[cig-commits] r11262 - in cs/portal/trunk/seismo/SeismoWebPortal: . static/css templates/SeismoWebPortal
leif at geodynamics.org
leif at geodynamics.org
Tue Feb 26 16:47:11 PST 2008
Author: leif
Date: 2008-02-26 16:47:10 -0800 (Tue, 26 Feb 2008)
New Revision: 11262
Added:
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/object_lists.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/objects.html
Removed:
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/job_list.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/mesh_list.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/meshes.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/model_list.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/models.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_list.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulations.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/station_index.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stations.html
Modified:
cs/portal/trunk/seismo/SeismoWebPortal/static/css/style.css
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_confirm_delete.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_detail.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_form.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_list.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_search.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_search_results.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_upload.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/events.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/home.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/mesh_confirm_delete.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/mesh_form_base.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/model_confirm_delete.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/model_form.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/settings.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_confirm_delete.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_detail.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_form.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/single_source_event_form.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/source_confirm_delete.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/source_detail.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/source_form.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_confirm_delete.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_detail.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_form.html
cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_upload.html
cs/portal/trunk/seismo/SeismoWebPortal/urls.py
cs/portal/trunk/seismo/SeismoWebPortal/views.py
Log:
First step towards "event-oriented" interface: consolidated all
"object" lists (simulations, stations, meshes, models -- excepting
events) on a single page.
Modified: cs/portal/trunk/seismo/SeismoWebPortal/static/css/style.css
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/static/css/style.css 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/static/css/style.css 2008-02-27 00:47:10 UTC (rev 11262)
@@ -342,6 +342,11 @@
border: thin solid black;
}
+table caption {
+ font-size: large;
+ background-color: #ccf;
+}
+
.even {
background-color: #eef;
}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_confirm_delete.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_confirm_delete.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_confirm_delete.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/events.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_detail.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_detail.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_detail.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/events.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_form.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_form.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_form.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/events.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_list.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_list.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_list.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/events.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_search.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_search.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_search.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/events.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_search_results.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_search_results.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_search_results.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/events.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_upload.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_upload.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/event_upload.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/events.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/events.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/events.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/events.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -6,11 +6,8 @@
<div class=taskbar>
<ul>
<li class=first><a href="/specfem3dglobe/">home</a>
- <li><a href="/specfem3dglobe/simulations/">simulations</a>
+ <li><a href="/specfem3dglobe/objects/">objects</a>
<li class=selected><a href="/specfem3dglobe/events/">events</a>
- <li><a href="/specfem3dglobe/stations/">stations</a>
- <li><a href="/specfem3dglobe/meshes/">meshes</a>
- <li><a href="/specfem3dglobe/models/">models</a>
<li><a href="/specfem3dglobe/registration/">profile</a>
</ul>
</div>
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/home.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/home.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/home.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -6,11 +6,8 @@
<div class=taskbar>
<ul>
<li class="first selected"><a href="/specfem3dglobe/">home</a>
- <li><a href="/specfem3dglobe/simulations/">simulations</a>
+ <li><a href="/specfem3dglobe/objects/">objects</a>
<li><a href="/specfem3dglobe/events/">events</a>
- <li><a href="/specfem3dglobe/stations/">stations</a>
- <li><a href="/specfem3dglobe/meshes/">meshes</a>
- <li><a href="/specfem3dglobe/models/">models</a>
<li><a href="/specfem3dglobe/registration/">profile</a>
</ul>
</div>
Deleted: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/job_list.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/job_list.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/job_list.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,37 +0,0 @@
-
-{% extends "SeismoWebPortal/jobs.html" %}
-
-{% block content %}
-
-{% if object_list %}
- <table rules=groups>
-
- <colgroup><col class=odd><col class=even><col class=odd><col class=even><col class=odd>
- <col class=even><col class=odd><col class=even><col class=odd></colgroup>
-
- <thead>
- <tr><th>id</th><th>simulation</th><th>task</th><th>status</th><th>created</th><th>started</th><th>finished</th><th>wait</th><th>duration</th></tr>
- </thead>
-
- <tbody>
- {% for object in object_list %}
- <tr>
- <td>{{ object.id|stringformat:"05d" }}</td>
- <td><a href="/specfem3dglobe/simulations/{{ object.run.simulation.id }}/">{{ object.run.simulation.name }}</a></td>
- <td>{{ object.task }}</td>
- <td>{{ object.status }}</td>
- <td>{{ object.created|date }} {{ object.created|time }}</td>
- <td>{{ object.started|date }} {{ object.started|time }}</td>
- <td>{{ object.finshed|date }} {{ object.finished|time }}</td>
- <td>{{ object.wait }}</td>
- <td>{{ object.duration }}</td>
- </tr>
- {% endfor %}
- </tbody>
-
- </table>
-{% else %}
- <p>You have no jobs.
-{% endif %}
-
-{% endblock %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/mesh_confirm_delete.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/mesh_confirm_delete.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/mesh_confirm_delete.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/meshes.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/mesh_form_base.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/mesh_form_base.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/mesh_form_base.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/meshes.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Deleted: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/mesh_list.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/mesh_list.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/mesh_list.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,90 +0,0 @@
-
-{% extends "SeismoWebPortal/meshes.html" %}
-
-{% block content %}
-
-<div class=toolbar>
- <form action="create/" method="post">
- <select name="nchunks" size="1">
- <option value="1">regional with 1 chunk</option>
- <option value="2">regional with 2 chunks</option>
- <option value="3">regional with 3 chunks</option>
- <option value="6" selected="selected">global (6 chunks)</option>
- </select>
- <input type="submit" value="New..." />
- </form>
-</div>
-
-{% if object_list %}
- <table border=1 rules=groups>
- <colgroup><col class=odd></colgroup>
- <colgroup><col class=even></colgroup>
- <colgroup><col class=odd><col class=even></colgroup>
- <colgroup><col class=odd><col class=even></colgroup>
- <colgroup><col class=odd><col class=even></colgroup>
- <colgroup><col class=odd><col class=even></colgroup>
- <colgroup><col class=odd></colgroup>
- <colgroup><col class=even></colgroup>
- <colgroup><col class=odd></colgroup>
-
- <thead>
- <tr>
- <th></th>
- <th></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>
- </tr>
-
- <tr>
- <th>name</th>
- <th>nchunks</th>
- <th>η</th>
- <th>ξ</th>
- <th>η</th>
- <th>ξ</th>
- <th>η</th>
- <th>ξ</th>
- <th>latitude</th>
- <th>longitude</th>
- <th>gamma rotation azimuth</th>
- <th>shortest period (s)</th>
- </tr>
- </thead>
-
- <tbody>
- {% for object in object_list %}
- <tr>
- <th><a href="{{ object.id }}/">{{ object.name }}</a></th>
- <td class=int>{{ object.nchunks }}</td>
- <td class=int>{{ object.nproc_eta }}</td>
- <td class=int>{{ object.nproc_xi }}</td>
- <td class=int>{{ object.nex_eta }}</td>
- <td class=int>{{ object.nex_xi }}</td>
- {% ifequal object.nchunks 6 %}
- <td class=notApplicable>n/a</td>
- <td class=notApplicable>n/a</td>
- <td class=notApplicable>n/a</td>
- <td class=notApplicable>n/a</td>
- <td class=notApplicable>n/a</td>
- {% else %}
- <td class=float>{{ object.angular_width_eta }}°</td>
- <td class=float>{{ object.angular_width_xi }}°</td>
- <td class=float>{{ object.center_latitude }}°</td>
- <td class=float>{{ object.center_longitude }}°</td>
- <td class=float>{{ object.gamma_rotation_azimuth }}°</td>
- {% endifequal %}
- <td class=int>{{ object.shortestPeriod|stringformat:".0f" }}</td>
- </tr>
- {% endfor %}
- </tbody>
-
- </table>
-{% else %}
- <p>You have no meshes.
-{% endif %}
-
-{% endblock %}
Deleted: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/meshes.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/meshes.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/meshes.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,23 +0,0 @@
-
-{% extends "SeismoWebPortal/base.html" %}
-
-{% block desktop %}
-
-<div class=taskbar>
- <ul>
- <li class=first><a href="/specfem3dglobe/">home</a>
- <li><a href="/specfem3dglobe/simulations/">simulations</a>
- <li><a href="/specfem3dglobe/events/">events</a>
- <li><a href="/specfem3dglobe/stations/">stations</a>
- <li class=selected><a href="/specfem3dglobe/meshes/">meshes</a>
- <li><a href="/specfem3dglobe/models/">models</a>
- <li><a href="/specfem3dglobe/registration/">profile</a>
- </ul>
-</div>
-
-<h1 class=titlebar>meshes</h1>
-
-{% block content %}
-{% endblock %}
-
-{% endblock %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/model_confirm_delete.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/model_confirm_delete.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/model_confirm_delete.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/models.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/model_form.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/model_form.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/model_form.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/models.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Deleted: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/model_list.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/model_list.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/model_list.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,49 +0,0 @@
-
-{% extends "SeismoWebPortal/models.html" %}
-
-{% block content %}
-
-<div class=toolbar>
- <form action="create/" method="get"><input type="submit" value="New..." /></form>
-</div>
-
-{% if object_list %}
- <table rules=groups>
- <colgroup><col class=odd></colgroup>
- <colgroup><col class=even></colgroup>
- <colgroup><col class=odd><col class=even><col class=odd><col class=even><col class=odd><col class=even></colgroup>
-
- <thead>
- <tr>
- <th>name</th>
- <th>type</th>
- <th>oceans</th>
- <th>gravity</th>
- <th>attenuation</th>
- <th>topography</th>
- <th>rotation</th>
- <th>ellipticity</th>
- </tr>
- </thead>
-
- <tbody>
- {% for object in object_list %}
- <tr>
- <th><a href="{{ object.id }}/">{{ object.name }}</a></th>
- <td>{{ object.get_type_display }}</td>
- <td><span class={{ object.oceans }}>{{ object.oceans }}</span></td>
- <td><span class={{ object.gravity }}>{{ object.gravity }}</span></td>
- <td><span class={{ object.attenuation }}>{{ object.attenuation }}</span></td>
- <td><span class={{ object.topography }}>{{ object.topography }}</span></td>
- <td><span class={{ object.rotation }}>{{ object.rotation }}</span></td>
- <td><span class={{ object.ellipticity }}>{{ object.ellipticity }}</span></td>
- </tr>
- {% endfor %}
- </tbody>
-
- </table>
-{% else %}
- <p>You have no models.
-{% endif %}
-
-{% endblock %}
Deleted: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/models.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/models.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/models.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,23 +0,0 @@
-
-{% extends "SeismoWebPortal/base.html" %}
-
-{% block desktop %}
-
-<div class=taskbar>
- <ul>
- <li class=first><a href="/specfem3dglobe/">home</a>
- <li><a href="/specfem3dglobe/simulations/">simulations</a>
- <li><a href="/specfem3dglobe/events/">events</a>
- <li><a href="/specfem3dglobe/stations/">stations</a>
- <li><a href="/specfem3dglobe/meshes/">meshes</a>
- <li class=selected><a href="/specfem3dglobe/models/">models</a>
- <li><a href="/specfem3dglobe/registration/">profile</a>
- </ul>
-</div>
-
-<h1 class=titlebar>models</h1>
-
-{% block content %}
-{% endblock %}
-
-{% endblock %}
Added: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/object_lists.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/object_lists.html (rev 0)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/object_lists.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -0,0 +1,217 @@
+
+{% extends "SeismoWebPortal/objects.html" %}
+
+{% block content %}
+
+
+<div class=toolbar>
+ <form action="../simulations/create/" method="get"><input type="submit" value="New Simulation..." /></form>
+ <form action="../stations/upload/" method="get"><input type="submit" value="Upload Station List..." /></form>
+ <form action="../meshes/create/" method="post">
+ <select name="nchunks" size="1">
+ <option value="1">regional with 1 chunk</option>
+ <option value="2">regional with 2 chunks</option>
+ <option value="3">regional with 3 chunks</option>
+ <option value="6" selected="selected">global (6 chunks)</option>
+ </select>
+ <input type="submit" value="New Mesh..." />
+ </form>
+ <form action="../models/create/" method="get"><input type="submit" value="New Model..." /></form>
+</div>
+
+<p>
+{% if simulation_list %}
+ <table rules=groups>
+ <caption>simulations</caption>
+
+ <colgroup><col class=odd><col class=even><col class=odd><col class=even><col class=odd><col class=even><col class=odd></colgroup>
+
+ <thead>
+ <tr><th>name</th><th>event</th><th>mesh</th><th>model</th><th>station list</th><th>record length</th><th>status</th></tr>
+ </thead>
+
+ <tbody>
+ {% for sim in simulation_list %}
+ <tr>
+ <th><a href="/specfem3dglobe/simulations/{{ sim.id }}/">{{ sim.name }}</a></th>
+
+ <td>{{ sim.events.icon }}<a href="/specfem3dglobe/events/{{ sim.events.id }}/">{{ sim.events }}</a>
+ <br>
+ <span class=inlineInfo>
+ {% if sim.events.singleSource %}
+ M<sub>w</sub> ≅ {{ sim.events.singleSource.momentMagnitude|stringformat:".2f" }}
+ {% else %}
+ finite-source
+ {% endif %}
+ </span>
+ </td>
+
+ <td><a href="/specfem3dglobe/meshes/{{ sim.mesh.id }}/">{{ sim.mesh }}</a><br>
+ <span class=inlineInfo>shortest period ≅ {{ sim.mesh.shortestPeriod|stringformat:".0f" }}s</span></td>
+ <td><a href="/specfem3dglobe/models/{{ sim.model.id }}/">{{ sim.model }}</a></td>
+ <td><a href="/specfem3dglobe/stations/{{ sim.stations.id }}/">{{ sim.stations }}</a></td>
+ <td>{{ sim.record_length }} minutes</td>
+ <td>{{ sim.status }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+
+ </table>
+{% else %}
+ <p>You have no simulations.
+{% endif %}
+
+
+<p>
+{% if station_lists %}
+ <table border=0 rules=groups>
+ <caption>stations</caption>
+
+ <colgroup><col class=odd><col class=even><col class=odd></colgroup>
+
+ <thead>
+ <tr>
+ <th>name</th>
+ <th>number of stations</th>
+ <th>downloads</th>
+ </tr>
+ </thead>
+
+ <tbody>
+ {% for station_list in station_lists %}
+ <tr>
+ <td><a href="../stations/{{ station_list.id }}/">{{ station_list.name }}</a></td>
+ <td>{{ station_list.station_set.count }}</td>
+ <td>
+ <a href="../stations/{{ station_list.id }}/gearth.kml"><img src="/specfem3dglobe/pics/kml.icon.gif" title="View in Google Earth" alt="View in Google Earth"></a>
+ [<a href="../stations/{{ station_list.id }}/stations.txt">text</a>]
+ </td>
+ </tr>
+ {% endfor %}
+ </tbody>
+
+ </table>
+{% else %}
+ <p>You have no stations.
+{% endif %}
+
+
+<p>
+{% if mesh_list %}
+ <table border=1 rules=groups>
+ <caption>meshes</caption>
+
+ <colgroup><col class=odd></colgroup>
+ <colgroup><col class=even></colgroup>
+ <colgroup><col class=odd><col class=even></colgroup>
+ <colgroup><col class=odd><col class=even></colgroup>
+ <colgroup><col class=odd><col class=even></colgroup>
+ <colgroup><col class=odd><col class=even></colgroup>
+ <colgroup><col class=odd></colgroup>
+ <colgroup><col class=even></colgroup>
+ <colgroup><col class=odd></colgroup>
+
+ <thead>
+ <tr>
+ <th></th>
+ <th></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>
+ </tr>
+
+ <tr>
+ <th>name</th>
+ <th>nchunks</th>
+ <th>η</th>
+ <th>ξ</th>
+ <th>η</th>
+ <th>ξ</th>
+ <th>η</th>
+ <th>ξ</th>
+ <th>latitude</th>
+ <th>longitude</th>
+ <th>γ rotation azimuth</th>
+ <th>shortest period (s)</th>
+ </tr>
+ </thead>
+
+ <tbody>
+ {% for object in mesh_list %}
+ <tr>
+ <th><a href="../meshes/{{ object.id }}/">{{ object.name }}</a></th>
+ <td class=int>{{ object.nchunks }}</td>
+ <td class=int>{{ object.nproc_eta }}</td>
+ <td class=int>{{ object.nproc_xi }}</td>
+ <td class=int>{{ object.nex_eta }}</td>
+ <td class=int>{{ object.nex_xi }}</td>
+ {% ifequal object.nchunks 6 %}
+ <td class=notApplicable>n/a</td>
+ <td class=notApplicable>n/a</td>
+ <td class=notApplicable>n/a</td>
+ <td class=notApplicable>n/a</td>
+ <td class=notApplicable>n/a</td>
+ {% else %}
+ <td class=float>{{ object.angular_width_eta }}°</td>
+ <td class=float>{{ object.angular_width_xi }}°</td>
+ <td class=float>{{ object.center_latitude }}°</td>
+ <td class=float>{{ object.center_longitude }}°</td>
+ <td class=float>{{ object.gamma_rotation_azimuth }}°</td>
+ {% endifequal %}
+ <td class=int>{{ object.shortestPeriod|stringformat:".0f" }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+
+ </table>
+{% else %}
+ <p>You have no meshes.
+{% endif %}
+
+
+<p>
+{% if model_list %}
+ <table rules=groups>
+ <caption>models</caption>
+
+ <colgroup><col class=odd></colgroup>
+ <colgroup><col class=even></colgroup>
+ <colgroup><col class=odd><col class=even><col class=odd><col class=even><col class=odd><col class=even></colgroup>
+
+ <thead>
+ <tr>
+ <th>name</th>
+ <th>type</th>
+ <th>oceans</th>
+ <th>gravity</th>
+ <th>attenuation</th>
+ <th>topography</th>
+ <th>rotation</th>
+ <th>ellipticity</th>
+ </tr>
+ </thead>
+
+ <tbody>
+ {% for object in model_list %}
+ <tr>
+ <th><a href="../models/{{ object.id }}/">{{ object.name }}</a></th>
+ <td>{{ object.get_type_display }}</td>
+ <td><span class={{ object.oceans }}>{{ object.oceans }}</span></td>
+ <td><span class={{ object.gravity }}>{{ object.gravity }}</span></td>
+ <td><span class={{ object.attenuation }}>{{ object.attenuation }}</span></td>
+ <td><span class={{ object.topography }}>{{ object.topography }}</span></td>
+ <td><span class={{ object.rotation }}>{{ object.rotation }}</span></td>
+ <td><span class={{ object.ellipticity }}>{{ object.ellipticity }}</span></td>
+ </tr>
+ {% endfor %}
+ </tbody>
+
+ </table>
+{% else %}
+ <p>You have no models.
+{% endif %}
+
+{% endblock %}
Added: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/objects.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/objects.html (rev 0)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/objects.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -0,0 +1,20 @@
+
+{% extends "SeismoWebPortal/base.html" %}
+
+{% block desktop %}
+
+<div class=taskbar>
+ <ul>
+ <li class=first><a href="/specfem3dglobe/">home</a>
+ <li class=selected><a href="/specfem3dglobe/objects/">objects</a>
+ <li><a href="/specfem3dglobe/events/">events</a>
+ <li><a href="/specfem3dglobe/registration/">profile</a>
+ </ul>
+</div>
+
+<h1 class=titlebar>objects</h1>
+
+{% block content %}
+{% endblock %}
+
+{% endblock %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/settings.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/settings.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/settings.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -6,11 +6,8 @@
<div class=taskbar>
<ul>
<li class=first><a href="/specfem3dglobe/">home</a>
- <li><a href="/specfem3dglobe/simulations/">simulations</a>
+ <li><a href="/specfem3dglobe/objects/">objects</a>
<li><a href="/specfem3dglobe/events/">events</a>
- <li><a href="/specfem3dglobe/stations/">stations</a>
- <li><a href="/specfem3dglobe/meshes/">meshes</a>
- <li><a href="/specfem3dglobe/models/">models</a>
<li class=selected><a href="/specfem3dglobe/registration/">profile</a>
</ul>
</div>
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_confirm_delete.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_confirm_delete.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_confirm_delete.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/simulations.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_detail.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_detail.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_detail.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/simulations.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_form.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_form.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_form.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/simulations.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Deleted: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_list.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_list.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulation_list.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,50 +0,0 @@
-
-{% extends "SeismoWebPortal/simulations.html" %}
-
-{% block content %}
-
-<div class=toolbar>
- <form action="create/" method="get"><input type="submit" value="New..." /></form>
-</div>
-
-{% if object_list %}
- <table rules=groups>
-
- <colgroup><col class=odd><col class=even><col class=odd><col class=even><col class=odd><col class=even><col class=odd></colgroup>
-
- <thead>
- <tr><th>name</th><th>event</th><th>mesh</th><th>model</th><th>station list</th><th>record length</th><th>status</th></tr>
- </thead>
-
- <tbody>
- {% for sim in object_list %}
- <tr>
- <th><a href="/specfem3dglobe/simulations/{{ sim.id }}/">{{ sim.name }}</a></th>
-
- <td>{{ sim.events.icon }}<a href="/specfem3dglobe/events/{{ sim.events.id }}/">{{ sim.events }}</a>
- <br>
- <span class=inlineInfo>
- {% if sim.events.singleSource %}
- M<sub>w</sub> ≅ {{ sim.events.singleSource.momentMagnitude|stringformat:".2f" }}
- {% else %}
- finite-source
- {% endif %}
- </span>
- </td>
-
- <td><a href="/specfem3dglobe/meshes/{{ sim.mesh.id }}/">{{ sim.mesh }}</a><br>
- <span class=inlineInfo>shortest period ≅ {{ sim.mesh.shortestPeriod|stringformat:".0f" }}s</span></td>
- <td><a href="/specfem3dglobe/models/{{ sim.model.id }}/">{{ sim.model }}</a></td>
- <td><a href="/specfem3dglobe/stations/{{ sim.stations.id }}/">{{ sim.stations }}</a></td>
- <td>{{ sim.record_length }} minutes</td>
- <td>{{ sim.status }}</td>
- </tr>
- {% endfor %}
- </tbody>
-
- </table>
-{% else %}
- <p>You have no simulations.
-{% endif %}
-
-{% endblock %}
Deleted: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulations.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulations.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/simulations.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,23 +0,0 @@
-
-{% extends "SeismoWebPortal/base.html" %}
-
-{% block desktop %}
-
-<div class=taskbar>
- <ul>
- <li class=first><a href="/specfem3dglobe/">home</a>
- <li class=selected><a href="/specfem3dglobe/simulations/">simulations</a>
- <li><a href="/specfem3dglobe/events/">events</a>
- <li><a href="/specfem3dglobe/stations/">stations</a>
- <li><a href="/specfem3dglobe/meshes/">meshes</a>
- <li><a href="/specfem3dglobe/models/">models</a>
- <li><a href="/specfem3dglobe/registration/">profile</a>
- </ul>
-</div>
-
-<h1 class=titlebar>simulations</h1>
-
-{% block content %}
-{% endblock %}
-
-{% endblock %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/single_source_event_form.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/single_source_event_form.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/single_source_event_form.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/events.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/source_confirm_delete.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/source_confirm_delete.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/source_confirm_delete.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/events.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/source_detail.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/source_detail.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/source_detail.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/events.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/source_form.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/source_form.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/source_form.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/events.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Deleted: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/station_index.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/station_index.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/station_index.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,40 +0,0 @@
-
-{% extends "SeismoWebPortal/stations.html" %}
-
-{% block content %}
-
-<div class=toolbar>
- <form action="upload/" method="get"><input type="submit" value="Upload..." /></form>
-</div>
-
-{% if station_lists %}
- <table border=0 rules=groups>
- <colgroup><col class=odd><col class=even><col class=odd></colgroup>
-
- <thead>
- <tr>
- <th>name</th>
- <th>number of stations</th>
- <th>downloads</th>
- </tr>
- </thead>
-
- <tbody>
- {% for station_list in station_lists %}
- <tr>
- <td><a href="{{ station_list.id }}/">{{ station_list.name }}</a></td>
- <td>{{ station_list.station_set.count }}</td>
- <td>
- <a href="{{ station_list.id }}/gearth.kml"><img src="/specfem3dglobe/pics/kml.icon.gif" title="View in Google Earth" alt="View in Google Earth"></a>
- [<a href="{{ station_list.id }}/stations.txt">text</a>]
- </td>
- </tr>
- {% endfor %}
- </tbody>
-
- </table>
-{% else %}
- <p>You have no stations.
-{% endif %}
-
-{% endblock %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_confirm_delete.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_confirm_delete.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_confirm_delete.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/stations.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_detail.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_detail.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_detail.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/stations.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_form.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_form.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_form.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/stations.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_upload.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_upload.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stationlist_upload.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,5 +1,5 @@
-{% extends "SeismoWebPortal/stations.html" %}
+{% extends "SeismoWebPortal/objects.html" %}
{% block content %}
Deleted: cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stations.html
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stations.html 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/templates/SeismoWebPortal/stations.html 2008-02-27 00:47:10 UTC (rev 11262)
@@ -1,23 +0,0 @@
-
-{% extends "SeismoWebPortal/base.html" %}
-
-{% block desktop %}
-
-<div class=taskbar>
- <ul>
- <li class=first><a href="/specfem3dglobe/">home</a>
- <li><a href="/specfem3dglobe/simulations/">simulations</a>
- <li><a href="/specfem3dglobe/events/">events</a>
- <li class=selected><a href="/specfem3dglobe/stations/">stations</a>
- <li><a href="/specfem3dglobe/meshes/">meshes</a>
- <li><a href="/specfem3dglobe/models/">models</a>
- <li><a href="/specfem3dglobe/registration/">profile</a>
- </ul>
-</div>
-
-<h1 class=titlebar>stations</h1>
-
-{% block content %}
-{% endblock %}
-
-{% endblock %}
Modified: cs/portal/trunk/seismo/SeismoWebPortal/urls.py
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/urls.py 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/urls.py 2008-02-27 00:47:10 UTC (rev 11262)
@@ -20,11 +20,6 @@
# Mesh
-mesh_list_detail_args = {
- 'queryset': Mesh.user_objects.all(),
- 'allow_empty': True,
-}
-
mesh_delete_args = {
'model': Mesh,
'post_delete_redirect': '/specfem3dglobe/meshes/',
@@ -34,11 +29,6 @@
# Model
-model_list_detail_args = {
- 'queryset': Model.user_objects.all(),
- 'allow_empty': True,
-}
-
model_delete_args = {
'model': Model,
'post_delete_redirect': '/specfem3dglobe/models/',
@@ -145,18 +135,17 @@
(r'^registration/$', 'SeismoWebPortal.views.registration'),
(r'^registration/password/$', 'SeismoWebPortal.views.password_change', password_change_args),
- (r'^meshes/$', 'django.views.generic.list_detail.object_list', mesh_list_detail_args),
+ (r'^objects/$', 'SeismoWebPortal.views.object_list'),
+
(r'^meshes/create/$', 'SeismoWebPortal.views.create_mesh'),
(r'^meshes/create/(?P<nchunks>\d+)/$', 'SeismoWebPortal.views.manipulate_mesh', dict(action='create')),
(r'^meshes/(?P<object_id>\d+)/$', 'SeismoWebPortal.views.manipulate_mesh', dict(action='edit')),
(r'^meshes/(?P<object_id>\d+)/delete/$', 'django.views.generic.create_update.delete_object', mesh_delete_args),
- (r'^models/$', 'django.views.generic.list_detail.object_list', model_list_detail_args),
(r'^models/create/$', 'SeismoWebPortal.views.create_model'),
(r'^models/(?P<object_id>\d+)/$', 'SeismoWebPortal.views.update_model'),
(r'^models/(?P<object_id>\d+)/delete/$', 'django.views.generic.create_update.delete_object', model_delete_args),
- (r'^simulations/$', 'SeismoWebPortal.views.simulation_index'),
(r'^simulations/create/$', 'SeismoWebPortal.views.create_simulation'),
(r'^simulations/(?P<object_id>\d+)/$', 'SeismoWebPortal.views.simulation_detail'),
(r'^simulations/(?P<object_id>\d+)/edit/$', 'SeismoWebPortal.views.update_simulation'),
@@ -188,7 +177,6 @@
(r'^events/(?P<object_id>\d+)/gearth\.kml$','SeismoWebPortal.views.event_detail_gearth'),
# stations
- (r'^stations/$', 'SeismoWebPortal.views.station_index'),
(r'^stations/upload/$', 'SeismoWebPortal.views.upload_station_list'),
(r'^stations/(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', {'queryset': StationList.user_objects.all()}),
(r'^stations/(?P<object_id>\d+)/edit/$', 'django.views.generic.create_update.update_object', stationlist_create_update_args),
Modified: cs/portal/trunk/seismo/SeismoWebPortal/views.py
===================================================================
--- cs/portal/trunk/seismo/SeismoWebPortal/views.py 2008-02-26 22:24:04 UTC (rev 11261)
+++ cs/portal/trunk/seismo/SeismoWebPortal/views.py 2008-02-27 00:47:10 UTC (rev 11262)
@@ -39,13 +39,18 @@
{},
RequestContext(request, {}))
-def simulation_index(request):
- from django.views.generic.list_detail import object_list
- return object_list(request, Simulation.objects.filter(user=request.user),
- allow_empty=True)
-simulation_index = login_required(simulation_index)
+def object_list(request):
+ return render_to_response('SeismoWebPortal/object_lists.html',
+ {'simulation_list': Simulation.objects.filter(user=request.user),
+ 'station_lists': StationList.objects.filter(user__exact=request.user),
+ 'mesh_list': Mesh.user_objects.all(),
+ 'model_list': Model.user_objects.all(),
+ },
+ RequestContext(request, {}))
+object_list = login_required(object_list)
+
def create_simulation(request):
def post_save(object):
user = request.user
@@ -795,14 +800,6 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-def station_index(request):
- station_lists = StationList.objects.filter(user__exact=request.user)
- return render_to_response('SeismoWebPortal/station_index.html',
- {'station_lists': station_lists },
- RequestContext(request, {}))
-station_index = login_required(station_index)
-
-
def upload_station_list(request):
from os.path import dirname
More information about the cig-commits
mailing list