r7302 - in dumbhippo/trunk/server/web: css-gnome css2 css3 images2 jsp-gnome jsp2 tags/2
- From: commits mugshot org
- To: online-desktop-list gnome org
- Subject: r7302 - in dumbhippo/trunk/server/web: css-gnome css2 css3 images2 jsp-gnome jsp2 tags/2
- Date: Fri, 8 Feb 2008 16:43:19 -0600 (CST)
Author: marinaz
Date: 2008-02-08 16:43:18 -0600 (Fri, 08 Feb 2008)
New Revision: 7302
Added:
dumbhippo/trunk/server/web/css3/signup-positions.css
dumbhippo/trunk/server/web/css3/signup.css
Removed:
dumbhippo/trunk/server/web/images2/header_login310.gif
dumbhippo/trunk/server/web/images2/header_login500.gif
dumbhippo/trunk/server/web/images2/header_signup500.gif
dumbhippo/trunk/server/web/jsp2/signup.jsp
dumbhippo/trunk/server/web/jsp2/summit.jsp
Modified:
dumbhippo/trunk/server/web/css-gnome/who-are-you.css
dumbhippo/trunk/server/web/css2/site.css
dumbhippo/trunk/server/web/css3/site.css
dumbhippo/trunk/server/web/css3/who-are-you-positions.css
dumbhippo/trunk/server/web/jsp-gnome/who-are-you.jsp
dumbhippo/trunk/server/web/tags/2/selfInvite.tag
dumbhippo/trunk/server/web/tags/2/wantsIn.tag
Log:
Update signup page to a new design. Mention GNOME Online on it.
Get rid of /summit, have it redirect to /main.
Remove unused header images (login and signup).
Modified: dumbhippo/trunk/server/web/css-gnome/who-are-you.css
===================================================================
--- dumbhippo/trunk/server/web/css-gnome/who-are-you.css 2008-02-08 22:31:31 UTC (rev 7301)
+++ dumbhippo/trunk/server/web/css-gnome/who-are-you.css 2008-02-08 22:43:18 UTC (rev 7302)
@@ -7,6 +7,11 @@
margin-bottom: 10px;
}
+.dh-text-input, #dhWantsInEmailEntry {
+ margin-top: 3px;
+ margin-bottom: 10px;
+}
+
#dhSelfInviteButton {
background-color: #5cc400;
border: 2px outset #57e925;
Modified: dumbhippo/trunk/server/web/css2/site.css
===================================================================
--- dumbhippo/trunk/server/web/css2/site.css 2008-02-08 22:31:31 UTC (rev 7301)
+++ dumbhippo/trunk/server/web/css2/site.css 2008-02-08 22:43:18 UTC (rev 7302)
@@ -317,21 +317,6 @@
color: #aaaaaa;
}
-.dh-special-subtitle {
- color: rgb(145,50,92);
- font-size: 16px;
- font-weight: bold;
-}
-
-.dh-disclaimer {
- font-size: 10px;
-}
-
-.dh-disclaimer-own-section {
- font-size: 16px;
- text-align: left;
-}
-
.dh-promo-description {
font-size: 14px;
}
Added: dumbhippo/trunk/server/web/css3/signup-positions.css
===================================================================
--- dumbhippo/trunk/server/web/css3/signup-positions.css 2008-02-08 22:31:31 UTC (rev 7301)
+++ dumbhippo/trunk/server/web/css3/signup-positions.css 2008-02-08 22:43:18 UTC (rev 7302)
@@ -0,0 +1,36 @@
+ CHARSET "UTF-8";
+
+
+.dh-shiny-box-content-body {
+ position: relative;
+ text-align: center;
+}
+
+#dhSignupContent {
+ position: relative;
+ width: 360px;
+ 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: 10px;
+ padding-bottom: 10px;
+ padding-right: 10px;
+ padding-left: 10px;
+ text-align: left; /* don't inherit text-align: center; */
+}
+
+#dhSignupContent .dh-text-input, #dhWantsInEmailEntry {
+ margin-top: 3px;
+ margin-bottom: 7px;
+ width: 100%;
+}
+
+#dhLoginLink {
+ position: absolute;
+ top: 5px;
+ right: 10px;
+}
Added: dumbhippo/trunk/server/web/css3/signup.css
===================================================================
--- dumbhippo/trunk/server/web/css3/signup.css 2008-02-08 22:31:31 UTC (rev 7301)
+++ dumbhippo/trunk/server/web/css3/signup.css 2008-02-08 22:43:18 UTC (rev 7302)
@@ -0,0 +1,16 @@
+ CHARSET "UTF-8";
+ IMPORT url("signup-positions.css");
+
+#dhSignupContent {
+ font-size: 12px; /* for inheritance by text inside the form */
+ background-color: #fbf3fe;
+}
+
+.dh-landing-result {
+ font-weight: bold;
+ color: #cc0033;
+}
+
+.dh-landing-explanatory {
+ font-size: 13px;
+}
\ No newline at end of file
Modified: dumbhippo/trunk/server/web/css3/site.css
===================================================================
--- dumbhippo/trunk/server/web/css3/site.css 2008-02-08 22:31:31 UTC (rev 7301)
+++ dumbhippo/trunk/server/web/css3/site.css 2008-02-08 22:43:18 UTC (rev 7302)
@@ -139,13 +139,11 @@
}
.dh-special-subtitle {
- color: rgb(145,50,92);
- font-size: 16px;
- font-weight: bold;
+ font-size: 14px;
}
.dh-disclaimer {
- font-size: 10px;
+ font-size: 12px;
}
.dh-disclaimer-own-section {
@@ -722,3 +720,11 @@
.dh-separator-invisible {
background-color: white;
}
+
+.dh-landing-result {
+ color: red;
+}
+
+.dh-landing-explanatory {
+ font-size: 13px;
+}
Modified: dumbhippo/trunk/server/web/css3/who-are-you-positions.css
===================================================================
--- dumbhippo/trunk/server/web/css3/who-are-you-positions.css 2008-02-08 22:31:31 UTC (rev 7301)
+++ dumbhippo/trunk/server/web/css3/who-are-you-positions.css 2008-02-08 22:43:18 UTC (rev 7302)
@@ -1,7 +1,5 @@
@CHARSET "UTF-8";
-/* Override the 500px width that's normal for a zone box */
-
.dh-shiny-box-content-body {
position: relative;
text-align: center;
Deleted: dumbhippo/trunk/server/web/images2/header_login310.gif
===================================================================
(Binary files differ)
Deleted: dumbhippo/trunk/server/web/images2/header_login500.gif
===================================================================
(Binary files differ)
Deleted: dumbhippo/trunk/server/web/images2/header_signup500.gif
===================================================================
(Binary files differ)
Modified: dumbhippo/trunk/server/web/jsp-gnome/who-are-you.jsp
===================================================================
--- dumbhippo/trunk/server/web/jsp-gnome/who-are-you.jsp 2008-02-08 22:31:31 UTC (rev 7301)
+++ dumbhippo/trunk/server/web/jsp-gnome/who-are-you.jsp 2008-02-08 22:43:18 UTC (rev 7302)
@@ -55,8 +55,7 @@
<dht2:selfInvite promotion="${landing.openSignupPromotion}" invitesAvailable="${landing.selfInvitations}"/>
</c:when>
<c:otherwise>
- <p><strong>Enter your email address and we'll let you know when GNOME Online has more room. If you have a Mugshot account you can use it to log in.
- </strong></p>
+ Enter your email address and we'll let you know when GNOME Online has more room. If you have a Mugshot account you can use it to log in.
<dht2:wantsIn buttonText="Sign Me Up!"/>
</c:otherwise>
</c:choose>
Deleted: dumbhippo/trunk/server/web/jsp2/signup.jsp
===================================================================
--- dumbhippo/trunk/server/web/jsp2/signup.jsp 2008-02-08 22:31:31 UTC (rev 7301)
+++ dumbhippo/trunk/server/web/jsp2/signup.jsp 2008-02-08 22:43:18 UTC (rev 7302)
@@ -1,40 +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="landing" class="com.dumbhippo.web.pages.LandingPage" scope="request"/>
-
-<head>
- <title>Sign up for Mugshot</title>
- <dht:siteStyle/>
- <link rel="stylesheet" type="text/css" href="/css2/${buildStamp}/landing.css"/>
- <dht:faviconIncludes/>
-</head>
-<%-- TODO: could get a more appropriate header, but Sign Up works too. --%>
-<dht:systemPage disableJumpTo="true" currentPageLink="signup" topImage="/images2/${buildStamp}/header_signup500.gif" fullHeader="true">
-
- <dht:zoneBoxTitle>Sign up for Mugshot</dht:zoneBoxTitle>
-
- <div>
-
- <c:choose>
- <c:when test="${landing.selfInvitations > 0}">
- <br/>
- <dht:selfInvite promotion="${landing.openSignupPromotion}" invitesAvailable="${landing.selfInvitations}"/>
- </c:when>
- <c:otherwise>
- <p><strong>Enter your email address to request an invitation to Mugshot!
- </strong></p>
- <dht:wantsIn buttonText="Sign Me Up!"/>
- </c:otherwise>
- </c:choose>
- </div>
-
- <dht:zoneBoxSeparator/>
-
- <dht:notevil ownSection="true"/>
-
-</dht:systemPage>
-</html>
\ No newline at end of file
Deleted: dumbhippo/trunk/server/web/jsp2/summit.jsp
===================================================================
--- dumbhippo/trunk/server/web/jsp2/summit.jsp 2008-02-08 22:31:31 UTC (rev 7301)
+++ dumbhippo/trunk/server/web/jsp2/summit.jsp 2008-02-08 22:43:18 UTC (rev 7302)
@@ -1,53 +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="landing" class="com.dumbhippo.web.pages.LandingPage" scope="request"/>
-
-<head>
- <title>Invite Yourself for a Mugshot</title>
- <dht:siteStyle/>
- <link rel="stylesheet" type="text/css" href="/css2/${buildStamp}/landing.css"/>
- <dht:faviconIncludes/>
-</head>
-<%-- TODO: could get a more appropriate header, but Sign Up works too. --%>
-<dht:systemPage disableJumpTo="true" currentPageLink="summit" topImage="/images2/${buildStamp}/header_signup500.gif" fullHeader="true">
-
- <dht:zoneBoxTitle>Invite Yourself for a Mugshot</dht:zoneBoxTitle>
-
- <div>
- <br/>
- <%-- we are not offering this promotion any longer, so instead of invitesAvailable="${landing.selfInvitations}", --%>
- <%-- pretend we have no invites and offer people to "sign up" --%>
- <dht:selfInvite promotion="${landing.summitPromotion}" invitesAvailable="0" summitSelfInvite="true"/>
- </div>
-
- <dht:zoneBoxSeparator/>
-
- <dht:zoneBoxTitle>Preview of Coming Attractions</dht:zoneBoxTitle>
- <div id="dhLinkSwarmTag">
- <img src="/images2/${buildStamp}/linkswarmtag.gif"/>
- </div>
- <div id="dhLinkSwarmSample">
- <img src="/images2/${buildStamp}/bubblesample.gif"/>
- </div>
- <div class="dh-special-subtitle dh-landing-explanatory">
- A desktop tool for Windows and Linux. Instantly get the buzz on cool sites.
- </div>
- <br/>
- <div id="dhMusicRadarTag">
- <img src="/images2/${buildStamp}/musicradartag.gif"/>
- </div>
- <dht:beaconSamples/>
- <div class="dh-special-subtitle dh-landing-explanatory">
- Easy to add to a blog or MySpace. Select a theme or create your own.
- </div>
-
- <dht:zoneBoxSeparator/>
-
- <dht:notevil ownSection="true"/>
-
-</dht:systemPage>
-</html>
Modified: dumbhippo/trunk/server/web/tags/2/selfInvite.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/2/selfInvite.tag 2008-02-08 22:31:31 UTC (rev 7301)
+++ dumbhippo/trunk/server/web/tags/2/selfInvite.tag 2008-02-08 22:43:18 UTC (rev 7302)
@@ -5,7 +5,6 @@
<%-- this tag is intended to be included only if invites are available --%>
<%@ attribute name="promotion" required="true" type="java.lang.String"%>
<%@ attribute name="invitesAvailable" required="true" type="java.lang.Integer"%>
-<%@ attribute name="summitSelfInvite" required="false" type="java.lang.Boolean" %>
<%-- We need to uniquify ids across the generated output --%>
<c:if test="${empty dhSelfInviteCount}">
@@ -76,22 +75,13 @@
<div id="dhSelfInviteForm${N}">
<c:choose>
<c:when test="${invitesAvailable > 0}">
- <c:choose>
- <c:when test="${summitSelfInvite}">
- <div class="dh-special-subtitle">
- You heard, you browsed, you signed up!
- </div>
- </c:when>
- <c:otherwise>
- <div class="dh-special-subtitle">
- To sign up for <c:out value="${site.siteName}"/>, enter your email address.
- <br/>
- Then, check your email for a sign-in link.
- </div>
- </c:otherwise>
- </c:choose>
-
- <input type="text" class="dh-text-entry" id="dhSelfInviteAddress${N}" size="30"/>
+ <div class="dh-special-subtitle">
+ To sign up for <c:out value="${site.siteName}"/>, enter your email address.
+ Then, check your email for a sign-in link.
+ </div>
+ <div>
+ <input type="text" class="dh-text-input" id="dhSelfInviteAddress${N}" size="30"/>
+ </div>
<input type="button" id="dhSelfInviteButton" value="Send" onclick="dhSelfInvite${N}()"/>
</c:when>
<c:otherwise>
@@ -105,7 +95,6 @@
</c:otherwise>
</c:choose>
</div>
- <br/>
<div id="dhSelfInviteMessage${N}" class="dh-landing-result dhInvisible">
Thinking...
</div>
Modified: dumbhippo/trunk/server/web/tags/2/wantsIn.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/2/wantsIn.tag 2008-02-08 22:31:31 UTC (rev 7301)
+++ dumbhippo/trunk/server/web/tags/2/wantsIn.tag 2008-02-08 22:43:18 UTC (rev 7302)
@@ -9,6 +9,8 @@
<dh:script module="dh.actions"/>
<form method="post" action="/wantsin" onsubmit="return dh.actions.validateEmailInput('dhWantsInEmailEntry');">
- <input type="text" id="dhWantsInEmailEntry" name="address"/>
+ <div>
+ <input type="text" id="dhWantsInEmailEntry" name="address"/>
+ </div>
<input type="submit" value="${buttonText}"/>
</form>
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
