diff --git a/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label.properties b/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label.properties index 287427d58..eea50ea7d 100644 --- a/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label.properties +++ b/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label.properties @@ -30,4 +30,16 @@ mainmenu.about=Acerca de mainmenu.aclunaga=Aclunaga mainmenu.manage_criterions=Administrar criterios mainmenu.orders=Pedidos -mainmenu.list_orders=Lista de pedidos \ No newline at end of file +mainmenu.list_orders=Lista de pedidos +mainmenu.company_overview=Vista de empresa +mainmenu.plannifications_list=Listado de planificacións +mainmenu.manage_machines=Xestionar máquinas +mainmenu.activity_work_types=Tipos de actividad de traballo +mainmenu.models=Modelos +mainmenu.work_reports=Partes de traballo +mainmenu.work_report_list=Listado de partes de traballo +mainmenu.work_report_types=Tipos de partes de traballo +mainmenu.work_report_import=Importación de partes de traballo +mainmenu.administration=Administración +mainmenu.manage_users=Xestionar usuarios e permisos +mainmenu.quality_management=Xestión da calidade \ No newline at end of file diff --git a/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label_en_US.properties b/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label_en_US.properties index 6b0b7ba6d..a0eb76ac7 100644 --- a/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label_en_US.properties +++ b/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label_en_US.properties @@ -30,4 +30,16 @@ mainmenu.about=About mainmenu.aclunaga=Aclunaga mainmenu.manage_criterions=Manage criterions mainmenu.orders=Orders -mainmenu.list_orders=Orders list \ No newline at end of file +mainmenu.list_orders=Orders list +mainmenu.company_overview=Company overview +mainmenu.plannifications_list=Plannifications list +mainmenu.manage_machines=Manage machines +mainmenu.activity_work_types=Activity work types +mainmenu.models=Models +mainmenu.work_reports=Work reports +mainmenu.work_report_list=Work report list +mainmenu.work_report_types=Work report types +mainmenu.work_report_import=Work report importation +mainmenu.administration=Administration +mainmenu.manage_users=Manage users and permissions +mainmenu.quality_management=Quality management \ No newline at end of file diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul index 50b561b2b..004796c9b 100644 --- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul +++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul @@ -7,16 +7,13 @@ - - - + + + - - - - @@ -27,11 +24,7 @@ href='/resources/worker/worker.zul#list' /> - - - @@ -40,25 +33,27 @@ + + - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/navalplanner-webapp/src/main/webapp/common/resources.zul b/navalplanner-webapp/src/main/webapp/common/resources.zul deleted file mode 100644 index 9726b009d..000000000 --- a/navalplanner-webapp/src/main/webapp/common/resources.zul +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - -