浏览代码

Modificaciones para nuevo diseño

Daniel Libonati 6 年之前
父节点
当前提交
fa86ff18ae

+ 4 - 2
app/config/bundles/ik/webservice-bundle/parameters.yml.dist

@@ -6,6 +6,7 @@ parameters:
     url_radius: 'https://%env(HOST_RADIUS)%'
     url_cablemodem: 'https://%env(HOST_CABLEMODEM)%'
     url_geoserver: 'https://%env(HOST_GEOSERVER)%'
+    url_dhcp: 'https://%env(HOST_DHCP)%'
     url_dummy: 'https://%env(HOST_DUMMY)%'
     client: '%url_base%/api/clients.json'
     remote_client_create_url: '%url_base%/admin/client/client/create'
@@ -13,15 +14,16 @@ parameters:
     remote_device_log_url: '%url_base%/api/devicelogs.json'
     remote_get_map_url: '%url_mapas%/api/maps.json'
     remote_get_object_type_url: '%url_mapas%/api/objecttypes.json'
-    sidebar_menu:
+    active_menu: 'DHCP'
+    navbar_menu:
         Base: '%url_base%'
         Cablemodems: '%url_cablemodem%'
         FTTH: '%url_ftth%'
         Mapas: '%url_mapas%'
         Stats: '%url_stats%'
+        DHCP: '%url_dhcp%'
         Radius: '%url_radius%'
     cablemodem_docker: '%url_cablemodem%'
     cablemodem_post_url: '%cablemodem_docker%/api/cablemodems.json'
     cablemodem_put_url: '%cablemodem_docker%/api/cablemodems/{id}.json'
     cablemodem_del_url: '%cablemodem_docker%/api/cablemodems/{id}.json'
-

+ 4 - 2
app/config/bundles/ik/webservice-bundle/parameters.yml.docker

@@ -6,6 +6,7 @@ parameters:
     url_radius: 'https://%env(HOST_RADIUS)%'
     url_cablemodem: 'https://%env(HOST_CABLEMODEM)%'
     url_geoserver: 'https://%env(HOST_GEOSERVER)%'
+    url_dhcp: 'https://%env(HOST_DHCP)%'
     url_dummy: 'https://%env(HOST_DUMMY)%'
     client: '%url_base%/api/clients.json'
     remote_client_create_url: '%url_base%/admin/client/client/create'
@@ -13,15 +14,16 @@ parameters:
     remote_device_log_url: '%url_base%/api/devicelogs.json'
     remote_get_map_url: '%url_mapas%/api/maps.json'
     remote_get_object_type_url: '%url_mapas%/api/objecttypes.json'
-    sidebar_menu:
+    active_menu: 'DHCP'
+    navbar_menu:
         Base: '%url_base%'
         Cablemodems: '%url_cablemodem%'
         FTTH: '%url_ftth%'
         Mapas: '%url_mapas%'
         Stats: '%url_stats%'
+        DHCP: '%url_dhcp%'
         Radius: '%url_radius%'
     cablemodem_docker: '%url_cablemodem%'
     cablemodem_post_url: '%cablemodem_docker%/api/cablemodems.json'
     cablemodem_put_url: '%cablemodem_docker%/api/cablemodems/{id}.json'
     cablemodem_del_url: '%cablemodem_docker%/api/cablemodems/{id}.json'
-

+ 2 - 0
app/config/config.yml

@@ -77,6 +77,8 @@ twig:
         fd_alerts: '@base_admin.alert_service'
         tenancy_service: '@base_tenancy.tenancy_service'
         checked_is_user_logged_in: '%app.checked_is_user_logged_in%'
+        active_menu: '%active_menu%'
+        navbar_menu: '%navbar_menu%'
 
 # Doctrine Configuration
 doctrine:

+ 1 - 1
src/DHCPBundle/Resources/config/services.yml

@@ -3,7 +3,7 @@ services:
         class: DHCPBundle\Admin\DHCPAdmin
         arguments: [~, DHCPBundle\Entity\DHCP, BaseAdminBundle:CRUD]
         tags:
-            - { name: sonata.admin, manager_type: orm, group: DHCP, label: DHCP, label_catalogue: DHCPBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
+            - { name: sonata.admin, manager_type: orm, group: DHCP, label: DHCP, label_catalogue: DHCPBundle, label_translator_strategy: sonata.admin.label.strategy.underscore, icon: '<i class="fa fa-table"></i>' }
         calls:
             - [setTranslationDomain, [DHCPBundle]]
         public: true

+ 7 - 8
src/HostBundle/Resources/config/services.yml

@@ -4,7 +4,7 @@ services:
         class: HostBundle\Admin\HostAdmin
         arguments: [~, HostBundle\Entity\Host, BaseAdminBundle:CRUD]
         tags:
-            - { name: sonata.admin, manager_type: orm, group: Host, label: Host, label_catalogue: HostBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
+            - { name: sonata.admin, manager_type: orm, group: Host, label: Host, label_catalogue: HostBundle, label_translator_strategy: sonata.admin.label.strategy.underscore, icon: '<i class="fa fa-hdd-o"></i>' }
         calls:
             - [setTranslationDomain, [HostBundle]]
             - [setTemplate, [edit, "HostBundle:CRUD:edit.html.twig"]]
@@ -25,24 +25,23 @@ services:
        tags:
            - { name: kernel.event_listener, event: sonata.admin.event.configure.form, method: configureFormFields }
            - { name: kernel.event_listener, event: sonata.admin.event.configure.show, method: configureShowFields }
-           
+
     dhcp.host_service:
         class: HostBundle\Services\HostService
         arguments: [ "@doctrine.orm.entity_manager", "@pool_ipv4_service" ]
-        
+
     dhcp.assign_host_fixed_address.subscriber:
         class: HostBundle\EventListener\AssignHostFixedAddressSubscriber
         arguments: [ "@service_container" ]
         tags:
-            - { name: doctrine.event_subscriber, connection: default }    
-        
+            - { name: doctrine.event_subscriber, connection: default }
+
     dhcp.kea_host_reservation.subscriber:
         class: HostBundle\EventListener\KEAHostReservationSubscriber
         arguments: [ "@service_container" ]
         tags:
-            - { name: doctrine.event_subscriber, connection: default }    
-        
+            - { name: doctrine.event_subscriber, connection: default }
+
     dhcp.dhcp_options.service:
         class: HostBundle\Services\DHCPOptionsService
         arguments: [ "@doctrine.orm.entity_manager", "@validator" ]
-        

+ 2 - 2
src/IPv4Bundle/Resources/config/services.yml

@@ -4,7 +4,7 @@ services:
         class: IPv4Bundle\Admin\NetGroupAdmin
         arguments: [~, IPv4Bundle\Entity\NetGroup, BaseAdminBundle:CRUD]
         tags:
-            - { name: sonata.admin, manager_type: orm, group: IPv4, label: NetGroup, label_catalogue: IPv4Bundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
+            - { name: sonata.admin, manager_type: orm, group: IPv4, label: NetGroup, label_catalogue: IPv4Bundle, label_translator_strategy: sonata.admin.label.strategy.underscore, icon: "<i style='font-family: Sans-serif' class='fa'>v4</i>" }
         calls:
             - [setTranslationDomain, [IPv4Bundle]]
         public: true
@@ -26,7 +26,7 @@ services:
         calls:
             - [setTranslationDomain, [IPv4Bundle]]
         public: true
-        
+
     pool_ipv4_service:
         class: IPv4Bundle\Services\PoolService
         arguments: [ '@doctrine.orm.entity_manager' ]

+ 1 - 1
src/IPv6Bundle/Resources/config/services.yml

@@ -4,7 +4,7 @@ services:
         class: IPv6Bundle\Admin\NetGroupAdmin
         arguments: [~, IPv6Bundle\Entity\NetGroup, BaseAdminBundle:CRUD]
         tags:
-            - { name: sonata.admin, manager_type: orm, group: IPv6, label: NetGroup, label_catalogue: IPv6Bundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
+            - { name: sonata.admin, manager_type: orm, group: IPv6, label: NetGroup, label_catalogue: IPv6Bundle, label_translator_strategy: sonata.admin.label.strategy.underscore, icon: "<i style='font-family: Sans-serif' class='fa'>v6</i>" }
         calls:
             - [setTranslationDomain, [IPv6Bundle]]
         public: true

+ 1 - 1
src/KeaBundle/Resources/config/services.yml

@@ -16,7 +16,7 @@ services:
         class: KeaBundle\Admin\ConfigAdmin
         arguments: [~, KeaBundle\Entity\Config, BaseAdminBundle:CRUD]
         tags:
-            - { name: sonata.admin, manager_type: orm, group: Kea, label: Config, label_catalogue: KeaBundle, label_translator_strategy: sonata.admin.label.strategy.underscore, audit: false }
+            - { name: sonata.admin, manager_type: orm, group: Kea, label: Config, label_catalogue: KeaBundle, label_translator_strategy: sonata.admin.label.strategy.underscore, audit: false, icon: '<i class="fa" style="font-family: Helvetica"><b>K</b></i>' }
         calls:
             - [setTranslationDomain, [KeaBundle]]
         public: true