From e859fe07e4d8406ae95896b7fbd2d2951f4d4d5d Mon Sep 17 00:00:00 2001 From: rvelices Date: Sat, 11 Dec 2010 13:42:19 +0000 Subject: [PATCH] css sprites (still ongoing) git-svn-id: http://piwigo.org/svn/trunk@8076 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/themes/default/template/group_list.tpl | 6 ++-- .../template/include/datepicker.inc.tpl | 4 +-- themes/default/iconset.css | 33 +++++++++++------- themes/default/sprite.png | Bin 4574 -> 6128 bytes themes/default/template/about.tpl | 8 ++--- themes/default/template/comments.tpl | 14 ++++---- themes/default/template/identification.tpl | 26 ++++++++------ .../template/menubar_identification.tpl | 14 +++++--- themes/default/template/notification.tpl | 4 ++- themes/default/template/picture_toolbar.tpl | 31 ++++++++++++++++ themes/default/template/profile.tpl | 14 ++++---- themes/default/template/register.tpl | 14 ++++---- themes/default/template/search.tpl | 27 +++++++------- themes/default/template/tags.tpl | 32 +++++++++-------- 14 files changed, 145 insertions(+), 82 deletions(-) diff --git a/admin/themes/default/template/group_list.tpl b/admin/themes/default/template/group_list.tpl index ec222acf7..38122ae13 100644 --- a/admin/themes/default/template/group_list.tpl +++ b/admin/themes/default/template/group_list.tpl @@ -31,9 +31,11 @@ {'Permissions'|@translate} - + {'Delete'|@translate} - + {'Toggle \'default group\' property'|@translate} diff --git a/admin/themes/default/template/include/datepicker.inc.tpl b/admin/themes/default/template/include/datepicker.inc.tpl index 8470c8fa3..9ed13e3fe 100644 --- a/admin/themes/default/template/include/datepicker.inc.tpl +++ b/admin/themes/default/template/include/datepicker.inc.tpl @@ -3,10 +3,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} {html_head} diff --git a/themes/default/iconset.css b/themes/default/iconset.css index 1bcc7c810..bd9f3f9e6 100644 --- a/themes/default/iconset.css +++ b/themes/default/iconset.css @@ -1,6 +1,8 @@ .pwg-icon { - display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; - width: 26px; height: 26px; background-image: url(sprite.png); + display: block; /*IE6*/ + display: inline-block; /*IE6 does not get it*/ + text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; + width: 26px; height: 26px; background-image: url(sprite.png); } .pwg-button-text { display:none; } @@ -16,22 +18,24 @@ a.pwg-state-default, a.pwg-state-default:visited, a.pwg-state-default:hover { .pwg-button { display: inline-block; + vertical-align: middle; } .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-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-arrowstop-n {background-position: -104px -26px} +.pwg-icon-arrowstop-e {background-position: -130px -26px} +.pwg-icon-arrowstop-s {background-position: -156px -26px} +.pwg-icon-arrowstop-w {background-position: -182px -26px} .pwg-icon-caddie {background-position: 0 -78px} .pwg-icon-caddie-add {background-position: -26px -78px} @@ -41,18 +45,21 @@ 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-edit {background-position: -52px -104px} +.pwg-icon-register {background-position: -78px -104px} +.pwg-icon-lost-password {background-position: -104px -104px} .pwg-icon-slideshow {background-position: 0 -130px} .pwg-icon-play {background-position: -26px -130px} .pwg-icon-pause {background-position: -52px -130px} +.pwg-icon-stop {background-position: -78px -130px} +.pwg-icon-clock-plus {background-position: -104px -130px} +.pwg-icon-clock-minus {background-position: -130px -130px} +.pwg-icon-repeat-play {background-position: -156px -130px} +.pwg-icon-repeat-stop {background-position: -182px -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 diff --git a/themes/default/sprite.png b/themes/default/sprite.png index f29704b9813db303f8176d5022332028eb7a0a2d..dfeaaf74a9848841830ec50b4f230d0c04d5b854 100644 GIT binary patch delta 3446 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 delta 1880 zcmZ9NYgCfy7RPNG1yPG;@`6z*p|pYj48`z`Tb+05 zm70Z-&_5%udRRguE{AFMpUu~_pDw*~D{053cjIQW8KQ+jmPwX_b~>EUEAVIQU+>iK zFZ^;0D$>*b44x={UhsH=+@FD3OB1~Wk(FEgouC0&T(lze*5>Re5cM!~ZaI}>3Eu7s77mXR zS^oku-05%qqrhvT{D}oIRlE1A!G!}uF4K5Wb2s5tK!)3!K?EK%e;2{`?LcPr=$+ZG z4b(w$Nb9Y{pOQ0@i=q&w0G*=Y7UuqS<#AUrsNpY`C`Ax(T?shPe6crZ6E~AYSr^cWk7MK<}Xt0D=&V-N~mbdU_ngs81r<+xe-PNQ(OZ! zIo}Tq7Sh4OGvqLcPzZ9J^C^RX1j`6ga4rNvpCf#G>C=fvoA+qdb?OLQM19)RPQL=U zB1wA+iI4tl4ho{y&z!I?Wq11(#49n`;TVh3`i<^Uxx-n&3%QE~Uje{v(S*hR@f-JW zdI(iADW6_D@1D0VQ0FSHqc-I{=*{&-+pm;3vDU_V8{+~p8)r~iKLKUG_IK^eFZRD# zccP!Fy$bZ7sgnXksqaHvEcXW|(1G>1do};Gtg24Z5l@k<+4Q~=XRO_rRGna*(^2~Z zSt4tCa&E@6)>#X)<+}lZAdjyNK!TMaD{5qC4uYoO-Xlnpn5*0IE#AP`9j=`)1)r>U z+a{}B$83Ot!&syK7!(3uAz2QE=sp0qi)5R}7+Ggx;H#f13E`l>xjeV_)>?0a!B+i%>ae#_-@TY6HnjGHJv0xx z@AkzR75fVeW=wXdO<*r16k-h39*?}p`?0TZq_$|?;b<+R)gFX~X7hi-IA)vuQ2 z@067QvxHc)%sEW^2F5;7&9fI@Y-?wAs=lI({g77H{qNU@sfBX}LF)3;6J|rx2droSnUuQu|jpB2% zq^>iBJsuJE@}8JexeDYyjuM<|t}4BkVogt&`Pq{fE!>rQcX2aO{^=y&sxjU zh%Y6C{nb4xbc?Vp3fGa9y?9(`RhrkYQlYz&1~CL)0LEBA!rp3HAD0y}W3AF%YAXiu z{3q1xowM(QY?^%8bdo2<)m?fPB{&j?Sz=3Eo-<{MZt!%s0ah9Gy95HeKl7Qp_WF51 z(t^@alY56PzYrL3)5N=QvWtfs|CpddiDAJ_8>0uZ=E)F5jqcLU2MPe{WPZ1`zh2C% zEFJekZ;5T_-9>VClui46;MYd3F0^Ku@9M7GP`tZ}V43nl`}OwRG2_7_VuRZ!yw6&t zBUMy_Vc&>~q~FoSeG+{;J(M$5c!6d>g^Az5@oRV+Y!W@H4lwrNlBV4J2Xgb<5GPuMt)aVp{U6ltW@!sa zW$}}pB<)_UIJsmmTh0f!q;Eii(DCo3jurhB=Ci(|kBBz?+JpbW;UfK}D=%->C}DwL zY+SHZMhUil`#?1zKT6dm%O_{AHH}^k*CIv_mXI<=DqP2B=l7M$V1cLTK1P=TplbF< zy(ThYXUY_dL|g$v%@zISSAf82zk``a<>bmu-f;K!Dw ptF=_Sw6pLPxR1sE-+#suWLIirL$xWyW42>yN24++s;`fn{~rs=b%6i? diff --git a/themes/default/template/about.tpl b/themes/default/template/about.tpl index 477bd323e..9e9515386 100644 --- a/themes/default/template/about.tpl +++ b/themes/default/template/about.tpl @@ -1,11 +1,9 @@

{'About'|@translate}

diff --git a/themes/default/template/comments.tpl b/themes/default/template/comments.tpl index 69afca2ee..56f3b8a86 100644 --- a/themes/default/template/comments.tpl +++ b/themes/default/template/comments.tpl @@ -1,11 +1,13 @@
-
-
    -
  • {'Home'|@translate}
    • -
-

{'User comments'|@translate}

-
+
+ +

{'User comments'|@translate}

+
diff --git a/themes/default/template/identification.tpl b/themes/default/template/identification.tpl index ca9bd04f7..3fcc24b50 100644 --- a/themes/default/template/identification.tpl +++ b/themes/default/template/identification.tpl @@ -1,11 +1,13 @@
-
-
    -
  • {'Home'|@translate}
    • -
-

{'Identification'|@translate}

-
+
+ +

{'Identification'|@translate}

+
{if isset($errors) }
@@ -53,10 +55,14 @@

- {if isset($U_REGISTER) } - {'Register'|@translate} {'Register'|@translate} - {/if} - {'Forgot your password?'|@translate} {'Forgot your password?'|@translate} +{if isset($U_REGISTER)} + +  {'Register'|@translate} + +{/if} + +  {'Forgot your password?'|@translate} +

diff --git a/themes/default/template/menubar_identification.tpl b/themes/default/template/menubar_identification.tpl index 6a6a596a1..7591e7f60 100644 --- a/themes/default/template/menubar_identification.tpl +++ b/themes/default/template/menubar_identification.tpl @@ -50,11 +50,15 @@
-
    -
  • {'Forgot your password?'|@translate}
    • - {if isset($U_REGISTER)} -
  • {'Register'|@translate}
    • - {/if} +
diff --git a/themes/default/template/notification.tpl b/themes/default/template/notification.tpl index 4fb1c70f4..ef2d99ced 100644 --- a/themes/default/template/notification.tpl +++ b/themes/default/template/notification.tpl @@ -6,7 +6,9 @@

{'Notification'|@translate}

diff --git a/themes/default/template/picture_toolbar.tpl b/themes/default/template/picture_toolbar.tpl index 23a7e0fed..e6f0d8edd 100644 --- a/themes/default/template/picture_toolbar.tpl +++ b/themes/default/template/picture_toolbar.tpl @@ -56,6 +56,37 @@ y.callService(
{if $DISPLAY_NAV_BUTTONS or isset($slideshow)} +{if isset($slideshow)} + {if isset($slideshow.U_INC_PERIOD)} + +  {'Accelerate diaporama speed'|@translate} + + {else} + +  {'Accelerate diaporama speed'|@translate} + + {/if} + {if isset($slideshow.U_DEC_PERIOD)} + +  {'Accelerate diaporama speed'|@translate} + + {else} + +  {'Accelerate diaporama speed'|@translate} + + {/if} +{/if} +{if isset($slideshow.U_START_REPEAT)} + +  {'Repeat the slideshow'|@translate} + +{/if} +{if isset($slideshow.U_STOP_REPEAT)} + +  {'Not repeat the slideshow'|@translate} + +{/if} + {if isset($first)}  {'First'|@translate} diff --git a/themes/default/template/profile.tpl b/themes/default/template/profile.tpl index 2bfcad3d1..3a401c599 100644 --- a/themes/default/template/profile.tpl +++ b/themes/default/template/profile.tpl @@ -10,12 +10,14 @@
{/if} -
- -

{'Profile'|@translate}

-
+
+ +

{'Profile'|@translate}

+
{$PROFILE_CONTENT}
diff --git a/themes/default/template/register.tpl b/themes/default/template/register.tpl index 4d97be09d..c7f6d446f 100644 --- a/themes/default/template/register.tpl +++ b/themes/default/template/register.tpl @@ -2,12 +2,14 @@
-
-
    -
  • {'Home'|@translate}
    • -
-

{'Registration'|@translate}

-
+
+ +

{'Registration'|@translate}

+
{if isset($errors)}
diff --git a/themes/default/template/search.tpl b/themes/default/template/search.tpl index cc958f7dd..e16e5e897 100644 --- a/themes/default/template/search.tpl +++ b/themes/default/template/search.tpl @@ -1,11 +1,10 @@ - {* Example of resizeable *} - +{* {include file='include/resize.inc.tpl'} - +*} {* Example of datepicker *} - +{* {include file='include/datepicker.inc.tpl'} {footer_script}{literal} @@ -13,18 +12,22 @@ pwg_initialization_datepicker("#end_day", "#end_month", "#end_year", "#end_linked_date", null, "#start_linked_date", null); jQuery().ready(function(){ $(".date_today").hide(); }); {/literal}{/footer_script} - +*}
-
- +

{'Search'|@translate}

+
{if isset($errors) }
diff --git a/themes/default/template/tags.tpl b/themes/default/template/tags.tpl index 4c226f80c..820e3ee69 100644 --- a/themes/default/template/tags.tpl +++ b/themes/default/template/tags.tpl @@ -1,19 +1,23 @@
-
-
    - {if $display_mode == 'letters'} -
  • {'cloud'|@translate}
    • - {/if} - - {if $display_mode == 'cloud'} -
  • {'letters'|@translate}
    • - {/if} - -
  • {'Home'|@translate}
    • -
-

{'Tags'|@translate}

-
+
+ +

{'Tags'|@translate}

+
{if isset($tags)} {if $display_mode == 'cloud'}