diff --git a/administrator/language/en-GB/en-GB.mod_quickicon.ini b/administrator/language/en-GB/en-GB.mod_quickicon.ini index ef66e982b53..1c5e6cc61dd 100644 --- a/administrator/language/en-GB/en-GB.mod_quickicon.ini +++ b/administrator/language/en-GB/en-GB.mod_quickicon.ini @@ -25,6 +25,7 @@ MOD_QUICKICON_GROUP_LABEL="Group" MOD_QUICKICON_HEADER_ICON_LABEL="Header Icon" MOD_QUICKICON_INSTALL_EXTENSIONS="Install Extensions" MOD_QUICKICON_LANGUAGE_MANAGER="Languages" +MOD_QUICKICON_LOAD_PLUGINS_LABEL="Load 3rd party plugins" MOD_QUICKICON_MAINTENANCE="Maintenance" MOD_QUICKICON_MEDIA_MANAGER="Media" MOD_QUICKICON_MENUITEMS_ADD="New Menu Item" @@ -49,10 +50,10 @@ MOD_QUICKICON_SHOW_MODULES_LABEL="Modules Icon" MOD_QUICKICON_SHOW_OVERRIDEUPDATE_LABEL="Override Update Check" MOD_QUICKICON_SHOW_PLUGINS_LABEL="Plugins Icon" MOD_QUICKICON_SHOW_PRIVACYREQUEST_LABEL="Privacy Requests" -MOD_QUICKICON_LOAD_PLUGINS_LABEL="Load 3rd party plugins" MOD_QUICKICON_SHOW_TEMPLATES_LABEL="Templates Icon" MOD_QUICKICON_SHOW_USERS_LABEL="User Icon" MOD_QUICKICON_SITE="Icons Site" +MOD_QUICKICON_SRONLY_NUMBER_OF="Number of %s" MOD_QUICKICON_STRUCTURE="Structure" MOD_QUICKICON_SYSTEM="Icons System" MOD_QUICKICON_TEMPLATES="Templates" @@ -63,4 +64,5 @@ MOD_QUICKICON_UPDATE="Icons Update" MOD_QUICKICON_USERS="Users" MOD_QUICKICON_USER_MANAGER="Users" MOD_QUICKICON_USER_MANAGER_1="User" +MOD_QUICKICON_WITH_AMOUNT="Show with count" MOD_QUICKICON_XML_DESCRIPTION="This module shows Quick Icons that are visible on the Dashboard (administrator area home page)." diff --git a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php index edca3259a15..70ed2e6eddf 100644 --- a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php +++ b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php @@ -65,21 +65,25 @@ public static function &getButtons(Registry $params, CMSApplication $application if ($params->get('show_users')) { - self::$buttons[$key][] = [ - 'ajaxurl' => 'index.php?option=com_users&task=users.getQuickiconContent&format=json', + $tmp = [ 'image' => 'fa fa-users', 'link' => Route::_('index.php?option=com_users'), - 'linkadd' => Route::_('index.php?option=com_users&task=user.add'), 'name' => 'MOD_QUICKICON_USER_MANAGER', 'access' => array('core.manage', 'com_users', 'core.create', 'com_users'), 'group' => 'MOD_QUICKICON_SITE', ]; + + if ($params->get('show_users') == 2) + { + $tmp['ajaxurl'] = 'index.php?option=com_users&task=users.getQuickiconContent&format=json'; + } + + self::$buttons[$key][] = $tmp; } if ($params->get('show_menuItems')) { - self::$buttons[$key][] = [ - 'ajaxurl' => 'index.php?option=com_menus&task=items.getQuickiconContent&format=json', + $tmp = [ 'image' => 'fa fa-list', 'link' => Route::_('index.php?option=com_menus'), 'linkadd' => Route::_('index.php?option=com_menus&task=item.add'), @@ -87,12 +91,18 @@ public static function &getButtons(Registry $params, CMSApplication $application 'access' => array('core.manage', 'com_menus', 'core.create', 'com_menus'), 'group' => 'MOD_QUICKICON_STRUCTURE', ]; + + if ($params->get('show_menuItems') == 2) + { + $tmp['ajaxurl'] = 'index.php?option=com_menus&task=items.getQuickiconContent&format=json'; + } + + self::$buttons[$key][] = $tmp; } if ($params->get('show_articles')) { - self::$buttons[$key][] = [ - 'ajaxurl' => 'index.php?option=com_content&task=articles.getQuickiconContent&format=json', + $tmp = [ 'image' => 'fa fa-file-alt', 'link' => Route::_('index.php?option=com_content'), 'linkadd' => Route::_('index.php?option=com_content&task=article.add'), @@ -100,12 +110,18 @@ public static function &getButtons(Registry $params, CMSApplication $application 'access' => array('core.manage', 'com_content', 'core.create', 'com_content'), 'group' => 'MOD_QUICKICON_SITE', ]; + + if ($params->get('show_articles') == 2) + { + $tmp['ajaxurl'] = 'index.php?option=com_content&task=articles.getQuickiconContent&format=json'; + } + + self::$buttons[$key][] = $tmp; } if ($params->get('show_categories')) { - self::$buttons[$key][] = [ - 'ajaxurl' => 'index.php?option=com_categories&task=categories.getQuickiconContent&format=json', + $tmp = [ 'link' => Route::_('index.php?option=com_categories'), 'image' => 'fa fa-folder-open', 'linkadd' => Route::_('index.php?option=com_categories&task=category.add'), @@ -113,6 +129,13 @@ public static function &getButtons(Registry $params, CMSApplication $application 'access' => array('core.manage', 'com_categories', 'core.create', 'com_categories'), 'group' => 'MOD_QUICKICON_SITE', ]; + + if ($params->get('show_categories') == 2) + { + $tmp['ajaxurl'] = 'index.php?option=com_categories&task=categories.getQuickiconContent&format=json'; + } + + self::$buttons[$key][] = $tmp; } if ($params->get('show_media')) @@ -128,8 +151,7 @@ public static function &getButtons(Registry $params, CMSApplication $application if ($params->get('show_modules')) { - self::$buttons[$key][] = [ - 'ajaxurl' => 'index.php?option=com_modules&task=modules.getQuickiconContent&format=json', + $tmp = [ 'image' => 'fa fa-cube', 'link' => Route::_('index.php?option=com_modules'), 'linkadd' => Route::_('index.php?option=com_modules&view=select'), @@ -137,18 +159,31 @@ public static function &getButtons(Registry $params, CMSApplication $application 'access' => array('core.manage', 'com_modules'), 'group' => 'MOD_QUICKICON_SITE' ]; + + if ($params->get('show_modules')== 2) + { + $tmp['ajaxurl'] = 'index.php?option=com_modules&task=modules.getQuickiconContent&format=json'; + } + + self::$buttons[$key][] = $tmp; } if ($params->get('show_plugins')) { - self::$buttons[$key][] = [ - 'ajaxurl' => 'index.php?option=com_plugins&task=plugins.getQuickiconContent&format=json', + $tmp = [ 'image' => 'fa fa-plug', 'link' => Route::_('index.php?option=com_plugins'), 'name' => 'MOD_QUICKICON_PLUGIN_MANAGER', 'access' => array('core.manage', 'com_plugins'), 'group' => 'MOD_QUICKICON_SITE' ]; + + if ($params->get('show_plugins') == 2) + { + $tmp['ajaxurl'] = 'index.php?option=com_plugins&task=plugins.getQuickiconContent&format=json'; + } + + self::$buttons[$key][] = $tmp; } if ($params->get('show_templates')) diff --git a/administrator/modules/mod_quickicon/mod_quickicon.xml b/administrator/modules/mod_quickicon/mod_quickicon.xml index 0bba859f100..edf43237489 100644 --- a/administrator/modules/mod_quickicon/mod_quickicon.xml +++ b/administrator/modules/mod_quickicon/mod_quickicon.xml @@ -69,73 +69,73 @@ + + + + + + 0 ? 'warning' : 'success'; @@ -48,6 +51,7 @@ // Set amount of number into counter span counter.textContent = response.data; + counter.insertAdjacentElement('afterbegin', srSpan); } else if (pulse) { pulse.classList.add('error'); } diff --git a/layouts/joomla/quickicons/icon.php b/layouts/joomla/quickicons/icon.php index 02444256b2e..dc46970b3c1 100644 --- a/layouts/joomla/quickicons/icon.php +++ b/layouts/joomla/quickicons/icon.php @@ -60,6 +60,8 @@ $add = ''; $name = ''; } + +$dataSr = 'data-sr="' . Text::sprintf('MOD_QUICKICON_SRONLY_NUMBER_OF', $name) . ':"'; ?>
  • @@ -70,7 +72,7 @@ -
    > +
    >