Skip to content

Commit

Permalink
Item13273: add dependency on GridLayoutPlugin
Browse files Browse the repository at this point in the history 
also:
- fixing caching issue using Internet Explorer
- removing some old $Rev$ tags
  • Loading branch information
@MichaelDaum
MichaelDaum committed Feb 23, 2015
1 parent 45c7865 commit 7ef304a
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 43 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -2,6 +2,7 @@ igp_*
*.gz
*,v
*.swp
*.lease
pub/System/ClassificationPlugin/jquery.catselector.js
pub/System/ClassificationPlugin/jquery.classifiedtopic.js
pub/System/ClassificationPlugin/jquery.hierarchy.js
Expand Down
12 changes: 6 additions & 6 deletions data/Applications/ClassificationApp/WebPreferences.txt
View file
@@ -1,12 +1,12 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1418731764" format="1.1" version="1"}%

%META:TOPICINFO{author="ProjectContributor" comment="" date="1424695107" format="1.1" version="1"}%

%TOC%

---+++ Naming
Text to be displayed on the sitemap and in the headerbar describing this web
using a kind of tagline:
* Set WEBSUMMARY = Categorization and folksomony application
* Set SITEMAPLIST = off

---+++ Access rights
* Set #DENYWEBVIEW =
Expand All @@ -26,7 +26,7 @@ Definition of DataForms:
</noautolink>

%META:FORM{name="Applications.ApplicationTopic"}%
%META:FIELD{name="TopicType" title="TopicType" value="ApplicationTopic, WebTool"}%
%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%
%META:FIELD{name="Summary" attributes="c" title="Summary" value="Preferences of the <nop>%25WEB%25 web"}%
%META:FIELD{name="WikiApplication" attributes="" title="WikiApplication" value="WikiWorkbench"}%
%META:FIELD{name="TopicType" title="TopicType" value="ApplicationTopic, WebTool, WikiTopic"}%
%META:FIELD{name="TopicTitle" title="<nop>TopicTitle" value=""}%
%META:FIELD{name="Summary" title="Summary" value="Preferences of the <nop>%25WEB%25 web"}%
%META:FIELD{name="WikiApplication" title="WikiApplication" value="WikiWorkbench"}%
34 changes: 11 additions & 23 deletions data/_ClassificationTemplate/WebHome.txt
View file
@@ -1,12 +1,11 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1418731764" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1424695107" format="1.1" reprev="19" version="1"}%
---+!! %TOPICTITLE%

---++ %MAKETEXT{"Welcome"}%
%DBCALL{"Applications.ClassificationApp.WelcomeMessage"}%

<div class="foswikiGrid">
<div class="foswikiRow">
<div class="foswikiCol8">
%BEGINGRID{border="on"}%
%BEGINCOL{"8"}%
---++ %MAKETEXT{"Categories"}%
<verbatim class="jqLoader {section:'parties'}">
%STARTSECTION{"parties"}%<!-- -->
Expand All @@ -27,9 +26,8 @@
</div>
%CLEAR%
<!-- -->%ENDSECTION{"tagcloud"}%
</div>
%STOPCHAPTER%
<div class="foswikiCol4 border">
%BEGINCOL{"4"}%
---++ %MAKETEXT{"Recent changes"}%
<verbatim class="jqLoader {section:'recentchanges'}">
%STARTSECTION{"recentchanges"}%<!-- -->
Expand All @@ -39,11 +37,8 @@
<!-- -->%ENDSECTION{"recentchanges"}%
</verbatim>
%STOPCHAPTER%
</div>
</div>
---
<div class="foswikiRow foswikiRedBullets">
<div class="foswikiCol4 border">
%BEGINROW{class="foswikiRedBullets"}%
%BEGINCOL{"4"}%
---++ %MAKETEXT{"Topics tagged \"[_1]\"" args="%QUERYTAG%"}%
<!--
* Set QUERYTAG = test
Expand All @@ -56,16 +51,14 @@
sort="on"
}%
%STOPCHAPTER%
</div>
<div class="foswikiCol4 border">
%BEGINCOL{"4"}%
---++ %MAKETEXT{"Quick links"}%
* ...
* ...
* ...

%STOPCHAPTER%
</div>
<div class="foswikiCol4 border">
%BEGINCOL{"4"}%
---++ %MAKETEXT{"Tools"}%
* [[Categories]]
* [[ClassifiedTopics]]
Expand All @@ -74,19 +67,13 @@
* [[WebStatistics]]
* [[WebNotify]]
%STOPCHAPTER%
</div>
</div>
---
<div class="foswikiRow">
<div class="foswikiCol12">
%BEGINCOL{"12"}%
---++ %MAKETEXT{"Add more text here"}%

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam aliquam molestie scelerisque. Aenean accumsan ante cursus nisl dapibus sed rhoncus lacus bibendum. Quisque eros libero, feugiat porttitor semper quis, commodo et magna. Sed fermentum lacinia dolor vitae iaculis. Nulla dapibus commodo orci non lacinia. Aliquam erat volutpat. Proin in nulla ut libero fringilla iaculis vitae sit amet purus. Vivamus ut convallis lacus. Nulla turpis eros, tincidunt sit amet accumsan non, molestie ut eros. Nunc porta rhoncus dui vitae interdum. Praesent rhoncus mollis quam, vel egestas mi rhoncus at. Quisque vestibulum magna sed justo laoreet at ultricies quam adipiscing. Vivamus sit amet sem justo, id ultrices sem. Vestibulum risus ipsum, congue eu varius sit amet, luctus eget velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.

%STOPCHAPTER%
</div>
</div>
</div><!-- end of grid -->
%ENDGRID%
<!-- %JQREQUIRE{"hyphenator, loader, infinitescroll, sameheight" warn="off"}% %REDDOTINIT% %IMAGE% -->
<!--
* Set CACHEEXPIRE = +5min
Expand All @@ -97,3 +84,4 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam aliquam molestie
%META:PREFERENCE{name="NATSKIN_SIDEBAR" title="NATSKIN_SIDEBAR" type="Local" value="off"}%
%META:PREFERENCE{name="DISPLAYREVISIONINFO" title="DISPLAYREVISIONINFO" type="Local" value="off"}%
%META:PREFERENCE{name="NOWYSIWYG" title="NOWYSIWYG" type="Set" value="on"}%
%META:PREFERENCE{name="TOPICTITLE" title="TOPICTITLE" type="Local" value="_ClassificationTemplate"}%
1 change: 1 addition & 0 deletions lib/Foswiki/Plugins/ClassificationPlugin/DEPENDENCIES
View file
@@ -1,6 +1,7 @@
Foswiki::Contrib::JSTreeContrib,>=1.03,perl,Required
Foswiki::Contrib::NatSkin,>=4.00,perl,Optional
Foswiki::Contrib::WikiWorkbenchContrib,>=1.31,perl,Required
Foswiki::Plugins::GridLayoutPlugin,>=1.00,perl,Required
Foswiki::Plugins::DBCachePlugin,>=4.10,perl,Required
Foswiki::Plugins::FilterPlugin,>=1.40,perl,Required
Foswiki::Plugins::FlexFormPlugin,>=2.61,perl,Required
Expand Down
2 changes: 0 additions & 2 deletions lib/Foswiki/Plugins/ClassificationPlugin/MANIFEST
View file
Expand Up @@ -153,7 +153,6 @@ data/Applications/ClassificationApp/WebPreferences.txt 0644
data/Applications/ClassificationApp/WebRss.txt 0644
data/Applications/ClassificationApp/WebSearchAdvanced.txt 0644
data/Applications/ClassificationApp/WebSearch.txt 0644
data/Applications/ClassificationApp/WebStatistics.txt 0644
data/Applications/ClassificationApp/WebTagList.txt 0644
data/Applications/ClassificationApp/WebTool.txt 0644
data/Applications/ClassificationApp/WebTopicEditTemplate.txt 0644
Expand All @@ -178,7 +177,6 @@ data/_ClassificationTemplate/WebNotify.txt 0644
data/_ClassificationTemplate/WebPreferences.txt 0644
data/_ClassificationTemplate/WebRss.txt 0644
data/_ClassificationTemplate/WebSearch.txt 0644
data/_ClassificationTemplate/WebStatistics.txt 0644
data/_ClassificationTemplate/WebTagList.txt 0644
data/_ClassificationTemplate/WebTopicEditTemplate.txt 0644
data/_ClassificationTemplate/WebTopicList.txt 0644
Expand Down
2 changes: 0 additions & 2 deletions pub/System/ClassificationPlugin/jquery.catselector.uncompressed.js
View file
Expand Up @@ -7,8 +7,6 @@
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html
*
* Revision: $Id$
*
*/
jQuery(function($) {
"use strict";
Expand Down
24 changes: 16 additions & 8 deletions pub/System/ClassificationPlugin/jquery.hierarchy.uncompressed.js
View file
@@ -1,7 +1,7 @@
/*
* jQuery hierarchy plugin 0.10
*
* Copyright (c) 2013-2014 Michael Daum http://michaeldaumconsulting.com
* Copyright (c) 2013-2015 Michael Daum http://michaeldaumconsulting.com
*
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
Expand All @@ -10,6 +10,7 @@
*/

(function($, window, document) {
"use strict";

/***************************************************************************
* defaults
Expand Down Expand Up @@ -193,7 +194,8 @@
"cat": node.attr ? node.data("name") : self.opts.root,
"select": self.inputField.val(),
"counts": self.opts.displayCounts,
"sort": self.opts.sort
"sort": self.opts.sort,
"t": (new Date()).getTime()
};
},
"success": function(data) {
Expand All @@ -213,7 +215,8 @@
"action": "search",
"web": self.opts.web,
"topic": self.opts.topic,
"title": term
"title": term,
"t": (new Date()).getTime()
};
}
}
Expand Down Expand Up @@ -323,7 +326,8 @@
"oldParent":oldParent,
"next": nextCat,
"prev": prevCat,
"copy": copy
"copy": copy,
"t": (new Date()).getTime()
},
error: function() {
$.jstree.rollback(data.rlbk);
Expand Down Expand Up @@ -377,7 +381,8 @@
"web": self.opts.web,
"topic": self.opts.topic,
"cat" : catName,
"title": newTitle
"title": newTitle,
"t": (new Date()).getTime()
},
error: function() {
$.jstree.rollback(data.rlbk);
Expand Down Expand Up @@ -426,7 +431,8 @@
"topic": self.opts.topic,
"cat": catName,
"title": title,
"parent": parentName
"parent": parentName,
"t": (new Date()).getTime()
//, "position": pos
},
error: function() {
Expand Down Expand Up @@ -470,7 +476,8 @@
"action" : "remove_node",
"web": self.opts.web,
"topic": self.opts.topic,
"cat": catName
"cat": catName,
"t": (new Date()).getTime()
},
error: function() {
$.jstree.rollback(data.rlbk);
Expand Down Expand Up @@ -683,7 +690,8 @@
data: {
"action" : "refresh",
"web": self.opts.web,
"topic": self.opts.topic
"topic": self.opts.topic,
"t": (new Date()).getTime()
},
beforeSend: function() {
$.blockUI({message:"<h1>Refreshing ...</h1>"});
Expand Down
2 changes: 0 additions & 2 deletions pub/System/ClassificationPlugin/jquery.tagselector.uncompressed.js
View file
Expand Up @@ -7,8 +7,6 @@
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html
*
* Revision: $Id$
*
*/
(function($) {
"use strict";
Expand Down

0 comments on commit 7ef304a

Please sign in to comment.