mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-17 12:10:45 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#595 where horizontal separator in dropdown nav wasn't quite right for the Page Add > Bookmarks option

Browse Source
This commit is contained in:
Ryan Cramer
2018-05-21 08:47:04 -04:00
parent 76a15a2539
commit 2ba8d29ce2
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wire/modules/Process/ProcessPageEdit/PageBookmarks.php
View File

@@ -43,8 +43,6 @@ class PageBookmarks extends Wire {
*/ */
public function initNavJSON(array $options = array()) { public function initNavJSON(array $options = array()) {
$page = $this->wire('page');
$templatesArray = array();
$bookmarkFields = array(); $bookmarkFields = array();
$bookmarksArray = array(); $bookmarksArray = array();
$rolesArray = array(); $rolesArray = array();
@@ -67,7 +65,6 @@ class PageBookmarks extends Wire {
$n = 0; $n = 0;
foreach($bookmarkFields as $name => $bookmarkIDs) { foreach($bookmarkFields as $name => $bookmarkIDs) {
$bookmarks = count($bookmarkIDs) ? $this->wire('pages')->getById($bookmarkIDs) : array(); $bookmarks = count($bookmarkIDs) ? $this->wire('pages')->getById($bookmarkIDs) : array();
// $className = "separator";
$role = isset($rolesArray[$name]) ? $rolesArray[$name] : null; $role = isset($rolesArray[$name]) ? $rolesArray[$name] : null;
foreach($bookmarks as $page) { foreach($bookmarks as $page) {
if($this->process == 'ProcessPageEdit' && !$page->editable()) continue; if($this->process == 'ProcessPageEdit' && !$page->editable()) continue;
@@ -77,9 +74,7 @@ class PageBookmarks extends Wire {
$icon = $page->template->getIcon(); $icon = $page->template->getIcon();
if(!$icon) $icon = $options['defaultIcon']; if(!$icon) $icon = $options['defaultIcon'];
$page->setQuietly($iconKey, $icon); $page->setQuietly($iconKey, $icon);
// $page->setQuietly($classKey, $className);
$page->setQuietly('_roleName', $role ? $role->name : $this->labels['all']); $page->setQuietly('_roleName', $role ? $role->name : $this->labels['all']);
$className = '';
$bookmarksArray[$page->id] = $page; $bookmarksArray[$page->id] = $page;
} }
$n++; $n++;
@@ -98,7 +93,7 @@ class PageBookmarks extends Wire {
$add->set('_icon', 'bookmark-o'); $add->set('_icon', 'bookmark-o');
$add->set('title', $this->labels['bookmarks']); $add->set('title', $this->labels['bookmarks']);
$add->set('id', 'bookmark'); $add->set('id', 'bookmark');
$add->set($classKey, 'highlight separator'); $add->set($classKey, 'separator');
array_unshift($bookmarksArray, $add); array_unshift($bookmarksArray, $add);
} }
@@ -135,6 +130,7 @@ class PageBookmarks extends Wire {
$noneHeadline = $this->_('There are currently no bookmarks defined'); $noneHeadline = $this->_('There are currently no bookmarks defined');
foreach($options['items'] as $item) { foreach($options['items'] as $item) {
/** @var WireData $item */
if($item->id == 'bookmark') continue; if($item->id == 'bookmark') continue;
$url = str_replace('{id}', $item->id, $options['edit']); $url = str_replace('{id}', $item->id, $options['edit']);
$icon = $item->_icon ? "<i class='fa fa-fw fa-$item->_icon'></i> " : ""; $icon = $item->_icon ? "<i class='fa fa-fw fa-$item->_icon'></i> " : "";
@@ -167,7 +163,7 @@ class PageBookmarks extends Wire {
* Provides the editor for bookmarks and returns InputfieldForm * Provides the editor for bookmarks and returns InputfieldForm
* *
* @return InputfieldForm * @return InputfieldForm
* @throws WirePermissionException * @throws WirePermissionException|WireException
* *
*/ */
public function editBookmarksForm() { public function editBookmarksForm() {
@@ -274,7 +270,6 @@ class PageBookmarks extends Wire {
/** /**
* Check and update the given process page for hidden/visible status depending on useBookmarks setting * Check and update the given process page for hidden/visible status depending on useBookmarks setting
* *
* @param Process $process
* @param Page $page * @param Page $page
* *
*/ */
@@ -295,7 +290,6 @@ class PageBookmarks extends Wire {
* Populate any configuration inputfields to the given $inputfields wrapper for $process * Populate any configuration inputfields to the given $inputfields wrapper for $process
* *
* @param InputfieldWrapper $inputfields * @param InputfieldWrapper $inputfields
* @param Process $process
* *
*/ */
public function addConfigInputfields(InputfieldWrapper $inputfields) { public function addConfigInputfields(InputfieldWrapper $inputfields) {