Skip to content

Commit

Permalink
Item12952: fix bubbling reports, nicer whirlies, fixes for some types
Browse files Browse the repository at this point in the history
  • Loading branch information
crawford committed Sep 1, 2014
1 parent 4bfb9ea commit ee0ff41
Show file tree
Hide file tree
Showing 7 changed files with 407 additions and 275 deletions.
8 changes: 5 additions & 3 deletions lib/Foswiki/Plugins/ConfigurePlugin.pm
Expand Up @@ -38,7 +38,7 @@ our $SHORTDESCRIPTION = '=configure= interface using json-rpc';

our $NO_PREFS_IN_TOPIC = 1;

use constant TRACE => 0;
use constant TRACE => 1;

BEGIN {
# Note: if Foswiki is in bootstrap mode, Foswiki.pm will try
Expand Down Expand Up @@ -459,12 +459,13 @@ sub check_current_value {
# that config is wishful thinking, but hey, can't have everything.

# Determine the set of value keys being checked
my %check;

my $keys = $params->{keys};
if ( !$keys || scalar @$keys == 0 ) {
$check{''} = 1;
push( @$keys, '' );
}

my %check;
foreach my $k (@$keys) {

# $k='' is the root section
Expand Down Expand Up @@ -525,6 +526,7 @@ sub check_current_value {
my $checker = Foswiki::Configure::Checker::loadChecker($spec);
if ($checker) {
$reporter->clear();
print STDERR "Checking $k\n" if TRACE;
$checker->check_current_value($reporter);
my @reps;
foreach my $level ( 'errors', 'warnings', 'confirmations', 'notes' )
Expand Down
14 changes: 6 additions & 8 deletions lib/Foswiki/Plugins/ConfigurePlugin/Config.spec
Expand Up @@ -10,15 +10,13 @@ $Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{STRING} = 'STRING';
# **PASSWORD**
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{PASSWORD} = 'PASSWORD';
# **BOOLEAN**
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{BOOLEAN} = 'BOOLEAN';
# **BOOLGROUP**
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{BOOLGROUP} = 'BOOLGROUP';
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{BOOLEAN} = 1;
# **COMMAND**
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{COMMAND} = 'COMMAND';
# **DATE**
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{DATE} = '12 Feb 2012';
# **EMAILADDRESS**
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{EMAILADDRESS} = 'EMAILADDRESS';
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{EMAILADDRESS} = 'address@email.co';
# **LANGUAGE**
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{LANGUAGE} = 'LANGUAGE';
# **NUMBER**
Expand All @@ -32,13 +30,13 @@ $Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{PATH} = 'PATH';
# **PERL**
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{PERL} = 'PERL';
# **REGEX**
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{REGEX} = 'REGEX';
# **SELECTCLASS**
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{SELECTCLASS} = 'SELECTCLASS';
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{REGEX} = qr/^regex$/;
# **SELECTCLASS none,Foswiki::Confi* **
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{SELECTCLASS} = 'Foswiki::Configure';
# **SELECT**
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{SELECT} = 'SELECT';
# **URLPATH**
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{URLPATH} = 'localhost';
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{URLPATH} = '/';
# **URL**
$Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{URL} = 'http://localhost';
# **STRING H**
Expand Down
Binary file modified pub/System/ConfigurePlugin/checkWhirly.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 9 additions & 3 deletions pub/System/ConfigurePlugin/configure.uncompressed.css
Expand Up @@ -5,8 +5,12 @@ html body {

.whirly {
display:inline-block;
width: 20px;
width: 100%;
height: 20px;
background-repeat: no-repeat;
padding-left: 23px;
padding-top: 2px;
color: lightgray;
}

.top_level_buttons {
Expand Down Expand Up @@ -42,8 +46,10 @@ div.node {

}

/* Used to record that a leaf node has been populated with a value */
.valued {
/* Used to record that a leaf node has been populated with a value
and needs a UI to be loaded */
.load_ui {
background-color: lavender; /* find something better */
}

/* Classes added to elements that have been checked. All of these
Expand Down

0 comments on commit ee0ff41

Please sign in to comment.