From acd3b90822cf9104307b76fbde980fec40245f51 Mon Sep 17 00:00:00 2001 From: rvelices Date: Fri, 10 Dec 2010 06:21:15 +0000 Subject: first sprite usage on picture page git-svn-id: http://piwigo.org/svn/trunk@8066 68402e56-0260-453c-a942-63ccdbb3a9ee --- themes/default/iconset.css | 79 ++++++++++++++ themes/default/sprite.png | Bin 0 -> 4574 bytes themes/default/template/include/datepicker.inc.tpl | 4 +- themes/default/template/picture.tpl | 6 +- themes/default/template/picture_toolbar.tpl | 113 +++++++++++++++++++++ themes/default/template/slideshow.tpl | 2 + themes/default/theme.css | 4 +- 7 files changed, 201 insertions(+), 7 deletions(-) create mode 100644 themes/default/iconset.css create mode 100644 themes/default/sprite.png create mode 100644 themes/default/template/picture_toolbar.tpl (limited to 'themes/default') diff --git a/themes/default/iconset.css b/themes/default/iconset.css new file mode 100644 index 000000000..1bcc7c810 --- /dev/null +++ b/themes/default/iconset.css @@ -0,0 +1,79 @@ +.pwg-icon { + display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; + width: 26px; height: 26px; background-image: url(sprite.png); +} +.pwg-button-text { display:none; } + +a.pwg-state-default, a.pwg-state-default:visited, a.pwg-state-default:hover { + text-decoration: none !important; +} + +.pwg-state-disabled .pwg-icon { + opacity: .5; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";! + filter: alpha(opacity=50); +} + +.pwg-button { + display: inline-block; +} + +.pwg-icon-home {background-position: -26px 0} +.pwg-icon-camera {background-position: -52px 0} +.pwg-icon-calendar {background-position: -78px 0} +.pwg-icon-save {background-position: -104px 0} + +.pwg-icon-arrow-n {background-position: 0 -26px} +.pwg-icon-arrow-e {background-position: -26px -26px} +.pwg-icon-arrow-s {background-position: -52px -26px} +.pwg-icon-arrow-w {background-position: -78px -26px} + +.pwg-icon-arrowstop-n {background-position: 0 -52px} +.pwg-icon-arrowstop-e {background-position: -26px -52px} +.pwg-icon-arrowstop-s {background-position: -52px -52px} +.pwg-icon-arrowstop-w {background-position: -78px -52px} + +.pwg-icon-caddie {background-position: 0 -78px} +.pwg-icon-caddie-add {background-position: -26px -78px} +.pwg-icon-caddie-del {background-position: -52px -78px} +.pwg-icon-favorite {background-position: -78px -78px} +.pwg-icon-favorite-add {background-position: -104px -78px} +.pwg-icon-favorite-del {background-position: -130px -78px} + +.pwg-icon-camera-info {background-position: 0 -104px} + +.pwg-icon-slideshow {background-position: 0 -130px} +.pwg-icon-play {background-position: -26px -130px} +.pwg-icon-pause {background-position: -52px -130px} + +/* +.pwg-icon-representative +.pwg-icon-edit +.pwg-icon-register +.pwg-icon-lost-password +.pwg-icon-cloud +.pwg-icon-letters +.pwg-icon-camera-calendar +flat +normal +filter-plus +filter-minus + +.pwg-icon-stop + +.pwg-icon-time +.pwg-icon-time-plus +.pwg-icon-time-minus +.pwg-icon-repeat +.pwg-icon-repeat-yes +.pwg-icon-repeat-no +*/ + + +A.pwg-button { + border: 1px solid blue; +} + +.pwg-state-default:hover { + border-color: green; +} diff --git a/themes/default/sprite.png b/themes/default/sprite.png new file mode 100644 index 000000000..f29704b98 Binary files /dev/null and b/themes/default/sprite.png differ diff --git a/themes/default/template/include/datepicker.inc.tpl b/themes/default/template/include/datepicker.inc.tpl index 9308fd3ff..636b6b9cb 100644 --- a/themes/default/template/include/datepicker.inc.tpl +++ b/themes/default/template/include/datepicker.inc.tpl @@ -4,10 +4,10 @@ {combine_script id='jquery.ui.datepicker' load='footer' require='jquery.ui' path='themes/default/js/ui/packed/ui.datepicker.packed.js'} {combine_script id='datepicker.js' load='footer' require='jquery.ui.datepicker' path='themes/default/js/datepicker.js'} -{assign var="datepicker_language" value="themes/default/js/ui/i18n/ui.datepicker-"|@cat:$lang_info.code|@cat:".js"} +{assign var="datepicker_language" value="themes/default/js/ui/i18n/ui.datepicker-`$lang_info.code`.js"} {if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists} -{combine_script id="jquery.ui.datepicker-$lang_info.code" path=$datepicker_language} +{combine_script id="jquery.ui.datepicker-$lang_info.code" load='footer' path=$datepicker_language} {/if} {combine_css path="themes/default/js/ui/theme/ui.datepicker.css"} diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index 220790059..4739b88b3 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -82,6 +82,8 @@ y.callService( {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'} +{include file='picture_toolbar.tpl'} +
{$ELEMENT_CONTENT} @@ -216,10 +218,6 @@ y.callService( _pwgRatingAutoQueue.push( {ldelim}rootUrl: '{$ROOT_URL|@escape:"javascript"}', image_id: {$current.id}, updateRateText: "{'Update your rating'|@translate|@escape:'javascript'}", updateRateElement: document.getElementById("updateRate"), ratingSummaryText: "{'%.2f (rated %d times)'|@translate|@escape:'javascript'}", ratingSummaryElement: document.getElementById("ratingSummary") {rdelim} ); - /*(function () {ldelim} - var s = document.createElement('script'); s.type = 'text/javascript'; s.async = true; s.src = '{$ROOT_URL}themes/default/js/rating.js'; - var s0 = document.getElementsByTagName('script')[0]; s0.parentNode.insertBefore(s, s0); - })();*/
diff --git a/themes/default/template/picture_toolbar.tpl b/themes/default/template/picture_toolbar.tpl new file mode 100644 index 000000000..23a7e0fed --- /dev/null +++ b/themes/default/template/picture_toolbar.tpl @@ -0,0 +1,113 @@ +
+
+{if isset($U_SLIDESHOW_START)} + +  {'slideshow'|@translate} + +{/if} +{if isset($U_METADATA)} + +  {'Show file metadata'|@translate} + +{/if} +{if isset($current.U_DOWNLOAD)} + +  {'download'|@translate} + +{/if} +{if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if} +{if isset($favorite)} + +  {'Favorites'|@translate} + +{/if} +{if isset($U_SET_AS_REPRESENTATIVE)} + +  {'representative'|@translate} + +{/if} +{if isset($U_ADMIN)} + +  {'edit'|@translate} + +{/if} +{if isset($U_CADDIE)}{*caddie management BEGIN*} + + +  {'caddie'|@translate} + +{/if}{*caddie management END*} +
+ +
+{if $DISPLAY_NAV_BUTTONS or isset($slideshow)} +{if isset($first)} + +  {'First'|@translate} + +{else} + +  {'First'|@translate} + +{/if} +{if isset($previous)} + +  {'Previous'|@translate} + +{else} + +  {'Previous'|@translate} + +{/if} +{if isset($slideshow.U_START_PLAY)} + +  {'Play of slideshow'|@translate} + +{/if} +{if isset($slideshow.U_STOP_PLAY)} + +  {'Pause of slideshow'|@translate} + +{/if} +{if isset($U_UP) and !isset($slideshow)} + +  {'Thumbnails'|@translate} + +{/if} +{if isset($next)} + +  {'Next'|@translate} + +{else} + +  {'Next'|@translate} + +{/if} +{if isset($last)} + + {'Last'|@translate} + +{else} + +  {'Last'|@translate} + +{/if} +{/if} +
+
+ \ No newline at end of file diff --git a/themes/default/template/slideshow.tpl b/themes/default/template/slideshow.tpl index a310935a2..03e5225bf 100644 --- a/themes/default/template/slideshow.tpl +++ b/themes/default/template/slideshow.tpl @@ -14,6 +14,8 @@ {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'} +{include file='picture_toolbar.tpl'} +
{$ELEMENT_CONTENT} {if isset($COMMENT_IMG)} diff --git a/themes/default/theme.css b/themes/default/theme.css index 87c685684..e0cf02373 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -1,3 +1,4 @@ +@import "iconset.css"; /** * Menubar */ @@ -816,4 +817,5 @@ LEGEND { } #piwigoAbout {width:600px;margin:0 auto;} -#linkToPiwigo {text-align:center;} \ No newline at end of file +#linkToPiwigo {text-align:center;} + -- cgit v1.2.3