Item4421: Brought over SkillsPlugin enhancements from TWiki; Tested o…

…n Foswiki; Ready for upload

git-svn-id: http://svn.foswiki.org/trunk/SkillsPlugin@2366 0b4bb1d4-4e5a-0410-9cc4-b2b747904278

data/TWiki/SkillsAdminIntroduction.txt

@@ -1,4 +1,3 @@
-%META:TOPICINFO{author="ProjectContributor" date="1176992097" format="1.1" version="0"}%
 %META:TOPICPARENT{name="SkillsPlugin"}%
 ---+!! !SkillsPlugin: Admin Introduction
 

data/TWiki/SkillsAdvancedSearch.txt

@@ -1,4 +1,3 @@
-%META:TOPICINFO{author="ProjectContributor" date="1176298895" format="1.1" version="0"}%
 %META:TOPICPARENT{name="SkillsPlugin"}%
 ---++ Skills Plugin Advanced Search
 
@@ -65,4 +64,4 @@ You can also create a drop down menu in place of the topic search text box. This
 </select>
 </verbatim>
 
-TWiki searches are very powerful, so you could get your data from almost anywhere. See VarSEARCH for more information on searching.
+Foswiki searches are very powerful, so you could get your data from almost anywhere. See VarSEARCH for more information on searching.

data/TWiki/SkillsBrowseAll.txt

@@ -1,4 +1,3 @@
-%META:TOPICINFO{author="ProjectContributor" date="1176312772" format="1.1" version="0"}%
 %META:TOPICPARENT{name="SkillsPlugin"}%
 ---+!! SkillsPlugin: Browse All Skills
 

data/TWiki/SkillsCreateNewCategory.txt

@@ -1,4 +1,3 @@
-%META:TOPICINFO{author="ProjectContributor" date="1176299717" format="1.1" version="0"}%
 %META:TOPICPARENT{name="SkillsPlugin"}%
 ---+!! SkillsPlugin: Create New Category
 
@@ -28,17 +27,18 @@
 </table>
 %STARTSECTION{"createcategory"}%
 
-%IF{ "{Plugins}{SkillsPlugin}{Enabled}" then="%ADDSKILLSMESSAGE%" else="<table border='0' cellpadding='3' cellspacing='0' width='100%'><tr><td bgcolor='yellow'><font color='red'><strong>The Skills Plugin is not enabled on this site. The forms below are disabled.</strong></font></td></tr></table>" }%
+%IF{ "{Plugins}{SkillsPlugin}{Enabled}" then="%URLPARAM{"skillsmessage"}%" else="<table border='0' cellpadding='3' cellspacing='0' width='100%'><tr><td bgcolor='yellow'><font color='red'><strong>The Skills Plugin is not enabled on this site. The forms below are disabled.</strong></font></td></tr></table>" }%
 
 Create a new category.
 
-<form name="createcategory" action="%SCRIPTURL{view}%/%BASEWEB%/%BASETOPIC%" method="post">
+<form name="createcategory" action="%SCRIPTURL{rest}%/SkillsPlugin/addNewCategory" method="post">
 <div class="twikiFormSteps">
 <div class="twikiFormStep">
-Name of new category: %BR% <input name="category" type="text" class="twikiInputField" size="20" value="%URLPARAM{"createcategory"}%" /> (use only alphanumeric characters and underscore)
+Name of new category: %BR% <input name="newcategory" type="text" class="twikiInputField" size="20" value="%URLPARAM{"createcategory"}%" />
 </div>
 <div class="twikiFormStep twikiLast">
 <input name="createcategory" type="submit" class="twikiSubmit" value="%MAKETEXT{"Create"}%" />
+<input type="hidden" name="topic" value="%WEB%.%TOPIC%" />
 </div>
 </div>
 </form>

data/TWiki/SkillsCreateNewSkill.txt

@@ -1,4 +1,3 @@
-%META:TOPICINFO{author="ProjectContributor" date="1176299017" format="1.1" version="0"}%
 %META:TOPICPARENT{name="SkillsPlugin"}%
 ---+!! SkillsPlugin: Create New Skill
 
@@ -26,15 +25,16 @@
 </table>
 %STARTSECTION{"createskill"}%
 
-%IF{ "{Plugins}{SkillsPlugin}{Enabled}" then="%ADDSKILLSMESSAGE%" else="<table border='0' cellpadding='3' cellspacing='0' width='100%'><tr><td bgcolor='yellow'><font color='red'><strong>The Skills Plugin is not enabled on this site. The forms below are disabled.</strong></font></td></tr></table>" }%
+%IF{ "{Plugins}{SkillsPlugin}{Enabled}" then="%URLPARAM{"skillsmessage"}%" else="<table border='0' cellpadding='3' cellspacing='0' width='100%'><tr><td bgcolor='yellow'><font color='red'><strong>The Skills Plugin is not enabled on this site. The forms below are disabled.</strong></font></td></tr></table>" }%
 
 Create a new skill.
 
-<form name="createskill" action="%SCRIPTURL{view}%/%BASEWEB%/%BASETOPIC%" method="post">
+<form name="createskill" action="%SCRIPTURL{rest}%/SkillsPlugin/addNewSkill" method="post">
 <div class="twikiFormSteps">
 <div class="twikiFormStep">
 Name of new skill: %BR%
-<input name="newskill" type="text" class="twikiInputField" size="20" value="%URLPARAM{"createskill"}%" /> (use only alphanumeric characters and underscore)
+<input name="newskill" type="text" class="twikiInputField" size="20" value="%URLPARAM{"createskill"}%" />
+<input type="hidden" name="topic" value="%WEB%.%TOPIC%" />
 </div>
 <div class="twikiFormStep">
 In category: %BR%

data/TWiki/SkillsDeleteCategory.txt

@@ -1,4 +1,3 @@
-%META:TOPICINFO{author="ProjectContributor" date="1176299732" format="1.1" version="0"}%
 %META:TOPICPARENT{name="SkillsPlugin"}%
 ---+!! SkillsPlugin: Delete Category
 
@@ -28,8 +27,8 @@
 </table>
 %STARTSECTION{"deletecategory"}%
 
-%IF{ "{Plugins}{SkillsPlugin}{Enabled}" then="%MANAGESKILLSMESSAGE%" else="<table border='0' cellpadding='3' cellspacing='0' width='100%'><tr><td bgcolor='yellow'><font color='red'><strong>The Skills Plugin is not enabled on this site. The forms below are disabled.</strong></font></td></tr></table>" }%
-<form name="renamecategory" action="%SCRIPTURL{view}%/%BASEWEB%/%BASETOPIC%" method="post" onsubmit="return confirmDelete(this.oldcategory.value);">
+%IF{ "{Plugins}{SkillsPlugin}{Enabled}" then="%URLPARAM{"skillsmessage"}%" else="<table border='0' cellpadding='3' cellspacing='0' width='100%'><tr><td bgcolor='yellow'><font color='red'><strong>The Skills Plugin is not enabled on this site. The forms below are disabled.</strong></font></td></tr></table>" }%
+<form name="renamecategory" action="%SCRIPTURL{rest}%/SkillsPlugin/deleteCategory" method="post" onsubmit="return confirmDelete(this.oldcategory.value);>
 
 Delete an existing category. %BR%
 %ICON{"warning"}% This will also delete all the skills in this category. It can not be undone.
@@ -43,6 +42,7 @@ Category to delete: %BR%
 </select>
 </div>
 <div class="twikiFormStep twikiLast">
+<input type="hidden" name="topic" value="%WEB%.%TOPIC%" />
 <input name="deletecategory" type="submit" class="twikiSubmit" value="%MAKETEXT{"Delete"}%" /> _Note: May take a while, as it searches though all users. Do not cancel._
 </div>
 </div>

data/TWiki/SkillsDeleteSkill.txt

@@ -1,4 +1,3 @@
-%META:TOPICINFO{author="ProjectContributor" date="1176299709" format="1.1" version="0"}%
 %META:TOPICPARENT{name="SkillsPlugin"}%
 ---+!! SkillsPlugin: Delete Skill
 
@@ -28,8 +27,8 @@
 </table>
 %STARTSECTION{"deleteskill"}%
 
-%IF{ "{Plugins}{SkillsPlugin}{Enabled}" then="%MANAGESKILLSMESSAGE%" else="<table border='0' cellpadding='3' cellspacing='0' width='100%'><tr><td bgcolor='yellow'><font color='red'><strong>The Skills Plugin is not enabled on this site. The forms below are disabled.</strong></font></td></tr></table>" }%
-<form name="deleteskill" action="%SCRIPTURL{view}%/%BASEWEB%/%BASETOPIC%" method="post" onsubmit="return confirmDelete(this.oldskill.value);">
+%IF{ "{Plugins}{SkillsPlugin}{Enabled}" then="%URLPARAM{"skillsmessage"}%" else="<table border='0' cellpadding='3' cellspacing='0' width='100%'><tr><td bgcolor='yellow'><font color='red'><strong>The Skills Plugin is not enabled on this site. The forms below are disabled.</strong></font></td></tr></table>" }%
+<form name="deleteskill" action="%SCRIPTURL{rest}%/SkillsPlugin/deleteSkill" method="post" onsubmit="return confirmDelete(this.oldskill.value);">
 
 Delete an existing skill.
 
@@ -42,6 +41,7 @@ Skill to delete: %BR%
 </select>
 </div>
 <div class="twikiFormStep twikiLast">
+<input type="hidden" name="topic" value="%WEB%.%TOPIC%" />
 <input name="deleteskill" type="submit" class="twikiSubmit" value="%MAKETEXT{"Delete"}%" /> _Note: May take a while, as it searches though all users. Do not cancel._
 </div>
 </div>

data/TWiki/SkillsDisplayOnHomePage.txt

@@ -1,8 +1,7 @@
-%META:TOPICINFO{author="ProjectContributor" date="1176297285" format="1.1" version="0"}%
 %META:TOPICPARENT{name="SkillsPlugin"}%
 ---++ Display Users Skills On Their Home Pages
 
-This topic will show you how to get the users skills displayed on their home page using the SkinTemplates system. An example is shown in the screen shot below. This example uses the default PatternSkin, and using an unchanged Main.PatternSkinUserViewTemplate.
+This topic will show you how to get the users skills displayed on their home page using the TWikiTemplates system. An example is shown in the screen shot below. This example uses the default PatternSkin, and using an unchanged Main.PatternSkinUserViewTemplate.
 
 <a href="%PUBURLPATH%/%WEB%/SkillsPlugin/skills_screenshot_full.png"><img src="%PUBURLPATH%/%WEB%/SkillsPlugin//skills_screenshot_thumb.png" alt="skills_screenshot_thumb.png" /></a>
 

data/TWiki/SkillsEditMySkills.txt

@@ -1,4 +1,3 @@
-%META:TOPICINFO{author="ProjectContributor" date="1176312780" format="1.1" version="0"}%
 %META:TOPICPARENT{name="SkillsPlugin"}%
 ---+!! SkillsPlugin: Edit My Skills
 

data/TWiki/SkillsMoveSkill.txt

@@ -1,4 +1,3 @@
-%META:TOPICINFO{author="ProjectContributor" date="1176299702" format="1.1" version="0"}%
 %META:TOPICPARENT{name="SkillsPlugin"}%
 ---+!! SkillsPlugin: Move Skill
 
@@ -28,8 +27,8 @@
 </table>
 %STARTSECTION{"moveskill"}%
 
-%IF{ "{Plugins}{SkillsPlugin}{Enabled}" then="%MANAGESKILLSMESSAGE%" else="<table border='0' cellpadding='3' cellspacing='0' width='100%'><tr><td bgcolor='yellow'><font color='red'><strong>The Skills Plugin is not enabled on this site. The forms below are disabled.</strong></font></td></tr></table>" }%
-<form name="renamecategory" action="%SCRIPTURL{view}%/%BASEWEB%/%BASETOPIC%" method="post">
+%IF{ "{Plugins}{SkillsPlugin}{Enabled}" then="%URLPARAM{"skillsmessage"}%" else="<table border='0' cellpadding='3' cellspacing='0' width='100%'><tr><td bgcolor='yellow'><font color='red'><strong>The Skills Plugin is not enabled on this site. The forms below are disabled.</strong></font></td></tr></table>" }%
+<form name="moveskill" action="%SCRIPTURL{rest}%/SkillsPlugin/moveSkill" method="post">
 
 Move an existing skill to a different category.
 
@@ -47,6 +46,7 @@ New category: %BR%
 </select>
 </div>
 <div class="twikiFormStep twikiLast">
+<input type="hidden" name="topic" value="%WEB%.%TOPIC%" />
 <input name="moveskill" type="submit" class="twikiSubmit" value="%MAKETEXT{"Move"}%" /> _Note: May take a while, as it searches though all users. Do not cancel._
 </div>
 </div>

data/TWiki/SkillsPlugin.txt

@@ -1,17 +1,18 @@
-%META:TOPICINFO{author="ProjectContributor" date="1177340575" format="1.1" version="0"}%
 ---+!! <nop>%TOPIC%
 
 This plugin allows users to specify what skills they have and their level of proficiency. The user can then display their skills on their home page, and view other users skills by browsing through specific categories/skills.
 
 %TOC%
 
+%ICON{warning}% *NOTE:* This extension requires Foswiki 1.1. However. it will work without any problems on 1.0 if you follow the instructions <a href="#Foswiki_1_0">below</a>.
+
 ---++ Example
 
-Below is a screenshot of the users skill being displayed on their homepage. Click for the full image.
+Below is a screenshot of the users skill being displayed on their homepage (on TWiki). Click for the full image.
 
 <a href="%ATTACHURLPATH%/skills_screenshot_full.png"><img src="%ATTACHURLPATH%/skills_screenshot_thumb.png" alt="skills_screenshot_thumb.png" /></a>
 
-To get the skills displayed on the users home page, as in this example, look at SkillsDisplayOnHomePage.
+To get the skills displayed on the users home page, as in this example, see SkillsDisplayOnHomePage.
 
 ---++ User Interface
 
@@ -27,10 +28,6 @@ The user interface for general users can be found at the following places:
 
 To create, modify or delete categories/skills, follow the instructions at SkillsAdminIntroduction.
 
----+++ Advanced Search
-
-You can create a more advanced search, by creating the form yourself and using an extra input field. This can allow searching for users in a particular office/location. This is described in detail at SkillsAdvancedSearch.
-
 ---++ Syntax Rules
 
 The Plugin handles a =%<nop>SKILLS{}%= variable that performs different actions. The =action=""= is a required parameter.
@@ -74,30 +71,24 @@ Plugin settings are stored as preferences variables in %LOCALSITEPREFS%.
       * Set ALLOWADDSKILLS = Main.UnknownUser
 
    * By default, the styles using in the plugins forms are found in the =style.css=, attached to this topic. To define your own style sheet, add the following to %LOCALSITEPREFS%:
-      * Set STYLEURL = %PUBURL%/%SYSTEMWEB%/SkillsPlugin/style.css
-
-   * Log add/create actions
-      * By default, any skills or categories that are created/deleted/renamed are logged in the standard TWiki logs (defined at =$TWiki::cfg{LogFileName}=). To disable this, add the following to =LocalSite.cfg=:
-         * =$TWiki::cfg{Plugins}{SkillsPlugin}{Log} = 0=
+      * Set STYLEURL = %PUBURL%/%TWIKIWEB%/SkillsPlugin/style.css
 
    * Debug plugin
       * To see the output in =data/debug.txt=, add the following to =LocalSite.cfg=:
-         * =$TWiki::cfg{Plugins}{SkillsPlugin}{Debug} = 1=
+         * =$Fowsiki::cfg{Plugins}{SkillsPlugin}{Debug} = 1=
 
    * Short description of plugin
       * Set SHORTDESCRIPTION = Allows users to list their skills, which can then be searched
 
 ---++ Plugin Installation Instructions
 
-__Note:__ You do not need to install anything on the browser to use this plugin. The following instructions are for the administrator who installs the plugin on the TWiki server. 
-
-   * Download the ZIP file from the Plugin web (see below)
+   * Download the ZIP file from the Extensions web (see below)
    * Unzip ==%TOPIC%.zip== in your twiki installation directory. Content:
    | *File:* | *Description:* |
 %$MANIFEST%
 
    * Configure the Plugin:
-      * TWiki 4.0 and up: Run the [[%SCRIPTURL%/configure%SCRIPTSUFFIX%][configure]] script to enable the Plugin
+      * Run the [[%SCRIPTURL%/configure%SCRIPTSUFFIX%][configure]] script to enable the Plugin
       * Change the Plugin settings as needed
    * Test if the installation was successful:
       * [[SkillsEditMySkills][You should see a form allowing you to add/edit your skills]]
@@ -106,25 +97,30 @@ __Note:__ You do not need to install anything on the browser to use this plugin.
       * SkillsCreateNewCategory
       * SkillsCreateNewSkill
 
+---+++ Foswiki 1.0
+
+This plugin can be installed on Foswiki 1.0 by downloading the following files and placing them in your =lib/TWiki/= directory:
+
+   * http://svn.foswiki.org/trunk/TWikiCompatibilityPlugin/lib/TWiki/LineIterator.pm
+   * http://svn.foswiki.org/trunk/TWikiCompatibilityPlugin/lib/TWiki/ListIterator.pm
+
+This is not needed in Foswiki 1.1 or later.
+
 ---++ Plugin Info
 
-|  Plugin Author: | TWiki:Main.AndrewRJones |
-|  Copyright: | &copy; 2007, TWiki:Main.AndrewRJones |
+|  Plugin Author: | Foswiki:Main.AndrewJones |
+|  Copyright: | &copy; 2007 - 2009, Foswiki:Main.AndrewJones |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
 |  Plugin Version: | %$VERSION% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
-|  14032 | Bugs:Item4209 - Initial release |
-|  TWiki Dependency: | $TWiki::Plugins::VERSION 1.1 |
-|  CPAN Dependencies: | none |
-|  Other Dependencies: | none |
+|  05 Feb 2009 | Complete rewrite; more scaleable; better performace; can use special characters in skill names; can use templates to change output; tested on Foswiki |
+|  14032 | Initial release |
+|  Dependencies: | %$DEPENDENCIES% |
 |  Perl Version: | Tested on 5.8.4 |
-|  Plugin Home: | http://foswiki.org/Extensions/%TOPIC% |
-|  Feedback: | http://foswiki.org/Extensions/%TOPIC%Dev |
-|  Appraisal: | http://foswiki.org/Extensions/%TOPIC%Appraisal |
-
-__Related Topics:__ [[%SYSTEMWEB%.Plugins][Plugins]], %SYSTEMWEB%.AdminDocumentationCategory, %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences
+|  Plugin Home: | http://Foswiki.org/Extensions/%TOPIC% |
+|  Support: | http://Foswiki.org/Support/%TOPIC% |
+|  Bugs: | http://Foswiki.org/Tasks/%TOPIC% |
 
-%META:FILEATTACHMENT{name="style.css" attr="" autoattached="1" comment="" date="1171245554" path="style.css" size="2317" user="Main.ProjectContributor" version=""}%
 %META:FILEATTACHMENT{name="skills_screenshot_thumb.png" attr="" autoattached="1" comment="" date="1171248289" path="skills_screenshot_thumb.png" size="48997" user="Main.ProjectContributor" version="2"}%
 %META:FILEATTACHMENT{name="skills_screenshot_full.png" attr="" autoattached="1" comment="" date="1171248281" path="skills_screenshot_full.png" size="131655" user="Main.ProjectContributor" version="1"}%
 %META:FILEATTACHMENT{name="skills_screenshot_search.png" attr="" autoattached="1" comment="" date="1172430565" path="skills_screenshot_search.png" size="9636" user="Main.ProjectContributor" version="1"}%

data/TWiki/SkillsRenameCategory.txt

@@ -1,4 +1,3 @@
-%META:TOPICINFO{author="ProjectContributor" date="1176299726" format="1.1" version="0"}%
 %META:TOPICPARENT{name="SkillsPlugin"}%
 ---+!! SkillsPlugin: Rename Category
 
@@ -28,8 +27,8 @@
 </table>
 %STARTSECTION{"renamecategory"}%
 
-%IF{ "{Plugins}{SkillsPlugin}{Enabled}" then="%MANAGESKILLSMESSAGE%" else="<table border='0' cellpadding='3' cellspacing='0' width='100%'><tr><td bgcolor='yellow'><font color='red'><strong>The Skills Plugin is not enabled on this site. The forms below are disabled.</strong></font></td></tr></table>" }%
-<form name="renamecategory" action="%SCRIPTURL{view}%/%BASEWEB%/%BASETOPIC%" method="post">
+%IF{ "{Plugins}{SkillsPlugin}{Enabled}" then="%URLPARAM{"skillsmessage"}%" else="<table border='0' cellpadding='3' cellspacing='0' width='100%'><tr><td bgcolor='yellow'><font color='red'><strong>The Skills Plugin is not enabled on this site. The forms below are disabled.</strong></font></td></tr></table>" }%
+<form name="renamecategory" action="%SCRIPTURL{rest}%/SkillsPlugin/renameCategory" method="post">
 
 Rename an existing category.
 
@@ -43,9 +42,10 @@ Category to rename: %BR%
 </div>
 <div class="twikiFormStep">
 New name for this category: %BR%
-<input type="text" value="%URLPARAM{"renamecategoryto" default="%URLPARAM{renamecategoryfrom}%"}%" name="newcategory" class="twikiInputField" size="20" /> (use only alphanumeric characters and underscore)
+<input type="text" value="%URLPARAM{"renamecategoryto"}%" name="newcategory" class="twikiInputField" size="20" />
 </div>
 <div class="twikiFormStep twikiLast">
+<input type="hidden" name="topic" value="%WEB%.%TOPIC%" />
 <input name="renamecategory" type="submit" class="twikiSubmit" value="%MAKETEXT{"Rename"}%" /> _Note: May take a while, as it searches though all users. Do not cancel._
 </div>
 </div>

data/TWiki/SkillsRenameSkill.txt

@@ -1,4 +1,3 @@
-%META:TOPICINFO{author="ProjectContributor" date="1176299692" format="1.1" version="0"}%
 %META:TOPICPARENT{name="SkillsPlugin"}%
 ---+!! SkillsPlugin: Rename Skill
 
@@ -28,8 +27,8 @@
 </table>
 %STARTSECTION{"renameskill"}%
 
-%IF{ "{Plugins}{SkillsPlugin}{Enabled}" then="%MANAGESKILLSMESSAGE%" else="<table border='0' cellpadding='3' cellspacing='0' width='100%'><tr><td bgcolor='yellow'><font color='red'><strong>The Skills Plugin is not enabled on this site. The forms below are disabled.</strong></font></td></tr></table>" }%
-<form name="renameskill" action="%SCRIPTURL{view}%/%BASEWEB%/%BASETOPIC%" method="post">
+%IF{ "{Plugins}{SkillsPlugin}{Enabled}" then="%URLPARAM{"skillsmessage"}%" else="<table border='0' cellpadding='3' cellspacing='0' width='100%'><tr><td bgcolor='yellow'><font color='red'><strong>The Skills Plugin is not enabled on this site. The forms below are disabled.</strong></font></td></tr></table>" }%
+<form name="renameskill" action="%SCRIPTURL{rest}%/SkillsPlugin/renameSkill" method="post">
 
 Rename an existing skill.
 
@@ -42,9 +41,10 @@ Skill to rename: %BR%
 </div>
 <div class="twikiFormStep">
 New name for this skill: %BR%
-<input type="text" name="newskill" class="twikiInputField" size="20" /> (use only alphanumeric characters and underscore)
+<input type="text" name="newskill" class="twikiInputField" size="20" />
 </div>
 <div class="twikiFormStep twikiLast">
+<input type="hidden" name="topic" value="%WEB%.%TOPIC%" />
 <input name="renameskill" type="submit" class="twikiSubmit" value="%MAKETEXT{"Rename"}%" /> _Note: May take a while, as it searches though all users. Do not cancel._
 </div>
 </div>

data/TWiki/SkillsSearch.txt

@@ -1,4 +1,3 @@
-%META:TOPICINFO{author="ProjectContributor" date="1176993381" format="1.1" version="0"}%
 %META:TOPICPARENT{name="SkillsPlugin"}%
 ---+!! SkillsPlugin: Search Skills
 
@@ -22,6 +21,8 @@ Search for users with a specific skill.
 <div class="twikiFormSteps">
 <div class="twikiFormStep">
 %SKILLS{action="search"}%
+%BR%
+%SKILLS{action="searchresults"}%
 </div>
 </div>
 %ENDSECTION{"searchskills"}%