diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul index abafff6e4..f3e959142 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul @@ -62,8 +62,8 @@ resourcesLoadPanel = self; - - + + diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java index 5ea8e7591..58aeba800 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java @@ -266,7 +266,9 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { subItem(_("Labels"), "/labels/labelTypes.zul","10-etiquetas.html"), subItem(_("Unit Measures"), "/materials/unitTypes.zul", "11-materiales.html#administraci-n-de-materiais"), subItem(_("Work Hours"),"/costcategories/typeOfWorkHours.zul","14-custos.html#administraci-n-de-horas-traballadas"), - subItem(_("Work Report Types"),"/workreports/workReportTypes.zul","09-partes.html#id2"))); + subItem(_("Work Report Models"), + "/workreports/workReportTypes.zul", + "09-partes.html#id2"))); } topItem(_("Reports"), "/reports/hoursWorkedPerWorkerReport.zul", "", diff --git a/navalplanner-webapp/src/main/resources/i18n/es.po b/navalplanner-webapp/src/main/resources/i18n/es.po index 35595bc97..a09247230 100644 --- a/navalplanner-webapp/src/main/resources/i18n/es.po +++ b/navalplanner-webapp/src/main/resources/i18n/es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-11-08 19:55+0100\n" -"PO-Revision-Date: 2010-11-09 19:07+0100\n" +"PO-Revision-Date: 2010-11-11 11:51+0100\n" "Last-Translator: Jacobo Aragunde Pérez \n" "Language-Team: Spanish <>\n" "MIME-Version: 1.0\n" @@ -471,8 +471,8 @@ msgstr "No se puede eliminar un escenario con escenarios derivados" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:270 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 -msgid "Work Report Types" -msgstr "Tipos de partes de trabajo" +msgid "Work Report Models" +msgstr "Modelos de partes de trabajo" #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22 msgid "Create new version" diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po index 51419e19d..be9363b55 100644 --- a/navalplanner-webapp/src/main/resources/i18n/gl.po +++ b/navalplanner-webapp/src/main/resources/i18n/gl.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-11-08 19:55+0100\n" -"PO-Revision-Date: 2010-11-09 19:08+0100\n" +"PO-Revision-Date: 2010-11-11 11:51+0100\n" "Last-Translator: Jacobo Aragunde Pérez \n" "Language-Team: Galician <>\n" "MIME-Version: 1.0\n" @@ -470,8 +470,8 @@ msgstr "Non se pode borrar un escenario con escenarios derivados" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:270 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 -msgid "Work Report Types" -msgstr "Tipos de partes de traballo" +msgid "Work Report Models" +msgstr "Modelos de partes de traballo" #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22 msgid "Create new version" diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot index 2a9c0a808..a9c4ed2c5 100644 --- a/navalplanner-webapp/src/main/resources/i18n/keys.pot +++ b/navalplanner-webapp/src/main/resources/i18n/keys.pot @@ -459,7 +459,7 @@ msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:270 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 -msgid "Work Report Types" +msgid "Work Report Models" msgstr "" #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22 diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css index 05b16ebab..f348b842d 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css @@ -1457,4 +1457,9 @@ display:none; .calendar-exceptions div.z-grid-body { overflow: hidden; +} + +/* Expand vertical boxes for non-ffox browsers */ +.z-vbox { + width:100%; } \ No newline at end of file diff --git a/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul b/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul index 2ea6c7bd5..a371a1288 100644 --- a/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul +++ b/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul @@ -29,8 +29,9 @@ + - + @@ -155,6 +156,7 @@ + diff --git a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul index 00cf7dd73..93e9014fd 100644 --- a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul +++ b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul @@ -18,7 +18,7 @@ along with this program. If not, see . --> - +