added: winix function 'account'

code for activating an account has been moved here from Pw
changed: the form for reseting a user's password has been moved
         to 'passwd' winix function (it was in Pw before)




git-svn-id: svn://ttmath.org/publicrep/winix/trunk@926 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2013-05-16 19:26:44 +00:00
parent 48cdca7549
commit 7c266b85e2
30 changed files with 1261 additions and 1050 deletions

20
html/fun_account.html Normal file
View File

@@ -0,0 +1,20 @@
<div class="winix">
<h1>Account</h1>
[if user_logged]
<p>You are logged as: [user_name]<br>
[if user_super_user]
You are the root
[end]
[# !! IMPROVE ME add info about groups, may other parameters like time zone, language?]
</p>
[else]
<p>You are not logged in.</p>
[end]
</div>

View File

@@ -2,41 +2,70 @@
<h1>{passwd_header}</h1>
<form method="post" action="[doc_base_url][dir]passwd">
[if user_super_user]
[if winix_function_param_is "resetpassword"]
<form id="additem" method="post" action="[doc_base_url][dir]passwd/resetpassword">
<fieldset>
<legend>{passwd_form_legend}</legend>
<input type="hidden" name="login" value="[passwd_resetpass_login]">
<input type="hidden" name="code" value="[passwd_resetpass_code]">
<p class="withnext">{passwd_new_password}:</p>
<input class="edit" type="password" name="passwordnew" value="">
<p class="withnext">{passwd_confirm_new_password}:</p>
<input class="edit" type="password" name="passwordconfirm" value="">
<input class="submit" type="submit" value="{passwd_submit}">
[if winix_function_param_is "postredirect"]
<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
[end]
</fieldset>
</form>
[else]
<form method="post" action="[doc_base_url][dir]passwd">
[if user_super_user]
<div class="winix_input_a">
<label for="winix_users_id">{passwd_login}:</label>
<select name="login" id="winix_users_id">
[for user_tab]
<option [if user_tab_is_current]selected[end]>[user_tab_name]</option>
[end]
</div>
</select>
[else]
<div class="winix_input_a">
<label for="winix_current_pass_id">{passwd_current_password}:</label>
<input id="winix_current_pass_id" type="password" name="passwordcur" value="">
</div>
[end]
<div class="winix_input_a">
<label for="winix_users_id">{passwd_login}:</label>
<select name="login" id="winix_users_id">
[for user_tab]
<option [if user_tab_is_current]selected[end]>[user_tab_name]</option>
[end]
<label for="winix_pass_new_id">{passwd_new_password}:</label>
<input id="winix_pass_new_id" type="password" name="passwordnew" value="">
</div>
</select>
[else]
<div class="winix_input_a">
<label for="winix_current_pass_id">{passwd_current_password}:</label>
<input id="winix_current_pass_id" type="password" name="passwordcur" value="">
<label for="winix_pass_new_confirm_id">{passwd_confirm_new_password}:</label>
<input id="winix_pass_new_confirm_id" type="password" name="passwordconfirm" value="">
</div>
[end]
<div class="winix_input_a">
<label for="winix_pass_new_id">{passwd_new_password}:</label>
<input id="winix_pass_new_id" type="password" name="passwordnew" value="">
</div>
<div class="winix_input_a">
<label for="winix_pass_new_confirm_id">{passwd_confirm_new_password}:</label>
<input id="winix_pass_new_confirm_id" type="password" name="passwordconfirm" value="">
</div>
[if winix_function_param_is "postredirect"]
<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
[end]
[if winix_function_param_is "postredirect"]
<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
[end]
<input type="submit" value="{passwd_submit}">
<input type="submit" value="{passwd_submit}">
</form>
</form>
[end]
</div>

View File

@@ -2,59 +2,30 @@
<h1>Pw</h1>
[if winix_function_param_is "resetpassword"]
<form id="additem" method="post" action="[doc_base_url][dir]pw/resetpassword">
<fieldset>
<legend>{passwd_form_legend}</legend>
<input type="hidden" name="login" value="[pw_change_password_login]">
<input type="hidden" name="code" value="[pw_users_change_password_code]">
<p class="withnext">{passwd_new_password}:</p>
<input class="edit" type="password" name="passwordnew" value="">
<p class="withnext">{passwd_confirm_new_password}:</p>
<input class="edit" type="password" name="passwordconfirm" value="">
<input class="submit" type="submit" value="{passwd_submit}">
[if winix_function_param_is "postredirect"]
<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
[end]
</fieldset>
</form>
[else]
[if user_tab]
<table class="tablec">
<tr>
<th>{pw_table_no}</th>
<th>{pw_table_login}</th>
<th>{pw_table_is_root}</th>
<th>{pw_table_is_active}</th>
<th>{pw_table_is_suspended}</th>
<th>{pw_table_is_banned}</th>
[if user_tab]
<table class="tablec">
<tr>
<th>{pw_table_no}</th>
<th>{pw_table_login}</th>
<th>{pw_table_is_root}</th>
<th>{pw_table_is_active}</th>
<th>{pw_table_is_suspended}</th>
<th>{pw_table_is_banned}</th>
</tr>
[for user_tab]
<tr class="[if-index odd]roweven[else]rowodd[end]">
<td>[user_tab_index]</td>
<td>[user_tab_name]</td>
<td>[if user_tab_is_super_user]{pw_table_yes}[end]</td>
<td>[if user_tab_is_active]{pw_table_yes}[end]</td>
<td>[if user_tab_is_suspended]{pw_table_yes}[end]</td>
<td>[if user_tab_is_blocked]{pw_table_yes}[end]</td>
</tr>
[for user_tab]
<tr class="[if-index odd]roweven[else]rowodd[end]">
<td>[user_tab_index]</td>
<td>[user_tab_name]</td>
<td>[if user_tab_is_super_user]{pw_table_yes}[end]</td>
<td>[if user_tab_is_active]{pw_table_yes}[end]</td>
<td>[if user_tab_is_suspended]{pw_table_yes}[end]</td>
<td>[if user_tab_is_blocked]{pw_table_yes}[end]</td>
</tr>
[end]
</table>
[end]
</table>
[end]
</div>