[Hastymail-cvs] hastymail/templates/default mailbox_template.php,1.23,1.24 message_template.php,1.23
Brought to you by:
sailfrog,
slushpupie
Menu
▾
▴
[Hastymail-cvs] hastymail/templates/default mailbox_template.php,1.23,1.24 message_template.php,1.23,1.24 new_template.php,1.20,1.21 thread_view_template.php,1.13,1.14
|
From: <sai...@us...> - 2006-05-12 14:33:25
|
Update of /cvsroot/hastymail/hastymail/templates/default In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv4864/templates/default Modified Files: mailbox_template.php message_template.php new_template.php thread_view_template.php Log Message: remaining backlog of changes since CVS has been down Index: mailbox_template.php =================================================================== RCS file: /cvsroot/hastymail/hastymail/templates/default/mailbox_template.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- mailbox_template.php 7 Apr 2006 00:32:12 -0000 1.23 +++ mailbox_template.php 12 May 2006 14:33:20 -0000 1.24 @@ -91,19 +91,19 @@ <td colspan="2" class="tables3" width="1%"> <input class="button3" type="submit" name="toggle_all" value="x"> </td> - <td class="tables3" width="45%"> + <td class="tables3"> <small><b>',$subject_lbl,'</b></small> </td> - <td class="tables3" width="30%"> + <td class="tables3"> <b><small>',$from_lbl,'</small></b> </td> - <td class="tables3" width="19%"> + <td class="tables3"> <b><small>',$date_lbl,'</small></b> </td> - <td class="tables3" width="5%"> - <b><small>',$size_lbl,'</small></b> + <td class="tables3"> + <b><small>',$size_lbl,'</small></b> </td> - <td class="tables3" width="1%"> + <td class="tables3"> </td> </tr>'; @@ -120,7 +120,7 @@ } else { echo ' <tr>'; } echo ' - <td class="',$r['class'],'" nowrap> + <td class="',$r['class'],'" nowrap width="1%"> <input type="checkbox" name="',$r['uid'],'" value="mark" class="',$r['class'],'"'; if ($r['checked']) { echo ' checked="1"'; } echo '> @@ -148,7 +148,7 @@ } echo ' </td> <td valign="top" nowrap class="',$r['class'],'"> - <font class="',$r['font'],'">',$r['date'],'</font> + <font class="',$r['font'],'">',$r['date'],'</font> </td> <td valign="top" colspan="2" class="',$r['class'],'" nowrap>'; if ($r['size']) { echo ' Index: message_template.php =================================================================== RCS file: /cvsroot/hastymail/hastymail/templates/default/message_template.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- message_template.php 5 May 2006 16:47:02 -0000 1.23 +++ message_template.php 12 May 2006 14:33:20 -0000 1.24 @@ -19,13 +19,48 @@ <table width="100%" cellpadding="4" cellspacing="0" class="tables2"> <tr class="tables1"> <td nowrap>'; - if ($prev_next_thread) { echo ' - ',str_replace('button3', 'button1', $prev_next_thread); - } if ($prev_next_search) { echo ' - <input type="hidden" name="search_on" value="1" /> ',str_replace('button3', 'button1', $prev_next_search); + /* prev next in thread */ + if ($pn_thread) { + if ($pn_thread['previous']) { echo ' + <input type="submit" name="previous_thread" value="<<<" class="button1" '; + if ($pn_thread['previous_new']) { echo 'style="{font-weight: 900}"'; } echo '>', + '<input type="hidden" name="previous_uid_thread" value="',$pn_thread['previous_uid'],'">', + '<input type="hidden" name="previous_box_thread" value="',$pn_thread['previous_box'],'">'; } + if ($pn_thread['center']) { echo ' <input type="submit" name="center_thread" value="',$pn_thread['center_value'],'" class="button1">'; } + if ($pn_thread['next']) { echo ' + <input type="submit" name="next_thread" value=">>>" class="button1" '; + if ($pn_thread['next_new']) { echo 'style="{font-weight: 900}"'; } echo '>', + '<input type="hidden" name="next_uid_thread" value="',$pn_thread['next_uid'],'">', + '<input type="hidden" name="next_box_thread" value="',$pn_thread['next_box'],'">'; } echo ' | '; + } + /* prev next in search */ + if ($pn_search) { echo ' + <input type="hidden" name="search_on" value="1" />'; + if ($pn_search['previous']) { echo ' + <input type="submit" name="previous_search" value="<<<" class="button1" '; + if ($pn_search['previous_new']) { echo 'style="{font-weight: 900}"'; } echo '>', + '<input type="hidden" name="previous_uid_search" value="',$pn_search['previous_uid'],'">', + '<input type="hidden" name="previous_box_search" value="',$pn_search['previous_box'],'">'; } + if ($pn_search['center']) { echo ' <input type="submit" name="center_search" value="',$pn_search['center_value'],'" class="button1">'; } + if ($pn_search['next']) { echo ' + <input type="submit" name="next_search" value=">>>" class="button1" '; + if ($pn_search['next_new']) { echo 'style="{font-weight: 900}"'; } echo '>', + '<input type="hidden" name="next_uid_search" value="',$pn_search['next_uid'],'">', + '<input type="hidden" name="next_box_search" value="',$pn_search['next_box'],'">'; } echo ' | '; + } + /* normal prev next */ + if ($pn_normal) { + if ($pn_normal['previous']) { echo ' + <input type="hidden" name="previous_uid_normal" value="',$pn_normal['previous_uid'],'"> + <input type="submit" name="previous_normal" value="<<<" class="button1" '; + if ($pn_normal['previous_new']) { echo 'style="{font-weight: 900}"'; } echo '>'; } + if ($pn_normal['center']) { echo ' <input type="submit" name="center_normal" value="',$pn_normal['center_value'],'" class="button1">'; } + if ($pn_normal['next']) { echo ' + <input type="hidden" name="next_uid_normal" value="',$pn_normal['next_uid'],'"> + <input type="submit" name="next_normal" value=">>>" class="button1" '; + if ($pn_normal['next_new']) { echo 'style="{font-weight: 900}"'; } echo '>'; } } echo ' - ',$prev_next_normal,' - <input type="checkbox" value="1" name="keep_as_new" /><small>',$lbl_keep_new,'</small> + <input type="checkbox" value="1" name="keep_as_new" /><small>',$lbl_keep_new,'</small> </td><td align="right"> <b>',$mailbox_title,'</b>'; if ($filter) { echo ' <b>(',$filter_name,')</b> '; } echo ' @@ -63,11 +98,33 @@ if ($folder_view) { echo ' <input type="submit" value="Folder view" name="folder_view" class="button3" />'; } } echo ' </td><td nowrap align="right">'; - if ($raw) { echo ' - ',$prev_next_delete,' '; + if ($raw) { + /* prev next + delete */ + if ($pn_delete) { + if ($pn_delete['previous']) { echo ' + <input type="hidden" name="previous_uid_delete" value="',$pn_delete['previous_uid'],'"> + <input type="submit" name="previous_delete" value="<<<" class="button3" '; + if ($pn_delete['previous_new']) { echo 'style="{font-weight: 900}"'; } echo '>'; } + if ($pn_delete['center']) { echo ' <input type="submit" name="center_delete" value="',$pn_delete['center_value'],'" class="button3">'; } + if ($pn_delete['next']) { echo ' + <input type="hidden" name="next_uid_delete" value="',$pn_delete['next_uid'],'"> + <input type="submit" name="next_delete" value=">>>" class="button3" '; + if ($pn_delete['next_new']) { echo 'style="{font-weight: 900}"'; } echo '>'; } echo ' '; + } if ($trash) { echo ' <small>',$lbl_skip_trash,'</small> <input type="checkbox" value="1" name="skip_trash" /> '; } - } echo ' - ',$prev_next_move,' <input type="hidden" name="uid_move" value="',$input_uid,'" /> <select class="select3" name="destination">',$folder_options,'</select> + } + /* prev next + move */ + if ($pn_move) { + if ($pn_move['previous']) { echo ' + <input type="hidden" name="previous_uid_move" value="',$pn_move['previous_uid'],'"> + <input type="submit" name="previous_move" value="<<<" class="button3" '; + if ($pn_move['previous_new']) { echo 'style="{font-weight: 900}"'; } echo '>'; } + if ($pn_move['center']) { echo ' <input type="submit" name="center_move" value="',$pn_move['center_value'],'" class="button3">'; } + if ($pn_move['next']) { echo ' + <input type="hidden" name="next_uid_move" value="',$pn_move['next_uid'],'"> + <input type="submit" name="next_move" value=">>>" class="button3" '; + if ($pn_move['next_new']) { echo 'style="{font-weight: 900}"'; } echo '>'; } + } echo ' <input type="hidden" name="uid_move" value="',$input_uid,'" /> <select class="select3" name="destination">',$folder_options,'</select> </td> </tr> <tr class="tables4"> @@ -142,8 +199,19 @@ <input type="submit" name="find_response" value="',$lbl_find_response,'" class="button3" />'; } echo ' </td> - <td align="right" nowrap> - ',$prev_next_delete,' '; + <td align="right" nowrap>'; + /* prev next + delete */ + if ($pn_delete) { + if ($pn_delete['previous']) { echo ' + <input type="hidden" name="previous_uid_delete" value="',$pn_delete['previous_uid'],'"> + <input type="submit" name="previous_delete" value="<<<" class="button3" '; + if ($pn_delete['previous_new']) { echo 'style="{font-weight: 900}"'; } echo '>'; } + if ($pn_delete['center']) { echo ' <input type="submit" name="center_delete" value="',$pn_delete['center_value'],'" class="button3">'; } + if ($pn_delete['next']) { echo ' + <input type="hidden" name="next_uid_delete" value="',$pn_delete['next_uid'],'"> + <input type="submit" name="next_delete" value=">>>" class="button3" '; + if ($pn_delete['next_new']) { echo 'style="{font-weight: 900}"'; } echo '>'; } echo ' '; + } if ($trash) { echo ' <small>',$lbl_skip_trash,'</small> <input type="checkbox" value="1" name="skip_trash" />'; } echo ' @@ -284,13 +352,47 @@ } echo ' <tr class="tables1"> <td width="10%" nowrap>'; - if ($prev_next_thread) { echo ' - ',str_replace('button3', 'button1', $prev_next_thread); + /* prev next in thread */ + if ($pn_thread) { + if ($pn_thread['previous']) { echo ' + <input type="submit" name="previous_thread" value="<<<" class="button1" '; + if ($pn_thread['previous_new']) { echo 'style="{font-weight: 900}"'; } echo '>', + '<input type="hidden" name="previous_uid_thread" value="',$pn_thread['previous_uid'],'">', + '<input type="hidden" name="previous_box_thread" value="',$pn_thread['previous_box'],'">'; } + if ($pn_thread['center']) { echo ' <input type="submit" name="center_thread" value="',$pn_thread['center_value'],'" class="button1">'; } + if ($pn_thread['next']) { echo ' + <input type="submit" name="next_thread" value=">>>" class="button1" '; + if ($pn_thread['next_new']) { echo 'style="{font-weight: 900}"'; } echo '>', + '<input type="hidden" name="next_uid_thread" value="',$pn_thread['next_uid'],'">', + '<input type="hidden" name="next_box_thread" value="',$pn_thread['next_box'],'">'; } echo ' | '; } - if ($prev_next_search) { echo ' - <input type="hidden" name="search_on" value="1" /> ',str_replace('button3', 'button1', $prev_next_search); + /* prev next in search */ + if ($pn_search) { echo ' + <input type="hidden" name="search_on" value="1" />'; + if ($pn_search['previous']) { echo ' + <input type="submit" name="previous_search" value="<<<" class="button1" '; + if ($pn_search['previous_new']) { echo 'style="{font-weight: 900}"'; } echo '>', + '<input type="hidden" name="previous_uid_search" value="',$pn_search['previous_uid'],'">', + '<input type="hidden" name="previous_box_search" value="',$pn_search['previous_box'],'">'; } + if ($pn_search['center']) { echo ' <input type="submit" name="center_search" value="',$pn_search['center_value'],'" class="button1">'; } + if ($pn_search['next']) { echo ' + <input type="submit" name="next_search" value=">>>" class="button1" '; + if ($pn_search['next_new']) { echo 'style="{font-weight: 900}"'; } echo '>', + '<input type="hidden" name="next_uid_search" value="',$pn_search['next_uid'],'">', + '<input type="hidden" name="next_box_search" value="',$pn_search['next_box'],'">'; } echo ' | '; + } + /* normal prev next */ + if ($pn_normal) { + if ($pn_normal['previous']) { echo ' + <input type="hidden" name="previous_uid_normal" value="',$pn_normal['previous_uid'],'"> + <input type="submit" name="previous_normal" value="<<<" class="button1" '; + if ($pn_normal['previous_new']) { echo 'style="{font-weight: 900}"'; } echo '>'; } + if ($pn_normal['center']) { echo ' <input type="submit" name="center_normal" value="',$pn_normal['center_value'],'" class="button1">'; } + if ($pn_normal['next']) { echo ' + <input type="hidden" name="next_uid_normal" value="',$pn_normal['next_uid'],'"> + <input type="submit" name="next_normal" value=">>>" class="button1" '; + if ($pn_normal['next_new']) { echo 'style="{font-weight: 900}"'; } echo '>'; } } echo ' - ',$prev_next_normal,' </td><td nowrap align="right">'; if ($add_addbook_option) { echo ' <input type="submit" value="',$lbl_add,'" name="prep" class="button1" /> Index: new_template.php =================================================================== RCS file: /cvsroot/hastymail/hastymail/templates/default/new_template.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- new_template.php 7 Apr 2006 00:32:12 -0000 1.20 +++ new_template.php 12 May 2006 14:33:20 -0000 1.21 @@ -109,7 +109,7 @@ } else { echo ' <tr>'; } echo ' - <td class="',$r['class'],'" nowrap> + <td class="',$r['class'],'" nowrap width="1%"> <input type="checkbox" name="',$f['chk_folder'],'[]" value="',$r['uid'],'" class="',$r['class'],'"'; if ($r['checked']) { echo ' checked="1"'; } echo '> @@ -133,7 +133,7 @@ <font class="',$r['font'],'">',$r['from'],'</font> </td> <td valign="top" nowrap class="',$r['class'],'"> - <font class="',$r['font'],'">',$r['date'],'</font> + <font class="',$r['font'],'">',$r['date'],'</font> </td> <td valign="top" colspan="2" class="',$r['class'],'" nowrap>'; if ($r['size']) { echo ' Index: thread_view_template.php =================================================================== RCS file: /cvsroot/hastymail/hastymail/templates/default/thread_view_template.php,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- thread_view_template.php 22 Mar 2006 19:11:16 -0000 1.13 +++ thread_view_template.php 12 May 2006 14:33:20 -0000 1.14 @@ -13,7 +13,7 @@ echo ' <table width="100%" cellpadding="3" cellspacing="0" class="tables2"> <tr class="tables1"> - <td colspan="3" nowrap> <big><b>',$page_name,'</td> + <td colspan="3" nowrap> <b>',$page_name,'</b></td> </tr> <tr><td></td></tr> <tr> |