Skip to content

Commit

Permalink
toggle inlinehelp for edit event view (third part) #1587
Browse files Browse the repository at this point in the history
Active Toggle Inline Help in other backend views: category, group, venues, setting.
mckillo committed Jun 16, 2023
1 parent c3cd0ed commit 80b15e7
Showing 22 changed files with 162 additions and 209 deletions.
3 changes: 3 additions & 0 deletions admin/models/forms/category.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<config>
<inlinehelp button="show"/>
</config>
<fieldset name="details"
addfieldpath="/administrator/components/com_jem/models/fields"
>
3 changes: 3 additions & 0 deletions admin/models/forms/group.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<config>
<inlinehelp button="show"/>
</config>
<fieldset name="details"
addfieldpath="/administrator/components/com_jem/models/fields"
>
3 changes: 3 additions & 0 deletions admin/models/forms/settings.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<config>
<inlinehelp button="show"/>
</config>
<fieldset name="globalparam2"
label="COM_JEM_GLOBAL_PARAMETERS"
>
3 changes: 3 additions & 0 deletions admin/models/forms/venue.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<config>
<inlinehelp button="show"/>
</config>
<fieldset name="details"
addfieldpath="/administrator/components/com_jem/models/fields"
>
40 changes: 12 additions & 28 deletions admin/views/category/tmpl/edit.php
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@
$wa = $this->document->getWebAssetManager();
$wa->useStyle('jem.colorpicker')
->useScript('keepalive')
->useScript('inlinehelp')
->useScript('form.validate');
?>

@@ -48,29 +49,14 @@
<fieldset class="adminform">
<legend><?php echo Text::_('COM_JEM_CATEGORY_FIELDSET_DETAILS');?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('catname'); ?>
<?php echo $this->form->getInput('catname'); ?></li>

<li><?php echo $this->form->getLabel('alias'); ?>
<?php echo $this->form->getInput('alias'); ?></li>

<li><?php echo $this->form->getLabel('extension'); ?>
<?php echo $this->form->getInput('extension'); ?></li>

<li><?php echo $this->form->getLabel('parent_id'); ?>
<?php echo $this->form->getInput('parent_id'); ?></li>

<li><?php echo $this->form->getLabel('published'); ?>
<?php echo $this->form->getInput('published'); ?></li>

<li><?php echo $this->form->getLabel('access'); ?>
<?php echo $this->form->getInput('access'); ?></li>

<li><?php echo $this->form->getLabel('color'); ?>
<?php echo $this->form->getInput('color'); ?></li>

<li><?php echo $this->form->getLabel('id'); ?>
<?php echo $this->form->getInput('id'); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('catname'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('alias'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('extension'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('parent_id'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('published'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('access'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('color'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('id'); ?></div></li>
</ul>
<div class="clr"></div>
<?php echo $this->form->getLabel('description'); ?>
@@ -105,8 +91,7 @@
<fieldset class="panelform">
<ul class="adminformlist">
<li>
<?php echo $this->form->getLabel('email'); ?>
<?php echo $this->form->getInput('email'); ?>
<div class="label-form"><?php echo $this->form->renderfield('email'); ?></div>
</li>
</ul>
</fieldset>
@@ -116,8 +101,7 @@
<fieldset class="panelform">
<ul class="adminformlist">
<li>
<?php echo $this->form->getLabel('emailacljl'); ?>
<?php echo $this->form->getInput('emailacljl'); ?>
<div class="label-form"><?php echo $this->form->renderfield('emailacljl'); ?></div>
</li>
</ul>
</fieldset>
@@ -150,7 +134,7 @@
<div class="accordion-body">
<fieldset class="panelform">
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('image'); ?> <?php echo $this->form->getInput('image'); ?>
<li><div class="label-form"><?php echo $this->form->renderfield('image'); ?></div>
</li>
</ul>
</fieldset>
13 changes: 4 additions & 9 deletions admin/views/category/tmpl/edit_options.php
Original file line number Diff line number Diff line change
@@ -17,20 +17,15 @@
<fieldset class="panelform">
<ul class="adminformlist">

<li><?php echo $this->form->getLabel('created_user_id'); ?>
<?php echo $this->form->getInput('created_user_id'); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('created_user_id'); ?></div></li>

<?php if (intval($this->item->created_time)) : ?>
<li><?php echo $this->form->getLabel('created_time'); ?>
<?php echo $this->form->getInput('created_time'); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('created_time'); ?></div></li>
<?php endif; ?>

<?php if ($this->item->modified_user_id) : ?>
<li><?php echo $this->form->getLabel('modified_user_id'); ?>
<?php echo $this->form->getInput('modified_user_id'); ?></li>

<li><?php echo $this->form->getLabel('modified_time'); ?>
<?php echo $this->form->getInput('modified_time'); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('modified_user_id'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('modified_time'); ?></div></li>
<?php endif; ?>

</ul>
3 changes: 2 additions & 1 deletion admin/views/category/view.html.php
Original file line number Diff line number Diff line change
@@ -122,6 +122,7 @@ protected function addToolbar()
}

ToolbarHelper::divider();
ToolbarHelper::help('editcategories', true);
ToolbarHelper::inlinehelp();
ToolBarHelper::help('editcategories', true, 'https://www.joomlaeventmanager.net/');
}
}
25 changes: 10 additions & 15 deletions admin/views/group/tmpl/edit.php
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@

$wa = $this->document->getWebAssetManager();
$wa->useScript('keepalive')
->useScript('inlinehelp')
->useScript('form.validate');

// Create shortcut to parameters.
@@ -89,11 +90,11 @@ class="form-validate" method="post" name="adminForm" id="adminForm" enctype="mul
<?php echo empty($this->item->id) ? Text::_('COM_JEM_NEW_GROUP') : Text::sprintf('COM_JEM_GROUP_DETAILS', $this->item->id); ?>
</legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('name');?> <?php echo $this->form->getInput('name'); ?>
<li><div class="label-form"><?php echo $this->form->renderfield('name'); ?></div>
</li>
<li><?php echo $this->form->getLabel('id');?> <?php echo $this->form->getInput('id'); ?>
<li><div class="label-form"><?php echo $this->form->renderfield('id'); ?></div>
</li>
<li><?php echo $this->form->getLabel('maintainers2');?> <?php echo $this->form->getInput('maintainers2'); ?>
<li><div class="label-form"><?php echo $this->form->renderfield('maintainers2'); ?></div>
</li>
</ul>
</fieldset>
@@ -138,18 +139,12 @@ class="form-validate" method="post" name="adminForm" id="adminForm" enctype="mul
<div class="accordion-body">
<fieldset class="panelform">
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('addvenue'); ?>
<?php echo $this->form->getInput('addvenue'); ?></li>
<li><?php echo $this->form->getLabel('publishvenue'); ?>
<?php echo $this->form->getInput('publishvenue'); ?></li>
<li><?php echo $this->form->getLabel('editvenue'); ?>
<?php echo $this->form->getInput('editvenue'); ?></li>
<li><?php echo $this->form->getLabel('addevent'); ?>
<?php echo $this->form->getInput('addevent'); ?></li>
<li><?php echo $this->form->getLabel('publishevent'); ?>
<?php echo $this->form->getInput('publishevent'); ?></li>
<li><?php echo $this->form->getLabel('editevent'); ?>
<?php echo $this->form->getInput('editevent'); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('addvenue'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('publishvenue'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('editvenue'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('addevent'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('publishevent'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('editevent'); ?></div></li>
</ul>
</fieldset>
</div>
3 changes: 2 additions & 1 deletion admin/views/group/view.html.php
Original file line number Diff line number Diff line change
@@ -114,7 +114,8 @@ protected function addToolbar()
}

ToolbarHelper::divider();
ToolbarHelper::help('editgroup', true);
ToolbarHelper::inlinehelp();
ToolBarHelper::help('editgroup', true, 'https://www.joomlaeventmanager.net/');
}
}
?>
1 change: 1 addition & 0 deletions admin/views/settings/tmpl/default.php
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@
$wa
->useScript('keepalive')
->useStyle('jem.colorpicker')
->useScript('inlinehelp')
->useScript('form.validate');


42 changes: 13 additions & 29 deletions admin/views/settings/tmpl/default_basicdisplay.php
Original file line number Diff line number Diff line change
@@ -15,35 +15,19 @@
<fieldset class="options-form">
<legend><?php echo Text::_( 'COM_JEM_DISPLAY_SETTINGS' ); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('showdetails'); ?> <?php echo $this->form->getInput('showdetails'); ?></li>

<li><?php echo $this->form->getLabel('formatShortDate'); ?>
<span <?php echo JEMOutput::tooltip(Text::_('COM_JEM_PHP_DATETIME_FORMAT_MANUAL'), Text::_('COM_JEM_PHP_DATE_MANUAL_DESC'), 'error'); ?>>
<a href="https://www.php.net/manual/datetime.format.php#refsect1-datetime.format-parameters" target="_blank"><?php echo $this->WarningIcon(); ?></a>
</span><?php echo $this->form->getInput('formatShortDate'); ?>
</li>

<li><?php echo $this->form->getLabel('formatdate'); ?>
<span <?php echo JEMOutput::tooltip(Text::_('COM_JEM_PHP_DATETIME_FORMAT_MANUAL'), Text::_('COM_JEM_PHP_DATETIME_FORMAT_MANUAL_DESC'), 'error'); ?>>
<a href="https://www.php.net/manual/datetime.format.php#refsect1-datetime.format-parameters" target="_blank"><?php echo $this->WarningIcon(); ?></a>
</span><?php echo $this->form->getInput('formatdate'); ?>
</li>

<li><?php echo $this->form->getLabel('formattime'); ?>
<span <?php echo JEMOutput::tooltip(Text::_('COM_JEM_PHP_DATETIME_FORMAT_MANUAL'), Text::_('COM_JEM_PHP_DATETIME_FORMAT_MANUAL_DESC'), 'error'); ?>>
<a href="https://www.php.net/manual/datetime.format.php#refsect1-datetime.format-parameters" target="_blank"><?php echo $this->WarningIcon(); ?></a>
</span><?php echo $this->form->getInput('formattime'); ?>
</li>

<li><?php echo $this->form->getLabel('timename'); ?> <?php echo $this->form->getInput('timename'); ?></li>

<li><?php echo $this->form->getLabel('formathour'); ?>
<span <?php echo JEMOutput::tooltip(Text::_('COM_JEM_PHP_DATETIME_FORMAT_MANUAL'), Text::_('COM_JEM_PHP_DATETIME_FORMAT_MANUAL_DESC'), 'error'); ?>>
<a href="https://www.php.net/manual/datetime.format.php#refsect1-datetime.format-parameters" target="_blank"><?php echo $this->WarningIcon(); ?></a>
</span><?php echo $this->form->getInput('formathour'); ?>
</li>

<li><?php echo $this->form->getLabel('storeip'); ?> <?php echo $this->form->getInput('storeip'); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('showdetails'); ?></div></li>

<li><div class="label-form"><?php echo $this->form->renderfield('formatShortDate'); ?></div></li>

<li><div class="label-form"><?php echo $this->form->renderfield('formatdate'); ?></div></li>

<li><div class="label-form"><?php echo $this->form->renderfield('formattime'); ?></div></li>

<li><div class="label-form"><?php echo $this->form->renderfield('timename'); ?></div></li>

<li><div class="label-form"><?php echo $this->form->renderfield('formathour'); ?></div></li>

<li><div class="label-form"><?php echo $this->form->renderfield('storeip'); ?></div></li>
</ul>
</fieldset>
</div>
4 changes: 2 additions & 2 deletions admin/views/settings/tmpl/default_basiceventhandling.php
Original file line number Diff line number Diff line change
@@ -15,8 +15,8 @@
<fieldset class="options-form">
<legend><?php echo Text::_( 'COM_JEM_EVENT_HANDLING' ); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('oldevent'); ?> <?php echo $this->form->getInput('oldevent'); ?></li>
<li id="evhandler1"><?php echo $this->form->getLabel('minus'); ?> <?php echo $this->form->getInput('minus'); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('oldevent'); ?></div></li>
<li id="evhandler1"><div class="label-form"><?php echo $this->form->renderfield('minus'); ?></div></li>
</ul>
</fieldset>
</div>
16 changes: 6 additions & 10 deletions admin/views/settings/tmpl/default_basicimagehandling.php
Original file line number Diff line number Diff line change
@@ -18,23 +18,19 @@
<fieldset class="options-form">
<legend><?php echo Text::_( 'COM_JEM_IMAGE_HANDLING' ); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('image_filetypes'); ?> <?php echo $this->form->getInput('image_filetypes'); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('image_filetypes'); ?></div></li>

<li><?php echo $this->form->getLabel('sizelimit'); ?> <?php echo $this->form->getInput('sizelimit'); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('sizelimit'); ?></div></li>

<li><?php echo $this->form->getLabel('imagehight'); ?> <?php echo $this->form->getInput('imagehight'); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('imagehight'); ?></div></li>

<li><?php echo $this->form->getLabel('imagewidth'); ?><span <?php echo JEMOutput::tooltip(Text::_('COM_JEM_WARNING'), Text::_('COM_JEM_WARNING_MAX_IMAGEWIDTH'), 'error'); ?>>
<?php echo $this->WarningIcon(); ?>
<?php echo $this->form->getInput('imagewidth'); ?>
</span>
</li>
<li><div class="label-form"><?php echo $this->form->renderfield('imagewidth'); ?></div></li>

<?php if ($gdv && $gdv >= 2) : //is the gd library installed on the server and its version > 2? ?>
<li><?php echo $this->form->getLabel('gddisabled'); ?> <?php echo $this->form->getInput('gddisabled'); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('gddisabled'); ?></div></li>
<?php endif; ?>

<li id="lb1" style="display:none"><?php echo $this->form->getLabel('lightbox'); ?> <?php echo $this->form->getInput('lightbox'); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('lightbox'); ?></div></li>
</ul>
</fieldset>
</div>
4 changes: 2 additions & 2 deletions admin/views/settings/tmpl/default_basiclayout.php
Original file line number Diff line number Diff line change
@@ -15,8 +15,8 @@
<fieldset class="options-form">
<legend><?php echo Text::_( 'COM_JEM_LAYOUT_STYLE_SETTINGS' ); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('layoutstyle'); ?> <?php echo $this->form->getInput('layoutstyle'); ?></li>
<li><?php echo $this->form->getLabel('useiconfont'); ?> <?php echo $this->form->getInput('useiconfont'); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('layoutstyle'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('useiconfont'); ?></div></li>
</ul>
</fieldset>
</div>
8 changes: 4 additions & 4 deletions admin/views/settings/tmpl/default_evregistration.php
Original file line number Diff line number Diff line change
@@ -18,10 +18,10 @@
<fieldset class="options-form">
<legend><?php echo Text::_('COM_JEM_REGISTRATION'); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('event_show_attendeenames',$group); ?> <?php echo $this->form->getInput('event_show_attendeenames',$group); ?></li>
<li><?php echo $this->form->getLabel('event_show_more_attendeedetails',$group); ?> <?php echo $this->form->getInput('event_show_more_attendeedetails',$group); ?></li>
<li><?php echo $this->form->getLabel('event_comunsolution',$group); ?> <?php echo $this->form->getInput('event_comunsolution',$group); ?></li>
<li><?php echo $this->form->getLabel('event_comunoption',$group); ?> <?php echo $this->form->getInput('event_comunoption',$group); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('event_show_attendeenames',$group); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('event_show_more_attendeedetails',$group); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('event_comunsolution',$group); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('event_comunoption',$group); ?></div></li>
</ul>
</fieldset>
</div>
12 changes: 6 additions & 6 deletions admin/views/settings/tmpl/default_evvenues.php
Original file line number Diff line number Diff line change
@@ -17,12 +17,12 @@
<fieldset class="options-form">
<legend><?php echo Text::_('COM_JEM_VENUES'); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('event_show_locdescription',$group); ?> <?php echo $this->form->getInput('event_show_locdescription',$group); ?></li>
<li><?php echo $this->form->getLabel('event_show_detailsadress',$group); ?> <?php echo $this->form->getInput('event_show_detailsadress',$group); ?></li>
<li><?php echo $this->form->getLabel('event_show_detlinkvenue',$group); ?> <?php echo $this->form->getInput('event_show_detlinkvenue',$group); ?></li>
<li><?php echo $this->form->getLabel('event_show_mapserv',$group); ?> <?php echo $this->form->getInput('event_show_mapserv',$group); ?></li>
<li><?php echo $this->form->getLabel('event_tld',$group); ?> <?php echo $this->form->getInput('event_tld',$group); ?></li>
<li><?php echo $this->form->getLabel('event_lg',$group); ?> <?php echo $this->form->getInput('event_lg',$group); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('event_show_locdescription',$group); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('event_show_detailsadress',$group); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('event_show_detlinkvenue',$group); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('event_show_mapserv',$group); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('event_tld',$group); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('event_lg',$group); ?></div></li>
</ul>
</fieldset>
</div>
121 changes: 60 additions & 61 deletions admin/views/settings/tmpl/default_layout.php
Original file line number Diff line number Diff line change
@@ -14,88 +14,87 @@
<div class="width-50 fltlft">
<div class="width-100" style="padding: 10px 1vw;">
<fieldset class="options-form">
<legend><?php echo Text::_('COM_JEM_GENERAL_LAYOUT_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php foreach ($this->form->getFieldset('layoutgenerallayoutsetting') as $field): ?>
<li><?php echo $field->label; ?> <?php echo $field->input; ?></li>
<?php endforeach; ?>
</ul>
</fieldset>
</div>
<legend><?php echo Text::_('COM_JEM_GENERAL_LAYOUT_SETTINGS'); ?></legend>
<ul class="adminformlist">
<?php foreach ($this->form->getFieldset('layoutgenerallayoutsetting') as $field): ?>
<li><?php echo $field->label; ?> <?php echo $field->input; ?></li>
<?php endforeach; ?>
</ul>
</fieldset>
</div>
<div class="width-100" style="padding: 10px 1vw;">
<fieldset class="options-form">
<legend><?php echo Text::_('COM_JEM_CITY_COLUMN'); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('showcity'); ?> <?php echo $this->form->getInput('showcity'); ?></li>
<legend><?php echo Text::_('COM_JEM_CITY_COLUMN'); ?></legend>
<ul class="adminformlist">
<li><div class="label-form"><?php echo $this->form->renderfield('showcity'); ?></div></li>

<li id="city1" style="display:none"><?php echo $this->form->getLabel('citywidth'); ?> <?php echo $this->form->getInput('citywidth'); ?></li>
</ul>
</fieldset>
</div>
<li id="city1" style="display:none"><div class="label-form"><?php echo $this->form->renderfield('citywidth'); ?></div></li>
</ul>
</fieldset>
</div>
<div class="width-100" style="padding: 10px 1vw;">
<fieldset class="options-form">
<legend><?php echo Text::_('COM_JEM_ATTENDEE_COLUMN'); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('showatte'); ?> <?php echo $this->form->getInput('showatte'); ?></li>
<legend><?php echo Text::_('COM_JEM_ATTENDEE_COLUMN'); ?></legend>
<ul class="adminformlist">
<li><div class="label-form"><?php echo $this->form->renderfield('showatte'); ?></div></li>

<li id="atte1" style="display:none"><?php echo $this->form->getLabel('attewidth'); ?> <?php echo $this->form->getInput('attewidth'); ?></li>
</ul>
</fieldset>
</div>
<li id="atte1" style="display:none"><div class="label-form"><?php echo $this->form->renderfield('attewidth'); ?></div></li>
</ul>
</fieldset>
</div>
<div class="width-100" style="padding: 10px 1vw;">
<fieldset class="options-form">
<legend><?php echo Text::_('COM_JEM_TITLE_COLUMN'); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('showtitle'); ?> <?php echo $this->form->getInput('showtitle'); ?>
</li>
<li id="title1" style="display:none"><?php echo $this->form->getLabel('titlewidth'); ?> <?php echo $this->form->getInput('titlewidth'); ?>
</li>
</ul>
</fieldset>
</div>
<legend><?php echo Text::_('COM_JEM_TITLE_COLUMN'); ?></legend>
<ul class="adminformlist">
<li><div class="label-form"><?php echo $this->form->renderfield('showtitle'); ?></div></li>
<li id="title1" style="display:none"><div class="label-form"><?php echo $this->form->renderfield('titlewidth'); ?></div>
</li>
</ul>
</fieldset>
</div>
<div class="width-100" style="padding: 10px 1vw;">
<fieldset class="options-form">
<legend><?php echo Text::_('COM_JEM_VENUE_COLUMN'); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('showlocate'); ?> <?php echo $this->form->getInput('showlocate'); ?></li>
<legend><?php echo Text::_('COM_JEM_VENUE_COLUMN'); ?></legend>
<ul class="adminformlist">
<li><div class="label-form"><?php echo $this->form->renderfield('showlocate'); ?></div></li>

<li id="loc1" style="display:none"><?php echo $this->form->getLabel('locationwidth'); ?> <?php echo $this->form->getInput('locationwidth'); ?></li>
<li id="loc1" style="display:none"><div class="label-form"><?php echo $this->form->renderfield('locationwidth'); ?></div></li>

<li id="loc2" style="display:none"><?php echo $this->form->getLabel('showlinkvenue'); ?> <?php echo $this->form->getInput('showlinkvenue'); ?></li>
</ul>
</fieldset>
</div>
<li id="loc2" style="display:none"><div class="label-form"><?php echo $this->form->renderfield('showlinkvenue'); ?></div></li>
</ul>
</fieldset>
</div>
<div class="width-100" style="padding: 10px 1vw;">
<fieldset class="options-form">
<legend><?php echo Text::_('COM_JEM_STATE_COLUMN'); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('showstate'); ?> <?php echo $this->form->getInput('showstate'); ?></li>
<li id="state1" style="display:none"><?php echo $this->form->getLabel('statewidth'); ?> <?php echo $this->form->getInput('statewidth'); ?></li>
</ul>
</fieldset>
</div>
<legend><?php echo Text::_('COM_JEM_STATE_COLUMN'); ?></legend>
<ul class="adminformlist">
<li><div class="label-form"><?php echo $this->form->renderfield('showstate'); ?></div></li>
<li id="state1" style="display:none"><div class="label-form"><?php echo $this->form->renderfield('statewidth'); ?></div></li>
</ul>
</fieldset>
</div>
<div class="width-100" style="padding: 10px 1vw;">
<fieldset class="options-form">
<legend><?php echo Text::_('COM_JEM_CATEGORY_COLUMN'); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('showcat'); ?> <?php echo $this->form->getInput('showcat'); ?></li>
<legend><?php echo Text::_('COM_JEM_CATEGORY_COLUMN'); ?></legend>
<ul class="adminformlist">
<li><div class="label-form"><?php echo $this->form->renderfield('showcat'); ?></div></li>

<li id="cat1" style="display:none"><?php echo $this->form->getLabel('catfrowidth'); ?> <?php echo $this->form->getInput('catfrowidth'); ?></li>
<li id="cat1" style="display:none"><div class="label-form"><?php echo $this->form->renderfield('catfrowidth'); ?></div></li>

<li id="cat2" style="display:none"><?php echo $this->form->getLabel('catlinklist'); ?> <?php echo $this->form->getInput('catlinklist'); ?></li>
</ul>
</fieldset>
</div>
<li id="cat2" style="display:none"><div class="label-form"><?php echo $this->form->renderfield('catlinklist'); ?></div></li>
</ul>
</fieldset>
</div>
<div class="width-100" style="padding: 10px 1vw;">
<fieldset class="options-form">
<legend><?php echo Text::_('COM_JEM_LAYOUT_TABLE_EVENTIMAGE'); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('showeventimage'); ?> <?php echo $this->form->getInput('showeventimage'); ?></li>
<legend><?php echo Text::_('COM_JEM_LAYOUT_TABLE_EVENTIMAGE'); ?></legend>
<ul class="adminformlist">
<li><div class="label-form"><?php echo $this->form->renderfield('showeventimage'); ?></div></li>

<li id="evimage1" style="display:none"><?php echo $this->form->getLabel('tableeventimagewidth'); ?> <?php echo $this->form->getInput('tableeventimagewidth'); ?></li>
</ul>
</fieldset>
</div>
<li id="evimage1" style="display:none"><div class="label-form"><?php echo $this->form->renderfield('tableeventimagewidth'); ?></div></li>
</ul>
</fieldset>
</div>
</div>

<div class="width-50 fltrt">
16 changes: 8 additions & 8 deletions admin/views/settings/tmpl/default_parameters.php
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@
<fieldset class="options-form">
<legend><?php echo Text::_('COM_JEM_SETTINGS_LEGEND_VIEW_EDITEVENT'); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('global_show_ownedvenuesonly',$group); ?> <?php echo $this->form->getInput('global_show_ownedvenuesonly',$group); ?></li>
<li><?php echo $this->form->getLabel('global_editevent_maxnumcustomfields',$group); ?> <?php echo $this->form->getInput('global_editevent_maxnumcustomfields',$group); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('global_show_ownedvenuesonly',$group); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('global_editevent_maxnumcustomfields',$group); ?></div></li>
</ul>
</fieldset>
</div>
@@ -50,12 +50,12 @@
<fieldset class="options-form">
<legend><?php echo Text::_('COM_JEM_VENUES'); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('global_show_locdescription',$group); ?> <?php echo $this->form->getInput('global_show_locdescription',$group); ?></li>
<li><?php echo $this->form->getLabel('global_show_detailsadress',$group); ?> <?php echo $this->form->getInput('global_show_detailsadress',$group); ?></li>
<li><?php echo $this->form->getLabel('global_show_detlinkvenue',$group); ?> <?php echo $this->form->getInput('global_show_detlinkvenue',$group); ?></li>
<li><?php echo $this->form->getLabel('global_show_mapserv',$group); ?> <?php echo $this->form->getInput('global_show_mapserv',$group); ?></li>
<li><?php echo $this->form->getLabel('global_tld',$group); ?> <?php echo $this->form->getInput('global_tld',$group); ?></li>
<li><?php echo $this->form->getLabel('global_lg',$group); ?> <?php echo $this->form->getInput('global_lg',$group); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('global_show_locdescription',$group); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('global_show_detailsadress',$group); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('global_show_detlinkvenue',$group); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('global_show_mapserv',$group); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('global_tld',$group); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('global_lg',$group); ?></div></li>
</ul>
</fieldset>
</div>
4 changes: 2 additions & 2 deletions admin/views/settings/tmpl/default_usercontrol.php
Original file line number Diff line number Diff line change
@@ -39,8 +39,8 @@
<legend><?php echo Text::_('COM_JEM_REGISTRATION'); ?></legend>
<ul class="adminformlist">
<li><?php echo $this->form->getLabel('showfroregistra'); ?> <?php echo $this->form->getInput('showfroregistra'); ?> </li>
<li id="froreg1"><?php echo $this->form->getLabel('regallowinvitation'); ?> <?php echo $this->form->getInput('regallowinvitation'); ?> </li>
<li id="froreg2"><?php echo $this->form->getLabel('regallowcomments'); ?> <?php echo $this->form->getInput('regallowcomments'); ?> </li>
<li id="froreg1"><div class="label-form"><?php echo $this->form->renderfield('regallowinvitation'); ?></div></li>
<li id="froreg2"><div class="label-form"><?php echo $this->form->renderfield('regallowcomments'); ?></div></li>
</ul>
</fieldset>
</div>
3 changes: 2 additions & 1 deletion admin/views/settings/view.html.php
Original file line number Diff line number Diff line change
@@ -112,7 +112,8 @@ protected function addToolbar()
ToolbarHelper::cancel('settings.cancel');

ToolbarHelper::divider();
ToolbarHelper::help('settings', true);
ToolbarHelper::inlinehelp();
ToolBarHelper::help('settings', true, 'https://www.joomlaeventmanager.net/');
}

protected function WarningIcon()
41 changes: 12 additions & 29 deletions admin/views/venue/tmpl/edit.php
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@
->useScript('keepalive')
->useScript('form.validate')
->useScript('jem.attachments')
->useScript('inlinehelp')
->useScript('jem.geocomplete');

// Create shortcut to parameters.
@@ -232,36 +233,18 @@ class="form-validate" method="post" name="adminForm" id="venue-form" enctype="mu
</legend>

<ul class="adminformlist">
<li><?php echo $this->form->getLabel('venue');?>
<?php echo $this->form->getInput('venue'); ?></li>

<li><?php echo $this->form->getLabel('alias'); ?>
<?php echo $this->form->getInput('alias'); ?></li>

<li><?php echo $this->form->getLabel('street'); ?>
<?php echo $this->form->getInput('street'); ?></li>

<li><?php echo $this->form->getLabel('postalCode'); ?>
<?php echo $this->form->getInput('postalCode'); ?></li>

<li><?php echo $this->form->getLabel('city'); ?>
<?php echo $this->form->getInput('city'); ?></li>

<li><?php echo $this->form->getLabel('state'); ?>
<?php echo $this->form->getInput('state'); ?></li>

<li><?php echo $this->form->getLabel('country'); ?>
<?php echo $this->form->getInput('country'); ?></li>

<li><?php echo $this->form->getLabel('latitude'); ?>
<?php echo $this->form->getInput('latitude'); ?></li>

<li><?php echo $this->form->getLabel('longitude'); ?>
<?php echo $this->form->getInput('longitude'); ?></li>

<li><?php echo $this->form->getLabel('url'); ?>
<?php echo $this->form->getInput('url'); ?></li>
<li><div class="label-form"><?php echo $this->form->renderfield('venue'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('alias'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('street'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('postalCode'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('city'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('state'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('country'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('latitude'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('longitude'); ?></div></li>
<li><div class="label-form"><?php echo $this->form->renderfield('url'); ?></div></li>
</ul>
<div class="clr"></div>
<div>
<?php echo $this->form->getLabel('locdescription'); ?>
<div class="clr"></div>
3 changes: 2 additions & 1 deletion admin/views/venue/view.html.php
Original file line number Diff line number Diff line change
@@ -123,6 +123,7 @@ protected function addToolbar()
}

ToolbarHelper::divider();
ToolbarHelper::help('editvenues', true);
ToolbarHelper::inlinehelp();
ToolBarHelper::help('editvenues', true, 'https://www.joomlaeventmanager.net/');
}
}

0 comments on commit 80b15e7

Please sign in to comment.