Changeset 8841


Ignore:
Timestamp:
Jan 22, 2011, 6:14:15 PM (14 years ago)
Author:
Eric
Message:

Set compatibility for Piwigo 2.2-RC
Note : Little display bug remains on Piwigo's left menu due to sortable tables (userlist.tpl, usermanager.tpl and ghosttracker.tpl) when no user is listed.

Location:
extensions/NBC_UserAdvManager/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php

    r8092 r8841  
    105105  case 'global':
    106106
    107         if (isset($_POST['submit']) and !is_adviser() and isset($_POST['UAM_Mail_Info']) and isset($_POST['UAM_Username_Char']) and isset($_POST['UAM_Confirm_Mail']) and isset($_POST['UAM_No_Comment_Anonymous']) and isset($_POST['UAM_Password_Enforced']) and isset($_POST['UAM_AdminPassword_Enforced']) and isset($_POST['UAM_GhostUser_Tracker']) and isset($_POST['UAM_Admin_ConfMail']) and isset($_POST['UAM_RedirToProfile']) and isset($_POST['UAM_GTAuto']))
     107        if (isset($_POST['submit']) and isset($_POST['UAM_Mail_Info']) and isset($_POST['UAM_Username_Char']) and isset($_POST['UAM_Confirm_Mail']) and isset($_POST['UAM_No_Comment_Anonymous']) and isset($_POST['UAM_Password_Enforced']) and isset($_POST['UAM_AdminPassword_Enforced']) and isset($_POST['UAM_GhostUser_Tracker']) and isset($_POST['UAM_Admin_ConfMail']) and isset($_POST['UAM_RedirToProfile']) and isset($_POST['UAM_GTAuto']))
    108108  {
    109109
    … …  
    215215
    216216  //Testing password enforcement
    217   if (isset($_POST['PasswordTest']) and !is_adviser() and isset($_POST['UAM_Password_Test']) and !empty($_POST['UAM_Password_Test']))
     217  if (isset($_POST['PasswordTest']) and isset($_POST['UAM_Password_Test']) and !empty($_POST['UAM_Password_Test']))
    218218  {
    219219    $UAM_Password_Test_Score = testpassword($_POST['UAM_Password_Test']);
    220220  }
    221   else if (isset($_POST['PasswordTest']) and !is_adviser() and empty($_POST['UAM_Password_Test']))
     221  else if (isset($_POST['PasswordTest']) and empty($_POST['UAM_Password_Test']))
    222222  {
    223223    array_push($page['errors'], l10n('reg_err_login3'));
    … …  
    10021002    }
    10031003
    1004     //Hide radio-button if not allow to assign adviser
    1005                 if ($conf['allow_adviser'])
    1006         {
    1007         $template->assign('adviser', true);
    1008         }
    1009 
    10101004// +-----------------------------------------------------------------------+
    10111005// |                               user list                               |
    … …  
    10861080                                  ? '<BR>['.l10n('is_the_default').']' : ''),
    10871081                                  'STATUS' => l10n('user_status_'
    1088                                   .$local_user['status']).(($local_user['adviser'] == 'true')
    1089                                   ? '<BR>['.l10n('adviser').']' : ''),
     1082                                  .$local_user['status']),
    10901083                                        'EMAIL'            => get_email_address_as_display_text($local_user['email']),
    10911084                'GROUPS'           => $groups_string,
    … …  
    13441337    {
    13451338      //Reset is only allowed for admins !
    1346       if (is_admin() and !is_adviser())
     1339      if (is_admin())
    13471340      {
    13481341        $query1 = '
    … …  
    14121405    }
    14131406
    1414     //Hide radio-button if not allow to assign adviser
    1415                 if ($conf['allow_adviser'])
    1416     {
    1417       $template->assign('adviser', true);
    1418         }
    1419 
    14201407// +-----------------------------------------------------------------------+
    14211408// |                               user list                               |

  • extensions/NBC_UserAdvManager/trunk/admin/template/ghosttracker.tpl

    r6783 r8841  
    1 {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
    2 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
    3 {known_script id="jquery.tablesorter" src=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"}
    4 {known_script id="jquery.tablesorter.pager" src=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.pager.js"}
     1{combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"}
     2{combine_script id="jquery.cluetip" path=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
     3{combine_script id="jquery.tablesorter" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"}
     4{combine_script id="jquery.tablesorter.pager" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.pager.js"}
    55
    66{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head}
    … …  
    2121      .tablesorter({ldelim}sortList:[[4,1]], headers: {ldelim} 0: {ldelim} sorter: false {rdelim}{rdelim}{rdelim})
    2222      .tablesorterPager({ldelim}container: $("#pager"), positionFixed: false, size: 20, totalPages: 0{rdelim});
    23     {rdelim}
    24 );
     23    {rdelim});
    2524</script>
    2625
    … …  
    4241  <fieldset>
    4342    <legend class="cluetip" title="{'UAM_gtTitle'|translate}|{'UAM_gtTitle_d'|translate}">{'GhostTracker_Title'|@translate}</legend>
    44         <table id="sorting" class="table2" width="97%" summary="">
    45           <thead>
    46             <tr class="throw">
    47               <th>&nbsp;</th>
    48               <th>{'Username'|@translate}</th>
    49               <th>{'Profile'|@translate}</th>
    50               <th>{'Email address'|@translate}</th>
    51               <th>{'LastVisit_Date'|@translate}</th>
    52               <th>{'Reminder'|@translate}</th>
    53             </tr>
    54           </thead>
    55           <tbody>
     43      <table id="sorting" class="table2" width="97%" summary="">
     44        <thead>
     45          <tr class="throw">
     46            <th>&nbsp;</th>
     47            <th>{'Username'|@translate}</th>
     48            <th>{'Profile'|@translate}</th>
     49            <th>{'Email address'|@translate}</th>
     50            <th>{'LastVisit_Date'|@translate}</th>
     51            <th>{'Reminder'|@translate}</th>
     52          </tr>
     53        </thead>
     54        <tbody>
    5655          {foreach from=$users item=user name=users_loop}
    5756            <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
    … …  
    7372          {/foreach}
    7473        </tbody>
    75         </table>
     74      </table>
    7675<div id="pager" class="pager">
    7776        <form>

  • extensions/NBC_UserAdvManager/trunk/admin/template/global.tpl

    r8092 r8841  
    1 {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
    2 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
     1{combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"}
     2{combine_script id="jquery.cluetip" path=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
    33
    44{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head}

  • extensions/NBC_UserAdvManager/trunk/admin/template/userlist.tpl

    r6783 r8841  
    1 {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
    2 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
    3 {known_script id="jquery.tablesorter" src=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"}
    4 {known_script id="jquery.tablesorter.pager" src=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.pager.js"}
    5 
     1{combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"}
     2{combine_script id="jquery.cluetip" path=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
     3{combine_script id="jquery.tablesorter" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"}
     4{combine_script id="jquery.tablesorter.pager" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.pager.js"}
    65
    76{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head}
    … …  
    2524);
    2625</script>
    27 
    2826
    2927<div class="titrePage">

  • extensions/NBC_UserAdvManager/trunk/admin/template/usermanager.tpl

    r6783 r8841  
    1 {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
    2 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
    3 {known_script id="jquery.tablesorter" src=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"}
    4 {known_script id="jquery.tablesorter.pager" src=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.pager.js"}
     1{combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"}
     2{combine_script id="jquery.cluetip" path=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
     3{combine_script id="jquery.tablesorter" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"}
     4{combine_script id="jquery.tablesorter.pager" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.pager.js"}
    55
    66{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head}

  • extensions/NBC_UserAdvManager/trunk/include/functions.inc.php

    r8092 r8841  
    17691769                u.'.$conf['user_fields']['email'].' AS email,
    17701770                ui.status,
    1771                 ui.adviser,
    17721771                ui.enabled_high,
    17731772                ui.level,
Note: See TracChangeset for help on using the changeset viewer.