From c8f8a00da9bd21c8adda849738a5420663c3fda9 Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@joomlatools>
Date: Wed, 21 Aug 2019 14:52:09 +0000
Subject: [PATCH 01/10] xtd buttons on editor in edit venue front end, closes
 #62

---
 site/models/forms/venue.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/models/forms/venue.xml b/site/models/forms/venue.xml
index f7f5a902e..4e338f975 100644
--- a/site/models/forms/venue.xml
+++ b/site/models/forms/venue.xml
@@ -36,7 +36,7 @@
 		/>
 		<field name="locdescription" type="editor"
 			filter="safehtml"
-			hide="pagebreak,readmore,image"
+			hide="pagebreak"
 			class="inputbox"
 			rows="3" cols="20"
 			width="100%"

From 55daea8cbaaea6e4043c0740d27a2eeed9d8bb61 Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@joomlatools>
Date: Fri, 23 Aug 2019 07:55:47 +0000
Subject: [PATCH 02/10] venue edit view changes, closes #63

---
 site/language/en-GB/en-GB.com_jem.ini         |   6 +
 site/views/editvenue/tmpl/responsive/edit.php | 236 ++++++++++--------
 .../tmpl/responsive/edit_attachments.php      |  83 +++---
 .../tmpl/responsive/edit_extended.php         |  51 ++++
 .../editvenue/tmpl/responsive/edit_other.php  |  75 ++----
 .../tmpl/responsive/edit_publish.php          |  34 +++
 6 files changed, 281 insertions(+), 204 deletions(-)
 create mode 100644 site/views/editvenue/tmpl/responsive/edit_extended.php
 create mode 100644 site/views/editvenue/tmpl/responsive/edit_publish.php

diff --git a/site/language/en-GB/en-GB.com_jem.ini b/site/language/en-GB/en-GB.com_jem.ini
index 6b72a72f8..545e91fb7 100644
--- a/site/language/en-GB/en-GB.com_jem.ini
+++ b/site/language/en-GB/en-GB.com_jem.ini
@@ -610,6 +610,12 @@ COM_JEM_VENUE_COPY_VENUE="Copy venue"
 COM_JEM_VENUE_COPY_COORDINATES="Copy coordinates"
 COM_JEM_EDITEVENT_EXTENDED_TAB="Extended"
 COM_JEM_EDITEVENT_PUBLISH_TAB="Publishing"
+COM_JEM_EDITVENUE_EXTENDED_TAB="Extended"
+COM_JEM_EDITVENUE_PUBLISH_TAB="Publishing"
+COM_JEM_EDITVENUE_IMAGE_LEGEND="Image"
+COM_JEM_EDITVENUE_URL_LEGEND="URL"
+COM_JEM_EDITVENUE_PUBLISHING_LEGEND="Publishing"
+COM_JEM_EDITVENUE_DESCRIPTION_LEGEND="Description"
 
 
 ; ERRORS
diff --git a/site/views/editvenue/tmpl/responsive/edit.php b/site/views/editvenue/tmpl/responsive/edit.php
index 0709655ee..ede5de1a0 100644
--- a/site/views/editvenue/tmpl/responsive/edit.php
+++ b/site/views/editvenue/tmpl/responsive/edit.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @version 2.3.0
  * @package JEM
@@ -18,16 +19,16 @@
 //$settings = json_decode($this->item->attribs);
 
 $options = array(
-    'onActive' => 'function(title, description){
+	'onActive' => 'function(title, description){
         description.setStyle("display", "block");
         title.addClass("open").removeClass("closed");
     }',
-    'onBackground' => 'function(title, description){
+	'onBackground' => 'function(title, description){
         description.setStyle("display", "none");
         title.addClass("closed").removeClass("open");
     }',
-    'startOffset' => 0,  // 0 starts on the first tab, 1 starts the second, etc...
-    'useCookie' => true, // this must not be a string. Don't use quotes.
+	'startOffset' => 0,  // 0 starts on the first tab, 1 starts the second, etc...
+	'useCookie' => true, // this must not be a string. Don't use quotes.
 );
 
 # defining values for centering default-map
@@ -35,20 +36,19 @@
 ?>
 
 <script type="text/javascript">
-	Joomla.submitbutton = function(task)
-	{
+	Joomla.submitbutton = function(task) {
 		if (task == 'venue.cancel' || document.formvalidator.isValid(document.id('venue-form'))) {
 			Joomla.submitform(task, document.getElementById('venue-form'));
 		}
 	}
 </script>
 <script type="text/javascript">
-	window.addEvent('domready', function(){
+	window.addEvent('domready', function() {
 		setAttribute();
 		test();
 	});
 
-	function setAttribute(){
+	function setAttribute() {
 		document.getElementById("tmp_form_postalCode").setAttribute("geo-data", "postal_code");
 		document.getElementById("tmp_form_city").setAttribute("geo-data", "locality");
 		document.getElementById("tmp_form_state").setAttribute("geo-data", "administrative_area_level_1");
@@ -61,40 +61,40 @@ function setAttribute(){
 		document.getElementById("tmp_form_venue").setAttribute("geo-data", "name");
 	}
 
-	function meta(){
+	function meta() {
 		var f = document.getElementById('venue-form');
-		if(f.jform_meta_keywords.value != "") f.jform_meta_keywords.value += ", ";
-		f.jform_meta_keywords.value += f.jform_venue.value+', ' + f.jform_city.value;
+		if (f.jform_meta_keywords.value != "") f.jform_meta_keywords.value += ", ";
+		f.jform_meta_keywords.value += f.jform_venue.value + ', ' + f.jform_city.value;
 	}
 
-	function test(){
+	function test() {
 		var form = document.getElementById('venue-form');
 		var map = $('jform_map');
 		var streetcheck = $(form.jform_street).hasClass('required');
 
-		if(map && map.checked == true) {
+		if (map && map.checked == true) {
 			var lat = $('jform_latitude');
 			var lon = $('jform_longitude');
 
-			if(lat.value == ('' || 0.000000) || lon.value == ('' || 0.000000)) {
-				if(!streetcheck) {
+			if (lat.value == ('' || 0.000000) || lon.value == ('' || 0.000000)) {
+				if (!streetcheck) {
 					addrequired();
 				}
 			} else {
-				if(lat.value != ('' || 0.000000) && lon.value != ('' || 0.000000) ) {
+				if (lat.value != ('' || 0.000000) && lon.value != ('' || 0.000000)) {
 					removerequired();
 				}
 			}
 			$('mapdiv').show();
 		}
 
-		if(map && map.checked == false) {
+		if (map && map.checked == false) {
 			removerequired();
 			$('mapdiv').hide();
 		}
 	}
 
-	function addrequired(){
+	function addrequired() {
 		var form = document.getElementById('venue-form');
 
 		$(form.jform_street).addClass('required');
@@ -103,7 +103,7 @@ function addrequired(){
 		$(form.jform_country).addClass('required');
 	}
 
-	function removerequired(){
+	function removerequired() {
 		var form = document.getElementById('venue-form');
 
 		$(form.jform_street).removeClass('required');
@@ -112,7 +112,7 @@ function removerequired(){
 		$(form.jform_country).removeClass('required');
 	}
 
-	jQuery(function(){
+	jQuery(function() {
 		jQuery("#geocomplete").geocomplete({
 			map: ".map_canvas",
 			<?php echo $location; ?>
@@ -120,26 +120,26 @@ function removerequired(){
 			detailsAttribute: "geo-data",
 			types: ['establishment', 'geocode'],
 			mapOptions: {
-			      zoom: 16,
-			      mapTypeId: "hybrid"
-			    },
+				zoom: 16,
+				mapTypeId: "hybrid"
+			},
 			markerOptions: {
 				draggable: true
 			}
 		});
 
-		jQuery("#geocomplete").bind('geocode:result', function(){
-				var street = jQuery("#tmp_form_street").val();
-				var route  = jQuery("#tmp_form_route").val();
+		jQuery("#geocomplete").bind('geocode:result', function() {
+			var street = jQuery("#tmp_form_street").val();
+			var route = jQuery("#tmp_form_route").val();
 
-				if (route) {
-					/* something to add */
-				} else {
-					jQuery("#tmp_form_street").val('');
-				}
+			if (route) {
+				/* something to add */
+			} else {
+				jQuery("#tmp_form_street").val('');
+			}
 		});
 
-		jQuery("#geocomplete").bind("geocode:dragged", function(event, latLng){
+		jQuery("#geocomplete").bind("geocode:dragged", function(event, latLng) {
 			jQuery("#tmp_form_latitude").val(latLng.lat());
 			jQuery("#tmp_form_longitude").val(latLng.lng());
 		});
@@ -185,15 +185,15 @@ function removerequired(){
 		});
 
 		jQuery('#jform_map').on('keyup keypress blur change', function() {
-		    test();
+			test();
 		});
 
 		jQuery('#jform_latitude').on('keyup keypress blur change', function() {
-		    test();
+			test();
 		});
 
 		jQuery('#jform_longitude').on('keyup keypress blur change', function() {
-		    test();
+			test();
 		});
 	});
 </script>
@@ -206,8 +206,8 @@ function removerequired(){
 		</h1>
 		<?php endif; ?>
 
-		<form action="<?php echo JRoute::_('index.php?option=com_jem&a_id=' . (int)$this->item->id); ?>" class="form-validate" method="post" name="adminForm" id="venue-form" enctype="multipart/form-data">
-			<div class="buttons btn-group">
+		<form action="<?php echo JRoute::_('index.php?option=com_jem&a_id=' . (int) $this->item->id); ?>" class="form-validate" method="post" name="adminForm" id="venue-form" enctype="multipart/form-data">
+			<div class="buttons">
 				<button type="button" class="positive btn btn-success" onclick="Joomla.submitbutton('venue.save')"><?php echo JText::_('JSAVE') ?></button>
 				<button type="button" class="negative btn" onclick="Joomla.submitbutton('venue.cancel')"><?php echo JText::_('JCANCEL') ?></button>
 			</div>
@@ -226,98 +226,112 @@ function removerequired(){
 			<fieldset>
 				<legend><?php echo JText::_('COM_JEM_EDITVENUE_DETAILS_LEGEND'); ?></legend>
 				<dl class="adminformlist jem-dl">
-					<dt><?php echo $this->form->getLabel('venue'); ?></dt><dd><?php echo $this->form->getInput('venue'); ?></dd>
+					<dt><?php echo $this->form->getLabel('venue'); ?></dt>
+					<dd><?php echo $this->form->getInput('venue'); ?></dd>
 					<?php if (is_null($this->item->id)) : ?>
-					<dt><?php echo $this->form->getLabel('alias'); ?></dt><dd><?php echo $this->form->getInput('alias'); ?></dd>
+					<dt><?php echo $this->form->getLabel('alias'); ?></dt>
+					<dd><?php echo $this->form->getInput('alias'); ?></dd>
 					<?php endif; ?>
-					<dt><?php echo $this->form->getLabel('street'); ?></dt><dd><?php echo $this->form->getInput('street'); ?></dd>
-					<dt><?php echo $this->form->getLabel('postalCode'); ?></dt><dd><?php echo $this->form->getInput('postalCode'); ?></dd>
-					<dt><?php echo $this->form->getLabel('city'); ?></dt><dd><?php echo $this->form->getInput('city'); ?></dd>
-					<dt><?php echo $this->form->getLabel('state'); ?></dt><dd><?php echo $this->form->getInput('state'); ?></dd>
-					<dt><?php echo $this->form->getLabel('country'); ?></dt><dd><?php echo $this->form->getInput('country'); ?></dd>
-					<dt><?php echo $this->form->getLabel('latitude'); ?></dt><dd><?php echo $this->form->getInput('latitude'); ?></dd>
-					<dt><?php echo $this->form->getLabel('longitude'); ?></dt><dd><?php echo $this->form->getInput('longitude'); ?></dd>
-					<dt><?php echo $this->form->getLabel('url'); ?></dt><dd><?php echo $this->form->getInput('url'); ?></dd>
-					<dt><?php echo $this->form->getLabel('published'); ?></dt><dd><?php echo $this->form->getInput('published'); ?></dd>
+					<dt><?php echo $this->form->getLabel('street'); ?></dt>
+					<dd><?php echo $this->form->getInput('street'); ?></dd>
+					<dt><?php echo $this->form->getLabel('postalCode'); ?></dt>
+					<dd><?php echo $this->form->getInput('postalCode'); ?></dd>
+					<dt><?php echo $this->form->getLabel('city'); ?></dt>
+					<dd><?php echo $this->form->getInput('city'); ?></dd>
+					<dt><?php echo $this->form->getLabel('state'); ?></dt>
+					<dd><?php echo $this->form->getInput('state'); ?></dd>
+					<dt><?php echo $this->form->getLabel('country'); ?></dt>
+					<dd><?php echo $this->form->getInput('country'); ?></dd>
+					<dt><?php echo $this->form->getLabel('latitude'); ?></dt>
+					<dd><?php echo $this->form->getInput('latitude'); ?></dd>
+					<dt><?php echo $this->form->getLabel('longitude'); ?></dt>
+					<dd><?php echo $this->form->getInput('longitude'); ?></dd>
 				</dl>
-        <div style="clear: both;"><br /></div>
-        <div>
-          <?php echo $this->form->getLabel('locdescription'); ?>        
-          <?php echo $this->form->getInput('locdescription'); ?>
-        </div>
+
 			</fieldset>
-      <p>&nbsp;</p>
+			<p>&nbsp;</p>
 
 			<!-- VENUE-GEODATA-->
+			<?php
+			$global_show_mapserv = $this->settings->get('global_show_mapserv');
+			if ($global_show_mapserv == 2 || $global_show_mapserv == 3) : ?>
 			<fieldset class="adminform" id="geodata">
+				<legend><?php echo JText::_('COM_JEM_GEODATA_LEGEND'); ?></legend>
 				<dl class="adminformlist jem-dl">
-					<dt><?php echo $this->form->getLabel('map'); ?></dt><dd><?php echo $this->form->getInput('map'); ?></dd>
+					<dt><?php echo $this->form->getLabel('map'); ?></dt>
+					<dd><?php echo $this->form->getInput('map'); ?></dd>
 				</dl>
-        <div style="clear: both;"></div>
-        
+				<div style="clear: both;"></div>
+
 				<div id="mapdiv">
-        <div class="jem-row jem-justify-start">
-					<div><input id="geocomplete" type="text" size="55" placeholder="<?php echo JText::_( 'COM_JEM_VENUE_ADDRPLACEHOLDER' ); ?>" value="" /></div>
-					<div><input id="find-left" class="btn" type="button" value="<?php echo JText::_('COM_JEM_VENUE_ADDR_FINDVENUEDATA'); ?>" /></div>
-        </div>
-          
-        <div class="map_canvas"></div>
-
-        <dl class="adminformlist jem-dl">
-          <dt><label><?php echo JText::_('COM_JEM_STREET'); ?></label></dt>
-          <dd>
-            <input type="text" disabled="disabled" class="readonly" id="tmp_form_street" readonly="readonly" />
-            <input type="hidden" class="readonly" id="tmp_form_streetnumber" readonly="readonly" />
-            <input type="hidden" class="readonly" id="tmp_form_route" readonly="readonly" />
-          </dd>
-          <dt><label><?php echo JText::_('COM_JEM_ZIP'); ?></label></dt>
-          <dd><input type="text" disabled="disabled" class="readonly" id="tmp_form_postalCode" readonly="readonly" /></dd>
-          <dt><label><?php echo JText::_('COM_JEM_CITY'); ?></label></dt>
-          <dd><input type="text" disabled="disabled" class="readonly" id="tmp_form_city" readonly="readonly" /></dd>
-          <dt><label><?php echo JText::_('COM_JEM_STATE'); ?></label></dt>
-          <dd><input type="text" disabled="disabled" class="readonly" id="tmp_form_state" readonly="readonly" /></dd>
-          <dt><label><?php echo JText::_('COM_JEM_VENUE'); ?></label></dt>
-          <dd><input type="text" disabled="disabled" class="readonly" id="tmp_form_venue" readonly="readonly" /></dd>
-          <dt><label><?php echo JText::_('COM_JEM_COUNTRY'); ?></label></dt>
-          <dd><input type="text" disabled="disabled" class="readonly" id="tmp_form_country" readonly="readonly" /></dd>
-          <dt><label><?php echo JText::_('COM_JEM_LATITUDE'); ?></label></dt>
-          <dd><input type="text" disabled="disabled" class="readonly" id="tmp_form_latitude" readonly="readonly" /></dd>
-          <dt><label><?php echo JText::_('COM_JEM_LONGITUDE'); ?></label></dt>
-          <dd><input type="text" disabled="disabled" class="readonly" id="tmp_form_longitude" readonly="readonly" /></dd>
-        </dl>
-
-        <div style="clear: both;"><br /></div>
-        <div class="jem-row jem-justify-start">
-          <input id="cp-all"     class="btn" type="button" value="<?php echo JText::_('COM_JEM_VENUE_COPY_DATA'); ?>" />
-          <input id="cp-address" class="btn" type="button" value="<?php echo JText::_('COM_JEM_VENUE_COPY_ADDRESS'); ?>" />
-          <input id="cp-venue"   class="btn" type="button" value="<?php echo JText::_('COM_JEM_VENUE_COPY_VENUE'); ?>" />
-          <input id="cp-latlong" class="btn" type="button" value="<?php echo JText::_('COM_JEM_VENUE_COPY_COORDINATES'); ?>" />
-        </div>
+					<div class="jem-row jem-justify-start">
+						<div><input id="geocomplete" type="text" size="55" placeholder="<?php echo JText::_('COM_JEM_VENUE_ADDRPLACEHOLDER'); ?>" value="" /></div>
+						<div><input id="find-left" class="btn" type="button" value="<?php echo JText::_('COM_JEM_VENUE_ADDR_FINDVENUEDATA'); ?>" /></div>
+					</div>
+
+					<div class="map_canvas"></div>
+
+					<dl class="adminformlist jem-dl">
+						<dt><label><?php echo JText::_('COM_JEM_STREET'); ?></label></dt>
+						<dd>
+							<input type="text" disabled="disabled" class="readonly" id="tmp_form_street" readonly="readonly" />
+							<input type="hidden" class="readonly" id="tmp_form_streetnumber" readonly="readonly" />
+							<input type="hidden" class="readonly" id="tmp_form_route" readonly="readonly" />
+						</dd>
+						<dt><label><?php echo JText::_('COM_JEM_ZIP'); ?></label></dt>
+						<dd><input type="text" disabled="disabled" class="readonly" id="tmp_form_postalCode" readonly="readonly" /></dd>
+						<dt><label><?php echo JText::_('COM_JEM_CITY'); ?></label></dt>
+						<dd><input type="text" disabled="disabled" class="readonly" id="tmp_form_city" readonly="readonly" /></dd>
+						<dt><label><?php echo JText::_('COM_JEM_STATE'); ?></label></dt>
+						<dd><input type="text" disabled="disabled" class="readonly" id="tmp_form_state" readonly="readonly" /></dd>
+						<dt><label><?php echo JText::_('COM_JEM_VENUE'); ?></label></dt>
+						<dd><input type="text" disabled="disabled" class="readonly" id="tmp_form_venue" readonly="readonly" /></dd>
+						<dt><label><?php echo JText::_('COM_JEM_COUNTRY'); ?></label></dt>
+						<dd><input type="text" disabled="disabled" class="readonly" id="tmp_form_country" readonly="readonly" /></dd>
+						<dt><label><?php echo JText::_('COM_JEM_LATITUDE'); ?></label></dt>
+						<dd><input type="text" disabled="disabled" class="readonly" id="tmp_form_latitude" readonly="readonly" /></dd>
+						<dt><label><?php echo JText::_('COM_JEM_LONGITUDE'); ?></label></dt>
+						<dd><input type="text" disabled="disabled" class="readonly" id="tmp_form_longitude" readonly="readonly" /></dd>
+					</dl>
+
+					<div style="clear: both;"><br /></div>
+					<div class="jem-row jem-justify-start">
+						<input id="cp-all" class="btn" type="button" value="<?php echo JText::_('COM_JEM_VENUE_COPY_DATA'); ?>" />
+						<input id="cp-address" class="btn" type="button" value="<?php echo JText::_('COM_JEM_VENUE_COPY_ADDRESS'); ?>" />
+						<input id="cp-venue" class="btn" type="button" value="<?php echo JText::_('COM_JEM_VENUE_COPY_VENUE'); ?>" />
+						<input id="cp-latlong" class="btn" type="button" value="<?php echo JText::_('COM_JEM_VENUE_COPY_COORDINATES'); ?>" />
+					</div>
 				</div>
 			</fieldset>
-      <p>&nbsp;</p>
-
-			<!-- META -->
-			<fieldset class="">
-				<legend><?php echo JText::_('COM_JEM_META_HANDLING'); ?></legend>
-				<input type="button" class="button btn" value="<?php echo JText::_('COM_JEM_ADD_VENUE_CITY'); ?>" onclick="meta()" />
-        <p>&nbsp;</p>
-				<?php foreach ($this->form->getFieldset('meta') as $field) : ?>
-					<dl class="jem-dl">
-						<dt class="control-label"><?php echo $field->label; ?></dt>
-						<dd class="controls"><?php echo $field->input; ?></dd>
-					</dl>
-				<?php endforeach; ?>
+			<p>&nbsp;</p>
+			<?php endif; ?>
+			<fieldset>
+				<legend><?php echo JText::_('COM_JEM_EDITVENUE_DESCRIPTION_LEGEND'); ?></legend>
+				<div style="clear: both;"><br /></div>
+				<div>
+					<?php echo $this->form->getLabel('locdescription'); ?>
+					<?php echo $this->form->getInput('locdescription'); ?>
+				</div>
 			</fieldset>
+			<p>&nbsp;</p>
+
+			<!-- EXTENDED TAB -->
+			<?php echo JHtml::_('tabs.panel', JText::_('COM_JEM_EDITVENUE_EXTENDED_TAB'), 'editvenue-extendedtab'); ?>
+			<?php echo $this->loadTemplate('extended'); ?>
+
+
+			<!-- PUBLISHING TAB -->
+			<?php echo JHtml::_('tabs.panel', JText::_('COM_JEM_EDITVENUE_PUBLISH_TAB'), 'venue-publishtab'); ?>
+			<?php echo $this->loadTemplate('publish'); ?>
 
 			<!-- ATTACHMENTS TAB -->
 			<?php if (!empty($this->item->attachments) || ($this->jemsettings->attachmentenabled != 0)) : ?>
-			<?php echo JHtml::_('tabs.panel', JText::_('COM_JEM_EDITVENUE_ATTACHMENTS_TAB'), 'venue-attachments'); ?>
+			<?php echo JHtml::_('tabs.panel', JText::_('COM_JEM_EDITVENUE_ATTACHMENTS_TAB'), 'venue-attachmentstab'); ?>
 			<?php echo $this->loadTemplate('attachments'); ?>
 			<?php endif; ?>
 
-			<!-- OTHER TAB -->
-			<?php echo JHtml::_('tabs.panel', JText::_('COM_JEM_EDITVENUE_OTHER_TAB'), 'venue-other' ); ?>
+			<!-- MORE TAB -->
+			<?php echo JHtml::_('tabs.panel', JText::_('COM_JEM_EDITVENUE_OTHER_TAB'), 'venue-othertab'); ?>
 			<?php echo $this->loadTemplate('other'); ?>
 
 			<?php echo JHtml::_('tabs.end'); ?>
@@ -334,4 +348,4 @@ function removerequired(){
 	<div class="copyright">
 		<?php echo JemOutput::footer(); ?>
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/site/views/editvenue/tmpl/responsive/edit_attachments.php b/site/views/editvenue/tmpl/responsive/edit_attachments.php
index 260617a9c..cc28eeeda 100644
--- a/site/views/editvenue/tmpl/responsive/edit_attachments.php
+++ b/site/views/editvenue/tmpl/responsive/edit_attachments.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @version 2.3.0
  * @package JEM
@@ -6,7 +7,7 @@
  * @copyright (C) 2005-2009 Christoph Lukes
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
-defined ('_JEXEC') or die;
+defined('_JEXEC') or die;
 ?>
 
 <fieldset>
@@ -14,76 +15,76 @@
 
 	<table class="adminform">
 		<tbody>
-			<?php foreach ($this->item->attachments as $file): ?>
+			<?php foreach ($this->item->attachments as $file) : ?>
 			<tr>
 				<td style="width: 100%;">
-          <dl class="jem-dl">
-            <dt><?php echo JText::_('COM_JEM_ATTACHMENT_FILE');?></dd>
-            <dd><input class="readonly" type="text" readonly="readonly" value="<?php echo $file->file; ?>" /></dd>
-            <dd><input type="hidden" name="attached-id[]" value="<?php echo $file->id; ?>" /></dd>
-            
-            <dt><?php echo JText::_('COM_JEM_ATTACHMENT_NAME'); ?></dt>
-            <?php /* name is always editable, also if attachemnt upload is not allowed */ ?>
-            <dd><input type="text" name="attached-name[]" value="<?php echo $file->name; ?>" /></dd>
-            
-            <dt><?php echo JText::_('COM_JEM_ATTACHMENT_DESCRIPTION'); ?></dt>
-            <?php /* description is always editable, also if attachemnt upload is not allowed */ ?>
-            <dd><input type="text" name="attached-desc[]" value="<?php echo $file->description; ?>" /></dd>
-            
-            <?php if ($this->jemsettings->attachmentenabled != 0) : ?>  
-              <?php //This button just deletes the dl because two times more getParent() in attachment.js is required?>
-              <dt><?php echo JText::_('COM_JEM_ATTACHMENT_REMOVE'); ?></dt>
-              <dd><?php echo JemOutput::removebutton(JText::_('COM_JEM_GLOBAL_REMOVE_ATTACHEMENT'), array('id' => 'attach-remove'.$file->id.':'.JSession::getFormToken(),'class' => 'attach-remove','title'=>JText::_('COM_JEM_GLOBAL_REMOVE_ATTACHEMENT'))); ?></dd>
-            <?php endif; ?>
-          <dl>
+					<dl class="jem-dl">
+						<dt><?php echo JText::_('COM_JEM_ATTACHMENT_FILE'); ?></dd>
+						<dd><input class="readonly" type="text" readonly="readonly" value="<?php echo $file->file; ?>" /></dd>
+						<dd><input type="hidden" name="attached-id[]" value="<?php echo $file->id; ?>" /></dd>
+
+						<dt><?php echo JText::_('COM_JEM_ATTACHMENT_NAME'); ?></dt>
+						<?php /* name is always editable, also if attachemnt upload is not allowed */ ?>
+						<dd><input type="text" name="attached-name[]" value="<?php echo $file->name; ?>" /></dd>
+
+						<dt><?php echo JText::_('COM_JEM_ATTACHMENT_DESCRIPTION'); ?></dt>
+						<?php /* description is always editable, also if attachemnt upload is not allowed */ ?>
+						<dd><input type="text" name="attached-desc[]" value="<?php echo $file->description; ?>" /></dd>
+
+						<?php if ($this->jemsettings->attachmentenabled != 0) : ?>
+						<?php //This button just deletes the dl because two times more getParent() in attachment.js is required
+								?>
+						<dt><?php echo JText::_('COM_JEM_ATTACHMENT_REMOVE') . ' ' . $file->name; ?></dt>
+						<dd><?php echo JemOutput::removebutton(JText::_('COM_JEM_GLOBAL_REMOVE_ATTACHEMENT'), array('id' => 'attach-remove' . $file->id . ':' . JSession::getFormToken(), 'class' => 'attach-remove btn', 'title' => JText::_('COM_JEM_GLOBAL_REMOVE_ATTACHEMENT'))); ?></dd>
+						<?php endif; ?>
+						<dl>
 				</td>
 				<td>
 					<div>
 						<div><?php echo JText::_('COM_JEM_ATTACHMENT_ACCESS'); ?></div>
 						<?php
-							$attribs = array('class'=>'inputbox', 'size'=>'7');
+							$attribs = array('class' => 'inputbox', 'size' => '7');
 							/* if attachment upload is not allowed changing access level should also not possible */
 							if ($this->jemsettings->attachmentenabled == 0) :
 								$attribs['disabled'] = 'disabled';
 							endif;
 
 							echo JHtml::_('select.genericlist', $this->access, 'attached-access[]', $attribs, 'value', 'text', $file->access);
-						?>
+							?>
 					</div>
 				</td>
 			</tr>
 			<?php endforeach; ?>
 		</tbody>
 	</table>
-  <p>&nbsp;</p>
+	<p>&nbsp;</p>
 
-  <legend><?php echo JText::_('COM_JEM_ADD_USER_REGISTRATIONS').' '.JText::_('COM_JEM_ATTACHMENTS_LEGEND'); ?></legend>
-  <table class="adminform" id="el-attachments">
-    <tbody>   
+	<legend><?php echo JText::_('COM_JEM_ADD_USER_REGISTRATIONS') . ' ' . JText::_('COM_JEM_ATTACHMENTS_LEGEND'); ?></legend>
+	<table class="adminform" id="el-attachments">
+		<tbody>
 			<?php if ($this->jemsettings->attachmentenabled != 0) : ?>
 			<tr>
 				<td style="width: 100%;">
-          <dl class="jem-dl">
-            <dt><?php echo JText::_('COM_JEM_ATTACHMENT_FILE'); ?></dt>
-            <dd><input type="file" name="attach[]" class="attach-field" /></dd>
-              <?php /* see attachments.js for button's onclick function */ ?>
-            <dt> </dt>
-            <dd><button type="button" class="clear-attach-field button3 formelm-buttons btn"><?php echo JText::_('JSEARCH_FILTER_CLEAR') ?></button></dd>
-            <dt><?php echo JText::_('COM_JEM_ATTACHMENT_NAME'); ?></dt>
-            <dd><input type="text" name="attach-name[]" class="attach-name" value="" /></dd>
-            <dt><?php echo JText::_('COM_JEM_ATTACHMENT_DESCRIPTION'); ?></dt>
-            <dd><input type="text" name="attach-desc[]" class="attach-desc" value="" /></dd>
-          </dl>
+					<dl class="jem-dl">
+						<dt><?php echo JText::_('COM_JEM_ATTACHMENT_FILE'); ?></dt>
+						<dd><input type="file" name="attach[]" class="attach-field" /></dd>
+						<?php /* see attachments.js for button's onclick function */ ?>
+						<dt> </dt>
+						<dd><button type="button" class="clear-attach-field button3 formelm-buttons btn"><?php echo JText::_('JSEARCH_FILTER_CLEAR') ?></button></dd>
+						<dt><?php echo JText::_('COM_JEM_ATTACHMENT_NAME'); ?></dt>
+						<dd><input type="text" name="attach-name[]" class="attach-name" value="" /></dd>
+						<dt><?php echo JText::_('COM_JEM_ATTACHMENT_DESCRIPTION'); ?></dt>
+						<dd><input type="text" name="attach-desc[]" class="attach-desc" value="" /></dd>
+					</dl>
 				</td>
 				<td>
 					<div>
 						<div><?php echo JText::_('COM_JEM_ATTACHMENT_ACCESS'); ?></div>
-						<?php echo JHtml::_('select.genericlist', $this->access, 'attach-access[]', array('class'=>'inputbox', 'size'=>'7'), 'value', 'text', 0); ?>
+						<?php echo JHtml::_('select.genericlist', $this->access, 'attach-access[]', array('class' => 'inputbox', 'size' => '7'), 'value', 'text', 0); ?>
 					</div>
 				</td>
 			</tr>
 			<?php endif; ?>
 		</tbody>
 	</table>
-</fieldset>
-
+</fieldset>
\ No newline at end of file
diff --git a/site/views/editvenue/tmpl/responsive/edit_extended.php b/site/views/editvenue/tmpl/responsive/edit_extended.php
new file mode 100644
index 000000000..572c2c115
--- /dev/null
+++ b/site/views/editvenue/tmpl/responsive/edit_extended.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @version 2.3.0
+ * @package JEM
+ * @copyright (C) 2013-2019 joomlaeventmanager.net
+ * @copyright (C) 2005-2009 Christoph Lukes
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
+ */
+defined('_JEXEC') or die;
+?>
+
+
+<!-- IMAGE -->
+<?php if ($this->item->locimage || $this->jemsettings->imageenabled != 0) : ?>
+<fieldset class="jem_fldst_image">
+	<legend><?php echo JText::_('COM_JEM_EDITVENUE_IMAGE_LEGEND'); ?></legend>
+	<?php if ($this->jemsettings->imageenabled != 0) : ?>
+	<dl class="adminformlist jem-dl">
+		<dt><?php echo $this->form->getLabel('userfile'); ?></dt>
+		<?php if ($this->item->locimage) : ?>
+		<dd>
+			<?php echo JEMOutput::flyer($this->item, $this->limage, 'venue', 'locimage'); ?>
+			<input type="hidden" name="locimage" id="locimage" value="<?php echo $this->item->locimage; ?>" />
+		</dd>
+		<dt> </dt>
+		<?php endif; ?>
+		<dd><?php echo $this->form->getInput('userfile'); ?></dd>
+		<dt> </dt>
+		<dd><button type="button" class="button3 btn" onclick="document.getElementById('jform_userfile').value = ''"><?php echo JText::_('JSEARCH_FILTER_CLEAR') ?></button></dd>
+		<?php if ($this->item->locimage) : ?>
+		<dt><?php echo JText::_('COM_JEM_REMOVE_IMAGE'); ?></dt>
+		<dd><?php
+						echo JHtml::image('media/com_jem/images/publish_r.png', null, array('id' => 'userfile-remove', 'data-id' => $this->item->id, 'data-type' => 'venues', 'title' => JText::_('COM_JEM_REMOVE_IMAGE'), 'class' =>'btn')); ?>
+		</dd>
+		<?php endif; ?>
+		</li>
+	</dl>
+	<input type="hidden" name="removeimage" id="removeimage" value="0" />
+	<?php endif; ?>
+</fieldset>
+<?php endif; ?>
+
+<fieldset>
+	<legend><?php echo JText::_('COM_JEM_EDITVENUE_URL_LEGEND'); ?></legend>
+	<dl class="adminformlist jem-dl">
+		<dt><?php echo $this->form->getLabel('url'); ?></dt>
+		<dd><?php echo $this->form->getInput('url'); ?></dd>
+	</dl>
+</fieldset>
+</fieldset>
\ No newline at end of file
diff --git a/site/views/editvenue/tmpl/responsive/edit_other.php b/site/views/editvenue/tmpl/responsive/edit_other.php
index 4e29b9d29..08e61bcc4 100644
--- a/site/views/editvenue/tmpl/responsive/edit_other.php
+++ b/site/views/editvenue/tmpl/responsive/edit_other.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @version 2.3.0
  * @package JEM
@@ -11,56 +12,26 @@
 $max_custom_fields = $this->settings->get('global_editvenue_maxnumcustomfields', -1); // default to All
 ?>
 
-	<!-- CUSTOM FIELDS -->
-	<?php if ($max_custom_fields != 0) : ?>
-	<fieldset class="panelform">
-		<legend><?php echo JText::_('COM_JEM_EDITVENUE_CUSTOMFIELDS'); ?></legend>
-		<dl class="adminformlist jem-dl-long">
-			<?php
-				$fields = $this->form->getFieldset('custom');
-				if ($max_custom_fields < 0) :
-					$max_custom_fields = count($fields);
+<!-- CUSTOM FIELDS -->
+<?php if ($max_custom_fields != 0) : ?>
+<fieldset class="panelform">
+	<legend><?php echo JText::_('COM_JEM_EDITVENUE_CUSTOMFIELDS'); ?></legend>
+	<dl class="adminformlist jem-dl-long">
+		<?php
+			$fields = $this->form->getFieldset('custom');
+			if ($max_custom_fields < 0) :
+				$max_custom_fields = count($fields);
+			endif;
+			$cnt = 0;
+			foreach ($fields as $field) :
+				if (++$cnt <= $max_custom_fields) :
+		?>
+		<dt><?php echo $field->label; ?></dt>
+		<dd><?php echo $field->input; ?></dd>
+		<?php
 				endif;
-				$cnt = 0;
-				foreach($fields as $field) :
-					if (++$cnt <= $max_custom_fields) :
-					?><dt><?php echo $field->label; ?></dt><dd><?php echo $field->input; ?></dd><?php
-					endif;
-				endforeach;
-			?>
-		</dl>
-	</fieldset>
-  <p>&nbsp;</p>
-	<?php endif; ?>
-
-  <!-- IMAGE -->
-	<?php if ($this->item->locimage || $this->jemsettings->imageenabled != 0) : ?>
-	<fieldset class="jem_fldst_image">
-    <legend><?php echo JText::_('COM_JEM_IMAGE'); ?></legend>
-		<?php if ($this->jemsettings->imageenabled != 0) : ?>
-		<dl class="adminformlist jem-dl">
-			<dt><?php echo $this->form->getLabel('userfile'); ?></dt>
-        <?php if ($this->item->locimage) : ?>
-          <dd>
-            <?php echo JEMOutput::flyer($this->item, $this->limage, 'venue', 'locimage'); ?>
-            <input type="hidden" name="locimage" id="locimage" value="<?php echo $this->item->locimage; ?>" />		
-          </dd>
-          <dt> </dt>
-        <?php endif; ?>
-        <dd><?php echo $this->form->getInput('userfile'); ?></dd>
-        <dt> </dt>
-				<dd><button type="button" class="button3 btn" onclick="document.getElementById('jform_userfile').value = ''"><?php echo JText::_('JSEARCH_FILTER_CLEAR') ?></button></dd>
-				<?php if ($this->item->locimage) : ?>
-          <dt><?php echo JText::_('COM_JEM_REMOVE_IMAGE'); ?></dt>
-          <dd><?php
-            echo JHtml::image('media/com_jem/images/publish_r.png', null, array('id' => 'userfile-remove', 'data-id' => $this->item->id, 'data-type' => 'venues', 'title' => JText::_('COM_JEM_REMOVE_IMAGE'))); ?>
-          </dd>
-        <?php endif; ?>
-			</li>
-		</dl>
-		<input type="hidden" name="removeimage" id="removeimage" value="0" />
-		<?php endif; ?>
-	</fieldset>
-	<?php endif; ?>
-
-
+			endforeach;
+		?>
+	</dl>
+</fieldset>
+<?php endif; ?>
\ No newline at end of file
diff --git a/site/views/editvenue/tmpl/responsive/edit_publish.php b/site/views/editvenue/tmpl/responsive/edit_publish.php
new file mode 100644
index 000000000..5b8f9cc44
--- /dev/null
+++ b/site/views/editvenue/tmpl/responsive/edit_publish.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * @version 2.3.0
+ * @package JEM
+ * @copyright (C) 2013-2019 joomlaeventmanager.net
+ * @copyright (C) 2005-2009 Christoph Lukes
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
+ */
+defined('_JEXEC') or die;
+
+//$max_custom_fields = $this->settings->get('global_editvenue_maxnumcustomfields', -1); // default to All
+?>
+
+<fieldset>
+	<legend><?php echo JText::_('COM_JEM_EDITVENUE_PUBLISHING_LEGEND'); ?></legend>
+	<dl class="adminformlist jem-dl">
+		<dt><?php echo $this->form->getLabel('published'); ?></dt>
+		<dd><?php echo $this->form->getInput('published'); ?></dd>
+	</dl>
+</fieldset>
+
+<!-- META -->
+<fieldset class="">
+	<legend><?php echo JText::_('COM_JEM_METADATA'); ?></legend>
+	<input type="button" class="button btn" value="<?php echo JText::_('COM_JEM_ADD_VENUE_CITY'); ?>" onclick="meta()" />
+	<p>&nbsp;</p>
+	<?php foreach ($this->form->getFieldset('meta') as $field) : ?>
+	<dl class="jem-dl">
+		<dt class="control-label"><?php echo $field->label; ?></dt>
+		<dd class="controls"><?php echo $field->input; ?></dd>
+	</dl>
+	<?php endforeach; ?>
+</fieldset>
\ No newline at end of file

From 31ed514d8af07bb2c109ca72e577ac02193e9a78 Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@joomlatools>
Date: Fri, 23 Aug 2019 07:58:04 +0000
Subject: [PATCH 03/10] version update to 2.3.0-beta3

---
 jem.xml                                             | 2 +-
 modules/mod_jem/mod_jem.xml                         | 2 +-
 modules/mod_jem_banner/mod_jem_banner.xml           | 2 +-
 modules/mod_jem_cal/mod_jem_cal.xml                 | 2 +-
 modules/mod_jem_calajax/mod_jem_calajax.xml         | 2 +-
 modules/mod_jem_jubilee/mod_jem_jubilee.xml         | 2 +-
 modules/mod_jem_teaser/mod_jem_teaser.xml           | 2 +-
 modules/mod_jem_wide/mod_jem_wide.xml               | 2 +-
 package/pkg_jem.xml                                 | 2 +-
 plugins/plg_content_jem/jem.xml                     | 2 +-
 plugins/plg_content_jemlistevents/jemlistevents.xml | 2 +-
 plugins/plg_finder_jem/jem.xml                      | 2 +-
 plugins/plg_jem_comments/comments.xml               | 2 +-
 plugins/plg_jem_mailer/mailer.xml                   | 2 +-
 plugins/plg_quickicon_jem/jemquickicon.xml          | 2 +-
 plugins/plg_search_jem/jem.xml                      | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/jem.xml b/jem.xml
index 31d061b75..31aaf7329 100644
--- a/jem.xml
+++ b/jem.xml
@@ -7,7 +7,7 @@
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>info@joomlaeventmanager.net</authorEmail>
 	<authorUrl>http://www.joomlaeventmanager.net</authorUrl>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>COM_JEM_INSTALLATION_DESCRIPTION</description>
 
 	<!-- Runs on install/uninstall/update; New in 1.6 -->
diff --git a/modules/mod_jem/mod_jem.xml b/modules/mod_jem/mod_jem.xml
index 23637fb7b..e159815cb 100644
--- a/modules/mod_jem/mod_jem.xml
+++ b/modules/mod_jem/mod_jem.xml
@@ -7,7 +7,7 @@
 	<creationDate>August 2019</creationDate>
 	<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>MOD_JEM_XML_DESCRIPTION</description>
 
 	<scriptfile>script.php</scriptfile>
diff --git a/modules/mod_jem_banner/mod_jem_banner.xml b/modules/mod_jem_banner/mod_jem_banner.xml
index 08509bdae..76cc39113 100644
--- a/modules/mod_jem_banner/mod_jem_banner.xml
+++ b/modules/mod_jem_banner/mod_jem_banner.xml
@@ -7,7 +7,7 @@
 	<creationDate>August 2019</creationDate>
 	<copyright>copyright (C) 2014-2019 joomlaeventmanager.net</copyright>
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>MOD_JEM_BANNER_XML_DESCRIPTION</description>
 
 	<scriptfile>script.php</scriptfile>
diff --git a/modules/mod_jem_cal/mod_jem_cal.xml b/modules/mod_jem_cal/mod_jem_cal.xml
index dc1201ee5..c207c81f3 100644
--- a/modules/mod_jem_cal/mod_jem_cal.xml
+++ b/modules/mod_jem_cal/mod_jem_cal.xml
@@ -7,7 +7,7 @@
 	<creationDate>August 2019</creationDate>
 	<copyright>Copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>MOD_JEM_CAL_XML_DESCRIPTION</description>
 
 	<scriptfile>script.php</scriptfile>
diff --git a/modules/mod_jem_calajax/mod_jem_calajax.xml b/modules/mod_jem_calajax/mod_jem_calajax.xml
index 629a6c96e..88620e290 100644
--- a/modules/mod_jem_calajax/mod_jem_calajax.xml
+++ b/modules/mod_jem_calajax/mod_jem_calajax.xml
@@ -7,7 +7,7 @@
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>info@joomlaeventmanager.net</authorEmail>
 	<authorUrl>http://www.qivva.com</authorUrl>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>MOD_JEM_CALAJAX_XML_DESCRIPTION</description>
 
 	<files>
diff --git a/modules/mod_jem_jubilee/mod_jem_jubilee.xml b/modules/mod_jem_jubilee/mod_jem_jubilee.xml
index e9a05d836..c05e7370a 100644
--- a/modules/mod_jem_jubilee/mod_jem_jubilee.xml
+++ b/modules/mod_jem_jubilee/mod_jem_jubilee.xml
@@ -7,7 +7,7 @@
 	<creationDate>August 2019</creationDate>
 	<copyright>copyright (C) 2015-2019 joomlaeventmanager.net</copyright>
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>MOD_JEM_JUBILEE_XML_DESCRIPTION</description>
 
 	<scriptfile>script.php</scriptfile>
diff --git a/modules/mod_jem_teaser/mod_jem_teaser.xml b/modules/mod_jem_teaser/mod_jem_teaser.xml
index 323c6b51b..13c379ed3 100644
--- a/modules/mod_jem_teaser/mod_jem_teaser.xml
+++ b/modules/mod_jem_teaser/mod_jem_teaser.xml
@@ -7,7 +7,7 @@
 	<creationDate>August 2019</creationDate>
 	<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>MOD_JEM_TEASER_XML_DESCRIPTION</description>
 
 	<scriptfile>script.php</scriptfile>
diff --git a/modules/mod_jem_wide/mod_jem_wide.xml b/modules/mod_jem_wide/mod_jem_wide.xml
index f6eeae35c..ed7a290ea 100644
--- a/modules/mod_jem_wide/mod_jem_wide.xml
+++ b/modules/mod_jem_wide/mod_jem_wide.xml
@@ -7,7 +7,7 @@
 	<creationDate>August 2019</creationDate>
 	<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>MOD_JEM_WIDE_XML_DESCRIPTION</description>
 
 	<scriptfile>script.php</scriptfile>
diff --git a/package/pkg_jem.xml b/package/pkg_jem.xml
index c22ccb1f7..f8e36bd25 100644
--- a/package/pkg_jem.xml
+++ b/package/pkg_jem.xml
@@ -9,7 +9,7 @@
 	<authorEmail>info@joomlaeventmanager.net</authorEmail>
 	<authorUrl>http://www.joomlaeventmanager.net</authorUrl>
 
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>PKG_JEM_INSTALLATION_DESCRIPTION</description>
 	<url>http://www.joomlaeventmanager.net/</url>
 	<packager>JEM Community</packager>
diff --git a/plugins/plg_content_jem/jem.xml b/plugins/plg_content_jem/jem.xml
index 69c876fc1..e015aa189 100644
--- a/plugins/plg_content_jem/jem.xml
+++ b/plugins/plg_content_jem/jem.xml
@@ -7,7 +7,7 @@
 	<creationDate>August 2019</creationDate>
 	<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>PLG_CONTENT_JEM_XML_DESCRIPTION</description>
 
 	<files>
diff --git a/plugins/plg_content_jemlistevents/jemlistevents.xml b/plugins/plg_content_jemlistevents/jemlistevents.xml
index a36a322d0..b6f6edcc7 100644
--- a/plugins/plg_content_jemlistevents/jemlistevents.xml
+++ b/plugins/plg_content_jemlistevents/jemlistevents.xml
@@ -7,7 +7,7 @@
 	<authorUrl>www.joomlaeventmanager.net</authorUrl>
 	<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>PLG_CONTENT_JEMLISTEVENTS_XML_DESCRIPTION</description>
 
 	<files>
diff --git a/plugins/plg_finder_jem/jem.xml b/plugins/plg_finder_jem/jem.xml
index 813ce28cd..e6eac6244 100644
--- a/plugins/plg_finder_jem/jem.xml
+++ b/plugins/plg_finder_jem/jem.xml
@@ -7,7 +7,7 @@
 	<authorUrl>http://www.joomlaeventmanager.net</authorUrl>
 	<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>PLG_FINDER_JEM_XML_DESCRIPTION</description>
 
 	<!-- <scriptfile>script.php</scriptfile> -->
diff --git a/plugins/plg_jem_comments/comments.xml b/plugins/plg_jem_comments/comments.xml
index 5d9ea65b5..b0252ddc8 100644
--- a/plugins/plg_jem_comments/comments.xml
+++ b/plugins/plg_jem_comments/comments.xml
@@ -7,7 +7,7 @@
 	<authorUrl>http://www.joomlaeventmanager.net</authorUrl>
 	<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>PLG_JEM_COMMENTS_XML_DESCRIPTION</description>
 
 	<files>
diff --git a/plugins/plg_jem_mailer/mailer.xml b/plugins/plg_jem_mailer/mailer.xml
index 816707f15..f216e0baa 100644
--- a/plugins/plg_jem_mailer/mailer.xml
+++ b/plugins/plg_jem_mailer/mailer.xml
@@ -7,7 +7,7 @@
 	<authorUrl>http://www.joomlaeventmanager.net</authorUrl>
 	<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>PLG_JEM_MAILER_XML_DESCRIPTION</description>
 
 	<files>
diff --git a/plugins/plg_quickicon_jem/jemquickicon.xml b/plugins/plg_quickicon_jem/jemquickicon.xml
index 57c4e0218..12c58ca03 100644
--- a/plugins/plg_quickicon_jem/jemquickicon.xml
+++ b/plugins/plg_quickicon_jem/jemquickicon.xml
@@ -7,7 +7,7 @@
 	<authorUrl>http://www.joomlaeventmanager.net</authorUrl>
 	<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>JEM Quick Icon</description>
 
 	<files>
diff --git a/plugins/plg_search_jem/jem.xml b/plugins/plg_search_jem/jem.xml
index dded27bf8..7bc09c542 100644
--- a/plugins/plg_search_jem/jem.xml
+++ b/plugins/plg_search_jem/jem.xml
@@ -7,7 +7,7 @@
 	<creationDate>August 2019</creationDate>
 	<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
 	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>2.3.0-beta2</version>
+	<version>2.3.0-beta3</version>
 	<description>PLG_SEARCH_JEM_XML_DESCRIPTION</description>
 
 	<files>

From 9566769d7d1441836f018fd181e5f484fbb30a11 Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@joomlatools>
Date: Fri, 23 Aug 2019 08:46:23 +0000
Subject: [PATCH 04/10] attendees print, duplicate date column removed, closes
 #66

---
 site/views/attendees/tmpl/responsive/print.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/site/views/attendees/tmpl/responsive/print.php b/site/views/attendees/tmpl/responsive/print.php
index a2081ebc4..0aa918218 100644
--- a/site/views/attendees/tmpl/responsive/print.php
+++ b/site/views/attendees/tmpl/responsive/print.php
@@ -60,7 +60,6 @@
 		<tr class="<?php echo "row$k"; ?>">
 			<td><?php echo ++$i; ?></td>
 			<td><?php echo $regname ? $row->name : $row->username; ?></td>
-			<td><?php if (!empty($row->uregdate)) { echo JHtml::_('date', $row->uregdate, JText::_('DATE_FORMAT_LC2')); } ?></td>
 			<?php if ($this->enableemailaddress == 1) : ?>
 			<td><?php echo $row->email; ?></td>
 			<?php endif; ?>

From 8208da0fab3f3d9199f469cc77fbe97d8b3161d9 Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@joomlatools>
Date: Fri, 23 Aug 2019 11:16:25 +0000
Subject: [PATCH 05/10] my events & attendence, embeded css changes, closes #67

---
 .../tmpl/responsive/default_attendances.php        | 14 +++++++++-----
 .../myevents/tmpl/responsive/default_events.php    | 12 ++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/site/views/myattendances/tmpl/responsive/default_attendances.php b/site/views/myattendances/tmpl/responsive/default_attendances.php
index 1c313988b..b6795729c 100644
--- a/site/views/myattendances/tmpl/responsive/default_attendances.php
+++ b/site/views/myattendances/tmpl/responsive/default_attendances.php
@@ -23,7 +23,7 @@
   .jem-sort #jem_date,
   #jem .jem-event .jem-event-date {
     <?php if (!empty($this->jemsettings->datewidth)) : ?>
-      flex: 1 <?php echo ($this->jemsettings->datewidth); ?>;
+      flex: 1 <?php echo intval(($this->jemsettings->datewidth))-5 . '%'; /*take a little off to fit comment*/?>;
     <?php else : ?>
       flex: 1;
     <?php endif; ?>
@@ -35,7 +35,7 @@
   .jem-sort #jem_title,
   #jem .jem-event .jem-event-title {
     <?php if (($this->jemsettings->showtitle == 1) && (!empty($this->jemsettings->titlewidth))) : ?>
-      flex: 1 <?php echo ($this->jemsettings->titlewidth); ?>;
+      flex: 1 <?php echo intval(($this->jemsettings->titlewidth))-5 . '%'; /*take a little off to fit comment*/?>;
     <?php else : ?>
       flex: 1;
     <?php endif; ?>
@@ -47,7 +47,7 @@
   .jem-sort #jem_location,
   #jem .jem-event .jem-event-venue {
     <?php if (($this->jemsettings->showlocate == 1) && (!empty($this->jemsettings->locationwidth))) : ?>
-      flex: 1 <?php echo ($this->jemsettings->locationwidth); ?>;
+      flex: 1 <?php echo intval(($this->jemsettings->locationwidth))-3 . '%'; /*take a little off to fit comment*/?>;
     <?php else : ?>
       flex: 1;
     <?php endif; ?>
@@ -105,8 +105,12 @@
   }
 
   .jem-sort #jem_status,
-  #jem.jem_myattendances .jem-myattendances-status {
-    flex: 0 2%;
+  #jem .jem-event .jem-myattendances-status {
+    flex: 0 1%;
+  }
+    .jem-sort #jem_comment,
+  #jem .jem-event .jem-myattendances-comments {
+    flex: 0 5%;
   }
 </style>
 
diff --git a/site/views/myevents/tmpl/responsive/default_events.php b/site/views/myevents/tmpl/responsive/default_events.php
index 86766c403..812082b4b 100644
--- a/site/views/myevents/tmpl/responsive/default_events.php
+++ b/site/views/myevents/tmpl/responsive/default_events.php
@@ -38,7 +38,7 @@ function tableOrdering(order, dir, view)
   .jem-sort #jem_date,
   #jem .jem-event .jem-event-date {
     <?php if (!empty($this->jemsettings->datewidth)) : ?>
-      flex: 1 <?php echo ($this->jemsettings->datewidth); ?>;
+      flex: 1 <?php echo intval(($this->jemsettings->datewidth))-4 . '%'; /*take a little off to fit status*/?>;
     <?php else : ?>
       flex: 1;
     <?php endif; ?>
@@ -50,7 +50,7 @@ function tableOrdering(order, dir, view)
   .jem-sort #jem_title,
   #jem .jem-event .jem-event-title {
     <?php if (($this->jemsettings->showtitle == 1) && (!empty($this->jemsettings->titlewidth))) : ?>
-      flex: 1 <?php echo ($this->jemsettings->titlewidth); ?>;
+      flex: 1 <?php echo (intval($this->jemsettings->titlewidth))-4 . '%'; /*take a little off to fit status*/?>;
     <?php else : ?>
       flex: 1;
     <?php endif; ?>
@@ -119,11 +119,11 @@ function tableOrdering(order, dir, view)
     <?php endif; ?>
   }
   
-  #jem.jem_myevents .jem-myevents-check {
+  #jem .jem-event .jem-myevents-check {
     flex: 0 1%;
   }
 
-  #jem.jem_myevents .jem-myevents-status {
+  #jem .jem-event .jem-myevents-status {
     flex: 0 1%;
   }
 </style>
@@ -171,7 +171,7 @@ function tableOrdering(order, dir, view)
       <?php if ($this->jemsettings->showcat == 1) : ?>
         <div id="jem_category" class="sectiontableheader">&nbsp;<?php echo JHtml::_('grid.sort', 'COM_JEM_TABLE_CATEGORY', 'c.catname', $this->lists['order_Dir'], $this->lists['order']); ?></div>
       <?php endif; ?> 
-      <?php if ($this->params->get('displayattendeecolumn') == 1) : ?>
+      <?php if ($this->jemsettings->showatte == 1) : ?>
 				<div id="jem_atte" class="sectiontableheader">&nbsp;<?php echo JText::_('COM_JEM_TABLE_ATTENDEES'); ?></div>
       <?php endif; ?>
       <div class="jem-myevents-status" ><?php echo JText::_('JSTATUS'); ?></div>
@@ -273,7 +273,7 @@ function tableOrdering(order, dir, view)
               </div>
             <?php endif; ?>
 
-					<?php if ($this->params->get('displayattendeecolumn') == 1) : ?>
+					<?php if ($this->jemsettings->showatte == 1) : ?>
 					<div class="jem-event-info-small jem-event-attendees" title="<?php echo JText::_('COM_JEM_TABLE_ATTENDEES').': '.$this->escape($row->regCount); ?>">
             <i class="fa fa-user" aria-hidden="true"></i>
 						<?php

From a0c93a0a25e928ba807939bba302609a72a42ae2 Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@joomlatools>
Date: Fri, 23 Aug 2019 11:48:53 +0000
Subject: [PATCH 06/10] event view show hourglass for waiting icon, closes #65

---
 site/views/event/tmpl/responsive/default_attendees.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/views/event/tmpl/responsive/default_attendees.php b/site/views/event/tmpl/responsive/default_attendees.php
index 2bbe6f576..7c63960df 100644
--- a/site/views/event/tmpl/responsive/default_attendees.php
+++ b/site/views/event/tmpl/responsive/default_attendees.php
@@ -64,7 +64,7 @@
           function jem_getStatusIcon($status) {
             switch($status) {
               case 2:  // waiting list
-                return ' <i class="fa fa-li fa-exclamation-circle jem-attendance-status-fa-exclamation-circle hasTooltip" title="'.JText::_('COM_JEM_ATTENDEES_ON_WAITINGLIST').'"></i>';
+                return ' <i class="fa fa-li fa-hourglass-half jem-attendance-status-fa-hourglass-half hasTooltip" title="'.JText::_('COM_JEM_ATTENDEES_ON_WAITINGLIST').'"></i>';
                 break;
               case 1:  // attending
                 return ' <i class="fa fa-li fa-check-circle jem-attendance-status-fa-check-circle hasTooltip" title="'.JText::_('COM_JEM_ATTENDEES_ATTENDING').'"></i>';

From 56df501340c6dfaa70dfa37d791f205f841f72ab Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@joomlatools>
Date: Wed, 11 Sep 2019 07:51:38 +0000
Subject: [PATCH 07/10] removed JRequest from 2 files, closes #76

---
 admin/controllers/attendee.php                     | 12 ++----------
 modules/mod_jem_teaser/tmpl/responsive/default.php |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/admin/controllers/attendee.php b/admin/controllers/attendee.php
index 87eed5b11..c30dbd366 100644
--- a/admin/controllers/attendee.php
+++ b/admin/controllers/attendee.php
@@ -50,11 +50,7 @@ public function cancel()
 		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
 
 		$attendee = JTable::getInstance('jem_register', '');
-		if (version_compare(JVERSION, '3.2', 'lt')) {
-			$attendee->bind(JRequest::get('post')); // before Joomla! 3.2.0 there is no good way to get them all from JInput :(
-		} else {
-			$attendee->bind(JFactory::getApplication()->input->post->getArray(/*get them all*/));
-		}
+		$attendee->bind(JFactory::getApplication()->input->post->getArray(/*get them all*/));
 		$attendee->checkin();
 
 		$this->setRedirect('index.php?option=com_jem&view=attendees&eventid='.JFactory::getApplication()->input->getInt('event', 0));
@@ -78,11 +74,7 @@ public function save()
 		$task = $jinput->getCmd('task');
 
 		// Retrieving $post
-		if (version_compare(JVERSION, '3.2', 'lt')) {
-			$post = JRequest::get('post'); // before Joomla! 3.2.0 we must and can use JRequest
-		} else {
-			$post = $jinput->post->getArray(/*get them all*/);
-		}
+		$post = $jinput->post->getArray(/*get them all*/);
 
 		// Retrieving email-setting
 		$sendemail = $jinput->getInt('sendemail','0');
diff --git a/modules/mod_jem_teaser/tmpl/responsive/default.php b/modules/mod_jem_teaser/tmpl/responsive/default.php
index c17a1242e..5fe1d49bb 100644
--- a/modules/mod_jem_teaser/tmpl/responsive/default.php
+++ b/modules/mod_jem_teaser/tmpl/responsive/default.php
@@ -16,7 +16,7 @@
 	$modal = 'notmodal';
 }
 /*
-if (JRequest::getVar('jem-rss','0') == 1) {		
+if (JFactory::getApplication()->input->getInt('jem-rss','0') == 1) {		
   ob_get_clean();
   createRSSfeed($list);
   jexit(); 

From afd23cebef2134647cfbcd15c2b44c147c69f039 Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@joomlatools>
Date: Wed, 11 Sep 2019 08:48:36 +0000
Subject: [PATCH 08/10] allow event editors to edit attendees, closes #73

---
 site/views/event/view.html.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/site/views/event/view.html.php b/site/views/event/view.html.php
index 8bc1a8336..2b67b1c2b 100644
--- a/site/views/event/view.html.php
+++ b/site/views/event/view.html.php
@@ -201,7 +201,9 @@ public function display($tpl = null)
 
 		// Check if user can edit attendees
 		$isAuthor = $userId && ($userId == $item->created_by);
-		$permissions->canEditAttendees = $isAuthor;
+		//$permissions->canEditAttendees = $isAuthor;
+		//new logic: user can edit events, suggested by jojo12
+		$permissions->canEditAttendees = $user->can('edit', 'event', $item->id, $item->created_by);
 
 		$this->permissions = $permissions;
 		$this->showeventstate = $permissions->canEditEvent || $permissions->canPublishEvent;

From e953ddf1938f5cfca34c59f638c94a4c05492486 Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@joomlatools>
Date: Sat, 14 Mar 2020 07:32:24 +0000
Subject: [PATCH 09/10] label text change, closes #90

---
 admin/language/en-GB/en-GB.com_jem.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/language/en-GB/en-GB.com_jem.ini b/admin/language/en-GB/en-GB.com_jem.ini
index 95d7fbed8..c9df5d19d 100644
--- a/admin/language/en-GB/en-GB.com_jem.ini
+++ b/admin/language/en-GB/en-GB.com_jem.ini
@@ -856,9 +856,9 @@ COM_JEM_TIME_NAME="Time Suffix"
 COM_JEM_LAYOUT_STYLE_SETTINGS="Style"
 COM_JEM_SHOW_LAYOUT_STYLE="Layout Style"
 COM_JEM_SHOW_LAYOUT_STYLE_DESC="Choose style the frontend should be shown. Select between old table style or a modern responsive style."
-COM_JEM_SHOW_LAYOUT_STYLE_LEGACY="Default Table Style"
-COM_JEM_SHOW_LAYOUT_STYLE_RESPONSIVE="Modern Responsive Style"
-COM_JEM_SHOW_LAYOUT_STYLE_ALTERNATIVE="Alternative Responsive Style"
+COM_JEM_SHOW_LAYOUT_STYLE_LEGACY="Legacy (Table Style)"
+COM_JEM_SHOW_LAYOUT_STYLE_RESPONSIVE="Default (Responsive Style)"
+COM_JEM_SHOW_LAYOUT_STYLE_ALTERNATIVE="Alternative (Responsive Style)"
 COM_JEM_INCLUDE_ICON_FONT="Use Icon Font"
 COM_JEM_INCLUDE_ICON_FONT_DESC="Use icon font instead of images for print icons etc."
 COM_JEM_EVENT_HANDLING="Event Handling"

From 0bf165910373ce3ddb5aafb3b46b81e3f6340b31 Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@joomlatools>
Date: Sat, 14 Mar 2020 09:48:26 +0000
Subject: [PATCH 10/10] closes #82

---
 admin/controllers/imagehandler.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/controllers/imagehandler.php b/admin/controllers/imagehandler.php
index bdd1e784c..4d1597107 100644
--- a/admin/controllers/imagehandler.php
+++ b/admin/controllers/imagehandler.php
@@ -83,10 +83,10 @@ public function uploadimage()
 
 		//upload the image
 		if (!JFile::upload($file['tmp_name'], $filepath)) {
-			echo "<script> alert('".JText::_('COM_JEM_UPLOAD_FAILED')."'); window.history.go(-1); </script>\n";
+			echo "<script> alert('".JText::_('COM_JEM_UPLOAD_FAILED')."'); </script>\n";
 			$app->close();
 		} else {
-			echo "<script> alert('".JText::_('COM_JEM_UPLOAD_COMPLETE')."'); window.history.go(-1); window.parent.SelectImage('$filename', '$filename'); </script>\n";
+			echo "<script> alert('".JText::_('COM_JEM_UPLOAD_COMPLETE')."'); window.parent.SelectImage('$filename', '$filename'); </script>\n";
 			$app->close();
 		}
 	}