From: Manni H. <man...@us...> - 2005-09-28 18:49:01
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23951/skins/default Modified Files: common-middle.thtml corpus-page.thtml Log Message: Make template system work even with strict-params enabled. Had to remove some cruft to make this work and I removed Jim's patches from HTML.pm and corpus-page.thtml. I want to try and get the best out of Jim's and Brian's corpus page, but a fresh start seems to be the best solution. Index: common-middle.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-middle.thtml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** common-middle.thtml 20 Aug 2005 06:40:12 -0000 1.20 --- common-middle.thtml 28 Sep 2005 18:48:38 -0000 1.21 *************** *** 51,63 **** <TMPL_IF NAME="Common_Middle_If_CanAdmin"> <td class="menuSpacer"></td> ! <td class="<TMPL_VAR NAME="Common_Middle_Tab4">" align="center"> <a class="menuLink" href="/administration" title="<TMPL_VAR NAME="Localize_tip_Menu_Admin">"><TMPL_VAR NAME="Localize_Header_Administration"></a> </td> <td class="menuSpacer"></td> ! <td class="<TMPL_VAR NAME="Common_Middle_Tab5">" align="center"> <a class="menuLink" href="/users" title="<TMPL_VAR NAME="Localize_tip_Menu_Users">"><TMPL_VAR NAME="Localize_Header_Users"></a> </td> <td class="menuSpacer"></td> ! <td class="<TMPL_VAR NAME="Common_Middle_Tab6">" align="center"> <a class="menuLink" href="/advanced" title="<TMPL_VAR NAME="Localize_tip_Menu_Advanced">"><TMPL_VAR NAME="Localize_Header_Advanced"></a> </td> --- 51,63 ---- <TMPL_IF NAME="Common_Middle_If_CanAdmin"> <td class="menuSpacer"></td> ! <td class="<TMPL_VAR NAME="Common_Middle_Tab3">" align="center"> <a class="menuLink" href="/administration" title="<TMPL_VAR NAME="Localize_tip_Menu_Admin">"><TMPL_VAR NAME="Localize_Header_Administration"></a> </td> <td class="menuSpacer"></td> ! <td class="<TMPL_VAR NAME="Common_Middle_Tab4">" align="center"> <a class="menuLink" href="/users" title="<TMPL_VAR NAME="Localize_tip_Menu_Users">"><TMPL_VAR NAME="Localize_Header_Users"></a> </td> <td class="menuSpacer"></td> ! <td class="<TMPL_VAR NAME="Common_Middle_Tab5">" align="center"> <a class="menuLink" href="/advanced" title="<TMPL_VAR NAME="Localize_tip_Menu_Advanced">"><TMPL_VAR NAME="Localize_Header_Advanced"></a> </td> Index: corpus-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** corpus-page.thtml 10 Sep 2005 08:49:41 -0000 1.24 --- corpus-page.thtml 28 Sep 2005 18:48:38 -0000 1.25 *************** *** 26,195 **** </TMPL_IF> - <!-- Jim's stuff --> - - <table class="bucketsTable" cellpadding="0" cellspacing="5" valign="top" align="center" summary="<TMPL_VAR NAME="Localize_Bucket_StatisticsTableSummary">"> - <tr> - <th scope="col" rowspan="2" align="center"> - <TMPL_VAR NAME="Localize_Bucket_BucketName"> - </th> - - <th scope="col" colspan="2" align="center" nowrap> - <TMPL_VAR NAME="Localize_Bucket_EmailsClassifiedUpper"> - </th> - - <th scope="col" rowspan="2" align="center"> - <TMPL_VAR NAME="Localize_Bucket_BreakClassificationFN"> - </th> - - - <th scope="col" rowspan="2" align="right"> - <TMPL_VAR NAME="Localize_Bucket_HitRate"> - </th> - - - <th scope="col" rowspan="2" align="center"> - <TMPL_VAR NAME="Localize_Bucket_BreakClassificationFP"> - </th> - - - <th scope="col" rowspan="2" align="right"> - <TMPL_VAR NAME="Localize_Bucket_StrikeRate"> - </th> - - - <th scope="col" colspan="2" align="center" nowrap> - <TMPL_VAR NAME="Localize_Words"> - </th> - - - <th scope="col" rowspan="2" align="right"> - <TMPL_VAR NAME="Localize_Bucket_UniqueWords"> - </th> - </tr> - - <tr> - <th align="right"> - <TMPL_VAR NAME="Localize_Count"> - </th> - - <th align="right"> - <TMPL_VAR NAME="Localize_Percent"> - </th> - - <th align="right"> - <TMPL_VAR NAME="Localize_Count"> - </th> - - <th align="right"> - <TMPL_VAR NAME="Localize_Percent"> - </th> - </tr> - - <TMPL_LOOP NAME="Corpus_Loop_Buckets"> - <TMPL_IF NAME="__odd__"> - <tr class="rowOdd"> - <TMPL_ELSE> - <tr class="rowEven"> - </TMPL_IF> - <td align="right"> - <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> - <a href="/buckets?session=<TMPL_VAR NAME="Session_Key">&showbucket=<TMPL_VAR NAME="Corpus_Bucket">"> - </TMPL_IF> - <span style="color:<TMPL_VAR NAME="Corpus_Bucket_Color">; white-space: nowrap;"> - <b> - <TMPL_VAR NAME="Corpus_Bucket"> - </b> - </span> - <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> - </a> - </TMPL_IF> - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_Message_Count"> - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_Message_Percent">% - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_False_Negative"> - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_Hit_Rate"> - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_False_Positive"> - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_Strike_Rate"> - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_Word_Count"> - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_Word_Percent">% - </td> - - <td align="right"> - <TMPL_VAR NAME="Corpus_Bucket_Unique"> - </td> - </tr> - </TMPL_LOOP> <!-- corpus loop buckets --> - <tr> - <td align="center"> - <b> - <TMPL_VAR NAME="Localize_Total"> - </b> - </td> - - <td align="right"> - <b> - <TMPL_VAR NAME="Corpus_Message_Count"> - </b> - </td> - - <td></td> - - <td align="right"> - <b> - <TMPL_VAR NAME="Corpus_Error_Count"> - </b> - </td> - - <td align="right"> - <b> - <TMPL_VAR NAME="Corpus_Accuracy"> - </b> - </td> - - <td></td> - - <td></td> - - <td align="right"> - <b> - <TMPL_VAR NAME="Corpus_Word_Count"> - </b> - </td> - - <td></td> - - <td align="right"> - <b> - <TMPL_VAR NAME="Corpus_Total_Unique"> - </b> - </td> - </tr> - </table> - - <!-- end Jim's stuff --> - <table class="settingsTable" width="100%" cellpadding="10%" cellspacing="0" summary="<TMPL_VAR NAME="Localize_Bucket_MaintenanceTableSummary">"> <tr> --- 26,29 ---- *************** *** 234,238 **** <TMPL_LOOP NAME="Corpus_Loop_Buckets"> - <TMPL_IF NAME="__odd__"> --- 68,71 ---- |