Menu
▾
▴
[TWiki-Dev] [SVN] ArthurClemens r13179 - in twiki/branches/MAIN/twikiplugins/PatternSkin: pub/TWiki/PatternSkin templates
|
From: <de...@de...> - 2007-03-18 19:05:28
|
Author: ArthurClemens
Date: 2007-03-18 14:05:27 -0500 (Sun, 18 Mar 2007)
New Revision: 13179
Removed:
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/body.pattern.tmpl
Modified:
twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/attach.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/backlinks.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/changeform.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/constants.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/edit.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oops.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/page.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/preview.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/rdiff.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/renamebase.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/view.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/viewprint.pattern.tmpl
Log:
Item3783: Pattern skin small template refactoring
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css 2007-03-18 16:49:11 UTC (rev 13178)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css 2007-03-18 19:05:27 UTC (rev 13179)
@@ -245,10 +245,12 @@
.editTable .twikiTable {
margin:0 0 2px 0;
}
+/*
.editTableInput,
.editTableTextarea {
font-family:monospace;
}
+*/
.editTableEditImageButton {
border:none;
}
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/attach.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/attach.pattern.tmpl 2007-03-18 16:49:11 UTC (rev 13178)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/attach.pattern.tmpl 2007-03-18 19:05:27 UTC (rev 13179)
@@ -1,8 +1,5 @@
-%TMPL:INCLUDE{"page"}%
-%TMPL:INCLUDE{"logo"}%
-%TMPL:INCLUDE{"viewtoolbar"}%
-%TMPL:INCLUDE{"viewtopicactionbuttons"}%
-%TMPL:INCLUDE{"viewbottombar"}%
+%TMPL:INCLUDE{"app"}%
+%TMPL:DEF{"logo"}%%TMPL:END%
@@ -49,8 +46,7 @@
%TMPL:DEF{"formstart"}%<div class="patternAttachForm"><form name="main" enctype="multipart/form-data" action="%SCRIPTURLPATH{"upload"}%/%INTURLENCODE{"%WEB%/%TOPIC%"}%" method="post">%TMPL:END%
-%TMPL:DEF{"formend"}%</div><!-- /patternAttachForm-->
-</form>%TMPL:END%
+%TMPL:DEF{"formend"}%</form></div><!-- /patternAttachForm-->%TMPL:END%
@@ -86,7 +82,7 @@
%TMPL:P{"pagehelp"}%
%TMPL:P{"formstart"}%
%TMPL:P{"attachform"}%
-%TMPL:P{"topicaction"}%
+%TMPL:P{"topicaction"}%%TMPL:P{"formend"}%
%TMPL:P{"movedelete"}%
%TMPL:P{"pagehelp_nojavascript"}%
</div><!-- /patternTopic-->
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/backlinks.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/backlinks.pattern.tmpl 2007-03-18 16:49:11 UTC (rev 13178)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/backlinks.pattern.tmpl 2007-03-18 19:05:27 UTC (rev 13179)
@@ -6,10 +6,6 @@
-%TMPL:DEF{"windowtitle"}%<title>%TMPL:P{"titleaction"}%<nop>%TOPIC% %TMPL:P{"titlesep"}% %WEB% %TMPL:P{"titlesep"}% <nop>%WIKITOOLNAME%</title>%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%
Deleted: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/body.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/body.pattern.tmpl 2007-03-18 16:49:11 UTC (rev 13178)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/body.pattern.tmpl 2007-03-18 19:05:27 UTC (rev 13179)
@@ -1,17 +0,0 @@
-%TMPL:DEF{"body"}%<body class="%TMPL:P{"bodyclassname"}%"><a name="PageTop"></a>
-<div id="patternScreen">
-<div id="patternPageShadow">
-<div id="patternPage">
-%TMPL:P{"startleftbarwrapper"}%<div id="patternOuter">
-<div id="patternFloatWrap">
-<div id="patternMain">%TMPL:P{"topbarspacer"}%
-<div id="patternMainContents">%TMPL:P{"logo"}%%TMPL:P{"content"}%
-</div><!-- /patternMainContents-->
-</div><!-- /patternMain-->%TMPL:P{"leftbar"}%
-</div><!-- /patternFloatWrap-->
-<div class="clear"> </div>
-</div><!-- /patternOuter-->%TMPL:P{"endleftbarwrapper"}%%TMPL:P{"topbar"}%%TMPL:P{"bottombar"}%
-</div><!-- /patternPage-->
-</div><!-- /patternPageShadow-->
-</div><!-- /patternScreen-->
-</body></html>%TMPL:END%
\ No newline at end of file
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/changeform.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/changeform.pattern.tmpl 2007-03-18 16:49:11 UTC (rev 13178)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/changeform.pattern.tmpl 2007-03-18 19:05:27 UTC (rev 13179)
@@ -1,13 +1,12 @@
-%TMPL:INCLUDE{"page"}%
-%TMPL:INCLUDE{"viewtopicactionbuttons"}%
-%TMPL:INCLUDE{"viewbottombar"}%
+%TMPL:INCLUDE{"app"}%
+%TMPL:DEF{"logo"}%%TMPL:END%%{ don't show a logo to make best use of screen estate }%
%TMPL:DEF{"titleaction"}%%MAKETEXT{"(change form)"}% %TMPL:END%
-%TMPL:DEF{"pagetitle"}%<h1 class="patternTemplateTitle">%MAKETEXT{"Choose a new form for [_1]" args="[[%TOPIC%]]"}%</h1>%TMPL:END%
+%TMPL:DEF{"pagetitle"}%<h1 class="patternTemplateTitle">%MAKETEXT{"Choose a new form for [_1]" args="<nop>%TOPIC%"}%</h1>%TMPL:END%
%TMPL:DEF{"webaction"}% *%MAKETEXT{"Action"}%* %TMPL:END%
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/constants.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/constants.pattern.tmpl 2007-03-18 16:49:11 UTC (rev 13178)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/constants.pattern.tmpl 2007-03-18 19:05:27 UTC (rev 13179)
@@ -1,9 +1,6 @@
%TMPL:DEF{"sep"}%<span class='twikiSeparator'> | </span>%TMPL:END%
-%TMPL:DEF{"titlesep"}%<%TMPL:END%
-
-
%TMPL:DEF{"LOG_IN"}%%MAKETEXT{"Log In"}%%TMPL:END%
%TMPL:DEF{"LOG_OUT"}%%MAKETEXT{"Log Out"}%%TMPL:END%
@@ -11,9 +8,7 @@
%TMPL:DEF{"canceltopicaction"}%<a href="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%" title='%MAKETEXT{"Back to topic"}%' %MAKETEXT{"accesskey='c'"}% rel='nofollow'>%MAKETEXT{"&Cancel"}%</a>%TMPL:END%
-
%TMPL:DEF{"bodyclassname"}%patternNoViewPage%TMPL:END%
-
-%TMPL:DEF{"windowtitle"}%<title>%TMPL:P{"titleaction"}% <nop>%TOPIC% %TMPL:P{"titlesep"}% %WEB% %TMPL:P{"titlesep"}% <nop>%WIKITOOLNAME%</title>%TMPL:END%
\ No newline at end of file
+%TMPL:DEF{"windowtitle"}%%TMPL:P{"titleaction"}% <nop>%TOPIC% < %WEB% < <nop>%WIKITOOLNAME%%TMPL:END%
\ No newline at end of file
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/edit.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/edit.pattern.tmpl 2007-03-18 16:49:11 UTC (rev 13178)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/edit.pattern.tmpl 2007-03-18 19:05:27 UTC (rev 13179)
@@ -1,10 +1,9 @@
-%TMPL:INCLUDE{"page"}%
-%TMPL:INCLUDE{"viewtoolbar"}%
-%TMPL:INCLUDE{"viewtopicactionbuttons"}%
-%TMPL:INCLUDE{"viewbottombar"}%
+%TMPL:INCLUDE{"app"}%
+%TMPL:DEF{"logo"}%%TMPL:END%%{ don't show a logo to make best use of screen estate }%
+
%TMPL:DEF{"templatejavascript"}%<script type="text/javascript" src="%PUBURLPATH%/%TWIKIWEB%/TWikiJavascripts/twiki_edit.js"></script>
%TMPL:END%
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oops.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oops.pattern.tmpl 2007-03-18 16:49:11 UTC (rev 13178)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oops.pattern.tmpl 2007-03-18 19:05:27 UTC (rev 13179)
@@ -1,7 +1,4 @@
-%TMPL:INCLUDE{"page"}%
-%TMPL:INCLUDE{"logo"}%
-%TMPL:INCLUDE{"viewtopicactionbuttons"}%
-%TMPL:INCLUDE{"viewbottombar"}%
+%TMPL:INCLUDE{"app"}%
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/page.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/page.pattern.tmpl 2007-03-18 16:49:11 UTC (rev 13178)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/page.pattern.tmpl 2007-03-18 19:05:27 UTC (rev 13179)
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="%LANG%" lang="%LANG%">
<head>
-%TMPL:P{"windowtitle"}%
+<title>%TMPL:P{"windowtitle"}%</title>
<meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
<link rel="icon" href="%FAVICON%" type="image/x-icon" />
<link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" />
@@ -9,8 +9,24 @@
%TMPL:P{"javascript"}%
%TMPL:P{"styles"}%
</head>
-%TMPL:P{"body"}%
+<body class="%TMPL:P{"bodyclassname"}%"><a name="PageTop"></a>
+<div id="patternScreen">
+<div id="patternPageShadow">
+<div id="patternPage">
+%TMPL:P{"startleftbarwrapper"}%<div id="patternOuter">
+<div id="patternFloatWrap">
+<div id="patternMain">%TMPL:P{"topbarspacer"}%
+<div id="patternMainContents">%TMPL:P{"logo"}%%TMPL:P{"content"}%
+</div><!-- /patternMainContents-->
+</div><!-- /patternMain-->%TMPL:P{"leftbar"}%
+</div><!-- /patternFloatWrap-->
+<div class="clear"> </div>
+</div><!-- /patternOuter-->%TMPL:P{"endleftbarwrapper"}%%TMPL:P{"topbar"}%%TMPL:P{"bottombar"}%
+</div><!-- /patternPage-->
+</div><!-- /patternPageShadow-->
+</div><!-- /patternScreen-->
+</body>
+</html>
%TMPL:INCLUDE{"constants"}%
%TMPL:INCLUDE{"javascript"}%
%TMPL:INCLUDE{"styles"}%
-%TMPL:INCLUDE{"body"}%
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/preview.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/preview.pattern.tmpl 2007-03-18 16:49:11 UTC (rev 13178)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/preview.pattern.tmpl 2007-03-18 19:05:27 UTC (rev 13179)
@@ -1,7 +1,5 @@
-%TMPL:INCLUDE{"page"}%
-%TMPL:INCLUDE{"viewtoolbar"}%
-%TMPL:INCLUDE{"viewtopicactionbuttons"}%
-%TMPL:INCLUDE{"viewbottombar"}%
+%TMPL:INCLUDE{"app"}%
+%TMPL:DEF{"logo"}%%TMPL:END%%{ don't show a logo to make best use of screen estate }%
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/rdiff.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/rdiff.pattern.tmpl 2007-03-18 16:49:11 UTC (rev 13178)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/rdiff.pattern.tmpl 2007-03-18 19:05:27 UTC (rev 13179)
@@ -1,8 +1,5 @@
%TMPL:INCLUDE{"searchbase"}%
-%TMPL:INCLUDE{"page"}%
-%TMPL:INCLUDE{"viewtopicactionbuttons"}%
-%TMPL:INCLUDE{"viewbottombar"}%
-%TMPL:INCLUDE{"logo"}%
+%TMPL:INCLUDE{"app"}%
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/renamebase.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/renamebase.pattern.tmpl 2007-03-18 16:49:11 UTC (rev 13178)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/renamebase.pattern.tmpl 2007-03-18 19:05:27 UTC (rev 13179)
@@ -1,7 +1,4 @@
-%TMPL:INCLUDE{"page"}%
-%TMPL:INCLUDE{"logo"}%
-%TMPL:INCLUDE{"viewtopicactionbuttons"}%
-%TMPL:INCLUDE{"viewbottombar"}%
+%TMPL:INCLUDE{"app"}%
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/view.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/view.pattern.tmpl 2007-03-18 16:49:11 UTC (rev 13178)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/view.pattern.tmpl 2007-03-18 19:05:27 UTC (rev 13179)
@@ -2,9 +2,9 @@
%TMPL:INCLUDE{"viewtopbar"}%
%TMPL:INCLUDE{"viewtoolbar"}%
%TMPL:INCLUDE{"viewleftbar"}%
-%TMPL:INCLUDE{"viewrightbar"}%
%TMPL:INCLUDE{"viewtopicactionbuttons"}%
%TMPL:INCLUDE{"viewbottombar"}%
+%TMPL:DEF{"logo"}%%TMPL:END%%{ no logo because we have a top bar }%
@@ -12,11 +12,6 @@
-%{ no logo because we have a top bar }%
-%TMPL:DEF{"logo"}%%TMPL:END%
-
-
-
%TMPL:DEF{"bodyclassname"}%patternViewPage%TMPL:END%
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/viewprint.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/viewprint.pattern.tmpl 2007-03-18 16:49:11 UTC (rev 13178)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/viewprint.pattern.tmpl 2007-03-18 19:05:27 UTC (rev 13179)
@@ -1,8 +1,7 @@
-%TMPL:INCLUDE{"page"}%
-%TMPL:INCLUDE{"viewbottombar"}%
+%TMPL:INCLUDE{"app"}%
+%TMPL:DEF{"logo"}%%TMPL:END%
%TMPL:DEF{"templatescript"}%%TMPL:END%
-%TMPL:DEF{"logo"}%%TMPL:END%
%TMPL:DEF{"styles"}%
|