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