diff --git a/templates/layout.admin.php b/templates/layout.admin.php
index ea352a0fb71bcf01937b606fbfd6e191bdd9cc50..52912f48767058d3b7c342d86092567809f2e2fb 100644
--- a/templates/layout.admin.php
+++ b/templates/layout.admin.php
@@ -8,39 +8,39 @@
<head>
<title>ownCloud</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="shortcut icon" href="favicon.ico" />
- <?php foreach($_["cssfiles"] as $cssfile): ?>
+ <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+ <?php foreach($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>
- <?php foreach($_["jsfiles"] as $jsfile): ?>
+ <?php foreach($_['jsfiles'] as $jsfile): ?>
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
<?php endforeach; ?>
</head>
<body>
<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>
<div id="user">
- <a href="<?php echo link_to("","index.php"); ?>" title=""><img src="<?php echo image_path("", "layout/back.png"); ?>"></a>
- <a href="<?php echo link_to("settings","index.php"); ?>" title=""><img src="<?php echo image_path("", "layout/settings.png"); ?>"></a>
- <a href="<?php echo link_to("help","index.php"); ?>" title=""><img src="<?php echo image_path("", "layout/help.png"); ?>"></a>
- <a href="<?php echo link_to("","index.php?logout=true"); ?>" title=""><img src="<?php echo image_path("", "layout/logout.png"); ?>"></a>
+ <a href="<?php echo link_to('', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/back.png'); ?>"></a>
+ <a href="<?php echo link_to('settings', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/settings.png'); ?>"></a>
+ <a href="<?php echo link_to('help', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/help.png'); ?>"></a>
+ <a href="<?php echo link_to('', 'index.php?logout=true'); ?>" title=""><img src="<?php echo image_path('', 'layout/logout.png'); ?>"></a>
</div>
</div>
<div id="main">
<div id="plugins">
<ul>
- <li><a style="background-image:url(<?php echo image_path("settings", "information.png"); ?>)" href="<?php echo link_to("settings", "index.php"); ?>" title="">Information</a></li>
- <?php foreach($_["navigation"] as $entry):?>
- <li><a style="background-image:url(<?php echo $entry["icon"]; ?>)" href="<?php echo $entry["href"]; ?>" title=""><?php echo $entry["name"] ?></a></li>
+ <li><a style="background-image:url(<?php echo image_path('settings', 'information.png'); ?>)" href="<?php echo link_to('settings', 'index.php'); ?>" title="">Information</a></li>
+ <?php foreach($_['navigation'] as $entry):?>
+ <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>
<div id="content">
- <?php echo $_["content"]; ?>
+ <?php echo $_['content']; ?>
</div>
</div>
</body>
diff --git a/templates/layout.guest.php b/templates/layout.guest.php
index a163a97103f2cef408e4902059823e213c01c0a3..8d567759ffcb5714c07c47719ad0de85914c85d5 100644
--- a/templates/layout.guest.php
+++ b/templates/layout.guest.php
@@ -8,17 +8,17 @@
<head>
<title>ownCloud</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="shortcut icon" href="favicon.ico" />
- <?php foreach($_["cssfiles"] as $cssfile): ?>
+ <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+ <?php foreach($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>
- <?php foreach($_["jsfiles"] as $jsfile): ?>
+ <?php foreach($_['jsfiles'] as $jsfile): ?>
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
<?php endforeach; ?>
</head>
<body class="login">
- <?php echo $_["content"]; ?>
+ <?php echo $_['content']; ?>
<p class="info">
ownCloud is an open personal cloud which runs on your personal server.<br />
To learn more, please visit <a href="http://www.owncloud.org/">owncloud.org</a>.
diff --git a/templates/layout.user.php b/templates/layout.user.php
index be14cc0fc0d61bdf7ed772e999393a8e7d8e34a9..0ee49623151105c12b4b1bf2414a97b4591d55a8 100644
--- a/templates/layout.user.php
+++ b/templates/layout.user.php
@@ -8,40 +8,40 @@
<head>
<title>ownCloud</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="shortcut icon" href="favicon.ico" />
- <?php foreach($_["cssfiles"] as $cssfile): ?>
+ <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+ <?php foreach($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>
- <?php foreach($_["jsfiles"] as $jsfile): ?>
+ <?php foreach($_['jsfiles'] as $jsfile): ?>
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
<?php endforeach; ?>
</head>
<body>
<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>
<div id="user">
<?php if( OC_APP::getActiveNavigationEntry() == "help" ): ?>
- <a href="<?php echo link_to("","index.php"); ?>" title=""><img src="<?php echo image_path("", "layout/back.png"); ?>"></a>
+ <a href="<?php echo link_to('', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/back.png'); ?>"></a>
<?php endif; ?>
- <a href="<?php echo link_to("settings","index.php"); ?>" title=""><img src="<?php echo image_path("", "layout/settings.png"); ?>"></a>
- <a href="<?php echo link_to("help","index.php"); ?>" title=""><img src="<?php echo image_path("", "layout/help.png"); ?>"></a>
- <a href="<?php echo link_to("","index.php"); ?>?logout=true" title=""><img src="<?php echo image_path("", "layout/logout.png"); ?>"></a>
+ <a href="<?php echo link_to('settings', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/settings.png'); ?>"></a>
+ <a href="<?php echo link_to('help', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/help.png'); ?>"></a>
+ <a href="<?php echo link_to('', 'index.php'); ?>?logout=true" title=""><img src="<?php echo image_path('', 'layout/logout.png'); ?>"></a>
</div>
</div>
<div id="main">
<div id="plugins">
<ul>
- <?php foreach($_["navigation"] as $entry): ?>
- <li><a style="background-image:url(<?php echo $entry["icon"]; ?>)" href="<?php echo $entry["href"]; ?>" title=""><?php echo $entry["name"]; ?></a></li>
+ <?php foreach($_['navigation'] as $entry): ?>
+ <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>
<div id="content">
- <?php echo $_["content"]; ?>
+ <?php echo $_['content']; ?>
</div>
</div>
</body>