Skip to content
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.

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

pkp/pkp-lib#5199 Set the current page on the top menu - OPS 3.4 #620

Open
wants to merge 2 commits into
base: stable-3_4_0
Choose a base branch
from
Open
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
53 changes: 51 additions & 2 deletions plugins/themes/default/DefaultThemePlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
/**
* @file plugins/themes/default/DefaultThemePlugin.php
*
* Copyright (c) 2014-2022 Simon Fraser University
* Copyright (c) 2003-2022 John Willinsky
* Copyright (c) 2014-2024 Simon Fraser University
* Copyright (c) 2003-2024 John Willinsky
* Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
*
* @class DefaultThemePlugin
Expand All @@ -17,6 +17,8 @@
use APP\core\Application;
use APP\file\PublicFileManager;
use PKP\config\Config;
use PKP\plugins\Hook;

use PKP\plugins\ThemePlugin;
use PKP\session\SessionManager;

Expand Down Expand Up @@ -210,6 +212,8 @@ public function init()

// Add navigation menu areas for this theme
$this->addMenuArea(['primary', 'user']);

Hook::add('TemplateManager::display', [$this, 'checkCurrentPage']);
}

/**
Expand Down Expand Up @@ -253,6 +257,51 @@ public function getDescription()
{
return __('plugins.themes.default.description');
}

/**
* @param $hookname string
* @param $args array
*/
public function checkCurrentPage($hookname, $args)
{
$templateMgr = $args[0];
// TODO check the issue with multiple calls of the hook on settings/website
if (!isset($templateMgr->registered_plugins['function']['default_item_active'])) {
$templateMgr->registerPlugin('function', 'default_item_active', [$this, 'isActiveItem']);
}
}

/**
* @param $params array
* @param $smarty Smarty_Internal_Template
*
* @return string
*/
public function isActiveItem($params, $smarty)
{
$navigationMenuItem = $params['item'];
$emptyMarker = '';
$activeMarker = ' active';

// Get URL of the current page
$request = $this->getRequest();
$currentUrl = $request->getCompleteUrl();
$currentPage = $request->getRequestedPage();

// Do not add an active marker if it's a dropdown menu
if ($navigationMenuItem->getIsChildVisible()) {
return $emptyMarker;
}

// Retrieve URL and its components for a menu item
$itemUrl = $navigationMenuItem->getUrl();

if ($currentUrl === $itemUrl) {
return $activeMarker;
}

return $emptyMarker;
}
}

if (!PKP_STRICT_MODE) {
Expand Down
44 changes: 33 additions & 11 deletions plugins/themes/default/styles/head.less
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
position: absolute;
width: 100%;
top: 100%;
background:@bg-base;
background: @bg-base;
left: 0;
padding: @base;
z-index: 9999;
Expand All @@ -117,7 +117,7 @@

a {
display: inline-block;
padding: 0.125rem 0;
padding: 0.86rem 0;
color: @text-bg-base;
text-decoration: none;

Expand All @@ -128,6 +128,20 @@
}
}

@media (max-width: @screen-desktop) {

.active {
background-color: @bg-base-border-color;

}

.active a {
font-weight: bold;

}
}


#siteNav {
position: absolute;
top: 0;
Expand Down Expand Up @@ -358,6 +372,20 @@
}
}

// Visualy highlighting the current menu item
> li.active {
> a {
//background: @primary-lift;
border-color: @text-bg-base;
outline: 0;
}

&:hover {
color: @bg-base;
border-color: red;
}
}

// Reproduce positioning of dropdown menu from Popper.js
> li:hover ul {
position: absolute;
Expand All @@ -377,7 +405,8 @@
}

.dropdown-menu a:focus,
.dropdown-menu a:hover {
.dropdown-menu a:hover,
.dropdown-menu li.active a {
border-color: @primary;
}

Expand Down Expand Up @@ -460,13 +489,6 @@
will-change: transform;
}

> li > a,
> li.in_focus > a,
> li > a:hover,
> li > a:focus {
color: @text-bg-base;
}

// Align to the right edge of the container
> li:last-child > a {
margin-right: -@base;
Expand Down Expand Up @@ -518,4 +540,4 @@
}
}
}
}
}