From 98e0ee2bed9cbb96913ad224518b844666095698 Mon Sep 17 00:00:00 2001
From: Tuan Pham Ngoc <github@joomdonation.com>
Date: Sat, 10 Jul 2021 17:35:11 +0700
Subject: [PATCH] Minor clean up to submit weblink form

---
 src/components/com_weblinks/forms/weblink.xml |  4 +-
 .../com_weblinks/tmpl/form/edit.php           | 49 +++++++------------
 2 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/src/components/com_weblinks/forms/weblink.xml b/src/components/com_weblinks/forms/weblink.xml
index 49ff543..93ee1af 100644
--- a/src/components/com_weblinks/forms/weblink.xml
+++ b/src/components/com_weblinks/forms/weblink.xml
@@ -32,7 +32,7 @@
 			name="alias"
 			type="text"
 			label="JFIELD_ALIAS_LABEL"
-			description="COM_WEBLINKS_FIELD_ALIAS_DESC"
+			description="JFIELD_ALIAS_DESC"
 			hint="JFIELD_ALIAS_PLACEHOLDER"
 			size="45"
 		/>
@@ -93,8 +93,6 @@
 			name="tags"
 			type="tag"
 			label="JTAG"
-			description="JTAG_DESC"
-			class="inputbox"
 			multiple="true"
 		/>
 
diff --git a/src/components/com_weblinks/tmpl/form/edit.php b/src/components/com_weblinks/tmpl/form/edit.php
index 57939ea..51b153b 100644
--- a/src/components/com_weblinks/tmpl/form/edit.php
+++ b/src/components/com_weblinks/tmpl/form/edit.php
@@ -16,7 +16,6 @@ use Joomla\CMS\Router\Route;
 
 HTMLHelper::_('behavior.keepalive');
 HTMLHelper::_('behavior.formvalidator');
-// HTMLHelper::_('behavior.modal', 'a.modal_jform_contenthistory');
 
 $captchaEnabled = false;
 $captchaSet = $this->params->get('captcha', Factory::getApplication()->get('captcha', '0'));
@@ -33,21 +32,13 @@ foreach (JPluginHelper::getPlugin('captcha') as $plugin)
 // Create shortcut to parameters.
 $params = $this->state->get('params');
 ?>
-
-<script type="text/javascript">
-	Joomla.submitbutton = function(task)
-	{
-		if (task == 'weblink.cancel' || document.formvalidator.isValid(document.getElementById('adminForm')))
-		{
-			Joomla.submitform(task);
-		}
-	}
-</script>
-<div class="edit<?php echo $this->pageclass_sfx; ?>">
+<div class="edit item-page<?php echo $this->pageclass_sfx; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
-	<h1>
-		<?php echo $this->escape($this->params->get('page_heading')); ?>
-	</h1>
+    <div class="page-header">
+        <h1>
+		    <?php echo $this->escape($this->params->get('page_heading')); ?>
+        </h1>
+    </div>
 	<?php endif; ?>
 	<form action="<?php echo Route::_('index.php?option=com_weblinks&view=form&w_id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate form-vertical">
 
@@ -75,23 +66,19 @@ $params = $this->state->get('params');
 			</div>
 		<?php endif; ?>
 
-		<div class="btn-toolbar">
-			<div class="btn-group">
-				<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('weblink.save')">
-					<span class="icon-ok"></span> <?php echo Text::_('JSAVE') ?>
-				</button>
-			</div>
-			<div class="btn-group">
-				<button type="button" class="btn" onclick="Joomla.submitbutton('weblink.cancel')">
-					<span class="icon-cancel"></span> <?php echo Text::_('JCANCEL') ?>
-				</button>
-			</div>
-			<?php if ($params->get('save_history', 0)) : ?>
-				<div class="btn-group">
-					<?php echo $this->form->getInput('contenthistory'); ?>
-				</div>
+        <div class="mb-2">
+            <button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('weblink.save')">
+                <span class="icon-check" aria-hidden="true"></span>
+				<?php echo Text::_('JSAVE'); ?>
+            </button>
+            <button type="button" class="btn btn-danger" onclick="Joomla.submitbutton('weblink.cancel')">
+                <span class="icon-times" aria-hidden="true"></span>
+				<?php echo Text::_('JCANCEL'); ?>
+            </button>
+			<?php if ($this->params->get('save_history', 0) && $this->item->id) : ?>
+				<?php echo $this->form->getInput('contenthistory'); ?>
 			<?php endif; ?>
-		</div>
+        </div>
 
 		<input type="hidden" name="return" value="<?php echo $this->return_page;?>" />
 		<input type="hidden" name="task" value="" />