[cig-commits] r12040 - in cs/portal/trunk/northridge/SeismoWebPortal: static/images templates/SeismoWebPortal templates/registration
leif at geodynamics.org
leif at geodynamics.org
Wed May 28 01:38:03 PDT 2008
Author: leif
Date: 2008-05-28 01:38:03 -0700 (Wed, 28 May 2008)
New Revision: 12040
Added:
cs/portal/trunk/northridge/SeismoWebPortal/static/images/cig-logo_small-initials.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/mineos_logo.gif
Removed:
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/settings.html
Modified:
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/base.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/password_change_form.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/register.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/style.css
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/userinfo_form.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/login.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset_done.html
Log:
Updated splash, login, registration, and profile pages.
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/cig-logo_small-initials.gif (from rev 12039, cs/portal/trunk/seismo/SeismoWebPortal/static/pics/cig-logo_small-initials.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/mineos_logo.gif (from rev 12039, cs/portal/trunk/seismo/SeismoWebPortal/static/pics/mineos_logo.gif)
===================================================================
(Binary files differ)
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/base.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/base.html 2008-05-28 04:01:57 UTC (rev 12039)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/base.html 2008-05-28 08:38:03 UTC (rev 12040)
@@ -3,11 +3,22 @@
{% block body %}
-<!--
-<div class="messages {% if messages %}active{% endif %}">{% if messages %}{{ messages|join:" " }}{% else %} {% endif %}</div>
--->
+<table id=header cellspacing=0>
+ <tr>
+ <td>
+ <h1>
+ <a href="{{root}}/">
+ <img src="{{root}}/images/cig.gif">
+ <img src="{{root}}/images/seismogram.gif"></a>
+ CIG Seismology Web Portal
+ </h1>
+ </td>
+ <td id=login align=right colspan=2>
+ </td>
+ </tr>
+</table>
-{% block desktop %}
+{% block content %}
{% endblock %}
{% endblock %}
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/password_change_form.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/password_change_form.html 2008-05-28 04:01:57 UTC (rev 12039)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/password_change_form.html 2008-05-28 08:38:03 UTC (rev 12040)
@@ -1,16 +1,11 @@
-{% extends "SeismoWebPortal/settings.html" %}
+{% extends "SeismoWebPortal/base.html" %}
{% block content %}
-<h2>profile</h2>
+<p><a href="{{root}}/">Home</a> ~ <a href="{{root}}/registration/">Edit Contact Information</a></p>
-<div class=tabs>
- <ul>
- <li class=first><a href="{{root}}/registration/">registration</a>
- <li class=selected><a href="{{root}}/registration/password/">password</a>
- </ul>
-</div>
+<h2>Profile → Change Password</h2>
{% if form.has_errors %}
<p><span class=error>Please correct the following error{{ form.error_dict|pluralize }}.</span>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html 2008-05-28 04:01:57 UTC (rev 12039)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html 2008-05-28 08:38:03 UTC (rev 12040)
@@ -1,7 +1,7 @@
-{% extends "SeismoWebPortal/base.html" %}
+{% extends "SeismoWebPortal/root.html" %}
-{% block desktop %}
+{% block body %}
<table id=header cellspacing=0>
<tr>
@@ -15,8 +15,9 @@
<td id=login align=right colspan=2>
{% if user.is_authenticated %}
<img src="{{root}}/images/user.gif"> {{ user.first_name }} ({{ user.username }}) ~
+ <a href="{{root}}/registration/">Profile</a> ~
+ <a class="actionButton" href="{{root}}/logout/">logout</a>
{% endif %}
- <a class="actionButton" href="{{root}}/logout/">logout</a>
</td>
</tr>
<tr>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/register.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/register.html 2008-05-28 04:01:57 UTC (rev 12039)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/register.html 2008-05-28 08:38:03 UTC (rev 12040)
@@ -1,12 +1,10 @@
-{% extends "SeismoWebPortal/root.html" %}
+{% extends "SeismoWebPortal/base.html" %}
-{% block body %}
+{% block content %}
-<p><a href="{{root}}/"><img id=logo src="{{root}}/images/specfem3dg_logo.jpg" width=99 height=94>Home</a>
+<h2>New User Registration</h2>
-<h2>new user registration</h2>
-
<p>To create a new account, simply fill-out the form below.
<p>If you've registered before, but have simply forgotten your username and/or password, try <a href="{{root}}/pwreset/">resetting your password</a>.
Deleted: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/settings.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/settings.html 2008-05-28 04:01:57 UTC (rev 12039)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/settings.html 2008-05-28 08:38:03 UTC (rev 12040)
@@ -1,11 +0,0 @@
-
-{% extends "SeismoWebPortal/base.html" %}
-
-{% block desktop %}
-
-{{taskbar}}
-
-{% block content %}
-{% endblock %}
-
-{% endblock %}
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html 2008-05-28 04:01:57 UTC (rev 12039)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html 2008-05-28 08:38:03 UTC (rev 12040)
@@ -1,29 +1,29 @@
-{% extends "SeismoWebPortal/root.html" %}
+{% extends "SeismoWebPortal/base.html" %}
-{% block body %}
+{% block content %}
-<div class=splash>
+<div id="splash">
- <div class=nameplate>
- <p id=presented>Presented by:</p>
- <ul class=producers>
- <li><a href="http://www.geodynamics.org/">Computational Infrastructure for Geodynamics</a>
- <li><a href="http://www.caltech.edu/">California Institute of Technology</a>
- </ul>
- <h1>SPECFEM 3D GLOBE</h1>
- <h2>Web Portal</h2>
- </div>
+ <p>Version 3</p>
- <p>Version 3.6.1
+ <p id="powered">Powered by:</p>
+ <ul id="codes">
+ <li><img src="{{root}}/images/specfem3dg_logo.jpg" width=99 height=94> Specfem 3D Globe v4.0
+ <li><img src="{{root}}/images/mineos_logo.gif" width=75 height=75> Mineos v1.0
+ </ul>
- <p><a class=button href="login/">login</a>
+ <hr>
+ <p id="login"><a href="login/">Login</a></p>
+
<p>Are you a new user? If so, please <a href="registration/">register</a>.<br>
- If you need help, <a href="mailto:portal at geodynamics.org">contact us</a>.
+ If you need help, <a href="mailto:portal at geodynamics.org">contact us</a>.</p>
- <p id=sponsored>Sponsored by:</p>
- <ul class=sponsors>
+ <hr>
+
+ <p id="sponsored">Brought to you by:</p>
+ <ul id="sponsors">
<li><a href="http://www.geodynamics.org/"><img src="{{root}}/images/cig-logo_small-initials.gif"></a>
<li><a href="http://www.caltech.edu/"><img src="{{root}}/images/citlogo.gif"></a>
<li><a href="http://www.seismolab.caltech.edu/"><img src="{{root}}/images/seismolab_logo.gif"></a>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/style.css
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/style.css 2008-05-28 04:01:57 UTC (rev 12039)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/style.css 2008-05-28 08:38:03 UTC (rev 12040)
@@ -463,3 +463,48 @@
padding: 1em;
background-color: #eee;
}
+
+
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ splash
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+
+#header h1 a {
+ text-decoration: none;
+}
+
+#splash {
+ text-align: center;
+}
+
+#powered, #presented, #sponsored {
+ font-style: italic;
+}
+
+#splash hr {
+ width: 50%;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
+
+#codes li,
+#sponsors li {
+ list-style: none;
+}
+
+#sponsors li {
+ display: inline;
+ padding-left: .5em;
+ padding-right: .5em;
+}
+
+#codes img,
+#sponsors img {
+ vertical-align: middle;
+}
+
+#splash #login {
+ font-size: xx-large;
+}
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/userinfo_form.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/userinfo_form.html 2008-05-28 04:01:57 UTC (rev 12039)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/userinfo_form.html 2008-05-28 08:38:03 UTC (rev 12040)
@@ -1,16 +1,11 @@
-{% extends "SeismoWebPortal/settings.html" %}
+{% extends "SeismoWebPortal/base.html" %}
{% block content %}
-<h2>profile</h2>
+<p><a href="{{root}}/">Home</a> ~ <a href="{{root}}/registration/password/">Change Password</a></p>
-<div class=tabs>
- <ul>
- <li class="selected first"><a href="{{root}}/registration/">registration</a>
- <li><a href="{{root}}/registration/password/">password</a>
- </ul>
-</div>
+<h2>Profile → Edit Contact Information</h2>
{% if form.has_errors %}
<p><span class=error>Please correct the following error{{ form.error_dict|pluralize }}.</span>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/login.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/login.html 2008-05-28 04:01:57 UTC (rev 12039)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/login.html 2008-05-28 08:38:03 UTC (rev 12040)
@@ -1,12 +1,10 @@
-{% extends "SeismoWebPortal/root.html" %}
+{% extends "SeismoWebPortal/base.html" %}
-{% block body %}
+{% block content %}
-<p><a href="{{root}}/"><img id=logo src="{{root}}/images/specfem3dg_logo.jpg" width=99 height=94>Home</a>
+<h2>Login</h2>
-<h1 class=titlebar>login</h1>
-
{% if form.has_errors %}
<dl class=error>
{% for f in form.error_dict.iteritems %}
@@ -36,7 +34,7 @@
{{ form.password }}
</div>
- <div><input class=submit type="submit" value="login" /></div>
+ <div><input class=submit type="submit" value="Login" /></div>
{% if next %}
<input type="hidden" name="next" value="{{ next }}" />
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset.html 2008-05-28 04:01:57 UTC (rev 12039)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset.html 2008-05-28 08:38:03 UTC (rev 12040)
@@ -1,12 +1,10 @@
-{% extends "SeismoWebPortal/root.html" %}
+{% extends "SeismoWebPortal/base.html" %}
-{% block body %}
+{% block content %}
-<p><a href="{{root}}/"><img id=logo src="{{root}}/images/specfem3dg_logo.jpg" width=99 height=94>Home</a>
+<h2>Password Reset</h2>
-<h1 class=titlebar>password reset</h1>
-
<p>Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you.</p>
<form action="{{action}}" method="post">
@@ -22,7 +20,7 @@
{{ form.email }} {% if form.email.errors %}<span class=error>{{ form.email.errors|join:", " }}</span>{% endif %}
</div>
- <input class=submit type="submit" value="reset my password" /></p>
+ <input class=submit type="submit" value="Reset My Password" /></p>
</div> <!-- tab30ex -->
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset_done.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset_done.html 2008-05-28 04:01:57 UTC (rev 12039)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset_done.html 2008-05-28 08:38:03 UTC (rev 12040)
@@ -1,12 +1,10 @@
-{% extends "SeismoWebPortal/root.html" %}
+{% extends "SeismoWebPortal/base.html" %}
-{% block body %}
+{% block content %}
-<p><a href="{{root}}/"><img id=logo src="{{root}}/images/specfem3dg_logo.jpg" width=99 height=94>Home</a>
+<h2>Password Reset</h2>
-<h1 class=titlebar>password reset</h1>
-
<p><b>Success!</b> We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly.</p>
<p><a href="{{root}}/login/">Login</a></p>
More information about the cig-commits
mailing list