diff --git a/administrator/components/com_finder/Indexer/Driver/Postgresql.php b/administrator/components/com_finder/Indexer/Driver/Postgresql.php index 594ad5f833c..e1892b10be0 100644 --- a/administrator/components/com_finder/Indexer/Driver/Postgresql.php +++ b/administrator/components/com_finder/Indexer/Driver/Postgresql.php @@ -326,8 +326,8 @@ class Postgresql extends Indexer * new term ids. */ $query = $db->getQuery(true) - ->update($db->quoteName('#__finder_tokens_aggregate') . ' AS ta') - ->join('INNER', $db->quoteName('#__finder_terms') . ' AS t ON t.term = ta.term') + ->update($db->quoteName('#__finder_tokens_aggregate', 'ta')) + ->join('INNER', $db->quoteName('#__finder_terms', 't'), 't.term = ta.term') ->set('term_id = t.term_id') ->where('ta.term_id = 0'); $db->setQuery($query); @@ -342,8 +342,8 @@ class Postgresql extends Indexer * the links counter for each term by one. */ $query->clear() - ->update($db->quoteName('#__finder_terms') . ' AS t') - ->join('INNER', $db->quoteName('#__finder_tokens_aggregate') . ' AS ta ON ta.term_id = t.term_id') + ->update($db->quoteName('#__finder_terms', 't')) + ->join('INNER', $db->quoteName('#__finder_tokens_aggregate', 'ta'), 'ta.term_id = t.term_id') ->set($db->quoteName('links') . ' = t.links + 1'); $db->setQuery($query); $db->execute(); diff --git a/administrator/components/com_tags/tmpl/tag/edit.php b/administrator/components/com_tags/tmpl/tag/edit.php index e63cf563418..7712d3e8434 100644 --- a/administrator/components/com_tags/tmpl/tag/edit.php +++ b/administrator/components/com_tags/tmpl/tag/edit.php @@ -59,7 +59,7 @@ $this->useCoreUI = true;
-
+
@@ -67,8 +67,13 @@ $this->useCoreUI = true;
-
- loadTemplate('metadata'); ?> +
+
+ +
+ +
+
diff --git a/administrator/components/com_tags/views/tags/tmpl/default.xml b/administrator/components/com_tags/tmpl/tags/default.xml similarity index 100% rename from administrator/components/com_tags/views/tags/tmpl/default.xml rename to administrator/components/com_tags/tmpl/tags/default.xml diff --git a/administrator/language/en-GB/en-GB.com_cpanel.ini b/administrator/language/en-GB/en-GB.com_cpanel.ini index bb35260b983..34924f2a89d 100644 --- a/administrator/language/en-GB/en-GB.com_cpanel.ini +++ b/administrator/language/en-GB/en-GB.com_cpanel.ini @@ -4,7 +4,7 @@ ; Note : All ini files need to be saved as UTF-8 COM_CPANEL="Dashboard$" -COM_CPANEL_ADD_DASHBOARD_MODULE="Add dashboard module" +COM_CPANEL_ADD_DASHBOARD_MODULE="Add module to the dashboard" COM_CPANEL_ADD_MODULE_MODAL_TITLE="Add Module" COM_CPANEL_DASHBOARD_BASE_ICON="fa fa-home" COM_CPANEL_DASHBOARD_BASE_TITLE="Control Panel" diff --git a/administrator/language/en-GB/en-GB.mod_menu.ini b/administrator/language/en-GB/en-GB.mod_menu.ini index e82a8017620..4a1a9ca685a 100644 --- a/administrator/language/en-GB/en-GB.mod_menu.ini +++ b/administrator/language/en-GB/en-GB.mod_menu.ini @@ -47,7 +47,7 @@ MOD_MENU_COM_USERS_USERS="Users" MOD_MENU_COMPONENTS="Components" MOD_MENU_CONFIGURATION="Global Configuration" MOD_MENU_CONTROL_PANEL="Home Dashboard" -MOD_MENU_DASHBOARD_LINK="Dashboard" +MOD_MENU_DASHBOARD_LINK="%s Dashboard" MOD_MENU_EXTENSIONS_EXTENSION_MANAGER="Manage" MOD_MENU_EXTENSIONS_EXTENSIONS="Extensions" MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER="Languages" diff --git a/administrator/modules/mod_menu/tmpl/default_submenu.php b/administrator/modules/mod_menu/tmpl/default_submenu.php index cd10fc0ad2f..a6341795e88 100644 --- a/administrator/modules/mod_menu/tmpl/default_submenu.php +++ b/administrator/modules/mod_menu/tmpl/default_submenu.php @@ -127,7 +127,7 @@ if ($current->getParams()->get('menu-quicktask', false)) if ($current->dashboard) { - $titleDashboard = Text::_('MOD_MENU_DASHBOARD_LINK') . ': ' . Text::_($current->title); + $titleDashboard = Text::sprintf('MOD_MENU_DASHBOARD_LINK', Text::_($current->title)); echo '' . '' diff --git a/administrator/templates/atum/template_preview.png b/administrator/templates/atum/template_preview.png index a5eb718d382..fbb99ff77dc 100644 Binary files a/administrator/templates/atum/template_preview.png and b/administrator/templates/atum/template_preview.png differ diff --git a/administrator/templates/atum/template_thumbnail.png b/administrator/templates/atum/template_thumbnail.png index ea155b07cdf..75ebff68b10 100644 Binary files a/administrator/templates/atum/template_thumbnail.png and b/administrator/templates/atum/template_thumbnail.png differ diff --git a/layouts/joomla/form/field/checkboxes.php b/layouts/joomla/form/field/checkboxes.php index a30b4edd802..0f9303c5669 100644 --- a/layouts/joomla/form/field/checkboxes.php +++ b/layouts/joomla/form/field/checkboxes.php @@ -58,7 +58,7 @@ $alt = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $name);
> - + $option) : ?>