Item13333: updated icons.yml

as well as: - incr'ing copyright - revert CGI-4.11 fixes - fixed rendering for Topic formfields
foswiki · Mar 26, 2015 · 4ff303d · 4ff303d
1 parent 2dceb3f
commit 4ff303d
Show file tree

Hide file tree

Showing 19 changed files with 338 additions and 31 deletions.
diff --git a/data/System/MoreFormfieldsPlugin.txt b/data/System/MoreFormfieldsPlugin.txt
@@ -40,11 +40,12 @@ These are:
 -->
 
 |  Author(s): | Michael Daum|
-|  Copyright: | &copy; 2010-2014 Michael Daum http://michaeldaumconsulting.com |
+|  Copyright: | &copy; 2010-2015 Michael Daum http://michaeldaumconsulting.com |
 |  License: | [[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]] |
 |  Release: | %$RELEASE% |
 |  Version: | %$VERSION% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  26 Mar 2015: | updated list of all fontawesom icons; fixed rendering of Topic formfields values |
 |  16 Dec 2014: | fixed thumbnails in user autocompletion; don't inherit from <nop>ListFieldDefinition for performance reasons |
 |  22 Aug 2014: | added smarbox formfield |
 |  04 Apr 2014: | fixed compatibility with foswiki >= 1.2.0 |

diff --git a/lib/Foswiki/Form/Autofill.pm b/lib/Foswiki/Form/Autofill.pm
@@ -42,10 +42,6 @@ sub renderForEdit {
   # may want to override this to make labels editable.
   my $renderedValue = $topicObject->expandMacros($value);
 
-  if ($this->can("decode")) {
-    $value = $this->decode($value);
-  }
-
   return (
     '',
     CGI::hidden(
@@ -108,7 +104,7 @@ sub beforeSaveHandler {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2013-2014 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2013-2015 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/lib/Foswiki/Form/Icon.pm b/lib/Foswiki/Form/Icon.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# MoreFormfieldsPlugin is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com
+# MoreFormfieldsPlugin is Copyright (C) 2010-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Form/Id.pm b/lib/Foswiki/Form/Id.pm
@@ -86,7 +86,7 @@ sub beforeSaveHandler {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2013-2014 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2013-2015 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/lib/Foswiki/Form/Ipaddress.pm b/lib/Foswiki/Form/Ipaddress.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# MoreFormfieldsPlugin is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com
+# MoreFormfieldsPlugin is Copyright (C) 2010-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Form/Macaddress.pm b/lib/Foswiki/Form/Macaddress.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# MoreFormfieldsPlugin is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com
+# MoreFormfieldsPlugin is Copyright (C) 2010-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Form/Netmask.pm b/lib/Foswiki/Form/Netmask.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# MoreFormfieldsPlugin is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com
+# MoreFormfieldsPlugin is Copyright (C) 2010-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Form/NetworkAddressField.pm b/lib/Foswiki/Form/NetworkAddressField.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# MoreFormfieldsPlugin is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com
+# MoreFormfieldsPlugin is Copyright (C) 2010-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Form/Phonenumber.pm b/lib/Foswiki/Form/Phonenumber.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# MoreFormfieldsPlugin is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com
+# MoreFormfieldsPlugin is Copyright (C) 2010-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Form/Select2.pm b/lib/Foswiki/Form/Select2.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# MoreFormfieldsPlugin is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com
+# MoreFormfieldsPlugin is Copyright (C) 2010-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Form/Smartbox.pm b/lib/Foswiki/Form/Smartbox.pm
@@ -109,7 +109,7 @@ HERE
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2008-2014 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2008-2015 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/lib/Foswiki/Form/Time.pm b/lib/Foswiki/Form/Time.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# MoreFormfieldsPlugin is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com
+# MoreFormfieldsPlugin is Copyright (C) 2010-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Form/Topic.pm b/lib/Foswiki/Form/Topic.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# MoreFormfieldsPlugin is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com
+# MoreFormfieldsPlugin is Copyright (C) 2010-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -115,7 +115,8 @@ sub getDisplayValue {
       } else {
         $val = $this->getTopicTitle($this->{_web}, $val);
       }
-      push @result, "<a href='%SCRIPTURLPATH{view}%/$this->{_web}/$origVal'>$val</a>";
+      my ($web, $topic) = Foswiki::Func::normalizeWebTopicName($this->{_web}, $origVal);
+      push @result, "<a href='%SCRIPTURLPATH{view}%/$web/$topic'>$val</a>";
     }
     $value = join(", ", @result);
   } else {
@@ -127,7 +128,8 @@ sub getDisplayValue {
     } else {
       $value = $this->getTopicTitle($this->{_web}, $value);
     }
-    $value = "<a href='%SCRIPTURLPATH{view}%/$this->{_web}/$origVal'>$value</a>";
+    my ($web, $topic) = Foswiki::Func::normalizeWebTopicName($this->{_web}, $origVal);
+    $value = "<a href='%SCRIPTURLPATH{view}%/$web/$topic'>$value</a>";
   }
 
   return $value;

diff --git a/lib/Foswiki/Form/User.pm b/lib/Foswiki/Form/User.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# MoreFormfieldsPlugin is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com
+# MoreFormfieldsPlugin is Copyright (C) 2010-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Plugins/MoreFormfieldsPlugin.pm b/lib/Foswiki/Plugins/MoreFormfieldsPlugin.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki -V The Free and Open Source Wiki, http://foswiki.org/
 #
-# MoreFormfieldsPlugin is Copyright (C) 2013-2014 Michael Daum http://michaeldaumconsulting.com
+# MoreFormfieldsPlugin is Copyright (C) 2013-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -25,8 +25,8 @@ use Foswiki::Plugins ();
 
 use Error qw(:try);
 
-our $VERSION = '0.20';
-our $RELEASE = '0.20';
+our $VERSION = '0.30';
+our $RELEASE = '26 Mar 2015';
 our $SHORTDESCRIPTION = 'Additionall formfield types for %SYSTEMWEB%.DataForms';
 our $NO_PREFS_IN_TOPIC = 1;
 

diff --git a/lib/Foswiki/Plugins/MoreFormfieldsPlugin/IconService.pm b/lib/Foswiki/Plugins/MoreFormfieldsPlugin/IconService.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# MoreFormfieldsPlugin is Copyright (C) 2013-2014 Michael Daum http://michaeldaumconsulting.com
+# MoreFormfieldsPlugin is Copyright (C) 2013-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -67,8 +67,8 @@ sub handleRest {
   my $index = 0;
 
   foreach my $icon (@{$this->{icons}}) {
-    next if $include && $icon->{text} !~ /$include/;
-    next if $exclude && $icon->{text} =~ /$exclude/;
+    next if $include && $icon->{id} !~ /$include/;
+    next if $exclude && $icon->{id} =~ /$exclude/;
 
     if ($doExactMatch) {
       next unless $icon->{text} eq $search;