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

[commits mugshot org]

Author: marinaz
Date: 2007-12-18 17:19:46 -0600 (Tue, 18 Dec 2007)
New Revision: 7084

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:16:37 UTC (rev 7083)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/impl/FacebookTrackerBean.java	2007-12-18 23:19:46 UTC (rev 7084)
@@ -602,9 +602,9 @@
 		User user = account.getOwner();
 
 		StringBuilder fbmlSb = new StringBuilder("");
-		fbmlSb.append("<fb:subtitle><fb:fbml version='1.1'><fb:visible-to-owner>" +
+		fbmlSb.append("<fb:fbml version='1.1'><fb:visible-to-owner><fb:subtitle>" +
 		              "<a href='http://apps.facebook.com/mugshot'>Edit Accounts</a>" +
-		              "</fb:visible-to-owner></fb:fbml></fb:subtitle>");
+		              "</fb:subtitle></fb:visible-to-owner></fb:fbml>");
 		
 		// add the accounts ribbon
         List<ExternalAccountView> lovedAccounts = new ArrayList<ExternalAccountView>();
@@ -623,11 +623,11 @@
 			}			
 		});
 		
-		fbmlSb.append("<div style='background: url(\"http://dogfood.mugshot.org/images3/facebook_gradient_bottom.png\";) bottom left repeat-x;'>");
+		fbmlSb.append("<div style='background: url(\"http://dogfood.mugshot.org/images3/facebook_gradient_bottom.gif\";) bottom left repeat-x;'>");
 		
-		fbmlSb.append("<div style='float:left'>Find me online:</div>");
+		fbmlSb.append("<div style='float:left;'>Find me online:</div>");
 		
-		fbmlSb.append("<div style='float:left'>");
+		fbmlSb.append("<div style='float:left;clear:right;'>");
 		for (ExternalAccountView a : lovedAccounts) {
             String imageTitle = a.getExternalAccount().getSiteName();
             if (a.getExternalAccount().getLinkText().length() >0 )
@@ -652,10 +652,10 @@
 				resultsCount++;
 				break;
 			}
-			backgroundColor = (resultsCount % 2 == 0 ? "#FFFFFF" : "#CCCCCC");
+			backgroundColor = (resultsCount % 2 == 0 ? "#FFFFFF" : "#EEEEEE");
 			resultsCount++;
 			fbmlSb.append(
-			    "<table cellspacing='0' cellpadding='0' style='background-color: " + backgroundColor + ";'>" +
+			    "<table cellspacing='0' cellpadding='0' style='background-color: " + backgroundColor + ";width:100%;'>" +
 			    "<tbody><tr><td>" +
 	            "<img src='http://mugshot.org"; + blockView.getIcon() + "' title='" + blockView.getTypeTitle() + "' style='width: 16; height: 16; border: none; margin-right: 3px;'/>" +
 			    "</td><td>" +
@@ -671,8 +671,8 @@
 			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.png\";) top left repeat-x;text-align: center;'>");    
-		    fbmlSb.append("<a target='_blank' style='font-size:12px;font-weight:bold;' href='" + getAbsoluteUrl("/person?who=" + user.getId().toString()) + "'>" +
+			fbmlSb.append("<div style='background: url(\"http://dogfood.mugshot.org/images3/facebook_gradient_top.gif\";) top left repeat-x;text-align: center;'>");    
+		    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-18 23:16:37 UTC (rev 7083)
+++ dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/FacebookServlet.java	2007-12-18 23:19:46 UTC (rev 7084)
@@ -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-bottom:10px;font-weight:bold;");
+                           "style", "margin-left:15px;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")
@@ -415,7 +415,7 @@
 		    xml.closeElement(); // div with the form
 		    
 		    if (!user.getAccount().getHasAcceptedTerms()) {
-		    	xml.openElement("div", "style", "width:200px;float:left;color:#666666;background-color:#EDF2F3;border-width:1px;border-color:#C2D1D4;margin-top:34px;margin-left:10px;padding:8px;");
+		    	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("span", "style", "font-weight:bold;");
 		    	xml.append("Do you already have a Mugshot account?");
 		    	xml.closeElement();
@@ -425,10 +425,10 @@
 			    // 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;margin-top:20px;margin-bottom:30px;";
+			    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;";
 			    xml.appendEmptyNode("input", "type", "submit", "value", "Verify My Mugshot Account", "style", buttonStyle);
 			    xml.closeElement();		
-		    	xml.openElement("span", "style", "font-weight:bold;");
+		    	xml.openElement("span", "style", "font-weight:bold;margin-top:25px;");
 		    	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.");