From: <de...@de...> - 2007-06-09 22:13:53
|
Author: ArthurClemens Date: 2007-06-09 17:13:52 -0500 (Sat, 09 Jun 2007) New Revision: 14076 Modified: twiki/branches/MAIN/templates/css.tmpl twiki/branches/MAIN/templates/twiki.tmpl Log: Item4128: rename css TMPL to templatestyle and put it in the head instead of in body Modified: twiki/branches/MAIN/templates/css.tmpl =================================================================== --- twiki/branches/MAIN/templates/css.tmpl 2007-06-09 22:13:38 UTC (rev 14075) +++ twiki/branches/MAIN/templates/css.tmpl 2007-06-09 22:13:52 UTC (rev 14076) @@ -2,4 +2,4 @@ /* to hide Twisty elements: */ .twistyHidden { display:none; } .twistyMakeVisible { display:none; } -</style> \ No newline at end of file +</style>%TMPL:P{"templatestyle"}% \ No newline at end of file Modified: twiki/branches/MAIN/templates/twiki.tmpl =================================================================== --- twiki/branches/MAIN/templates/twiki.tmpl 2007-06-09 22:13:38 UTC (rev 14075) +++ twiki/branches/MAIN/templates/twiki.tmpl 2007-06-09 22:13:52 UTC (rev 14076) @@ -30,7 +30,7 @@ %TMPL:DEF{"windowtitle"}%<title>%TMPL:P{"titleaction"}% <nop>%TOPIC%%TMPL:P{"titlesep"}%%WEB%%TMPL:P{"titlesep"}%<nop>%WIKITOOLNAME%</title>%TMPL:END% -%TMPL:DEF{"twikistyle"}%%TMPL:INCLUDE{"css"}%%TMPL:END% +%TMPL:DEF{"twikistyle"}%%TMPL:INCLUDE{"css"}%%TMPL:END%%TMPL:END% %TMPL:DEF{"head"}%<head> %TMPL:P{"windowtitle"}% @@ -138,8 +138,8 @@ %TMPL:DEF{"login_actions"}%%IF{"context authenticated" then='%MAKETEXT{"Hello [_1]!" args="[[%WIKIUSERNAME%][%SPACEOUT{%WIKINAME%}%]]"}%%BR%%LOGOUT%' else='%LOGIN% %MAKETEXT{"or"}% [[%TWIKIWEB%.TWikiRegistration][%MAKETEXT{"Register"}%]]'}%%TMPL:END% %{ app-style page layout }% -%{ optional inline CSS styles to be placed in body text: }% -%TMPL:DEF{"bodystyle"}%%TMPL:END% +%{ additional style }% +%TMPL:DEF{"templatestyle"}%%TMPL:END% %{ title string in page: }% %TMPL:DEF{"pagetitle"}%%TMPL:END% %{ main application contents: }% |