2 files changed, 39 insertions, 27 deletions

diff --git a/admin/themes/default/template/footer.tpl b/admin/themes/default/template/footer.tpl
index f1c3694a8..f287bab0e 100644
--- a/admin/themes/default/template/footer.tpl
+++ b/admin/themes/default/template/footer.tpl
@@ -45,7 +45,7 @@
 {literal}
 <script type='text/javascript'>
   $(function() {
-    $('#pwgHead A, #footer A, .themeActions A, .themeActions SPAN').tipTip({
+    $('#pwgHead A, #footer A, .themeActions A, .themeActions SPAN, .languageActions A, .languageActions SPAN').tipTip({
         '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 493d1edda..381e87e8e 100644
--- a/admin/themes/default/template/languages_installed.tpl
+++ b/admin/themes/default/template/languages_installed.tpl
@@ -2,33 +2,45 @@
   <h2>{'Installed Languages'|@translate}</h2>
 </div>
 
-<table class="table2 languages">
-<thead>
-  <tr class="throw">
-    <td>{'Language'|@translate}</td>
-    <td>{'Actions'|@translate}</td>
-  </tr>
-</thead>
+{foreach from=$language_states item=language_state}
+<fieldset>
+  <legend>
+  {if $language_state == 'active'}
+  {'Active Languages'|@translate}
 
-{foreach from=$languages item=language name=languages_loop}
-  <tr class="{if $smarty.foreach.languages_loop.index is odd}row1{else}row2{/if}">
-    <td class="{$language.STATE}">
-      {$language.NAME}
-      {if $language.IS_DEFAULT}<i>({'Default'|@translate})</i>{/if}
-    </td>
-    <td style="text-align: center;">
-    {if !$language.IS_DEFAULT}
-      {if $language.STATE == 'active' or $language.STATE == 'missing'}
-        <a href="{$language.U_ACTION}&amp;action=deactivate">{'Deactivate'|@translate}</a> |
-        <a href="{$language.U_ACTION}&amp;action=set_default">{'Default'|@translate}</a>
-      {else}
-        <a href="{$language.U_ACTION}&amp;action=activate">{'Activate'|@translate}</a> |
-        <a href="{$language.U_ACTION}&amp;action=delete" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Delete'|@translate}</a>
+  {elseif $language_state == 'inactive'}
+  {'Inactive Languages'|@translate}
+
+  {/if}
+  </legend>
+  <div class="languageBoxes">
+  {foreach from=$languages item=language}
+    {if $language.state == $language_state}
+  <div class="languageBox{if $language.is_default} languageDefault{/if}">
+    <div class="languageName">{$language.name}{if $language.is_default} <em>({'default'|@translate})</em>{/if}</div>
+    <div class="languageActions">
+      <div>
+      {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>
+        {else}
+      <span title="{$language.deactivate_tooltip}">{'Deactivate'|@translate}</span>
+        {/if}
+
+        {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>
+        {/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>
       {/if}
-    {else}
-      ---
+      </div>
+    </div> <!-- languageActions -->
+  </div> <!-- languageBox -->
     {/if}
-    </td>
-  </tr>
+  {/foreach}
+  </div> <!-- languageBoxes -->
+</fieldset>
 {/foreach}
-</table>
\ No newline at end of file