From 07cea17fdbfcd0578f5e4897ea22eb7f53ca0297 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Tue, 30 Nov 2010 12:05:09 +0100
Subject: [PATCH] creates two tabs, one of them Main preferences, and the
 another Entity sequences for all the sequences of the entities.

FEA : ItEr64S06NavalPlanEntities
---
 .../web/common/ConfigurationController.java         |  4 ++--
 .../src/main/webapp/common/configuration.zul        | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
index f0a863cd7..b93388d9e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
@@ -77,7 +77,7 @@ public class ConfigurationController extends GenericForwardComposer {
 
     private Component messagesContainer;
 
-    private Tabpanel panelConfiguration;
+    private Tabpanel panelEntitySequences;
 
     @Override
     public void doAfterCompose(Component comp) throws Exception {
@@ -137,7 +137,7 @@ public class ConfigurationController extends GenericForwardComposer {
     private void createPanelEntityComponents() {
         for (final EntityNameEnum entityName : EntityNameEnum.values()) {
             Component entitySequenceComponent = Executions.createComponents(
-                    "components/panelEntitySequence.zul", panelConfiguration
+                    "components/panelEntitySequence.zul", panelEntitySequences
                             .getFellow("panelEntitySequence"),
                     new HashMap<String, String>());
             initLabelInPanelSequence(entitySequenceComponent, entityName);
diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul
index f4a1f653f..7d998af4f 100644
--- a/navalplanner-webapp/src/main/webapp/common/configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul
@@ -38,6 +38,7 @@
     <tabbox>
         <tabs>
             <tab label="${i18n:_('Main preferences')}" />
+            <tab label="${i18n:_('Entity sequences')}" />
         </tabs>
         <tabpanels>
             <tabpanel id="panelConfiguration">
@@ -168,12 +169,12 @@
                         </row>
                     </rows>
                 </grid>
-                <separator bar="false" height="20px" />
-                <panel border="normal" title="Entity code sequences">
-                    <panelchildren id="panelEntitySequence">
-                    </panelchildren>
-                </panel>
-
+			</tabpanel>
+			<tabpanel id="panelEntitySequences">
+				<panel border="normal" title="Entity code sequences">
+					<panelchildren id="panelEntitySequence">
+					</panelchildren>
+				</panel>
             </tabpanel>
         </tabpanels>
     </tabbox>