r7086 - in dumbhippo/trunk/server/src/com/dumbhippo: server/impl web/servlets

[commits mugshot org]

Author: marinaz
Date: 2007-12-18 19:18:13 -0600 (Tue, 18 Dec 2007)
New Revision: 7086

Modified:
   dumbhippo/trunk/server/src/com/dumbhippo/server/impl/FacebookTrackerBean.java
   dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/FacebookServlet.java
Log:
More style improvements/fixes.

Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/impl/FacebookTrackerBean.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/impl/FacebookTrackerBean.java	2007-12-19 00:44:28 UTC (rev 7085)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/impl/FacebookTrackerBean.java	2007-12-19 01:18:13 UTC (rev 7086)
@@ -623,9 +623,9 @@
 			}			
 		});
 		
-		fbmlSb.append("<div style='background: url(\"http://dogfood.mugshot.org/images3/facebook_gradient_bottom.gif\";) bottom left repeat-x;'>");
+		fbmlSb.append("<div style='background: url(\"http://dogfood.mugshot.org/images3/facebook_gradient_bottom.gif\";) bottom left repeat-x;width:396px;margin-left:-8px;'>");
 
-		fbmlSb.append("<table><tr><td valign='top' style='padding-top:3px;white-space:nowrap;'>Find me online:</td>");
+		fbmlSb.append("<table cellspacing='0' cellpadding='0'><tr><td valign='top' style='padding-left:8px;padding-top:3px;padding-right:2px;white-space:nowrap;'>Find me online:</td>");
 		
 		fbmlSb.append("<td>");
 		for (ExternalAccountView a : lovedAccounts) {
@@ -655,8 +655,8 @@
 			backgroundColor = (resultsCount % 2 == 0 ? "#FFFFFF" : "#EEEEEE");
 			resultsCount++;
 			fbmlSb.append(
-			    "<table cellspacing='0' cellpadding='0' style='background-color: " + backgroundColor + ";width:100%;margin-left:-10px;margin-right:-10px;padding-top:2px;padding-bottom:2px;'>" +
-			    "<tbody><tr><td style='padding-left:10px;'>" +
+			    "<table cellspacing='0' cellpadding='0' style='background-color: " + backgroundColor + ";width:396px;margin-left:-8px;padding-top:1px;padding-bottom:1px;'>" +
+			    "<tbody><tr><td style='width:26px;padding-left:8px;'>" +
 	            "<img src='http://mugshot.org"; + blockView.getIcon() + "' title='" + blockView.getTypeTitle() + "' style='width: 16; height: 16; border: none; margin-right: 3px;'/>" +
 			    "</td><td align='left'>" +
 			    blockView.getSummaryHeading() +
@@ -671,7 +671,7 @@
 			String visitMugshotText = "Visit my Mugshot Page"; 
 			if (resultsCount == INITIAL_BLOCKS_PER_PAGE);
 			    visitMugshotText = visitMugshotText + " To See More";
-			fbmlSb.append("<div style='background: url(\"http://dogfood.mugshot.org/images3/facebook_gradient_top.gif\";) top left repeat-x;text-align: center;'>");    
+			fbmlSb.append("<div style='background: url(\"http://dogfood.mugshot.org/images3/facebook_gradient_top.gif\";) top left repeat-x;text-align: center;width:396px;margin-left:-8px;padding-top:2px;'>");    
 		    fbmlSb.append("<a target='_blank' style='font-size:12px;' href='" + getAbsoluteUrl("/person?who=" + user.getId().toString()) + "'>" +
 				          visitMugshotText + "</a>");
 		    fbmlSb.append("</div>");

Modified: dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/FacebookServlet.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/FacebookServlet.java	2007-12-19 00:44:28 UTC (rev 7085)
+++ dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/FacebookServlet.java	2007-12-19 01:18:13 UTC (rev 7086)
@@ -176,7 +176,7 @@
 
         xml.appendTextNode("fb:header", "Musgshot");
         xml.appendTextNode("div", "Mugshot allows you and your friends to see your activity from lots of other sites on the internet in a single place in your profile.",
-                           "style", "margin-left:15px;margin-bottom:10px;font-weight:bold;");
+                           "style", "margin-left:25px;margin-bottom:10px;font-weight:bold;");
 		if (user != null && errorMessage == null) {
 			// check if there are mugshot params, process them, and display an appropriate message
 	        @SuppressWarnings("unchecked")
@@ -340,13 +340,13 @@
 			String categoryNameLeftMargin = "margin-left:0px;";
 			if (user.getAccount().getHasAcceptedTerms()) {
 			    xml.appendTextNode("span", "Updates to the information below will be reflected in ",
-				    	           "style", "color:#666666;margin-left:15px;");
+				    	           "style", "color:#666666;margin-left:25px;");
 		        xml.appendTextNode("a", "your Mugshot account", "href",
 				                   baseUrl + "/person?who=" + user.getId(), "target", "_blank");
 		        xml.append(".");
 		    } else {
 			    xml.appendTextNode("span", "Fill in the information for accounts you want to display updates from.",
-		    	                   "style", "color:#666666;margin-left:15px;");		
+		    	                   "style", "color:#666666;margin-left:25px;");		
 			    floatStyle="float:left;";
 			    labelWidth="120";
 			    leftSideWidth = "width:430px;";
@@ -428,8 +428,10 @@
 			    String buttonStyle = "background-color:#3B5998;color:#ffffff;border-width:1px;padding-top:2px;padding-bottom:2px;padding-right:6px;padding-left:6px;margin-top:8px;margin-bottom:8px;border-top-color:#728199;border-left-color:#728199;border-right-color:#0E1F5B;border-bottom-color:#0E1F5B;";
 			    xml.appendEmptyNode("input", "type", "submit", "value", "Verify My Mugshot Account", "style", buttonStyle);
 			    xml.closeElement();		
+			    // divider line
 		    	xml.openElement("div", "style", "height:1px;background-color:#C2D1D4;margin-top:8px;margin-bottom:8px;");
-			    xml.openElement("span", "style", "font-weight:bold;");
+			    xml.closeElement();		
+		    	xml.openElement("span", "style", "font-weight:bold;");
 		    	xml.append("Want to create a Mugshot account?");
 		    	xml.closeElement();
 			    xml.append(" It's free and easy and helps you see all your friends' activities in one place, share links, and read feeds in a social setting.");