Skip to content

Commit

Permalink
Item12962: rewriting class names and paths
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.foswiki.org/trunk/MoreFormfieldsPlugin@17813 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
MichaelDaum authored and MichaelDaum committed Jul 11, 2014
1 parent 14a1bba commit 694e14f
Show file tree
Hide file tree
Showing 15 changed files with 65 additions and 61 deletions.
2 changes: 1 addition & 1 deletion 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
Expand Down
6 changes: 3 additions & 3 deletions 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
Expand Down Expand Up @@ -59,7 +59,7 @@ sub renderForEdit {
Foswiki::Plugins::JQueryPlugin::createPlugin("select2");

Foswiki::Func::addToZone("script", "FOSWIKI::ICONFIELD", <<'HERE', "JQUERYPLUGIN::FONTAWESOME, JQUERYPLUGIN::SELECT2");
<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsContrib/iconfield.js'></script>
<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsPlugin/iconfield.js'></script>
HERE

$this->readIcons();
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
12 changes: 6 additions & 6 deletions 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
Expand All @@ -25,11 +25,11 @@ our @ISA = ('Foswiki::Form::Text');
sub addJavascript {
#my $this = shift;
Foswiki::Func::addToZone("script",
"MOREFORMFIELDSCONTRIB::IPADDRESS::JS",
"<script src='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsContrib/networkaddress.js'></script>",
"MOREFORMFIELDSPLUGIN::IPADDRESS::JS",
"<script src='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsPlugin/networkaddress.js'></script>",
"JQUERYPLUGIN::FOSWIKI, JQUERYPLUGIN::LIVEQUERY, JQUERYPLUGIN::VALIDATE");

if ($Foswiki::cfg{Plugins}{MoreFormfieldsContrib}{Debug}) {
if ($Foswiki::cfg{Plugins}{MoreFormfieldsPlugin}{Debug}) {
Foswiki::Plugins::JQueryPlugin::createPlugin("debug");
}

Expand All @@ -38,8 +38,8 @@ sub addJavascript {
sub addStyles {
#my $this = shift;
Foswiki::Func::addToZone("head",
"MOREFORMFIELDSCONTRIB::CSS",
"<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsContrib/moreformfields.css' media='all' />");
"MOREFORMFIELDSPLUGIN::CSS",
"<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsPlugin/moreformfields.css' media='all' />");

}

Expand Down
12 changes: 6 additions & 6 deletions 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
Expand All @@ -24,19 +24,19 @@ our @ISA = ('Foswiki::Form::Text');
sub addStyles {
#my $this = shift;
Foswiki::Func::addToZone("head",
"MOREFORMFIELDSCONTRIB::CSS",
"<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsContrib/moreformfields.css' media='all' />");
"MOREFORMFIELDSPLUGIN::CSS",
"<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsPlugin/moreformfields.css' media='all' />");

}

sub addJavascript {
#my $this = shift;
Foswiki::Func::addToZone("script",
"MOREFORMFIELDSCONTRIB::PHONENUMBER::JS",
"<script src='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsContrib/phonenumber.js'></script>",
"MOREFORMFIELDSPLUGIN::PHONENUMBER::JS",
"<script src='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsPlugin/phonenumber.js'></script>",
"JQUERYPLUGIN::FOSWIKI, JQUERYPLUGIN::LIVEQUERY, JQUERYPLUGIN::VALIDATE");

if ($Foswiki::cfg{Plugins}{MoreFormfieldsContrib}{Debug}) {
if ($Foswiki::cfg{Plugins}{MoreFormfieldsPlugin}{Debug}) {
Foswiki::Plugins::JQueryPlugin::createPlugin("debug");
}

Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
8 changes: 4 additions & 4 deletions 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
Expand Down Expand Up @@ -161,8 +161,8 @@ sub renderForEdit {
sub addStyles {
#my $this = shift;
Foswiki::Func::addToZone("head",
"MOREFORMFIELDSCONTRIB::CSS",
"<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsContrib/moreformfields.css' media='all' />");
"MOREFORMFIELDSPLUGIN::CSS",
"<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsPlugin/moreformfields.css' media='all' />");

}

Expand All @@ -171,7 +171,7 @@ sub addJavascript {

Foswiki::Plugins::JQueryPlugin::createPlugin("select2");
Foswiki::Func::addToZone("script", "FOSWIKI::TOPICFIELD", <<"HERE", "JQUERYPLUGIN::SELECT2");
<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsContrib/topicfield.js'></script>
<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsPlugin/topicfield.js'></script>
HERE
}

Expand Down
4 changes: 2 additions & 2 deletions 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
Expand Down Expand Up @@ -43,7 +43,7 @@ sub addJavascript {

Foswiki::Plugins::JQueryPlugin::createPlugin("select2");
Foswiki::Func::addToZone("script", "FOSWIKI::USERFIELD", <<"HERE", "JQUERYPLUGIN::SELECT2");
<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsContrib/userfield.js'></script>
<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/MoreFormfieldsPlugin/userfield.js'></script>
HERE
}

Expand Down
6 changes: 3 additions & 3 deletions lib/Foswiki/Plugins/MoreFormfieldsPlugin/Clockpicker.pm
@@ -1,4 +1,4 @@
package Foswiki::Contrib::MoreFormfieldsContrib::Clockpicker;
package Foswiki::Plugins::MoreFormfieldsPlugins::Clockpicker;

use strict;
use warnings;
Expand All @@ -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
);
Expand Down
2 changes: 1 addition & 1 deletion lib/Foswiki/Plugins/MoreFormfieldsPlugin/Config.spec
Expand Up @@ -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;
Expand Down
62 changes: 33 additions & 29 deletions 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
Expand All @@ -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
2 changes: 1 addition & 1 deletion lib/Foswiki/Plugins/MoreFormfieldsPlugin/build.pl
Expand Up @@ -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.
Expand Down

0 comments on commit 694e14f

Please sign in to comment.