From 788a600d78fd974798ca1f3c91429f4e567f0413 Mon Sep 17 00:00:00 2001 From: rvelices Date: Wed, 29 Dec 2010 21:00:25 +0000 Subject: css sprites fix ie7 display picture.tpl more compact + removed unnecessary escape modifiers + use footer_script template combine_css small things git-svn-id: http://piwigo.org/svn/trunk@8378 68402e56-0260-453c-a942-63ccdbb3a9ee --- themes/default/fix-ie7.css | 3 + themes/default/template/picture.tpl | 291 ++++++++++++++++++------------------ 2 files changed, 145 insertions(+), 149 deletions(-) (limited to 'themes/default') diff --git a/themes/default/fix-ie7.css b/themes/default/fix-ie7.css index 5d98130ad..c72b00748 100644 --- a/themes/default/fix-ie7.css +++ b/themes/default/fix-ie7.css @@ -19,3 +19,6 @@ margin-top: 2%; } +.pwg-icon { + display: block; +} diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index 1288e1f17..3da465a05 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -1,73 +1,70 @@ -{* Example of resizeable *} -{* +{* Example of resizeable {include file='include/autosize.inc.tpl'} *} {if isset($errors)}
- +
{/if} - {if isset($infos)}
- +
{/if} {if !empty($PLUGIN_PICTURE_BEFORE)}{$PLUGIN_PICTURE_BEFORE}{/if}
-
- {$SECTION_TITLE} - {$LEVEL_SEPARATOR}{$current.TITLE} -
-
{$PHOTO}
- {if $SHOW_PICTURE_NAME_ON_TITLE } -

{$current.TITLE}

- {/if} +
+ {$SECTION_TITLE} {$LEVEL_SEPARATOR}{$current.TITLE} +
+
{$PHOTO}
+ {if $SHOW_PICTURE_NAME_ON_TITLE} +

{$current.TITLE}

+ {/if}
-
+
{if isset($U_SLIDESHOW_START)} - -  {'slideshow'|@translate} - + +  {'slideshow'|@translate} + {/if} {if isset($U_METADATA)} - -  {'Show file metadata'|@translate} - + +  {'Show file metadata'|@translate} + {/if} {if isset($current.U_DOWNLOAD)} - -  {'download'|@translate} - + +  {'download'|@translate} + {/if} {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if} {if isset($favorite)} - -  {'Favorites'|@translate} - + +  {'Favorites'|@translate} + {/if} {if isset($U_SET_AS_REPRESENTATIVE)} - -  {'representative'|@translate} - + +  {'representative'|@translate} + {/if} {if isset($U_ADMIN)} - -  {'edit'|@translate} - + +  {'edit'|@translate} + {/if} {if isset($U_CADDIE)}{*caddie management BEGIN*} {footer_script} @@ -76,7 +73,6 @@ if (aElement.disabled) return; aElement.disabled=true; var y = new PwgWS(rootUrl); - y.callService( "pwg.caddie.add", {image_id: id} , { @@ -86,11 +82,11 @@ y.callService( ); }{/literal} {/footer_script} - -  {'caddie'|@translate} - + +  {'caddie'|@translate} + {/if}{*caddie management END*} -
+
{include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
@@ -102,110 +98,109 @@ y.callService(

{$COMMENT_IMG}

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

- [ {'stop the slideshow'|@translate} ] + [ {'stop the slideshow'|@translate} ]

{/if} {if $DISPLAY_NAV_THUMB} -{if isset($previous) } +{if isset($previous)} {/if} -{if isset($next) } +{if isset($next)} {/if} {/if} - {if $display_info.author} - - - - - {/if} - {if $display_info.created_on} - - - - - {/if} - {if $display_info.posted_on} - - - - - {/if} - {if $display_info.dimensions} - - - - - {/if} - {if $display_info.file} - - - - - {/if} - {if $display_info.filesize} - - - - - {/if} - {if $display_info.tags} - - - - - {/if} - {if $display_info.categories} - - - - - {/if} - {if $display_info.visits} - - - - - {/if} + {if $display_info.author} + + + + + {/if} + {if $display_info.created_on} + + + + + {/if} + {if $display_info.posted_on} + + + + + {/if} + {if $display_info.dimensions} + + + + + {/if} + {if $display_info.file} + + + + + {/if} + {if $display_info.filesize} + + + + + {/if} + {if $display_info.tags} + + + + + {/if} + {if $display_info.categories} + + + + + {/if} + {if $display_info.visits} + + + + + {/if} -{if $display_info.average_rate and isset($rate_summary) } +{if $display_info.average_rate and isset($rate_summary)} {/if} - + {if isset($rating)} {/if} -{if $display_info.privacy_level and isset($available_permission_levels) } +{if $display_info.privacy_level and isset($available_permission_levels)} -
{'Author'|@translate}{if isset($INFO_AUTHOR)}{$INFO_AUTHOR}{else}{'N/A'|@translate}{/if}
{'Created on'|@translate}{if isset($INFO_CREATION_DATE)}{$INFO_CREATION_DATE}{else}{'N/A'|@translate}{/if}
{'Posted on'|@translate}{$INFO_POSTED_DATE}
{'Dimensions'|@translate}{if isset($INFO_DIMENSIONS)}{$INFO_DIMENSIONS}{else}{'N/A'|@translate}{/if}
{'File'|@translate}{$INFO_FILE}
{'Filesize'|@translate}{if isset($INFO_FILESIZE)}{$INFO_FILESIZE}{else}{'N/A'|@translate}{/if}
{'Tags'|@translate} - {if isset($related_tags)} - {foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if} - {$tag.name}{/foreach} - {/if} -
{'Albums'|@translate} - {if isset($related_categories)} -
    - {foreach from=$related_categories item=cat} -
  • {$cat}
    • - {/foreach} -
- {/if} -
{'Visits'|@translate}{$INFO_VISITS}
{'Author'|@translate}{if isset($INFO_AUTHOR)}{$INFO_AUTHOR}{else}{'N/A'|@translate}{/if}
{'Created on'|@translate}{if isset($INFO_CREATION_DATE)}{$INFO_CREATION_DATE}{else}{'N/A'|@translate}{/if}
{'Posted on'|@translate}{$INFO_POSTED_DATE}
{'Dimensions'|@translate}{if isset($INFO_DIMENSIONS)}{$INFO_DIMENSIONS}{else}{'N/A'|@translate}{/if}
{'File'|@translate}{$INFO_FILE}
{'Filesize'|@translate}{if isset($INFO_FILESIZE)}{$INFO_FILESIZE}{else}{'N/A'|@translate}{/if}
{'Tags'|@translate} + {if isset($related_tags)} + {foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}{$tag.name}{/foreach} + {/if} +
{'Albums'|@translate} + {if isset($related_categories)} +
    + {foreach from=$related_categories item=cat} +
  • {$cat}
    • + {/foreach} +
+ {/if} +
{'Visits'|@translate}{$INFO_VISITS}
{'Average rate'|@translate} {if $rate_summary.count} - {assign var='rate_text' value='%.2f (rated %d times)'|@translate } - {$pwg->sprintf($rate_text, $rate_summary.average, $rate_summary.count) } + {assign var='rate_text' value='%.2f (rated %d times)'|@translate} + {$pwg->sprintf($rate_text, $rate_summary.average, $rate_summary.count)} {else} {'no rate'|@translate} {/if}
@@ -213,33 +208,32 @@ y.callService(
-
  +
{foreach from=$rating.marks item=mark name=rate_loop} - {if !$smarty.foreach.rate_loop.first} | {/if} {if isset($rating.USER_RATE) && $mark==$rating.USER_RATE} - + {else} - + {/if} {/foreach} {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} {combine_script id='rating' load='async' require='core.scripts' path='themes/default/js/rating.js'} - + ratingSummaryText: "{'%.2f (rated %d times)'|@translate|@escape:'javascript'}", ratingSummaryElement: document.getElementById("ratingSummary"){rdelim} ); + {/footer_script}
{'Who can see this photo?'|@translate} + {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} {footer_script} {literal}function setPrivacyLevel(selectElement, rootUrl, id, level) @@ -256,7 +250,7 @@ y.callService( ); }{/literal} {/footer_script} - {foreach from=$available_permission_levels item=label key=level} {/foreach} @@ -269,35 +263,34 @@ y.callService( {if isset($metadata)} {foreach from=$metadata item=meta} - - - - {foreach from=$meta.lines item=value key=label} - - - - - {/foreach} + + + + {foreach from=$meta.lines item=value key=label} + + + + + {/foreach} {/foreach}
{$meta.TITLE}
{$label}{$value}
{$meta.TITLE}
{$label}{$value}
{/if} -
{if isset($COMMENT_COUNT)}
- {if $COMMENT_COUNT > 0} + {if $COMMENT_COUNT > 0}

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

- {/if} - {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} + {/if} + {if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} {if isset($comments)} {include file='comment_list.tpl'} {/if} {if isset($comment_add)} -
+
{'Add a comment'|@translate} {if $comment_add.SHOW_AUTHOR} @@ -310,6 +303,6 @@ y.callService( {/if}
-{/if} {*comments*} +{/if}{*comments*} {if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if} -- cgit v1.2.3