r7045 - in dumbhippo/trunk/server: src/com/dumbhippo/web/servlets web web/jsp3

[commits mugshot org]

Author: marinaz
Date: 2007-12-12 17:01:36 -0600 (Wed, 12 Dec 2007)
New Revision: 7045

Removed:
   dumbhippo/trunk/server/web/jsp3/facebook-application-page.jsp
Modified:
   dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/FacebookServlet.java
   dumbhippo/trunk/server/web/servlet-info.xml
Log:
Use baseUrl for the server instead of hardcoded dogfood server url.

Remove unused facebook.application-page.jsp

Modified: dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/FacebookServlet.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/FacebookServlet.java	2007-12-12 22:26:13 UTC (rev 7044)
+++ dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/FacebookServlet.java	2007-12-12 23:01:36 UTC (rev 7045)
@@ -171,7 +171,8 @@
 		
 		// this returns some code in FBML we'll return for our app page on Facebook
 		// it intentionally points to my test server for now
-		XmlBuilder xml = new XmlBuilder();		
+		XmlBuilder xml = new XmlBuilder();	
+		String baseUrl = config.getBaseUrlMugshot().toExternalForm();
 
         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 and automatically puts that in your profile and news feed.",
@@ -341,7 +342,7 @@
 			    xml.appendTextNode("span", "Updates to the information below will be reflected in ",
 				    	           "style", "margin-left:15px;");
 		        xml.appendTextNode("a", "your Mugshot account", "href",
-				                   "http://dogfood.mugshot.org/person?who="; + user.getId(), "target", "_blank");
+				                   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.",
@@ -416,7 +417,7 @@
 		    	xml.openElement("div", "style", "width:200px;float:left;color:#666666;font-weight:bold;margin-top:34px;margin-left:10px;");
 			    xml.append("Do you already have a Mugshot account? Don't fill in this stuff, just verify" +
 			    		   " your Mugshot account by following this link.");
-			    xml.openElement("form", "action", "http://dogfood.mugshot.org/facebook-add";, "target", "_blank", "method", "GET");
+			    xml.openElement("form", "action", baseUrl + "/facebook-add", "target", "_blank", "method", "GET");
 			    // 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
@@ -424,7 +425,7 @@
 			    xml.appendEmptyNode("input", "type", "submit", "value", "Verify My Mugshot Account", "style", buttonStyle);
 			    xml.closeElement();		
 			    xml.append("Want to create a Mugshot account? 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.");
-	            xml.openElement("form", "action", "http://dogfood.mugshot.org/facebook-signin";, "target", "_blank", "method", "GET");
+	            xml.openElement("form", "action", baseUrl + "/facebook-signin", "target", "_blank", "method", "GET");
 	            xml.appendEmptyNode("input", "type", "submit", "value", "Create My Mugshot Account", "style", buttonStyle);
 	            xml.closeElement();	
 		    	xml.closeElement();

Deleted: dumbhippo/trunk/server/web/jsp3/facebook-application-page.jsp
===================================================================
--- dumbhippo/trunk/server/web/jsp3/facebook-application-page.jsp	2007-12-12 22:26:13 UTC (rev 7044)
+++ dumbhippo/trunk/server/web/jsp3/facebook-application-page.jsp	2007-12-12 23:01:36 UTC (rev 7045)
@@ -1,8 +0,0 @@
-<!-- this is some code in FBML we'll return for our app page on Facebook -->
-<!-- it intentionally points to my test server for now -->
-<p>
-You need to be <a href="http://test.marinaz.dumbhippo.com:8080/account"; target="_blank">logged in to Mugshot</a> to be able to verify your Mugshot account.
-<form action="http://test.marinaz.dumbhippo.com:8080/facebook-add"; target="_blank" method="GET">
-<input type="submit" value="Verify My Mugshot Account"/>
-</form>
-</p>
\ No newline at end of file

Modified: dumbhippo/trunk/server/web/servlet-info.xml
===================================================================
--- dumbhippo/trunk/server/web/servlet-info.xml	2007-12-12 22:26:13 UTC (rev 7044)
+++ dumbhippo/trunk/server/web/servlet-info.xml	2007-12-12 23:01:36 UTC (rev 7045)
@@ -291,7 +291,7 @@
            they are listed below for completeness -->
       <init-param>
           <param-name>noSignin</param-name>
-          <param-value>apple-dashboard-content,application,applications,applications-learnmore,badges,busy,buttons,comingsoon,error,facebook-application-page,facebook-welcome,files,flash,google-stacker,google-stacker-spec,google-stacker-content,group-files,licenses,mugshot-eula,public-groups,radar-theme,sharelink,sharelink-inactive,signup,summit,tour,unknownlink,upgrade,user-summary,who-are-you,robots.txt,trademark</param-value>
+          <param-value>apple-dashboard-content,application,applications,applications-learnmore,badges,busy,buttons,comingsoon,error,facebook-welcome,files,flash,google-stacker,google-stacker-spec,google-stacker-content,group-files,licenses,mugshot-eula,public-groups,radar-theme,sharelink,sharelink-inactive,signup,summit,tour,unknownlink,upgrade,user-summary,who-are-you,robots.txt,trademark</param-value>
       </init-param>
       <init-param>
           <param-name>requiresSigninStealth</param-name>