[cig-commits] r12065 - in cs/portal/trunk/northridge/SeismoWebPortal: . templates/SeismoWebPortal
leif at geodynamics.org
leif at geodynamics.org
Fri May 30 19:10:02 PDT 2008
Author: leif
Date: 2008-05-30 19:10:02 -0700 (Fri, 30 May 2008)
New Revision: 12065
Modified:
cs/portal/trunk/northridge/SeismoWebPortal/forms.py
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/style.css
Log:
Per Jeroen's request, added a tabbed look to the icon bar in order to
visually separate 1D from 3D.
Modified: cs/portal/trunk/northridge/SeismoWebPortal/forms.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/forms.py 2008-05-30 23:32:11 UTC (rev 12064)
+++ cs/portal/trunk/northridge/SeismoWebPortal/forms.py 2008-05-31 02:10:02 UTC (rev 12065)
@@ -104,8 +104,8 @@
parametersChoices = [list(blank)]
for groupLabel, ModelClass in [
- ("3D Parameters (Specfem 3D Globe)", models.Specfem3DGlobeParameters),
- ("1D Parameters (Mineos)", models.MineosParameters),
+ ("3D Parameters ~ Specfem 3D Globe", models.Specfem3DGlobeParameters),
+ ("1D Parameters ~ Mineos", models.MineosParameters),
]:
ctype = ContentType.objects.get_for_model(ModelClass)
group = []
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html 2008-05-30 23:32:11 UTC (rev 12064)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html 2008-05-31 02:10:02 UTC (rev 12065)
@@ -22,47 +22,54 @@
</tr>
<tr>
<td colspan=3>
- <table id="buttonBar">
+ <table id="buttonBar" cellpadding=0 cellspacing=0>
+ <thead>
<tr>
- <td align=center>
+ <th align=left colspan=4></th>
+ <th class="Specfem3DGlobe" align=left colspan=2><div class="tab">3D ~ Specfem 3D Globe</div></th>
+ <th class="Mineos" align=left colspan=3><div class="tab">1D ~ Mineos</div></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="general" align=center>
<a href="{{root}}/"><img src="{{root}}/images/home.gif" width=32 height=32><br>
Home</a>
</td>
- <td align=center>
+ <td class="general" align=center>
<a href="{{root}}/?class=Run"><img src="{{root}}/images/rocket.gif" width=32 height=32><br>
Runs</a>
</td>
- <td align=center>
+ <td class="general" align=center>
<a href="{{root}}/?class=Event"><img src="{{root}}/images/events.gif" width=32 height=32><br>
Events</a>
</td>
- <td align=center>
+ <td class="general" align=center>
<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>
+ <td class="Specfem3DGlobe" align=center>
<a href="{{root}}/?class=Specfem3DGlobeParameters"><img src="{{root}}/images/parameters.gif" width=32 height=32><br>
3D Parameters</a>
</td>
- <td align=center>
+ <td class="Specfem3DGlobe" align=center>
<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>
+ <td class="Mineos" align=center>
<a href="{{root}}/?class=MineosParameters"><img src="{{root}}/images/parameters.gif" width=32 height=32><br>
1D Parameters</a>
</td>
- <td align=center>
+ <td class="Mineos" align=center>
<a href="{{root}}/?class=MineosModel"><img src="{{root}}/images/prem.gif" width=32 height=32><br>
1D Models</a>
</td>
- <td align=center>
+ <td class="Mineos" align=center>
<a href="{{root}}/?class=MineosModeCatalog"><img src="{{root}}/images/modecat.gif" width=32 height=32><br>
Mode Catalogs</a>
</td>
</tr>
+ </tbody>
</table>
</td>
</tr>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/style.css
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/style.css 2008-05-30 23:32:11 UTC (rev 12064)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/style.css 2008-05-31 02:10:02 UTC (rev 12065)
@@ -17,7 +17,6 @@
vertical-align: middle;
}
-
#header {
width: 100%;
margin-bottom: 1em;
@@ -61,18 +60,60 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#buttonBar {
+ font-size: small;
+ width: 100%;
+}
+
+#buttonBar th {
+ font-size: x-small;
+ font-weight: normal;
+}
+
+#buttonBar .tab {
+ position: relative;
+ top: 1px;
+ display: inline;
+ padding-left: 1ex;
+ padding-right: 1ex;
border-style: solid;
- border-width: 1px;
+ border-width: 1px 1px 0px 1px;
border-color: #8cacbb;
+}
+
+#buttonBar td {
+ padding-top: 1ex;
+ padding-bottom: 1ex;
+}
+
+#buttonBar td.general {
background-color: #dee7ec;
- font-size: small;
- width: 100%;
+ border-style: solid;
+ border-width: 1px 0px 1px 0px;
+ border-color: #8cacbb;
}
-td.separator {
- border-left: 1px dotted #8cacbb;
+#buttonBar th.Specfem3DGlobe .tab {
+ background-color: #cde2a7;
}
+#buttonBar td.Specfem3DGlobe {
+ background-color: #cde2a7;
+ border-style: solid;
+ border-width: 1px 0px 1px 0px;
+ border-color: #8cacbb;
+}
+
+#buttonBar th.Mineos .tab {
+ background-color: #ccf;
+}
+
+#buttonBar td.Mineos {
+ background-color: #ccf;
+ border-style: solid;
+ border-width: 1px 0px 1px 0px;
+ border-color: #8cacbb;
+}
+
#buttonBar a {
text-decoration: none;
color: black;
@@ -201,7 +242,11 @@
color: silver;
}
+.shortcut {
+ margin-left: 30ex;
+}
+
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
radio
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
More information about the cig-commits
mailing list