Changeset 12614 for branches

Timestamp:

Nov 12, 2011, 4:23:04 PM (12 years ago)

Author:

mistic100

Message:

merge r12613 form trunk: bug:2501 Tooltip mistranslated in the themes manager

Location:

branches/2.3

Files:

• admin/themes/default/template/footer.tpl (modified) (1 diff)
• admin/themes/default/template/languages_installed.tpl (modified) (2 diffs)
• admin/themes/default/template/themes_installed.tpl (modified) (2 diffs)
• plugins/LocalFilesEditor/main.inc.php (modified) (1 diff)

branches/2.3/admin/themes/default/template/footer.tpl

@@ -47 +47 @@
 {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,

branches/2.3/admin/themes/default/template/languages_installed.tpl

@@ -23 +23 @@
       {if $language_state == 'active'}
         {if $language.deactivable}
-      <a href="{$language.u_action}&amp;action=deactivate" title="{'Forbid this language to users'|@translate}">{'Deactivate'|@translate}</a>
+      <a href="{$language.u_action}&amp;action=deactivate" class="tiptip" title="{'Forbid this language to users'|@translate}">{'Deactivate'|@translate}</a>
         {else}
       <span title="{$language.deactivate_tooltip}">{'Deactivate'|@translate}</span>
@@ -29 +29 @@
 
         {if not $language.is_default}
-      | <a href="{$language.u_action}&amp;action=set_default" title="{'Set as default language for unregistered and new users'|@translate}">{'Default'|@translate}</a>
+      | <a href="{$language.u_action}&amp;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}&amp;action=activate" title="{'Make this language available to users'|@translate}">{'Activate'|@translate}</a>
-      | <a href="{$language.u_action}&amp;action=delete" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');" title="{'Delete this language'|@translate}">{'Delete'|@translate}</a>
+      <a href="{$language.u_action}&amp;action=activate" class="tiptip" title="{'Make this language available to users'|@translate}">{'Activate'|@translate}</a>
+      | <a href="{$language.u_action}&amp;action=delete" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');" class="tiptip" title="{'Delete this language'|@translate}">{'Delete'|@translate}</a>
       {/if}
       </div>

branches/2.3/admin/themes/default/template/themes_installed.tpl

@@ -23 +23 @@
       <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>
@@ -29 +29 @@
       
 {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>

branches/2.3/plugins/LocalFilesEditor/main.inc.php

@@ -59 +59 @@
   $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&amp;theme={$theme.id}">CSS</a>
 {else}