r7308 - in dumbhippo/trunk/server: src/com/dumbhippo/web/servlets web/css-gnome web/jsp2 web/tags/2 web/tags/3 web/tags/gnome

[commits mugshot org]

Author: marinaz
Date: 2008-02-11 15:05:22 -0600 (Mon, 11 Feb 2008)
New Revision: 7308

Modified:
   dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/RewriteServlet.java
   dumbhippo/trunk/server/web/css-gnome/site.css
   dumbhippo/trunk/server/web/jsp2/unknownlink.jsp
   dumbhippo/trunk/server/web/tags/2/notevil.tag
   dumbhippo/trunk/server/web/tags/3/accountStatus.tag
   dumbhippo/trunk/server/web/tags/gnome/header.tag
Log:
Disallow access to the Mugshot pages from online.gnome.org site.

Have terms of use and privacy links on online.gnome.org link to 
the Mugshot site directly, and say that they apply to "the GNOME 
Online and Mugshot".


Modified: dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/RewriteServlet.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/RewriteServlet.java	2008-02-11 19:02:13 UTC (rev 7307)
+++ dumbhippo/trunk/server/src/com/dumbhippo/web/servlets/RewriteServlet.java	2008-02-11 21:05:22 UTC (rev 7308)
@@ -164,7 +164,10 @@
     }
     
     private String getVersionedJspPath(Site site, String name) {
-    	if (site == Site.GNOME && jspPagesGnome.contains(name)) {
+    	// Don't display Mugshot pages on the GNOME Online site.
+    	// To avoid duplication, we now use "configjs" and "unknownlink"
+    	// from the Mugshot site, since they don't link to any other pages.
+    	if (site == Site.GNOME && !name.equals("configjs") && !name.equals("unknownlink")) {
     		return "/jsp-gnome/" + name + ".jsp";
     	} else {
 			Integer version = jspPages.get(name);

Modified: dumbhippo/trunk/server/web/css-gnome/site.css
===================================================================
--- dumbhippo/trunk/server/web/css-gnome/site.css	2008-02-11 19:02:13 UTC (rev 7307)
+++ dumbhippo/trunk/server/web/css-gnome/site.css	2008-02-11 21:05:22 UTC (rev 7308)
@@ -193,3 +193,33 @@
     margin-top:         3px;
 	font-size:			14px;
 }
+
+#dhAccountStatus {
+	background-color:	#fbfadc;
+	border:				1px solid #cccc99;
+	font-size:			12px;
+}
+
+#dhAccountDisabled {
+	background-color:	#fbfadc;
+	border:				1px solid #cc0000;
+	font-size:			14px;
+	font-weight:		bold;
+}
+
+#dhAccountStatus, #dhAccountDisabled {
+	position:			relative;
+	padding-left: 		9px;
+	padding-right: 		9px;
+	padding-top: 		4px;
+	padding-bottom: 	4px;
+	margin-bottom:		15px;
+}
+
+.dh-account-status-secondary {
+	padding-left:		15px;
+}
+
+.dh-account-status-secondary input {
+	margin-left:		0px;
+}
\ No newline at end of file

Modified: dumbhippo/trunk/server/web/jsp2/unknownlink.jsp
===================================================================
--- dumbhippo/trunk/server/web/jsp2/unknownlink.jsp	2008-02-11 19:02:13 UTC (rev 7307)
+++ dumbhippo/trunk/server/web/jsp2/unknownlink.jsp	2008-02-11 21:05:22 UTC (rev 7308)
@@ -2,6 +2,9 @@
 <%@ taglib uri="/jsp/dumbhippo.tld" prefix="dh" %>
 <%@ taglib tagdir="/WEB-INF/tags/2" prefix="dht" %>
 
+<%-- Right now, GNOME Online is also using this page. We should copy it over to jsp-gnome --%>
+<%-- and update the code in RewriteServlet, if this page will include any Mugshot-specific --%>
+<%-- links in the future.  --%>
 <jsp:forward page="/error">
 	<jsp:param name="text" value="That page doesn't exist."/>
 </jsp:forward>
\ No newline at end of file

Modified: dumbhippo/trunk/server/web/tags/2/notevil.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/2/notevil.tag	2008-02-11 19:02:13 UTC (rev 7307)
+++ dumbhippo/trunk/server/web/tags/2/notevil.tag	2008-02-11 21:05:22 UTC (rev 7308)
@@ -10,4 +10,4 @@
 </c:if>
 
 <div class="${disclaimerClass}">We promise not to sell or share your info, spam or scam you,
-	install spyware, or other annoying stuff. <a href="/privacy">See our Privacy Policy.</a></div>
\ No newline at end of file
+	install spyware, or other annoying stuff. <c:choose><c:when test="${dh:enumIs(site, 'GNOME')}"><a href="${signin.baseUrlMugshot}/privacy" target="_blank">See GNOME Online and Mugshot Privacy Policy.</a></c:when><c:otherwise><a href="${signin.baseUrlMugshot}/privacy">See our Privacy Policy.</a></c:otherwise></c:choose></div>
\ No newline at end of file

Modified: dumbhippo/trunk/server/web/tags/3/accountStatus.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/3/accountStatus.tag	2008-02-11 19:02:13 UTC (rev 7307)
+++ dumbhippo/trunk/server/web/tags/3/accountStatus.tag	2008-02-11 21:05:22 UTC (rev 7308)
@@ -77,11 +77,20 @@
 				<td valign="center">			
 					<div>
 						<div class="dh-account-status-primary">Welcome to <c:out value="${site.siteName}"/>!</div>
-						Activate your account to share updates with friends.
+						<c:choose>
+						    <c:when test="${dh:enumIs(site, 'GNOME')}">	
+						        Activate your account to start using GNOME Online Desktop.
+						    </c:when>
+						    <c:otherwise>
+						        Activate your account to share updates with friends.
+						    </c:otherwise>
+						</c:choose>       
 					</div>
-					<div>
-						<a href="/features">Learn more about <c:out value="${site.siteName}"/>.</a>					
-					</div>
+					<c:if test="${dh:enumIs(site, 'MUGSHOT')}">	
+					    <div>
+						    <a href="/features">Learn more about Mugshot.</a>					
+					    </div>
+					</c:if>    
 					<script type="text/javascript">
 						dh.event.addPageLoadListener(dh.actions.updateGetStarted);
 					</script>
@@ -90,7 +99,7 @@
 					<div class="dh-account-status-secondary">
 						<div>
 			        	<input type="checkbox" id="dhAcceptTerms" onclick="dh.actions.updateGetStarted();">
-		                	<label for="dhAcceptTerms">I agree to the <c:out value="${site.siteName}"/></label> <a href="javascript:window.open('/terms', 'dhTermsOfUse', 'menubar=no,scrollbars=yes,width=700,height=700');void(0);">Terms of Use</a>.
+		                	<label for="dhAcceptTerms">I agree to the <c:out value="${site.siteName}"/> <c:if test="${!dh:enumIs(site, 'MUGSHOT')}">and Mugshot </c:if></label> <a href="javascript:window.open('${signin.baseUrlMugshot}/terms', 'dhTermsOfUse', 'menubar=no,scrollbars=yes,width=700,height=700');void(0);">Terms of Use</a>.
 				        </input>
 				        </div>
 				        <div>

Modified: dumbhippo/trunk/server/web/tags/gnome/header.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/gnome/header.tag	2008-02-11 19:02:13 UTC (rev 7307)
+++ dumbhippo/trunk/server/web/tags/gnome/header.tag	2008-02-11 21:05:22 UTC (rev 7308)
@@ -32,7 +32,7 @@
 				<div><a class="dh-underlined-link" href="javascript:dh.actions.signOut();" title="Keep others from using your account on this computer">Log out</a></div>
 			</c:when>
 			<c:otherwise>	
-			    <span><a class="dh-underlined-link" href="/who-are-you">Log in</a><c:if test="${!disableSignupLink}"> | <a class="dh-underlined-link" href="/signup">Sign up</a></c:if></span>
+			    <span><a class="dh-underlined-link" href="/who-are-you">Log in</a><c:if test="${!disableSignupLink}"> | <a class="dh-underlined-link" href="/who-are-you">Sign up</a></c:if></span>
 			</c:otherwise>
 		</c:choose>
 	</div>