Skip to content

[4.0] Moving com_finder submenu to mainmenu #24020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Hackwar wants to merge 20 commits into from
Closed

[4.0] Moving com_finder submenu to mainmenu #24020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
12ec122
Moving com_finder submenu to mainmenu
Hackwar Feb 26, 2019
544ace4
Fixing language string
Hackwar Feb 26, 2019
8ac7581
Merge branch '4.0-dev' into j4findermenu
infograf768 Mar 4, 2019
e5e4b8b
Merge branch '4.0-dev' into j4findermenu
infograf768 Mar 4, 2019
4ac790c
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into j…
Hackwar May 20, 2019
52a69fd
Merge branch 'j4findermenu' of github.com:Hackwar/joomla-cms into j4f…
Hackwar May 20, 2019
06d004c
Removing obsolete strings
Hackwar May 20, 2019
133bcf6
Merge branch '4.0-dev' into j4findermenu
Hackwar Jun 9, 2019
550b966
Fixing timestamp default value
Hackwar Jun 9, 2019
e525eb7
Fixing timestamp default value
Hackwar Jun 9, 2019
805c62d
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into j…
Hackwar Jun 14, 2019
d28f4b9
Removing use statement
Hackwar Jun 24, 2019
f0c66ea
Reverting mistakenly changed file
Hackwar Jun 24, 2019
d9de338
Merge branch '4.0-dev' into j4findermenu
Hackwar Jun 24, 2019
5cf791e
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into j…
Hackwar Aug 21, 2019
9f32daa
Removing unnecessary imports
Hackwar Aug 21, 2019
1242765
Updating joomla/database
Hackwar Aug 21, 2019
822d13b
Merge branch '4.0-dev' into j4findermenu
Hackwar Aug 26, 2019
dcde6dd
Merge branch '4.0-dev' into j4findermenu
infograf768 Aug 29, 2019
7e9fac5
Merge branch '4.0-dev' into j4findermenu
roland-d Aug 31, 2019
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
5 changes: 5 additions & 0 deletions administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-02-26.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
5 changes: 5 additions & 0 deletions administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-02-26.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
34 changes: 0 additions & 34 deletions administrator/components/com_finder/Helper/FinderHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
defined('_JEXEC') or die;

use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;

/**
* Helper class for Finder.
Expand All @@ -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.
*
Expand Down
13 changes: 0 additions & 13 deletions administrator/components/com_finder/View/Filters/HtmlView.php
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 0 additions & 4 deletions administrator/components/com_finder/View/Searches/HtmlView.php
View file
Open in desktop
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
15 changes: 15 additions & 0 deletions administrator/components/com_finder/finder.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,21 @@
<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/Index">COM_FINDER_MAPS</menu>
<menu link="option=com_finder&amp;view=filters" img="class:finder"
alt="Smart Search/Index">COM_FINDER_FILTERS</menu>
<menu link="option=com_finder&amp;view=searches" img="class:finder"
alt="Smart Search/Searches">COM_FINDER_SEARCHES</menu>
</submenu>
<files folder="admin">
<filename>access.xml</filename>
<filename>config.xml</filename>
Expand Down
5 changes: 1 addition & 4 deletions administrator/components/com_finder/tmpl/filters/default.php
View file
Open in desktop
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
8 changes: 8 additions & 0 deletions administrator/components/com_finder/tmpl/filters/default.xml
View file
Open in desktop
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/index/default.php
View file
Open in desktop
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
View file
Open in desktop
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_INDEX_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_FINDER_INDEX_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
5 changes: 1 addition & 4 deletions administrator/components/com_finder/tmpl/maps/default.php
View file
Open in desktop
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
View file
Open in desktop
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>
5 changes: 1 addition & 4 deletions administrator/components/com_finder/tmpl/searches/default.php
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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"
2 changes: 1 addition & 1 deletion composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading