[cig-commits] r12005 - in cs/portal/trunk/northridge/SeismoWebPortal: . static static/images templates/SeismoWebPortal templates/registration
leif at geodynamics.org
leif at geodynamics.org
Thu May 22 13:34:37 PDT 2008
Author: leif
Date: 2008-05-22 13:34:37 -0700 (Thu, 22 May 2008)
New Revision: 12005
Added:
cs/portal/trunk/northridge/SeismoWebPortal/static/images/adobe-pdf.icon.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/cig.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/citlogo.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/cmtsolution.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/events.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/home.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/icon-no.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/icon-yes.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/kml.icon.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/mesh.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/modecat.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/nsf_logo.jpg
cs/portal/trunk/northridge/SeismoWebPortal/static/images/parameters.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/prem.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/seismolab_logo.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/specfem3dg_logo.jpg
cs/portal/trunk/northridge/SeismoWebPortal/static/images/stationlist.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/stations.gif
cs/portal/trunk/northridge/SeismoWebPortal/static/images/tg_logo.gif
Removed:
cs/portal/trunk/northridge/SeismoWebPortal/static/css/
cs/portal/trunk/northridge/SeismoWebPortal/static/icons/
cs/portal/trunk/northridge/SeismoWebPortal/static/pics/
Modified:
cs/portal/trunk/northridge/SeismoWebPortal/forms.py
cs/portal/trunk/northridge/SeismoWebPortal/models.py
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_upload.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/home.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_detail.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_list.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/specfem3dglobeparameters_list.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_upload.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
cs/portal/trunk/northridge/SeismoWebPortal/views.py
Log:
Junk removal pass. Quick code review.
Modified: cs/portal/trunk/northridge/SeismoWebPortal/forms.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/forms.py 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/forms.py 2008-05-22 20:34:37 UTC (rev 12005)
@@ -8,6 +8,7 @@
import cmt
import models
+
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Specfem 3D Globe meshes
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Modified: cs/portal/trunk/northridge/SeismoWebPortal/models.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/models.py 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/models.py 2008-05-22 20:34:37 UTC (rev 12005)
@@ -50,7 +50,7 @@
class Source(models.Model):
# an event is composed of one or more sources
- event = models.ForeignKey(Event)
+ event = models.ForeignKey(Event, db_index=True)
dataSource = models.ForeignKey(DataSource)
@@ -197,7 +197,7 @@
class Station(models.Model):
# each user has their own stations
- stationList = models.ForeignKey(StationList)
+ stationList = models.ForeignKey(StationList, db_index=True)
code = models.CharField(maxlength=10) # 3-4 chars currently
name = models.CharField(maxlength=100)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/adobe-pdf.icon.gif (from rev 11876, cs/portal/trunk/northridge/SeismoWebPortal/static/pics/adobe-pdf.icon.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/cig.gif (from rev 11876, cs/portal/trunk/northridge/SeismoWebPortal/static/pics/cig.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/citlogo.gif (from rev 11876, cs/portal/trunk/northridge/SeismoWebPortal/static/pics/citlogo.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/cmtsolution.gif (from rev 11876, cs/portal/trunk/northridge/SeismoWebPortal/static/pics/cmtsolution.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/events.gif (from rev 11961, cs/portal/trunk/northridge/SeismoWebPortal/static/icons/events.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/home.gif (from rev 11961, cs/portal/trunk/northridge/SeismoWebPortal/static/icons/home.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/icon-no.gif (from rev 11876, cs/portal/trunk/northridge/SeismoWebPortal/static/pics/icon-no.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/icon-yes.gif (from rev 11876, cs/portal/trunk/northridge/SeismoWebPortal/static/pics/icon-yes.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/kml.icon.gif (from rev 11876, cs/portal/trunk/northridge/SeismoWebPortal/static/pics/kml.icon.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/mesh.gif (from rev 11921, cs/portal/trunk/northridge/SeismoWebPortal/static/icons/mesh.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/modecat.gif (from rev 11921, cs/portal/trunk/northridge/SeismoWebPortal/static/icons/modecat.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/nsf_logo.jpg (from rev 11876, cs/portal/trunk/northridge/SeismoWebPortal/static/pics/nsf_logo.jpg)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/parameters.gif (from rev 11921, cs/portal/trunk/northridge/SeismoWebPortal/static/icons/parameters.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/prem.gif (from rev 11961, cs/portal/trunk/northridge/SeismoWebPortal/static/icons/prem.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/seismolab_logo.gif (from rev 11876, cs/portal/trunk/northridge/SeismoWebPortal/static/pics/seismolab_logo.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/specfem3dg_logo.jpg (from rev 11876, cs/portal/trunk/northridge/SeismoWebPortal/static/pics/specfem3dg_logo.jpg)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/stationlist.gif (from rev 11921, cs/portal/trunk/northridge/SeismoWebPortal/static/icons/stationlist.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/stations.gif (from rev 11877, cs/portal/trunk/northridge/SeismoWebPortal/static/pics/stations.gif)
===================================================================
(Binary files differ)
Copied: cs/portal/trunk/northridge/SeismoWebPortal/static/images/tg_logo.gif (from rev 11876, cs/portal/trunk/northridge/SeismoWebPortal/static/pics/tg_logo.gif)
===================================================================
(Binary files differ)
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_upload.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_upload.html 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_upload.html 2008-05-22 20:34:37 UTC (rev 12005)
@@ -37,7 +37,7 @@
known as the Harvard CMT catalog). It looks like this:</p>
<div class=illustration id=cmtsolutionIllustration>
- <img src="{{root}}/pics/cmtsolution.gif" width=700 height=310>
+ <img src="{{root}}/images/cmtsolution.gif" width=700 height=310>
<p class=caption><code>CMTSOLUTION</code> file obtained from the
Harvard CMT catalog. The top line is the initial estimate of the
source, which is used as a starting point for the CMT
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/home.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/home.html 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/home.html 2008-05-22 20:34:37 UTC (rev 12005)
@@ -33,7 +33,7 @@
<h3>tips</h3>
-<p><img src="{{root}}/pics/kml.icon.gif"> If you have
+<p><img src="{{root}}/images/kml.icon.gif"> If you have
<a href="http://earth.google.com/">Google Earth</a> installed on your
computer, you can use it to map events and stations. Just look for
the KML icon and click it!</p>
@@ -46,4 +46,4 @@
<h3>additional documentation</h3>
<p><a href="{{root}}/doc/manual_SPECFEM3D_GLOBE.pdf">
- <img src="{{root}}/pics/adobe-pdf.icon.gif">SPECFEM 3D GLOBE User Manual</a>
+ <img src="{{root}}/images/adobe-pdf.icon.gif">SPECFEM 3D GLOBE User Manual</a>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_detail.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_detail.html 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_detail.html 2008-05-22 20:34:37 UTC (rev 12005)
@@ -5,10 +5,10 @@
<dt>model</dt><dd><a href="{{root}}/?class=MineosModel&object={{object.model.id}}">{{ object.model }}</a></dd>
<dt>mode catalog</dt><dd><a href="{{root}}/?class=MineosModeCatalog&object={{object.model.id}}">{{ object.catalog }}</a></dd>
<dt>oscillations</dt>
- <dd><img src="{{root}}/pics/icon-{% if object.radial %}yes{% else %}no{% endif %}.gif" alt="{{ object.radial }}"> radial</dd>
- <dd><img src="{{root}}/pics/icon-{% if object.toroidal %}yes{% else %}no{% endif %}.gif" alt="{{ object.toroidal }}"> toroidal </dd>
- <dd><img src="{{root}}/pics/icon-{% if object.spheroidal %}yes{% else %}no{% endif %}.gif" alt="{{ object.spheroidal }}"> spheroidal</dd>
- <dd><img src="{{root}}/pics/icon-{% if object.ictoroidal %}yes{% else %}no{% endif %}.gif" alt="{{ object.ictoroidal }}"> inner core toroidal</dd>
+ <dd><img src="{{root}}/images/icon-{% if object.radial %}yes{% else %}no{% endif %}.gif" alt="{{ object.radial }}"> radial</dd>
+ <dd><img src="{{root}}/images/icon-{% if object.toroidal %}yes{% else %}no{% endif %}.gif" alt="{{ object.toroidal }}"> toroidal </dd>
+ <dd><img src="{{root}}/images/icon-{% if object.spheroidal %}yes{% else %}no{% endif %}.gif" alt="{{ object.spheroidal }}"> spheroidal</dd>
+ <dd><img src="{{root}}/images/icon-{% if object.ictoroidal %}yes{% else %}no{% endif %}.gif" alt="{{ object.ictoroidal }}"> inner core toroidal</dd>
<dt>select frequency range</dt><dd>{{ object.fmin }} <= f < {{ object.fmax }}</dd>
<dt>sampling period</dt><dd>{{ object.step }}s</dd>
</dl>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_list.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_list.html 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_list.html 2008-05-22 20:34:37 UTC (rev 12005)
@@ -29,10 +29,10 @@
<td><a href="{{root}}/?class=MineosParameters&object={{object.id}}">{{ object }}</a></td>
<td>{{ object.model }}</td>
<td>{{ object.catalog }}</td>
- <td><img src="{{root}}/pics/icon-{% if object.radial %}yes{% else %}no{% endif %}.gif" alt="{{ object.radial }}"></td>
- <td><img src="{{root}}/pics/icon-{% if object.toroidal %}yes{% else %}no{% endif %}.gif" alt="{{ object.toroidal }}"></td>
- <td><img src="{{root}}/pics/icon-{% if object.spheroidal %}yes{% else %}no{% endif %}.gif" alt="{{ object.spheroidal }}"></td>
- <td><img src="{{root}}/pics/icon-{% if object.ictoroidal %}yes{% else %}no{% endif %}.gif" alt="{{ object.ictoroidal }}"></td>
+ <td><img src="{{root}}/images/icon-{% if object.radial %}yes{% else %}no{% endif %}.gif" alt="{{ object.radial }}"></td>
+ <td><img src="{{root}}/images/icon-{% if object.toroidal %}yes{% else %}no{% endif %}.gif" alt="{{ object.toroidal }}"></td>
+ <td><img src="{{root}}/images/icon-{% if object.spheroidal %}yes{% else %}no{% endif %}.gif" alt="{{ object.spheroidal }}"></td>
+ <td><img src="{{root}}/images/icon-{% if object.ictoroidal %}yes{% else %}no{% endif %}.gif" alt="{{ object.ictoroidal }}"></td>
<td>{{ object.fmin }}</td>
<td>{{ object.fmax }}</td>
<td>{{ object.step }}</td>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html 2008-05-22 20:34:37 UTC (rev 12005)
@@ -7,7 +7,7 @@
<tr>
<td>
<h1>
- <img src="{{root}}/pics/cig.gif">
+ <img src="{{root}}/images/cig.gif">
<img src="{{root}}/images/seismogram.gif">
CIG Seismology Web Portal
</h1>
@@ -24,7 +24,7 @@
<table id=buttonbar>
<tr>
<td align=center>
- <a href="{{root}}/"><img src="{{root}}/icons/home.gif" width=32 height=32><br>
+ <a href="{{root}}/"><img src="{{root}}/images/home.gif" width=32 height=32><br>
Home</a>
</td>
<td align=center>
@@ -32,33 +32,33 @@
Runs</a>
</td>
<td align=center>
- <a href="{{root}}/?class=Event"><img src="{{root}}/icons/events.gif" width=32 height=32><br>
+ <a href="{{root}}/?class=Event"><img src="{{root}}/images/events.gif" width=32 height=32><br>
Events</a>
</td>
<td align=center>
- <a href="{{root}}/?class=StationList"><img src="{{root}}/icons/stationlist.gif" width=32 height=32><br>
+ <a href="{{root}}/?class=StationList"><img src="{{root}}/images/stationlist.gif" width=32 height=32><br>
Stations</a>
</td>
<td class=separator></td>
<td align=center>
- <a href="{{root}}/?class=Specfem3DGlobeParameters"><img src="{{root}}/icons/parameters.gif" width=32 height=32><br>
+ <a href="{{root}}/?class=Specfem3DGlobeParameters"><img src="{{root}}/images/parameters.gif" width=32 height=32><br>
3D Parameters</a>
</td>
<td align=center>
- <a href="{{root}}/?class=Specfem3DGlobeMesh"><img src="{{root}}/icons/mesh.gif" width=32 height=32><br>
+ <a href="{{root}}/?class=Specfem3DGlobeMesh"><img src="{{root}}/images/mesh.gif" width=32 height=32><br>
Meshes</a>
</td>
<td class=separator></td>
<td align=center>
- <a href="{{root}}/?class=MineosParameters"><img src="{{root}}/icons/parameters.gif" width=32 height=32><br>
+ <a href="{{root}}/?class=MineosParameters"><img src="{{root}}/images/parameters.gif" width=32 height=32><br>
1D Parameters</a>
</td>
<td align=center>
- <a href="{{root}}/?class=MineosModel"><img src="{{root}}/icons/prem.gif" width=32 height=32><br>
+ <a href="{{root}}/?class=MineosModel"><img src="{{root}}/images/prem.gif" width=32 height=32><br>
1D Models</a>
</td>
<td align=center>
- <a href="{{root}}/?class=MineosModeCatalog"><img src="{{root}}/icons/modecat.gif" width=32 height=32><br>
+ <a href="{{root}}/?class=MineosModeCatalog"><img src="{{root}}/images/modecat.gif" width=32 height=32><br>
Mode Catalogs</a>
</td>
</tr>
@@ -144,19 +144,19 @@
<ul>
<li>
{% if downloadableAsText %}
- <a href="{{root}}/?class={{klass}}&object={{object.id}}&action=downloadAsText"><img src="{{root}}/icons/document.gif" width=32 height=32> Text</a>
+ <a href="{{root}}/?class={{klass}}&object={{object.id}}&action=downloadAsText"><img src="{{root}}/images/document.gif" width=32 height=32> Text</a>
{% else %}
- <span class="actionMenuItem disabled"><img src="{{root}}/icons/document.gif" width=32 height=32> Text</span>
+ <span class="actionMenuItem disabled"><img src="{{root}}/images/document.gif" width=32 height=32> Text</span>
{% endif %}
</li>
<li>
{% if downloadableAsKML %}
- <a href="{{root}}/?class={{klass}}&object={{object.id}}&action=downloadAsKML"><img src="{{root}}/pics/kml.icon.gif"> Google Earth Map</a>
+ <a href="{{root}}/?class={{klass}}&object={{object.id}}&action=downloadAsKML"><img src="{{root}}/images/kml.icon.gif"> Google Earth Map</a>
{% else %}
- <span class="actionMenuItem disabled"><img src="{{root}}/pics/kml.icon.gif"> Google Earth Map</span>
+ <span class="actionMenuItem disabled"><img src="{{root}}/images/kml.icon.gif"> Google Earth Map</span>
{% endif %}
</li>
- <li><span class="actionMenuItem disabled"><img src="{{root}}/pics/adobe-pdf.icon.gif"> PDF</span></li>
+ <li><span class="actionMenuItem disabled"><img src="{{root}}/images/adobe-pdf.icon.gif"> PDF</span></li>
<li><span class="actionMenuItem disabled"><img src="{{root}}/images/ps.gif"> PostScript</span></li>
</ul>
</dd>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/register.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/register.html 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/register.html 2008-05-22 20:34:37 UTC (rev 12005)
@@ -3,7 +3,7 @@
{% block body %}
-<p><a href="{{root}}/"><img id=logo src="{{root}}/pics/specfem3dg_logo.jpg" width=99 height=94>Home</a>
+<p><a href="{{root}}/"><img id=logo src="{{root}}/images/specfem3dg_logo.jpg" width=99 height=94>Home</a>
<h2>new user registration</h2>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html 2008-05-22 20:34:37 UTC (rev 12005)
@@ -22,12 +22,12 @@
<td>{{ object.mesh }}<br>
<span class=inlineInfo>shortest period ≅ {{ object.mesh.shortestPeriod|stringformat:".0f" }}s</span></td>
<td>{{ object.get_model_display }}</td>
- <td><img src="{{root}}/pics/icon-{% if object.oceans %}yes{% else %}no{% endif %}.gif" alt="{{ object.oceans }}"></td>
- <td><img src="{{root}}/pics/icon-{% if object.gravity %}yes{% else %}no{% endif %}.gif" alt="{{ object.gravity }}"></td>
- <td><img src="{{root}}/pics/icon-{% if object.attenuation %}yes{% else %}no{% endif %}.gif" alt="{{ object.attenuation }}"></td>
- <td><img src="{{root}}/pics/icon-{% if object.topography %}yes{% else %}no{% endif %}.gif" alt="{{ object.topography }}"></td>
- <td><img src="{{root}}/pics/icon-{% if object.rotation %}yes{% else %}no{% endif %}.gif" alt="{{ object.rotation }}"></td>
- <td><img src="{{root}}/pics/icon-{% if object.ellipticity %}yes{% else %}no{% endif %}.gif" alt="{{ object.ellipticity }}"></td>
+ <td><img src="{{root}}/images/icon-{% if object.oceans %}yes{% else %}no{% endif %}.gif" alt="{{ object.oceans }}"></td>
+ <td><img src="{{root}}/images/icon-{% if object.gravity %}yes{% else %}no{% endif %}.gif" alt="{{ object.gravity }}"></td>
+ <td><img src="{{root}}/images/icon-{% if object.attenuation %}yes{% else %}no{% endif %}.gif" alt="{{ object.attenuation }}"></td>
+ <td><img src="{{root}}/images/icon-{% if object.topography %}yes{% else %}no{% endif %}.gif" alt="{{ object.topography }}"></td>
+ <td><img src="{{root}}/images/icon-{% if object.rotation %}yes{% else %}no{% endif %}.gif" alt="{{ object.rotation }}"></td>
+ <td><img src="{{root}}/images/icon-{% if object.ellipticity %}yes{% else %}no{% endif %}.gif" alt="{{ object.ellipticity }}"></td>
</tr>
{% endfor %}
</tbody>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html 2008-05-22 20:34:37 UTC (rev 12005)
@@ -22,15 +22,13 @@
<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>.
- <p><img src="{{root}}/pics/specfem3dg.jpg" width=393 height=374>
-
<p id=sponsored>Sponsored by:</p>
<ul class=sponsors>
- <li><a href="http://www.geodynamics.org/"><img src="{{root}}/pics/cig-logo_small-initials.gif"></a>
- <li><a href="http://www.caltech.edu/"><img src="{{root}}/pics/citlogo.gif"></a>
- <li><a href="http://www.seismolab.caltech.edu/"><img src="{{root}}/pics/seismolab_logo.gif"></a>
- <li><a href="http://www.nsf.gov/"><img src="{{root}}/pics/nsf_logo.jpg"></a>
- <li><a href="http://www.teragrid.org/"><img src="{{root}}/pics/tg_logo.gif"></a>
+ <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>
+ <li><a href="http://www.nsf.gov/"><img src="{{root}}/images/nsf_logo.jpg"></a>
+ <li><a href="http://www.teragrid.org/"><img src="{{root}}/images/tg_logo.gif"></a>
</ul>
</div> <!-- splash -->
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_upload.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_upload.html 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_upload.html 2008-05-22 20:34:37 UTC (rev 12005)
@@ -39,7 +39,7 @@
<code>STATIONS</code> file, which looks like this:</p>
<div class=illustration id=stations>
- <img src="{{root}}/pics/stations.gif" width=576 height=322>
+ <img src="{{root}}/images/stations.gif" width=576 height=322>
<p class=caption>Sample <code>STATIONS</code> file.</p>
</div>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/login.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/login.html 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/login.html 2008-05-22 20:34:37 UTC (rev 12005)
@@ -3,7 +3,7 @@
{% block body %}
-<p><a href="{{root}}/"><img id=logo src="{{root}}/pics/specfem3dg_logo.jpg" width=99 height=94>Home</a>
+<p><a href="{{root}}/"><img id=logo src="{{root}}/images/specfem3dg_logo.jpg" width=99 height=94>Home</a>
<h1 class=titlebar>login</h1>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset.html 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset.html 2008-05-22 20:34:37 UTC (rev 12005)
@@ -3,7 +3,7 @@
{% block body %}
-<p><a href="{{root}}/"><img id=logo src="{{root}}/pics/specfem3dg_logo.jpg" width=99 height=94>Home</a>
+<p><a href="{{root}}/"><img id=logo src="{{root}}/images/specfem3dg_logo.jpg" width=99 height=94>Home</a>
<h1 class=titlebar>password reset</h1>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset_done.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset_done.html 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/registration/pwreset_done.html 2008-05-22 20:34:37 UTC (rev 12005)
@@ -3,7 +3,7 @@
{% block body %}
-<p><a href="{{root}}/"><img id=logo src="{{root}}/pics/specfem3dg_logo.jpg" width=99 height=94>Home</a>
+<p><a href="{{root}}/"><img id=logo src="{{root}}/images/specfem3dg_logo.jpg" width=99 height=94>Home</a>
<h1 class=titlebar>password reset</h1>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/views.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/views.py 2008-05-22 20:04:08 UTC (rev 12004)
+++ cs/portal/trunk/northridge/SeismoWebPortal/views.py 2008-05-22 20:34:37 UTC (rev 12005)
@@ -29,7 +29,7 @@
if request.user.is_anonymous():
if request.GET:
return login_redirect(request, root)
- return render_to_response('SeismoWebPortal/splash.html', {},
+ return render_to_response('SeismoWebPortal/splash.html', {'root': root},
RequestContext(request, {}))
className = request.REQUEST.get('class')
More information about the cig-commits
mailing list