Skip to content

Commit

Permalink
Rework userForms to use bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
@dwt
jhinghaus authored and dwt committed Jun 5, 2018
1 parent f71376e commit f0ff084
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 127 deletions.
97 changes: 39 additions & 58 deletions src/OFS/dtml/addUser.dtml
View file
@@ -1,73 +1,54 @@
<dtml-var manage_page_header>

<main>

<dtml-var "manage_form_title(this(), _, form_title='Add User')">

<p class="form-help">
To add a new user, enter the name <dtml-unless remote_user_mode__>
,password, confirmation</dtml-unless> and roles for the new user and
click &quot;Add&quot;. <em>Domains</em> is an optional list of domains
from which the user is allowed to login.
,password, confirmation</dtml-unless> and roles for the new user and
click &quot;Add&quot;. <em>Domains</em> is an optional list of domains
from which the user is allowed to login.
</p>

<form action="manage_users" method="post">
<table>
<tr>
<td align="left" valign="top">
<div class="form-label">
Name
</div>
</td>
<td align="left" valign="top">
<input type="text" name="name" size="30" />
</td>
</tr>
<form action="manage_users" method="post" class="zmi-user">
<div class="form-group row">
<label for="name" class="form-label col-sm-3 col-md-2">
Name
</label>
<input id="name" class="form-control col-sm-9 col-md-6" type="text" name="name" size="30" />
</div>

<dtml-if remote_user_mode__>
<input type="hidden" name="password" value="password" />
<input type="hidden" name="confirm" value="password" />
<dtml-else>
<tr>
<td align="left" valign="top">
<div class="form-label">
Password
</div>
</td>
<td align="left" valign="top">
<input type="password" name="password" size="30" />
</td>
</tr>
<tr>
<td align="left" valign="top">
<div class="form-label">
(Confirm)
</div>
</td>
<td align="left" valign="top">
<input type="password" name="confirm" size="30" />
</td>
</tr>
<div class="form-group row">
<label for="pw" class="form-label col-sm-3 col-md-2">
Password
</label>
<input id="pw" class="form-control col-sm-9 col-md-6" type="password" name="password" size="30" />
</div>
<div class="form-group row">
<label for="confirm" class="form-label col-sm-3 col-md-2">
(Confirm)
</label>
<input id="confirm" class="form-control col-sm-9 col-md-6" type="password" name="confirm" size="30" />
</div>
</dtml-if>

<tr>
<td align="left" valign="top">
<div class="form-optional">
Domains
<div class="form-group row">
<label for="domains" class="form-label col-sm-3 col-md-2">
Domains
</label>
<input id="domains" class="form-control col-sm-9 col-md-6" type="text" name="domains:tokens" size="30" value="" />
</div>
</td>
<td align="left" valign="top">
<input type="text" name="domains:tokens" size="30" value="" />
</td>
</tr>

<tr>
<td align="left" valign="top">
<div class="form-label">
<div class="form-group row">
<label for="roles" class="form-label col-sm-3 col-md-2">
Roles
</div>
</td>
<td align="left" valign="top">
<div class="form-element">
<select name="roles:list" size="5" multiple>
</label>
<select id="roles" class="form-control col-sm-9 col-md-6" name="roles:list" size="5" multiple>
<dtml-in valid_roles>
<dtml-if expr="_vars['sequence-item'] != 'Authenticated'">
<dtml-if expr="_vars['sequence-item'] != 'Anonymous'">
Expand All @@ -78,12 +59,12 @@ Domains
</dtml-if>
</dtml-in valid_roles>
</select>
<br />
<input type="submit" name="submit" value="Add" />
</div>
</td>
</tr>
</table>
</div>
<div class="controls">
<input class="btn btn-primary" type="submit" name="submit" value="Add" />
</div>
</form>

</main>

<dtml-var manage_page_footer>
120 changes: 51 additions & 69 deletions src/OFS/dtml/editUser.dtml
View file
@@ -1,90 +1,72 @@
<dtml-var manage_page_header>

<main>

<dtml-var "manage_form_title(this(), _, form_title='Change User')">

<FORM ACTION="manage_users" METHOD="POST">
<TABLE>
<TR>
<TD VALIGN="TOP">
<div class="form-label">
Name
</div>
</TD>
<TD VALIGN="TOP">
<div class="form-text">
<dtml-var expr="user.name" html_quote>
<FORM ACTION="manage_users" METHOD="POST" class="zmi-user">
<div class="form-group row">
<label for="name" class="form-label col-sm-3 col-md-2">
Name
</label>
<div id="name" class="form-text col-sm-9 col-md-6">
<dtml-var expr="user.name" html_quote>
</div>
</div>
</TD>
</TR>
<TR><TD COLSPAN=2>&nbsp;</TD></TR>

<dtml-if remote_user_mode__>
<INPUT TYPE="HIDDEN" NAME="password" value="&dtml-password;" />
<INPUT TYPE="HIDDEN" NAME="confirm" value="&dtml-password;" />
<dtml-else>
<TR>
<TD VALIGN="TOP">
<div class="form-label">
New Password
<div class="form-group row">
<label for="pw" class="form-label col-sm-3 col-md-2">
New Password
</label>
<INPUT id="pw" class="form-control col-sm-9 col-md-6" TYPE="PASSWORD" NAME="password" SIZE="30" value="password" />
</div>
</TD>
<TD VALIGN="TOP">
<INPUT TYPE="PASSWORD" NAME="password" SIZE="30" value="password" />
</TD>
</TR>
<TR>
<TD VALIGN="TOP">
<div class="form-label">
(Confirm)
<div class="form-group row">
<label for="confirm" class="form-label col-sm-3 col-md-2">
(Confirm)
</label>
<INPUT id="confirm" class="form-control col-sm-9 col-md-6" TYPE="PASSWORD" NAME="confirm" SIZE="30" value="pconfirm" />
</div>
</TD>
<TD VALIGN="TOP">
<INPUT TYPE="PASSWORD" NAME="confirm" SIZE="30" value="pconfirm" />
</TD>
</TR>
</dtml-if>
<TR>
<TD VALIGN="TOP">
<div class="form-optional">
Domains

<div class="form-group row">
<label for="domains" class="form-label col-sm-3 col-md-2">
Domains
</label>
<INPUT id="domains" class="form-control col-sm-9 col-md-6" TYPE="TEXT" NAME="domains:tokens" SIZE="30"
VALUE="<dtml-if expr="user.domains"><dtml-in expr="user.domains">&dtml-sequence-item; </dtml-in></dtml-if>" />
</div>
</TD>
<TD VALIGN="TOP">
<INPUT TYPE="TEXT" NAME="domains:tokens" SIZE="30"
VALUE="<dtml-if expr="user.domains"><dtml-in expr="user.domains">&dtml-sequence-item; </dtml-in></dtml-if>" />
</TD>
</TR>

<TR>
<TD VALIGN="TOP">
<div class="form-label">
Roles
<div class="form-group row">
<label for="roles" class="form-label col-sm-3 col-md-2">
Roles
</label>
<SELECT id="roles" class="form-control col-sm-9 col-md-6" NAME="roles:list" SIZE="5" MULTIPLE>
<dtml-in valid_roles>
<dtml-if expr="_vars['sequence-item'] != 'Authenticated'">
<dtml-if expr="_vars['sequence-item'] != 'Anonymous'">
<dtml-if expr="_vars['sequence-item'] != 'Shared'">
<dtml-if expr="_vars['sequence-item'] in user.roles">
<OPTION VALUE="&dtml-sequence-item;" selected>&dtml-sequence-item;
<dtml-else>
<OPTION VALUE="&dtml-sequence-item;">&dtml-sequence-item;
</dtml-if>
</dtml-if>
</dtml-if>
</dtml-if>
</dtml-in valid_roles>
</SELECT>
</div>
</TD>
<TD VALIGN="TOP">
<div class="form-element">
<SELECT NAME="roles:list" SIZE="5" MULTIPLE>
<dtml-in valid_roles>
<dtml-if expr="_vars['sequence-item'] != 'Authenticated'">
<dtml-if expr="_vars['sequence-item'] != 'Anonymous'">
<dtml-if expr="_vars['sequence-item'] != 'Shared'">
<dtml-if expr="_vars['sequence-item'] in user.roles">
<OPTION VALUE="&dtml-sequence-item;" selected>&dtml-sequence-item;
<dtml-else>
<OPTION VALUE="&dtml-sequence-item;">&dtml-sequence-item;
</dtml-if>
</dtml-if>
</dtml-if>
</dtml-if>
</dtml-in valid_roles>
</SELECT>

<INPUT TYPE="HIDDEN" NAME="name" VALUE="<dtml-var expr="user.name" html_quote>" />
<br /><br />
<INPUT class="form-element" TYPE="SUBMIT" NAME="submit" VALUE="Change" />
<div class="controls">
<INPUT class="btn btn-primary" TYPE="SUBMIT" NAME="submit" VALUE="Change" />
</div>
</TD>
</TR>
</TABLE>
</FORM>

</main>

<dtml-var manage_page_footer>

0 comments on commit f0ff084

Please sign in to comment.