Scarab commit: svn commit: r11015 - trunk/src/webapp: WEB-INF/templates/macros WEB-INF/templates/viewIssue skins

Author: dabbous
Date: 2010-05-05 05:48:12-0700
New Revision: 11015

Modified:
   trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
   trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm
   trunk/src/webapp/skins/classic.css

Log:
layout fix on attribute page (field label width was wrong)

Modified: trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm?view=diff&pathrev=11015&r1=11014&r2=11015
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm	2010-05-05 05:48:12-0700
@@ -92,7 +92,7 @@
       #if ($canMakeTransition.trim()=="true")
         #if ($templateInfo || (!$required && $newValues && $newValues.toString() == ''))
           <input id="$cssId" type="hidden" name="$attrInput.get($optionFieldName).Key" value="$newValues"/>
-          #if ($newValues > 0)
+          #if ($newValues && $newValues > 0)
             #set ($checked = "checked")
           #end
           #set ($oc = "javascript:this.form.${attrInput.get($optionFieldName).Key}.value=(this.checked)?$option.OptionId:''")
@@ -264,7 +264,7 @@
             name="$fieldName" 
             value="$fieldValue"
             #if($size > 0) size="$size" #else class="fullWidth" #end /> 
-            #if ( !$fieldValue.toString().equals($hint) ) <span class="hint">$hint</span> #end
+            #if ( $hint.length() > 0 && !$fieldValue.toString().equals($hint) ) <span class="hint">$hint</span> #end
             
         #end
 #end

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&pathrev=11015&r1=11014&r2=11015
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	2010-05-05 05:48:12-0700
@@ -105,7 +105,7 @@
         <tr>
           <th style="text-align:right;"> 
             <span style="white-space:nowrap;display:inline;margin-left:0px; margin-right:0px;">#drawRequiredMarkupAsNeeded($user $currentIssue $att)$displayValue</span>
-            #if($fieldExtraHeader)
+            #if($fieldExtraHeader && $fieldExtraHeader.size()>0)
               <pre>$fieldExtraHeader</pre>
             #end
           </th>
@@ -152,7 +152,7 @@
           <tr>
             <th style="text-align:right;"> 
               <span style="white-space:nowrap;display:inline;margin-left:0px; margin-right:0px;">$displayValue</span>
-              #if($fieldExtraHeader)
+              #if($fieldExtraHeader && $fieldExtraHeader.size()>0)
                 <pre>$fieldExtraHeader</pre>
               #end
             </th>

Modified: trunk/src/webapp/skins/classic.css
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/classic.css?view=diff&pathrev=11015&r1=11014&r2=11015
==============================================================================
--- trunk/src/webapp/skins/classic.css	(original)
+++ trunk/src/webapp/skins/classic.css	2010-05-05 05:48:12-0700
@@ -91,7 +91,7 @@
 
 #scb_banner table {
     border-style:none;
-    margin:8px 0px;
+    margin:8px;
     padding:0px;
     width:100%;
 }
@@ -1083,11 +1083,11 @@
 }
 
 input.fullWidth {
-	width: 100%;
+	width: 99%;
 }
 
 textarea.fullWidth {
-	width: 100%;
+	width: 99%;
 }
 
 .cpYearNavigation,.cpMonthNavigation {
@@ -1308,7 +1308,7 @@
 	border-bottom-style: none;
 	margin-left: 2px;
 	margin-right: 2px;
-  _width:640px; // for ie6 only (long-line wrapping broken)
+  _width:1000px; // for ie6 only (long-line wrapping broken)
 }
 
 .scarab-canvas div h4 {

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