From 12bdadc665ac3f849c8e85251edb03b16bcda14f Mon Sep 17 00:00:00 2001
From: ArthurClemens <ArthurClemens@0b4bb1d4-4e5a-0410-9cc4-b2b747904278>
Date: Wed, 2 Nov 2011 22:31:09 +0000
Subject: [PATCH] Item11232: consolidate changes (and use same timestamps)

git-svn-id: http://svn.foswiki.org/branches/Release01x01@12990 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
---
 PatternSkin/data/Main/PatternSkinUserViewTemplate.txt |  8 ++------
 PatternSkin/data/Main/WebLeftBarExample.txt           |  2 +-
 PatternSkin/data/System/PatternSkin.txt               |  2 +-
 PatternSkin/data/System/PatternSkinCss.txt            |  2 +-
 PatternSkin/data/System/PatternSkinCssCookbook.txt    |  2 +-
 PatternSkin/data/System/PatternSkinCustomization.txt  |  2 +-
 PatternSkin/data/System/PatternSkinElements.txt       |  3 ++-
 .../System/PatternSkinHorizontalNavigationExample.txt |  6 +++---
 PatternSkin/data/System/PatternSkinTheme.txt          |  2 +-
 PatternSkin/data/System/PatternSkinTheme2009.txt      |  2 +-
 PatternSkin/data/System/PatternSkinThemeFatWilly.txt  |  2 +-
 .../System/PatternSkinThemeFatWillyNavigation.txt     |  2 +-
 .../System/PatternSkinWebCreateNewTopicTemplate.txt   |  2 +-
 PatternSkin/data/System/WebBottomBarExample.txt       |  2 +-
 PatternSkin/data/System/WebLeftBarCookbook.txt        |  2 +-
 PatternSkin/data/System/WebLeftBarExample.txt         |  2 +-
 PatternSkin/data/System/WebLeftBarLogin.txt           |  2 +-
 .../data/System/WebLeftBarPersonalTemplate.txt        |  2 +-
 PatternSkin/data/Trash/WebLeftBarExample.txt          |  2 +-
 PatternSkin/pub/System/PatternSkinTheme/style_src.css |  4 ++++
 PatternSkin/pub/System/PatternSkinTheme2009/style.css |  7 +++----
 .../pub/System/PatternSkinThemeFatWilly/style_src.css |  4 ++++
 PatternSkin/templates/edit.pattern.tmpl               |  2 +-
 PatternSkin/templates/foswiki.pattern.tmpl            |  2 +-
 PatternSkin/templates/foswiki.pattern01x00.tmpl       | 11 ++++++++++-
 PatternSkin/templates/view.pattern.tmpl               |  4 ++--
 PatternSkin/templates/viewprint.pattern.tmpl          |  4 ++--
 PatternSkin/templates/viewsidebar.pattern.tmpl        |  4 ++--
 PatternSkin/templates/viewtopbar.pattern.tmpl         |  2 +-
 29 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/PatternSkin/data/Main/PatternSkinUserViewTemplate.txt b/PatternSkin/data/Main/PatternSkinUserViewTemplate.txt
index a9fefe2903..6e7755b6a0 100644
--- a/PatternSkin/data/Main/PatternSkinUserViewTemplate.txt
+++ b/PatternSkin/data/Main/PatternSkinUserViewTemplate.txt
@@ -1,6 +1,2 @@
-%META:TOPICINFO{author="ProjectContributor" date="1231502400" format="1.1" version="1"}%
-%TMPL:INCLUDE{"view"}%
-
-%TMPL:DEF{"formattop"}%%TMPL:P{"form"}%%TMPL:END%
-
-%TMPL:DEF{"formatbottom"}%%TMPL:END%
+%META:TOPICINFO{author="ProjectContributor" date="1300477710" format="1.1" version="1"}%
+%TMPL:INCLUDE{"view"}%
\ No newline at end of file
diff --git a/PatternSkin/data/Main/WebLeftBarExample.txt b/PatternSkin/data/Main/WebLeftBarExample.txt
index 2488191dce..3ef4c083db 100644
--- a/PatternSkin/data/Main/WebLeftBarExample.txt
+++ b/PatternSkin/data/Main/WebLeftBarExample.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1289333260" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1289333272" format="1.1" version="1"}%
 %META:TOPICPARENT{name="WebHome"}%
 %INCLUDE{"%IF{"context can_login" then="%SYSTEMWEB%.WebLeftBarLogin" else="<nop>"}%" warn="off"}%
 
diff --git a/PatternSkin/data/System/PatternSkin.txt b/PatternSkin/data/System/PatternSkin.txt
index f743bc982c..ecfce971a9 100644
--- a/PatternSkin/data/System/PatternSkin.txt
+++ b/PatternSkin/data/System/PatternSkin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1314382795" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1314382739" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Skins"}%
 %STARTINCLUDE%
 <!--
diff --git a/PatternSkin/data/System/PatternSkinCss.txt b/PatternSkin/data/System/PatternSkinCss.txt
index 9ac3346c41..f8c3d2ebd3 100644
--- a/PatternSkin/data/System/PatternSkinCss.txt
+++ b/PatternSkin/data/System/PatternSkinCss.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1301018830" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1301018910" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkin"}%
 ---+!! CSS elements in !PatternSkin
 
diff --git a/PatternSkin/data/System/PatternSkinCssCookbook.txt b/PatternSkin/data/System/PatternSkinCssCookbook.txt
index aa0d181d74..c3f0a513b9 100644
--- a/PatternSkin/data/System/PatternSkinCssCookbook.txt
+++ b/PatternSkin/data/System/PatternSkinCssCookbook.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1303098807" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1303098887" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkin"}%
 ---+!! %SYSTEMWEB%.PatternSkin CSS Cookbook
 
diff --git a/PatternSkin/data/System/PatternSkinCustomization.txt b/PatternSkin/data/System/PatternSkinCustomization.txt
index 328656facb..f71835b634 100644
--- a/PatternSkin/data/System/PatternSkinCustomization.txt
+++ b/PatternSkin/data/System/PatternSkinCustomization.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1303098807" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1303098887" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkin"}%
 ---+!! %SYSTEMWEB%.PatternSkin Customization
 
diff --git a/PatternSkin/data/System/PatternSkinElements.txt b/PatternSkin/data/System/PatternSkinElements.txt
index 55a10209dc..27446446c7 100644
--- a/PatternSkin/data/System/PatternSkinElements.txt
+++ b/PatternSkin/data/System/PatternSkinElements.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1304697230" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1304697250" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkin"}%
 <div class="foswikiBroadcastMessage"> <strong>NOTE:</strong> Edit and Attach will be disabled today between 05:00 PM and 06:00 PM PDT (00:00 to 01:00 GMT) for a scheduled Foswiki maintenance.</div>
 
@@ -301,3 +301,4 @@ class="cyan"
 class="simple"
 }%
 %CLEAR%
+
diff --git a/PatternSkin/data/System/PatternSkinHorizontalNavigationExample.txt b/PatternSkin/data/System/PatternSkinHorizontalNavigationExample.txt
index a065521902..1bc98a9b61 100644
--- a/PatternSkin/data/System/PatternSkinHorizontalNavigationExample.txt
+++ b/PatternSkin/data/System/PatternSkinHorizontalNavigationExample.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1300477020" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1300477710" format="1.1" version="1"}%
 ---+!! <nop>PatternSkin horizontal navigation example
 
 Include main navigation with:
@@ -35,9 +35,9 @@ Include meta navigation with:
     "%TOPIC%"
     section="topbarbutton"
     ID=""
-    DESTWEB="Sandbox"
+    DESTWEB="%SANDBOXWEB%"
     DESTTOPIC="WebHome"
-    LABEL="Sandbox"
+    LABEL="%SANDBOXWEB%"
 }%
 </ul><br class="foswikiClear" /></div>%ENDSECTION{"main"}%
 
diff --git a/PatternSkin/data/System/PatternSkinTheme.txt b/PatternSkin/data/System/PatternSkinTheme.txt
index 5515945a32..97ae4a0e9b 100644
--- a/PatternSkin/data/System/PatternSkinTheme.txt
+++ b/PatternSkin/data/System/PatternSkinTheme.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1300477020" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1288962587" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkin"}%
 ---+!! <nop>PatternSkin theme
 Default pattern skin theme.
diff --git a/PatternSkin/data/System/PatternSkinTheme2009.txt b/PatternSkin/data/System/PatternSkinTheme2009.txt
index d65fada46d..2d13e3f987 100644
--- a/PatternSkin/data/System/PatternSkinTheme2009.txt
+++ b/PatternSkin/data/System/PatternSkinTheme2009.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1288964903" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1288962587" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkin"}%
 ---+!! <nop>PatternSkin theme: 2009
 
diff --git a/PatternSkin/data/System/PatternSkinThemeFatWilly.txt b/PatternSkin/data/System/PatternSkinThemeFatWilly.txt
index 2257a3fb0c..1b00bc7532 100644
--- a/PatternSkin/data/System/PatternSkinThemeFatWilly.txt
+++ b/PatternSkin/data/System/PatternSkinThemeFatWilly.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1304087442" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1304087511" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkin"}%
 ---+!! <nop>PatternSkin theme: Foswiki "Fat Willy" Site Skin
 
diff --git a/PatternSkin/data/System/PatternSkinThemeFatWillyNavigation.txt b/PatternSkin/data/System/PatternSkinThemeFatWillyNavigation.txt
index 91ef1088a8..a54a0fe06b 100644
--- a/PatternSkin/data/System/PatternSkinThemeFatWillyNavigation.txt
+++ b/PatternSkin/data/System/PatternSkinThemeFatWillyNavigation.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1300477020" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1300477710" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkinFatwillyTheme"}%
 ---+!! <nop>PatternSkin theme: Foswiki "Fat Willy" Site Skin - Navigation
 
diff --git a/PatternSkin/data/System/PatternSkinWebCreateNewTopicTemplate.txt b/PatternSkin/data/System/PatternSkinWebCreateNewTopicTemplate.txt
index 5a3bc6b53e..410f340b99 100644
--- a/PatternSkin/data/System/PatternSkinWebCreateNewTopicTemplate.txt
+++ b/PatternSkin/data/System/PatternSkinWebCreateNewTopicTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1288964903" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1288962587" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkin"}%
 %TMPL:INCLUDE{"WebCreateNewTopic"}%
 
diff --git a/PatternSkin/data/System/WebBottomBarExample.txt b/PatternSkin/data/System/WebBottomBarExample.txt
index b2a5339575..db8dcdd4f1 100644
--- a/PatternSkin/data/System/WebBottomBarExample.txt
+++ b/PatternSkin/data/System/WebBottomBarExample.txt
@@ -1,3 +1,3 @@
-%META:TOPICINFO{author="ProjectContributor" date="1300477020" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1300477710" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkin"}%
 %WEBCOPYRIGHT%
diff --git a/PatternSkin/data/System/WebLeftBarCookbook.txt b/PatternSkin/data/System/WebLeftBarCookbook.txt
index f0c0c53253..8ae258d08a 100644
--- a/PatternSkin/data/System/WebLeftBarCookbook.txt
+++ b/PatternSkin/data/System/WebLeftBarCookbook.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1300477020" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1300477710" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkin"}%
 ---+ !WebLeftBar Cookbook
 
diff --git a/PatternSkin/data/System/WebLeftBarExample.txt b/PatternSkin/data/System/WebLeftBarExample.txt
index a2c9e78992..4ecb6eda09 100644
--- a/PatternSkin/data/System/WebLeftBarExample.txt
+++ b/PatternSkin/data/System/WebLeftBarExample.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1289333260" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1289333272" format="1.1" version="1"}%
 %META:TOPICPARENT{name="WebHome"}%
 %INCLUDE{"%IF{"context can_login" then="%SYSTEMWEB%.WebLeftBarLogin" else="<nop>"}%" warn="off"}%
 
diff --git a/PatternSkin/data/System/WebLeftBarLogin.txt b/PatternSkin/data/System/WebLeftBarLogin.txt
index 12a98687bf..dbc3cf3fbd 100644
--- a/PatternSkin/data/System/WebLeftBarLogin.txt
+++ b/PatternSkin/data/System/WebLeftBarLogin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1311980901" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1311983319" format="1.1" version="1"}%
 %META:TOPICPARENT{name="WebLeftBarExample"}%
 %STARTINCLUDE%<div class="patternLeftBarPersonal">
 %IF{"context authenticated" then='%MAKETEXT{"Hello [_1]" args="<span class=\"foswikiUserName\">[[%WIKIUSERNAME%][%SPACEOUT{%WIKINAME%}%]]</span>"}%'}%%IF{"$ LOGOUT != ''" then='%BR%<ul><li class="patternLogOut">%LOGOUT%</li></ul>'}%%IF{"$ LOGIN != '' and not context authenticated" then='<ul><li class="patternLogIn">%LOGIN% %IF{"context registration_supported AND context registration_enabled" then="%MAKETEXT{"or"}% [[%SYSTEMWEB%.UserRegistration][%MAKETEXT{"Register"}%]]"}%</li></ul>'}%
diff --git a/PatternSkin/data/System/WebLeftBarPersonalTemplate.txt b/PatternSkin/data/System/WebLeftBarPersonalTemplate.txt
index 96ed6d4a11..78a681c659 100644
--- a/PatternSkin/data/System/WebLeftBarPersonalTemplate.txt
+++ b/PatternSkin/data/System/WebLeftBarPersonalTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1300477020" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1300477710" format="1.1" version="1"}%
 %META:TOPICPARENT{name="WebLeftBarExample"}%
 <!--
 Customise this topic; samples and ideas available at %SYSTEMWEB%.WebLeftBarCookbook.
diff --git a/PatternSkin/data/Trash/WebLeftBarExample.txt b/PatternSkin/data/Trash/WebLeftBarExample.txt
index ec940526ca..01b24d957f 100644
--- a/PatternSkin/data/Trash/WebLeftBarExample.txt
+++ b/PatternSkin/data/Trash/WebLeftBarExample.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1300477020" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1300477710" format="1.1" version="1"}%
 %META:TOPICPARENT{name="WebLeftBar"}%
 %INCLUDE{"%IF{"context can_login" then="%SYSTEMWEB%.WebLeftBarLogin" else="<nop>"}%" warn="off"}%
    * *%MAKETEXT{"Toolbox"}%*
diff --git a/PatternSkin/pub/System/PatternSkinTheme/style_src.css b/PatternSkin/pub/System/PatternSkinTheme/style_src.css
index def90b7da0..03b0c93c20 100755
--- a/PatternSkin/pub/System/PatternSkinTheme/style_src.css
+++ b/PatternSkin/pub/System/PatternSkinTheme/style_src.css
@@ -149,6 +149,9 @@ select {
 	font-family:arial, verdana, sans-serif;
 	font-size:100%;
 }
+label input {
+	vertical-align:text-bottom;
+}
 .foswikiTextarea {
 	padding:1px 4px;
 }
@@ -263,6 +266,7 @@ a.foswikiSubmit:visited:active {
 .foswikiTable th {
 	border-width:1px;
 	border-style:solid;
+	vertical-align:top;
 }
 .foswikiTable {
 	margin:2px 0;
diff --git a/PatternSkin/pub/System/PatternSkinTheme2009/style.css b/PatternSkin/pub/System/PatternSkinTheme2009/style.css
index e23c60d38f..8148cf5a1f 100644
--- a/PatternSkin/pub/System/PatternSkinTheme2009/style.css
+++ b/PatternSkin/pub/System/PatternSkinTheme2009/style.css
@@ -154,6 +154,9 @@ select {
 	font-family:arial, verdana, sans-serif;
 	font-size:100%;
 }
+label input {
+	vertical-align:text-bottom;
+}
 .foswikiTextarea {
 	padding:1px 4px;
 }
@@ -413,10 +416,6 @@ table.foswikiFormTable th.foswikiFormTableHRow a:visited {
 	/* always add class foswikiButton as well */
 	padding:.1em .2em;
 }
-.patternAttachmentHeader {
-        font-size: 1.1em;
-	/* behaviour class */
-}
 .foswikiForm h3 a:link,
 .foswikiForm h3 a:visited {
 	text-decoration:none;
diff --git a/PatternSkin/pub/System/PatternSkinThemeFatWilly/style_src.css b/PatternSkin/pub/System/PatternSkinThemeFatWilly/style_src.css
index 8eb4788b9c..de866d05ba 100755
--- a/PatternSkin/pub/System/PatternSkinThemeFatWilly/style_src.css
+++ b/PatternSkin/pub/System/PatternSkinThemeFatWilly/style_src.css
@@ -278,6 +278,10 @@ select {
 	vertical-align:middle;
 }
 
+label input {
+	vertical-align:text-bottom;
+}
+
 th {
 	line-height:1.15em;
 }
diff --git a/PatternSkin/templates/edit.pattern.tmpl b/PatternSkin/templates/edit.pattern.tmpl
index a1380a1f53..dc4caa31e5 100644
--- a/PatternSkin/templates/edit.pattern.tmpl
+++ b/PatternSkin/templates/edit.pattern.tmpl
@@ -44,7 +44,7 @@
 %TMPL:DEF{"topicinfo"}%%TMPL:P{"revCommentPluginOptions"}%%TMPL:P{"saveoptions"}%<div class="patternTopicActions foswikiFormStep"><div class="patternActionButtons">%TMPL:P{"action_buttons"}%<div class="foswikiClear"></div></div></div>%TMPL:END%
 
 
-%TMPL:DEF{"textarea"}%<div class="patternEditTopic"><textarea class="foswikiTextarea foswikiEditboxStyleProportional foswikiWysiwygEdit" id="topic" name="text" rows="%EDITBOXHEIGHT%" cols="%EDITBOXWIDTH%" style='%EDITBOXSTYLE%'>%TEXT%</textarea>%TMPL:P{"sig_textareabuttons"}%</div>%TMPL:END%
+%TMPL:DEF{"textarea"}%%IF{"{Validation}{Method}='strikeone'" then="<noscript>$percentTMPL:P{enable_js}$percent</noscript>"}%<div class="patternEditTopic"><textarea class="foswikiTextarea foswikiEditboxStyleProportional foswikiWysiwygEdit" id="topic" name="text" rows="%EDITBOXHEIGHT%" cols="%EDITBOXWIDTH%" style='%EDITBOXSTYLE%'>%TEXT%</textarea>%TMPL:P{"sig_textareabuttons"}%</div>%TMPL:END%
 
 
 %TMPL:DEF{"sig_textareabuttons"}%<div class="patternSigLine">%IF{"not context TinyMCEPluginEnabled or $nowysiwyg='1' or $NOWYSIWYG='1'" then='%TMPL:P{"textareabuttons"}%'}%%TMPL:P{"sig"}%<div class="foswikiClear"></div></div>%TMPL:END%
diff --git a/PatternSkin/templates/foswiki.pattern.tmpl b/PatternSkin/templates/foswiki.pattern.tmpl
index 1cbe3b0093..9041c2612b 100644
--- a/PatternSkin/templates/foswiki.pattern.tmpl
+++ b/PatternSkin/templates/foswiki.pattern.tmpl
@@ -56,7 +56,7 @@
 }%%TMPL:P{"JavascriptFiles/foswikiForm"}%%{
 }%%TMPL:P{"LIBJS" id="PatternSkin/pattern" requires="JQUERYPLUGIN::FOSWIKI,JavascriptFiles/foswikiPref,JavascriptFiles/foswikiForm"}%%TMPL:END%
 
-%TMPL:DEF{"bodystart"}%<body class="%TMPL:P{"bodyclassname"}%">
+%TMPL:DEF{"bodystart"}%<body class="foswikiNoJs %TMPL:P{"bodyclassname"}%">
 #PageTop%TMPL:END%
 
 %TMPL:DEF{"main"}%<div class="foswikiPage"><div id="patternScreen">
diff --git a/PatternSkin/templates/foswiki.pattern01x00.tmpl b/PatternSkin/templates/foswiki.pattern01x00.tmpl
index 936d422a04..4e16ba5daf 100644
--- a/PatternSkin/templates/foswiki.pattern01x00.tmpl
+++ b/PatternSkin/templates/foswiki.pattern01x00.tmpl
@@ -39,4 +39,13 @@ JQUERYPLUGIN is not a hard requirement, but it must sort earlier.
 	<meta name='TEXT_SEARCH' content='%MAKETEXT{"Search"}%' />
 	<meta name='TEXT_NUM_TOPICS' content='%MAKETEXT{"Number of topics:"}%' />
 	<meta name='TEXT_MODIFY_SEARCH' content='%MAKETEXT{"Modify search"}%' />"
-}%
\ No newline at end of file
+}%%{
+---------------------------------------------------
+}%
+In Foswiki 1.1.x this macro is defined in foswiki.tpml.
+Handy macro for including JS from system paths
+}%%TMPL:DEF{"FWSRC"}%%TMPL:END%%TMPL:DEF{"LIBJS"}%%ADDTOZONE{
+ "script"
+ id="%id%"
+ text="<script type=\"text/javascript\" src=\"%PUBURLPATH%/%SYSTEMWEB%/%id%%TMPL:P{"FWSRC"}%.js\"></script>"
+ requires="%requires%"}%%TMPL:END%
\ No newline at end of file
diff --git a/PatternSkin/templates/view.pattern.tmpl b/PatternSkin/templates/view.pattern.tmpl
index 73a3d8d92b..9b7be34b17 100644
--- a/PatternSkin/templates/view.pattern.tmpl
+++ b/PatternSkin/templates/view.pattern.tmpl
@@ -23,7 +23,7 @@
 ---------------------------------------------------
 }%%TMPL:DEF{"top"}%<div class="patternTop"><span class="patternHomePath foswikiLeft">%TMPL:P{"breadcrumb"}%</span><span class="patternToolBar foswikiRight">%TMPL:P{"top:toolbarbuttons"}%</span><div class="foswikiClear"></div></div>%TMPL:END%
 
-%TMPL:DEF{"top:toolbarbuttons"}%%TMPL:P{"activatable_edit_or_create"}%%TMPL:P{"activatable_attach"}%%TMPL:END%%{
+%TMPL:DEF{"top:toolbarbuttons"}%%TMPL:P{"activatable_edit_or_create"}%%TMPL:P{"activatable_attach"}%%TMPL:P{context="SubscribePluginEnabled" then="activatable_subscribe"}%%TMPL:END%%{
 ---------------------------------------------------
 }%%TMPL:DEF{"breadcrumb:separator"}%<span class='foswikiSeparator'>&gt;</span>%TMPL:END%
 
@@ -73,4 +73,4 @@
 ---------------------------------------------------
 }%%TMPL:DEF{"horizontalnavigation"}%%IF{"istopic '%PATTERNSKIN_NAVIGATION_TOPIC%'" then="$percntINCLUDE{$quot%PATTERNSKIN_NAVIGATION_TOPIC%$quot section=$quotmain$quot warn=$quotoff$quot}$percnt"}%%TMPL:END%%{
 ---------------------------------------------------
-}%%TMPL:DEF{"metanavigation"}%%IF{"istopic '%PATTERNSKIN_NAVIGATION_TOPIC%'" then="$percntINCLUDE{$quot%PATTERNSKIN_NAVIGATION_TOPIC%$quot section=$quotmeta$quot warn=$quotoff$quot}$percnt"}%%TMPL:END%
\ No newline at end of file
+}%%TMPL:DEF{"metanavigation"}%%IF{"istopic '%PATTERNSKIN_NAVIGATION_TOPIC%'" then="$percntINCLUDE{$quot%PATTERNSKIN_NAVIGATION_TOPIC%$quot section=$quotmeta$quot warn=$quotoff$quot}$percnt"}%%TMPL:END%
diff --git a/PatternSkin/templates/viewprint.pattern.tmpl b/PatternSkin/templates/viewprint.pattern.tmpl
index ec42cec6c2..23f92664bb 100644
--- a/PatternSkin/templates/viewprint.pattern.tmpl
+++ b/PatternSkin/templates/viewprint.pattern.tmpl
@@ -30,9 +30,9 @@
 
 %TMPL:DEF{"broadcastmessage"}%%TMPL:END%
 
-%TMPL:DEF{"content"}%<div class="foswikiTopic">%TMPL:P{"broadcastmessage"}% %TEXT%</div><!-- /foswikiTopic-->%TMPL:END%
+%TMPL:DEF{"content"}%<div class="foswikiTopic">%TMPL:P{"broadcastmessage"}% %TEXT%</div>%TMPL:END%
 
 %TMPL:DEF{"patterntopiccontents"}%
 %TMPL:P{"contentheader"}%%TMPL:P{"formtop"}%%TMPL:P{"attachmentstop"}%<div class="patternContent">%TMPL:P{"content"}%
-%TMPL:P{"contentfooter"}%%TMPL:P{"formbottom"}%%TMPL:P{"attachmentsbottom"}%</div><!-- /patternContent-->
+%TMPL:P{"contentfooter"}%%TMPL:P{"formbottom"}%%TMPL:P{"attachmentsbottom"}%</div>
 %TMPL:P{"topicinfo"}%%TMPL:END%
\ No newline at end of file
diff --git a/PatternSkin/templates/viewsidebar.pattern.tmpl b/PatternSkin/templates/viewsidebar.pattern.tmpl
index 9cf6365e5b..17d32558e8 100644
--- a/PatternSkin/templates/viewsidebar.pattern.tmpl
+++ b/PatternSkin/templates/viewsidebar.pattern.tmpl
@@ -1,7 +1,7 @@
 %{ to include a side bar on a page, just include this template in the page template }%
 %TMPL:DEF{"sidebar"}%<div id="patternSideBar"><div id="patternClearHeaderLeft"></div>
 <div id="patternSideBarContents">%TMPL:P{"websidebar"}%
-</div><!-- /patternSideBarContents--></div><!-- /patternSideBar-->%TMPL:END%
+</div></div>%TMPL:END%
 
 
 %TMPL:DEF{"sidebar:webindicator"}%<div class="patternWebIndicator" style="border-color:%WEBBGCOLOR%">
@@ -20,4 +20,4 @@
 
 
 %TMPL:DEF{"startsidebarwrapper"}%<div id="patternWrapper">%TMPL:END%
-%TMPL:DEF{"endsidebarwrapper"}%</div><!-- /patternWrapper-->%TMPL:END%
\ No newline at end of file
+%TMPL:DEF{"endsidebarwrapper"}%</div>%TMPL:END%
\ No newline at end of file
diff --git a/PatternSkin/templates/viewtopbar.pattern.tmpl b/PatternSkin/templates/viewtopbar.pattern.tmpl
index d02030c142..8ec95a1dec 100644
--- a/PatternSkin/templates/viewtopbar.pattern.tmpl
+++ b/PatternSkin/templates/viewtopbar.pattern.tmpl
@@ -1,6 +1,6 @@
 %{ to include a top bar on a page, just include this template in the page template }%
 
-%TMPL:DEF{"topbar"}%<div id="patternTopBar"><div id="patternTopBarContentsWrapper"><div id="patternTopBarContents">%IF{"istopic '%SYSTEMWEB%.WebTopBar'" then="$percntINCLUDE{$quot%SYSTEMWEB%.WebTopBar$quot}$percnt" else="$percntINCLUDE{$quot%SYSTEMWEB%.WebTopBarExample$quot}$percnt"}%</div><!--/patternTopBarContents--></div><!--/patternTopBarContentsWrapper--></div><!-- /patternTopBar-->%TMPL:END%
+%TMPL:DEF{"topbar"}%<div id="patternTopBar"><div id="patternTopBarContentsWrapper"><div id="patternTopBarContents">%IF{"istopic '%SYSTEMWEB%.WebTopBar'" then="$percntINCLUDE{$quot%SYSTEMWEB%.WebTopBar$quot}$percnt" else="$percntINCLUDE{$quot%SYSTEMWEB%.WebTopBarExample$quot}$percnt"}%</div></div></div>%TMPL:END%
 
 
 %TMPL:DEF{"topbarspacer"}%<div id="patternClearHeaderCenter"></div>%TMPL:END%
\ No newline at end of file