Merging revisions 2778-2779

0 comment is removed (Start with 1)
Accurate samples/my-picture.tpl...

CSS 2.1 cannot be reached (14 errors left).
IE rule set is created (including IE hack).

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

4 files changed, 24 insertions, 12 deletions

diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index d6a99decf..b8f3ec522 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -251,8 +251,9 @@ y.callService(
 
 {if isset($COMMENT_COUNT)}
 <div id="comments">
-	<h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3>
-
+  {if $COMMENT_COUNT > 0}
+		<h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3>
+  {/if}
 	{if !empty($COMMENT_NAV_BAR)}
 	<div class="navigationBar">{$COMMENT_NAV_BAR}</div>
 	{/if}
diff --git a/template/yoga/theme/Sylvia/theme-ie.css b/template/yoga/theme/Sylvia/theme-ie.css
new file mode 100644
index 000000000..f5cb7aa0f
--- /dev/null
+++ b/template/yoga/theme/Sylvia/theme-ie.css
@@ -0,0 +1,12 @@
+#content.thumbnailCategory div.description .text {
+	scrollbar-face-color:#222;
+	scrollbar-shadow-color:#444;
+	scrollbar-highlight-color:#000;
+	scrollbar-darkshadow-color:#333;
+	scrollbar-track-color:#111;
+	scrollbar-arrow-color:#f70;
+}
+
+#debug { word-wrap:break-word; }
+/* IE6... Hacks: */
+/*\*/ * html #menubar #mbIdentification .button { margin-right:25px; } /* */ 
\ No newline at end of file
diff --git a/template/yoga/theme/Sylvia/theme.css b/template/yoga/theme/Sylvia/theme.css
index 5d7dbefe3..9750f18f2 100644
--- a/template/yoga/theme/Sylvia/theme.css
+++ b/template/yoga/theme/Sylvia/theme.css
@@ -59,10 +59,7 @@ padding: 0 0 0 10px; margin: 0; }
 #content .thumbnailCategory div.description { background:transparent url(images/cat_top-right.gif) no-repeat scroll right top;
 margin: 0; padding:15px 10px 3px 0; overflow: hidden; }
 #content .thumbnailCategory div.description .text { display:block; margin:10px 2px 0 0;
-overflow: auto; overflow-x:hidden; padding:0 0 5px;  /* Only IE family supports colored scrollbar */
- scrollbar-face-color: #222; scrollbar-shadow-color: #444; scrollbar-highlight-color: #000;
- scrollbar-3dlight-color: #292929; scrollbar-darkshadow-color: #333; scrollbar-track-color: #111;
- scrollbar-arrow-color: #f70; }
+overflow: auto; overflow-x:hidden; padding:0 0 5px; }
 .content div.thumbnailCategory div.description p.dates { margin: 0 15px 0 15px; text-align: right; }
 #content.content .thumbnailCategory div.description H3 { display: block; margin: 0; }
 #content ul.thumbnailCategories li:hover { background-color:#111; } 
@@ -95,14 +92,12 @@ A:hover, A:active { color: #f33; border-bottom: 1px solid #f33; cursor: pointer;
 #imageToolBar { padding:0 7%; }
 #imageHeaderBar .imageNumber { margin-right:7%; }
 #imageHeaderBar .browsePath { margin-left:7%; }
-*, *:focus, *:active, input:active, a:active, input:focus, a:focus { outline: none; -moz-outline-width: 0px; }
-#debug { margin: 15px 15px 5px 248px; font-size:12px; clear: both; word-wrap:break-word;}
+*, *:focus, *:active, input:active, a:active, input:focus, a:focus { outline: none; }
+#debug { margin: 15px 15px 5px 248px; font-size:12px; clear: both; }
 .rateButtonStarFull { 	background-image: url('icon/rating-stars.gif'); }
 .rateButtonStarEmpty { background-image: url('icon/rating-stars.gif'); }
 #menubar #mbIdentification fieldset div input[type="text"] { margin: 0 0 3px; width: 174px; display: inline; }
 input[type="button"], input[type="submit"], input[type="reset"] {
 color:#ff3363; background-color:#222; border-color: #ff3363; }
 input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover {
-color:#999; border-color: #666; }
-/* IE6... Hacks: */
-/*\*/ * html #menubar #mbIdentification .button { margin-right:25px; } /* */ 
\ No newline at end of file
+color:#999; border-color: #666; }
\ No newline at end of file
diff --git a/template/yoga/theme/Sylvia/themeconf.inc.php b/template/yoga/theme/Sylvia/themeconf.inc.php
index 66b953bce..578b34ffb 100644
--- a/template/yoga/theme/Sylvia/themeconf.inc.php
+++ b/template/yoga/theme/Sylvia/themeconf.inc.php
@@ -5,6 +5,10 @@ $themeconf = array(
   'icon_dir' => 'template/yoga/theme/Sylvia/icon',
   'admin_icon_dir' => 'template/yoga/icon/admin',
   'mime_icon_dir' => 'template/yoga/theme/Sylvia/icon/mimetypes/',
-  'local_head' => '',
+  'local_head' => '
+<!--[if IE]> <-->
+	<link rel="stylesheet" href="template/yoga/theme/Sylvia/theme-ie.css" type="text/css">
+<!--> <![endif]-->
+  ',
 );
 ?>