From 7626e48e0172ffcbdca9c14f27134b03e0e501fb Mon Sep 17 00:00:00 2001 From: rvelices Date: Sun, 12 Dec 2010 12:22:49 +0000 Subject: [PATCH] css sprites git-svn-id: http://piwigo.org/svn/trunk@8091 68402e56-0260-453c-a942-63ccdbb3a9ee --- themes/clear/theme.css | 5 +- themes/default/iconset.css | 37 ++---- themes/default/sprite.png | Bin 6128 -> 7034 bytes themes/default/template/about.tpl | 6 +- themes/default/template/index.tpl | 139 +++++++++++--------- themes/default/template/nbm.tpl | 14 +- themes/default/template/password.tpl | 14 +- themes/default/template/picture_toolbar.tpl | 2 +- themes/default/template/popuphelp.tpl | 14 +- themes/default/template/search_rules.tpl | 14 +- themes/default/template/upload.tpl | 15 ++- themes/default/theme.css | 1 - 12 files changed, 130 insertions(+), 131 deletions(-) diff --git a/themes/clear/theme.css b/themes/clear/theme.css index dc690e1d9..07e86ecda 100644 --- a/themes/clear/theme.css +++ b/themes/clear/theme.css @@ -50,8 +50,9 @@ UL.thumbnails SPAN.wrap2:hover, /* links */ A, INPUT.rateButton { - color: #005e89; - background: transparent; + color: #005e89; + background: transparent; + border-bottom: 1px dotted #005e89; } A:hover, INPUT.rateButton:hover { diff --git a/themes/default/iconset.css b/themes/default/iconset.css index bd9f3f9e6..5be7cbde4 100644 --- a/themes/default/iconset.css +++ b/themes/default/iconset.css @@ -6,13 +6,13 @@ } .pwg-button-text { display:none; } -a.pwg-state-default, a.pwg-state-default:visited, a.pwg-state-default:hover { +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)";! + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter: alpha(opacity=50); } @@ -23,10 +23,11 @@ a.pwg-state-default, a.pwg-state-default:visited, a.pwg-state-default:hover { .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-cloud {background-position: -130px 0} -.pwg-icon-letters {background-position: -156px 0} +.pwg-icon-save {background-position: -78px 0} +.pwg-icon-cloud {background-position: -104px 0} +.pwg-icon-letters {background-position: -130px 0} +.pwg-icon-calendar {background-position: -156px 0} +.pwg-icon-camera-calendar {background-position: -182px 0} .pwg-icon-arrow-n {background-position: 0 -26px} .pwg-icon-arrow-e {background-position: -26px -26px} @@ -37,6 +38,11 @@ a.pwg-state-default, a.pwg-state-default:visited, a.pwg-state-default:hover { .pwg-icon-arrowstop-s {background-position: -156px -26px} .pwg-icon-arrowstop-w {background-position: -182px -26px} +.pwg-icon-close {background-position: 0 -52px} +.pwg-icon-category-edit {background-position: -26px -52px} +.pwg-icon-category-view-normal {background-position: -156px -52px} +.pwg-icon-category-view-flat {background-position: -182px -52px} + .pwg-icon-caddie {background-position: 0 -78px} .pwg-icon-caddie-add {background-position: -26px -78px} .pwg-icon-caddie-del {background-position: -52px -78px} @@ -45,7 +51,7 @@ a.pwg-state-default, a.pwg-state-default:visited, a.pwg-state-default:hover { .pwg-icon-favorite-del {background-position: -130px -78px} .pwg-icon-camera-info {background-position: 0 -104px} -.pwg-icon-camera-representative {background-position: -26px -104px} +.pwg-icon-representative {background-position: -26px -104px} .pwg-icon-edit {background-position: -52px -104px} .pwg-icon-register {background-position: -78px -104px} .pwg-icon-lost-password {background-position: -104px -104px} @@ -59,23 +65,6 @@ 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-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; diff --git a/themes/default/sprite.png b/themes/default/sprite.png index dfeaaf74a9848841830ec50b4f230d0c04d5b854..df0627c42ede849a4b5c8f372ea24ded020df038 100644 GIT binary patch delta 4324 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 delta 3411 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 diff --git a/themes/default/template/about.tpl b/themes/default/template/about.tpl index 9e9515386..eca44dbed 100644 --- a/themes/default/template/about.tpl +++ b/themes/default/template/about.tpl @@ -1,9 +1,9 @@

{'About'|@translate}

diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index 37f577f84..8c68cfd8b 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -1,76 +1,85 @@ {$MENUBAR} {if !empty($PLUGIN_INDEX_CONTENT_BEFORE)}{$PLUGIN_INDEX_CONTENT_BEFORE}{/if}
-
-
    - {if !empty($image_orders) } -
  • - {'Sort order'|@translate}: - -
    • - {/if} +
    + - {if isset($U_CADDIE) } -
  • {'caddie'|@translate}
    • - {/if} +

    {$TITLE}

    - {if isset($U_EDIT) } -
  • {'edit'|@translate}
    • - {/if} +{if isset($chronology_views)} +
    {'View'|@translate}: + +
    +{/if} - {if isset($U_SEARCH_RULES) } - {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} -
  • (?)
    • - {/if} +{if isset($chronology.TITLE) } +

    {$chronology.TITLE}

    +{/if} - {if isset($U_SLIDESHOW) } -
  • {'slideshow'|@translate}
    • - {/if} - - {if isset($U_MODE_FLAT) } -
  • {'display all elements in all sub-albums'|@translate}
    • - {/if} - - {if isset($U_MODE_NORMAL) } -
  • {'return to normal view mode'|@translate}
    • - {/if} - - {if isset($U_MODE_POSTED) } -
  • {'display a calendar by posted date'|@translate}
    • - {/if} - - {if isset($U_MODE_CREATED) } -
  • {'display a calendar by creation date'|@translate}
    • - {/if} - - {if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if} -
- -

{$TITLE}

- - {if isset($chronology_views) } -
{'View'|@translate}: - -
- {/if} - - {if isset($chronology.TITLE) } -

{$chronology.TITLE}

- {/if} - -
+
{if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if} diff --git a/themes/default/template/nbm.tpl b/themes/default/template/nbm.tpl index 39574881e..5c40d2938 100644 --- a/themes/default/template/nbm.tpl +++ b/themes/default/template/nbm.tpl @@ -1,11 +1,13 @@
-
-
    -
  • {'Home'|@translate}
    • -
-

{'Notification'|@translate}

-
+
+ +

{'Notification'|@translate}

+
{if not empty($errors)}
diff --git a/themes/default/template/password.tpl b/themes/default/template/password.tpl index 413286e29..def94dff8 100644 --- a/themes/default/template/password.tpl +++ b/themes/default/template/password.tpl @@ -1,11 +1,13 @@
-
-
    -
  • {'Home'|@translate}
    • -
-

{'Password forgotten'|@translate}

-
+
+ +

{'Password forgotten'|@translate}

+
{if count($errors)}
diff --git a/themes/default/template/picture_toolbar.tpl b/themes/default/template/picture_toolbar.tpl index e6f0d8edd..7ea2e80c5 100644 --- a/themes/default/template/picture_toolbar.tpl +++ b/themes/default/template/picture_toolbar.tpl @@ -17,7 +17,7 @@ {/if} {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if} {if isset($favorite)} - +  {'Favorites'|@translate} {/if} diff --git a/themes/default/template/popuphelp.tpl b/themes/default/template/popuphelp.tpl index 89cba8578..523ad4942 100644 --- a/themes/default/template/popuphelp.tpl +++ b/themes/default/template/popuphelp.tpl @@ -1,14 +1,12 @@
-
+
-

{$PAGE_TITLE}

-
+

{$PAGE_TITLE}

+
{$HELP_CONTENT} diff --git a/themes/default/template/search_rules.tpl b/themes/default/template/search_rules.tpl index adc1f9193..db334b859 100644 --- a/themes/default/template/search_rules.tpl +++ b/themes/default/template/search_rules.tpl @@ -1,14 +1,12 @@
-
+
-

{'Search rules'|@translate}

-
+

{'Search rules'|@translate}

+
{if isset($INTRODUCTION) }

{$INTRODUCTION}

diff --git a/themes/default/template/upload.tpl b/themes/default/template/upload.tpl index 6e6bdc42a..268ccbfa7 100644 --- a/themes/default/template/upload.tpl +++ b/themes/default/template/upload.tpl @@ -1,4 +1,3 @@ - {* Example of resizeable *} {* {include file='include/autosize.inc.tpl'} @@ -6,12 +5,14 @@
-
-
    -
  • {'Home'|@translate}
    • -
-

{'Upload a picture'|@translate}

-
+
+ +

{'Upload a picture'|@translate}

+
{if !empty($errors)}
diff --git a/themes/default/theme.css b/themes/default/theme.css index e0cf02373..ee84b150a 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -455,7 +455,6 @@ H2 { A { text-decoration:none; - border-bottom: 1px dotted #005e89; } A:hover { border-bottom: 1px solid #858460;