mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6399 from nextcloud/app-navigation-flex 

App navigation flex
This commit is contained in:
John Molakvoæ 2017-09-21 18:50:28 +02:00 committed by GitHub
parent 4d556a3ade eb00dbb593
commit e336283a48
9 changed files with 379 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/files/css/files.scss
View File

@ -108,9 +108,8 @@
.nav-icon-trashbin { .nav-icon-trashbin {
background-image: url('../img/delete.svg?v=1'); background-image: url('../img/delete.svg?v=1');
} }
/* no icon for the quota bar */
.nav-icon-quota { .nav-icon-quota {
padding-left: 15px !important; background-image: url('../img/quota.svg?v=1');
} }
#app-navigation .nav-files a.nav-icon-files { #app-navigation .nav-files a.nav-icon-files {
@ -777,11 +776,7 @@ table.dragshadow td.size {
margin: 0 !important; margin: 0 !important;
border: none; border: none;
border-radius: 0; border-radius: 0;
position: fixed !important; background-color: transparent;
bottom: 44px;
width: inherit !important;
background-color: #fff;
border-right: 1px solid #eee;
z-index:1; z-index:1;
.quota-container { .quota-container {
@ -795,11 +790,6 @@ table.dragshadow td.size {
} }
} }
/* increase the padding of the last item to not hide below the quota item */
.app-files #app-navigation > ul li:nth-last-child(1) {
margin-bottom: 44px;
}
#quotatext { #quotatext {
padding: 0; padding: 0;
height: 30px; height: 30px;

4
apps/files/img/quota.svg Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16" height="16" version="1" xmlns="http://www.w3.org/2000/svg">
<path d="m8 1c-3.8553 0-7 3.1448-7 7 0 3.8552 3.1448 7 7 7 3.8553 0 7-3.1448 7-7 0-3.8553-3.1447-7-7-7zm0 1.75c2.9103 0 5.25 2.3398 5.25 5.25 0 1.4192-0.55825 2.7011-1.4665 3.6435l-3.7835-3.6435z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 323 B

21
apps/files/templates/appnavigation.php
View File

@ -1,6 +1,17 @@
<div id="app-navigation"> <div id="app-navigation">
<ul class="with-icon"> <ul class="with-icon">
<li id="quota" class="section <?php <?php $pinned = 0 ?>
<?php foreach ($_['navigationItems'] as $item) {
strpos($item['classes'], 'pinned')!==false ? $pinned++ : '';
?>
<li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?> <?php p($item['classes']) ?> <?php p($pinned===1?'first-pinned':'') ?>">
<a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"
class="nav-icon-<?php p($item['icon'] !== '' ? $item['icon'] : $item['id']) ?> svg">
<?php p($item['name']);?>
</a>
</li>
<?php } ?>
<li id="quota" class="section pinned <?php
if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) { if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
?>has-tooltip" title="<?php p($_['usage_relative'] . '%'); ?>has-tooltip" title="<?php p($_['usage_relative'] . '%');
} ?>"> } ?>">
@ -18,14 +29,6 @@
</div> </div>
</a> </a>
</li> </li>
<?php foreach ($_['navigationItems'] as $item) { ?>
<li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?>">
<a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"
class="nav-icon-<?php p($item['icon'] !== '' ? $item['icon'] : $item['id']) ?> svg">
<?php p($item['name']);?>
</a>
</li>
<?php } ?>
</ul> </ul>
<div id="app-settings"> <div id="app-settings">
<div id="app-settings-header"> <div id="app-settings-header">

8
apps/files/tests/Controller/ViewControllerTest.php
View File

@ -142,6 +142,7 @@ class ViewControllerTest extends TestCase {
'active' => false, 'active' => false,
'icon' => '', 'icon' => '',
'type' => 'link', 'type' => 'link',
'classes' => '',
], ],
[ [
'id' => 'recent', 'id' => 'recent',
@ -152,6 +153,7 @@ class ViewControllerTest extends TestCase {
'active' => false, 'active' => false,
'icon' => '', 'icon' => '',
'type' => 'link', 'type' => 'link',
'classes' => '',
], ],
[ [
'id' => 'favorites', 'id' => 'favorites',
@ -162,6 +164,7 @@ class ViewControllerTest extends TestCase {
'active' => false, 'active' => false,
'icon' => '', 'icon' => '',
'type' => 'link', 'type' => 'link',
'classes' => '',
], ],
[ [
'id' => 'sharingin', 'id' => 'sharingin',
@ -172,6 +175,7 @@ class ViewControllerTest extends TestCase {
'active' => false, 'active' => false,
'icon' => '', 'icon' => '',
'type' => 'link', 'type' => 'link',
'classes' => '',
], ],
[ [
'id' => 'sharingout', 'id' => 'sharingout',
@ -182,6 +186,7 @@ class ViewControllerTest extends TestCase {
'active' => false, 'active' => false,
'icon' => '', 'icon' => '',
'type' => 'link', 'type' => 'link',
'classes' => '',
], ],
[ [
'id' => 'sharinglinks', 'id' => 'sharinglinks',
@ -192,6 +197,7 @@ class ViewControllerTest extends TestCase {
'active' => false, 'active' => false,
'icon' => '', 'icon' => '',
'type' => 'link', 'type' => 'link',
'classes' => '',
], ],
[ [
'id' => 'systemtagsfilter', 'id' => 'systemtagsfilter',
@ -202,6 +208,7 @@ class ViewControllerTest extends TestCase {
'active' => false, 'active' => false,
'icon' => '', 'icon' => '',
'type' => 'link', 'type' => 'link',
'classes' => '',
], ],
[ [
'id' => 'trashbin', 'id' => 'trashbin',
@ -212,6 +219,7 @@ class ViewControllerTest extends TestCase {
'active' => false, 'active' => false,
'icon' => '', 'icon' => '',
'type' => 'link', 'type' => 'link',
'classes' => 'pinned',
], ],
]); ]);

1
apps/files_trashbin/appinfo/app.php
View File

@ -36,5 +36,6 @@
'script' => 'list.php', 'script' => 'list.php',
'order' => 50, 'order' => 50,
'name' => $l->t('Deleted files'), 'name' => $l->t('Deleted files'),
'classes' => 'pinned',
]; ];
}); });

14
apps/files_trashbin/css/trash.css
View File

@ -20,17 +20,3 @@
display: none; display: none;
} }
/* move Deleted Files to bottom of sidebar */
.nav-trashbin {
position: fixed !important;
bottom: 88px;
width: inherit !important;
background-color: #fff;
border-right: 1px solid #eee;
margin-bottom: 0px !important;
}
/* double padding to account for Deleted files entry, issue with Firefox */
.app-files #app-navigation > ul li:nth-last-child(2) {
margin-bottom: 88px;
}

534
core/css/apps.scss
View File

@ -1,5 +1,5 @@
/** /**
* @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com> * @copyright Copyright (c) 2016-2017, John Molakvoæ <skjnldsv@protonmail.com>
* @copyright Copyright (c) 2016, Julius Haertl <jus@bitgrid.net> * @copyright Copyright (c) 2016, Julius Haertl <jus@bitgrid.net>
* @copyright Copyright (c) 2016, Morris Jobke <hey@morrisjobke.de> * @copyright Copyright (c) 2016, Morris Jobke <hey@morrisjobke.de>
* @copyright Copyright (c) 2016, pgys <info@pexlab.space> * @copyright Copyright (c) 2016, pgys <info@pexlab.space>
@ -93,13 +93,44 @@ kbd {
border-right: 1px solid nc-darken($color-main-background, 8%); border-right: 1px solid nc-darken($color-main-background, 8%);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
li {
position: relative;
}
> ul { > ul {
position: relative; position: relative;
height: 100%; height: 100%;
width: inherit; width: inherit;
overflow: auto; overflow-x: hidden;
overflow-y: auto;
box-sizing: border-box; box-sizing: border-box;
display: flex;
flex-direction: column;
> li { > li {
display: inline-flex;
flex-wrap: wrap;
order: 1;
flex-shrink: 0;
/* Pinned-to-bottom entries */
&.pinned {
order: 2;
&.first-pinned {
margin-top: auto !important;
}
}
> a,
> .app-navigation-entry-deleted {
/* Ugly hack for overriding the main entry link */
padding-left: 44px !important;
}
> .app-navigation-entry-edit {
/* Ugly hack for overriding the main entry link */
/* align the input correctly with the link text
44px-6px padding for the input */
padding-left: 38px !important;
}
&:focus, &:focus,
&:hover, &:hover,
&.active, &.active,
@ -110,12 +141,147 @@ kbd {
box-shadow: inset 2px 0 $color-primary; box-shadow: inset 2px 0 $color-primary;
} }
} }
/* align loader */
&.icon-loading-small:after {
left: 22px;
top: 22px;
}
/* hide and animate deletion/collapse of subitems */
&.deleted,
&.collapsible:not(.open) {
> ul {
opacity: 0;
max-height: 0;
/* bezier override the hide/slow effect due to the 2000 max-height */
transition: max-height 1000ms cubic-bezier(0, 1, 0, 1),
opacity 250ms ease-in-out;
}
}
/* Second level nesting for lists */
> ul {
flex: 1 0 100%;
padding-left: 62px;
width: inherit;
transition: max-height 2000ms ease-in-out,
opacity 250ms ease-in-out;
max-height: 9999px;
opacity: 1;
> li {
display: inline-flex;
flex-wrap: wrap;
&:focus,
&:hover,
&.active,
a.selected {
&,
> a {
opacity: 1;
}
}
/* align loader */
&.icon-loading-small:after {
left: -10px;
}
/* Submenu fix for icon */
> a[class*='icon-'],
> a[style*='background-image'],
.app-navigation-entry-bullet {
margin-left: -32px; /* 44px padding - 12px padding */
}
/* Submenu fix for bullet */
> .app-navigation-entry-bullet {
left: -32px;/* 44px padding - 12px padding */
}
}
}
}
/* Menu and submenu */
> li,
> li > ul > li {
position: relative;
width: 100%;
box-sizing: border-box;
/* hide icons if loading */
&.icon-loading-small {
> a,
> .app-navigation-entry-bullet {
background: none !important;
}
}
/* Main entry link */
> a {
background-size: 16px 16px;
background-position: 14px center;
background-repeat: no-repeat;
display: block;
justify-content: space-between;
line-height: 44px;
min-height: 44px;
padding: 0 12px;
overflow: hidden;
box-sizing: border-box;
white-space: nowrap;
text-overflow: ellipsis;
color: $color-main-text;
opacity: .57;
flex: 1 1 0;
z-index: 100; /* above the bullet */
/* TODO: forbid using img as icon in menu? */
&:first-child img {
margin-bottom: -3px;
margin-right: 11px;
width: 16px;
margin-left: 2px;
}
/* counter can also be inside the link */
> .app-navigation-entry-utils {
display: inline-block;
float: right;
.app-navigation-entry-utils-counter {
padding-right: 0 !important;
}
}
}
/* Bullet icon */
> .app-navigation-entry-bullet {
position: absolute;
display: block;
margin: 16px;
width: 12px;
height: 12px;
border: none;
border-radius: 50%;
cursor: pointer;
}
/* padding in case of icon or bullet */
> a[class*='icon-'],
> a[style*='background-image'] {
padding-left: 44px;
}
/* popover fix the flex positionning of the li parent */
> .app-navigation-entry-menu {
top: 44px;
}
/* show edit/undo field if editing/deleted */
&.editing .app-navigation-entry-edit {
opacity: 1;
z-index: 250;
}
&.deleted .app-navigation-entry-deleted {
transform: translateX(0);
z-index: 250;
}
} }
}
li {
position: relative;
width: 100%;
box-sizing: border-box;
} }
&.hidden { &.hidden {
display: none; display: none;
@ -123,45 +289,34 @@ kbd {
&.without-app-settings { &.without-app-settings {
padding-bottom: 0; padding-bottom: 0;
} }
.active.with-menu > a,
.with-counter > a { /**
padding-right: 50px; * Button styling for menu, edit and undo
} */
.active.with-menu.with-counter > a { .app-navigation-entry-utils .app-navigation-entry-utils-menu-button > button,
padding-right: 90px; .app-navigation-entry-deleted .app-navigation-entry-deleted-button {
} border: 0;
.with-icon a, opacity: 0.5;
.app-navigation-entry-loading a { background-color: transparent;
padding-left: 44px;
background-size: 16px 16px;
background-position: 14px center;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center;
&:hover,
&:focus {
background-color: transparent;
opacity: 1;
}
} }
li > a {
display: block; /**
width: 100%; * Collapsible menus
line-height: 44px; */
min-height: 44px;
padding: 0 12px;
overflow: hidden;
box-sizing: border-box;
white-space: nowrap;
text-overflow: ellipsis;
color: $color-main-text;
opacity: .57;
}
li > a:first-child img {
margin-bottom: -3px;
margin-right: 11px;
width: 16px;
margin-left: 2px;
}
.collapse {
display: none;
/* hide collapse button initially */
}
.collapsible { .collapsible {
> .collapse { /* Fallback for old collapse button.
TODO: to be removed. Leaved here for retro compatibility */
.collapse {
display: none;
}
&:after {
position: absolute; position: absolute;
height: 44px; height: 44px;
width: 44px; width: 44px;
@ -176,124 +331,47 @@ kbd {
border-radius: 0; border-radius: 0;
outline: none !important; outline: none !important;
box-shadow: none; box-shadow: none;
} content: ' ';
&:hover > a, opacity: 0;
&:focus > a {
background-image: none;
}
&:hover,
&:focus {
> .collapse {
display: block;
}
}
.collapse {
-webkit-transform: rotate(-90deg); -webkit-transform: rotate(-90deg);
-ms-transform: rotate(-90deg); -ms-transform: rotate(-90deg);
transform: rotate(-90deg); transform: rotate(-90deg);
} }
/* force padding on link no matter if 'a' has an icon class */
> a:first-child {
padding-left: 44px;
}
&:after,
> a {
transition: background 100ms ease-in-out,
transform 250ms ease-in-out,
opacity 100ms ease-in-out;
}
&:hover > a,
&:focus > a {
background-position-x: -50px;
}
&:hover,
&:focus {
&:after {
opacity: 1;
}
}
&.open { &.open {
.collapse { &:after {
-webkit-transform: rotate(0); -webkit-transform: rotate(0);
-ms-transform: rotate(0); -ms-transform: rotate(0);
transform: rotate(0); transform: rotate(0);
} }
background-image: linear-gradient(top, nc-darken($color-main-background, 8%) 0%, nc-darken($color-main-background, 3%) 100%);
background-image: -webkit-linear-gradient(top, nc-darken($color-main-background, 8%) 0%, nc-darken($color-main-background, 3%) 100%);
background-image: -ms-linear-gradient(top, nc-darken($color-main-background, 8%) 0%, nc-darken($color-main-background, 3%) 100%);
} }
} }
> {
/* Second level nesting for lists */
ul ul {
display: none;
li > a {
padding-left: 32px;
}
}
.with-icon ul li {
> a,
&.app-navigation-entry-loading > a {
padding-left: 68px;
background-position: 44px center;
}
}
}
> ul .collapsible.open {
&:hover,
&:focus {
box-shadow: inset 0 0 3px $color-box-shadow;
}
ul {
display: block;
}
}
/* Deleted entries with undo button */
.app-navigation-entry-deleted {
display: inline-block;
height: 44px;
width: 100%;
}
.app-navigation-entry-deleted-description {
padding-left: 12px;
position: relative;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
display: inline-block;
width: calc(100% - 49px);
line-height: 44px;
float: left;
}
.app-navigation-entry-deleted-button {
margin: 0;
height: 44px;
width: 44px;
line-height: 44px;
border: 0;
display: inline-block;
background-color: transparent;
opacity: .5;
&:hover, &:focus {
opacity: 1;
}
}
/* counter and actions, legacy code */
.utils {
position: absolute;
padding: 7px 7px 0 0;
right: 0;
top: 0;
bottom: 0;
font-size: 12px;
button,
.counter {
width: 44px;
height: 44px;
padding-top: 12px;
}
}
/* drag and drop */
.drag-and-drop {
-webkit-transition: padding-bottom 500ms ease 0s;
transition: padding-bottom 500ms ease 0s;
padding-bottom: 40px;
}
.error {
color: $color-error;
}
.app-navigation-separator {
border-bottom: 1px solid nc-lighten($color-main-text, 86%);
}
/** /**
* App navigation utils, buttons and counters for drop down menu * App navigation utils, buttons and counters for drop down menu
*/ */
.app-navigation-entry-utils { .app-navigation-entry-utils {
position: absolute; flex: 0 1 auto;
top: 0;
right: 0;
z-index: 105;
ul { ul {
display: flex !important; display: flex !important;
align-items: center; align-items: center;
@ -303,73 +381,141 @@ kbd {
width: 44px !important; width: 44px !important;
height: 44px; height: 44px;
} }
}
.active > .app-navigation-entry-utils li {
display: inline-block;
}
.app-navigation-entry-utils button {
height: 100%;
width: 100%;
margin: 0;
box-shadow: none;
}
.app-navigation-entry-utils-menu-button {
button { button {
border: 0; height: 100%;
opacity: .5; width: 100%;
background-color: transparent; margin: 0;
background-repeat: no-repeat; box-shadow: none;
background-position: center;
background-image: url('../img/actions/more.svg?v=1');
} }
&:hover button, .app-navigation-entry-utils-menu-button {
&:focus button { /* Prevent bg img override if an icon class is set */
background-color: transparent; button:not([class^='icon-']):not([class*=' icon-']) {
opacity: 1; background-image: url('../img/actions/more.svg?v=1');
}
&:hover button,
&:focus button {
background-color: transparent;
opacity: 1;
}
}
.app-navigation-entry-utils-counter {
overflow: hidden;
text-align: right;
font-size: 9pt;
line-height: 44px;
padding: 0 12px; /* Same padding as all li > a in the app-navigation */
} }
}
.app-navigation-entry-utils-counter {
overflow: hidden;
text-overflow: hidden;
text-align: right;
font-size: 9pt;
width: 38px;
line-height: 44px;
padding: 0 10px;
}
.app-navigation-entry-utils ul, .app-navigation-entry-menu ul {
list-style-type: none;
} }
/* editing an entry */ /**
* Editable entries
*/
.app-navigation-entry-edit { .app-navigation-entry-edit {
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
display: inline-block; display: block;
height: 39px; width: calc(100% - 1px); /* Avoid border overlapping */
width: 100%; transition: opacity 250ms ease-in-out;
opacity: 0;
position: absolute;
background-color: $color-main-background;
z-index: -1;
form {
display: inline-flex;
width: 100%;
}
input { input {
border-bottom-right-radius: 0;
border-top-right-radius: 0;
width: calc(100% - 36px);
padding: 5px; padding: 5px;
margin-right: 0; margin-right: 0;
height: 38px; height: 38px;
float: left; border: 1px solid nc-darken($color-main-background, 8%);
border: 1px solid rgba(nc-lighten($color-main-text, 73%), 0.9); &:hover {
/* overlapp borders */
z-index: 1;
}
}
input[type='text'] {
width: 100%;
min-width: 0; /* firefox hack: override auto */
border-bottom-right-radius: 0;
border-top-right-radius: 0;
} }
button, button,
input[type='submit'] { input:not([type='text']) {
width: 36px; width: 36px;
height: 38px; height: 38px;
float: left; flex: 0 0 36px;
&:not(:last-child) {
border-radius: 0;
}
&:not(:first-child) {
margin-left: -1px;
}
&:last-child {
border-bottom-left-radius: 0;
border-top-left-radius: 0;
}
} }
.icon-checkmark { }
border-bottom-left-radius: 0;
border-top-left-radius: 0; /**
border-left: 0; * Deleted entries with undo button
margin-right: 0; */
.app-navigation-entry-deleted {
display: inline-flex;
padding-left: 12px;
transform: translateX(250px);
.app-navigation-entry-deleted-description {
position: relative;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
flex: 1 1 0;
line-height: 44px;
} }
.app-navigation-entry-deleted-button {
margin: 0;
height: 44px;
width: 44px;
line-height: 44px;
&:hover, &:focus {
opacity: 1;
}
}
}
/**
* Common rules for animation of undo and edit entries
*/
.app-navigation-entry-edit,
.app-navigation-entry-deleted {
width: calc(100% - 1px); /* Avoid border overlapping */
transition: transform 250ms ease-in-out,
opacity 250ms ease-in-out,
z-index 250ms ease-in-out;
position: absolute;
background-color: $color-main-background;
}
/**
* drag and drop
*/
.drag-and-drop {
-webkit-transition: padding-bottom 500ms ease 0s;
transition: padding-bottom 500ms ease 0s;
padding-bottom: 40px;
}
.error {
color: $color-error;
}
.app-navigation-separator {
border-bottom: 1px solid nc-lighten($color-main-text, 86%);
}
.app-navigation-entry-utils ul,
.app-navigation-entry-menu ul {
list-style-type: none;
} }
} }

3
lib/private/NavigationManager.php
View File

@ -91,6 +91,9 @@ class NavigationManager implements INavigationManager {
if(!isset($entry['icon'])) { if(!isset($entry['icon'])) {
$entry['icon'] = ''; $entry['icon'] = '';
} }
if(!isset($entry['classes'])) {
$entry['classes'] = '';
}
if(!isset($entry['type'])) { if(!isset($entry['type'])) {
$entry['type'] = 'link'; $entry['type'] = 'link';
} }

9
tests/lib/NavigationManagerTest.php
View File

@ -72,6 +72,7 @@ class NavigationManagerTest extends TestCase {
'icon' => 'optional', 'icon' => 'optional',
'href' => 'url', 'href' => 'url',
'type' => 'settings', 'type' => 'settings',
'classes' => '',
], ],
[ [
'id' => 'entry id', 'id' => 'entry id',
@ -81,6 +82,7 @@ class NavigationManagerTest extends TestCase {
'href' => 'url', 'href' => 'url',
'active' => false, 'active' => false,
'type' => 'settings', 'type' => 'settings',
'classes' => '',
], ],
], ],
[ [
@ -100,6 +102,7 @@ class NavigationManagerTest extends TestCase {
'href' => 'url', 'href' => 'url',
'active' => false, 'active' => false,
'type' => 'link', 'type' => 'link',
'classes' => '',
], ],
], ],
]; ];
@ -255,6 +258,7 @@ class NavigationManagerTest extends TestCase {
'name' => 'Apps', 'name' => 'Apps',
'active' => false, 'active' => false,
'type' => 'settings', 'type' => 'settings',
'classes' => '',
] ]
]; ];
$defaults = [ $defaults = [
@ -266,6 +270,7 @@ class NavigationManagerTest extends TestCase {
'name' => 'Settings', 'name' => 'Settings',
'active' => false, 'active' => false,
'type' => 'settings', 'type' => 'settings',
'classes' => '',
], ],
[ [
'id' => 'logout', 'id' => 'logout',
@ -275,6 +280,7 @@ class NavigationManagerTest extends TestCase {
'name' => 'Log out', 'name' => 'Log out',
'active' => false, 'active' => false,
'type' => 'settings', 'type' => 'settings',
'classes' => '',
], ],
]; ];
return [ return [
@ -286,6 +292,7 @@ class NavigationManagerTest extends TestCase {
'name' => 'Test', 'name' => 'Test',
'active' => false, 'active' => false,
'type' => 'link', 'type' => 'link',
'classes' => '',
]]), ['navigations' => [['route' => 'test.page.index', 'name' => 'Test']]]], ]]), ['navigations' => [['route' => 'test.page.index', 'name' => 'Test']]]],
'minimalistic-settings' => [array_merge($defaults, [[ 'minimalistic-settings' => [array_merge($defaults, [[
'id' => 'test', 'id' => 'test',
@ -295,6 +302,7 @@ class NavigationManagerTest extends TestCase {
'name' => 'Test', 'name' => 'Test',
'active' => false, 'active' => false,
'type' => 'settings', 'type' => 'settings',
'classes' => '',
]]), ['navigations' => [['route' => 'test.page.index', 'name' => 'Test', 'type' => 'settings']]]], ]]), ['navigations' => [['route' => 'test.page.index', 'name' => 'Test', 'type' => 'settings']]]],
'admin' => [array_merge($apps, $defaults, [[ 'admin' => [array_merge($apps, $defaults, [[
'id' => 'test', 'id' => 'test',
@ -304,6 +312,7 @@ class NavigationManagerTest extends TestCase {
'name' => 'Test', 'name' => 'Test',
'active' => false, 'active' => false,
'type' => 'link', 'type' => 'link',
'classes' => '',
]]), ['navigations' => [['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index', 'name' => 'Test']]], true], ]]), ['navigations' => [['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index', 'name' => 'Test']]], true],
'no name' => [array_merge($apps, $defaults), ['navigations' => [['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index']]], true], 'no name' => [array_merge($apps, $defaults), ['navigations' => [['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index']]], true],
'no admin' => [$defaults, ['navigations' => [['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index', 'name' => 'Test']]]] 'no admin' => [$defaults, ['navigations' => [['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index', 'name' => 'Test']]]]