From: Joseph C. <tex...@us...> - 2006-02-11 09:51:57
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19497/skins/default Modified Files: Tag: b0_22_2 history-page.thtml Log Message: Add all Remove buttons to top of history page as in 0.23, results in simpler historyMainForm. Take a few other minor changes from 0.23. Index: history-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v retrieving revision 1.34.6.1 retrieving revision 1.34.6.2 diff -C2 -d -r1.34.6.1 -r1.34.6.2 *** history-page.thtml 8 Feb 2006 12:04:39 -0000 1.34.6.1 --- history-page.thtml 11 Feb 2006 09:51:48 -0000 1.34.6.2 *************** *** 32,56 **** <TMPL_IF NAME="History_If_Some_Messages"> - <form class="HistoryMainForm" action="/history" method="post"> - <input type="hidden" name="search" value="<TMPL_VAR NAME="History_Field_Search">" /> - <input type="hidden" name="sort" value="<TMPL_VAR NAME="History_Field_Sort">" /> - <input type="hidden" name="negate" value="<TMPL_VAR NAME="History_Field_Not">" /> - <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> - <input type="hidden" name="start_message" value="<TMPL_VAR NAME="History_Start_Message">" /> - <input type="hidden" name="filter" value="<TMPL_VAR NAME="History_Field_Filter">" /> - - <TMPL_IF "History_If_MultiPage"> - <table width="100%" summary=""> <tr> <td align="left"> ! <h2 class="history"><TMPL_VAR NAME="Localize_History_Title"> (<TMPL_VAR NAME="History_Count">) </h2> ! <input type="submit" class="submit removeButton" name="clearall" value="<TMPL_VAR NAME="Localize_History_RemoveAll">" /> </td> ! <td class="historyNavigatorTop"> <!-- the following html was generated by history-navigator-widget.thtml --> <TMPL_INCLUDE NAME="history-navigator-widget.thtml"> <!-- end of history-navigator-widget.thtml content --> (<a class="history" href="/history?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Refresh"></a>) --- 32,47 ---- <TMPL_IF NAME="History_If_Some_Messages"> <table width="100%" summary=""> <tr> <td align="left"> ! <h2 class="history" style="margin-top: 0pt;"><TMPL_VAR NAME="Localize_History_Title"> (<TMPL_VAR NAME="History_Count">) </h2> </td> ! <td class="historyNavigatorTop" style="vertical-align: top;" align="right"> + <TMPL_IF "History_If_MultiPage"> <!-- the following html was generated by history-navigator-widget.thtml --> <TMPL_INCLUDE NAME="history-navigator-widget.thtml"> <!-- end of history-navigator-widget.thtml content --> + </TMPL_IF> (<a class="history" href="/history?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Refresh"></a>) *************** *** 58,85 **** </td> </tr> - </table> - - <TMPL_ELSE> - - <table width="100%"> <tr> - <td align="left"> - <h2 class="history"><TMPL_VAR NAME="Localize_History_Title"> (<TMPL_VAR NAME="History_Count">)</h2> - <input type="submit" class="submit removeButton" name="clearall" value="<TMPL_VAR NAME="Localize_History_RemoveAll">" /> - </td> - <td class="historyNavigatorTop" align="right"> - - (<a class="history" href="/history?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Refresh"></a>) - - </td> - </tr> - </table> - - </TMPL_IF> - - </form> - - <table> - <tr> <td colspan="<TMPL_VAR NAME="History_Colspan">"> <!-- the following html was history-search-filter-widget.thtml --> --- 49,53 ---- *************** *** 87,93 **** <!-- end of history-search-filter-widget.thtml content --> </td> ! </tr> </table> ! <form class="HistoryMainForm" action="/history" method="post"> <input type="hidden" name="search" value="<TMPL_VAR NAME="History_Field_Search">" /> --- 55,61 ---- <!-- end of history-search-filter-widget.thtml content --> </td> ! </tr> </table> ! <br /> <form class="HistoryMainForm" action="/history" method="post"> <input type="hidden" name="search" value="<TMPL_VAR NAME="History_Field_Search">" /> *************** *** 98,101 **** --- 66,73 ---- <input type="hidden" name="filter" value="<TMPL_VAR NAME="History_Field_Filter">" /> + <input type="submit" class="submit removeButton" name="clearchecked" value="<TMPL_VAR NAME="Localize_History_RemoveChecked">" /> + <input type="submit" class="submit removeButton" name="clearpage" value="<TMPL_VAR NAME="Localize_History_RemovePage">" /> + <input type="submit" class="submit removeButton" name="clearall" value="<TMPL_VAR NAME="Localize_History_RemoveAll"> (<TMPL_VAR NAME="History_Count">)" /> + <table class="historyTable" width="100%" summary="<TMPL_VAR NAME="Localize_History_MainTableSummary">"> <tr valign="bottom"> *************** *** 267,276 **** <tr> - <td colspan="<TMPL_VAR NAME="History_Colspan">"></td> - </tr> - <tr> <td colspan="<TMPL_VAR NAME="History_Colspan">"> <input type="submit" class="submit removeButton" name="clearchecked" value="<TMPL_VAR NAME="Localize_History_RemoveChecked">" /> <input type="submit" class="submit removeButton" name="clearpage" value="<TMPL_VAR NAME="Localize_History_RemovePage">" /> </td> <td> --- 239,246 ---- <tr> <td colspan="<TMPL_VAR NAME="History_Colspan">"> <input type="submit" class="submit removeButton" name="clearchecked" value="<TMPL_VAR NAME="Localize_History_RemoveChecked">" /> <input type="submit" class="submit removeButton" name="clearpage" value="<TMPL_VAR NAME="Localize_History_RemovePage">" /> + <input type="submit" class="submit removeButton" name="clearall" value="<TMPL_VAR NAME="Localize_History_RemoveAll"> (<TMPL_VAR NAME="History_Count">)" /> </td> <td> *************** *** 280,283 **** --- 250,254 ---- <tr> <td colspan="<TMPL_VAR NAME="History_Colspan">"> + <br /> <span class="historyLabel"> <TMPL_VAR NAME="Localize_History_Column_Characters">: *************** *** 287,290 **** --- 258,262 ---- <input type="submit" class="submit" name="automatic" value="<TMPL_VAR NAME="Localize_History_Automatic">" /> </td> + <td></td> </tr> </table> *************** *** 305,320 **** <TMPL_ELSE> <!-- if some messages --> ! <h2 class="history"><TMPL_VAR NAME="Localize_History_Title"></h2> ! <br /> ! <br /> ! <span class="bucketsLabel"> ! <TMPL_VAR NAME="Localize_History_NoMessages">. ! </span> ! <br /> ! <br /> ! <!-- the following html was history-search-filter-widget.thtml --> ! <TMPL_INCLUDE NAME="history-search-filter-widget.thtml"> ! <!-- end of history-search-filter-widget.thtml content --> </TMPL_IF> <!-- if some messages --> --- 277,303 ---- <TMPL_ELSE> <!-- if some messages --> ! <table width="100%" summary=""> ! <tr> ! <td align="left"> ! <h2 class="history" style="margin-top: 0pt;"><TMPL_VAR NAME="Localize_History_Title"></h2> ! </td> ! <td class="historyNavigatorTop" style="vertical-align: top;" align="right"> ! (<a class="history" href="/history?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Refresh"></a>) ! ! </td> ! </tr> ! <tr> ! <td> ! <!-- the following html was history-search-filter-widget.thtml --> ! <TMPL_INCLUDE NAME="history-search-filter-widget.thtml"> ! <!-- end of history-search-filter-widget.thtml content --> ! <br /> ! <span class="bucketsLabel"> ! <TMPL_VAR NAME="Localize_History_NoMessages">. ! </span> ! </td> ! </tr> ! </table> </TMPL_IF> <!-- if some messages --> |