Changeset 18800


Ignore:
Timestamp:
Oct 29, 2012, 8:58:53 PM (8 years ago)
Author:
Eric
Message:

merge r18799 from trunk :
Small admin panel upgrade
Update lv_LV, thanks to : agrisans
Add da_DK, thanks to : Kaare

Location:
extensions/UserAdvManager/branches/2.41
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/branches/2.41/admin/template/ghosttracker.tpl

    r12666 r18800  
    6060              <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>
    6161              <td>{$user.EMAIL}</td>
    62 {if $user.REMINDER == l10n('UAM_Reminder_Sent_NOK')}
     62            {if $user.REMINDER == l10n('UAM_Reminder_Sent_NOK')}
    6363              <td style="color:orange;text-align:center;">{$user.LASTVISIT}</td>
    6464              <td style="color:orange;text-align:center;">{$user.REMINDER}</td>
    65 {else $user.REMINDER == l10n('UAM_Reminder_Sent_OK')}
     65            {else $user.REMINDER == l10n('UAM_Reminder_Sent_OK')}
    6666              <td style="color:red;text-align:center;">{$user.LASTVISIT}</td>
    6767              <td style="color:red;text-align:center;">{$user.REMINDER}</td>
    68 {/if}
     68            {/if}
    6969              {foreach from=$user.plugin_columns item=data}
    7070                <td>{$data}</td>
     
    7474        </tbody>
    7575      </table>
    76 <div id="pager" class="pager">
    77         <form>
    78                 <img src="{$UAM_PATH}admin/template/icon/first.png" class="first">
    79                 <img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev">
    80                 <input type="text" class="pagedisplay">
    81                 <img src="{$UAM_PATH}admin/template/icon/next.png" class="next">
    82                 <img src="{$UAM_PATH}admin/template/icon/last.png" class="last">
    83                 <select class="pagesize">
    84                         <option  value="10">10</option>
    85                         <option selected="selected" value="20">20</option>
    86                         <option value="30">30</option>
    87                         <option value="40">40</option>
    88                 </select>
    89         </form>
    90 </div>
    91         <br>
    92 <p>
    93   {'target'|@translate}
    94   <label><input type="radio" name="target" value="all" > {'all'|@translate}</label>
    95   <label><input type="radio" name="target" value="selection" checked="checked" > {'selection'|@translate}</label>
    96 </p>
     76      <div id="pager" class="pager">
     77      <form>
     78        <img src="{$UAM_PATH}admin/template/icon/first.png" class="first">
     79        <img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev">
     80        <input type="text" class="pagedisplay">
     81        <img src="{$UAM_PATH}admin/template/icon/next.png" class="next">
     82        <img src="{$UAM_PATH}admin/template/icon/last.png" class="last">
     83        <select class="pagesize">
     84          <option  value="10">10</option>
     85          <option selected="selected" value="20">20</option>
     86          <option value="30">30</option>
     87          <option value="40">40</option>
     88        </select>
     89      </form>
     90      </div>
     91      <br>
     92      <fieldset>
     93      <p>
     94        {'target'|@translate}
     95        <label><input type="radio" name="target" value="all" > {'all'|@translate}</label>
     96        <label><input type="radio" name="target" value="selection" checked="checked" > {'selection'|@translate}</label>
     97      </p>
    9798
    98 <p>
    99   <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected" >
    100   <input class="submit" type="submit" value="{'UAM_Reminder'|@translate}" name="Reminder_Email" >
    101 </p>
     99      <p>
     100        <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected" >
     101        <input class="submit" type="submit" value="{'UAM_Reminder'|@translate}" name="Reminder_Email" >
     102      </p>
     103      </fieldset>
    102104  </fieldset>
    103                 {else}
    104                 <div>
    105                         {'UAM_No_Ghosts'|@translate}
    106                 </div>
     105    {else}
     106                  <div>
     107                         {'UAM_No_Ghosts'|@translate}
     108                  </div>
    107109                {/if}
    108110</form>
  • extensions/UserAdvManager/branches/2.41/admin/template/global.tpl

    r18461 r18800  
    5555  jQuery("#UAM_Mail_Info_false").click(function() {
    5656    jQuery("#UAM_MAIL_INFO").hide("slow");
     57  });
     58  jQuery("#UAM_CustomPasswRetr_true").click(function() {
     59    jQuery("#UAM_CustomPasswRetr").show("slow");
     60  });
     61  jQuery("#UAM_CustomPasswRetr_false").click(function() {
     62    jQuery("#UAM_CustomPasswRetr").hide("slow");
    5763  });
    5864 
     
    882888              {'UAM_Enable'|@translate}
    883889</label>
    884             <textarea class="uam_textfields" name="UAM_CustomPasswRetr_Text" id="UAM_CustomPasswRetr_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CUSTOMPASSWRETR_TEXT}</textarea>
    885          
     890            <fieldset id="UAM_CustomPasswRetr" {if $UAM_CUSTOMPASSWRETR_FALSE}style="display:none"{/if}>
     891              <textarea class="uam_textfields" name="UAM_CustomPasswRetr_Text" id="UAM_CustomPasswRetr_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CUSTOMPASSWRETR_TEXT}</textarea>
     892            </fieldset>
    886893          </li>
    887894        </ul>
  • extensions/UserAdvManager/branches/2.41/admin/template/usermanager.tpl

    r17918 r18800  
    6868      </tbody>
    6969      </table>
    70 {if !empty($users)}
    71 <div id="pager" class="pager">
    72         <form>
    73                 <img src="{$UAM_PATH}admin/template/icon/first.png" class="first">
    74                 <img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev">
    75                 <input type="text" class="pagedisplay">
    76                 <img src="{$UAM_PATH}admin/template/icon/next.png" class="next">
    77                 <img src="{$UAM_PATH}admin/template/icon/last.png" class="last">
    78                 <select class="pagesize">
    79                         <option  value="10">10</option>
    80                         <option selected="selected" value="20">20</option>
    81                         <option value="30">30</option>
    82                         <option value="40">40</option>
    83                 </select>
    84         </form>
    85 </div>
    86 {/if}
     70      {if !empty($users)}
     71        <div id="pager" class="pager">
     72          <form>
     73            <img src="{$UAM_PATH}admin/template/icon/first.png" class="first">
     74            <img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev">
     75            <input type="text" class="pagedisplay">
     76            <img src="{$UAM_PATH}admin/template/icon/next.png" class="next">
     77            <img src="{$UAM_PATH}admin/template/icon/last.png" class="last">
     78            <select class="pagesize">
     79              <option  value="10">10</option>
     80              <option selected="selected" value="20">20</option>
     81              <option value="30">30</option>
     82              <option value="40">40</option>
     83            </select>
     84          </form>
     85        </div>
     86      {/if}
    8787        <br>
     88      <fieldset>
     89        <p>
     90          {'target'|@translate}
     91          <label><input type="radio" name="target" value="all" > {'all'|@translate}</label>
     92          <label><input type="radio" name="target" value="selection" checked="checked" > {'selection'|@translate}</label>
     93        </p>
    8894
    89 <p>
    90   {'target'|@translate}
    91   <label><input type="radio" name="target" value="all" > {'all'|@translate}</label>
    92   <label><input type="radio" name="target" value="selection" checked="checked" > {'selection'|@translate}</label>
    93 </p>
    94 
    95 <p>
    96 {if $CONFIRM_LOCAL == "local"}
    97   <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected">
    98   <input class="submit" type="submit" value="{'UAM_Manual_Validation'|@translate}" name="Manual_Validation">
    99 {else}
    100   <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected">
    101   <input class="submit" type="submit" value="{'UAM_Mail_without_key'|@translate}" name="Mail_Without_Key">
    102   <input class="submit" type="submit" value="{'UAM_Mail_with_key'|@translate}" name="Mail_With_Key">
    103   <input class="submit" type="submit" value="{'UAM_Manual_Validation'|@translate}" name="Manual_Validation">
    104 {/if}
    105 </p>
     95        <p>
     96        {if $CONFIRM_LOCAL == "local"}
     97          <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected">
     98          <input class="submit" type="submit" value="{'UAM_Manual_Validation'|@translate}" name="Manual_Validation">
     99        {else}
     100          <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected">
     101          <input class="submit" type="submit" value="{'UAM_Mail_without_key'|@translate}" name="Mail_Without_Key">
     102          <input class="submit" type="submit" value="{'UAM_Mail_with_key'|@translate}" name="Mail_With_Key">
     103          <input class="submit" type="submit" value="{'UAM_Manual_Validation'|@translate}" name="Manual_Validation">
     104        {/if}
     105        </p>
     106      </fieldset>
    106107  </fieldset>
    107                 {else}
    108                 <div>
    109                         {'UAM_No_Usermanager'|@translate}
    110                 </div>
    111                 {/if}
     108    {else}
     109      <div>
     110        {'UAM_No_Usermanager'|@translate}
     111                  </div>
     112    {/if}
    112113</form>
    113114
  • extensions/UserAdvManager/branches/2.41/changelog.txt.php

    r18479 r18800  
    340340            Update it_IT, thanks to : Ericnet and virgigiole
    341341
    342 -- 2.41.0 : Bug 2744 fixed - User connexion rejection does not work if no group/status/privacy is set
     342-- 2.41.0 : Bug 2741 fixed - User connexion rejection was not working if $conf['guest_access'] = false
     343            Bug 2744 fixed - User connexion rejection does not work if no group/status/privacy is set
     344            Feature 2745 - Send an email to admins with a link to validate new registered users
    343345            Bug 2749 fixed - regex meta-characters are usable in character exclusion in usernames
    344346            New unvalidated user controls are more efficient
     
    351353            Update de_DE, thanks to : Yogie
    352354            Update it_IT, thanks to : salvatore
    353            
     355
     356-- 2.41.1 : Small admin panel upgrade
     357            Update lv_LV, thanks to : agrisans
     358            Add da_DK, thanks to : Kaare
     359
    354360*/
    355361?>
  • extensions/UserAdvManager/branches/2.41/language/el_GR/plugin.lang.php

    r18206 r18800  
    333333$lang['UAM_Subject admin validation for %s'] = 'Η καταχώρηση των %s αναμένει επικύρωση';
    334334$lang['UAM_Manual_validation_needed_for %s'] = 'Ο χρήστης % καταχωρήθηκε και περιμένει χειροκίνητη επικύρωση από τον διαχειριστή';
     335$lang['UAM_Customize_messagesandmails'] = 'Προσαρμόστε τα μηνύματα και τα e-mails';
     336$lang['UAM_Change'] = 'Αλλάξτε την Ομάδα / Status / Επίπεδο προστασίας των χρηστών που έχουν επιβεβαιωθεί';
    335337?>
  • extensions/UserAdvManager/branches/2.41/language/es_ES/plugin.lang.php

    r18206 r18800  
    392392$lang['UAM_Manual_validation_needed_for %s'] = 'El usuario %s se ha registrado y espera para la validación manual por un administrador.';
    393393$lang['UAM_Subject admin validation for %s'] = 'El registro de %s espera para la validación';
     394$lang['UAM_Change'] = 'Change the Group/Status/Privacy Level of the users who have been confirmed';
     395$lang['UAM_Customize_messagesandmails'] = 'Personalizar los mensajes y correos';
    394396?>
  • extensions/UserAdvManager/branches/2.41/language/it_IT/plugin.lang.php

    r18290 r18800  
    404404$lang['UAM_Manual_validation_needed_for %s'] = 'L\'utente %s si è registrato ed è in attesa dell\'approvazione manuale da parte dell\'amministratore.';
    405405$lang['UAM_Subject admin validation for %s'] = 'La registrazione di %s è in attesa di approvazione';
     406$lang['UAM_Change'] = 'Cambia il Gruppo/Stato/Livello di Privacy degli utenti che sono stati confermati.';
     407$lang['UAM_Customize_messagesandmails'] = 'Personalizza i messaggi e le email';
    406408?>
  • extensions/UserAdvManager/branches/2.41/language/lv_LV/help.lang.php

    r18477 r18800  
    182182<br><br>
    183183Lai lietotu vairākas valodas, ja aktivēts, varat izmantot Paplašinātā apraksta spraudņa tegus.';
     184$lang['UAM_ConfirmMail_Subject_d'] = 'Ievadiet šeit savu pielāgoto reģistrācijas apstiprinājuma pasta tēmu. <br>
     185Pēc noklusējuma lauks ir vispārējs tekstu angļu valodā, bet to var mainīt un izmantot Paplašinātā Apraksta spraudņa tulkošanas tagus [lang =?], ja uzstādīti.
     186<br><br>
     187Neizmantojot Paplašinātā Apraksta spraudņa iespējas, pieejami sekojoši papildu pielāgošanas tagi: <br>
     188- <b style=&quot;color: red;&quot;>[username]</b> lai automātiski ievietotu e-pasta gala lietotāja vārdu.<br>
     189- <b style=&quot;color: red;&quot;>[mygallery]</b> lai ievietotu jūsu galerijas nosaukumu.<br>';
     190$lang['UAM_confirmmail_custom1_d'] = 'Kad opcija &quot;Reģistrācijas apstiprināšana&quot; ir aktīva, šis lauks ļauj jums pielāgot <b><u>akceptēšanas tekstu</u></b> reģistrēšanas apstiprināšanas lapā, kas parādās, kad lietotājs uzklikšķina uz pa e-pastā saņemto apstiprināšanas saiti.
     191<br><br>
     192Pēc spraudņa instalēšanas, standarta teksts tiek iestatīts kā paraugs.
     193<br><br>
     194Tālāk pielāgojiet saturu ar speciālo tagu-iezīmju palīdzību:<br>
     195- <b style=&quot;color: red;&quot;>[username]</b> lai automātiski ievietotu atbilstošo lietotāja vārdu.<br>
     196- <b style=&quot;color: red;&quot;>[mygallery]</b> lai ievietotu jūsu galerijas nosaukumu.<br>
     197- <b style=&quot;color: red;&quot;>[myurl]</b> lai ievietotu jūsu galerijas URL, ja tas iestatīts Piwigo konfigurācijas opcijās.
     198<br><br>
     199Šis lauks savietojams ar FCK Redaktoru un, ja lietojat daudzvalodu variantu, ja tas aktīvs, varat izmantot Paplašinātā apraksta spraudņa [lang] tagus.';
    184200?>
  • extensions/UserAdvManager/branches/2.41/language/lv_LV/plugin.lang.php

    r18385 r18800  
    388388$lang['UAM_Manual_validation_needed_for %s'] = 'Lietotājs %s ir reģistrējies un gaida administratora apstiprinājumu. ';
    389389$lang['UAM_Subject admin validation for %s'] = '%s reģistrācija gaida apstiprinājumu';
     390$lang['UAM_Change'] = 'Izmainīt apstiprināto lietotāju Grupas/Statuss/Konfidencialitāte Līmeni';
     391$lang['UAM_Customize_messagesandmails'] = 'Pielāgojiet ziņojumus un pastu';
    390392?>
Note: See TracChangeset for help on using the changeset viewer.