diff --git a/master:PatternSkin/templates/foswiki.pattern.tmpl b/release11:PatternSkin/templates/foswiki.pattern.tmpl index 3775306..1cbe3b0 100644 --- a/master:PatternSkin/templates/foswiki.pattern.tmpl +++ b/release11: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"}% +%TMPL:DEF{"bodystart"}% #PageTop%TMPL:END% %TMPL:DEF{"main"}%
@@ -78,15 +78,4 @@ %TMPL:DEF{"bodyend"}%%TMPL:END% -%TMPL:DEF{"textareabuttons"}%   %TMPL:END% - -%{ -Added for compatibility with Foswiki 1.0.x -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="" - requires="%requires%"}%%TMPL:END% \ No newline at end of file +%TMPL:DEF{"textareabuttons"}%   %TMPL:END% \ No newline at end of file diff --git a/master:PatternSkin/templates/viewprint.pattern.tmpl b/release11:PatternSkin/templates/viewprint.pattern.tmpl index 23f9266..ec42cec 100644 --- a/master:PatternSkin/templates/viewprint.pattern.tmpl +++ b/release11:PatternSkin/templates/viewprint.pattern.tmpl @@ -30,9 +30,9 @@ %TMPL:DEF{"broadcastmessage"}%%TMPL:END% -%TMPL:DEF{"content"}%
%TMPL:P{"broadcastmessage"}% %TEXT%
%TMPL:END% +%TMPL:DEF{"content"}%
%TMPL:P{"broadcastmessage"}% %TEXT%
%TMPL:END% %TMPL:DEF{"patterntopiccontents"}% %TMPL:P{"contentheader"}%%TMPL:P{"formtop"}%%TMPL:P{"attachmentstop"}%
%TMPL:P{"content"}% -%TMPL:P{"contentfooter"}%%TMPL:P{"formbottom"}%%TMPL:P{"attachmentsbottom"}%
+%TMPL:P{"contentfooter"}%%TMPL:P{"formbottom"}%%TMPL:P{"attachmentsbottom"}%
%TMPL:P{"topicinfo"}%%TMPL:END% \ No newline at end of file diff --git a/master:PatternSkin/templates/viewsidebar.pattern.tmpl b/release11:PatternSkin/templates/viewsidebar.pattern.tmpl index 17d3255..9cf6365 100644 --- a/master:PatternSkin/templates/viewsidebar.pattern.tmpl +++ b/release11: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"}%
%TMPL:P{"websidebar"}% -
%TMPL:END% +
%TMPL:END% %TMPL:DEF{"sidebar:webindicator"}%
@@ -20,4 +20,4 @@ %TMPL:DEF{"startsidebarwrapper"}%
%TMPL:END% -%TMPL:DEF{"endsidebarwrapper"}%
%TMPL:END% \ No newline at end of file +%TMPL:DEF{"endsidebarwrapper"}%
%TMPL:END% \ No newline at end of file diff --git a/master:PatternSkin/templates/attachtables.pattern.tmpl b/release11:PatternSkin/templates/attachtables.pattern.tmpl index f49165b..ad66fb2 100644 --- a/master:PatternSkin/templates/attachtables.pattern.tmpl +++ b/release11:PatternSkin/templates/attachtables.pattern.tmpl @@ -3,7 +3,7 @@ %TMPL:DEF{"commonattachtableattributes"}%valign="middle" dataalign="left,left,left,right,left,left,left,left" datavalign="top" headeralign="left" headercolor="#0066cc" databg="#ffffff" headerbg="#ffffff" headerbgsorted="#eeeeee" databgsorted="#f5f5f5" %TMPL:END% -%TMPL:DEF{"topicattachmentwisty"}%%TWISTY{id="topicattachmentslist" mode="div" remember="on" showimgleft="%ICONURLPATH{toggleopen}%" hideimgleft="%ICONURLPATH{toggleclose}%" link="%MAKETEXT{"Attachments ([_1])" args="%QUERY{"length(attachments[NOT lc(attr)=~'h'])"}%"}%" linkclass="patternTwistyButton"}%%TMPL:END% +%TMPL:DEF{"topicattachmentwisty"}%%TWISTY{id="topicattachmentslist" mode="div" remember="on" showimgleft="%ICONURLPATH{toggleopen}%" hideimgleft="%ICONURLPATH{toggleclose}%" showlink="%MAKETEXT{"Attachments"}%" hidelink="%MAKETEXT{"Attachments"}%" linkclass="patternTwistyButton patternAttachmentHeader"}%%TMPL:END% %{ Header definition for topic attachments and top table in attach screen }% %TMPL:DEF{ATTACH:files:header(basic)}%
diff --git a/master:PatternSkin/templates/login.sudo.pattern.tmpl b/release11:PatternSkin/templates/login.sudo.pattern.tmpl old mode 100755 new mode 100644 diff --git a/master:PatternSkin/templates/viewtopbar.pattern.tmpl b/release11:PatternSkin/templates/viewtopbar.pattern.tmpl index 8ec95a1..d02030c 100644 --- a/master:PatternSkin/templates/viewtopbar.pattern.tmpl +++ b/release11: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"}%
%IF{"istopic '%SYSTEMWEB%.WebTopBar'" then="$percntINCLUDE{$quot%SYSTEMWEB%.WebTopBar$quot}$percnt" else="$percntINCLUDE{$quot%SYSTEMWEB%.WebTopBarExample$quot}$percnt"}%
%TMPL:END% +%TMPL:DEF{"topbar"}%
%IF{"istopic '%SYSTEMWEB%.WebTopBar'" then="$percntINCLUDE{$quot%SYSTEMWEB%.WebTopBar$quot}$percnt" else="$percntINCLUDE{$quot%SYSTEMWEB%.WebTopBarExample$quot}$percnt"}%
%TMPL:END% %TMPL:DEF{"topbarspacer"}%
%TMPL:END% \ No newline at end of file diff --git a/master:PatternSkin/templates/edit.pattern.tmpl b/release11:PatternSkin/templates/edit.pattern.tmpl index dc4caa3..a1380a1 100644 --- a/master:PatternSkin/templates/edit.pattern.tmpl +++ b/release11:PatternSkin/templates/edit.pattern.tmpl @@ -44,7 +44,7 @@ %TMPL:DEF{"topicinfo"}%%TMPL:P{"revCommentPluginOptions"}%%TMPL:P{"saveoptions"}%
%TMPL:P{"action_buttons"}%
%TMPL:END% -%TMPL:DEF{"textarea"}%%IF{"{Validation}{Method}='strikeone'" then=""}%
%TMPL:P{"sig_textareabuttons"}%
%TMPL:END% +%TMPL:DEF{"textarea"}%
%TMPL:P{"sig_textareabuttons"}%
%TMPL:END% %TMPL:DEF{"sig_textareabuttons"}%
%IF{"not context TinyMCEPluginEnabled or $nowysiwyg='1' or $NOWYSIWYG='1'" then='%TMPL:P{"textareabuttons"}%'}%%TMPL:P{"sig"}%
%TMPL:END% diff --git a/master:PatternSkin/templates/view.pattern.tmpl b/release11:PatternSkin/templates/view.pattern.tmpl index 9b7be34..73a3d8d 100644 --- a/master:PatternSkin/templates/view.pattern.tmpl +++ b/release11:PatternSkin/templates/view.pattern.tmpl @@ -23,7 +23,7 @@ --------------------------------------------------- }%%TMPL:DEF{"top"}%
%TMPL:P{"breadcrumb"}%%TMPL:P{"top:toolbarbuttons"}%
%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{"top:toolbarbuttons"}%%TMPL:P{"activatable_edit_or_create"}%%TMPL:P{"activatable_attach"}%%TMPL:END%%{ --------------------------------------------------- }%%TMPL:DEF{"breadcrumb:separator"}%>%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% +}%%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 diff --git a/master:PatternSkin/lib/Foswiki/Contrib/PatternSkin.pm b/release11:PatternSkin/lib/Foswiki/Contrib/PatternSkin.pm index 232db6c..b4dee41 100644 --- a/master:PatternSkin/lib/Foswiki/Contrib/PatternSkin.pm +++ b/release11:PatternSkin/lib/Foswiki/Contrib/PatternSkin.pm @@ -4,7 +4,7 @@ use strict; use warnings; our $VERSION = '$Rev$'; -our $RELEASE = '5.4.16'; +our $RELEASE = '5.4.17'; 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'; diff --git a/master:PatternSkin/pub/System/PatternSkinThemeFatWilly/style_src.css b/release11:PatternSkin/pub/System/PatternSkinThemeFatWilly/style_src.css index de866d0..8eb4788 100755 --- a/master:PatternSkin/pub/System/PatternSkinThemeFatWilly/style_src.css +++ b/release11:PatternSkin/pub/System/PatternSkinThemeFatWilly/style_src.css @@ -278,10 +278,6 @@ select { vertical-align:middle; } -label input { - vertical-align:text-bottom; -} - th { line-height:1.15em; } diff --git a/master:PatternSkin/pub/System/PatternSkin/pattern_src.js b/release11:PatternSkin/pub/System/PatternSkin/pattern_src.js index a93faad..4f702ce 100644 --- a/master:PatternSkin/pub/System/PatternSkin/pattern_src.js +++ b/release11:PatternSkin/pub/System/PatternSkin/pattern_src.js @@ -3,6 +3,25 @@ jQuery(document).ready( function ($) { var searchResultsCount = 0; + // Create an attachment counter in the attachment table twisty. + $('.foswikiAttachments').livequery(function() { + var table = $(this).find('table.foswikiTable'); + if (!table) { + return; + } + var rows = table.attr('rows'); + if (!rows) { + return; + } + var count = rows.length - 1; + var countStr = " " + + count + "<\/span>"; + $(this).find('.patternAttachmentHeader').livequery(function() { + $(this).append(countStr); + }); + } + ); + // Search page handling $('.foswikiSearchResultCount span').livequery(function() { searchResultsCount += parseInt($(this).html()); diff --git a/master:PatternSkin/pub/System/PatternSkinTheme2009/style.css b/release11:PatternSkin/pub/System/PatternSkinTheme2009/style.css index 8148cf5..e23c60d 100644 --- a/master:PatternSkin/pub/System/PatternSkinTheme2009/style.css +++ b/release11:PatternSkin/pub/System/PatternSkinTheme2009/style.css @@ -154,9 +154,6 @@ select { font-family:arial, verdana, sans-serif; font-size:100%; } -label input { - vertical-align:text-bottom; -} .foswikiTextarea { padding:1px 4px; } @@ -416,6 +413,10 @@ 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/master:PatternSkin/pub/System/PatternSkinTheme/style_src.css b/release11:PatternSkin/pub/System/PatternSkinTheme/style_src.css index 03b0c93..def90b7 100755 --- a/master:PatternSkin/pub/System/PatternSkinTheme/style_src.css +++ b/release11:PatternSkin/pub/System/PatternSkinTheme/style_src.css @@ -149,9 +149,6 @@ select { font-family:arial, verdana, sans-serif; font-size:100%; } -label input { - vertical-align:text-bottom; -} .foswikiTextarea { padding:1px 4px; } @@ -266,7 +263,6 @@ a.foswikiSubmit:visited:active { .foswikiTable th { border-width:1px; border-style:solid; - vertical-align:top; } .foswikiTable { margin:2px 0; diff --git a/master:PatternSkin/data/Main/PatternSkinUserViewTemplate.txt b/release11:PatternSkin/data/Main/PatternSkinUserViewTemplate.txt index 6e7755b..a9fefe2 100644 --- a/master:PatternSkin/data/Main/PatternSkinUserViewTemplate.txt +++ b/release11:PatternSkin/data/Main/PatternSkinUserViewTemplate.txt @@ -1,2 +1,6 @@ -%META:TOPICINFO{author="ProjectContributor" date="1300477710" format="1.1" version="1"}% -%TMPL:INCLUDE{"view"}% \ No newline at end of file +%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% diff --git a/master:PatternSkin/data/Main/WebLeftBarExample.txt b/release11:PatternSkin/data/Main/WebLeftBarExample.txt index 3ef4c08..2488191 100644 --- a/master:PatternSkin/data/Main/WebLeftBarExample.txt +++ b/release11:PatternSkin/data/Main/WebLeftBarExample.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1289333272" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1289333260" format="1.1" version="1"}% %META:TOPICPARENT{name="WebHome"}% %INCLUDE{"%IF{"context can_login" then="%SYSTEMWEB%.WebLeftBarLogin" else=""}%" warn="off"}% diff --git a/master:PatternSkin/data/System/PatternSkinWebCreateNewTopicTemplate.txt b/release11:PatternSkin/data/System/PatternSkinWebCreateNewTopicTemplate.txt index 410f340..5a3bc6b 100644 --- a/master:PatternSkin/data/System/PatternSkinWebCreateNewTopicTemplate.txt +++ b/release11:PatternSkin/data/System/PatternSkinWebCreateNewTopicTemplate.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1288962587" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1288964903" format="1.1" version="1"}% %META:TOPICPARENT{name="PatternSkin"}% %TMPL:INCLUDE{"WebCreateNewTopic"}% diff --git a/master:PatternSkin/data/System/WebLeftBarPersonalTemplate.txt b/release11:PatternSkin/data/System/WebLeftBarPersonalTemplate.txt index 78a681c..96ed6d4 100644 --- a/master:PatternSkin/data/System/WebLeftBarPersonalTemplate.txt +++ b/release11:PatternSkin/data/System/WebLeftBarPersonalTemplate.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1300477710" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1300477020" format="1.1" version="1"}% %META:TOPICPARENT{name="WebLeftBarExample"}%   | +| 02 Oct 2011: | v.5.4.17: Update javascript for attachment counting. | | 26 Aug 2011: | v.5.4.15, v.5.4.16: Additional support for running Pattern Skin on Foswiki 1.0.x release. | | 28 May 2011: | v.5.4.14: Fixed search results on Foswiki 1.0.x versions. | | 29 Apr 2011: | v.5.4.13: Added no-column CSS for Fatwilly theme. | diff --git a/master:PatternSkin/data/System/PatternSkinTheme.txt b/release11:PatternSkin/data/System/PatternSkinTheme.txt index 97ae4a0..5515945 100644 --- a/master:PatternSkin/data/System/PatternSkinTheme.txt +++ b/release11:PatternSkin/data/System/PatternSkinTheme.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1288962587" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1300477020" format="1.1" version="1"}% %META:TOPICPARENT{name="PatternSkin"}% ---+!! PatternSkin theme Default pattern skin theme. diff --git a/master:PatternSkin/data/System/PatternSkinCss.txt b/release11:PatternSkin/data/System/PatternSkinCss.txt index f8c3d2e..9ac3346 100644 --- a/master:PatternSkin/data/System/PatternSkinCss.txt +++ b/release11:PatternSkin/data/System/PatternSkinCss.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1301018910" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1301018830" format="1.1" version="1"}% %META:TOPICPARENT{name="PatternSkin"}% ---+!! CSS elements in !PatternSkin diff --git a/master:PatternSkin/data/System/PatternSkinColorSettings.txt b/release11:PatternSkin/data/System/PatternSkinColorSettings.txt index 584c614..55c769f 100644 --- a/master:PatternSkin/data/System/PatternSkinColorSettings.txt +++ b/release11:PatternSkin/data/System/PatternSkinColorSettings.txt @@ -441,7 +441,7 @@ a:hover.twistyTrigger { } /* RevCommentPlugin */ -.revComment .patternTopicActions { +.revComment .patternTopicAction { background-color:%ATTACHMENT_AND_FORM_BACKGROUND%; } @@ -486,7 +486,8 @@ table.foswikiFormTable, background-color:%ACTIVE_FORM_BACKGROUND%; border-color:%FORM_STEP_BORDER%; } -.foswikiFormStep { +.foswikiFormStep, +.patternPreviewFormStep { border-color:%FORM_STEP_BORDER%; } .foswikiFormStep h2 { @@ -624,26 +625,27 @@ a:hover .foswikiAccessKey { color:%SIDEBAR_TEXT%; } -.patternViewPage .patternTopicActions { +.patternTopicActions { background-color:%TOPIC_ACTION_BACKGROUND%; + color:%MAIN_TEXT%; } .patternActionButtons a:link, .patternActionButtons a:visited, .patternActionButtons a:hover { color:%LINK_TEXT_NORMAL%; } -.patternTopicActions s, -.patternTopicActions strike { +.patternTopicAction s, +.patternTopicAction strike { color:%DISABLED_TEXT%; } -.patternTopicActions .foswikiAccessKey { +.patternTopicAction .foswikiAccessKey { color:%LINK_TEXT_NORMAL%; border-color:%LINK_TEXT_NORMAL%; } -.patternTopicActions a:hover .foswikiAccessKey { +.patternTopicAction a:hover .foswikiAccessKey { color:%LINK_TEXT_HOVER%; } -.patternTopicActions label { +.patternTopicAction label { color:%GENERAL_TEXT%; } .patternHelpCol { @@ -987,6 +989,9 @@ li.patternLogIn { -webkit-box-shadow: 0 0 10px %STRONG_BORDER%; box-shadow: 0 0 10px %STRONG_BORDER%; } +.patternBorder { + border-color:%NEUTRAL_BORDER%; +} .foswikiJs a.jqPopUpWindow:link, .foswikiJs a.jqPopUpWindow:visited, .foswikiJs a.jqPopUpWindow:hover { diff --git a/master:PatternSkin/data/System/PatternSkinThemeFatWilly.txt b/release11:PatternSkin/data/System/PatternSkinThemeFatWilly.txt index 1b00bc7..2257a3f 100644 --- a/master:PatternSkin/data/System/PatternSkinThemeFatWilly.txt +++ b/release11:PatternSkin/data/System/PatternSkinThemeFatWilly.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1304087511" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1304087442" format="1.1" version="1"}% %META:TOPICPARENT{name="PatternSkin"}% ---+!! PatternSkin theme: Foswiki "Fat Willy" Site Skin diff --git a/master:PatternSkin/data/System/PatternSkinTheme2009.txt b/release11:PatternSkin/data/System/PatternSkinTheme2009.txt index 2d13e3f..d65fada 100644 --- a/master:PatternSkin/data/System/PatternSkinTheme2009.txt +++ b/release11:PatternSkin/data/System/PatternSkinTheme2009.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1288962587" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1288964903" format="1.1" version="1"}% %META:TOPICPARENT{name="PatternSkin"}% ---+!! PatternSkin theme: 2009 diff --git a/master:PatternSkin/data/System/WebLeftBarCookbook.txt b/release11:PatternSkin/data/System/WebLeftBarCookbook.txt index 8ae258d..f0c0c53 100644 --- a/master:PatternSkin/data/System/WebLeftBarCookbook.txt +++ b/release11:PatternSkin/data/System/WebLeftBarCookbook.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1300477710" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1300477020" format="1.1" version="1"}% %META:TOPICPARENT{name="PatternSkin"}% ---+ !WebLeftBar Cookbook diff --git a/master:PatternSkin/data/Trash/WebLeftBarExample.txt b/release11:PatternSkin/data/Trash/WebLeftBarExample.txt index 01b24d9..ec94052 100644 --- a/master:PatternSkin/data/Trash/WebLeftBarExample.txt +++ b/release11:PatternSkin/data/Trash/WebLeftBarExample.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1300477710" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1300477020" format="1.1" version="1"}% %META:TOPICPARENT{name="WebLeftBar"}% %INCLUDE{"%IF{"context can_login" then="%SYSTEMWEB%.WebLeftBarLogin" else=""}%" warn="off"}% * *%MAKETEXT{"Toolbox"}%*