From 996e60d74f06b32d90eee8722d5fc0b19a64a66e Mon Sep 17 00:00:00 2001 From: MichaelDaum Date: Wed, 23 Apr 2014 09:07:03 +0000 Subject: [PATCH] Item12865: improved display of revision info also: - added back Clear button to category editor - made list of buttons on category editor configurable git-svn-id: http://svn.foswiki.org/trunk/ClassificationPlugin@17550 0b4bb1d4-4e5a-0410-9cc4-b2b747904278 --- .../CategorizedTopicRenderIndexItem.txt | 4 +-- .../ClassificationApp/Category.txt | 3 +- .../ClassifiedTopicRenderIndexItem.txt | 6 ++-- .../ClassifiedTopicViewTemplate.txt | 2 +- .../RenderCategoryBrowser.txt | 27 +++++++++++------ .../RenderClassifiedTopicView.txt | 4 +-- .../TaggedTopicRenderIndexItem.txt | 4 +-- data/System/ClassificationPlugin.txt | 1 + lib/Foswiki/Plugins/ClassificationPlugin.pm | 4 +-- .../Plugins/ClassificationPlugin/Access.pm | 1 - .../Plugins/ClassificationPlugin/MANIFEST | 2 ++ .../styles.uncompressed.css | 29 ++++++++++++++++--- 12 files changed, 60 insertions(+), 27 deletions(-) diff --git a/data/Applications/ClassificationApp/CategorizedTopicRenderIndexItem.txt b/data/Applications/ClassificationApp/CategorizedTopicRenderIndexItem.txt index 14c9ad4..697fa95 100644 --- a/data/Applications/ClassificationApp/CategorizedTopicRenderIndexItem.txt +++ b/data/Applications/ClassificationApp/CategorizedTopicRenderIndexItem.txt @@ -22,7 +22,7 @@ a summary for an object listed within the Category topic.
$formatTime(info.date) - | + | $percntGETTOPICTITLE{\" $percntUSERINFO{\"$expand(info.author)\" format=\"$wikiusername\" @@ -30,7 +30,7 @@ a summary for an object listed within the Category topic. }$percnt $percntCATINFO{\"$web.$topic\" - header=\" | \" + header=\" | \" separator=\", \" footer=\"\" }$percnt diff --git a/data/Applications/ClassificationApp/Category.txt b/data/Applications/ClassificationApp/Category.txt index 8b5c98e..297b536 100644 --- a/data/Applications/ClassificationApp/Category.txt +++ b/data/Applications/ClassificationApp/Category.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1390903057" format="1.1" reprev="20" version="21"}% +%META:TOPICINFO{author="micha" comment="reprev" date="1397729650" format="1.1" reprev="20" version="22"}% %META:TOPICPARENT{name="TopicType"}% %TOC% %DBCALL{"Applications.RenderTopicInstaller" @@ -33,6 +33,7 @@ See also: See [[CategorizedTopic]], [[ClassifiedTopic]], [[TaggedTopic]], [[Cate %DBCALL{"Applications.ClassificationApp.RenderCategoryBrowser" THEWEB="%URLPARAM{"web" default="%BASEWEB%"}%" MODE="edit" + BUTTONS="filter, refresh" }%%STOPINCLUDE% ---++ %TOPIC% form diff --git a/data/Applications/ClassificationApp/ClassifiedTopicRenderIndexItem.txt b/data/Applications/ClassificationApp/ClassifiedTopicRenderIndexItem.txt index 1c4ae97..4059140 100644 --- a/data/Applications/ClassificationApp/ClassifiedTopicRenderIndexItem.txt +++ b/data/Applications/ClassificationApp/ClassifiedTopicRenderIndexItem.txt @@ -27,7 +27,7 @@ a summary for an object of type ClassifiedTopic.
$formatTime(info.date) - | + | $percntGETTOPICTITLE{\" $percntUSERINFO{\"$expand(info.author)\" format=\"$wikiusername\" @@ -35,11 +35,11 @@ a summary for an object of type ClassifiedTopic. }$percnt $percntCATINFO{\"$web.$topic\" - header=\" | \" + header=\" | \" separator=\", \" footer=\"\" }$percnt$percntTAGINFO{\"$web.$topic\" - header=\" | \" + header=\" | \" separator=\", \" limit=\"5\" footer=\"\" diff --git a/data/Applications/ClassificationApp/ClassifiedTopicViewTemplate.txt b/data/Applications/ClassificationApp/ClassifiedTopicViewTemplate.txt index e13af65..ac1889d 100644 --- a/data/Applications/ClassificationApp/ClassifiedTopicViewTemplate.txt +++ b/data/Applications/ClassificationApp/ClassifiedTopicViewTemplate.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1390384358" format="1.1" reprev="16" version="16"}% +%META:TOPICINFO{author="micha" comment="reprev" date="1398188320" format="1.1" reprev="17" version="17"}% %META:TOPICPARENT{name="TopicView"}% %{}% %TMPL:INCLUDE{"Applications.WikiTopicView"}% diff --git a/data/Applications/ClassificationApp/RenderCategoryBrowser.txt b/data/Applications/ClassificationApp/RenderCategoryBrowser.txt index 4423cbf..adda43a 100644 --- a/data/Applications/ClassificationApp/RenderCategoryBrowser.txt +++ b/data/Applications/ClassificationApp/RenderCategoryBrowser.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1393259686" format="1.1" reprev="13" version="14"}% +%META:TOPICINFO{author="micha" comment="reprev" date="1397729628" format="1.1" reprev="15" version="15"}% %META:TOPICPARENT{name="TopicFunction"}% %TOC{depth="2"}% @@ -14,7 +14,7 @@ * =edit=: allows to modify the hierarchy * =select=: select one or more categories; specify the name of the formfield to be used in the NAME parameter * =browse=: navigate among categories - * BUTTONS: =on=, =off= - toggle the display of the buttons, defaults to =on= + * BUTTONS: =on=, =off= - toggle the display of the buttons, defaults to =on=; you may also switch on individual buttons using a comma separated lists of ids =filter=, =refresh=, =undo= and/or =clear= %ENDSECTION{name="documentation" type="section"}% @@ -25,8 +25,8 @@ %IF{"'%MODE%'='select'" then="" else="" - }%%IF{"'%BUTTONS{default="on"}%'='on'" - then="$percntDBCALL{\"%WEB%.%TOPIC%\" section=\"buttons\"}$percnt" + }%%IF{"'%BUTTONS{default="on"}%'!='off'" + then="$percntDBCALL{\"%WEB%.%TOPIC%\" section=\"buttons\" buttons=\"%BUTTONS{default="on"}%\"}$percnt" else="" }%
@@ -48,10 +48,19 @@ %STARTSECTION{"buttons"}%
- %BUTTON{"%MAKETEXT{"Filter"}%" icon="find" class="simple jqHierarchySearchButton" title="%MAKETEXT{"Search for matching categories"}%"}% - %IF{"'%USERNAME%' ingroup 'AdminGroup'" + %IF{"'%buttons%'=~'\bfilter\b' or '%buttons%'='on'" + then="%BUTTON{"%MAKETEXT{"Filter"}%" icon="find" class="simple jqHierarchySearchButton" title="%MAKETEXT{"Search for matching categories"}%"}%" + }% + %IF{"'%USERNAME%' ingroup 'AdminGroup' and ('%buttons%'=~'\brefresh\b' or '%buttons%'='on')" then="%BUTTON{"%MAKETEXT{"Refresh"}%" icon="arrow_refresh" class="jqHierarchyRefreshButton simple" title="%MAKETEXT{"Refresh hierarchy cache on the backend"}%"}%" - }%%CLEAR% + }% + %IF{"'%buttons%'=~'\bclear\b' or '%buttons%'='on'" + then="%BUTTON{"%MAKETEXT{"Clear"}%" icon="application" class="simple jqHierarchyClearButton" title="%MAKETEXT{"Empty the selection"}%""}%" + }% + %IF{"'%buttons%'=~'\bundo\b' or '%buttons%'='on'" + then="%BUTTON{"%MAKETEXT{"Undo"}%" icon="arrow_refresh" class="simple jqHierarchyResetButton" title="%MAKETEXT{"Reset the selection"}%""}%" + }% + %CLEAR%
%ENDSECTION{"buttons"}% @@ -60,10 +69,10 @@ %DBCALL{"%TOPIC%" MODE="select"}% ---+++ browse -%DBCALL{"%TOPIC%" MODE="browse"}% +%DBCALL{"%TOPIC%" MODE="browse" BUTTONS="off"}% ---+++ edit -%DBCALL{"%TOPIC%" MODE="edit"}% +%DBCALL{"%TOPIC%" MODE="edit" BUTTONS="filter, refresh"}% %DBCALL{"Applications.RenderFunctionCallers"}% diff --git a/data/Applications/ClassificationApp/RenderClassifiedTopicView.txt b/data/Applications/ClassificationApp/RenderClassifiedTopicView.txt index 6eea111..1ba4099 100644 --- a/data/Applications/ClassificationApp/RenderClassifiedTopicView.txt +++ b/data/Applications/ClassificationApp/RenderClassifiedTopicView.txt @@ -19,12 +19,12 @@ showing its category and tagging info in the top. %DBCALL{"Applications.RenderWikiTopicView" TITLE_EXTRA="%TITLE_EXTRA%"}% %CATINFO{ "%BASEWEB%.%BASETOPIC%" - header="| %JQICON{"fa-folder"}% " + header="| %JQICON{"fa-folder"}% " format="" }% %TAGINFO{ "%BASEWEB%.%BASETOPIC%" - header="| %JQICON{"fa-tag"}% " + header="| %JQICON{"fa-tag"}% " format="" limit="30" footer="$percntIF{\"$count > $index\" diff --git a/data/Applications/ClassificationApp/TaggedTopicRenderIndexItem.txt b/data/Applications/ClassificationApp/TaggedTopicRenderIndexItem.txt index 49c494b..d0855c4 100644 --- a/data/Applications/ClassificationApp/TaggedTopicRenderIndexItem.txt +++ b/data/Applications/ClassificationApp/TaggedTopicRenderIndexItem.txt @@ -22,7 +22,7 @@ a summary for an object listed within the TaggedTopic.
$formatTime(info.date) - | + | $percntGETTOPICTITLE{\" $percntUSERINFO{\"$expand(info.author)\" format=\"$wikiusername\" @@ -30,7 +30,7 @@ a summary for an object listed within the TaggedTopic. }$percnt $percntTAGINFO{\"$web.$topic\" - header=\" | \" + header=\" | \" separator=\", \" limit=\"5\" footer=\"\" diff --git a/data/System/ClassificationPlugin.txt b/data/System/ClassificationPlugin.txt index 39d6343..77096b6 100644 --- a/data/System/ClassificationPlugin.txt +++ b/data/System/ClassificationPlugin.txt @@ -353,6 +353,7 @@ Note however that for now only the =%DBQUERY= language is supported (see [[Foswi | Release: | %$RELEASE% | | Version: | %$VERSION% | | Change History: |   | +| 23 Apr 2014: | improved topic info layout; added WebTagList; added back Clear button to category editor | | 04 Apr 2014: | fixed compatibility with foswiki >= 1.2.0; flag rest handlers that don't require authentication | | 18 Mar 2014: | fixed syntax error in jstree combponent (Foswiki:Main/DanieleGondoni);\ added =sort= paramteter to HIERARCHY macro;\ diff --git a/lib/Foswiki/Plugins/ClassificationPlugin.pm b/lib/Foswiki/Plugins/ClassificationPlugin.pm index 352bee7..27db15a 100644 --- a/lib/Foswiki/Plugins/ClassificationPlugin.pm +++ b/lib/Foswiki/Plugins/ClassificationPlugin.pm @@ -17,8 +17,8 @@ use strict; use warnings; use Foswiki::Contrib::DBCacheContrib::Search (); -our $VERSION = '3.00'; -our $RELEASE = '3.00'; +our $VERSION = '3.01'; +our $RELEASE = '3.01'; our $NO_PREFS_IN_TOPIC = 1; our $SHORTDESCRIPTION = 'A topic classification plugin and application'; diff --git a/lib/Foswiki/Plugins/ClassificationPlugin/Access.pm b/lib/Foswiki/Plugins/ClassificationPlugin/Access.pm index e6f0381..46ae25d 100644 --- a/lib/Foswiki/Plugins/ClassificationPlugin/Access.pm +++ b/lib/Foswiki/Plugins/ClassificationPlugin/Access.pm @@ -18,7 +18,6 @@ use strict; use Foswiki::Plugins::ClassificationPlugin; use constant TRACE => 0; # toggle m - use constant NO_CATACL => 0; use constant DENY_ALLOW => 1; use constant ALLOW_DENY => 2; diff --git a/lib/Foswiki/Plugins/ClassificationPlugin/MANIFEST b/lib/Foswiki/Plugins/ClassificationPlugin/MANIFEST index fa871e7..a931df5 100644 --- a/lib/Foswiki/Plugins/ClassificationPlugin/MANIFEST +++ b/lib/Foswiki/Plugins/ClassificationPlugin/MANIFEST @@ -153,6 +153,7 @@ 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 data/Applications/ClassificationApp/WebTopicList.txt 0644 @@ -176,6 +177,7 @@ 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 data/System/ClassificationPlugin.txt 0644 diff --git a/pub/System/ClassificationPlugin/styles.uncompressed.css b/pub/System/ClassificationPlugin/styles.uncompressed.css index 2e4ccf3..7980e24 100644 --- a/pub/System/ClassificationPlugin/styles.uncompressed.css +++ b/pub/System/ClassificationPlugin/styles.uncompressed.css @@ -283,6 +283,10 @@ a:hover.tag_todo { color:#fff !important; } +.clsHilight { + background-color:#FFFFC0; + color:black; +} /* pattern skin tweaks */ #patternMainContents h1 a, @@ -293,8 +297,25 @@ a:hover.tag_todo { #patternMainContents h6 a { text-decoration:none !important; } - -.clsHilight { - background-color:#FFFFC0; - color:black; +#patternMainContents h1 .foswikiTopicSummary { + font-size: 65%; + line-height: 1.5; + color:#a1a1a1; +} +#patternMainContents .foswikiTopicInfo { + margin-bottom:2em; +} +#patternMainContents .foswikiTopicInfo h1 { + margin:0.5em 0; + border-bottom:1px solid #dfdfdf; +} +#patternMainContents .foswikiTopicInfo, +#patternMainContents .foswikiTopicInfo a { + color:#a1a1a1; +} +#patternMainContents .foswikiTopicInfo h1 a { + color:inherit; +} +.patternTop .patternRevInfo { + display:none; }