Skip to content

Commit

Permalink
Item14039: Improve performance of SkinBrowser
Browse files Browse the repository at this point in the history 
Multiple searches across all System web topics were not needed.

Thanks to BramVanOosterhout for the debugging that exposed these
issues.
  • Loading branch information
@gac410
gac410 committed Apr 4, 2016
1 parent 8dc53bd commit 25f9dda
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 23 deletions.
40 changes: 21 additions & 19 deletions PatternSkin/data/System/PatternSkin.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1454519814" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1459801632" format="1.1" version="1"}%
%META:TOPICPARENT{name="Skins"}%
%STARTINCLUDE%
---+!! Pattern skin
Expand Down Expand Up @@ -44,7 +44,7 @@ Set these variables site wide in [[%LOCALSITEPREFS%]].
---++ Screenshot

Click to enlarge:%BR%
%SEARCH{ "%TOPIC%" scope="topic" nosearch="on" nototal="on" format="$pattern(.*\| *Screenshot\:[^\|]*\|([^\|]*).*)" }%
%SEARCH{ "%TOPIC%" scope="topic" topic="%TOPIC%" nosearch="on" nototal="on" format="$pattern(.*\| *Screenshot\:[^\|]*\|([^\|]*).*)" }%
<div class="foswikiGrayText">Click to view full screenshot</div>


Expand Down Expand Up @@ -189,6 +189,8 @@ 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; |
| 04 Apr 2016 | V.6.06: Foswikitask:Item13950: Remove refresh cache links for guests<br/> \
Foswikitask:Item14039: SkinBrowser is too slow, searches are too broad. |
| 03 Feb 2016 | V.6.05: Foswikitask:Item13880: Malformed HTML in WebCreateNewTopic |
| 03 Dec 2015 | v.6.04: Foswikitask:Item13885: Restore compatibility with Foswiki 1.1. |
| 06 Nov 2015 | v.6.03: Foswikitask:Item13814: Raw view should use monospaced font. |
Expand Down Expand Up @@ -260,20 +262,20 @@ Leave remarks, suggestions and other feedback in http://foswiki.org/Support/%TOP
%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="1454519814" size="786" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header3.gif" attr="h" comment="" date="1454519814" size="33112" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot.png" attr="h" comment="" date="1454519814" size="129505" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01_src.js" attr="h" comment="" date="1454519814" size="2618" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header1.gif" attr="h" comment="" date="1454519814" size="20605" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js" attr="h" comment="" date="1454519814" size="1305" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header2.gif" attr="h" comment="" date="1454519814" size="41616" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header5.gif" attr="h" comment="" date="1454519814" size="20639" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern_src.js" attr="h" comment="" date="1454519814" size="1732" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js.gz" attr="h" comment="" date="1454519814" size="474" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js.gz" attr="h" comment="" date="1454519814" size="620" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print.css" attr="h" comment="" date="1454519814" size="3869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="headers.psd" attr="h" comment="" date="1454519814" size="8499470" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header4.gif" attr="h" comment="" date="1454519814" size="92238" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot_full.png" attr="h" comment="" date="1454519814" size="177943" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js" attr="h" comment="" date="1454519814" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print_src.css" attr="h" comment="" date="1454519814" size="5545" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print.css.gz" attr="h" comment="" date="1459801632" size="786" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header3.gif" attr="h" comment="" date="1459801632" size="33112" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot.png" attr="h" comment="" date="1459801632" size="129505" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01_src.js" attr="h" comment="" date="1459801632" size="2618" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header1.gif" attr="h" comment="" date="1459801632" size="20605" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js" attr="h" comment="" date="1459801632" size="1305" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header2.gif" attr="h" comment="" date="1459801632" size="41616" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header5.gif" attr="h" comment="" date="1459801632" size="20639" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern_src.js" attr="h" comment="" date="1459801632" size="1732" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js.gz" attr="h" comment="" date="1459801632" size="474" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js.gz" attr="h" comment="" date="1459801632" size="620" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print.css" attr="h" comment="" date="1459801632" size="3869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="headers.psd" attr="h" comment="" date="1459801632" size="8499470" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header4.gif" attr="h" comment="" date="1459801632" size="92238" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot_full.png" attr="h" comment="" date="1459801632" size="177943" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js" attr="h" comment="" date="1459801632" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print_src.css" attr="h" comment="" date="1459801632" size="5545" user="ProjectContributor" version="1"}%
4 changes: 2 additions & 2 deletions PatternSkin/data/System/WebLeftBarExample.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1447730097" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1459801632" format="1.1" version="1"}%
%META:TOPICPARENT{name="WebHome"}%
%INCLUDE{"%IF{"context can_login" then="%SYSTEMWEB%.WebLeftBarLogin" else="<nop>"}%" warn="off"}%

Expand Down Expand Up @@ -35,7 +35,7 @@
* %WEBPREFSTOPIC%

* <b>%MAKETEXT{"Categories"}%</b>
%SEARCH{"parent.name='Category' AND name!='%BASETOPIC%'" web="%BASEWEB%" type="query"
%SEARCH{"parent.name='Category' AND name!='%BASETOPIC%'" web="%BASEWEB%" topic="*Category" type="query"
nonoise="on" format=" * [[$topic]]"}%
%ENDSECTION{"topics"}%

Expand Down
4 changes: 2 additions & 2 deletions PatternSkin/lib/Foswiki/Contrib/PatternSkin.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package Foswiki::Contrib::PatternSkin;
use strict;
use warnings;

our $VERSION = '6.05';
our $RELEASE = '03 Feb 2016';
our $VERSION = '6.06';
our $RELEASE = '04 Apr 2016';
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';

Expand Down

0 comments on commit 25f9dda

Please sign in to comment.