From 8574a4f3cfc9c2976cea10bda12d8de49967f84c Mon Sep 17 00:00:00 2001
From: Astrid <astridx@users.noreply.github.com>
Date: Mon, 12 Feb 2018 23:57:58 +0100
Subject: [PATCH] improvedtheBatchview (#375)

---
 .../views/weblinks/tmpl/default.php           | 17 +++++-
 .../views/weblinks/tmpl/default_batch.php     | 56 -------------------
 .../weblinks/tmpl/default_batch_body.php      | 40 +++++++++++++
 .../weblinks/tmpl/default_batch_footer.php    | 17 ++++++
 4 files changed, 71 insertions(+), 59 deletions(-)
 delete mode 100644 src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php
 create mode 100644 src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_body.php
 create mode 100644 src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_footer.php

diff --git a/src/administrator/components/com_weblinks/views/weblinks/tmpl/default.php b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default.php
index 69b0840..65c9325 100644
--- a/src/administrator/components/com_weblinks/views/weblinks/tmpl/default.php
+++ b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default.php
@@ -164,11 +164,22 @@ if ($saveOrder)
 					<?php endforeach; ?>
 				</tbody>
 			</table>
+			<?php // Load the batch processing form. ?>
+			<?php if ($user->authorise('core.create', 'com_content')
+				&& $user->authorise('core.edit', 'com_content')
+				&& $user->authorise('core.edit.state', 'com_content')) : ?>
+				<?php echo JHtml::_(
+					'bootstrap.renderModal',
+					'collapseModal',
+					array(
+						'title'  => JText::_('COM_WEBLINKS_BATCH_OPTIONS'),
+						'footer' => $this->loadTemplate('batch_footer'),
+					),
+					$this->loadTemplate('batch_body')
+				); ?>
+			<?php endif; ?>
 		<?php endif; ?>
 
-		<?php //Load the batch processing form. ?>
-		<?php echo $this->loadTemplate('batch'); ?>
-
 		<input type="hidden" name="task" value="" />
 		<input type="hidden" name="boxchecked" value="0" />
 		<?php echo JHtml::_('form.token'); ?>
diff --git a/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php
deleted file mode 100644
index 3807e82..0000000
--- a/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-$published = $this->state->get('filter.published');
-?>
-<div class="modal hide fade" id="collapseModal">
-	<div class="modal-header">
-		<button type="button" role="presentation" class="close" data-dismiss="modal">&#215;</button>
-		<h3><?php echo JText::_('COM_WEBLINKS_BATCH_OPTIONS'); ?></h3>
-	</div>
-	<div class="modal-body modal-batch">
-		<p><?php echo JText::_('COM_WEBLINKS_BATCH_TIP'); ?></p>
-		<div class="row-fluid">
-			<div class="control-group span6">
-				<div class="controls">
-					<?php echo JHtml::_('batch.tag'); ?>
-				</div>
-			</div>
-			<div class="control-group span6">
-				<div class="controls">
-					<?php echo JHtml::_('batch.language'); ?>
-				</div>
-			</div>
-		</div>
-		<div class="row-fluid">
-			<div class="control-group span6">
-				<div class="controls">
-					<?php echo JHtml::_('batch.access'); ?>
-				</div>
-			</div>
-			<?php if ($published >= 0) : ?>
-				<div class="control-group span6">
-					<div class="controls">
-						<?php echo JHtml::_('batch.item', 'com_weblinks'); ?>
-					</div>
-				</div>
-			<?php endif; ?>
-		</div>
-	</div>
-	<div class="modal-footer">
-		<button class="btn" type="button" onclick="document.id('batch-category-id').value='';document.id('batch-access').value='';document.id('batch-language-id').value='';document.id('batch-tag-id)').value=''" data-dismiss="modal">
-			<?php echo JText::_('JCANCEL'); ?>
-		</button>
-		<button class="btn btn-primary" type="submit" onclick="Joomla.submitbutton('weblink.batch');">
-			<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
-		</button>
-	</div>
-</div>
diff --git a/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_body.php b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_body.php
new file mode 100644
index 0000000..e6ff658
--- /dev/null
+++ b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_body.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+$published = $this->state->get('filter.published');
+?>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.language'); ?>
+			</div>
+		</div>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.access'); ?>
+			</div>
+		</div>
+	</div>
+	<div class="row-fluid">
+		<?php if ($published >= 0) : ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.item', 'com_weblinks'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.tag'); ?>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_footer.php b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_footer.php
new file mode 100644
index 0000000..fb0c758
--- /dev/null
+++ b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_footer.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+?>
+<a class="btn" type="button" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value='';document.getElementById('batch-user-id').value='';document.getElementById('batch-tag-id').value=''" data-dismiss="modal">
+	<?php echo JText::_('JCANCEL'); ?>
+</a>
+<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('weblink.batch');">
+	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+</button>
\ No newline at end of file