merge : from trunk r:1381:1382 into branch 1.6 (feature 433)

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

3 files changed, 36 insertions, 35 deletions

diff --git a/template/yoga/content.css b/template/yoga/content.css
index bb5e4e585..1ffa3fe8a 100644
--- a/template/yoga/content.css
+++ b/template/yoga/content.css
@@ -74,32 +74,6 @@ BODY#theNBMPage #content
   top: 0;
 }
 
-/* fix IE with another layout */
-* html #content UL.thumbnails SPAN.wrap2 {
-  display: block;
-  position: relative;
-  text-align: left;
-}
-* html #content UL.thumbnails SPAN.wrap2 A,
-* html #content UL.thumbnails SPAN.wrap2 LABEL {
-  overflow: visible;
-  position: absolute;
-  top: 50%;
-  text-align: center;
-}
-* html #content UL.thumbnails IMG.thumbnail {
-  position: relative;
-  top: -50%;
-  /*\*//*/
-    margin-top: -40%;
-  /**/
-}
-* html #content UL.thumbnails SPAN.wrap2 input {
-  position: absolute;
-  left: 0;
-  top: -50%;  /* same as other browsers but not so pretty */
-}
-
 #content .navigationBar, #content .additional_info {
     margin: 10px 0;
     text-align: center;
@@ -163,8 +137,8 @@ UL.categoryActions {
 #content DIV.comment {
   margin: 0 0 0.5em 0;
   padding: 0;
-  overflow: hidden; /* these 2 lines ensure the floating child is kept in the DIV */
-  width: 100%;	    /* don't ask why. It's a very usefull trick                   */
+  overflow: hidden; /* these 2 lines keep the floating child in the DIV */
+  width: 100%;	    /* don't ask why. It's a very usefull trick         */
 }
 
 #content DIV.comment A.illustration {
@@ -299,10 +273,6 @@ DIV.calImg {
   width: 100%;
 }
 
-* html #content UL.thumbnailCategories {
-  width: 99%; /* buggy IE box model */
-}
-
 #content UL.thumbnailCategories LI {
   margin:0;
   padding:0;
diff --git a/template/yoga/fix-ie5-ie6.css b/template/yoga/fix-ie5-ie6.css
index 257d93d41..e78b0bda4 100644
--- a/template/yoga/fix-ie5-ie6.css
+++ b/template/yoga/fix-ie5-ie6.css
@@ -1,5 +1,5 @@
 /* $Id$ */
-/* Issues in IE from 5 to 6 only to to be used with IE7                       */
+/* Issues in IE from 5 to 6 only not to be used with IE7                      */
 
 /* fix lack of :hover behaviour for non link objects */
 BODY {
@@ -20,3 +20,35 @@ UL.tagSelection LI INPUT,
   border: none;
   background-color: transparent;
 }
+
+/* fix IE with another layout for thumbnails */
+#content UL.thumbnails SPAN.wrap2 {
+  display: block;
+  position: relative;
+  text-align: left;
+}
+#content UL.thumbnails SPAN.wrap2 A,
+#content UL.thumbnails SPAN.wrap2 LABEL {
+  overflow: visible;
+  position: absolute;
+  top: 50%;
+  text-align: center;
+}
+#content UL.thumbnails IMG.thumbnail {
+  position: relative;
+  top: -50%;
+  /*\*//*/
+    margin-top: -40%;
+  /**/
+}
+#content UL.thumbnails SPAN.wrap2 input {
+  position: absolute;
+  left: 0;
+  top: -50%;  /* same as other browsers but not so pretty */
+}
+
+/* fix category thumbnails on main page */
+#content UL.thumbnailCategories {
+  width: 99%; /* buggy IE box model */
+}
+
diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl
index f09bd748b..cb4d7d01e 100644
--- a/template/yoga/index.tpl
+++ b/template/yoga/index.tpl
@@ -52,8 +52,7 @@
   <!-- END calendar -->
 
   <!-- BEGIN calendar -->
-  <h2>{calendar.TITLE}
-</h2>
+  <h2>{calendar.TITLE}</h2>
   <!-- END calendar -->
 
   </div> <!-- titrePage -->