diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-07 15:56:26 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-07 15:56:26 -0400 |
| commit | 1aa89b7cbb051875ffa577a6a89e9cf9bb6eafee (patch) | |
| tree | b4923b27fc550d37eeb609db02ef6d20a508ab30 /core/templates/layout.admin.php | |
| parent | 5d521d7c7c8f8e796a3ddc81e1e4430238ba5451 (diff) | |
| parent | 3e8ae8636cad91877c727c7b1ea77436816e7c3d (diff) | |
| download | nextcloud-server-1aa89b7cbb051875ffa577a6a89e9cf9bb6eafee.tar.gz nextcloud-server-1aa89b7cbb051875ffa577a6a89e9cf9bb6eafee.zip | |
Merge branch 'master' into sharing
Conflicts:
files/css/files.css
lib/base.php
Diffstat (limited to 'core/templates/layout.admin.php')
| -rw-r--r-- | core/templates/layout.admin.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/templates/layout.admin.php b/core/templates/layout.admin.php index 3aac4c98ac5..d70c54f7b15 100644 --- a/core/templates/layout.admin.php +++ b/core/templates/layout.admin.php @@ -9,6 +9,7 @@ <?php endforeach; ?> <script type="text/javascript"> var oc_webroot = '<?php global $WEBROOT; echo $WEBROOT; ?>'; + var oc_current_user = '<?php echo OC_User::getUser() ?>'; // </script> <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> @@ -36,7 +37,7 @@ </div> <div id="main"> - <div id="plugins"> + <div id="navigation"> <ul> <?php foreach($_['settingsnavigation'] 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> |