Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions administrator/components/com_finder/Helper/FinderHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,39 +29,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.
*
Expand Down
13 changes: 0 additions & 13 deletions administrator/components/com_finder/View/Filters/HtmlView.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
*
Expand Down Expand Up @@ -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')))
{
Expand All @@ -119,7 +107,6 @@ public function display($tpl = null)

// Configure the toolbar.
$this->addToolbar();
$this->sidebar = \JHtmlSidebar::render();

return parent::display($tpl);
}
Expand Down
12 changes: 0 additions & 12 deletions administrator/components/com_finder/View/Index/HtmlView.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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())
{
Expand Down Expand Up @@ -159,7 +148,6 @@ public function display($tpl = null)

// Configure the toolbar.
$this->addToolbar();
$this->sidebar = \JHtmlSidebar::render();

return parent::display($tpl);
}
Expand Down
13 changes: 0 additions & 13 deletions administrator/components/com_finder/View/Maps/HtmlView.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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
*
Expand Down Expand Up @@ -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')))
{
Expand All @@ -123,7 +111,6 @@ public function display($tpl = null)

// Prepare the view.
$this->addToolbar();
$this->sidebar = \JHtmlSidebar::render();

return parent::display($tpl);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)
{
Expand All @@ -112,7 +109,6 @@ public function display($tpl = null)

// Prepare the view.
$this->addToolbar();
$this->sidebar = \JHtmlSidebar::render();

return parent::display($tpl);
}
Expand Down
16 changes: 16 additions & 0 deletions administrator/components/com_finder/finder.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,22 @@
<languages folder="site">
<language tag="en-GB">language/en-GB.com_finder.ini</language>
</languages>
<administration>
<menu img="class:finder">COM_FINDER</menu>
<submenu>
<!--
Note that all & must be escaped to &amp; for the file to be valid
XML and be parsed by the installer
-->
<menu link="option=com_finder&amp;view=index" img="class:finder"
alt="Smart Search/Index">COM_FINDER_INDEX</menu>
<menu link="option=com_finder&amp;view=maps" img="class:finder"
alt="Smart Search/Maps">COM_FINDER_MAPS</menu>
<menu link="option=com_finder&amp;view=filters" img="class:finder"
alt="Smart Search/Filters">COM_FINDER_FILTERS</menu>
<menu link="option=com_finder&amp;view=searches" img="class:finder"
alt="Smart Search/Searches">COM_FINDER_SEARCHES</menu>
</submenu>
<administration>
<files folder="admin">
<filename>access.xml</filename>
Expand Down
5 changes: 1 addition & 4 deletions administrator/components/com_finder/tmpl/filters/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@
?>
<form action="<?php echo Route::_('index.php?option=com_finder&view=filters'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row">
<div id="j-sidebar-container" class="col-md-2">
<?php echo $this->sidebar; ?>
</div>
<div class="col-md-10">
<div class="col-md-12">
<div id="j-main-container" class="j-main-container">
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if (empty($this->items)) : ?>
Expand Down
5 changes: 1 addition & 4 deletions administrator/components/com_finder/tmpl/index/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@
?>
<form action="<?php echo Route::_('index.php?option=com_finder&view=index'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row">
<div id="j-sidebar-container" class="col-md-2">
<?php echo $this->sidebar; ?>
</div>
<div class="col-md-10">
<div class="col-md-12">
<div id="j-main-container" class="j-main-container">
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if (empty($this->items)) : ?>
Expand Down
8 changes: 8 additions & 0 deletions administrator/components/com_finder/tmpl/index/default.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_FINDER_FILTERS_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_FINDER_FILTERS_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
5 changes: 1 addition & 4 deletions administrator/components/com_finder/tmpl/maps/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@
?>
<form action="<?php echo Route::_('index.php?option=com_finder&view=maps'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row">
<div id="j-sidebar-container" class="col-md-2">
<?php echo $this->sidebar; ?>
</div>
<div class="col-md-10">
<div class="col-md-12">
<div id="j-main-container" class="j-main-container">
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if (empty($this->items)) : ?>
Expand Down
8 changes: 8 additions & 0 deletions administrator/components/com_finder/tmpl/maps/default.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_FINDER_MAPS_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_FINDER_MAPS_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
?>
<form action="<?php echo Route::_('index.php?option=com_finder&view=searches'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row">
<div id="j-sidebar-container" class="col-md-2">
<?php echo $this->sidebar; ?>
</div>
<div class="col-md-10">
<div class="col-md-12">
<div id="j-main-container" class="j-main-container">
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
<?php if (empty($this->items)) : ?>
Expand Down
8 changes: 8 additions & 0 deletions administrator/components/com_finder/tmpl/searches/default.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_FINDER_SEARCHES_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_FINDER_SEARCHES_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
4 changes: 0 additions & 4 deletions administrator/language/en-GB/en-GB.com_finder.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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."
12 changes: 12 additions & 0 deletions administrator/language/en-GB/en-GB.com_finder.sys.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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"
16 changes: 12 additions & 4 deletions installation/sql/mysql/joomla.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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`)
Expand Down Expand Up @@ -1335,11 +1335,19 @@ 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, 12, 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 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 18, 'main', 'com_messages_manager', 'Private Messages', '', 'Messaging/Private Messages', 'index.php?option=com_messages&view=messages', 'component', 1, 10, 2, `extension_id`, 0, '0000-00-00 00:00:00', 0, 0, 'class:messages-add', 0, '', 18, 19, 0, '*', 1 FROM `#__extensions` WHERE `name` = 'com_messages';
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`)
Expand Down