Scarab commit: svn commit: r10274 - trunk/src: conf/classes webapp/WEB-INF/templates/navigations webapp/WEB-INF/templates/screens webapp/WEB-INF/templates/screens/admin

Author: jorgeuriarte
Date: 2006-08-31 07:13:13-0700
New Revision: 10274

Modified:
   trunk/src/conf/classes/ScarabBundle_en.properties
   trunk/src/conf/classes/ScarabBundle_es.properties
   trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm
   trunk/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm
   trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm
   trunk/src/webapp/WEB-INF/templates/screens/admin/ManageArtifactTypes.vm
   trunk/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm

Log:
More fixes related to Menu structure. Depends on revisions 10272,10273.

Modified: trunk/src/conf/classes/ScarabBundle_en.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_en.properties?view=diff&rev=10274&p1=trunk/src/conf/classes/ScarabBundle_en.properties&p2=trunk/src/conf/classes/ScarabBundle_en.properties&r1=10273&r2=10274
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_en.properties	(original)
+++ trunk/src/conf/classes/ScarabBundle_en.properties	2006-08-31 07:13:13-0700
@@ -927,6 +927,7 @@
 CurrentModule=Current module
 AdminManageIssueTypes=Manage issue types
 ManageModules=Manage modules
+ChangeModule=Change module
 XMLImport=XML import
 XMLExport=XML export
 Roles=Roles

Modified: trunk/src/conf/classes/ScarabBundle_es.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_es.properties?view=diff&rev=10274&p1=trunk/src/conf/classes/ScarabBundle_es.properties&p2=trunk/src/conf/classes/ScarabBundle_es.properties&r1=10273&r2=10274
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_es.properties	(original)
+++ trunk/src/conf/classes/ScarabBundle_es.properties	2006-08-31 07:13:13-0700
@@ -901,6 +901,7 @@
 CurrentModule = Módulo actual
 AdminManageIssueTypes = Gestionar tipos de petición
 ManageModules = Gestionar módulos
+ChangeModule = Cambiar módulo
 XMLImport = Importación XML
 XMLExport = Exportación XML
 #-TRANS

Modified: trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm?view=diff&rev=10274&p1=trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm&p2=trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm&r1=10273&r2=10274
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm	2006-08-31 07:13:13-0700
@@ -44,7 +44,7 @@
       <div>$link.setPage("admin,ManageArtifactTypes.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "3").setLabel("$l10n.CurrentModule")</div>
      #else
        #if (!$data.user.CurrentModule.isGlobalModule())
-      <div>$link.setPage("admin,ManageModules.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "3").setLabel("$l10n.CurrentModule")</div>
+      <div>$link.setPage("admin,ManageArtifactTypes.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "3").setLabel("$l10n.CurrentModule")</div>
        #end
      #end
     #end

Modified: trunk/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm?view=diff&rev=10274&p1=trunk/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm&p2=trunk/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm&r1=10273&r2=10274
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm	2006-08-31 07:13:13-0700
@@ -2,3 +2,4 @@
  <div>$link.setPage("admin,XMLImportIssues.vm").setLabel("$l10n.XMLImportIssues")</div>
  <div>$link.setPage("admin,XMLExportIssues.vm").setLabel("$l10n.XMLExportIssues")</div>
  <div>$link.setPage("admin,XMLExportSettings.vm").setLabel("$l10n.XMLExportSettings")</div>
+ <div>$link.setPage("SelectModule.vm").setLabel("$l10n.ChangeModule")</div>

Modified: trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm?view=diff&rev=10274&p1=trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm&r1=10273&r2=10274
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm	2006-08-31 07:13:13-0700
@@ -39,7 +39,7 @@
 </tr>

 

 #foreach ($module in $userModules)

-  #if (!($module.isGlobalModule() && $user.isUserAnonymous()))

+  #if (!($module.isGlobalModule() && $userModules.size() > 1))

   #indexedRows($velocityCount)

    <td>

      $modulelink.setPage("$module.ModuleId").setLabel($module.Name)


Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/ManageArtifactTypes.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/ManageArtifactTypes.vm?view=diff&rev=10274&p1=trunk/src/webapp/WEB-INF/templates/screens/admin/ManageArtifactTypes.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/admin/ManageArtifactTypes.vm&r1=10273&r2=10274
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/ManageArtifactTypes.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/ManageArtifactTypes.vm	2006-08-31 07:13:13-0700
@@ -50,7 +50,7 @@
   #paginate ($resultsPerPage $pageNum $sortColumn $sortPolarity)
 #end
 
-<h3>$l10n.NavManageIssueTypes</h3>
+<h3>$l10n.format("ManageIssueTypes", $module.Name)</h3>
 
 #if (!$rmits || $rmits.isEmpty())
   <p><em>$l10n.NoIssueTypesInModule</em></p>

Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm?view=diff&rev=10274&p1=trunk/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm&r1=10273&r2=10274
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm	2006-08-31 07:13:13-0700
@@ -10,6 +10,7 @@
 </tr>
 
 #foreach ($module in $userModules)
+#if (!$module.isGlobalModule())
 #indexedRows($velocityCount)
 #set ($modDel = $module.Deleted)
 <td>
@@ -24,13 +25,14 @@
 </td>
 </tr>
 #end
+#end
 
 </table>
 #else
 <p><em>$l10n.NoModulesToEdit</em></p>
 #end
 
-#if ($data.User.getEditableModules().size() > 0)
+#if ($data.User.EditableModules.size() > 0)
 <form action="$link.setPage("admin,ModifyModule.vm").addPathInfo("new", "true")" method="post">
 <div class="functnbar2">
 <input type="submit" name="maxumusDorkus" value="$l10n.CreateNew" />