diff --git a/template-extension/distributed/samples/my-picture.tpl b/template-extension/distributed/samples/my-picture.tpl index 1f2f6f13d..1f3d2688e 100644 --- a/template-extension/distributed/samples/my-picture.tpl +++ b/template-extension/distributed/samples/my-picture.tpl @@ -1,24 +1,96 @@ {* $Id$ *} - + +{if isset($errors)} +
+ +
+{/if} + +{if isset($infos)} +
+ +
+{/if} +
{'home'|@translate} - {$LEVEL_SEPARATOR}{$SECTION_TITLE} + {if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if} {$LEVEL_SEPARATOR}{$current.TITLE}
+
{$PHOTO}
+ {if $SHOW_PICTURE_NAME_ON_TITLE } +

{$current.TITLE}

+ {/if}
{if !empty($PLUGIN_PICTURE_BEFORE)}{$PLUGIN_PICTURE_BEFORE}{/if}
+ {if isset($U_SLIDESHOW_START) } + {'slideshow'|@translate} + {/if} + {if isset($U_SLIDESHOW_STOP) } + {'slideshow_stop'|@translate} + {/if} + metadata + {if isset($current.U_DOWNLOAD) } + {'download'|@translate} + {/if} {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if} + {if isset($favorite) } + favorite + {/if} + {if !empty($U_SET_AS_REPRESENTATIVE) } + {'representative'|@translate} + {/if} + {if isset($U_ADMIN) } + {'edit'|@translate} + {/if} + {if isset($U_CADDIE) }{*caddie management BEGIN*} + + {'caddie'|@translate} + {/if}{*caddie management END*}
- {include file=$FILE_PICTURE_NAV_BUTTONS} + {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
{$ELEMENT_CONTENT} +{if isset($COMMENT_IMG)} +

{$COMMENT_IMG}

+{/if} + +{if isset($U_SLIDESHOW_STOP) } +

+ [ {'slideshow_stop'|@translate} ] +

+{/if} +
{if isset($previous) } @@ -32,4 +104,4 @@ {/if} -{if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if} +{if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if} \ No newline at end of file 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)}
-

{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}

- + {if $COMMENT_COUNT > 0} +

{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}

+ {/if} {if !empty($COMMENT_NAV_BAR)}
{$COMMENT_NAV_BAR}
{/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' => ' + + + + ', ); ?>