@@ -52,7 +56,16 @@
- form->renderFieldset('metadata'); ?>
+
+
+
+
+
diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php
index e86323ee47206..f10f501682021 100644
--- a/administrator/components/com_banners/tmpl/clients/default.php
+++ b/administrator/components/com_banners/tmpl/clients/default.php
@@ -110,9 +110,8 @@
editor, $item->checked_out_time, 'clients.', $canCheckin); ?>
- checked_out ? '' : '
'; ?>
- escape($item->name); ?>
+ escape($item->name); ?>
escape($item->name); ?>
diff --git a/administrator/components/com_cache/Controller/DisplayController.php b/administrator/components/com_cache/Controller/DisplayController.php
index 5e4ab8ca7d4da..cb37d7a60f6de 100644
--- a/administrator/components/com_cache/Controller/DisplayController.php
+++ b/administrator/components/com_cache/Controller/DisplayController.php
@@ -11,8 +11,10 @@
defined('_JEXEC') or die;
+use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Response\JsonResponse;
/**
* Cache Controller
@@ -29,6 +31,44 @@ class DisplayController extends BaseController
*/
protected $default_view = 'cache';
+ /**
+ * Method to get The Cache Size
+ *
+ * @since 4.0
+ */
+ public function getQuickiconContent()
+ {
+ $model = $this->getModel('Cache');
+
+ $data = $model->getData();
+
+ $size = 0;
+
+ if (!empty($data))
+ {
+ foreach ($data as $d)
+ {
+ $size += $d->size;
+ }
+ }
+
+ // Number bytes are returned in format xxx.xx MB
+ $bytes = HTMLHelper::_('number.bytes', $size, 'MB', 1);
+
+ if (!empty($bytes))
+ {
+ $result['amount'] = $bytes;
+ $result['sronly'] = Text::sprintf('COM_CACHE_QUICKICON_SRONLY', $bytes);
+ }
+ else
+ {
+ $result['amount'] = 0;
+ $result['sronly'] = Text::sprintf('COM_CACHE_QUICKICON_SRONLY_NOCACHE');
+ }
+
+ echo new JsonResponse($result);
+ }
+
/**
* Method to delete a list of cache groups.
*
diff --git a/administrator/components/com_categories/Controller/CategoriesController.php b/administrator/components/com_categories/Controller/CategoriesController.php
index 9703c8db66b45..bc5a5ccfd135b 100644
--- a/administrator/components/com_categories/Controller/CategoriesController.php
+++ b/administrator/components/com_categories/Controller/CategoriesController.php
@@ -13,6 +13,7 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Controller\AdminController;
+use Joomla\CMS\Response\JsonResponse;
use Joomla\CMS\Router\Route;
use Joomla\Utilities\ArrayHelper;
@@ -39,6 +40,30 @@ public function getModel($name = 'Category', $prefix = 'Administrator', $config
return parent::getModel($name, $prefix, $config);
}
+ /**
+ * Method to get the number of content categories
+ *
+ * @return string The JSON-encoded amount of published content categories
+ *
+ * @since 4.0
+ */
+ public function getQuickiconContent()
+ {
+ $model = $this->getModel('Categories');
+ $model->setState('filter.published', 1);
+ $model->setState('filter.extension', 'com_content');
+
+ $amount = (int) $model->getTotal();
+
+ $result = [];
+
+ $result['amount'] = $amount;
+ $result['sronly'] = Text::plural('COM_CATEGORIES_N_QUICKICON_SRONLY', $amount);
+ $result['name'] = Text::plural('COM_CATEGORIES_N_QUICKICON', $amount);
+
+ echo new JsonResponse($result);
+ }
+
/**
* Rebuild the nested set tree.
*
diff --git a/administrator/components/com_categories/View/Categories/HtmlView.php b/administrator/components/com_categories/View/Categories/HtmlView.php
index 425691b1f755b..d666c0f233911 100644
--- a/administrator/components/com_categories/View/Categories/HtmlView.php
+++ b/administrator/components/com_categories/View/Categories/HtmlView.php
@@ -190,8 +190,8 @@ protected function addToolbar()
$dropdown = $toolbar->dropdownButton('status-group')
->text('JTOOLBAR_CHANGE_STATUS')
->toggleSplit(false)
- ->icon('fa fa-globe')
- ->buttonClass('btn btn-info')
+ ->icon('fa fa-ellipsis-h')
+ ->buttonClass('btn btn-action')
->listCheck(true);
$childBar = $dropdown->getChildToolbar();
@@ -214,17 +214,17 @@ protected function addToolbar()
{
$childBar->trash('categories.trash')->listCheck(true);
}
- }
- // Add a batch button
- if ($canDo->get('core.create')
- && $canDo->get('core.edit')
- && $canDo->get('core.edit.state'))
- {
- $toolbar->popupButton('batch')
- ->text('JTOOLBAR_BATCH')
- ->selector('collapseModal')
- ->listCheck(true);
+ // Add a batch button
+ if ($canDo->get('core.create')
+ && $canDo->get('core.edit')
+ && $canDo->get('core.edit.state'))
+ {
+ $childBar->popupButton('batch')
+ ->text('JTOOLBAR_BATCH')
+ ->selector('collapseModal')
+ ->listCheck(true);
+ }
}
if ($canDo->get('core.admin'))
diff --git a/administrator/components/com_categories/forms/category.xml b/administrator/components/com_categories/forms/category.xml
index ece1e8adde164..274939725be79 100644
--- a/administrator/components/com_categories/forms/category.xml
+++ b/administrator/components/com_categories/forms/category.xml
@@ -217,31 +217,34 @@
section="category"
/>
-
-
-