Merged daniel into master

app/config/config.yml

@@ -14,9 +14,11 @@ imports:
     - { resource: "@BaseOAuthClientBundle/Resources/config/hwioauthbundle/services.yml" }
     - { resource: "@BaseOAuthClientBundle/Resources/config/hwioauthbundle/config.yml" }
     - { resource: "@TemplateBundle/Resources/config/services.yml" }
+    - { resource: '@BaseAdminBundle/Resources/config/services.yml' }
     - { resource: "@ExtraDataBundle/Resources/config/services.yml" }
 
 parameters:
+    app_name: ftth
     locale: es
 
 framework:
@@ -51,6 +53,9 @@ twig:
     strict_variables: "%kernel.debug%"
     form_themes:
         - 'WebserviceBundle:Type:remote_client_widget.html.twig'
+    globals:
+        base_url: %url_base%
+        fd_alerts: '@base_admin.alert_service'
 
 # Doctrine Configuration
 doctrine:

app/config/routing.yml

@@ -41,14 +41,19 @@ _sonata:
 
 FTTHBundle:
     resource: "@FTTHBundle/Resources/config/routing/admin.xml"
-    prefix: /admin    
-    
+    prefix: /admin
+
 base_oauth_client:
     resource: "@BaseOAuthClientBundle/Resources/config/routing.yml"
-    
+
 base_hwioauthbundle_oauth_client:
     resource: "@BaseOAuthClientBundle/Resources/config/hwioauthbundle/routing.yml"
 
 workflow:
     resource: "@WorkflowBundle/Resources/config/routing/admin.xml"
     prefix:   /
+
+base_admin_alert:
+    resource: "@BaseAdminBundle/Controller/"
+    type:     annotation
+    prefix:   /

composer.lock

@@ -1262,7 +1262,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "9ea1772fe297c40392bc5e3dbf2ffb7946fd8d08"
+                "reference": "72d12e369281ee3dbe186f8e4c4e958062b7d365"
             },
             "type": "library",
             "autoload": {