diff options
author | Serge Martin <edb@sigluy.net> | 2011-08-09 11:33:15 +0200 |
---|---|---|
committer | Serge Martin <edb@sigluy.net> | 2011-08-09 11:33:15 +0200 |
commit | 4e5b6f72c17ec361757495e89d3f1929f3981dbb (patch) | |
tree | b770453fdeef023fb6acdfe1851f8a72a5b6cd24 /core/templates | |
parent | 97462b018d7aae7bd6044bcb42d42c1b51171d5a (diff) | |
parent | 44f3dfe771840ca426e52e4a32b1b7f31428aea1 (diff) | |
download | nextcloud-server-4e5b6f72c17ec361757495e89d3f1929f3981dbb.tar.gz nextcloud-server-4e5b6f72c17ec361757495e89d3f1929f3981dbb.zip |
Merge branch 'master' of git://anongit.kde.org/owncloud
Diffstat (limited to 'core/templates')
-rw-r--r-- | core/templates/layout.guest.php | 6 | ||||
-rw-r--r-- | core/templates/layout.user.php | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index cd4078395bd..21388509f35 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -30,9 +30,11 @@ <body id="body-login"> <div id="login"> - <div id="header"><img src="<?php echo image_path('', 'owncloud-logo-medium-white.png'); ?>" alt="ownCloud" /></div> + <header><div id="header"> + <img src="<?php echo image_path('', 'owncloud-logo-medium-white.png'); ?>" alt="ownCloud" /> + </div></header> <?php echo $_['content']; ?> </div> - <p class="info"><?php echo $l->t( '<a href="http://owncloud.org/">ownCloud</a> is a personal cloud which runs on your own server.</p>' ); ?> + <footer><p class="info"><?php echo $l->t( '<a href="http://owncloud.org/">ownCloud</a> is a personal cloud which runs on your own server.</p>' ); ?></p></footer> </body> </html> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 29dbfaa8164..2dce647873f 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -28,15 +28,15 @@ </head> <body id="<?php echo $_['bodyid'];?>"> - <div id="header"> + <header><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> <?php echo $_['searchbox']?> <ul id="metanav"> <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></header> - <div id="navigation"> + <nav><div id="navigation"> <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> @@ -61,7 +61,8 @@ <?php endif; ?> <?php endforeach; ?> </ul> - </div> + </div></nav> + <div id="content"> <?php echo $_['content']; ?> </div> |