Item14626: Item13883: Merge branch 'Release02x01'

foswiki · Feb 24, 2018 · dd2075b · dd2075b
2 parents 6115809 + b192c28
commit dd2075b
Show file tree

Hide file tree

Showing 8 changed files with 117 additions and 88 deletions.
diff --git a/PatternSkin/data/System/PatternSkin.txt b/PatternSkin/data/System/PatternSkin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1512791273" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1519435597" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Skins"}%
 %STARTINCLUDE%
 ---+!! Pattern skin
@@ -189,6 +189,7 @@ For further troubleshooting and feedback, go to http://foswiki.org/Support/%TOPI
 |  Preview: | [[%SCRIPTURL{view}%/%WEB%/%TOPIC%?skin=pattern][Preview with this skin]] |
 |  Base Name: | pattern |
 |  History: | <!-- specify latest version first -->&nbsp; |
+|  12 Feb 2018 | V.6.12: Foswikitask:Item14633: Wrong language is used in the =&lt;html&gt;= tag. |
 |  8 Dec 2017 | v.6.11:  Foswikitask:Item14434: Translated text with reserved characters used in System.WebCreateNewTopicComponents will create wrong HTML<br/>\
                          Foswikitask:Item14488: PatternSkin is missing "body" zone used by NatSkin and many extensions.<br/>\
                          Foswikitask:Item14556: clean up header area. |
@@ -267,28 +268,28 @@ Leave remarks, suggestions and other feedback in http://foswiki.org/Support/%TOP
 
 %META:FORM{name="PackageForm"}%
 %META:FIELD{name="Author" title="Author" value="Arthur Clemens"}%
-%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2004-2017 Arthur Clemens, Foswiki contributors"}%
+%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2004-2018 Arthur Clemens, Foswiki contributors"}%
 %META:FIELD{name="Description" title="Description" value="%25$SHORTDESCRIPTION%25"}%
 %META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/%25$ROOTMODULE%25"}%
 %META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
 %META:FIELD{name="Release" title="Release" value="%25$RELEASE%25"}%
 %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="1512791273" size="786" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="header3.gif" attr="h" comment="" date="1512791273" size="33112" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="patternskin_screenshot.png" attr="h" comment="" date="1512791273" size="129505" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="foswiki_edit_01x01_src.js" attr="h" comment="" date="1512791273" size="2618" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="header1.gif" attr="h" comment="" date="1512791273" size="20605" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="pattern.js" attr="h" comment="" date="1512791273" size="1305" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="header2.gif" attr="h" comment="" date="1512791273" size="41616" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="header5.gif" attr="h" comment="" date="1512791273" size="20639" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="pattern_src.js" attr="h" comment="" date="1512791273" size="1732" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="foswiki_edit_01x01.js.gz" attr="h" comment="" date="1512791273" size="474" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="pattern.js.gz" attr="h" comment="" date="1512791273" size="620" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="print.css" attr="h" comment="" date="1512791273" size="3869" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="headers.psd" attr="h" comment="" date="1512791273" size="8499470" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="header4.gif" attr="h" comment="" date="1512791273" size="92238" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="patternskin_screenshot_full.png" attr="h" comment="" date="1512791273" size="177943" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="foswiki_edit_01x01.js" attr="h" comment="" date="1512791273" size="1007" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="print_src.css" attr="h" comment="" date="1512791273" size="5545" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="print.css.gz" attr="h" comment="" date="1519435597" size="786" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="header3.gif" attr="h" comment="" date="1519435597" size="33112" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="patternskin_screenshot.png" attr="h" comment="" date="1519435597" size="129505" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="foswiki_edit_01x01_src.js" attr="h" comment="" date="1519435597" size="2618" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="header1.gif" attr="h" comment="" date="1519435597" size="20605" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="pattern.js" attr="h" comment="" date="1519435597" size="1305" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="header2.gif" attr="h" comment="" date="1519435597" size="41616" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="header5.gif" attr="h" comment="" date="1519435597" size="20639" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="pattern_src.js" attr="h" comment="" date="1519435597" size="1732" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="foswiki_edit_01x01.js.gz" attr="h" comment="" date="1519435597" size="474" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="pattern.js.gz" attr="h" comment="" date="1519435597" size="620" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="print.css" attr="h" comment="" date="1519435597" size="3869" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="headers.psd" attr="h" comment="" date="1519435597" size="8499470" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="header4.gif" attr="h" comment="" date="1519435597" size="92238" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="patternskin_screenshot_full.png" attr="h" comment="" date="1519435597" size="177943" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="foswiki_edit_01x01.js" attr="h" comment="" date="1519435597" size="1007" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="print_src.css" attr="h" comment="" date="1519435597" size="5545" user="ProjectContributor" version="1"}%
diff --git a/PatternSkin/lib/Foswiki/Contrib/PatternSkin.pm b/PatternSkin/lib/Foswiki/Contrib/PatternSkin.pm
@@ -3,16 +3,16 @@ package Foswiki::Contrib::PatternSkin;
 use strict;
 use warnings;
 
-our $VERSION = '6.11';
-our $RELEASE = '8 Dec 2017';
+our $VERSION = '6.12';
+our $RELEASE = '23 Feb 2018';
 our $SHORTDESCRIPTION =
 'Pattern skin provides a CSS based default look and feel - flexible and [[http://www.w3.org/][W3C]] compliant. Its layout and color scheme are designed to provide a nice, clean and productive editing environment';
 
 1;
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2008-2017 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2008-2018 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/core/data/System/Macros.txt b/core/data/System/Macros.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1489246418" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1519431680" format="1.1" version="1"}%
 %META:TOPICPARENT{name="UserDocumentationCategory"}%
 %STARTINCLUDE%
 ---+ Macros
@@ -40,7 +40,7 @@ To use a macro type its name. For example,
    * To leave a macro unexpanded, precede it with an exclamation mark, e.g. type =!%<nop>TOPIC%= to get =%<nop>TOPIC%=
       * Alternatively, insert a =&lt;nop&gt;= anywhere in the macro, Eg. =%&lt;nop&gt;TOPIC%=
    * Macros are expanded relative to the topic they are _used_ in, not the topic they are _defined_ in
-   * Type =%<nop>ALLVARIABLES%= to get a full listing of all macros defined for a particular topic
+   * Type =%<nop>SHOWPREFERENCE%= to get a full listing of all macros defined for a particular topic, or =%<nop>SHOWPREFERENCE{"foo"}%= to see an individual setting.
    * If a macro is not defined, then it will be left in the text _unless_ it is called with a =default= parameter, in which case the value of the =default= parameter will replace the macro call in the output. For example, =%<nop>UNDEFINED{default="blank"}%= will expand to =blank=.
 
 ---+++ Order of expansion
@@ -290,7 +290,7 @@ Macro names must start with an ASCII letter. The following characters can be ASC
 
 By convention all settings, predefined macros and macros registered by plugins are always UPPER-CASE.
 <!--
-   * Set CONDITIONS = According to [[%BASETOPIC%]], The %WHAT% is %STATE% today. (Set in [[Macros]]).
+   * Set CONDITIONS = According to [[%TOPIC%]], The %WHAT% is %STATE% today. (Set in [[Macros]]).
    * Set WEATHER = It's %DEFAULT{default="raining"}%.
 -->
 %INCLUDE{"PreferenceSettings"}%
@@ -524,4 +524,3 @@ You can add comments anywhere in macros (and outside them) using the standard =#
 ---
 *Related Topics:* MacrosQuickReference, PreferenceSettings, UserDocumentationCategory
 <!-- %JQREQUIRE{"chili"}% -->
-