[cig-commits] r12010 - cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal
leif at geodynamics.org
leif at geodynamics.org
Fri May 23 00:44:18 PDT 2008
Author: leif
Date: 2008-05-23 00:44:17 -0700 (Fri, 23 May 2008)
New Revision: 12010
Modified:
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html
cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/style.css
Log:
Fixes for Windows Firefox, IE.
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html 2008-05-23 01:28:08 UTC (rev 12009)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/pluggable.html 2008-05-23 07:44:17 UTC (rev 12010)
@@ -21,7 +21,7 @@
</tr>
<tr>
<td colspan=3>
- <table id=buttonbar>
+ <table id="buttonBar">
<tr>
<td align=center>
<a href="{{root}}/"><img src="{{root}}/images/home.gif" width=32 height=32><br>
@@ -66,14 +66,14 @@
</td>
</tr>
<tr>
- <td id=menubar>
+ <td class="toolBar" id="actionBar">
<table>
<tr>
<td>
{% ifequal klass 'Event' %}
- <a class="actionButton" href="{{root}}/?class={{klass}}&action=search"><img src="{{root}}/images/search_icon.gif"> Search</a>
+ <a href="{{root}}/?class={{klass}}&action=search"><img src="{{root}}/images/search_icon.gif"> Search</a>
{% else %}
- <span class="actionButton disabled"><img src="{{root}}/images/search_icon.gif"> Search</span>
+ <span class="disabled"><img src="{{root}}/images/search_icon.gif"> Search</span>
{% endifequal %}
</td>
<td>
@@ -93,45 +93,45 @@
</dd>
</dl>
{% else %}
- <a class="actionButton" href="{{root}}/?class={{klass}}&action=new">New</a>
+ <a href="{{root}}/?class={{klass}}&action=new">New</a>
{% endifequal %}
{% else %}
- <span class="actionButton disabled">New</span>
+ <span class="disabled">New</span>
{% endif %}
</td>
<td>
{% if uploadable %}
- <a class="actionButton" href="{{root}}/?class={{klass}}&action=upload">Upload</a>
+ <a href="{{root}}/?class={{klass}}&action=upload">Upload</a>
{% else %}
- <span class="actionButton disabled">Upload</span>
+ <span class="disabled">Upload</span>
{% endif %}
</td>
<td>
{% if object %}
- <a class="actionButton" href="{{root}}/?class={{klass}}&object={{object.id}}">View</a>
+ <a href="{{root}}/?class={{klass}}&object={{object.id}}">View</a>
{% else %}
- <span class="actionButton disabled">View</span>
+ <span class="disabled">View</span>
{% endif %}
</td>
<td>
{% if object %}
- <a class="actionButton" href="{{root}}/?class={{klass}}&object={{object.id}}&action=edit">Edit</a>
+ <a href="{{root}}/?class={{klass}}&object={{object.id}}&action=edit">Edit</a>
{% else %}
- <span class="actionButton disabled">Edit</span>
+ <span class="disabled">Edit</span>
{% endif %}
</td>
<td>
{% if duplicatable %}
- <a class="actionButton" href="{{root}}/?class={{klass}}&object={{object.id}}&action=duplicate"><img src="{{root}}/images/dup_icon.gif"> Duplicate</a>
+ <a href="{{root}}/?class={{klass}}&object={{object.id}}&action=duplicate"><img src="{{root}}/images/dup_icon.gif"> Duplicate</a>
{% else %}
- <span class="actionButton disabled"><img src="{{root}}/images/dup_icon.gif"> Duplicate</span>
+ <span class="disabled"><img src="{{root}}/images/dup_icon.gif"> Duplicate</span>
{% endif %}
</td>
<td>
{% if object %}
- <a class="actionButton" href="{{root}}/?class={{klass}}&object={{object.id}}&action=delete"><img src="{{root}}/images/delete_icon.gif"> Delete</a>
+ <a href="{{root}}/?class={{klass}}&object={{object.id}}&action=delete"><img src="{{root}}/images/delete_icon.gif"> Delete</a>
{% else %}
- <span class="actionButton disabled"><img src="{{root}}/images/delete_icon.gif"> Delete</span>
+ <span class="disabled"><img src="{{root}}/images/delete_icon.gif"> Delete</span>
{% endif %}
</td>
<td>
@@ -162,16 +162,16 @@
</dd>
</dl>
{% else %}
- <span class="actionButton disabled">Download</span>
+ <span class="disabled">Download</span>
{% endif %}
</td>
</tr>
</table>
</td>
- <td id=navbar>
+ <td class="toolBar" id="navBar">
<table>
<tr>
- <td>
+ <td class="info">
{% if object %}
{{ index }} of {{ count }}
{% else %}
@@ -180,7 +180,7 @@
{% endifnotequal %}
{% endif %}
</td>
- <td>
+ <td class="iconButton">
{% if object %}
{% ifequal klass 'Source' %}
<a href="{{root}}/?class=Event&object={{object.obj.event.id}}#s{{object.id}}"><img src="{{root}}/images/highlight-item.gif" alt="Highlight Item" width=24 height=16></a>
@@ -193,22 +193,22 @@
</td>
<td>
{% if prevObject %}
- <a class="actionButton" href="{{root}}/?class={{klass}}&object={{prevObject.id}}">←</a>
+ <a href="{{root}}/?class={{klass}}&object={{prevObject.id}}">←</a>
{% else %}
- <span class="actionButton disabled">←</span>
+ <span class="disabled">←</span>
{% endif %}
</td>
<td>
{% if nextObject %}
- <a class="actionButton" href="{{root}}/?class={{klass}}&object={{nextObject.id}}">→</a>
+ <a href="{{root}}/?class={{klass}}&object={{nextObject.id}}">→</a>
{% else %}
- <span class="actionButton disabled">→</span>
+ <span class="disabled">→</span>
{% endif %}
</td>
</tr>
</table>
</td>
- <td id=viewbar align=right>
+ <td class="toolBar" id="viewBar" align=right>
<table>
<tr>
<td>
@@ -226,7 +226,7 @@
</dd>
</dl>
{% else %}
- <span class="actionButton disabled">Show</span>
+ <span class="disabled">Show</span>
{% endif %}
</td>
</tr>
@@ -245,7 +245,7 @@
</div>
{% endif %}
-<div id="content">
+<div class="XXX" id="content">
{{content}}
</div>
Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/style.css
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/style.css 2008-05-23 01:28:08 UTC (rev 12009)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/style.css 2008-05-23 07:44:17 UTC (rev 12010)
@@ -57,7 +57,7 @@
buttons
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#buttonbar {
+#buttonBar {
border-style: solid;
border-width: 1px;
border-color: #8cacbb;
@@ -70,7 +70,7 @@
border-left: 1px dotted #8cacbb;
}
-#buttonbar a {
+#buttonBar a {
text-decoration: none;
color: black;
}
@@ -80,42 +80,55 @@
buttons/menus
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#menubar {
+#actionBar, #navBar, #viewBar {
border-bottom: 1px solid #8cacbb;
font-size: small;
}
-#navbar {
- border-bottom: 1px solid #8cacbb;
- font-size: small;
+.toolBar img {
+ vertical-align: middle;
}
-#viewbar {
- border-bottom: 1px solid #8cacbb;
- font-size: small;
+.toolBar td,
+.actionButton {
+ border: 1px solid black;
+ background: white url({{root}}/images/input_background.gif) repeat-x;
}
+.toolBar td.info,
+.toolBar td.iconButton {
+ border: none;
+ background-color: white;
+ background-image: none;
+}
+
+.toolBar td a,
+.actionButton {
+ white-space: nowrap;
+ padding-left: 1ex;
+ padding-right: 1ex;
+ text-decoration: none;
+ color: black;
+}
+
+.toolBar td span.disabled {
+ padding-left: 1ex;
+ padding-right: 1ex;
+}
+
.actionMenu {
position: relative;
margin: 0;
padding: 0;
}
-.actionMenu img {
- vertical-align: middle;
-}
-
.actionMenu a {
text-decoration: none;
color: black;
}
-.actionMenu .actionMenuHeader {
- border: 1px solid black;
- background: white url({{root}}/images/input_background.gif) repeat-x;
-}
-
.actionMenu .actionMenuHeader a {
+ white-space: nowrap;
padding-left: 1ex;
padding-right: 1ex;
}
@@ -131,6 +144,7 @@
.actionMenu.alignRight .actionMenuContent {
right: -1px;
+ text-align: left; /* for IE */
}
.actionMenu .actionMenuContent ul {
@@ -140,6 +154,7 @@
}
.actionMenu .actionMenuContent li {
+ white-space: nowrap;
list-style: none;
padding: 0;
margin: 0;
@@ -162,10 +177,6 @@
border: 1px solid black;
}
-.actionMenu .actionMenuContent li {
- white-space: nowrap;
-}
-
.actionMenu .actionMenuContent li a {
display: block;
padding-left: 1ex;
@@ -183,15 +194,6 @@
padding-right: 1ex;
}
-.actionButton {
- border: 1px solid black;
- padding-left: 1ex;
- padding-right: 1ex;
- text-decoration: none;
- color: black;
- background: white url({{root}}/images/input_background.gif) repeat-x;
-}
-
.disabled {
color: silver;
}
More information about the cig-commits
mailing list