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

This commit is contained in:
Serge Martin 2011-08-09 11:33:15 +02:00
commit 4e5b6f72c1
2 changed files with 9 additions and 6 deletions

View File

@ -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>

View File

@ -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>