Menu
▾
▴
[popfile-commit] engine/skins/default common-javascript.thtml, NONE, 1.6.2.1 history-javascript.thtml, NONE, 1.10.2.1 common-middle.thtml, 1.5.6.1, 1.5.6.2 common-top.thtml, 1.2, 1.2.6.1 corpus-page.thtml, 1.9.6.4, 1.9.6.5 history-page.thtml, 1.34.6.3, 1.34.6.4 style.css, 1.5.6.1, 1.5.6.2
|
From: Joseph C. <tex...@us...> - 2007-12-02 08:48:59
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5824/default Modified Files: Tag: b0_22_2 common-middle.thtml common-top.thtml corpus-page.thtml history-page.thtml style.css Added Files: Tag: b0_22_2 common-javascript.thtml history-javascript.thtml Log Message: Port some skin changes from HEAD. Add Javascript Check All box for message history. Add text that magnet matches (any opinions on that?). Still need to update the rest of the skins (this causes minor issues with them). Index: history-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v retrieving revision 1.34.6.3 retrieving revision 1.34.6.4 diff -C2 -d -r1.34.6.3 -r1.34.6.4 *** history-page.thtml 15 Feb 2006 07:15:54 -0000 1.34.6.3 --- history-page.thtml 2 Dec 2007 08:49:00 -0000 1.34.6.4 *************** *** 5,14 **** <div class="helpMessage"> <form method="post" action="/buckets"> - <TMPL_VAR NAME="Localize_Help_Bucket_Setup"> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> - <p> <input type="submit" class="submit" name="nomore_bucket_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> - </p> </form> </div> --- 5,13 ---- <div class="helpMessage"> + <TMPL_VAR NAME="Localize_Help_Bucket_Setup"> + <br /><br /> <form method="post" action="/buckets"> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="submit" class="submit" name="nomore_bucket_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> </form> </div> *************** *** 19,28 **** <div class="helpMessage"> <form method="post" action="/buckets"> - <TMPL_VAR NAME="Localize_Help_Training"> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> - <p> <input type="submit" class="submit" name="nomore_training_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> - </p> </form> </div> --- 18,26 ---- <div class="helpMessage"> + <TMPL_VAR NAME="Localize_Help_Training"> + <br /><br /> <form method="post" action="/buckets"> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="submit" class="submit" name="nomore_training_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> </form> </div> *************** *** 45,49 **** </TMPL_IF> ! (<a class="history" href="/history?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Refresh"></a>) </td> --- 43,49 ---- </TMPL_IF> ! <div class="refreshLink"> ! (<a class="history" href="/history?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Refresh"></a>) ! </div> </td> *************** *** 58,62 **** </table> <br /> ! <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">" /> --- 58,62 ---- </table> <br /> ! <form action="/history" method="post" class="historyForm" name="historyForm"> <input type="hidden" name="search" value="<TMPL_VAR NAME="History_Field_Search">" /> <input type="hidden" name="sort" value="<TMPL_VAR NAME="History_Field_Sort">" /> *************** *** 71,77 **** <table class="historyTable" width="100%" summary="<TMPL_VAR NAME="Localize_History_MainTableSummary">"> ! <tr valign="bottom"> ! ! <th></th> <TMPL_LOOP NAME="History_Loop_Headers"> --- 71,76 ---- <table class="historyTable" width="100%" summary="<TMPL_VAR NAME="Localize_History_MainTableSummary">"> ! <tr class="rowHeader"> ! <th id="removeChecks" scope="col" align="left"></th> <TMPL_LOOP NAME="History_Loop_Headers"> *************** *** 195,199 **** <TMPL_IF NAME="History_If_Reclassified"> ! <TMPL_VAR NAME="Localize_History_Reclassified"> <input type="submit" class="submit undoButton" name="undo_<TMPL_VAR NAME="History_I">" value="<TMPL_VAR NAME="Localize_Undo">" /> --- 194,198 ---- <TMPL_IF NAME="History_If_Reclassified"> ! <span class="reclassifyText"><TMPL_VAR NAME="Localize_History_Reclassified"></span> <input type="submit" class="submit undoButton" name="undo_<TMPL_VAR NAME="History_I">" value="<TMPL_VAR NAME="Localize_Undo">" /> *************** *** 201,205 **** <TMPL_IF NAME="History_If_Magnetized"> ! <img title="<TMPL_VAR NAME="History_Magnet" ESCAPE=HTML>" alt="<TMPL_VAR NAME="History_Magnet" ESCAPE=HTML>" src="/skins/default/magnet.png"> <TMPL_ELSE> --- 200,207 ---- <TMPL_IF NAME="History_If_Magnetized"> ! <div class="historyMagnetUsed"> ! <img title="<TMPL_VAR NAME="History_Magnet" ESCAPE=HTML>" alt="<TMPL_VAR NAME="History_Magnet" ESCAPE=HTML>" src="/skins/default/magnet.png"> ! <span><TMPL_VAR NAME="History_Magnet" ESCAPE=HTML></span> ! </div> <TMPL_ELSE> *************** *** 240,246 **** --- 242,250 ---- <tr> <td colspan="<TMPL_VAR NAME="History_Colspan">"> + <div class="removeButtonsBottom"> <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">)" /> + </div> </td> <td> *************** *** 280,286 **** <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>) --- 284,290 ---- <tr> <td align="left"> ! <h2 class="history"><TMPL_VAR NAME="Localize_History_Title"></h2> </td> ! <td class="historyNavigatorTop"> (<a class="history" href="/history?session=<TMPL_VAR NAME="Session_Key">"><TMPL_VAR NAME="Localize_Refresh"></a>) *************** *** 303,305 **** --- 307,310 ---- </TMPL_IF> <!-- if some messages --> + <TMPL_INCLUDE NAME="history-javascript.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> --- NEW FILE: common-javascript.thtml --- <script type="text/javascript"> <!-- function OnLoadHandler(){ return 0; } // --> </script> Index: common-middle.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-middle.thtml,v retrieving revision 1.5.6.1 retrieving revision 1.5.6.2 diff -C2 -d -r1.5.6.1 -r1.5.6.2 *** common-middle.thtml 15 Sep 2005 09:18:22 -0000 1.5.6.1 --- common-middle.thtml 2 Dec 2007 08:49:00 -0000 1.5.6.2 *************** *** 1,3 **** ! <body dir="<TMPL_VAR NAME="Localize_LanguageDirection">"> <table class="shellTop" align="center" width="100%" summary=""> <tr class="shellTopRow"> --- 1,3 ---- ! <body dir="<TMPL_VAR NAME="Localize_LanguageDirection">" onLoad="OnLoadHandler()"> <table class="shellTop" align="center" width="100%" summary=""> <tr class="shellTopRow"> Index: common-top.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-top.thtml,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** common-top.thtml 20 Jul 2004 16:45:02 -0000 1.2 --- common-top.thtml 2 Dec 2007 08:49:00 -0000 1.2.6.1 *************** *** 2,7 **** <html lang="<TMPL_VAR NAME="Localize_LanguageCode">"> <head> ! <title><TMPL_VAR NAME="Localize_Header_Title"></title> ! <link rel="icon" href="favicon.ico"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">style.css" title="POPFile-Style"> </head> --- 2,8 ---- <html lang="<TMPL_VAR NAME="Localize_LanguageCode">"> <head> ! <title><TMPL_VAR NAME="Localize_Header_Title"></title> ! <link rel="icon" href="favicon.ico"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">style.css" title="POPFile"> ! <TMPL_INCLUDE NAME="common-javascript.thtml"> </head> Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/style.css,v retrieving revision 1.5.6.1 retrieving revision 1.5.6.2 diff -C2 -d -r1.5.6.1 -r1.5.6.2 *** style.css 14 Sep 2005 19:24:29 -0000 1.5.6.1 --- style.css 2 Dec 2007 08:49:00 -0000 1.5.6.2 *************** *** 78,90 **** /* Table Settings */ ! .settingsTable { border: 1px solid #CCCC99; } ! .settingsPanel { border: 1px solid #CCCC99; } ! .openMessageTable { border: 3px solid #CCCC99; } --- 78,90 ---- /* Table Settings */ ! table.settingsTable { border: 1px solid #CCCC99; } ! td.settingsPanel { border: 1px solid #CCCC99; } ! table.openMessageTable { border: 3px solid #CCCC99; } *************** *** 110,129 **** tr.rowHighlighted { color: #000000; ! background-color: #999999; } tr.rowBoundary { ! color: #000000; ! background-color: #AFAF7F; } ! .lookupResultsTable { border: 3px solid #CCCC99; } - tr.rowBoundary { - background-color: #CCCC99; - } - /*********************************************************/ /* Graphics */ --- 110,124 ---- tr.rowHighlighted { color: #000000; ! background-color: #B7B7B7; } tr.rowBoundary { ! background-color: #CCCC99; } ! table.lookupResultsTable { border: 3px solid #CCCC99; } /*********************************************************/ /* Graphics */ *************** *** 166,170 **** border: 2px solid #CCCC99; padding: 0.4em; ! padding-bottom: 0; } --- 161,168 ---- border: 2px solid #CCCC99; padding: 0.4em; ! } ! ! div.helpMessage form { ! margin: 0; } *************** *** 172,176 **** /* Form Labels */ ! .historyLabel { font-weight: bold; } --- 170,175 ---- /* Form Labels */ ! th.historyLabel { ! text-align: left; font-weight: bold; } *************** *** 224,241 **** /* Positioning */ ! table.historyWidgetsTop { ! width: 100%; ! margin-left: 1.5em; ! margin-top: 0.6em; ! margin-bottom: 1.0em; } ! table.historyWidgetsBottom { ! width: 100%; ! margin-top: 0.6em; } .historyNavigatorTop, .historyNavigatorBottom { text-align: right; } --- 223,247 ---- /* Positioning */ ! td.historyWidgetsTop form { ! margin: 0; ! padding: 0; } ! form.historyForm { ! margin: 0; ! padding: 0; } .historyNavigatorTop, .historyNavigatorBottom { text-align: right; + vertical-align: top; + } + + .historyNavigatorTop form, .historyNavigatorBottom form { + display:inline; + } + + .refreshLink { + margin-top: 0.5em; } *************** *** 244,248 **** } ! .advancedWidgets { ! margin-top: 1em; } --- 250,288 ---- } ! h2.history, h2.buckets, h2.magnets, h2.users { ! margin-top: 0; ! margin-bottom: 0.3em; ! } ! ! .search { ! display: inline; ! float: left; ! padding-right: 1em; ! } ! ! .filter { ! display: inline; ! } ! ! .removeButtonsTop { ! padding-bottom: 1em; ! } ! ! .viewHeadings { ! display: inline; ! } ! ! .historyMagnetUsed { ! overflow: hidden; ! white-space: nowrap; ! vertical-align: middle; ! } ! ! .historyMagnetUsed img { ! vertical-align: bottom; ! } ! ! .historyMagnetUsed span { ! font-size:80%; ! vertical-align: middle; } Index: corpus-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v retrieving revision 1.9.6.4 retrieving revision 1.9.6.5 diff -C2 -d -r1.9.6.4 -r1.9.6.5 *** corpus-page.thtml 8 Feb 2006 12:04:39 -0000 1.9.6.4 --- corpus-page.thtml 2 Dec 2007 08:49:00 -0000 1.9.6.5 *************** *** 5,14 **** <div class="helpMessage"> <form method="post" action="/buckets"> - <TMPL_VAR NAME="Localize_Help_Bucket_Setup"> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> - <p> <input type="submit" class="submit" name="nomore_bucket_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> - </p> </form> </div> --- 5,13 ---- <div class="helpMessage"> + <TMPL_VAR NAME="Localize_Help_Bucket_Setup"> + <br /><br /> <form method="post" action="/buckets"> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="submit" class="submit" name="nomore_bucket_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> </form> </div> *************** *** 19,28 **** <div class="helpMessage"> <form method="post" action="/buckets"> - <TMPL_VAR NAME="Localize_Help_Training"> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> - <p> <input type="submit" class="submit" name="nomore_training_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> - </p> </form> </div> --- 18,26 ---- <div class="helpMessage"> + <TMPL_VAR NAME="Localize_Help_Training"> + <br /><br /> <form method="post" action="/buckets"> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> <input type="submit" class="submit" name="nomore_training_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> </form> </div> --- NEW FILE: history-javascript.thtml --- <script type="text/javascript"> <!-- function OnLoadHandler() { // redefine default OnLoadHandler if (document.getElementById("removeChecks")) document.getElementById("removeChecks").innerHTML = "<input type='checkbox' class='checkbox' onclick='javascript:toggleChecks(this);' title='Select All' />"; } function toggleChecks(x) { var d = document.forms; for (var i=0; i < d.length; i++) { for (var j=0; j < d[i].elements.length; j++) if (d[i].elements[j].name.substr(0,7) == "remove_") d[i].elements[j].checked = x.checked; } return 0; } // --> </script> |
