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 f29704b98..dfeaaf74a 100644 Binary files a/themes/default/sprite.png and b/themes/default/sprite.png differ 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'}