- update of picture.tpl for a specific Opera bug

- Comments included in default.css to help admin to enhanced their gallery


git-svn-id: http://piwigo.org/svn/trunk@689 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 154 insertions, 198 deletions

diff --git a/template/default/default.css b/template/default/default.css
index 07b079206..3e919e782 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -1,21 +1,25 @@
 /* BACKGROUND */
 
-body { background-color:#000000;}
-.main, .throw, .admin {	background-color:#3F3F3F;}
-.row1,input,select,textarea, .table1, .home { background-color:#5F5F5F;}
-.table2, .commentTitle { background-color: #797979;}
-.errors { background-color:red;}
-
-.titreMenu,.titrePage,.imgMenu a:hover { background-image: url(theme/tableh1_bg.gif);}
-.bouton, .imgMenu a, #imgBarMenu { background-image: url(theme/button_bg.gif);}
+body { background-color:#000000;} /*General background color*/
+.main, .throw, .admin {	background-color:#3F3F3F;} /*Main background color*/
+.row1,input,select,textarea, .table1, .home { background-color:#5F5F5F;} /* Tables & forms */
+.table2, .commentTitle { background-color: #797979;} /* Alternate table & comments  */
+.errors { background-color:red;} /* Errors display */
+.titreMenu,.titrePage,.imgMenu a:hover { background-image: url(theme/tableh1_bg.gif);} /* Titles background image  */
+.bouton, .imgMenu a, #imgBarMenu { background-image: url(theme/button_bg.gif);} /* Buttons background image */
 
 /* FONT COLORS */
 
-.titreMenu, .titreMenu a, .info, .admin{ color:#FFF48E;}
-.titrePage, .titreMenu a:hover { color:#E0E0E0;}
-.comment{ color:#C6B78E;}
-.commentDate { color:#999999;}
-input,select,textarea { color:#FFFFCC;}
+body { color:#E0E0E0;} /* General font color */
+input,select,textarea { color:#FFFFCC;} /* Forms font color */
+.titreMenu, .titreMenu a, .info, .admin{ color:#FFF48E;} /* Menu & sections titles */
+.titrePage, .titreMenu a:hover { color:#E0E0E0;} /* Page title */
+.comment{ color:#C6B78E;} /* Comments */
+.commentDate { color:#999999;} /* Comments date */
+.throw { color:#FFFFCC;} /* First line of tables */
+.bouton, .errors { color:#FFFFFF;} /* Buttons & errors */
+.update_summary_new { color:#9cb4ce;} /* Update results (admin side only) */
+.update_summary_del { color:#ffe1e1;} /* Update results (admin side only) */
 
 /* ANCHORS */
 
@@ -25,7 +29,71 @@ a.none:hover { text-decoration:none;}
 a.image:hover { text-decoration:none;}
 a.thumbLink:hover { text-decoration:none;}
 
+/* FONT STYLES */
+
+body /* Main font style */
+{
+  font-family: Verdana, Geneva, Arial, sans-serif;
+  font-size:12px;
+  margin:5px;
+}
+
+h1 /* H1 tag style (admin side only) */
+{
+	font-family: 'Trebuchet MS', Verdana, sans-serif;
+	text-decoration:none; 
+	line-height:	120%;
+	font-size:18px;
+	font-weight: bold;
+}
+
+h2 /* H2 tag style (admin side only) */
+{
+	font-family: Arial, Helvetica, sans-serif;
+	text-decoration:none; 
+	line-height:	120%; 
+	font-size:12px;
+	font-weight: bold;
+}
+
+.titreMenu /* Menu titles */
+{
+  font-size:12px;
+  font-weight:600;
+}
+
+.titrePage /* Page titles */
+{
+  font-family: 'Trebuchet MS', Verdana, sans-serif;
+  font-weight:600;
+  font-size:16px;
+}
+
+.commentTitle /* Comments title */
+{
+  font-family: Arial, Helvetica, sans-serif;
+  font-size:12px;
+  font-weight:bold;
+}
+
+.menu .thumbnail, .totalImages { font-size:11px;}
+.small{ font-size:10px;}
+.menuCategorySelected, .throw, .admin, .errors { font-weight:bold;}
+.menuCategoryNotSelected, .dateSelected, .pageNumberSelected, .thumb_picture, .thumb_category  { font-weight:normal;}
+.commentDate, .bouton  { font-weight:lighter;}
+.commentImage { font-style:italic; font-size:16px;}
+.nameImage { font-size:20px;}
+.info { font-size:16px;}
+.copyright { font-size:10px; text-align:center; letter-spacing:-1px;}
+div.information {  font-size:14px; font-weight:bold;}
+
+/*----------------------------------------------*/
+/* Under this point, do not modify the values   */
+/* unless you are aware of what you are doing!  */
+/*----------------------------------------------*/
+
 /* POSITION */
+
 #gauche,#droite
 {
   float:left;
@@ -44,44 +112,57 @@ a.thumbLink:hover { text-decoration:none;}
 #left {float:left; }
 #right{float:right; }
 
-/* MAIN STYLES */
+/* GENERAL LAYOUT STYLES */
 
-body {
-  font-family: Verdana, Geneva, Arial, sans-serif;
-  font-size:12px;
-  color:#E0E0E0;
-  margin:5px;
+.main 
+{
+	border: 1px solid #E0E0E0; 
+	width:100%;
+	padding-bottom:30px;
+	text-align:center;
+	display:block;
 }
 
-h1 {
-	font:			bold 18pt 'Trebuchet MS', Verdana, sans-serif;
-	text-decoration:none; 
-	line-height:	120%;
+.home
+{
+  border: 1px solid #000000;
+  display:block;
+  text-align:center;
+  width:100%;
 }
 
-h2 {
-	font:			bold 12pt Arial, Helvetica, sans-serif;
-	text-decoration:none; 
-	line-height:	120%; 
+.navigationBar 
+{
+  text-align:center;
+  margin-top:10px;
+  margin-bottom:10px;
 }
 
+.info 
+{
+  margin:5px 0px 5px 0px;
+  white-space:nowrap;
+  text-align:center;
+}
 
-
-/* LAYOUT STYLE */
-
-.main {
-	border: 1px solid #E0E0E0; 
-	width:100%;
-	padding-bottom:30px;
-	text-align:center;
-	display:block;
+.errors 
+{
+  text-align:left;
+  margin-top:5px;
+  margin-bottom:5px;
+  border:1px solid black;
 }
 
-/* Navigation styles */
+div.information {
+  text-align:left;
+  margin:10px;
+  padding:5px;
+}
 
-.small{
-  font-size:10px;
+span.dateSelected, span.pageNumberSelected {
+  text-decoration:underline;
 }
+/* MENU LAYOUT STYLES */
 
 .titreMenu,.titrePage
 {
@@ -91,49 +172,34 @@ h2 {
   border-right: 1px solid #000000;
   height: 25px;
   line-height: 25px;
-  font-size:12px;
-  font-weight:600;
   text-align:center;
 }
+.titrePage {text-align:left;}
 
-.titrePage
+.menu 
 {
-  font-family: 'Trebuchet MS', Verdana, sans-serif;
-  text-align:left;
-  font-size:16px;
-}
-
-.menu {
   margin:10px 5px 10px 5px;
   white-space:nowrap;
-  font-size:11px;
   text-align:left;
 }
 
-ul.menu {
+ul.menu 
+{
   text-align:left;
   list-style-type: square ;
   padding-left:15px;
   margin:5px;
 }
 
-.menuCategorySelected {
-  font-weight:bold;
-}
-
-.menuCategoryNotSelected {
-  font-weight:normal;
-}
-
-.navigationBar {
+.totalImages {
   text-align:center;
-  margin-top:10px;
-  margin-bottom:10px;
+  margin-top:5px;
 }
 
- /* Image related styles */
+ /* IMAGE LAYOUT STYLES */
  
-.image {
+.image 
+{
 	border : 3px solid #FFFFFF;
 	margin : 10px 4px 10px 4px;
 }
@@ -178,29 +244,17 @@ ul.menu {
 
 .commentImage {
   text-align:justify;
-  font-style:italic;
-  font-size:16px;
   margin-top: 10px;
   margin-bottom: 10px;
 }
 
-.nameImage {
-  text-align:center;
-  font-size:20px;
-}
-/* Table styles */
+/* TABLE LAYOUT STYLES */
 
-.table1, .home
+.table1
 {
   border: 1px solid #000000;
   display:block;
 }
-
-.home
-{
-  text-align:center;
-  width:100%;
-}
   
 .table2 {
 	border: 1px solid #000000; 
@@ -220,9 +274,7 @@ ul.menu {
 } 
 
 .throw {
-  color:#FFFFCC;
   text-align:center;
-  font-weight:bold;
   border-top: 1px solid #000000; 
   border-bottom: 1px solid #000000; 
   height:20px;
@@ -232,10 +284,10 @@ td.throw{
   text-align:left;
   width:auto;
 }
-/* Thumbnails styles */
+
+/* THUMBNAILS LAYOUT STYLES */
 
 .thumbnail {
-	font-size:11px;
 	text-align:center;
 	vertical-align: baseline;
 	white-space: nowrap;
@@ -253,164 +305,68 @@ table.thumbnail {
 	margin: 2px;
 }
 
-/* Comment styles */
-.commentTitle {
-  font-family: Arial, Helvetica, sans-serif;
-  font-size:12px;
-  font-weight:bold;
-  padding: 15px 5px 10px 5px;
-}
+/* COMMENTS LAYOUT STYLES */
 
+.commentTitle {  padding: 15px 5px 10px 5px; }
 .commentDate {
-  font-weight:lighter;
   text-align:right;
   border-top: 1px solid #000000; 
   border-bottom: 1px solid #000000;
 }
 
-/* Form styles */
+/* FORM LAYOUT STYLES */
 
-form{
+form
+{
   text-align:left;
   padding:10px;
 }
 
-.bouton {
+.bouton
+{
   border: 1px solid #404750;
-  color:#FFFFFF;
   padding-left: 3px;
   padding-right: 3px;
-  font-weight:500;
   background-position : bottom;
   margin-top:10px;
 }
 
-input,select,textarea {
+input,select,textarea 
+{
  text-indent:2px;
  border: 1px solid #797979;
  padding: 0;
 }
 
-.radio{
-  border:0;
-}
-/* Admin styles */
+.radio{  border:0;}
 
-.adminMenu {
+/* ADMIN LAYOUT STYLES */
+
+.adminMenu 
+{
   text-align:center;
   font-size:12px;
 }
 
-div.adminMenu{
-margin:10px 50px 10px 50px; 
-}
+div.adminMenu{ margin:10px 50px 10px 50px; }
 
-.admin {
-font-weight:bold;
+.admin 
+{
 margin:0px 0px 12px 0px;
 text-align: center;
 padding:0px;
 }
 
-/* Other styles */
-.info {
-  margin:5px 0px 5px 0px;
-  white-space:nowrap;
-  text-align:center;
-  font-size:16px;
-}
-
-.totalImages {
-  text-align:center;
-  margin-top:5px;
-  font-family:sans-serif;
-  font-size:11px;
-}
-
-.copyright {
-  font-size:10px;
-  text-align:center;
-  letter-spacing:-1px;
-}
-
-.errors {
-  text-align:left;
-  margin-top:5px;
-  margin-bottom:5px;
-  font-weight:bold;
-  border:1px solid black;
-  color:white;
-}
-
-div.information {
-  text-align:left;
-  font-size:14px;
-  font-weight:bold;
-  margin:10px;
-  padding:5px;
-}
-
-span.dateSelected, span.pageNumberSelected {
-  text-decoration:underline;
-}
-
-/**
- * in calendar category, year or month currently focused
- */
-span.dateSelected {
-}
-
-/**
- * in navigation bar, page number currently focused
- */
-span.pageNumberSelected {
-}
-
-span.thumb_picture {
-  font-weight:normal;
-}
-
-span.thumb_category {
-  font-weight:normal;
-}
-
-span.update_error_element, span.update_category_error {
-  color:orange;
-}
-
-.update_summary_new {
-  color:#9cb4ce;
-}
-
-.update_summary_del {
-  color:#ffe1e1;
-}
-
 div.remoteOutput, div.remoteLocal {
-  background-color:#444444;
   border:1px solid black;
   margin:10px;
   text-align:left;
   padding:5px;
 }
 
-li.remoteInfo {
-  color:gray;
-}
-
-li.remoteWarning {
-  color:#ffe1e1;
-}
-
-li.remoteError {
-  color:orange;
-}
-
 div.remoteLocal {
   text-align:center;
 }
 
 /* for debugging purpose */
-pre {
-  text-align:left;
-}
\ No newline at end of file
+pre { text-align:left; }
\ No newline at end of file
diff --git a/template/default/picture.tpl b/template/default/picture.tpl
index 4d4c5c374..4bd65d6d6 100644
--- a/template/default/picture.tpl
+++ b/template/default/picture.tpl
@@ -62,7 +62,7 @@
   [ <a href="{stop_slideshow.U_SLIDESHOW}" class="back" style="font-weight:bold;">{L_STOP_SLIDESHOW}</a> ]
 </div>
 <!-- END stop_slideshow -->
-
+<div style="clear:both;"></div>
 <div id="gauche">
 &nbsp;
   <!-- BEGIN previous -->
@@ -91,9 +91,9 @@
   <!-- END next -->
   &nbsp;
 </div>
-<div style="clear:both"></div>
+<div style="clear:both;"></div>
          <!-- BEGIN metadata -->
-          <table class="metadata">
+          <table class="tablecompact">
             <!-- BEGIN headline -->
             <tr>
               <th colspan="2">{metadata.headline.TITLE}</th>