Index: attach.tmpl =================================================================== --- attach.tmpl (revision 12220) +++ attach.tmpl (working copy) @@ -1,18 +1,10 @@ %TMPL:INCLUDE{"twiki"}% - - %TMPL:DEF{"templatescript"}% %TMPL:END% - -%TMPL:DEF{"bodystart"}% - -#PageTop -%TMPL:END% - %TMPL:DEF{"notes"}% __Notes:__ @@ -31,7 +23,6 @@ %TMPL:END% %TMPL:DEF{"content"}% -%TMPL:P{"simpleheader"}%
%TMPL:P{"existingattachments"}% %TMPL:P{"previousdetails"}% @@ -70,11 +61,3 @@ %TMPL:P{"notes"}% %TMPL:P{"extranotes"}% %TMPL:P{"topicinfo"}%
%TMPL:END% - -%TMPL:DEF{"attach"}% -%TMPL:P{"htmldoctype"}% -%TMPL:P{"head"}% -%TMPL:P{"bodystart"}% -%TMPL:P{"main"}% -%TMPL:P{"bodyend"}% -%TMPL:END% Index: search.tmpl =================================================================== --- search.tmpl (revision 12220) +++ search.tmpl (working copy) @@ -38,8 +38,3 @@

%SPLIT% %TMPL:P{"topicinfo"}%%TMPL:END% -%TMPL:DEF{"main"}% -

-%TMPL:P{"standardheader"}% -
-%TMPL:P{"content"}%%TMPL:END% \ No newline at end of file Index: oopssaveerr.tmpl =================================================================== --- oopssaveerr.tmpl (revision 12220) +++ oopssaveerr.tmpl (working copy) @@ -7,11 +7,13 @@ %TMPL:DEF{"titleaction"}%%MAKETEXT{"(oops)"}% %TMPL:END% %TMPL:DEF{"webaction"}% *%MAKETEXT{"Attention"}%* %TMPL:END% %TMPL:DEF{"heading"}%%MAKETEXT{"Topic save error"}%%TMPL:END% -%TMPL:DEF{"message"}% + +%TMPL:DEF{"content"}% %MAKETEXT{"During save of file [_1] an error was found by the version control system. Please notify your [_2] administrator." args="%WEB%.%TOPIC%, %WIKITOOLNAME%"}% =%PARAM1%= %MAKETEXT{"Go back in your browser and save your changes locally."}% %TMPL:END% + %TMPL:DEF{"topicaction"}% [[%WEB%.%TOPIC%][%MAKETEXT{"OK"}%]] %TMPL:END% -%TMPL:P{"oops"}% + Index: editform.tmpl =================================================================== --- editform.tmpl (revision 12220) +++ editform.tmpl (working copy) @@ -5,7 +5,6 @@ %TMPL:DEF{"footernote"}% %TMPL:END% %TMPL:DEF{"content"}% -%TMPL:P{"simpleheader"}%
Index: view.plain.tmpl =================================================================== --- view.plain.tmpl (revision 12220) +++ view.plain.tmpl (working copy) @@ -1,10 +1,5 @@ %TMPL:INCLUDE{"twiki"}% -%TMPL:DEF{"bodystart"}% - -#PageTop -%TMPL:END% - %TMPL:DEF{"titleaction"}% %REVTITLE% %TMPL:END% %TMPL:DEF{"webaction"}% %WEBTOPICLIST% %TMPL:END% %TMPL:DEF{"form"}% @@ -51,8 +46,3 @@ %TMPL:P{"sep"}% %TMPL:P{"revisions"}% %TMPL:P{context="inactive" then="inactive_more" else="active_more"}%%TMPL:END% -%TMPL:P{"htmldoctype"}% -%TMPL:P{"head"}% -%TMPL:P{"bodystart"}% -%TMPL:P{"main"}% -%TMPL:P{"bodyend"}% Index: searchformat.tmpl =================================================================== --- searchformat.tmpl (revision 12220) +++ searchformat.tmpl (working copy) @@ -5,18 +5,8 @@ %TMPL:DEF{"topicaction"}% %TMPL:END% -%TMPL:P{"htmldoctype"}% -%TMPL:P{"head"}% - -#PageTop - -%TMPL:P{"standardheader"}% -
+%TMPL:DEF{"content"}% %SPLIT%Search: %SEARCHSTRING%

%SPLIT%%REPEAT%%REPEAT%%SPLIT%Number of topics: %NTOPICS%

%SPLIT% -%TMPL:P{"standardfooter"}% -%TMPL:P{"topicinfo"}% -#PageBottom - - \ No newline at end of file +%TMPL:END% Index: moveattachment.tmpl =================================================================== --- moveattachment.tmpl (revision 12220) +++ moveattachment.tmpl (working copy) @@ -12,7 +12,6 @@ %TMPL:DEF{"content"}% -%TMPL:P{"simpleheader"}%

---+ Move or Delete File %FILENAME% Index: preview.tmpl =================================================================== --- preview.tmpl (revision 12220) +++ preview.tmpl (working copy) @@ -1,4 +1,5 @@ %TMPL:INCLUDE{"twiki"}% + %TMPL:DEF{"footernote"}%
    @@ -10,6 +11,7 @@ (help)
%TMPL:END% +%{ this body redefinition needs to be, its the only place a background image is allowed (TODO: push up with parameter?) }% %TMPL:DEF{"bodystart"}% #PageTop @@ -30,7 +32,6 @@ %TMPL:DEF{"topicaction"}% %FORMFIELDS% %TMPL:END% %TMPL:DEF{"content"}% -%TMPL:P{"simpleheader"}%
%TEXT% %META{"form"}% @@ -43,8 +44,3 @@ %TMPL:P{"topicinfo"}%
%TMPL:END% -%TMPL:P{"htmldoctype"}% -%TMPL:P{"head"}% -%TMPL:P{"bodystart"}% -%TMPL:P{"main"}% -%TMPL:P{"bodyend"}% \ No newline at end of file Index: edit.tmpl =================================================================== --- edit.tmpl (revision 12220) +++ edit.tmpl (working copy) @@ -1,14 +1,11 @@ %TMPL:INCLUDE{"twiki"}% + %TMPL:DEF{"focus"}% try { document.main.text.focus(); } catch (er) {} %TMPL:END% %TMPL:DEF{"templatescript"}% %TMPL:END% -%TMPL:DEF{"bodystart"}% - -#PageTop -%TMPL:END% %TMPL:DEF{"footernote"}%
@@ -26,7 +23,6 @@ %TMPL:DEF{"content"}% -%TMPL:P{"simpleheader"}%

@@ -58,8 +54,4 @@ %TMPL:DEF{"titleaction"}%(edit) %TMPL:END% %TMPL:DEF{"titlehelp"}% %TMPL:END% %TMPL:DEF{"webaction"}%Change topic%TMPL:END% -%TMPL:P{"htmldoctype"}% -%TMPL:P{"head"}% -%TMPL:P{"bodystart"}% -%TMPL:P{"main"}% -%TMPL:P{"bodyend"}% \ No newline at end of file + Index: twiki.tmpl =================================================================== --- twiki.tmpl (revision 12220) +++ twiki.tmpl (working copy) @@ -4,18 +4,10 @@ %TMPL:DEF{"LOG_IN"}%Log In%TMPL:END% %TMPL:DEF{"LOG_OUT"}%Log Out%TMPL:END% - - %TMPL:DEF{"htmldoctype"}% %TMPL:END% - - -%TMPL:DEF{"templatescript"}%%TMPL:END% - - - %TMPL:DEF{"script"}% %TMPL:END% - - -%TMPL:DEF{"bodystart"}% - -#PageTop -%TMPL:END% - - %TMPL:DEF{"titleaction"}%(set preferences) %TMPL:END% %TMPL:DEF{"webaction"}%Preferences for%TMPL:END% @@ -41,7 +31,6 @@ %TMPL:DEF{"content"}% -%TMPL:P{"simpleheader"}% ---+ %TMPL:P{"webaction"}% %TOPIC%
@@ -53,8 +42,3 @@
%TMPL:P{"topicinfo"}%%TMPL:END% -%TMPL:P{"htmldoctype"}% -%TMPL:P{"head"}% -%TMPL:P{"bodystart"}% -%TMPL:P{"main"}% -%TMPL:P{"bodyend"}% Index: backlinks.tmpl =================================================================== --- backlinks.tmpl (revision 12220) +++ backlinks.tmpl (working copy) @@ -1,11 +1,6 @@ %TMPL:INCLUDE{"search"}% - -%TMPL:DEF{"standardheader"}%%TMPL:END% - - - %TMPL:DEF{"searchweb"}%%SEARCH{ search="%TOPIC%([^A-Za-z0-9]|$)|%SPACEOUT{"%TOPIC%" separator=" *"}%([^A-Za-z0-9]|$)|%WEB%.%TOPIC%([^A-Za-z0-9]|$)" type="regex" scope="text" nosearch="on" excludetopic="%TOPIC%" web="%WEB%" }%%TMPL:END% Index: renamebase.tmpl =================================================================== --- renamebase.tmpl (revision 12220) +++ renamebase.tmpl (working copy) @@ -11,7 +11,6 @@ %TMPL:DEF{"content"}%
-%TMPL:P{"simpleheader"}% ---+ %TMPL:P{"webaction"}% %TOPIC% | | *Web:* | * Topic:* | @@ -36,11 +35,3 @@ * The checkmarked topics will be updated (another form will appear which will _eventually_ allow you to rename any topics that were locked) %TMPL:P{"topicinfo"}%
%TMPL:END% - -%TMPL:DEF{"rename"}% -%TMPL:P{"htmldoctype"}% -%TMPL:P{"head"}% -%TMPL:P{"bodystart"}% -%TMPL:P{"main"}% -%TMPL:P{"bodyend"}% -%TMPL:END% \ No newline at end of file Index: oopsmore.tmpl =================================================================== --- oopsmore.tmpl (revision 12220) +++ oopsmore.tmpl (working copy) @@ -2,8 +2,9 @@ %TMPL:DEF{"titleaction"}%(more) %TMPL:END% %TMPL:DEF{"webaction"}% *Topic actions* %TMPL:END% %TMPL:DEF{"heading"}%More Actions on Topic [[%TOPIC%]]%TMPL:END% -%TMPL:DEF{"message"}% +%TMPL:DEF{"content"}% + * *%MAKETEXT{"Delete topic"}%* * %MAKETEXT{"Delete topic..."}%, %MAKETEXT{"looking for references in _all public webs_"}% *%MAKETEXT{"(recommended)"}%* @@ -52,6 +53,8 @@ * *Edit topic preference settings* - * Edit settings for this topic %TMPL:END% + * Edit settings for this topic + %TMPL:P{"topicinfo"}% + %TMPL:END% + %TMPL:DEF{"topicaction"}% [[%WEB%.%TOPIC%][Cancel]] %TMPL:END% -%TMPL:P{"oops"}% Index: attachagain.tmpl =================================================================== --- attachagain.tmpl (revision 12220) +++ attachagain.tmpl (working copy) @@ -1,4 +1,5 @@ %TMPL:INCLUDE{"attach"}% + %TMPL:DEF{"titleaction"}%(attach) %TMPL:END% %TMPL:DEF{"headerhelp"}% %TMPL:END% %TMPL:DEF{"webaction"}% Update attachment *%FILENAME%* on *%TOPIC%* %TMPL:END% Index: view.print.tmpl =================================================================== --- view.print.tmpl (revision 12220) +++ view.print.tmpl (working copy) @@ -17,12 +17,6 @@

%TMPL:P{"content"}% -%TMPL:P{"standardfooter"}%%TMPL:END% - -%TMPL:DEF{"content"}% -%TEXT% -%META{"form"}% -%META{"attachments"}%

@@ -31,11 +25,11 @@
-%TMPL:P{"copyright"}% +%TMPL:P{"standardfooter"}%%TMPL:END% + +%TMPL:DEF{"content"}% +%TEXT% +%META{"form"}% +%META{"attachments"}% %TMPL:END% -%TMPL:P{"htmldoctype"}% -%TMPL:P{"head"}% -%TMPL:P{"bodystart"}% -%TMPL:P{"main"}% -%TMPL:P{"bodyend"}% Index: oopsattention.tmpl =================================================================== --- oopsattention.tmpl (revision 12220) +++ oopsattention.tmpl (working copy) @@ -1,10 +1,11 @@ %TMPL:INCLUDE{"twiki"}% + %TMPL:DEF{"titleaction"}% %TMPL:END% %TMPL:DEF{"webaction"}%%TMPL:END% %TMPL:DEF{"heading"}%%MAKETEXT{"Attention"}%%TMPL:END% %TMPL:DEF{"topicaction"}% %TMPL:END% %TMPL:INCLUDE{"messages"}% -%TMPL:DEF{"message"}% + +%TMPL:DEF{"content"}% %INSTANTIATE% %TMPL:END% -%TMPL:P{"oops"}% Index: login.tmpl =================================================================== --- login.tmpl (revision 12220) +++ login.tmpl (working copy) @@ -7,15 +7,8 @@ %TMPL:DEF{"NEW_USER_NOTE"}%Enter a new username and password to change identity%TMPL:END% %TMPL:DEF{"UNRECOGNISED_USER"}%Unrecognised user and/or password.%TMPL:END% -%TMPL:DEF{"topbar"}% -

-
- %WIKILOGOALT% -
-
%TMPL:END% %TMPL:DEF{"content"}% -%TMPL:P{"simpleheader"}% ---+ %BANNER% %NOTE% %AUTHREALM% @@ -34,11 +27,8 @@

%TMPL:END% -%TMPL:DEF{"main"}%%TMPL:P{"topbar"}%

-%TMPL:P{"content"}% -%TMPL:P{"standardfooter"}%
%TMPL:END% -%TMPL:P{"htmldoctype"}% +%TMPL:DEF{"head"}% <nop>%WIKITOOLNAME% User Authentication @@ -49,6 +39,5 @@ %TMPL:P{"templatecustomstyle"}% -%TMPL:P{"bodystart"}% -%TMPL:P{"main"}% -%TMPL:P{"bodyend"}% +%TMPL:END% + Index: changeform.tmpl =================================================================== --- changeform.tmpl (revision 12220) +++ changeform.tmpl (working copy) @@ -6,7 +6,6 @@ %TMPL:DEF{"webaction"}% *Action* %TMPL:END% %TMPL:DEF{"content"}% -%TMPL:P{"simpleheader"}%
---++ Choose a new form template @@ -33,8 +32,3 @@ %TMPL:P{"topicinfo"}%
%TMPL:END% -%TMPL:P{"htmldoctype"}% -%TMPL:P{"head"}% -%TMPL:P{"bodystart"}% -%TMPL:P{"main"}% -%TMPL:P{"bodyend"}% \ No newline at end of file Index: view.tmpl =================================================================== --- view.tmpl (revision 12220) +++ view.tmpl (working copy) @@ -14,13 +14,9 @@ %META{"moved"}%
%TMPL:END% -%TMPL:DEF{"main"}% -
%BROADCASTMESSAGE% -%TMPL:P{"standardheader"}% -
-%TMPL:P{"content"}% -%TMPL:P{"standardfooter"}%%TMPL:END% +%TMPL:DEF{"simpleheader"}%%BROADCASTMESSAGE%%TMPL:P{"standardheader"}%%TMPL:END% + %TMPL:DEF{"inactive_edit"}%Edit%TMPL:END% %TMPL:DEF{"create_topic"}%Create%TMPL:END% %TMPL:DEF{"edit_topic"}%Edit%TMPL:END% @@ -49,8 +45,4 @@ %TMPL:P{"sep"}% %TMPL:P{"revisions"}% %TMPL:P{context="inactive" then="inactive_more" else="active_more"}%%TMPL:END% -%TMPL:P{"htmldoctype"}% -%TMPL:P{"head"}% -%TMPL:P{"bodystart"}% -%TMPL:P{"main"}% -%TMPL:P{"bodyend"}% \ No newline at end of file + Index: oopsaccessdenied.tmpl =================================================================== --- oopsaccessdenied.tmpl (revision 12220) +++ oopsaccessdenied.tmpl (working copy) @@ -1,11 +1,13 @@ %{ Templates for access denied messages. One DEF is selected and inserted at %INSTANTIATE }% %TMPL:INCLUDE{"twiki"}% + %TMPL:DEF{"titleaction"}%%MAKETEXT{"(oops)"}% %TMPL:END% %TMPL:DEF{"webaction"}% *%MAKETEXT{"Attention"}%* %TMPL:END% %TMPL:DEF{"heading"}%%MAKETEXT{"Access Denied"}%%TMPL:END% %TMPL:DEF{"topicaction"}% [[%MAINWEB%.%HOMETOPIC%][%MAKETEXT{"OK"}%]] %TMPL:END% + %TMPL:INCLUDE{"messages"}% -%TMPL:DEF{"message"}% + +%TMPL:DEF{"content"}% %INSTANTIATE% %TMPL:END% -%TMPL:P{"oops"}% \ No newline at end of file Index: backlinksallwebs.tmpl =================================================================== --- backlinksallwebs.tmpl (revision 12220) +++ backlinksallwebs.tmpl (working copy) @@ -6,7 +6,7 @@ -%TMPL:DEF{"content"}%%TMPL:P{"simpleheader"}%

Backlinks to %TOPIC% in all Webs  Search %WEB% Web only

+%TMPL:DEF{"content"}%

Backlinks to %TOPIC% in all Webs  Search %WEB% Web only

%TMPL:P{"searchweb"}% %TMPL:P{"searchallwebs"}% %TMPL:P{"topicinfo"}% Index: oopsleaseconflict.tmpl =================================================================== --- oopsleaseconflict.tmpl (revision 12220) +++ oopsleaseconflict.tmpl (working copy) @@ -5,8 +5,9 @@ %TMPL:DEF{"heading"}%%MAKETEXT{"Conflict"}%%TMPL:END% %TMPL:DEF{"topicaction"}%%TMPL:END% %TMPL:INCLUDE{"messages"}% -%TMPL:DEF{"message"}% +%TMPL:DEF{"content"}% + %{ Instantiate either lease_active or lease_old }% %INSTANTIATE% @@ -26,7 +27,7 @@ %TMPL:END% + %TMPL:DEF{"topicaction"}% [[%WEB%.%TOPIC%][%MAKETEXT{"View topic"}%]] %TMPL:P{"sep"}% View raw text without formatting%TMPL:END% -%TMPL:P{"oops"}% Index: oopschangelanguage.tmpl =================================================================== --- oopschangelanguage.tmpl (revision 12220) +++ oopschangelanguage.tmpl (working copy) @@ -8,7 +8,7 @@ %ICON{info}% %MAKETEXT{"You can set your favorite language permanently by setting the [_1] variable in your user topic." args="*LANGUAGE*"}% %TMPL:END% -%TMPL:DEF{"message"}% +%TMPL:DEF{"content"}% %MAKETEXT{"TWiki's user interface is available in several languages. If you want to change the language for this session, choose one of the following and hit \"Change language\". Otherwise, follow the \"Cancel\" link on the bottom of the page to return to the previous topic."}% @@ -24,4 +24,3 @@ %TMPL:P{"languagenotes"}% %TMPL:END% -%TMPL:P{"oops"}% \ No newline at end of file Index: edittext.tmpl =================================================================== --- edittext.tmpl (revision 12220) +++ edittext.tmpl (working copy) @@ -3,7 +3,6 @@ %TMPL:DEF{"titleaction"}%(edit text)%TMPL:END% %TMPL:DEF{"content"}% -%TMPL:P{"simpleheader"}%