Skip to content

Commit

Permalink
Item14664: Add some more Config web changes.
Browse files Browse the repository at this point in the history
Change SitePreferences into a templated topic.
  • Loading branch information
gac410 committed Mar 21, 2018
1 parent e299d30 commit 7be5c97
Show file tree
Hide file tree
Showing 12 changed files with 86 additions and 69 deletions.
21 changes: 11 additions & 10 deletions CommentPlugin/data/System/CommentPlugin.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1516632401" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1521606920" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! Comment Plugin

Expand Down Expand Up @@ -81,12 +81,13 @@ To define a comment type, you have to provide at least two simple template defin
The plugin picks up these template definitions from a standard template file, =templates/comments.tmpl=. This allows different templates to be defined for different Foswiki skins.

---+++ Defining custom templates
By default, =templates/comments.tmpl= includes the topic %SYSTEMWEB%.CommentPluginTemplate, which contains all the shipped standard templates and in turn includes %SYSTEMWEB%.<nop>UserCommentsTemplate that can include non-standard customizations.
By default, =templates/comments.tmpl= includes the topic %SYSTEMWEB%.CommentPluginTemplate, which contains all the shipped standard templates and
in turn includes the =UserCommentsTemplate= using the template search path.

This allows for several levels of customization:
1 To *override all default templates, everywhere*, change =comments.tmpl= to include a different topic (this customization will be lost next time you upgrade, though).
1 To add *site-wide local template customizations*, add them to %SYSTEMWEB%.UserCommentsTemplate (create if it does not exist yet). You can redefine the standard templates here if you want, and your definitions will override the standard definitions.
1 To override templates on a *web-by-web basis*, add a topic =UserCommentsTemplate= to the web (this will replace %SYSTEMWEB%.<nop>UserCommentsTemplate)
1 To *override all default templates, everywhere*, place your own version of %SYSTEMWEB%.CommentPluginTemplate into [[%CONFIGWEB%.CommentPluginTemplate]]. This will completely override the copy of it in the %SYSTEMWEB% Web unless it's explicitly Included..
1 To add *site-wide local template customizations*, add them to [[%CONFIGWEB%.UserCommentsTemplate]] (create if it does not exist yet). You can redefine the standard templates here if you want, and your definitions will override the standard definitions.
1 To override templates on a *web-by-web basis*, add a topic =UserCommentsTemplate= to the web. Note that this will NOT override a =UserCommentsTemplate= topic placed into the %CONFIGWEB%.)
1 To override templates *for a specific skin*, add them to %SYSTEMWEB%.<nop>UserComments&lt;Skin&gt;Template (where &lt;Skin&gt; is the name of the skin with the first letter capitalized, e.g. Pattern)

You can also define a *comment template in a topic*, by passing the topic location with =templatetopic=. For example:
Expand Down Expand Up @@ -336,8 +337,8 @@ Another great Foswiki extension from the <img src="%ATTACHURLPATH%/wikiringlogo2
%META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
%META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/CommentPlugin"}%
%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/CommentPlugin"}%
%META:FILEATTACHMENT{name="comment.uncompressed.css" attr="h" comment="" date="1516632401" size="70" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="comment.js" attr="h" comment="" date="1516632401" size="1931" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="comment.css" attr="h" comment="" date="1516632401" size="60" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="comment.uncompressed.js" attr="h" comment="" date="1516632401" size="5134" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1516632401" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="comment.uncompressed.css" attr="h" comment="" date="1521606920" size="70" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="comment.js" attr="h" comment="" date="1521606920" size="1931" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="comment.css" attr="h" comment="" date="1521606920" size="60" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="comment.uncompressed.js" attr="h" comment="" date="1521606920" size="5134" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1521606920" size="1343" user="ProjectContributor" version="1"}%
29 changes: 15 additions & 14 deletions EditTablePlugin/data/System/EditTablePlugin.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1521596899" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1521606920" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! Edit Table Plugin

Expand Down Expand Up @@ -215,7 +215,8 @@ Test if the Plugin is correctly installed:
| 13 Sep 2009: | 4.32: Arthur Clemens: Fix possible sorting issue on edit screen when no TABLE tag is present. |
| 02 Sep 2009: | 4.31: Kenneth Lavrsen: Disabled the display of SpreadSheetPlugin "CALC" in headers and footers as this caused the string CALC to be saved instead of the real formular. |
| 14 Jun 2009: | 4.30: Arthur Clemens: Major code refactoring to let !EditTablePlugin work together with !SpreadSheetPlugin. |
| 18 Apr 2009: | 4.22: Ignore all saving unless it happened by saving a form using POST method. <br />Fixed including edit parameters from subwebs. <br />Removed support for settings in the plugin topic which is a bad idea anyway as they get overwritten at each Foswiki upgrade. Define the global settings in <nop>%CONFIGWEB%.SitePreferences instead. |
| 18 Apr 2009: | 4.22: Ignore all saving unless it happened by saving a form using POST method. <br />Fixed including edit parameters from subwebs. <br />Removed support for settings in the plugin topic which is a bad idea anyway as they get overwritten at each Foswiki upgrade. Define the global settings in <nop>%LOCALSITEPREFS% instead. |

| 26 Mar 2009: | 4.21: Fixed a problem with plugin going into deep recursive orbit when a table is followed by text containing vertical bars but not valid table row. |
| 17 Mar 2009: | 4.20: Fixed several bugs related to use of macros in EDITTABLE and TABLE tags |
| 08 Feb 2009: | 4.13: Fixed incidental removal of =EDITCELL= tags when a different table in the topic is edited. Improved display of linebreaks and TML inside cells. |
Expand Down Expand Up @@ -268,15 +269,15 @@ Test if the Plugin is correctly installed:
| Plugin Home: | http://foswiki.org/Extensions/%TOPIC% |
| Support: | http://foswiki.org/Support/%TOPIC% |

%META:FILEATTACHMENT{name="EditTablePluginCalendarExample.gif" attr="h" comment="" date="1521596899" size="7823" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="ScreenshotEditCell1.gif" attr="h" date="1521596899" size="2017" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="ScreenshotEditCell2.gif" attr="h" date="1521596899" size="3199" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="img.gif" attr="h" date="1521596899" size="145" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="menuarrow.gif" attr="h" date="1521596899" size="68" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.gif" attr="h" date="1521596899" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_move.gif" attr="h" date="1521596899" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_delete.gif" attr="h" date="1521596899" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_delete_disabled.gif" attr="h" date="1521596899" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.css" attr="h" date="1521596899" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.js" attr="h" date="1521596899" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="move_done_bg_anim.gif" attr="h" date="1521596899" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="EditTablePluginCalendarExample.gif" attr="h" comment="" date="1521606920" size="7823" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="ScreenshotEditCell1.gif" attr="h" date="1521606920" size="2017" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="ScreenshotEditCell2.gif" attr="h" date="1521606920" size="3199" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="img.gif" attr="h" date="1521606920" size="145" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="menuarrow.gif" attr="h" date="1521606920" size="68" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.gif" attr="h" date="1521606920" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_move.gif" attr="h" date="1521606920" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_delete.gif" attr="h" date="1521606920" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_delete_disabled.gif" attr="h" date="1521606920" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.css" attr="h" date="1521606920" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.js" attr="h" date="1521606920" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="move_done_bg_anim.gif" attr="h" date="1521606920" size="298" user="ProjectContributor" version="1"}%
8 changes: 4 additions & 4 deletions InterwikiPlugin/data/System/InterWikis.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1486602810" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1521606920" format="1.1" version="1"}%
%META:TOPICPARENT{name="InterwikiPlugin"}%
---+ <nop>Inter-Wiki Link Rules (or Links to other Sites)

Expand All @@ -20,13 +20,13 @@ See %SYSTEMWEB%.InterwikiPlugin for more details on specifiying the INTERLINKFOR
#AddingYourOwn
---+++ Adding your own Inter-Wiki Links

Rather than adding your own inter-wiki links to this topic, the recommended approach is to create a topic in your %USERSWEB% Web, for example [[%USERSWEB%.InterWikis]]. You can then set the =INTERWIKIPLUGIN_RULESTOPIC= preference setting in [[%LOCALSITEPREFS%]] as follows:
Rather than adding your own inter-wiki links to this topic, the recommended approach is to create a topic in your %CONFIGWEB% Web, for example [[%CONFIGWEB%.InterWikis]]. You can then set the =INTERWIKIPLUGIN_RULESTOPIC= preference setting in [[%LOCALSITEPREFS%]] as follows:

<verbatim class="tml">
* Set INTERWIKIPLUGIN_RULESTOPIC = %SYSTEMWEB%.InterWikis, %USERSWEB%.InterWikis
* Set INTERWIKIPLUGIN_RULESTOPIC = %SYSTEMWEB%.InterWikis, %CONFIGWEB%.InterWikis
</verbatim>

Any inter-wikis you add to [[%USERSWEB%.InterWikis]] will then be available in the same way that the inter-wikis from here are. If you create a rule in [[%USERSWEB%.InterWikis]] which has the same alias as a rule in this topic, the rule from [[%USERSWEB%.InterWikis]] will take preference.
Any inter-wikis you add to [[%CONFIGWEB%.InterWikis]] will then be available in the same way that the inter-wikis from here are. If you create a rule in [[%CONFIGWEB%.InterWikis]] which has the same alias as a rule in this topic, the rule from [[%CONFIGWEB%.InterWikis]] will take preference.

---+++ General Inter-Site Links

Expand Down
5 changes: 2 additions & 3 deletions ModPerlEngineContrib/data/System/ModPerlEngineContrib.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1521596899" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1521606920" format="1.1" version="1"}%
---+!! !ModPerlEngineContrib
<!--
One line description, required for extensions repository catalog.
Expand Down Expand Up @@ -100,8 +100,7 @@ Go to =Store Settings=:
attachments.

Note that this should be kept in sync with the Foswiki =ATTACHFILESIZELIMIT=,
set in %CONFIGWEB%.SitePreferences, default taken from
%SYSTEMWEB%.DefaultPreferences.
set in %LOCALSITEPREFS%, default taken from [[%SYSTEMWEB%.%WIKIPREFSTOPIC%]].
<verbatim>
<IfModule mod_perl.c>
PerlSwitches -wT # DO NOT USE THIS with Foswiki 2.0
Expand Down
38 changes: 19 additions & 19 deletions PatternSkin/data/System/PatternSkin.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1521596899" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1521606920" format="1.1" version="1"}%
%META:TOPICPARENT{name="Skins"}%
%STARTINCLUDE%
---+!! Pattern skin
Expand Down Expand Up @@ -80,7 +80,7 @@ The =Edit= and =Edit wiki text= buttons simply add =;action=text= or =;action=fo

---+++ Installation
<div class="foswikiNotification"> *Compatibility with Foswiki 1.1 has been restored. However system changes are required:*
* The SKIN must be overridden to "pattern01x01,pattern". You can safely set this in your %CONFIGWEB%.SitePreferences before upgrading this extension.
* The SKIN must be overridden to "pattern01x01,pattern". You can safely set this in your %LOCALSITEPREFS% before upgrading this extension.
* #Set SKIN = pattern01x01,pattern
* You must not manually install by extracting the archive directly into your Foswiki instance. You must use the Extension Installer. The installer will omit two files which are incompatible and must not be installed on Foswiki 1.1.
* =data/System/WebCreateNewTopicComponents.txt=
Expand Down Expand Up @@ -278,20 +278,20 @@ Leave remarks, suggestions and other feedback in http://foswiki.org/Support/%TOP
%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/%25$ROOTMODULE%25"}%
%META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
%META:FILEATTACHMENT{name="print.css.gz" attr="h" comment="" date="1521596899" size="786" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header3.gif" attr="h" comment="" date="1521596899" size="33112" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot.png" attr="h" comment="" date="1521596899" size="129505" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01_src.js" attr="h" comment="" date="1521596899" size="2618" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header1.gif" attr="h" comment="" date="1521596899" size="20605" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js" attr="h" comment="" date="1521596899" size="1305" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header2.gif" attr="h" comment="" date="1521596899" size="41616" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header5.gif" attr="h" comment="" date="1521596899" size="20639" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern_src.js" attr="h" comment="" date="1521596899" size="1732" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js.gz" attr="h" comment="" date="1521596899" size="474" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js.gz" attr="h" comment="" date="1521596899" size="620" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print.css" attr="h" comment="" date="1521596899" size="3869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="headers.psd" attr="h" comment="" date="1521596899" size="8499470" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header4.gif" attr="h" comment="" date="1521596899" size="92238" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot_full.png" attr="h" comment="" date="1521596899" size="177943" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js" attr="h" comment="" date="1521596899" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print_src.css" attr="h" comment="" date="1521596899" size="5545" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print.css.gz" attr="h" comment="" date="1521606920" size="786" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header3.gif" attr="h" comment="" date="1521606920" size="33112" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot.png" attr="h" comment="" date="1521606920" size="129505" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01_src.js" attr="h" comment="" date="1521606920" size="2618" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header1.gif" attr="h" comment="" date="1521606920" size="20605" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js" attr="h" comment="" date="1521606920" size="1305" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header2.gif" attr="h" comment="" date="1521606920" size="41616" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header5.gif" attr="h" comment="" date="1521606920" size="20639" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern_src.js" attr="h" comment="" date="1521606920" size="1732" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js.gz" attr="h" comment="" date="1521606920" size="474" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js.gz" attr="h" comment="" date="1521606920" size="620" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print.css" attr="h" comment="" date="1521606920" size="3869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="headers.psd" attr="h" comment="" date="1521606920" size="8499470" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header4.gif" attr="h" comment="" date="1521606920" size="92238" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot_full.png" attr="h" comment="" date="1521606920" size="177943" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js" attr="h" comment="" date="1521606920" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print_src.css" attr="h" comment="" date="1521606920" size="5545" user="ProjectContributor" version="1"}%
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
%META:TOPICINFO{author="ProjectContributor" date="1521596899" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1521606920" format="1.1" version="1"}%
%META:TOPICPARENT{name="PatternSkin"}%
---+!! <nop>PatternSkin horizontal navigation example

Include main navigation with:
<verbatim class="tml">
%INCLUDE{"PatternSkinHorizontalNavigationExample" section="main"}%
</verbatim>
This is done automatically in the templates by setting in the %CONFIGWEB%.SitePreferences:
This is done automatically in the templates by setting in the [[%LOCALSITEPREFS%]]:
* #Set PATTERNSKIN_NAVIGATION_TOPIC = %SYSTEMWEB%.PatternSkinHorizontalNavigationExample

---++ Include sections
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
%META:TOPICINFO{author="ProjectContributor" date="1521596899" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1521606920" format="1.1" version="1"}%
%META:TOPICPARENT{name="PatternSkinFatwillyTheme"}%
---+!! <nop>PatternSkin theme: Foswiki "Fat Willy" Site Skin - Navigation

Include main navigation with:
<verbatim class="tml">
%INCLUDE{"%SYSTEMWEB%.PatternSkinThemeFatWillyNavigation" section="main"}%
</verbatim>
This is done automatically in the templates by setting in the %CONFIGWEB%.SitePreferences:
This is done automatically in the templates by setting in the %LOCALSITEPREFS%:
* #Set PATTERNSKIN_NAVIGATION_TOPIC = %SYSTEMWEB%.PatternSkinThemeFatWillyNavigation

Include meta navigation with:
Expand Down
Loading

0 comments on commit 7be5c97

Please sign in to comment.