|
From: Chris W. <la...@us...> - 2001-10-24 16:35:20
|
Update of /cvsroot/openinteract/OpenInteract/pkg/base_error/template
In directory usw-pr-cvs1:/tmp/cvs-serv16308/template
Modified Files:
error_detail.tmpl error_filter.meta error_filter.tmpl
error_list.tmpl
Log Message:
update templates for the CommonHandler conversion
Index: error_detail.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_error/template/error_detail.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** error_detail.tmpl 2001/09/06 15:10:41 1.5
--- error_detail.tmpl 2001/10/24 16:35:17 1.6
***************
*** 1,133 ****
! [%- th = OI.theme_properties -%]
! [% OI.comp( 'showerror', error_msg = error_msg ) %]
<div align="center">
! <p><a href="[% main_script %]/listing/">Back to list</a></p>
! <h1 align="center">Error Detail</h1>
! <table border="0" width="75%">
! <tr><td>
! <p>Below is the detail for an error that occurred. Please contact the
administrator if you have any ideas as to what else <b>should</b> be
in such an entry.</p>
- </td></tr>
- </table>
-
- <table border="0" bgcolor="#000000" cellpadding="2" cellspacing="0" width="75%">
- <tr><td>
! <table border="0" cellpadding="3" cellspacing="0" width="100%">
!
! <tr valign="middle" bgcolor="[% th.head_bgcolor %]" align="center">
! <td colspan="2"><font color="[% th.head_font_color %]">
! <b>Information about Error <tt>[% err.error_id %]</tt></b>
! </font></td>
! </tr>
!
! <tr valign="top" bgcolor="[% th.even_color %]">
! <td align="right"><b>Date</b></td>
! <td>[% err.error_time %]
! </td>
! </tr>
!
! <tr valign="top" bgcolor="[% th.odd_color %]">
! <td align="right"><b>Code</b></td>
! <td>[% err.code %]
! </td>
! </tr>
!
! <tr valign="top" bgcolor="[% th.even_color %]">
! <td align="right"><b>Type</b></td>
! <td>[% err.type %]
! </td>
! </tr>
! <tr valign="top" bgcolor="[% th.odd_color %]">
! <td align="right"><b>System Message</b></td>
! <td><font size="-1"><pre>[% err.system_msg %]</pre></font>
! </td>
! </tr>
! <tr valign="top" bgcolor="[% th.even_color %]">
! <td align="right"><b>User Message</b></td>
! <td><font size="-1"><pre>[% err.user_msg %]</pre></font>
! </td>
! </tr>
! <tr valign="top" bgcolor="[% th.odd_color %]">
! <td align="right"><b>Calling Info</b></td>
! <td align="left">
! <table border="0" cellpadding="2" cellspacing="0">
! <tr>
! <td align="right"><font size="-1"><b>File</b></font></td>
! <td><font size="-1">[% err.filename %]</font></td>
! </tr>
! <tr>
! <td align="right"><font size="-1"><b>Package</b></font></td>
! <td><font size="-1">[% err.package %]</font></td>
! </tr>
! <tr>
! <td align="right"><font size="-1"><b>Line #</b></font></td>
! <td><font size="-1">[% err.line %]</font></td>
! </tr>
! <tr>
! <td align="right"><font size="-1"><b>Action</b></font></td>
! <td><font size="-1">[% err.action %]</font></td>
! </tr>
! </table>
! </td>
! </tr>
! <tr valign="top" bgcolor="[% th.even_color %]">
! <td align="right"><b>User</b></td>
! <td>
! [%- IF error_user %]<a href="/User/show/?user_id=[% user.user_id %]">[% user.login_name %]</a>
! [%- ELSE %](no user tracked)[% END -%]
</td>
</tr>
! <tr valign="top" bgcolor="[% th.odd_color %]">
! <td align="right"><b>Session</b></td>
! <td>
! [%- IF err.session_id %][% err.session_id %][% ELSE %](no session tracked)[% END -%]
! </td>
! </tr>
! <tr valign="top" bgcolor="[% th.even_color %]">
! <td align="right"><b>URL</b></td>
! <td>[% err.url %]
! </td>
! </tr>
! <tr valign="top" bgcolor="[% th.odd_color %]">
! <td align="right"><b>Browser</b></td>
! <td>[% err.browser %]
! </td>
! </tr>
! <tr valign="top" bgcolor="[% th.even_color %]">
! <td align="right"><b>Referer</b></td>
! <td>[% IF err.referer %]<a href="[% err.referer %]">[% err.referer %]</a>[% ELSE %](none recorded)[% END %]
! </td>
! </tr>
! <tr valign="top" bgcolor="[% th.odd_color %]">
! <td align="right"><b>Notes</b></td>
! <td>[% err.notes %]
! </td>
! </tr>
! <tr bgcolor="[% th.head_bgcolor %]">
! <td colspan="2"> </td>
! </tr>
! </table>
! </td></tr>
! </table>
</div>
--- 1,72 ----
! [%- DEFAULT theme = OI.theme_properties -%]
! [%- PROCESS error_message -%]
<div align="center">
! <p align="right"><a href="/Error/search_form/">Back to search form</a></p>
! <h1>Error Detail</h1>
! <p align="left">Below is the detail for an error that occurred. Please contact the
administrator if you have any ideas as to what else <b>should</b> be
in such an entry.</p>
! [%- INCLUDE table_bordered_begin -%]
! [%- count = 0;
! valign = 'top' -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'Date', text = err.error_time ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'Code', text = err.code ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'Type', text = err.type ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'System Message', text = "<pre>$err.system_msg</pre>" ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'User Message', text = "<pre>$err.user_msg</pre>" ) -%]
! [%- count = count + 1 -%]
! [%- INCLUDE label_row_begin( label = 'Calling Info' ) -%]
! <td align="left">
! <table border="0" cellpadding="1" cellspacing="0">
! [% INCLUDE label_text_row( label = 'File', text = err.filename ) %]
! [% INCLUDE label_text_row( label = 'Package', text = err.package ) %]
! [% INCLUDE label_text_row( label = 'Line #', text = err.line ) %]
! [% INCLUDE label_text_row( label = 'Action', text = err.action ) %]
! </table>
</td>
</tr>
! [% IF error_user %]
! [%- user_view_url = OI.make_url( base = '/User/show/', user_id = error_user.user_id );
! user_text = "<a href='$user_view_url'>$error_user.login_name</a>"; -%]
! [% ELSE -%]
! [%- user_text = '(no user tracked)' -%]
! [% END -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'User', text = user_text ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'Session', text = err.session_id || '(no session tracked)' ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'URL', text = err.url ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'Browser', text = err.browser ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'Referer', text = err.referer ) -%]
! [%- count = count + 1 -%]
! [% INCLUDE label_text_row( label = 'Notes', text = err.notes ) -%]
! [% PROCESS table_bordered_end -%]
</div>
Index: error_filter.meta
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_error/template/error_filter.meta,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** error_filter.meta 2001/02/02 06:19:51 1.1.1.1
--- error_filter.meta 2001/10/24 16:35:17 1.2
***************
*** 1,8 ****
name: error_filter
! title: Component for sorting, filtering error objects
package: base_error
! Parameters:
!
! --sort: radio button selected pressed for sort
! --filterby: hashref of filtering options
! --main_script
--- 1,4 ----
name: error_filter
! title: Error filtering form criteria
package: base_error
! Standalone component for sorting, filtering error objects
\ No newline at end of file
Index: error_filter.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_error/template/error_filter.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** error_filter.tmpl 2001/08/13 16:10:14 1.2
--- error_filter.tmpl 2001/10/24 16:35:17 1.3
***************
*** 1,21 ****
! <form name="error_filter" action="[% main_script %]/listing/"
! method="get">
!
! <table border="0" bgcolor="#000000" cellpadding="2" cellspacing="0">
! <tr><td>
! <table border="0" cellpadding="2" cellspacing="0" width="100%" bgcolor="#eeeeee">
<tr bgcolor="#cccccc">
! <td align="center" colspan="2"><font size="-1"><b>Sort by</b></font></td>
</tr>
<tr>
! <td align="center" colspan="2">
! <font size="-1">
! <input type="radio" name="sort" value="error_time"[% IF sort == 'error_time' %]checked[% END %]> Date
! <input type="radio" name="sort" value="code"[% IF sort == 'code' %]checked[% END %]> Code
! <input type="radio" name="sort" value="type"[% IF sort == 'type' %]checked[% END %]> Type
! </font>
! </td>
</tr>
--- 1,18 ----
! <form name="error_filter" method="GET"
! action="/Error/listing/">
! [% INCLUDE table_bordered_begin -%]
<tr bgcolor="#cccccc">
! <td align="center" colspan="2"><font size="-1">
! <b>Sort by</b>
! </font></td>
</tr>
<tr>
! <td align="center" colspan="2"><font size="-1">
! [% INCLUDE form_radio( name = 'sort', value = 'error_time', picked = sort ) %] Date
! [% INCLUDE form_radio( name = 'sort', value = 'code', picked = sort ) %] Code
! [% INCLUDE form_radio( name = 'sort', value = 'type', picked = sort ) %] Type
! </font></td>
</tr>
***************
*** 26,57 ****
<td><font size="-1">Date</font></td>
<td><font size="-1">
! <tt>Fr: </tt>
! [% OI.comp( 'date_select', month_value = filterby.from_month,
! day_value = filterby.from_day,
! year_value = filterby.from_year, blank = 1,
field_prefix = 'filter_date_from' ) %]<br>
! <tt>To: </tt>
! [% OI.comp( 'date_select', month_value = filterby.to_month,
! day_value = filterby.to_day,
! year_value = filterby.to_year, blank = 1,
field_prefix = 'filter_date_to' ) %]
! </font>
! </td>
</tr>
<tr valign="middle">
<td><font size="-1">Code</font></td>
! <td><font size="-1"><input type="text" size="12" name="filter_code" value="[% filterby.code %]"></font></td>
</tr>
<tr valign="middle">
<td><font size="-1">Type</font></td>
! <td><font size="-1"><input type="text" size="12" name="filter_type" value="[% filterby.type %]"></td>
</tr>
<tr bgcolor="#cccccc">
! <td colspan="2" align="right"><input type="submit" value="Filter"></td>
</tr>
- </table>
! </td></tr>
! </table>
</form>
--- 23,51 ----
<td><font size="-1">Date</font></td>
<td><font size="-1">
! <tt>From: </tt>
! [% INCLUDE date_select( object = filterby.date_from, blank = 1,
field_prefix = 'filter_date_from' ) %]<br>
! <tt>To: </tt>
! [% INCLUDE date_select( object = filterby.date_to, blank = 1,
field_prefix = 'filter_date_to' ) %]
! </font></td>
</tr>
<tr valign="middle">
<td><font size="-1">Code</font></td>
! <td><font size="-1">[% INCLUDE form_text( name = 'filter_code', size = '12',
! value = filterby.code ) %]</font></td>
</tr>
<tr valign="middle">
<td><font size="-1">Type</font></td>
! <td><font size="-1">[% INCLUDE form_text( name = 'filter_type', size = '12',
! value = filterby.type ) %]</font></td>
</tr>
<tr bgcolor="#cccccc">
! <td colspan="2" align="right"><font size="-1">
! [% INCLUDE form_submit( value = 'Filter', reset = 1 ) %]
! </font></td>
</tr>
! [% PROCESS table_bordered_end -%]
</form>
Index: error_list.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_error/template/error_list.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** error_list.tmpl 2001/08/13 16:10:14 1.5
--- error_list.tmpl 2001/10/24 16:35:17 1.6
***************
*** 1,39 ****
! [%- th = OI.theme_properties -%]
! [%- OI.comp( 'showerror', error_msg = error_msg ) -%]
!
! <div align="center">
!
! <h2>Browse the Error Log</h2>
!
! [%- OI.comp( 'error_filter', sort = sort, main_script = main_script,
! filterby = filterby ) -%]
!
! <form name="error_action" method="post" action="[% main_script %]/remove/">
! <table border="0" bgcolor="#000000" width="75%"
! cellpadding="2" cellspacing="0">
! <tr><td>
! [%- font_header = 'size="+1" color="$th.head_font_color"' -%]
! <table border="0" width="100%"
! cellpadding="3" cellspacing="0" >
! <tr bgcolor="[% th.head_bgcolor %]" align="center" valign="bottom">
! <td><b><font [% font_header %]>ID</font></b></td>
! <td><b><font [% font_header %]>Date</font></b></td>
! <td><b><font [% font_header %]>Code</font></b></td>
! <td><b><font [% font_header %]>Type</font></b></td>
! <td><b><font [% font_header %]>Message</font></b></td>
! <td><b><font [% font_header %]>Actions</font></b></td>
! </tr>
! [%- count = 0 -%]
! [% WHILE ( item = error_iterator.get_next ) -%]
! [%- SET row_color = th.odd_color -%]
! [%- SET row_color = th.even_color IF count mod 2 == 0 -%]
! <tr bgcolor="[% row_color %]">
! <td>
! <font size="-1">
! <tt><a href="[% main_script %]/show/?error_id=[% item.error_id %]">[% item.error_id %]</a></tt>
! </font>
! </td>
<td><font size="-1">[% item.error_time %]</font></td>
<td align="center"><font size="-1">[% item.code %]</font></td>
--- 1,15 ----
! [%########################################
! MACROS
! ########################################-%]
! [%# NOTE: We use 'item' here because 'error' is or is likely to be a
! reserved word.-%]
! [% MACRO error_row BLOCK -%]
! [%- view_url = OI.make_url( base = '/Error/show/', error_id = item.error_id ) -%]
! <tr bgcolor="[% PROCESS row_color %]">
! <td><font size="-1"><tt>
! <a href="[% view_url %]">[% item.error_id %]</a>
! </tt></font></td>
<td><font size="-1">[% item.error_time %]</font></td>
<td align="center"><font size="-1">[% item.code %]</font></td>
***************
*** 43,74 ****
<a href="javascript:notify( '[% item.error_id %]' )">Notify</a><br>
<a href="javascript:confirm_remove( '[% item.error_id %]' )">Remove</a><br>
! Tag: <input type="checkbox" name="error_id" value="[% item.error_id %]">
</tr>
- [%- count = count + 1 -%]
- [% END %]
! <tr bgcolor="#ffffff">
! <td colspan="6" align="right"><font size="-1">
! <input type="button" value="Remove Tagged" onClick="submit_it( 'remove' )"><br>
! <input type="button" value="Notify Tagged" onClick="submit_it( 'notify' )"><br>
! <input type="button" value="Select All Toggle" onClick="tag_all()">
! </font></td>
! </tr>
- <tr bgcolor="[% th.head_bgcolor %]">
- <td colspan="6"> </td>
- </tr>
! </table>
! </td></tr>
! </table>
! <input type="hidden" name="email" value="">
! </form>
! </div>
<script lanaguage="Javascript">
--- 19,51 ----
<a href="javascript:notify( '[% item.error_id %]' )">Notify</a><br>
<a href="javascript:confirm_remove( '[% item.error_id %]' )">Remove</a><br>
! [% IF is_form -%]
! Tag: [% INCLUDE form_checkbox( name = 'error_id', value = item.error_id ) %]
! [% END -%]
! </td>
</tr>
! [% END -%]
! [%########################################
! DISPLAY
! ########################################-%]
! [% INCLUDE table_bordered_begin -%]
! [% INCLUDE header_row( labels = [ 'ID', 'Date', 'Code', 'Type', 'Message', 'Actions' ] ) -%]
! [%- count = 0 -%]
! [% WHILE ( item = error_iterator.get_next ) -%]
! [% error_row() -%]
! [%- count = count + 1 -%]
! [% END %]
! [% PROCESS table_bordered_end -%]
!
+ [%########################################
+ JAVASCRIPT
+ ########################################-%]
<script lanaguage="Javascript">
|