adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-01 20:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merging revisions 2778-2779

Browse Source 
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
This commit is contained in:
vdigital
2008-10-19 21:02:47 +00:00
parent a6be0e500b
commit c0ba6e46a3
5 changed files with 100 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
template-extension/distributed/samples/my-picture.tpl
+76 -4
View File
@@ -1,24 +1,96 @@
{* $Id$ *}
<!-- This is a sample of template extensions -->
{if isset($errors)}
<div class="errors">
<ul>
{foreach from=$errors item=error}
<li>{$error}</li>
{/foreach}
</ul>
</div>
{/if}
{if isset($infos)}
<div class="infos">
<ul>
{foreach from=$infos item=info}
<li>{$info}</li>
{/foreach}
</ul>
</div>
{/if}
<div id="imageHeaderBar">
<div class="browsePath">
<a href="{$U_HOME}" rel="home">{'home'|@translate}</a>
{$LEVEL_SEPARATOR}{$SECTION_TITLE}
{if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if}
{$LEVEL_SEPARATOR}{$current.TITLE}
</div>
<div class="imageNumber">{$PHOTO}</div>
{if $SHOW_PICTURE_NAME_ON_TITLE }
<h2>{$current.TITLE}</h2>
{/if}
</div>
{if !empty($PLUGIN_PICTURE_BEFORE)}{$PLUGIN_PICTURE_BEFORE}{/if}
<div id="imageToolBar">
<div class="randomButtons">
{if isset($U_SLIDESHOW_START) }
<a href="{$U_SLIDESHOW_START}" title="{'slideshow'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_slideshow.png" class="button" alt="{'slideshow'|@translate}"></a>
{/if}
{if isset($U_SLIDESHOW_STOP) }
<a href="{$U_SLIDESHOW_STOP}" title="{'slideshow_stop'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_slideshow.png" class="button" alt="{'slideshow_stop'|@translate}"></a>
{/if}
<a href="{$U_METADATA}" title="{'picture_show_metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata" /></a>
{if isset($current.U_DOWNLOAD) }
<a href="{$current.U_DOWNLOAD}" title="{'download_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
{/if}
{if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
{if isset($favorite) }
<a href="{$favorite.U_FAVORITE}" title="{$favorite.FAVORITE_HINT}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="favorite" title="{$favorite.FAVORITE_HINT}"></a>
{/if}
{if !empty($U_SET_AS_REPRESENTATIVE) }
<a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as category representative'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/representative.png" class="button" alt="{'representative'|@translate}"></a>
{/if}
{if isset($U_ADMIN) }
<a href="{$U_ADMIN}" title="{'link_info_image'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
{/if}
{if isset($U_CADDIE) }{*caddie management BEGIN*}
<script type="text/javascript">
{literal}function addToCadie(aElement, rootUrl, id)
{
if (aElement.disabled) return;
aElement.disabled=true;
var y = new PwgWS(rootUrl);
y.callService(
"pwg.caddie.add", {image_id: id} ,
{
onFailure: function(num, text) { alert(num + " " + text); document.location=aElement.href; },
onSuccess: function(result) { aElement.disabled = false; }
}
);
}{/literal}
</script>
<a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
{/if}{*caddie management END*}
</div>
{include file=$FILE_PICTURE_NAV_BUTTONS}
{include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
</div> <!-- imageToolBar -->
<div id="theImage">
{$ELEMENT_CONTENT}
{if isset($COMMENT_IMG)}
<p>{$COMMENT_IMG}</p>
{/if}
{if isset($U_SLIDESHOW_STOP) }
<p>
[ <a href="{$U_SLIDESHOW_STOP}">{'slideshow_stop'|@translate}</a> ]
</p>
{/if}
</div>
{if isset($previous) }
@@ -32,4 +104,4 @@
</a>
{/if}
{if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if}
{if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if}
template/yoga/picture.tpl
+3 -2
View File
@@ -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}
template/yoga/theme/Sylvia/theme-ie.css
+12
View File
@@ -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; } /* */
template/yoga/theme/Sylvia/theme.css
+4 -9
View File
@@ -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; } /* */
color:#999; border-color: #666; }
template/yoga/theme/Sylvia/themeconf.inc.php
+5 -1
View File
@@ -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]-->
',
);
?>