Update of /cvsroot/mailmanager/MailManager/www In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14133/www Modified Files: AccountSettings.zpt Create.zpt CustomerSettings.zpt FilterSettings.zpt GenerateMail.zpt GroupSettings.zpt Help.zpt LoggedOut.zpt OptionSettings.zpt Reports.zpt Search.zpt Settings.zpt SystemSettings.zpt Tickets.zpt UserSettings.zpt index_html.zpt macros.zpt master.zpt master_style_css.dtml test.zpt ticket_index_html.zpt Log Message: * Remove unused slots. * Rename some of the remaining slots so that I don't sound like I'm mad whilst writing documentation. :-) Index: Reports.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/Reports.zpt,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- Reports.zpt 13 Dec 2005 13:19:16 -0000 1.37 +++ Reports.zpt 13 Dec 2005 13:23:26 -0000 1.38 @@ -28,14 +28,14 @@ <body metal:use-macro="here/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/reports_head_nav"> Ticket subnav bar. </div> </div> - <!-- options_table slot --> - <div tal:omit-tag="" metal:fill-slot="options_table"> + <!-- portlets slot --> + <div tal:omit-tag="" metal:fill-slot="portlets"> <div class="box bg"> <h2 i18n:translate="information">Information</h2> <p tal:condition="python:section == 'snapshot'" i18n:translate="snapshot_info"> Index: Settings.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/Settings.zpt,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Settings.zpt 7 Nov 2005 12:45:36 -0000 1.20 +++ Settings.zpt 13 Dec 2005 13:23:26 -0000 1.21 @@ -13,14 +13,14 @@ <title metal:fill-slot="title">Logicalware MailManager : Generate Mail</title> </head> <body metal:use-macro="here/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/options_head_nav"> Ticket subnav bar. </div> </div> - <!-- options_table slot --> - <div metal:fill-slot="options_table"> + <!-- portlets slot --> + <div metal:fill-slot="portlets"> <div class="box bg"> <h2 i18n:translate="important">Important</h2> <p i18n:translate="settings_info">Some of the options available in the Settings are permanent and cannot be undone. Please check before all actions are executed.</p> Index: Create.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/Create.zpt,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- Create.zpt 6 Dec 2005 14:48:24 -0000 1.43 +++ Create.zpt 13 Dec 2005 13:23:26 -0000 1.44 @@ -18,14 +18,14 @@ </head> <body metal:use-macro="container/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/tickets_head_nav"> Ticket subnav bar. </div> </div> - <!-- options_table slot --> - <div metal:fill-slot="options_table"> + <!-- portlets slot --> + <div metal:fill-slot="portlets"> <div class="box bg"> <h2 i18n:translate="information">Information</h2> <p i18n:translate="create_info"> Index: AccountSettings.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/AccountSettings.zpt,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- AccountSettings.zpt 8 Dec 2005 15:21:05 -0000 1.58 +++ AccountSettings.zpt 13 Dec 2005 13:23:26 -0000 1.59 @@ -15,13 +15,13 @@ <title metal:fill-slot="title">Logicalware MailManager : Account Settings</title> </head> <body metal:use-macro="container/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/options_head_nav"> Ticket subnav bar. </div> </div> - <div metal:fill-slot="options_table"> + <div metal:fill-slot="portlets"> <div class="box"> <h2>Options</h2> Index: Tickets.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/Tickets.zpt,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- Tickets.zpt 9 Dec 2005 14:25:53 -0000 1.56 +++ Tickets.zpt 13 Dec 2005 13:23:26 -0000 1.57 @@ -22,7 +22,7 @@ </head> <body metal:use-macro="container/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/tickets_head_nav"> Ticket subnav bar. </div> @@ -40,7 +40,7 @@ </li> </ul> </div> - <p metal:fill-slot="support_cell_left" tal:omit-tag=""> + <p metal:fill-slot="left_column" tal:omit-tag=""> </p> <div metal:fill-slot="main_content"> Index: SystemSettings.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/SystemSettings.zpt,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- SystemSettings.zpt 24 Nov 2005 14:12:54 -0000 1.50 +++ SystemSettings.zpt 13 Dec 2005 13:23:26 -0000 1.51 @@ -15,13 +15,13 @@ <title metal:fill-slot="title">Logicalware MailManager : System Settings</title> </head> <body metal:use-macro="here/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/options_head_nav"> Ticket subnav bar. </div> </div> - <div metal:fill-slot="options_table"> + <div metal:fill-slot="portlets"> <div class="box"> <h2 i18n:translate="options">Options</h2> <ul> Index: master.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/master.zpt,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- master.zpt 30 Nov 2005 14:33:13 -0000 1.54 +++ master.zpt 13 Dec 2005 13:23:26 -0000 1.55 @@ -28,7 +28,7 @@ <div id="header"> <div id="topbar"> - <form accept-charset="utf-8" metal:define-slot="account_list" action="setSession" method="post" tal:define="acc_id request/SESSION/account_id | nothing" tal:condition="python:user.has_role('Tickets')"> + <form accept-charset="utf-8" action="setSession" method="post" tal:define="acc_id request/SESSION/account_id | nothing" tal:condition="python:user.has_role('Tickets')"> <p id="account_list"> <label for="header_account_name" i18n:translate="account">Account</label> <select accesskey="a" tal:attributes="tabindex tabindex/next" id="header_account_name" name="value" onchange="window.open('setSession?key=account_id&value=' + this.options[this.selectedIndex].value, '_top')"> @@ -44,7 +44,7 @@ </p> </form> - <form accept-charset="utf-8" metal:define-slot="agent_list" action="setSession" method="post" tal:define="assigned request/SESSION/assigned | user/getUserName" tal:condition="python:user.has_role('Tickets')"> + <form accept-charset="utf-8" action="setSession" method="post" tal:define="assigned request/SESSION/assigned | user/getUserName" tal:condition="python:user.has_role('Tickets')"> <p id="agent_list"> <label for="header_username_dropdown" i18n:translate="user">User</label> <select accesskey="u" tal:attributes="tabindex tabindex/next" id="header_username_dropdown" name="value" onchange="window.open('setSession?key=assigned&value=' + this.options[this.selectedIndex].value, '_top')"> @@ -111,7 +111,7 @@ <!-- The second level menus --> <div id="subnav"> - <div metal:define-slot="table_head_nav"> + <div metal:define-slot="subnav"> <!-- empty --> </div> </div> @@ -124,12 +124,12 @@ </div> <div id="mainbody"> - <div id="leftboxes" metal:define-slot="support_cell_left"> + <div id="left_column" metal:define-slot="left_column"> <div class="box" id="errors" tal:define="error error | request/error | nothing" tal:condition="error"> <h2>Errors</h2> - <div metal:define-slot="error_slot" class="error"> + <div class="error"> <ul tal:condition="python:same_type(error, [])"> <li tal:repeat="error_string error" tal:content="error_string">Error list string</li> </ul> @@ -138,8 +138,8 @@ </p> </div> </div> - <div metal:define-slot="options_table"> - <!-- This page doesn't fill in the options 'table' --> + <div metal:define-slot="portlets"> + <!-- This page doesn't have any portlets --> </div> </div> Index: OptionSettings.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/OptionSettings.zpt,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- OptionSettings.zpt 24 Nov 2005 14:12:54 -0000 1.43 +++ OptionSettings.zpt 13 Dec 2005 13:23:26 -0000 1.44 @@ -15,13 +15,13 @@ <title metal:fill-slot="title">Logicalware MailManager : Options</title> </head> <body metal:use-macro="here/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/options_head_nav"> Ticket subnav bar. </div> </div> - <div metal:fill-slot="options_table"> + <div metal:fill-slot="portlets"> <div class="box"> <h2 i18n:translate="options">Options</h2> <ul> Index: UserSettings.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/UserSettings.zpt,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- UserSettings.zpt 24 Nov 2005 14:12:54 -0000 1.38 +++ UserSettings.zpt 13 Dec 2005 13:23:26 -0000 1.39 @@ -15,13 +15,13 @@ <title metal:fill-slot="title">Logicalware MailManager : User Settings</title> </head> <body metal:use-macro="here/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/options_head_nav"> Ticket subnav bar. </div> </div> - <div metal:fill-slot="options_table"> + <div metal:fill-slot="portlets"> <div class="box"> <h2 i18n:translate="options">Options</h2> Index: master_style_css.dtml =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/master_style_css.dtml,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- master_style_css.dtml 30 Nov 2005 14:32:30 -0000 1.34 +++ master_style_css.dtml 13 Dec 2005 13:23:26 -0000 1.35 @@ -305,7 +305,7 @@ .box label {width: 80px; float: left;} /* Boxes on the left hand side */ -#leftboxes { +#left_column { float:left; width: 240px; padding:0px;margin-top:0px; @@ -343,7 +343,7 @@ /* Actual content (for most pages) in the remaining space. */ #content { - margin-left: 270px; /* #leftboxes's width plus a bit. */ + margin-left: 270px; /* #left_column's width plus a bit. */ margin-right: 10px; } Index: Search.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/Search.zpt,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- Search.zpt 18 Nov 2005 14:56:25 -0000 1.31 +++ Search.zpt 13 Dec 2005 13:23:26 -0000 1.32 @@ -15,13 +15,13 @@ </head> <body metal:use-macro="container/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/tickets_head_nav"> Ticket subnav bar. </div> </div> - <div metal:fill-slot="options_table"> + <div metal:fill-slot="portlets"> <div class="box bg"> <h2 i18n:translate="information">Information</h2> <p>Select your search criteria from the options provided.</p> Index: CustomerSettings.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/CustomerSettings.zpt,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- CustomerSettings.zpt 24 Nov 2005 14:12:54 -0000 1.26 +++ CustomerSettings.zpt 13 Dec 2005 13:23:26 -0000 1.27 @@ -15,13 +15,13 @@ <title metal:fill-slot="title">Logicalware MailManager : Generate Mail</title> </head> <body metal:use-macro="here/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/options_head_nav"> Ticket subnav bar. </div> </div> - <div metal:fill-slot="options_table"> + <div metal:fill-slot="portlets"> <div class="box"> <h2>Options</h2> <ul> Index: index_html.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/index_html.zpt,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- index_html.zpt 4 Nov 2005 15:44:37 -0000 1.35 +++ index_html.zpt 13 Dec 2005 13:23:26 -0000 1.36 @@ -14,13 +14,13 @@ </head> <body metal:use-macro="container/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/tickets_head_nav"> Ticket subnav bar. </div> </div> - <div metal:fill-slot="options_table" tal:omit-tag=""> + <div metal:fill-slot="portlets" tal:omit-tag=""> <div class="box bg"> <h2 i18n:translate="logged_in">Logged In</h2> <p> <strong tal:content="user/getUserName">username</strong></p> Index: LoggedOut.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/LoggedOut.zpt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- LoggedOut.zpt 28 Sep 2005 15:07:36 -0000 1.10 +++ LoggedOut.zpt 13 Dec 2005 13:23:26 -0000 1.11 @@ -13,7 +13,7 @@ </head> <body metal:use-macro="container/master/macros/template"> - <div metal:fill-slot="options_table" tal:omit-tag=""> + <div metal:fill-slot="portlets" tal:omit-tag=""> <div class="box"> <h2 i18n:translate="logout">Log Out</h2> Index: test.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/test.zpt,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- test.zpt 4 Nov 2005 15:44:37 -0000 1.13 +++ test.zpt 13 Dec 2005 13:23:26 -0000 1.14 @@ -12,13 +12,13 @@ </head> <body metal:use-macro="container/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/tickets_head_nav"> Ticket subnav bar. </div> </div> - <div metal:fill-slot="options_table"> + <div metal:fill-slot="portlets"> <!-- empty --> </div> Index: GenerateMail.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/GenerateMail.zpt,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- GenerateMail.zpt 4 Nov 2005 15:44:37 -0000 1.11 +++ GenerateMail.zpt 13 Dec 2005 13:23:26 -0000 1.12 @@ -11,7 +11,7 @@ <title metal:fill-slot="title">Logicalware MailManager : Generate Mail</title> </head> <body metal:use-macro="here/master/macros/template"> - <div metal:fill-slot="options_table"> + <div metal:fill-slot="portlets"> <!-- empty --> </div> <div metal:fill-slot="main_content"> Index: ticket_index_html.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/ticket_index_html.zpt,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- ticket_index_html.zpt 9 Dec 2005 14:25:53 -0000 1.100 +++ ticket_index_html.zpt 13 Dec 2005 13:23:26 -0000 1.101 @@ -35,7 +35,7 @@ </head> <body metal:use-macro="container/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/tickets_head_nav"> Ticket subnav bar. </div> @@ -58,7 +58,7 @@ </ul> </div> - <div metal:fill-slot="options_table"> + <div metal:fill-slot="portlets"> <form accept-charset="utf-8" class="box" method="post" tal:define="method python:test(request.get('details'), 'save', 'change')" tal:attributes="action python:'ticket/%06d/%s' % (here.id, method)" action="specifiedByTal"> <h2 i18n:translate="ticket_details">Ticket Details</h2> Index: FilterSettings.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/FilterSettings.zpt,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- FilterSettings.zpt 24 Nov 2005 14:12:54 -0000 1.45 +++ FilterSettings.zpt 13 Dec 2005 13:23:26 -0000 1.46 @@ -15,14 +15,14 @@ <title metal:fill-slot="title">Logicalware MailManager : Generate Mail</title> </head> <body metal:use-macro="here/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/options_head_nav"> Ticket subnav bar. </div> </div> - <!-- options_table slot --> - <div metal:fill-slot="options_table" tal:omit-tag=""> + <!-- portlets slot --> + <div metal:fill-slot="portlets" tal:omit-tag=""> <div class="box"> <h2 i18n:translate="options">Options</h2> <ul> Index: macros.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/macros.zpt,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- macros.zpt 9 Dec 2005 14:25:53 -0000 1.28 +++ macros.zpt 13 Dec 2005 13:23:26 -0000 1.29 @@ -97,8 +97,8 @@ <div metal:use-macro="container/macros/macros/help_support_cell"> Cell </div> - <div metal:fill-slot="options_table" tal:omit-tag=""> - <div metal:use-macro="container/macros/macros/help_options_table">Opts</div> + <div metal:fill-slot="portlets" tal:omit-tag=""> + <div metal:use-macro="container/macros/macros/help_portlets">Opts</div> </div> <div metal:fill-slot="main_content" tal:omit-tag=""> <div metal:define-slot="help_content"> @@ -109,7 +109,7 @@ </div> - <div metal:define-macro="help_options_table"> + <div metal:define-macro="help_portlets"> <form class="box bg" accept-charset="utf-8" action="quickFind" method="post"> <h2><label style="float: none;" for="topic" i18n:translate="quick_find">Quick Find</label></h2> <p> Index: Help.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/Help.zpt,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Help.zpt 28 Sep 2005 15:07:36 -0000 1.12 +++ Help.zpt 13 Dec 2005 13:23:26 -0000 1.13 @@ -16,8 +16,8 @@ <div metal:use-macro="container/macros/macros/help_support_cell"> Cell </div> - <div metal:fill-slot="options_table" tal:omit-tag=""> - <div metal:use-macro="container/macros/macros/help_options_table">Opts</div> + <div metal:fill-slot="portlets" tal:omit-tag=""> + <div metal:use-macro="container/macros/macros/help_portlets">Opts</div> </div> <div metal:fill-slot="main_content" tal:omit-tag=""> <h2 i18n:translate="quick_start">Quick Start</h2> Index: GroupSettings.zpt =================================================================== RCS file: /cvsroot/mailmanager/MailManager/www/GroupSettings.zpt,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- GroupSettings.zpt 24 Nov 2005 14:12:54 -0000 1.35 +++ GroupSettings.zpt 13 Dec 2005 13:23:26 -0000 1.36 @@ -15,13 +15,13 @@ <title metal:fill-slot="title">Logicalware MailManager : Group Settings</title> </head> <body metal:use-macro="here/master/macros/template"> - <div tal:omit-tag="" metal:fill-slot="table_head_nav"> + <div tal:omit-tag="" metal:fill-slot="subnav"> <div tal:omit-tag="" metal:use-macro="container/macros/macros/options_head_nav"> Ticket subnav bar. </div> </div> - <div metal:fill-slot="options_table"> + <div metal:fill-slot="portlets"> <div class="box"> <h2 i18n:translate="options">Options</h2> <ul> |