Index: extensions/UserAdvManager/trunk/admin/template/global.tpl
===================================================================
--- extensions/UserAdvManager/trunk/admin/template/global.tpl	(revision 18433)
+++ extensions/UserAdvManager/trunk/admin/template/global.tpl	(revision 18450)
@@ -11,9 +11,43 @@
 {
   jQuery("#UAM_Confirm_Mail_true, #UAM_Confirm_Mail_local").click(function() {
-    jQuery("#UAM_CONFIRM_MAIL_TRUE").show("slow");
+    jQuery("#UAM_CONFIRM_MAIL__").show("slow");
   });
   jQuery("#UAM_Confirm_Mail_false").click(function() {
-    jQuery("#UAM_CONFIRM_MAIL_TRUE").hide("slow");
-  });
+    jQuery("#UAM_CONFIRM_MAIL__").hide("slow");
+  });
+  jQuery("#UAM_ConfirmMail_Remail_true, #UAM_ConfirmMail_TimeOut_true").click(function() {
+    jQuery("#UAM_ConfirmMail_field").show("slow");
+  });
+  jQuery("#UAM_ConfirmMail_TimeOut_false").click(function() {
+    if ($("input[name='UAM_ConfirmMail_Remail']:checked").val()=="false" )
+    {
+      jQuery("#UAM_ConfirmMail_field").hide("slow");
+    }
+  });
+  jQuery("#UAM_ConfirmMail_Remail_false").click(function() {
+    if ( $("input[name='UAM_ConfirmMail_TimeOut']:checked").val()=="false" )
+    {
+      jQuery("#UAM_ConfirmMail_field").hide("slow");
+    }
+  });
+  jQuery("#UAM_RejectConnexion_true").click(function() {
+    jQuery("#UAM_REJECTLOGIN").show("slow");
+  });
+  jQuery("#UAM_RejectConnexion_false").click(function() {
+    jQuery("#UAM_REJECTLOGIN").hide("slow");
+  });
+  jQuery("#UAM_GTAuto_true").click(function() {
+    jQuery("#UAM_GTAUTO").show("slow");
+  });
+  jQuery("#UAM_GTAuto_false").click(function() {
+    jQuery("#UAM_GTAUTO").hide("slow");
+  });
+  jQuery("#UAM_Mail_Info_true").click(function() {
+    jQuery("#UAM_MAIL_INFO").show("slow");
+  });
+  jQuery("#UAM_Mail_Info_false").click(function() {
+    jQuery("#UAM_MAIL_INFO").hide("slow");
+  });
+ 
   jQuery("#show_UAM_AdminValidation").click(function() {
     jQuery("#UAM_AdminValidation").show("slow");
@@ -110,8 +144,8 @@
       &nbsp;
     <input class="submit" type="submit" value="{'UAM_audit'|@translate}" name="audit">
+    <input name="nb_para" id="nb_para" type="text" value="{$nb_para}" style="display:none"> 
+    <input name="nb_para2" id="nb_para2" type="text" value="{$nb_para2}" style="display:none"> 
   </p>
 
-  <input name="nb_para" id="nb_para" type="text" value="{$nb_para}" style="display:none"> 
-  <input name="nb_para2" id="nb_para2" type="text" value="{$nb_para2}" style="display:none"> 
 
   <div id="instructionConfig1" class="instructionBlock" >
@@ -124,5 +158,4 @@
 
     <div id="Config1" class="instructionBlockContent" style="display:none">
-      <fieldset>
         <ul>
           <li>
@@ -130,20 +163,19 @@
               {'UAM_Username_Char'|@translate}
             </label>
-          <br><br>
-            <input type="radio" value="false" {$UAM_USERNAME_CHAR_FALSE} name="UAM_Username_Char">
+            <label for="UAM_Username_Char_false"><input id="UAM_Username_Char_false" type="radio" value="false" {$UAM_USERNAME_CHAR_FALSE} name="UAM_Username_Char">
               {'UAM_Username_Char_false'|@translate}<br>
-            <input type="radio" value="true" {$UAM_USERNAME_CHAR_TRUE} name="UAM_Username_Char">
+            </label>
+            <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}
-            <div id="uam_leftmargin">
+            <div class="uam_leftmargin">
               <input type="text" name="UAM_Username_List" value="{$UAM_USERNAME_CHAR_LIST}" size="20" style="text-align: center;">
             </div>
-          <br><br>
-          </li>
-      
+            </label>
+          </li>
           <li>
             <label class="cluetip" title="{'UAM_Password_Enforced'|translate}|{'UAM_passwTitle_d'|translate}">
               {'UAM_Password_Enforced'|@translate}
             </label>
-          <br><br>
+          
             <input type="radio" value="false" {$UAM_PASSWORDENF_FALSE} name="UAM_Password_Enforced">
               {'UAM_Disable'|@translate}<br>
@@ -151,5 +183,5 @@
               {'UAM_Password_Enforced_true'|@translate}&nbsp;
             <input type="text" name="UAM_Password_Score" value="{$UAM_PASSWORD_SCORE}" size="5" style="text-align: center;">
-          <br><br>
+            <br>
             {'UAM_PasswordTest'|@translate}
               <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;">
@@ -157,7 +189,6 @@
               <input class="submit" type="submit" value="{'UAM_PasswordTest'|@translate}" name="PasswordTest">
               &nbsp;&nbsp;&nbsp;{'UAM_ScoreTest'|@translate}{$UAM_PASSWORD_TEST_SCORE}
-            <br><br>
-          </li>
-
+            
+          </li>
           <ul>
             <li>
@@ -165,5 +196,5 @@
                 {'UAM_AdminPassword_Enforced'|@translate}
               </label>
-            <br><br>
+            
               <input type="radio" value="false" {$UAM_ADMINPASSWENF_FALSE} name="UAM_AdminPassword_Enforced">
                 {'UAM_Disable'|@translate}
@@ -171,5 +202,5 @@
               <input type="radio" value="true" {$UAM_ADMINPASSWENF_TRUE} name="UAM_AdminPassword_Enforced">
                 {'UAM_Enable'|@translate}
-            <br><br>
+            
             </li>
           </ul>
@@ -182,5 +213,5 @@
 
             <div class="uam_hide">
-            <br><br>
+            
               <input type="radio" value="false" {$UAM_MAILEXCLUSION_FALSE} name="UAM_MailExclusion">
                 {'UAM_Disable'|@translate}
@@ -188,5 +219,5 @@
               <input type="radio" value="true" {$UAM_MAILEXCLUSION_TRUE} name="UAM_MailExclusion">
                 {'UAM_MailExclusion_true'|@translate}
-            <br><br>
+            
             </div>
           {else}
@@ -195,5 +226,5 @@
             </label>
 
-            <br><br>
+            
               <input type="radio" value="false" {$UAM_MAILEXCLUSION_FALSE} name="UAM_MailExclusion">
                 {'UAM_Disable'|@translate}
@@ -201,21 +232,20 @@
               <input type="radio" value="true" {$UAM_MAILEXCLUSION_TRUE} name="UAM_MailExclusion">
                 {'UAM_MailExclusion_true'|@translate}
-            <br><br>
+            
 
           {if $UAM_ERROR_REPORTS1}     
-            <div id="uam_leftmargin">
+            <div class="uam_leftmargin">
               <textarea class="uam_textfields" name="UAM_MailExclusion_List" id="UAM_MailExclusion_List" rows="3" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_MAILEXCLUSION_LIST}</textarea>
             </div>
-            <br><br>
+            
           {else}
-            <div id="uam_leftmargin">
+            <div class="uam_leftmargin">
               <textarea class="uam_textfields" name="UAM_MailExclusion_List" id="UAM_MailExclusion_List" rows="3" {$TAG_INPUT_ENABLED}>{$UAM_MAILEXCLUSION_LIST}</textarea>
             </div>
-            <br><br>
+            
           {/if}
           {/if}
           </li>
         </ul>
-      </fieldset>
     </div>
   </div>
@@ -233,5 +263,4 @@
   
     <div id="Config2" class="instructionBlockContent" style="display:none">
-      <fieldset>
         <ul>
         	<li>
@@ -239,5 +268,5 @@
               {'UAM_Confirm_Mail'|@translate}
             </label>
-          <br><br>
+          
             <label for="UAM_Confirm_Mail_false"><input type="radio" id="UAM_Confirm_Mail_false" value="false" {$UAM_CONFIRM_MAIL_FALSE} name="UAM_Confirm_Mail">
               {'UAM_Disable'|@translate}</label>
@@ -248,8 +277,8 @@
             <label for="UAM_Confirm_Mail_local"><input type="radio" id="UAM_Confirm_Mail_local" value="local" {$UAM_CONFIRM_MAIL_LOCAL} name="UAM_Confirm_Mail">
               {'UAM_Confirm_Mail_local'|@translate}</label>
-          <br><br>
-          </li>
-          
-          <div id="UAM_CONFIRM_MAIL_TRUE" {if $UAM_CONFIRM_MAIL_FALSE}style="display:none"{/if}>
+          
+          </li>
+        </ul>
+          <div id="UAM_CONFIRM_MAIL__" {if $UAM_CONFIRM_MAIL_FALSE}style="display:none"{/if}>
             <ul>
          	    <li>
@@ -257,5 +286,5 @@
                   {'UAM_Stuffs'|@translate}
                 </label>
-              <br><br>
+              
                 <input type="radio" value="false" {$UAM_STUFFS_FALSE} name="UAM_Stuffs">
                   {'UAM_Disable'|@translate}
@@ -263,5 +292,5 @@
                 <input type="radio" value="true" {$UAM_STUFFS_TRUE} name="UAM_Stuffs">
                   {'UAM_Enable'|@translate}
-              <br><br>
+              
               </li>
 
@@ -270,5 +299,5 @@
                   {'UAM_AdminConfMail'|@translate}
                 </label>
-              <br><br>
+              
                 <input type="radio" value="false" {$UAM_ADMINCONFMAIL_FALSE} name="UAM_Admin_ConfMail">
                   {'UAM_Disable'|@translate}
@@ -276,5 +305,5 @@
                 <input type="radio" value="true" {$UAM_ADMINCONFMAIL_TRUE} name="UAM_Admin_ConfMail">
                   {'UAM_Enable'|@translate}
-              <br><br>
+              
               </li>
             </ul>
@@ -287,7 +316,7 @@
                 {'UAM_AdminValidationMail_Subject'|@translate}
               </label>
-            <br><br>
+            
               &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_AdminValidationMail_Subject" id="UAM_AdminValidationMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_ADMINVALIDATIONMAIL_SUBJECT}</textarea>
-            <br><br>
+            
             </li>
 
@@ -297,7 +326,7 @@
                   {'UAM_AdminValidationMail_Text'|@translate}
                 </label>
-              <br><br>
+              
                 <textarea class="uam_textfields" name="UAM_AdminValidationMail_Text" id="UAM_AdminValidationMail_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_ADMINVALIDATIONMAIL_TEXT}</textarea>
-              <br><br>
+              
               </li>
             </ul>
@@ -309,7 +338,7 @@
                 {'UAM_ConfirmMail_Subject'|@translate}
               </label>
-            <br><br>
+            
               &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_ConfirmMail_Subject" id="UAM_ConfirmMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_SUBJECT}</textarea>
-            <br><br>
+            
             </li>
 
@@ -319,5 +348,5 @@
                   {'UAM_ConfirmMail_Text'|@translate}
                 </label>
-              <br><br>
+              
               {if $UAM_ERROR_REPORTS2}
                   <textarea class="uam_textfields" name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea>
@@ -325,5 +354,5 @@
                   <textarea class="uam_textfields" name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea>
               {/if}
-              <br><br>
+              
               </li>
             </ul>
@@ -340,7 +369,7 @@
                 {'UAM_confirmmail_custom_Txt1'|@translate}
               </label>
-            <br><br>
+            
                 <textarea class="uam_textfields" name="UAM_ConfirmMail_Custom_Txt1" id="UAM_ConfirmMail_Custom_Txt1" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT1}</textarea>
-            <br><br>
+            
             </li>
             {if 'FCK_PATH'|@defined}
@@ -354,7 +383,7 @@
                 {'UAM_confirmmail_custom_Txt2'|@translate}
               </label>
-            <br><br>
+            
                 <textarea class="uam_textfields" name="UAM_ConfirmMail_Custom_Txt2" id="UAM_ConfirmMail_Custom_Txt2" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT2}</textarea>
-            <br><br>
+            
             </li>
             {if 'FCK_PATH'|@defined}
@@ -372,23 +401,21 @@
                   {'UAM_RejectConnexion'|@translate}
                 </label>
-            <br><br>
-                <input type="radio" value="false" {$UAM_REJECTCONNECT_FALSE} name="UAM_RejectConnexion">
+            
+                <label for="UAM_RejectConnexion_false"><input id="UAM_RejectConnexion_false" type="radio" value="false" {$UAM_REJECTCONNECT_FALSE} name="UAM_RejectConnexion">
                   {'UAM_Disable'|@translate}
+                </label>
             <br>
-                <input type="radio" value="true" {$UAM_REJECTCONNECT_TRUE} name="UAM_RejectConnexion">
-                  {'UAM_Enable'|@translate}
-            <br><br>
-              </li>
-            {if $UAM_REJECTLOGIN_FALSE}
-              <div class="uam_hide">
-            {/if}
-              <li>
+                <label for="UAM_RejectConnexion_true"><input id="UAM_RejectConnexion_true" type="radio" value="true" {$UAM_REJECTCONNECT_TRUE} name="UAM_RejectConnexion">
+                  {'UAM_Enable'|@translate}</label>
+                </label>
+            
+              </li>
+              <li id="UAM_REJECTLOGIN" {if $UAM_REJECTCONNECT_FALSE}style="display: none"{/if}>
                 <label class="cluetip" title="{'UAM_RejectConnexion_Custom_Txt'|translate}|{'UAM_RejectConnexion_Custom_Txt_d'|translate}">
                   {'UAM_RejectConnexion_Custom_Txt'|@translate}
                 </label>
-            <br><br>
+            
                 <textarea class="uam_textfields" name="UAM_CustomRejectConnexion_Text" id="UAM_CustomRejectConnexion_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_REJECTCONNECT_TEXT}</textarea>
-            <br><br>
-              </li>
+            
             {if 'FCK_PATH'|@defined}
               <div style="text-align:right;">
@@ -396,7 +423,5 @@
               </div>
             {/if}
-            {if $UAM_REJECTLOGIN_FALSE}
-              </div>
-            {/if}
+              </li>
             </ul>
 
@@ -411,5 +436,5 @@
                   {'UAM_Confirm_Group'|@translate}
                 </label>
-              <br><br>
+              
               </li>
 
@@ -420,8 +445,8 @@
                   </label>
                 <br>
-                  <div id="uam_leftmargin">
+                  <div class="uam_leftmargin">
                     {html_options name="UAM_No_Confirm_Group" options=$No_Confirm_Group.group_options selected=$No_Confirm_Group.group_selected}
                   </div>
-                <br><br>
+                
                 </li>
 
@@ -431,8 +456,8 @@
                   </label>
                 <br>
-                  <div id="uam_leftmargin">
+                  <div class="uam_leftmargin">
                     {html_options name="UAM_Validated_Group" options=$Validated_Group.group_options selected=$Validated_Group.group_selected}
                   </div>
-                <br><br>
+                
                 </li>
               </ul>
@@ -442,5 +467,5 @@
                   {'UAM_Confirm_Status'|@translate}
                 </label>
-              <br><br>
+              
               </li>
 
@@ -451,8 +476,8 @@
                   </label>
                 <br>
-                  <div id="uam_leftmargin">
+                  <div class="uam_leftmargin">
                     {html_options name="UAM_No_Confirm_Status" options=$No_Confirm_Status.Status_options selected=$No_Confirm_Status.Status_selected}
                   </div>
-                <br><br>
+                
                 </li>
 
@@ -462,8 +487,8 @@
                   </label>
                 <br>
-                  <div id="uam_leftmargin">
+                  <div class="uam_leftmargin">
                     {html_options name="UAM_Validated_Status" options=$Confirm_Status.Status_options selected=$Confirm_Status.Status_selected}
                   </div>
-                <br><br>
+                
                 </li>
               </ul>
@@ -473,5 +498,5 @@
                   {'UAM_Confirm_Level'|@translate}
                 </label>
-              <br><br>
+              
               </li>
               
@@ -482,8 +507,8 @@
                   </label>
                 <br>
-                  <div id="uam_leftmargin">
+                  <div class="uam_leftmargin">
                     {html_options name="UAM_No_Valid_Level" options=$No_Valid_Level.Level_options selected=$No_Valid_Level.Level_selected}
                   </div>
-                <br><br>
+                
                 </li>
 
@@ -493,8 +518,8 @@
                   </label>
                 <br>
-                  <div id="uam_leftmargin">
+                  <div class="uam_leftmargin">
                     {html_options name="UAM_Valid_Level" options=$Valid_Level.Level_options selected=$Valid_Level.Level_selected}
                   </div>
-                <br><br>
+                
                 </li>
               </ul>
@@ -506,12 +531,12 @@
                   {'UAM_ValidationLimit_Info'|@translate}
                 </label>
-              <br><br>
-                <input type="radio" value="false" {$UAM_CONFIRMMAIL_TIMEOUT_FALSE} name="UAM_ConfirmMail_TimeOut">
-                  {'UAM_Disable'|@translate}
+              
+                <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>
               <br>
-                <input type="radio" value="true" {$UAM_CONFIRMMAIL_TIMEOUT_TRUE} name="UAM_ConfirmMail_TimeOut">
-                  {'UAM_ConfirmMail_TimeOut_true'|@translate}
+                <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}</label>
                 <input type="text" name="UAM_ConfirmMail_Delay" value="{$UAM_CONFIRMMAIL_DELAY}" size="5" style="text-align: center;">
-              <br><br>
+              
               </li>
 
@@ -520,15 +545,14 @@
                   {'UAM_ConfirmMail_Remail'|@translate}
                 </label>
-              <br><br>
-                <input type="radio" value="false" {$UAM_CONFIRMMAIL_REMAIL_FALSE} name="UAM_ConfirmMail_Remail">
-                  {'UAM_Disable'|@translate}
+              
+                <label for="UAM_ConfirmMail_Remail_false" ><input id="UAM_ConfirmMail_Remail_false" type="radio" value="false" {$UAM_CONFIRMMAIL_REMAIL_FALSE} name="UAM_ConfirmMail_Remail">
+                  {'UAM_Disable'|@translate}</label>
               <br>
-                <input type="radio" value="true" {$UAM_CONFIRMMAIL_REMAIL_TRUE} name="UAM_ConfirmMail_Remail">
-                  {'UAM_Enable'|@translate}
-              <br><br>
+                <label for="UAM_ConfirmMail_Remail_true" ><input id="UAM_ConfirmMail_Remail_true" type="radio" value="true" {$UAM_CONFIRMMAIL_REMAIL_TRUE} name="UAM_ConfirmMail_Remail">
+                  {'UAM_Enable'|@translate}</label>
+              
               </li>
             <a id="show_UAM_ConfirmMail" >{'UAM_Customize_messagesandmails'|translate}</a>
             <a id="hide_UAM_ConfirmMail" style="display: none">{'hide details'|translate}</a>
-
               <ul id="UAM_ConfirmMail" style="display: none">
                 <li>
@@ -536,7 +560,7 @@
                     {'UAM_ConfirmMail_ReMail_Subject'|@translate}
                   </label>
-                <br><br>
+                
                   &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_ConfirmMail_Remail_Subject" id="UAM_ConfirmMail_Remail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_SUBJECT}</textarea>
-                <br><br>
+                
                 </li>
 
@@ -546,5 +570,5 @@
                       {'UAM_ConfirmMail_ReMail_Txt1'|@translate}
                     </label>
-                  <br><br>
+                  
                   {if $UAM_ERROR_REPORTS3}
                     <textarea class="uam_textfields" name="UAM_ConfirmMail_ReMail_Txt1" id="UAM_ConfirmMail_ReMail_Txt1" rows="10" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT1}</textarea>
@@ -552,5 +576,5 @@
                     <textarea class="uam_textfields" name="UAM_ConfirmMail_ReMail_Txt1" id="UAM_ConfirmMail_ReMail_Txt1" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT1}</textarea>
                   {/if}
-                  <br><br>
+                  
                   </li>
 <!--
@@ -566,5 +590,5 @@
                       {'UAM_ConfirmMail_ReMail_Txt2'|@translate}
                     </label>
-                  <br><br>
+                  
                   {if $UAM_ERROR_REPORTS4}
                     <textarea class="uam_textfields" name="UAM_ConfirmMail_ReMail_Txt2" id="UAM_ConfirmMail_ReMail_Txt2" rows="10" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT2}</textarea>
@@ -586,9 +610,5 @@
             </ul>
 
-          {if $UAM_CONFIRMMAIL_TIMEOUT_FALSE and $UAM_CONFIRMMAIL_REMAIL_FALSE}
-            <div class="uam_hide">
-          {/if}
-
-          <fieldset>
+          <fieldset id="UAM_ConfirmMail_field" {if $UAM_CONFIRMMAIL_TIMEOUT_FALSE and $UAM_CONFIRMMAIL_REMAIL_FALSE}style="display:none"{/if}>
           <ul>
             <li>
@@ -596,5 +616,5 @@
                 {'UAM_USRAuto'|@translate}
               </label>
-            <br><br>
+            
               <input type="radio" value="false" {$UAM_USRAUTO_FALSE} name="UAM_USRAuto">
                 {'UAM_Disable'|@translate}
@@ -602,5 +622,5 @@
               <input type="radio" value="true" {$UAM_USRAUTO_TRUE} name="UAM_USRAuto">
                 {'UAM_Enable'|@translate}
-            <br><br>
+            
             </li>
 
@@ -610,7 +630,7 @@
                   {'UAM_USRAutoDel'|@translate}
                 </label>
-              <br><br>
+              
                 <textarea class="uam_textfields" name="UAM_USRAutoDelText" id="UAM_USRAutoDelText" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_USRAUTODEL_TEXT}</textarea>
-              <br><br>
+              
               {if 'FCK_PATH'|@defined}
                 <div style="text-align:right;">
@@ -624,5 +644,5 @@
                   {'UAM_USRAutoMail'|@translate}
                 </label>
-              <br><br>
+              
                 <input type="radio" value="false" {$UAM_USRAUTOMAIL_FALSE} name="UAM_USRAutoMail">
                   {'UAM_Disable'|@translate}
@@ -630,17 +650,10 @@
                 <input type="radio" value="true" {$UAM_USRAUTOMAIL_TRUE} name="UAM_USRAutoMail">
                   {'UAM_Enable'|@translate}
-              <br><br><br>
+              <br>
               </li>
             </ul>
           </ul>
           </fieldset>
-
-          {if $UAM_CONFIRMMAIL_TIMEOUT_FALSE and $UAM_CONFIRMMAIL_REMAIL_FALSE}
-            </div>
-          {/if}
           </div>
-
-        </ul>
-      </fieldset>
     </div>
   </div>
@@ -654,5 +667,4 @@
   
     <div id="Config3" class="instructionBlockContent" style="display:none">
-      <fieldset>
         <ul>
           <li>
@@ -660,5 +672,5 @@
               {'UAM_GhostTracker'|@translate}
             </label>
-          <br><br>
+          
             <input type="radio" value="false" {$UAM_GHOSTRACKER_FALSE} name="UAM_GhostUser_Tracker">
               {'UAM_Disable'|@translate}
@@ -667,5 +679,5 @@
               {'UAM_GhostTracker_true'|@translate}
             <input type="text" name="UAM_GhostTracker_DayLimit" value="{$UAM_GHOSTRACKER_DAYLIMIT}" size="5" style="text-align: center;">
-          <br><br>
+          
           </li>
         </ul>
@@ -677,7 +689,7 @@
               {'UAM_GTReminder_Subject'|@translate}
             </label>
-          <br><br>
+          
             &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_GTReminder_Subject" id="UAM_GTReminder_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_GTREMINDER_SUBJECT}</textarea>
-          <br><br>
+          
           </li>
           <li>
@@ -685,7 +697,7 @@
               {'UAM_GhostTracker_ReminderText'|@translate}
             </label>
-          <br><br>
+          
             <textarea class="uam_textfields" name="UAM_GhostTracker_ReminderText" id="UAM_GhostTracker_ReminderText" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_GHOSTRACKER_REMINDERTEXT}</textarea>
-          <br><br>
+          
           </li>
 <!--
@@ -704,113 +716,107 @@
               {'UAM_GTAuto'|@translate}
             </label>
-          <br><br>
-            <input type="radio" value="false" {$UAM_GTAUTO_FALSE} name="UAM_GTAuto">
+          
+            <label for="UAM_GTAuto_false"><input id="UAM_GTAuto_false" type="radio" value="false" {$UAM_GTAUTO_FALSE} name="UAM_GTAuto">
               {'UAM_Disable'|@translate}
+            </label>
           <br>
-            <input type="radio" value="true" {$UAM_GTAUTO_TRUE} name="UAM_GTAuto">
+            <label for="UAM_GTAuto_true"><input id="UAM_GTAuto_true" type="radio" value="true" {$UAM_GTAUTO_TRUE} name="UAM_GTAuto">
               {'UAM_Enable'|@translate}
-          <br><br>
-          </li>
-          
-          {if $UAM_GTAUTO_FALSE}
-            <div class="uam_hide">
-          {/if}
-              <ul>
-                <li>
-                  <label class="cluetip" title="{'UAM_GTAutoDelTitle'|translate}|{'UAM_GTAutoDelTitle_d'|translate}">
-                    {'UAM_GTAutoDel'|@translate}
-                  </label>
-                <br><br>
-                    <textarea class="uam_textfields" name="UAM_GTAutoDelText" id="UAM_GTAutoDelText" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_GTAUTODEL_TEXT}</textarea>
-                <br><br>
+            </label>
+          
+          </li>
+            <ul id="UAM_GTAUTO" {if $UAM_GTAUTO_FALSE}style="display: none"{/if}>
+              <li>
+                <label class="cluetip" title="{'UAM_GTAutoDelTitle'|translate}|{'UAM_GTAutoDelTitle_d'|translate}">
+                  {'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;">
+                  <a href="#" onClick="toogleEditor('UAM_GTAutoDelText'); return false;">FCK Editor On/Off</a>
+                </div>
+              {/if}
+              </li>
+
+              <li>
+                <label class="cluetip" title="{'UAM_GTAutoGp'|translate}|{'UAM_GTAutoGpTitle_d'|translate}">
+                  {'UAM_GTAutoGp'|@translate}
+                </label>
+              
+                <ul>
+                  <li>
+                    <label>
+                      {'UAM_Expired_Group'|@translate}
+                    </label>
+                    <br>
+                      <div class="uam_leftmargin">
+                        {html_options name="UAM_Downgrade_Group" options=$Downgrade_Group.group_options selected=$Downgrade_Group.group_selected}
+                      </div>
+                  
+                  </li>
+
+                  <li>
+                    <label>
+                      {'UAM_Expired_Status'|@translate}
+                    </label>
+                  <br>
+                    <div class="uam_leftmargin">
+                      {html_options name="UAM_Downgrade_Status" options=$Downgrade_Status.Status_options selected=$Downgrade_Status.Status_selected}
+                    </div>
+                  
+                  </li>
+
+                  <li>
+                    <label>
+                      {'UAM_Expired_Level'|@translate}
+                    </label>
+                  <br>
+                    <div class="uam_leftmargin">
+                      {html_options name="UAM_Downgrade_Level" options=$Downgrade_Level.Level_options selected=$Downgrade_Level.Level_selected}
+                    </div>
+                  
+                  </li>
+                </ul>
+
+                <ul>
+                  <li>
+                    <label class="cluetip" title="{'UAM_GTAutoMail'|translate}|{'UAM_GTAutoMailTitle_d'|translate}">
+                      {'UAM_GTAutoMail'|@translate}
+                    </label>
+                  
+                    <input type="radio" value="false" {$UAM_GTAUTOMAIL_FALSE} name="UAM_GTAutoMail">
+                      {'UAM_Disable'|@translate}
+                  <br>
+                    <input type="radio" value="true" {$UAM_GTAUTOMAIL_TRUE} name="UAM_GTAutoMail">
+                      {'UAM_Enable'|@translate}
+                  
+                    <li>
+                      <label class="cluetip" title="{'UAM_GTAutomail_Subject'|translate}|{'UAM_GTAutomail_Subject_d'|translate}">
+                        {'UAM_GTAutomail_Subject'|@translate}
+                      </label>
                     
-                {if 'FCK_PATH'|@defined}
-                  <div style="text-align:right;">
-                    <a href="#" onClick="toogleEditor('UAM_GTAutoDelText'); return false;">FCK Editor On/Off</a>
-                  </div>
-                {/if}
-                </li>
-
-                <li>
-                  <label class="cluetip" title="{'UAM_GTAutoGp'|translate}|{'UAM_GTAutoGpTitle_d'|translate}">
-                    {'UAM_GTAutoGp'|@translate}
-                  </label>
-                <br><br>
-                  <ul>
-                    <li>
-                      <label>
-                        {'UAM_Expired_Group'|@translate}
-                      </label>
-                      <br>
-                        <div id="uam_leftmargin">
-                          {html_options name="UAM_Downgrade_Group" options=$Downgrade_Group.group_options selected=$Downgrade_Group.group_selected}
-                        </div>
-                    <br><br>
+                      &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_GTAutoMail_Subject" id="UAM_GTAutoMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_GTAUTOMAIL_SUBJECT}</textarea>
+                    
                     </li>
 
-                    <li>
-                      <label>
-                        {'UAM_Expired_Status'|@translate}
-                      </label>
-                    <br>
-                      <div id="uam_leftmargin">
-                        {html_options name="UAM_Downgrade_Status" options=$Downgrade_Status.Status_options selected=$Downgrade_Status.Status_selected}
-                      </div>
-                    <br><br>
-                    </li>
-
-                    <li>
-                      <label>
-                        {'UAM_Expired_Level'|@translate}
-                      </label>
-                    <br>
-                      <div id="uam_leftmargin">
-                        {html_options name="UAM_Downgrade_Level" options=$Downgrade_Level.Level_options selected=$Downgrade_Level.Level_selected}
-                      </div>
-                    <br><br>
-                    </li>
-                  </ul>
-
-                  <ul>
-                    <li>
-                      <label class="cluetip" title="{'UAM_GTAutoMail'|translate}|{'UAM_GTAutoMailTitle_d'|translate}">
-                        {'UAM_GTAutoMail'|@translate}
-                      </label>
-                    <br><br>
-                      <input type="radio" value="false" {$UAM_GTAUTOMAIL_FALSE} name="UAM_GTAutoMail">
-                        {'UAM_Disable'|@translate}
-                    <br>
-                      <input type="radio" value="true" {$UAM_GTAUTOMAIL_TRUE} name="UAM_GTAutoMail">
-                        {'UAM_Enable'|@translate}
-                    <br><br>
+                    <ul>
                       <li>
-                        <label class="cluetip" title="{'UAM_GTAutomail_Subject'|translate}|{'UAM_GTAutomail_Subject_d'|translate}">
-                          {'UAM_GTAutomail_Subject'|@translate}
+                        <label class="cluetip" title="{'UAM_GTAutomail_Text'|translate}|{'UAM_GTAutomail_Text_d'|translate}">
+                          {'UAM_GTAutomail_Text'|@translate}
                         </label>
-                      <br><br>
-                        &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_GTAutoMail_Subject" id="UAM_GTAutoMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_GTAUTOMAIL_SUBJECT}</textarea>
-                      <br><br>
+                      
+                        <textarea class="uam_textfields" name="UAM_GTAutoMailText" id="UAM_GTAutoMailText" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_GTAUTOMAILTEXT}</textarea>
+                      
                       </li>
-
-                      <ul>
-                        <li>
-                          <label class="cluetip" title="{'UAM_GTAutomail_Text'|translate}|{'UAM_GTAutomail_Text_d'|translate}">
-                            {'UAM_GTAutomail_Text'|@translate}
-                          </label>
-                        <br><br>
-                          <textarea class="uam_textfields" name="UAM_GTAutoMailText" id="UAM_GTAutoMailText" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_GTAUTOMAILTEXT}</textarea>
-                        <br><br>
-                        </li>
-                      </ul>
-                    </li>
-                  </ul>
-                </li>
-              </ul>
-          {if $UAM_GTAUTO_FALSE}
-            </div>
-          {/if}
+                    </ul>
+                  </li>
+                </ul>
+              </li>
+            </ul>
           </ul>
         </ul>
-      </fieldset>
     </div>
   </div>
@@ -823,5 +829,4 @@
   
     <div id="Config5" class="instructionBlockContent" style="display:none">
-      <fieldset>
         <ul>
           <li>
@@ -829,18 +834,16 @@
               {'UAM_Mail_Info'|@translate}
             </label>
-          <br><br>
-            <input type="radio" value="false" {$UAM_MAIL_INFO_FALSE} name="UAM_Mail_Info">
+          
+            <label for="UAM_Mail_Info_false"><input id="UAM_Mail_Info_false" type="radio" value="false" {$UAM_MAIL_INFO_FALSE} name="UAM_Mail_Info">
               {'UAM_Disable'|@translate}
+            </label>
           <br>
-            <input type="radio" value="true" {$UAM_MAIL_INFO_TRUE} name="UAM_Mail_Info">
+            <label for="UAM_Mail_Info_true"><input id="UAM_Mail_Info_true" type="radio" value="true" {$UAM_MAIL_INFO_TRUE} name="UAM_Mail_Info">
               {'UAM_Enable'|@translate}
-          <br><br>
+            </label>
+          
           </li>
         </ul>
-      {if $UAM_MAIL_INFO_FALSE}
-        <div class="uam_hide">
-      {/if}
-
-        <fieldset>
+        <fieldset id="UAM_MAIL_INFO" {if $UAM_MAIL_INFO_FALSE}style="display:none"{/if}>
           <ul>
             <li>
@@ -848,5 +851,5 @@
                 {'UAM_HidePassw'|@translate}
               </label>
-            <br><br>
+            
               <input type="radio" value="false" {$UAM_HIDEPASSW_FALSE} name="UAM_HidePassw">
                 {'UAM_Disable'|@translate}
@@ -854,5 +857,5 @@
               <input type="radio" value="true" {$UAM_HIDEPASSW_TRUE} name="UAM_HidePassw">
                 {'UAM_Enable'|@translate}
-            <br><br>
+            
             </li>
             
@@ -861,7 +864,7 @@
                 {'UAM_MailInfo_Subject'|@translate}
               </label>
-            <br><br>
+            
               &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_InfoMail_Subject" id="UAM_InfoMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_INFOMAIL_SUBJECT}</textarea>
-            <br><br>
+            
             </li>
 
@@ -871,7 +874,7 @@
                   {'UAM_MailInfo_Text'|@translate}
                 </label>
-              <br><br>
+              
                 <textarea class="uam_textfields" name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea>
-              <br><br>
+              
               </li>
             </ul>
@@ -885,11 +888,4 @@
           </ul>
         </fieldset>
-
-      {if $UAM_MAIL_INFO_FALSE}
-        </div>
-      {/if}
-      </fieldset>
-
-      <fieldset>
         <ul>
           <li>
@@ -897,5 +893,5 @@
               {'UAM_Tracking registered users'|@translate}
             </label>
-          <br><br>
+          
             <input type="radio" value="false" {$UAM_ADDLASTVISIT_FALSE} name="UAM_Add_LastVisit_Column">
               {'UAM_Disable'|@translate}
@@ -903,5 +899,5 @@
             <input type="radio" value="true" {$UAM_ADDLASTVISIT_TRUE} name="UAM_Add_LastVisit_Column">
               {'UAM_Enable'|@translate}
-          <br><br>
+          
           </li>
 
@@ -910,5 +906,5 @@
               {'UAM_RedirToProfile'|@translate}
             </label>
-          <br><br>
+          
             <input type="radio" value="false" {$UAM_REDIRTOPROFILE_FALSE} name="UAM_RedirToProfile">
               {'UAM_Disable'|@translate}
@@ -916,5 +912,5 @@
             <input type="radio" value="true" {$UAM_REDIRTOPROFILE_TRUE} name="UAM_RedirToProfile">
               {'UAM_Enable'|@translate}
-          <br><br>
+          
           </li>
 
@@ -923,5 +919,5 @@
               {'UAM_PwdReset'|@translate}
             </label>
-          <br><br>
+          
             <input type="radio" value="false" {$UAM_PWDRESET_FALSE} name="UAM_PwdReset">
               {'UAM_Disable'|@translate}
@@ -929,10 +925,7 @@
             <input type="radio" value="true" {$UAM_PWDRESET_TRUE} name="UAM_PwdReset">
               {'UAM_Enable'|@translate}
-          <br><br>
+          
           </li>
         </ul>
-      </fieldset>
-
-      <fieldset>
         <ul>
           <li>
@@ -940,5 +933,5 @@
               {'UAM_CustomPasswRetr'|@translate}
             </label>
-          <br><br>
+          
             <input type="radio" value="false" {$UAM_CUSTOMPASSWRETR_FALSE} name="UAM_CustomPasswRetr">
               {'UAM_Disable'|@translate}
@@ -946,10 +939,9 @@
             <input type="radio" value="true" {$UAM_CUSTOMPASSWRETR_TRUE} name="UAM_CustomPasswRetr">
               {'UAM_Enable'|@translate}
-          <br><br><br>
+          <br>
             <textarea class="uam_textfields" name="UAM_CustomPasswRetr_Text" id="UAM_CustomPasswRetr_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CUSTOMPASSWRETR_TEXT}</textarea>
-          <br><br>
+          
           </li>
         </ul>
-      </fieldset>
     </div>
   </div>
@@ -972,5 +964,5 @@
     {'UAM_Dump_Download'|@translate}&nbsp;
       <input type="checkbox" name="dump_download" value="true" {$UAM_DUMP_DOWNLOAD}>
-  <br><br>
+  
       <input class="submit" type="submit" value="{'UAM_Save'|@translate}" name="save" {$TAG_INPUT_ENABLED}>
   </p>
@@ -980,5 +972,5 @@
 <form method="post" action="" class="general">
   <p>
-    {'UAM_Restore'|@translate}<br><br>
+    {'UAM_Restore'|@translate}
       <input class="submit" type="submit" value="{'UAM_Restore_File'|@translate}" name="restore" {$TAG_INPUT_ENABLED}>
   </p>
