upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

one settings link, common template, styling

Browse source 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2017-05-16 01:40:10 +02:00
parent 247b305b79
commit 560ab2e911
No known key found for this signature in database
GPG key ID: 7424F1874854DF23
3 changed files with 43 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/private/NavigationManager.php
View file

@ -177,14 +177,14 @@ class NavigationManager implements INavigationManager {
]);
}
// Personal settings
// Personal and (if applicable) admin settings
$this->add([
'type' => 'settings',
'id' => 'personal',
'id' => 'settings',
'order' => 1,
'href' => $this->urlGenerator->linkToRoute('settings_personal'),
'name' => $l->t('Personal'),
'icon' => $this->urlGenerator->imagePath('settings', 'personal.svg'),
'name' => $l->t('Settings'),
'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
]);
// Logout
@ -211,18 +211,6 @@ class NavigationManager implements INavigationManager {
'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
]);
}
if ($this->isAdmin()) {
// Admin settings
$this->add([
'type' => 'settings',
'id' => 'admin',
'order' => 2,
'href' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index'),
'name' => $l->t('Admin'),
'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
]);
}
}
if ($this->appManager === 'null') {

8
settings/css/settings.css
View file

@ -1296,3 +1296,11 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
margin-bottom: 12px;
opacity: .7;
}
.settings-caption {
font-weight: bold;
line-height: 44px;
padding: 0 12px;
white-space: nowrap;
text-overflow: ellipsis;
}

32
settings/templates/admin/frame.php → settings/templates/settings/frame.php
View file

@ -30,9 +30,39 @@ script('files', 'jquery.fileupload');
<div id="app-navigation">
<ul>
<li class="settings-caption">Personal</li>
<?php
foreach($_['forms'] as $form) {
foreach($_['forms']['personal'] as $form) {
if (isset($form['anchor'])) {
$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]);
$class = 'nav-icon-' . $form['anchor'];
$sectionName = $form['section-name'];
$active = $form['active'] ? ' class="active"' : '';
?>
<li <?php print_unescaped($form['active'] ? ' class="active"' : ''); ?>>
<a href="<?php p($anchor); ?>">
<?php if (!empty($form['icon'])) { ?>
<img alt="" src="<?php print_unescaped($form['icon']); ?>">
<span><?php p($form['section-name']); ?></span>
<?php } else { ?>
<span class="no-icon"><?php p($form['section-name']); ?></span>
<?php } ?>
</a>
</li>
<?php
}
}
?>
<?php
if(!empty($_['forms']['admin'])) {
?>
<li class="settings-caption">Administration</li>
<?php
}
foreach($_['forms']['admin'] as $form) {
if (isset($form['anchor'])) {
$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]);
$class = 'nav-icon-' . $form['anchor'];
$sectionName = $form['section-name'];