diff options
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/layout.user.php | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 18291e0f84e..93c8fa77245 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -29,8 +29,30 @@ </div> <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> @@ -38,20 +60,14 @@ <nav><div id="navigation"> <ul id="apps" class="svg"> <?php foreach($_['navigation'] as $entry): ?> - <li data-id="<?php echo $entry['id']; ?>"><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 data-id="<?php echo $entry['id']; ?>"> + <a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> + <img class="icon" src="<?php echo $entry['icon']; ?>"/> + <?php echo $entry['name']; ?> + </a> </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'); ?>" /> - <span><?php echo $l->t('Settings');?></span> - <div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>> - <?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 endforeach; ?> - </div> - </ul> </div></nav> <div id="content-wrapper"> |