aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--template-extension/distributed/samples/my-picture.tpl82
-rw-r--r--themes/dark/images/s26_outline_ffff80.pngbin0 -> 2033 bytes
-rw-r--r--themes/dark/images/s26_outline_ffffff.pngbin0 -> 2033 bytes
-rw-r--r--themes/dark/theme.css16
-rw-r--r--themes/default/icon/category_children.pngbin1554 -> 0 bytes
-rw-r--r--themes/default/icon/category_representant_random.pngbin3171 -> 0 bytes
-rw-r--r--themes/default/iconset.css8
-rw-r--r--themes/default/template/picture.tpl83
-rw-r--r--themes/default/template/picture_nav_buttons.tpl117
-rw-r--r--themes/default/template/picture_toolbar.tpl144
-rw-r--r--themes/default/template/slideshow.tpl2
-rw-r--r--themes/default/theme.css24
12 files changed, 186 insertions, 290 deletions
diff --git a/template-extension/distributed/samples/my-picture.tpl b/template-extension/distributed/samples/my-picture.tpl
index 715f3fa2f..0d47a8273 100644
--- a/template-extension/distributed/samples/my-picture.tpl
+++ b/template-extension/distributed/samples/my-picture.tpl
@@ -33,47 +33,65 @@
{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="{'stop the slideshow'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_slideshow.png" class="button" alt="{'stop the slideshow'|@translate}"></a>
- {/if}
- <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 isset($current.U_DOWNLOAD) }
- <a href="{$current.U_DOWNLOAD}" title="{'download'|@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="{'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="{'edit'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
- {/if}
- {if isset($U_CADDIE) }{*caddie management BEGIN*}
+ <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">&nbsp;</span><span class="pwg-button-text">{'slideshow'|@translate}</span>
+ </a>
+{/if}
+{if isset($U_SLIDESHOW_STOP)}
+ <a href="{$U_SLIDESHOW_STOP}" title="{'stop the slideshow'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+ <span class="pwg-icon pwg-icon-slideshow">&nbsp;</span><span class="pwg-button-text">{'stop the 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">&nbsp;</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">&nbsp;</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}">&nbsp;</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">&nbsp;</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">&nbsp;</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="{'caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
- {/if}{*caddie management END*}
- </div>
+ <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">&nbsp;</span><span class="pwg-button-text">{'caddie'|@translate}</span>
+ </a>
+{/if}{*caddie management END*}
+ </div>
{include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
</div> <!-- imageToolBar -->
diff --git a/themes/dark/images/s26_outline_ffff80.png b/themes/dark/images/s26_outline_ffff80.png
new file mode 100644
index 000000000..2232f0395
--- /dev/null
+++ b/themes/dark/images/s26_outline_ffff80.png
Binary files differ
diff --git a/themes/dark/images/s26_outline_ffffff.png b/themes/dark/images/s26_outline_ffffff.png
new file mode 100644
index 000000000..d440b68d9
--- /dev/null
+++ b/themes/dark/images/s26_outline_ffffff.png
Binary files differ
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
deleted file mode 100644
index 7205c3f61..000000000
--- a/themes/default/icon/category_children.png
+++ /dev/null
Binary files differ
diff --git a/themes/default/icon/category_representant_random.png b/themes/default/icon/category_representant_random.png
deleted file mode 100644
index dfa69846f..000000000
--- a/themes/default/icon/category_representant_random.png
+++ /dev/null
Binary files differ
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">&nbsp;</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">&nbsp;</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">&nbsp;</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}">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">// <![CDATA[ {literal}
document.onkeydown = function(e)
diff --git a/themes/default/template/picture_toolbar.tpl b/themes/default/template/picture_toolbar.tpl
deleted file mode 100644
index 7ea2e80c5..000000000
--- a/themes/default/template/picture_toolbar.tpl
+++ /dev/null
@@ -1,144 +0,0 @@
-<div class="pictureToolBar">
- <div class="actionButtons" style="float:left">
-{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">&nbsp;</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">&nbsp;</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">&nbsp;</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}">&nbsp;</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">&nbsp;</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">&nbsp;</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;
-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}" class="pwg-state-default pwg-button" rel="nofollow">
- <span class="pwg-icon pwg-icon-caddie-add">&nbsp;</span><span class="pwg-button-text">{'caddie'|@translate}</span>
- </a>
-{/if}{*caddie management END*}
- </div>
-
- <div class="navigationButtons" style="float:right">
-{if $DISPLAY_NAV_BUTTONS or isset($slideshow)}
-{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">&nbsp;</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-minus">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span><span class="pwg-button-text">{'First'|@translate}</span>
- </a>
-{else}
- <span class="pwg-state-disabled pwg-button">
- <span class="pwg-icon pwg-icon-arrowstop-w">&nbsp;</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">&nbsp;</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">&nbsp;</span><span class="pwg-button-text">{'Previous'|@translate}</span>
- </span>
-{/if}
-{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">&nbsp;</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">&nbsp;</span><span class="pwg-button-text">{'Pause of slideshow'|@translate}</span>
- </a>
-{/if}
-{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">&nbsp;</span><span class="pwg-button-text">{'Thumbnails'|@translate}</span>
- </a>
-{/if}
-{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">&nbsp;</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">&nbsp;</span><span class="pwg-button-text">{'Next'|@translate}</span>
- </span>
-{/if}
-{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}
- <span class="pwg-state-disabled pwg-button pwg-button-icon-right">
- <span class="pwg-icon pwg-icon-arrowstop-e">&nbsp;</span><span class="pwg-button-text">{'Last'|@translate}</span>
- </span>
-{/if}
-{/if}
- </div>
-</div>
- \ No newline at end of file
diff --git a/themes/default/template/slideshow.tpl b/themes/default/template/slideshow.tpl
index 03e5225bf..a310935a2 100644
--- a/themes/default/template/slideshow.tpl
+++ b/themes/default/template/slideshow.tpl
@@ -14,8 +14,6 @@
{include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
</div>
-{include file='picture_toolbar.tpl'}
-
<div id="theImage">
{$ELEMENT_CONTENT}
{if isset($COMMENT_IMG)}
diff --git a/themes/default/theme.css b/themes/default/theme.css
index ee84b150a..10d3834a1 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -136,11 +136,6 @@ UL.categoryActions LI {
display: inline;
}
-UL.categoryActions A IMG, UL.categoryActions A {
- border: 0;
- margin-bottom: -5px;
-}
-
/* begin chronology/calendar elements*/
.content .calendarViews {
display: block;
@@ -343,22 +338,16 @@ UL.thumbnails IMG {
#imageToolBar {
text-align: center;
- position: relative;
clear: both;
margin-bottom: 4px;
padding: 0;
height: 28px;
}
-#imageToolBar A, #imageToolBar IMG {
- display: block;
- border: 0;
- margin: 0; padding: 0;
-}
-#imageToolBar A { width: 48px; }
-#imageToolBar IMG { margin: 2px auto; }
-#imageToolBar .randomButtons A { float: left; }
-#imageToolBar .navButtons A { float: right; }
+#imageToolBar .actionButtons { float: left; }
+#imageToolBar .navigationButtons { float: right; }
+#imageToolBar .pwg-button {width:42px;}
+
#theImage {
clear: left;
@@ -728,11 +717,8 @@ UL.thumbnails SPAN.thumbLegend {
/**
* Default colors
*/
-#imageToolBar * {
- background: inherit;
-}
-/* So that non-links are slightly greyed out */
+ /* So that non-links are slightly greyed out */
.content .navigationBar, .calItemEmpty, TD.calDayCellEmpty {
color: #b0b0b0;
}