r7300 - in dumbhippo/trunk/server: src/com/dumbhippo/server/impl web/css2 web/css3 web/jsp2 web/jsp3 web/tags/3
- From: commits mugshot org
- To: online-desktop-list gnome org
- Subject: r7300 - in dumbhippo/trunk/server: src/com/dumbhippo/server/impl web/css2 web/css3 web/jsp2 web/jsp3 web/tags/3
- Date: Fri, 8 Feb 2008 14:12:25 -0600 (CST)
Author: marinaz
Date: 2008-02-08 14:12:24 -0600 (Fri, 08 Feb 2008)
New Revision: 7300
Added:
dumbhippo/trunk/server/web/css3/who-are-you-iefixes.css
dumbhippo/trunk/server/web/css3/who-are-you-positions.css
dumbhippo/trunk/server/web/css3/who-are-you.css
dumbhippo/trunk/server/web/jsp3/who-are-you.jsp
Removed:
dumbhippo/trunk/server/web/css2/who-are-you-positions.css
dumbhippo/trunk/server/web/css2/who-are-you.css
dumbhippo/trunk/server/web/jsp2/who-are-you.jsp
Modified:
dumbhippo/trunk/server/src/com/dumbhippo/server/impl/SigninSystemBean.java
dumbhippo/trunk/server/web/css3/site.css
dumbhippo/trunk/server/web/jsp3/main.jsp
dumbhippo/trunk/server/web/tags/3/header.tag
dumbhippo/trunk/server/web/tags/3/shinyBox.tag
Log:
Update login page to the new design. Include a note about being able to
log in with a GNOME Online account on it.
Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/impl/SigninSystemBean.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/impl/SigninSystemBean.java 2008-02-08 20:11:00 UTC (rev 7299)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/impl/SigninSystemBean.java 2008-02-08 20:12:24 UTC (rev 7300)
@@ -68,7 +68,7 @@
try {
resource = identitySpider.lookupEmail(address);
} catch (NotFoundException e) {
- throw new HumanVisibleException("That isn't an email address we know about");
+ throw new HumanVisibleException("This isn't an email address we know about.");
}
String link = getLoginLink(viewpoint, resource);
MimeMessage message = mailer.createMessage(viewpoint, Mailer.SpecialSender.LOGIN, resource.getEmail());
@@ -94,7 +94,7 @@
try {
resource = identitySpider.lookupAim(address);
} catch (NotFoundException e) {
- throw new HumanVisibleException("That isn't an AIM screen name we know about");
+ throw new HumanVisibleException("This isn't an AIM screen name we know about.");
}
String link = getLoginLink(viewpoint, resource);
Deleted: dumbhippo/trunk/server/web/css2/who-are-you-positions.css
===================================================================
--- dumbhippo/trunk/server/web/css2/who-are-you-positions.css 2008-02-08 20:11:00 UTC (rev 7299)
+++ dumbhippo/trunk/server/web/css2/who-are-you-positions.css 2008-02-08 20:12:24 UTC (rev 7300)
@@ -1,17 +0,0 @@
- CHARSET "UTF-8";
-
-/* Override the 500px width that's normal for a zone box */
-
-.dh-body-without-sidebar #dhPageHeader, .dh-zone-box-title-container, #dhContentColumn, .dh-body-without-sidebar #dhPage, .dh-zone-box-header {
- width: 310px;
-}
-
-#dhContentColumn .dh-text-input {
- margin-bottom: 10px;
- width: 288px;
-}
-
-#dhPasswordHelp {
- position: absolute;
- right: 10px;
-}
\ No newline at end of file
Deleted: dumbhippo/trunk/server/web/css2/who-are-you.css
===================================================================
--- dumbhippo/trunk/server/web/css2/who-are-you.css 2008-02-08 20:11:00 UTC (rev 7299)
+++ dumbhippo/trunk/server/web/css2/who-are-you.css 2008-02-08 20:12:24 UTC (rev 7300)
@@ -1,21 +0,0 @@
- CHARSET "UTF-8";
- IMPORT url("who-are-you-positions.css");
-
-#dhContentColumn {
- font-size: 12px; /* for inheritance by text in the zone box */
-}
-
-#dhLoginNotification {
- font-weight: bold;
- color: #cc0033;
-}
-
-#dhPasswordHelp {
- display: none;
- font-size: 12px;
-}
-
-#dhSignupLink {
- font-size: 10px;
- text-align: right;
-}
Modified: dumbhippo/trunk/server/web/css3/site.css
===================================================================
--- dumbhippo/trunk/server/web/css3/site.css 2008-02-08 20:11:00 UTC (rev 7299)
+++ dumbhippo/trunk/server/web/css3/site.css 2008-02-08 20:12:24 UTC (rev 7300)
@@ -711,3 +711,14 @@
.dh-amazon-description {
font-style: italic;
}
+
+.dh-separator {
+ background-color: #cccccc;
+ height: 1px;
+ margin-top: 7px;
+ margin-bottom: 7px;
+}
+
+.dh-separator-invisible {
+ background-color: white;
+}
Added: dumbhippo/trunk/server/web/css3/who-are-you-iefixes.css
===================================================================
--- dumbhippo/trunk/server/web/css3/who-are-you-iefixes.css 2008-02-08 20:11:00 UTC (rev 7299)
+++ dumbhippo/trunk/server/web/css3/who-are-you-iefixes.css 2008-02-08 20:12:24 UTC (rev 7300)
@@ -0,0 +1,5 @@
+ CHARSET "UTF-8";
+
+#dhPasswordHelp {
+ margin-right: 10px;
+}
\ No newline at end of file
Added: dumbhippo/trunk/server/web/css3/who-are-you-positions.css
===================================================================
--- dumbhippo/trunk/server/web/css3/who-are-you-positions.css 2008-02-08 20:11:00 UTC (rev 7299)
+++ dumbhippo/trunk/server/web/css3/who-are-you-positions.css 2008-02-08 20:12:24 UTC (rev 7300)
@@ -0,0 +1,41 @@
+ CHARSET "UTF-8";
+
+/* Override the 500px width that's normal for a zone box */
+
+.dh-shiny-box-content-body {
+ position: relative;
+ text-align: center;
+}
+
+#dhLoginForm {
+ position: relative;
+ width: 310px;
+ border: 1px solid #cccccc;
+ margin-top: 20px;
+ margin-bottom: 5px;
+ /* this centers us in firefox, the text-align: center on
+ our parent centers us in IE */
+ margin-left: auto;
+ margin-right: auto;
+ padding-top: 20px;
+ padding-bottom: 10px;
+ padding-right: 10px;
+ padding-left: 10px;
+ text-align: left; /* don't inherit text-align: center; */
+}
+
+#dhLoginForm .dh-text-input {
+ margin-bottom: 7px;
+ width: 100%;
+}
+
+#dhSignupLink {
+ position: absolute;
+ top: 5px;
+ right: 10px;
+}
+
+#dhPasswordHelp {
+ position: absolute;
+ right: 0px;
+}
\ No newline at end of file
Added: dumbhippo/trunk/server/web/css3/who-are-you.css
===================================================================
--- dumbhippo/trunk/server/web/css3/who-are-you.css 2008-02-08 20:11:00 UTC (rev 7299)
+++ dumbhippo/trunk/server/web/css3/who-are-you.css 2008-02-08 20:12:24 UTC (rev 7300)
@@ -0,0 +1,16 @@
+ CHARSET "UTF-8";
+ IMPORT url("who-are-you-positions.css");
+
+#dhLoginForm {
+ font-size: 12px; /* for inheritance by text inside the form */
+ background-color: #fbf3fe;
+}
+
+#dhLoginNotification {
+ font-weight: bold;
+ color: #cc0033;
+}
+
+#dhPasswordHelp {
+ display: none;
+}
Deleted: dumbhippo/trunk/server/web/jsp2/who-are-you.jsp
===================================================================
--- dumbhippo/trunk/server/web/jsp2/who-are-you.jsp 2008-02-08 20:11:00 UTC (rev 7299)
+++ dumbhippo/trunk/server/web/jsp2/who-are-you.jsp 2008-02-08 20:12:24 UTC (rev 7300)
@@ -1,52 +0,0 @@
-<html>
-<%@ page pageEncoding="UTF-8" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
-<%@ taglib uri="/jsp/dumbhippo.tld" prefix="dh" %>
-<%@ taglib tagdir="/WEB-INF/tags/2" prefix="dht" %>
-
-<dh:bean id="whoareyou" class="com.dumbhippo.web.pages.WhoAreYouPage" scope="page"/>
-
-<head>
- <title>Log In</title>
- <dht:siteStyle/>
- <link rel="stylesheet" type="text/css" href="/css2/${buildStamp}/who-are-you.css">
- <dht:faviconIncludes/>
- <dh:script module="dh.login"/>
-</head>
-<dht:systemPage disableFooter="true" disableJumpTo="true" topImage="/images2/${buildStamp}/header_login310.gif" bottomImage="/images2/${buildStamp}/bottom_gray310.gif">
- <form id="dhLoginForm" name="dhLoginForm" action="/signinpost" method="post">
- <c:if test='${!empty param["next"]}'>
- <input type="hidden" value='${param["next"]}' name="next"/>
- </c:if>
- <table width="100%">
- <tr>
- <td><div class="dh-title">Log in</div></td>
- <td align="right"><div id="dhSignupLink"><a href="/signup">Don't have an account?</a></div></td>
- </tr>
- </table>
- <div id="dhLoginNotification" style="display: none;"></div>
- <div>Email address:</div>
- <div>
- <dht:textInput id="dhLoginAddressEntry" name="address"/>
- </div>
- <div id="dhLoginPasswordLabel" style="display: none;">Password:</div>
- <div>
- <dht:textInput id="dhLoginPasswordEntry" type="password" name="password" style="display: none;"/>
- </div>
- <input id="dhLoginPasswordShowing" type="hidden" value='false' name="passwordShowing"/>
- <div style="position:relative">
- <input id="dhLoginButton" type="submit" value="Log in"/>
- <a id="dhPasswordHelp" href="http://developer.mugshot.org/wiki/Did_You_Set_A_Password"; target="_blank">Did you set a password?</a>
- </div>
- </form>
- <dht:zoneBoxSeparator/>
- <div>
- <c:if test="${!empty whoareyou.aimBotScreenName}">
- <%-- c:if on one line here to avoid weird link text spacing --%>
- <a href="aim:GoIM?screenname=${whoareyou.aimBotScreenName}&message=Hey+Bot!+Send+me+a+login+link!"><c:if test="${!empty whoareyou.aimPresenceKey}"><img src="http://api.oscar.aol.com/SOA/key=${whoareyou.aimPresenceKey}/presence/${whoareyou.aimBotScreenName}"; border="0"/> </c:if>AIM log in</a> |
- </c:if>
- <a id="dhLoginTogglePasswordLink" href="javascript:dh.login.togglePasswordBox()"><%-- filled in by javascript --%></a> [alt-p]
- </div>
-
-</dht:systemPage>
-</html>
Modified: dumbhippo/trunk/server/web/jsp3/main.jsp
===================================================================
--- dumbhippo/trunk/server/web/jsp3/main.jsp 2008-02-08 20:11:00 UTC (rev 7299)
+++ dumbhippo/trunk/server/web/jsp3/main.jsp 2008-02-08 20:12:24 UTC (rev 7300)
@@ -52,3 +52,4 @@
</c:forEach>
</div>
</dht3:page>
+</html>
\ No newline at end of file
Added: dumbhippo/trunk/server/web/jsp3/who-are-you.jsp
===================================================================
--- dumbhippo/trunk/server/web/jsp3/who-are-you.jsp 2008-02-08 20:11:00 UTC (rev 7299)
+++ dumbhippo/trunk/server/web/jsp3/who-are-you.jsp 2008-02-08 20:12:24 UTC (rev 7300)
@@ -0,0 +1,55 @@
+<html>
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
+<%@ taglib uri="/jsp/dumbhippo.tld" prefix="dh" %>
+<%@ taglib tagdir="/WEB-INF/tags/2" prefix="dht" %>
+<%@ taglib tagdir="/WEB-INF/tags/3" prefix="dht3" %>
+
+<head>
+ <title>Log In - Mugshot</title>
+ <dht3:stylesheet name="site" iefixes="true"/>
+ <dht3:stylesheet name="who-are-you" iefixes="true"/>
+ <dht:faviconIncludes/>
+ <dh:script modules="dh.login"/>
+</head>
+
+<dh:bean id="whoareyou" class="com.dumbhippo.web.pages.WhoAreYouPage" scope="page"/>
+
+<dht3:page currentPageLink="who-are-you">
+ <dht3:pageSubHeader title="Log In"/>
+ <dht3:shinyBox color="purple">
+ <form id="dhLoginForm" name="dhLoginForm" action="/signinpost" method="post">
+ <c:if test='${!empty param["next"]}'>
+ <input type="hidden" value='${param["next"]}' name="next"/>
+ </c:if>
+ <div id="dhSignupLink"><a href="/signup">Don't have an account?</a></div>
+ <div id="dhLoginNotification" style="display: none;"></div>
+ <div>Email address:</div>
+ <div>
+ <dht:textInput id="dhLoginAddressEntry" name="address"/>
+ </div>
+ <div id="dhLoginPasswordLabel" style="display: none;">Password:</div>
+ <div>
+ <dht:textInput id="dhLoginPasswordEntry" type="password" name="password" style="display: none;"/>
+ </div>
+ <input id="dhLoginPasswordShowing" type="hidden" value='false' name="passwordShowing"/>
+ <div style="position:relative">
+ <input id="dhLoginButton" type="submit" value="Log in"/>
+ <a id="dhPasswordHelp" href="http://developer.mugshot.org/wiki/Did_You_Set_A_Password"; target="_blank">Did you set a password?</a>
+ </div>
+ <dht:zoneBoxSeparator/>
+ <div>
+ <c:if test="${!empty whoareyou.aimBotScreenName}">
+ <%-- c:if on one line here to avoid weird link text spacing --%>
+ <a href="aim:GoIM?screenname=${whoareyou.aimBotScreenName}&message=Hey+Bot!+Send+me+a+login+link!"><c:if test="${!empty whoareyou.aimPresenceKey}"><img src="http://api.oscar.aol.com/SOA/key=${whoareyou.aimPresenceKey}/presence/${whoareyou.aimBotScreenName}"; border="0"/> </c:if>AIM log in</a> |
+ </c:if>
+ <a id="dhLoginTogglePasswordLink" href="javascript:dh.login.togglePasswordBox()"><%-- filled in by javascript --%></a> [alt-p]
+ </div>
+ <dht:zoneBoxSeparator/>
+ <div>
+ GNOME Online user? Use your <a href="http://online.gnome.org";>online.gnome.org</a> account to log in here.
+ </div>
+ </form>
+ </dht3:shinyBox>
+</dht3:page>
+</html>
\ No newline at end of file
Modified: dumbhippo/trunk/server/web/tags/3/header.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/3/header.tag 2008-02-08 20:11:00 UTC (rev 7299)
+++ dumbhippo/trunk/server/web/tags/3/header.tag 2008-02-08 20:12:24 UTC (rev 7300)
@@ -15,6 +15,9 @@
<c:when test="${currentPageLink == 'main' && !signin.valid}">
<c:set var="disableHomeLink" value="true"/>
</c:when>
+ <c:when test="${currentPageLink == 'who-are-you'}">
+ <c:set var="disableLoginLink" value="true"/>
+ </c:when>
<c:when test="${currentPageLink == 'signup'}">
<c:set var="disableSignupLink" value="true"/>
</c:when>
@@ -56,7 +59,7 @@
<div id="dhPageHeaderWelcomeOptions"><dht:actionLinkLogout oneLine="true" underline="true"/></div>
</c:when>
<c:otherwise>
- <span id="dhPageHeaderWelcomeOptions"><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 id="dhPageHeaderWelcomeOptions"><c:if test="${!disableLoginLink}"><a class="dh-underlined-link" href="/who-are-you">Log in</a></c:if><c:if test="${!disableSignupLink}"><c:if test="${!disableLoginLink}"> | </c:if><a class="dh-underlined-link" href="/signup">Sign up</a></c:if></span>
</c:otherwise>
</c:choose>
</div>
Modified: dumbhippo/trunk/server/web/tags/3/shinyBox.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/3/shinyBox.tag 2008-02-08 20:11:00 UTC (rev 7299)
+++ dumbhippo/trunk/server/web/tags/3/shinyBox.tag 2008-02-08 20:12:24 UTC (rev 7300)
@@ -30,7 +30,7 @@
<table class="dh-shiny-box-spacer-table" cellspacing="0" cellpadding="0">
<tr>
<td class="dh-shiny-box-content-side-spacer"> </td>
- <td><jsp:doBody/></td>
+ <td class="dh-shiny-box-content-body"><jsp:doBody/></td>
<td class="dh-shiny-box-content-side-spacer"> </td>
</tr>
</table>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
