Changeset 26948 for extensions/UserAdvManager/branches/2.6/admin/template/usermanager.tpl

Timestamp:

Jan 24, 2014, 6:36:41 PM (10 years ago)

Author:

Eric

Message:

merge r26094, r26292, r26686, r26706, r26861, r26862, r26914, r26933, r26934 and r26947 from trunk to branch 2.6

Dev:

• Replace word "categorie" by "album" in en_UK and fr_FR translation files
• Fix html5 validation errors
• Piwigo 2.6 compliance: Improve confirmation email sending - More accurate when users or admins are set to confirm registrations
• Piwigo 2.6 compliance: Update tablesorter jquery plugin for compliance with jquery v1.10
• Improve confirmation and information email sending workflow
• HTML5 recommandation improvement - Tablesorter and tablepager jquery plugin customization (step 1)

Translations:
Update pt_BR, thanks to : flaviove
Update pt_PT, thanks to : Bridges
Add sk_SK, thanks to : JoeKundlak
Update sk_SK, thanks to : JoeKundlak

File:

• extensions/UserAdvManager/branches/2.6/admin/template/usermanager.tpl (modified) (7 diffs)

extensions/UserAdvManager/branches/2.6/admin/template/usermanager.tpl

@@ -2 +2 @@
 {combine_script id='jquery.cluetip' require='jquery' path='themes/default/js/plugins/jquery.cluetip.js'}
 {combine_script id='jquery.tablesorter' require='jquery' path=$UAM_PATH|@cat:'admin/template/js/jquery.tablesorter.min.js'}
-{combine_script id='jquery.tablesorter.pager' require='jquery' path=$UAM_PATH|@cat:'admin/template/js/jquery.tablesorter.pager.js'}
+{combine_script id='jquery.tablesorter.pager' require='jquery' path=$UAM_PATH|@cat:'admin/template/js/jquery.tablesorter.pager.min.js'}
 
 {combine_css path= $UAM_PATH|@cat:'admin/template/uam.css'}
@@ -16 +16 @@
 {rdelim});
 
-$(document).ready(function() 
+$(document).ready(function()
     {ldelim}
       $("#sorting")
-      .tablesorter({ldelim}sortList:[[6,1]], headers: {ldelim} 0: {ldelim} sorter: false {rdelim}{rdelim}{rdelim})
-      .tablesorterPager({ldelim}container: $("#pager"), positionFixed: false, size: 20, totalPages: 0{rdelim});
+      .tablesorter({ldelim}sortList:[[6,0]], headers: {ldelim} 0: {ldelim} sorter: false {rdelim},2: {ldelim} sorter: false {rdelim}{rdelim}{rdelim})
+      .tablesorterPager({ldelim}container: $("#pager"), page: 0, size: 20, output: '{ldelim}page{rdelim} / {ldelim}totalPages{rdelim}',{rdelim});
     {rdelim} 
 );
@@ -29 +29 @@
 </div>
 
-<form method="post" action="" class="general">
+<form method="post" class="general">
+    {if count($users) > 0}
   <fieldset>
         <legend class="cluetip" title="{'UAM_Tracking confirmations'|translate}|{'UAM_usermanTitle_d'|translate}">{'UAM_Tracking confirmations'|@translate}</legend>
-    {if count($users) > 0}
-      <table id="sorting" class="table2" width="97%" summary="">
+      <table id="sorting" class="table2">
                   <thead>
                         <tr class="throw">
-                        <th>&nbsp;</td>
+                        <th>&nbsp;</th>
                         <th>{'Username'|@translate}&nbsp;&nbsp;</th>
             <th>{'Profile'|@translate}&nbsp;&nbsp;</th>
@@ -53 +53 @@
             <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}"/></td>
             <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td>
-            <td style="text-align:center;"><a href="./admin.php?page=profile&amp;user_id={$user.ID}" title="{'Profile'|@translate}" onclick="window.open(this.href); return false;"><img src="{$UAM_PATH}admin/template/icon/edit_s.png"/></a></td>
+            <td style="text-align:center;"><a href="./admin.php?page=profile&amp;user_id={$user.ID}" title="{'Profile'|@translate}" onclick="window.open(this.href); return false;"><img src="{$UAM_PATH}admin/template/icon/edit_s.png" alt=""/></a></td>
             <td>{$user.STATUS}</td>
             <td>{$user.EMAIL}</td>
@@ -70 +70 @@
       {if !empty($users)}
         <div id="pager" class="pager">
-          <form>
-            <img src="{$UAM_PATH}admin/template/icon/first.png" class="first"/>
-            <img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev"/>
+            <img src="{$UAM_PATH}admin/template/icon/first.png" class="first" alt=""/>
+            <img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev" alt=""/>
             <input type="text" class="pagedisplay"/>
-            <img src="{$UAM_PATH}admin/template/icon/next.png" class="next"/>
-            <img src="{$UAM_PATH}admin/template/icon/last.png" class="last"/>
-            <select class="pagesize">
+            <img src="{$UAM_PATH}admin/template/icon/next.png" class="next" alt=""/>
+            <img src="{$UAM_PATH}admin/template/icon/last.png" class="last" alt=""/>
+            <select class="pagesize" title="{'UAM_Select page size'|@translate}">
               <option  value="10">10</option>
               <option selected="selected" value="20">20</option>
@@ -82 +81 @@
               <option value="40">40</option>
             </select>
-          </form>
+            <select class="gotoPage" title="{'UAM_Select page number'|@translate}"></select>
         </div>
       {/if}
@@ -107 +106 @@
   </fieldset>
     {else}
+  <fieldset>
+        <legend class="cluetip" title="{'UAM_Tracking confirmations'|translate}|{'UAM_usermanTitle_d'|translate}">{'UAM_Tracking confirmations'|@translate}</legend>
       <div>
         {'UAM_No_Usermanager'|@translate}
                   </div>
+  </fieldset>
     {/if}
 </form>