Merge branch 'master' of https://github.com/Fabrik/fabrik.git

* 'master' of https://github.com/Fabrik/fabrik.git:
  Added more forceful language to the 'original connection' notice on connection #1, making it clear it needs to match the main J! site connection details.
  fixed in windows and in admin - forms calendar buttons not showing
  added: caneditrow list plugin - operator option (so can test == or !-=) and access level
  fixed: potenail error if nested data set attempted to be rendered in list - for now just converting to a json_string for display purposes
  Added group acl setting. Closes FabrikGH-417
  fixed: readonly class not removed from cdd element when populated if please select turned on
  Fixing use of undeclared $joinid in renderCheckBoxList() in join element model.
  removed default group column width property, as JForm@@filter would subsequently replace empty submitted strings with the default
  possible fix for ssl detection with recaptcha element
  possible fix for js error which was stopping some users from seeing dropdown suboptions when editing the element
  submenu showing twice in cron list
  fixed: list menu items with empty prefilters - these were superceeding the list prefilters. Altered fabrikmodalrepeat field so that if no data stored in the menu item, the first row is not shown. Added a [+] icon to th to allow for adding in the first row. Also first row can now be deleted
  Closes FabrikGH-563 - calendar day / week view - events occuring at same times were overlapping - altered width/heights and offsets to fit in better
  Closes FabrikGH-553 - db join error when rendering as multiselect list
  update col - use of jinput over jrequest
  Closes FabrikGH-551 - cant empty trash
  Added bumping up GROUP_CONCAT_MAX_LEN to 10k, as apparently it defaults to 1k in MySQL, which is truncating things like file paths in AJAX uploads.  We now do this in the enable big selects helper, rather than adding YAFO, so folk having truncation issues need to enable that option.

administrator/components/com_fabrik/language/en-GB/en-GB.com_fabrik.ini

@@ -366,7 +366,7 @@ COM_FABRIK_FIELD_EMAIL_ICON_DESC="Show a button on the form allowing the user to
 COM_FABRIK_FIELD_EMAIL_ICON_LABEL="Email icon"
 COM_FABRIK_FIELD_EMPTY_DATA_MESSAGE_DESC="This text is shown when the list contains no data."
 COM_FABRIK_FIELD_EMPTY_DATA_MESSAGE_LABEL="Empty data message"
-COM_FABRIK_FIELD_ENABLE_BIG_SELECTS_DESC="If you have lots of view joins and / or huge numbers of elements, you may see MySQL errors complaining about needing SQL_BIG_SELECTS enabled.  Only enable this option if you get see such an error."
+COM_FABRIK_FIELD_ENABLE_BIG_SELECTS_DESC="If you have lots of view joins and / or huge numbers of elements, you may see MySQL errors complaining about needing SQL_BIG_SELECTS enabled.  Only enable this option if you get see such an error.  This option also raises GROUP_CONCAT_MAX_LEN to 10k, which may be required if you use things like AJAX upload elements with lots of files."
 COM_FABRIK_FIELD_ENABLE_BIG_SELECTS_LABEL="Enable big selects"
 COM_FABRIK_FIELD_ENABLE_SINGLE_ORDERING_DESC="Can be over-ridden on a per view basis. Single-ordering will reset any other column ordering when ordering a column"
 COM_FABRIK_FIELD_ENABLE_SINGLE_ORDERING_LABEL="Enable single-ordering"
@@ -400,6 +400,8 @@ COM_FABRIK_FIELD_FULLWORDS_DESC="When searching using a field filter and with th
 COM_FABRIK_FIELD_FULLWORDS_LABEL="Full word match"
 COM_FABRIK_FIELD_GO_BACK_BUTTON_LABEL="Go back button"
 COM_FABRIK_FIELD_GO_BACK_BUTTON_LABEL_LABEL="Go back button label"
+COM_FABRIK_FIELD_GROUP_ACCESS_DESC="Which view level can see the group in the form. If this access level means the user can not view the group then the 'layout - show group' option is ignored" 
+COM_FABRIK_FIELD_GROUP_ACCESS_LABEL="Access"
 COM_FABRIK_FIELD_GROUP_BY_ACCESS_DESC="Which view level can see the front end group by button"
 COM_FABRIK_FIELD_GROUP_BY_ACCESS_LABEL="Access"
 COM_FABRIK_FIELD_GROUP_BY_DESC="Group the records together based on identical values found in the selected element"
@@ -837,7 +839,7 @@ COM_FABRIK_ONLY_LOGGED_IN_USERS="Only logged in users"
 COM_FABRIK_ON_CHANGE="On change"
 COM_FABRIK_OPTIONS="Options"
 COM_FABRIK_OR="Or"
-COM_FABRIK_ORIGINAL_CONNECTION="This is the original connection"
+COM_FABRIK_ORIGINAL_CONNECTION="This is the original site connection.  Please make sure this matches your main Joomla site database details"
 COM_FABRIK_PACKAGE="Package"
 COM_FABRIK_PACKAGES_N_ITEMS_DELETED="%d packages successfully deleted"
 COM_FABRIK_PACKAGES_N_ITEMS_DELETED_1="%d package successfully deleted"

administrator/components/com_fabrik/models/fields/fabrikmodalrepeat.js

@@ -56,14 +56,14 @@ var FabrikModalRepeat = new Class({
 			this.win.show();
 			this.win.position();
 			this.resizeWin(true);
+			this.win.position();
 			this.mask.show();
 		}.bind(this));
 	},
 
 	resizeWin: function (setup) {
 		var size = this.el.getDimensions(true);
 		var wsize = this.win.getDimensions(true);
-		console.log(size, wsize);
 		var y = setup ? wsize.y : size.y + 30;
 		this.win.setStyles({'width': size.x + 'px', 'height': (y) + 'px'});
 	},
@@ -101,27 +101,34 @@ var FabrikModalRepeat = new Class({
 
 				// Store radio button selections
 				var radiovals = this._getRadioValues(); 
-				tr.clone().inject(tr, 'after');
+
+				if (tr.getChildren('th')) {
+					this.tmpl.clone().inject(tr, 'after');
+				} else {
+					tr.clone().inject(tr, 'after');
+				}
 				this.stripe();
 
 				// Reapply values as renaming radio buttons 
 				this._setRadioValues(radiovals);
 				this.resizeWin();
 			}
+			this.win.position();
 			e.stop();
 		}.bind(this));
 		this.content.addEvent('click:relay(a.remove)', function (e) {
 
 			// If only one row -don't remove
 			var rows = this.content.getElements('tbody tr');
 			if (rows.length <= 1) {
-				return;
+				// return;
 			}
 
 			if (tr = this.findTr(e)) {
 				tr.dispose();
 			}
 			this.resizeWin();
+			this.win.position();
 			e.stop();
 		}.bind(this));
 	},
@@ -177,6 +184,10 @@ var FabrikModalRepeat = new Class({
 				});
 			});
 		}
+		if (rowcount === 0) {
+			this.tmpl = tr;
+			tr.dispose();
+		}
 	},
 
 	findTr: function (e) {

administrator/components/com_fabrik/models/fields/fabrikmodalrepeat.php

@@ -40,6 +40,7 @@ class JFormFieldFabrikModalrepeat extends JFormField
 	protected function getInput()
 	{
 		// Initialize variables.
+		$app = JFactory::getApplication();
 		$document = JFactory::getDocument();
 		$options = array();
 		JHTML::stylesheet('administrator/components/com_fabrik/views/fabrikadmin.css');
@@ -97,6 +98,7 @@ protected function getInput()
 		$css = '#' . $fieldSetId . ' { display: none; }';
 		$document->addStyleDeclaration($css);
 
+		$path = 'templates/' . $app->getTemplate() . '/images/menu/';
 		$str[] = '<div id="' . $modalid . '" style="display:none">';
 		$str[] = '<table class="adminlist ' . $this->element['class'] . '">';
 		$str[] = '<thead><tr class="row0">';
@@ -106,16 +108,16 @@ protected function getInput()
 			$names[] = $field->element->getAttribute('name');
 			$str[] = '<th>' . $field->getLabel($field->name) . '</th>';
 		}
-		$str[] = '<th></th>';
+		$str[] = '<th><a href="#" class="add"><img src="' . $path . '/icon-16-new.png" alt="' . JText::_('ADD') . '" /></a></th>';
 		$str[] = '</tr></thead>';
 
 		$str[] = '<tbody><tr>';
 		foreach ($subForm->getFieldset($this->element->getAttribute('name') . '_modal') as $field)
 		{
 			$str[] = '<td>' . $field->getInput() . '</td>';
 		}
-		$app = JFactory::getApplication();
-		$path = 'templates/' . $app->getTemplate() . '/images/menu/';
+
+
 		$str[] = '<td><div style="width:35px"><a href="#" class="add"><img src="' . $path . '/icon-16-new.png" alt="' . JText::_('ADD') . '" /></a>';
 		$str[] = '<a href="#" class="remove"><img src="' . $path . '/icon-16-delete.png" alt="' . JText::_('REMOVE') . '" /></a>';
 		$str[] = '</td>';

administrator/components/com_fabrik/models/fields/suboptions.js

@@ -89,8 +89,9 @@ var Suboptions = new Class({
 							])
 						])
 					]);
-		if (document.id('sub_subElementBody').getElement('li').innerHTML === '') {
-			li.replaces(document.id('sub_subElementBody').getElement('li'));
+		var oldLi = document.id('sub_subElementBody').getElement('li'); 
+		if (typeOf(oldLi) !== 'null' && oldLi.innerHTML === '') {
+			li.replaces(oldLi);
 		} else {
 			li.inject(document.id('sub_subElementBody'));
 		}

administrator/components/com_fabrik/models/forms/group.xml

@@ -61,13 +61,19 @@
 
 		<fieldset name="details2" >
 
-		<field name="intro"
-			type="editor"
-			filter="FabrikAdminHelper::filterText"
-			rows="6"
-			cols="20"
-			label="COM_FABRIK_FIELD_GROUP_INTRO_LABEL"
-			description="COM_FABRIK_FIELD_GROUP_INTRO_DESC" />
+			<field name="access" 
+				type="accesslevel"
+				default="1"
+				label="COM_FABRIK_FIELD_GROUP_ACCESS_LABEL" 
+				description="COM_FABRIK_FIELD_GROUP_ACCESS_DESC" />
+
+			<field name="intro"
+				type="editor"
+				filter="FabrikAdminHelper::filterText"
+				rows="6"
+				cols="20"
+				label="COM_FABRIK_FIELD_GROUP_INTRO_LABEL"
+				description="COM_FABRIK_FIELD_GROUP_INTRO_DESC" />
 
 		</fieldset>
 
@@ -157,7 +163,7 @@
 				description="COM_FABRIK_COLUMNS_DESC" />
 
 			<field name="group_column_widths" 
-				type="text" default="44%,44%" 
+				type="text" default="" 
 				label="COM_FABRIK_FIELD_COLUMN_WIDTHS_LABEL" 
 				description="COM_FABRIK_FIELD_COLUMN_WIDTHS_DESC" />