From 694e14f42eb90a35189358c496402c69e6cc6d65 Mon Sep 17 00:00:00 2001 From: MichaelDaum Date: Fri, 11 Jul 2014 14:30:53 +0000 Subject: [PATCH] Item12962: rewriting class names and paths git-svn-id: http://svn.foswiki.org/trunk/MoreFormfieldsPlugin@17813 0b4bb1d4-4e5a-0410-9cc4-b2b747904278 --- data/System/MoreFormfieldsAjaxHelper.txt | 2 +- lib/Foswiki/Form/Icon.pm | 6 +- lib/Foswiki/Form/Ipaddress.pm | 2 +- lib/Foswiki/Form/Macaddress.pm | 2 +- lib/Foswiki/Form/Netmask.pm | 2 +- lib/Foswiki/Form/NetworkAddressField.pm | 12 ++-- lib/Foswiki/Form/Phonenumber.pm | 12 ++-- lib/Foswiki/Form/Select2.pm | 2 +- lib/Foswiki/Form/Time.pm | 2 +- lib/Foswiki/Form/Topic.pm | 8 +-- lib/Foswiki/Form/User.pm | 4 +- .../MoreFormfieldsPlugin/Clockpicker.pm | 6 +- .../Plugins/MoreFormfieldsPlugin/Config.spec | 2 +- .../Plugins/MoreFormfieldsPlugin/MANIFEST | 62 ++++++++++--------- .../Plugins/MoreFormfieldsPlugin/build.pl | 2 +- 15 files changed, 65 insertions(+), 61 deletions(-) diff --git a/data/System/MoreFormfieldsAjaxHelper.txt b/data/System/MoreFormfieldsAjaxHelper.txt index 37ec13d..218d429 100644 --- a/data/System/MoreFormfieldsAjaxHelper.txt +++ b/data/System/MoreFormfieldsAjaxHelper.txt @@ -1,5 +1,5 @@ %META:TOPICINFO{author="micha" comment="reprev" date="1403528623" format="1.1" reprev="7" version="8"}% -%META:TOPICPARENT{name="MoreFormfieldsContrib"}% +%META:TOPICPARENT{name="MoreFormfieldsPlugin"}% ---+!! %TOPIC% ---++ topic field backend diff --git a/lib/Foswiki/Form/Icon.pm b/lib/Foswiki/Form/Icon.pm index 3aca231..7b98e9a 100644 --- 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/ # -# MoreFormfieldsContrib is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com +# MoreFormfieldsPlugin is Copyright (C) 2010-2014 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 @@ -59,7 +59,7 @@ sub renderForEdit { Foswiki::Plugins::JQueryPlugin::createPlugin("select2"); Foswiki::Func::addToZone("script", "FOSWIKI::ICONFIELD", <<'HERE', "JQUERYPLUGIN::FONTAWESOME, JQUERYPLUGIN::SELECT2"); - + HERE $this->readIcons(); @@ -94,7 +94,7 @@ sub readIcons { return if %icons; # read fontawesome icons - my $iconFile = $Foswiki::cfg{PubDir}.'/'.$Foswiki::cfg{SystemWebName}.'/MoreFormfieldsContrib/icons.yml'; + my $iconFile = $Foswiki::cfg{PubDir}.'/'.$Foswiki::cfg{SystemWebName}.'/MoreFormfieldsPlugin/icons.yml'; my $yml = YAML::LoadFile($iconFile); diff --git a/lib/Foswiki/Form/Ipaddress.pm b/lib/Foswiki/Form/Ipaddress.pm index 80627b2..2ba9139 100644 --- 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/ # -# MoreFormfieldsContrib is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com +# MoreFormfieldsPlugin is Copyright (C) 2010-2014 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 index 28fea26..d4b6fd0 100644 --- 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/ # -# MoreFormfieldsContrib is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com +# MoreFormfieldsPlugin is Copyright (C) 2010-2014 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 index 1a39a84..bcb236c 100644 --- 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/ # -# MoreFormfieldsContrib is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com +# MoreFormfieldsPlugin is Copyright (C) 2010-2014 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 index 068d1d9..26e0d9b 100644 --- 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/ # -# MoreFormfieldsContrib is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com +# MoreFormfieldsPlugin is Copyright (C) 2010-2014 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,11 +25,11 @@ our @ISA = ('Foswiki::Form::Text'); sub addJavascript { #my $this = shift; Foswiki::Func::addToZone("script", - "MOREFORMFIELDSCONTRIB::IPADDRESS::JS", - "", + "MOREFORMFIELDSPLUGIN::IPADDRESS::JS", + "", "JQUERYPLUGIN::FOSWIKI, JQUERYPLUGIN::LIVEQUERY, JQUERYPLUGIN::VALIDATE"); - if ($Foswiki::cfg{Plugins}{MoreFormfieldsContrib}{Debug}) { + if ($Foswiki::cfg{Plugins}{MoreFormfieldsPlugin}{Debug}) { Foswiki::Plugins::JQueryPlugin::createPlugin("debug"); } @@ -38,8 +38,8 @@ sub addJavascript { sub addStyles { #my $this = shift; Foswiki::Func::addToZone("head", - "MOREFORMFIELDSCONTRIB::CSS", - ""); + "MOREFORMFIELDSPLUGIN::CSS", + ""); } diff --git a/lib/Foswiki/Form/Phonenumber.pm b/lib/Foswiki/Form/Phonenumber.pm index fc8955d..5185e03 100644 --- 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/ # -# MoreFormfieldsContrib is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com +# MoreFormfieldsPlugin is Copyright (C) 2010-2014 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 @@ -24,19 +24,19 @@ our @ISA = ('Foswiki::Form::Text'); sub addStyles { #my $this = shift; Foswiki::Func::addToZone("head", - "MOREFORMFIELDSCONTRIB::CSS", - ""); + "MOREFORMFIELDSPLUGIN::CSS", + ""); } sub addJavascript { #my $this = shift; Foswiki::Func::addToZone("script", - "MOREFORMFIELDSCONTRIB::PHONENUMBER::JS", - "", + "MOREFORMFIELDSPLUGIN::PHONENUMBER::JS", + "", "JQUERYPLUGIN::FOSWIKI, JQUERYPLUGIN::LIVEQUERY, JQUERYPLUGIN::VALIDATE"); - if ($Foswiki::cfg{Plugins}{MoreFormfieldsContrib}{Debug}) { + if ($Foswiki::cfg{Plugins}{MoreFormfieldsPlugin}{Debug}) { Foswiki::Plugins::JQueryPlugin::createPlugin("debug"); } diff --git a/lib/Foswiki/Form/Select2.pm b/lib/Foswiki/Form/Select2.pm index 999ca17..b2b2002 100644 --- 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/ # -# MoreFormfieldsContrib is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com +# MoreFormfieldsPlugin is Copyright (C) 2010-2014 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/Time.pm b/lib/Foswiki/Form/Time.pm index 05e533c..49a3bd6 100644 --- 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/ # -# MoreFormfieldsContrib is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com +# MoreFormfieldsPlugin is Copyright (C) 2010-2014 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 index 1886097..3afba75 100644 --- 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/ # -# MoreFormfieldsContrib is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com +# MoreFormfieldsPlugin is Copyright (C) 2010-2014 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 @@ -161,8 +161,8 @@ sub renderForEdit { sub addStyles { #my $this = shift; Foswiki::Func::addToZone("head", - "MOREFORMFIELDSCONTRIB::CSS", - ""); + "MOREFORMFIELDSPLUGIN::CSS", + ""); } @@ -171,7 +171,7 @@ sub addJavascript { Foswiki::Plugins::JQueryPlugin::createPlugin("select2"); Foswiki::Func::addToZone("script", "FOSWIKI::TOPICFIELD", <<"HERE", "JQUERYPLUGIN::SELECT2"); - + HERE } diff --git a/lib/Foswiki/Form/User.pm b/lib/Foswiki/Form/User.pm index c5977c9..fb0c0e2 100644 --- 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/ # -# MoreFormfieldsContrib is Copyright (C) 2010-2014 Michael Daum http://michaeldaumconsulting.com +# MoreFormfieldsPlugin is Copyright (C) 2010-2014 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 @@ -43,7 +43,7 @@ sub addJavascript { Foswiki::Plugins::JQueryPlugin::createPlugin("select2"); Foswiki::Func::addToZone("script", "FOSWIKI::USERFIELD", <<"HERE", "JQUERYPLUGIN::SELECT2"); - + HERE } diff --git a/lib/Foswiki/Plugins/MoreFormfieldsPlugin/Clockpicker.pm b/lib/Foswiki/Plugins/MoreFormfieldsPlugin/Clockpicker.pm index 80f3642..d6617f4 100644 --- a/lib/Foswiki/Plugins/MoreFormfieldsPlugin/Clockpicker.pm +++ b/lib/Foswiki/Plugins/MoreFormfieldsPlugin/Clockpicker.pm @@ -1,4 +1,4 @@ -package Foswiki::Contrib::MoreFormfieldsContrib::Clockpicker; +package Foswiki::Plugins::MoreFormfieldsPlugins::Clockpicker; use strict; use warnings; @@ -17,8 +17,8 @@ sub new { homepage => 'http://weareoutman.github.io/clockpicker', javascript => ['clockpicker.js', 'clockpicker.init.js'], css => ['clockpicker.css'], - documentation => 'MoreFormfieldsContrib', - puburl => '%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsContrib', + documentation => 'MoreFormfieldsPlugin', + puburl => '%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsPlugin', ), $class ); diff --git a/lib/Foswiki/Plugins/MoreFormfieldsPlugin/Config.spec b/lib/Foswiki/Plugins/MoreFormfieldsPlugin/Config.spec index e5e533d..61acaaf 100644 --- a/lib/Foswiki/Plugins/MoreFormfieldsPlugin/Config.spec +++ b/lib/Foswiki/Plugins/MoreFormfieldsPlugin/Config.spec @@ -2,7 +2,7 @@ # ---++ JQueryPlugin # ---+++ Extra plugins # **STRING** -$Foswiki::cfg{JQueryPlugin}{Plugins}{Clockpicker}{Module} = 'Foswiki::Contrib::MoreFormfieldsContrib::Clockpicker'; +$Foswiki::cfg{JQueryPlugin}{Plugins}{Clockpicker}{Module} = 'Foswiki::Plugins::MoreFormfieldsPlugin::Clockpicker'; # **BOOLEAN** $Foswiki::cfg{JQueryPlugin}{Plugins}{Clockpicker}{Enabled} = 1; 1; diff --git a/lib/Foswiki/Plugins/MoreFormfieldsPlugin/MANIFEST b/lib/Foswiki/Plugins/MoreFormfieldsPlugin/MANIFEST index d5eede7..390e581 100644 --- a/lib/Foswiki/Plugins/MoreFormfieldsPlugin/MANIFEST +++ b/lib/Foswiki/Plugins/MoreFormfieldsPlugin/MANIFEST @@ -1,6 +1,5 @@ data/System/MoreFormfieldsAjaxHelper.txt 0644 -data/System/MoreFormfieldsContrib.txt 0644 -lib/Foswiki/Contrib/MoreFormfieldsContrib.pm 0644 +data/System/MoreFormfieldsPlugin.txt 0644 lib/Foswiki/Form/Autofill.pm 0644 lib/Foswiki/Form/Icon.pm 0644 lib/Foswiki/Form/Id.pm 0644 @@ -13,31 +12,36 @@ lib/Foswiki/Form/Select2.pm 0644 lib/Foswiki/Form/Time.pm 0644 lib/Foswiki/Form/Topic.pm 0644 lib/Foswiki/Form/User.pm 0644 +lib/Foswiki/Plugins/MoreFormfieldsPlugin/Clockpicker.pm 0644 +lib/Foswiki/Plugins/MoreFormfieldsPlugin/Config.spec 0644 lib/Foswiki/Plugins/MoreFormfieldsPlugin.pm 0644 -pub/System/MoreFormfieldsContrib/clockpicker.css 0644 -pub/System/MoreFormfieldsContrib/clockpicker.css.gz 0644 -pub/System/MoreFormfieldsContrib/clockpicker.js 0644 -pub/System/MoreFormfieldsContrib/clockpicker.js.gz 0644 -pub/System/MoreFormfieldsContrib/clockpicker.uncompressed.css 0644 -pub/System/MoreFormfieldsContrib/clockpicker.uncompressed.js 0644 -pub/System/MoreFormfieldsContrib/iconfield.js 0644 -pub/System/MoreFormfieldsContrib/iconfield.js.gz 0644 -pub/System/MoreFormfieldsContrib/iconfield.uncompressed.js 0644 -pub/System/MoreFormfieldsContrib/icons.yml 0644 -pub/System/MoreFormfieldsContrib/Makefile 0644 -pub/System/MoreFormfieldsContrib/moreformfields.css 0644 -pub/System/MoreFormfieldsContrib/moreformfields.css.gz 0644 -pub/System/MoreFormfieldsContrib/moreformfields.uncompressed.css 0644 -pub/System/MoreFormfieldsContrib/networkaddress.js 0644 -pub/System/MoreFormfieldsContrib/networkaddress.js.gz 0644 -pub/System/MoreFormfieldsContrib/networkaddress.uncompressed.js 0644 -pub/System/MoreFormfieldsContrib/phonenumber.js 0644 -pub/System/MoreFormfieldsContrib/phonenumber.js.gz 0644 -pub/System/MoreFormfieldsContrib/phonenumber.uncompressed.js 0644 -pub/System/MoreFormfieldsContrib/phone.png 0644 -pub/System/MoreFormfieldsContrib/topicfield.js 0644 -pub/System/MoreFormfieldsContrib/topicfield.js.gz 0644 -pub/System/MoreFormfieldsContrib/topicfield.uncompressed.js 0644 -pub/System/MoreFormfieldsContrib/userfield.js 0644 -pub/System/MoreFormfieldsContrib/userfield.js.gz 0644 -pub/System/MoreFormfieldsContrib/userfield.uncompressed.js 0644 +pub/System/MoreFormfieldsPlugin/clockpicker.css 0644 +pub/System/MoreFormfieldsPlugin/clockpicker.css.gz 0644 +pub/System/MoreFormfieldsPlugin/clockpicker.init.js 0644 +pub/System/MoreFormfieldsPlugin/clockpicker.init.js.gz 0644 +pub/System/MoreFormfieldsPlugin/clockpicker.init.uncompressed.js 0644 +pub/System/MoreFormfieldsPlugin/clockpicker.js 0644 +pub/System/MoreFormfieldsPlugin/clockpicker.js.gz 0644 +pub/System/MoreFormfieldsPlugin/clockpicker.uncompressed.css 0644 +pub/System/MoreFormfieldsPlugin/clockpicker.uncompressed.js 0644 +pub/System/MoreFormfieldsPlugin/iconfield.js 0644 +pub/System/MoreFormfieldsPlugin/iconfield.js.gz 0644 +pub/System/MoreFormfieldsPlugin/iconfield.uncompressed.js 0644 +pub/System/MoreFormfieldsPlugin/icons.yml 0644 +pub/System/MoreFormfieldsPlugin/Makefile 0644 +pub/System/MoreFormfieldsPlugin/moreformfields.css 0644 +pub/System/MoreFormfieldsPlugin/moreformfields.css.gz 0644 +pub/System/MoreFormfieldsPlugin/moreformfields.uncompressed.css 0644 +pub/System/MoreFormfieldsPlugin/networkaddress.js 0644 +pub/System/MoreFormfieldsPlugin/networkaddress.js.gz 0644 +pub/System/MoreFormfieldsPlugin/networkaddress.uncompressed.js 0644 +pub/System/MoreFormfieldsPlugin/phonenumber.js 0644 +pub/System/MoreFormfieldsPlugin/phonenumber.js.gz 0644 +pub/System/MoreFormfieldsPlugin/phonenumber.uncompressed.js 0644 +pub/System/MoreFormfieldsPlugin/phone.png 0644 +pub/System/MoreFormfieldsPlugin/topicfield.js 0644 +pub/System/MoreFormfieldsPlugin/topicfield.js.gz 0644 +pub/System/MoreFormfieldsPlugin/topicfield.uncompressed.js 0644 +pub/System/MoreFormfieldsPlugin/userfield.js 0644 +pub/System/MoreFormfieldsPlugin/userfield.js.gz 0644 +pub/System/MoreFormfieldsPlugin/userfield.uncompressed.js 0644 diff --git a/lib/Foswiki/Plugins/MoreFormfieldsPlugin/build.pl b/lib/Foswiki/Plugins/MoreFormfieldsPlugin/build.pl index a1c6f9c..ba2b36c 100755 --- a/lib/Foswiki/Plugins/MoreFormfieldsPlugin/build.pl +++ b/lib/Foswiki/Plugins/MoreFormfieldsPlugin/build.pl @@ -3,7 +3,7 @@ use Foswiki::Contrib::Build; # Create the build object -$build = new Foswiki::Contrib::Build('MoreFormfieldsContrib'); +$build = new Foswiki::Contrib::Build('MoreFormfieldsPlugin'); # (Optional) Set the details of the repository for uploads. # This can be any web on any accessible Foswiki installation.