Author: jorgeuriarte
Date: 2006-09-19 15:48:43-0700
New Revision: 10303
Modified:
branches/release/b21/ (props changed)
branches/release/b21/project.xml
branches/release/b21/src/conf/classes/ScarabBundle_en.properties
branches/release/b21/src/conf/classes/ScarabBundle_es.properties
branches/release/b21/src/webapp/WEB-INF/templates/navigations/Administration.vm
branches/release/b21/src/webapp/WEB-INF/templates/navigations/GlobalAdmin.vm
branches/release/b21/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm
branches/release/b21/src/webapp/WEB-INF/templates/screens/SelectModule.vm
branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/AdminIndex.vm
branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/GlobalArtifactTypeShow.vm
branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/ManageArtifactTypes.vm
branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm
branches/release/b21/src/webapp/WEB-INF/templates/screens/home/EnterNew.vm
branches/release/b21/xdocs/index.xml
Log:
Merged revisions via svnmerge from
http://scarab.tigris.org/svn/scarab/trunk
........
r10268 | jorgeuriarte | 2006-08-29 16:55:20 +0200 (Tue, 29 Aug 2006) | 1 line
Documentation updated with new URL for nightly builds.
........
r10272 | jorgeuriarte | 2006-08-30 23:20:41 +0200 (Wed, 30 Aug 2006) | 1 line
Fixes SCB1913, and moves 'Manage modules' to the 'Global data' menu, fixing in the way some permissions and titles.
........
r10273 | jorgeuriarte | 2006-08-31 00:37:32 +0200 (Thu, 31 Aug 2006) | 1 line
Fixes SCB1914. Public modules list will now only appear if there's any module other than Global availaible for the anonymous user.
........
r10274 | jorgeuriarte | 2006-08-31 16:13:13 +0200 (Thu, 31 Aug 2006) | 1 line
More fixes related to Menu structure. Depends on revisions 10272,10273.
........
r10276 | ronvoe122 | 2006-09-04 13:31:41 +0200 (Mon, 04 Sep 2006) | 1 line
Here I am.
........
r10286 | jorgeuriarte | 2006-09-08 22:36:13 +0200 (Fri, 08 Sep 2006) | 1 line
Added link to the Windows/NTLM authentication howto.
........
r10287 | jorgeuriarte | 2006-09-08 23:13:49 +0200 (Fri, 08 Sep 2006) | 1 line
Added info regarding cache-tuning.
........
Modified: branches/release/b21/project.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/project.xml?view=diff&rev=10303&p1=branches/release/b21/project.xml&p2=branches/release/b21/project.xml&r1=10302&r2=10303
==============================================================================
--- branches/release/b21/project.xml (original)
+++ branches/release/b21/project.xml 2006-09-19 15:48:43-0700
@@ -101,6 +101,11 @@
<email>[email protected]</email>
</developer>
<developer>
+ <name>Ronny Voelker</name>
+ <id>ronvoe122</id>
+ <email>[email protected]</email>
+ </developer>
+ <developer>
<name>Steve James</name>
<id>spjames</id>
<email>ste@cpan.org</email>
Modified: branches/release/b21/src/conf/classes/ScarabBundle_en.properties
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/conf/classes/ScarabBundle_en.properties?view=diff&rev=10303&p1=branches/release/b21/src/conf/classes/ScarabBundle_en.properties&p2=branches/release/b21/src/conf/classes/ScarabBundle_en.properties&r1=10302&r2=10303
==============================================================================
--- branches/release/b21/src/conf/classes/ScarabBundle_en.properties (original)
+++ branches/release/b21/src/conf/classes/ScarabBundle_en.properties 2006-09-19 15:48:43-0700
@@ -925,8 +925,10 @@
UpdateSearchIndexBody=Click the "Update search index" button below to re-create the Lucene search indexes in case they have been corrupted or lost. When you click the button below, the page will continue to refresh until the index is done updating. This can be a very resource intensive process, so please perform this action with caution and please do not stop this process until it is complete.
Approve=Approve
Modules=Modules
+CurrentModule=Current module
AdminManageIssueTypes=Manage issue types
ManageModules=Manage modules
+ChangeModule=Change module
XMLImport=XML import
XMLExport=XML export
Roles=Roles
Modified: branches/release/b21/src/conf/classes/ScarabBundle_es.properties
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/conf/classes/ScarabBundle_es.properties?view=diff&rev=10303&p1=branches/release/b21/src/conf/classes/ScarabBundle_es.properties&p2=branches/release/b21/src/conf/classes/ScarabBundle_es.properties&r1=10302&r2=10303
==============================================================================
--- branches/release/b21/src/conf/classes/ScarabBundle_es.properties (original)
+++ branches/release/b21/src/conf/classes/ScarabBundle_es.properties 2006-09-19 15:48:43-0700
@@ -84,8 +84,8 @@
admin/UserAttributeEdit.vm.Title = Editor de atributos de usuario
admin/UserAttributeSelect.vm.Title = Seleccionar atributo de usuario
admin/UpdateSearchIndex.vm.Title = Actualizar índice de búsqueda
-admin/AppConfigurationSettings.vm.Title = Actualizar configuración de la aplicación
-admin/GlobalEmailSettings.vm.Title = Actualizar configuración de Email
+admin/AppConfigurationSettings.vm.Title = Actualizar configuración de la aplicación
+admin/GlobalEmailSettings.vm.Title = Actualizar configuración de Email
admin/XMLImportIssuesResults.vm.Title = Resultados de la importación XML de peticiones
admin/XMLImportIssues.vm.Title = Importación XML de peticiones
admin/XMLExportIssues.vm.Title = Exportación XML de peticiones
@@ -899,8 +899,10 @@
UpdateSearchIndexBody = Pulsa en "Actualizar índice de búsqueda" para recrear los índices de búsqueda de Lucene, en caso de que se hayan corrompido o perdido. Cuando pulses, la página continuará refrescándose hasta que el índice se haya actualizado. Este proceso requiere muchos recursos, así que debe realizarse con precacución, y no debe denerse hasta que se complete.
Approve = Aprobaciones
Modules = Módulos
+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: branches/release/b21/src/webapp/WEB-INF/templates/navigations/Administration.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/navigations/Administration.vm?view=diff&rev=10303&p1=branches/release/b21/src/webapp/WEB-INF/templates/navigations/Administration.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/navigations/Administration.vm&r1=10302&r2=10303
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/navigations/Administration.vm (original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/navigations/Administration.vm 2006-09-19 15:48:43-0700
@@ -36,14 +36,16 @@
#if ($allowMAT || $allowMM || $link.isAllowed("admin,XMLExportIssues.vm"))
#if ($adminMenu.equals("3"))
- <div><strong>$l10n.Modules</strong>
+ <div><strong>$l10n.CurrentModule</strong>
$renderer.render("navigations", "ModuleAdmin.vm")
</div>
#else
#if ($allowMAT && ! $allowMM)
- <div>$link.setPage("admin,ManageArtifactTypes.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "3").setLabel("$l10n.Modules")</div>
+ <div>$link.setPage("admin,ManageArtifactTypes.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "3").setLabel("$l10n.CurrentModule")</div>
#else
- <div>$link.setPage("admin,ManageModules.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "3").setLabel("$l10n.Modules")</div>
+ #if (!$data.user.CurrentModule.isGlobalModule())
+ <div>$link.setPage("admin,ManageArtifactTypes.vm").setPathInfo($scarabG.Constant.CURRENT_ADMIN_MENU, "3").setLabel("$l10n.CurrentModule")</div>
+ #end
#end
#end
#end
Modified: branches/release/b21/src/webapp/WEB-INF/templates/navigations/GlobalAdmin.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/navigations/GlobalAdmin.vm?view=diff&rev=10303&p1=branches/release/b21/src/webapp/WEB-INF/templates/navigations/GlobalAdmin.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/navigations/GlobalAdmin.vm&r1=10302&r2=10303
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/navigations/GlobalAdmin.vm (original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/navigations/GlobalAdmin.vm 2006-09-19 15:48:43-0700
@@ -1,5 +1,6 @@
<div>$link.setPage("admin,GlobalArtifactTypeShow.vm").setLabel("$l10n.GlobalIssueTypes")</div>
<div>$link.setPage("admin,GlobalAttributeShow.vm").setLabel("$l10n.GlobalAttributes")</div>
+ <div>$link.setPage("admin,ManageModules.vm").setLabel("$l10n.ManageModules")</div>
<div>$link.setPage("admin,GlobalEmailSettings.vm").setLabel("$l10n.EmailConfiguration")</div>
<div>$link.setPage("admin,AppConfigurationSettings.vm").setLabel("$l10n.AppConfiguration")</div>
<div>$link.setPage("admin,UpdateSearchIndex.vm").setLabel("$l10n.UpdateSearchIndex")</div>
Modified: branches/release/b21/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm?view=diff&rev=10303&p1=branches/release/b21/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm&r1=10302&r2=10303
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm (original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/navigations/ModuleAdmin.vm 2006-09-19 15:48:43-0700
@@ -1,5 +1,5 @@
- <div>$link.setPage("admin,ManageModules.vm").setLabel("$l10n.ManageModules")</div>
<div>$link.setPage("admin,ManageArtifactTypes.vm").setLabel("$l10n.NavManageIssueTypes")</div>
<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: branches/release/b21/src/webapp/WEB-INF/templates/screens/SelectModule.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/screens/SelectModule.vm?view=diff&rev=10303&p1=branches/release/b21/src/webapp/WEB-INF/templates/screens/SelectModule.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/screens/SelectModule.vm&r1=10302&r2=10303
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/screens/SelectModule.vm (original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/screens/SelectModule.vm 2006-09-19 15:48:43-0700
@@ -1,4 +1,5 @@
#set ($currentModule = $scarabR.CurrentModule)
+#set ($user = $data.User)
<div id="selectmodule" class="app">
@@ -29,7 +30,7 @@
#end
<h3>$page.Title</h3>
-#set ($userModules = $data.User.Modules)
+#set ($userModules = $user.Modules)
#if ($userModules.size() > 0)
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<tr>
@@ -38,7 +39,7 @@
</tr>
#foreach ($module in $userModules)
- #if (!$module.isGlobalModule())
+ #if (!($module.isGlobalModule() && $userModules.size() > 1))
#indexedRows($velocityCount)
<td>
$modulelink.setPage("$module.ModuleId").setLabel($module.Name)
@@ -57,7 +58,6 @@
$l10n.format("YouCannotAccessModules", $link.setPage("Login.vm").addPathInfo($scarabG.Constant.NEXT_TEMPLATE, "SelectModule.vm"))
</em></p>
#end
-#set ($user = $data.User)
#if (!$user.hasLoggedIn())
<p class="infomark"><em>$l10n.ToAccessPage $link.setPage("Login.vm").setLabel("Login").</em></p>
#else
Modified: branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/AdminIndex.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/AdminIndex.vm?view=diff&rev=10303&p1=branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/AdminIndex.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/AdminIndex.vm&r1=10302&r2=10303
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/AdminIndex.vm (original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/AdminIndex.vm 2006-09-19 15:48:43-0700
@@ -15,6 +15,9 @@
#if ($link.isAllowed("admin,GlobalAttributeShow.vm"))
<li>$link.setPage("admin,GlobalAttributeShow.vm").setLabel("$l10n.GlobalAttributes")</li>
#end
+#if ($link.isAllowed("admin,ManageModules.vm"))
+ <li>$link.setPage("admin,ManageModules.vm").setLabel("$l10n.ManageModules")</li>
+#end
#if ($link.isAllowed("admin,GlobalEmailSettings.vm"))
<li>$link.setPage("admin,GlobalEmailSettings.vm").setLabel("$l10n.EmailConfiguration")</li>
#end
@@ -37,15 +40,12 @@
</ul>
#end
-#if ($link.isAllowed("admin,ManageArtifactTypes.vm") || $link.isAllowed("admin,ManageModules.vm") || $link.isAllowed("admin,XMLExportIssues.vm"))
-<h3>$l10n.Modules</h3>
+#if ( !$data.user.CurrentModule.isGlobalModule() && ($link.isAllowed("admin,ManageArtifactTypes.vm") || $link.isAllowed("admin,XMLExportIssues.vm")))
+<h3>$l10n.CurrentModule</h3>
<ul>
#if ($link.isAllowed("admin,ManageArtifactTypes.vm"))
<li>$link.setPage("admin,ManageArtifactTypes.vm").setLabel("$l10n.AdminManageIssueTypes")</li>
#end
-#if ($link.isAllowed("admin,ManageModules.vm"))
- <li>$link.setPage("admin,ManageModules.vm").setLabel("$l10n.ManageModules")</li>
-#end
#if ($link.isAllowed("admin,XMLImportIssues.vm"))
<li>$link.setPage("admin,XMLImportIssues.vm").setLabel("$l10n.XMLImport")</li>
#end
Modified: branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/GlobalArtifactTypeShow.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/GlobalArtifactTypeShow.vm?view=diff&rev=10303&p1=branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/GlobalArtifactTypeShow.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/GlobalArtifactTypeShow.vm&r1=10302&r2=10303
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/GlobalArtifactTypeShow.vm (original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/GlobalArtifactTypeShow.vm 2006-09-19 15:48:43-0700
@@ -34,7 +34,7 @@
#paginate ($resultsPerPage $pageNum $sortColumn $sortPolarity)
#end
-<h3>$l10n.IssueTypes</h3>
+<h3>$l10n.GlobalIssueTypes</h3>
#if ($nditempty)
<p>$l10n.ClickAddNewToAddGlobalIssueType</p>
Modified: branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/ManageArtifactTypes.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/ManageArtifactTypes.vm?view=diff&rev=10303&p1=branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/ManageArtifactTypes.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/ManageArtifactTypes.vm&r1=10302&r2=10303
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/ManageArtifactTypes.vm (original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/ManageArtifactTypes.vm 2006-09-19 15:48:43-0700
@@ -50,7 +50,7 @@
#paginate ($resultsPerPage $pageNum $sortColumn $sortPolarity)
#end
-<h3>$l10n.IssueTypes</h3>
+<h3>$l10n.format("ManageIssueTypes", $module.Name)</h3>
#if (!$rmits || $rmits.isEmpty())
<p><em>$l10n.NoIssueTypesInModule</em></p>
Modified: branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm?view=diff&rev=10303&p1=branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm&r1=10302&r2=10303
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm (original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm 2006-09-19 15:48:43-0700
@@ -1,7 +1,7 @@
#set ($userModules = $data.User.EditableModules)
<div id="managemodule" class="app">
-<h3>$l10n.Modules</h3>
+<h3>$l10n.ManageModules</h3>
#if ($userModules.size() > 0)
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<tr>
@@ -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" />
Modified: branches/release/b21/src/webapp/WEB-INF/templates/screens/home/EnterNew.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/screens/home/EnterNew.vm?view=diff&rev=10303&p1=branches/release/b21/src/webapp/WEB-INF/templates/screens/home/EnterNew.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/screens/home/EnterNew.vm&r1=10302&r2=10303
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/screens/home/EnterNew.vm (original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/screens/home/EnterNew.vm 2006-09-19 15:48:43-0700
@@ -3,7 +3,7 @@
#set ($currentModule = $scarabR.CurrentModule)
#set ($currentModuleIssueTypes = $currentModule.IssueTypes)
-#if ($currentModuleIssueTypes.isEmpty())
+#if ($currentModuleIssueTypes.isEmpty() || $currentModule.isGlobalModule() )
<p><em>$l10n.NoIssueTypesInModule</em></p>
#else
<h3>$l10n.IssueTypesInProject</h3>
Modified: branches/release/b21/xdocs/index.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/xdocs/index.xml?view=diff&rev=10303&p1=branches/release/b21/xdocs/index.xml&p2=branches/release/b21/xdocs/index.xml&r1=10302&r2=10303
==============================================================================
--- branches/release/b21/xdocs/index.xml (original)
+++ branches/release/b21/xdocs/index.xml 2006-09-19 15:48:43-0700
@@ -81,7 +81,7 @@
There are two types of downloads. There is the source download available from the Subversion <a href="http://scarab.tigris.org/source/browse/scarab">repository</a> and the stable releases from the <a href="http://scarab.tigris.org/servlets/ProjectDownloadList">Project Download List</a>.
</p>
<p>
- You can also download a nightly built from <a href="http://apache.org/~jon/scarab/nightly/">here</a>.
+ You can also download a nightly built of the trunk from <a href="http://www.solitone.org/~pscarab/scarab/nightly/">here</a>.
</p>
</section>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.