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

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1340 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 50 insertions, 27 deletions

diff --git a/template/yoga/admin/stats.tpl b/template/yoga/admin/stats.tpl
index d09759643..75de81f79 100644
--- a/template/yoga/admin/stats.tpl
+++ b/template/yoga/admin/stats.tpl
@@ -5,48 +5,47 @@
 <img class="image" src="{IMG_REPORT}" alt="{L_STAT_MONTHLY_ALT}" />
 
 <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 -->
 </table>
 
 <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>
     <th>{L_STAT_ADDR}</th>
     <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 -->
 <div class="admin">
 {navigation.NAV_BAR}
 </div>
-<!-- END navigation -->
\ No newline at end of file
+<!-- END navigation -->
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 01f7afb29..9752690af 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -52,19 +52,19 @@ HR.separation {
 
 /** General defaults **/
 INPUT {margin: 0;}
-ul, dl, li { text-align: left;}
+UL, DL, LI { text-align: left;}
 TABLE {			/* horizontaly centered */
   margin-left: auto;
   margin-right: auto;
 }
 /* for debugging purpose */
-pre { text-align:left; }
+PRE { text-align:left; }
 
 /** forms **/
 
-form { padding: 0em; }
+FORM { padding: 0em; }
 
-form p {
+FORM P {
 	text-align: center;
 	margin-top: 2em;
 	margin-bottom: 2em;
@@ -73,28 +73,52 @@ form p {
 	font-size: 80%;
 }
 
-textarea.description {
+TEXTAREA.description {
   height: 100px;
   width: 500px;
   overflow: auto;
 }
-select.categoryList {
+SELECT.categoryList {
   width: 100%;
 }
 
 /** go to an admin.css ? **/
 
-.table2 {
+TABLE.table2 {
   border: 1px solid black;
   margin: 1em auto;
   padding: 0;
 }
 
-.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) */
   padding-right: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
diff --git a/template/yoga/theme/clear/theme.css b/template/yoga/theme/clear/theme.css
index ee77519f6..56da48326 100644
--- a/template/yoga/theme/clear/theme.css
+++ b/template/yoga/theme/clear/theme.css
@@ -10,7 +10,7 @@ BODY, H3, .throw {
   background-color: #ffffff;	/* white */
 }
 
-H2, #menubar DT, #imageHeaderBar, #imageToolBar A:hover {
+H2, #menubar DT, #imageHeaderBar, #imageToolBar A:hover, .row1 {
   background-color: #d3d3d3;
 }
 
diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index 6a9ee7a40..854cc48dd 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
@@ -21,7 +21,7 @@ BODY {
   background-color: #000000;
 }
 
-H3, #the_page, #imageHeaderBar, #imageToolBar A:hover {
+H3, #the_page, #imageHeaderBar, #imageToolBar A:hover, .row1  {
   background-color: #3f3f3f;
 }