Merge branch 'master' of github.com:w00d5t0ck/kekrozsak

app/AppKernel.php

@@ -24,6 +24,7 @@ class AppKernel extends Kernel
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
             new Io\TcpdfBundle\IoTcpdfBundle(),
             new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
+            new Jmikola\JsAssetsHelperBundle\JmikolaJsAssetsHelperBundle(),
             // Own bundles
             new KekRozsak\FrontBundle\KekRozsakFrontBundle(),
             new KekRozsak\SecurityBundle\KekRozsakSecurityBundle(),

app/Resources/TwigBundle/views/Exception/error404.html.twig

@@ -0,0 +1,14 @@
+{% extends 'KekRozsakFrontBundle:Default:main_template.html.twig' %}
+
+{% block content %}
+<h3>A keresett oldal nem létezik</h3>
+<p>
+{% spaceless %}
+    A keresett oldal nem létezik. Válassz valamit a menüből
+{% if app.user %}
+    vagy kattints a bal felső sarokban a nevedre a további lehetőségekért
+{% endif %}
+    !
+{% endspaceless %}
+</p>
+{% endblock content %}

app/config/config.yml

@@ -8,6 +8,9 @@ jms_di_extra:
         bundles: [ KekRozsakFrontBundle, KekRozsakSecurityBundle ]
         directories: [ "%kernel.root_dir%/../src" ]
 
+jmikola_js_assets_helper:
+    packages_to_expose: [ KekRozsakFrontBundle ]
+
 framework:
     #esi:             ~
     #translator:      { fallback: %locale% }
@@ -17,7 +20,10 @@ framework:
     form:            true
     csrf_protection: true
     validation:      { enable_annotations: true }
-    templating:      { engines: ['twig'] } #assets_version: SomeVersionScheme
+    templating:
+        engines: ['twig']
+        packages: 
+            KekRozsakFrontBundle: ~
     default_locale:  %locale%
     trust_proxy_headers: false # Should Request object should trust proxy headers (X_FORWARDED_FOR/HTTP_CLIENT_IP)
     session:         ~

app/config/routing.yml

@@ -1,6 +1,9 @@
 fos_js_routing:
     resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml"
 
+jmikola_js_assets_helper_routing:
+    resource: "@JmikolaJsAssetsHelperBundle/Resources/config/routing/routing.xml"
+
 KekRozsakAdminBundle:
     resource: "@KekRozsakAdminBundle/Controller/"
     type:     annotation

composer.json

@@ -27,6 +27,7 @@
 	"doctrine/doctrine-migrations-bundle": "dev-master",
         "egeloen/ckeditor-bundle": "dev-master",
 	"friendsofsymfony/jsrouting-bundle": "dev-master",
+        "jmikola/js-assets-helper-bundle": "dev-master",
         "gergelypolonkai/tcpdfbundle": "dev-master"
     },
     "scripts": {

src/KekRozsak/FrontBundle/Resources/public/js/forum.js

@@ -24,7 +24,8 @@ function favouriteOn()
         type: 'GET',
         url:  url
     }).done(function() {
-        elem.html('[Kedvenc ikon]');
+        elem.find('img').attr('alt', '[Kedvenc]');
+        elem.find('img').attr('src', AssetsHelper.getURL('bundles/kekrozsakfront/images/penta-yellow-24.png'));
         elem.removeClass('favourite-topic-button');
         elem.addClass('unfavourite-topic-button');
         elem.attr('id', 'unfavourite-topic-button-' + topicSlug);
@@ -58,7 +59,8 @@ function favouriteOff()
         type: 'GET',
         url:  url
     }).done(function() {
-        elem.html('[Nem kedvenc ikon]');
+        elem.find('img').attr('alt', '[Nem kedvenc]');
+        elem.find('img').attr('src', AssetsHelper.getUrl('/bundles/kekrozsakfront/images/penta-blue-24.png'));
         elem.removeClass('unfavourite-topic-button');
         elem.addClass('favourite-topic-button');
         elem.attr('id', 'favourite-topic-button-' + topicSlug);

src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig

@@ -17,6 +17,8 @@
         <script type="text/javascript" src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
         <script type="text/javascript" src="{{ path('fos_js_routing_js', {callback: 'fos.Router.setData'}) }}"></script>
         <script type="text/javascript" src="{{ asset('js/jquery-form/jquery.form.js') }}"></script>
+        <script type="text/javascript" src="{{ asset('bundles/jmikolajsassetshelper/js/asset_helper.js') }}"></script>
+        <script type="text/javascript" src="{{ path('jmikola_js_assets_helper_js') }}"></script>
 {% javascripts 'bundles/kekrozsakfront/js/*' output='js/kekrozsak.js' %}
         <script type="text/javascript" src="{{ asset_url }}"></script>
 {% endjavascripts %}

src/KekRozsak/FrontBundle/Resources/views/Forum/postList.html.twig

@@ -5,9 +5,9 @@
 {% block content %}
 <h3>
 {% if app.user.userData and app.user.userData.isFavouriteForumTopic(topic) %}
-    <span class="gomb unfavourite-topic-button topicgroup-{{ topicGroup.slug }}" id="unfavourite-topic-button-{{ topic.slug }}">[Kedvenc ikon]</span>
+    <span class="unfavourite-topic-button topicgroup-{{ topicGroup.slug }}" id="unfavourite-topic-button-{{ topic.slug }}"><img src="{{ asset('bundles/kekrozsakfront/images/penta-yellow-24.png') }}" alt="[Kedvenc]" /></span>
 {% else %}
-    <span class="gomb favourite-topic-button topicgroup-{{ topicGroup.slug }}" id="favourite-topic-button-{{ topic.slug }}">[Nem kedvenc ikon]</span>
+    <span class="favourite-topic-button topicgroup-{{ topicGroup.slug }}" id="favourite-topic-button-{{ topic.slug }}"><img src="{{ asset('bundles/kekrozsakfront/images/penta-blue-24.png') }}" alt="[Nem kedvenc]" /></span>
 {% endif %}
     <a href="{{ path('KekRozsakFrontBundle_forumTopicGroupList') }}">Fórum</a> -
     <a href="{{ path('KekRozsakFrontBundle_forumTopicList', {slug: topicGroup.slug}) }}">{{ topicGroup.title }}</a> -

src/KekRozsak/FrontBundle/Resources/views/Forum/topicGroupList.html.twig

@@ -39,9 +39,9 @@
             <td>
                 [ikon]
 {% if app.user.userData and app.user.userData.isFavouriteForumTopic(topic) %}
-                <span class="gomb unfavourite-topic-button topicgroup-{{ topic.topicGroup.slug }}" id="unfavourite-topic-button-{{ topic.slug }}">[Kedvenc ikon]</span>
+                <span class="unfavourite-topic-button topicgroup-{{ topic.topicGroup.slug }}" id="unfavourite-topic-button-{{ topic.slug }}"><img src="{{ asset('bundles/kekrozsakfront/images/penta-yellow-24.png') }}" alt="[Kedvenc]" /></span>
 {% else %}
-                <span class="gomb favourite-topic-button topicgroup-{{ topic.topicGroup.slug }}" id="favourite-topic-button-{{ topic.slug }}">[Nem kedvenc ikon]</span>
+                <span class="favourite-topic-button topicgroup-{{ topic.topicGroup.slug }}" id="favourite-topic-button-{{ topic.slug }}"><img src="{{ asset('bundles/kekrozsakfront/images/penta-blue-24.png') }}" alt="[Nem kedvenc]" /></span>
 {% endif %}
             </td>
             <td><a href="{{ path('KekRozsakFrontBundle_forumPostList', {topicGroupSlug: topicGroup.slug, topicSlug: topic.slug}) }}">{{ topic.title }}</a></td>

src/KekRozsak/FrontBundle/Resources/views/Forum/topicList.html.twig

@@ -29,9 +29,9 @@
             <td>
                 [ikon]
 {% if app.user.userData and app.user.userData.isFavouriteForumTopic(topic) %}
-                <span class="gomb unfavourite-topic-button topicgroup-{{ topicGroup.slug }}" id="unfavourite-topic-button-{{ topic.slug }}">[Kedvenc ikon]</span>
+                <span class="unfavourite-topic-button topicgroup-{{ topicGroup.slug }}" id="unfavourite-topic-button-{{ topic.slug }}"><img src="{{ asset('bundles/kekrozsakfront/images/penta-yellow-24.png') }}" alt="[Kedvenc]" /></span>
 {% else %}
-                <span class="gomb favourite-topic-button topicgroup-{{ topicGroup.slug }}" id="favourite-topic-button-{{ topic.slug }}">[Nem kedvenc ikon]</span>
+                <span class="favourite-topic-button topicgroup-{{ topicGroup.slug }}" id="favourite-topic-button-{{ topic.slug }}"><img src="{{ asset('bundles/kekrozsakfront/images/penta-blue-24.png') }}" alt="[Nem kedvenc]" /></span>
 {% endif %}
             </td>
             <td><a href="{{ path('KekRozsakFrontBundle_forumPostList', { topicGroupSlug: topicGroup.slug, topicSlug: topic.slug }) }}">{{ topic.title }}</a></td>