Frontediting fix

Author: hiteshaggarwal

astroid/astroid-framework/plugins/astroid/astroid.php

@@ -13,6 +13,8 @@
 JLoader::registerNamespace('Astroid', JPATH_LIBRARIES . '/astroid/framework/library/astroid', false, false, 'psr4');
 
 use Astroid\Framework;
+use Astroid\Helper;
+use Astroid\Helper\Template;
 
 /**
  * Astroid system plugin
@@ -30,23 +32,24 @@ public function onAfterRoute()
       $option = $this->app->input->get('option', '');
       $astroid = $this->app->input->get('astroid', '');
       if ($option == 'com_ajax' && !empty($astroid)) {
-         Astroid\Framework::getClient()->execute($astroid);
+         Framework::getClient()->execute($astroid);
       }
    }
 
    public function onContentPrepareForm($form, $data)
    {
-      Astroid\Framework::getClient()->onContentPrepareForm($form, $data);
+      Framework::getClient()->onContentPrepareForm($form, $data);
    }
 
    public function onAfterRender()
    {
-      Astroid\Framework::getClient()->onAfterRender();
+      if (Framework::isAdmin()) return;
+      Framework::getClient()->onAfterRender();
    }
 
    public function onAfterRespond()
    {
-      if (!(Astroid\Helper::getPluginParams()->get('astroid_debug', 0)) || Framework::isAdmin()) {
+      if (!(Helper::getPluginParams()->get('astroid_debug', 0)) || Framework::isAdmin()) {
          return;
       }
 
@@ -61,15 +64,15 @@ public function onAfterRespond()
       if ($contents) {
          ob_end_clean();
       }
-      echo Astroid\Helper::str_lreplace('</body>', Astroid\Helper::debug() . '</body>', $contents);
+      echo Helper::str_lreplace('</body>', Helper::debug() . '</body>', $contents);
    }
 
    public function onExtensionAfterSave($context, $table, $isNew)
    {
-      if (Astroid\Framework::isAdmin() && $context == "com_templates.style" && $isNew && Astroid\Helper\Template::isAstroidTemplate($table->template)) {
+      if (Framework::isAdmin() && $context == "com_templates.style" && $isNew && Template::isAstroidTemplate($table->template)) {
          $params = \json_decode($table->params, TRUE);
          $parent_id = $params['astroid'];
-         Astroid\Helper\Template::setTemplateDefaults($table->template, $table->id, $parent_id);
+         Template::setTemplateDefaults($table->template, $table->id, $parent_id);
       }
    }
 

astroid/astroid-template-one/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 {
@@ -67,12 +69,6 @@
    <?php $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date') || $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author') || $assocParam || $template->params->get('astroid_readtime', 1));
    ?>
 
-   <?php if (!$useDefList && $this->print) : ?>
-      <div id="pop-print" class="btn hidden-print">
-         <?php echo HTMLHelper::_('icon.print_screen', $this->item, $params); ?>
-      </div>
-      <div class="clearfix"> </div>
-   <?php endif; ?>
    <?php $astroidArticle->render('above-title'); ?>
    <?php if (($params->get('show_title') || $params->get('show_author'))) : ?>
       <div class="item-title">
@@ -95,16 +91,9 @@
          <?php endif; ?>
       </div>
    <?php endif; ?>
-   <?php if (!$this->print) : ?>
-      <?php if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
-         <?php echo LayoutHelper::render('joomla.content.icons', array('params' => $params, 'item' => $this->item, 'print' => false)); ?>
-      <?php endif; ?>
-   <?php else : ?>
-      <?php if ($useDefList) : ?>
-         <div id="pop-print" class="btn hidden-print">
-            <?php echo HTMLHelper::_('icon.print_screen', $this->item, $params); ?>
-         </div>
-      <?php endif; ?>
+
+   <?php if ($canEdit) : ?>
+      <?php echo LayoutHelper::render('joomla.content.icons', array('params' => $params, 'item' => $this->item)); ?>
    <?php endif; ?>
 
    <?php // Content is generated by content plugin event "onContentAfterTitle"