Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item13206: fix jquery icon parameter
- see jquery-ui migration guide
- cleaned up build script
- use https everywhere
  • Loading branch information
MichaelDaum committed Sep 7, 2016
1 parent 9ba9fee commit d7a035b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 83 deletions.
8 changes: 4 additions & 4 deletions ConfigurePlugin/data/System/ConfigurePlugin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1460393558" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1473233286" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! Configure Plugin
%FORMFIELD{"Description"}%
Expand Down Expand Up @@ -52,9 +52,9 @@ The plugin uses the =JsonRpcContrib=, which must be installed.
%META:FIELD{name="Author" title="Author" value="CrawfordCurrie"}%
%META:FIELD{name="Copyright" title="Copyright" value="2013-2016, CrawfordCurrie http://c-dot.co.uk, All Rights Reserved"}%
%META:FIELD{name="Description" title="Description" value="%25$SHORTDESCRIPTION%25"}%
%META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/%25$ROOTMODULE%25"}%
%META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
%META:FIELD{name="Home" title="Home" value="https://foswiki.org/Extensions/%25$ROOTMODULE%25"}%
%META:FIELD{name="License" title="License" value="GPL ([[https://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
%META:FIELD{name="Release" title="Release" value="%25$RELEASE%25"}%
%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/%25$ROOTMODULE%25"}%
%META:FIELD{name="Support" title="Support" value="https://foswiki.org/Support/%25$ROOTMODULE%25"}%
%META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
65 changes: 1 addition & 64 deletions ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin/build.pl
@@ -1,23 +1,4 @@
#!/usr/bin/perl -w
#
# Example build class. Copy this file to the equivalent place in your
# plugin or contrib and edit.
#
# Read the comments at the top of lib/Foswiki/Contrib/Build.pm for
# details of how the build process works, and what files you
# have to provide and where.
#
# Requires the environment variable FOSWIKI_LIBS (a colon-separated path
# list) to be set to point at the build system and any required dependencies.
# Usage: ./build.pl [-n] [-v] [target]
# where [target] is the optional build target (build, test,
# install, release, uninstall), test is the default.
# Two command-line options are supported:
# -n Don't actually do anything, just print commands
# -v Be verbose
#

# Standard preamble
#!/usr/bin/env perl
use strict;
use warnings;

Expand All @@ -30,47 +11,3 @@

# Build the target on the command line, or the default target
$build->build( $build->{target} );

=begin TML
You can do a lot more with the build system if you want; for example, to add
a new target, you could do this:
<verbatim>
{
package MyModuleBuild;
our @ISA = qw( Foswiki::Contrib::Build );
sub new {
my $class = shift;
return bless( $class->SUPER::new( "MyModule" ), $class );
}
sub target_mytarget {
my $this = shift;
# Do other build stuff here
}
}
# Create the build object
my $build = new MyModuleBuild();
</verbatim>
You can also specify a different default target server for uploads.
This can be any web on any accessible Foswiki installation.
These defaults will be used when expanding tokens in .txt
files, but be warned, they can be overridden at upload time!
<verbatim>
# name of web to upload to
$build->{UPLOADTARGETWEB} = 'Extensions';
# Full URL of pub directory
$build->{UPLOADTARGETPUB} = 'http://foswiki.org/pub';
# Full URL of bin directory
$build->{UPLOADTARGETSCRIPT} = 'http://foswiki.org/bin';
# Script extension
$build->{UPLOADTARGETSUFFIX} = '';
</verbatim>
=cut

Expand Up @@ -481,6 +481,7 @@ table.tml {
background:#aaa;
border-color:#aaa;
border-radius:0;
margin:0;
}
.ui-tabs-vertical > .ui-tabs-nav > li.ui-tabs-active > a {
color:#fff;
Expand Down
Expand Up @@ -581,9 +581,7 @@ function _id_ify(id) {
call_wizard($node, fb, $node);
}
}).button({
icons: {
primary: icon
}
icon: icon
});
$node.find(".button_box").append($button);
}
Expand Down Expand Up @@ -664,9 +662,7 @@ function _id_ify(id) {
handler.restoreCurrentValue();
check_current_value($node, true);
}).button({
icons: {
primary: "ui-icon-cancel"
}
icon: "ui-icon-cancel"
}).hide();
$button.appendTo($buttons);

Expand All @@ -676,9 +672,7 @@ function _id_ify(id) {
handler.restoreDefaultValue();
check_current_value($node, true);
}).button({
icons: {
primary: "ui-icon-arrowrefresh-1-w"
}
icon: "ui-icon-arrowrefresh-1-w"
}).hide();
$button.appendTo($buttons);

Expand Down Expand Up @@ -1076,9 +1070,7 @@ if (0) {
});

$('#searchButton').button({
icons: {
primary: "ui-icon-search"
},
icon: "ui-icon-search",
text: false
}).click(function() {
search($("#searchInput").val());
Expand Down Expand Up @@ -1181,9 +1173,7 @@ if (0) {
});
$('.help_button').each(function() {
$(this).button({
icons: {
primary: $(this).attr("name")
},
icon: $(this).attr("name"),
text: false
});
});
Expand Down

0 comments on commit d7a035b

Please sign in to comment.