Menu
▾
▴
[popfile-commit] engine/skins/default configuration-bar.thtml,1.12,1.13 history-navigator-widget.thtml,1.4,1.5 history-page.thtml,1.62,1.63 history-search-filter-widget.thtml,1.10,1.11 style.css,1.17,1.18 common-after-configuration.thtml,1.4,NONE common-before-configuration.thtml,1.6,NONE
|
From: Joseph C. <tex...@us...> - 2005-05-23 09:39:45
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27979/skins/default Modified Files: configuration-bar.thtml history-navigator-widget.thtml history-page.thtml history-search-filter-widget.thtml style.css Removed Files: common-after-configuration.thtml common-before-configuration.thtml Log Message: All inline styles except one are now defined in the stylesheet. (Not counting color definitions which also use inline styles.) The last is a display:none in history-page.thtml on the hidden parameter only form so it does not affect page layout. There is no reason a skin would make it visible so I leaving it as inline. Moved Remove buttons below search widget. Add "Remove Checked" to upper set of remove buttons. Add container divs with class removeButtonsTop and removeButtonsBottom around remove buttons in both places. Remove common before and after configuration templates. Manni's Is_history_page variable solves the problem they were originally meant for. Add div container class refreshLink around refresh link so skin can control position and padding. --- common-before-configuration.thtml DELETED --- Index: configuration-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/configuration-bar.thtml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** configuration-bar.thtml 22 May 2005 10:45:43 -0000 1.12 --- configuration-bar.thtml 23 May 2005 09:39:33 -0000 1.13 *************** *** 1,3 **** ! <TMPL_INCLUDE NAME="common-before-configuration.thtml"> <TMPL_IF NAME="If_Show_Config_Bars"> --- 1,16 ---- ! <br /> ! <span class="configBarTitle"> ! ! <TMPL_IF NAME="If_Show_Config_Bars"> ! ! <a name="configBar" title="<TMPL_VAR NAME="Localize_Configuration_Hide_Bar">" href="<TMPL_VAR NAME="Configuration_Action">?hide_configbar=1"><b>Config Bar</b></a> ! ! <TMPL_ELSE> ! ! <a title="<TMPL_VAR NAME="Localize_Configuration_Show_Bar">" href="<TMPL_VAR NAME="Configuration_Action">?show_configbar=1#configBar"><b>Config Bar</b></a> ! ! </TMPL_IF> ! ! </span> <TMPL_IF NAME="If_Show_Config_Bars"> *************** *** 92,94 **** </TMPL_IF> - <TMPL_INCLUDE NAME="common-after-configuration.thtml"> --- 105,106 ---- Index: history-search-filter-widget.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-search-filter-widget.thtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** history-search-filter-widget.thtml 19 May 2005 22:51:28 -0000 1.10 --- history-search-filter-widget.thtml 23 May 2005 09:39:33 -0000 1.11 *************** *** 1,8 **** <form action="/history" method="post"> ! <div style="display:inline; float: left; padding-right:1em;"> <label class="historyLabel" for="historySearch"> <TMPL_VAR NAME="Localize_History_SearchMessage"> </label> ! <br> <TMPL_IF NAME="History_If_Search"> <input type="text" id="historySearch" name="search" value="<TMPL_VAR ESCAPE=HTML NAME="History_Field_Search">" /> --- 1,8 ---- <form action="/history" method="post"> ! <div class="search"> <label class="historyLabel" for="historySearch"> <TMPL_VAR NAME="Localize_History_SearchMessage"> </label> ! <br /> <TMPL_IF NAME="History_If_Search"> <input type="text" id="historySearch" name="search" value="<TMPL_VAR ESCAPE=HTML NAME="History_Field_Search">" /> *************** *** 11,15 **** </div> ! <div style="display:inline;"> <label class="historyLabel" for="historyFilter"> <TMPL_VAR NAME="Localize_History_FilterBy"> --- 11,15 ---- </div> ! <div class="filter"> <label class="historyLabel" for="historyFilter"> <TMPL_VAR NAME="Localize_History_FilterBy"> *************** *** 39,43 **** </div> ! <div> <input type="hidden" name="negate" value="" /> <input type="checkbox" name="negate" id="negate" class="checkbox" <TMPL_VAR NAME="History_Field_Not"> /> --- 39,43 ---- </div> ! <div class="negate"> <input type="hidden" name="negate" value="" /> <input type="checkbox" name="negate" id="negate" class="checkbox" <TMPL_VAR NAME="History_Field_Not"> /> Index: history-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** history-page.thtml 22 May 2005 19:17:03 -0000 1.62 --- history-page.thtml 23 May 2005 09:39:33 -0000 1.63 *************** *** 28,32 **** </TMPL_IF> ! <form 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">" /> --- 28,32 ---- </TMPL_IF> ! <form action="/history" method="post" style="display:none;"> <input type="hidden" name="search" value="<TMPL_VAR NAME="History_Field_Search">" /> <input type="hidden" name="sort" value="<TMPL_VAR NAME="History_Field_Sort">" /> *************** *** 41,47 **** <tr> <td align="left"> ! <h2 class="history" style="margin:0;"><TMPL_VAR NAME="Localize_History_Title"> (<TMPL_VAR NAME="History_Count">)</h2> </td> ! <td class="historyNavigatorTop" align="right" valign="top" rowspan="2"> <TMPL_IF "History_If_MultiPage"> --- 41,47 ---- <tr> <td align="left"> ! <h2 class="history"><TMPL_VAR NAME="Localize_History_Title"> (<TMPL_VAR NAME="History_Count">)</h2> </td> ! <td class="historyNavigatorTop" rowspan="2"> <TMPL_IF "History_If_MultiPage"> *************** *** 49,66 **** <TMPL_INCLUDE NAME="history-navigator-widget.thtml"> <!-- end of history-navigator-widget.thtml content --> - <br /> </TMPL_IF> (<a class="history" href="/history"><TMPL_VAR NAME="Localize_Refresh"></a>) </td> </tr> <tr> - <td colspan="<TMPL_VAR NAME="History_Colspan">"> - <input type="submit" class="submit removeButton" name="clearpage" onClick="return confirmClick(this)" value="<TMPL_VAR NAME="Localize_History_RemovePage">" /> - <input type="submit" class="submit removeButton" name="clearall" onClick="return confirmClick(this)" value="<TMPL_VAR NAME="Localize_History_RemoveAll"> (<TMPL_VAR NAME="History_Count">)" /> - </td> - </tr> - <tr> <td colspan="2"> <!-- the following html was history-search-filter-widget.thtml --> --- 49,61 ---- <TMPL_INCLUDE NAME="history-navigator-widget.thtml"> <!-- end of history-navigator-widget.thtml content --> </TMPL_IF> + <div class="refreshLink"> (<a class="history" href="/history"><TMPL_VAR NAME="Localize_Refresh"></a>) + </div> </td> </tr> <tr> <td colspan="2"> <!-- the following html was history-search-filter-widget.thtml --> *************** *** 70,74 **** --- 65,75 ---- </tr> </table> + <form action="/history" method="post"> + <div class="removeButtonsTop"> + <input type="submit" class="submit removeButton" name="clearchecked" onClick="return confirmClick(this)" value="<TMPL_VAR NAME="Localize_History_RemoveChecked">" /> + <input type="submit" class="submit removeButton" name="clearpage" onClick="return confirmClick(this)" value="<TMPL_VAR NAME="Localize_History_RemovePage">" /> + <input type="submit" class="submit removeButton" name="clearall" onClick="return confirmClick(this)" value="<TMPL_VAR NAME="Localize_History_RemoveAll"> (<TMPL_VAR NAME="History_Count">)" /> + </div> <table class="historyTable" width="100%" summary="<TMPL_VAR NAME="Localize_History_MainTableSummary">"> <tr class="rowHeader"> *************** *** 241,247 **** <tr> <td colspan="<TMPL_VAR NAME="History_Colspan">"> ! <input type="submit" class="submit removeButton" name="clearchecked" onClick="return confirmClick(this)" value="<TMPL_VAR NAME="Localize_History_RemoveChecked">" /> ! <input type="submit" class="submit removeButton" name="clearpage" onClick="return confirmClick(this)" value="<TMPL_VAR NAME="Localize_History_RemovePage">" /> ! <input type="submit" class="submit removeButton" name="clearall" onClick="return confirmClick(this)" value="<TMPL_VAR NAME="Localize_History_RemoveAll"> (<TMPL_VAR NAME="History_Count">)" /> </td> <td> --- 242,250 ---- <tr> <td colspan="<TMPL_VAR NAME="History_Colspan">"> ! <div class="removeButtonsBottom"> ! <input type="submit" class="submit removeButton" name="clearchecked" onClick="return confirmClick(this)" value="<TMPL_VAR NAME="Localize_History_RemoveChecked">" /> ! <input type="submit" class="submit removeButton" name="clearpage" onClick="return confirmClick(this)" value="<TMPL_VAR NAME="Localize_History_RemovePage">" /> ! <input type="submit" class="submit removeButton" name="clearall" onClick="return confirmClick(this)" value="<TMPL_VAR NAME="Localize_History_RemoveAll"> (<TMPL_VAR NAME="History_Count">)" /> ! </div> </td> <td> *************** *** 273,279 **** <h2 class="history"><TMPL_VAR NAME="Localize_History_Title"></h2> </td> ! <td class="historyNavigatorTop" align="right"> (<a class="history" href="/history"><TMPL_VAR NAME="Localize_Refresh"></a>) - </td> </tr> --- 276,281 ---- <h2 class="history"><TMPL_VAR NAME="Localize_History_Title"></h2> </td> ! <td class="historyNavigatorTop"> (<a class="history" href="/history"><TMPL_VAR NAME="Localize_Refresh"></a>) </td> </tr> Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/style.css,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** style.css 22 May 2005 11:26:03 -0000 1.17 --- style.css 23 May 2005 09:39:33 -0000 1.18 *************** *** 235,238 **** --- 235,247 ---- .historyNavigatorTop, .historyNavigatorBottom { text-align: right; + vertical-align: top; + } + + .historyNavigatorTop form, .historyNavigatorBottom form { + display:inline; + } + + .refreshLink { + margin-top: 0.5em; } *************** *** 241,253 **** } /*********************************************************/ /* Config Bars */ .configBarTitle { ! border:2px #CCCC99 solid; ! padding:0.3em; ! padding-bottom:0; ! margin-left:0.3em; ! background:#CCCC99; } --- 250,281 ---- } + h2.history { + margin-top: 0; + margin-bottom: 0.3em; + } + + .search { + display: inline; + float: left; + padding-right: 1em; + } + + .filter { + display: inline; + } + + .removeButtonsTop { + padding-bottom: 1em; + } + /*********************************************************/ /* Config Bars */ .configBarTitle { ! border: 2px #CCCC99 solid; ! padding: 0.3em; ! padding-bottom: 0; ! margin-left: 0.3em; ! background: #CCCC99; } Index: history-navigator-widget.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-navigator-widget.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** history-navigator-widget.thtml 19 May 2005 22:51:28 -0000 1.4 --- history-navigator-widget.thtml 23 May 2005 09:39:33 -0000 1.5 *************** *** 21,25 **** [<a href="/history?start_message=<TMPL_VAR NAME="History_Navigator_Next"><TMPL_VAR NAME="History_Navigator_Fields">"><TMPL_VAR NAME="Localize_Next"> ></a>] </TMPL_IF> ! <form action="/history" method="post" style="display:inline;"> <input type="text" name="jumptopage" value="" size="3" /> <input type="submit" class="submit" name="gopage" value="<TMPL_VAR NAME="Localize_Go">" /> --- 21,25 ---- [<a href="/history?start_message=<TMPL_VAR NAME="History_Navigator_Next"><TMPL_VAR NAME="History_Navigator_Fields">"><TMPL_VAR NAME="Localize_Next"> ></a>] </TMPL_IF> ! <form action="/history" method="post"> <input type="text" name="jumptopage" value="" size="3" /> <input type="submit" class="submit" name="gopage" value="<TMPL_VAR NAME="Localize_Go">" /> --- common-after-configuration.thtml DELETED --- |
