From: François KUBLER <francois@kubler.org>
Date: Wed, 9 Mar 2011 21:46:17 +0000 (+0100)
Subject: Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
X-Git-Tag: v3.0~267^2~558^2~178
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7faf852561d3aca1cd1f62858d03d5b3daf888f9;p=nextcloud-server.git

Merge branch 'refactoring' of git.kde.org:owncloud into refactoring

Conflicts:
	admin/templates/index.php
	templates/layout.admin.php
	templates/layout.user.php

All conflicts are fixed.
---

7faf852561d3aca1cd1f62858d03d5b3daf888f9
diff --cc admin/templates/index.php
index 2ca7b0b2d3b,f13d5634eac..9d0ffd84c61
--- a/admin/templates/index.php
+++ b/admin/templates/index.php
@@@ -6,7 -6,7 +6,7 @@@
  <h1>Administration</h1>
  
  <ul>
 -	<? foreach( $_["adminpages"] as $i ){ ?>
 -		<li><a href="<? echo $i["href"] ?>"><? echo $i["name"] ?></a></li>
 -	<? } ?>
 +	<?php foreach($_["adminpages"] as $i): ?>
- 		<li><a href="<?php echo link_to($i["app"], $i["file"]); ?>"><?php echo $i["name"]; ?></a></li>
++		<li><a href="<?php echo $i["href"]; ?>"><?php echo $i["name"]; ?></a></li>
 +	<?php endforeach; ?>
  </ul>
diff --cc templates/layout.admin.php
index ebf0a1f048a,849ed6656be..22de64335fd
--- a/templates/layout.admin.php
+++ b/templates/layout.admin.php
@@@ -24,9 -24,9 +24,9 @@@
  			<div id="user">
  				<a id="user_menu_link" href="" title="">Username</a>
  				<ul id="user_menu">
- 					<?php foreach($_["personalmenu"] as $entry ): ?>
- 						<li><a href="<?php echo link_to($entry["app"], $entry["file"]); ?>" title=""><?php echo $entry["name"]; ?></a></li>
 -					<? foreach( $_["personalmenu"] as $entry ){ ?>
 -						<li><a href="<? echo $entry["href"] ?>" title=""><? echo $entry["name"] ?></a></li>
 -					<? } ?>
++					<?php foreach($_["personalmenu"] as $entry): ?>
++						<li><a href="<?php echo $entry["href"]; ?>" title=""><?php echo $entry["name"]; ?></a></li>
 +					<?php endforeach; ?>
  				</ul>
  			</div>
  		</div>
@@@ -34,9 -34,8 +34,8 @@@
  		<div id="main">
  			<div id="plugins">
  				<ul>
- 					<?php foreach($_["navigation"] as $entry): ?>
- 						<li><a href="<?php echo link_to($entry["app"], $entry["file"]); ?>" title=""><?php echo $entry["name"]; ?></a></li>
- 					<?php endforeach; ?>
 -					<li><a style="background-image:url(<? echo image_path( "admin", "navicon.png" ) ?>)" href="<? echo link_to( "admin", "index.php" )?>" title="">Administration</a></li>
 -					<li><a style="background-image:url(<? echo image_path( "", "actions/arrow-left.png" ) ?>)" href="<? echo link_to( "", "index.php" )?>" title="">Back</a></li>
++					<li><a style="background-image:url(<?php echo image_path("admin", "navicon.png"); ?>)" href="<?php echo link_to("admin", "index.php"); ?>" title="">Administration</a></li>
++					<li><a style="background-image:url(<?php echo image_path("", "actions/arrow-left.png"); ?>)" href="<?php echo link_to("", "index.php"); ?>" title="">Back</a></li>
  				</ul>
  			</div>
  
diff --cc templates/layout.user.php
index 20fb3f88cd6,ff845a9b957..7529f2c720a
--- a/templates/layout.user.php
+++ b/templates/layout.user.php
@@@ -24,9 -24,9 +24,9 @@@
  			<div id="user">
  				<a id="user_menu_link" href="" title="">Username</a>
  				<ul id="user_menu">
 -					<? foreach( $_["personalmenu"] as $entry ){ ?>
 -						<li><a href="<? echo $entry["href"] ?>" title=""><? echo $entry["name"] ?></a></li>
 -					<? } ?>
 +					<?php foreach($_["personalmenu"] as $entry): ?>
- 						<li><a href="<?php echo link_to($entry["app"], $entry["file"]); ?>" title=""><?php echo $entry["name"]; ?></a></li>
++						<li><a href="<?php echo $entry["href"]; ?>" title=""><?php echo $entry["name"]; ?></a></li>
 +					<?php endforeach; ?>
  				</ul>
  			</div>
  		</div>
@@@ -34,9 -34,9 +34,9 @@@
  		<div id="main">
  			<div id="plugins">
  				<ul>
 -					<? foreach( $_["navigation"] as $entry ){ ?>
 -						<li><a style="background-image:url(<? echo $entry["icon"] ?>)" href="<? echo $entry["href"] ?>" title=""><? echo $entry["name"] ?></a></li>
 -					<? } ?>
 +					<?php foreach($_["navigation"] as $entry): ?>
- 						<li><a href="<?php echo link_to($entry["app"], $entry["file"]); ?>" title=""><?php echo $entry["name"]; ?></a></li>
++						<li><a style="background-image:url(<?php echo $entry["icon"]; ?>)" href="<?php echo $entry["href"]; ?>" title=""><?php echo $entry["name"]; ?></a></li>
 +					<?php endforeach; ?>
  				</ul>
  			</div>