diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-08-08 21:42:25 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-08-08 21:43:31 +0200 |
| commit | e6f6d3dabccb5f9fd42d7f0f609107a9023fc4d3 (patch) | |
| tree | b99446ea286dd9df0275500c1798eb1654aadb01 /core | |
| parent | 7820e8959c1764f6260005ff8aeca41ca13c3e8e (diff) | |
| download | nextcloud-server-e6f6d3dabccb5f9fd42d7f0f609107a9023fc4d3.tar.gz nextcloud-server-e6f6d3dabccb5f9fd42d7f0f609107a9023fc4d3.zip | |
dont use a different navigation page for settings stuff
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/layout.admin.php | 69 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 13 |
2 files changed, 11 insertions, 71 deletions
diff --git a/core/templates/layout.admin.php b/core/templates/layout.admin.php deleted file mode 100644 index 853fcff608d..00000000000 --- a/core/templates/layout.admin.php +++ /dev/null @@ -1,69 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>ownCloud</title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> - <?php foreach($_['cssfiles'] as $cssfile): ?> - <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> - <?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> - <?php endforeach; ?> - <?php foreach($_['headers'] as $header): ?> - <?php - echo '<'.$header['tag'].' '; - foreach($header['attributes'] as $name=>$value){ - echo "$name='$value' "; - }; - echo '>'; - echo $header['text']; - echo '</'.$header['tag'].'>'; - ?> - <?php endforeach; ?> - </head> - - <body id="body-settings"> - <div id="header"> - <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img src="<?php echo image_path('', 'owncloud-logo-small-white.png'); ?>" alt="ownCloud" /></a> - <ul id="metanav"> - <li><a href="<?php echo link_to('', 'index.php'); ?>" title="Back to files"><img class='svg' src="<?php echo image_path('', 'actions/back.svg'); ?>"></a></li> - <li><a href="<?php echo link_to('', 'index.php?logout=true'); ?>" title="Log out"><img class='svg' src="<?php echo image_path('', 'actions/logout.svg'); ?>"></a></li> - </ul> - </div> - - <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> - <?php if( sizeof( $entry["subnavigation"] )): ?> - <?php foreach($entry["subnavigation"] as $subentry):?> - <li><a href="<?php echo $subentry['href']; ?>" title="" <?php if( $subentry['active'] ): ?>class="active"<?php endif; ?>><?php echo $subentry['name'] ?></a></li> - <?php endforeach; ?> - <?php endif; ?> - <?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> - <?php if( sizeof( $entry["subnavigation"] )): ?> - <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> - </div> - - <div id="content"> - <?php echo $_['content']; ?> - </div> - </body> -</html> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 57c48563bd8..db142241d64 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -32,13 +32,12 @@ <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img src="<?php echo image_path('', 'owncloud-logo-small-white.png'); ?>" alt="ownCloud" /></a> <?php echo $_['searchbox']?> <ul id="metanav"> - <li><a href="<?php echo link_to('settings', 'index.php'); ?>" title="Settings"><img class='svg' src="<?php echo image_path('', 'actions/settings.svg'); ?>"></a></li> <li><a href="<?php echo link_to('', 'index.php'); ?>?logout=true" title="Log out"><img class='svg' src="<?php echo image_path('', 'actions/logout.svg'); ?>"></a></li> </ul> </div> <div id="navigation"> - <ul> + <ul id="apps"> <?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> <?php if( sizeof( $entry["subnavigation"] )): ?> @@ -51,6 +50,16 @@ </li> <?php endforeach; ?> </ul> + <ul id="settings"> + <?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> + <?php if( sizeof( $entry["subnavigation"] )): ?> + <?php foreach($entry["subnavigation"] as $subentry):?> + <li><a href="<?php echo $subentry['href']; ?>" title="" <?php if( $subentry['active'] ): ?>class="active"<?php endif; ?>><?php echo $subentry['name'] ?></a></li> + <?php endforeach; ?> + <?php endif; ?> + <?php endforeach; ?> + </ul> </div> <div id="content"> <?php echo $_['content']; ?> |