Author: jhoech
Date: 2010-04-08 06:41:06-0700
New Revision: 10978
Removed:
trunk/src/webapp/WEB-INF/templates/screens/admin/AdminIndex.vm
Modified:
trunk/ (props changed)
trunk/properties.xsl (props changed)
trunk/scarab_properties.xml
trunk/src/conf/classes/ScarabBundle_de.properties
trunk/src/conf/classes/ScarabBundle_en.properties
trunk/src/conf/classes/ScarabBundle_es.properties
trunk/src/conf/classes/ScarabBundle_fr.properties
trunk/src/conf/classes/ScarabBundle_it.properties
trunk/src/conf/classes/ScarabBundle_ja.properties
trunk/src/conf/classes/ScarabBundle_ko.properties
trunk/src/conf/classes/ScarabBundle_nl.properties
trunk/src/conf/classes/ScarabBundle_pl.properties
trunk/src/conf/classes/ScarabBundle_pt_BR.properties
trunk/src/conf/classes/ScarabBundle_ru.properties
trunk/src/conf/classes/ScarabBundle_zh_CN.properties
trunk/src/conf/classes/ScarabBundle_zh_TW.properties
trunk/src/conf/conf/TurbineResources.properties
trunk/src/java/org/tigris/scarab/actions/admin/ManageRoles.java
trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
trunk/src/sql/scarab-default-data.sql
trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm
trunk/src/webapp/WEB-INF/templates/navigations/GlobalAdmin.vm
trunk/src/webapp/WEB-INF/templates/screens/admin/SetInfoMessage.vm
trunk/src/webapp/scripts/CalendarPopup.js
trunk/xdocs/changes.xml
Log:
MRG - Merged revision from b22-release branch starting from last revision of merge: -10977
Modified: trunk/scarab_properties.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/scarab_properties.xml?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/scarab_properties.xml (original)
+++ trunk/scarab_properties.xml 2010-04-08 06:41:06-0700
@@ -385,7 +385,7 @@
<default>Administrator</default>
<comment>
Username of the initial (only?) Scarab administrator. Maybe this,
- along with the other adminstrator user properties, should be build
+ along with the other administrator user properties, should be build
properties which modify the seed data. Otherwise use hard-coded
values.
</comment>
Modified: trunk/src/conf/classes/ScarabBundle_de.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_de.properties?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_de.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_de.properties 2010-04-08 06:41:06-0700
@@ -37,7 +37,6 @@
admin/AddPermission.vm.Title=Rechte-Verwaltung
admin/AddRole.vm.Title=Rollen-Verwaltung
admin/AddUser.vm.Title=Benutzer-Verwaltung
-admin/AdminIndex.vm.Title=Verwaltung
admin/Approval.vm.Title=Prüfen eingereichter Tickets
admin/ArtifactTypeEdit.vm.Title=Ticket-Typ ändern
admin/ArtifactTypeSelect.vm.Title=Ticket-Typ auswählen
@@ -1001,8 +1000,8 @@
LockedAttributes=Sie können die folgenden gesperrten Attribute nicht sichern: {0}
LockedAttribute=Sie können Ihre Änderungen nicht speichern solange das Attribut {0} gesperrt ist
CannotDeleteIssueType=Ticket-Typ konnte nicht gelöscht werden.
-SetInfoMessage=Informationsnachricht defaultmäßig setzen
-SetInfoMessagePrompt=Geben Sie Text ein, der als defaultmäßige Informationsnachricht angezeigt werden soll. Die Nachricht kann entfernt werden, indem bestätigt wird, wenn kein Text im Feld steht.
+SetInfoMessage=Informationsnachricht setzen
+SetInfoMessagePrompt=Geben Sie eine Nachricht ein, der im Kopfbereich aller Ansichten angezeigt wird, speichern eines leeren Textes deaktiviert diese Meldung. Diese Einstellung wird bei einem Neustart der Anwendung gelöscht!
NewAttributeGroup=Neue Attributgruppe
NoAttributesSelected=Keine Attribute zum Löschen ausgewählt.
PermissionExists=Eine Zulassung mit diesem Namen existiert bereits: {0}
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&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_en.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_en.properties 2010-04-08 06:41:06-0700
@@ -52,7 +52,6 @@
admin/AddPermission.vm.Title=Permission administration
admin/AddRole.vm.Title=Role administration
admin/AddUser.vm.Title=User administration
-admin/AdminIndex.vm.Title=Administration
admin/Approval.vm.Title=Approve/reject user submitted items
admin/ArtifactTypeEdit.vm.Title=Edit issue type
admin/ArtifactTypeSelect.vm.Title=Select issue type
@@ -1059,8 +1058,8 @@
LockedAttributes=You cannot save the following locked attributes: {0}
LockedAttribute=You cannot save your changes as the attribute {0} is locked.
CannotDeleteIssueType=Was not able to delete the issue type.
-SetInfoMessage=Set default informational message
-SetInfoMessagePrompt=Enter text to be displayed as a default informational message. The message can be removed by submitting with no text entered.
+SetInfoMessage=Set informational message
+SetInfoMessagePrompt=Enter message to be displayed in the header of every screen, saving an empty text deactivates this message. This setting is deleted if the application is restarted!
NewAttributeGroup=New attribute group
NoAttributesSelected=No attributes were selected for deletion.
PermissionExists=A permission already exists with that name: {0}
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&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_es.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_es.properties 2010-04-08 06:41:06-0700
@@ -50,7 +50,6 @@
admin/AddPermission.vm.Title = Administración de permisos
admin/AddRole.vm.Title = Administración de roles
admin/AddUser.vm.Title = Administración de usuarios
-admin/AdminIndex.vm.Title = Administración
admin/Approval.vm.Title = Aprobar/rechazar envíos de usuario
admin/ArtifactTypeEdit.vm.Title = Editar tipo de petición
admin/ArtifactTypeSelect.vm.Title = Seleccionar tipo de petición
Modified: trunk/src/conf/classes/ScarabBundle_fr.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_fr.properties?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_fr.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_fr.properties 2010-04-08 06:41:06-0700
@@ -50,7 +50,6 @@
admin/AddPermission.vm.Title = Administration des droits
admin/AddRole.vm.Title = Administration des rôles
admin/AddUser.vm.Title = Administration des utilisateurs
-admin/AdminIndex.vm.Title = Administration
admin/Approval.vm.Title = Approuver/rejeter les items soumis
admin/ArtifactTypeEdit.vm.Title = Éditer le type de fiche
admin/ArtifactTypeSelect.vm.Title = Choisir le type de fiche
@@ -80,7 +79,7 @@
admin/ModifyModule.vm.Title = Éditeur de module
admin/ModuleAttributeEdit.vm.Title = Éditeur d'attributs de module
admin/ConditionEdit.vm.Title = Éditeur de conditions
-admin/SetInfoMessage.vm.Title = Message d'information par défaut
+admin/SetInfoMessage.vm.Title = Message d'information
admin/UserAttributeEdit.vm.Title = Editeur d'attributs utilisateur
admin/UserAttributeSelect.vm.Title = Choisir un attribut utilisateur
admin/UpdateSearchIndex.vm.Title = Mise à jour de l'index de recherche
Modified: trunk/src/conf/classes/ScarabBundle_it.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_it.properties?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_it.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_it.properties 2010-04-08 06:41:06-0700
@@ -51,7 +51,6 @@
admin/AddPermission.vm.Title=Amministrazione permessi
admin/AddRole.vm.Title=Amministrazione ruoli
admin/AddUser.vm.Title=Amministrazione utenti
-admin/AdminIndex.vm.Title=Amministrazione
admin/Approval.vm.Title=Approva/Rifiuta segnalazioni utente
admin/ArtifactTypeEdit.vm.Title=Modifica tipi segnalazione
admin/ArtifactTypeSelect.vm.Title=Seleziona tipi segnalazione
Modified: trunk/src/conf/classes/ScarabBundle_ja.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_ja.properties?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_ja.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_ja.properties 2010-04-08 06:41:06-0700
@@ -30,7 +30,6 @@
admin/AddPermission.vm.Title=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u306e\u7ba1\u7406
admin/AddRole.vm.Title=\u30ed\u30fc\u30eb\u306e\u7ba1\u7406
admin/AddUser.vm.Title=\u30e6\u30fc\u30b6\u306e\u7ba1\u7406
-admin/AdminIndex.vm.Title=\u7ba1\u7406
admin/Approval.vm.Title=\u30e6\u30fc\u30b6\u7533\u8acb\u306e\u8a8d\u53ef/\u62d2\u5426
admin/ArtifactTypeEdit.vm.Title=\u6848\u4ef6\u7a2e\u5225\u306e\u7de8\u96c6
admin/ArtifactTypeSelect.vm.Title=\u6848\u4ef6\u7a2e\u5225\u306e\u9078\u629e
Modified: trunk/src/conf/classes/ScarabBundle_ko.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_ko.properties?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_ko.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_ko.properties 2010-04-08 06:41:06-0700
@@ -43,7 +43,6 @@
admin/AddPermission.vm.Title = \uad8c\ud55c \uad00\ub9ac
admin/AddRole.vm.Title = \uc5ed\ud65c \uad00\ub9ac
admin/AddUser.vm.Title = \uc0ac\uc6a9\uc790 \uad00\ub9ac
-admin/AdminIndex.vm.Title = \uad00\ub9ac
admin/Approval.vm.Title = \uc0ac\uc6a9\uc790 \uc694\uccad \ud56d\ubaa9 \uc2b9\uc778/\uac70\ubd80
admin/ArtifactTypeEdit.vm.Title = \uc774\uc288 \ud0c0\uc785 \uc218\uc815
admin/ArtifactTypeSelect.vm.Title = \uc774\uc288 \ud0c0\uc785 \uc120\ud0dd
Modified: trunk/src/conf/classes/ScarabBundle_nl.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_nl.properties?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_nl.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_nl.properties 2010-04-08 06:41:06-0700
@@ -29,7 +29,6 @@
admin/AddPermission.vm.Title = Rechten administratie
admin/AddRole.vm.Title = Rollen administratie
admin/AddUser.vm.Title = Gebruiker administratie
-admin/AdminIndex.vm.Title = Administratie
admin/Approval.vm.Title = Goedkeuren/afkeuren gebruiker gevraagde items
admin/ArtifactTypeEdit.vm.Title = Wijzig kaartsoort
admin/ArtifactTypeSelect.vm.Title = Selecteer kaartsoort
Modified: trunk/src/conf/classes/ScarabBundle_pl.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_pl.properties?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_pl.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_pl.properties 2010-04-08 06:41:06-0700
@@ -58,7 +58,6 @@
admin/AddPermission.vm.Title=Administrowanie uprawnieniami
admin/AddRole.vm.Title=Administrowanie rolami
admin/AddUser.vm.Title=Administrowanie u\u017cytkownikami
-admin/AdminIndex.vm.Title=Administracja
admin/Approval.vm.Title=Zatwierd\u017a/odrzu\u0107 pro\u015bby wys\u0142ane przez u\u017cytkownika
admin/ArtifactTypeEdit.vm.Title=Edycja typu zagadnienia
admin/ArtifactTypeSelect.vm.Title=Wybierz typ zagadnienia
Modified: trunk/src/conf/classes/ScarabBundle_pt_BR.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_pt_BR.properties?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_pt_BR.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_pt_BR.properties 2010-04-08 06:41:06-0700
@@ -29,7 +29,6 @@
admin/AddPermission.vm.Title=Administração de Permissões
admin/AddRole.vm.Title=Administração de Cargos
admin/AddUser.vm.Title=Administração de Usuários
-admin/AdminIndex.vm.Title=Administração de
admin/Approval.vm.Title=Aprovar/rejeitar ítens enviados por usuário
admin/ArtifactTypeEdit.vm.Title=Editar tipo de item
admin/ArtifactTypeSelect.vm.Title=Selecionar tipo de item
Modified: trunk/src/conf/classes/ScarabBundle_ru.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_ru.properties?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_ru.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_ru.properties 2010-04-08 06:41:06-0700
@@ -3670,8 +3670,6 @@
admin/AddUser.vm.Title = \u0410\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F
-admin/AdminIndex.vm.Title = \u0410\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435
-
admin/Approval.vm.Title = \u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044C/\u043E\u0442\u043A\u043B\u043E\u043D\u0438\u0442\u044C \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u044B, \u043F\u0440\u0435\u0434\u043B\u043E\u0436\u0435\u043D\u043D\u044B\u0435 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C
admin/ArtifactTypeEdit.vm.Title = \u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u0438\u043F \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u044B
Modified: trunk/src/conf/classes/ScarabBundle_zh_CN.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_zh_CN.properties?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_zh_CN.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_zh_CN.properties 2010-04-08 06:41:06-0700
@@ -30,7 +30,6 @@
admin/AddPermission.vm.Title = \u6743\u9650\u7ba1\u7406
admin/AddRole.vm.Title = \u89d2\u8272\u7ba1\u7406
admin/AddUser.vm.Title = \u7528\u6237\u7ba1\u7406
-admin/AdminIndex.vm.Title = \u7ba1\u7406
admin/Approval.vm.Title = \u6838\u5b9e/\u9a73\u56de\u7528\u6237\u53d1\u9001\u8bb0\u5f55
admin/ArtifactTypeEdit.vm.Title = \u7f16\u8f91\u6848\u4ef6\u5206\u7c7b
admin/ArtifactTypeSelect.vm.Title = \u9009\u62e9\u6848\u4ef6\u5206\u7c7b
Modified: trunk/src/conf/classes/ScarabBundle_zh_TW.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_zh_TW.properties?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_zh_TW.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_zh_TW.properties 2010-04-08 06:41:06-0700
@@ -43,7 +43,6 @@
admin/AddPermission.vm.Title=\u6b0a\u9650\u7ba1\u7406
admin/AddRole.vm.Title=\u89d2\u8272\u7ba1\u7406
admin/AddUser.vm.Title=\u4f7f\u7528\u4eba\u54e1\u7ba1\u7406
-admin/AdminIndex.vm.Title=\u7cfb\u7d71\u7ba1\u7406
admin/Approval.vm.Title=\u6838\u53ef/\u99c1\u56de\u4f7f\u7528\u8005\u63d0\u4ea4\u9805\u76ee
admin/ArtifactTypeEdit.vm.Title=\u7de8\u8f2f\u8b70\u984c\u7a2e\u985e
admin/ArtifactTypeSelect.vm.Title=\u9078\u64c7\u8b70\u984c\u7a2e\u985e
Modified: trunk/src/conf/conf/TurbineResources.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/TurbineResources.properties?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/conf/conf/TurbineResources.properties (original)
+++ trunk/src/conf/conf/TurbineResources.properties 2010-04-08 06:41:06-0700
@@ -755,6 +755,7 @@
services.ScarabSecurity.screen.admin.ManageUserSearch.vm=Domain__Admin
services.ScarabSecurity.screen.admin.ManagePermissions.vm=Domain__Admin
services.ScarabSecurity.screen.admin.ManageRoles.vm=Domain__Admin
+services.ScarabSecurity.screen.admin.SetInfoMessage.vm=Domain__Edit
# Action permissions
Modified: trunk/src/java/org/tigris/scarab/actions/admin/ManageRoles.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/admin/ManageRoles.java?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/admin/ManageRoles.java (original)
+++ trunk/src/java/org/tigris/scarab/actions/admin/ManageRoles.java 2010-04-08 06:41:06-0700
@@ -231,16 +231,6 @@
.getString(ScarabConstants.NEXT_TEMPLATE, "admin,ManageRoles.vm"));
}
-
- /**
- This manages clicking the Cancel button
- */
- public void doCancel(RunData data, TemplateContext context) throws Exception
- {
- setTarget(data, data.getParameters()
- .getString(ScarabConstants.CANCEL_TEMPLATE, "admin,AdminIndex.vm"));
- }
-
/**
calls doCancel()
*/
Modified: trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java (original)
+++ trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java 2010-04-08 06:41:06-0700
@@ -3058,7 +3058,7 @@
public void setInfoMessage(Localizable localizable)
{
ScarabLocalizationTool l10n = getLocalizationTool();
- this.infoMessage = new SimpleSkipFiltering(localizable.getMessage(l10n));
+ this.infoMessage = localizable == null ? null : new SimpleSkipFiltering(localizable.getMessage(l10n));
}
/**
Modified: trunk/src/sql/scarab-default-data.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/scarab-default-data.sql?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/sql/scarab-default-data.sql (original)
+++ trunk/src/sql/scarab-default-data.sql 2010-04-08 06:41:06-0700
@@ -395,7 +395,6 @@
insert into SCARAB_R_OPTION_OPTION values (82,40,1,20,20);
insert into SCARAB_R_OPTION_OPTION values (82,41,1,21,21);
insert into SCARAB_R_OPTION_OPTION values (82,42,1,22,22);
-insert into SCARAB_R_OPTION_OPTION values (82,77,1,23,23);
insert into SCARAB_R_OPTION_OPTION values (83,39,1,30,30);
insert into SCARAB_R_OPTION_OPTION values (83,43,1,31,31);
insert into SCARAB_R_OPTION_OPTION values (83,44,1,32,32);
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&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/navigations/Administration.vm 2010-04-08 06:41:06-0700
@@ -19,7 +19,7 @@
<div class="scarab-toolgroup">
<div class="label">
- <strong>$link.setPage("admin,AdminIndex.vm").setLabel("$l10n.Admin")</strong></div>
+ <strong>$l10n.Admin</strong></div>
<div class="body">
#if ($allowGATS || $allowGAS || $allowUSI)
Modified: trunk/src/webapp/WEB-INF/templates/navigations/GlobalAdmin.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/navigations/GlobalAdmin.vm?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/navigations/GlobalAdmin.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/navigations/GlobalAdmin.vm 2010-04-08 06:41:06-0700
@@ -2,5 +2,6 @@
<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,AppConfigurationSettings.vm").setLabel("$l10n.AppConfiguration")</div>
<div>$link.setPage("admin,UpdateSearchIndex.vm").setLabel("$l10n.UpdateSearchIndex")</div>
+ <div>$link.setPage("admin,SetInfoMessage.vm").setLabel("$l10n.SetInfoMessage")</div>
Removed: trunk/src/webapp/WEB-INF/templates/screens/admin/AdminIndex.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/AdminIndex.vm?view=markup&pathrev=10977
Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/SetInfoMessage.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/SetInfoMessage.vm?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/SetInfoMessage.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/SetInfoMessage.vm 2010-04-08 06:41:06-0700
@@ -1,11 +1,17 @@
<div class="app" id="setinfomessage">
+<h3>$l10n.SetInfoMessage</h3>
+<div class="colbar">
+ $l10n.SetInfoMessagePrompt
+</div>
+<table>
<form action="$link.setPage("admin,SetInfoMessage.vm")" method="post">
-<input type="hidden" name="action" value="admin.SetInfoMessage" />
-
-<div>$l10n.SetInfoMessagePrompt</div>
-<div><input type="text" name="msg" value="" size="80" /></div>
-<div><input type="submit" name="foo" value="Set message" /></div>
+ <tr>
+ <td><input type="hidden" name="action" value="admin.SetInfoMessage" /><input type="text" name="msg" value="" size="80" /></td>
+ </tr>
+ <tr>
+ <td><input type="submit" name="foo" value="$l10n.Done" /></td>
+ </tr>
</form>
-</div>
+</table>
Modified: trunk/src/webapp/scripts/CalendarPopup.js
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/scripts/CalendarPopup.js?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/src/webapp/scripts/CalendarPopup.js (original)
+++ trunk/src/webapp/scripts/CalendarPopup.js 2010-04-08 06:41:06-0700
@@ -994,6 +994,9 @@
*/
+// Quick fix for FF3
+function CP_stop(e) { if (e && e.stopPropagation) { e.stopPropagation(); } }
+
// CONSTRUCTOR for the CalendarPopup Object
function CalendarPopup() {
var c;
@@ -1320,7 +1323,7 @@
var refresh = windowref+'CP_refreshCalendar';
var refreshLink = 'javascript:' + refresh;
if (this.isShowNavigationDropdowns) {
- result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="78" COLSPAN="3"><select CLASS="'+this.cssPrefix+'cpMonthNavigation" name="cpMonth" onChange="'+refresh+'('+this.index+',this.options[this.selectedIndex].value-0,'+(year-0)+');">';
+ result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="78" COLSPAN="3"><select CLASS="'+this.cssPrefix+'cpMonthNavigation" name="cpMonth" onmouseup="CP_stop(event)" onChange="'+refresh+'('+this.index+',this.options[this.selectedIndex].value-0,'+(year-0)+');">';
for( var monthCounter=1; monthCounter<=12; monthCounter++ ) {
var selected = (monthCounter==month) ? 'SELECTED' : '';
result += '<option value="'+monthCounter+'" '+selected+'>'+this.monthNames[monthCounter-1]+'</option>';
@@ -1328,7 +1331,7 @@
result += '</select></TD>';
result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10"> </TD>';
- result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="56" COLSPAN="3"><select CLASS="'+this.cssPrefix+'cpYearNavigation" name="cpYear" onChange="'+refresh+'('+this.index+','+month+',this.options[this.selectedIndex].value-0);">';
+ result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="56" COLSPAN="3"><select CLASS="'+this.cssPrefix+'cpYearNavigation" name="cpYear" onmouseup="CP_stop(event)" onChange="'+refresh+'('+this.index+','+month+',this.options[this.selectedIndex].value-0);">';
for( var yearCounter=year-this.yearSelectStartOffset; yearCounter<=year+this.yearSelectStartOffset; yearCounter++ ) {
var selected = (yearCounter==year) ? 'SELECTED' : '';
result += '<option value="'+yearCounter+'" '+selected+'>'+yearCounter+'</option>';
Modified: trunk/xdocs/changes.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/changes.xml?view=diff&pathrev=10978&r1=10977&r2=10978
==============================================================================
--- trunk/xdocs/changes.xml (original)
+++ trunk/xdocs/changes.xml 2010-04-08 06:41:06-0700
@@ -44,7 +44,7 @@
Handler to create new tickets and to handle attribute options via xml-rpc interface.
</action>
</release>
- <release version="b21" date="in-development">
+ <release version="b21" date="9-FEB-2007 (guessed from release files datestamp)">
<action dev="pledbrook" type="fix" due-to="Ronny Voelker" fix="SCB1736">
Sorting on the "Created By" and "Modified By" attributes now works
without any problems.
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2522132
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.