From 3da0ed058803000260660da3acbcc98989cf3c82 Mon Sep 17 00:00:00 2001 From: mistic100 Date: Sat, 12 Nov 2011 15:23:04 +0000 Subject: merge r12613 form trunk: bug:2501 Tooltip mistranslated in the themes manager git-svn-id: http://piwigo.org/svn/branches/2.3@12614 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/themes/default/template/footer.tpl | 2 +- admin/themes/default/template/languages_installed.tpl | 8 ++++---- admin/themes/default/template/themes_installed.tpl | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'admin/themes') diff --git a/admin/themes/default/template/footer.tpl b/admin/themes/default/template/footer.tpl index 79b9f6947..2704ef5c1 100644 --- a/admin/themes/default/template/footer.tpl +++ b/admin/themes/default/template/footer.tpl @@ -46,7 +46,7 @@ {combine_script id='jquery.tipTip' load='async' path='themes/default/js/plugins/jquery.tipTip.minified.js'} {footer_script require='jquery.tipTip'} jQuery(document).ready(function() {ldelim} - jQuery('#pwgHead A[title], #footer A[title], .themeActions A, .themeActions SPAN, .languageActions A, .languageActions SPAN').tipTip({ldelim} + jQuery('#pwgHead A[title], #footer A[title], .themeActions .tiptip, .languageActions .tiptip').tipTip({ldelim} 'delay' : 0, 'fadeIn' : 200, 'fadeOut' : 200 diff --git a/admin/themes/default/template/languages_installed.tpl b/admin/themes/default/template/languages_installed.tpl index 381e87e8e..192cfcc61 100644 --- a/admin/themes/default/template/languages_installed.tpl +++ b/admin/themes/default/template/languages_installed.tpl @@ -22,19 +22,19 @@
{if $language_state == 'active'} {if $language.deactivable} - {'Deactivate'|@translate} + {'Deactivate'|@translate} {else} {'Deactivate'|@translate} {/if} {if not $language.is_default} - | {'Default'|@translate} + | {'Default'|@translate} {/if} {/if} {if $language_state == 'inactive'} - {'Activate'|@translate} - | {'Delete'|@translate} + {'Activate'|@translate} + | {'Delete'|@translate} {/if}
diff --git a/admin/themes/default/template/themes_installed.tpl b/admin/themes/default/template/themes_installed.tpl index 70b00bcb8..f591e14f1 100644 --- a/admin/themes/default/template/themes_installed.tpl +++ b/admin/themes/default/template/themes_installed.tpl @@ -22,16 +22,16 @@ jQuery(document).ready(function() {
{if $theme.deactivable} - {'Deactivate'|@translate} + {'Deactivate'|@translate} {else} {'Deactivate'|@translate} {/if} {if not $theme.is_default} - | {'Default'|@translate} + | {'Default'|@translate} {/if} {if isset($theme.admin_uri)} -
{'Configuration'|@translate} +
{'Configuration'|@translate} {/if}
-- cgit v1.2.3