diff options
author | mistic100 <mistic@piwigo.org> | 2011-11-12 15:23:04 +0000 |
---|---|---|
committer | mistic100 <mistic@piwigo.org> | 2011-11-12 15:23:04 +0000 |
commit | 3da0ed058803000260660da3acbcc98989cf3c82 (patch) | |
tree | 704d5436f964301a023439bc8770ea2082c879fa | |
parent | aeddc4f9938d250907da2e8a432b9ae97f78b421 (diff) |
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
-rw-r--r-- | admin/themes/default/template/footer.tpl | 2 | ||||
-rw-r--r-- | admin/themes/default/template/languages_installed.tpl | 8 | ||||
-rw-r--r-- | admin/themes/default/template/themes_installed.tpl | 6 | ||||
-rw-r--r-- | plugins/LocalFilesEditor/main.inc.php | 2 |
4 files changed, 9 insertions, 9 deletions
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 @@ <div> {if $language_state == 'active'} {if $language.deactivable} - <a href="{$language.u_action}&action=deactivate" title="{'Forbid this language to users'|@translate}">{'Deactivate'|@translate}</a> + <a href="{$language.u_action}&action=deactivate" class="tiptip" title="{'Forbid this language to users'|@translate}">{'Deactivate'|@translate}</a> {else} <span title="{$language.deactivate_tooltip}">{'Deactivate'|@translate}</span> {/if} {if not $language.is_default} - | <a href="{$language.u_action}&action=set_default" title="{'Set as default language for unregistered and new users'|@translate}">{'Default'|@translate}</a> + | <a href="{$language.u_action}&action=set_default" class="tiptip" title="{'Set as default language for unregistered and new users'|@translate}">{'Default'|@translate}</a> {/if} {/if} {if $language_state == 'inactive'} - <a href="{$language.u_action}&action=activate" title="{'Make this language available to users'|@translate}">{'Activate'|@translate}</a> - | <a href="{$language.u_action}&action=delete" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');" title="{'Delete this language'|@translate}">{'Delete'|@translate}</a> + <a href="{$language.u_action}&action=activate" class="tiptip" title="{'Make this language available to users'|@translate}">{'Activate'|@translate}</a> + | <a href="{$language.u_action}&action=delete" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');" class="tiptip" title="{'Delete this language'|@translate}">{'Delete'|@translate}</a> {/if} </div> </div> <!-- languageActions --> 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() { <div class="themeActions"> <div> {if $theme.deactivable} - <a href="{$deactivate_baseurl}{$theme.id}" title="{'Forbid this theme to users'|@translate}">{'Deactivate'|@translate}</a> + <a href="{$deactivate_baseurl}{$theme.id}" class="tiptip" title="{'Forbid this theme to users'|@translate}">{'Deactivate'|@translate}</a> {else} <span title="{$theme.deactivate_tooltip}">{'Deactivate'|@translate}</span> {/if} {if not $theme.is_default} - | <a href="{$set_default_baseurl}{$theme.id}" title="{'Set as default theme for unregistered and new users'|@translate}">{'Default'|@translate}</a> + | <a href="{$set_default_baseurl}{$theme.id}" class="tiptip" title="{'Set as default theme for unregistered and new users'|@translate}">{'Default'|@translate}</a> {/if} {if isset($theme.admin_uri)} - <br><a href="{$theme.admin_uri}" title="{'Configuration'|@translate}">{'Configuration'|@translate}</a> + <br><a href="{$theme.admin_uri}" class="tiptip" title="{'Configuration'|@translate}">{'Configuration'|@translate}</a> {/if} </div> </div> <!-- themeActions --> diff --git a/plugins/LocalFilesEditor/main.inc.php b/plugins/LocalFilesEditor/main.inc.php index cc468ce41..9e8402bec 100644 --- a/plugins/LocalFilesEditor/main.inc.php +++ b/plugins/LocalFilesEditor/main.inc.php @@ -58,7 +58,7 @@ function localfiles_css_link_prefilter($content, &$smarty) $search = '#{if isset\(\$theme.admin_uri\)}.*?{/if}#s'; $replacement = ' {if isset($theme.admin_uri)} - <br><a href="{$theme.admin_uri}" title="{\'Configuration\'|@translate}">{\'Configuration\'|@translate}</a> + <br><a href="{$theme.admin_uri}" class="tiptip" title="{\'Configuration\'|@translate}">{\'Configuration\'|@translate}</a> | <a href="admin.php?page=plugin-LocalFilesEditor-css&theme={$theme.id}">CSS</a> {else} <br><a href="admin.php?page=plugin-LocalFilesEditor-css&theme={$theme.id}">CSS</a> |