Merge branch 'master' into files_encryption

Conflicts:
	apps/files_encryption/templates/settings.php

1 files changed, 11 insertions, 11 deletions

diff --git a/settings/templates/help.php b/settings/templates/help.php
index b697905f7ef..8f51cd87017 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,14 +1,14 @@
 <div id="controls">
-        <?php if($_['admin']) { ?>
+	<?php if($_['admin']) { ?>
 		<a class="button newquestion <?php echo($_['style1']); ?>" href="<?php echo($_['url1']); ?>"><?php echo $l->t( 'User Documentation' ); ?></a>
-   	     	<a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a>
+		<a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a>
 	<?php } ?>
-        <a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a>
-        <a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a>
-        <?php if($_['admin']) { ?>
+	<a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a>
+	<a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a>
+	<?php if($_['admin']) { ?>
 		<a class="button newquestion" href="https://github.com/owncloud/core/issues" target="_blank"><?php echo $l->t( 'Bugtracker' ); ?></a>
 	<?php } ?>
-        <a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a>
+	<a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a>
 </div>
 <br /><br />
 <iframe src="<?php echo($_['url']); ?>" width="100%" id="ifm" ></iframe>
@@ -18,14 +18,14 @@
 <!--
 
 function pageY(elem) {
-    return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop;
+	return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop;
 }
 var buffer = 5; //scroll bar buffer
 function resizeIframe() {
-    var height = document.documentElement.clientHeight;
-    height -= pageY(document.getElementById('ifm'))+ buffer ;
-    height = (height < 0) ? 0 : height;
-    document.getElementById('ifm').style.height = height + 'px';
+	var height = document.documentElement.clientHeight;
+	height -= pageY(document.getElementById('ifm'))+ buffer ;
+	height = (height < 0) ? 0 : height;
+	document.getElementById('ifm').style.height = height + 'px';
 }
 
 document.getElementById('ifm').onload=resizeIframe;