Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item14288: Merge remote-tracking branch 'master'
  • Loading branch information
MichaelDaum committed Jun 20, 2017
2 parents 74811eb + 811c971 commit 066e9fc
Show file tree
Hide file tree
Showing 67 changed files with 2,464 additions and 481 deletions.
34 changes: 18 additions & 16 deletions EditRowPlugin/data/System/EditRowPlugin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1493666715" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1497953719" format="1.1" version="1"}%
---+!! !EditRowPlugin
<!--
One line description, required for extensions repository catalog.
Expand Down Expand Up @@ -271,7 +271,9 @@ Provides the vertical row editing interface like
Another great Foswiki extension from the <a style="text-decoration:none" href="http://wikiring.com"><img src="%ATTACHURLPATH%/wikiringlogo20x20.png" alt="" /> *WikiRing* </a> - working together to improve your wiki experience!

| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 3.318 (1 May 2017) | Foswikitask:Item14351: Uninitialized value warning when changerows is used with EditRowPlugin <br/>\
| 3.318 (15 May 2017) | Foswikitask:Item14351: Uninitialized value warning when changerows is used with EditRowPlugin. <br/>\
Foswikitask:Item13766: EditRowPlugin columns widths are jumping to wider size when you hoover the mouse over the table. <br/>\
Foswikitask:Item14234: Clicking pencil for first row (erp_row=0) opens editor on entire table. <br/>\
Foswikitask:Item14349: Edit Table button not functional on IE 11.|
| 3.317 (21 Jan 2017) | Foswikitask:Item14107 Document that move, add & delete row actions are immediate, not subject to cancel. |
| 3.316 (26 Nov 2016) | Foswikitask:Item14174 css.gz and js.gz files missing from MANIFEST<br/> \
Expand Down Expand Up @@ -352,17 +354,17 @@ Another great Foswiki extension from the <a style="text-decoration:none" href="h
%META:FIELD{name="License" title="License" value="[[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]]"}%
%META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/EditRowPlugin"}%
%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/EditRowPlugin"}%
%META:FILEATTACHMENT{name="icons.png" attr="h" comment="" date="1493666715" size="2457" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example3.png" attr="h" comment="" date="1493666715" size="15337" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example4.png" attr="h" comment="" date="1493666715" size="22834" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.css" attr="h" comment="" date="1493666715" size="1454" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot2.png" attr="h" comment="" date="1493666715" size="12013" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.uncompressed.js" attr="h" comment="" date="1493666715" size="6803" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.js" attr="h" comment="" date="1493666715" size="11898" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.css" attr="h" comment="" date="1493666715" size="2130" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example5.png" attr="h" comment="" date="1493666715" size="9132" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.js" attr="h" comment="" date="1493666715" size="26625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1493666715" size="19461" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.js" attr="h" comment="" date="1493666715" size="3626" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1493666715" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="clock.gif" attr="h" comment="" date="1493666715" size="1418" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="icons.png" attr="h" comment="" date="1497953719" size="2457" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example3.png" attr="h" comment="" date="1497953719" size="15337" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example4.png" attr="h" comment="" date="1497953719" size="22834" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.css" attr="h" comment="" date="1497953719" size="1454" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot2.png" attr="h" comment="" date="1497953719" size="12013" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.uncompressed.js" attr="h" comment="" date="1497953719" size="6803" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.js" attr="h" comment="" date="1497953719" size="11898" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.css" attr="h" comment="" date="1497953719" size="2130" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example5.png" attr="h" comment="" date="1497953719" size="9132" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.js" attr="h" comment="" date="1497953719" size="26625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1497953719" size="19461" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.js" attr="h" comment="" date="1497953719" size="3626" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1497953719" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="clock.gif" attr="h" comment="" date="1497953719" size="1418" user="ProjectContributor" version="1"}%
2 changes: 1 addition & 1 deletion EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin.pm
Expand Up @@ -33,7 +33,7 @@ BEGIN {
}

our $VERSION = '3.318';
our $RELEASE = '01 May 2017';
our $RELEASE = '15 May 2017';
our $SHORTDESCRIPTION = 'Inline edit for tables';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down
5 changes: 2 additions & 3 deletions EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/Table.pm
Expand Up @@ -175,9 +175,8 @@ sub render {

$this->_assignLabels();

my $editing = ( $opts->{for_edit} && $this->can_edit() );
my $wholeTable =
( defined $opts->{active_row} && $opts->{active_row} <= 0 );
my $editing = ( $opts->{for_edit} && $this->can_edit() );
my $wholeTable = ( defined $opts->{active_row} && $opts->{active_row} < 0 );

my $id = $this->getID();
push( @out, Foswiki::Render::html( 'a', { name => "erp_${id}" } ) )
Expand Down
@@ -1,5 +1,5 @@
# See bottom of file for license and copyright information
package HTML;
package ERP_HTML;

use strict;
use warnings;
Expand Down Expand Up @@ -223,16 +223,21 @@ INPUT
# erp_table => "TABLE_0"
);
my $expected = <<EXPECTED;
<form method="POST" action="$saveurl" name="erp_form_TABLE_0">
<input type="hidden" name="erp_topic" value="$this->{test_web}.$this->{test_topic}" /><input type="hidden" name="erp_version" value="VERSION" /><input type="hidden" name="erp_table" value="TABLE_0" /><input type="hidden" name="erp_row" value="0" />
<form action='$saveurl' method='POST' name='erp_form_TABLE_0'>
<input name='erp_topic' type='hidden' value='$this->{test_web}.$this->{test_topic}'></input>
<input name='erp_version' type='hidden' value='VERSION'></input>
<input name='erp_table' type='hidden' value='TABLE_0'></input>
<input name='erp_row' type='hidden' value='0'></input>
<a name='erp_TABLE_0'></a>
<input type="hidden" name="erp_TABLE_0_format" value="" />
<input name='erp_TABLE_0_format' type='hidden' value=''></input>
| #REF0# |
<input type="hidden" name="erp_action" value="" />
<button type="submit" name="erp_action" value="saveTableCmd" title="Save" class="ui-icon ui-icon-disk erp-button" />
<button type="submit" name="erp_action" value="cancelCmd" title="Cancel" class="ui-icon ui-icon-cancel erp-button" />
<button class="ui-icon ui-icon-plusthick erp-button" name="erp_action" title="Add new row after this row / at the end" type="submit" value="addRowCmd" />
<button class="ui-icon ui-icon-minusthick erp-button" name="erp_action" title="Delete this row / last row" type="submit" value="deleteRowCmd" />
<input name='erp_action' type='hidden' value=''></input>
<button class='ui-icon ui-icon-disk erp-button' name='erp_action' title='Save' type='submit' value='saveRowCmd'></button>
<button class='ui-icon ui-icon-cancel erp-button' name='erp_action' title='Cancel' type='submit' value='cancelCmd'></button>
<button class='ui-icon ui-icon-plusthick erp-button' name='erp_action' title='Add new row after this row / at the end' type='submit' value='addRowCmd'></button>
<button class='ui-icon ui-icon-minusthick erp-button' name='erp_action' title='Delete this row / last row' type='submit' value='deleteRowCmd'></button>
<a name='erp_TABLE_0_0'></a>|
</form>
EXPECTED
$this->assert_html_equals( $expected, $in );
Expand Down Expand Up @@ -285,18 +290,21 @@ INPUT
);
Foswiki::Plugins::EditRowPlugin::postRenderingHandler($in);
my $expected = <<EXPECTED;
<form method="POST" action="$saveurl" name="erp_form_TABLE_0">
<input type="hidden" name="erp_topic" value="$this->{test_web}.$this->{test_topic}" /><input type="hidden" name="erp_version" value="VERSION" /><input type="hidden" name="erp_table" value="TABLE_0" /><input type="hidden" name="erp_row" value="0" />
<form action='$saveurl' method='POST' name='erp_form_TABLE_0'>
<input name='erp_topic' type='hidden' value='$this->{test_web}.$this->{test_topic}'></input>
<input name='erp_version' type='hidden' value='VERSION'></input>
<input name='erp_table' type='hidden' value='TABLE_0'></input>
<input name='erp_row' type='hidden' value='0'></input>
<a name='erp_TABLE_0'></a>
<input type="hidden" name="erp_TABLE_0_format" value="" />
<input name='erp_TABLE_0_format' type='hidden' value=''></input>
| #REF0# |
<input type="hidden" name="erp_action" value="" />
<button class="ui-icon ui-icon-disk erp-button" name="erp_action" title="Save" type="submit" value="saveTableCmd"/>
<button class="ui-icon ui-icon-cancel erp-button" name="erp_action" title="Cancel" type="submit" value="cancelCmd"/>
<button class="ui-icon ui-icon-plusthick erp-button" name="erp_action" title="Add new row after this row / at the end" type="submit" value="addRowCmd">
</button>
<button class="ui-icon ui-icon-minusthick erp-button" name="erp_action" title="Delete this row / last row" type="submit" value="deleteRowCmd">
</button>
<input name='erp_action' type='hidden' value=''></input>
<button class='ui-icon ui-icon-disk erp-button' name='erp_action' title='Save' type='submit' value='saveRowCmd'></button>
<button class='ui-icon ui-icon-cancel erp-button' name='erp_action' title='Cancel' type='submit' value='cancelCmd'></button>
<button class='ui-icon ui-icon-plusthick erp-button' name='erp_action' title='Add new row after this row / at the end' type='submit' value='addRowCmd'></button>
<button class='ui-icon ui-icon-minusthick erp-button' name='erp_action' title='Delete this row / last row' type='submit' value='deleteRowCmd'></button>
<a name='erp_TABLE_0_0'></a>|
</form>
EXPECTED
$this->assert_html_equals( $expected, $in );
Expand Down
Expand Up @@ -6,6 +6,6 @@ use warnings;
use Unit::TestSuite;
our @ISA = 'Unit::TestSuite';

sub include_tests { return ( 'Parser', 'HTML', 'Rest' ) }
sub include_tests { return ( 'Parser', 'ERP_HTML', 'Rest' ) }

1;
8 changes: 4 additions & 4 deletions FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1495415159" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1497953719" format="1.1" version="1"}%
---+!! <nop>FastCGI Engine Contrib
%$SHORTDESCRIPTION%

Expand Down Expand Up @@ -160,8 +160,8 @@ server {
#fastcgi_pass unix:/var/run/nginx/foswiki.sock;
fastcgi_pass 127.0.0.1:9000;
fastcgi_split_path_info ^(/bin/\w+)(.*);
# Captures two variables ($ffastcgi_script_name) and ($fastcgi_path_info)
fastcgi_param SCRIPT_FILENAME $foswiki_root/$fastcgi_script_name;
# Captures two variables ($fastcgi_script_name) and ($fastcgi_path_info)
fastcgi_param SCRIPT_FILENAME $foswiki_root/bin/$fastcgi_script_name;
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
include fastcgi_params;
Expand Down Expand Up @@ -232,7 +232,7 @@ After the update, each process will still serve one more request before reloadin
---++ Info

| Change History: | |
| 21 May 2017 | (1.04) Foswikitask:Item14346 - Fix issues in the systemd service file. Improve documentation.<br/>
| 21 May 2017 | (1.04) Foswikitask:Item14346 - Fix issues in the systemd service file. Improve documentation.<br/>\
Foswikitask:Item14402 - Fix default Foswiki root location. along with more doc improvements. |
| 04 Oct 2016 | (1.03) Foswikitask:Item13883 - Documentation updates, Foswikitask:Item14086 - Add a systemd example service file. |
| 14 Jun 2015 | (1.02) Foswikitask:Item10751 - Prepare for Unicode core. |
Expand Down
8 changes: 0 additions & 8 deletions TopicUserMappingContrib/data/Main/GroupTemplate.txt

This file was deleted.

13 changes: 13 additions & 0 deletions TopicUserMappingContrib/data/System/GroupTemplate.txt
@@ -0,0 +1,13 @@
%META:TOPICINFO{author="ProjectContributor" date="1497953719" format="1.1" version="1"}%
%META:TOPICPARENT{name="WikiGroups"}%
%STARTSECTION{type="templateonly"}%
To modify this template, first copy it to %USERSWEB%.%TOPIC% web, and edit that
copy. If %USERSWEB%.%TOPIC% exists, it will automatically be used when
creating new groups.
%ENDSECTION{type="templateonly"}%

%MAKETEXT{"Edit this topic to add a description to the [_1]" args="!%URLPARAM{"topic"}%"}%

%META:PREFERENCE{name="GROUP" title="GROUP" value=""}%
%META:PREFERENCE{name="VIEW_TEMPLATE" title="VIEW_TEMPLATE" value="GroupView"}%
%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%URLPARAM{"topic"}%"}%
Expand Up @@ -3,7 +3,6 @@
data/System/TopicUserMappingContrib.txt 0644 Documentation
lib/Foswiki/Contrib/TopicUserMappingContrib.pm 0444
lib/Foswiki/Users/TopicUserMapping.pm 0444
data/Main/GroupTemplate.txt 0644
data/Main/NobodyGroup.txt 0644
data/Main/RegistrationAgent.txt 0644
data/Main/UserHomepageHeader.txt 0644
Expand All @@ -19,6 +18,7 @@ data/System/ChangeEmailAddress.txt 0644
data/System/ChangePassword.txt 0644
data/System/DefaultUserRegistration.txt 0644
data/System/FAQRebuildingWikiUsersTopic.txt 0644
data/System/GroupTemplate.txt 0644
data/System/ManagingUsers.txt 0644
data/System/NewUserTemplate.txt 0644
data/System/ResetPassword.txt 0644
Expand Down
25 changes: 22 additions & 3 deletions TopicUserMappingContrib/lib/Foswiki/Users/TopicUserMapping.pm
Expand Up @@ -411,12 +411,16 @@ m/^\s+\*\s($Foswiki::regex{webNameRegex}\.)?($Foswiki::regex{wikiWordRegex})\s*(
$odate = ''
unless $odate =~ m/^\d+[- .\/]+[A-Za-z0-9]+[- .\/]+\d+$/;
$insidelist = 1;

#print STDERR "1: Found $web.$name.$odate $insidelist\n";
}
elsif ( $line =~ m/^\s+\*\s([A-Z]) - / ) {
elsif ( $line =~ m/^\s+\*\s([[:upper:]]) - / ) {

# * A - <a name="A">- - - -</a>^M
$name = $1;
$insidelist = 1;

#print STDERR "2: Found $name $insidelist\n";
}
elsif ( $insidelist == 1 ) {

Expand All @@ -426,18 +430,24 @@ m/^\s+\*\s($Foswiki::regex{webNameRegex}\.)?($Foswiki::regex{wikiWordRegex})\s*(
# in all alphabets
$insidelist = 2;
$name = '';

#print STDERR "3: Found $name $insidelist\n";
}
if ( ( $name && ( $wikiname le $name ) ) || $insidelist == 2 ) {

#print STDERR "4: Found $wikiname le $name || $insidelist\n";
# found alphabetical position or last record
if ( $wikiname eq $name ) {

#print STDERR "5: Found $wikiname eq $name\n";

next if ( $action eq 'del' );

# adjusting existing user - keep original registration date
$entry .= $odate;
}
else {
print STDERR "6: Appending $today to $entry NL $line \n";
$entry .= $today . "\n" . $line;
}

Expand Down Expand Up @@ -946,8 +956,17 @@ sub addUserToGroup {
)
);

$groupTopicObject =
Foswiki::Meta->load( $this->{session}, $groupWeb, 'GroupTemplate' );
if ( Foswiki::Func::topicExists( $groupWeb, 'GroupTemplate' ) ) {
$groupTopicObject =
Foswiki::Meta->load( $this->{session}, $groupWeb,
'GroupTemplate' );
}
else {
$groupTopicObject =
Foswiki::Meta->load( $this->{session},
$Foswiki::cfg{SystemWebName},
'GroupTemplate' );
}

# expand the GroupTemplate as best we can.
$this->{session}->{request}
Expand Down
27 changes: 8 additions & 19 deletions UpdatesPlugin/lib/Foswiki/Plugins/UpdatesPlugin/build.pl
@@ -1,26 +1,15 @@
#!/usr/bin/perl -w
BEGIN { unshift @INC, split( /:/, $ENV{FOSWIKI_LIBS} ); }
use Foswiki::Contrib::Build;

# Create the build object
$build = new Foswiki::Contrib::Build('UpdatesPlugin');
#!/usr/bin/env perl

# (Optional) Set the details of the repository 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!
# Standard preamble
use strict;
use warnings;

# name of web to upload to
$build->{UPLOADTARGETWEB} = 'Extensions';

# Full URL of pub directory
$build->{UPLOADTARGETPUB} = 'http://foswiki.org/pub';
BEGIN { unshift @INC, split( /:/, $ENV{FOSWIKI_LIBS} ); }

# Full URL of bin directory
$build->{UPLOADTARGETSCRIPT} = 'http://foswiki.org/bin';
use Foswiki::Contrib::Build;

# Script extension
$build->{UPLOADTARGETSUFFIX} = '';
# Create the build object
my $build = new Foswiki::Contrib::Build('UpdatesPlugin');

# Build the target on the command line, or the default target
$build->build( $build->{target} );
Expand Down
4 changes: 3 additions & 1 deletion UpdatesPlugin/templates/updatesplugin.tmpl
Expand Up @@ -3,12 +3,14 @@
%JQICON{"error"}%
%TMPL:P{"messagetmpl::text"}%
<a href="%SCRIPTURLPATH{configure}%">%JQICON{"tick"}% %MAKETEXT{"Upgrade"}%</a>
<a href="#" id="foswikiUpdatesIgnore">%JQICON{"cross"}% %MAKETEXT{"Ignore for 7 days"}%</a>
<a href="#" id="foswikiUpdatesIgnore">%JQICON{"cross"}% %MAKETEXT{"Ignore for 7 days"}%</a><br/>
%TMPL:P{"messagetmpl::list"}%
%CLEAR%
</div>
</script>%TMPL:END%

%TMPL:DEF{"messagetmpl::text"}%%MAKETEXT{"Warning: Updates found for [_1] extension(s)." args="{{:nrPlugins}}"}%%TMPL:END%
%TMPL:DEF{"messagetmpl::list"}%({{:pluginList}})%TMPL:END%

%TMPL:DEF{"css"}%<style type="text/css">
.foswikiBroadcastMessage.foswikiUpdatesMessage {
Expand Down

0 comments on commit 066e9fc

Please sign in to comment.