Menu
▾
▴
[popfile-commit] engine/skins/default administration-page.thtml,1.6,1.7 advanced-page.thtml,1.13,1.14 bucket-page.thtml,1.10,1.11 common-after-configuration.thtml,1.3,1.4 common-before-configuration.thtml,1.4,1.5 common-bottom.thtml,1.12,1.13 configuration-bar.thtml,1.11,1.12 corpus-page.thtml,1.18,1.19 history-page.thtml,1.59,1.60 magnet-page.thtml,1.10,1.11 password-page.thtml,1.9,1.10 session-page.thtml,1.3,1.4 shutdown-page.thtml,1.2,1.3 users-page.thtml,1.3,1.4
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15367/skins/default Modified Files: administration-page.thtml advanced-page.thtml bucket-page.thtml common-after-configuration.thtml common-before-configuration.thtml common-bottom.thtml configuration-bar.thtml corpus-page.thtml history-page.thtml magnet-page.thtml password-page.thtml session-page.thtml shutdown-page.thtml users-page.thtml Log Message: * HTML.pm: make handling of the config bar a little smarter. It now sets a template variable that decides whether the history bar also gets included. Should any other tabs also get a dedicated bar, config-bar.thtml must be changed to include another if statement and the new template; HTML::handle_configuration_bar() must be changed to set the new if variable. * HTML.pm: remove some tab characters * configuration-bar.thtml: Include the opening and closing form tag * configuration-bar.thtml: Include common-before-configuration.thtml and common-after-configuration.html directly from here. * common-after-configuration.thml and common-bottom.html: move the closing table tags to the latter because the table tags were opened in common-middle.thtml and thus should be closed in common-bottom. * xy-page.thml: adapt to the changes in the config bar template and simply include the that template from here. Next step (possibly): Get rid of common-before-configuration and common-after-configuration. Index: common-before-configuration.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-before-configuration.thtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** common-before-configuration.thtml 19 May 2005 22:51:28 -0000 1.4 --- common-before-configuration.thtml 22 May 2005 10:45:43 -0000 1.5 *************** *** 1 **** --- 1,15 ---- + <br /> + <TMPL_IF NAME="If_Show_Config_Bars"> + + <span style="border:2px #CCCC99 solid; padding:0.3em; padding-bottom:0; margin-left:0.3em; background:#CCCC99;"> + <a name="configBar" href="<TMPL_VAR NAME="Configuration_Action">?hide_configbar=1"><b>Config Bar</b></a> + </span> + + <TMPL_ELSE> + <span style="border:2px #CCCC99 solid; padding:0.3em; margin:0.3em; background:#CCCC99;"> + <a href="<TMPL_VAR NAME="Configuration_Action">?show_configbar=1#configBar"><b>Config Bar</b></a> + </span> + <br /> + + </TMPL_IF> Index: history-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** history-page.thtml 22 May 2005 09:12:12 -0000 1.59 --- history-page.thtml 22 May 2005 10:45:43 -0000 1.60 *************** *** 296,337 **** </tr> </table> ! <br /> </TMPL_IF> <!-- if some messages --> <TMPL_INCLUDE NAME="history-javascript.thtml"> ! ! <!--<TMPL_INCLUDE NAME="common-before-configuration.thtml">--> ! ! <TMPL_IF NAME="If_Show_Config_Bars"> ! ! <span style="border:2px #CCCC99 solid; padding:0.3em; padding-bottom:0; margin-left:0.3em; background:#CCCC99;"> ! <a name="configBar" href="<TMPL_VAR NAME="Configuration_Action">?hide_configbar=1"><b>Config Bar</b></a> ! </span> ! ! <table class="configBar" cellspacing="0" width="100%"> ! <tr> ! <td> ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <TMPL_INCLUDE NAME="history-bar.thtml"> ! </form> ! </td> ! </tr> ! <tr> ! <td> ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <TMPL_INCLUDE NAME="configuration-bar.thtml"> ! </form> ! </td> ! </tr> ! </table> ! ! <TMPL_ELSE> ! ! <span style="border:2px #CCCC99 solid; padding:0.3em; margin:0.3em; background:#CCCC99;"> ! <a href="<TMPL_VAR NAME="Configuration_Action">?show_configbar=1#configBar"><b>Config Bar</b></a> ! </span> ! <br /> ! </TMPL_IF> ! ! <TMPL_INCLUDE NAME="common-after-configuration.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> --- 296,303 ---- </tr> </table> ! </TMPL_IF> <!-- if some messages --> <TMPL_INCLUDE NAME="history-javascript.thtml"> ! <TMPL_INCLUDE NAME="configuration-bar.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> Index: users-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/users-page.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** users-page.thtml 7 Apr 2005 19:55:09 -0000 1.3 --- users-page.thtml 22 May 2005 10:45:43 -0000 1.4 *************** *** 178,183 **** </TMPL_IF> - <TMPL_INCLUDE NAME="common-before-configuration.thtml"> <TMPL_INCLUDE NAME="configuration-bar.thtml"> - <TMPL_INCLUDE NAME="common-after-configuration.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> --- 178,181 ---- Index: administration-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/administration-page.thtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** administration-page.thtml 20 Feb 2005 10:05:57 -0000 1.6 --- administration-page.thtml 22 May 2005 10:45:43 -0000 1.7 *************** *** 167,172 **** </tr> </table> - <TMPL_INCLUDE NAME="common-before-configuration.thtml"> <TMPL_INCLUDE NAME="configuration-bar.thtml"> - <TMPL_INCLUDE NAME="common-after-configuration.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> --- 167,170 ---- Index: common-bottom.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-bottom.thtml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** common-bottom.thtml 15 Feb 2005 04:23:54 -0000 1.12 --- common-bottom.thtml 22 May 2005 10:45:43 -0000 1.13 *************** *** 1,2 **** --- 1,12 ---- + </td> + <td class="shellRight"></td> + </tr> + <tr class="shellBottomRow"> + <td class="shellBottomLeft"></td> + <td class="shellBottomCenter"></td> + <td class="shellBottomRight"></td> + </tr> + </table> + <TMPL_IF NAME="Header_If_Password"> <TMPL_ELSE> Index: advanced-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/advanced-page.thtml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** advanced-page.thtml 15 Feb 2005 04:23:54 -0000 1.13 --- advanced-page.thtml 22 May 2005 10:45:43 -0000 1.14 *************** *** 111,116 **** </table> - <TMPL_INCLUDE NAME="common-before-configuration.thtml"> <TMPL_INCLUDE NAME="configuration-bar.thtml"> - <TMPL_INCLUDE NAME="common-after-configuration.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> --- 111,114 ---- Index: configuration-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/configuration-bar.thtml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** configuration-bar.thtml 19 May 2005 22:51:28 -0000 1.11 --- configuration-bar.thtml 22 May 2005 10:45:43 -0000 1.12 *************** *** 1,2 **** --- 1,23 ---- + <TMPL_INCLUDE NAME="common-before-configuration.thtml"> + + <TMPL_IF NAME="If_Show_Config_Bars"> + + <table class="configBar" cellspacing="0" width="100%"> + + <TMPL_IF NAME="Is_history_page"> + + <tr> + <td> + <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> + <TMPL_INCLUDE NAME="history-bar.thtml"> + </form> + </td> + </tr> + + </TMPL_IF> + + <tr> + <td> + <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <div class="configBarOption"> <label class="configurationLabel" for="configSkin"> *************** *** 63,64 **** --- 84,94 ---- <input type="submit" class="submit" name="change_language" value="<TMPL_VAR NAME="Localize_Apply">" /> </div> + + </form> + </td> + </tr> + </table> + + </TMPL_IF> + + <TMPL_INCLUDE NAME="common-after-configuration.thtml"> Index: magnet-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/magnet-page.thtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** magnet-page.thtml 15 Feb 2005 04:23:54 -0000 1.10 --- magnet-page.thtml 22 May 2005 10:45:43 -0000 1.11 *************** *** 160,165 **** </div> - <TMPL_INCLUDE NAME="common-before-configuration.thtml"> <TMPL_INCLUDE NAME="configuration-bar.thtml"> - <TMPL_INCLUDE NAME="common-after-configuration.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> --- 160,163 ---- Index: bucket-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/bucket-page.thtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** bucket-page.thtml 15 Feb 2005 04:23:54 -0000 1.10 --- bucket-page.thtml 22 May 2005 10:45:43 -0000 1.11 *************** *** 145,150 **** </TMPL_IF> - <TMPL_INCLUDE NAME="common-before-configuration.thtml"> <TMPL_INCLUDE NAME="configuration-bar.thtml"> - <TMPL_INCLUDE NAME="common-after-configuration.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> --- 145,148 ---- Index: session-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/session-page.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** session-page.thtml 14 Jan 2005 20:43:19 -0000 1.3 --- session-page.thtml 22 May 2005 10:45:43 -0000 1.4 *************** *** 4,8 **** <h2 class="session"><TMPL_VAR NAME="Localize_Session_Title"></h2><br /><br /><TMPL_VAR NAME="Localize_Session_Error"> - <TMPL_INCLUDE NAME="common-before-configuration.thtml"> - <TMPL_INCLUDE NAME="common-after-configuration.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> --- 4,6 ---- Index: shutdown-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/shutdown-page.thtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shutdown-page.thtml 14 Jan 2005 20:43:19 -0000 1.2 --- shutdown-page.thtml 22 May 2005 10:45:43 -0000 1.3 *************** *** 4,8 **** <h2><TMPL_VAR NAME="Localize_Shutdown_Message"></h2> - <TMPL_INCLUDE NAME="common-before-configuration.thtml"> - <TMPL_INCLUDE NAME="common-after-configuration.thtml"> - <TMPL_INCLUDE NAME="common-bottom.thtml"> --- 4,5 ---- Index: password-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/password-page.thtml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** password-page.thtml 22 May 2005 09:37:06 -0000 1.9 --- password-page.thtml 22 May 2005 10:45:43 -0000 1.10 *************** *** 30,33 **** </script> - <TMPL_INCLUDE NAME="common-after-configuration.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> --- 30,32 ---- Index: corpus-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** corpus-page.thtml 15 Feb 2005 04:23:54 -0000 1.18 --- corpus-page.thtml 22 May 2005 10:45:43 -0000 1.19 *************** *** 544,549 **** </table> - <TMPL_INCLUDE NAME="common-before-configuration.thtml"> <TMPL_INCLUDE NAME="configuration-bar.thtml"> - <TMPL_INCLUDE NAME="common-after-configuration.thtml"> <TMPL_INCLUDE NAME="common-bottom.thtml"> --- 544,547 ---- Index: common-after-configuration.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-after-configuration.thtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** common-after-configuration.thtml 19 May 2005 22:51:28 -0000 1.3 --- common-after-configuration.thtml 22 May 2005 10:45:43 -0000 1.4 *************** *** 1,9 **** - </td> - <td class="shellRight"></td> - </tr> - <tr class="shellBottomRow"> - <td class="shellBottomLeft"></td> - <td class="shellBottomCenter"></td> - <td class="shellBottomRight"></td> - </tr> - </table> --- 0 ---- |
