diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2012-10-27 18:58:16 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2012-10-27 18:58:16 +0200 |
| commit | fc280b28876bd1b57a8f4a5710da26adb8ebb3b9 (patch) | |
| tree | de3c667376063b50f634373bb7f2de0b58c989d0 /core/templates | |
| parent | b595ea6efc85709640280593459956f786d32b57 (diff) | |
| download | nextcloud-server-fc280b28876bd1b57a8f4a5710da26adb8ebb3b9.tar.gz nextcloud-server-fc280b28876bd1b57a8f4a5710da26adb8ebb3b9.zip | |
first move of settings to top right
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/layout.user.php | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 1efce3c7c83..a49d6b994b7 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -35,8 +35,30 @@ <body id="<?php echo $_['bodyid'];?>"> <header><div id="header"> <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a> - <a class="header-right header-action" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out'); echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a> - <form class="searchbox header-right" action="#" method="post"> + + <ul id="settings" class="svg"> + <span id="expand"> + <?php echo OC_User::getUser()?OC_User::getUser():'' ?> + <img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" /> + </span> + <div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>> + <?php foreach($_['settingsnavigation'] as $entry):?> + <li> + <a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>> + <img src="<?php echo $entry['icon']; ?>"> + <?php echo $entry['name'] ?> + </a> + </li> + <?php endforeach; ?> + <li> + <a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"> + <img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out'); echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /> Log out + </a> + </li> + </div> + </ul> + + <form class="searchbox" action="#" method="post"> <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])) {echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" x-webkit-speech /> </form> </div></header> @@ -52,20 +74,6 @@ </li> <?php endforeach; ?> </ul> - - <ul id="settings" class="svg"> - <img role=button tabindex=0 id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" /> - <div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>> - <?php foreach($_['settingsnavigation'] as $entry):?> - <li> - <a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>> - <img src="<?php echo $entry['icon']; ?>"> - <?php echo $entry['name'] ?> - </a> - </li> - <?php endforeach; ?> - </div> - </ul> </div></nav> <div id="content"> |