Changeset 26948 for extensions/UserAdvManager

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

Location:

extensions/UserAdvManager/branches/2.6

Files:

• admin/UAM_admin.php (modified) (1 diff)
• admin/template/ghosttracker.tpl (modified) (8 diffs)
• admin/template/global.tpl (modified) (37 diffs)
• admin/template/js/jquery-latest.js (deleted)
• admin/template/js/jquery.metadata.js (modified) (5 diffs)
• admin/template/js/jquery.tablesorter.js (modified) (1 diff)
• admin/template/js/jquery.tablesorter.min.js (modified) (1 diff)
• admin/template/js/jquery.tablesorter.pager.js (modified) (1 diff)
• admin/template/js/jquery.tablesorter.pager.min.js (added)
• admin/template/uam.css (modified) (5 diffs)
• admin/template/userlist.tpl (modified) (6 diffs)
• admin/template/usermanager.tpl (modified) (7 diffs)
• include/functions.inc.php (modified) (15 diffs)
• language/en_UK/plugin.lang.php (modified) (5 diffs)
• language/fr_FR/plugin.lang.php (modified) (6 diffs)
• language/pt_BR/help.lang.php (modified) (1 diff)
• language/pt_PT/description.txt (modified) (1 diff)
• language/pt_PT/help.lang.php (modified) (1 diff)
• language/sk_SK (added)
• language/sk_SK/index.php (added)
• language/sk_SK/plugin.lang.php (added)
• obsolete.list (added)

extensions/UserAdvManager/branches/2.6/admin/UAM_admin.php

@@ -169 +169 @@
     $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
     
-    if (((isset($conf_UAM['1']) and ($conf_UAM['1'] == 'false' or $conf_UAM['1'] == 'local')) or ($_POST['UAM_Confirm_Mail'] == 'false' or $_POST['UAM_Confirm_Mail'] == 'local')) and $_POST['UAM_GTAutoMail'] == 'true')
+    if (((isset($conf_UAM['CONFIRM_MAIL']) and ($conf_UAM['CONFIRM_MAIL'] == 'false' or $conf_UAM['CONFIRM_MAIL'] == 'local')) or ($_POST['UAM_Confirm_Mail'] == 'false' or $_POST['UAM_Confirm_Mail'] == 'local')) and $_POST['UAM_GTAutoMail'] == 'true')
     {
       $newvalue = 'false';

extensions/UserAdvManager/branches/2.6/admin/template/ghosttracker.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'}
@@ -19 +19 @@
     {ldelim}
       $("#sorting")
-      .tablesorter({ldelim}sortList:[[4,1]], headers: {ldelim} 0: {ldelim} sorter: false {rdelim}{rdelim}{rdelim})
-      .tablesorterPager({ldelim}container: $("#pager"), positionFixed: false, size: 20, totalPages: 0{rdelim});
+      .tablesorter({ldelim}sortList:[[4,1]], 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});
 </script>
@@ -28 +28 @@
 </div>
 
-<form method="post" action="" class="general">
+<form method="post" class="general">
   <fieldset>
         <legend>{'UAM_GT_Init'|@translate}</legend>
@@ -39 +39 @@
   </fieldset>
   
+    {if count($users) > 0}
   <fieldset>
     <legend class="cluetip" title="{'UAM_GhostTracker_Title'|translate}|{'UAM_gtTitle_d'|translate}">{'UAM_GhostTracker_Title'|@translate}</legend>
-    {if count($users) > 0}
-      <table id="sorting" class="table2" width="97%" summary="">
+      <table id="sorting" class="table2">
         <thead>
           <tr class="throw">
@@ -58 +58 @@
               <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.EMAIL}</td>
             {if $user.REMINDER == l10n('UAM_Reminder_Sent_NOK')}
@@ -75 +75 @@
       </table>
       <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>
@@ -87 +86 @@
           <option value="40">40</option>
         </select>
-      </form>
+        <select class="gotoPage" title="{'UAM_Select page number'|@translate}"></select>
       </div>
       <br/>
@@ -104 +103 @@
   </fieldset>
     {else}
+  <fieldset>
+    <legend class="cluetip" title="{'UAM_GhostTracker_Title'|translate}|{'UAM_gtTitle_d'|translate}">{'UAM_GhostTracker_Title'|@translate}</legend>
                   <div>
                          {'UAM_No_Ghosts'|@translate}
                   </div>
+  </fieldset>
                 {/if}
 </form>

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

@@ -151 +151 @@
 </div>
 
-<form method="post" action="" class="general">
+<form method="post" class="general">
 
   <p>
@@ -181 +181 @@
             <label for="UAM_Username_Char_true"><input id="UAM_Username_Char_true" type="radio" value="true" {$UAM_USERNAME_CHAR_TRUE} name="UAM_Username_Char"/>
               {'UAM_Username_Char_true'|@translate}
+            </label>
             <div class="uam_leftmargin">
               <input type="text" name="UAM_Username_List" value="{$UAM_USERNAME_CHAR_LIST}" size="20" style="text-align: center;"/>
             </div>
-            </label>
           </li>
 
@@ -297 +297 @@
               &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_AdminValidationMail_Subject" id="UAM_AdminValidationMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_ADMINVALIDATIONMAIL_SUBJECT}</textarea>
             </li>
+            <li style="list-style-type: none;">
             <ul>
               <li>
@@ -305 +306 @@
               </li>
             </ul>
+            </li>
           </ul>
           <ul>
@@ -313 +315 @@
               &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_ConfirmMail_Subject" id="UAM_ConfirmMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_SUBJECT}</textarea>
             </li>
+            <li style="list-style-type: none;">
             <ul>
               <li>
@@ -325 +328 @@
               </li>
             </ul>
+            </li>
 <!--
             {* if 'FCK_PATH'|@defined *}
@@ -332 +336 @@
             {* /if *}
 -->
+          <li style="list-style-type: none;">
           <br/><hr/><br/>
+          </li>
             <li>
               <label class="cluetip" title="{'UAM_confirmmail_custom_Txt1'|translate}|{'UAM_confirmmail_custom1_d'|translate}">
@@ -340 +346 @@
             </li>
             {if 'FCK_PATH'|@defined}
+            <li style="list-style-type: none;">
               <div style="text-align:right;">
                 <a href="#" onClick="toogleEditor('UAM_ConfirmMail_Custom_Txt1'); return false;">FCK Editor On/Off</a>
               </div>
+            </li>
             {/if}
             <li>
@@ -351 +359 @@
             </li>
             {if 'FCK_PATH'|@defined}
+            <li style="list-style-type: none;">
               <div style="text-align:right;">
                 <a href="#" onClick="toogleEditor('UAM_ConfirmMail_Custom_Txt2'); return false;">FCK Editor On/Off</a>
               </div>
+            </li>
             {/if}
           </ul>
@@ -377 +387 @@
                 <textarea class="uam_textfields" name="UAM_CustomRejectConnexion_Text" id="UAM_CustomRejectConnexion_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_REJECTCONNECT_TEXT}</textarea>
             {if 'FCK_PATH'|@defined}
+            <li style="list-style-type: none;">
               <div style="text-align:right;">
                 <a href="#" onClick="toogleEditor('UAM_CustomRejectConnexion_Text'); return false;">FCK Editor On/Off</a>
               </div>
+            </li>
             {/if}
               </li>
@@ -388 +400 @@
           <fieldset id="UAM_Change" style="display: none">
           <ul>
+          <li style="list-style-type: none;">
             <div id="uam_notice">{'UAM_Confirm_grpstat_notice'|@translate}</div>
+          </li>
+              <li style="list-style-type: none;">
               <br/>
+              </li>
               <li>
                 <label class="cluetip" title="{'UAM_confirmgrpTitle'|translate}|{'UAM_confirmgrpTitle_d'|translate}">
@@ -395 +411 @@
                 </label>
               </li>
+              <li style="list-style-type: none;">
               <ul>
                 <li>
@@ -413 +430 @@
                 </li>
               </ul>
+              </li>
               <li>
                 <label class="cluetip" title="{'UAM_confirmstatTitle'|translate}|{'UAM_confirmstatTitle_d'|translate}">
@@ -418 +436 @@
                 </label>
               </li>
+              <li style="list-style-type: none;">
               <ul>
                 <li>
@@ -436 +455 @@
                 </li>
               </ul>
+              </li>
               <li>
                 <label class="cluetip" title="{'UAM_confirmlevelTitle'|translate}|{'UAM_confirmlevelTitle_d'|translate}">
@@ -441 +461 @@
                 </label>
               </li>
+              <li style="list-style-type: none;">
               <ul>
                 <li>
@@ -459 +480 @@
                 </li>
               </ul>
+              </li>
             </ul>
             </fieldset>
@@ -467 +489 @@
                   {'UAM_ValidationLimit_Info'|@translate}
                 </label>
-                <label for="UAM_ConfirmMail_TimeOut_false" ><input id="UAM_ConfirmMail_TimeOut_false" type="radio" value="false" {$UAM_CONFIRMMAIL_TIMEOUT_FALSE} name="UAM_ConfirmMail_TimeOut"/>
+                <label for="UAM_ConfirmMail_TimeOut_false" >
+                  <input id="UAM_ConfirmMail_TimeOut_false" type="radio" value="false" {$UAM_CONFIRMMAIL_TIMEOUT_FALSE} name="UAM_ConfirmMail_TimeOut"/>
                   {'UAM_Disable'|@translate}
                 </label>
-                <label for="UAM_ConfirmMail_TimeOut_true" ><input id="UAM_ConfirmMail_TimeOut_true" type="radio" value="true" {$UAM_CONFIRMMAIL_TIMEOUT_TRUE} name="UAM_ConfirmMail_TimeOut"/>
+                <label for="UAM_ConfirmMail_TimeOut_true" >
+                  <input id="UAM_ConfirmMail_TimeOut_true" type="radio" value="true" {$UAM_CONFIRMMAIL_TIMEOUT_TRUE} name="UAM_ConfirmMail_TimeOut"/>
                   {'UAM_ConfirmMail_TimeOut_true'|@translate}
-                <input type="text" name="UAM_ConfirmMail_Delay" value="{$UAM_CONFIRMMAIL_DELAY}" size="5" style="text-align: center;"/>
-                </label>
+                </label>
+                  <input type="text" name="UAM_ConfirmMail_Delay" value="{$UAM_CONFIRMMAIL_DELAY}" size="5" style="text-align: center;"/>
               </li>
               <li>
@@ -486 +510 @@
                 </label>
               </li>
-            <a id="show_UAM_ConfirmMail" >{'UAM_Customize_messagesandmails'|translate}</a>
-            <a id="hide_UAM_ConfirmMail" style="display: none">{'hide details'|translate}</a>
+            <li style="list-style-type: none;">
+              <a id="show_UAM_ConfirmMail" >{'UAM_Customize_messagesandmails'|translate}</a>
+              <a id="hide_UAM_ConfirmMail" style="display: none">{'hide details'|translate}</a>
+            </li>
             <fieldset id="UAM_ConfirmMail" style="display: none">
               <ul>
@@ -550 +576 @@
                 {'UAM_Enable'|@translate}
               </label>
-            </li>
             <ul>
               <li>
@@ -575 +600 @@
               </li>
             </ul>
+            </li>
           </ul>
           </fieldset>
@@ -593 +619 @@
               {'UAM_GhostTracker'|@translate}
             </label>
-            <label for"UAM_GhostUser_Tracker_false">
+            <label for="UAM_GhostUser_Tracker_false">
               <input id="UAM_GhostUser_Tracker_false" type="radio" value="false" {$UAM_GHOSTRACKER_FALSE} name="UAM_GhostUser_Tracker"/>
               {'UAM_Disable'|@translate}
             </label>
-            <label for"UAM_GhostUser_Tracker_true">
+            <label for="UAM_GhostUser_Tracker_true">
               <input id="UAM_GhostUser_Tracker_true" type="radio" value="true" {$UAM_GHOSTRACKER_TRUE} name="UAM_GhostUser_Tracker"/>
               {'UAM_GhostTracker_true'|@translate}
+            </label>
             <input type="text" name="UAM_GhostTracker_DayLimit" value="{$UAM_GHOSTRACKER_DAYLIMIT}" size="5" style="text-align: center;"/>
-            </label>
           
           </li>
@@ -636 +662 @@
           </ul>
           </fieldset>
-          <br><hr><br>
+          <br/><hr/><br/>
           <ul>
             <li>
@@ -642 +668 @@
                 {'UAM_GTAuto'|@translate}
               </label>
-            
+
               <label for="UAM_GTAuto_false"><input id="UAM_GTAuto_false" type="radio" value="false" {$UAM_GTAUTO_FALSE} name="UAM_GTAuto"/>
                 {'UAM_Disable'|@translate}
               </label>
-              
+
               <label for="UAM_GTAuto_true"><input id="UAM_GTAuto_true" type="radio" value="true" {$UAM_GTAUTO_TRUE} name="UAM_GTAuto"/>
                 {'UAM_Enable'|@translate}
               </label>
-            
-            </li>
+
               <ul id="UAM_GTAUTO" {if $UAM_GTAUTO_FALSE}style="display: none"{/if}>
                 <li>
@@ -657 +682 @@
                     {'UAM_GTAutoDel'|@translate}
                   </label>
-                
+
                     <textarea class="uam_textfields" name="UAM_GTAutoDelText" id="UAM_GTAutoDelText" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_GTAUTODEL_TEXT}</textarea>
-                
-                    
+
                 {if 'FCK_PATH'|@defined}
                   <div style="text-align:right;">
@@ -667 +691 @@
                 {/if}
                 </li>
-  
+
                 <li>
                   <label class="cluetip" title="{'UAM_GTAutoGp'|translate}|{'UAM_GTAutoGpTitle_d'|translate}">
                     {'UAM_GTAutoGp'|@translate}
                   </label>
-                
+
                   <ul>
                     <li>
@@ -681 +705 @@
                           {html_options name="UAM_Downgrade_Group" options=$Downgrade_Group.group_options selected=$Downgrade_Group.group_selected}
                         </div>
-                    
                     </li>
   
@@ -691 +714 @@
                         {html_options name="UAM_Downgrade_Status" options=$Downgrade_Status.Status_options selected=$Downgrade_Status.Status_selected}
                       </div>
-                    
                     </li>
-  
+
                     <li>
                       <label>
@@ -701 +723 @@
                         {html_options name="UAM_Downgrade_Level" options=$Downgrade_Level.Level_options selected=$Downgrade_Level.Level_selected}
                       </div>
-                    
                     </li>
                   </ul>
-  
+
                   <ul>
                     <li>
@@ -717 +738 @@
                         {'UAM_Enable'|@translate}
                       </label>
-                    
+
                       <li>
                         <label class="cluetip" title="{'UAM_GTAutomail_Subject'|translate}|{'UAM_GTAutomail_Subject_d'|translate}">
                           {'UAM_GTAutomail_Subject'|@translate}
                         </label>
-                      
+
                         &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_GTAutoMail_Subject" id="UAM_GTAutoMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_GTAUTOMAIL_SUBJECT}</textarea>
-                      
                       </li>
-  
-                      <ul>
-                        <li>
-                          <label class="cluetip" title="{'UAM_GTAutomail_Text'|translate}|{'UAM_GTAutomail_Text_d'|translate}">
-                            {'UAM_GTAutomail_Text'|@translate}
-                          </label>
-                        
-                          <textarea class="uam_textfields" name="UAM_GTAutoMailText" id="UAM_GTAutoMailText" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_GTAUTOMAILTEXT}</textarea>
-                        
+                      <li style="list-style-type: none;">
+                        <ul>
+                          <li>
+                            <label class="cluetip" title="{'UAM_GTAutomail_Text'|translate}|{'UAM_GTAutomail_Text_d'|translate}">
+                              {'UAM_GTAutomail_Text'|@translate}
+                            </label>
+
+                            <textarea class="uam_textfields" name="UAM_GTAutoMailText" id="UAM_GTAutoMailText" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_GTAUTOMAILTEXT}</textarea>
                         </li>
                       </ul>
+                      </li>
                     </li>
                   </ul>
                 </li>
               </ul>
-            </ul>
+            </li>
           </ul>
         </div>
@@ -787 +807 @@
             
               &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_InfoMail_Subject" id="UAM_InfoMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_INFOMAIL_SUBJECT}</textarea>
-            
-            </li>
-
-            <ul>
-              <li>
-                <label class="cluetip" title="{'UAM_MailInfo_Text'|translate}|{'UAM_infotxtTitle_d'|translate}">
-                  {'UAM_MailInfo_Text'|@translate}
-                </label>
-              
-                <textarea class="uam_textfields" name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea>
-              
-              </li>
-            </ul>
+            </li>
+
+            <li style="list-style-type: none;">
+              <ul>
+                <li>
+                  <label class="cluetip" title="{'UAM_MailInfo_Text'|translate}|{'UAM_infotxtTitle_d'|translate}">
+                    {'UAM_MailInfo_Text'|@translate}
+                  </label>
+
+                  <textarea class="uam_textfields" name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea>
+                </li>
+              </ul>
+            </li>
 <!--
             {* if 'FCK_PATH'|@defined *}
@@ -811 +831 @@
 
         <ul>
-            <li>
-              <label class="cluetip" title="{'UAM_AddURL2Mail'|translate}|{'UAM_AddURL2Mail_d'|translate}">
-                {'UAM_AddURL2Mail'|@translate}
-              </label>
-              <label for="UAM_AddURL2Mail_false"><input id="UAM_AddURL2Mail_false" value="false" {$UAM_ADDURL2MAIL_FALSE} name="UAM_AddURL2Mail" type="radio"/>
-                {'UAM_Disable'|@translate}
-              </label>
-              <label for="UAM_AddURL2Mail_true"><input id="UAM_AddURL2Mail_true" value="true" {$UAM_ADDURL2MAIL_TRUE} name="UAM_AddURL2Mail" type="radio"/>
-                {'UAM_Enable'|@translate}
-              </label>
-            </li>
+          <li>
+            <label class="cluetip" title="{'UAM_AddURL2Mail'|translate}|{'UAM_AddURL2Mail_d'|translate}">
+              {'UAM_AddURL2Mail'|@translate}
+              </label>
+                <label for="UAM_AddURL2Mail_false"><input id="UAM_AddURL2Mail_false" value="false" {$UAM_ADDURL2MAIL_FALSE} name="UAM_AddURL2Mail" type="radio"/>
+                  {'UAM_Disable'|@translate}
+                </label>
+                <label for="UAM_AddURL2Mail_true"><input id="UAM_AddURL2Mail_true" value="true" {$UAM_ADDURL2MAIL_TRUE} name="UAM_AddURL2Mail" type="radio"/>
+                  {'UAM_Enable'|@translate}
+                </label>
+          </li>
           <li>
             <label class="cluetip" title="{'UAM_Tracking registered users'|translate}|{'UAM_Tracking registered users_d'|translate}">
               {'UAM_Tracking registered users'|@translate}
             </label>
-          
+
             <label for="UAM_Add_LastVisit_Column_false"><input id="UAM_Add_LastVisit_Column_false" value="false" {$UAM_ADDLASTVISIT_FALSE} name="UAM_Add_LastVisit_Column" type="radio"/>
               {'UAM_Disable'|@translate}
@@ -838 +858 @@
               {'UAM_RedirToProfile'|@translate}
             </label>
-          
+
             <label for="UAM_RedirToProfile_false"><input id="UAM_RedirToProfile_false" value="false" {$UAM_REDIRTOPROFILE_FALSE} name="UAM_RedirToProfile" type="radio"/>
               {'UAM_Disable'|@translate}
@@ -852 +872 @@
               {'UAM_CustomPasswRetr'|@translate}
             </label>
-          
+
             <label for="UAM_CustomPasswRetr_false"><input id="UAM_CustomPasswRetr_false" value="false" {$UAM_CUSTOMPASSWRETR_FALSE} name="UAM_CustomPasswRetr" type="radio"/>
               {'UAM_Disable'|@translate}
@@ -868 +888 @@
 
   <p>
-    <input class="submit" type="submit" value="{'UAM_submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} >&nbsp;<input class="submit" type="submit" value="{'UAM_audit'|@translate}" name="audit"/>
+    <input class="submit" type="submit" value="{'UAM_submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} />&nbsp;<input class="submit" type="submit" value="{'UAM_audit'|@translate}" name="audit"/>
   </p>
 </form>
 
 
-<div id="instructionTips" class="instructionBlock" >
+<div id="instructionBkp" class="instructionBlock" >
   <div id="Backup_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('Backup_header', 'Backup')">
     <span class="cluetip" title="{'UAM_DumpTxt'|translate}|{'UAM_DumpTitle_d'|translate}">{'UAM_DumpTxt'|@translate}</span>
   </div>
-  
+
   <div id="Backup" class="instructionBlockContent" style="display:none">
-<fieldset>
-<form method="post" action="" class="general">
-  <p>
-    {'UAM_Dump_Download'|@translate}&nbsp;
-      <input type="checkbox" name="dump_download" value="true" {$UAM_DUMP_DOWNLOAD}/>
-  
-      <input class="submit" type="submit" value="{'UAM_Save'|@translate}" name="save" {$TAG_INPUT_ENABLED}/>
-  </p>
-</form>
-</fieldset>
-<fieldset>
-<form method="post" action="" class="general">
-  <p>
-    {'UAM_Restore'|@translate}
-      <input class="submit" type="submit" value="{'UAM_Restore_File'|@translate}" name="restore" {$TAG_INPUT_ENABLED}/>
-  </p>
-</form>
-</fieldset>
+    <fieldset>
+      <form method="post" class="general">
+        <p>
+          {'UAM_Dump_Download'|@translate}&nbsp;
+          <input type="checkbox" name="dump_download" value="true" {$UAM_DUMP_DOWNLOAD}/>
+
+          <input class="submit" type="submit" value="{'UAM_Save'|@translate}" name="save" {$TAG_INPUT_ENABLED}/>
+        </p>
+      </form>
+    </fieldset>
+    <fieldset>
+      <form method="post" class="general">
+        <p>
+          {'UAM_Restore'|@translate}
+          <input class="submit" type="submit" value="{'UAM_Restore_File'|@translate}" name="restore" {$TAG_INPUT_ENABLED}/>
+        </p>
+      </form>
+    </fieldset>
   </div>
-
 </div>
 
@@ -906 +925 @@
     <span class="cluetip" title="{'UAM_Title4'|translate}|{'UAM_tipsTitle_d'|translate}">{'UAM_Title4'|@translate}</span>
   </div>
-  
+
   <div id="Tips" class="instructionBlockContent" style="display:none">
     <fieldset>
@@ -930 +949 @@
     </fieldset>
   </div>
-
 </div>
 

extensions/UserAdvManager/branches/2.6/admin/template/js/jquery.metadata.js

@@ -2 +2 @@
  * Metadata - jQuery plugin for parsing metadata from elements
  *
- * Copyright (c) 2006 John Resig, Yehuda Katz, J�örn Zaefferer, Paul McLanahan
+ * Copyright (c) 2006 John Resig, Yehuda Katz, Jörn Zaefferer, Paul McLanahan
  *
  * Dual licensed under the MIT and GPL licenses:
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
- *
- * Revision: $Id$
  *
  */
@@ -19 +17 @@
  *
  *   attr:  Inside an attribute. The name parameter indicates *which* attribute.
- *          
+ *
  *   class: Inside the class attribute, wrapped in curly braces: { }
- *   
+ *
  *   elem:  Inside a child element (e.g. a script tag). The
  *          name parameter indicates *which* element.
- *          
+ *
  * The metadata for an element is loaded the first time the element is accessed via jQuery.
  *
  * As a result, you can define the metadata type, use $(expr) to load the metadata into the elements
  * matched by expr, then redefine the metadata type and run another $(expr) for other elements.
- * 
+ *
  * @name $.metadata.setType
  *
@@ -36 +34 @@
  * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
  * @desc Reads metadata from the class attribute
- * 
+ *
  * @example <p id="one" class="some_class" data="{item_id: 1, item_label: 'Label'}">This is a p</p>
  * @before $.metadata.setType("attr", "data")
  * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
  * @desc Reads metadata from a "data" attribute
- * 
+ *
  * @example <p id="one" class="some_class"><script>{item_id: 1, item_label: 'Label'}</script>This is a p</p>
  * @before $.metadata.setType("elem", "script")
  * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
  * @desc Reads metadata from a nested script element
- * 
+ *
  * @param String type The encoding type
  * @param String name The name of the attribute to be used to get metadata (optional)
@@ -62 +60 @@
                         type: 'class',
                         name: 'metadata',
-                        cre: /({.*})/,
+                        cre: /(\{.*\})/,
                         single: 'metadata'
                 },
@@ -70 +68 @@
                 },
                 get: function( elem, opts ){
-                        var settings = $.extend({},this.defaults,opts);
+                        var data, m, e, attr,
+                                settings = $.extend({},this.defaults,opts);
                         // check for empty string in single property
-                        if ( !settings.single.length ) settings.single = 'metadata';
-                        
-                        var data = $.data(elem, settings.single);
+                        if ( !settings.single.length ) { settings.single = 'metadata'; }
+
+                        data = $.data(elem, settings.single);
                         // returned cached data if it already exists
-                        if ( data ) return data;
-                        
+                        if ( data ) { return data; }
+
                         data = "{}";
-                        
-                        if ( settings.type == "class" ) {
-                                var m = settings.cre.exec( elem.className );
-                                if ( m )
-                                        data = m[1];
-                        } else if ( settings.type == "elem" ) {
-                                if( !elem.getElementsByTagName )
-                                        return undefined;
-                                var e = elem.getElementsByTagName(settings.name);
-                                if ( e.length )
-                                        data = $.trim(e[0].innerHTML);
-                        } else if ( elem.getAttribute != undefined ) {
-                                var attr = elem.getAttribute( settings.name );
-                                if ( attr )
-                                        data = attr;
+
+                        if ( settings.type === "class" ) {
+                                m = settings.cre.exec( elem.className );
+                                if ( m ) { data = m[1]; }
+                        } else if ( settings.type === "elem" ) {
+                                if( !elem.getElementsByTagName ) { return undefined; }
+                                e = elem.getElementsByTagName(settings.name);
+                                if ( e.length ) { data = $.trim(e[0].innerHTML); }
+                        } else if ( elem.getAttribute !== undefined ) {
+                                attr = elem.getAttribute( settings.name );
+                                if ( attr ) { data = attr; }
                         }
-                        
-                        if ( data.indexOf( '{' ) <0 )
-                        data = "{" + data + "}";
-                        
+
+                        if ( data.indexOf( '{' ) <0 ) { data = "{" + data + "}"; }
+
                         data = eval("(" + data + ")");
-                        
+
                         $.data( elem, settings.single, data );
                         return data;

extensions/UserAdvManager/branches/2.6/admin/template/js/jquery.tablesorter.js

@@ -1 @@
-/*
- * 
- * TableSorter 2.0 - Client-side table sorting with ease!
- * Version 2.0.5b
- * @requires jQuery v1.2.3
- * 
- * Copyright (c) 2007 Christian Bach
- * Examples and docs at: http://tablesorter.com
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- * 
- */
-/**
- * 
- * @description Create a sortable table with multi-column sorting capabilitys
- * 
- * @example $('table').tablesorter();
- * @desc Create a simple tablesorter interface.
- * 
- * @example $('table').tablesorter({ sortList:[[0,0],[1,0]] });
- * @desc Create a tablesorter interface and sort on the first and secound column column headers.
- * 
- * @example $('table').tablesorter({ headers: { 0: { sorter: false}, 1: {sorter: false} } });
- *          
- * @desc Create a tablesorter interface and disableing the first and second  column headers.
- *      
- * 
- * @example $('table').tablesorter({ headers: { 0: {sorter:"integer"}, 1: {sorter:"currency"} } });
- * 
- * @desc Create a tablesorter interface and set a column parser for the first
- *       and second column.
- * 
- * 
- * @param Object
- *            settings An object literal containing key/value pairs to provide
- *            optional settings.
- * 
- * 
- * @option String cssHeader (optional) A string of the class name to be appended
- *         to sortable tr elements in the thead of the table. Default value:
- *         "header"
- * 
- * @option String cssAsc (optional) A string of the class name to be appended to
- *         sortable tr elements in the thead on a ascending sort. Default value:
- *         "headerSortUp"
- * 
- * @option String cssDesc (optional) A string of the class name to be appended
- *         to sortable tr elements in the thead on a descending sort. Default
- *         value: "headerSortDown"
- * 
- * @option String sortInitialOrder (optional) A string of the inital sorting
- *         order can be asc or desc. Default value: "asc"
- * 
- * @option String sortMultisortKey (optional) A string of the multi-column sort
- *         key. Default value: "shiftKey"
- * 
- * @option String textExtraction (optional) A string of the text-extraction
- *         method to use. For complex html structures inside td cell set this
- *         option to "complex", on large tables the complex option can be slow.
- *         Default value: "simple"
- * 
- * @option Object headers (optional) An array containing the forces sorting
- *         rules. This option let's you specify a default sorting rule. Default
- *         value: null
- * 
- * @option Array sortList (optional) An array containing the forces sorting
- *         rules. This option let's you specify a default sorting rule. Default
- *         value: null
- * 
- * @option Array sortForce (optional) An array containing forced sorting rules.
- *         This option let's you specify a default sorting rule, which is
- *         prepended to user-selected rules. Default value: null
- * 
- * @option Boolean sortLocaleCompare (optional) Boolean flag indicating whatever
- *         to use String.localeCampare method or not. Default set to true.
- * 
- * 
- * @option Array sortAppend (optional) An array containing forced sorting rules.
- *         This option let's you specify a default sorting rule, which is
- *         appended to user-selected rules. Default value: null
- * 
- * @option Boolean widthFixed (optional) Boolean flag indicating if tablesorter
- *         should apply fixed widths to the table columns. This is usefull when
- *         using the pager companion plugin. This options requires the dimension
- *         jquery plugin. Default value: false
- * 
- * @option Boolean cancelSelection (optional) Boolean flag indicating if
- *         tablesorter should cancel selection of the table headers text.
- *         Default value: true
- * 
- * @option Boolean debug (optional) Boolean flag indicating if tablesorter
- *         should display debuging information usefull for development.
- * 
- * @type jQuery
- * 
- * @name tablesorter
- * 
- * @cat Plugins/Tablesorter
- * 
- * @author Christian Bach/christian.bach@polyester.se
- */
-
-(function ($) {
-    $.extend({
-        tablesorter: new
-        function () {
-
-            var parsers = [],
-                widgets = [];
-
-            this.defaults = {
-                cssHeader: "header",
-                cssAsc: "headerSortUp",
-                cssDesc: "headerSortDown",
-                cssChildRow: "expand-child",
-                sortInitialOrder: "asc",
-                sortMultiSortKey: "shiftKey",
-                sortForce: null,
-                sortAppend: null,
-                sortLocaleCompare: true,
-                textExtraction: "simple",
-                parsers: {}, widgets: [],
-                widgetZebra: {
-                    css: ["even", "odd"]
-                }, headers: {}, widthFixed: false,
-                cancelSelection: true,
-                sortList: [],
-                headerList: [],
-                dateFormat: "us",
-                decimal: '/\.|\,/g',
-                onRenderHeader: null,
-                selectorHeaders: 'thead th',
-                debug: false
-            };
-
-            /* debuging utils */
-
-            function benchmark(s, d) {
-                log(s + "," + (new Date().getTime() - d.getTime()) + "ms");
-            }
-
-            this.benchmark = benchmark;
-
-            function log(s) {
-                if (typeof console != "undefined" && typeof console.debug != "undefined") {
-                    console.log(s);
-                } else {
-                    alert(s);
-                }
-            }
-
-            /* parsers utils */
-
-            function buildParserCache(table, $headers) {
-
-                if (table.config.debug) {
-                    var parsersDebug = "";
-                }
-
-                if (table.tBodies.length == 0) return; // In the case of empty tables
-                var rows = table.tBodies[0].rows;
-
-                if (rows[0]) {
-
-                    var list = [],
-                        cells = rows[0].cells,
-                        l = cells.length;
-
-                    for (var i = 0; i < l; i++) {
-
-                        var p = false;
-
-                        if ($.metadata && ($($headers[i]).metadata() && $($headers[i]).metadata().sorter)) {
-
-                            p = getParserById($($headers[i]).metadata().sorter);
-
-                        } else if ((table.config.headers[i] && table.config.headers[i].sorter)) {
-
-                            p = getParserById(table.config.headers[i].sorter);
-                        }
-                        if (!p) {
-
-                            p = detectParserForColumn(table, rows, -1, i);
-                        }
-
-                        if (table.config.debug) {
-                            parsersDebug += "column:" + i + " parser:" + p.id + "\n";
-                        }
-
-                        list.push(p);
-                    }
-                }
-
-                if (table.config.debug) {
-                    log(parsersDebug);
-                }
-
-                return list;
-            };
-
-            function detectParserForColumn(table, rows, rowIndex, cellIndex) {
-                var l = parsers.length,
-                    node = false,
-                    nodeValue = false,
-                    keepLooking = true;
-                while (nodeValue == '' && keepLooking) {
-                    rowIndex++;
-                    if (rows[rowIndex]) {
-                        node = getNodeFromRowAndCellIndex(rows, rowIndex, cellIndex);
-                        nodeValue = trimAndGetNodeText(table.config, node);
-                        if (table.config.debug) {
-                            log('Checking if value was empty on row:' + rowIndex);
-                        }
-                    } else {
-                        keepLooking = false;
-                    }
-                }
-                for (var i = 1; i < l; i++) {
-                    if (parsers[i].is(nodeValue, table, node)) {
-                        return parsers[i];
-                    }
-                }
-                // 0 is always the generic parser (text)
-                return parsers[0];
-            }
-
-            function getNodeFromRowAndCellIndex(rows, rowIndex, cellIndex) {
-                return rows[rowIndex].cells[cellIndex];
-            }
-
-            function trimAndGetNodeText(config, node) {
-                return $.trim(getElementText(config, node));
-            }
-
-            function getParserById(name) {
-                var l = parsers.length;
-                for (var i = 0; i < l; i++) {
-                    if (parsers[i].id.toLowerCase() == name.toLowerCase()) {
-                        return parsers[i];
-                    }
-                }
-                return false;
-            }
-
-            /* utils */
-
-            function buildCache(table) {
-
-                if (table.config.debug) {
-                    var cacheTime = new Date();
-                }
-
-                var totalRows = (table.tBodies[0] && table.tBodies[0].rows.length) || 0,
-                    totalCells = (table.tBodies[0].rows[0] && table.tBodies[0].rows[0].cells.length) || 0,
-                    parsers = table.config.parsers,
-                    cache = {
-                        row: [],
-                        normalized: []
-                    };
-
-                for (var i = 0; i < totalRows; ++i) {
-
-                    /** Add the table data to main data array */
-                    var c = $(table.tBodies[0].rows[i]),
-                        cols = [];
-
-                    // if this is a child row, add it to the last row's children and
-                    // continue to the next row
-                    if (c.hasClass(table.config.cssChildRow)) {
-                        cache.row[cache.row.length - 1] = cache.row[cache.row.length - 1].add(c);
-                        // go to the next for loop
-                        continue;
-                    }
-
-                    cache.row.push(c);
-
-                    for (var j = 0; j < totalCells; ++j) {
-                        cols.push(parsers[j].format(getElementText(table.config, c[0].cells[j]), table, c[0].cells[j]));
-                    }
-
-                    cols.push(cache.normalized.length); // add position for rowCache
-                    cache.normalized.push(cols);
-                    cols = null;
-                };
-
-                if (table.config.debug) {
-                    benchmark("Building cache for " + totalRows + " rows:", cacheTime);
-                }
-
-                return cache;
-            };
-
-            function getElementText(config, node) {
-
-                var text = "";
-
-                if (!node) return "";
-
-                if (!config.supportsTextContent) config.supportsTextContent = node.textContent || false;
-
-                if (config.textExtraction == "simple") {
-                    if (config.supportsTextContent) {
-                        text = node.textContent;
-                    } else {
-                        if (node.childNodes[0] && node.childNodes[0].hasChildNodes()) {
-                            text = node.childNodes[0].innerHTML;
-                        } else {
-                            text = node.innerHTML;
-                        }
-                    }
-                } else {
-                    if (typeof(config.textExtraction) == "function") {
-                        text = config.textExtraction(node);
-                    } else {
-                        text = $(node).text();
-                    }
-                }
-                return text;
-            }
-
-            function appendToTable(table, cache) {
-
-                if (table.config.debug) {
-                    var appendTime = new Date()
-                }
-
-                var c = cache,
-                    r = c.row,
-                    n = c.normalized,
-                    totalRows = n.length,
-                    checkCell = (n[0].length - 1),
-                    tableBody = $(table.tBodies[0]),
-                    rows = [];
-
-
-                for (var i = 0; i < totalRows; i++) {
-                    var pos = n[i][checkCell];
-
-                    rows.push(r[pos]);
-
-                    if (!table.config.appender) {
-
-                        //var o = ;
-                        var l = r[pos].length;
-                        for (var j = 0; j < l; j++) {
-                            tableBody[0].appendChild(r[pos][j]);
-                        }
-
-                        // 
-                    }
-                }
-
-
-
-                if (table.config.appender) {
-
-                    table.config.appender(table, rows);
-                }
-
-                rows = null;
-
-                if (table.config.debug) {
-                    benchmark("Rebuilt table:", appendTime);
-                }
-
-                // apply table widgets
-                applyWidget(table);
-
-                // trigger sortend
-                setTimeout(function () {
-                    $(table).trigger("sortEnd");
-                }, 0);
-
-            };
-
-            function buildHeaders(table) {
-
-                if (table.config.debug) {
-                    var time = new Date();
-                }
-
-                var meta = ($.metadata) ? true : false;
-                
-                var header_index = computeTableHeaderCellIndexes(table);
-
-                $tableHeaders = $(table.config.selectorHeaders, table).each(function (index) {
-
-                    this.column = header_index[this.parentNode.rowIndex + "-" + this.cellIndex];
-                    // this.column = index;
-                    this.order = formatSortingOrder(table.config.sortInitialOrder);
-                    
-                                        
-                                        this.count = this.order;
-
-                    if (checkHeaderMetadata(this) || checkHeaderOptions(table, index)) this.sortDisabled = true;
-                                        if (checkHeaderOptionsSortingLocked(table, index)) this.order = this.lockedOrder = checkHeaderOptionsSortingLocked(table, index);
-
-                    if (!this.sortDisabled) {
-                        var $th = $(this).addClass(table.config.cssHeader);
-                        if (table.config.onRenderHeader) table.config.onRenderHeader.apply($th);
-                    }
-
-                    // add cell to headerList
-                    table.config.headerList[index] = this;
-                });
-
-                if (table.config.debug) {
-                    benchmark("Built headers:", time);
-                    log($tableHeaders);
-                }
-
-                return $tableHeaders;
-
-            };
-
-            // from:
-            // http://www.javascripttoolbox.com/lib/table/examples.php
-            // http://www.javascripttoolbox.com/temp/table_cellindex.html
-
-
-            function computeTableHeaderCellIndexes(t) {
-                var matrix = [];
-                var lookup = {};
-                var thead = t.getElementsByTagName('THEAD')[0];
-                var trs = thead.getElementsByTagName('TR');
-
-                for (var i = 0; i < trs.length; i++) {
-                    var cells = trs[i].cells;
-                    for (var j = 0; j < cells.length; j++) {
-                        var c = cells[j];
-
-                        var rowIndex = c.parentNode.rowIndex;
-                        var cellId = rowIndex + "-" + c.cellIndex;
-                        var rowSpan = c.rowSpan || 1;
-                        var colSpan = c.colSpan || 1
-                        var firstAvailCol;
-                        if (typeof(matrix[rowIndex]) == "undefined") {
-                            matrix[rowIndex] = [];
-                        }
-                        // Find first available column in the first row
-                        for (var k = 0; k < matrix[rowIndex].length + 1; k++) {
-                            if (typeof(matrix[rowIndex][k]) == "undefined") {
-                                firstAvailCol = k;
-                                break;
-                            }
-                        }
-                        lookup[cellId] = firstAvailCol;
-                        for (var k = rowIndex; k < rowIndex + rowSpan; k++) {
-                            if (typeof(matrix[k]) == "undefined") {
-                                matrix[k] = [];
-                            }
-                            var matrixrow = matrix[k];
-                            for (var l = firstAvailCol; l < firstAvailCol + colSpan; l++) {
-                                matrixrow[l] = "x";
-                            }
-                        }
-                    }
-                }
-                return lookup;
-            }
-
-            function checkCellColSpan(table, rows, row) {
-                var arr = [],
-                    r = table.tHead.rows,
-                    c = r[row].cells;
-
-                for (var i = 0; i < c.length; i++) {
-                    var cell = c[i];
-
-                    if (cell.colSpan > 1) {
-                        arr = arr.concat(checkCellColSpan(table, headerArr, row++));
-                    } else {
-                        if (table.tHead.length == 1 || (cell.rowSpan > 1 || !r[row + 1])) {
-                            arr.push(cell);
-                        }
-                        // headerArr[row] = (i+row);
-                    }
-                }
-                return arr;
-            };
-
-            function checkHeaderMetadata(cell) {
-                if (($.metadata) && ($(cell).metadata().sorter === false)) {
-                    return true;
-                };
-                return false;
-            }
-
-            function checkHeaderOptions(table, i) {
-                if ((table.config.headers[i]) && (table.config.headers[i].sorter === false)) {
-                    return true;
-                };
-                return false;
-            }
-                        
-                         function checkHeaderOptionsSortingLocked(table, i) {
-                if ((table.config.headers[i]) && (table.config.headers[i].lockedOrder)) return table.config.headers[i].lockedOrder;
-                return false;
-            }
-                        
-            function applyWidget(table) {
-                var c = table.config.widgets;
-                var l = c.length;
-                for (var i = 0; i < l; i++) {
-
-                    getWidgetById(c[i]).format(table);
-                }
-
-            }
-
-            function getWidgetById(name) {
-                var l = widgets.length;
-                for (var i = 0; i < l; i++) {
-                    if (widgets[i].id.toLowerCase() == name.toLowerCase()) {
-                        return widgets[i];
-                    }
-                }
-            };
-
-            function formatSortingOrder(v) {
-                if (typeof(v) != "Number") {
-                    return (v.toLowerCase() == "desc") ? 1 : 0;
-                } else {
-                    return (v == 1) ? 1 : 0;
-                }
-            }
-
-            function isValueInArray(v, a) {
-                var l = a.length;
-                for (var i = 0; i < l; i++) {
-                    if (a[i][0] == v) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            function setHeadersCss(table, $headers, list, css) {
-                // remove all header information
-                $headers.removeClass(css[0]).removeClass(css[1]);
-
-                var h = [];
-                $headers.each(function (offset) {
-                    if (!this.sortDisabled) {
-                        h[this.column] = $(this);
-                    }
-                });
-
-                var l = list.length;
-                for (var i = 0; i < l; i++) {
-                    h[list[i][0]].addClass(css[list[i][1]]);
-                }
-            }
-
-            function fixColumnWidth(table, $headers) {
-                var c = table.config;
-                if (c.widthFixed) {
-                    var colgroup = $('<colgroup>');
-                    $("tr:first td", table.tBodies[0]).each(function () {
-                        colgroup.append($('<col>').css('width', $(this).width()));
-                    });
-                    $(table).prepend(colgroup);
-                };
-            }
-
-            function updateHeaderSortCount(table, sortList) {
-                var c = table.config,
-                    l = sortList.length;
-                for (var i = 0; i < l; i++) {
-                    var s = sortList[i],
-                        o = c.headerList[s[0]];
-                    o.count = s[1];
-                    o.count++;
-                }
-            }
-
-            /* sorting methods */
-
-            function multisort(table, sortList, cache) {
-
-                if (table.config.debug) {
-                    var sortTime = new Date();
-                }
-
-                var dynamicExp = "var sortWrapper = function(a,b) {",
-                    l = sortList.length;
-
-                // TODO: inline functions.
-                for (var i = 0; i < l; i++) {
-
-                    var c = sortList[i][0];
-                    var order = sortList[i][1];
-                    // var s = (getCachedSortType(table.config.parsers,c) == "text") ?
-                    // ((order == 0) ? "sortText" : "sortTextDesc") : ((order == 0) ?
-                    // "sortNumeric" : "sortNumericDesc");
-                    // var s = (table.config.parsers[c].type == "text") ? ((order == 0)
-                    // ? makeSortText(c) : makeSortTextDesc(c)) : ((order == 0) ?
-                    // makeSortNumeric(c) : makeSortNumericDesc(c));
-                    var s = (table.config.parsers[c].type == "text") ? ((order == 0) ? makeSortFunction("text", "asc", c) : makeSortFunction("text", "desc", c)) : ((order == 0) ? makeSortFunction("numeric", "asc", c) : makeSortFunction("numeric", "desc", c));
-                    var e = "e" + i;
-
-                    dynamicExp += "var " + e + " = " + s; // + "(a[" + c + "],b[" + c
-                    // + "]); ";
-                    dynamicExp += "if(" + e + ") { return " + e + "; } ";
-                    dynamicExp += "else { ";
-
-                }
-
-                // if value is the same keep orignal order
-                var orgOrderCol = cache.normalized[0].length - 1;
-                dynamicExp += "return a[" + orgOrderCol + "]-b[" + orgOrderCol + "];";
-
-                for (var i = 0; i < l; i++) {
-                    dynamicExp += "}; ";
-                }
-
-                dynamicExp += "return 0; ";
-                dynamicExp += "}; ";
-
-                if (table.config.debug) {
-                    benchmark("Evaling expression:" + dynamicExp, new Date());
-                }
-
-                eval(dynamicExp);
-
-                cache.normalized.sort(sortWrapper);
-
-                if (table.config.debug) {
-                    benchmark("Sorting on " + sortList.toString() + " and dir " + order + " time:", sortTime);
-                }
-
-                return cache;
-            };
-
-            function makeSortFunction(type, direction, index) {
-                var a = "a[" + index + "]",
-                    b = "b[" + index + "]";
-                if (type == 'text' && direction == 'asc') {
-                    return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + a + " < " + b + ") ? -1 : 1 )));";
-                } else if (type == 'text' && direction == 'desc') {
-                    return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + b + " < " + a + ") ? -1 : 1 )));";
-                } else if (type == 'numeric' && direction == 'asc') {
-                    return "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + a + " - " + b + "));";
-                } else if (type == 'numeric' && direction == 'desc') {
-                    return "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + b + " - " + a + "));";
-                }
-            };
-
-            function makeSortText(i) {
-                return "((a[" + i + "] < b[" + i + "]) ? -1 : ((a[" + i + "] > b[" + i + "]) ? 1 : 0));";
-            };
-
-            function makeSortTextDesc(i) {
-                return "((b[" + i + "] < a[" + i + "]) ? -1 : ((b[" + i + "] > a[" + i + "]) ? 1 : 0));";
-            };
-
-            function makeSortNumeric(i) {
-                return "a[" + i + "]-b[" + i + "];";
-            };
-
-            function makeSortNumericDesc(i) {
-                return "b[" + i + "]-a[" + i + "];";
-            };
-
-            function sortText(a, b) {
-                if (table.config.sortLocaleCompare) return a.localeCompare(b);
-                return ((a < b) ? -1 : ((a > b) ? 1 : 0));
-            };
-
-            function sortTextDesc(a, b) {
-                if (table.config.sortLocaleCompare) return b.localeCompare(a);
-                return ((b < a) ? -1 : ((b > a) ? 1 : 0));
-            };
-
-            function sortNumeric(a, b) {
-                return a - b;
-            };
-
-            function sortNumericDesc(a, b) {
-                return b - a;
-            };
-
-            function getCachedSortType(parsers, i) {
-                return parsers[i].type;
-            }; /* public methods */
-            this.construct = function (settings) {
-                return this.each(function () {
-                    // if no thead or tbody quit.
-                    if (!this.tHead || !this.tBodies) return;
-                    // declare
-                    var $this, $document, $headers, cache, config, shiftDown = 0,
-                        sortOrder;
-                    // new blank config object
-                    this.config = {};
-                    // merge and extend.
-                    config = $.extend(this.config, $.tablesorter.defaults, settings);
-                    // store common expression for speed
-                    $this = $(this);
-                    // save the settings where they read
-                    $.data(this, "tablesorter", config);
-                    // build headers
-                    $headers = buildHeaders(this);
-                    // try to auto detect column type, and store in tables config
-                    this.config.parsers = buildParserCache(this, $headers);
-                    // build the cache for the tbody cells
-                    cache = buildCache(this);
-                    // get the css class names, could be done else where.
-                    var sortCSS = [config.cssDesc, config.cssAsc];
-                    // fixate columns if the users supplies the fixedWidth option
-                    fixColumnWidth(this);
-                    // apply event handling to headers
-                    // this is to big, perhaps break it out?
-                    $headers.click(
-
-                    function (e) {
-                        var totalRows = ($this[0].tBodies[0] && $this[0].tBodies[0].rows.length) || 0;
-                        if (!this.sortDisabled && totalRows > 0) {
-                            // Only call sortStart if sorting is
-                            // enabled.
-                            $this.trigger("sortStart");
-                            // store exp, for speed
-                            var $cell = $(this);
-                            // get current column index
-                            var i = this.column;
-                            // get current column sort order
-                            this.order = this.count++ % 2;
-                                                        // always sort on the locked order.
-                                                        if(this.lockedOrder) this.order = this.lockedOrder;
-                                                        
-                                                        // user only whants to sort on one
-                            // column
-                            if (!e[config.sortMultiSortKey]) {
-                                // flush the sort list
-                                config.sortList = [];
-                                if (config.sortForce != null) {
-                                    var a = config.sortForce;
-                                    for (var j = 0; j < a.length; j++) {
-                                        if (a[j][0] != i) {
-                                            config.sortList.push(a[j]);
-                                        }
-                                    }
-                                }
-                                // add column to sort list
-                                config.sortList.push([i, this.order]);
-                                // multi column sorting
-                            } else {
-                                // the user has clicked on an all
-                                // ready sortet column.
-                                if (isValueInArray(i, config.sortList)) {
-                                    // revers the sorting direction
-                                    // for all tables.
-                                    for (var j = 0; j < config.sortList.length; j++) {
-                                        var s = config.sortList[j],
-                                            o = config.headerList[s[0]];
-                                        if (s[0] == i) {
-                                            o.count = s[1];
-                                            o.count++;
-                                            s[1] = o.count % 2;
-                                        }
-                                    }
-                                } else {
-                                    // add column to sort list array
-                                    config.sortList.push([i, this.order]);
-                                }
-                            };
-                            setTimeout(function () {
-                                // set css for headers
-                                setHeadersCss($this[0], $headers, config.sortList, sortCSS);
-                                appendToTable(
-                                        $this[0], multisort(
-                                        $this[0], config.sortList, cache)
-                                                                );
-                            }, 1);
-                            // stop normal event by returning false
-                            return false;
-                        }
-                        // cancel selection
-                    }).mousedown(function () {
-                        if (config.cancelSelection) {
-                            this.onselectstart = function () {
-                                return false
-                            };
-                            return false;
-                        }
-                    });
-                    // apply easy methods that trigger binded events
-                    $this.bind("update", function () {
-                        var me = this;
-                        setTimeout(function () {
-                            // rebuild parsers.
-                            me.config.parsers = buildParserCache(
-                            me, $headers);
-                            // rebuild the cache map
-                            cache = buildCache(me);
-                        }, 1);
-                    }).bind("updateCell", function (e, cell) {
-                        var config = this.config;
-                        // get position from the dom.
-                        var pos = [(cell.parentNode.rowIndex - 1), cell.cellIndex];
-                        // update cache
-                        cache.normalized[pos[0]][pos[1]] = config.parsers[pos[1]].format(
-                        getElementText(config, cell), cell);
-                    }).bind("sorton", function (e, list) {
-                        $(this).trigger("sortStart");
-                        config.sortList = list;
-                        // update and store the sortlist
-                        var sortList = config.sortList;
-                        // update header count index
-                        updateHeaderSortCount(this, sortList);
-                        // set css for headers
-                        setHeadersCss(this, $headers, sortList, sortCSS);
-                        // sort the table and append it to the dom
-                        appendToTable(this, multisort(this, sortList, cache));
-                    }).bind("appendCache", function () {
-                        appendToTable(this, cache);
-                    }).bind("applyWidgetId", function (e, id) {
-                        getWidgetById(id).format(this);
-                    }).bind("applyWidgets", function () {
-                        // apply widgets
-                        applyWidget(this);
-                    });
-                    if ($.metadata && ($(this).metadata() && $(this).metadata().sortlist)) {
-                        config.sortList = $(this).metadata().sortlist;
-                    }
-                    // if user has supplied a sort list to constructor.
-                    if (config.sortList.length > 0) {
-                        $this.trigger("sorton", [config.sortList]);
-                    }
-                    // apply widgets
-                    applyWidget(this);
-                });
-            };
-            this.addParser = function (parser) {
-                var l = parsers.length,
-                    a = true;
-                for (var i = 0; i < l; i++) {
-                    if (parsers[i].id.toLowerCase() == parser.id.toLowerCase()) {
-                        a = false;
-                    }
-                }
-                if (a) {
-                    parsers.push(parser);
-                };
-            };
-            this.addWidget = function (widget) {
-                widgets.push(widget);
-            };
-            this.formatFloat = function (s) {
-                var i = parseFloat(s);
-                return (isNaN(i)) ? 0 : i;
-            };
-            this.formatInt = function (s) {
-                var i = parseInt(s);
-                return (isNaN(i)) ? 0 : i;
-            };
-            this.isDigit = function (s, config) {
-                // replace all an wanted chars and match.
-                return /^[-+]?\d*$/.test($.trim(s.replace(/[,.']/g, '')));
-            };
-            this.clearTableBody = function (table) {
-                if ($.browser.msie) {
-                    function empty() {
-                        while (this.firstChild)
-                        this.removeChild(this.firstChild);
-                    }
-                    empty.apply(table.tBodies[0]);
-                } else {
-                    table.tBodies[0].innerHTML = "";
-                }
-            };
-        }
-    });
-
-    // extend plugin scope
-    $.fn.extend({
-        tablesorter: $.tablesorter.construct
-    });
-
-    // make shortcut
-    var ts = $.tablesorter;
-
-    // add default parsers
-    ts.addParser({
-        id: "text",
-        is: function (s) {
-            return true;
-        }, format: function (s) {
-            return $.trim(s.toLocaleLowerCase());
-        }, type: "text"
-    });
-
-    ts.addParser({
-        id: "digit",
-        is: function (s, table) {
-            var c = table.config;
-            return $.tablesorter.isDigit(s, c);
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(s);
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "currency",
-        is: function (s) {
-            return /^[£$€?.]/.test(s);
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(s.replace(new RegExp(/[£$€]/g), ""));
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "ipAddress",
-        is: function (s) {
-            return /^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s);
-        }, format: function (s) {
-            var a = s.split("."),
-                r = "",
-                l = a.length;
-            for (var i = 0; i < l; i++) {
-                var item = a[i];
-                if (item.length == 2) {
-                    r += "0" + item;
-                } else {
-                    r += item;
-                }
-            }
-            return $.tablesorter.formatFloat(r);
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "url",
-        is: function (s) {
-            return /^(https?|ftp|file):\/\/$/.test(s);
-        }, format: function (s) {
-            return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//), ''));
-        }, type: "text"
-    });
-
-    ts.addParser({
-        id: "isoDate",
-        is: function (s) {
-            return /^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s);
-        }, format: function (s) {
-            return $.tablesorter.formatFloat((s != "") ? new Date(s.replace(
-            new RegExp(/-/g), "/")).getTime() : "0");
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "percent",
-        is: function (s) {
-            return /\%$/.test($.trim(s));
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g), ""));
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "usLongDate",
-        is: function (s) {
-            return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/));
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(new Date(s).getTime());
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "shortDate",
-        is: function (s) {
-            return /\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s);
-        }, format: function (s, table) {
-            var c = table.config;
-            s = s.replace(/\-/g, "/");
-            if (c.dateFormat == "us") {
-                // reformat the string in ISO format
-                s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$1/$2");
-            } else if (c.dateFormat == "uk") {
-                // reformat the string in ISO format
-                s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$2/$1");
-            } else if (c.dateFormat == "dd/mm/yy" || c.dateFormat == "dd-mm-yy") {
-                s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/, "$1/$2/$3");
-            }
-            return $.tablesorter.formatFloat(new Date(s).getTime());
-        }, type: "numeric"
-    });
-    ts.addParser({
-        id: "time",
-        is: function (s) {
-            return /^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s);
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(new Date("2000/01/01 " + s).getTime());
-        }, type: "numeric"
-    });
-    ts.addParser({
-        id: "metadata",
-        is: function (s) {
-            return false;
-        }, format: function (s, table, cell) {
-            var c = table.config,
-                p = (!c.parserMetadataName) ? 'sortValue' : c.parserMetadataName;
-            return $(cell).metadata()[p];
-        }, type: "numeric"
-    });
-    // add default widgets
-    ts.addWidget({
-        id: "zebra",
-        format: function (table) {
-            if (table.config.debug) {
-                var time = new Date();
-            }
-            var $tr, row = -1,
-                odd;
-            // loop through the visible rows
-            $("tr:visible", table.tBodies[0]).each(function (i) {
-                $tr = $(this);
-                // style children rows the same way the parent
-                // row was styled
-                if (!$tr.hasClass(table.config.cssChildRow)) row++;
-                odd = (row % 2 == 0);
-                $tr.removeClass(
-                table.config.widgetZebra.css[odd ? 0 : 1]).addClass(
-                table.config.widgetZebra.css[odd ? 1 : 0])
-            });
-            if (table.config.debug) {
-                $.tablesorter.benchmark("Applying Zebra widget", time);
-            }
-        }
-    });
+/**!
+* TableSorter 2.14.5 - Client-side table sorting with ease!
+* @requires jQuery v1.2.6+
+*
+* Copyright (c) 2007 Christian Bach
+* Examples and docs at: http://tablesorter.com
+* Dual licensed under the MIT and GPL licenses:
+* http://www.opensource.org/licenses/mit-license.php
+* http://www.gnu.org/licenses/gpl.html
+*
+* @type jQuery
+* @name tablesorter
+* @cat Plugins/Tablesorter
+* @author Christian Bach/christian.bach@polyester.se
+* @contributor Rob Garrison/https://github.com/Mottie/tablesorter
+*/
+/*jshint browser:true, jquery:true, unused:false, expr: true */
+/*global console:false, alert:false */
+!(function($) {
+        "use strict";
+        $.extend({
+                /*jshint supernew:true */
+                tablesorter: new function() {
+
+                        var ts = this;
+
+                        ts.version = "2.14.5";
+
+                        ts.parsers = [];
+                        ts.widgets = [];
+                        ts.defaults = {
+
+                                // *** appearance
+                                theme            : 'default',  // adds tablesorter-{theme} to the table for styling
+                                widthFixed       : false,      // adds colgroup to fix widths of columns
+                                showProcessing   : false,      // show an indeterminate timer icon in the header when the table is sorted or filtered.
+
+                                headerTemplate   : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = <i/> (class from cssIcon)
+                                onRenderTemplate : null,       // function(index, template){ return template; }, (template is a string)
+                                onRenderHeader   : null,       // function(index){}, (nothing to return)
+
+                                // *** functionality
+                                cancelSelection  : true,       // prevent text selection in the header
+                                tabIndex         : true,       // add tabindex to header for keyboard accessibility
+                                dateFormat       : 'mmddyyyy', // other options: "ddmmyyy" or "yyyymmdd"
+                                sortMultiSortKey : 'shiftKey', // key used to select additional columns
+                                sortResetKey     : 'ctrlKey',  // key used to remove sorting on a column
+                                usNumberFormat   : true,       // false for German "1.234.567,89" or French "1 234 567,89"
+                                delayInit        : false,      // if false, the parsed table contents will not update until the first sort
+                                serverSideSorting: false,      // if true, server-side sorting should be performed because client-side sorting will be disabled, but the ui and events will still be used.
+
+                                // *** sort options
+                                headers          : {},         // set sorter, string, empty, locked order, sortInitialOrder, filter, etc.
+                                ignoreCase       : true,       // ignore case while sorting
+                                sortForce        : null,       // column(s) first sorted; always applied
+                                sortList         : [],         // Initial sort order; applied initially; updated when manually sorted
+                                sortAppend       : null,       // column(s) sorted last; always applied
+                                sortStable       : false,      // when sorting two rows with exactly the same content, the original sort order is maintained
+
+                                sortInitialOrder : 'asc',      // sort direction on first click
+                                sortLocaleCompare: false,      // replace equivalent character (accented characters)
+                                sortReset        : false,      // third click on the header will reset column to default - unsorted
+                                sortRestart      : false,      // restart sort to "sortInitialOrder" when clicking on previously unsorted columns
+
+                                emptyTo          : 'bottom',   // sort empty cell to bottom, top, none, zero
+                                stringTo         : 'max',      // sort strings in numerical column as max, min, top, bottom, zero
+                                textExtraction   : 'simple',   // text extraction method/function - function(node, table, cellIndex){}
+                                textSorter       : null,       // choose overall or specific column sorter function(a, b, direction, table, columnIndex) [alt: ts.sortText]
+                                numberSorter     : null,       // choose overall numeric sorter function(a, b, direction, maxColumnValue)
+
+                                // *** widget options
+                                widgets: [],                   // method to add widgets, e.g. widgets: ['zebra']
+                                widgetOptions    : {
+                                        zebra : [ 'even', 'odd' ]    // zebra widget alternating row class names
+                                },
+                                initWidgets      : true,       // apply widgets on tablesorter initialization
+
+                                // *** callbacks
+                                initialized      : null,       // function(table){},
+
+                                // *** extra css class names
+                                tableClass       : '',
+                                cssAsc           : '',
+                                cssDesc          : '',
+                                cssHeader        : '',
+                                cssHeaderRow     : '',
+                                cssProcessing    : '', // processing icon applied to header during sort/filter
+
+                                cssChildRow      : 'tablesorter-childRow', // class name indiciating that a row is to be attached to the its parent 
+                                cssIcon          : 'tablesorter-icon',     //  if this class exists, a <i> will be added to the header automatically
+                                cssInfoBlock     : 'tablesorter-infoOnly', // don't sort tbody with this class name (only one class name allowed here!)
+
+                                // *** selectors
+                                selectorHeaders  : '> thead th, > thead td',
+                                selectorSort     : 'th, td',   // jQuery selector of content within selectorHeaders that is clickable to trigger a sort
+                                selectorRemove   : '.remove-me',
+
+                                // *** advanced
+                                debug            : false,
+
+                                // *** Internal variables
+                                headerList: [],
+                                empties: {},
+                                strings: {},
+                                parsers: []
+
+                                // deprecated; but retained for backwards compatibility
+                                // widgetZebra: { css: ["even", "odd"] }
+
+                        };
+
+                        // internal css classes - these will ALWAYS be added to
+                        // the table and MUST only contain one class name - fixes #381
+                        ts.css = {
+                                table      : 'tablesorter',
+                                childRow   : 'tablesorter-childRow',
+                                header     : 'tablesorter-header',
+                                headerRow  : 'tablesorter-headerRow',
+                                icon       : 'tablesorter-icon',
+                                info       : 'tablesorter-infoOnly',
+                                processing : 'tablesorter-processing',
+                                sortAsc    : 'tablesorter-headerAsc',
+                                sortDesc   : 'tablesorter-headerDesc'
+                        };
+
+                        /* debuging utils */
+                        function log() {
+                                var s = arguments.length > 1 ? Array.prototype.slice.call(arguments) : arguments[0];
+                                if (typeof console !== "undefined" && typeof console.log !== "undefined") {
+                                        console.log(s);
+                                } else {
+                                        alert(s);
+                                }
+                        }
+
+                        function benchmark(s, d) {
+                                log(s + " (" + (new Date().getTime() - d.getTime()) + "ms)");
+                        }
+
+                        ts.log = log;
+                        ts.benchmark = benchmark;
+
+                        // $.isEmptyObject from jQuery v1.4
+                        function isEmptyObject(obj) {
+                                /*jshint forin: false */
+                                for (var name in obj) {
+                                        return false;
+                                }
+                                return true;
+                        }
+
+                        function getElementText(table, node, cellIndex) {
+                                if (!node) { return ""; }
+                                var c = table.config,
+                                        t = c.textExtraction, text = "";
+                                if (t === "simple") {
+                                        if (c.supportsTextContent) {
+                                                text = node.textContent; // newer browsers support this
+                                        } else {
+                                                text = $(node).text();
+                                        }
+                                } else {
+                                        if (typeof t === "function") {
+                                                text = t(node, table, cellIndex);
+                                        } else if (typeof t === "object" && t.hasOwnProperty(cellIndex)) {
+                                                text = t[cellIndex](node, table, cellIndex);
+                                        } else {
+                                                text = c.supportsTextContent ? node.textContent : $(node).text();
+                                        }
+                                }
+                                return $.trim(text);
+                        }
+
+                        function detectParserForColumn(table, rows, rowIndex, cellIndex) {
+                                var cur,
+                                i = ts.parsers.length,
+                                node = false,
+                                nodeValue = '',
+                                keepLooking = true;
+                                while (nodeValue === '' && keepLooking) {
+                                        rowIndex++;
+                                        if (rows[rowIndex]) {
+                                                node = rows[rowIndex].cells[cellIndex];
+                                                nodeValue = getElementText(table, node, cellIndex);
+                                                if (table.config.debug) {
+                                                        log('Checking if value was empty on row ' + rowIndex + ', column: ' + cellIndex + ': "' + nodeValue + '"');
+                                                }
+                                        } else {
+                                                keepLooking = false;
+                                        }
+                                }
+                                while (--i >= 0) {
+                                        cur = ts.parsers[i];
+                                        // ignore the default text parser because it will always be true
+                                        if (cur && cur.id !== 'text' && cur.is && cur.is(nodeValue, table, node)) {
+                                                return cur;
+                                        }
+                                }
+                                // nothing found, return the generic parser (text)
+                                return ts.getParserById('text');
+                        }
+
+                        function buildParserCache(table) {
+                                var c = table.config,
+                                        // update table bodies in case we start with an empty table
+                                        tb = c.$tbodies = c.$table.children('tbody:not(.' + c.cssInfoBlock + ')'),
+                                        rows, list, l, i, h, ch, p, time, parsersDebug = "";
+                                if ( tb.length === 0) {
+                                        return c.debug ? log('*Empty table!* Not building a parser cache') : '';
+                                } else if (c.debug) {
+                                        time = new Date();
+                                        log('Detecting parsers for each column');
+                                }
+                                rows = tb[0].rows;
+                                if (rows[0]) {
+                                        list = [];
+                                        l = rows[0].cells.length;
+                                        for (i = 0; i < l; i++) {
+                                                // tons of thanks to AnthonyM1229 for working out the following selector (issue #74) to make this work in IE8!
+                                                // More fixes to this selector to work properly in iOS and jQuery 1.8+ (issue #132 & #174)
+                                                h = c.$headers.filter(':not([colspan])');
+                                                h = h.add( c.$headers.filter('[colspan="1"]') ) // ie8 fix
+                                                        .filter('[data-column="' + i + '"]:last');
+                                                ch = c.headers[i];
+                                                // get column parser
+                                                p = ts.getParserById( ts.getData(h, ch, 'sorter') );
+                                                // empty cells behaviour - keeping emptyToBottom for backwards compatibility
+                                                c.empties[i] = ts.getData(h, ch, 'empty') || c.emptyTo || (c.emptyToBottom ? 'bottom' : 'top' );
+                                                // text strings behaviour in numerical sorts
+                                                c.strings[i] = ts.getData(h, ch, 'string') || c.stringTo || 'max';
+                                                if (!p) {
+                                                        p = detectParserForColumn(table, rows, -1, i);
+                                                }
+                                                if (c.debug) {
+                                                        parsersDebug += "column:" + i + "; parser:" + p.id + "; string:" + c.strings[i] + '; empty: ' + c.empties[i] + "\n";
+                                                }
+                                                list.push(p);
+                                        }
+                                }
+                                if (c.debug) {
+                                        log(parsersDebug);
+                                        benchmark("Completed detecting parsers", time);
+                                }
+                                c.parsers = list;
+                        }
+
+                        /* utils */
+                        function buildCache(table) {
+                                var b = table.tBodies,
+                                tc = table.config,
+                                totalRows,
+                                totalCells,
+                                parsers = tc.parsers,
+                                t, v, i, j, k, c, cols, cacheTime, colMax = [];
+                                tc.cache = {};
+                                // if no parsers found, return - it's an empty table.
+                                if (!parsers) {
+                                        return tc.debug ? log('*Empty table!* Not building a cache') : '';
+                                }
+                                if (tc.debug) {
+                                        cacheTime = new Date();
+                                }
+                                // processing icon
+                                if (tc.showProcessing) {
+                                        ts.isProcessing(table, true);
+                                }
+                                for (k = 0; k < b.length; k++) {
+                                        tc.cache[k] = { row: [], normalized: [] };
+                                        // ignore tbodies with class name from c.cssInfoBlock
+                                        if (!$(b[k]).hasClass(tc.cssInfoBlock)) {
+                                                totalRows = (b[k] && b[k].rows.length) || 0;
+                                                totalCells = (b[k].rows[0] && b[k].rows[0].cells.length) || 0;
+                                                for (i = 0; i < totalRows; ++i) {
+                                                        /** Add the table data to main data array */
+                                                        c = $(b[k].rows[i]);
+                                                        cols = [];
+                                                        // if this is a child row, add it to the last row's children and continue to the next row
+                                                        if (c.hasClass(tc.cssChildRow)) {
+                                                                tc.cache[k].row[tc.cache[k].row.length - 1] = tc.cache[k].row[tc.cache[k].row.length - 1].add(c);
+                                                                // go to the next for loop
+                                                                continue;
+                                                        }
+                                                        tc.cache[k].row.push(c);
+                                                        for (j = 0; j < totalCells; ++j) {
+                                                                t = getElementText(table, c[0].cells[j], j);
+                                                                // allow parsing if the string is empty, previously parsing would change it to zero,
+                                                                // in case the parser needs to extract data from the table cell attributes
+                                                                v = parsers[j].format(t, table, c[0].cells[j], j);
+                                                                cols.push(v);
+                                                                if ((parsers[j].type || '').toLowerCase() === "numeric") {
+                                                                        colMax[j] = Math.max(Math.abs(v) || 0, colMax[j] || 0); // determine column max value (ignore sign)
+                                                                }
+                                                        }
+                                                        cols.push(tc.cache[k].normalized.length); // add position for rowCache
+                                                        tc.cache[k].normalized.push(cols);
+                                                }
+                                                tc.cache[k].colMax = colMax;
+                                        }
+                                }
+                                if (tc.showProcessing) {
+                                        ts.isProcessing(table); // remove processing icon
+                                }
+                                if (tc.debug) {
+                                        benchmark("Building cache for " + totalRows + " rows", cacheTime);
+                                }
+                        }
+
+                        // init flag (true) used by pager plugin to prevent widget application
+                        function appendToTable(table, init) {
+                                var c = table.config,
+                                        wo = c.widgetOptions,
+                                        b = table.tBodies,
+                                        rows = [],
+                                        c2 = c.cache,
+                                        r, n, totalRows, checkCell, $bk, $tb,
+                                        i, j, k, l, pos, appendTime;
+                                if (isEmptyObject(c2)) { return; } // empty table - fixes #206/#346
+                                if (c.debug) {
+                                        appendTime = new Date();
+                                }
+                                for (k = 0; k < b.length; k++) {
+                                        $bk = $(b[k]);
+                                        if ($bk.length && !$bk.hasClass(c.cssInfoBlock)) {
+                                                // get tbody
+                                                $tb = ts.processTbody(table, $bk, true);
+                                                r = c2[k].row;
+                                                n = c2[k].normalized;
+                                                totalRows = n.length;
+                                                checkCell = totalRows ? (n[0].length - 1) : 0;
+                                                for (i = 0; i < totalRows; i++) {
+                                                        pos = n[i][checkCell];
+                                                        rows.push(r[pos]);
+                                                        // removeRows used by the pager plugin; don't render if using ajax - fixes #411
+                                                        if (!c.appender || (c.pager && (!c.pager.removeRows || !wo.pager_removeRows) && !c.pager.ajax)) {
+                                                                l = r[pos].length;
+                                                                for (j = 0; j < l; j++) {
+                                                                        $tb.append(r[pos][j]);
+                                                                }
+                                                        }
+                                                }
+                                                // restore tbody
+                                                ts.processTbody(table, $tb, false);
+                                        }
+                                }
+                                if (c.appender) {
+                                        c.appender(table, rows);
+                                }
+                                if (c.debug) {
+                                        benchmark("Rebuilt table", appendTime);
+                                }
+                                // apply table widgets; but not before ajax completes
+                                if (!init && !c.appender) { ts.applyWidget(table); }
+                                // trigger sortend
+                                $(table).trigger("sortEnd", table);
+                                $(table).trigger("updateComplete", table);
+                        }
+
+                        // computeTableHeaderCellIndexes from:
+                        // http://www.javascripttoolbox.com/lib/table/examples.php
+                        // http://www.javascripttoolbox.com/temp/table_cellindex.html
+                        function computeThIndexes(t) {
+                                var matrix = [],
+                                lookup = {},
+                                cols = 0, // determine the number of columns
+                                trs = $(t).find('thead:eq(0), tfoot').children('tr'), // children tr in tfoot - see issue #196
+                                i, j, k, l, c, cells, rowIndex, cellId, rowSpan, colSpan, firstAvailCol, matrixrow;
+                                for (i = 0; i < trs.length; i++) {
+                                        cells = trs[i].cells;
+                                        for (j = 0; j < cells.length; j++) {
+                                                c = cells[j];
+                                                rowIndex = c.parentNode.rowIndex;
+                                                cellId = rowIndex + "-" + c.cellIndex;
+                                                rowSpan = c.rowSpan || 1;
+                                                colSpan = c.colSpan || 1;
+                                                if (typeof(matrix[rowIndex]) === "undefined") {
+                                                        matrix[rowIndex] = [];
+                                                }
+                                                // Find first available column in the first row
+                                                for (k = 0; k < matrix[rowIndex].length + 1; k++) {
+                                                        if (typeof(matrix[rowIndex][k]) === "undefined") {
+                                                                firstAvailCol = k;
+                                                                break;
+                                                        }
+                                                }
+                                                lookup[cellId] = firstAvailCol;
+                                                cols = Math.max(firstAvailCol, cols);
+                                                // add data-column
+                                                $(c).attr({ 'data-column' : firstAvailCol }); // 'data-row' : rowIndex
+                                                for (k = rowIndex; k < rowIndex + rowSpan; k++) {
+                                                        if (typeof(matrix[k]) === "undefined") {
+                                                                matrix[k] = [];
+                                                        }
+                                                        matrixrow = matrix[k];
+                                                        for (l = firstAvailCol; l < firstAvailCol + colSpan; l++) {
+                                                                matrixrow[l] = "x";
+                                                        }
+                                                }
+                                        }
+                                }
+                                // may not be accurate if # header columns !== # tbody columns
+                                t.config.columns = cols + 1; // add one because it's a zero-based index
+                                return lookup;
+                        }
+
+                        function formatSortingOrder(v) {
+                                // look for "d" in "desc" order; return true
+                                return (/^d/i.test(v) || v === 1);
+                        }
+
+                        function buildHeaders(table) {
+                                var header_index = computeThIndexes(table), ch, $t,
+                                        h, i, t, lock, time, c = table.config;
+                                c.headerList = [];
+                                c.headerContent = [];
+                                if (c.debug) {
+                                        time = new Date();
+                                }
+                                // add icon if cssIcon option exists
+                                i = c.cssIcon ? '<i class="' + ( c.cssIcon === ts.css.icon ? ts.css.icon : c.cssIcon + ' ' + ts.css.icon ) + '"></i>' : '';
+                                c.$headers = $(table).find(c.selectorHeaders).each(function(index) {
+                                        $t = $(this);
+                                        ch = c.headers[index];
+                                        c.headerContent[index] = $(this).html(); // save original header content
+                                        // set up header template
+                                        t = c.headerTemplate.replace(/\{content\}/g, $(this).html()).replace(/\{icon\}/g, i);
+                                        if (c.onRenderTemplate) {
+                                                h = c.onRenderTemplate.apply($t, [index, t]);
+                                                if (h && typeof h === 'string') { t = h; } // only change t if something is returned
+                                        }
+                                        $(this).html('<div class="tablesorter-header-inner">' + t + '</div>'); // faster than wrapInner
+
+                                        if (c.onRenderHeader) { c.onRenderHeader.apply($t, [index]); }
+
+                                        this.column = header_index[this.parentNode.rowIndex + "-" + this.cellIndex];
+                                        this.order = formatSortingOrder( ts.getData($t, ch, 'sortInitialOrder') || c.sortInitialOrder ) ? [1,0,2] : [0,1,2];
+                                        this.count = -1; // set to -1 because clicking on the header automatically adds one
+                                        this.lockedOrder = false;
+                                        lock = ts.getData($t, ch, 'lockedOrder') || false;
+                                        if (typeof lock !== 'undefined' && lock !== false) {
+                                                this.order = this.lockedOrder = formatSortingOrder(lock) ? [1,1,1] : [0,0,0];
+                                        }
+                                        $t.addClass(ts.css.header + ' ' + c.cssHeader);
+                                        // add cell to headerList
+                                        c.headerList[index] = this;
+                                        // add to parent in case there are multiple rows
+                                        $t.parent().addClass(ts.css.headerRow + ' ' + c.cssHeaderRow);
+                                        // allow keyboard cursor to focus on element
+                                        if (c.tabIndex) { $t.attr("tabindex", 0); }
+                                });
+                                // enable/disable sorting
+                                updateHeader(table);
+                                if (c.debug) {
+                                        benchmark("Built headers:", time);
+                                        log(c.$headers);
+                                }
+                        }
+
+                        function commonUpdate(table, resort, callback) {
+                                var c = table.config;
+                                // remove rows/elements before update
+                                c.$table.find(c.selectorRemove).remove();
+                                // rebuild parsers
+                                buildParserCache(table);
+                                // rebuild the cache map
+                                buildCache(table);
+                                checkResort(c.$table, resort, callback);
+                        }
+
+                        function updateHeader(table) {
+                                var s, c = table.config;
+                                c.$headers.each(function(index, th){
+                                        s = ts.getData( th, c.headers[index], 'sorter' ) === 'false';
+                                        th.sortDisabled = s;
+                                        $(th)[ s ? 'addClass' : 'removeClass' ]('sorter-false');
+                                });
+                        }
+
+                        function setHeadersCss(table) {
+                                var f, i, j, l,
+                                        c = table.config,
+                                        list = c.sortList,
+                                        css = [ts.css.sortAsc + ' ' + c.cssAsc, ts.css.sortDesc + ' ' + c.cssDesc],
+                                        // find the footer
+                                        $t = $(table).find('tfoot tr').children().removeClass(css.join(' '));
+                                // remove all header information
+                                c.$headers.removeClass(css.join(' '));
+                                l = list.length;
+                                for (i = 0; i < l; i++) {
+                                        // direction = 2 means reset!
+                                        if (list[i][1] !== 2) {
+                                                // multicolumn sorting updating - choose the :last in case there are nested columns
+                                                f = c.$headers.not('.sorter-false').filter('[data-column="' + list[i][0] + '"]' + (l === 1 ? ':last' : '') );
+                                                if (f.length) {
+                                                        for (j = 0; j < f.length; j++) {
+                                                                if (!f[j].sortDisabled) {
+                                                                        f.eq(j).addClass(css[list[i][1]]);
+                                                                        // add sorted class to footer, if it exists
+                                                                        if ($t.length) {
+                                                                                $t.filter('[data-column="' + list[i][0] + '"]').eq(j).addClass(css[list[i][1]]);
+                                                                        }
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+
+                        // automatically add col group, and column sizes if set
+                        function fixColumnWidth(table) {
+                                if (table.config.widthFixed && $(table).find('colgroup').length === 0) {
+                                        var colgroup = $('<colgroup>'),
+                                                overallWidth = $(table).width();
+                                        // only add col for visible columns - fixes #371
+                                        $(table.tBodies[0]).find("tr:first").children("td:visible").each(function() {
+                                                colgroup.append($('<col>').css('width', parseInt(($(this).width()/overallWidth)*1000, 10)/10 + '%'));
+                                        });
+                                        $(table).prepend(colgroup);
+                                }
+                        }
+
+                        function updateHeaderSortCount(table, list) {
+                                var s, t, o, c = table.config,
+                                        sl = list || c.sortList;
+                                c.sortList = [];
+                                $.each(sl, function(i,v){
+                                        // ensure all sortList values are numeric - fixes #127
+                                        s = [ parseInt(v[0], 10), parseInt(v[1], 10) ];
+                                        // make sure header exists
+                                        o = c.$headers[s[0]];
+                                        if (o) { // prevents error if sorton array is wrong
+                                                c.sortList.push(s);
+                                                t = $.inArray(s[1], o.order); // fixes issue #167
+                                                o.count = t >= 0 ? t : s[1] % (c.sortReset ? 3 : 2);
+                                        }
+                                });
+                        }
+
+                        function getCachedSortType(parsers, i) {
+                                return (parsers && parsers[i]) ? parsers[i].type || '' : '';
+                        }
+
+                        function initSort(table, cell, e){
+                                var a, i, j, o, s,
+                                        c = table.config,
+                                        k = !e[c.sortMultiSortKey],
+                                        $this = $(table);
+                                // Only call sortStart if sorting is enabled
+                                $this.trigger("sortStart", table);
+                                // get current column sort order
+                                cell.count = e[c.sortResetKey] ? 2 : (cell.count + 1) % (c.sortReset ? 3 : 2);
+                                // reset all sorts on non-current column - issue #30
+                                if (c.sortRestart) {
+                                        i = cell;
+                                        c.$headers.each(function() {
+                                                // only reset counts on columns that weren't just clicked on and if not included in a multisort
+                                                if (this !== i && (k || !$(this).is('.' + ts.css.sortDesc + ',.' + ts.css.sortAsc))) {
+                                                        this.count = -1;
+                                                }
+                                        });
+                                }
+                                // get current column index
+                                i = cell.column;
+                                // user only wants to sort on one column
+                                if (k) {
+                                        // flush the sort list
+                                        c.sortList = [];
+                                        if (c.sortForce !== null) {
+                                                a = c.sortForce;
+                                                for (j = 0; j < a.length; j++) {
+                                                        if (a[j][0] !== i) {
+                                                                c.sortList.push(a[j]);
+                                                        }
+                                                }
+                                        }
+                                        // add column to sort list
+                                        o = cell.order[cell.count];
+                                        if (o < 2) {
+                                                c.sortList.push([i, o]);
+                                                // add other columns if header spans across multiple
+                                                if (cell.colSpan > 1) {
+                                                        for (j = 1; j < cell.colSpan; j++) {
+                                                                c.sortList.push([i + j, o]);
+                                                        }
+                                                }
+                                        }
+                                        // multi column sorting
+                                } else {
+                                        // get rid of the sortAppend before adding more - fixes issue #115
+                                        if (c.sortAppend && c.sortList.length > 1) {
+                                                if (ts.isValueInArray(c.sortAppend[0][0], c.sortList)) {
+                                                        c.sortList.pop();
+                                                }
+                                        }
+                                        // the user has clicked on an already sorted column
+                                        if (ts.isValueInArray(i, c.sortList)) {
+                                                // reverse the sorting direction
+                                                for (j = 0; j < c.sortList.length; j++) {
+                                                        s = c.sortList[j];
+                                                        o = c.$headers[s[0]];
+                                                        if (s[0] === i) {
+                                                                // o.count seems to be incorrect when compared to cell.count
+                                                                s[1] = o.order[cell.count];
+                                                                if (s[1] === 2) {
+                                                                        c.sortList.splice(j,1);
+                                                                        o.count = -1;
+                                                                }
+                                                        }
+                                                }
+                                        } else {
+                                                // add column to sort list array
+                                                o = cell.order[cell.count];
+                                                if (o < 2) {
+                                                        c.sortList.push([i, o]);
+                                                        // add other columns if header spans across multiple
+                                                        if (cell.colSpan > 1) {
+                                                                for (j = 1; j < cell.colSpan; j++) {
+                                                                        c.sortList.push([i + j, o]);
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                }
+                                if (c.sortAppend !== null) {
+                                        a = c.sortAppend;
+                                        for (j = 0; j < a.length; j++) {
+                                                if (a[j][0] !== i) {
+                                                        c.sortList.push(a[j]);
+                                                }
+                                        }
+                                }
+                                // sortBegin event triggered immediately before the sort
+                                $this.trigger("sortBegin", table);
+                                // setTimeout needed so the processing icon shows up
+                                setTimeout(function(){
+                                        // set css for headers
+                                        setHeadersCss(table);
+                                        multisort(table);
+                                        appendToTable(table);
+                                }, 1);
+                        }
+
+                        // sort multiple columns
+                        function multisort(table) { /*jshint loopfunc:true */
+                                var i, k, num, col, colMax, cache, lc,
+                                        order, orgOrderCol, sortTime, sort, x, y,
+                                        dir = 0,
+                                        c = table.config,
+                                        cts = c.textSorter || '',
+                                        sortList = c.sortList,
+                                        l = sortList.length,
+                                        bl = table.tBodies.length;
+                                if (c.serverSideSorting || isEmptyObject(c.cache)) { // empty table - fixes #206/#346
+                                        return;
+                                }
+                                if (c.debug) { sortTime = new Date(); }
+                                for (k = 0; k < bl; k++) {
+                                        colMax = c.cache[k].colMax;
+                                        cache = c.cache[k].normalized;
+                                        lc = cache.length;
+                                        orgOrderCol = (cache && cache[0]) ? cache[0].length - 1 : 0;
+                                        cache.sort(function(a, b) {
+                                                // cache is undefined here in IE, so don't use it!
+                                                for (i = 0; i < l; i++) {
+                                                        col = sortList[i][0];
+                                                        order = sortList[i][1];
+                                                        // sort direction, true = asc, false = desc
+                                                        dir = order === 0;
+
+                                                        if (c.sortStable && a[col] === b[col] && l === 1) {
+                                                                return a[orgOrderCol] - b[orgOrderCol];
+                                                        }
+
+                                                        // fallback to natural sort since it is more robust
+                                                        num = /n/i.test(getCachedSortType(c.parsers, col));
+                                                        if (num && c.strings[col]) {
+                                                                // sort strings in numerical columns
+                                                                if (typeof (c.string[c.strings[col]]) === 'boolean') {
+                                                                        num = (dir ? 1 : -1) * (c.string[c.strings[col]] ? -1 : 1);
+                                                                } else {
+                                                                        num = (c.strings[col]) ? c.string[c.strings[col]] || 0 : 0;
+                                                                }
+                                                                // fall back to built-in numeric sort
+                                                                // var sort = $.tablesorter["sort" + s](table, a[c], b[c], c, colMax[c], dir);
+                                                                sort = c.numberSorter ? c.numberSorter(x[col], y[col], dir, colMax[col], table) :
+                                                                        ts[ 'sortNumeric' + (dir ? 'Asc' : 'Desc') ](a[col], b[col], num, colMax[col], col, table);
+                                                        } else {
+                                                                // set a & b depending on sort direction
+                                                                x = dir ? a : b;
+                                                                y = dir ? b : a;
+                                                                // text sort function
+                                                                if (typeof(cts) === 'function') {
+                                                                        // custom OVERALL text sorter
+                                                                        sort = cts(x[col], y[col], dir, col, table);
+                                                                } else if (typeof(cts) === 'object' && cts.hasOwnProperty(col)) {
+                                                                        // custom text sorter for a SPECIFIC COLUMN
+                                                                        sort = cts[col](x[col], y[col], dir, col, table);
+                                                                } else {
+                                                                        // fall back to natural sort
+                                                                        sort = ts[ 'sortNatural' + (dir ? 'Asc' : 'Desc') ](a[col], b[col], col, table, c);
+                                                                }
+                                                        }
+                                                        if (sort) { return sort; }
+                                                }
+                                                return a[orgOrderCol] - b[orgOrderCol];
+                                        });
+                                }
+                                if (c.debug) { benchmark("Sorting on " + sortList.toString() + " and dir " + order + " time", sortTime); }
+                        }
+
+                        function resortComplete($table, callback){
+                                var c = $table[0].config;
+                                if (c.pager && !c.pager.ajax) {
+                                        $table.trigger('updateComplete');
+                                }
+                                if (typeof callback === "function") {
+                                        callback($table[0]);
+                                }
+                        }
+
+                        function checkResort($table, flag, callback) {
+                                // don't try to resort if the table is still processing
+                                // this will catch spamming of the updateCell method
+                                if (flag !== false && !$table[0].isProcessing) {
+                                        $table.trigger("sorton", [$table[0].config.sortList, function(){
+                                                resortComplete($table, callback);
+                                        }]);
+                                } else {
+                                        resortComplete($table, callback);
+                                }
+                        }
+
+                        function bindEvents(table){
+                                var c = table.config,
+                                        $this = c.$table,
+                                        j, downTime;
+                                // apply event handling to headers
+                                c.$headers
+                                // http://stackoverflow.com/questions/5312849/jquery-find-self;
+                                .find(c.selectorSort).add( c.$headers.filter(c.selectorSort) )
+                                .unbind('mousedown.tablesorter mouseup.tablesorter sort.tablesorter keypress.tablesorter')
+                                .bind('mousedown.tablesorter mouseup.tablesorter sort.tablesorter keypress.tablesorter', function(e, external) {
+                                        // only recognize left clicks or enter
+                                        if ( ((e.which || e.button) !== 1 && !/sort|keypress/.test(e.type)) || (e.type === 'keypress' && e.which !== 13) ) {
+                                                return;
+                                        }
+                                        // ignore long clicks (prevents resizable widget from initializing a sort)
+                                        if (e.type === 'mouseup' && external !== true && (new Date().getTime() - downTime > 250)) { return; }
+                                        // set timer on mousedown
+                                        if (e.type === 'mousedown') {
+                                                downTime = new Date().getTime();
+                                                return e.target.tagName === "INPUT" ? '' : !c.cancelSelection;
+                                        }
+                                        if (c.delayInit && isEmptyObject(c.cache)) { buildCache(table); }
+                                        // jQuery v1.2.6 doesn't have closest()
+                                        var $cell = /TH|TD/.test(this.tagName) ? $(this) : $(this).parents('th, td').filter(':first'), cell = $cell[0];
+                                        if (!cell.sortDisabled) {
+                                                initSort(table, cell, e);
+                                        }
+                                });
+                                if (c.cancelSelection) {
+                                        // cancel selection
+                                        c.$headers
+                                                .attr('unselectable', 'on')
+                                                .bind('selectstart', false)
+                                                .css({
+                                                        'user-select': 'none',
+                                                        'MozUserSelect': 'none' // not needed for jQuery 1.8+
+                                                });
+                                }
+                                // apply easy methods that trigger bound events
+                                $this
+                                .unbind('sortReset update updateRows updateCell updateAll addRows sorton appendCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave '.split(' ').join('.tablesorter '))
+                                .bind("sortReset.tablesorter", function(e){
+                                        e.stopPropagation();
+                                        c.sortList = [];
+                                        setHeadersCss(table);
+                                        multisort(table);
+                                        appendToTable(table);
+                                })
+                                .bind("updateAll.tablesorter", function(e, resort, callback){
+                                        e.stopPropagation();
+                                        ts.refreshWidgets(table, true, true);
+                                        ts.restoreHeaders(table);
+                                        buildHeaders(table);
+                                        bindEvents(table);
+                                        commonUpdate(table, resort, callback);
+                                })
+                                .bind("update.tablesorter updateRows.tablesorter", function(e, resort, callback) {
+                                        e.stopPropagation();
+                                        // update sorting (if enabled/disabled)
+                                        updateHeader(table);
+                                        commonUpdate(table, resort, callback);
+                                })
+                                .bind("updateCell.tablesorter", function(e, cell, resort, callback) {
+                                        e.stopPropagation();
+                                        $this.find(c.selectorRemove).remove();
+                                        // get position from the dom
+                                        var l, row, icell,
+                                        $tb = $this.find('tbody'),
+                                        // update cache - format: function(s, table, cell, cellIndex)
+                                        // no closest in jQuery v1.2.6 - tbdy = $tb.index( $(cell).closest('tbody') ),$row = $(cell).closest('tr');
+                                        tbdy = $tb.index( $(cell).parents('tbody').filter(':first') ),
+                                        $row = $(cell).parents('tr').filter(':first');
+                                        cell = $(cell)[0]; // in case cell is a jQuery object
+                                        // tbody may not exist if update is initialized while tbody is removed for processing
+                                        if ($tb.length && tbdy >= 0) {
+                                                row = $tb.eq(tbdy).find('tr').index( $row );
+                                                icell = cell.cellIndex;
+                                                l = c.cache[tbdy].normalized[row].length - 1;
+                                                c.cache[tbdy].row[table.config.cache[tbdy].normalized[row][l]] = $row;
+                                                c.cache[tbdy].normalized[row][icell] = c.parsers[icell].format( getElementText(table, cell, icell), table, cell, icell );
+                                                checkResort($this, resort, callback);
+                                        }
+                                })
+                                .bind("addRows.tablesorter", function(e, $row, resort, callback) {
+                                        e.stopPropagation();
+                                        if (isEmptyObject(c.cache)) {
+                                                // empty table, do an update instead - fixes #450
+                                                updateHeader(table);
+                                                commonUpdate(table, resort, callback);
+                                        } else {
+                                                var i, rows = $row.filter('tr').length,
+                                                dat = [], l = $row[0].cells.length,
+                                                tbdy = $this.find('tbody').index( $row.parents('tbody').filter(':first') );
+                                                // fixes adding rows to an empty table - see issue #179
+                                                if (!c.parsers) {
+                                                        buildParserCache(table);
+                                                }
+                                                // add each row
+                                                for (i = 0; i < rows; i++) {
+                                                        // add each cell
+                                                        for (j = 0; j < l; j++) {
+                                                                dat[j] = c.parsers[j].format( getElementText(table, $row[i].cells[j], j), table, $row[i].cells[j], j );
+                                                        }
+                                                        // add the row index to the end
+                                                        dat.push(c.cache[tbdy].row.length);
+                                                        // update cache
+                                                        c.cache[tbdy].row.push([$row[i]]);
+                                                        c.cache[tbdy].normalized.push(dat);
+                                                        dat = [];
+                                                }
+                                                // resort using current settings
+                                                checkResort($this, resort, callback);
+                                        }
+                                })
+                                .bind("sorton.tablesorter", function(e, list, callback, init) {
+                                        var c = table.config;
+                                        e.stopPropagation();
+                                        $this.trigger("sortStart", this);
+                                        // update header count index
+                                        updateHeaderSortCount(table, list);
+                                        // set css for headers
+                                        setHeadersCss(table);
+                                        // fixes #346
+                                        if (c.delayInit && isEmptyObject(c.cache)) { buildCache(table); }
+                                        $this.trigger("sortBegin", this);
+                                        // sort the table and append it to the dom
+                                        multisort(table);
+                                        appendToTable(table, init);
+                                        if (typeof callback === "function") {
+                                                callback(table);
+                                        }
+                                })
+                                .bind("appendCache.tablesorter", function(e, callback, init) {
+                                        e.stopPropagation();
+                                        appendToTable(table, init);
+                                        if (typeof callback === "function") {
+                                                callback(table);
+                                        }
+                                })
+                                .bind("applyWidgetId.tablesorter", function(e, id) {
+                                        e.stopPropagation();
+                                        ts.getWidgetById(id).format(table, c, c.widgetOptions);
+                                })
+                                .bind("applyWidgets.tablesorter", function(e, init) {
+                                        e.stopPropagation();
+                                        // apply widgets
+                                        ts.applyWidget(table, init);
+                                })
+                                .bind("refreshWidgets.tablesorter", function(e, all, dontapply){
+                                        e.stopPropagation();
+                                        ts.refreshWidgets(table, all, dontapply);
+                                })
+                                .bind("destroy.tablesorter", function(e, c, cb){
+                                        e.stopPropagation();
+                                        ts.destroy(table, c, cb);
+                                });
+                        }
+
+                        /* public methods */
+                        ts.construct = function(settings) {
+                                return this.each(function() {
+                                        var table = this,
+                                                // merge & extend config options
+                                                c = $.extend(true, {}, ts.defaults, settings);
+                                        // create a table from data (build table widget)
+                                        if (!table.hasInitialized && ts.buildTable && this.tagName !== 'TABLE') {
+                                                // return the table (in case the original target is the table's container)
+                                                ts.buildTable(table, c);
+                                        }
+                                        ts.setup(table, c);
+                                });
+                        };
+
+                        ts.setup = function(table, c) {
+                                // if no thead or tbody, or tablesorter is already present, quit
+                                if (!table || !table.tHead || table.tBodies.length === 0 || table.hasInitialized === true) {
+                                        return c.debug ? log('stopping initialization! No table, thead, tbody or tablesorter has already been initialized') : '';
+                                }
+
+                                var k = '',
+                                        $this = $(table),
+                                        m = $.metadata;
+                                // initialization flag
+                                table.hasInitialized = false;
+                                // table is being processed flag
+                                table.isProcessing = true;
+                                // make sure to store the config object
+                                table.config = c;
+                                // save the settings where they read
+                                $.data(table, "tablesorter", c);
+                                if (c.debug) { $.data( table, 'startoveralltimer', new Date()); }
+
+                                // constants
+                                c.supportsTextContent = $('<span>x</span>')[0].textContent === 'x';
+                                // removing this in version 3 (only supports jQuery 1.7+)
+                                c.supportsDataObject = (function(version) {
+                                        version[0] = parseInt(version[0], 10);
+                                        return (version[0] > 1) || (version[0] === 1 && parseInt(version[1], 10) >= 4);
+                                })($.fn.jquery.split("."));
+                                // digit sort text location; keeping max+/- for backwards compatibility
+                                c.string = { 'max': 1, 'min': -1, 'max+': 1, 'max-': -1, 'zero': 0, 'none': 0, 'null': 0, 'top': true, 'bottom': false };
+                                // add table theme class only if there isn't already one there
+                                if (!/tablesorter\-/.test($this.attr('class'))) {
+                                        k = (c.theme !== '' ? ' tablesorter-' + c.theme : '');
+                                }
+                                c.$table = $this.addClass(ts.css.table + ' ' + c.tableClass + k);
+                                c.$tbodies = $this.children('tbody:not(.' + c.cssInfoBlock + ')');
+                                c.widgetInit = {}; // keep a list of initialized widgets
+                                // build headers
+                                buildHeaders(table);
+                                // fixate columns if the users supplies the fixedWidth option
+                                // do this after theme has been applied
+                                fixColumnWidth(table);
+                                // try to auto detect column type, and store in tables config
+                                buildParserCache(table);
+                                // build the cache for the tbody cells
+                                // delayInit will delay building the cache until the user starts a sort
+                                if (!c.delayInit) { buildCache(table); }
+                                // bind all header events and methods
+                                bindEvents(table);
+                                // get sort list from jQuery data or metadata
+                                // in jQuery < 1.4, an error occurs when calling $this.data()
+                                if (c.supportsDataObject && typeof $this.data().sortlist !== 'undefined') {
+                                        c.sortList = $this.data().sortlist;
+                                } else if (m && ($this.metadata() && $this.metadata().sortlist)) {
+                                        c.sortList = $this.metadata().sortlist;
+                                }
+                                // apply widget init code
+                                ts.applyWidget(table, true);
+                                // if user has supplied a sort list to constructor
+                                if (c.sortList.length > 0) {
+                                        $this.trigger("sorton", [c.sortList, {}, !c.initWidgets]);
+                                } else if (c.initWidgets) {
+                                        // apply widget format
+                                        ts.applyWidget(table);
+                                }
+
+                                // show processesing icon
+                                if (c.showProcessing) {
+                                        $this
+                                        .unbind('sortBegin.tablesorter sortEnd.tablesorter')
+                                        .bind('sortBegin.tablesorter sortEnd.tablesorter', function(e) {
+                                                ts.isProcessing(table, e.type === 'sortBegin');
+                                        });
+                                }
+
+                                // initialized
+                                table.hasInitialized = true;
+                                table.isProcessing = false;
+                                if (c.debug) {
+                                        ts.benchmark("Overall initialization time", $.data( table, 'startoveralltimer'));
+                                }
+                                $this.trigger('tablesorter-initialized', table);
+                                if (typeof c.initialized === 'function') { c.initialized(table); }
+                        };
+
+                        // *** Process table ***
+                        // add processing indicator
+                        ts.isProcessing = function(table, toggle, $ths) {
+                                table = $(table);
+                                var c = table[0].config,
+                                        // default to all headers
+                                        $h = $ths || table.find('.' + ts.css.header);
+                                if (toggle) {
+                                        if (c.sortList.length > 0) {
+                                                // get headers from the sortList
+                                                $h = $h.filter(function(){
+                                                        // get data-column from attr to keep  compatibility with jQuery 1.2.6
+                                                        return this.sortDisabled ? false : ts.isValueInArray( parseFloat($(this).attr('data-column')), c.sortList);
+                                                });
+                                        }
+                                        $h.addClass(ts.css.processing + ' ' + c.cssProcessing);
+                                } else {
+                                        $h.removeClass(ts.css.processing + ' ' + c.cssProcessing);
+                                }
+                        };
+
+                        // detach tbody but save the position
+                        // don't use tbody because there are portions that look for a tbody index (updateCell)
+                        ts.processTbody = function(table, $tb, getIt){
+                                var holdr;
+                                if (getIt) {
+                                        table.isProcessing = true;
+                                        $tb.before('<span class="tablesorter-savemyplace"/>');
+                                        holdr = ($.fn.detach) ? $tb.detach() : $tb.remove();
+                                        return holdr;
+                                }
+                                holdr = $(table).find('span.tablesorter-savemyplace');
+                                $tb.insertAfter( holdr );
+                                holdr.remove();
+                                table.isProcessing = false;
+                        };
+
+                        ts.clearTableBody = function(table) {
+                                $(table)[0].config.$tbodies.empty();
+                        };
+
+                        // restore headers
+                        ts.restoreHeaders = function(table){
+                                var c = table.config;
+                                // don't use c.$headers here in case header cells were swapped
+                                c.$table.find(c.selectorHeaders).each(function(i){
+                                        // only restore header cells if it is wrapped
+                                        // because this is also used by the updateAll method
+                                        if ($(this).find('.tablesorter-header-inner').length){
+                                                $(this).html( c.headerContent[i] );
+                                        }
+                                });
+                        };
+
+                        ts.destroy = function(table, removeClasses, callback){
+                                table = $(table)[0];
+                                if (!table.hasInitialized) { return; }
+                                // remove all widgets
+                                ts.refreshWidgets(table, true, true);
+                                var $t = $(table), c = table.config,
+                                $h = $t.find('thead:first'),
+                                $r = $h.find('tr.' + ts.css.headerRow).removeClass(ts.css.headerRow + ' ' + c.cssHeaderRow),
+                                $f = $t.find('tfoot:first > tr').children('th, td');
+                                // remove widget added rows, just in case
+                                $h.find('tr').not($r).remove();
+                                // disable tablesorter
+                                $t
+                                        .removeData('tablesorter')
+                                        .unbind('sortReset update updateAll updateRows updateCell addRows sorton appendCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd '.split(' ').join('.tablesorter '));
+                                c.$headers.add($f)
+                                        .removeClass( [ts.css.header, c.cssHeader, c.cssAsc, c.cssDesc, ts.css.sortAsc, ts.css.sortDesc].join(' ') )
+                                        .removeAttr('data-column');
+                                $r.find(c.selectorSort).unbind('mousedown.tablesorter mouseup.tablesorter keypress.tablesorter');
+                                ts.restoreHeaders(table);
+                                if (removeClasses !== false) {
+                                        $t.removeClass(ts.css.table + ' ' + c.tableClass + ' tablesorter-' + c.theme);
+                                }
+                                // clear flag in case the plugin is initialized again
+                                table.hasInitialized = false;
+                                if (typeof callback === 'function') {
+                                        callback(table);
+                                }
+                        };
+
+                        // *** sort functions ***
+                        // regex used in natural sort
+                        ts.regex = {
+                                chunk : /(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi, // chunk/tokenize numbers & letters
+                                hex: /^0x[0-9a-f]+$/i // hex
+                        };
+
+                        // Natural sort - https://github.com/overset/javascript-natural-sort (date sorting removed)
+                        ts.sortNatural = function(a, b) {
+                                if (a === b) { return 0; }
+                                var xN, xD, yN, yD, xF, yF, i, mx,
+                                        r = ts.regex;
+                                // first try and sort Hex codes
+                                if (r.hex.test(b)) {
+                                        xD = parseInt(a.match(r.hex), 16);
+                                        yD = parseInt(b.match(r.hex), 16);
+                                        if ( xD < yD ) { return -1; }
+                                        if ( xD > yD ) { return 1; }
+                                }
+
+                                // chunk/tokenize
+                                xN = a.replace(r.chunk, '\\0$1\\0').replace(/\\0$/, '').replace(/^\\0/, '').split('\\0');
+                                yN = b.replace(r.chunk, '\\0$1\\0').replace(/\\0$/, '').replace(/^\\0/, '').split('\\0');
+                                mx = Math.max(xN.length, yN.length);
+                                // natural sorting through split numeric strings and default strings
+                                for (i = 0; i < mx; i++) {
+                                        // find floats not starting with '0', string or 0 if not defined
+                                        xF = isNaN(xN[i]) ? xN[i] || 0 : parseFloat(xN[i]) || 0;
+                                        yF = isNaN(yN[i]) ? yN[i] || 0 : parseFloat(yN[i]) || 0;
+                                        // handle numeric vs string comparison - number < string - (Kyle Adams)
+                                        if (isNaN(xF) !== isNaN(yF)) { return (isNaN(xF)) ? 1 : -1; }
+                                        // rely on string comparison if different types - i.e. '02' < 2 != '02' < '2'
+                                        if (typeof xF !== typeof yF) {
+                                                xF += '';
+                                                yF += '';
+                                        }
+                                        if (xF < yF) { return -1; }
+                                        if (xF > yF) { return 1; }
+                                }
+                                return 0;
+                        };
+
+                        ts.sortNaturalAsc = function(a, b, col, table, c) {
+                                if (a === b) { return 0; }
+                                var e = c.string[ (c.empties[col] || c.emptyTo ) ];
+                                if (a === '' && e !== 0) { return typeof e === 'boolean' ? (e ? -1 : 1) : -e || -1; }
+                                if (b === '' && e !== 0) { return typeof e === 'boolean' ? (e ? 1 : -1) : e || 1; }
+                                return ts.sortNatural(a, b);
+                        };
+
+                        ts.sortNaturalDesc = function(a, b, col, table, c) {
+                                if (a === b) { return 0; }
+                                var e = c.string[ (c.empties[col] || c.emptyTo ) ];
+                                if (a === '' && e !== 0) { return typeof e === 'boolean' ? (e ? -1 : 1) : e || 1; }
+                                if (b === '' && e !== 0) { return typeof e === 'boolean' ? (e ? 1 : -1) : -e || -1; }
+                                return ts.sortNatural(b, a);
+                        };
+
+                        // basic alphabetical sort
+                        ts.sortText = function(a, b) {
+                                return a > b ? 1 : (a < b ? -1 : 0);
+                        };
+
+                        // return text string value by adding up ascii value
+                        // so the text is somewhat sorted when using a digital sort
+                        // this is NOT an alphanumeric sort
+                        ts.getTextValue = function(a, num, mx) {
+                                if (mx) {
+                                        // make sure the text value is greater than the max numerical value (mx)
+                                        var i, l = a ? a.length : 0, n = mx + num;
+                                        for (i = 0; i < l; i++) {
+                                                n += a.charCodeAt(i);
+                                        }
+                                        return num * n;
+                                }
+                                return 0;
+                        };
+
+                        ts.sortNumericAsc = function(a, b, num, mx, col, table) {
+                                if (a === b) { return 0; }
+                                var c = table.config,
+                                        e = c.string[ (c.empties[col] || c.emptyTo ) ];
+                                if (a === '' && e !== 0) { return typeof e === 'boolean' ? (e ? -1 : 1) : -e || -1; }
+                                if (b === '' && e !== 0) { return typeof e === 'boolean' ? (e ? 1 : -1) : e || 1; }
+                                if (isNaN(a)) { a = ts.getTextValue(a, num, mx); }
+                                if (isNaN(b)) { b = ts.getTextValue(b, num, mx); }
+                                return a - b;
+                        };
+
+                        ts.sortNumericDesc = function(a, b, num, mx, col, table) {
+                                if (a === b) { return 0; }
+                                var c = table.config,
+                                        e = c.string[ (c.empties[col] || c.emptyTo ) ];
+                                if (a === '' && e !== 0) { return typeof e === 'boolean' ? (e ? -1 : 1) : e || 1; }
+                                if (b === '' && e !== 0) { return typeof e === 'boolean' ? (e ? 1 : -1) : -e || -1; }
+                                if (isNaN(a)) { a = ts.getTextValue(a, num, mx); }
+                                if (isNaN(b)) { b = ts.getTextValue(b, num, mx); }
+                                return b - a;
+                        };
+
+                        ts.sortNumeric = function(a, b) {
+                                return a - b;
+                        };
+
+                        // used when replacing accented characters during sorting
+                        ts.characterEquivalents = {
+                                "a" : "\u00e1\u00e0\u00e2\u00e3\u00e4\u0105\u00e5", // áàâãäąå
+                                "A" : "\u00c1\u00c0\u00c2\u00c3\u00c4\u0104\u00c5", // ÁÀÂÃÄĄÅ
+                                "c" : "\u00e7\u0107\u010d", // çćč
+                                "C" : "\u00c7\u0106\u010c", // ÇĆČ
+                                "e" : "\u00e9\u00e8\u00ea\u00eb\u011b\u0119", // éèêëěę
+                                "E" : "\u00c9\u00c8\u00ca\u00cb\u011a\u0118", // ÉÈÊËĚĘ
+                                "i" : "\u00ed\u00ec\u0130\u00ee\u00ef\u0131", // íìİîïı
+                                "I" : "\u00cd\u00cc\u0130\u00ce\u00cf", // ÍÌİÎÏ
+                                "o" : "\u00f3\u00f2\u00f4\u00f5\u00f6", // óòôõö
+                                "O" : "\u00d3\u00d2\u00d4\u00d5\u00d6", // ÓÒÔÕÖ
+                                "ss": "\u00df", // ß (s sharp)
+                                "SS": "\u1e9e", // ẞ (Capital sharp s)
+                                "u" : "\u00fa\u00f9\u00fb\u00fc\u016f", // úùûüů
+                                "U" : "\u00da\u00d9\u00db\u00dc\u016e" // ÚÙÛÜŮ
+                        };
+                        ts.replaceAccents = function(s) {
+                                var a, acc = '[', eq = ts.characterEquivalents;
+                                if (!ts.characterRegex) {
+                                        ts.characterRegexArray = {};
+                                        for (a in eq) {
+                                                if (typeof a === 'string') {
+                                                        acc += eq[a];
+                                                        ts.characterRegexArray[a] = new RegExp('[' + eq[a] + ']', 'g');
+                                                }
+                                        }
+                                        ts.characterRegex = new RegExp(acc + ']');
+                                }
+                                if (ts.characterRegex.test(s)) {
+                                        for (a in eq) {
+                                                if (typeof a === 'string') {
+                                                        s = s.replace( ts.characterRegexArray[a], a );
+                                                }
+                                        }
+                                }
+                                return s;
+                        };
+
+                        // *** utilities ***
+                        ts.isValueInArray = function(v, a) {
+                                var i, l = a.length;
+                                for (i = 0; i < l; i++) {
+                                        if (a[i][0] === v) {
+                                                return true;
+                                        }
+                                }
+                                return false;
+                        };
+
+                        ts.addParser = function(parser) {
+                                var i, l = ts.parsers.length, a = true;
+                                for (i = 0; i < l; i++) {
+                                        if (ts.parsers[i].id.toLowerCase() === parser.id.toLowerCase()) {
+                                                a = false;
+                                        }
+                                }
+                                if (a) {
+                                        ts.parsers.push(parser);
+                                }
+                        };
+
+                        ts.getParserById = function(name) {
+                                var i, l = ts.parsers.length;
+                                for (i = 0; i < l; i++) {
+                                        if (ts.parsers[i].id.toLowerCase() === (name.toString()).toLowerCase()) {
+                                                return ts.parsers[i];
+                                        }
+                                }
+                                return false;
+                        };
+
+                        ts.addWidget = function(widget) {
+                                ts.widgets.push(widget);
+                        };
+
+                        ts.getWidgetById = function(name) {
+                                var i, w, l = ts.widgets.length;
+                                for (i = 0; i < l; i++) {
+                                        w = ts.widgets[i];
+                                        if (w && w.hasOwnProperty('id') && w.id.toLowerCase() === name.toLowerCase()) {
+                                                return w;
+                                        }
+                                }
+                        };
+
+                        ts.applyWidget = function(table, init) {
+                                table = $(table)[0]; // in case this is called externally
+                                var c = table.config,
+                                        wo = c.widgetOptions,
+                                        widgets = [],
+                                        time, w, wd;
+                                if (c.debug) { time = new Date(); }
+                                if (c.widgets.length) {
+                                        // ensure unique widget ids
+                                        c.widgets = $.grep(c.widgets, function(v, k){
+                                                return $.inArray(v, c.widgets) === k;
+                                        });
+                                        // build widget array & add priority as needed
+                                        $.each(c.widgets || [], function(i,n){
+                                                wd = ts.getWidgetById(n);
+                                                if (wd && wd.id) {
+                                                        // set priority to 10 if not defined
+                                                        if (!wd.priority) { wd.priority = 10; }
+                                                        widgets[i] = wd;
+                                                }
+                                        });
+                                        // sort widgets by priority
+                                        widgets.sort(function(a, b){
+                                                return a.priority < b.priority ? -1 : a.priority === b.priority ? 0 : 1;
+                                        });
+                                        // add/update selected widgets
+                                        $.each(widgets, function(i,w){
+                                                if (w) {
+                                                        if (init || !(c.widgetInit[w.id])) {
+                                                                if (w.hasOwnProperty('options')) {
+                                                                        wo = table.config.widgetOptions = $.extend( true, {}, w.options, wo );
+                                                                }
+                                                                if (w.hasOwnProperty('init')) {
+                                                                        w.init(table, w, c, wo);
+                                                                }
+                                                                c.widgetInit[w.id] = true;
+                                                        }
+                                                        if (!init && w.hasOwnProperty('format')) {
+                                                                w.format(table, c, wo, false);
+                                                        }
+                                                }
+                                        });
+                                }
+                                if (c.debug) {
+                                        w = c.widgets.length;
+                                        benchmark("Completed " + (init === true ? "initializing " : "applying ") + w + " widget" + (w !== 1 ? "s" : ""), time);
+                                }
+                        };
+
+                        ts.refreshWidgets = function(table, doAll, dontapply) {
+                                table = $(table)[0]; // see issue #243
+                                var i, c = table.config,
+                                        cw = c.widgets,
+                                        w = ts.widgets, l = w.length;
+                                // remove previous widgets
+                                for (i = 0; i < l; i++){
+                                        if ( w[i] && w[i].id && (doAll || $.inArray( w[i].id, cw ) < 0) ) {
+                                                if (c.debug) { log( 'Refeshing widgets: Removing ' + w[i].id  ); }
+                                                // only remove widgets that have been initialized - fixes #442
+                                                if (w[i].hasOwnProperty('remove') && c.widgetInit[w[i].id]) {
+                                                        w[i].remove(table, c, c.widgetOptions);
+                                                        c.widgetInit[w[i].id] = false;
+                                                }
+                                        }
+                                }
+                                if (dontapply !== true) {
+                                        ts.applyWidget(table, doAll);
+                                }
+                        };
+
+                        // get sorter, string, empty, etc options for each column from
+                        // jQuery data, metadata, header option or header class name ("sorter-false")
+                        // priority = jQuery data > meta > headers option > header class name
+                        ts.getData = function(h, ch, key) {
+                                var val = '', $h = $(h), m, cl;
+                                if (!$h.length) { return ''; }
+                                m = $.metadata ? $h.metadata() : false;
+                                cl = ' ' + ($h.attr('class') || '');
+                                if (typeof $h.data(key) !== 'undefined' || typeof $h.data(key.toLowerCase()) !== 'undefined'){
+                                        // "data-lockedOrder" is assigned to "lockedorder"; but "data-locked-order" is assigned to "lockedOrder"
+                                        // "data-sort-initial-order" is assigned to "sortInitialOrder"
+                                        val += $h.data(key) || $h.data(key.toLowerCase());
+                                } else if (m && typeof m[key] !== 'undefined') {
+                                        val += m[key];
+                                } else if (ch && typeof ch[key] !== 'undefined') {
+                                        val += ch[key];
+                                } else if (cl !== ' ' && cl.match(' ' + key + '-')) {
+                                        // include sorter class name "sorter-text", etc; now works with "sorter-my-custom-parser"
+                                        val = cl.match( new RegExp('\\s' + key + '-([\\w-]+)') )[1] || '';
+                                }
+                                return $.trim(val);
+                        };
+
+                        ts.formatFloat = function(s, table) {
+                                if (typeof s !== 'string' || s === '') { return s; }
+                                // allow using formatFloat without a table; defaults to US number format
+                                var i,
+                                        t = table && table.config ? table.config.usNumberFormat !== false :
+                                                typeof table !== "undefined" ? table : true;
+                                if (t) {
+                                        // US Format - 1,234,567.89 -> 1234567.89
+                                        s = s.replace(/,/g,'');
+                                } else {
+                                        // German Format = 1.234.567,89 -> 1234567.89
+                                        // French Format = 1 234 567,89 -> 1234567.89
+                                        s = s.replace(/[\s|\.]/g,'').replace(/,/g,'.');
+                                }
+                                if(/^\s*\([.\d]+\)/.test(s)) {
+                                        // make (#) into a negative number -> (10) = -10
+                                        s = s.replace(/^\s*\(([.\d]+)\)/, '-$1');
+                                }
+                                i = parseFloat(s);
+                                // return the text instead of zero
+                                return isNaN(i) ? $.trim(s) : i;
+                        };
+
+                        ts.isDigit = function(s) {
+                                // replace all unwanted chars and match
+                                return isNaN(s) ? (/^[\-+(]?\d+[)]?$/).test(s.toString().replace(/[,.'"\s]/g, '')) : true;
+                        };
+
+                }()
+        });
+
+        // make shortcut
+        var ts = $.tablesorter;
+
+        // extend plugin scope
+        $.fn.extend({
+                tablesorter: ts.construct
+        });
+
+        // add default parsers
+        ts.addParser({
+                id: "text",
+                is: function() {
+                        return true;
+                },
+                format: function(s, table) {
+                        var c = table.config;
+                        if (s) {
+                                s = $.trim( c.ignoreCase ? s.toLocaleLowerCase() : s );
+                                s = c.sortLocaleCompare ? ts.replaceAccents(s) : s;
+                        }
+                        return s;
+                },
+                type: "text"
+        });
+
+        ts.addParser({
+                id: "digit",
+                is: function(s) {
+                        return ts.isDigit(s);
+                },
+                format: function(s, table) {
+                        var n = ts.formatFloat((s || '').replace(/[^\w,. \-()]/g, ""), table);
+                        return s && typeof n === 'number' ? n : s ? $.trim( s && table.config.ignoreCase ? s.toLocaleLowerCase() : s ) : s;
+                },
+                type: "numeric"
+        });
+
+        ts.addParser({
+                id: "currency",
+                is: function(s) {
+                        return (/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/).test((s || '').replace(/[,. ]/g,'')); // £$€¤¥¢
+                },
+                format: function(s, table) {
+                        var n = ts.formatFloat((s || '').replace(/[^\w,. \-()]/g, ""), table);
+                        return s && typeof n === 'number' ? n : s ? $.trim( s && table.config.ignoreCase ? s.toLocaleLowerCase() : s ) : s;
+                },
+                type: "numeric"
+        });
+
+        ts.addParser({
+                id: "ipAddress",
+                is: function(s) {
+                        return (/^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/).test(s);
+                },
+                format: function(s, table) {
+                        var i, a = s ? s.split(".") : '',
+                        r = "",
+                        l = a.length;
+                        for (i = 0; i < l; i++) {
+                                r += ("00" + a[i]).slice(-3);
+                        }
+                        return s ? ts.formatFloat(r, table) : s;
+                },
+                type: "numeric"
+        });
+
+        ts.addParser({
+                id: "url",
+                is: function(s) {
+                        return (/^(https?|ftp|file):\/\//).test(s);
+                },
+                format: function(s) {
+                        return s ? $.trim(s.replace(/(https?|ftp|file):\/\//, '')) : s;
+                },
+                type: "text"
+        });
+
+        ts.addParser({
+                id: "isoDate",
+                is: function(s) {
+                        return (/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/).test(s);
+                },
+                format: function(s, table) {
+                        return s ? ts.formatFloat((s !== "") ? (new Date(s.replace(/-/g, "/")).getTime() || "") : "", table) : s;
+                },
+                type: "numeric"
+        });
+
+        ts.addParser({
+                id: "percent",
+                is: function(s) {
+                        return (/(\d\s*?%|%\s*?\d)/).test(s) && s.length < 15;
+                },
+                format: function(s, table) {
+                        return s ? ts.formatFloat(s.replace(/%/g, ""), table) : s;
+                },
+                type: "numeric"
+        });
+
+        ts.addParser({
+                id: "usLongDate",
+                is: function(s) {
+                        // two digit years are not allowed cross-browser
+                        // Jan 01, 2013 12:34:56 PM or 01 Jan 2013
+                        return (/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i).test(s) || (/^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i).test(s);
+                },
+                format: function(s, table) {
+                        return s ? ts.formatFloat( (new Date(s.replace(/(\S)([AP]M)$/i, "$1 $2")).getTime() || ''), table) : s;
+                },
+                type: "numeric"
+        });
+
+        ts.addParser({
+                id: "shortDate", // "mmddyyyy", "ddmmyyyy" or "yyyymmdd"
+                is: function(s) {
+                        // testing for ##-##-#### or ####-##-##, so it's not perfect; time can be included
+                        return (/(^\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4})|(^\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2})/).test((s || '').replace(/\s+/g," ").replace(/[\-.,]/g, "/"));
+                },
+                format: function(s, table, cell, cellIndex) {
+                        if (s) {
+                                var c = table.config, ci = c.headerList[cellIndex],
+                                format = ci.dateFormat || ts.getData( ci, c.headers[cellIndex], 'dateFormat') || c.dateFormat;
+                                s = s.replace(/\s+/g," ").replace(/[\-.,]/g, "/"); // escaped - because JSHint in Firefox was showing it as an error
+                                if (format === "mmddyyyy") {
+                                        s = s.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/, "$3/$1/$2");
+                                } else if (format === "ddmmyyyy") {
+                                        s = s.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/, "$3/$2/$1");
+                                } else if (format === "yyyymmdd") {
+                                        s = s.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/, "$1/$2/$3");
+                                }
+                        }
+                        return s ? ts.formatFloat( (new Date(s).getTime() || ''), table) : s;
+                },
+                type: "numeric"
+        });
+
+        ts.addParser({
+                id: "time",
+                is: function(s) {
+                        return (/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i).test(s);
+                },
+                format: function(s, table) {
+                        return s ? ts.formatFloat( (new Date("2000/01/01 " + s.replace(/(\S)([AP]M)$/i, "$1 $2")).getTime() || ""), table) : s;
+                },
+                type: "numeric"
+        });
+
+        ts.addParser({
+                id: "metadata",
+                is: function() {
+                        return false;
+                },
+                format: function(s, table, cell) {
+                        var c = table.config,
+                        p = (!c.parserMetadataName) ? 'sortValue' : c.parserMetadataName;
+                        return $(cell).metadata()[p];
+                },
+                type: "numeric"
+        });
+
+        // add default widgets
+        ts.addWidget({
+                id: "zebra",
+                priority: 90,
+                format: function(table, c, wo) {
+                        var $tb, $tv, $tr, row, even, time, k, l,
+                        child = new RegExp(c.cssChildRow, 'i'),
+                        b = c.$tbodies;
+                        if (c.debug) {
+                                time = new Date();
+                        }
+                        for (k = 0; k < b.length; k++ ) {
+                                // loop through the visible rows
+                                $tb = b.eq(k);
+                                l = $tb.children('tr').length;
+                                if (l > 1) {
+                                        row = 0;
+                                        $tv = $tb.children('tr:visible').not(c.selectorRemove);
+                                        // revered back to using jQuery each - strangely it's the fastest method
+                                        /*jshint loopfunc:true */
+                                        $tv.each(function(){
+                                                $tr = $(this);
+                                                // style children rows the same way the parent row was styled
+                                                if (!child.test(this.className)) { row++; }
+                                                even = (row % 2 === 0);
+                                                $tr.removeClass(wo.zebra[even ? 1 : 0]).addClass(wo.zebra[even ? 0 : 1]);
+                                        });
+                                }
+                        }
+                        if (c.debug) {
+                                ts.benchmark("Applying Zebra widget", time);
+                        }
+                },
+                remove: function(table, c, wo){
+                        var k, $tb,
+                                b = c.$tbodies,
+                                rmv = (wo.zebra || [ "even", "odd" ]).join(' ');
+                        for (k = 0; k < b.length; k++ ){
+                                $tb = $.tablesorter.processTbody(table, b.eq(k), true); // remove tbody
+                                $tb.children().removeClass(rmv);
+                                $.tablesorter.processTbody(table, $tb, false); // restore tbody
+                        }
+                }
+        });
+
 })(jQuery);

extensions/UserAdvManager/branches/2.6/admin/template/js/jquery.tablesorter.min.js

@@ -1 @@
-
-(function($){$.extend({tablesorter:new
-function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:true,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'/\.|\,/g',onRenderHeader:null,selectorHeaders:'thead th',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}if(table.tBodies.length==0)return;var rows=table.tBodies[0].rows;if(rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i<l;i++){var p=false;if($.metadata&&($($headers[i]).metadata()&&$($headers[i]).metadata().sorter)){p=getParserById($($headers[i]).metadata().sorter);}else if((table.config.headers[i]&&table.config.headers[i].sorter)){p=getParserById(table.config.headers[i].sorter);}if(!p){p=detectParserForColumn(table,rows,-1,i);}if(table.config.debug){parsersDebug+="column:"+i+" parser:"+p.id+"\n";}list.push(p);}}if(table.config.debug){log(parsersDebug);}return list;};function detectParserForColumn(table,rows,rowIndex,cellIndex){var l=parsers.length,node=false,nodeValue=false,keepLooking=true;while(nodeValue==''&&keepLooking){rowIndex++;if(rows[rowIndex]){node=getNodeFromRowAndCellIndex(rows,rowIndex,cellIndex);nodeValue=trimAndGetNodeText(table.config,node);if(table.config.debug){log('Checking if value was empty on row:'+rowIndex);}}else{keepLooking=false;}}for(var i=1;i<l;i++){if(parsers[i].is(nodeValue,table,node)){return parsers[i];}}return parsers[0];}function getNodeFromRowAndCellIndex(rows,rowIndex,cellIndex){return rows[rowIndex].cells[cellIndex];}function trimAndGetNodeText(config,node){return $.trim(getElementText(config,node));}function getParserById(name){var l=parsers.length;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==name.toLowerCase()){return parsers[i];}}return false;}function buildCache(table){if(table.config.debug){var cacheTime=new Date();}var totalRows=(table.tBodies[0]&&table.tBodies[0].rows.length)||0,totalCells=(table.tBodies[0].rows[0]&&table.tBodies[0].rows[0].cells.length)||0,parsers=table.config.parsers,cache={row:[],normalized:[]};for(var i=0;i<totalRows;++i){var c=$(table.tBodies[0].rows[i]),cols=[];if(c.hasClass(table.config.cssChildRow)){cache.row[cache.row.length-1]=cache.row[cache.row.length-1].add(c);continue;}cache.row.push(c);for(var j=0;j<totalCells;++j){cols.push(parsers[j].format(getElementText(table.config,c[0].cells[j]),table,c[0].cells[j]));}cols.push(cache.normalized.length);cache.normalized.push(cols);cols=null;};if(table.config.debug){benchmark("Building cache for "+totalRows+" rows:",cacheTime);}return cache;};function getElementText(config,node){var text="";if(!node)return"";if(!config.supportsTextContent)config.supportsTextContent=node.textContent||false;if(config.textExtraction=="simple"){if(config.supportsTextContent){text=node.textContent;}else{if(node.childNodes[0]&&node.childNodes[0].hasChildNodes()){text=node.childNodes[0].innerHTML;}else{text=node.innerHTML;}}}else{if(typeof(config.textExtraction)=="function"){text=config.textExtraction(node);}else{text=$(node).text();}}return text;}function appendToTable(table,cache){if(table.config.debug){var appendTime=new Date()}var c=cache,r=c.row,n=c.normalized,totalRows=n.length,checkCell=(n[0].length-1),tableBody=$(table.tBodies[0]),rows=[];for(var i=0;i<totalRows;i++){var pos=n[i][checkCell];rows.push(r[pos]);if(!table.config.appender){var l=r[pos].length;for(var j=0;j<l;j++){tableBody[0].appendChild(r[pos][j]);}}}if(table.config.appender){table.config.appender(table,rows);}rows=null;if(table.config.debug){benchmark("Rebuilt table:",appendTime);}applyWidget(table);setTimeout(function(){$(table).trigger("sortEnd");},0);};function buildHeaders(table){if(table.config.debug){var time=new Date();}var meta=($.metadata)?true:false;var header_index=computeTableHeaderCellIndexes(table);$tableHeaders=$(table.config.selectorHeaders,table).each(function(index){this.column=header_index[this.parentNode.rowIndex+"-"+this.cellIndex];this.order=formatSortingOrder(table.config.sortInitialOrder);this.count=this.order;if(checkHeaderMetadata(this)||checkHeaderOptions(table,index))this.sortDisabled=true;if(checkHeaderOptionsSortingLocked(table,index))this.order=this.lockedOrder=checkHeaderOptionsSortingLocked(table,index);if(!this.sortDisabled){var $th=$(this).addClass(table.config.cssHeader);if(table.config.onRenderHeader)table.config.onRenderHeader.apply($th);}table.config.headerList[index]=this;});if(table.config.debug){benchmark("Built headers:",time);log($tableHeaders);}return $tableHeaders;};function computeTableHeaderCellIndexes(t){var matrix=[];var lookup={};var thead=t.getElementsByTagName('THEAD')[0];var trs=thead.getElementsByTagName('TR');for(var i=0;i<trs.length;i++){var cells=trs[i].cells;for(var j=0;j<cells.length;j++){var c=cells[j];var rowIndex=c.parentNode.rowIndex;var cellId=rowIndex+"-"+c.cellIndex;var rowSpan=c.rowSpan||1;var colSpan=c.colSpan||1
-var firstAvailCol;if(typeof(matrix[rowIndex])=="undefined"){matrix[rowIndex]=[];}for(var k=0;k<matrix[rowIndex].length+1;k++){if(typeof(matrix[rowIndex][k])=="undefined"){firstAvailCol=k;break;}}lookup[cellId]=firstAvailCol;for(var k=rowIndex;k<rowIndex+rowSpan;k++){if(typeof(matrix[k])=="undefined"){matrix[k]=[];}var matrixrow=matrix[k];for(var l=firstAvailCol;l<firstAvailCol+colSpan;l++){matrixrow[l]="x";}}}}return lookup;}function checkCellColSpan(table,rows,row){var arr=[],r=table.tHead.rows,c=r[row].cells;for(var i=0;i<c.length;i++){var cell=c[i];if(cell.colSpan>1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHeaderOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i<l;i++){getWidgetById(c[i]).format(table);}}function getWidgetById(name){var l=widgets.length;for(var i=0;i<l;i++){if(widgets[i].id.toLowerCase()==name.toLowerCase()){return widgets[i];}}};function formatSortingOrder(v){if(typeof(v)!="Number"){return(v.toLowerCase()=="desc")?1:0;}else{return(v==1)?1:0;}}function isValueInArray(v,a){var l=a.length;for(var i=0;i<l;i++){if(a[i][0]==v){return true;}}return false;}function setHeadersCss(table,$headers,list,css){$headers.removeClass(css[0]).removeClass(css[1]);var h=[];$headers.each(function(offset){if(!this.sortDisabled){h[this.column]=$(this);}});var l=list.length;for(var i=0;i<l;i++){h[list[i][0]].addClass(css[list[i][1]]);}}function fixColumnWidth(table,$headers){var c=table.config;if(c.widthFixed){var colgroup=$('<colgroup>');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('<col>').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i<l;i++){var s=sortList[i],o=c.headerList[s[0]];o.count=s[1];o.count++;}}function multisort(table,sortList,cache){if(table.config.debug){var sortTime=new Date();}var dynamicExp="var sortWrapper = function(a,b) {",l=sortList.length;for(var i=0;i<l;i++){var c=sortList[i][0];var order=sortList[i][1];var s=(table.config.parsers[c].type=="text")?((order==0)?makeSortFunction("text","asc",c):makeSortFunction("text","desc",c)):((order==0)?makeSortFunction("numeric","asc",c):makeSortFunction("numeric","desc",c));var e="e"+i;dynamicExp+="var "+e+" = "+s;dynamicExp+="if("+e+") { return "+e+"; } ";dynamicExp+="else { ";}var orgOrderCol=cache.normalized[0].length-1;dynamicExp+="return a["+orgOrderCol+"]-b["+orgOrderCol+"];";for(var i=0;i<l;i++){dynamicExp+="}; ";}dynamicExp+="return 0; ";dynamicExp+="}; ";if(table.config.debug){benchmark("Evaling expression:"+dynamicExp,new Date());}eval(dynamicExp);cache.normalized.sort(sortWrapper);if(table.config.debug){benchmark("Sorting on "+sortList.toString()+" and dir "+order+" time:",sortTime);}return cache;};function makeSortFunction(type,direction,index){var a="a["+index+"]",b="b["+index+"]";if(type=='text'&&direction=='asc'){return"("+a+" == "+b+" ? 0 : ("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : ("+a+" < "+b+") ? -1 : 1 )));";}else if(type=='text'&&direction=='desc'){return"("+a+" == "+b+" ? 0 : ("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : ("+b+" < "+a+") ? -1 : 1 )));";}else if(type=='numeric'&&direction=='asc'){return"("+a+" === null && "+b+" === null) ? 0 :("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : "+a+" - "+b+"));";}else if(type=='numeric'&&direction=='desc'){return"("+a+" === null && "+b+" === null) ? 0 :("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : "+b+" - "+a+"));";}};function makeSortText(i){return"((a["+i+"] < b["+i+"]) ? -1 : ((a["+i+"] > b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((a<b)?-1:((a>b)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((b<a)?-1:((b>a)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j<a.length;j++){if(a[j][0]!=i){config.sortList.push(a[j]);}}}config.sortList.push([i,this.order]);}else{if(isValueInArray(i,config.sortList)){for(var j=0;j<config.sortList.length;j++){var s=config.sortList[j],o=config.headerList[s[0]];if(s[0]==i){o.count=s[1];o.count++;s[1]=o.count%2;}}}else{config.sortList.push([i,this.order]);}};setTimeout(function(){setHeadersCss($this[0],$headers,config.sortList,sortCSS);appendToTable($this[0],multisort($this[0],config.sortList,cache));},1);return false;}}).mousedown(function(){if(config.cancelSelection){this.onselectstart=function(){return false};return false;}});$this.bind("update",function(){var me=this;setTimeout(function(){me.config.parsers=buildParserCache(me,$headers);cache=buildCache(me);},1);}).bind("updateCell",function(e,cell){var config=this.config;var pos=[(cell.parentNode.rowIndex-1),cell.cellIndex];cache.normalized[pos[0]][pos[1]]=config.parsers[pos[1]].format(getElementText(config,cell),cell);}).bind("sorton",function(e,list){$(this).trigger("sortStart");config.sortList=list;var sortList=config.sortList;updateHeaderSortCount(this,sortList);setHeadersCss(this,$headers,sortList,sortCSS);appendToTable(this,multisort(this,sortList,cache));}).bind("appendCache",function(){appendToTable(this,cache);}).bind("applyWidgetId",function(e,id){getWidgetById(id).format(this);}).bind("applyWidgets",function(){applyWidget(this);});if($.metadata&&($(this).metadata()&&$(this).metadata().sortlist)){config.sortList=$(this).metadata().sortlist;}if(config.sortList.length>0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==parser.id.toLowerCase()){a=false;}}if(a){parsers.push(parser);};};this.addWidget=function(widget){widgets.push(widget);};this.formatFloat=function(s){var i=parseFloat(s);return(isNaN(i))?0:i;};this.formatInt=function(s){var i=parseInt(s);return(isNaN(i))?0:i;};this.isDigit=function(s,config){return/^[-+]?\d*$/.test($.trim(s.replace(/[,.']/g,'')));};this.clearTableBody=function(table){if($.browser.msie){function empty(){while(this.firstChild)this.removeChild(this.firstChild);}empty.apply(table.tBodies[0]);}else{table.tBodies[0].innerHTML="";}};}});$.fn.extend({tablesorter:$.tablesorter.construct});var ts=$.tablesorter;ts.addParser({id:"text",is:function(s){return true;},format:function(s){return $.trim(s.toLocaleLowerCase());},type:"text"});ts.addParser({id:"digit",is:function(s,table){var c=table.config;return $.tablesorter.isDigit(s,c);},format:function(s){return $.tablesorter.formatFloat(s);},type:"numeric"});ts.addParser({id:"currency",is:function(s){return/^[£$€?.]/.test(s);},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/[£$€]/g),""));},type:"numeric"});ts.addParser({id:"ipAddress",is:function(s){return/^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s);},format:function(s){var a=s.split("."),r="",l=a.length;for(var i=0;i<l;i++){var item=a[i];if(item.length==2){r+="0"+item;}else{r+=item;}}return $.tablesorter.formatFloat(r);},type:"numeric"});ts.addParser({id:"url",is:function(s){return/^(https?|ftp|file):\/\/$/.test(s);},format:function(s){return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//),''));},type:"text"});ts.addParser({id:"isoDate",is:function(s){return/^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s);},format:function(s){return $.tablesorter.formatFloat((s!="")?new Date(s.replace(new RegExp(/-/g),"/")).getTime():"0");},type:"numeric"});ts.addParser({id:"percent",is:function(s){return/\%$/.test($.trim(s));},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g),""));},type:"numeric"});ts.addParser({id:"usLongDate",is:function(s){return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/));},format:function(s){return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"shortDate",is:function(s){return/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s);},format:function(s,table){var c=table.config;s=s.replace(/\-/g,"/");if(c.dateFormat=="us"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$1/$2");}else if(c.dateFormat=="uk"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$2/$1");}else if(c.dateFormat=="dd/mm/yy"||c.dateFormat=="dd-mm-yy"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/,"$1/$2/$3");}return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"time",is:function(s){return/^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s);},format:function(s){return $.tablesorter.formatFloat(new Date("2000/01/01 "+s).getTime());},type:"numeric"});ts.addParser({id:"metadata",is:function(s){return false;},format:function(s,table,cell){var c=table.config,p=(!c.parserMetadataName)?'sortValue':c.parserMetadataName;return $(cell).metadata()[p];},type:"numeric"});ts.addWidget({id:"zebra",format:function(table){if(table.config.debug){var time=new Date();}var $tr,row=-1,odd;$("tr:visible",table.tBodies[0]).each(function(i){$tr=$(this);if(!$tr.hasClass(table.config.cssChildRow))row++;odd=(row%2==0);$tr.removeClass(table.config.widgetZebra.css[odd?0:1]).addClass(table.config.widgetZebra.css[odd?1:0])});if(table.config.debug){$.tablesorter.benchmark("Applying Zebra widget",time);}}});})(jQuery);
+/*!
+* TableSorter 2.14.4 min - Client-side table sorting with ease!
+* Copyright (c) 2007 Christian Bach
+*/
+!function(g){g.extend({tablesorter:new function(){function c(){var a=1<arguments.length?Array.prototype.slice.call(arguments):arguments[0];"undefined"!==typeof console&&"undefined"!==typeof console.log?console.log(a):alert(a)}function r(a,b){c(a+" ("+((new Date).getTime()-b.getTime())+"ms)")}function k(a){for(var b in a)return!1;return!0}function p(a,b,d){if(!b)return"";var h=a.config,e=h.textExtraction,n="",n="simple"===e?h.supportsTextContent?b.textContent:g(b).text():"function"===typeof e?e(b, a,d):"object"===typeof e&&e.hasOwnProperty(d)?e[d](b,a,d):h.supportsTextContent?b.textContent:g(b).text();return g.trim(n)}function s(a){var b=a.config,d=b.$tbodies=b.$table.children("tbody:not(."+b.cssInfoBlock+")"),h,e,n,l,x,g,m,v="";if(0===d.length)return b.debug?c("*Empty table!* Not building a parser cache"):"";b.debug&&(m=new Date,c("Detecting parsers for each column"));d=d[0].rows;if(d[0])for(h=[],e=d[0].cells.length,n=0;n<e;n++){l=b.$headers.filter(":not([colspan])");l=l.add(b.$headers.filter('[colspan="1"]')).filter('[data-column="'+ n+'"]:last');x=b.headers[n];g=f.getParserById(f.getData(l,x,"sorter"));b.empties[n]=f.getData(l,x,"empty")||b.emptyTo||(b.emptyToBottom?"bottom":"top");b.strings[n]=f.getData(l,x,"string")||b.stringTo||"max";if(!g)a:{l=a;x=d;g=-1;for(var k=n,u=void 0,A=f.parsers.length,q=!1,s="",u=!0;""===s&&u;)g++,x[g]?(q=x[g].cells[k],s=p(l,q,k),l.config.debug&&c("Checking if value was empty on row "+g+", column: "+k+': "'+s+'"')):u=!1;for(;0<=--A;)if((u=f.parsers[A])&&"text"!==u.id&&u.is&&u.is(s,l,q)){g=u;break a}g= f.getParserById("text")}b.debug&&(v+="column:"+n+"; parser:"+g.id+"; string:"+b.strings[n]+"; empty: "+b.empties[n]+"\n");h.push(g)}b.debug&&(c(v),r("Completed detecting parsers",m));b.parsers=h}function w(a){var b=a.tBodies,d=a.config,h,e,n=d.parsers,l,x,y,m,v,k,u,A=[];d.cache={};if(!n)return d.debug?c("*Empty table!* Not building a cache"):"";d.debug&&(u=new Date);d.showProcessing&&f.isProcessing(a,!0);for(m=0;m<b.length;m++)if(d.cache[m]={row:[],normalized:[]},!g(b[m]).hasClass(d.cssInfoBlock)){h= b[m]&&b[m].rows.length||0;e=b[m].rows[0]&&b[m].rows[0].cells.length||0;for(x=0;x<h;++x)if(v=g(b[m].rows[x]),k=[],v.hasClass(d.cssChildRow))d.cache[m].row[d.cache[m].row.length-1]=d.cache[m].row[d.cache[m].row.length-1].add(v);else{d.cache[m].row.push(v);for(y=0;y<e;++y)l=p(a,v[0].cells[y],y),l=n[y].format(l,a,v[0].cells[y],y),k.push(l),"numeric"===(n[y].type||"").toLowerCase()&&(A[y]=Math.max(Math.abs(l)||0,A[y]||0));k.push(d.cache[m].normalized.length);d.cache[m].normalized.push(k)}d.cache[m].colMax= A}d.showProcessing&&f.isProcessing(a);d.debug&&r("Building cache for "+h+" rows",u)}function z(a,b){var d=a.config,h=d.widgetOptions,e=a.tBodies,n=[],l=d.cache,c,y,m,v,p,u,A,q,s,t,w;if(!k(l)){d.debug&&(w=new Date);for(q=0;q<e.length;q++)if(c=g(e[q]),c.length&&!c.hasClass(d.cssInfoBlock)){p=f.processTbody(a,c,!0);c=l[q].row;y=l[q].normalized;v=(m=y.length)?y[0].length-1:0;for(u=0;u<m;u++)if(t=y[u][v],n.push(c[t]),!d.appender||d.pager&&!(d.pager.removeRows&&h.pager_removeRows||d.pager.ajax))for(s=c[t].length, A=0;A<s;A++)p.append(c[t][A]);f.processTbody(a,p,!1)}d.appender&&d.appender(a,n);d.debug&&r("Rebuilt table",w);b||d.appender||f.applyWidget(a);g(a).trigger("sortEnd",a);g(a).trigger("updateComplete",a)}}function D(a){var b=[],d={},h=0,e=g(a).find("thead:eq(0), tfoot").children("tr"),n,l,c,f,m,k,r,p,t,q;for(n=0;n<e.length;n++)for(m=e[n].cells,l=0;l<m.length;l++){f=m[l];k=f.parentNode.rowIndex;r=k+"-"+f.cellIndex;p=f.rowSpan||1;t=f.colSpan||1;"undefined"===typeof b[k]&&(b[k]=[]);for(c=0;c<b[k].length+ 1;c++)if("undefined"===typeof b[k][c]){q=c;break}d[r]=q;h=Math.max(q,h);g(f).attr({"data-column":q});for(c=k;c<k+p;c++)for("undefined"===typeof b[c]&&(b[c]=[]),r=b[c],f=q;f<q+t;f++)r[f]="x"}a.config.columns=h+1;return d}function C(a){return/^d/i.test(a)||1===a}function E(a){var b=D(a),d,h,e,n,l,x,k,m=a.config;m.headerList=[];m.headerContent=[];m.debug&&(k=new Date);n=m.cssIcon?'<i class="'+(m.cssIcon===f.css.icon?f.css.icon:m.cssIcon+" "+f.css.icon)+'"></i>':"";m.$headers=g(a).find(m.selectorHeaders).each(function(a){h= g(this);d=m.headers[a];m.headerContent[a]=g(this).html();l=m.headerTemplate.replace(/\{content\}/g,g(this).html()).replace(/\{icon\}/g,n);m.onRenderTemplate&&(e=m.onRenderTemplate.apply(h,[a,l]))&&"string"===typeof e&&(l=e);g(this).html('<div class="tablesorter-header-inner">'+l+"</div>");m.onRenderHeader&&m.onRenderHeader.apply(h,[a]);this.column=b[this.parentNode.rowIndex+"-"+this.cellIndex];this.order=C(f.getData(h,d,"sortInitialOrder")||m.sortInitialOrder)?[1,0,2]:[0,1,2];this.count=-1;this.lockedOrder= !1;x=f.getData(h,d,"lockedOrder")||!1;"undefined"!==typeof x&&!1!==x&&(this.order=this.lockedOrder=C(x)?[1,1,1]:[0,0,0]);h.addClass(f.css.header+" "+m.cssHeader);m.headerList[a]=this;h.parent().addClass(f.css.headerRow+" "+m.cssHeaderRow);m.tabIndex&&h.attr("tabindex",0)});F(a);m.debug&&(r("Built headers:",k),c(m.$headers))}function B(a,b,d){var h=a.config;h.$table.find(h.selectorRemove).remove();s(a);w(a);G(h.$table,b,d)}function F(a){var b,d=a.config;d.$headers.each(function(a,e){b="false"===f.getData(e, d.headers[a],"sorter");e.sortDisabled=b;g(e)[b?"addClass":"removeClass"]("sorter-false")})}function H(a){var b,d,h,e=a.config,n=e.sortList,l=[f.css.sortAsc+" "+e.cssAsc,f.css.sortDesc+" "+e.cssDesc],c=g(a).find("tfoot tr").children().removeClass(l.join(" "));e.$headers.removeClass(l.join(" "));h=n.length;for(b=0;b<h;b++)if(2!==n[b][1]&&(a=e.$headers.not(".sorter-false").filter('[data-column="'+n[b][0]+'"]'+(1===h?":last":"")),a.length))for(d=0;d<a.length;d++)a[d].sortDisabled||(a.eq(d).addClass(l[n[b][1]]), c.length&&c.filter('[data-column="'+n[b][0]+'"]').eq(d).addClass(l[n[b][1]]))}function L(a){if(a.config.widthFixed&&0===g(a).find("colgroup").length){var b=g("<colgroup>"),d=g(a).width();g(a.tBodies[0]).find("tr:first").children("td:visible").each(function(){b.append(g("<col>").css("width",parseInt(g(this).width()/d*1E3,10)/10+"%"))});g(a).prepend(b)}}function M(a,b){var d,h,e,n=a.config,c=b||n.sortList;n.sortList=[];g.each(c,function(a,b){d=[parseInt(b[0],10),parseInt(b[1],10)];if(e=n.$headers[d[0]])n.sortList.push(d), h=g.inArray(d[1],e.order),e.count=0<=h?h:d[1]%(n.sortReset?3:2)})}function N(a,b){return a&&a[b]?a[b].type||"":""}function O(a,b,d){var h,e,n,c=a.config,x=!d[c.sortMultiSortKey],k=g(a);k.trigger("sortStart",a);b.count=d[c.sortResetKey]?2:(b.count+1)%(c.sortReset?3:2);c.sortRestart&&(e=b,c.$headers.each(function(){this===e||!x&&g(this).is("."+f.css.sortDesc+",."+f.css.sortAsc)||(this.count=-1)}));e=b.column;if(x){c.sortList=[];if(null!==c.sortForce)for(h=c.sortForce,d=0;d<h.length;d++)h[d][0]!==e&& c.sortList.push(h[d]);h=b.order[b.count];if(2>h&&(c.sortList.push([e,h]),1<b.colSpan))for(d=1;d<b.colSpan;d++)c.sortList.push([e+d,h])}else if(c.sortAppend&&1<c.sortList.length&&f.isValueInArray(c.sortAppend[0][0],c.sortList)&&c.sortList.pop(),f.isValueInArray(e,c.sortList))for(d=0;d<c.sortList.length;d++)n=c.sortList[d],h=c.$headers[n[0]],n[0]===e&&(n[1]=h.order[b.count],2===n[1]&&(c.sortList.splice(d,1),h.count=-1));else if(h=b.order[b.count],2>h&&(c.sortList.push([e,h]),1<b.colSpan))for(d=1;d< b.colSpan;d++)c.sortList.push([e+d,h]);if(null!==c.sortAppend)for(h=c.sortAppend,d=0;d<h.length;d++)h[d][0]!==e&&c.sortList.push(h[d]);k.trigger("sortBegin",a);setTimeout(function(){H(a);I(a);z(a)},1)}function I(a){var b,d,c,e,n,l,g,p,m,v,t,u,s=0,q=a.config,w=q.textSorter||"",z=q.sortList,B=z.length,C=a.tBodies.length;if(!q.serverSideSorting&&!k(q.cache)){q.debug&&(m=new Date);for(d=0;d<C;d++)n=q.cache[d].colMax,p=(l=q.cache[d].normalized)&&l[0]?l[0].length-1:0,l.sort(function(d,l){for(b=0;b<B;b++){e= z[b][0];g=z[b][1];s=0===g;if(q.sortStable&&d[e]===l[e]&&1===B)break;(c=/n/i.test(N(q.parsers,e)))&&q.strings[e]?(c="boolean"===typeof q.string[q.strings[e]]?(s?1:-1)*(q.string[q.strings[e]]?-1:1):q.strings[e]?q.string[q.strings[e]]||0:0,v=q.numberSorter?q.numberSorter(t[e],u[e],s,n[e],a):f["sortNumeric"+(s?"Asc":"Desc")](d[e],l[e],c,n[e],e,a)):(t=s?d:l,u=s?l:d,v="function"===typeof w?w(t[e],u[e],s,e,a):"object"===typeof w&&w.hasOwnProperty(e)?w[e](t[e],u[e],s,e,a):f["sortNatural"+(s?"Asc":"Desc")](d[e], l[e],e,a,q));if(v)return v}return d[p]-l[p]});q.debug&&r("Sorting on "+z.toString()+" and dir "+g+" time",m)}}function J(a,b){var d=a[0].config;d.pager&&!d.pager.ajax&&a.trigger("updateComplete");"function"===typeof b&&b(a[0])}function G(a,b,d){!1===b||a[0].isProcessing?J(a,d):a.trigger("sorton",[a[0].config.sortList,function(){J(a,d)}])}function K(a){var b=a.config,d=b.$table,c,e;b.$headers.find(b.selectorSort).add(b.$headers.filter(b.selectorSort)).unbind("mousedown.tablesorter mouseup.tablesorter sort.tablesorter keypress.tablesorter").bind("mousedown.tablesorter mouseup.tablesorter sort.tablesorter keypress.tablesorter", function(d,c){if(!(1!==(d.which||d.button)&&!/sort|keypress/.test(d.type)||"keypress"===d.type&&13!==d.which||"mouseup"===d.type&&!0!==c&&250<(new Date).getTime()-e)){if("mousedown"===d.type)return e=(new Date).getTime(),"INPUT"===d.target.tagName?"":!b.cancelSelection;b.delayInit&&k(b.cache)&&w(a);var h=(/TH|TD/.test(this.tagName)?g(this):g(this).parents("th, td").filter(":first"))[0];h.sortDisabled||O(a,h,d)}});b.cancelSelection&&b.$headers.attr("unselectable","on").bind("selectstart",!1).css({"user-select":"none", MozUserSelect:"none"});d.unbind("sortReset update updateRows updateCell updateAll addRows sorton appendCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave ".split(" ").join(".tablesorter ")).bind("sortReset.tablesorter",function(d){d.stopPropagation();b.sortList=[];H(a);I(a);z(a)}).bind("updateAll.tablesorter",function(b,d,c){b.stopPropagation();f.refreshWidgets(a,!0,!0);f.restoreHeaders(a);E(a);K(a);B(a,d,c)}).bind("update.tablesorter updateRows.tablesorter",function(b,d,c){b.stopPropagation(); F(a);B(a,d,c)}).bind("updateCell.tablesorter",function(c,e,h,f){c.stopPropagation();d.find(b.selectorRemove).remove();var m,k,r;m=d.find("tbody");c=m.index(g(e).parents("tbody").filter(":first"));var s=g(e).parents("tr").filter(":first");e=g(e)[0];m.length&&0<=c&&(k=m.eq(c).find("tr").index(s),r=e.cellIndex,m=b.cache[c].normalized[k].length-1,b.cache[c].row[a.config.cache[c].normalized[k][m]]=s,b.cache[c].normalized[k][r]=b.parsers[r].format(p(a,e,r),a,e,r),G(d,h,f))}).bind("addRows.tablesorter", function(e,f,g,r){e.stopPropagation();if(k(b.cache))F(a),B(a,g,r);else{var m=f.filter("tr").length,v=[],w=f[0].cells.length,u=d.find("tbody").index(f.parents("tbody").filter(":first"));b.parsers||s(a);for(e=0;e<m;e++){for(c=0;c<w;c++)v[c]=b.parsers[c].format(p(a,f[e].cells[c],c),a,f[e].cells[c],c);v.push(b.cache[u].row.length);b.cache[u].row.push([f[e]]);b.cache[u].normalized.push(v);v=[]}G(d,g,r)}}).bind("sorton.tablesorter",function(b,c,e,h){var f=a.config;b.stopPropagation();d.trigger("sortStart", this);M(a,c);H(a);f.delayInit&&k(f.cache)&&w(a);d.trigger("sortBegin",this);I(a);z(a,h);"function"===typeof e&&e(a)}).bind("appendCache.tablesorter",function(b,d,c){b.stopPropagation();z(a,c);"function"===typeof d&&d(a)}).bind("applyWidgetId.tablesorter",function(d,c){d.stopPropagation();f.getWidgetById(c).format(a,b,b.widgetOptions)}).bind("applyWidgets.tablesorter",function(b,d){b.stopPropagation();f.applyWidget(a,d)}).bind("refreshWidgets.tablesorter",function(b,d,c){b.stopPropagation();f.refreshWidgets(a, d,c)}).bind("destroy.tablesorter",function(b,d,c){b.stopPropagation();f.destroy(a,d,c)})}var f=this;f.version="2.14.4";f.parsers=[];f.widgets=[];f.defaults={theme:"default",widthFixed:!1,showProcessing:!1,headerTemplate:"{content}",onRenderTemplate:null,onRenderHeader:null,cancelSelection:!0,tabIndex:!0,dateFormat:"mmddyyyy",sortMultiSortKey:"shiftKey",sortResetKey:"ctrlKey",usNumberFormat:!0,delayInit:!1,serverSideSorting:!1,headers:{},ignoreCase:!0,sortForce:null,sortList:[],sortAppend:null,sortStable:!1, sortInitialOrder:"asc",sortLocaleCompare:!1,sortReset:!1,sortRestart:!1,emptyTo:"bottom",stringTo:"max",textExtraction:"simple",textSorter:null,numberSorter:null,widgets:[],widgetOptions:{zebra:["even","odd"]},initWidgets:!0,initialized:null,tableClass:"",cssAsc:"",cssDesc:"",cssHeader:"",cssHeaderRow:"",cssProcessing:"",cssChildRow:"tablesorter-childRow",cssIcon:"tablesorter-icon",cssInfoBlock:"tablesorter-infoOnly",selectorHeaders:"> thead th, > thead td",selectorSort:"th, td",selectorRemove:".remove-me", debug:!1,headerList:[],empties:{},strings:{},parsers:[]};f.css={table:"tablesorter",childRow:"tablesorter-childRow",header:"tablesorter-header",headerRow:"tablesorter-headerRow",icon:"tablesorter-icon",info:"tablesorter-infoOnly",processing:"tablesorter-processing",sortAsc:"tablesorter-headerAsc",sortDesc:"tablesorter-headerDesc"};f.log=c;f.benchmark=r;f.construct=function(a){return this.each(function(){var b=g.extend(!0,{},f.defaults,a);!this.hasInitialized&&f.buildTable&&"TABLE"!==this.tagName&& f.buildTable(this,b);f.setup(this,b)})};f.setup=function(a,b){if(!a||!a.tHead||0===a.tBodies.length||!0===a.hasInitialized)return b.debug?c("stopping initialization! No table, thead, tbody or tablesorter has already been initialized"):"";var d="",h=g(a),e=g.metadata;a.hasInitialized=!1;a.isProcessing=!0;a.config=b;g.data(a,"tablesorter",b);b.debug&&g.data(a,"startoveralltimer",new Date);b.supportsTextContent="x"===g("<span>x</span>")[0].textContent;b.supportsDataObject=function(a){a[0]=parseInt(a[0], 10);return 1<a[0]||1===a[0]&&4<=parseInt(a[1],10)}(g.fn.jquery.split("."));b.string={max:1,min:-1,"max+":1,"max-":-1,zero:0,none:0,"null":0,top:!0,bottom:!1};/tablesorter\-/.test(h.attr("class"))||(d=""!==b.theme?" tablesorter-"+b.theme:"");b.$table=h.addClass(f.css.table+" "+b.tableClass+d);b.$tbodies=h.children("tbody:not(."+b.cssInfoBlock+")");b.widgetInit={};E(a);L(a);s(a);b.delayInit||w(a);K(a);b.supportsDataObject&&"undefined"!==typeof h.data().sortlist?b.sortList=h.data().sortlist:e&&h.metadata()&& h.metadata().sortlist&&(b.sortList=h.metadata().sortlist);f.applyWidget(a,!0);0<b.sortList.length?h.trigger("sorton",[b.sortList,{},!b.initWidgets]):b.initWidgets&&f.applyWidget(a);b.showProcessing&&h.unbind("sortBegin.tablesorter sortEnd.tablesorter").bind("sortBegin.tablesorter sortEnd.tablesorter",function(b){f.isProcessing(a,"sortBegin"===b.type)});a.hasInitialized=!0;a.isProcessing=!1;b.debug&&f.benchmark("Overall initialization time",g.data(a,"startoveralltimer"));h.trigger("tablesorter-initialized", a);"function"===typeof b.initialized&&b.initialized(a)};f.isProcessing=function(a,b,d){a=g(a);var c=a[0].config;a=d||a.find("."+f.css.header);b?(0<c.sortList.length&&(a=a.filter(function(){return this.sortDisabled?!1:f.isValueInArray(parseFloat(g(this).attr("data-column")),c.sortList)})),a.addClass(f.css.processing+" "+c.cssProcessing)):a.removeClass(f.css.processing+" "+c.cssProcessing)};f.processTbody=function(a,b,d){if(d)return a.isProcessing=!0,b.before('<span class="tablesorter-savemyplace"/>'), d=g.fn.detach?b.detach():b.remove();d=g(a).find("span.tablesorter-savemyplace");b.insertAfter(d);d.remove();a.isProcessing=!1};f.clearTableBody=function(a){g(a)[0].config.$tbodies.empty()};f.restoreHeaders=function(a){var b=a.config;b.$table.find(b.selectorHeaders).each(function(a){g(this).find(".tablesorter-header-inner").length&&g(this).html(b.headerContent[a])})};f.destroy=function(a,b,d){a=g(a)[0];if(a.hasInitialized){f.refreshWidgets(a,!0,!0);var c=g(a),e=a.config,n=c.find("thead:first"),l=n.find("tr."+ f.css.headerRow).removeClass(f.css.headerRow+" "+e.cssHeaderRow),k=c.find("tfoot:first > tr").children("th, td");n.find("tr").not(l).remove();c.removeData("tablesorter").unbind("sortReset update updateAll updateRows updateCell addRows sorton appendCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd ".split(" ").join(".tablesorter "));e.$headers.add(k).removeClass([f.css.header,e.cssHeader,e.cssAsc,e.cssDesc,f.css.sortAsc,f.css.sortDesc].join(" ")).removeAttr("data-column"); l.find(e.selectorSort).unbind("mousedown.tablesorter mouseup.tablesorter keypress.tablesorter");f.restoreHeaders(a);!1!==b&&c.removeClass(f.css.table+" "+e.tableClass+" tablesorter-"+e.theme);a.hasInitialized=!1;"function"===typeof d&&d(a)}};f.regex={chunk:/(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi,hex:/^0x[0-9a-f]+$/i};f.sortNatural=function(a,b){if(a===b)return 0;var d,c,e,g,l,k;c=f.regex;if(c.hex.test(b)){d=parseInt(a.match(c.hex),16);e=parseInt(b.match(c.hex), 16);if(d<e)return-1;if(d>e)return 1}d=a.replace(c.chunk,"\\0$1\\0").replace(/\\0$/,"").replace(/^\\0/,"").split("\\0");c=b.replace(c.chunk,"\\0$1\\0").replace(/\\0$/,"").replace(/^\\0/,"").split("\\0");k=Math.max(d.length,c.length);for(l=0;l<k;l++){e=isNaN(d[l])?d[l]||0:parseFloat(d[l])||0;g=isNaN(c[l])?c[l]||0:parseFloat(c[l])||0;if(isNaN(e)!==isNaN(g))return isNaN(e)?1:-1;typeof e!==typeof g&&(e+="",g+="");if(e<g)return-1;if(e>g)return 1}return 0};f.sortNaturalAsc=function(a,b,d,c,e){if(a===b)return 0; d=e.string[e.empties[d]||e.emptyTo];return""===a&&0!==d?"boolean"===typeof d?d?-1:1:-d||-1:""===b&&0!==d?"boolean"===typeof d?d?1:-1:d||1:f.sortNatural(a,b)};f.sortNaturalDesc=function(a,b,d,c,e){if(a===b)return 0;d=e.string[e.empties[d]||e.emptyTo];return""===a&&0!==d?"boolean"===typeof d?d?-1:1:d||1:""===b&&0!==d?"boolean"===typeof d?d?1:-1:-d||-1:f.sortNatural(b,a)};f.sortText=function(a,b){return a>b?1:a<b?-1:0};f.getTextValue=function(a,b,d){if(d){var c=a?a.length:0,e=d+b;for(d=0;d<c;d++)e+= a.charCodeAt(d);return b*e}return 0};f.sortNumericAsc=function(a,b,d,c,e,g){if(a===b)return 0;g=g.config;e=g.string[g.empties[e]||g.emptyTo];if(""===a&&0!==e)return"boolean"===typeof e?e?-1:1:-e||-1;if(""===b&&0!==e)return"boolean"===typeof e?e?1:-1:e||1;isNaN(a)&&(a=f.getTextValue(a,d,c));isNaN(b)&&(b=f.getTextValue(b,d,c));return a-b};f.sortNumericDesc=function(a,b,d,c,e,g){if(a===b)return 0;g=g.config;e=g.string[g.empties[e]||g.emptyTo];if(""===a&&0!==e)return"boolean"===typeof e?e?-1:1:e||1;if(""=== b&&0!==e)return"boolean"===typeof e?e?1:-1:-e||-1;isNaN(a)&&(a=f.getTextValue(a,d,c));isNaN(b)&&(b=f.getTextValue(b,d,c));return b-a};f.sortNumeric=function(a,b){return a-b};f.characterEquivalents={a:"\u00e1\u00e0\u00e2\u00e3\u00e4\u0105\u00e5",A:"\u00c1\u00c0\u00c2\u00c3\u00c4\u0104\u00c5",c:"\u00e7\u0107\u010d",C:"\u00c7\u0106\u010c",e:"\u00e9\u00e8\u00ea\u00eb\u011b\u0119",E:"\u00c9\u00c8\u00ca\u00cb\u011a\u0118",i:"\u00ed\u00ec\u0130\u00ee\u00ef\u0131",I:"\u00cd\u00cc\u0130\u00ce\u00cf",o:"\u00f3\u00f2\u00f4\u00f5\u00f6", O:"\u00d3\u00d2\u00d4\u00d5\u00d6",ss:"\u00df",SS:"\u1e9e",u:"\u00fa\u00f9\u00fb\u00fc\u016f",U:"\u00da\u00d9\u00db\u00dc\u016e"};f.replaceAccents=function(a){var b,d="[",c=f.characterEquivalents;if(!f.characterRegex){f.characterRegexArray={};for(b in c)"string"===typeof b&&(d+=c[b],f.characterRegexArray[b]=RegExp("["+c[b]+"]","g"));f.characterRegex=RegExp(d+"]")}if(f.characterRegex.test(a))for(b in c)"string"===typeof b&&(a=a.replace(f.characterRegexArray[b],b));return a};f.isValueInArray=function(a, b){var d,c=b.length;for(d=0;d<c;d++)if(b[d][0]===a)return!0;return!1};f.addParser=function(a){var b,d=f.parsers.length,c=!0;for(b=0;b<d;b++)f.parsers[b].id.toLowerCase()===a.id.toLowerCase()&&(c=!1);c&&f.parsers.push(a)};f.getParserById=function(a){var b,d=f.parsers.length;for(b=0;b<d;b++)if(f.parsers[b].id.toLowerCase()===a.toString().toLowerCase())return f.parsers[b];return!1};f.addWidget=function(a){f.widgets.push(a)};f.getWidgetById=function(a){var b,d,c=f.widgets.length;for(b=0;b<c;b++)if((d= f.widgets[b])&&d.hasOwnProperty("id")&&d.id.toLowerCase()===a.toLowerCase())return d};f.applyWidget=function(a,b){a=g(a)[0];var d=a.config,c=d.widgetOptions,e=[],k,l,p;d.debug&&(k=new Date);d.widgets.length&&(d.widgets=g.grep(d.widgets,function(a,b){return g.inArray(a,d.widgets)===b}),g.each(d.widgets||[],function(a,b){(p=f.getWidgetById(b))&&p.id&&(p.priority||(p.priority=10),e[a]=p)}),e.sort(function(a,b){return a.priority<b.priority?-1:a.priority===b.priority?0:1}),g.each(e,function(e,f){if(f){if(b|| !d.widgetInit[f.id])f.hasOwnProperty("options")&&(c=a.config.widgetOptions=g.extend(!0,{},f.options,c)),f.hasOwnProperty("init")&&f.init(a,f,d,c),d.widgetInit[f.id]=!0;!b&&f.hasOwnProperty("format")&&f.format(a,d,c,!1)}}));d.debug&&(l=d.widgets.length,r("Completed "+(!0===b?"initializing ":"applying ")+l+" widget"+(1!==l?"s":""),k))};f.refreshWidgets=function(a,b,d){a=g(a)[0];var h,e=a.config,k=e.widgets,l=f.widgets,r=l.length;for(h=0;h<r;h++)l[h]&&l[h].id&&(b||0>g.inArray(l[h].id,k))&&(e.debug&& c("Refeshing widgets: Removing "+l[h].id),l[h].hasOwnProperty("remove")&&e.widgetInit[l[h].id]&&(l[h].remove(a,e,e.widgetOptions),e.widgetInit[l[h].id]=!1));!0!==d&&f.applyWidget(a,b)};f.getData=function(a,b,d){var c="";a=g(a);var e,f;if(!a.length)return"";e=g.metadata?a.metadata():!1;f=" "+(a.attr("class")||"");"undefined"!==typeof a.data(d)||"undefined"!==typeof a.data(d.toLowerCase())?c+=a.data(d)||a.data(d.toLowerCase()):e&&"undefined"!==typeof e[d]?c+=e[d]:b&&"undefined"!==typeof b[d]?c+=b[d]: " "!==f&&f.match(" "+d+"-")&&(c=f.match(RegExp("\\s"+d+"-([\\w-]+)"))[1]||"");return g.trim(c)};f.formatFloat=function(a,b){if("string"!==typeof a||""===a)return a;var c;a=(b&&b.config?!1!==b.config.usNumberFormat:"undefined"!==typeof b?b:1)?a.replace(/,/g,""):a.replace(/[\s|\.]/g,"").replace(/,/g,".");/^\s*\([.\d]+\)/.test(a)&&(a=a.replace(/^\s*\(([.\d]+)\)/,"-$1"));c=parseFloat(a);return isNaN(c)?g.trim(a):c};f.isDigit=function(a){return isNaN(a)?/^[\-+(]?\d+[)]?$/.test(a.toString().replace(/[,.'"\s]/g, "")):!0}}});var p=g.tablesorter;g.fn.extend({tablesorter:p.construct});p.addParser({id:"text",is:function(){return!0},format:function(c,r){var k=r.config;c&&(c=g.trim(k.ignoreCase?c.toLocaleLowerCase():c),c=k.sortLocaleCompare?p.replaceAccents(c):c);return c},type:"text"});p.addParser({id:"digit",is:function(c){return p.isDigit(c)},format:function(c,r){var k=p.formatFloat((c||"").replace(/[^\w,. \-()]/g,""),r);return c&&"number"===typeof k?k:c?g.trim(c&&r.config.ignoreCase?c.toLocaleLowerCase():c): c},type:"numeric"});p.addParser({id:"currency",is:function(c){return/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/.test((c||"").replace(/[,. ]/g,""))},format:function(c,r){var k=p.formatFloat((c||"").replace(/[^\w,. \-()]/g,""),r);return c&&"number"===typeof k?k:c?g.trim(c&&r.config.ignoreCase?c.toLocaleLowerCase():c):c},type:"numeric"});p.addParser({id:"ipAddress",is:function(c){return/^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/.test(c)},format:function(c, g){var k,t=c?c.split("."):"",s="",w=t.length;for(k=0;k<w;k++)s+=("00"+t[k]).slice(-3);return c?p.formatFloat(s,g):c},type:"numeric"});p.addParser({id:"url",is:function(c){return/^(https?|ftp|file):\/\//.test(c)},format:function(c){return c?g.trim(c.replace(/(https?|ftp|file):\/\//,"")):c},type:"text"});p.addParser({id:"isoDate",is:function(c){return/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/.test(c)},format:function(c,g){return c?p.formatFloat(""!==c?(new Date(c.replace(/-/g,"/"))).getTime()||"":"",g):c}, type:"numeric"});p.addParser({id:"percent",is:function(c){return/(\d\s*?%|%\s*?\d)/.test(c)&&15>c.length},format:function(c,g){return c?p.formatFloat(c.replace(/%/g,""),g):c},type:"numeric"});p.addParser({id:"usLongDate",is:function(c){return/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i.test(c)||/^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i.test(c)},format:function(c,g){return c?p.formatFloat((new Date(c.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||"",g):c},type:"numeric"}); p.addParser({id:"shortDate",is:function(c){return/(^\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4})|(^\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2})/.test((c||"").replace(/\s+/g," ").replace(/[\-.,]/g,"/"))},format:function(c,g,k,t){if(c){k=g.config;var s=k.headerList[t];t=s.dateFormat||p.getData(s,k.headers[t],"dateFormat")||k.dateFormat;c=c.replace(/\s+/g," ").replace(/[\-.,]/g,"/");"mmddyyyy"===t?c=c.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$1/$2"):"ddmmyyyy"===t?c=c.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/, "$3/$2/$1"):"yyyymmdd"===t&&(c=c.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/,"$1/$2/$3"))}return c?p.formatFloat((new Date(c)).getTime()||"",g):c},type:"numeric"});p.addParser({id:"time",is:function(c){return/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i.test(c)},format:function(c,g){return c?p.formatFloat((new Date("2000/01/01 "+c.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||"",g):c},type:"numeric"});p.addParser({id:"metadata",is:function(){return!1},format:function(c,p,k){c=p.config; c=c.parserMetadataName?c.parserMetadataName:"sortValue";return g(k).metadata()[c]},type:"numeric"});p.addWidget({id:"zebra",priority:90,format:function(c,r,k){var t,s,w,z,D,C,E=RegExp(r.cssChildRow,"i"),B=r.$tbodies;r.debug&&(D=new Date);for(c=0;c<B.length;c++)t=B.eq(c),C=t.children("tr").length,1<C&&(w=0,t=t.children("tr:visible").not(r.selectorRemove),t.each(function(){s=g(this);E.test(this.className)||w++;z=0===w%2;s.removeClass(k.zebra[z?1:0]).addClass(k.zebra[z?0:1])}));r.debug&&p.benchmark("Applying Zebra widget", D)},remove:function(c,p,k){var t;p=p.$tbodies;var s=(k.zebra||["even","odd"]).join(" ");for(k=0;k<p.length;k++)t=g.tablesorter.processTbody(c,p.eq(k),!0),t.children().removeClass(s),g.tablesorter.processTbody(c,t,!1)}})}(jQuery);

extensions/UserAdvManager/branches/2.6/admin/template/js/jquery.tablesorter.pager.js

@@ -1 @@
-(function($) {
-        $.extend({
-                tablesorterPager: new function() {
-                        
-                        function updatePageDisplay(c) {
-                                var s = $(c.cssPageDisplay,c.container).val((c.page+1) + c.seperator + c.totalPages);   
-                        }
-                        
-                        function setPageSize(table,size) {
-                                var c = table.config;
-                                c.size = size;
-                                c.totalPages = Math.ceil(c.totalRows / c.size);
-                                c.pagerPositionSet = false;
-                                moveToPage(table);
-                                fixPosition(table);
-                        }
-                        
-                        function fixPosition(table) {
-                                var c = table.config;
-                                if(!c.pagerPositionSet && c.positionFixed) {
-                                        var c = table.config, o = $(table);
-                                        if(o.offset) {
-                                                c.container.css({
-                                                        top: o.offset().top + o.height() + 'px',
-                                                        position: 'absolute'
+/*!
+ * tablesorter pager plugin
+ * updated 12/16/2013 (v2.14.5)
+ */
+/*jshint browser:true, jquery:true, unused:false */
+;(function($) {
+        "use strict";
+        /*jshint supernew:true */
+        var ts = $.tablesorter;
+
+        $.extend({ tablesorterPager: new function() {
+
+                this.defaults = {
+                        // target the pager markup
+                        container: null,
+
+                        // use this format: "http://mydatabase.com?page={page}&size={size}&{sortList:col}&{filterList:fcol}"
+                        // where {page} is replaced by the page number, {size} is replaced by the number of records to show,
+                        // {sortList:col} adds the sortList to the url into a "col" array, and {filterList:fcol} adds
+                        // the filterList to the url into an "fcol" array.
+                        // So a sortList = [[2,0],[3,0]] becomes "&col[2]=0&col[3]=0" in the url
+                        // and a filterList = [[2,Blue],[3,13]] becomes "&fcol[2]=Blue&fcol[3]=13" in the url
+                        ajaxUrl: null,
+
+                        // modify the url after all processing has been applied
+                        customAjaxUrl: function(table, url) { return url; },
+
+                        // modify the $.ajax object to allow complete control over your ajax requests
+                        ajaxObject: {
+                                dataType: 'json'
+                        },
+
+                        // set this to false if you want to block ajax loading on init
+                        processAjaxOnInit: true,
+
+                        // process ajax so that the following information is returned:
+                        // [ total_rows (number), rows (array of arrays), headers (array; optional) ]
+                        // example:
+                        // [
+                        //   100,  // total rows
+                        //   [
+                        //     [ "row1cell1", "row1cell2", ... "row1cellN" ],
+                        //     [ "row2cell1", "row2cell2", ... "row2cellN" ],
+                        //     ...
+                        //     [ "rowNcell1", "rowNcell2", ... "rowNcellN" ]
+                        //   ],
+                        //   [ "header1", "header2", ... "headerN" ] // optional
+                        // ]
+                        ajaxProcessing: function(ajax){ return [ 0, [], null ]; },
+
+                        // output default: '{page}/{totalPages}'
+                        // possible variables: {page}, {totalPages}, {filteredPages}, {startRow}, {endRow}, {filteredRows} and {totalRows}
+                        output: '{startRow} to {endRow} of {totalRows} rows', // '{page}/{totalPages}'
+
+                        // apply disabled classname to the pager arrows when the rows at either extreme is visible
+                        updateArrows: true,
+
+                        // starting page of the pager (zero based index)
+                        page: 0,
+
+                        // Number of visible rows
+                        size: 10,
+
+                        // Save pager page & size if the storage script is loaded (requires $.tablesorter.storage in jquery.tablesorter.widgets.js)
+                        savePages: true,
+
+                        // if true, the table will remain the same height no matter how many records are displayed. The space is made up by an empty
+                        // table row set to a height to compensate; default is false
+                        fixedHeight: false,
+
+                        // count child rows towards the set page size? (set true if it is a visible table row within the pager)
+                        // if true, child row(s) may not appear to be attached to its parent row, may be split across pages or
+                        // may distort the table if rowspan or cellspans are included.
+                        countChildRows: false,
+
+                        // remove rows from the table to speed up the sort of large tables.
+                        // setting this to false, only hides the non-visible rows; needed if you plan to add/remove rows with the pager enabled.
+                        removeRows: false, // removing rows in larger tables speeds up the sort
+
+                        // css class names of pager arrows
+                        cssFirst: '.first', // go to first page arrow
+                        cssPrev: '.prev', // previous page arrow
+                        cssNext: '.next', // next page arrow
+                        cssLast: '.last', // go to last page arrow
+                        cssGoto: '.gotoPage', // go to page selector - select dropdown that sets the current page
+                        cssPageDisplay: '.pagedisplay', // location of where the "output" is displayed
+                        cssPageSize: '.pagesize', // page size selector - select dropdown that sets the "size" option
+                        cssErrorRow: 'tablesorter-errorRow', // error information row
+
+                        // class added to arrows when at the extremes (i.e. prev/first arrows are "disabled" when on the first page)
+                        cssDisabled: 'disabled', // Note there is no period "." in front of this class name
+
+                        // stuff not set by the user
+                        totalRows: 0,
+                        totalPages: 0,
+                        filteredRows: 0,
+                        filteredPages: 0,
+                        ajaxCounter: 0,
+                        currentFilters: [],
+                        startRow: 0,
+                        endRow: 0,
+                        $size: null,
+                        last: {}
+
+                };
+
+                var $this = this,
+
+                // hide arrows at extremes
+                pagerArrows = function(p, disable) {
+                        var a = 'addClass',
+                        r = 'removeClass',
+                        d = p.cssDisabled,
+                        dis = !!disable,
+                        tp = Math.min( p.totalPages, p.filteredPages );
+                        if ( p.updateArrows ) {
+                                p.$container.find(p.cssFirst + ',' + p.cssPrev)[ ( dis || p.page === 0 ) ? a : r ](d);
+                                p.$container.find(p.cssNext + ',' + p.cssLast)[ ( dis || p.page === tp - 1 || p.totalPages === 0 ) ? a : r ](d);
+                        }
+                },
+
+                updatePageDisplay = function(table, p, flag) {
+                        var i, pg, s, out,
+                                c = table.config,
+                                f = c.$table.hasClass('hasFilters') && !p.ajaxUrl,
+                                t = (c.widgetOptions && c.widgetOptions.filter_filteredRow || 'filtered') + ',' + c.selectorRemove +
+                                        (p.countChildRows ? '' : ',.' + c.cssChildRow),
+                                sz = p.size || 10; // don't allow dividing by zero
+                        p.totalPages = Math.ceil( p.totalRows / sz ); // needed for "pageSize" method
+                        p.filteredRows = (f) ? c.$tbodies.eq(0).children('tr').not('.' + t ).length : p.totalRows;
+                        p.filteredPages = (f) ? Math.ceil( p.filteredRows / sz ) || 1 : p.totalPages;
+                        if ( Math.min( p.totalPages, p.filteredPages ) >= 0 ) {
+                                t = (p.size * p.page > p.filteredRows);
+                                p.startRow = (t) ? 1 : (p.filteredRows === 0 ? 0 : p.size * p.page + 1);
+                                p.page = (t) ? 0 : p.page;
+                                p.endRow = Math.min( p.filteredRows, p.totalRows, p.size * ( p.page + 1 ) );
+                                out = p.$container.find(p.cssPageDisplay);
+                                // form the output string (can now get a new output string from the server)
+                                s = ( p.ajaxData && p.ajaxData.output ? p.ajaxData.output || p.output : p.output )
+                                        // {page} = one-based index; {page+#} = zero based index +/- value
+                                        .replace(/\{page([\-+]\d+)?\}/gi, function(m,n){
+                                                return p.totalPages ? p.page + (n ? parseInt(n, 10) : 1) : 0;
+                                        })
+                                        // {totalPages}, {extra}, {extra:0} (array) or {extra : key} (object)
+                                        .replace(/\{\w+(\s*:\s*\w+)?\}/gi, function(m){
+                                                var str = m.replace(/[{}\s]/g,''),
+                                                        extra = str.split(':'),
+                                                        data = p.ajaxData,
+                                                        // return zero for default page/row numbers
+                                                        deflt = /(rows?|pages?)$/i.test(str) ? 0 : '';
+                                                return extra.length > 1 && data && data[extra[0]] ? data[extra[0]][extra[1]] : p[str] || (data ? data[str] : deflt) || deflt;
+                                        });
+                                if (out.length) {
+                                        out[ (out[0].tagName === 'INPUT') ? 'val' : 'html' ](s);
+                                        if ( p.$goto.length ) {
+                                                t = '';
+                                                pg = Math.min( p.totalPages, p.filteredPages );
+                                                for ( i = 1; i <= pg; i++ ) {
+                                                        t += '<option>' + i + '</option>';
+                                                }
+                                                p.$goto.html(t).val( p.page + 1 );
+                                        }
+                                }
+                        }
+                        pagerArrows(p);
+                        if (p.initialized && flag !== false) {
+                                c.$table.trigger('pagerComplete', p);
+                                // save pager info to storage
+                                if (p.savePages && ts.storage) {
+                                        ts.storage(table, 'tablesorter-pager', {
+                                                page : p.page,
+                                                size : p.size
+                                        });
+                                }
+                        }
+                },
+
+                fixHeight = function(table, p) {
+                        var d, h,
+                                c = table.config,
+                                $b = c.$tbodies.eq(0);
+                        if (p.fixedHeight) {
+                                $b.find('tr.pagerSavedHeightSpacer').remove();
+                                h = $.data(table, 'pagerSavedHeight');
+                                if (h) {
+                                        d = h - $b.height();
+                                        if ( d > 5 && $.data(table, 'pagerLastSize') === p.size && $b.children('tr:visible').length < p.size ) {
+                                                $b.append('<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.replace(/(tr)?\./g,'') + '" style="height:' + d + 'px;"></tr>');
+                                        }
+                                }
+                        }
+                },
+
+                changeHeight = function(table, p) {
+                        var $b = table.config.$tbodies.eq(0);
+                        $b.find('tr.pagerSavedHeightSpacer').remove();
+                        $.data(table, 'pagerSavedHeight', $b.height());
+                        fixHeight(table, p);
+                        $.data(table, 'pagerLastSize', p.size);
+                },
+
+                hideRows = function(table, p){
+                        if (!p.ajaxUrl) {
+                                var i,
+                                c = table.config,
+                                rows = c.$tbodies.eq(0).children(),
+                                l = rows.length,
+                                s = ( p.page * p.size ),
+                                e =  s + p.size,
+                                f = c.widgetOptions && c.widgetOptions.filter_filteredRow || 'filtered',
+                                j = 0; // size counter
+                                for ( i = 0; i < l; i++ ){
+                                        if ( !rows[i].className.match(f) ) {
+                                                rows[i].style.display = ( j >= s && j < e ) ? '' : 'none';
+                                                // don't count child rows
+                                                j += rows[i].className.match(c.cssChildRow + '|' + c.selectorRemove.slice(1)) && !p.countChildRows ? 0 : 1;
+                                        }
+                                }
+                        }
+                },
+
+                hideRowsSetup = function(table, p){
+                        p.size = parseInt( p.$size.val(), 10 ) || p.size;
+                        $.data(table, 'pagerLastSize', p.size);
+                        pagerArrows(p);
+                        if ( !p.removeRows ) {
+                                hideRows(table, p);
+                                $(table).bind('sortEnd.pager filterEnd.pager', function(){
+                                        hideRows(table, p);
+                                });
+                        }
+                },
+
+                renderAjax = function(data, table, p, xhr, exception){
+                        // process data
+                        if ( typeof(p.ajaxProcessing) === "function" ) {
+                                // ajaxProcessing result: [ total, rows, headers ]
+                                var i, j, hsh, $f, $sh, t, th, d, l, $err, rr_count,
+                                        c = table.config,
+                                        $t = c.$table,
+                                        tds = '',
+                                        result = p.ajaxProcessing(data, table) || [ 0, [] ],
+                                        hl = $t.find('thead th').length;
+
+                                $t.find('thead tr.' + p.cssErrorRow).remove(); // Clean up any previous error.
+
+                                if ( exception ) {
+                                        if (c.debug) {
+                                                ts.log('Ajax Error', xhr, exception);
+                                        }
+                                        $err = $('<tr class="' + p.cssErrorRow + '"><td style="text-align:center;" colspan="' + hl + '">' + (
+                                                xhr.status === 0 ? 'Not connected, verify Network' :
+                                                xhr.status === 404 ? 'Requested page not found [404]' :
+                                                xhr.status === 500 ? 'Internal Server Error [500]' :
+                                                exception === 'parsererror' ? 'Requested JSON parse failed' :
+                                                exception === 'timeout' ? 'Time out error' :
+                                                exception === 'abort' ? 'Ajax Request aborted' :
+                                                'Uncaught error: ' + xhr.statusText + ' [' + xhr.status + ']' ) + '</td></tr>')
+                                        .click(function(){
+                                                $(this).remove();
+                                        })
+                                        // add error row to thead instead of tbody, or clicking on the header will result in a parser error
+                                        .appendTo( $t.find('thead:first') );
+                                        c.$tbodies.eq(0).empty();
+                                } else {
+                                        // process ajax object
+                                        if (!$.isArray(result)) {
+                                                p.ajaxData = result;
+                                                p.totalRows = result.total;
+                                                th = result.headers;
+                                                d = result.rows;
+                                        } else {
+                                                // allow [ total, rows, headers ]  or [ rows, total, headers ]
+                                                t = isNaN(result[0]) && !isNaN(result[1]);
+                                                //ensure a zero returned row count doesn't fail the logical ||
+                                                rr_count = result[t ? 1 : 0];
+                                                p.totalRows = isNaN(rr_count) ? p.totalRows || 0 : rr_count;
+                                                d = p.totalRows === 0 ? [""] : result[t ? 0 : 1] || []; // row data
+                                                th = result[2]; // headers
+                                        }
+                                        l = d.length;
+                                        if (d instanceof jQuery) {
+                                                // append jQuery object
+                                                c.$tbodies.eq(0).empty().append(d);
+                                        } else if (l) {
+                                                // build table from array
+                                                for ( i = 0; i < l; i++ ) {
+                                                        tds += '<tr>';
+                                                        for ( j = 0; j < d[i].length; j++ ) {
+                                                                // build tbody cells; watch for data containing HTML markup - see #434
+                                                                tds += /^\s*<td/.test(d[i][j]) ? $.trim(d[i][j]) : '<td>' + d[i][j] + '</td>';
+                                                        }
+                                                        tds += '</tr>';
+                                                }
+                                                // add rows to first tbody
+                                                p.processAjaxOnInit ? c.$tbodies.eq(0).html( tds ) : p.processAjaxOnInit = true;
+                                        }
+                                        // only add new header text if the length matches
+                                        if ( th && th.length === hl ) {
+                                                hsh = $t.hasClass('hasStickyHeaders');
+                                                $sh = hsh ? c.widgetOptions.$sticky.children('thead:first').children().children() : '';
+                                                $f = $t.find('tfoot tr:first').children();
+                                                // don't change td headers (may contain pager)
+                                                c.$headers.filter('th').each(function(j){
+                                                        var $t = $(this), icn;
+                                                        // add new test within the first span it finds, or just in the header
+                                                        if ( $t.find('.' + ts.css.icon).length ) {
+                                                                icn = $t.find('.' + ts.css.icon).clone(true);
+                                                                $t.find('.tablesorter-header-inner').html( th[j] ).append(icn);
+                                                                if ( hsh && $sh.length ) {
+                                                                        icn = $sh.eq(j).find('.' + ts.css.icon).clone(true);
+                                                                        $sh.eq(j).find('.tablesorter-header-inner').html( th[j] ).append(icn);
+                                                                }
+                                                        } else {
+                                                                $t.find('.tablesorter-header-inner').html( th[j] );
+                                                                if (hsh && $sh.length) {
+                                                                        $sh.eq(j).find('.tablesorter-header-inner').html( th[j] );
+                                                                }
+                                                        }
+                                                        $f.eq(j).html( th[j] );
                                                 });
                                         }
-                                        c.pagerPositionSet = true;
-                                }
-                        }
-                        
-                        function moveToFirstPage(table) {
-                                var c = table.config;
-                                c.page = 0;
-                                moveToPage(table);
-                        }
-                        
-                        function moveToLastPage(table) {
-                                var c = table.config;
-                                c.page = (c.totalPages-1);
-                                moveToPage(table);
-                        }
-                        
-                        function moveToNextPage(table) {
-                                var c = table.config;
-                                c.page++;
-                                if(c.page >= (c.totalPages-1)) {
-                                        c.page = (c.totalPages-1);
-                                }
-                                moveToPage(table);
-                        }
-                        
-                        function moveToPrevPage(table) {
-                                var c = table.config;
-                                c.page--;
-                                if(c.page <= 0) {
-                                        c.page = 0;
-                                }
-                                moveToPage(table);
-                        }
-                                                
-                        
-                        function moveToPage(table) {
-                                var c = table.config;
-                                if(c.page < 0 || c.page > (c.totalPages-1)) {
-                                        c.page = 0;
-                                }
-                                
-                                renderTable(table,c.rowsCopy);
-                        }
-                        
-                        function renderTable(table,rows) {
-                                
-                                var c = table.config;
-                                var l = rows.length;
-                                var s = (c.page * c.size);
-                                var e = (s + c.size);
-                                if(e > rows.length ) {
+                                }
+                                if (c.showProcessing) {
+                                        ts.isProcessing(table); // remove loading icon
+                                }
+                                // make sure last pager settings are saved, prevents multiple server side calls with
+                                // the same parameters
+                                p.last.totalPages =  p.totalPages = Math.ceil( p.totalRows / ( p.size || 10 ) );
+                                p.last.currentFilters = p.currentFilters;
+                                p.last.sortList = (c.sortList || []).join(',');
+                                updatePageDisplay(table, p);
+                                fixHeight(table, p);
+                                // apply widgets after table has rendered
+                                $t.trigger('applyWidgets');
+                                $t.trigger('update', [false, function(){
+                                        if (p.initialized) {
+                                                $t.trigger('updateComplete');
+                                                $t.trigger('pagerChange', p);
+                                        }
+                                }]);
+                        }
+                        if (!p.initialized) {
+                                p.initialized = true;
+                                $(table).trigger('pagerInitialized', p);
+                        }
+                },
+
+                getAjax = function(table, p){
+                        var url = getAjaxUrl(table, p),
+                        $doc = $(document),
+                        counter,
+                        c = table.config;
+                        if ( url !== '' ) {
+                                if (c.showProcessing) {
+                                        ts.isProcessing(table, true); // show loading icon
+                                }
+                                $doc.bind('ajaxError.pager', function(e, xhr, settings, exception) {
+                                        renderAjax(null, table, p, xhr, exception);
+                                        $doc.unbind('ajaxError.pager');
+                                });
+
+                                counter = ++p.ajaxCounter;
+
+                                p.ajaxObject.url = url; // from the ajaxUrl option and modified by customAjaxUrl
+                                p.ajaxObject.success = function(data) {
+                                        // Refuse to process old ajax commands that were overwritten by new ones - see #443
+                                        if (counter < p.ajaxCounter){
+                                                return;
+                                        }
+                                        renderAjax(data, table, p);
+                                        $doc.unbind('ajaxError.pager');
+                                        if (typeof p.oldAjaxSuccess === 'function') {
+                                                p.oldAjaxSuccess(data);
+                                        }
+                                };
+                                if (c.debug) {
+                                        ts.log('ajax initialized', p.ajaxObject);
+                                }
+                                $.ajax(p.ajaxObject);
+                        }
+                },
+
+                getAjaxUrl = function(table, p) {
+                        var c = table.config,
+                                url = (p.ajaxUrl) ? p.ajaxUrl
+                                // allow using "{page+1}" in the url string to switch to a non-zero based index
+                                .replace(/\{page([\-+]\d+)?\}/, function(s,n){ return p.page + (n ? parseInt(n, 10) : 0); })
+                                .replace(/\{size\}/g, p.size) : '',
+                        sl = c.sortList,
+                        fl = p.currentFilters || $(table).data('lastSearch') || [],
+                        sortCol = url.match(/\{\s*sort(?:List)?\s*:\s*(\w*)\s*\}/),
+                        filterCol = url.match(/\{\s*filter(?:List)?\s*:\s*(\w*)\s*\}/),
+                        arry = [];
+                        if (sortCol) {
+                                sortCol = sortCol[1];
+                                $.each(sl, function(i,v){
+                                        arry.push(sortCol + '[' + v[0] + ']=' + v[1]);
+                                });
+                                // if the arry is empty, just add the col parameter... "&{sortList:col}" becomes "&col"
+                                url = url.replace(/\{\s*sort(?:List)?\s*:\s*(\w*)\s*\}/g, arry.length ? arry.join('&') : sortCol );
+                                arry = [];
+                        }
+                        if (filterCol) {
+                                filterCol = filterCol[1];
+                                $.each(fl, function(i,v){
+                                        if (v) {
+                                                arry.push(filterCol + '[' + i + ']=' + encodeURIComponent(v));
+                                        }
+                                });
+                                // if the arry is empty, just add the fcol parameter... "&{filterList:fcol}" becomes "&fcol"
+                                url = url.replace(/\{\s*filter(?:List)?\s*:\s*(\w*)\s*\}/g, arry.length ? arry.join('&') : filterCol );
+                                p.currentFilters = fl;
+                        }
+                        if ( typeof(p.customAjaxUrl) === "function" ) {
+                                url = p.customAjaxUrl(table, url);
+                        }
+                        if (c.debug) {
+                                ts.log('Pager ajax url: ' + url);
+                        }
+                        return url;
+                },
+
+                renderTable = function(table, rows, p) {
+                        var i, $tb,
+                                l = rows && rows.length || 0, // rows may be undefined
+                                s = ( p.page * p.size ),
+                                e = ( s + p.size );
+                        if ( l < 1 ) { return; } // empty table, abort!
+                        if ( p.page >= p.totalPages ) {
+                                // lets not render the table more than once
+                                moveToLastPage(table, p);
+                        }
+                        p.isDisabled = false; // needed because sorting will change the page and re-enable the pager
+                        if (p.initialized) { $(table).trigger('pagerChange', p); }
+
+                        if ( !p.removeRows ) {
+                                hideRows(table, p);
+                        } else {
+                                if ( e > rows.length ) {
                                         e = rows.length;
                                 }
-                                
-                                
-                                var tableBody = $(table.tBodies[0]);
-                                
-                                // clear the table body
-                                
-                                $.tablesorter.clearTableBody(table);
-                                
-                                for(var i = s; i < e; i++) {
-                                        
-                                        //tableBody.append(rows[i]);
-                                        
-                                        var o = rows[i];
-                                        var l = o.length;
-                                        for(var j=0; j < l; j++) {
-                                                
-                                                tableBody[0].appendChild(o[j]);
-
-                                        }
-                                }
-                                
-                                fixPosition(table,tableBody);
-                                
-                                $(table).trigger("applyWidgets");
-                                
-                                if( c.page >= c.totalPages ) {
-                                moveToLastPage(table);
-                                }
-                                
-                                updatePageDisplay(c);
-                        }
-                        
-                        this.appender = function(table,rows) {
-                                
-                                var c = table.config;
-                                
+                                ts.clearTableBody(table);
+                                $tb = ts.processTbody(table, table.config.$tbodies.eq(0), true);
+                                for ( i = s; i < e; i++ ) {
+                                        $tb.append(rows[i]);
+                                }
+                                ts.processTbody(table, $tb, false);
+                        }
+
+                        updatePageDisplay(table, p);
+                        if ( !p.isDisabled ) { fixHeight(table, p); }
+                        $(table).trigger('applyWidgets');
+                },
+
+                showAllRows = function(table, p){
+                        if ( p.ajax ) {
+                                pagerArrows(p, true);
+                        } else {
+                                p.isDisabled = true;
+                                $.data(table, 'pagerLastPage', p.page);
+                                $.data(table, 'pagerLastSize', p.size);
+                                p.page = 0;
+                                p.size = p.totalRows;
+                                p.totalPages = 1;
+                                $(table).addClass('pagerDisabled').find('tr.pagerSavedHeightSpacer').remove();
+                                renderTable(table, table.config.rowsCopy, p);
+                                if (table.config.debug) {
+                                        ts.log('pager disabled');
+                                }
+                        }
+                        // disable size selector
+                        p.$size.add(p.$goto).each(function(){
+                                $(this).addClass(p.cssDisabled)[0].disabled = true;
+                        });
+                },
+
+                moveToPage = function(table, p, flag) {
+                        if ( p.isDisabled ) { return; }
+                        var c = table.config,
+                                l = p.last,
+                                pg = Math.min( p.totalPages, p.filteredPages );
+                        if ( p.page < 0 ) { p.page = 0; }
+                        if ( p.page > ( pg - 1 ) && pg !== 0 ) { p.page = pg - 1; }
+                        // don't allow rendering multiple times on the same page/size/totalpages/filters/sorts
+                        if ( l.page === p.page && l.size === p.size && l.totalPages === p.totalPages &&
+                                (l.currentFilters || []).join(',') === (p.currentFilters || []).join(',') &&
+                                l.sortList === (c.sortList || []).join(',') ) { return; }
+                        if (c.debug) {
+                                ts.log('Pager changing to page ' + p.page);
+                        }
+                        p.last = {
+                                page : p.page,
+                                size : p.size,
+                                // fixes #408; modify sortList otherwise it auto-updates
+                                sortList : (c.sortList || []).join(','),
+                                totalPages : p.totalPages,
+                                currentFilters : p.currentFilters || []
+                        };
+                        if (p.ajax) {
+                                getAjax(table, p);
+                        } else if (!p.ajax) {
+                                renderTable(table, table.config.rowsCopy, p);
+                        }
+                        $.data(table, 'pagerLastPage', p.page);
+                        if (p.initialized && flag !== false) {
+                                c.$table.trigger('pageMoved', p);
+                                c.$table.trigger('applyWidgets');
+                        }
+                },
+
+                setPageSize = function(table, size, p) {
+                        p.size = size || p.size || 10;
+                        p.$size.val(p.size);
+                        $.data(table, 'pagerLastPage', p.page);
+                        $.data(table, 'pagerLastSize', p.size);
+                        p.totalPages = Math.ceil( p.totalRows / p.size );
+                        moveToPage(table, p);
+                },
+
+                moveToFirstPage = function(table, p) {
+                        p.page = 0;
+                        moveToPage(table, p);
+                },
+
+                moveToLastPage = function(table, p) {
+                        p.page = ( Math.min( p.totalPages, p.filteredPages ) - 1 );
+                        moveToPage(table, p);
+                },
+
+                moveToNextPage = function(table, p) {
+                        p.page++;
+                        if ( p.page >= ( Math.min( p.totalPages, p.filteredPages ) - 1 ) ) {
+                                p.page = ( Math.min( p.totalPages, p.filteredPages ) - 1 );
+                        }
+                        moveToPage(table, p);
+                },
+
+                moveToPrevPage = function(table, p) {
+                        p.page--;
+                        if ( p.page <= 0 ) {
+                                p.page = 0;
+                        }
+                        moveToPage(table, p);
+                },
+
+                destroyPager = function(table, p){
+                        showAllRows(table, p);
+                        p.$container.hide(); // hide pager
+                        table.config.appender = null; // remove pager appender function
+                        p.initialized = false;
+                        $(table).unbind('destroy.pager sortEnd.pager filterEnd.pager enable.pager disable.pager');
+                        if (ts.storage) {
+                                ts.storage(table, 'tablesorter-pager', '');
+                        }
+                },
+
+                enablePager = function(table, p, triggered){
+                        var pg = p.$size.removeClass(p.cssDisabled).removeAttr('disabled');
+                        p.$goto.removeClass(p.cssDisabled).removeAttr('disabled');
+                        p.isDisabled = false;
+                        p.page = $.data(table, 'pagerLastPage') || p.page || 0;
+                        p.size = $.data(table, 'pagerLastSize') || parseInt(pg.find('option[selected]').val(), 10) || p.size || 10;
+                        pg.val(p.size); // set page size
+                        p.totalPages = Math.ceil( Math.min( p.totalPages, p.filteredPages ) / p.size );
+                        if ( triggered ) {
+                                $(table).trigger('update');
+                                setPageSize(table, p.size, p);
+                                hideRowsSetup(table, p);
+                                fixHeight(table, p);
+                                if (table.config.debug) {
+                                        ts.log('pager enabled');
+                                }
+                        }
+                };
+
+                $this.appender = function(table, rows) {
+                        var c = table.config,
+                                p = c.pager;
+                        if ( !p.ajax ) {
                                 c.rowsCopy = rows;
-                                c.totalRows = rows.length;
-                                c.totalPages = Math.ceil(c.totalRows / c.size);
-                                
-                                renderTable(table,rows);
-                        };
-                        
-                        this.defaults = {
-                                size: 10,
-                                offset: 0,
-                                page: 0,
-                                totalRows: 0,
-                                totalPages: 0,
-                                container: null,
-                                cssNext: '.next',
-                                cssPrev: '.prev',
-                                cssFirst: '.first',
-                                cssLast: '.last',
-                                cssPageDisplay: '.pagedisplay',
-                                cssPageSize: '.pagesize',
-                                seperator: "/",
-                                positionFixed: true,
-                                appender: this.appender
-                        };
-                        
-                        this.construct = function(settings) {
-                                
-                                return this.each(function() {   
-                                        
-                                        config = $.extend(this.config, $.tablesorterPager.defaults, settings);
-                                        
-                                        var table = this, pager = config.container;
-                                
-                                        $(this).trigger("appendCache");
-                                        
-                                        config.size = parseInt($(".pagesize",pager).val());
-                                        
-                                        $(config.cssFirst,pager).click(function() {
-                                                moveToFirstPage(table);
+                                p.totalRows = p.countChildRows ? c.$tbodies.eq(0).children().length : rows.length;
+                                p.size = $.data(table, 'pagerLastSize') || p.size || 10;
+                                p.totalPages = Math.ceil( p.totalRows / p.size );
+                                renderTable(table, rows, p);
+                        }
+                };
+
+                $this.construct = function(settings) {
+                        return this.each(function() {
+                                // check if tablesorter has initialized
+                                if (!(this.config && this.hasInitialized)) { return; }
+                                var t, ctrls, fxn,
+                                        table = this,
+                                        c = table.config,
+                                        p = c.pager = $.extend( {}, $.tablesorterPager.defaults, settings ),
+                                        $t = c.$table,
+                                        // added in case the pager is reinitialized after being destroyed.
+                                        pager = p.$container = $(p.container).addClass('tablesorter-pager').show();
+                                if (c.debug) {
+                                        ts.log('Pager initializing');
+                                }
+                                p.oldAjaxSuccess = p.oldAjaxSuccess || p.ajaxObject.success;
+                                c.appender = $this.appender;
+                                if (ts.filter && $.inArray('filter', c.widgets) >= 0) {
+                                        // get any default filter settings (data-value attribute) fixes #388
+                                        p.currentFilters = c.$table.data('lastSearch') || ts.filter.setDefaults(table, c, c.widgetOptions) || [];
+                                        // set, but don't apply current filters
+                                        ts.setFilters(table, p.currentFilters, false);
+                                }
+                                if (p.savePages && ts.storage) {
+                                        t = ts.storage(table, 'tablesorter-pager') || {}; // fixes #387
+                                        p.page = isNaN(t.page) ? p.page : t.page;
+                                        p.size = ( isNaN(t.size) ? p.size : t.size ) || 10;
+                                        $.data(table, 'pagerLastSize', p.size);
+                                }
+
+                                $t
+                                        .unbind('filterStart filterEnd sortEnd disable enable destroy update updateRows updateAll addRows pageSize '.split(' ').join('.pager '))
+                                        .bind('filterStart.pager', function(e, filters) {
+                                                p.currentFilters = filters;
+                                                p.page = 0; // fixes #456
+                                        })
+                                        // update pager after filter widget completes
+                                        .bind('filterEnd.pager sortEnd.pager', function() {
+                                                if (p.initialized) {
+                                                        moveToPage(table, p, false);
+                                                        updatePageDisplay(table, p, false);
+                                                        fixHeight(table, p);
+                                                }
+                                        })
+                                        .bind('disable.pager', function(e){
+                                                e.stopPropagation();
+                                                showAllRows(table, p);
+                                        })
+                                        .bind('enable.pager', function(e){
+                                                e.stopPropagation();
+                                                enablePager(table, p, true);
+                                        })
+                                        .bind('destroy.pager', function(e){
+                                                e.stopPropagation();
+                                                destroyPager(table, p);
+                                        })
+                                        .bind('update updateRows updateAll addRows '.split(' ').join('.pager '), function(e){
+                                                e.stopPropagation();
+                                                hideRows(table, p);
+                                        })
+                                        .bind('pageSize.pager', function(e,v){
+                                                e.stopPropagation();
+                                                setPageSize(table, parseInt(v, 10) || 10, p);
+                                                hideRows(table, p);
+                                                updatePageDisplay(table, p, false);
+                                                if (p.$size.length) { p.$size.val(p.size); } // twice?
+                                        })
+                                        .bind('pageSet.pager', function(e,v){
+                                                e.stopPropagation();
+                                                p.page = (parseInt(v, 10) || 1) - 1;
+                                                if (p.$goto.length) { p.$goto.val(p.size); } // twice?
+                                                moveToPage(table, p);
+                                                updatePageDisplay(table, p, false);
+                                        });
+
+                                // clicked controls
+                                ctrls = [ p.cssFirst, p.cssPrev, p.cssNext, p.cssLast ];
+                                fxn = [ moveToFirstPage, moveToPrevPage, moveToNextPage, moveToLastPage ];
+                                pager.find(ctrls.join(','))
+                                        .unbind('click.pager')
+                                        .bind('click.pager', function(e){
+                                                e.stopPropagation();
+                                                var i, $t = $(this), l = ctrls.length;
+                                                if ( !$t.hasClass(p.cssDisabled) ) {
+                                                        for (i = 0; i < l; i++) {
+                                                                if ($t.is(ctrls[i])) {
+                                                                        fxn[i](table, p);
+                                                                        break;
+                                                                }
+                                                        }
+                                                }
+                                        });
+
+                                // goto selector
+                                p.$goto = pager.find(p.cssGoto);
+                                if ( p.$goto.length ) {
+                                        p.$goto
+                                                .unbind('change')
+                                                .bind('change', function(){
+                                                        p.page = $(this).val() - 1;
+                                                        moveToPage(table, p);
+                                                        updatePageDisplay(table, p, false);
+                                                });
+                                }
+
+                                // page size selector
+                                p.$size = pager.find(p.cssPageSize);
+                                if ( p.$size.length ) {
+                                        p.$size.unbind('change.pager').bind('change.pager', function() {
+                                                p.$size.val( $(this).val() ); // in case there are more than one pagers
+                                                if ( !$(this).hasClass(p.cssDisabled) ) {
+                                                        setPageSize(table, parseInt( $(this).val(), 10 ), p);
+                                                        changeHeight(table, p);
+                                                }
                                                 return false;
                                         });
-                                        $(config.cssNext,pager).click(function() {
-                                                moveToNextPage(table);
-                                                return false;
-                                        });
-                                        $(config.cssPrev,pager).click(function() {
-                                                moveToPrevPage(table);
-                                                return false;
-                                        });
-                                        $(config.cssLast,pager).click(function() {
-                                                moveToLastPage(table);
-                                                return false;
-                                        });
-                                        $(config.cssPageSize,pager).change(function() {
-                                                setPageSize(table,parseInt($(this).val()));
-                                                return false;
-                                        });
-                                });
-                        };
-                        
-                }
-        });
-        // extend plugin scope
-        $.fn.extend({
-        tablesorterPager: $.tablesorterPager.construct
-        });
-        
-})(jQuery);                             
+                                }
+
+                                // clear initialized flag
+                                p.initialized = false;
+                                // before initialization event
+                                $t.trigger('pagerBeforeInitialized', p);
+
+                                enablePager(table, p, false);
+
+                                if ( typeof(p.ajaxUrl) === 'string' ) {
+                                        // ajax pager; interact with database
+                                        p.ajax = true;
+                                        //When filtering with ajax, allow only custom filtering function, disable default filtering since it will be done server side.
+                                        c.widgetOptions.filter_serversideFiltering = true;
+                                        c.serverSideSorting = true;
+                                        moveToPage(table, p);
+                                } else {
+                                        p.ajax = false;
+                                        // Regular pager; all rows stored in memory
+                                        $(this).trigger("appendCache", true);
+                                        hideRowsSetup(table, p);
+                                }
+
+                                changeHeight(table, p);
+
+                                // pager initialized
+                                if (!p.ajax) {
+                                        p.initialized = true;
+                                        $(table).trigger('pagerInitialized', p);
+                                }
+                        });
+                };
+
+        }()
+});
+// extend plugin scope
+$.fn.extend({
+        tablesorterPager: $.tablesorterPager.construct
+});
+
+})(jQuery);

extensions/UserAdvManager/branches/2.6/admin/template/uam.css

@@ -38 +38 @@
   font-weight: bold;
   color: yellow;
+}
+
+table.table2 {
+        border: 1px solid #111;
+        margin: 1em auto;
+        padding: 0;
+  width: 97%;
 }
 
@@ -85 +92 @@
 
 /* jQuery tablesorter instructions */
-tr.throw
+table.tablesorter tbody tr.normal-row td {
+  background: #111111;  
+  color: #666666;
+}
+table.tablesorter tbody tr.alt-row td {
+  background: #222222;
+  color: #666666;
+}
+
+tr.tablesorter-headerRow, throw
 {
 cursor:pointer;
@@ -91 +107 @@
 }
 
-th.header
+th.tablesorter-header
 {
 background-image:url("./icon/bg.png");
@@ -99 +115 @@
 }
 
-th.headerSortDown
+th.tablesorter-headerDesc
 {
 background-image:url("./icon/desc.png");
 }
 
-th.headerSortUp
+th.tablesorter-headerAsc
 {
 background-image:url("./icon/asc.png");
 }
 
+th.sorter-false {
+        background-image: none;
+}
+
+/* jQuery tablesorter pager instructions */
 .pager{
   text-align:center;
+}
+
+/* pager wrapper, div */
+.tablesorter-pager {
+  padding: 5px;
+}
+/* pager wrapper, in thead/tfoot */
+td.tablesorter-pager {
+  background-color: #e6eeee;
+  margin: 0; /* needed for bootstrap .pager gets a 18px bottom margin */
+}
+/* pager navigation arrows */
+.tablesorter-pager img {
+  vertical-align: middle;
+  margin-right: 2px;
+  cursor: pointer;
 }
 
@@ -116 +153 @@
   margin-bottom: -3px;
 }
+
+/* pager output text */
+.tablesorter-pager .pagedisplay {
+  padding: 0 5px 0 5px;
+  width: 50px;
+  text-align: center;
+}
+
+
+/* pager element reset (needed for bootstrap) */
+.tablesorter-pager select {
+  margin: 0;
+  padding: 0;
+}
+
+/*** css used when "updateArrows" option is true ***/
+/* the pager itself gets a disabled class when the number of rows is less than the size */
+.tablesorter-pager.disabled {
+  display: none;
+}
+/* hide or fade out pager arrows when the first or last row is visible */
+.tablesorter-pager .disabled {
+  /* visibility: hidden */
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+  cursor: default;
+}

extensions/UserAdvManager/branches/2.6/admin/template/userlist.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'}
+
 
 <script type="text/javascript">
@@ -21 +22 @@
       .tablesorter(
       {ldelim}
-          sortList:[[3,1]],
+          sortList:[[3,0]],
           // pass the headers argument and assing a object 
           headers:
-          {ldelim} 
-              // assign the fourth column (we start counting zero) 
+          {ldelim}
+              // assign the second column (we start counting zero) 
+              1:
+              {ldelim} 
+                  // disable it by setting the property sorter to false 
+                  sorter: false
+              {rdelim},
+              // assign the fifth column (we start counting zero) 
               4:
               {ldelim} 
                   // disable it by setting the property sorter to false 
-                  sorter: false 
+                  sorter: false
               {rdelim}
-          {rdelim} 
+          {rdelim}
       {rdelim})
-      .tablesorterPager({ldelim}container: $("#pager"), positionFixed: false, size: 20, totalPages: 0{rdelim});
+      .tablesorterPager({ldelim}container: $("#pager"), page: 0, size: 20, output: '{ldelim}page{rdelim} / {ldelim}totalPages{rdelim}'{rdelim});
     {rdelim} 
 );
@@ -42 +49 @@
 </div>
 
-<form method="post" action="" class="general">
+<form method="post" class="general">
   <fieldset>
         <legend class="cluetip" title="{'UAM_Tracking registered users'|translate}|{'UAM_userlistTitle_d'|translate}">{'UAM_Tracking registered users'|@translate}</legend>
     {if count($users) > 0}
-      <table id="sorting" class="table2" width="97%" summary="">
+      <table id="sorting" class="table2">
                         <thead>
                         <tr class="throw">
@@ -59 +66 @@
         {foreach from=$users item=user name=users_loop}
           <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
-            <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><label>{$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" alt=""/></a></td>
             <td>{$user.EMAIL}</td>
             <td style="text-align:center;">{$user.LASTVISIT}</td>
@@ -80 +87 @@
       </table>
 <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>
@@ -92 +98 @@
                         <option value="40">40</option>
                 </select>
-        </form>
+    <select class="gotoPage" title="{'UAM_Select page number'|@translate}"></select>
 </div>
         <br/>

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>

extensions/UserAdvManager/branches/2.6/include/functions.inc.php

@@ -142 +142 @@
 
     // --------------------------------------------------------------------------------------------------------------------
-    // Workflow when admins have to validate registrations (CONFIRM_MAIL = local)
-    // No validation needed when admins add users if ADMINCONFMAIL is set to OFF - users are considered as valid by default
-    // Else a notification email with validation link is send to admins
-    // Finally when a user registers himself, a notification email with validation link is send to admins
+    // Workflow when admins have to validate registrations (CONFIRM_MAIL = local):
+    // 1- A confirmation email with validation link is send to users added by admins
+    // 2- Else no validation needed when admins add users if ADMINCONFMAIL is set to OFF - users are considered as valid by
+    // default and no information email is send to user from UAM (Piwigo will do that by checking the option box)
+    // 3- Finally when a user registers himself, a notification email with validation link is send to admins
     // --------------------------------------------------------------------------------------------------------------------
     if (isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL'] == 'local')
     {
-      if (is_admin() and isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'true')
+      if (is_admin() and (isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'true'))
       {
         SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true); 
       }
-      elseif (is_admin() and isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'false')
+      elseif (is_admin() and (isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'false'))
       {
         SetValidated($register_user['id']);
-        SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
+        // Pending information email - Managed by Piwigo
+        //SendMail2User(2, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
       }
       elseif (!is_admin())
@@ -164 +166 @@
     }
     // --------------------------------------------------------------------------------------------------------------------
-    // Workflow when users have to validate their registration (CONFIRM_MAIL = true)
-    // No validation needed when admins add users if ADMINCONFMAIL is set to OFF - users are considered as valid by default
-    // Else an email with validation link is send to user
-    // Finally when a user registers himself, an email with validation link is send to him
+    // Workflow when users have to validate their registration (CONFIRM_MAIL = true):
+    // 1- A confirmation email with validation link is send to users added by admins
+    // 2- ELse no validation needed when admins add users if ADMINCONFMAIL is set to OFF - users are considered as valid by
+    // default and no information email is send to user from UAM (Piwigo will do that by checking the option box)
+    // 3- Finally when a user registers himself, an email with validation link is send to him
     // --------------------------------------------------------------------------------------------------------------------
     elseif (isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL'] == 'true')
     {
-      if (is_admin() and isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'true')
+      if (is_admin() and (isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'true'))
       {
         SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true); 
       }
-      elseif (is_admin() and isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'false')
+      elseif (is_admin() and (isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'false'))
       {
         SetValidated($register_user['id']);
-        SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
+        // Pending information email - Managed by Piwigo
+        //SendMail2User(2, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
       }
       elseif (!is_admin())
@@ -287 +291 @@
     }
 
-    $typemail = 3; // Only information email send to user on user profile update if checked
-
-    if (!empty($_POST['use_new_pwd']))
-    {
-      $typemail = 2; // Confirmation email on user profile update - With information email
-    }
-
     // Sending registration confirmation by email
     // ------------------------------------------
@@ -310 +307 @@
         list($current_email) = pwg_db_fetch_row(pwg_query($query));
 
-        // This is to send a new validation key
-        // ------------------------------------
-        if ($_POST['mail_address'] != $current_email and (isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL'] == 'true'))
+        // This is to set the user to "waiting" group or status until validation
+        // ---------------------------------------------------------------------
+        if ($_POST['mail_address'] != $current_email and (isset($conf_UAM['CONFIRM_MAIL']) and ($conf_UAM['CONFIRM_MAIL'] == 'true' or $conf_UAM['CONFIRM_MAIL'] == 'local')))
         {
           SetPermission($user['id']);// Set to "waiting" group or status until user validation
@@ -318 +315 @@
           $confirm_mail_need = true;
         }
-
-        // This is to set the user to "waiting" group or status until admin validation
-        // ---------------------------------------------------------------------------
-        elseif ($_POST['mail_address'] != $current_email and (isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL'] == 'local'))
+        else
         {
-          SetPermission($user['id']);// Set to "waiting" group or status until admin validation
-          SetUnvalidated($user['id']); // Set UAM_validated field to false in #_users table
           $confirm_mail_need = false;
-        }       
-      }
-
-      if (((!empty($_POST['use_new_pwd']) and (isset($conf_UAM['MAIL_INFO']) and $conf_UAM['MAIL_INFO'] == 'true')) or $confirm_mail_need))
+        }
+      }
+
+      // Send information email
+      if ((isset($conf_UAM['MAIL_INFO']) and $conf_UAM['MAIL_INFO'] == 'true') or $confirm_mail_need)
       {
         $query = '
@@ -338 +331 @@
 
         list($username) = pwg_db_fetch_row(pwg_query($query));
-        SendMail2User($typemail, $user['id'], $username, $_POST['use_new_pwd'], $_POST['mail_address'], $confirm_mail_need);
+
+        SendMail2User(2, $user['id'], $username, $_POST['use_new_pwd'], $_POST['mail_address'], $confirm_mail_need);
       }
     }
@@ -1109 +1103 @@
       break;
 
-    case 2: // Confirmation email on user profile update - With information email if modification done in user profile
-      if (isset($conf_UAM['CONFIRMMAIL_SUBJECT']) and !empty($conf_UAM['CONFIRMMAIL_SUBJECT']))
+    case 2: // Confirmation email on user profile update - Information email if modification done in user profile
+      if (isset($conf_UAM['INFOMAIL_SUBJECT']) and !empty($conf_UAM['INFOMAIL_SUBJECT']))
       {
         // Management of Extension flags ([username], [mygallery])
@@ -1121 +1115 @@
         if (function_exists('get_user_language_desc'))
         {
-          $subject = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM['CONFIRMMAIL_SUBJECT']))."\n\n";
+          $subject = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM['INFOMAIL_SUBJECT']))."\n\n";
         }
-        else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM['CONFIRMMAIL_SUBJECT']))."\n\n"; 
-      }
-
-      $password = !empty($password) ? $password : l10n('UAM_empty_pwd');
+        else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM['INFOMAIL_SUBJECT']))."\n\n"; 
+      }
+
+      $password = !empty($password) ? $password : l10n('UAM_no_update_pwd');
 
       if (isset($conf_UAM['MAILINFO_TEXT']) and !empty($conf_UAM['MAILINFO_TEXT']))
@@ -1170 +1164 @@
 
       break;
-
-    case 3: // Only information email send to user if checked
-      if (isset($conf_UAM['INFOMAIL_SUBJECT']) and !empty($conf_UAM['INFOMAIL_SUBJECT']))
-      {
-        // Management of Extension flags ([username], [mygallery])
-        // -------------------------------------------------------
-        $patterns[] = '#\[username\]#i';
-        $replacements[] = $username;
-        $patterns[] = '#\[mygallery\]#i';
-        $replacements[] = $conf['gallery_title'];
-
-        if (function_exists('get_user_language_desc'))
-        {
-          $subject = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM['INFOMAIL_SUBJECT']))."\n\n";
-        }
-        else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM['INFOMAIL_SUBJECT']))."\n\n"; 
-      }
-
-      $password = !empty($password) ? $password : l10n('UAM_no_update_pwd');
-
-      if (isset($conf_UAM['MAILINFO_TEXT']) and !empty($conf_UAM['MAILINFO_TEXT']))
-      {
-        // Management of Extension flags ([username], [mygallery], [myurl])
-        // ----------------------------------------------------------------
-        $patterns[] = '#\[username\]#i';
-        $replacements[] = $username;
-        $patterns[] = '#\[mygallery\]#i';
-        $replacements[] = $conf['gallery_title'];
-        $patterns[] = '#\[myurl\]#i';
-        $replacements[] = get_gallery_home_url();
-
-        if (function_exists('get_user_language_desc'))
-        {
-          $infos1_perso = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM['MAILINFO_TEXT']))."\n\n";
-        }
-        else $infos1_perso = l10n(preg_replace($patterns, $replacements, $conf_UAM['MAILINFO_TEXT']))."\n\n"; 
-      }
-
-      if (isset($conf_UAM['MAIL_INFO']) and $conf_UAM['MAIL_INFO'] == 'true')
-      {
-        if (isset($conf_UAM['HIDEPASSW']) and $conf_UAM['HIDEPASSW'] == 'true') // Allow display of clear password in email
-        {
-          $infos1 = array(
-            get_l10n_args('UAM_infos_mail %s', stripslashes($username)),
-            get_l10n_args('UAM_User: %s', stripslashes($username)),
-            get_l10n_args('UAM_Password: %s', $password),
-            get_l10n_args('Email: %s', $email),
-            get_l10n_args('', ''),
-          );
-        }
-        else // Do not allow display of clear password in email
-        {
-          $infos1 = array(
-            get_l10n_args('UAM_infos_mail %s', stripslashes($username)),
-            get_l10n_args('UAM_User: %s', stripslashes($username)),
-            get_l10n_args('Email: %s', $email),
-            get_l10n_args('', ''),
-          );
-        }
-      }
-
-      break;
   }
 
@@ -1266 +1198 @@
   }
 
+//       $converted_res = ($confirm) ? 'true' : 'false';
+//       UAMLog($typemail,$converted_res,$conf_UAM['CONFIRM_MAIL'],$subject);
+
 // Sending the email with subject and contents
 // -------------------------------------------
-  if ((isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL'] == 'local') and $confirm)
-        {
+
+  if ((isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL'] == 'local') and $confirm) // Confirmation email send to admins
+  {
     switch_lang_to(get_default_language());
 
-        load_language('plugin.lang', UAM_PATH);
-        $subject = get_l10n_args('UAM_Subject admin validation for %s',$username);
-
-                $content = array(
-         get_l10n_args('UAM_Manual_validation_needed_for %s', stripslashes($username)),
-     get_l10n_args('', ''),
-     get_l10n_args('UAM_Link: %s', AddConfirmMail($id, $email)),
+    load_language('plugin.lang', UAM_PATH);
+    $subject_admin = get_l10n_args('UAM_Subject admin validation for %s',$username);
+
+    $content_admin = array(
+      get_l10n_args('UAM_Manual_validation_needed_for %s', stripslashes($username)),
+      get_l10n_args('', ''),
+      get_l10n_args('UAM_Link: %s', AddConfirmMail($id, $email)),
     );
 
-    //UAM_mail_notification_admins($subject, $content);
-    pwg_mail_notification_admins($subject, $content, true);
-  }
-        elseif ((isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL'] == 'true') and $confirm)
+    pwg_mail_notification_admins($subject_admin, $content_admin, true);
+  }
+
+
+        if ((isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL'] == 'true') and $confirm) // Confirmation email send to users
         {
           // Adding gallery URL at the end of the email
     if (isset($conf_UAM['ADD_GALLERY_URL_TO_EMAILS']) and $conf_UAM['ADD_GALLERY_URL_TO_EMAILS'] == 'true')
     {
-      $content = (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url();
+      $content_confirmation = (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url();
 
       pwg_mail(
@@ -1297 +1234 @@
           ),
         array(
-          'content' => $content,
+          'content' => $content_confirmation,
           'content_format' => 'text/plain',
           'subject' => $subject,
@@ -1306 +1243 @@
     elseif (isset($conf_UAM['ADD_GALLERY_URL_TO_EMAILS']) and $conf_UAM['ADD_GALLERY_URL_TO_EMAILS'] == 'false')
     {
-      $content = (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "");
+      $content_confirmation = (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "");
 
       pwg_mail(
@@ -1314 +1251 @@
           ),
         array(
-          'content' => $content,
+          'content' => $content_confirmation,
           'content_format' => 'text/plain',
           'subject' => $subject,
@@ -1323 +1260 @@
     else
     {
-      $content = (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "");
+      $content_confirmation = (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "");
 
       pwg_mail(
@@ -1331 +1268 @@
           ),
         array(
-          'content' => $content,
+          'content' => $content_confirmation,
+          'content_format' => 'text/plain',
+          'subject' => $subject,
+          )
+        );
+    }
+        }
+
+
+        if ((isset($conf_UAM['MAIL_INFO']) and $conf_UAM['MAIL_INFO'] == 'true') and $typemail <> 1) // Information email send to users
+        {
+          // Adding gallery URL at the end of the email
+    if (isset($conf_UAM['ADD_GALLERY_URL_TO_EMAILS']) and $conf_UAM['ADD_GALLERY_URL_TO_EMAILS'] == 'true')
+    {
+      $content_info = (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url();
+
+      pwg_mail(
+        array(
+          'name' => stripslashes($username),
+          'email' => $email,
+          ),
+        array(
+          'content' => $content_info,
+          'content_format' => 'text/plain',
+          'subject' => $subject,
+          )
+        );
+    }
+    // Do not add gallery URL at the end of the email
+    elseif (isset($conf_UAM['ADD_GALLERY_URL_TO_EMAILS']) and $conf_UAM['ADD_GALLERY_URL_TO_EMAILS'] == 'false')
+    {
+      $content_info = (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "");
+
+      pwg_mail(
+        array(
+          'name' => stripslashes($username),
+          'email' => $email,
+          ),
+        array(
+          'content' => $content_info,
+          'content_format' => 'text/plain',
+          'subject' => $subject,
+          )
+        );
+    }
+    // By default do not add gallery URL at the end of the email
+    else
+    {
+      $content_info = (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "");
+
+      pwg_mail(
+        array(
+          'name' => stripslashes($username),
+          'email' => $email,
+          ),
+        array(
+          'content' => $content_info,
           'content_format' => 'text/plain',
           'subject' => $subject,

extensions/UserAdvManager/branches/2.6/language/en_UK/plugin.lang.php

@@ -268 +268 @@
             Goals: Inform the visitor that the registration is awaiting approval by displaying a personal block on the home page of the gallery, and this, as registration is not approved.
             <br/><br/>
-            <b>Recall: In standard operation, the "Guest" only sees the public categories, without information message.</b>
-            </li><br/><br/>
-            <li>
-Prerequisite:<br/>
-- A gallery with all or some private categories, visible only by registered users<br/>
-- At least 2 following Piwigo\'s users groups: "Waiting," without permission on private categories, and "Confirmed" with all the permissions on the private categories<br/>
-- UAM plugin<br/>
-- PWG Stuffs plugin, for adding a special UAM module<br/>
-- Optionally, the plugin Extended Description to support multi-languages<br/>
-            </li><br/><br/>
-            <li>
-Stages:<br/><br/>
+            <b>Recall: In standard operation, the "Guest" only sees the public albums, without information message.</b>
+            </li>
+            <li style="list-style-type: none;"><br/></li>
+            <li>
+Prerequisite:
+<li style="list-style-type: none;"></li>
+<li style="list-style-type: none;">- A gallery with all or some private albums, visible only by registered users</li>
+<li style="list-style-type: none;">- At least 2 following Piwigo\'s users groups: "Waiting," without permission on private albums, and "Confirmed" with all the permissions on the private albums</li>
+<li style="list-style-type: none;">- UAM plugin</li>
+<li style="list-style-type: none;">- PWG Stuffs plugin, for adding a special UAM module</li>
+<li style="list-style-type: none;">- Optionally, the plugin Extended Description to support multi-languages</li>
+            </li>
+            <li style="list-style-type: none;"><br/></li>
+            <li>
+Stages:
+<li style="list-style-type: none;"></li>
 A. In plugin UAM:
               <ol>
@@ -289 +293 @@
                 <li>Save the plugin configuration</li>
               </ol>
-<br/>
+<li style="list-style-type: none;"><br/></li>
 B. In plugin PWG Stuffs :
               <ol>
@@ -306 +310 @@
             <li>
             Goals: Inform the visitor that the registration is awaiting confirmation by posting an additional page replacing the standard index page gallery at each of these connections, and this, as registration is not approved.
-            <br/><br/>
+            <li style="list-style-type: none;"></li>
             Advantages over the method with PWG_Stuffs: Allow formatting information and displaying the information immediately upon registration of visitors.
-            </li><br/><br/>
-            <li>
-Prerequisite:<br/>
-- A gallery with all or some private categories, visible only by registered users<br/>
-- At least 2 following Piwigo\'s users groups: "Waiting," without permission on private categories, and "Confirmed" with all the permissions on the private categories<br/>
-- UAM plugin<br/>
-- Additional Pages plugin for adding and managing an additional page to replace the default index page of the gallery<br/>
-- Optionally, the plugin Extended Description to support multi-languages<br/>
-            </li><br/><br/>
-            <li>
-Stages:<br/><br/>
+            </li>
+            <li style="list-style-type: none;"><br/></li>
+            <li>
+Prerequisite:
+<li style="list-style-type: none;"></li>
+<li style="list-style-type: none;">- A gallery with all or some private albums, visible only by registered users</li>
+<li style="list-style-type: none;">- At least 2 following Piwigo\'s users groups: "Waiting," without permission on private albums, and "Confirmed" with all the permissions on the private albums</li>
+<li style="list-style-type: none;">- UAM plugin</li>
+<li style="list-style-type: none;">- Additional Pages plugin for adding and managing an additional page to replace the default index page of the gallery</li>
+<li style="list-style-type: none;">- Optionally, the plugin Extended Description to support multi-languages</li>
+            </li>
+            <li style="list-style-type: none;"><br/></li>
+            <li>
+Stages:
+<li style="list-style-type: none;"></li>
 A. In plugin UAM:
               <ol>
@@ -327 +335 @@
                 <li>Save the plugin configuration</li>
               </ol>
-<br/>
-B. In plugin Additional Pages:<br/>
+<li style="list-style-type: none;"><br/></li>
+B. In plugin Additional Pages:
+<li style="list-style-type: none;"></li>
                 <b>NOTE : The management of access rights for groups on Additional Pages must be turned on (see plugin configuration settings).</b>
-                <br/>
+                <li style="list-style-type: none;"></li>
               <ol>
                 <li>Add a new page with at least the following parameters:</li>
@@ -403 +412 @@
 $lang['UAM_AddURL2Mail'] = 'Add the URL of the gallery at the end of emails (like a signature)';
 $lang['UAM_Follow this link to access the gallery'] = 'Please, follow this link to access the gallery';
+
+$lang['UAM_Select page size'] = 'Select page size';
+$lang['UAM_Select page number'] = 'Select page number';
 ?>

extensions/UserAdvManager/branches/2.6/language/fr_FR/plugin.lang.php

@@ -105 +105 @@
 $lang['UAM_GT_Init'] = 'Initialisation du Ghost Tracker';
 $lang['UAM_GhostTracker_Title'] = 'Gestion des visiteurs fantômes';
-$lang['UAM_GhostTracker_Init'] = 'A première activation de cette fonction, ou à sa réactivation après une longue période pendant laquelle de nouveaux visiteurs se sont inscrits, il convient d\'initialiser ou de réinitialiser le Ghost Tracker. Cette action n\'est à faire qu\'une seule fois après activation ou réactivation de l\'option; à cet effet, cliquez <u>une seule fois</u> sur le bouton d\'initialisation ci-dessous.</b>';
+$lang['UAM_GhostTracker_Init'] = 'A la première activation de cette fonction, ou à sa réactivation après une longue période pendant laquelle de nouveaux visiteurs se sont inscrits, il convient d\'initialiser ou de réinitialiser le Ghost Tracker. Cette action n\'est à faire qu\'une seule fois après activation ou réactivation de l\'option; à cet effet, cliquez <u>une seule fois</u> sur le bouton d\'initialisation ci-dessous.';
 /* Mailing */
 $lang['UAM_Add of %s'] = 'Profil créé pour %s';
@@ -262 +262 @@
             <br/><br/>
             Avantages par rapport à la méthode avec PWG_Stuffs : Permettre une information mise en forme et moins austère et afficher immédiatement l\'information dès l\'inscription des visiteurs.
-            </li><br/><br/>
-            <li>
-Pré-requis:<br/>
-- Une galerie avec tout ou partie des catégories privées, visibles par les seuls utilisateurs inscrits<br/>
-- Au moins les 2 groupes d\'utilisateurs Piwigo suivants : "Attente", sans aucune permission sur les catégories privées, et "Confirmés", avec toutes les permissions sur les catégories privées<br/>
-- Le plugin UAM<br/>
-- Le plugin Additional Pages, pour l\'ajout et la gestion d\'une page additionnelle remplaçant la page d\'index par défaut de la galerie<br/>
-- En option, le plugin Extended Description, pour le support multi-langues<br/>
-            </li><br/><br/>
-            <li>
-Réalisation:<br/><br/>
-A. Dans le plugin UAM:<br/>
+            </li>
+            <li style="list-style-type: none;"><br/></li>
+            <li>
+Pré-requis:
+<li style="list-style-type: none;"></li>
+<li style="list-style-type: none;">- Une galerie avec tout ou partie des albums privées, visibles par les seuls utilisateurs inscrits</li>
+<li style="list-style-type: none;">- Au moins les 2 groupes d\'utilisateurs Piwigo suivants : "Attente", sans aucune permission sur les albums privées, et "Confirmés", avec toutes les permissions sur les albums privées</li>
+<li style="list-style-type: none;">- Le plugin UAM</li>
+<li style="list-style-type: none;">- Le plugin Additional Pages, pour l\'ajout et la gestion d\'une page additionnelle remplaçant la page d\'index par défaut de la galerie</li>
+<li style="list-style-type: none;">- En option, le plugin Extended Description, pour le support multi-langues</li>
+            </li>
+            <li style="list-style-type: none;"><br/></li>
+            <li>
+Réalisation:
+<li style="list-style-type: none;"></li>
+A. Dans le plugin UAM:
+<li style="list-style-type: none;"></li>
               <ol>
                 <li>Activer la confirmation d\'inscription</li>
@@ -281 +286 @@
                 <li>Enregistrer la configuration du plugin</li>
               </ol>
-<br/>
-B. Dans le plugin Additional Pages:<br/>
+<li style="list-style-type: none;"><br/></li>
+B. Dans le plugin Additional Pages:
+<li style="list-style-type: none;"></li>
                 <b>NOTE : La gestion des droits d\'accès aux pages additionelles pour les groupes doit être activée (voir configuration du plugin Additional Pages).</b>
                 <br/>
@@ -312 +318 @@
             <li>
             Objectifs : Informer le visiteur que son inscription est en attente de confirmation en affichant un bloc personnel sur la page d\'accueil de la galerie; et ce, tant que l\'inscription n\'est pas confirmée.<br/><br/>
-            <b>Rappel: En fonctionnement standard, le "Guest" ne voit que les catégories publiques, sans message d\'information.</b>
-            </li><br/><br/>
-            <li>
-Pré-requis:<br/>
-- Une galerie avec tout ou partie des catégories privées, visibles par les seuls utilisateurs inscrits<br/>
-- Au moins les 2 groupes d\'utilisateurs Piwigo suivants : "Attente", sans aucune permission sur les catégories privées, et "Confirmés", avec toutes les permissions sur les catégories privées<br/>
-- Le plugin UAM<br/>
-- Le plugin PWG Stuffs, pour l\'ajout d\'un module spécial UAM<br/>
-- En option, le plugin Extended Description, pour le support multi-langues<br/>
-            </li><br/><br/>
-            <li>
-Réalisation:<br/><br/>
-A. Dans le plugin UAM:<br/>
+            <b>Rappel: En fonctionnement standard, le "Guest" ne voit que les albums publics, sans message d\'information.</b>
+            </li>
+            <li style="list-style-type: none;"><br/></li>
+            <li>
+Pré-requis:
+<li style="list-style-type: none;"></li>
+<li style="list-style-type: none;">- Une galerie avec tout ou partie des albums privées, visibles par les seuls utilisateurs inscrits</li>
+<li style="list-style-type: none;">- Au moins les 2 groupes d\'utilisateurs Piwigo suivants : "Attente", sans aucune permission sur les albums privées, et "Confirmés", avec toutes les permissions sur les albums privées</li>
+<li style="list-style-type: none;">- Le plugin UAM</li>
+<li style="list-style-type: none;">- Le plugin PWG Stuffs, pour l\'ajout d\'un module spécial UAM</li>
+<li style="list-style-type: none;">- En option, le plugin Extended Description, pour le support multi-langues</li>
+            </li>
+            <li style="list-style-type: none;"><br/></li>
+            <li>
+Réalisation:
+<li style="list-style-type: none;"></li>
+A. Dans le plugin UAM:
+<li style="list-style-type: none;"></li>
               <ol>
                 <li>Activer la confirmation d\'inscription</li>
@@ -333 +344 @@
                 <li>Enregistrer la configuration du plugin</li>
               </ol>
-<br/>
-B. Dans le plugin PWG Stuffs:<br/>
+<li style="list-style-type: none;"><br/></li>
+B. Dans le plugin PWG Stuffs:
+<li style="list-style-type: none;"></li>
               <ol>
                 <li>Aller dans l\'onglet "Ajouter un nouveau bloc"</li>
@@ -403 +415 @@
 $lang['UAM_AddURL2Mail'] = 'Ajouter l\'URL de la galerie à la fin des emails (comme une signature)';
 $lang['UAM_Follow this link to access the gallery'] = 'Veuillez utiliser ce lien pour vous connecter';
+
+$lang['UAM_Select page size'] = 'Choisir la taille des pages';
+$lang['UAM_Select page number'] = 'Sélectionner une page';
 ?>

extensions/UserAdvManager/branches/2.6/language/pt_BR/help.lang.php

@@ -77 +77 @@
 <br/><br/>
 Se esta opção e a opção "Lembrar os usuários não confirmados" são ativadas, novas opções aparecem em baixo nesta seção para permitir a automação de gestão de usuários não confirmados.';
+$lang['UAM_miscTitle_d'] = '- Usuários registrados monitoramento <br/>
+- Apelido obrigatório para comentário de visitantes <br/>
+...';
+$lang['UAM_infomailTitle_d'] = 'Esta opção permite automatizar o envio de um e-mail de informações de um usuário quando ele muda de senha ou endereço de e-mail em sua página de perfil. <br/><bb/>
+O conteúdo da mensagem enviada é composta por uma parte customizável a introduzir uma pequena nota de boas-vindas e uma parte fixa, indicando o nome de login, senha e endereço de e-mail do usuário.';
+$lang['UAM_confirmstatTitle'] = 'Estatutos';
+$lang['UAM_confirmTitle_d'] = '- Informações geração email <br/>
+- Registrar confirmação geração email <br/>
+- Grupos, estado ou nível de privacidade auto registro <br/>
+- Prazo para a confirmação do registro <br/>
+- Geração email Lembrete
+...';
+$lang['UAM_USRAutoMailTitle_d'] = 'Quando ativada, esta função irá enviar automaticamente conteúdo personalizado em "Lembrete de e-mail com uma nova chave gerada" aos visitantes que correspondem aos critérios.';
+$lang['UAM_Tracking registered users_d'] = 'Isso ativa uma tabela na guia "de rastreamento de usuários registrados", onde são listados os utilizadores registados na galeria com a data de sua última visita e tempo gasto (em dias) desde a sua última visita. O monitoramento é puramente informativo para o administrador da galeria.';
+$lang['UAM_StuffsTitle_d'] = 'Isso permite que um bloco UAM adicional no PWG Stuffs plugin (se instalado), informar os visitantes que não confirmaram sua inscrição sobre suas condição.
+<br/><br/>
+Consulte <b>Dicas e Exemplos de Uso</b> na parte inferior desta página para mais detalhes.';
+$lang['UAM_HidePasswTitle_d'] = 'Escolha esta opção se você deseja exibir a senha escolhida pelo visitante no e-mail informações. Se você ativar a opção, a senha irá aparecer em texto claro. Se você desativar a senha não vai aparecer.';
 ?>

extensions/UserAdvManager/branches/2.6/language/pt_PT/description.txt

@@ -1 @@
-Reforço das possibilidades de gerenciamento de utilizadores
+Reforço das capacidades de gestão de utilizadores

extensions/UserAdvManager/branches/2.6/language/pt_PT/help.lang.php

@@ -317 +317 @@
 $lang['UAM_infomailTitle_d'] = 'Esta opção permite automatizar o envio de um e-mail informação para um utilizador quando ele altera a senha ou endereço de e-mail no seu perfil. <br/>
 O conteúdo da mensagem a enviar é composto por uma parte personalizável para introduzir uma pequena nota de boas-vindas e uma parte fixa, indicando o nome de login, senha e endereço de e-mail do utilizador.';
+$lang['UAM_confirmstatTitle_d'] = '<b style=&quot;color: red;&quot;>AVISO : A utilização de estatutos na confirmação requer que tenha mantido o estatuto &quot;Guest (Visitante)&quot; como o estatuto por defeito (no modelo de utilizador) para os novos registos. Note que também pode definir outro tipo de utilizador como defeito. Por favor reveja a documentação do Piwigo para mais detalhes.</b><br/><br/>
+Os estatutos são validados para utilização conjunta com a &quot;Confirmação de registo&quot;';
+$lang['UAM_confirmlevelTitle_d'] = '<b style=&quot;color: red;&quot;>AVISO : A utilização do nível de privacidade requere que já o tenha utilizado com as suas imagens. Por favor reveja a documentação do Piwigo para mais detalhes.</b><br/><br/>
+O nível de privacidade é validado para utilização conjunta com a &quot;Confirmação de registo&quot;';
+$lang['UAM_confirmgrpTitle_d'] = '<b style=&quot;color: red;&quot;>AVISO : A utilização de grupos na confirmação requer que tenha criado pelo menos um grupo de utilizadores e que este esteja definido como grupo &quot;por defeito&quot; na gestão de grupos de utilizadores do Piwigo.</b><br/><br/>
+os grupos são validados para utilização conjunta com a &quot;Confirmação de registo&quot;
+';
+$lang['UAM_carexcTitle_d'] = 'Pode ser interessante a proibição da utilização de certos caracteres nos nomes de utilizador (exemplo: recusar nomes de login que contenham @). Esta opção permite excluir caracteres ou sequências de caracteres.<br/>
+NB: A opção pode também excluir palavras inteiras
+<br/><br/>
+<b style=&quot;color: red;&quot;>Aviso: esta opção não tem efeito sobre os nomes de utilizador criados à ativação da mesma.</b>';
 ?>