From 5431d64f80cd0102dcaca2096e6d860dea835faa Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Tue, 17 Aug 2010 11:15:36 +0200
Subject: [PATCH] ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #594]
 Renamed *-V2.zul files to *.zul.

---
 .../org/navalplanner/web/common/CustomMenuController.java     | 2 +-
 .../resources/criterions/{_edition-V2.zul => _edition.zul}    | 0
 .../webapp/resources/criterions/{_list-V2.zul => _list.zul}   | 0
 .../criterions/{criterions-V2.zul => criterions.zul}          | 4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename navalplanner-webapp/src/main/webapp/resources/criterions/{_edition-V2.zul => _edition.zul} (100%)
 rename navalplanner-webapp/src/main/webapp/resources/criterions/{_list-V2.zul => _list.zul} (100%)
 rename navalplanner-webapp/src/main/webapp/resources/criterions/{criterions-V2.zul => criterions.zul} (96%)

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 a3a22c4d0..1a545a007 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
@@ -253,7 +253,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
                 subItem(_("Cost Categories"),"/costcategories/costCategory.zul","14-custos.html#categor-as-de-custo"),
                 subItem(_("Data Types"),"/advance/advanceTypes.zul", "04-avances.html#id1",
                     subItem(_("Advances"),"/advance/advanceTypes.zul", "04-avances.html#id1"),
-                    subItem(_("Criteria"),"/resources/criterions/criterions-V2.zul","02-criterios.html#id1"),
+                    subItem(_("Criteria"),"/resources/criterions/criterions.zul","02-criterios.html#id1"),
                     subItem(_("Labels"), "/labels/labelTypes.zul","10-etiquetas.html"),
                     subItem(_("Units"), "/materials/unitTypes.zul", "11-materiales.html#administraci-n-de-materiais"),
                     subItem(_("Work Hours"),"/costcategories/typeOfWorkHours.zul","14-custos.html#administraci-n-de-horas-traballadas"),
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul
similarity index 100%
rename from navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul
rename to navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul
similarity index 100%
rename from navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul
rename to navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul
similarity index 96%
rename from navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul
rename to navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul
index c1e5c54d4..4fcc8894d 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul
@@ -25,8 +25,8 @@
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
 <?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
-<?component name="list" inline="true" macroURI="_list-V2.zul"?>
-<?component name="edition" inline="true" macroURI="_edition-V2.zul"?>
+<?component name="list" inline="true" macroURI="_list.zul"?>
+<?component name="edition" inline="true" macroURI="_edition.zul"?>
 <zk>
  <window self="@{define(content)}"
   apply="org.navalplanner.web.resources.criterion.CriterionAdminController_V2">