Scarab commit: svn commit: r10857 - trunk/src/webapp/WEB-INF/templates/screens/admin

Author: jhoech
Date: 2009-09-24 08:15:19-0700
New Revision: 10857

Modified:
   trunk/src/webapp/WEB-INF/templates/screens/admin/   (props changed)
   trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeOptionSelect.vm
   trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeSelect.vm
   trunk/src/webapp/WEB-INF/templates/screens/admin/UserAttributeSelect.vm

Log:
MRG - Merged current changes (only some whitespaces and comments this time) from 0.22 branch back into trunk. Branch was in revision 10856.


Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeOptionSelect.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeOptionSelect.vm?view=diff&pathrev=10857&r1=10856&r2=10857
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeOptionSelect.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeOptionSelect.vm	2009-09-24 08:15:19-0700
@@ -19,12 +19,13 @@
 
 <div class="functnbar">
 #if ($availOptions.size() > 0)
-<input type="submit" value="$l10n.Add" name="eventSubmit_doSelectattributeoption" />&#160;
+	<input type="submit" value="$l10n.Add" name="eventSubmit_doSelectattributeoption" />&#160;
 #end
 #if ($canEditDomain)
-##<input type="submit" value="$l10n.CreateNew" name="eventSubmit_doGotoothertemplate" />&#160;
+	##commented for workflow reasons (SCB2737)
+	##<input type="submit" value="$l10n.CreateNew" name="eventSubmit_doGotoothertemplate" />&#160;
 #end
-<input type="submit" value="$l10n.Cancel" name="eventSubmit_doCancel" />&#160;
+	<input type="submit" value="$l10n.Cancel" name="eventSubmit_doCancel" />&#160;
 </div>
 
 #if ($availOptions.size() == 0)
@@ -49,10 +50,11 @@
 
 <div class="functnbar2">
 #if ($availOptions.size() > 0)
-<input type="submit" value="$l10n.Add" name="eventSubmit_doSelectattributeoption" />&#160;
+	<input type="submit" value="$l10n.Add" name="eventSubmit_doSelectattributeoption" />&#160;
 #end
 #if ($canEditDomain)
-##<input type="submit" value="$l10n.CreateNew" name="eventSubmit_doGotoothertemplate" />&#160;
+	##commented for workflow reasons (SCB2737)
+	##<input type="submit" value="$l10n.CreateNew" name="eventSubmit_doGotoothertemplate" />&#160;
 #end
 <input type="submit" value="$l10n.Cancel" name="eventSubmit_doCancel" />&#160;
 </div>

Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeSelect.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeSelect.vm?view=diff&pathrev=10857&r1=10856&r2=10857
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeSelect.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/AttributeSelect.vm	2009-09-24 08:15:19-0700
@@ -17,6 +17,7 @@
    <input type="submit" value="$l10n.Add" name="eventSubmit_doSelectattribute" />
 #end
 #if ($canEditDomain)
+	 ##commented for workflow reasons (SCB2737)
     ##<input type="submit" value="$l10n.CreateNew" name="eventSubmit_doCreatenewglobalattribute"/>&#160;
 #end
 <input type="submit" value="$l10n.Cancel" name="eventSubmit_doCancel"/>

Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/UserAttributeSelect.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/UserAttributeSelect.vm?view=diff&pathrev=10857&r1=10856&r2=10857
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/UserAttributeSelect.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/UserAttributeSelect.vm	2009-09-24 08:15:19-0700
@@ -6,7 +6,8 @@
    <input type="submit" value="$l10n.AddSelectedToModule" name="eventSubmit_doSelectuserattribute" />
 #end
 #if ($canEditDomain)
-    ##<input type="submit" value="$l10n.CreateNew" name="eventSubmit_doCreatenewuserattribute"/>&#160;
+    ##commented for workflow reasons (SCB2737)
+	##<input type="submit" value="$l10n.CreateNew" name="eventSubmit_doCreatenewuserattribute"/>&#160;
 #end
 <input type="submit" value="$l10n.Cancel" name="eventSubmit_doCancel"/>
 </div>

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2399320