Merge branch 'master' of git://anongit.kde.org/owncloud

remotes/origin/stable
Serge Martin 14 years ago
commit 4e5b6f72c1
  1. 6
      core/templates/layout.guest.php
  2. 9
      core/templates/layout.user.php

@ -30,9 +30,11 @@
<body id="body-login"> <body id="body-login">
<div id="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']; ?> <?php echo $_['content']; ?>
</div> </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> </body>
</html> </html>

@ -28,15 +28,15 @@
</head> </head>
<body id="<?php echo $_['bodyid'];?>"> <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> <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']?> <?php echo $_['searchbox']?>
<ul id="metanav"> <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> <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> </ul>
</div> </div></header>
<div id="navigation"> <nav><div id="navigation">
<ul id="apps"> <ul id="apps">
<?php foreach($_['navigation'] as $entry): ?> <?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> <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 endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
</div> </div></nav>
<div id="content"> <div id="content">
<?php echo $_['content']; ?> <?php echo $_['content']; ?>
</div> </div>

Loading…
Cancel
Save