Ignore:
Timestamp:
Oct 23, 2013, 6:04:53 PM (11 years ago)
Author:
Eric
Message:

r25092 merged from trunk to branch 2.51 :
Bug 1109 fixed - Password enforcement features have been removed from UAM and set in a new dedicated plugin : Password Policy

Language files cleanup

Bug 2984 fixed - Display issue in Miscellaneous options
Bug 2986 fixed - Status for unvalidated users can not be "Guest" and is forced to "-------"
Bug 2987 fixed - New registered users have to follow a link on confirmation page before log in

File:
1 edited

Legend:

Unmodified
Added
Removed

  • extensions/UserAdvManager/branches/2.51/admin/template/global.tpl

    r24212 r25093  
    186186            </label>
    187187          </li>
    188           <li>
    189             <label class="cluetip" title="{'UAM_Password_Enforced'|translate}|{'UAM_passwTitle_d'|translate}">
    190               {'UAM_Password_Enforced'|@translate}
    191             </label>
    192          
    193             <label for="UAM_Password_Enforced_false"><input id="UAM_Password_Enforced_false" type="radio" value="false" {$UAM_PASSWORDENF_FALSE} name="UAM_Password_Enforced"/>
    194               {'UAM_Disable'|@translate}
    195             </label>
    196             <label for="UAM_Password_Enforced_true"><input id="UAM_Password_Enforced_true" type="radio" value="true" {$UAM_PASSWORDENF_TRUE} name="UAM_Password_Enforced"/>
    197               {'UAM_Password_Enforced_true'|@translate}&nbsp;
    198             <input type="text" name="UAM_Password_Score" value="{$UAM_PASSWORD_SCORE}" size="5" style="text-align: center;"/>
    199             </label>
    200             {'UAM_PasswordTest'|@translate}
    201               <input class="cluetip" title="{'UAM_passwtestTitle'|translate}|{'UAM_passwtestTitle_d'|translate}" type="text" name="UAM_Password_Test" value="{$UAM_PASSWORD_TEST}" size="50" style="text-align: left;"/>
    202               &nbsp;&nbsp;&nbsp;
    203               <input class="submit" type="submit" value="{'UAM_PasswordTest'|@translate}" name="PasswordTest"/>
    204               &nbsp;&nbsp;&nbsp;{'UAM_ScoreTest'|@translate}{$UAM_PASSWORD_TEST_SCORE}
    205            
    206           </li>
    207           <ul>
    208             <li>
    209               <label class="cluetip" title="{'UAM_AdminPassword_Enforced'|translate}|{'UAM_passwadmTitle_d'|translate}">
    210                 {'UAM_AdminPassword_Enforced'|@translate}
    211               </label>
    212            
    213               <label for="UAM_AdminPassword_Enforced_false"><input id="UAM_AdminPassword_Enforced_false" value="false" {$UAM_ADMINPASSWENF_FALSE} name="UAM_AdminPassword_Enforced" type="radio"/>
    214                 {'UAM_Disable'|@translate}
    215               </label>
    216               <label for="UAM_AdminPassword_Enforced_true"><input id="UAM_AdminPassword_Enforced_true" value="true" {$UAM_ADMINPASSWENF_TRUE} name="UAM_AdminPassword_Enforced" type="radio"/>
    217                 {'UAM_Enable'|@translate}
    218               </label>
    219            
    220             </li>
    221           </ul>
    222      
     188
    223189          <li>
    224190          {if $UAM_EMAIL_MANDATORY}
    … …  
    283249            </label>
    284250            <label for="UAM_Confirm_Mail_false"><input type="radio" id="UAM_Confirm_Mail_false" value="false" {$UAM_CONFIRM_MAIL_FALSE} name="UAM_Confirm_Mail"/>
    285               {'UAM_Disable'|@translate}</label>
     251              {'UAM_Disable'|@translate}
     252            </label>
    286253            <label for="UAM_Confirm_Mail_true"><input type="radio" id="UAM_Confirm_Mail_true" value="true" {$UAM_CONFIRM_MAIL_TRUE} name="UAM_Confirm_Mail"/>
    287               {'UAM_Confirm_Mail_true'|@translate}</label>
     254              {'UAM_Confirm_Mail_true'|@translate}
     255            </label>
    288256            <label for="UAM_Confirm_Mail_local"><input type="radio" id="UAM_Confirm_Mail_local" value="local" {$UAM_CONFIRM_MAIL_LOCAL} name="UAM_Confirm_Mail"/>
    289               {'UAM_Confirm_Mail_local'|@translate}</label>
     257              {'UAM_Confirm_Mail_local'|@translate}
     258            </label>
    290259          </li>
    291260        </ul>
    … …  
    399368                </label>
    400369                <label for="UAM_RejectConnexion_true"><input id="UAM_RejectConnexion_true" type="radio" value="true" {$UAM_REJECTCONNECT_TRUE} name="UAM_RejectConnexion"/>
    401                   {'UAM_Enable'|@translate}</label>
     370                  {'UAM_Enable'|@translate}
    402371                </label>
    403372              </li>
    … …  
    499468                </label>
    500469                <label for="UAM_ConfirmMail_TimeOut_false" ><input id="UAM_ConfirmMail_TimeOut_false" type="radio" value="false" {$UAM_CONFIRMMAIL_TIMEOUT_FALSE} name="UAM_ConfirmMail_TimeOut"/>
    501                   {'UAM_Disable'|@translate}</label>
     470                  {'UAM_Disable'|@translate}
     471                </label>
    502472                <label for="UAM_ConfirmMail_TimeOut_true" ><input id="UAM_ConfirmMail_TimeOut_true" type="radio" value="true" {$UAM_CONFIRMMAIL_TIMEOUT_TRUE} name="UAM_ConfirmMail_TimeOut"/>
    503473                  {'UAM_ConfirmMail_TimeOut_true'|@translate}
    … …  
    510480                </label>
    511481                <label for="UAM_ConfirmMail_Remail_false" ><input id="UAM_ConfirmMail_Remail_false" type="radio" value="false" {$UAM_CONFIRMMAIL_REMAIL_FALSE} name="UAM_ConfirmMail_Remail"/>
    512                   {'UAM_Disable'|@translate}</label>
     482                  {'UAM_Disable'|@translate}
     483                </label>
    513484                <label for="UAM_ConfirmMail_Remail_true" ><input id="UAM_ConfirmMail_Remail_true" type="radio" value="true" {$UAM_CONFIRMMAIL_REMAIL_TRUE} name="UAM_ConfirmMail_Remail"/>
    514                   {'UAM_Enable'|@translate}</label>
     485                  {'UAM_Enable'|@translate}
     486                </label>
    515487              </li>
    516488            <a id="show_UAM_ConfirmMail" >{'UAM_Customize_messagesandmails'|translate}</a>
    … …  
    673645              <label for="UAM_GTAuto_false"><input id="UAM_GTAuto_false" type="radio" value="false" {$UAM_GTAUTO_FALSE} name="UAM_GTAuto"/>
    674646                {'UAM_Disable'|@translate}
     647              </label>
    675648             
    676649              <label for="UAM_GTAuto_true"><input id="UAM_GTAuto_true" type="radio" value="true" {$UAM_GTAUTO_TRUE} name="UAM_GTAuto"/>
    … …  
    794767            </label>
    795768          </li>
    796 
    797             <li>
    798               <label class="cluetip" title="{'UAM_AddURL2Mail'|translate}|{'UAM_AddURL2Mail_d'|translate}">
    799                 {'UAM_AddURL2Mail'|@translate}
    800               </label>
    801               <label for="UAM_AddURL2Mail_false"><input id="UAM_AddURL2Mail_false" value="false" {$UAM_ADDURL2MAIL_FALSE} name="UAM_AddURL2Mail" type="radio"/>
    802                 {'UAM_Disable'|@translate}
    803               </label>
    804               <label for="UAM_AddURL2Mail_true"><input id="UAM_AddURL2Mail_true" value="true" {$UAM_ADDURL2MAIL_TRUE} name="UAM_AddURL2Mail" type="radio"/>
    805                 {'UAM_Enable'|@translate}
    806               </label>
    807             </li>
    808 
    809769        </ul>
    810770        <fieldset id="UAM_MAIL_INFO" {if $UAM_MAIL_INFO_FALSE} style="display:none"{/if}>
    … …  
    849809          </ul>
    850810        </fieldset>
     811
    851812        <ul>
     813            <li>
     814              <label class="cluetip" title="{'UAM_AddURL2Mail'|translate}|{'UAM_AddURL2Mail_d'|translate}">
     815                {'UAM_AddURL2Mail'|@translate}
     816              </label>
     817              <label for="UAM_AddURL2Mail_false"><input id="UAM_AddURL2Mail_false" value="false" {$UAM_ADDURL2MAIL_FALSE} name="UAM_AddURL2Mail" type="radio"/>
     818                {'UAM_Disable'|@translate}
     819              </label>
     820              <label for="UAM_AddURL2Mail_true"><input id="UAM_AddURL2Mail_true" value="true" {$UAM_ADDURL2MAIL_TRUE} name="UAM_AddURL2Mail" type="radio"/>
     821                {'UAM_Enable'|@translate}
     822              </label>
     823            </li>
    852824          <li>
    853825            <label class="cluetip" title="{'UAM_Tracking registered users'|translate}|{'UAM_Tracking registered users_d'|translate}">
    … …  
    874846            </label>
    875847          </li>
    876 
    877           <li>
    878             <label class="cluetip" title="{'UAM_PwdReset'|translate}|{'UAM_PwdResetTitle_d'|translate}">
    879               {'UAM_PwdReset'|@translate}
    880             </label>
    881          
    882             <label for="UAM_PwdReset_false"><input id="UAM_PwdReset_false" value="false" {$UAM_PWDRESET_FALSE} name="UAM_PwdReset" type="radio"/>
    883               {'UAM_Disable'|@translate}
    884             </label>
    885             <label for="UAM_PwdReset_true"><input id="UAM_PwdReset_true" value="true" {$UAM_PWDRESET_TRUE} name="UAM_PwdReset" type="radio"/>
    886               {'UAM_Enable'|@translate}
    887             </label>
    888          
    889           </li>
    890848        </ul>
    891849        <ul>
    … …  
    897855            <label for="UAM_CustomPasswRetr_false"><input id="UAM_CustomPasswRetr_false" value="false" {$UAM_CUSTOMPASSWRETR_FALSE} name="UAM_CustomPasswRetr" type="radio"/>
    898856              {'UAM_Disable'|@translate}
    899 </label>
     857            </label>
    900858            <label for="UAM_CustomPasswRetr_true"><input id="UAM_CustomPasswRetr_true" value="true" {$UAM_CUSTOMPASSWRETR_TRUE} name="UAM_CustomPasswRetr" type="radio"/>
    901859              {'UAM_Enable'|@translate}
    902 </label>
     860            </label>
    903861            <fieldset id="UAM_CustomPasswRetr" {if $UAM_CUSTOMPASSWRETR_FALSE}style="display:none"{/if}>
    904862              <textarea class="uam_textfields" name="UAM_CustomPasswRetr_Text" id="UAM_CustomPasswRetr_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CUSTOMPASSWRETR_TEXT}</textarea>
Note: See TracChangeset for help on using the changeset viewer.