Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item13532: default to dbcache connector
  • Loading branch information
MichaelDaum committed Jul 17, 2015
1 parent 7114c3f commit 393cfd6
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 23 deletions.
9 changes: 5 additions & 4 deletions data/System/JQGridPlugin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="save topic" date="1290553816" format="1.1" version="3"}%
%META:TOPICINFO{author="micha" comment="save topic" date="1436976367" format="1.1" version="2"}%
---+ %TOPIC%

%STARTSECTION{"summary"}%
Expand Down Expand Up @@ -111,10 +111,10 @@ If guests are to make use of %TOPIC% without being logged in, remove the =rest=
height="auto"
FirstName_hidden="on"
LastName_hidden="on"
Telephone_format="%JQICON{"telephone"}% ${value}"
Telephone_format="%JQICON{"telephone"}% {{:value}}"
Topic_title="Name"
Topic_formatoptions="web:'%USERSWEB%'"
Topic_format="<a href='%SCRIPTURLPATH{"view"}%/${web}/${value}'>${FirstName} ${LastName}</a>"
Topic_format="<a href='%SCRIPTURLPATH{"view"}%/{{:web}}/{{:value}}'>{{:FirstName}} {{:LastName}}</a>"
}%

%ENDSECTION{"UsersExample"}%</verbatim>
Expand Down Expand Up @@ -166,11 +166,12 @@ Custom grid connectors must process the following parameters:
-->

| Author(s): | Michael Daum |
| Copyright: | 2009-2014 Michael Daum http://michaeldaumconsulting.com |
| Copyright: | 2009-2015 Michael Daum http://michaeldaumconsulting.com |
| License: | GPL |
| Release: | %$RELEASE% |
| Version: | %$VERSION% |
| Change History: | <!-- versions below in reverse order --> |
| 17 Jul 2015: | (2.41) default to =dbcache= connector now as it is the only one really working; fixed example in docu; fixed grid resizer |
| 02 Dec 2014: | (2.40) moving from jquery.tmpl to jsrender |
| 28 Aug 2014: | (2.31) fully specify REST security |
| 11 Apr 2014: | (2.30) work around different styles of inconsistencies in =renderForDisplay= across foswiki core releases |
Expand Down
6 changes: 3 additions & 3 deletions lib/Foswiki/Plugins/JQGridPlugin.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2009-2014 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2009-2015 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 @@ -16,8 +16,8 @@ package Foswiki::Plugins::JQGridPlugin;
use strict;
use warnings;

our $VERSION = '2.40';
our $RELEASE = '2.40';
our $VERSION = '2.41';
our $RELEASE = '2.41';
our $SHORTDESCRIPTION = 'jQuery grid widget for Foswiki';
our $NO_PREFS_IN_TOPIC = 1;
our $doInit = 0;
Expand Down
2 changes: 1 addition & 1 deletion lib/Foswiki/Plugins/JQGridPlugin/Config.spec
Expand Up @@ -3,7 +3,7 @@
# ---+++ Connectors
# **STRING 50**
# Default connector used when no other <code>connector</code> parameter is specified to the <code>%GRID</code> macro.
$Foswiki::cfg{JQGridPlugin}{DefaultConnector} = 'search';
$Foswiki::cfg{JQGridPlugin}{DefaultConnector} = 'dbcache';

# **STRING 50**
# Implementation handling the default <code>search</code> connector based on Foswiki's standard <code>%SEARCH</code>
Expand Down
2 changes: 1 addition & 1 deletion lib/Foswiki/Plugins/JQGridPlugin/Connector.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2009-2014 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2009-2015 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/Plugins/JQGridPlugin/DBCacheConnector.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2009-2014 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2009-2015 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/Plugins/JQGridPlugin/DEPENDENCIES
@@ -1,3 +1,3 @@
Foswiki::Plugins::JQueryPlugin,>6.00,perl,Required
Foswiki::Plugins::DBCachePlugin,>3.61,perl,Optional
Foswiki::Plugins::DBCachePlugin,>3.61,perl,Required
Foswiki::Plugins::SolrPlugin,>1.00,perl,Optional
2 changes: 1 addition & 1 deletion lib/Foswiki/Plugins/JQGridPlugin/FoswikiConnector.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2009-2014 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2009-2015 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
15 changes: 9 additions & 6 deletions lib/Foswiki/Plugins/JQGridPlugin/GRID.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2009-2014 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2009-2015 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 @@ -473,11 +473,14 @@ HERE
my $autoResizer = '';
if (defined $theWidth && $theWidth eq 'auto') {
$autoResizer = <<"HERE";
jQuery(window).bind("resize", function() {
var parent = myGrid.parents('.ui-jqgrid:first').parent();
var gridWidth = parent.width()-2;
myGrid.setGridWidth(gridWidth);
});
function gridResizer() {
var width = myGrid.parents('.ui-jqgrid:first').parent().width()-2;
if (width > 0) {
myGrid.setGridWidth(width);
}
}
jQuery(window).bind('resize', gridResizer);
gridResizer();
HERE
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Foswiki/Plugins/JQGridPlugin/SearchConnector.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2009-2014 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2009-2015 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/Plugins/JQGridPlugin/SolrConnector.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2011-2014 Michael Daum, http://michaeldaumconsulting.com
# Copyright (C) 2011-2015 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
5 changes: 4 additions & 1 deletion pub/System/JQGridPlugin/css/Makefile
Expand Up @@ -5,7 +5,10 @@ TARGET=jquery.jqgrid.css
CSSSOURCE=\
ui.jqgrid.css \
ui.multiselect.css \
jquery.searchFilter.css
jquery.searchFilter.css


# myfixes.css

jquery.jqgrid.uncompressed.css: $(CSSSOURCE)
@echo creating $@ from $^
Expand Down
2 changes: 1 addition & 1 deletion pub/System/JQGridPlugin/css/jquery.jqgrid.uncompressed.css
Expand Up @@ -176,4 +176,4 @@ tr.ui-search-toolbar select {margin: 1px 0px 0px 0px}
.ui-searchFilter table td {margin: 0em; padding: 1px;}
.ui-searchFilter table td input, .ui-searchFilter table td select {margin: 0.1em;}
.ui-searchFilter .ui-state-default { cursor: pointer; }
.ui-searchFilter .divider hr {margin: 1px; }
.ui-searchFilter .divider hr {margin: 1px; }
2 changes: 1 addition & 1 deletion pub/System/JQGridPlugin/css/jquery.searchFilter.css
Expand Up @@ -3,4 +3,4 @@
.ui-searchFilter table td {margin: 0em; padding: 1px;}
.ui-searchFilter table td input, .ui-searchFilter table td select {margin: 0.1em;}
.ui-searchFilter .ui-state-default { cursor: pointer; }
.ui-searchFilter .divider hr {margin: 1px; }
.ui-searchFilter .divider hr {margin: 1px; }

0 comments on commit 393cfd6

Please sign in to comment.