Scarab commit: svn commit: r10831 - trunk/src: conf/classes webapp/WEB-INF/templates/viewIssue

Author: dabbous
Date: 2009-07-24 01:08:33-0700
New Revision: 10831

Modified:
   trunk/src/conf/classes/ScarabBundle_de.properties
   trunk/src/conf/classes/ScarabBundle_en.properties
   trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm

Log:
cosmethic:

- Shortened an alert message:

old: This attribute is required to complete the information.
new: Required attribute must be set!

- moved alert messages from above the wrong field to below the field.

added a hook for javascript-support. Now each field contains an empty span
with a unique id:

<span id="${attributeName}:Hint" ></span>

This span has no impact on the GUI and currently it is just used from
extension methods (javascript add ons). As it is not functional by any means
i count it as cosmethic add on and added it here. (may be wrong)

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&pathrev831&r1830&r2831
=============================================================================--- trunk/src/conf/classes/ScarabBundle_de.properties	(original)
+++ trunk/src/conf/classes/ScarabBundle_de.properties	2009-07-24 01:08:33-0700
@@ -2211,7 +2211,7 @@
 ConditionOnGlobalAttribute="{0}" globale Attribute
 ConditionOnModuleAttribute="{0}" Attribute in Modul "{1}"
 ConditionOnTransition=Transition in "{0}" attribute
-ConditionallyRequiredAttribute=Dieses Attribut muß angegeben werden, um die Information vollständig zu haben.
+ConditionallyRequiredAttribute=Pflichtfeld darf nicht leer sein!
 ConditionsCurrentValue=Aktueller Wert
 ConditionsExplanation1=Diese Bedingung wird genau dann erfüllt (wahr), wenn mindestens eines der unten ausgewählten Attribut-Werte Paare in einem Ticket existiert. Sie können hier für jedes Attribut mehrere Attributwerte auswählen (mit der SHIFT- oder ALT-Taste!).
 ConditionsExplanation2=Sie können die logische Kombination von Attributen auch mit "und" verknüpfen. Dann muß in einem Ticket aus jedem Attribut jeweils eine der hier gewählten Optionen aktiviert sein, damit die Bedingung insgesamt erfüllt ist.

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&pathrev831&r1830&r2831
=============================================================================--- trunk/src/conf/classes/ScarabBundle_en.properties	(original)
+++ trunk/src/conf/classes/ScarabBundle_en.properties	2009-07-24 01:08:33-0700
@@ -2271,7 +2271,7 @@
 AppConfiguration                     = Application configuration
 AppConfigurationChangesSaved         = Your changes were saved, don't forget to restart Scarab.
 AppConfigurationBody                 = Edit the various application settings.  The changes will be saved in CustomSettings.properties.  Be careful that boolean values are properly entered as "true" or "false".  Most settings will require restarting Scarab.
-ConditionallyRequiredAttribute       = This attribute is required to complete the information.
+ConditionallyRequiredAttribute       = Required attribute must be set!
 ConditionallyRequiredUserAttribute   = User attribute \"{0}\" must be set first to permit state \"{1}\"
 RequiredIf=Conditionally required
 RequiredIfExplanation=Whenever a given condition is true, this attribute will be required to be filled even if it's not marked as Required.

Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm?view=diff&pathrev831&r1830&r2831
=============================================================================--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	2009-07-24 01:08:33-0700
@@ -117,12 +117,13 @@
           #attrValueLeafSelect ($attVal $field "" false $attVal.isRequired())
           #attrValueErrorMsg ($attVal $field)
         #elseif ($att.isIntegerAttribute())
-          #attrValueErrorMsg($attVal "NumericValue")
           #attrValueText($attVal $attrInput.NumericValue $fieldSize $fieldHint)
+          #attrValueErrorMsg($attVal "NumericValue")
         #else
-          #attrValueErrorMsg($attVal "Value")
           #attrValueText($attVal $attrInput.Value $fieldSize $fieldHint)
-        #end
+          #attrValueErrorMsg($attVal "Value")
+        #end
+        <span id="${displayValue}:Hint" ></span>
       </span>
       #if ($onSameLine)
         </span>
@@ -184,6 +185,7 @@
             ## Just output the raw value directly.
             $!attrInput.Value
           #end
+          <span id="${displayValue}:Hint" ></span>
         </span>
         #if ($onSameLine)
           </span>
@@ -198,7 +200,7 @@
     #set ($isOptionAttr = $attVal.Attribute.isOptionAttribute())
     #if ($attVal.isSet() && (!$attrInput.Value.toString().trim().equals("") || !$attrInput.NumericValue))
       <tr>
-    	  <th>[I] $rma.DisplayValue</th>
+    	  <th>[I] $displayValue</th>
         <td colspan="$colspan">
           #if ($isOptionAttr)
 			            #if ($module.getRModuleOption($attVal.AttributeOption, $issueType).Active)
@@ -211,6 +213,7 @@
           #else
             $!attrInput.Value
           #end
+          <span id="${displayValue}:Hint" ></span>
         </td>
       </tr>
 	    #end

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