Changeset 657

Timestamp:

11/14/08 16:42:45 (4 years ago)

Author:

KennethLavrsen

Message:

Item109: Finishing the TWikiTemplates to SkinTemplates and TemplateTopics split

Location:

branches/Release04x02

Files:

• data/TWiki/SkinTemplates.txt (modified) (1 diff)
• data/TWiki/TWikiUpgradeGuide.txt (modified) (1 diff)
• lib/MANIFEST (modified) (3 diffs)
• lib/TWiki/Func.pm (modified) (2 diffs)
• pub/TWiki/SkinTemplates/testscreen.gif (deleted)
• templates/css.tmpl (modified) (1 diff)
• templates/oopsmore.tmpl (modified) (1 diff)
• tools/TWikiKernel/MANIFEST (modified) (3 diffs)
• twikiplugins/CommentPlugin/data/TWiki/CommentPlugin.txt (modified) (3 diffs)
• twikiplugins/CommentPlugin/data/TWiki/CommentPluginTemplate.txt (modified) (2 diffs)
• twikiplugins/TinyMCEPlugin/data/TWiki/TinyMCEPlugin.txt (modified) (1 diff)
• twikiplugins/TopicUserMappingContrib/data/TWiki/ManagingUsers.txt (modified) (1 diff)

branches/Release04x02/data/TWiki/SkinTemplates.txt

@@ -54 +54 @@
 See IfStatements for details of supported context identifiers.
 
+#FindingTemplates
 ---+++ Finding Skin Templates
 

branches/Release04x02/data/TWiki/TWikiUpgradeGuide.txt

@@ -156 +156 @@
 ---+++ Template spec changed
 
-Until TWiki 4.0.5 TWiki.TWikiTemplates the text inside template definition blocks (anything between %<nop>TMPL:DEF{"block"}% and %<nop>TMPL:END% was stripped of leading and trailing white space incl new lines.
+Until TWiki 4.0.5 !SkinTemplates (formerly !TWikiTemplates) the text inside template definition blocks (anything between %<nop>TMPL:DEF{"block"}% and %<nop>TMPL:END% was stripped of leading and trailing white space incl new lines.
 
 This caused a lot of problems for skin developers when you wanted a newline before or after the block text.

branches/Release04x02/lib/MANIFEST

@@ -157 +157 @@
 data/TWiki/SitePermissions.txt 0644
 data/TWiki/Skins.txt 0644
+data/TWiki/SkinTemplates.txt 0644
 data/TWiki/StandardColors.txt 0644
 data/TWiki/StartingPoints.txt 0644
 data/TWiki/StaticMethod.txt 0644
+data/TWiki/TemplatesTopics.txt 0644
 data/TWiki/TwentyMinuteTutorial.txt 0644
 data/TWiki/TWikiJavascripts.txt 0644
@@ -171 +173 @@
 data/TWiki/TWikiSkinBrowser.txt 0644
 data/TWiki/TWikiSystemRequirements.txt 0644
-data/TWiki/TWikiTemplates.txt 0644
 data/TWiki/TWikiTopics.txt 0644
 data/TWiki/TWikiUpgradeGuide.txt 0644
@@ -979 +980 @@
 pub/TWiki/TWikiJavascripts/twikiuiToggle.js 0644
 pub/TWiki/TWikiJavascripts/unicode_chars.js 0644
-pub/TWiki/TWikiTemplates/base.css 0644
-pub/TWiki/TWikiTemplates/default.css 0644
-pub/TWiki/TWikiTemplates/oopsmore_diff_debug.gif 0644
-pub/TWiki/TWikiTemplates/oopsmore_diff_sequential.gif 0644
-pub/TWiki/TWikiTemplates/oopsmore_diff_sidebyside.gif 0644
-pub/TWiki/TWikiTemplates/testscreen.gif 0644
+pub/TWiki/SkinTemplates/base.css 0644
+pub/TWiki/SkinTemplates/default.css 0644
+pub/TWiki/SkinTemplates/oopsmore_diff_debug.gif 0644
+pub/TWiki/SkinTemplates/oopsmore_diff_sequential.gif 0644
+pub/TWiki/SkinTemplates/oopsmore_diff_sidebyside.gif 0644
 pub/TWiki/WabiSabi/wabisabi.gif 0644
 pub/TWiki/WebPreferences/Dakar.gif 0644

branches/Release04x02/lib/TWiki/Func.pm

@@ -1909 +1909 @@
 ---+++ readTemplate( $name, $skin ) -> $text
 
-Read a template or skin. Embedded [[%SYSTEMWEB%.TWikiTemplates][template directives]] get expanded
+Read a template or skin. Embedded [[%SYSTEMWEB%.SkinTemplates][template directives]] get expanded
    * =$name= - Template name, e.g. ='view'=
    * =$skin= - Comma-separated list of skin names, optional, e.g. ='print'=
@@ -1939 +1939 @@
 list of loaded templates, overwriting any previous definition.
 
-How TWiki searches for templates is described in TWikiTemplates.
+How TWiki searches for templates is described in SkinTemplates.
 
 If template text is found, extracts include statements and fully expands them.

branches/Release04x02/templates/css.tmpl

@@ -9 +9 @@
 
 %TMPL:DEF{"twikibase"}%<style type="text/css" media="all">
-@import url('%PUBURLPATH%/%SYSTEMWEB%/TWikiTemplates/base.css');
+@import url('%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/base.css');
 </style>%TMPL:END%
 
 
 %TMPL:DEF{"twikistyle"}%<style type="text/css" media="all">
-@import url('%PUBURLPATH%/%SYSTEMWEB%/TWikiTemplates/default.css');
+@import url('%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/default.css');
 </style>%TMPL:END%
 

branches/Release04x02/templates/oopsmore.tmpl

@@ -95 +95 @@
 <form name="main" action="%SCRIPTURLPATH{"rdiff"}%/%WEB%/%TOPIC%">
    * %MAKETEXT{"Older revision:"}% <input class="twikiInputField" type="text" name="rev2" size="6" value="1" /> &nbsp; %MAKETEXT{"Newer revision:"}% <input class="twikiInputField" type="text" name="rev1" size="6" value="%PARAM1%" /><br />
-     <table class="twikiTable twikiDiffOptions"><tr><td><label for="sequential"><img src="%PUBURLPATH%/%SYSTEMWEB%/TWikiTemplates/oopsmore_diff_sequential.gif" alt="sequential" width="80" height="80" /></label></td><td><label for="sidebyside"><img src="%PUBURLPATH%/%SYSTEMWEB%/TWikiTemplates/oopsmore_diff_sidebyside.gif" alt="side by side" width="80" height="80" /></label></td><td><label for="debug"><img src="%PUBURLPATH%/%SYSTEMWEB%/TWikiTemplates/oopsmore_diff_debug.gif" alt="debug" width="80" height="80" /></label></td></tr><tr><td><input type="radio" name="render" id="sequential" value="sequential" checked="checked" /><label for="sequential"> %MAKETEXT{"Sequential"}%</label></td><td><input type="radio" name="render" id="sidebyside" value="sidebyside" /><label for="sidebyside"> %MAKETEXT{"Side by side"}%</label></td><td><input type="radio" name="render" id="debug" value="debug" /><label for="debug"> %MAKETEXT{"Debug"}%</label></td></tr></table>
+     <table class="twikiTable twikiDiffOptions"><tr><td><label for="sequential"><img src="%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/oopsmore_diff_sequential.gif" alt="sequential" width="80" height="80" /></label></td><td><label for="sidebyside"><img src="%PUBURLPATH%/%SYSTEMWEB%/TWikiTemplates/oopsmore_diff_sidebyside.gif" alt="side by side" width="80" height="80" /></label></td><td><label for="debug"><img src="%PUBURLPATH%/%SYSTEMWEB%/TWikiTemplates/oopsmore_diff_debug.gif" alt="debug" width="80" height="80" /></label></td></tr><tr><td><input type="radio" name="render" id="sequential" value="sequential" checked="checked" /><label for="sequential"> %MAKETEXT{"Sequential"}%</label></td><td><input type="radio" name="render" id="sidebyside" value="sidebyside" /><label for="sidebyside"> %MAKETEXT{"Side by side"}%</label></td><td><input type="radio" name="render" id="debug" value="debug" /><label for="debug"> %MAKETEXT{"Debug"}%</label></td></tr></table>
      <input type="submit" class="twikiButton" value='%MAKETEXT{"View difference"}%' />
 </form>

branches/Release04x02/tools/TWikiKernel/MANIFEST

@@ -147 +147 @@
 data/TWiki/SitePermissions.txt 0660
 data/TWiki/Skins.txt 0660
+data/TWiki/SkinTemplates.txt 0660
 data/TWiki/StandardColors.txt 0660
 data/TWiki/StartingPoints.txt 0660
 data/TWiki/StaticMethod.txt 0660
+data/TWiki/TemplatesTopics.txt 0660
 data/TWiki/TwentyMinuteTutorial.txt 0660
 data/TWiki/TWiki.txt 0660
@@ -161 +163 @@
 data/TWiki/TWikiSkinBrowser.txt 0660
 data/TWiki/TWikiSystemRequirements.txt 0660
-data/TWiki/TWikiTemplates.txt 0660
 data/TWiki/TWikiTopics.txt 0660
 data/TWiki/TWikiUpgradeGuide.txt 0660
@@ -572 +573 @@
 pub/TWiki/ProjectLogos/T-logo.svg 0660
 pub/TWiki/ProjectLogos/favicon.ico 0660
-pub/TWiki/TWikiTemplates/testscreen.gif 0660
 pub/TWiki/TWikiJavascripts/twiki.js 0660
 pub/TWiki/TWikiJavascripts/twiki_attach.js 0660

branches/Release04x02/twikiplugins/CommentPlugin/data/TWiki/CommentPlugin.txt

@@ -91 +91 @@
 Customisation of the comment plugin requires
         * familiarity with HTML forms
-        * some familiarity with the [[%SYSTEMWEB%.TWikiTemplates][TWiki templating language]].
+        * some familiarity with the [[%SYSTEMWEB%.SkinTemplates][Skin Templates]].
 
 To define a comment type, you have to provide two simple template definitions in the template file; one for the prompt box, and one for the generated output. If we have a template type "mytype", these are named =PROMPT:mytype= and =OUTPUT:mytype= respectively. See =comments.tmpl= in the templates directory for examples.
@@ -116 +116 @@
 
 
-%X% Templates are picked up by following the [[TWikiTemplates#Finding_Templates][standard TWiki rules]] for locating template files. Note that you can use =%TMPL:INCLUDE= to include other files of templates. %BR%
-%X% Note that from TWiki release 4.1.0 leading and trailing whitespace is no longer stripped. This means that when you upgrade to TWiki 4.1.X you may need to remove the first line break in your custom comment templates. See TWiki.TWikiReleaseNotes04x01 for more information.
+%X% Templates are picked up by following the [[SkinTemplates#FindingTemplates][standard rules for locating template files]]. Note that you can use =%TMPL:INCLUDE= to include other files of templates. %BR%
 
 ---+++ Customisation example
@@ -229 +228 @@
 | =%<nop>COMMENTPLUGIN_TEMPLATES%= | =comments= | Name of template file in the 'templates' directory that contains the comment templates. The default 'comments.tmpl' automatically includes user templates from %SYSTEMWEB%.CommentPluginTemplate, which in turn includes %SYSTEMWEB%.UserCommentsTemplate. |
 | =%<nop>COMMENTPLUGIN_DEFAULT_TYPE%= | =above= | Default template type |
-These can be set in !SitePreferences, in !WebPreferences or in individual topics.
+These can be set in !%SYSTEMWEB%.DefaultPreferences, !%USERSWEB%.SitePreferences, in !WebPreferences, or in individual topics.
 
 #Installation

branches/Release04x02/twikiplugins/CommentPlugin/data/TWiki/CommentPluginTemplate.txt

@@ -1 @@
-%META:TOPICINFO{author="ProjectContributor" date="1166310108" format="1.0" version="$Rev: 16647 $"}%
+%META:TOPICINFO{author="ProjectContributor" date="1166310108" format="1.0" version="$Rev: 15131 $"}%
 %META:TOPICPARENT{name="CommentPlugin"}%
 
@@ -6 +6 @@
 See [[%SYSTEMWEB%.CommentPlugin#Customisation][CommentPlugin: Customisation]] for help.
 
-While this topic can be viewed as a TWiki topic, it is used by the CommentPlugin as a template file - see TWikiTemplates. The important content in here is in the verbatim blocks. The rest of the topic is just comments.
+While this topic can be viewed as a TWiki topic, it is used by the CommentPlugin as a template file. The syntax is the same as used for the templates used for presentation in skins - see SkinTemplates. The important content in here is in the verbatim blocks. The rest of the topic is just comments.
 
 %ICON{"hand"}% See CommentPluginExamples to view rendered templates

branches/Release04x02/twikiplugins/TinyMCEPlugin/data/TWiki/TinyMCEPlugin.txt

@@ -89 +89 @@
    theme_advanced_path: false,
    theme_advanced_statusbar_location : "bottom",
-   content_css : "%PUBURLPATH%/%SYSTEMWEB%/TinyMCEPlugin/wysiwyg%IF{"$TINYMCEPLUGIN_DEBUG" then="_src"}%.css,%PUBURLPATH%/%SYSTEMWEB%/TWikiTemplates/base.css,%TWIKISTYLEURL%,%TWIKICOLORSURL%"
+   content_css : "%PUBURLPATH%/%SYSTEMWEB%/TinyMCEPlugin/wysiwyg%IF{"$TINYMCEPLUGIN_DEBUG" then="_src"}%.css,%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/base.css,%TWIKISTYLEURL%,%TWIKICOLORSURL%"
 </verbatim>
    * Additional settings for specific browsers.

branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/ManagingUsers.txt

@@ -92 +92 @@
    3 Email to notify the TWiki admin of registration - =templates/registernotifyadmin.tmpl=
 
-As these are TWikiTemplates, they can be customized and selected using the SKIN path setting.
+As these are SkinTemplates, they can be customized and selected using the SKIN path setting.
 Because there are default tmpl files in the =templates= dir, this cannot use Template topics.