diff options
Diffstat (limited to '')
| -rw-r--r-- | themes/dark/images/s26_outline_ffff80.png | bin | 0 -> 2033 bytes | |||
| -rw-r--r-- | themes/dark/images/s26_outline_ffffff.png | bin | 0 -> 2033 bytes | |||
| -rw-r--r-- | themes/dark/theme.css | 16 | ||||
| -rw-r--r-- | themes/default/icon/category_children.png | bin | 1554 -> 0 bytes | |||
| -rw-r--r-- | themes/default/icon/category_representant_random.png | bin | 3171 -> 0 bytes | |||
| -rw-r--r-- | themes/default/iconset.css | 8 | ||||
| -rw-r--r-- | themes/default/template/picture.tpl | 83 | ||||
| -rw-r--r-- | themes/default/template/picture_nav_buttons.tpl | 117 | ||||
| -rw-r--r-- | themes/default/template/picture_toolbar.tpl | 144 | ||||
| -rw-r--r-- | themes/default/template/slideshow.tpl | 2 | ||||
| -rw-r--r-- | themes/default/theme.css | 24 |
11 files changed, 136 insertions, 258 deletions
diff --git a/themes/dark/images/s26_outline_ffff80.png b/themes/dark/images/s26_outline_ffff80.png Binary files differnew file mode 100644 index 000000000..2232f0395 --- /dev/null +++ b/themes/dark/images/s26_outline_ffff80.png diff --git a/themes/dark/images/s26_outline_ffffff.png b/themes/dark/images/s26_outline_ffffff.png Binary files differnew file mode 100644 index 000000000..d440b68d9 --- /dev/null +++ b/themes/dark/images/s26_outline_ffffff.png diff --git a/themes/dark/theme.css b/themes/dark/theme.css index 56d441091..c52d69767 100644 --- a/themes/dark/theme.css +++ b/themes/dark/theme.css @@ -6,7 +6,7 @@ INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ { } H2, #menubar DT { - color: #fff48e; + color: #ffff80; } @@ -67,9 +67,17 @@ UL.thumbnails SPAN.wrap2:hover, /* links */ A, INPUT.rateButton { color: #fff; - border: 0; } A:hover { - color: #FFF48E; -}
\ No newline at end of file + color: #ffff80; +} + +.pwg-icon { + background-image: url(images/s26_outline_ffffff.png); +} + +A:hover .pwg-icon { + background-image: url(images/s26_outline_ffff80.png); +} + diff --git a/themes/default/icon/category_children.png b/themes/default/icon/category_children.png Binary files differdeleted file mode 100644 index 7205c3f61..000000000 --- a/themes/default/icon/category_children.png +++ /dev/null diff --git a/themes/default/icon/category_representant_random.png b/themes/default/icon/category_representant_random.png Binary files differdeleted file mode 100644 index dfa69846f..000000000 --- a/themes/default/icon/category_representant_random.png +++ /dev/null diff --git a/themes/default/iconset.css b/themes/default/iconset.css index 5be7cbde4..3f03d0a48 100644 --- a/themes/default/iconset.css +++ b/themes/default/iconset.css @@ -65,11 +65,9 @@ A.pwg-state-default, A.pwg-state-default:visited, A.pwg-state-default:hover { .pwg-icon-repeat-play {background-position: -156px -130px} .pwg-icon-repeat-stop {background-position: -182px -130px} +.pwg-icon-map {background-position: 0 -156px} -A.pwg-button { - border: 1px solid blue; -} -.pwg-state-default:hover { - border-color: green; +A.pwg-state-default:hover { + border: 0 !important; /*don't add bottom border on hover*/ } diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index 4739b88b3..9afef3d5a 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -1,4 +1,3 @@ - {* Example of resizeable *} {* {include file='include/autosize.inc.tpl'} @@ -38,51 +37,63 @@ </div> <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_METADATA) } - <a href="{$U_METADATA}" title="{'Show file metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata"></a> - {/if} - {if isset($current.U_DOWNLOAD) } - <a href="{$current.U_DOWNLOAD}" title="{'download this file'|@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="{if $favorite.IS_FAVORITE}{'delete this image from your favorites'|@translate}{else}{'add this image to your favorites'|@translate}{/if}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/{if $favorite.IS_FAVORITE}del_favorite{else}favorite{/if}.png" class="button" alt="favorite" title="{if $favorite.IS_FAVORITE}{'delete this image from your favorites'|@translate}{else}{'add this image to your favorites'|@translate}{/if}"></a> - {/if} - {if !empty($U_SET_AS_REPRESENTATIVE) } - <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as album 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="{'Modify information'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a> - {/if} - {if isset($U_CADDIE) }{*caddie management BEGIN*} -{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} + <div class="actionButtons"> +{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> + </a> +{/if} +{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> + </a> +{/if} +{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> + </a> +{/if} +{if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if} +{if isset($favorite)} + <a href="{$favorite.U_FAVORITE}" title="{if $favorite.IS_FAVORITE}{'delete this image from your favorites'|@translate}{else}{'add this image 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> + </a> +{/if} +{if isset($U_SET_AS_REPRESENTATIVE)} + <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as category 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} +{if isset($U_ADMIN)} + <a href="{$U_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} +{if isset($U_CADDIE)}{*caddie management BEGIN*} <script type="text/javascript"> {literal}function addToCadie(aElement, rootUrl, id) { if (aElement.disabled) return; -aElement.disabled=true; +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; } - } - ); + "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='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'} -</div> <!-- imageToolBar --> + <a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'add to caddie'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> + <span class="pwg-icon pwg-icon-caddie-add"> </span><span class="pwg-button-text">{'caddie'|@translate}</span> + </a> +{/if}{*caddie management END*} + </div> -{include file='picture_toolbar.tpl'} + {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'} +</div> <!-- imageToolBar --> <div id="theImage"> {$ELEMENT_CONTENT} diff --git a/themes/default/template/picture_nav_buttons.tpl b/themes/default/template/picture_nav_buttons.tpl index 0bb50bd8f..03000676b 100644 --- a/themes/default/template/picture_nav_buttons.tpl +++ b/themes/default/template/picture_nav_buttons.tpl @@ -1,67 +1,88 @@ - <div class="navButtons"> - +<div class="navigationButtons"> {if $DISPLAY_NAV_BUTTONS or isset($slideshow)} -{if isset($last)} - <a class="navButton" href="{$last.U_IMG}" title="{'Last'|@translate} : {$last.TITLE}" rel="last"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last.png" class="button" alt="{'Last'|@translate}"></a> +{if isset($slideshow)} +{if isset($slideshow.U_INC_PERIOD)} + <a href="{$slideshow.U_INC_PERIOD}" title="{'Accelerate diaporama speed'|@translate}" class="pwg-state-default pwg-button"> + <span class="pwg-icon pwg-icon-clock-minus"> </span><span class="pwg-button-text">{'Accelerate diaporama speed'|@translate}</span> + </a> {else} - <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last_unactive.png" class="button" alt=""></a> + <span class="pwg-state-disabled pwg-button"> + <span class="pwg-icon pwg-icon-clock-minus"> </span><span class="pwg-button-text">{'Accelerate 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> + </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> {/if} - -{if isset($next)} - <a class="navButton" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" rel="next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right.png" class="button" alt="{'Next'|@translate}"></a> +{/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> + </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> + </a> +{/if} +{if isset($first)} + <a href="{$first.U_IMG}" title="{'First'|@translate} : {$first.TITLE}" class="pwg-state-default pwg-button"> + <span class="pwg-icon pwg-icon-arrowstop-w"> </span><span class="pwg-button-text">{'First'|@translate}</span> + </a> {else} - <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right_unactive.png" class="button" alt=""></a> + <span class="pwg-state-disabled pwg-button"> + <span class="pwg-icon pwg-icon-arrowstop-w"> </span><span class="pwg-button-text">{'First'|@translate}</span> + </span> +{/if} +{if isset($previous)} + <a href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" 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> {/if} - {if isset($slideshow.U_START_PLAY)} - <a class="navButton" href="{$slideshow.U_START_PLAY}" title="{'Play of slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/play.png" class="button" alt="{'Play of slideshow'|@translate}"></a> + <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> + </a> {/if} - {if isset($slideshow.U_STOP_PLAY)} - <a class="navButton" href="{$slideshow.U_STOP_PLAY}" title="{'Pause of slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/pause.png" class="button" alt="{'Pause of slideshow'|@translate}"></a> + <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> + </a> {/if} - {if isset($U_UP) and !isset($slideshow)} - <a class="navButton" href="{$U_UP}" title="{'Thumbnails'|@translate}" rel="up"><img src="{$ROOT_URL}{$themeconf.icon_dir}/up.png" class="button" alt="{'Thumbnails'|@translate}"></a> + <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> + </a> {/if} - -{if isset($previous)} - <a class="navButton" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left.png" class="button" alt="{'Previous'|@translate}"></a> +{if isset($next)} + <a href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" 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} - <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left_unactive.png" class="button" alt=""></a> + <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> {/if} - -{if isset($first)} - <a class="navButton" href="{$first.U_IMG}" title="{'First'|@translate} : {$first.TITLE}" rel="first"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first.png" class="button" alt="{'First'|@translate}"></a> +{if isset($last)} + <a href="{$last.U_IMG}" title="{'Last'|@translate} : {$last.TITLE}" class="pwg-state-default pwg-button pwg-button-icon-right"> + <span class="pwg-icon pwg-icon-arrowstop-e"></span><span class="pwg-button-text">{'Last'|@translate}</span> + </a> {else} - <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first_unactive.png" class="button" alt=""></a> -{/if} - - -{if isset($slideshow.U_START_REPEAT)} - <a class="navButton" href="{$slideshow.U_START_REPEAT}" title="{'Repeat the slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_repeat.png" class="button" alt="{'Repeat the slideshow'|@translate}"></a> + <span class="pwg-state-disabled pwg-button pwg-button-icon-right"> + <span class="pwg-icon pwg-icon-arrowstop-e"> </span><span class="pwg-button-text">{'Last'|@translate}</span> + </span> {/if} - -{if isset($slideshow.U_STOP_REPEAT)} - <a class="navButton" href="{$slideshow.U_STOP_REPEAT}" title="{'Not repeat the slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_repeat.png" class="button" alt="{'Not repeat the slideshow'|@translate}"></a> -{/if} - -{if isset($slideshow)} - {if isset($slideshow.U_DEC_PERIOD)} - <a class="navButton" href="{$slideshow.U_DEC_PERIOD}" title="{'Accelerate diaporama speed'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period.png" class="button" alt="{'Accelerate diaporama speed'|@translate}"></a> - {else} - <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period_unactive.png" class="button" alt=""></a> - {/if} - - {if isset($slideshow.U_INC_PERIOD)} - <a class="navButton" href="{$slideshow.U_INC_PERIOD}" title="{'Reduce diaporama speed'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period.png" class="button" alt="{'Reduce diaporama speed'|@translate}"></a> - {else} - <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period_unactive.png" class="button" alt=""></a> - {/if} {/if} -{/if} - - </div> +</div> <script type="text/javascript">// <
