summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2017-05-16 01:40:10 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2017-06-23 12:36:37 +0200
commit560ab2e91158fa57b12cb5f382dfd79cbbc1ffc4 (patch)
tree679e3b4989fed3aea1d62d97f69b0a878fb75bf9 /settings
parent247b305b79e16ef1e26b374a4efed7e44c241e91 (diff)
downloadnextcloud-server-560ab2e91158fa57b12cb5f382dfd79cbbc1ffc4.tar.gz
nextcloud-server-560ab2e91158fa57b12cb5f382dfd79cbbc1ffc4.zip
one settings link, common template, styling
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'settings')
-rw-r--r--settings/css/settings.css8
-rw-r--r--settings/templates/settings/frame.php (renamed from settings/templates/admin/frame.php)32
2 files changed, 39 insertions, 1 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 0d68a3b622d..4786af4733f 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -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;
+}
diff --git a/settings/templates/admin/frame.php b/settings/templates/settings/frame.php
index 2b234f4cd9b..80737bc6f91 100644
--- a/settings/templates/admin/frame.php
+++ b/settings/templates/settings/frame.php
@@ -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'];