From 7b9b723da97a9220cffee31f072cb0ce22b8201d Mon Sep 17 00:00:00 2001
From: ZAZiOs <85897688+ZAZiOs@users.noreply.github.com>
Date: Wed, 23 Nov 2022 22:22:03 +0300
Subject: [PATCH] Fixes requested by celestora

---
 .../Auth/FinishRestoringPassword.xml          | 57 +++++++++----
 Web/Presenters/templates/Auth/Login.xml       | 27 +++---
 .../templates/Auth/LoginSecondFactor.xml      | 29 ++++---
 Web/Presenters/templates/Auth/Register.xml    | 83 +++++++++++--------
 Web/Presenters/templates/Auth/Restore.xml     | 41 ++++++---
 Web/static/css/style.css                      |  9 ++
 6 files changed, 159 insertions(+), 87 deletions(-)

diff --git a/Web/Presenters/templates/Auth/FinishRestoringPassword.xml b/Web/Presenters/templates/Auth/FinishRestoringPassword.xml
index 7752c3d0..bac6ef39 100644
--- a/Web/Presenters/templates/Auth/FinishRestoringPassword.xml
+++ b/Web/Presenters/templates/Auth/FinishRestoringPassword.xml
@@ -9,21 +9,48 @@
 {/block}
 
 {block content}
-    <p>
-        {_access_recovery_info_2}
-    </p>
-    
+	<h4 style="margin-left: 100px; margin-right: 100px;">{_access_recovery}</h4>
+        <table cellspacing="10" cellpadding="0" border="0" align="center" width="70%">
+            <tbody>
+                <tr>
+                    <td>
+                    {_access_recovery_info_2}
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+
     <form method="POST" enctype="multipart/form-data">
-        <label for="password">{_new_password}: </label>
-        <input id="password" type="password" name="password" required />
-        <br/><br/>
-        {if $is2faEnabled}
-            <label for="code">{_"2fa_code_2"}: </label>
-            <input id="code" type="text" name="code" required />
-            <br/><br/>
-        {/if}
-        
-        <input type="hidden" name="hash" value="{$csrfToken}" />
-        <input type="submit" value="{_reset_password}" class="button" style="float: right;" />
+        <table cellspacing="7" cellpadding="0" width="55%" border="0" align="center">
+            <tbody>
+                <tr>
+                    <td class="regform-left">
+                        <span class="nobold">{_new_password}: </span>
+                    </td>
+                    <td class="regform-right">
+                        <input id="password" type="password" name="password" required />
+                    </td>
+					</tr>
+					{if $is2faEnabled}
+					<tr style="text-align: right;">
+					<td class="regform-left">
+                        <span class="nobold">{_"2fa_code_2"}: </span>
+                    </td>
+                    <td class="regform-right">
+                        <input id="password" type="password" name="password" required />
+                    </td>
+					</tr>
+					{/if}
+                <tr>
+                    <td>
+                        
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+		<center>
+            <input type="hidden" name="hash" value="{$csrfToken}" />
+            <input type="submit" value="{_reset_password}" class="button" />
+		</center>
     </form>
 {/block}
diff --git a/Web/Presenters/templates/Auth/Login.xml b/Web/Presenters/templates/Auth/Login.xml
index b8fd4f6c..82d73588 100644
--- a/Web/Presenters/templates/Auth/Login.xml
+++ b/Web/Presenters/templates/Auth/Login.xml
@@ -8,13 +8,13 @@
 {block content}
     <form method="POST" enctype="multipart/form-data">
 	<h4 style="margin-left: 100px; margin-right: 100px;">{_log_in}</h4>
-        <table cellspacing="7" cellpadding="0" width="40%" border="0" align="center">
+        <table cellspacing="7" cellpadding="0" width="46%" border="0" align="center">
             <tbody>
                 <tr style="text-align: right;">
                     <td>
                         <span class="nobold">{_email}: </span>
                     </td>
-                    <td>
+                    <td style="width:191px;">
                         <input type="text" name="login" required />
                     </td>
                 </tr>
@@ -26,20 +26,17 @@
                         <input type="password" name="password" required />
                     </td>
                 </tr>
-                <tr>
-                    <td>
-                        
-                    </td>
-                    <td>
-		    <center>
-                        <input type="hidden" name="hash" value="{$csrfToken}" />
-                        <input type="submit" value="{_log_in}" class="button" />
-                        <a href="/reg" class="button" style="display: inline-block;">{_registration}</a><br><br>
-			<a href="/restore">{_forgot_password}</a>
-		    </center>
-                    </td>
-                </tr>
             </tbody>
         </table>
+		    <center>
+            <!-- div style="margin-bottom: 8px;"> 
+                <input type="checkbox" name="someone_pc" value=""/>
+				<label for="someone_pc" class="nobold">{_not_your_pc}?</label><br>
+            </div -->
+                <input type="hidden" name="hash" value="{$csrfToken}" />
+                <input type="submit" value="{_log_in}" class="button" />
+                <a href="/reg" class="button" style="display: inline-block;">{_registration}</a><br><br>
+                <a href="/restore">{_forgot_password}</a>
+		    </center>
     </form>
 {/block}
diff --git a/Web/Presenters/templates/Auth/LoginSecondFactor.xml b/Web/Presenters/templates/Auth/LoginSecondFactor.xml
index 33b68fac..a1ba1ede 100644
--- a/Web/Presenters/templates/Auth/LoginSecondFactor.xml
+++ b/Web/Presenters/templates/Auth/LoginSecondFactor.xml
@@ -6,16 +6,23 @@
 {/block}
 
 {block content}
-    <p>
-        {_two_factor_authentication_login}
-    </p>
+	<h4 style="margin-left: 100px; margin-right: 100px;">{_two_factor_authentication}</h4>
+        <table cellspacing="10" cellpadding="0" border="0" align="center" width="70%">
+            <tbody>
+                <tr>
+                    <td>
+                    {_two_factor_authentication_login}
+                    </td>
+                </tr>
+            </tbody>
+        </table>
 
     <form method="POST" enctype="multipart/form-data">
         <table cellspacing="7" cellpadding="0" width="40%" border="0" align="center">
             <tbody>
-                <tr>
+                <tr style="text-align: right;">
                     <td>
-                        <span>{_code}: </span>
+                        <span class="nobold">{_code}: </span>
                     </td>
                     <td>
                         <input type="text" name="code" autocomplete="off" required />
@@ -25,14 +32,14 @@
                     <td>
                         
                     </td>
-                    <td>
-                        <input type="hidden" name="login" value="{$login}" />
-                        <input type="hidden" name="password" value="{$password}" />
-                        <input type="hidden" name="hash" value="{$csrfToken}" />
-                        <input type="submit" value="{_log_in}" class="button" />
-                    </td>
                 </tr>
             </tbody>
         </table>
+        <center>
+            <input type="hidden" name="login" value="{$login}" />
+            <input type="hidden" name="password" value="{$password}" />
+            <input type="hidden" name="hash" value="{$csrfToken}" />
+            <input type="submit" value="{_log_in}" class="button" />
+        </center>
     </form>
 {/block}
diff --git a/Web/Presenters/templates/Auth/Register.xml b/Web/Presenters/templates/Auth/Register.xml
index 1dcd0041..52a88d22 100644
--- a/Web/Presenters/templates/Auth/Register.xml
+++ b/Web/Presenters/templates/Auth/Register.xml
@@ -32,7 +32,7 @@
 	                </td>
 	                <td>
 	                <b>{php echo OPENVK_ROOT_CONF['openvk']['appearance']['name']} {_registration_welcome_1}</b><br>
-                        {_registration_welcome_2}				
+                    {_registration_welcome_2}
 	                </td>
 	            </tr>
 	        </tbody>
@@ -41,59 +41,59 @@
             <table cellspacing="7" cellpadding="0" width="52%" border="0" align="center">
                 <tbody>
                     <tr>
-		        <h4 style="margin-left: 60px;">{_main}</h4>
-		    </tr>
+						<h4 style="margin-left: 60px;">{_main}</h4>
+					</tr>
                     <tr>
-                        <td style="text-align: right; min-width: 100px;">
+                        <td class="regform-left">
                             <span class="nobold">{_name}: </span>
                         </td>
-                        <td style="min-width: 200px;">
+                        <td class="regform-right">
                             <input type="text" name="first_name" required />
                         </td>
                     </tr>
                     <tr>
-                        <td style="text-align: right;">
+                        <td class="regform-left">
                             <span class="nobold">{_surname}: </span>
                         </td>
-                        <td>
+                        <td class="regform-right">
                             <input type="text" name="last_name" />
                         </td>
                     </tr>
                     
                     <tr>
-                        <td style="text-align: right;">
+                        <td class="regform-left">
                             <span class="nobold">{_email}: </span>
                         </td>
-                        <td>
+                        <td class="regform-right">
                             <input type="email" name="email" required />
                         </td>
                     </tr>
                     <tr>
-                        <td style="text-align: right;">
+                        <td class="regform-left">
                             <span class="nobold">{_password}: </span>
                         </td>
-                        <td>
+                        <td class="regform-right">
                             <input type="password" name="password" required />
                         </td>
                     </tr>
 		        </table>
 		        <table cellspacing="7" cellpadding="0" width="52%" border="0" align="center">
-			<tr>
-			     <h4 style="margin-left: 60px;">{_other_fields}</h4>
-			</tr>
+				    <tr>
+		                 <h4 style="margin-left: 60px;">{_other_fields}</h4>
+				    </tr>
                     <tr>
-                        <td style="text-align: right; min-width: 100px;">
+                        <td class="regform-left">
                             <span class="nobold">{_birth_date}: </span>
                         </td>
-                        <td style="min-width: 200px;">
+                        <td class="regform-right">
                             <input max={date('Y-m-d')} name="birthday" type="date"/>
                         </td>
                     </tr>
-			<tr>
-                        <td style="text-align: right;">
+			        <tr>
+                        <td class="regform-left">
                             <span class="nobold">{_gender}: </span>
                         </td>
-                        <td>
+                        <td class="regform-right">
                             {var $femalePreferred = OPENVK_ROOT_CONF["openvk"]["preferences"]["femaleGenderPriority"]}
                             <select name="sex" required>
                                 <option n:attr="selected => !$femalePreferred" value="male">{_male}</option>
@@ -102,32 +102,43 @@
                         </td>
                     </tr>
                     <tr>
-                        <td style="text-align: right;">
+                        <td class="regform-left">
                             <span class="nobold">CAPTCHA: </span>
                         </td>
-                        <td>
+                        <td class="regform-right">
                             {captcha_template()|noescape}
                         </td>
                     </tr>
-                        </table>
-                        <div style="margin-left: 100px; margin-right: 100px; text-align: center;">
-                            <input type="hidden" name="hash" value="{$csrfToken}" />
-                            <input type="checkbox" required="true" name="confirmation" /> {_checkbox_in_registration|noescape}
-                            <br /><br />
-			    <input type="submit" value="{_registration}" class="button" /><br><br>
+                </table>
+                    <div style="margin-left: 100px; margin-right: 100px; text-align: center;">
+                        <input type="hidden" name="hash" value="{$csrfToken}" />
+                        <input type="checkbox" required="true" name="confirmation" /> {_checkbox_in_registration|noescape}
+                        <br /><br />
+			            <input type="submit" value="{_registration}" class="button" /><br><br>
                         </div>
                 </tbody>
         </form>
     </div>
     {else}
-        <center>
-            <img src="/assets/packages/static/openvk/img/oof.apng" alt="{_registration_closed}" style="width: 20%;" />
-            <p>
-                {_registration_disabled_info}
-                {if OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']}
-                    <br/><br/><b>{php echo OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']}</b>
-                {/if}
-            </p>
-        </center>
+	<h4>{_registration_closed}</h4>
+		<table cellspacing="10" cellpadding="0" border="0" align="center" style="margin: 9px;">
+	        <tbody>
+	            <tr>
+	                <td style="width: 20%;">
+	                <img src="/assets/packages/static/openvk/img/oof.apng" alt="{_registration_closed}" style="width: 100%;"/>
+	                </td>
+	                <td>
+					{_registration_disabled_info}
+                    {if OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']}
+                        <br/>
+					    <br/>
+					    {_admin_banned_link_reason}: 
+					    <br>
+					    <b>{php echo OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']}</b>
+					{/if}
+	                </td>
+	            </tr>
+	        </tbody>
+	    </table>
     {/if}
 {/block}
diff --git a/Web/Presenters/templates/Auth/Restore.xml b/Web/Presenters/templates/Auth/Restore.xml
index 81d9cf41..ac3a9730 100644
--- a/Web/Presenters/templates/Auth/Restore.xml
+++ b/Web/Presenters/templates/Auth/Restore.xml
@@ -9,16 +9,37 @@
 {/block}
 
 {block content}
-    <p>
-        {_access_recovery_info}
-    </p>
-    
+	<h4 style="margin-left: 100px; margin-right: 100px;">{_access_recovery}</h4>
+        <table cellspacing="10" cellpadding="0" border="0" align="center" width="70%">
+            <tbody>
+                <tr>
+                    <td>
+                    {_access_recovery_info}
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+
     <form method="POST" enctype="multipart/form-data">
-        <label for="login">{_log_in}: </label>
-        <input id="login" type="text" name="login" required />
-        <br/><br/>
-        
-        <input type="hidden" name="hash" value="{$csrfToken}" />
-        <input type="submit" value="{_reset_password}" class="button" style="float: right;" />
+        <table cellspacing="7" cellpadding="0" width="46%" border="0" align="center">
+            <tbody>
+                <tr style="text-align: right;">
+                    <td>
+                        <span class="nobold">{_email}: </span>
+                    </td>
+                    <td>
+                        <input id="login" type="text" name="login" required />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+		<center>
+            <input type="hidden" name="hash" value="{$csrfToken}" />
+            <input type="submit" value="{_reset_password}" class="button"/>
+		</center>
     </form>
 {/block}
diff --git a/Web/static/css/style.css b/Web/static/css/style.css
index dc024539..adede2b2 100644
--- a/Web/static/css/style.css
+++ b/Web/static/css/style.css
@@ -2162,3 +2162,12 @@ a.poll-retract-vote {
         opacity: 1;
     }
 }
+
+.regform-left{
+	text-align: right; 
+	min-width: 110px;
+}
+
+.regform-right{
+	min-width: 200px;
+}
\ No newline at end of file