diff options
Diffstat (limited to 'themes/default/template')
30 files changed, 481 insertions, 242 deletions
diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl index 433de1ff2..5fe4e2f47 100644 --- a/themes/default/template/comment_list.tpl +++ b/themes/default/template/comment_list.tpl @@ -1,16 +1,16 @@ {if isset($comment_derivative_params)} {strip}{html_style} -.commentElement .illustration{ldelim} - width: {$comment_derivative_params->max_width()+5}px +.commentElement .illustration{ + width:{$comment_derivative_params->max_width()+5}px } -.content .commentElement .description{ldelim} - min-height: {$comment_derivative_params->max_height()+5}px +.content .commentElement .description{ + min-height:{$comment_derivative_params->max_height()+5}px } {/html_style}{/strip} -{/if} {footer_script}var error_icon = "{$ROOT_URL}{$themeconf.icon_dir}/errors_small.png";{/footer_script} <div class="loader"><img src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif"></div> +{/if} <ul class="commentsList"> {foreach from=$comments item=comment name=comment_loop} <li class="commentElement {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}"> @@ -57,7 +57,7 @@ {/if} <span class="commentAuthor">{if $comment.WEBSITE_URL}<a href="{$comment.WEBSITE_URL}" class="external" target="_blank" rel="nofollow">{$comment.AUTHOR}</a>{else}{$comment.AUTHOR}{/if}</span> - {if $comment.EMAIL}- <a href="mailto:{$comment.EMAIL}">{$comment.EMAIL}</a>{/if} + {if isset($comment.EMAIL)}- <a href="mailto:{$comment.EMAIL}">{$comment.EMAIL}</a>{/if} - <span class="commentDate">{$comment.DATE}</span> {if isset($comment.IN_EDIT)} <a name="edit_comment"></a> diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index 3ed52498c..00dccca5e 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -1,5 +1,7 @@ +{combine_script id='core.switchbox' load='async' require='jquery' path='themes/default/js/switchbox.js'} {$MENUBAR} + {if isset($errors) or isset($infos)} <div class="content messages{if isset($MENUBAR)} contentWithMenu{/if}"> {include file='infos_errors.tpl'} @@ -12,7 +14,7 @@ <ul class="categoryActions"> {if !empty($image_orders)} <li>{strip}<a id="sortOrderLink" title="{'Sort order'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-sort"> </span><span class="pwg-button-text">{'Sort order'|@translate}</span> + <span class="pwg-icon pwg-icon-sort"></span><span class="pwg-button-text">{'Sort order'|@translate}</span> </a> <div id="sortOrderBox" class="switchBox"> <div class="switchBoxTitle">{'Sort order'|@translate}</div> @@ -24,22 +26,12 @@ {/if} {/foreach} </div> - {footer_script require='jquery'}{literal} -jQuery("#sortOrderLink").click(function() { - var elt = jQuery("#sortOrderBox"); - elt.css("left", Math.min( jQuery(this).offset().left, jQuery(window).width() - elt.outerWidth(true) - 5)) - .css("top", jQuery(this).offset().top + jQuery(this).outerHeight(true)) - .toggle(); -}); -jQuery("#sortOrderBox").on("mouseleave", function() { - jQuery(this).hide(); -}); - {/literal}{/footer_script} + {footer_script}(SwitchBox=window.SwitchBox||[]).push("#sortOrderLink", "#sortOrderBox");{/footer_script} {/strip}</li> {/if} {if !empty($image_derivatives)} <li>{strip}<a id="derivativeSwitchLink" title="{'Photo sizes'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-sizes"> </span><span class="pwg-button-text">{'Photo sizes'|@translate}</span> + <span class="pwg-icon pwg-icon-sizes"></span><span class="pwg-button-text">{'Photo sizes'|@translate}</span> </a> <div id="derivativeSwitchBox" class="switchBox"> <div class="switchBoxTitle">{'Photo sizes'|@translate}</div> @@ -51,66 +43,57 @@ jQuery("#sortOrderBox").on("mouseleave", function() { {/if} {/foreach} </div> - {footer_script require='jquery'}{literal} -jQuery("#derivativeSwitchLink").click(function() { - var elt = jQuery("#derivativeSwitchBox"); - elt.css("left", Math.min( jQuery(this).offset().left, jQuery(window).width() - elt.outerWidth(true) - 5)) - .css("top", jQuery(this).offset().top + jQuery(this).outerHeight(true)) - .toggle(); -}); -jQuery("#derivativeSwitchBox").on("mouseleave", function() { - jQuery(this).hide(); -}); - {/literal}{/footer_script} + {footer_script}(SwitchBox=window.SwitchBox||[]).push("#derivativeSwitchLink", "#derivativeSwitchBox");{/footer_script} {/strip}</li> {/if} {if isset($favorite)} - <li><a href="{$favorite.U_FAVORITE}" title="{'delete all photos from your favorites'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-favorite-del"> </span><span class="pwg-button-text">{'delete all photos from your favorites'|@translate}</span> + <li id="cmdFavorite"><a href="{$favorite.U_FAVORITE}" title="{'delete all photos from your favorites'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> + <span class="pwg-icon pwg-icon-favorite-del"></span><span class="pwg-button-text">{'delete all photos from your favorites'|@translate}</span> </a></li> {/if} {if isset($U_CADDIE)} - <li><a href="{$U_CADDIE}" title="{'Add to caddie'|@translate}" class="pwg-state-default pwg-button"> - <span class="pwg-icon pwg-icon-caddie-add"> </span><span class="pwg-button-text">{'Caddie'|@translate}</span> + <li id="cmdCaddie"><a href="{$U_CADDIE}" title="{'Add to caddie'|@translate}" class="pwg-state-default pwg-button"> + <span class="pwg-icon pwg-icon-caddie-add"></span><span class="pwg-button-text">{'Caddie'|@translate}</span> </a></li> {/if} {if isset($U_EDIT)} - <li><a href="{$U_EDIT}" title="{'Edit album'|@translate}" class="pwg-state-default pwg-button"> - <span class="pwg-icon pwg-icon-category-edit"> </span><span class="pwg-button-text">{'Edit'|@translate}</span> + <li id="cmdEditAlbum"><a href="{$U_EDIT}" title="{'Edit album'|@translate}" class="pwg-state-default pwg-button"> + <span class="pwg-icon pwg-icon-category-edit"></span><span class="pwg-button-text">{'Edit'|@translate}</span> </a></li> {/if} {if isset($U_SEARCH_RULES)} {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} <li><a href="{$U_SEARCH_RULES}" onclick="popuphelp(this.href); return false;" title="{'Search rules'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-help"> </span><span class="pwg-button-text">(?)</span> + <span class="pwg-icon pwg-icon-help"></span><span class="pwg-button-text">(?)</span> </a></li> {/if} {if isset($U_SLIDESHOW)} - <li>{strip}<a href="{$U_SLIDESHOW}" title="{'slideshow'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-slideshow"> </span><span class="pwg-button-text">{'slideshow'|@translate}</span> + <li id="cmdSlideshow">{strip}<a href="{$U_SLIDESHOW}" title="{'slideshow'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> + <span class="pwg-icon pwg-icon-slideshow"></span><span class="pwg-button-text">{'slideshow'|@translate}</span> </a>{/strip}</li> {/if} {if isset($U_MODE_FLAT)} <li>{strip}<a href="{$U_MODE_FLAT}" title="{'display all photos in all sub-albums'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-category-view-flat"> </span><span class="pwg-button-text">{'display all photos in all sub-albums'|@translate}</span> + <span class="pwg-icon pwg-icon-category-view-flat"></span><span class="pwg-button-text">{'display all photos in all sub-albums'|@translate}</span> </a>{/strip}</li> {/if} {if isset($U_MODE_NORMAL)} <li>{strip}<a href="{$U_MODE_NORMAL}" title="{'return to normal view mode'|@translate}" class="pwg-state-default pwg-button"> - <span class="pwg-icon pwg-icon-category-view-normal"> </span><span class="pwg-button-text">{'return to normal view mode'|@translate}</span> + <span class="pwg-icon pwg-icon-category-view-normal"></span><span class="pwg-button-text">{'return to normal view mode'|@translate}</span> </a>{/strip}</li> {/if} {if isset($U_MODE_POSTED)} <li>{strip}<a href="{$U_MODE_POSTED}" title="{'display a calendar by posted date'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-calendar"> </span><span class="pwg-button-text">{'Calendar'|@translate}</span> + <span class="pwg-icon pwg-icon-calendar"></span><span class="pwg-button-text">{'Calendar'|@translate}</span> </a>{/strip}</li> {/if} {if isset($U_MODE_CREATED)} <li>{strip}<a href="{$U_MODE_CREATED}" title="{'display a calendar by creation date'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-camera-calendar"> </span><span class="pwg-button-text">{'Calendar'|@translate}</span> + <span class="pwg-icon pwg-icon-camera-calendar"></span><span class="pwg-button-text">{'Calendar'|@translate}</span> </a>{/strip}</li> {/if} +{if !empty($PLUGIN_INDEX_BUTTONS)}{foreach from=$PLUGIN_INDEX_BUTTONS item=button}<li>{$button}</li>{/foreach}{/if} {if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if} </ul> @@ -118,26 +101,15 @@ jQuery("#derivativeSwitchBox").on("mouseleave", function() { {if isset($chronology_views)} <div class="calendarViews">{'View'|@translate}: - <a id="calendarViewSwitchLink" href="javascript:toggleCalendarViewsBox()"> + <a id="calendarViewSwitchLink" href="#"> {foreach from=$chronology_views item=view}{if $view.SELECTED}{$view.CONTENT}{/if}{/foreach} - </a> + </a> <div id="calendarViewSwitchBox" class="switchBox"> {foreach from=$chronology_views item=view name=loop}{if !$smarty.foreach.loop.first}<br>{/if} <span{if !$view.SELECTED} style="visibility:hidden"{/if}>✔ </span><a href="{$view.VALUE}">{$view.CONTENT}</a> {/foreach} </div> - {footer_script require='jquery'}{literal} -function toggleCalendarViewsBox() { - var elt = jQuery("#calendarViewSwitchBox") - , ePos = jQuery("#calendarViewSwitchLink"); - elt.css("left", Math.min( ePos.offset().left, jQuery(window).width() - elt.outerWidth(true) - 5)) - .css("top", ePos.offset().top + ePos.outerHeight(true)) - .toggle(); -}; -jQuery("#calendarViewSwitchBox").on("mouseleave", function() { - jQuery(this).hide(); -}); - {/literal}{/footer_script} + {footer_script}(SwitchBox=window.SwitchBox||[]).push("#calendarViewSwitchLink", "#calendarViewSwitchBox");{/footer_script} </div> {/if} @@ -180,7 +152,10 @@ jQuery("#calendarViewSwitchBox").on("mouseleave", function() { </div> {/if} +{if !empty($CONTENT)}{$CONTENT}{/if} + {if !empty($CATEGORIES)}{$CATEGORIES}{/if} + {if !empty($cats_navbar)} {include file='navigation_bar.tpl'|@get_extent:'navbar' navbar=$cats_navbar} {/if} diff --git a/themes/default/template/mail/index.php b/themes/default/template/mail/index.php index 41732f2fd..c8de97f60 100644 --- a/themes/default/template/mail/index.php +++ b/themes/default/template/mail/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2013 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/themes/default/template/mail/screenshot-clear.png b/themes/default/template/mail/screenshot-clear.png Binary files differnew file mode 100644 index 000000000..ae879604a --- /dev/null +++ b/themes/default/template/mail/screenshot-clear.png diff --git a/themes/default/template/mail/screenshot-dark.png b/themes/default/template/mail/screenshot-dark.png Binary files differnew file mode 100644 index 000000000..2906c4ec8 --- /dev/null +++ b/themes/default/template/mail/screenshot-dark.png diff --git a/themes/default/template/mail/text/html/footer.tpl b/themes/default/template/mail/text/html/footer.tpl index b1f1b9317..da17e4473 100644 --- a/themes/default/template/mail/text/html/footer.tpl +++ b/themes/default/template/mail/text/html/footer.tpl @@ -1,22 +1,23 @@ -</div> <!-- content --> -<div id="copyright"> -<hr> - {'Sent by'|@translate} - <a href="{$GALLERY_URL}">{$GALLERY_TITLE}</a> + {* <!-- end $CONTENT --> *} + </td></tr> - {* Please, do not remove this copyright. If you really want to, - contact us on http://piwigo.org to find a solution on how - to show the origin of the script...*} - - {'Powered by'|@translate} - <a href="http://piwigo.org" class="Piwigo"> - <span class="Piwigo">Piwigo</span></a> - {$VERSION} + <tr><td id="footer"> + {* <!-- begin FOOTER --> *} +{* <!-- Please, do not remove this copyright. If you really want to, +contact us on http://piwigo.org to find a solution on how +to show the origin of the script... --> *} + + {'Sent by'|translate} <a href="{$GALLERY_URL}">{$GALLERY_TITLE}</a> + - {'Powered by'|translate} <a href="{$PHPWG_URL}" class="Piwigo">Piwigo</a> + {if not empty($VERSION)}{$VERSION}{/if} + + - {'Contact'|translate} + <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|translate|escape:url}">{'Webmaster'|@translate}</a> + {* <!-- end FOOTER --> *} + </td></tr> + </table> - - {'Contact'|@translate} - <a href="mailto:{$MAIL}?subject={$TITLE_MAIL}">{'Webmaster'|@translate}</a> - -</div> <!-- copyright --> -</div> <!-- the_page --> - -</body> -</html> + </td></tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/themes/default/template/mail/text/html/global-mail-css.tpl b/themes/default/template/mail/text/html/global-mail-css.tpl index 072bcb0be..59a1bde2f 100644 --- a/themes/default/template/mail/text/html/global-mail-css.tpl +++ b/themes/default/template/mail/text/html/global-mail-css.tpl @@ -1,11 +1,105 @@ -/* Global mail css */ - -body {ldelim} font-family: Univers, Helvetica, Optima; font-size:12px; margin:0px; padding:0px; } -#the_page {ldelim} margin:0px; padding:0px; text-align:left;} -#content {ldelim} margin:0px; padding:30px 0px 0px 30px; width:732px;} -hr {ldelim} width:632px; margin-left:0;} -#copyright {ldelim} font-size:10px; margin:0px; padding:48px 0px 32px 62px;} -.PWG {ldelim} font-family:verdana, sans-serif !important; font-size:0.9em; font-weight:normal; letter-spacing:0px;} -h2 {ldelim} padding:7px 15px; width:617px; font-weight:bold;} -img {ldelim} margin:16px; border:16px solid #aaa; -moz-border-radius: 4px; border-radius: 4px 4px; } -img:hover {ldelim} padding: 15px; border: 1px solid yellow; -moz-border-radius: 4px; border-radius: 4px 4px; } +{strip} +/* page */ +body { + font-family:"Verdana", "Helvetica", "Optima", sans-serif; + font-size:12px; + margin:0px; + padding:0px; +} + +html, body, #bodyTable { + width:100%; + height:100%; +} + +/* main block */ +#header { + padding:20px; +} +#header #title { + font-size:26px; + font-weight:bold; +} +#header #subtitle { + font-size:20px; +} +#content { + padding:0 20px 20px 20px; + font-family:"Verdana", "Helvetica", "Optima", sans-serif; + font-size:13px; +} +#footer { + font-size:10px; + padding:5px; +} +#topSpacer { + margin-bottom:20px; +} + +/* images */ +img { + border:none; +} + +h1, h2, h3, h4, h5 { + margin:0.5em 0 0.25em 0; +} +h1 { font-size:26px; } +h2 { font-size:20px; } +h3 { font-size:16px; } +h4 { font-size:12px; } +h5 { font-size:10px; } + +/* paragraphs */ +p { + margin:0.25em 0 0.5em 0; +} +blockquote { + margin-left:10px; + padding-left:10px; + font-family:"Times",serif; + font-size:14px; +} + +/* list */ +ul, ol { + margin:0.5em 0 0.25em 30px; + padding:0; +} +dl { + margin:0.5em 0 0.25em 10px; +} +dt { + margin:0.25em 0 0 0; + font-weight:bold; +} +dd { + margin:0 0 0.25em 10px; +} + +/* tables */ +#content table { + width:100%; + border-spacing:0; + border-collapse:collapse; +} +#content table td { + padding:2px 3px; +} +#content table th { + font-weight:bold; + text-align:center; + padding:4px 0; +} +#content table tfoot td { + font-size:0.8em; +} + +/* line */ +hr { + border-width:0 0 1px 0; + border-color:#ddd; + border-style:solid; + margin:1em; +} +{/strip}
\ No newline at end of file diff --git a/themes/default/template/mail/text/html/header.tpl b/themes/default/template/mail/text/html/header.tpl index e6af4c024..b98f5be18 100644 --- a/themes/default/template/mail/text/html/header.tpl +++ b/themes/default/template/mail/text/html/header.tpl @@ -1,17 +1,29 @@ ------={$BOUNDARY_KEY} -Content-Type: {$CONTENT_TYPE}; charset="{$CONTENT_ENCODING}"; -Content-Transfer-Encoding: 8bit - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html lang="{$lang_info.code}" dir="{$lang_info.direction}"> -<head> -<title>Piwigo Mail</title> -<meta http-equiv="Content-Type" content="text/html; charset={$CONTENT_ENCODING}"> -<style><!-- /* Mini style for mails */ -{if isset($GLOBAL_MAIL_CSS)}{$GLOBAL_MAIL_CSS}{/if} -{if isset($MAIL_CSS)}{$MAIL_CSS}{/if} ---></style> -</head> -<body> -<div id="the_page"> -<div id="content" class="content"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset={$CONTENT_ENCODING}"/> + <title>Piwigo Mail</title> + + <style type="text/css"> + {if isset($GLOBAL_MAIL_CSS)}{$GLOBAL_MAIL_CSS}{/if} + {if isset($MAIL_CSS)}{$MAIL_CSS}{/if} + </style> + </head> + + <body> + <table id="bodyTable" cellspacing="0" cellpadding="10" border="0"> + <tr><td align="center" valign="top"> + + <table id="contentTable" cellspacing="0" cellpadding="0" border="0"> + <tr><td id="header"> + {* <!-- begin HEADER --> *} + <div id="title">{$MAIL_TITLE}</div> + {if not empty($MAIL_SUBTITLE)}<div id="subtitle">{$MAIL_SUBTITLE}</div>{/if} + {* <!-- end HEADER --> *} + </td></tr> + + <tr><td id="content"> +{* <!-- use an invisible div with a bottom margin to force the browser +to merge the margin with the element bellow (typically h1/h2/...) --> *} + <div id="topSpacer"></div> + {* <!-- begin CONTENT --> *}
\ No newline at end of file diff --git a/themes/default/template/mail/text/html/index.php b/themes/default/template/mail/text/html/index.php index 41732f2fd..c8de97f60 100644 --- a/themes/default/template/mail/text/html/index.php +++ b/themes/default/template/mail/text/html/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2013 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/themes/default/template/mail/text/html/mail-css-clear.tpl b/themes/default/template/mail/text/html/mail-css-clear.tpl new file mode 100644 index 000000000..98b0337d9 --- /dev/null +++ b/themes/default/template/mail/text/html/mail-css-clear.tpl @@ -0,0 +1,73 @@ +{strip} +/* page */ +body { + color:#111; +} + +html, body, #bodyTable { + background:#fff; +} +#contentTable { + width:600px; +} + +/* main block */ +#header { + background:#eee; + background-image:radial-gradient(ellipse at center, #fefefe, #e5e5e5); + border-top:4px solid #f70; + text-align:center; + text-shadow:1px 1px 0px #fff; +} +#header #subtitle { + color:#e06900; +} +#content { + background:#fefefe; + border-width:1px; + border-style:solid; + border-color:#ddd #eee; + box-shadow:inset 0 0 20px #eee; +} +#footer { + background:#eee; + border-bottom:2px solid #f70; +} + +/* links */ +a { + color:#f70; + text-decoration:none; +} +a:hover { + text-decoration:underline; +} + +/* images */ +img.photo { + border:10px solid #ddd; +} +img.photo:hover { + border-color:#eee; +} + +/* paragraphs */ +blockquote { + border-left:2px solid #aaa; + border-radius:2px; +} + +/* tables */ +#content table td { + border-bottom:1px solid #efefef; +} +#content table th { + background:#aaa; + color:#fff; + border-right:1px solid #ddd; +} +#content table tfoot td { + background:#eee; + border-right:1px solid #fff; +} +{/strip}
\ No newline at end of file diff --git a/themes/default/template/mail/text/html/mail-css-dark.tpl b/themes/default/template/mail/text/html/mail-css-dark.tpl new file mode 100644 index 000000000..390a7dfb6 --- /dev/null +++ b/themes/default/template/mail/text/html/mail-css-dark.tpl @@ -0,0 +1,87 @@ +{strip} +/* page */ +body { + color:#fff; +} + +html, body, #bodyTable { + background:#111; +} +#contentTable { + width:600px; +} + +/* main block */ +#header { + background:#444; + background-image:radial-gradient(ellipse at center, #555, #333); + border:1px solid #000; + border-top:4px solid #f36; + text-align:center; + text-shadow:1px 1px 0px #000; +} +#header #title { + color:#eee; +} +#header #subtitle { + color:#C9224C; +} +#content { + background:#111; + border-width:1px; + border-style:solid; + border-color:#666 #000; + box-shadow:inset 0 0 20px #333; +} +#footer { + background:#333; + border:1px solid #000; + border-bottom:2px solid #f36; +} + +/* links */ +a { + color:#f36; + text-decoration:none; +} +a:hover { + text-decoration:underline; +} + +/* images */ +img.photo { + border:10px solid #666; +} +img.photo:hover { + border-color:#999; +} + +h1, h2, h3, h4, h5 { + color:#bbb; +} + +/* paragraphs */ +blockquote { + border-left:2px solid #aaa; + border-radius:2px; +} + +/* tables */ +#content table td { + border-bottom:1px solid #999; +} +#content table th { + background:#666; + border-right:1px solid #aaa; +} +#content table tfoot td { + background:#444; + color:#aaa; + border-right:1px solid #aaa; +} + +/* line */ +hr { + border-color:#555; +} +{/strip}
\ No newline at end of file diff --git a/themes/default/template/mail/text/html/notification_admin.tpl b/themes/default/template/mail/text/html/notification_admin.tpl new file mode 100644 index 000000000..f236b8ee6 --- /dev/null +++ b/themes/default/template/mail/text/html/notification_admin.tpl @@ -0,0 +1,9 @@ +{$CONTENT} + +{if isset($TECHNICAL)} +<p style="padding-top:10px;font-size:11px;"> +{'Connected user: %s'|translate:$TECHNICAL.username}<br> +{'IP: %s'|translate:$TECHNICAL.ip}<br> +{'Browser: %s'|translate:$TECHNICAL.user_agent} +</p> +{/if}
\ No newline at end of file diff --git a/themes/default/template/mail/text/html/notification_by_mail.tpl b/themes/default/template/mail/text/html/notification_by_mail.tpl index 9989a32c0..df3e431e1 100644 --- a/themes/default/template/mail/text/html/notification_by_mail.tpl +++ b/themes/default/template/mail/text/html/notification_by_mail.tpl @@ -38,13 +38,13 @@ {/if} <p>{'See you soon,'|@translate}</p> <p style="text-align:center">{$SEND_AS_NAME}</p> +<hr> <p> -<br><hr> {'To unsubscribe'|@translate}{', click on'|@translate} <a href="{$UNSUBSCRIBE_LINK}">{$UNSUBSCRIBE_LINK}</a><br> {'To subscribe'|@translate}{', click on'|@translate} <a href="{$SUBSCRIBE_LINK}">{$SUBSCRIBE_LINK}</a><br> {'If you encounter problems or have any question, please send a message to'|@translate} <a href="mailto:{$CONTACT_EMAIL}?subject={'[NBM] Problems or questions'|@translate}">{$CONTACT_EMAIL}</a><br> -<hr><br> </p> +<hr> {if not empty($recent_posts)} </div> <div id="nbm_recent_post"> diff --git a/themes/default/template/mail/text/index.php b/themes/default/template/mail/text/index.php index 41732f2fd..c8de97f60 100644 --- a/themes/default/template/mail/text/index.php +++ b/themes/default/template/mail/text/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2013 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/themes/default/template/mail/text/plain/footer.tpl b/themes/default/template/mail/text/plain/footer.tpl index 8574697e6..0f9ef273e 100644 --- a/themes/default/template/mail/text/plain/footer.tpl +++ b/themes/default/template/mail/text/plain/footer.tpl @@ -1,5 +1,7 @@ +{literal} --- +{/literal} +---- {'Sent by'|@translate} "{$GALLERY_TITLE}" {$GALLERY_URL} -{'Contact'|@translate} {$MAIL} -{'Powered by'|@translate} Piwigo {$VERSION} +{'Powered by'|@translate} "Piwigo{if not empty($VERSION)} {$VERSION}{/if}" {$PHPWG_URL} +{'Contact'|@translate}: {$CONTACT_MAIL}
\ No newline at end of file diff --git a/themes/default/template/mail/text/plain/header.tpl b/themes/default/template/mail/text/plain/header.tpl index 6fcc863d2..31d7456fb 100644 --- a/themes/default/template/mail/text/plain/header.tpl +++ b/themes/default/template/mail/text/plain/header.tpl @@ -1,5 +1,6 @@ ------={$BOUNDARY_KEY} -Content-Type: {$CONTENT_TYPE}; charset="{$CONTENT_ENCODING}"; -Content-Transfer-Encoding: 8bit{literal} - -{/literal}{*note that there must be an empty line to separate the mime headers*} +{$MAIL_TITLE} +{if not empty($MAIL_SUBTITLE)}{$MAIL_SUBTITLE} +{/if} +---- +{literal} +{/literal}
\ No newline at end of file diff --git a/themes/default/template/mail/text/plain/index.php b/themes/default/template/mail/text/plain/index.php index 41732f2fd..c8de97f60 100644 --- a/themes/default/template/mail/text/plain/index.php +++ b/themes/default/template/mail/text/plain/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2013 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/themes/default/template/mail/text/plain/notification_admin.tpl b/themes/default/template/mail/text/plain/notification_admin.tpl new file mode 100644 index 000000000..e6970842f --- /dev/null +++ b/themes/default/template/mail/text/plain/notification_admin.tpl @@ -0,0 +1,8 @@ +{$CONTENT} + +{if isset($TECHNICAL)} +----------------------------- +{'Connected user: %s'|translate:$TECHNICAL.username} +{'IP: %s'|translate:$TECHNICAL.ip} +{'Browser: %s'|translate:$TECHNICAL.user_agent} +{/if}
\ No newline at end of file diff --git a/themes/default/template/menubar_categories.tpl b/themes/default/template/menubar_categories.tpl index 65a149cff..c3c5b1c02 100644 --- a/themes/default/template/menubar_categories.tpl +++ b/themes/default/template/menubar_categories.tpl @@ -14,7 +14,7 @@ <ul> {else} </li> - {'</ul></li>'|@str_repeat:$ref_level-$cat.LEVEL} + {'</ul></li>'|@str_repeat:($ref_level-$cat.LEVEL)} {/if} <li {if $cat.SELECTED}class="selected"{/if}> <a href="{$cat.URL}" {if $cat.IS_UPPERCAT}rel="up"{/if} title="{$cat.TITLE}">{$cat.NAME}</a> @@ -28,5 +28,5 @@ {/foreach} {'</li></ul>'|@str_repeat:$ref_level} - <p class="totalImages">{$pwg->l10n_dec('%d photo', '%d photos', $block->data.NB_PICTURE)}</p> + <p class="totalImages">{$block->data.NB_PICTURE|@translate_dec:'%d photo':'%d photos'}</p> </dd> diff --git a/themes/default/template/menubar_menu.tpl b/themes/default/template/menubar_menu.tpl index 29276a48f..2eb2dd3a9 100644 --- a/themes/default/template/menubar_menu.tpl +++ b/themes/default/template/menubar_menu.tpl @@ -11,7 +11,7 @@ <ul>{strip} {foreach from=$block->data item=link} {if is_array($link)} - <li><a href="{$link.URL}" title="{$link.TITLE}"{if isset($link.REL)} {$link.REL}{/if}>{$link.NAME}</a></li> + <li><a href="{$link.URL}" title="{$link.TITLE}"{if isset($link.REL)} {$link.REL}{/if}>{$link.NAME}</a>{if isset($link.COUNTER)} ({$link.COUNTER}){/if}</li> {/if} {/foreach} {/strip}</ul> diff --git a/themes/default/template/menubar_tags.tpl b/themes/default/template/menubar_tags.tpl index 975d7eb09..d1a672837 100644 --- a/themes/default/template/menubar_tags.tpl +++ b/themes/default/template/menubar_tags.tpl @@ -5,7 +5,7 @@ <span>{strip} <a class="tagLevel{$tag.level}" href= {if isset($tag.U_ADD)} - "{$tag.U_ADD}" title="{$pwg->l10n_dec('%d photo is also linked to current tags', '%d photos are also linked to current tags', $tag.counter)}" rel="nofollow">+ + "{$tag.U_ADD}" title="{$tag.counter|@translate_dec:'%d photo is also linked to current tags':'%d photos are also linked to current tags'}" rel="nofollow">+ {else} "{$tag.URL}" title="{'display photos linked to this tag'|@translate}"> {/if} diff --git a/themes/default/template/month_calendar.tpl b/themes/default/template/month_calendar.tpl index 904570a10..ac8fed166 100644 --- a/themes/default/template/month_calendar.tpl +++ b/themes/default/template/month_calendar.tpl @@ -1,31 +1,28 @@ - -{if !empty($chronology_navigation_bars) } +{if !empty($chronology_navigation_bars)} {foreach from=$chronology_navigation_bars item=bar} <div class="calendarBar"> {if isset($bar.previous)} - <div style="float:left">« <a href="{$bar.previous.URL}">{$bar.previous.LABEL}</a></div> + <div style="float:left;margin-right:5px">« <a href="{$bar.previous.URL}">{$bar.previous.LABEL}</a></div> {/if} {if isset($bar.next)} - <div style="float:right"><a href="{$bar.next.URL}">{$bar.next.LABEL}</a> »</div> + <div style="float:right;margin-left:5px"><a href="{$bar.next.URL}">{$bar.next.LABEL}</a> »</div> {/if} {if empty($bar.items)} {else} {foreach from=$bar.items item=item} - <span class="calItem{if !isset($item.URL)}Empty{/if}" {if isset($item.NB_IMAGES)}title="{$pwg->l10n_dec('%d photo', '%d photos', $item.NB_IMAGES)}"{/if}> - {if isset($item.URL)} - <a href="{$item.URL}">{$item.LABEL}</a> + {if !isset($item.URL)} + <span class="calItem">{$item.LABEL}</span> {else} - {$item.LABEL} + <a class="calItem"{if isset($item.NB_IMAGES)} title="{$item.NB_IMAGES|@translate_dec:'%d photo':'%d photos'}"{/if} href="{$item.URL}">{$item.LABEL}</a> {/if} - </span> {/foreach} {/if} </div> {/foreach} {/if} -{if !empty($chronology_calendar.calendar_bars) } +{if !empty($chronology_calendar.calendar_bars)} {foreach from=$chronology_calendar.calendar_bars item=bar} <div class="calendarCalBar"> <span class="calCalHead"><a href="{$bar.U_HEAD}">{$bar.HEAD_LABEL}</a> ({$bar.NB_IMAGES})</span><br> @@ -43,7 +40,7 @@ {/foreach} {/if} -{if isset($chronology_calendar.month_view) } +{if isset($chronology_calendar.month_view)} <table class="calMonth"> <thead> <tr> @@ -52,13 +49,11 @@ {/foreach} </tr> </thead> -{html_head} {*add the style to html head for strict standard compliance*} -<style type="text/css"> -TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim} - width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px; +{html_style} +.calMonth TD, .calMonth .calImg{ + width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px } -</style> -{/html_head} +{/html_style} {foreach from=$chronology_calendar.month_view.weeks item=week} <tr> {foreach from=$week item=day} @@ -68,7 +63,7 @@ TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim} <div class="calBackDate">{$day.DAY}</div><div class="calForeDate">{$day.DAY}</div> <div class="calImg"> <a href="{$day.U_IMG_LINK}"> - <img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$pwg->l10n_dec('%d photo','%d photos', $day.NB_ELEMENTS)}"> + <img src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$day.NB_ELEMENTS|@translate_dec:'%d photo':'%d photos'}"> </a> </div> {else} @@ -78,9 +73,9 @@ TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim} <td> {/if} </td> - {/foreach} {*day in week*} + {/foreach}{*day in week*} </tr> - {/foreach} {*week in month*} + {/foreach}{*week in month*} </table> {/if} diff --git a/themes/default/template/password.tpl b/themes/default/template/password.tpl index 260830cdf..7b6a389ae 100644 --- a/themes/default/template/password.tpl +++ b/themes/default/template/password.tpl @@ -11,6 +11,8 @@ {if $action ne 'none'} <form id="lostPassword" action="{$form_action}?action={$action}{if isset($key)}&key={$key}{/if}" method="post"> +<fieldset> + <legend>{'Forgot your password?'|translate}</legend> <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> {if $action eq 'lost'} @@ -44,7 +46,7 @@ <input type="password" name="passwordConf" id="passwordConf" value=""> </label> </p> - +</fieldset> <p class="bottomButtons"><input type="submit" name="submit" value="{'Submit'|@translate}"></p> {/if} diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index eacb81beb..f64e04856 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -1,11 +1,11 @@ -{* Example of resizeable -{include file='include/autosize.inc.tpl'} -*} +{combine_script id='core.switchbox' load='async' require='jquery' path='themes/default/js/switchbox.js'} {if isset($MENUBAR)}{$MENUBAR}{/if} <div id="content"{if isset($MENUBAR)} class="contentWithMenu"{/if}> + {if isset($errors) or not empty($infos)} {include file='infos_errors.tpl'} {/if} + {if !empty($PLUGIN_PICTURE_BEFORE)}{$PLUGIN_PICTURE_BEFORE}{/if} <div id="imageHeaderBar"> @@ -17,6 +17,7 @@ <div id="imageToolBar"> <div class="imageNumber">{$PHOTO}</div> {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'} + <div class="actionButtons"> {if isset($current.unique_derivatives) && count($current.unique_derivatives)>1} {footer_script require='jquery'}{literal} @@ -30,26 +31,18 @@ function changeImgSrc(url,typeSave,typeMap) theImg.useMap = "#map"+typeMap; } jQuery('#derivativeSwitchBox .switchCheck').css('visibility','hidden'); - jQuery('#derivativeChecked'+typeSave).css('visibility','visible'); + jQuery('#derivativeChecked'+typeMap).css('visibility','visible'); document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}'; } -jQuery("#derivativeSwitchLink").click(function() { - var elt = jQuery("#derivativeSwitchBox"); - elt.css("left", Math.min( jQuery(this).offset().left, jQuery(window).width() - elt.outerWidth(true) - 5)) - .css("top", jQuery(this).offset().top + jQuery(this).outerHeight(true)) - .toggle(); -}); -jQuery("#derivativeSwitchBox").on("mouseleave click", function() { - jQuery(this).hide(); -}); +(SwitchBox=window.SwitchBox||[]).push("#derivativeSwitchLink", "#derivativeSwitchBox"); {/literal}{/footer_script} {strip}<a id="derivativeSwitchLink" title="{'Photo sizes'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-sizes"> </span><span class="pwg-button-text">{'Photo sizes'|@translate}</span> + <span class="pwg-icon pwg-icon-sizes"></span><span class="pwg-button-text">{'Photo sizes'|@translate}</span> </a> <div id="derivativeSwitchBox" class="switchBox"> <div class="switchBoxTitle">{'Photo sizes'|@translate}</div> {foreach from=$current.unique_derivatives item=derivative key=derivative_type} - <span class="switchCheck" id="derivativeChecked{$derivative_type}"{if $derivative->get_type() ne $current.selected_derivative->get_type()} style="visibility:hidden"{/if}>✔ </span> + <span class="switchCheck" id="derivativeChecked{$derivative->get_type()}"{if $derivative->get_type() ne $current.selected_derivative->get_type()} style="visibility:hidden"{/if}>✔ </span> <a href="javascript:changeImgSrc('{$derivative->get_url()|@escape:javascript}','{$derivative_type}','{$derivative->get_type()}')"> {$derivative->get_type()|@translate}<span class="derivativeSizeDetails"> ({$derivative->get_size_hr()})</span> </a><br> @@ -63,33 +56,34 @@ jQuery("#derivativeSwitchBox").on("mouseleave click", function() { {/if} {strip}{if isset($U_SLIDESHOW_START)} <a href="{$U_SLIDESHOW_START}" title="{'slideshow'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-slideshow"> </span><span class="pwg-button-text">{'slideshow'|@translate}</span> + <span class="pwg-icon pwg-icon-slideshow"></span><span class="pwg-button-text">{'slideshow'|@translate}</span> </a> {/if}{/strip} {strip}{if isset($U_METADATA)} <a href="{$U_METADATA}" title="{'Show file metadata'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-camera-info"> </span><span class="pwg-button-text">{'Show file metadata'|@translate}</span> + <span class="pwg-icon pwg-icon-camera-info"></span><span class="pwg-button-text">{'Show file metadata'|@translate}</span> </a> {/if}{/strip} {strip}{if isset($current.U_DOWNLOAD)} <a href="{$current.U_DOWNLOAD}" title="{'Download this file'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-save"> </span><span class="pwg-button-text">{'Download'|@translate}</span> + <span class="pwg-icon pwg-icon-save"></span><span class="pwg-button-text">{'Download'|@translate}</span> </a> {/if}{/strip} +{if isset($PLUGIN_PICTURE_BUTTONS)}{foreach from=$PLUGIN_PICTURE_BUTTONS item=button}{$button}{/foreach}{/if} {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if} {strip}{if isset($favorite)} <a href="{$favorite.U_FAVORITE}" title="{if $favorite.IS_FAVORITE}{'delete this photo from your favorites'|@translate}{else}{'add this photo to your favorites'|@translate}{/if}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-favorite-{if $favorite.IS_FAVORITE}del{else}add{/if}"> </span><span class="pwg-button-text">{'Favorites'|@translate}</span> + <span class="pwg-icon pwg-icon-favorite-{if $favorite.IS_FAVORITE}del{else}add{/if}"></span><span class="pwg-button-text">{'Favorites'|@translate}</span> </a> {/if}{/strip} {strip}{if isset($U_SET_AS_REPRESENTATIVE)} - <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as album representative'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-representative"> </span><span class="pwg-button-text">{'representative'|@translate}</span> + <a id="cmdSetRepresentative" href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as album representative'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> + <span class="pwg-icon pwg-icon-representative"></span><span class="pwg-button-text">{'representative'|@translate}</span> </a> {/if}{/strip} {strip}{if isset($U_PHOTO_ADMIN)} - <a href="{$U_PHOTO_ADMIN}" title="{'Modify information'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-edit"> </span><span class="pwg-button-text">{'Edit'|@translate}</span> + <a id="cmdEditPhoto" href="{$U_PHOTO_ADMIN}" title="{'Modify information'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> + <span class="pwg-icon pwg-icon-edit"></span><span class="pwg-button-text">{'Edit'|@translate}</span> </a> {/if}{/strip} {strip}{if isset($U_CADDIE)}{*caddie management BEGIN*} @@ -134,15 +128,23 @@ y.callService( {if $DISPLAY_NAV_THUMB} <div class="navThumbs"> {if isset($previous)} - <a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE|@escape}" rel="prev"> + <a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE_ESC}" rel="prev"> <span class="thumbHover prevThumbHover"></span> - <img src="{$previous.derivatives.square->get_url()}" alt="{$previous.TITLE|@escape}"> + <img src="{$previous.derivatives.square->get_url()}" alt="{$previous.TITLE_ESC}"> + </a> + {elseif isset($U_UP)} + <a class="navThumb" id="linkPrev" href="{$U_UP}" title="{'Thumbnails'|@translate}"> + <div class="thumbHover">{'First Page'|@translate}<br><br>{'Go back to the album'|@translate}</div> </a> {/if} {if isset($next)} - <a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE|@escape}" rel="next"> + <a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE_ESC}" rel="next"> <span class="thumbHover nextThumbHover"></span> - <img src="{$next.derivatives.square->get_url()}" alt="{$next.TITLE|@escape}"> + <img src="{$next.derivatives.square->get_url()}" alt="{$next.TITLE_ESC}"> + </a> + {elseif isset($U_UP)} + <a class="navThumb" id="linkNext" href="{$U_UP}" title="{'Thumbnails'|@translate}"> + <div class="thumbHover">{'Last Page'|@translate}<br><br>{'Go back to the album'|@translate}</div> </a> {/if} </div> @@ -218,12 +220,7 @@ y.callService( <dt>{'Rating score'|@translate}</dt> <dd> {if $rate_summary.count} - {if $rate_summary.count == 1} - {assign var='rate_text' value='%d rate'|@translate} - {else} - {assign var='rate_text' value='%d rates'|@translate} - {/if} - <span id="ratingScore">{$rate_summary.score}</span> <span id="ratingCount">({$pwg->sprintf($rate_text, $rate_summary.count)})</span> + <span id="ratingScore">{$rate_summary.score}</span> <span id="ratingCount">({$rate_summary.count|@translate_dec:'%d rate':'%d rates'})</span> {else} <span id="ratingScore">{'no rate'|@translate}</span> <span id="ratingCount"></span> {/if} @@ -274,51 +271,38 @@ y.callService( {/if} {if $display_info.privacy_level and isset($available_permission_levels)} - <div id="Privacy" class="imageInfo"><div class="relSwitchBox"> - <dt><a id="privacyLevelLink" href="javascript:togglePrivacyLevelBox()">{'Who can see this photo?'|@translate}</a></dt> + <div id="Privacy" class="imageInfo"> + <dt>{'Who can see this photo?'|@translate}</dt> <dd> + <div> + <a id="privacyLevelLink" href>{$available_permission_levels[$current.level]}</a> + </div> {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} -{footer_script require='jquery'} -{literal}function setPrivacyLevel(rootUrl, id, level) -{ -var y = new PwgWS(rootUrl); -y.callService( - "pwg.images.setPrivacyLevel", {image_id: id, level:level} , +{footer_script require='jquery'}{strip} +function setPrivacyLevel(id, level){ +(new PwgWS('{$ROOT_URL}')).callService( + "pwg.images.setPrivacyLevel", { image_id:id, level:level}, { method: "POST", onFailure: function(num, text) { alert(num + " " + text); }, onSuccess: function(result) { jQuery('#privacyLevelBox .switchCheck').css('visibility','hidden'); - jQuery('#levelCheck'+level).css('visibility','visible'); + jQuery('#switchLevel'+level).prev('.switchCheck').css('visibility','visible'); + jQuery('#privacyLevelLink').text(jQuery('#switchLevel'+level).text()); } } ); } -function togglePrivacyLevelBox() -{ - var elt = document.getElementById("privacyLevelBox"), - ePos = document.getElementById("privacyLevelLink"); - if (elt.style.display == "none") - { - elt.style.left = (ePos.offsetLeft)+"px"; - elt.style.top = (ePos.offsetTop+ePos.offsetHeight)+"px"; - elt.style.display="block"; - } - else - elt.style.display="none"; -} -{/literal} -{/footer_script} - - <div id="privacyLevelBox" class="switchBox" onclick="togglePrivacyLevelBox()" style="display:none" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||togglePrivacyLevelBox()"> +(SwitchBox=window.SwitchBox||[]).push("#privacyLevelLink", "#privacyLevelBox"); +{/strip}{/footer_script} + <div id="privacyLevelBox" class="switchBox" style="display:none"> {foreach from=$available_permission_levels item=label key=level} - <span id="levelCheck{$level}" class="switchCheck" {if $level != $current.level} style="visibility:hidden"{/if}>✔ </span> - <a id="switchLevel{$level}" href="javascript:setPrivacyLevel('{$ROOT_URL}', {$current.id}, {$level})">{$label}</a><br> + <span class="switchCheck"{if $level != $current.level} style="visibility:hidden"{/if}>✔ </span> + <a id="switchLevel{$level}" href="javascript:setPrivacyLevel({$current.id},{$level})">{$label}</a><br> {/foreach} </div> - </dd> - </div></div> + </div> {/if} {/strip} </dl> @@ -341,7 +325,7 @@ function togglePrivacyLevelBox() {if isset($COMMENT_COUNT)} <div id="comments" {if (!isset($comment_add) && ($COMMENT_COUNT == 0))}class="noCommentContent"{else}class="commentContent"{/if}><div id="commentsSwitcher"></div> - <h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3> + <h3>{$COMMENT_COUNT|@translate_dec:'%d comment':'%d comments'}</h3> <div id="pictureComments"> {if isset($comment_add)} @@ -353,7 +337,7 @@ function togglePrivacyLevelBox() <p><input type="text" name="author" id="author" value="{$comment_add.AUTHOR}"></p> {/if} {if $comment_add.SHOW_EMAIL} - <p><label for="email">{'Email'|@translate}{if $comment_add.EMAIL_MANDATORY} ({'mandatory'|@translate}){/if} :</label></p> + <p><label for="email">{'Email address'|@translate}{if $comment_add.EMAIL_MANDATORY} ({'mandatory'|@translate}){/if} :</label></p> <p><input type="text" name="email" id="email" value="{$comment_add.EMAIL}"></p> {/if} <p><label for="website_url">{'Website'|@translate} :</label></p> diff --git a/themes/default/template/picture_content.tpl b/themes/default/template/picture_content.tpl index 793c275ea..c2bbc2e39 100644 --- a/themes/default/template/picture_content.tpl +++ b/themes/default/template/picture_content.tpl @@ -4,17 +4,17 @@ {footer_script}var error_icon = "{$ROOT_URL}{$themeconf.icon_dir}/errors_small.png"{/footer_script} {/if} -<img {if $current.selected_derivative->is_cached()}src="{$current.selected_derivative->get_url()}" {$current.selected_derivative->get_size_htm()}{else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif" data-src="{$current.selected_derivative->get_url()}"{/if} alt="{$ALT_IMG}" id="theMainImage" usemap="#map{$current.selected_derivative->get_type()}" title="{if isset($COMMENT_IMG)}{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{else}{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}{/if}"> +<img {if $current.selected_derivative->is_cached()}src="{$current.selected_derivative->get_url()}" {$current.selected_derivative->get_size_htm()}{else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif" data-src="{$current.selected_derivative->get_url()}"{/if} alt="{$ALT_IMG}" id="theMainImage" usemap="#map{$current.selected_derivative->get_type()}" title="{if isset($COMMENT_IMG)}{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{else}{$current.TITLE_ESC} - {$ALT_IMG}{/if}"> {foreach from=$current.unique_derivatives item=derivative key=derivative_type}{strip} <map name="map{$derivative->get_type()}"> {assign var='size' value=$derivative->get_size()} {if isset($previous)} -<area shape=rect coords="0,0,{$size[0]/4|@intval},{$size[1]}" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE|@escape}" alt="{$previous.TITLE|@escape}"> +<area shape=rect coords="0,0,{($size[0]/4)|@intval},{$size[1]}" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE_ESC}" alt="{$previous.TITLE_ESC}"> {/if} -<area shape=rect coords="{$size[0]/4|@intval},0,{$size[0]/1.34|@intval},{$size[1]/4|@intval}" href="{$U_UP}" title="{'Thumbnails'|@translate}" alt="{'Thumbnails'|@translate}"> +<area shape=rect coords="{($size[0]/4)|@intval},0,{($size[0]/1.34)|@intval},{($size[1]/4)|@intval}" href="{$U_UP}" title="{'Thumbnails'|@translate}" alt="{'Thumbnails'|@translate}"> {if isset($next)} -<area shape=rect coords="{$size[0]/1.33|@intval},0,{$size[0]},{$size[1]}" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE|@escape}" alt="{$next.TITLE|@escape}"> +<area shape=rect coords="{($size[0]/1.33)|@intval},0,{$size[0]},{$size[1]}" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE_ESC}" alt="{$next.TITLE_ESC}"> {/if} </map> {/strip}{/foreach}
\ No newline at end of file diff --git a/themes/default/template/picture_nav_buttons.tpl b/themes/default/template/picture_nav_buttons.tpl index 6da241c51..b56ab0eee 100644 --- a/themes/default/template/picture_nav_buttons.tpl +++ b/themes/default/template/picture_nav_buttons.tpl @@ -3,31 +3,31 @@ {if isset($slideshow)} {if isset($slideshow.U_INC_PERIOD)} <a href="{$slideshow.U_INC_PERIOD}" title="{'Reduce diaporama speed'|@translate}" class="pwg-state-default pwg-button"> - <span class="pwg-icon pwg-icon-clock-minus"> </span><span class="pwg-button-text">{'Reduce diaporama speed'|@translate}</span> + <span class="pwg-icon pwg-icon-clock-minus"></span><span class="pwg-button-text">{'Reduce diaporama speed'|@translate}</span> </a> {else} <span class="pwg-state-disabled pwg-button"> - <span class="pwg-icon pwg-icon-clock-minus"> </span><span class="pwg-button-text">{'Reduce diaporama speed'|@translate}</span> + <span class="pwg-icon pwg-icon-clock-minus"></span><span class="pwg-button-text">{'Reduce diaporama speed'|@translate}</span> </span> {/if} {if isset($slideshow.U_DEC_PERIOD)} <a href="{$slideshow.U_DEC_PERIOD}" title="{'Accelerate diaporama speed'|@translate}" class="pwg-state-default pwg-button"> - <span class="pwg-icon pwg-icon-clock-plus"> </span><span class="pwg-button-text">{'Accelerate diaporama speed'|@translate}</span> + <span class="pwg-icon pwg-icon-clock-plus"></span><span class="pwg-button-text">{'Accelerate diaporama speed'|@translate}</span> </a> {else} <span class="pwg-state-disabled pwg-button"> - <span class="pwg-icon pwg-icon-clock-plus"> </span><span class="pwg-button-text">{'Accelerate diaporama speed'|@translate}</span> + <span class="pwg-icon pwg-icon-clock-plus"></span><span class="pwg-button-text">{'Accelerate diaporama speed'|@translate}</span> </span> {/if} {/if} {if isset($slideshow.U_START_REPEAT)} <a href="{$slideshow.U_START_REPEAT}" title="{'Repeat the slideshow'|@translate}" class="pwg-state-default pwg-button"> - <span class="pwg-icon pwg-icon-repeat-play"> </span><span class="pwg-button-text">{'Repeat the slideshow'|@translate}</span> + <span class="pwg-icon pwg-icon-repeat-play"></span><span class="pwg-button-text">{'Repeat the slideshow'|@translate}</span> </a> {/if} {if isset($slideshow.U_STOP_REPEAT)} <a href="{$slideshow.U_STOP_REPEAT}" title="{'Not repeat the slideshow'|@translate}" class="pwg-state-default pwg-button"> - <span class="pwg-icon pwg-icon-repeat-stop"> </span><span class="pwg-button-text">{'Not repeat the slideshow'|@translate}</span> + <span class="pwg-icon pwg-icon-repeat-stop"></span><span class="pwg-button-text">{'Not repeat the slideshow'|@translate}</span> </a> {/if} {*<!--{strip}{if isset($first)} @@ -41,35 +41,35 @@ {/if}{/strip}-->*} {strip}{if isset($U_UP) and !isset($slideshow)} <a href="{$U_UP}" title="{'Thumbnails'|@translate}" class="pwg-state-default pwg-button"> - <span class="pwg-icon pwg-icon-arrow-n"> </span><span class="pwg-button-text">{'Thumbnails'|@translate}</span> + <span class="pwg-icon pwg-icon-arrow-n"></span><span class="pwg-button-text">{'Thumbnails'|@translate}</span> </a> {/if}{/strip} {strip}{if isset($previous)} - <a href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE|@escape}" class="pwg-state-default pwg-button"> - <span class="pwg-icon pwg-icon-arrow-w"> </span><span class="pwg-button-text">{'Previous'|@translate}</span> + <a href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE_ESC}" class="pwg-state-default pwg-button"> + <span class="pwg-icon pwg-icon-arrow-w"></span><span class="pwg-button-text">{'Previous'|@translate}</span> </a> {else} <span class="pwg-state-disabled pwg-button"> - <span class="pwg-icon pwg-icon-arrow-w"> </span><span class="pwg-button-text">{'Previous'|@translate}</span> + <span class="pwg-icon pwg-icon-arrow-w"></span><span class="pwg-button-text">{'Previous'|@translate}</span> </span> {/if}{/strip} {if isset($slideshow.U_START_PLAY)} <a href="{$slideshow.U_START_PLAY}" title="{'Play of slideshow'|@translate}" class="pwg-state-default pwg-button"> - <span class="pwg-icon pwg-icon-play"> </span><span class="pwg-button-text">{'Play of slideshow'|@translate}</span> + <span class="pwg-icon pwg-icon-play"></span><span class="pwg-button-text">{'Play of slideshow'|@translate}</span> </a> {/if} {if isset($slideshow.U_STOP_PLAY)} <a href="{$slideshow.U_STOP_PLAY}" title="{'Pause of slideshow'|@translate}" class="pwg-state-default pwg-button"> - <span class="pwg-icon pwg-icon-pause"> </span><span class="pwg-button-text">{'Pause of slideshow'|@translate}</span> + <span class="pwg-icon pwg-icon-pause"></span><span class="pwg-button-text">{'Pause of slideshow'|@translate}</span> </a> {/if} {strip}{if isset($next)} - <a href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE|@escape}" class="pwg-state-default pwg-button pwg-button-icon-right"> - <span class="pwg-icon pwg-icon-arrow-e"> </span><span class="pwg-button-text">{'Next'|@translate}</span> + <a href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE_ESC}" class="pwg-state-default pwg-button pwg-button-icon-right"> + <span class="pwg-icon pwg-icon-arrow-e"></span><span class="pwg-button-text">{'Next'|@translate}</span> </a> {else} <span class="pwg-state-disabled pwg-button pwg-button-icon-right"> - <span class="pwg-icon pwg-icon-arrow-e"> </span><span class="pwg-button-text">{'Next'|@translate}</span> + <span class="pwg-icon pwg-icon-arrow-e"></span><span class="pwg-button-text">{'Next'|@translate}</span> </span> {/if}{/strip} {*<!--{strip}{if isset($last)} diff --git a/themes/default/template/profile_content.tpl b/themes/default/template/profile_content.tpl index 3f2245523..0c4f26c10 100644 --- a/themes/default/template/profile_content.tpl +++ b/themes/default/template/profile_content.tpl @@ -50,7 +50,7 @@ </li> <li> <span class="property"> - <label for="template">{'Interface theme'|@translate}</label> + <label for="template">{'Theme'|@translate}</label> </span> {html_options name=theme options=$template_options selected=$template_selection} </li> diff --git a/themes/default/template/redirect.tpl b/themes/default/template/redirect.tpl index aa90953ec..bfab38386 100644 --- a/themes/default/template/redirect.tpl +++ b/themes/default/template/redirect.tpl @@ -1,12 +1,8 @@ -{html_head} -<style type="text/css">#the_page {ldelim}text-align:center;} </style> -{/html_head} - -<div> +<div style="margin:2em;text-align:center;font-size:larger"> {$REDIRECT_MSG} </div> -<p style="margin: 2em"> +<p style="margin:2em;text-align:center"> <a href="{$page_refresh.U_REFRESH}"> {'Click here if your browser does not automatically forward you'|@translate} </a> diff --git a/themes/default/template/search.tpl b/themes/default/template/search.tpl index c27b33202..4db60eb96 100644 --- a/themes/default/template/search.tpl +++ b/themes/default/template/search.tpl @@ -21,7 +21,7 @@ <ul class="categoryActions"> {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" class="pwg-state-default pwg-button"> - <span class="pwg-icon pwg-icon-help"> </span><span class="pwg-button-text">{'Help'|@translate}</span> + <span class="pwg-icon pwg-icon-help"></span><span class="pwg-button-text">{'Help'|@translate}</span> </a></li> </ul> <h2><a href="{$U_HOME}">{'Home'|@translate}</a>{$LEVEL_SEPARATOR}{'Search'|@translate}</h2> @@ -33,7 +33,7 @@ <fieldset> <legend>{'Filter'|@translate}</legend> <label>{'Search for words'|@translate} - <input type="text" style="width: 300px" name="search_allwords" size="30"> + <input type="text" name="search_allwords" size="35"> </label> <ul> <li><label> @@ -44,7 +44,7 @@ </label></li> </ul> <label>{'Search for Author'|@translate} - <input type="text" style="width: 300px" name="search_author" size="30"> + <input type="text" name="search_author" size="35"> </label> </fieldset> @@ -111,7 +111,7 @@ <fieldset> <legend>{'Search in albums'|@translate}</legend> <label>{'Albums'|@translate} - <select class="categoryList" name="cat[]" multiple="multiple" > + <select class="categoryList" name="cat[]" multiple="multiple" size="15"> {html_options options=$category_options selected=$category_options_selected} </select> </label> diff --git a/themes/default/template/tags.tpl b/themes/default/template/tags.tpl index c4327289a..b4f54b24d 100644 --- a/themes/default/template/tags.tpl +++ b/themes/default/template/tags.tpl @@ -5,12 +5,12 @@ <ul class="categoryActions"> {if $display_mode == 'letters'} <li><a href="{$U_CLOUD}" title="{'show tag cloud'|@translate}" class="pwg-state-default pwg-button"> - <span class="pwg-icon pwg-icon-cloud"> </span><span class="pwg-button-text">{'cloud'|@translate}</span> + <span class="pwg-icon pwg-icon-cloud"></span><span class="pwg-button-text">{'cloud'|@translate}</span> </a></li> {/if} {if $display_mode == 'cloud'} <li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> - <span class="pwg-icon pwg-icon-letters"> </span><span class="pwg-button-text">{'letters'|@translate}</span> + <span class="pwg-icon pwg-icon-letters"></span><span class="pwg-button-text">{'letters'|@translate}</span> </a></li> {/if} </ul> @@ -23,7 +23,7 @@ {if $display_mode == 'cloud' and isset($tags)} <div id="fullTagCloud"> {foreach from=$tags item=tag} - <span><a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{$pwg->l10n_dec('%d photo', '%d photos', $tag.counter)}">{$tag.name}</a></span> + <span><a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{$tag.counter|@translate_dec:'%d photo':'%d photos'}">{$tag.name}</a></span> {/foreach} </div> {/if} @@ -39,7 +39,7 @@ {foreach from=$letter.tags item=tag} <tr class="tagLine"> <td><a href="{$tag.URL}" title="{$tag.name}">{$tag.name}</a></td> - <td class="nbEntries">{$pwg->l10n_dec('%d photo', '%d photos', $tag.counter)}</td> + <td class="nbEntries">{$tag.counter|@translate_dec:'%d photo':'%d photos'}</td> </tr> {/foreach} </table> |
