From 549b6e0507cce14192670645ec1f4be43aa205a7 Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 14 Dec 2010 06:45:52 +0000 Subject: [PATCH] css sprites - almost done - still to implement nice colors and hover effect for clear and sylvia git-svn-id: http://piwigo.org/svn/trunk@8119 68402e56-0260-453c-a942-63ccdbb3a9ee --- .../distributed/samples/my-picture.tpl | 82 ++++++---- themes/dark/images/s26_outline_ffff80.png | Bin 0 -> 2033 bytes themes/dark/images/s26_outline_ffffff.png | Bin 0 -> 2033 bytes themes/dark/theme.css | 16 +- themes/default/icon/category_children.png | Bin 1554 -> 0 bytes .../icon/category_representant_random.png | Bin 3171 -> 0 bytes themes/default/iconset.css | 8 +- themes/default/template/picture.tpl | 83 +++++----- .../default/template/picture_nav_buttons.tpl | 141 +++++++++-------- themes/default/template/picture_toolbar.tpl | 144 ------------------ themes/default/template/slideshow.tpl | 2 - themes/default/theme.css | 24 +-- 12 files changed, 198 insertions(+), 302 deletions(-) create mode 100644 themes/dark/images/s26_outline_ffff80.png create mode 100644 themes/dark/images/s26_outline_ffffff.png delete mode 100644 themes/default/icon/category_children.png delete mode 100644 themes/default/icon/category_representant_random.png delete mode 100644 themes/default/template/picture_toolbar.tpl 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}
-
- {if isset($U_SLIDESHOW_START) } - {'slideshow'|@translate} - {/if} - {if isset($U_SLIDESHOW_STOP) } - {'stop the slideshow'|@translate} - {/if} - metadata - {if isset($current.U_DOWNLOAD) } - {'download'|@translate} - {/if} - {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if} - {if isset($favorite) } - favorite - {/if} - {if !empty($U_SET_AS_REPRESENTATIVE) } - {'representative'|@translate} - {/if} - {if isset($U_ADMIN) } - {'edit'|@translate} - {/if} - {if isset($U_CADDIE) }{*caddie management BEGIN*} +
+{if isset($U_SLIDESHOW_START)} + +  {'slideshow'|@translate} + +{/if} +{if isset($U_SLIDESHOW_STOP)} + +  {'stop the 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*} -
+ +  {'caddie'|@translate} + +{/if}{*caddie management END*} +
{include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
diff --git a/themes/dark/images/s26_outline_ffff80.png b/themes/dark/images/s26_outline_ffff80.png new file mode 100644 index 0000000000000000000000000000000000000000..2232f03954213667987133619f868f527e94d16e GIT binary patch literal 2033 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
-
- {if isset($U_SLIDESHOW_START) } - {'slideshow'|@translate} - {/if} - {if isset($U_METADATA) } - metadata - {/if} - {if isset($current.U_DOWNLOAD) } - {'download'|@translate} - {/if} - {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if} - {if isset($favorite) } - favorite - {/if} - {if !empty($U_SET_AS_REPRESENTATIVE) } - {'representative'|@translate} - {/if} - {if isset($U_ADMIN) } - {'edit'|@translate} - {/if} - {if isset($U_CADDIE) }{*caddie management BEGIN*} -{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} +
+{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*} -
- {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'} -
+ +  {'caddie'|@translate} + +{/if}{*caddie management END*} +
-{include file='picture_toolbar.tpl'} + {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'} +
{$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 @@ - - -  {'caddie'|@translate} - -{/if}{*caddie management END*} -
- - - - \ 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'} -{include file='picture_toolbar.tpl'} -
{$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; }