From 80b15e79114f81c602799ba8c982402211f35892 Mon Sep 17 00:00:00 2001 From: McKillo Date: Fri, 16 Jun 2023 10:24:21 +0200 Subject: [PATCH] toggle inlinehelp for edit event view (third part) #1587 Active Toggle Inline Help in other backend views: category, group, venues, setting. --- admin/models/forms/category.xml | 3 + admin/models/forms/group.xml | 3 + admin/models/forms/settings.xml | 3 + admin/models/forms/venue.xml | 3 + admin/views/category/tmpl/edit.php | 40 ++---- admin/views/category/tmpl/edit_options.php | 13 +- admin/views/category/view.html.php | 3 +- admin/views/group/tmpl/edit.php | 25 ++-- admin/views/group/view.html.php | 3 +- admin/views/settings/tmpl/default.php | 1 + .../settings/tmpl/default_basicdisplay.php | 42 ++---- .../tmpl/default_basiceventhandling.php | 4 +- .../tmpl/default_basicimagehandling.php | 16 +-- .../settings/tmpl/default_basiclayout.php | 4 +- .../settings/tmpl/default_evregistration.php | 8 +- .../views/settings/tmpl/default_evvenues.php | 12 +- admin/views/settings/tmpl/default_layout.php | 121 +++++++++--------- .../settings/tmpl/default_parameters.php | 16 +-- .../settings/tmpl/default_usercontrol.php | 4 +- admin/views/settings/view.html.php | 3 +- admin/views/venue/tmpl/edit.php | 41 ++---- admin/views/venue/view.html.php | 3 +- 22 files changed, 162 insertions(+), 209 deletions(-) diff --git a/admin/models/forms/category.xml b/admin/models/forms/category.xml index 992cf092e..f0786e4a8 100644 --- a/admin/models/forms/category.xml +++ b/admin/models/forms/category.xml @@ -1,5 +1,8 @@
+ + +
diff --git a/admin/models/forms/group.xml b/admin/models/forms/group.xml index 167ce7df6..df93542c3 100644 --- a/admin/models/forms/group.xml +++ b/admin/models/forms/group.xml @@ -1,5 +1,8 @@ + + +
diff --git a/admin/models/forms/settings.xml b/admin/models/forms/settings.xml index 68aec1581..f9859ca70 100644 --- a/admin/models/forms/settings.xml +++ b/admin/models/forms/settings.xml @@ -1,5 +1,8 @@ + + +
diff --git a/admin/models/forms/venue.xml b/admin/models/forms/venue.xml index 84a140eca..292a83a8c 100644 --- a/admin/models/forms/venue.xml +++ b/admin/models/forms/venue.xml @@ -1,5 +1,8 @@ + + +
diff --git a/admin/views/category/tmpl/edit.php b/admin/views/category/tmpl/edit.php index 3feffc7b0..4c2cad1a8 100644 --- a/admin/views/category/tmpl/edit.php +++ b/admin/views/category/tmpl/edit.php @@ -25,6 +25,7 @@ $wa = $this->document->getWebAssetManager(); $wa->useStyle('jem.colorpicker') ->useScript('keepalive') + ->useScript('inlinehelp') ->useScript('form.validate'); ?> @@ -48,29 +49,14 @@
    -
  • form->getLabel('catname'); ?> - form->getInput('catname'); ?>
    • - -
  • form->getLabel('alias'); ?> - form->getInput('alias'); ?>
    • - -
  • form->getLabel('extension'); ?> - form->getInput('extension'); ?>
    • - -
  • form->getLabel('parent_id'); ?> - form->getInput('parent_id'); ?>
    • - -
  • form->getLabel('published'); ?> - form->getInput('published'); ?>
    • - -
  • form->getLabel('access'); ?> - form->getInput('access'); ?>
    • - -
  • form->getLabel('color'); ?> - form->getInput('color'); ?>
    • - -
  • form->getLabel('id'); ?> - form->getInput('id'); ?>
    • +
  • form->renderfield('catname'); ?>
    • +
  • form->renderfield('alias'); ?>
    • +
  • form->renderfield('extension'); ?>
    • +
  • form->renderfield('parent_id'); ?>
    • +
  • form->renderfield('published'); ?>
    • +
  • form->renderfield('access'); ?>
    • +
  • form->renderfield('color'); ?>
    • +
  • form->renderfield('id'); ?>
form->getLabel('description'); ?> @@ -105,8 +91,7 @@
  • - form->getLabel('email'); ?> - form->getInput('email'); ?> +
    form->renderfield('email'); ?>
@@ -116,8 +101,7 @@
  • - form->getLabel('emailacljl'); ?> - form->getInput('emailacljl'); ?> +
    form->renderfield('emailacljl'); ?>
@@ -150,7 +134,7 @@
    -
  • form->getLabel('image'); ?> form->getInput('image'); ?> +
  • form->renderfield('image'); ?>
diff --git a/admin/views/category/tmpl/edit_options.php b/admin/views/category/tmpl/edit_options.php index 5a630c642..beac95ab4 100644 --- a/admin/views/category/tmpl/edit_options.php +++ b/admin/views/category/tmpl/edit_options.php @@ -17,20 +17,15 @@
    -
  • form->getLabel('created_user_id'); ?> - form->getInput('created_user_id'); ?>
    • +
  • form->renderfield('created_user_id'); ?>
    • item->created_time)) : ?> -
  • form->getLabel('created_time'); ?> - form->getInput('created_time'); ?>
    • +
  • form->renderfield('created_time'); ?>
    • item->modified_user_id) : ?> -
  • form->getLabel('modified_user_id'); ?> - form->getInput('modified_user_id'); ?>
    • - -
  • form->getLabel('modified_time'); ?> - form->getInput('modified_time'); ?>
    • +
  • form->renderfield('modified_user_id'); ?>
    • +
  • form->renderfield('modified_time'); ?>
diff --git a/admin/views/category/view.html.php b/admin/views/category/view.html.php index 393306d75..7bfa0c088 100644 --- a/admin/views/category/view.html.php +++ b/admin/views/category/view.html.php @@ -122,6 +122,7 @@ protected function addToolbar() } ToolbarHelper::divider(); - ToolbarHelper::help('editcategories', true); + ToolbarHelper::inlinehelp(); + ToolBarHelper::help('editcategories', true, 'https://www.joomlaeventmanager.net/'); } } diff --git a/admin/views/group/tmpl/edit.php b/admin/views/group/tmpl/edit.php index ac101ec92..1f15339af 100644 --- a/admin/views/group/tmpl/edit.php +++ b/admin/views/group/tmpl/edit.php @@ -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 item->id) ? Text::_('COM_JEM_NEW_GROUP') : Text::sprintf('COM_JEM_GROUP_DETAILS', $this->item->id); ?>
    -
  • form->getLabel('name');?> form->getInput('name'); ?> +
  • form->renderfield('name'); ?>
    • -
  • form->getLabel('id');?> form->getInput('id'); ?> +
  • form->renderfield('id'); ?>
    • -
  • form->getLabel('maintainers2');?> form->getInput('maintainers2'); ?> +
  • form->renderfield('maintainers2'); ?>
@@ -138,18 +139,12 @@ class="form-validate" method="post" name="adminForm" id="adminForm" enctype="mul
    -
  • form->getLabel('addvenue'); ?> - form->getInput('addvenue'); ?>
    • -
  • form->getLabel('publishvenue'); ?> - form->getInput('publishvenue'); ?>
    • -
  • form->getLabel('editvenue'); ?> - form->getInput('editvenue'); ?>
    • -
  • form->getLabel('addevent'); ?> - form->getInput('addevent'); ?>
    • -
  • form->getLabel('publishevent'); ?> - form->getInput('publishevent'); ?>
    • -
  • form->getLabel('editevent'); ?> - form->getInput('editevent'); ?>
    • +
  • form->renderfield('addvenue'); ?>
    • +
  • form->renderfield('publishvenue'); ?>
    • +
  • form->renderfield('editvenue'); ?>
    • +
  • form->renderfield('addevent'); ?>
    • +
  • form->renderfield('publishevent'); ?>
    • +
  • form->renderfield('editevent'); ?>
diff --git a/admin/views/group/view.html.php b/admin/views/group/view.html.php index e472e7386..8b42340c0 100644 --- a/admin/views/group/view.html.php +++ b/admin/views/group/view.html.php @@ -114,7 +114,8 @@ protected function addToolbar() } ToolbarHelper::divider(); - ToolbarHelper::help('editgroup', true); + ToolbarHelper::inlinehelp(); + ToolBarHelper::help('editgroup', true, 'https://www.joomlaeventmanager.net/'); } } ?> diff --git a/admin/views/settings/tmpl/default.php b/admin/views/settings/tmpl/default.php index 8755b65ec..faa881e63 100644 --- a/admin/views/settings/tmpl/default.php +++ b/admin/views/settings/tmpl/default.php @@ -26,6 +26,7 @@ $wa ->useScript('keepalive') ->useStyle('jem.colorpicker') + ->useScript('inlinehelp') ->useScript('form.validate'); diff --git a/admin/views/settings/tmpl/default_basicdisplay.php b/admin/views/settings/tmpl/default_basicdisplay.php index dd00f87eb..f3ceeb330 100644 --- a/admin/views/settings/tmpl/default_basicdisplay.php +++ b/admin/views/settings/tmpl/default_basicdisplay.php @@ -15,35 +15,19 @@
    -
  • form->getLabel('showdetails'); ?> form->getInput('showdetails'); ?>
    • - -
  • form->getLabel('formatShortDate'); ?> - > - WarningIcon(); ?> - form->getInput('formatShortDate'); ?> -
    • - -
  • form->getLabel('formatdate'); ?> - > - WarningIcon(); ?> - form->getInput('formatdate'); ?> -
    • - -
  • form->getLabel('formattime'); ?> - > - WarningIcon(); ?> - form->getInput('formattime'); ?> -
    • - -
  • form->getLabel('timename'); ?> form->getInput('timename'); ?>
    • - -
  • form->getLabel('formathour'); ?> - > - WarningIcon(); ?> - form->getInput('formathour'); ?> -
    • - -
  • form->getLabel('storeip'); ?> form->getInput('storeip'); ?>
    • +
  • form->renderfield('showdetails'); ?>
    • + +
  • form->renderfield('formatShortDate'); ?>
    • + +
  • form->renderfield('formatdate'); ?>
    • + +
  • form->renderfield('formattime'); ?>
    • + +
  • form->renderfield('timename'); ?>
    • + +
  • form->renderfield('formathour'); ?>
    • + +
  • form->renderfield('storeip'); ?>
diff --git a/admin/views/settings/tmpl/default_basiceventhandling.php b/admin/views/settings/tmpl/default_basiceventhandling.php index eda745902..8dd8cf054 100644 --- a/admin/views/settings/tmpl/default_basiceventhandling.php +++ b/admin/views/settings/tmpl/default_basiceventhandling.php @@ -15,8 +15,8 @@
    -
  • form->getLabel('oldevent'); ?> form->getInput('oldevent'); ?>
    • -
  • form->getLabel('minus'); ?> form->getInput('minus'); ?>
    • +
  • form->renderfield('oldevent'); ?>
    • +
  • form->renderfield('minus'); ?>
diff --git a/admin/views/settings/tmpl/default_basicimagehandling.php b/admin/views/settings/tmpl/default_basicimagehandling.php index e8f1b1cc0..a068fecad 100644 --- a/admin/views/settings/tmpl/default_basicimagehandling.php +++ b/admin/views/settings/tmpl/default_basicimagehandling.php @@ -18,23 +18,19 @@
    -
  • form->getLabel('image_filetypes'); ?> form->getInput('image_filetypes'); ?>
    • +
  • form->renderfield('image_filetypes'); ?>
    • -
  • form->getLabel('sizelimit'); ?> form->getInput('sizelimit'); ?>
    • +
  • form->renderfield('sizelimit'); ?>
    • -
  • form->getLabel('imagehight'); ?> form->getInput('imagehight'); ?>
    • +
  • form->renderfield('imagehight'); ?>
    • -
  • form->getLabel('imagewidth'); ?>> - WarningIcon(); ?> - form->getInput('imagewidth'); ?> - -
    • +
  • form->renderfield('imagewidth'); ?>
    • = 2) : //is the gd library installed on the server and its version > 2? ?> -
  • form->getLabel('gddisabled'); ?> form->getInput('gddisabled'); ?>
    • +
  • form->renderfield('gddisabled'); ?>
    • - +
  • form->renderfield('lightbox'); ?>
diff --git a/admin/views/settings/tmpl/default_basiclayout.php b/admin/views/settings/tmpl/default_basiclayout.php index e91966b10..b26a57037 100644 --- a/admin/views/settings/tmpl/default_basiclayout.php +++ b/admin/views/settings/tmpl/default_basiclayout.php @@ -15,8 +15,8 @@
    -
  • form->getLabel('layoutstyle'); ?> form->getInput('layoutstyle'); ?>
    • -
  • form->getLabel('useiconfont'); ?> form->getInput('useiconfont'); ?>
    • +
  • form->renderfield('layoutstyle'); ?>
    • +
  • form->renderfield('useiconfont'); ?>
diff --git a/admin/views/settings/tmpl/default_evregistration.php b/admin/views/settings/tmpl/default_evregistration.php index 563d5bd4b..ed21130d4 100644 --- a/admin/views/settings/tmpl/default_evregistration.php +++ b/admin/views/settings/tmpl/default_evregistration.php @@ -18,10 +18,10 @@
    -
  • form->getLabel('event_show_attendeenames',$group); ?> form->getInput('event_show_attendeenames',$group); ?>
    • -
  • form->getLabel('event_show_more_attendeedetails',$group); ?> form->getInput('event_show_more_attendeedetails',$group); ?>
    • -
  • form->getLabel('event_comunsolution',$group); ?> form->getInput('event_comunsolution',$group); ?>
    • -
  • form->getLabel('event_comunoption',$group); ?> form->getInput('event_comunoption',$group); ?>
    • +
  • form->renderfield('event_show_attendeenames',$group); ?>
    • +
  • form->renderfield('event_show_more_attendeedetails',$group); ?>
    • +
  • form->renderfield('event_comunsolution',$group); ?>
    • +
  • form->renderfield('event_comunoption',$group); ?>
diff --git a/admin/views/settings/tmpl/default_evvenues.php b/admin/views/settings/tmpl/default_evvenues.php index 7696e60c5..c8f7b9e2a 100644 --- a/admin/views/settings/tmpl/default_evvenues.php +++ b/admin/views/settings/tmpl/default_evvenues.php @@ -17,12 +17,12 @@
    -
  • form->getLabel('event_show_locdescription',$group); ?> form->getInput('event_show_locdescription',$group); ?>
    • -
  • form->getLabel('event_show_detailsadress',$group); ?> form->getInput('event_show_detailsadress',$group); ?>
    • -
  • form->getLabel('event_show_detlinkvenue',$group); ?> form->getInput('event_show_detlinkvenue',$group); ?>
    • -
  • form->getLabel('event_show_mapserv',$group); ?> form->getInput('event_show_mapserv',$group); ?>
    • -
  • form->getLabel('event_tld',$group); ?> form->getInput('event_tld',$group); ?>
    • -
  • form->getLabel('event_lg',$group); ?> form->getInput('event_lg',$group); ?>
    • +
  • form->renderfield('event_show_locdescription',$group); ?>
    • +
  • form->renderfield('event_show_detailsadress',$group); ?>
    • +
  • form->renderfield('event_show_detlinkvenue',$group); ?>
    • +
  • form->renderfield('event_show_mapserv',$group); ?>
    • +
  • form->renderfield('event_tld',$group); ?>
    • +
  • form->renderfield('event_lg',$group); ?>
diff --git a/admin/views/settings/tmpl/default_layout.php b/admin/views/settings/tmpl/default_layout.php index c85ed846f..412480840 100644 --- a/admin/views/settings/tmpl/default_layout.php +++ b/admin/views/settings/tmpl/default_layout.php @@ -14,88 +14,87 @@
- -
    - form->getFieldset('layoutgenerallayoutsetting') as $field): ?> -
  • label; ?> input; ?>
    • - -
-
-
+ +
    + form->getFieldset('layoutgenerallayoutsetting') as $field): ?> +
  • label; ?> input; ?>
    • + +
+
+
- -
    -
  • form->getLabel('showcity'); ?> form->getInput('showcity'); ?>
    • + +
      +
    • form->renderfield('showcity'); ?>
      • - -
    -
-
+ + +
+
- -
    -
  • form->getLabel('showatte'); ?> form->getInput('showatte'); ?>
    • + +
      +
    • form->renderfield('showatte'); ?>
      • - -
    -
-
+ + +
+
- -
    -
  • form->getLabel('showtitle'); ?> form->getInput('showtitle'); ?> -
    • - -
-
-
+ +
    +
  • form->renderfield('showtitle'); ?>
    • + +
+
+
- -
    -
  • form->getLabel('showlocate'); ?> form->getInput('showlocate'); ?>
    • + +
      +
    • form->renderfield('showlocate'); ?>
      • - + - -
    -
-
+ + +
+
- -
    -
  • form->getLabel('showstate'); ?> form->getInput('showstate'); ?>
    • - -
-
-
+ + + +
- -
    -
  • form->getLabel('showcat'); ?> form->getInput('showcat'); ?>
    • + +
      +
    • form->renderfield('showcat'); ?>
      • - + - -
    -
-
+ + + +
- -
    -
  • form->getLabel('showeventimage'); ?> form->getInput('showeventimage'); ?>
    • + +
      +
    • form->renderfield('showeventimage'); ?>
      • - -
    -
-
+ + + +
diff --git a/admin/views/settings/tmpl/default_parameters.php b/admin/views/settings/tmpl/default_parameters.php index 4293ae1a3..1d4a81a6d 100644 --- a/admin/views/settings/tmpl/default_parameters.php +++ b/admin/views/settings/tmpl/default_parameters.php @@ -29,8 +29,8 @@
    -
  • form->getLabel('global_show_ownedvenuesonly',$group); ?> form->getInput('global_show_ownedvenuesonly',$group); ?>
    • -
  • form->getLabel('global_editevent_maxnumcustomfields',$group); ?> form->getInput('global_editevent_maxnumcustomfields',$group); ?>
    • +
  • form->renderfield('global_show_ownedvenuesonly',$group); ?>
    • +
  • form->renderfield('global_editevent_maxnumcustomfields',$group); ?>
@@ -50,12 +50,12 @@
    -
  • form->getLabel('global_show_locdescription',$group); ?> form->getInput('global_show_locdescription',$group); ?>
    • -
  • form->getLabel('global_show_detailsadress',$group); ?> form->getInput('global_show_detailsadress',$group); ?>
    • -
  • form->getLabel('global_show_detlinkvenue',$group); ?> form->getInput('global_show_detlinkvenue',$group); ?>
    • -
  • form->getLabel('global_show_mapserv',$group); ?> form->getInput('global_show_mapserv',$group); ?>
    • -
  • form->getLabel('global_tld',$group); ?> form->getInput('global_tld',$group); ?>
    • -
  • form->getLabel('global_lg',$group); ?> form->getInput('global_lg',$group); ?>
    • +
  • form->renderfield('global_show_locdescription',$group); ?>
    • +
  • form->renderfield('global_show_detailsadress',$group); ?>
    • +
  • form->renderfield('global_show_detlinkvenue',$group); ?>
    • +
  • form->renderfield('global_show_mapserv',$group); ?>
    • +
  • form->renderfield('global_tld',$group); ?>
    • +
  • form->renderfield('global_lg',$group); ?>
diff --git a/admin/views/settings/tmpl/default_usercontrol.php b/admin/views/settings/tmpl/default_usercontrol.php index 78c52c808..5b1583455 100644 --- a/admin/views/settings/tmpl/default_usercontrol.php +++ b/admin/views/settings/tmpl/default_usercontrol.php @@ -39,8 +39,8 @@ diff --git a/admin/views/settings/view.html.php b/admin/views/settings/view.html.php index f55d42a9f..a46e4037f 100644 --- a/admin/views/settings/view.html.php +++ b/admin/views/settings/view.html.php @@ -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() diff --git a/admin/views/venue/tmpl/edit.php b/admin/views/venue/tmpl/edit.php index e60485acc..95f570cf0 100644 --- a/admin/views/venue/tmpl/edit.php +++ b/admin/views/venue/tmpl/edit.php @@ -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 +
form->getLabel('locdescription'); ?>
diff --git a/admin/views/venue/view.html.php b/admin/views/venue/view.html.php index 5ec2d5d06..9f2cb5aa0 100644 --- a/admin/views/venue/view.html.php +++ b/admin/views/venue/view.html.php @@ -123,6 +123,7 @@ protected function addToolbar() } ToolbarHelper::divider(); - ToolbarHelper::help('editvenues', true); + ToolbarHelper::inlinehelp(); + ToolBarHelper::help('editvenues', true, 'https://www.joomlaeventmanager.net/'); } }