Frontend Editing Bug fixes for Template Zero

Author: hiteshaggarwal

astroid/astroid-template-zero/html/com_content/article/default.php

@@ -19,6 +19,8 @@
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 
+HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers');
+
 if (ASTROID_JOOMLA_VERSION > 3) {
    \JLoader::registerAlias('ContentHelperRoute', 'Joomla\Component\Content\Site\Helper\RouteHelper');
 } else {

astroid/astroid-template-zero/html/com_content/form/edit.php

@@ -1,54 +1,27 @@
 <?php
 
 /**
- * @package   Astroid Framework
- * @author    JoomDev https://www.joomdev.com
- * @copyright Copyright (C) 2009 - 2020 JoomDev.
- * @license https://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   (C) 2013 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Text;
 
-HTMLHelper::_('bootstrap.framework');
-
-$canEdit = $displayData['params']->get('access-edit');
+$canEdit   = $displayData['params']->get('access-edit');
 $articleId = $displayData['item']->id;
-
 ?>
 
-<div class="icons">
-	<?php if (empty($displayData['print'])) : ?>
-
-		<?php if ($canEdit || $displayData['params']->get('show_print_icon') || $displayData['params']->get('show_email_icon')) : ?>
-			<div class="btn-group content-edit-dropdown float-right">
-				<button class="btn dropdown-toggle py-1 px-2" type="button" id="dropdownMenuButton-<?php echo $articleId; ?>" aria-label="<?php echo Text::_('JUSER_TOOLS'); ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-					<span class="fas fa-cog fa-sm" aria-hidden="true"></span>
-					<span class="caret" aria-hidden="true"></span>
-				</button>
-				<?php // Note the actions class is deprecated. Use dropdown-menu instead. 
-				?>
-				<div class="dropdown-menu" aria-labelledby="dropdownMenuButton-<?php echo $articleId; ?>">
-					<?php if ($displayData['params']->get('show_print_icon')) : ?>
-						<li class="dropdown-item print-icon"> <?php echo HTMLHelper::_('icon.print_popup', $displayData['item'], $displayData['params']); ?> </li>
-					<?php endif; ?>
-					<?php if ($displayData['params']->get('show_email_icon')) : ?>
-						<li class="dropdown-item email-icon"> <?php echo HTMLHelper::_('icon.email', $displayData['item'], $displayData['params']); ?> </li>
-					<?php endif; ?>
-					<?php if ($canEdit) : ?>
-						<li class="dropdown-item edit-icon"> <?php echo HTMLHelper::_('icon.edit', $displayData['item'], $displayData['params']); ?> </li>
-					<?php endif; ?>
-				</div>
-			</div>
-		<?php endif; ?>
-
-	<?php else : ?>
-
+<?php if ($canEdit) : ?>
+	<div class="icons">
 		<div class="float-right">
-			<?php echo HTMLHelper::_('icon.print_screen', $displayData['item'], $displayData['params']); ?>
+			<div>
+				<?php echo HTMLHelper::_('icon.edit', $displayData['item'], $displayData['params']); ?>
+			</div>
 		</div>
-
-	<?php endif; ?>
-</div>
+	</div>
+<?php endif; ?>

astroid/astroid-template-zero/html/layouts/joomla/content/icons.php

@@ -4,28 +4,20 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright   (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
-HTMLHelper::_('bootstrap.tooltip');
-
 $params = $displayData['params'];
-$legacy = $displayData['legacy'];
 
 ?>
 <?php if ($params->get('show_icons')) : ?>
-	<?php if ($legacy) : ?>
-		<?php echo HTMLHelper::_('image', 'system/new.png', Text::_('JNEW'), null, true); ?>
-	<?php else : ?>
-		<span class="icon-plus" aria-hidden="true"></span>
-		<?php echo Text::_('JNEW'); ?>
-	<?php endif; ?>
+	<span class="fas fa-plus" aria-hidden="true"></span>
+	<?php echo Text::_('JNEW'); ?>
 <?php else : ?>
 	<?php echo Text::_('JNEW') . '&#160;'; ?>
 <?php endif; ?>