Changeset 1340 for branches

Timestamp:

Jun 4, 2006, 12:15:29 PM (18 years ago)

Author:

chrisaga

Message:

merge from trunk r1338:1339 into branch 1.6 (fix bug 400)

Location:

branches/branch-1_6/template/yoga

Files:

• admin/stats.tpl (modified) (3 diffs)
• default-layout.css (modified) (5 diffs)
• theme/clear/theme.css (modified) (1 diff, 1 prop)
• theme/dark/theme.css (modified) (1 diff)

branches/branch-1_6/template/yoga/admin/stats.tpl

@@ -6 +6 @@
 
 <h3>{L_STAT_DETAIL_TITLE}</h3>
-<table class="table2" width="60%">
-<tr class="throw">
+<table class="table2" id="dailyStats">
+  <tr class="throw">
     <th>{L_VALUE}</th>
     <th>{L_PAGES_SEEN}</th>
     <th>{L_VISITORS}</th>
     <th>{L_PICTURES}</th>
-</tr>
+  </tr>
 <!-- BEGIN statrow -->
   <tr class="{statrow.T_CLASS}">
     <td>{statrow.VALUE}</td>
-    <td>{statrow.PAGES}</td>
-    <td>{statrow.VISITORS}</td>
-    <td>{statrow.IMAGES}</td>
+    <td class="number">{statrow.PAGES}</td>
+    <td class="number">{statrow.VISITORS}</td>
+    <td class="number">{statrow.IMAGES}</td>
   </tr>
 <!-- END statrow -->
@@ -24 +24 @@
 
 <h3>{L_DATE_TITLE}</h3>
-<table class="table2" width="98%">
-<tr class="throw">
+<table class="table2" id="detailedStats">
+  <tr class="throw">
     <th>{L_STAT_HOUR}</th>
     <th>{L_STAT_LOGIN}</th>
@@ -31 +31 @@
     <th>{L_STAT_CATEGORY}</th>
     <th>{L_STAT_FILE}</th>
-    <th>{L_STAT_PICTURE}</th>
-</tr>
+    <th>{L_STAT_PICTURE}</th> 
+  </tr>
 <!-- BEGIN detail -->
   <tr class="{detail.T_CLASS}">
-    <td nowrap>{detail.HOUR}</td>
+    <td class="hour">{detail.HOUR}</td>
     <td>{detail.LOGIN}</td>
     <td>{detail.IP}</td>
-  <td>{detail.CATEGORY}</td>
-  <td>{detail.FILE}</td>
-  <td>{detail.PICTURE}</td>
+    <td>{detail.CATEGORY}</td>
+    <td>{detail.FILE}</td>
+    <td>{detail.PICTURE}</td>
   </tr>
 <!-- END detail -->
 </table>
-
 
 <!-- BEGIN navigation -->

branches/branch-1_6/template/yoga/default-layout.css

@@ -53 +53 @@
 /** General defaults **/
 INPUT {margin: 0;}
-ul, dl, li { text-align: left;}
+UL, DL, LI { text-align: left;}
 TABLE {                 /* horizontaly centered */
   margin-left: auto;
@@ -59 +59 @@
 }
 /* for debugging purpose */
-pre { text-align:left; }
+PRE { text-align:left; }
 
 /** forms **/
 
-form { padding: 0em; }
-
-form p {
+FORM { padding: 0em; }
+
+FORM P {
         text-align: center;
         margin-top: 2em;
@@ -74 +74 @@
 }
 
-textarea.description {
+TEXTAREA.description {
   height: 100px;
   width: 500px;
   overflow: auto;
 }
-select.categoryList {
+SELECT.categoryList {
   width: 100%;
 }
@@ -85 +85 @@
 /** go to an admin.css ? **/
 
-.table2 {
+TABLE.table2 {
   border: 1px solid black;
   margin: 1em auto;
@@ -91 +91 @@
 }
 
-.table2 TD, .table2 TH {
+TABLE.table2 TD, TABLE.table2 TH {
   padding: 0 1em;
 }
 
-form#add_virtual p { text-align: left; }
+TABLE.table2 TR {
+  text-align: left;
+}
+
+TABLE.table2 TR.throw {
+  text-align: center;
+}
+
+.hour {
+  white-space: pre;
+}
+
+.number {
+  text-align: right;
+}
+  
+TABLE#dailyStats {
+  width: 60%;
+}
+
+TABLE#detailedStats {
+  width: 80%;
+}
+
+FORM#add_virtual P { text-align: left; }
 FORM#categoryOrdering, FORM#addVirtual {
   padding-left: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */

branches/branch-1_6/template/yoga/theme/clear/theme.css

@@ -11 +11 @@
 }
 
-H2, #menubar DT, #imageHeaderBar, #imageToolBar A:hover {
+H2, #menubar DT, #imageHeaderBar, #imageToolBar A:hover, .row1 {
   background-color: #d3d3d3;
 }

branches/branch-1_6/template/yoga/theme/dark/theme.css

@@ -22 +22 @@
 }
 
-H3, #the_page, #imageHeaderBar, #imageToolBar A:hover {
+H3, #the_page, #imageHeaderBar, #imageToolBar A:hover, .row1  {
   background-color: #3f3f3f;
 }