diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-02-26.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-02-26.sql new file mode 100644 index 0000000000000..ef8e83d352b3c --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-02-26.sql @@ -0,0 +1,5 @@ +INSERT INTO `#__menu` (`menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `home`, `language`, `client_id`) VALUES +('main', 'com_finder_index', 'Smart-Search-Index', '', 'Smart Search/Index', 'index.php?option=com_finder&view=index', 'component', 1, 18, 2, 27, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 0, '*', 1), +('main', 'com_finder_maps', 'Smart-Search-Maps', '', 'Smart Search/Maps', 'index.php?option=com_finder&view=maps', 'component', 1, 18, 2, 27, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 0, '*', 1), +('main', 'com_finder_filters', 'Smart-Search-Filters', '', 'Smart Search/Filters', 'index.php?option=com_finder&view=filters', 'component', 1, 18, 2, 27, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 0, '*', 1), +('main', 'com_finder_searches', 'Smart-Search-Searches', '', 'Smart Search/Searches', 'index.php?option=com_finder&view=searches', 'component', 1, 18, 2, 27, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 0, '*', 1); diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-02-26.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-02-26.sql new file mode 100644 index 0000000000000..f0fe5acc213b9 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-02-26.sql @@ -0,0 +1,5 @@ +INSERT INTO "#__menu" ("menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "home", "language", "client_id") VALUES +('main', 'com_finder_index', 'Smart-Search-Index', '', 'Smart Search/Index', 'index.php?option=com_finder&view=index', 'component', 1, 18, 2, 27, 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 0, '*', 1), +('main', 'com_finder_maps', 'Smart-Search-Maps', '', 'Smart Search/Maps', 'index.php?option=com_finder&view=maps', 'component', 1, 18, 2, 27, 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 0, '*', 1), +('main', 'com_finder_filters', 'Smart-Search-Filters', '', 'Smart Search/Filters', 'index.php?option=com_finder&view=filters', 'component', 1, 18, 2, 27, 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 0, '*', 1), +('main', 'com_finder_searches', 'Smart-Search-Searches', '', 'Smart Search/Searches', 'index.php?option=com_finder&view=searches', 'component', 1, 18, 2, 27, 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 0, '*', 1); diff --git a/administrator/components/com_finder/Helper/FinderHelper.php b/administrator/components/com_finder/Helper/FinderHelper.php index 7f6f3e5e8abcb..a87508304ead2 100644 --- a/administrator/components/com_finder/Helper/FinderHelper.php +++ b/administrator/components/com_finder/Helper/FinderHelper.php @@ -12,7 +12,6 @@ defined('_JEXEC') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; /** * Helper class for Finder. @@ -29,39 +28,6 @@ class FinderHelper */ public static $extension = 'com_finder'; - /** - * Configure the Linkbar. - * - * @param string $vName The name of the active view. - * - * @return void - * - * @since 2.5 - */ - public static function addSubmenu($vName) - { - \JHtmlSidebar::addEntry( - Text::_('COM_FINDER_SUBMENU_INDEX'), - 'index.php?option=com_finder&view=index', - $vName === 'index' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_FINDER_SUBMENU_MAPS'), - 'index.php?option=com_finder&view=maps', - $vName === 'maps' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_FINDER_SUBMENU_FILTERS'), - 'index.php?option=com_finder&view=filters', - $vName === 'filters' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_FINDER_SUBMENU_SEARCHES'), - 'index.php?option=com_finder&view=searches', - $vName === 'searches' - ); - } - /** * Gets the finder system plugin extension id. * diff --git a/administrator/components/com_finder/View/Filters/HtmlView.php b/administrator/components/com_finder/View/Filters/HtmlView.php index 28319c59c8292..8494ab4d66232 100644 --- a/administrator/components/com_finder/View/Filters/HtmlView.php +++ b/administrator/components/com_finder/View/Filters/HtmlView.php @@ -18,7 +18,6 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; -use Joomla\Component\Finder\Administrator\Helper\FinderHelper; /** * Filters view class for Finder. @@ -45,15 +44,6 @@ class HtmlView extends BaseHtmlView */ protected $pagination; - /** - * The HTML markup for the sidebar - * - * @var string - * - * @since 3.6.1 - */ - protected $sidebar; - /** * The model state * @@ -107,8 +97,6 @@ public function display($tpl = null) $this->filterForm = $this->get('FilterForm'); $this->activeFilters = $this->get('ActiveFilters'); - FinderHelper::addSubmenu('filters'); - // Check for errors. if (count($errors = $this->get('Errors'))) { @@ -119,7 +107,6 @@ public function display($tpl = null) // Configure the toolbar. $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); return parent::display($tpl); } diff --git a/administrator/components/com_finder/View/Index/HtmlView.php b/administrator/components/com_finder/View/Index/HtmlView.php index 470ce4e83b001..c40933ab5f996 100644 --- a/administrator/components/com_finder/View/Index/HtmlView.php +++ b/administrator/components/com_finder/View/Index/HtmlView.php @@ -58,15 +58,6 @@ class HtmlView extends BaseHtmlView */ protected $pluginState; - /** - * The HTML markup for the sidebar - * - * @var string - * - * @since 3.6.1 - */ - protected $sidebar; - /** * The model state * @@ -123,8 +114,6 @@ public function display($tpl = null) $this->filterForm = $this->get('FilterForm'); $this->activeFilters = $this->get('ActiveFilters'); - FinderHelper::addSubmenu('index'); - // We do not need to filter by language when multilingual is disabled if (!Multilanguage::isEnabled()) { @@ -159,7 +148,6 @@ public function display($tpl = null) // Configure the toolbar. $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); return parent::display($tpl); } diff --git a/administrator/components/com_finder/View/Maps/HtmlView.php b/administrator/components/com_finder/View/Maps/HtmlView.php index c7cf7079a7e66..e1eac1a9985dd 100644 --- a/administrator/components/com_finder/View/Maps/HtmlView.php +++ b/administrator/components/com_finder/View/Maps/HtmlView.php @@ -18,7 +18,6 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; -use Joomla\Component\Finder\Administrator\Helper\FinderHelper; use Joomla\Component\Finder\Administrator\Helper\FinderHelperLanguage; /** @@ -46,15 +45,6 @@ class HtmlView extends BaseHtmlView */ protected $pagination; - /** - * The HTML markup for the sidebar - * - * @var string - * - * @since 3.6.1 - */ - protected $sidebar; - /** * The model state * @@ -111,8 +101,6 @@ public function display($tpl = null) $this->filterForm = $this->get('FilterForm'); $this->activeFilters = $this->get('ActiveFilters'); - FinderHelper::addSubmenu('maps'); - // Check for errors. if (count($errors = $this->get('Errors'))) { @@ -123,7 +111,6 @@ public function display($tpl = null) // Prepare the view. $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); return parent::display($tpl); } diff --git a/administrator/components/com_finder/View/Searches/HtmlView.php b/administrator/components/com_finder/View/Searches/HtmlView.php index 7d0635a390289..2b4336b39b8f3 100644 --- a/administrator/components/com_finder/View/Searches/HtmlView.php +++ b/administrator/components/com_finder/View/Searches/HtmlView.php @@ -17,7 +17,6 @@ use Joomla\CMS\MVC\View\GenericDataException; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; -use Joomla\Component\Finder\Administrator\Helper\FinderHelper; /** * View class for a list of search terms. @@ -102,8 +101,6 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } - FinderHelper::addSubmenu('searches'); - // Check if plugin is enabled if (!$this->enabled) { @@ -112,7 +109,6 @@ public function display($tpl = null) // Prepare the view. $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); return parent::display($tpl); } diff --git a/administrator/components/com_finder/finder.xml b/administrator/components/com_finder/finder.xml index 2e3baff5ea895..d37d6d78c89fc 100644 --- a/administrator/components/com_finder/finder.xml +++ b/administrator/components/com_finder/finder.xml @@ -40,6 +40,21 @@ language/en-GB.com_finder.ini + COM_FINDER + + + COM_FINDER_INDEX + COM_FINDER_MAPS + COM_FINDER_FILTERS + COM_FINDER_SEARCHES + access.xml config.xml diff --git a/administrator/components/com_finder/tmpl/filters/default.php b/administrator/components/com_finder/tmpl/filters/default.php index 65f3f717e3f46..0223da8250c28 100644 --- a/administrator/components/com_finder/tmpl/filters/default.php +++ b/administrator/components/com_finder/tmpl/filters/default.php @@ -25,10 +25,7 @@ ?>
-
- sidebar; ?> -
-
+
$this)); ?> items)) : ?> diff --git a/administrator/components/com_finder/tmpl/filters/default.xml b/administrator/components/com_finder/tmpl/filters/default.xml new file mode 100644 index 0000000000000..f600047125d00 --- /dev/null +++ b/administrator/components/com_finder/tmpl/filters/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_finder/tmpl/index/default.php b/administrator/components/com_finder/tmpl/index/default.php index 6f205266b3c24..516f9b34d6aad 100644 --- a/administrator/components/com_finder/tmpl/index/default.php +++ b/administrator/components/com_finder/tmpl/index/default.php @@ -27,10 +27,7 @@ ?>
-
- sidebar; ?> -
-
+
$this)); ?> items)) : ?> diff --git a/administrator/components/com_finder/tmpl/index/default.xml b/administrator/components/com_finder/tmpl/index/default.xml new file mode 100644 index 0000000000000..4a58d10c23423 --- /dev/null +++ b/administrator/components/com_finder/tmpl/index/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_finder/tmpl/maps/default.php b/administrator/components/com_finder/tmpl/maps/default.php index 8267814fc9821..bc86a6ab955b7 100644 --- a/administrator/components/com_finder/tmpl/maps/default.php +++ b/administrator/components/com_finder/tmpl/maps/default.php @@ -26,10 +26,7 @@ ?>
-
- sidebar; ?> -
-
+
$this)); ?> items)) : ?> diff --git a/administrator/components/com_finder/tmpl/maps/default.xml b/administrator/components/com_finder/tmpl/maps/default.xml new file mode 100644 index 0000000000000..713592b9ddecf --- /dev/null +++ b/administrator/components/com_finder/tmpl/maps/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_finder/tmpl/searches/default.php b/administrator/components/com_finder/tmpl/searches/default.php index dd536b75621f2..beab0f41279f8 100644 --- a/administrator/components/com_finder/tmpl/searches/default.php +++ b/administrator/components/com_finder/tmpl/searches/default.php @@ -24,10 +24,7 @@ ?>
-
- sidebar; ?> -
-
+
$this, 'options' => array('filterButton' => false))); ?> items)) : ?> diff --git a/administrator/components/com_finder/tmpl/searches/default.xml b/administrator/components/com_finder/tmpl/searches/default.xml new file mode 100644 index 0000000000000..d27195a4aa718 --- /dev/null +++ b/administrator/components/com_finder/tmpl/searches/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/language/en-GB/en-GB.com_finder.ini b/administrator/language/en-GB/en-GB.com_finder.ini index 674242f3c9bfb..03bbc3b110277 100644 --- a/administrator/language/en-GB/en-GB.com_finder.ini +++ b/administrator/language/en-GB/en-GB.com_finder.ini @@ -185,8 +185,4 @@ COM_FINDER_STATISTICS_LINK_TYPE_HEADING="Link Type" COM_FINDER_STATISTICS_LINK_TYPE_TOTAL="Total" COM_FINDER_STATISTICS_STATS_DESCRIPTION="The indexed content on this site includes %s terms across %s links with %s attributes in %s branches." COM_FINDER_STATISTICS_TITLE="Smart Search Statistics" -COM_FINDER_SUBMENU_FILTERS="Search Filters" -COM_FINDER_SUBMENU_INDEX="Indexed Content" -COM_FINDER_SUBMENU_MAPS="Content Maps" -COM_FINDER_SUBMENU_SEARCHES="Statistics" COM_FINDER_XML_DESCRIPTION="Smart Search." diff --git a/administrator/language/en-GB/en-GB.com_finder.sys.ini b/administrator/language/en-GB/en-GB.com_finder.sys.ini index 4d7ecca042fd5..fc99926b68237 100644 --- a/administrator/language/en-GB/en-GB.com_finder.sys.ini +++ b/administrator/language/en-GB/en-GB.com_finder.sys.ini @@ -4,6 +4,18 @@ ; Note : All ini files need to be saved as UTF-8 COM_FINDER="Smart Search" +COM_FINDER_FILTERS="Filters" +COM_FINDER_FILTERS_VIEW_DEFAULT_DESC="Shows a list of all content filters." +COM_FINDER_FILTERS_VIEW_DEFAULT_TITLE="List All Filters" +COM_FINDER_INDEX="Index" +COM_FINDER_INDEX_VIEW_DEFAULT_DESC="Shows a list of all indexed items." +COM_FINDER_INDEX_VIEW_DEFAULT_TITLE="List Search Index" +COM_FINDER_MAPS="Content Maps" +COM_FINDER_MAPS_VIEW_DEFAULT_DESC="Shows a list of all content maps." +COM_FINDER_MAPS_VIEW_DEFAULT_TITLE="List Content Maps" COM_FINDER_MENU_SEARCH_VIEW_DEFAULT_TEXT="The default search layout." COM_FINDER_MENU_SEARCH_VIEW_DEFAULT_TITLE="Search" +COM_FINDER_SEARCHES="Statistics" +COM_FINDER_SEARCHES_VIEW_DEFAULT_DESC="Shows statistics of the searches users have done." +COM_FINDER_SEARCHES_VIEW_DEFAULT_TITLE="Search Statistics" COM_FINDER_XML_DESCRIPTION="Smart Search" diff --git a/composer.lock b/composer.lock index 694d0d073f2f3..9133ed8ee0392 100644 --- a/composer.lock +++ b/composer.lock @@ -5557,7 +5557,7 @@ "email": "puneet.kala@community.joomla.org" }, { - "name": "Javier Gomez", + "name": "Javier Gómez", "email": "javier.gomez@community.joomla.org" } ], diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index 013d35456c48d..2290a8947681e 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -1307,7 +1307,7 @@ CREATE TABLE IF NOT EXISTS `#__menu` ( -- INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES -(1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '0000-00-00 00:00:00', 0, 0, '', 0, '', 0, 37, 0, '*', 0); +(1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '0000-00-00 00:00:00', 0, 0, '', 0, '', 0, 43, 0, '*', 0); INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) SELECT 2, 'main', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 1, 1, 1, `extension_id`, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 1, 10, 0, '*', 1 FROM `#__extensions` WHERE `name` = 'com_banners'; INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) @@ -1335,13 +1335,21 @@ SELECT 13, 'main', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'inde INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) SELECT 14, 'main', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&view=categories&extension=com_newsfeeds', 'component', 1, 13, 2, `extension_id`, 0, '0000-00-00 00:00:00', 0, 0, 'class:newsfeeds-cat', 0, '', 24, 25, 0, '*', 1 FROM `#__extensions` WHERE `name` = 'com_categories'; INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) -SELECT 15, 'main', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder&view=index', 'component', 1, 1, 1, `extension_id`, 0, '0000-00-00 00:00:00', 0, 0, 'class:finder', 0, '', 27, 28, 0, '*', 1 FROM `#__extensions` WHERE `name` = 'com_finder'; +SELECT 15, 'main', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder&view=index', 'component', 1, 1, 1, `extension_id`, 0, '0000-00-00 00:00:00', 0, 0, 'class:finder', 0, '', 27, 36, 0, '*', 1 FROM `#__extensions` WHERE `name` = 'com_finder'; INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) -SELECT 16, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags&view=tags', 'component', 1, 1, 1, `extension_id`, 0, '0000-00-00 00:00:00', 0, 1, 'class:tags', 0, '', 29, 30, 0, '', 1 FROM `#__extensions` WHERE `name` = 'com_tags'; +SELECT 16, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags&view=tags', 'component', 1, 1, 1, `extension_id`, 0, '0000-00-00 00:00:00', 0, 1, 'class:tags', 0, '', 37, 38, 0, '', 1 FROM `#__extensions` WHERE `name` = 'com_tags'; INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) -SELECT 17, 'main', 'com_associations', 'Multilingual Associations', '', 'Multilingual Associations', 'index.php?option=com_associations&view=associations', 'component', 1, 1, 1, `extension_id`, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 31, 32, 0, '*', 1 FROM `#__extensions` WHERE `name` = 'com_associations'; +SELECT 17, 'main', 'com_associations', 'Multilingual Associations', '', 'Multilingual Associations', 'index.php?option=com_associations&view=associations', 'component', 1, 1, 1, `extension_id`, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 39, 40, 0, '*', 1 FROM `#__extensions` WHERE `name` = 'com_associations'; INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) -SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, `extension_id`, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 35, 36, 1, '*', 0 FROM `#__extensions` WHERE `name` = 'com_content'; +SELECT 18, 'main', 'com_finder_index', 'Smart-Search-Index', '', 'Smart Search/Index', 'index.php?option=com_finder&view=index', 'component', 1, 15, 2, `extension_id`, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 28, 29, 0, '*', 1 FROM `#__extensions` WHERE `name` = 'com_finder'; +INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) +SELECT 19, 'main', 'com_finder_maps', 'Smart-Search-Maps', '', 'Smart Search/Maps', 'index.php?option=com_finder&view=maps', 'component', 1, 15, 2, `extension_id`, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 30, 31, 0, '*', 1 FROM `#__extensions` WHERE `name` = 'com_finder'; +INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) +SELECT 20, 'main', 'com_finder_filters', 'Smart-Search-Filters', '', 'Smart Search/Filters', 'index.php?option=com_finder&view=filters', 'component', 1, 15, 2, `extension_id`, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 32, 33, 0, '*', 1 FROM `#__extensions` WHERE `name` = 'com_finder'; +INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) +SELECT 21, 'main', 'com_finder_searches', 'Smart-Search-Searches', '', 'Smart Search/Searches', 'index.php?option=com_finder&view=searches', 'component', 1, 15, 2, `extension_id`, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 34, 35, 0, '*', 1 FROM `#__extensions` WHERE `name` = 'com_finder'; +INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) +SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, `extension_id`, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 41, 42, 1, '*', 0 FROM `#__extensions` WHERE `name` = 'com_content'; -- -------------------------------------------------------- diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index 3728af907552a..ad88a11b84682 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -1310,7 +1310,7 @@ COMMENT ON COLUMN "#__menu"."home" IS 'Indicates if this menu item is the home o -- INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") VALUES -(1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '1970-01-01 00:00:00', 0, 0, '', 0, '', 0, 37, 0, '*', 0); +(1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '1970-01-01 00:00:00', 0, 0, '', 0, '', 0, 43, 0, '*', 0); INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") SELECT 2, 'main', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 1, 1, 1, "extension_id", 0, '1970-01-01 00:00:00', 0, 0, 'class:banners', 0, '', 1, 10, 0, '*', 1 FROM "#__extensions" WHERE "name" = 'com_banners'; INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") @@ -1338,13 +1338,21 @@ SELECT 13, 'main', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'inde INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") SELECT 14, 'main', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&view=categories&extension=com_newsfeeds', 'component', 1, 13, 2, "extension_id", 0, '1970-01-01 00:00:00', 0, 0, 'class:newsfeeds-cat', 0, '', 24, 25, 0, '*', 1 FROM "#__extensions" WHERE "name" = 'com_categories'; INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") -SELECT 15, 'main', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder&view=index', 'component', 1, 1, 1, "extension_id", 0, '1970-01-01 00:00:00', 0, 0, 'class:finder', 0, '', 27, 28, 0, '*', 1 FROM "#__extensions" WHERE "name" = 'com_finder'; +SELECT 15, 'main', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder&view=index', 'component', 1, 1, 1, "extension_id", 0, '1970-01-01 00:00:00', 0, 0, 'class:finder', 0, '', 27, 36, 0, '*', 1 FROM "#__extensions" WHERE "name" = 'com_finder'; INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") -SELECT 16, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags&view=tags', 'component', 1, 1, 1, "extension_id", 0, '1970-01-01 00:00:00', 0, 1, 'class:tags', 0, '', 29, 30, 0, '', 1 FROM "#__extensions" WHERE "name" = 'com_tags'; +SELECT 16, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags&view=tags', 'component', 1, 1, 1, "extension_id", 0, '1970-01-01 00:00:00', 0, 1, 'class:tags', 0, '', 37, 38, 0, '', 1 FROM "#__extensions" WHERE "name" = 'com_tags'; INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") -SELECT 17, 'main', 'com_associations', 'Multilingual Associations', '', 'Multilingual Associations', 'index.php?option=com_associations&view=associations', 'component', 1, 1, 1, "extension_id", 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 31, 32, 0, '*', 1 FROM "#__extensions" WHERE "name" = 'com_associations'; +SELECT 17, 'main', 'com_associations', 'Multilingual Associations', '', 'Multilingual Associations', 'index.php?option=com_associations&view=associations', 'component', 1, 1, 1, "extension_id", 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 39, 40, 0, '*', 1 FROM "#__extensions" WHERE "name" = 'com_associations'; INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") -SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, "extension_id", 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 35, 36, 1, '*', 0 FROM "#__extensions" WHERE "name" = 'com_content'; +SELECT 18, 'main', 'com_finder_index', 'Smart-Search-Index', '', 'Smart Search/Index', 'index.php?option=com_finder&view=index', 'component', 1, 15, 2, "extension_id", 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 41, 42, 0, '*', 1 FROM "#__extensions" WHERE "name" = 'com_finder'; +INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") +SELECT 19, 'main', 'com_finder_maps', 'Smart-Search-Maps', '', 'Smart Search/Maps', 'index.php?option=com_finder&view=maps', 'component', 1, 15, 2, "extension_id", 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 30, 31, 0, '*', 1 FROM "#__extensions" WHERE "name" = 'com_finder'; +INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") +SELECT 20, 'main', 'com_finder_filters', 'Smart-Search-Filters', '', 'Smart Search/Filters', 'index.php?option=com_finder&view=filters', 'component', 1, 15, 2, "extension_id", 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 32, 33, 0, '*', 1 FROM "#__extensions" WHERE "name" = 'com_finder'; +INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") +SELECT 21, 'main', 'com_finder_searches', 'Smart-Search-Searches', '', 'Smart Search/Searches', 'index.php?option=com_finder&view=searches', 'component', 1, 15, 2, "extension_id", 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 34, 35, 0, '*', 1 FROM "#__extensions" WHERE "name" = 'com_finder'; +INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") +SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, "extension_id", 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 41, 42, 1, '*', 0 FROM "#__extensions" WHERE "name" = 'com_content'; SELECT setval('#__menu_id_seq', 102, false);