summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRobin Appelman <icewind1991@gmail.com>2011-07-29 19:38:01 +0200
committerRobin Appelman <icewind1991@gmail.com>2011-07-29 19:43:06 +0200
commitd12d08e2f3553b06df6371535f971c9f193bd388 (patch)
treea5a06b8a522d87a4e2f8934ee46fba3a2cfdbe9b /core
parent8b872e326a1ef6776f2f5f09b9c698447146ac6a (diff)
downloadnextcloud-server-d12d08e2f3553b06df6371535f971c9f193bd388.tar.gz
nextcloud-server-d12d08e2f3553b06df6371535f971c9f193bd388.zip
some more changes for navigation subentries
Diffstat (limited to 'core')
-rw-r--r--core/css/styles.css1
-rw-r--r--core/templates/layout.admin.php11
-rw-r--r--core/templates/layout.user.php15
3 files changed, 17 insertions, 10 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index 99090b9171e..00433979d24 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -89,6 +89,7 @@ input[type="search"] { font-size:1em; padding-left:2em; background:#eee url('../
#plugins a:active { outline:0; }
#plugins .subentry { background-color:#ddd; border-top:1px solid #aaa; border-bottom:1px solid #ccc; color:#000; outline:0; }
#plugins .subentry.active { background-color:#bbb; border-top:1px solid #aaa; border-bottom:1px solid #ccc; color:#000; outline:0; }
+#plugins li.subentry a {padding-left:4em;}
/* CONTENT ------------------------------------------------------------------ */
#content { margin:3.5em 0 0 15.7em; }
diff --git a/core/templates/layout.admin.php b/core/templates/layout.admin.php
index 8077fd304f3..3aac4c98ac5 100644
--- a/core/templates/layout.admin.php
+++ b/core/templates/layout.admin.php
@@ -48,12 +48,15 @@
<?php endforeach; ?>
<?php if(isset($_['adminnavigation'])):?>
<?php foreach($_['adminnavigation'] as $entry):?>
- <li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
+ <li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a>
<?php if( sizeof( $entry["subnavigation"] )): ?>
- <?php foreach($entry["subnavigation"] as $subentry):?>
- <li><a class="subentry<?php if( $subentry['active'] ): ?> active<?php endif; ?>" href="<?php echo $subentry['href']; ?>" title=""><?php echo $subentry['name'] ?></a></li>
- <?php endforeach; ?>
+ <ul>
+ <?php foreach($entry["subnavigation"] as $subentry):?>
+ <li class="subentry"><a class="subentry<?php if( $subentry['active'] ): ?> active<?php endif; ?>" href="<?php echo $subentry['href']; ?>" title=""><?php echo $subentry['name'] ?></a></li>
+ <?php endforeach; ?>
+ </ul>
<?php endif; ?>
+ </li>
<?php endforeach; ?>
<?php endif; ?>
</ul>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 4440ae28b27..8f073914a1f 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -43,12 +43,15 @@
<div id="plugins">
<ul>
<?php foreach($_['navigation'] as $entry): ?>
- <li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>><?php echo $entry['name']; ?></a></li>
- <?php if( sizeof( $entry["subnavigation"] )): ?>
- <?php foreach($entry["subnavigation"] as $subentry):?>
- <li><a style="background-image:url(<?php echo $subentry['icon']; ?>)" href="<?php echo $subentry['href']; ?>" title="" <?php if( $subentry['active'] ): ?>class="active"<?php endif; ?>><?php echo $subentry['name'] ?></a></li>
- <?php endforeach; ?>
- <?php endif; ?>
+ <li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>><?php echo $entry['name']; ?></a>
+ <?php if( sizeof( $entry["subnavigation"] )): ?>
+ <ul>
+ <?php foreach($entry["subnavigation"] as $subentry):?>
+ <li class="subentry"><a style="background-image:url(<?php echo $subentry['icon']; ?>)" href="<?php echo $subentry['href']; ?>" title="" <?php if( $subentry['active'] ): ?>class="active"<?php endif; ?>><?php echo $subentry['name'] ?></a></li>
+ <?php endforeach; ?>
+ </ul>
+ <?php endif; ?>
+ </li>
<?php endforeach; ?>
</ul>
</div>