This is my branch to remove main-template and main-template-macros. lp:~sinzui/launchpad/remove-main-template Diff size: 940 (450 lines are removed files) Launchpad bug: https://bugs.launchpad.net/bugs/69726 Test command: ./bin/test -vvt "tales-macro|zcmldirectives" then test the whole suite. (/me did) Pre-implementation: no one Target release: 3.1.11 = Remove main-template and main-template-macros = main-template and main-template-macros are obsolete and launchpad still has code and tests to support them. They should be removed. == Rules == * Remove main-template and main-template-macros from zcml and templates * Update page macros, remove obsolete behaviour ADDENDUM ec2 test discovered pages that were still on 2.0 UI. * Shipit and signon both use @@+main-template-macros/notifications Registering that name on base-template-macros will continue support * OpenIDRPConfig is still using main-template, updated them to 3.0 * forgottenpassword is still using main-template, update it to 3.0 * The timeline is still using main-template-macros, update it to 3.0 == QA == * Visit a project * Verify that the timeline displays * Visit +rpconfig * Verify the page displays * Verify the add and edit pages have cancel buttons * Visit forgottenpassword, verify the page displays. == Lint == Linting changed files: lib/canonical/launchpad/pagetitles.py lib/canonical/launchpad/doc/tales-macro.txt lib/canonical/launchpad/doc/zcmldirectives.txt lib/canonical/launchpad/icing/style.css lib/canonical/launchpad/templates/launchpad-forgottenpassword.pt lib/canonical/launchpad/webapp/login.py lib/canonical/launchpad/webapp/tales.py lib/canonical/launchpad/zcml/launchpad.zcml lib/canonical/widgets/location.py lib/lp/app/browser/configure.zcml lib/lp/app/templates/base-layout-macros.pt lib/lp/registry/browser/productrelease.py lib/lp/registry/browser/team.py lib/lp/registry/templates/object-timeline-graph.pt lib/lp/services/openid/browser/configure.zcml lib/lp/services/openid/browser/openidrpconfig.py lib/lp/services/openid/templates/openidrpconfig-add.pt lib/lp/services/openid/templates/openidrpconfig-edit.pt lib/lp/services/openid/templates/openidrpconfigset-index.pt == Test == * lib/canonical/launchpad/doc/tales-macro.txt * Removed unsupported features. * Updated test to use a real page layout. * lib/canonical/launchpad/doc/zcmldirectives.txt * Updated test to use a modern example. == Implementation == * lib/canonical/launchpad/pagetitles.py * Removed the unused page title. * lib/canonical/launchpad/icing/style.css * Removed the comment about main template. * lib/canonical/launchpad/templates/launchpad-forgottenpassword.pt * Updated page to 3.0 * lib/canonical/launchpad/webapp/login.py * Moved the page title tot he view. * lib/canonical/launchpad/webapp/tales.py * Updated the documentation examples for page layouts. * Removed master (main-template) and the code that switched between main and base. * Removed the old layout configuration. * lib/canonical/launchpad/zcml/launchpad.zcml * Unregistered main-template and main-template-macros * lib/canonical/widgets/location.py * Updated the comment to reference base-layout. * lib/lp/app/browser/configure.zcml * Registered +main-template-macros as a copy of +base-layout-macros to support signon and shipit * lib/lp/app/templates/base-layout-macros.pt * Removed comment about main-template. Note that when this branch lands, we can start removing style.css * lib/lp/registry/browser/productrelease.py * Updated comment to reference base-layout. * lib/lp/registry/browser/team.py * Updated comment to reference base-layout * lib/lp/registry/templates/object-timeline-graph.pt * Updated template to use base-layout-macros. * lib/lp/services/openid/browser/configure.zcml * Registered OpenIDRPConfigSetView to support the page title. * lib/lp/services/openid/browser/openidrpconfig.py * Added OpenIDRPConfigSetView to support the page title. * Moved the page titles into the views * Added cancel links to the add and edit views. * lib/lp/services/openid/templates/openidrpconfig-add.pt * Updated the page macro and removed the redundant heading. * lib/lp/services/openid/templates/openidrpconfig-edit.pt * Updated the page macro and removed the redundant heading. * lib/lp/services/openid/templates/openidrpconfigset-index.pt * Updated the page macro and removed the redundant heading.