Item14288: Merge 'origin/master'

foswiki · Sep 28, 2017 · 1e029a0 · 1e029a0
2 parents 286527c + 58ae72c
commit 1e029a0
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 31 deletions.
diff --git a/FamFamFamContrib/lib/Foswiki/Contrib/FamFamFamContrib/MANIFEST b/FamFamFamContrib/lib/Foswiki/Contrib/FamFamFamContrib/MANIFEST
@@ -1,5 +1,4 @@
 !noci
-templates/icons.tmpl 0444
 templates/view.famfamfam.tmpl 0444
 templates/subscribe.famfamfam.tmpl 0444
 

diff --git a/TinyMCEPlugin/data/System/TinyMCEPlugin.txt b/TinyMCEPlugin/data/System/TinyMCEPlugin.txt
@@ -11,7 +11,7 @@ One line description, required for extensions repository catalog.
 <img alt="screenshot" src="%ATTACHURLPATH%/screenshot.png"/>
 
 %TOC%
-This is an integration of the fast and highly functional [[http://tinymce.moxiecode.com][TinyMCE]] WYSIWYG editor. It supports a wide range of browsers, including Firefox, IE, Safari, Opera and Google Chrome (see [[http://wiki.moxiecode.com/index.php/TinyMCE:Compatibility][compatibility chart]]). At the time of writing it doesn't work with Konqueror.
+This is an integration of the fast and highly functional [[http://tinymce.moxiecode.com][TinyMCE]] WYSIWYG editor. It supports a wide range of browsers, including Firefox, IE-11 & Edge, Safari and Google Chrome (see [[https://www.tinymce.com/docs/get-started/system-requirements/#browsercompatibility][compatibility chart]]). At the time of writing it doesn't work with Konqueror.
 
 The integration uses the Foswiki:Extensions.WysiwygPlugin to translate text to and from a format that !TinyMCE can edit.
 
@@ -151,13 +151,14 @@ See http://foswiki.org/Tasks/TinyMCEPlugin and http://foswiki.org/Tasks/WysiwygP
 
 ---++ Plugin Info
 
+See the [[%ATTACHURLPATH%/tinymce/changelog.txt][TinyMCE Editor Change Log]] for detailed changes included in this release of the !TinyMCE Editor.
 
 |  Copyright: | &copy; 2007-2017 Crawford Currie http://c-dot.co.uk %BR%\
-                &copy; 2010-2014 [[%SYSTEMWEB%.ProjectContributor][Foswiki Contributors]] |
+                &copy; 2010-2017 [[%SYSTEMWEB%.ProjectContributor][Foswiki Contributors]] |
 |             | This package also includes a complete release of the !TinyMCE editor which is covered by the [[https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html][GNU Lesser General Public License, Version 2.1] |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
-|  2.02 | Foswikitask:Item14323: Upgrade to TinyMCE 4.6.7. Support for IE 8-10 is removed. |
-|  2.01 | Foswikitask:Item14323: Upgrade to TinyMCE 4.6.6. Support for IE 8-10 is removed. |
+|  2.02 | Foswikitask:Item14323: Upgrade to TinyMCE 4.6.7. |
+|  2.01 | Foswikitask:Item14323: Upgrade to TinyMCE 4.6.6. Note that support for IE 8-10 has been removed. |
 |  2.00 | Foswikitask:Item14323: Upgrade to TinyMCE 4.5.3, much simplified UI, full unicode support. |
 |  1.30 | Foswikitask:Item12181: Upgrade to TinyMCE 3.5.11 |
 |  21 Dec 2012 (TBD)   | Foswikitask:Item12278: Changing a wikiword should not require visiting the TinyMCE link dialog. *Changes TINYMCEPLUGIN_INIT settings* |

diff --git a/core/data/System/SkinTemplates.txt b/core/data/System/SkinTemplates.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1490476899" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1506603718" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Skins"}%
 %STARTINCLUDE%
 ---+ Skin Templates
@@ -159,31 +159,34 @@ and then =* Set SKIN=crumbless,pattern=
 Remember: the template path contains the most specific template first.
 
 ---+++ Comments
-Comments delimited by =#{...}#= are removed from the templates as soon as
+Comments delimited by =%<nop>{...}%= are removed from the templates as soon as
 the file is read, before any other template macros are evaluated. 
 
-An alternative comment type =#{...}#= will automatically absorb whitespace
+An alternative comment type =#<nop>{...}#= will automatically absorb whitespace
 either side of the comment (newlines, spaces, tabs etc). This type of comment
 only works in templates.
 
-The alternative comment type becomes really useful when we have skin templates defined in topics, because we can now use it to delimit content that should be _displayed when the topic is viewed normally_, but _removed when the templates are instantiated_.
+The alternative comment type becomes really useful when we have skin templates defined in topics,
+because we can now use it to delimit content that should be _displayed when the topic is viewed normally_, but _removed when the templates are instantiated_.
 
 or example, we might have templates in a topic like this:
 <verbatim class="tml">
 %TMPL:DEF{"example"}%
-#{ This comment will always be removed }%
+#{ This comment will always be removed }#
 %{ This comment will be removed when the template is instantiated }%
 Example
 %TMPL:END%
 </verbatim>
 
 When we view the topic, we'll see:
 
+<pre>
 %<nop>TMPL:DEF{"example"}%
-#{ This comment will always be removed }%
+#{ This comment will always be removed }#
 %{ This comment will be removed when the template is instantiated }%
 Example
 %<nop>TMPL:END%
+</pre>
 but all comments will be removed when the template is actually used.
 
 #FindingTemplates
@@ -375,12 +378,12 @@ see what PatternSkin defines.
 
 %STOPINCLUDE%
 
-%META:FILEATTACHMENT{name="oopsmore_diff_debug.gif" attr="h" comment="" date="1490476899" size="3205" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="default.css.gz" attr="h" comment="" date="1490476899" size="2072" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="base.css.gz" attr="h" comment="" date="1490476899" size="1331" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="oopsmore_diff_sidebyside.gif" attr="h" comment="" date="1490476899" size="1994" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="base_src.css" attr="h" comment="" date="1490476899" size="6780" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="base.css" attr="h" comment="" date="1490476899" size="5196" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="oopsmore_diff_sequential.gif" attr="h" comment="" date="1490476899" size="3464" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="default_src.css" attr="h" comment="" date="1490476899" size="11093" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="default.css" attr="h" comment="" date="1490476899" size="8209" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="oopsmore_diff_debug.gif" attr="h" comment="" date="1506603718" size="3205" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="default.css.gz" attr="h" comment="" date="1506603718" size="2072" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="base.css.gz" attr="h" comment="" date="1506603718" size="1331" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="oopsmore_diff_sidebyside.gif" attr="h" comment="" date="1506603718" size="1994" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="base_src.css" attr="h" comment="" date="1506603718" size="6780" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="base.css" attr="h" comment="" date="1506603718" size="5196" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="oopsmore_diff_sequential.gif" attr="h" comment="" date="1506603718" size="3464" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="default_src.css" attr="h" comment="" date="1506603718" size="11093" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="default.css" attr="h" comment="" date="1506603718" size="8209" user="ProjectContributor" version="1"}%
diff --git a/core/lib/Foswiki/Contrib/core/MANIFEST b/core/lib/Foswiki/Contrib/core/MANIFEST
@@ -825,6 +825,7 @@ templates/edittext.tmpl 0444
 templates/form.tmpl 0444
 templates/formtables.tmpl 0444
 templates/foswiki.tmpl 0444
+templates/icons.tmpl 0444
 templates/itemview.tmpl 0444
 templates/login.sudo.tmpl 0444
 templates/login.tmpl 0444

diff --git a/core/templates/foswiki.tmpl b/core/templates/foswiki.tmpl
@@ -163,11 +163,6 @@ formatting macros
 webListIndent - used in WEBLIST
 }%%TMPL:DEF{"webListIndent"}%<span class='foswikiWebIndent'></span>%TMPL:END%%{
 ---------------------------------------------------
-icon:image - uses double quotes required for legacy reasons :/ 
-}%%TMPL:DEF{"icon:image"}%<span class='foswikiIcon'><img src="%URL%" width="%WIDTH%" height="%HEIGHT%" alt="%ALT%" /></span>%TMPL:END%%{
----------------------------------------------------
-}%%TMPL:DEF{"icon:image_singlequote"}%<span class='foswikiIcon'><img src='%URL%' width='%WIDTH%' height='%HEIGHT%' alt='%ALT%' /></span>%TMPL:END%%{
----------------------------------------------------
 support for default skin's webtopiclist
 }%%TMPL:DEF{"defaultwebtopiclist"}%[[WebChanges][Changes]] %SEP% [[WebIndex][Index]] %SEP% [[WebSearch][Search]] %SEP% Go <input type="text" name="topic" size="16" />%TMPL:END%%{
 ---------------------------------------------------

diff --git a/FamFamFamContrib/templates/icons.tmpl → core/templates/icons.tmpl b/FamFamFamContrib/templates/icons.tmpl → core/templates/icons.tmpl
@@ -1,10 +1,8 @@
 %{ FamFamFam based icon library for over-ride by skins. By defining the ICON using a Template, you can completely customise your skin }%
 
-%{ the 'alt' text should really be a MAKETEXT.. }%
-
-%{ yes, i'm redefining it - its also (currently) in foswiki.tmpl }%
 %TMPL:DEF{"icon:image"}%<span class='foswikiIcon'><img src='%URL%' width='%WIDTH%' height='%HEIGHT%' alt='%ALT%' /></span>%TMPL:END%
 
+%{ the 'alt' text should really be a MAKETEXT.. }%
 
 %TMPL:DEF{"iconurl:book"}%%PUBURL%/%SYSTEMWEB%/DocumentGraphics/book.png%TMPL:END%
 %TMPL:DEF{"iconalt:book"}%Book%TMPL:END%
@@ -15,13 +13,10 @@
 %TMPL:DEF{"icon:blank-bg"}%<span class='foswikiIcon'><div class='inner' style='width:14;height:14;border:1 solid gray;background:transparent;display:inline-block'></div></span>%TMPL:END%
 %TMPL:DEF{"icon:empty"}%<span class='foswikiIcon'><div class='inner' style='width:14;height:14;border:0;background:transparent;display:inline-block;'></div></span>%TMPL:END%
 
-
-
 %{ needs tweaking to get the 'm' and 'p' in the right place }%
 %TMPL:DEF{"icon:monospace"}%<span class='foswikiIcon'><div class='inner' style='width:14;height:14;border:1 solid gray;background:white;display:inline-block;font-family:monospace;'>m</div></span>%TMPL:END%
 %TMPL:DEF{"icon:proportional"}%<span class='foswikiIcon'><div class='inner' style='width:14;height:14;border:1 solid gray;background:white;display:inline-block;font-family:serif;'>p</div></span>%TMPL:END%
 
-
 %{ non-16 sized icons }%
 %TMPL:DEF{"icon:more-small"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/more-small.png' width='13' height='13' alt='Read more' /></span>%TMPL:END%
 %TMPL:DEF{"icon:photo"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/photo.png' width='13' height='10' alt='Photo' /></span>%TMPL:END%