Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item14288: Merge 'origin/master'
  • Loading branch information
MichaelDaum committed Sep 19, 2017
2 parents 53c6ce1 + b1bd372 commit 21e16cf
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 13 deletions.
2 changes: 1 addition & 1 deletion PatternSkin/templates/foswiki.pattern.tmpl
Expand Up @@ -78,6 +78,6 @@
</div>
</div>%TMPL:END%

%TMPL:DEF{"bodyend"}%</body></html>%TMPL:END%
%TMPL:DEF{"bodyend"}%%RENDERZONE{"body"}%</body></html>%TMPL:END%

%TMPL:DEF{"textareabuttons"}%<span class="foswikiRight foswikiMakeVisible" style="text-align:left; margin:0 0 0 1em;"><span class="foswikiLeft patternTextareaButton patternButtonFontSelector" title="%MAKETEXT{"Switch to monotype or proportional font"}%">&nbsp;</span><span class="foswikiLeft patternTextareaButton patternButtonEnlarge" title="%MAKETEXT{"Enlarge edit box"}%">&nbsp;</span><span class="foswikiLeft patternTextareaButton patternButtonShrink" title="%MAKETEXT{"Shrink edit box"}%">&nbsp;</span></span>%TMPL:END%
4 changes: 2 additions & 2 deletions UpdatesPlugin/data/System/UpdatesPlugin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1501242886" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1505814092" format="1.1" version="1"}%
---+!! %TOPIC%
<img class="foswikiRight" src="%ATTACHURL%/logo.png">
%$SHORTDESCRIPTION%
Expand Down Expand Up @@ -83,4 +83,4 @@ This plugin was initially developed during a collaborative design and coding ses
%META:FIELD{name="License" title="License" value="[[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]]"}%
%META:FIELD{name="Home" title="Home" value="Foswiki:Extensions/%25$ROOTMODULE%25"}%
%META:FIELD{name="Support" title="Support" value="Foswiki:Support/%25$ROOTMODULE%25"}%
%META:FILEATTACHMENT{name="logo.png" attr="h" comment="" date="1501242886" size="53676" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="logo.png" attr="h" comment="" date="1505814092" size="53676" user="ProjectContributor" version="1"}%
14 changes: 12 additions & 2 deletions core/data/System/ReleaseNotes02x01.txt
@@ -1,5 +1,5 @@
%META:TOPICINFO{author="ProjectContributor" date="1497953719" format="1.1" version="1"}%
%META:TOPICPARENT{name="ReleaseHistory"}%
%META:TOPICINFO{author="ProjectContributor" date="1505814092" format="1.1" version="1"}%
META:TOPICPARENT{name="ReleaseHistory"}%
---+!! Foswiki Release 2.1.4

%TWISTY{showlink="Table of Contents..." hidelink="hide TOC"}%
Expand Down Expand Up @@ -81,6 +81,16 @@ However the TinyMCEPlugin is still unable to render image links while editing a

See [[%BUGS%/Item13696][Item13696]] for up-to-date details.

---++ Important changes in Foswiki 2.1.5

---+++ New zone added as a default zone.

The =body= zone has been added as a default zone. It is rendered at the end
of the body, just before the =&lt;body&gt= tag. This improves compatibity of PatternSkin with Foswiki:Extensions.NatSkin. A number of extensions released for !NatSkin will not
function correctly without this zone. No changes are required unless you
have replaced the =foswiki.tmpl= or =foswiki.pattern.tmpl= with a local
version.

---++ Important changes in Foswiki 2.1.3

---+++ Security issues addressed in this release.
Expand Down
14 changes: 10 additions & 4 deletions core/data/System/VarADDTOZONE.txt
@@ -1,10 +1,10 @@
%META:TOPICINFO{author="ProjectContributor" date="1434650530" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1505759671" format="1.1" version="1"}%
%META:TOPICPARENT{name="Macros"}%
---+ ADDTOZONE -- add content to a named zone on the page

---++ Parameters
| *Parameter* | *Description* | *Default* |
| ="zone"= | comma-separated list of the names of zones that the content should be added to. The only zones guaranteed to exist are =head= and =script= | =head= |
| ="zone"= | comma-separated list of the names of zones that the content should be added to. The only zones guaranteed to exist are =head=, =script= and =body=.| =head= |
| =id= | =identifier= for the text being added with the =ADDTOZONE= call, to be used in the =requires= parameter of other =ADDTOZONE= calls. %H% Multiple =ADDTOZONE= calls with the same =id= parameter will simply overwrite the earlier =ADDTOZONE= call. | |
| =requires= | comma separated string of =ids= of text within this =zone= that this content should follow when the zone is rendered. The content will be rendered even if a specified =id= is missing.| |
| =text= | text to be added to the named zone, mutually exclusive with =topic=.| |
Expand All @@ -17,7 +17,7 @@ _Zones_ are specific places in the output HTML that are marked by calls to the
together, such as Javascript and CSS, that must be included in the output HTML
in a specific order, and in a specific place.

There are two special zones called =head= and =script=. The =head= zone is rendered
There are three special zones called =head=, =script= and =body=. The =head= zone is rendered
as part of the HTML head section. It is the catch-all container for any content supposed
to be placed into the HTML head section, except Javascript, which is collected in the
=script= zone.
Expand All @@ -26,7 +26,7 @@ All Javascript _must_ always be added to the =script= zone exclusively, in order
grant ordering constraints among scripts are resolved properly. Never add Javascript to
the =head= zone -- never add non-Javascript content to the =script= zone.

Both zones are added to the HTML head section automatically just before the
Both =head= and =script= zones are added to the HTML head section automatically just before the
closing &lt;/head> tag as if they were specified explicitly in the skin templates using:
<verbatim class="tml">
<head>
Expand All @@ -36,6 +36,12 @@ closing &lt;/head> tag as if they were specified explicitly in the skin template
</head>
</verbatim>

The =body= zone is added to the end of the rendered page just prior to the
closing =&lt;body&gt;= tag.

<div class="foswikiHelp">The =body= zone is new with Foswiki 2.1.5. It was
added for improved compatibility with the NatSkin. </div>

You may create as many zones in addition to the standard =head= and =script=
zones as you like. For any non-standard zone specified in
[[%TOPIC%][ADDTOZONE]] you will also need to provide an appropriate
Expand Down
9 changes: 5 additions & 4 deletions core/data/System/VarRENDERZONE.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1450471494" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1505759671" format="1.1" version="1"}%
%META:TOPICPARENT{name="Macros"}%
---+ RENDERZONE - render the content of a zone
Rendersa zone. See [[VarADDTOZONE][ADDTOZONE]] for an explanation of _zones_.
Expand Down Expand Up @@ -29,10 +29,11 @@ Supports the [[FormatTokens][standard format tokens]] in all parameters.

%H% Zones are cleared after being rendered; they are only ever rendered once.

%H% =head= and =script= are _automatic zones_. They don't require a
corresponding =RENDERZONE= anywhere in the templates - they are
%H% =head=, =script= and =body= are _default zones_. The corresponding =RENDERZONE=
is already included in the base =foswiki.tmpl=. =head= and =script= are
automatically inserted before the =&lt;/head&gt;= tag in the output HTML
page.
page. =body= is automatically inserted before the =&lt;/body&gt;= tag in
the output HTML page.

%H% Macros will be expanded in all zones. TML markup will not be expanded
in the =head= and =scripts= zones. Any formatting in =head= and =scripts= zones
Expand Down
1 change: 1 addition & 0 deletions core/templates/foswiki.tmpl
Expand Up @@ -72,6 +72,7 @@ but may be used in derived templates.
#PageTop %TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"bodyend"}%</div>
%RENDERZONE{"body"}%
</body></html>%TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"broadcastmessage"}%%IF{"defined FOSWIKI_BROADCAST and $FOSWIKI_BROADCAST != ''" then="$percntTMPL:P{$quotbroadcastmessage:system$quot}$percnt"}%%IF{"defined BROADCASTMESSAGE and $BROADCASTMESSAGE != ''" then="$percntTMPL:P{$quotbroadcastmessage:contents$quot}$percnt"}%%TMPL:END%%{
Expand Down

0 comments on commit 21e16cf

Please sign in to comment.