Fixes requested by celestora

This commit is contained in:
ZAZiOs 2022-11-23 22:22:03 +03:00 committed by GitHub
parent 1298d11722
commit 7b9b723da9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 159 additions and 87 deletions

View file

@ -9,21 +9,48 @@
{/block} {/block}
{block content} {block content}
<p> <h4 style="margin-left: 100px; margin-right: 100px;">{_access_recovery}</h4>
{_access_recovery_info_2} <table cellspacing="10" cellpadding="0" border="0" align="center" width="70%">
</p> <tbody>
<tr>
<td>
{_access_recovery_info_2}
</td>
</tr>
</tbody>
</table>
<form method="POST" enctype="multipart/form-data"> <form method="POST" enctype="multipart/form-data">
<label for="password">{_new_password}: </label> <table cellspacing="7" cellpadding="0" width="55%" border="0" align="center">
<input id="password" type="password" name="password" required /> <tbody>
<br/><br/> <tr>
{if $is2faEnabled} <td class="regform-left">
<label for="code">{_"2fa_code_2"}: </label> <span class="nobold">{_new_password}: </span>
<input id="code" type="text" name="code" required /> </td>
<br/><br/> <td class="regform-right">
{/if} <input id="password" type="password" name="password" required />
</td>
<input type="hidden" name="hash" value="{$csrfToken}" /> </tr>
<input type="submit" value="{_reset_password}" class="button" style="float: right;" /> {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> </form>
{/block} {/block}

View file

@ -8,13 +8,13 @@
{block content} {block content}
<form method="POST" enctype="multipart/form-data"> <form method="POST" enctype="multipart/form-data">
<h4 style="margin-left: 100px; margin-right: 100px;">{_log_in}</h4> <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> <tbody>
<tr style="text-align: right;"> <tr style="text-align: right;">
<td> <td>
<span class="nobold">{_email}: </span> <span class="nobold">{_email}: </span>
</td> </td>
<td> <td style="width:191px;">
<input type="text" name="login" required /> <input type="text" name="login" required />
</td> </td>
</tr> </tr>
@ -26,20 +26,17 @@
<input type="password" name="password" required /> <input type="password" name="password" required />
</td> </td>
</tr> </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> </tbody>
</table> </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> </form>
{/block} {/block}

View file

@ -6,16 +6,23 @@
{/block} {/block}
{block content} {block content}
<p> <h4 style="margin-left: 100px; margin-right: 100px;">{_two_factor_authentication}</h4>
{_two_factor_authentication_login} <table cellspacing="10" cellpadding="0" border="0" align="center" width="70%">
</p> <tbody>
<tr>
<td>
{_two_factor_authentication_login}
</td>
</tr>
</tbody>
</table>
<form method="POST" enctype="multipart/form-data"> <form method="POST" enctype="multipart/form-data">
<table cellspacing="7" cellpadding="0" width="40%" border="0" align="center"> <table cellspacing="7" cellpadding="0" width="40%" border="0" align="center">
<tbody> <tbody>
<tr> <tr style="text-align: right;">
<td> <td>
<span>{_code}: </span> <span class="nobold">{_code}: </span>
</td> </td>
<td> <td>
<input type="text" name="code" autocomplete="off" required /> <input type="text" name="code" autocomplete="off" required />
@ -25,14 +32,14 @@
<td> <td>
</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> </tr>
</tbody> </tbody>
</table> </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> </form>
{/block} {/block}

View file

@ -32,7 +32,7 @@
</td> </td>
<td> <td>
<b>{php echo OPENVK_ROOT_CONF['openvk']['appearance']['name']} {_registration_welcome_1}</b><br> <b>{php echo OPENVK_ROOT_CONF['openvk']['appearance']['name']} {_registration_welcome_1}</b><br>
{_registration_welcome_2} {_registration_welcome_2}
</td> </td>
</tr> </tr>
</tbody> </tbody>
@ -41,59 +41,59 @@
<table cellspacing="7" cellpadding="0" width="52%" border="0" align="center"> <table cellspacing="7" cellpadding="0" width="52%" border="0" align="center">
<tbody> <tbody>
<tr> <tr>
<h4 style="margin-left: 60px;">{_main}</h4> <h4 style="margin-left: 60px;">{_main}</h4>
</tr> </tr>
<tr> <tr>
<td style="text-align: right; min-width: 100px;"> <td class="regform-left">
<span class="nobold">{_name}: </span> <span class="nobold">{_name}: </span>
</td> </td>
<td style="min-width: 200px;"> <td class="regform-right">
<input type="text" name="first_name" required /> <input type="text" name="first_name" required />
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="text-align: right;"> <td class="regform-left">
<span class="nobold">{_surname}: </span> <span class="nobold">{_surname}: </span>
</td> </td>
<td> <td class="regform-right">
<input type="text" name="last_name" /> <input type="text" name="last_name" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="text-align: right;"> <td class="regform-left">
<span class="nobold">{_email}: </span> <span class="nobold">{_email}: </span>
</td> </td>
<td> <td class="regform-right">
<input type="email" name="email" required /> <input type="email" name="email" required />
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="text-align: right;"> <td class="regform-left">
<span class="nobold">{_password}: </span> <span class="nobold">{_password}: </span>
</td> </td>
<td> <td class="regform-right">
<input type="password" name="password" required /> <input type="password" name="password" required />
</td> </td>
</tr> </tr>
</table> </table>
<table cellspacing="7" cellpadding="0" width="52%" border="0" align="center"> <table cellspacing="7" cellpadding="0" width="52%" border="0" align="center">
<tr> <tr>
<h4 style="margin-left: 60px;">{_other_fields}</h4> <h4 style="margin-left: 60px;">{_other_fields}</h4>
</tr> </tr>
<tr> <tr>
<td style="text-align: right; min-width: 100px;"> <td class="regform-left">
<span class="nobold">{_birth_date}: </span> <span class="nobold">{_birth_date}: </span>
</td> </td>
<td style="min-width: 200px;"> <td class="regform-right">
<input max={date('Y-m-d')} name="birthday" type="date"/> <input max={date('Y-m-d')} name="birthday" type="date"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="text-align: right;"> <td class="regform-left">
<span class="nobold">{_gender}: </span> <span class="nobold">{_gender}: </span>
</td> </td>
<td> <td class="regform-right">
{var $femalePreferred = OPENVK_ROOT_CONF["openvk"]["preferences"]["femaleGenderPriority"]} {var $femalePreferred = OPENVK_ROOT_CONF["openvk"]["preferences"]["femaleGenderPriority"]}
<select name="sex" required> <select name="sex" required>
<option n:attr="selected => !$femalePreferred" value="male">{_male}</option> <option n:attr="selected => !$femalePreferred" value="male">{_male}</option>
@ -102,32 +102,43 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="text-align: right;"> <td class="regform-left">
<span class="nobold">CAPTCHA: </span> <span class="nobold">CAPTCHA: </span>
</td> </td>
<td> <td class="regform-right">
{captcha_template()|noescape} {captcha_template()|noescape}
</td> </td>
</tr> </tr>
</table> </table>
<div style="margin-left: 100px; margin-right: 100px; text-align: center;"> <div style="margin-left: 100px; margin-right: 100px; text-align: center;">
<input type="hidden" name="hash" value="{$csrfToken}" /> <input type="hidden" name="hash" value="{$csrfToken}" />
<input type="checkbox" required="true" name="confirmation" /> {_checkbox_in_registration|noescape} <input type="checkbox" required="true" name="confirmation" /> {_checkbox_in_registration|noescape}
<br /><br /> <br /><br />
<input type="submit" value="{_registration}" class="button" /><br><br> <input type="submit" value="{_registration}" class="button" /><br><br>
</div> </div>
</tbody> </tbody>
</form> </form>
</div> </div>
{else} {else}
<center> <h4>{_registration_closed}</h4>
<img src="/assets/packages/static/openvk/img/oof.apng" alt="{_registration_closed}" style="width: 20%;" /> <table cellspacing="10" cellpadding="0" border="0" align="center" style="margin: 9px;">
<p> <tbody>
{_registration_disabled_info} <tr>
{if OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']} <td style="width: 20%;">
<br/><br/><b>{php echo OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']}</b> <img src="/assets/packages/static/openvk/img/oof.apng" alt="{_registration_closed}" style="width: 100%;"/>
{/if} </td>
</p> <td>
</center> {_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} {/if}
{/block} {/block}

View file

@ -9,16 +9,37 @@
{/block} {/block}
{block content} {block content}
<p> <h4 style="margin-left: 100px; margin-right: 100px;">{_access_recovery}</h4>
{_access_recovery_info} <table cellspacing="10" cellpadding="0" border="0" align="center" width="70%">
</p> <tbody>
<tr>
<td>
{_access_recovery_info}
</td>
</tr>
</tbody>
</table>
<form method="POST" enctype="multipart/form-data"> <form method="POST" enctype="multipart/form-data">
<label for="login">{_log_in}: </label> <table cellspacing="7" cellpadding="0" width="46%" border="0" align="center">
<input id="login" type="text" name="login" required /> <tbody>
<br/><br/> <tr style="text-align: right;">
<td>
<input type="hidden" name="hash" value="{$csrfToken}" /> <span class="nobold">{_email}: </span>
<input type="submit" value="{_reset_password}" class="button" style="float: right;" /> </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> </form>
{/block} {/block}

View file

@ -2162,3 +2162,12 @@ a.poll-retract-vote {
opacity: 1; opacity: 1;
} }
} }
.regform-left{
text-align: right;
min-width: 110px;
}
.regform-right{
min-width: 200px;
}