r7513 - in dumbhippo/trunk/server/web: css-gnome tags/2 tags/3

[commits mugshot org]

Author: marinaz
Date: 2008-09-24 18:24:58 -0500 (Wed, 24 Sep 2008)
New Revision: 7513

Modified:
   dumbhippo/trunk/server/web/css-gnome/account.css
   dumbhippo/trunk/server/web/tags/2/formTableRow.tag
   dumbhippo/trunk/server/web/tags/3/accountEditTableExternals.tag
Log:
Don't try to display an icon if it is empty. Indent the label so that it lines up with other labels that have icons.

Modified: dumbhippo/trunk/server/web/css-gnome/account.css
===================================================================
--- dumbhippo/trunk/server/web/css-gnome/account.css	2008-09-24 21:57:12 UTC (rev 7512)
+++ dumbhippo/trunk/server/web/css-gnome/account.css	2008-09-24 23:24:58 UTC (rev 7513)
@@ -24,13 +24,13 @@
 
 #dhAccounts .dh-label-cell {
 	text-align:     left;
-	width:          120px; /* if you change this, you also have to change the -with-prefix one below */
+	width:          210px; /* if you change this, you also have to change the -with-prefix one below */
 }
 
 #dhAccounts .dh-label-cell .dh-label-cell-div-with-prefix {
     position:       relative;
     margin-left:    -40px;
-    width:          160px; /* if you change this, you also have to change the one above */
+    width:          250px; /* if you change this, you also have to change the one above */
 }
 
 #dhAccounts .dh-control-cell-next-to-info {
@@ -42,6 +42,10 @@
     vertical-align:  middle;
 }
 
+#dhAccounts .dh-no-icon-label {
+    margin-left:     26px;
+}
+
 .dh-account-preferences-row label {
     position: relative;
     bottom:   -1px;

Modified: dumbhippo/trunk/server/web/tags/2/formTableRow.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/2/formTableRow.tag	2008-09-24 21:57:12 UTC (rev 7512)
+++ dumbhippo/trunk/server/web/tags/2/formTableRow.tag	2008-09-24 23:24:58 UTC (rev 7513)
@@ -30,8 +30,9 @@
 	    <td class="dh-label-cell">
 		    <div class="dh-label-cell-div ${withPrefixClass}" id="${controlId}FormLabel">
                 <c:if test="${!empty prefixIcon}"><dh:png klass="dh-form-table-row-icon" src="${prefixIcon}" style="width: ${prefixIconWidth}; height: ${prefixIconHeight}; border: none; overflow: hidden;"/></c:if>
-			    <c:if test="${!empty icon}"><dh:png klass="dh-form-table-row-icon" src="${icon}" style="width: 16; height: 16; border: none; overflow: hidden;"/></c:if>
-		        <c:out value="${label}"/>:
+                <c:set var="noIconClass" value="dh-no-icon-label"/>
+			    <c:if test="${!empty icon}"><dh:png klass="dh-form-table-row-icon" src="${icon}" style="width: 16; height: 16; border: none; overflow: hidden;"/><c:set var="noIconClass" value=""/></c:if>
+		        <span class="${noIconClass}"><c:out value="${label}"/>:</span>
 	        </div>
 	    </td>
 	</c:when>

Modified: dumbhippo/trunk/server/web/tags/3/accountEditTableExternals.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/3/accountEditTableExternals.tag	2008-09-24 21:57:12 UTC (rev 7512)
+++ dumbhippo/trunk/server/web/tags/3/accountEditTableExternals.tag	2008-09-24 23:24:58 UTC (rev 7513)
@@ -135,9 +135,13 @@
 	            <c:if test="${supportedAccount.newType}">
 	                <c:set var="label" value="${supportedAccount.siteName}"/>  
 	            </c:if>
+	            <c:set var="icon" value=""/>
+	            <c:if test="${!empty supportedAccount.iconName}">
+	                <c:set var="icon" value="/images3/${buildStamp}/${supportedAccount.iconName}"/>
+	            </c:if>    
 	            <dht2:formTableRow controlId="dh${supportedAccount.domNodeIdName}"
 		                           label="${label}"				
-			                       icon="/images3/${buildStamp}/${supportedAccount.iconName}">
+			                       icon="${icon}">
                     <gnome:loveEntry name="${supportedAccount.siteName}"
 			  	   	  	             userInfoType="${supportedAccount.userInfoType}"
 							         link="${supportedAccount.onlineAccountType.site}"