[cig-commits] r12019 - in cs/portal/trunk/northridge/SeismoWebPortal: . templates/SeismoWebPortal
leif at geodynamics.org
leif at geodynamics.org
Fri May 23 19:57:03 PDT 2008
Author: leif
Date: 2008-05-23 19:57:03 -0700 (Fri, 23 May 2008)
New Revision: 12019
Modified:
cs/portal/trunk/northridge/SeismoWebPortal/models.py
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_confirm_delete.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_form.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_list.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_search.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_search_results.html
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/mesh_form_base.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mesh_form_global.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_confirm_delete.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_detail.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_form.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_list.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_confirm_delete.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_detail.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_form.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_list.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_upload.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_confirm_delete.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_detail.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_form.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_list.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_confirm_delete.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_detail.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_form.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_list.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/single_source_event_form.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemesh_confirm_delete.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemesh_detail.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemesh_list.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_confirm_delete.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_detail.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_confirm_delete.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_detail.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_form.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_list.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_upload.html
cs/portal/trunk/northridge/SeismoWebPortal/views.py
Log:
Cleaned-up h2 headings; added list headings; added icon to headings
for context.
Modified: cs/portal/trunk/northridge/SeismoWebPortal/models.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/models.py 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/models.py 2008-05-24 02:57:03 UTC (rev 12019)
@@ -407,7 +407,7 @@
list_display = ('status', 'started', 'finished')
def __str__(self):
- return "run %04d" % self.id
+ return "Run %04d" % self.id
class Job(models.Model):
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_confirm_delete.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_confirm_delete.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_confirm_delete.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>delete event</h2>
+<h2>Delete Event</h2>
<form method="post" action="{{action}}">
<input type="hidden" name="class" value="Event">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_form.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_form.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_form.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>rename event</h2>
+<h2>Rename Event</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/event_list.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_list.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_list.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,4 +1,6 @@
+<h2><img src="{{root}}/images/events.gif" width=32 height=32> Events</h2>
+
{% if object_list %}
<table rules=cols class="clickable">
<thead>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_search.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_search.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_search.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>event search</h2>
+<h2>Event Search</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/event_search_results.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_search_results.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_search_results.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>event search results</h2>
+<h2>Event Search Results</h2>
{% if error %}
<p><span class=error>{{ error }}</span></p>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_upload.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_upload.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/event_upload.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>upload event</h2>
+<h2>Upload Event</h2>
<form action="{{action}}" method="post" enctype="multipart/form-data">
<input type="hidden" name="class" value="Event">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/home.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/home.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/home.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>home</h2>
+<h2><img src="{{root}}/images/home.gif" width=32 height=32> Home</h2>
<h3>quick start</h3>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mesh_form_base.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mesh_form_base.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mesh_form_base.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>{% if object %}edit{% else %}new{% endif %} {% block heading %}{{ nchunks }}-chunk regional mesh{% endblock %}</h2>
+<h2><img src="{{root}}/images/mesh.gif" width=32 height=32> {% if object %}Edit{% else %}New{% endif %} {% block heading %}{{ nchunks }}-chunk Regional Mesh{% endblock %}</h2>
<form name="mesh_form" method="post" action="{{action}}">
<input type="hidden" name="class" value="Specfem3DGlobeMesh">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mesh_form_global.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mesh_form_global.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mesh_form_global.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,7 +1,7 @@
{% extends "SeismoWebPortal/mesh_form_3chunks.html" %}
-{% block heading %}global mesh{% endblock %}
+{% block heading %}Global Mesh{% endblock %}
<!-- chuck position is meaningless for a global simulation -->
{% block mesh_chunk_position %}
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_confirm_delete.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_confirm_delete.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_confirm_delete.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>delete mineos mode catalog</h2>
+<h2><img src="{{root}}/images/modecat.gif" width=32 height=32> Delete Mineos Mode Catalog</h2>
<form method="post" action="{{action}}">
<input type="hidden" name="class" value="MineosModeCatalog">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_detail.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_detail.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_detail.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>{{ object }}</h2>
+<h2><img src="{{root}}/images/modecat.gif" width=32 height=32> {{ object }}</h2>
<dl class=parameters>
<dt>eps</dt><dd>{{ object.eps }}</dd>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_form.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_form.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_form.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>{% if object %}edit{% else %}new{% endif %} Mineos mode catalog</h2>
+<h2><img src="{{root}}/images/modecat.gif" width=32 height=32> {% if object %}Edit{% else %}New{% endif %} Mineos Mode Catalog</h2>
<form method="post" action="{{action}}">
<input type="hidden" name="class" value="MineosModeCatalog">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_list.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_list.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodecatalog_list.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,10 +1,12 @@
+<h2><img src="{{root}}/images/modecat.gif" width=32 height=32> Mode Catalogs</h2>
+
{% if object_list %}
<table rules=cols class="clickable">
<thead>
<tr>
- <th rowspan=2></th>
+ <th rowspan=2 valign=bottom>name</th>
<th rowspan=2 valign=bottom>eps</th>
<th rowspan=2 valign=bottom>wgrav<br><small>(mHz)</small></th>
<th colspan=2 valign=bottom><center>angular<br>orders</center></th>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_confirm_delete.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_confirm_delete.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_confirm_delete.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>delete mineos model</h2>
+<h2><img src="{{root}}/images/prem.gif" width=32 height=32> Delete Mineos Model</h2>
<form method="post" action="{{action}}">
<input type="hidden" name="class" value="MineosModel">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_detail.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_detail.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_detail.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>{{ object }}</h2>
+<h2><img src="{{root}}/images/prem.gif" width=32 height=32> {{ object }}</h2>
<pre>
{{ object.data }}
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_form.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_form.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_form.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>rename mineos model</h2>
+<h2><img src="{{root}}/images/prem.gif" width=32 height=32> Rename Mineos Model</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/mineosmodel_list.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_list.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_list.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,4 +1,6 @@
+<h2><img src="{{root}}/images/prem.gif" width=32 height=32> 1D Models</h2>
+
{% if object_list %}
<table rules=cols class="clickable">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_upload.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_upload.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosmodel_upload.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>upload mineos model</h2>
+<h2><img src="{{root}}/images/prem.gif" width=32 height=32> Upload Mineos Model</h2>
<form action="{{action}}" method="POST" enctype="multipart/form-data">
<input type="hidden" name="class" value="MineosModel">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_confirm_delete.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_confirm_delete.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_confirm_delete.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>delete mineos parameters</h2>
+<h2><img src="{{root}}/images/parameters.gif" width=32 height=32> Delete Mineos Parameters</h2>
<form method="post" action="{{action}}">
<input type="hidden" name="class" value="MineosParameters">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_detail.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_detail.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_detail.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>{{ object }}</h2>
+<h2><img src="{{root}}/images/parameters.gif" width=32 height=32> {{ object }}</h2>
<dl class=parameters>
<dt>model</dt><dd><a href="{{root}}/?class=MineosModel&object={{object.model.id}}">{{ object.model }}</a></dd>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_form.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_form.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_form.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>{% if object %}edit{% else %}new{% endif %} Mineos parameters</h2>
+<h2><img src="{{root}}/images/parameters.gif" width=32 height=32> {% if object %}Edit{% else %}New{% endif %} Mineos Parameters</h2>
<form method="post" action="{{action}}">
<input type="hidden" name="class" value="MineosParameters">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_list.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_list.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/mineosparameters_list.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,10 +1,12 @@
+<h2><img src="{{root}}/images/parameters.gif" width=32 height=32> 1D Parameters</h2>
+
{% if object_list %}
<table rules=cols class="clickable">
<thead>
<tr>
- <th rowspan=3></th>
+ <th rowspan=3 valign=bottom>name</th>
<th rowspan=3 valign=bottom>model</th>
<th rowspan=3 valign=bottom>mode catalog</th>
<th colspan=4 valign=bottom>oscillations</th>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_confirm_delete.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_confirm_delete.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_confirm_delete.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>delete run</h2>
+<h2><img src="{{root}}/images/rocket.gif" width=32 height=32> Delete Run</h2>
<form method="post" action="{{action}}">
<input type="hidden" name="class" value="Run">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_detail.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_detail.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_detail.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>{{ object }}</h2>
+<h2><img src="{{root}}/images/rocket.gif" width=32 height=32> {{ object }}</h2>
<dl class=parameters>
<dt>id</dt><dd>{{ object.id|stringformat:"04d" }}</dd>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_form.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_form.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_form.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>{% if object %}edit {{object}}{% else %}new run{% endif %}</h2>
+<h2><img src="{{root}}/images/rocket.gif" width=32 height=32> {% if object %}Edit {{object}}{% else %}New Run{% endif %}</h2>
<form method="post" action="{{action}}">
<input type="hidden" name="class" value="Run">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_list.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_list.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/run_list.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,4 +1,6 @@
+<h2><img src="{{root}}/images/rocket.gif" width=32 height=32> Runs</h2>
+
{% if object_list %}
<table rules=cols class="clickable">
<thead>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/single_source_event_form.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/single_source_event_form.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/single_source_event_form.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>{% if object %}edit{% else %}new{% endif %} event</h2>
+<h2>{% if object %}Edit{% else %}New{% endif %} Event</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/specfem3dglobemesh_confirm_delete.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemesh_confirm_delete.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemesh_confirm_delete.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>delete mesh</h2>
+<h2><img src="{{root}}/images/mesh.gif" width=32 height=32> Delete Mesh</h2>
<form method="post" action="{{action}}">
<input type="hidden" name="class" value="Specfem3DGlobeMesh">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemesh_detail.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemesh_detail.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemesh_detail.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>{{ object }}</h2>
+<h2><img src="{{root}}/images/mesh.gif" width=32 height=32> {{ object }}</h2>
<dl class=parameters>
<dt>nchunks</dt><dd>{{ object.nchunks }}</dd>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemesh_list.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemesh_list.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobemesh_list.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,4 +1,6 @@
+<h2><img src="{{root}}/images/mesh.gif" width=32 height=32> Meshes</h2>
+
{% if object_list %}
<table rules=cols class="clickable">
<colgroup><col class=odd></colgroup>
@@ -13,18 +15,17 @@
<thead>
<tr>
- <th rowspan=2></th>
- <th></th>
+ <th rowspan=2 valign=bottom>name</th>
+ <th rowspan=2 valign=bottom>nchunks</th>
<th colspan=2 class=colgroup>nproc</th>
<th colspan=2 class=colgroup>nex</th>
<th colspan=2 class=colgroup>angular width</th>
<th colspan=2 class=colgroup>center</th>
- <th></th>
- <th></th>
+ <th rowspan=2 valign=bottom>γ rotation azimuth</th>
+ <th rowspan=2 valign=bottom>shortest period (s)</th>
</tr>
<tr>
- <th>nchunks</th>
<th>η</th>
<th>ξ</th>
<th>η</th>
@@ -33,8 +34,6 @@
<th>ξ</th>
<th>latitude</th>
<th>longitude</th>
- <th>γ rotation azimuth</th>
- <th>shortest period (s)</th>
</tr>
</thead>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_confirm_delete.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_confirm_delete.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_confirm_delete.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>delete specfem 3d globe parameters</h2>
+<h2><img src="{{root}}/images/parameters.gif" width=32 height=32> Delete Specfem 3D Globe Parameters</h2>
<form method="post" action="{{action}}">
<input type="hidden" name="class" value="Specfem3DGlobeParameters">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_detail.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_detail.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_detail.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>{{ object }}</h2>
+<h2><img src="{{root}}/images/parameters.gif" width=32 height=32> {{ object }}</h2>
<dl class=parameters>
<dt>mesh</dt><dd><a href="{{root}}/?class=Specfem3DGlobeMesh&object={{object.mesh.id}}">{{ object.mesh }}</a></dd>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_form.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>{% if object %}edit{% else %}new{% endif %} Specfem 3D Globe parameters</h2>
+<h2><img src="{{root}}/images/parameters.gif" width=32 height=32> {% if object %}Edit{% else %}New{% endif %} Specfem 3D Globe Parameters</h2>
<form method="post" action="{{action}}">
<input type="hidden" name="class" value="Specfem3DGlobeParameters">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/specfem3dglobeparameters_list.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,9 +1,11 @@
+<h2><img src="{{root}}/images/parameters.gif" width=32 height=32> 3D Parameters</h2>
+
{% if object_list %}
<table rules=cols class="clickable">
<thead>
<tr>
- <th></th>
+ <th>name</th>
<th>mesh</th>
<th>model</th>
<th>oceans</th>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_confirm_delete.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_confirm_delete.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_confirm_delete.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>delete station list</h2>
+<h2><img src="{{root}}/images/stationlist.gif" width=32 height=32> Delete Station List</h2>
<form method="post" action="{{action}}">
<input type="hidden" name="class" value="StationList">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_detail.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_detail.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_detail.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>{{ object.name }}</h2>
+<h2><img src="{{root}}/images/stationlist.gif" width=32 height=32> {{ object }}</h2>
<p class=infobar>{{ object.station_set.count }} station{{ object.station_set.count|pluralize }}
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_form.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_form.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_form.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>rename station list</h2>
+<h2><img src="{{root}}/images/stationlist.gif" width=32 height=32> Rename Station List</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/stationlist_list.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_list.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_list.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,4 +1,6 @@
+<h2><img src="{{root}}/images/stationlist.gif" width=32 height=32> Stations</h2>
+
{% if object_list %}
<table rules=cols class="clickable">
<thead>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_upload.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_upload.html 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/stationlist_upload.html 2008-05-24 02:57:03 UTC (rev 12019)
@@ -1,5 +1,5 @@
-<h2>upload station list</h2>
+<h2><img src="{{root}}/images/stationlist.gif" width=32 height=32> Upload Station List</h2>
<form action="{{action}}" method="POST" enctype="multipart/form-data">
<input type="hidden" name="class" value="StationList">
Modified: cs/portal/trunk/northridge/SeismoWebPortal/views.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/views.py 2008-05-24 01:49:02 UTC (rev 12018)
+++ cs/portal/trunk/northridge/SeismoWebPortal/views.py 2008-05-24 02:57:03 UTC (rev 12019)
@@ -39,7 +39,7 @@
className = request.REQUEST.get('class')
if className is None:
t = loader.get_template('SeismoWebPortal/home.html')
- ret = t.render({})
+ ret = t.render({'root': root})
else:
More information about the cig-commits
mailing list