Menu
▾
▴
[Openinteract-commits] CVS: OpenInteract/pkg/base_user/template new_user_form.tmpl,1.2,1.3 user_detail.tmpl,1.3,1.4 user_form.tmpl,1.4,1.5 user_list.tmpl,1.4,1.5 user_search_form.tmpl,1.2,1.3
|
From: Chris W. <la...@us...> - 2001-10-31 13:58:04
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_user/template
In directory usw-pr-cvs1:/tmp/cvs-serv1727/template
Modified Files:
new_user_form.tmpl user_detail.tmpl user_form.tmpl
user_list.tmpl user_search_form.tmpl
Log Message:
use template widgets throughout
Index: new_user_form.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_user/template/new_user_form.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** new_user_form.tmpl 2001/08/13 16:10:15 1.2
--- new_user_form.tmpl 2001/10/31 13:58:01 1.3
***************
*** 1,22 ****
! [%- th = OI.theme_properties -%]
<div align="center">
! <form name="newuser" action="[% main_script %]/edit/" method="post">
! <table border="0" cellpadding="2" cellspacing="0"
! bgcolor=[% th.border_color %]" width="75%">
! <tr><td>
! <table border="0" width="100%" bgcolor="[% th.bgcolor %]"
! cellpadding="3" cellspacing="0">
! <tr bgcolor="[% th.head_bgcolor %]">
! <td colspan="2"><font size="+1" color="[% th.head_font_color %]">
<b>Create an Account</b>
</font></td>
</tr>
<tr><td align="left" colspan="2">
<p>Creating a new account is easy! We only need two things:<br>
! [% th.bullet %] the OI.login you'd like to use<br>
! [% th.bullet %] a working email address
<p>Once you fill out these items below and the username is not
--- 1,19 ----
! [%- DEFAULT theme = OI.theme_properties -%]
<div align="center">
! <form name="newuser" action="/NewUser/edit/" method="post">
! [% INCLUDE table_bordered_begin -%]
! <tr bgcolor="[% theme.head_bgcolor %]">
! <td colspan="2"><font size="+1" color="[% theme.head_font_color %]">
<b>Create an Account</b>
</font></td>
</tr>
+
<tr><td align="left" colspan="2">
<p>Creating a new account is easy! We only need two things:<br>
! [% theme.bullet %] the OI.login you'd like to use<br>
! [% theme.bullet %] a working email address
<p>Once you fill out these items below and the username is not
***************
*** 28,32 ****
</td></tr>
-
[%- IF OI.error_hold.newuser.message %]
<tr align="center">
--- 25,28 ----
***************
*** 37,61 ****
[% END -%]
! <tr>
! <td align="right"><b>Desired Login</b></td>
! <td><font size="-1">
! <input type="text" name="requested_login"
! value="[% requested_login %]" size="15">
! </font></td>
! </tr>
! <tr>
! <td align="right"><b>Working email address</b></td>
! <td><font size="-1">
! <input type="text" name="working_email"
! value="[% working_email %]" size="15">
! </font></td>
! </tr>
! <tr align="right"><td colspan="2">
! <font size="-1"><input type="submit" value="Go!"></font>
! </td></tr>
! </table>
! </td></tr>
! </table>
</form>
--- 33,49 ----
[% END -%]
! [% INCLUDE label_form_text_row( label = 'Desired Login',
! color = theme.bgcolor,
! name = 'requested_login',
! value = requested_login ) -%]
! [% INCLUDE label_form_text_row( label = 'Working email address',
! color = theme.bgcolor,
! name = 'working_email',
! value = working_email ) -%]
!
! [% INCLUDE form_submit_row( value = 'Go!' ) -%]
!
! [% INCLUDE table_bordered_end -%]
</form>
Index: user_detail.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_user/template/user_detail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** user_detail.tmpl 2001/09/14 12:23:00 1.3
--- user_detail.tmpl 2001/10/31 13:58:01 1.4
***************
*** 1,64 ****
! [%- theme = OI.theme_properties -%]
! [% OI.comp( 'showerror', error_msg = error_msg ) %]
<div align="center">
<h2 align="center">User Detail</h2>
<p>This screen has detail about a particular user record.</p>
-
- <table border="0" bgcolor="[% theme.border_color %]" width="50%"
- cellpadding="2" cellspacing="0">
- <tr><td>
! <table border="0" width="100%" bgcolor="[% theme.bgcolor %]"
! cellpadding="5" cellspacing="0">
!
! <tr valign="top" align="center" bgcolor="[% theme.head_bgcolor %]">
! <td colspan="2"><font color="[% theme.head_font_color %]" size="+1">
! <b>Review User Detail</b>
! </font></td>
! </tr>
!
! <tr valign="top" bgcolor="[% theme.even_color %]">
! <td align="right"><b>Name</b></td>
! <td><font size="-1">[% user.first_name %] [% user.last_name %]</font></td>
! </tr>
! <tr valign="top" bgcolor="[% theme.odd_color %]">
! <td align="right"><b>E-Mail</b></td>
! <td><font size="-1"><a href="mailto:[% user.email %]">[% user.email %]</a></font></td>
! </tr>
! <tr valign="top" bgcolor="[% theme.even_color %]">
! <td align="right"><b>Login Name</b></td>
! <td><font size="-1">[% user.login_name %]</font></td>
! </tr>
! <tr valign="top" bgcolor="[% theme.odd_color %]">
! <td align="right"><b>Title</b></td>
! <td><font size="-1">[% user.title %]</font> </td>
! </tr>
! <tr valign="top" bgcolor="[% theme.even_color %]">
! <td align="right"><b>Notes</b></td>
! <td><font size="-1">[% user.notes %]</font> </td>
! </tr>
! <tr valign="top" bgcolor="[% theme.odd_color %]">
! <td align="right"><b>Member of Groups</b></td>
! <td><font size="-1">
! [% FOREACH group = group_list %]
! [% theme.bullet %] <a href="/Group/show/?group_id=[% group.group_id %]">[% group.name %]</a><br>
! [% END %]
! </font></td>
! </tr>
! <tr valign="top" bgcolor="[% theme.head_bgcolor %]"><td colspan="2"> </td></tr>
!
! </table>
! </td></tr>
! </table>
</div>
--- 1,45 ----
! [%- DEFAULT theme = OI.theme_properties -%]
<div align="center">
+ [%- PROCESS error_message -%]
+ [%- PROCESS status_message -%]
+
<h2 align="center">User Detail</h2>
<p>This screen has detail about a particular user record.</p>
! [% INCLUDE table_bordered_begin( table_width = '50%' ) -%]
! [%- count = 0 -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'Name',
! text = "$user.first_name $user.last_name" ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'E-Mail',
! text = "<a href='mailto:$user.email'>$user.email</a>" ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'Login Name',
! text = user.login_name ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'Title',
! text = user.title ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'Notes',
! text = user.notes ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_row_begin( label = 'Member of Groups' ) -%]
! <td>[% FOREACH group = group_list -%]
! [% group_url = OI.make_url( base = '/Group/show', group_id = group.group_id ) -%]
! [% theme.bullet %] <a href="[% group_url %]">[% group.name %]</a><br>
! [% END -%]
! </td></tr>
! [% INCLUDE table_bordered_end -%]
</div>
Index: user_form.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_user/template/user_form.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** user_form.tmpl 2001/09/14 12:23:00 1.4
--- user_form.tmpl 2001/10/31 13:58:01 1.5
***************
*** 1,90 ****
! [%- theme = OI.theme_properties -%]
! [% OI.comp( 'showerror', error_msg = error_msg ) %]
<div align="center">
-
- <h2 align="center">User Editing</h2>
! <p>This screen allows you to add edit information for a user or create a new one.</p>
! <form name="user" action="[% main_script %]/edit/" method="post"
! onsubmit="return data_check( this )">
! <table border="0" bgcolor="[% theme.border_color %]" width="50%"
! cellpadding="2" cellspacing="0">
! <tr><td>
! <table border="0" width="100%" bgcolor="[% theme.bgcolor %]"
! cellpadding="5" cellspacing="0">
! <tr valign="top" align="center" bgcolor="[% theme.head_bgcolor %]">
! <td colspan="2"><font color="[% theme.head_font_color %]" size="+1">
! [% action = ( user.id ) ? 'Edit a' : 'Create a New' -%]
! <b>[% action %] User</b>
! </font></td>
! </tr>
! <tr valign="top" bgcolor="[% theme.even_color %]">
! <td align="right"><b>Name</b> [% theme.required %]</td>
! <td><font size="-1">
! <input type="text" size="12" name="first_name" value="[% user.first_name %]">
! <input type="text" size="12" name="last_name" value="[% user.last_name %]">
! </font></td>
! </tr>
! <tr valign="top" bgcolor="[% theme.odd_color %]">
! <td align="right"><b>E-Mail</b> [% theme.required %]</td>
! <td><font size="-1">
! <input type="text" size="30" name="email" value="[% user.email %]">
! </font></td>
! </tr>
! <tr valign="top" bgcolor="[% theme.even_color %]">
! <td align="right"><b>Login Name</b> [% theme.required %]</td>
! <td><font size="-1">
! <input type="text" size="30" name="login_name" value="[% user.login_name %]">
! </font></td>
! </tr>
! <tr valign="top" bgcolor="[% theme.odd_color %]">
! <td align="right"><b>Password</b> [% IF NOT user.id %][% theme.required %][% END %]</td>
! <td><font size="-1">
! <input type="password" size="15" name="password" value=""><br>
! <input type="password" size="15" name="password_conf" value=""> (<em>confirm</em>)
! [%- IF user.id %]<br>
! <font color="#ff0000">If you do not type anything, the password will not be changed.</font>
[%- END -%]
! </font></td>
! </tr>
!
! <tr valign="top" bgcolor="[% theme.even_color %]">
! <td align="right"><b>Title</b></td>
! <td><font size="-1">
! <input type="text" size="30" name="title" value="[% user.title %]">
! </font></td>
! </tr>
! <tr valign="top" bgcolor="[% theme.odd_color %]">
! <td align="right"><b>Notes</b></td>
! <td><font size="-1">
! <textarea name="notes" cols="30" rows="3">[% user.notes %]</textarea>
! </font></td>
! </tr>
! <tr valign="top" bgcolor="[% theme.even_color %]">
! <td colspan="2" align="right"><font size="-1">
! <input type="submit" value="Modify">
! </font></td>
! </tr>
! <tr valign="top" bgcolor="[% theme.head_bgcolor %]"><td colspan="2"> </td></tr>
! </table>
! </td></tr>
! </table>
! <input type="hidden" name="user_id" value="[% user.id %]">
! </form>
</div>
--- 1,69 ----
! [%- DEFAULT theme = OI.theme_properties -%]
<div align="center">
! [%- PROCESS error_message -%]
! [%- PROCESS status_message -%]
! [%- is_new = ( user.id ) ? 0 : 1 -%]
! [%- action = ( is_new ) ? 'Create a New' : 'Edit a' -%]
! <h2>[% action %] User</h2>
! <p>Make necessary modifications to the user record below. If you do
! not enter a password it will not be changed.</p>
! <form name="user" action="/User/edit/" method="post">
! [% INCLUDE table_bordered_begin -%]
! [%- count = 0;
! valign = 'top'; -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_row_begin( label = 'Name', is_required = 1 ) -%]
! <td>[% INCLUDE form_text( name = 'first_name', size = 12,
! value = user.first_name ) -%]
! [% INCLUDE form_text( name = 'last_name', size = 12,
! value = user.last_name ) -%]
! </td></tr>
! [%- count = count + 1 -%]
! [% INCLUDE label_form_text_row( label = 'E-Mail', is_required = 1,
! name = 'email', size = 30,
! value = user.email ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_form_text_row( label = 'Login Name', is_required = 1,
! name = 'login_name', size = 30,
! value = user.login_name ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_row_begin( label = 'Password', is_required = is_new ) -%]
! <td>[% INCLUDE form_password( name = 'password', size = 15 ) -%] <br>
! [% INCLUDE form_password( name = 'password_conf', size = 15 ) -%]
! [%- UNLESS is_new -%]
! <br><font color="#ff0000" size="-1">
! If you do not type anything, the password will not be changed.
! </font>
[%- END -%]
! </td></tr>
! [%- count = count + 1 -%]
! [% INCLUDE label_form_text_row( label = 'Title',
! name = 'title', size = 30,
! value = user.title ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_form_textarea_row( label = 'Notes', name = 'notes',
! rows = 3, cols = 30, wrap = 'virtual',
! value = user.notes ) -%]
! [%- count = count + 1 -%]
! [%- INCLUDE form_submit_row( value = 'Modify' ) -%]
! [% INCLUDE table_bordered_end -%]
! [% INCLUDE form_hidden( name = 'user_id', value = user.id ) -%]
! </form>
</div>
Index: user_list.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_user/template/user_list.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** user_list.tmpl 2001/09/14 12:23:00 1.4
--- user_list.tmpl 2001/10/31 13:58:01 1.5
***************
*** 1,29 ****
- [%- theme = OI.theme_properties -%]
-
[%########################################
MACROS
########################################-%]
-
- [% MACRO header_cell( label ) BLOCK -%]
- <td><font color="[% theme.head_font_color %]" size="+1">[% label %]</font></td>
- [% END -%]
! [% MACRO user_row( user, count ) BLOCK -%]
! [%- SET row_color = theme.odd_color -%]
! [%- SET row_color = theme.even_color IF count mod 2 == 0 -%]
! <tr bgcolor="[% row_color %]">
! <td><font size="-1">[% user.login_name %]</font></td>
! <td><font size="-1">[% user.full_name %]</font> </td>
! <td><font size="-1">[% user.title %]</font> </td>
! <td><font size="-1">
! [%- IF user.email %]<a href="mailto:[% user.email %]">[% user.email %]</a>
! [%- ELSE %] [% END %]
! </font></td>
! <td><font size="-1">
! [% edit_url = OI.make_url( base = '/User/show/', user_id = user.id ) -%]
! [% remove_url = OI.make_url( base = '/User/remove/', user_id = user.id ) -%]
! <a href="[% edit_url %]">Detail</a><br>
! <a href="[% remove_url %]">Remove</a><br>
! </font></td>
</tr>
[% END -%]
--- 1,21 ----
[%########################################
MACROS
########################################-%]
! [% MACRO user_row BLOCK -%]
! [%- edit_url = OI.make_url( base = '/User/show/',
! user_id = user.id ) -%]
! [%- remove_url = OI.make_url( base = '/User/remove/',
! user_id = user.id ) -%]
! <tr bgcolor="[% PROCESS row_color %]" valign="top">
! <td>[% user.login_name %]</td>
! <td>[% user.full_name %] </td>
! <td>[% user.title %] </td>
! <td>[% IF user.email %]<a href="mailto:[% user.email %]">[% user.email %]</a>
! [%- ELSE %] [% END %]</td>
! <td><a href="[% edit_url %]">Detail</a>
! [%- IF user.tmp_security_level >= OI.security_level.write -%]
! <br><a href="[% remove_url %]">Remove</a>[% END -%]
! </td>
</tr>
[% END -%]
***************
*** 34,83 ****
########################################-%]
! [%- OI.comp( 'showerror', error_msg = error_msg ) -%]
!
! <div align="center">
!
! <table border="0" width="50%" cellpadding="5" cellspacing="0">
! <tr><td align="left">
! <h2 align="center">User Listing</h2>
!
! <p>Listed below are the users matching your criteria. You can get
! further detail about each one or perform other actions on them.</p>
! </td></tr></table>
!
! [% IF NOT user_iterator.has_next -%]
!
! <p align="center"><b>No users matched criteria.</b></p>
!
! [% ELSE -%]
!
! <table border="0" bgcolor="[% theme.border_color %]"
! cellspacing="0" cellpadding="2">
! <tr><td>
! <table border="0" width="100%" bgcolor="[% theme.bgcolor %]"
! cellpadding="5" cellspacing="0">
! <tr bgcolor="[% theme.head_bgcolor %]" align="center">
! [% header_cell( 'Username' ) -%]
! [% header_cell( 'Full Name' ) -%]
! [% header_cell( 'Title' ) -%]
! [% header_cell( 'E-Mail' ) -%]
! [% header_cell( 'Actions' ) -%]
! </tr>
[%- count = 0 -%]
! [% WHILE ( user = user_iterator.get_next ) -%]
! [% user_row( user, count ) -%]
[%- count = count + 1 -%]
[% END %]
! <tr bgcolor="[% theme.head_bgcolor %]"><td colspan="5"> </td></tr>
!
! </table>
! </td></tr>
! </table>
!
! [% END -%]
!
! </div>
--- 26,40 ----
########################################-%]
! [% INCLUDE table_bordered_begin -%]
! [% INCLUDE header_row( label = [ 'Username', 'Full Name', 'Title',
! 'E-Mail', 'Actions' ] ) -%]
[%- count = 0 -%]
! [% WHILE ( user = iterator.get_next ) -%]
! [% user_row() -%]
[%- count = count + 1 -%]
[% END %]
! [% INCLUDE table_bordered_end -%]
Index: user_search_form.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_user/template/user_search_form.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** user_search_form.tmpl 2001/09/14 12:23:00 1.2
--- user_search_form.tmpl 2001/10/31 13:58:01 1.3
***************
*** 1,46 ****
! [%- theme = OI.theme_properties -%]
! [%########################################
! MACROS
! ########################################-%]
! [% MACRO search_row( label, field_name, count ) BLOCK -%]
! [%- SET row_color = theme.odd_color -%]
! [%- SET row_color = theme.even_color IF count mod 2 == 0 -%]
! <tr bgcolor="[% row_color %]">
! <td align="right"><b>[% label %]</b></td>
! <td><input type="text" name="[% field_name %]" size="25"></td>
! </tr>
! [% END -%]
! [%########################################
! DISPLAY START
! ########################################-%]
! [%- OI.comp( 'showerror', error_msg = error_msg ) -%]
! <h1 align="center">User Search</h2>
! <div align="center">
! <form action="/User/listing/" method="get">
! <table border="0" bgcolor="[% theme.border_color %]"
! cellspacing="0" cellpadding="2">
! <tr><td>
! <table border="0" bgcolor="[% theme.bgcolor %]"
! cellspacing="0" cellpadding="4">
! [% search_row( 'Login', 'login_name', 1 ) -%]
! [% search_row( 'First Name', 'first_name', 2 ) -%]
! [% search_row( 'Last Name', 'last_name', 3 ) -%]
! [% search_row( 'Email', 'email', 4 ) -%]
! <tr bgcolor="[% theme.odd_color %]" align="right">
! <td colspan="2"><input type="submit" value="Search"></td>
! </tr>
! </table>
! </td></tr>
! </table>
</form>
</div>
--- 1,38 ----
! [%- DEFAULT theme = OI.theme_properties -%]
! <div align="center">
! [%- PROCESS error_message -%]
! [%- PROCESS status_message -%]
! <h2>User Search</h2>
! <form action="/User/search/" method="GET">
! [% INCLUDE table_bordered_begin( table_width = '50%' ) -%]
! [%- count = 0 -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_form_text_row( label = 'Login', size = 25,
! name = 'login_name' ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_form_text_row( label = 'First Name', size = 25,
! name = 'first_name' ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_form_text_row( label = 'Last Name', size = 25,
! name = 'last_name' ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_form_text_row( label = 'Email', size = 25,
! name = 'email' ) -%]
!
! [%- count = count + 1 -%]
! [% INCLUDE form_submit_row( value = 'Search' ) -%]
+ [% INCLUDE table_bordered_end -%]
+
</form>
+
</div>
|
