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

[commits mugshot org]

Author: marinaz
Date: 2007-12-18 18:44:28 -0600 (Tue, 18 Dec 2007)
New Revision: 7085

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-18 23:19:46 UTC (rev 7084)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/impl/FacebookTrackerBean.java	2007-12-19 00:44:28 UTC (rev 7085)
@@ -602,9 +602,9 @@
 		User user = account.getOwner();
 
 		StringBuilder fbmlSb = new StringBuilder("");
-		fbmlSb.append("<fb:fbml version='1.1'><fb:visible-to-owner><fb:subtitle>" +
-		              "<a href='http://apps.facebook.com/mugshot'>Edit Accounts</a>" +
-		              "</fb:subtitle></fb:visible-to-owner></fb:fbml>");
+		fbmlSb.append("<fb:subtitle>Displaying latest updates<fb:fbml version='1.1'><fb:visible-to-owner>" +
+		              "<a href='http://apps.facebook.com/mugshot' style='float:right;'>Edit Accounts</a>" +
+		              "</fb:visible-to-owner></fb:fbml></fb:subtitle>");
 		
 		// add the accounts ribbon
         List<ExternalAccountView> lovedAccounts = new ArrayList<ExternalAccountView>();
@@ -624,10 +624,10 @@
 		});
 		
 		fbmlSb.append("<div style='background: url(\"http://dogfood.mugshot.org/images3/facebook_gradient_bottom.gif\";) bottom left repeat-x;'>");
+
+		fbmlSb.append("<table><tr><td valign='top' style='padding-top:3px;white-space:nowrap;'>Find me online:</td>");
 		
-		fbmlSb.append("<div style='float:left;'>Find me online:</div>");
-		
-		fbmlSb.append("<div style='float:left;clear:right;'>");
+		fbmlSb.append("<td>");
 		for (ExternalAccountView a : lovedAccounts) {
             String imageTitle = a.getExternalAccount().getSiteName();
             if (a.getExternalAccount().getLinkText().length() >0 )
@@ -638,7 +638,7 @@
 					      "</a>");
 		}		
 
-		fbmlSb.append("</div></div>");
+		fbmlSb.append("</td></tr></table></div>");
 		
 		Pageable<BlockView> pageableMugshot = new Pageable<BlockView>("mugshot");
 		pageableMugshot.setPosition(0);
@@ -655,10 +655,10 @@
 			backgroundColor = (resultsCount % 2 == 0 ? "#FFFFFF" : "#EEEEEE");
 			resultsCount++;
 			fbmlSb.append(
-			    "<table cellspacing='0' cellpadding='0' style='background-color: " + backgroundColor + ";width:100%;'>" +
-			    "<tbody><tr><td>" +
+			    "<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;'>" +
 	            "<img src='http://mugshot.org"; + blockView.getIcon() + "' title='" + blockView.getTypeTitle() + "' style='width: 16; height: 16; border: none; margin-right: 3px;'/>" +
-			    "</td><td>" +
+			    "</td><td align='left'>" +
 			    blockView.getSummaryHeading() +
 		        ": <a target='_blank' href='" + getAbsoluteUrl(blockView.getSummaryLink()) + "'>" + blockView.getSummaryLinkText() + "</a>" +
 			    "</td></tr></table>");			

Modified: dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/FacebookServlet.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/FacebookServlet.java	2007-12-18 23:19:46 UTC (rev 7084)
+++ dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/FacebookServlet.java	2007-12-19 00:44:28 UTC (rev 7085)
@@ -415,7 +415,7 @@
 		    xml.closeElement(); // div with the form
 		    
 		    if (!user.getAccount().getHasAcceptedTerms()) {
-		    	xml.openElement("div", "style", "width:180px;float:left;color:#666666;background-color:#EDF2F3;border-style:solid;border-width:2px;border-color:#C2D1D4;margin-top:34px;margin-left:10px;padding:8px;");
+		    	xml.openElement("div", "style", "width:184px;float:left;background-color:#EDF2F3;border-style:solid;border-width:1px;border-color:#C2D1D4;margin-top:34px;margin-left:10px;padding:8px;");
 		    	xml.openElement("span", "style", "font-weight:bold;");
 		    	xml.append("Do you already have a Mugshot account?");
 		    	xml.closeElement();
@@ -425,10 +425,11 @@
 			    // there didn't seem to be a way to get buttons in fb:editor to open in a new window, which is what we want here, so we are using 
 			    // our own form and buttons 
 			    // original top and left border color on facebook is #D8DFEA, but it looks too light to me
-			    String buttonStyle = "background-color:#3B5998;color:#ffffff;border-width:1px;padding-top:2px;padding-bottom:2px;padding-right:6px;padding-left:6px;border-top-color:#728199;border-left-color:#728199;border-right-color:#0E1F5B;border-bottom-color:#0E1F5B;";
+			    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();		
-		    	xml.openElement("span", "style", "font-weight:bold;margin-top:25px;");
+		    	xml.openElement("div", "style", "height:1px;background-color:#C2D1D4;margin-top:8px;margin-bottom:8px;");
+			    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.");