diff --git a/ganttzk-demo-webapp/src/main/webapp/common/css/navalpro_v01.css b/ganttzk-demo-webapp/src/main/webapp/common/css/navalplan.css similarity index 100% rename from ganttzk-demo-webapp/src/main/webapp/common/css/navalpro_v01.css rename to ganttzk-demo-webapp/src/main/webapp/common/css/navalplan.css diff --git a/ganttzk-demo-webapp/src/main/webapp/common/css/navalpro_zk.css b/ganttzk-demo-webapp/src/main/webapp/common/css/navalplan_zk.css similarity index 100% rename from ganttzk-demo-webapp/src/main/webapp/common/css/navalpro_zk.css rename to ganttzk-demo-webapp/src/main/webapp/common/css/navalplan_zk.css diff --git a/ganttzk-demo-webapp/src/main/webapp/common/error.zul b/ganttzk-demo-webapp/src/main/webapp/common/error.zul index 96768c984..5daf1a673 100644 --- a/ganttzk-demo-webapp/src/main/webapp/common/error.zul +++ b/ganttzk-demo-webapp/src/main/webapp/common/error.zul @@ -19,8 +19,8 @@ --> - - + + diff --git a/ganttzk-demo-webapp/src/main/webapp/common/layout/template_ganttzk_demo.zul b/ganttzk-demo-webapp/src/main/webapp/common/layout/template_ganttzk_demo.zul index 8d8026e41..20dacebbc 100644 --- a/ganttzk-demo-webapp/src/main/webapp/common/layout/template_ganttzk_demo.zul +++ b/ganttzk-demo-webapp/src/main/webapp/common/layout/template_ganttzk_demo.zul @@ -19,8 +19,8 @@ --> - - + + diff --git a/ganttzk-demo-webapp/src/main/webapp/common/page_not_found.zul b/ganttzk-demo-webapp/src/main/webapp/common/page_not_found.zul index e5d563aef..3eac8d115 100644 --- a/ganttzk-demo-webapp/src/main/webapp/common/page_not_found.zul +++ b/ganttzk-demo-webapp/src/main/webapp/common/page_not_found.zul @@ -19,8 +19,8 @@ --> - - + + diff --git a/ganttzk-demo-webapp/src/main/webapp/planner/main.zul b/ganttzk-demo-webapp/src/main/webapp/planner/main.zul index ecad4c3bf..a07f54814 100644 --- a/ganttzk-demo-webapp/src/main/webapp/planner/main.zul +++ b/ganttzk-demo-webapp/src/main/webapp/planner/main.zul @@ -23,8 +23,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul index e821101d3..dc4c5eef9 100644 --- a/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul +++ b/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/calendars/calendars.zul b/navalplanner-webapp/src/main/webapp/calendars/calendars.zul index c7c5da4c8..21766dd4d 100644 --- a/navalplanner-webapp/src/main/webapp/calendars/calendars.zul +++ b/navalplanner-webapp/src/main/webapp/calendars/calendars.zul @@ -23,8 +23,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul b/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul index e1775859e..274c4705c 100644 --- a/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul +++ b/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul @@ -19,8 +19,8 @@ --> - - + + diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul index 92214af06..23be2f2be 100644 --- a/navalplanner-webapp/src/main/webapp/common/configuration.zul +++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul @@ -23,8 +23,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan.css similarity index 100% rename from navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css rename to navalplanner-webapp/src/main/webapp/common/css/navalplan.css diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css similarity index 99% rename from navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css rename to navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css index 046e00aba..4c3bf5a8c 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css @@ -1,5 +1,5 @@ /* - * navalpro_zk.css NavalPlan + * navalplan_zk.css NavalPlan * * This stylesheet contains declarations for ZK overriden components * according to the ZK Style Guides [http://www.zkoss.org/doc/styleguide] diff --git a/navalplanner-webapp/src/main/webapp/common/error.zul b/navalplanner-webapp/src/main/webapp/common/error.zul index 582a054c0..f5bac6293 100644 --- a/navalplanner-webapp/src/main/webapp/common/error.zul +++ b/navalplanner-webapp/src/main/webapp/common/error.zul @@ -19,8 +19,8 @@ --> - - + + diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul index 65fe1976a..e7fe939d3 100644 --- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul +++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul @@ -19,8 +19,8 @@ --> - - + + diff --git a/navalplanner-webapp/src/main/webapp/common/layout/timeout.zul b/navalplanner-webapp/src/main/webapp/common/layout/timeout.zul index 0743bbb84..7f601a28c 100644 --- a/navalplanner-webapp/src/main/webapp/common/layout/timeout.zul +++ b/navalplanner-webapp/src/main/webapp/common/layout/timeout.zul @@ -18,8 +18,8 @@ along with this program. If not, see . --> - - + + diff --git a/navalplanner-webapp/src/main/webapp/common/page_not_found.zul b/navalplanner-webapp/src/main/webapp/common/page_not_found.zul index 955b7cf11..8609a177a 100644 --- a/navalplanner-webapp/src/main/webapp/common/page_not_found.zul +++ b/navalplanner-webapp/src/main/webapp/common/page_not_found.zul @@ -19,8 +19,8 @@ --> - - + + diff --git a/navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul b/navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul index e4d7056b1..ebea31c27 100644 --- a/navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul +++ b/navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul @@ -21,8 +21,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul b/navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul index 1207c072a..faf35611d 100644 --- a/navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul +++ b/navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul @@ -21,8 +21,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul b/navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul index 56e492001..fdd60c7f2 100644 --- a/navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul +++ b/navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul @@ -21,8 +21,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/labels/labelTypes.zul b/navalplanner-webapp/src/main/webapp/labels/labelTypes.zul index cc0f29255..d5876c3e1 100644 --- a/navalplanner-webapp/src/main/webapp/labels/labelTypes.zul +++ b/navalplanner-webapp/src/main/webapp/labels/labelTypes.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/materials/materials.zul b/navalplanner-webapp/src/main/webapp/materials/materials.zul index 065f929dd..3dedf137f 100644 --- a/navalplanner-webapp/src/main/webapp/materials/materials.zul +++ b/navalplanner-webapp/src/main/webapp/materials/materials.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/planner/index.zul b/navalplanner-webapp/src/main/webapp/planner/index.zul index f82a4ea84..e38f44cbc 100644 --- a/navalplanner-webapp/src/main/webapp/planner/index.zul +++ b/navalplanner-webapp/src/main/webapp/planner/index.zul @@ -23,8 +23,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/planner/main.zul b/navalplanner-webapp/src/main/webapp/planner/main.zul index a4ad85e46..509dee948 100644 --- a/navalplanner-webapp/src/main/webapp/planner/main.zul +++ b/navalplanner-webapp/src/main/webapp/planner/main.zul @@ -23,8 +23,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/planner/resources_use.zul b/navalplanner-webapp/src/main/webapp/planner/resources_use.zul index 9b2c0b4ce..7567fc586 100644 --- a/navalplanner-webapp/src/main/webapp/planner/resources_use.zul +++ b/navalplanner-webapp/src/main/webapp/planner/resources_use.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul b/navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul index 2478215ff..bb8df1868 100644 --- a/navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul +++ b/navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul b/navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul index c7e86be36..a82ccbdcc 100644 --- a/navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul +++ b/navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul b/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul index e773e38a1..baa03f0c9 100644 --- a/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul +++ b/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul b/navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul index d45e92e11..e4b9cebc9 100644 --- a/navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul +++ b/navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul b/navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul index 929a4c7b3..a73834851 100644 --- a/navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul +++ b/navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul b/navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul index 396c9573b..a56e607a3 100644 --- a/navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul +++ b/navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul b/navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul index 7519da5c9..040eb0bff 100644 --- a/navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul +++ b/navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul b/navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul index ca204e40a..3a2d51536 100644 --- a/navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul +++ b/navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul b/navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul index d06201f0a..7067252d5 100644 --- a/navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul +++ b/navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul @@ -24,8 +24,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul index 992324fc8..7230c53e7 100644 --- a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul +++ b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul @@ -21,8 +21,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul index 65b8d0cb6..ee75e7777 100644 --- a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul +++ b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul @@ -21,8 +21,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/machines.zul b/navalplanner-webapp/src/main/webapp/resources/machine/machines.zul index 993bba167..7d9b64643 100644 --- a/navalplanner-webapp/src/main/webapp/resources/machine/machines.zul +++ b/navalplanner-webapp/src/main/webapp/resources/machine/machines.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul b/navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul index fe6f4d47d..726f1bace 100644 --- a/navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul +++ b/navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul b/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul index fef2c6cbc..5cab492e8 100644 --- a/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul +++ b/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul @@ -22,8 +22,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul b/navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul index 0976069c4..a2e8e518c 100644 --- a/navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul +++ b/navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul @@ -20,8 +20,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul b/navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul index a91c81551..744984ee1 100644 --- a/navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul +++ b/navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul @@ -20,8 +20,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/templates/templates.zul b/navalplanner-webapp/src/main/webapp/templates/templates.zul index ba1a8e1f1..9d5cf71c1 100644 --- a/navalplanner-webapp/src/main/webapp/templates/templates.zul +++ b/navalplanner-webapp/src/main/webapp/templates/templates.zul @@ -20,8 +20,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/users/profiles.zul b/navalplanner-webapp/src/main/webapp/users/profiles.zul index ee305b8b0..a5a32fc27 100644 --- a/navalplanner-webapp/src/main/webapp/users/profiles.zul +++ b/navalplanner-webapp/src/main/webapp/users/profiles.zul @@ -21,8 +21,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/users/users.zul b/navalplanner-webapp/src/main/webapp/users/users.zul index 2a9b4b800..680df5c39 100644 --- a/navalplanner-webapp/src/main/webapp/users/users.zul +++ b/navalplanner-webapp/src/main/webapp/users/users.zul @@ -21,8 +21,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReport.zul b/navalplanner-webapp/src/main/webapp/workreports/workReport.zul index 89f424887..5c973602a 100644 --- a/navalplanner-webapp/src/main/webapp/workreports/workReport.zul +++ b/navalplanner-webapp/src/main/webapp/workreports/workReport.zul @@ -21,8 +21,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul b/navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul index ab7216d8a..9b2770401 100644 --- a/navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul +++ b/navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul @@ -21,8 +21,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul b/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul index 3ec857394..66b1179e1 100644 --- a/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul +++ b/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul @@ -21,8 +21,8 @@ - - + +