diff options
Diffstat (limited to '')
| -rw-r--r-- | themes/default/template/header.tpl | 2 | ||||
| -rw-r--r-- | themes/default/template/index.tpl | 8 | ||||
| -rw-r--r-- | themes/default/template/picture.tpl | 5 | ||||
| -rw-r--r-- | themes/default/theme.css | 9 |
4 files changed, 18 insertions, 6 deletions
diff --git a/themes/default/template/header.tpl b/themes/default/template/header.tpl index 444b3fc2d..c26d696e7 100644 --- a/themes/default/template/header.tpl +++ b/themes/default/template/header.tpl @@ -49,6 +49,8 @@ <script type="text/javascript" src="{$ROOT_URL}themes/default/js/pngfix.js"></script> <![endif]--> +{combine_script id="jquery"} + {if not empty($head_elements)} {foreach from=$head_elements item=elt}{$elt} {/foreach} diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index 2502e42b1..35697d778 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -8,10 +8,10 @@ <span class="pwg-icon pwg-icon-sort"> </span><span class="pwg-button-text">{'Sort order'|@translate}</span> </a> <div id="sortOrderBox" style="display:none; text-align:left" onclick="toggleSortOrderBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleSortOrderBox()"> - {'Sort order'|@translate}<hr> + <div class="switchBoxTitle">{'Sort order'|@translate}</div> {foreach from=$image_orders item=image_order name=loop}{if !$smarty.foreach.loop.first}<br>{/if} {if $image_order.SELECTED} - <span>{$image_order.DISPLAY}</span> + <span>✔ {$image_order.DISPLAY}</span> {else} <a href="{$image_order.URL}" rel="nofollow">{$image_order.DISPLAY}</a> {/if} @@ -39,10 +39,10 @@ function toggleSortOrderBox() { <span class="pwg-icon pwg-icon-sizes"> </span><span class="pwg-button-text">{'Photo sizes'|@translate}</span> </a> <div id="derivativeSwitchBox" style="display:none; text-align:left" onclick="toggleImageDerivativesBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleImageDerivativesBox()"> - {'Photo sizes'|@translate}<hr> + <div class="switchBoxTitle">{'Photo sizes'|@translate}</div> {foreach from=$image_derivatives item=image_derivative name=loop}{if !$smarty.foreach.loop.first}<br>{/if} {if $image_derivative.SELECTED} - <span>{$image_derivative.DISPLAY}</span> + <span>✔ {$image_derivative.DISPLAY}</span> {else} <a href="{$image_derivative.URL}" rel="nofollow">{$image_derivative.DISPLAY}</a> {/if} diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index e0472ca51..b95948b1e 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -29,6 +29,8 @@ function changeImgSrc(url,typeSave,typeMap) theImg.src = url; theImg.useMap = "#map"+typeMap; } + jQuery('.derivativeChecked').hide(); + jQuery('#derivativeChecked'+typeSave).show(); document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}'; } @@ -50,8 +52,9 @@ function toggleDerivativeSwitchBox() {strip}<a id="derivativeSwitchLink" href="javascript:toggleDerivativeSwitchBox()" 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></a> <div id="derivativeSwitchBox" onclick="toggleDerivativeSwitchBox()" style="display:none"> +<div class="switchBoxTitle">{'Photo sizes'|@translate}</div> {foreach from=$current.unique_derivatives item=derivative key=derivative_type} -<a href="javascript:changeImgSrc('{$derivative->get_url()|@escape:javascript}','{$derivative_type}','{$derivative->get_type()}')">{$derivative->get_type()|@translate} ({$derivative->get_size_hr()})</a><br> +<span class="derivativeChecked" id="derivativeChecked{$derivative->get_type()}" {if $derivative->get_type() ne $current.selected_derivative->get_type()}style="display:none"{/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> {/foreach} {if isset($U_ORIGINAL)} <a href="javascript:phpWGOpenWindow('{$U_ORIGINAL}','xxx','scrollbars=yes,toolbar=no,status=no,resizable=yes')" rel="nofollow">{'Original'|@translate}</a> diff --git a/themes/default/theme.css b/themes/default/theme.css index 2049d04af..23fcf420c 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -341,9 +341,16 @@ TD.calDayHead { #imageToolBar .pwg-button {width:42px;} #derivativeSwitchBox, #sortOrderBox { - padding: 0.5em 1em; + padding: 0.5em 10px; border-radius: 4px; z-index: 100; + text-align:left; +} + +.switchBoxTitle { + border-bottom:1px solid #000; + padding-bottom:5px; + margin-bottom:5px; } #theImage { |