Merge branch 'master' into fixing-1354-master

Conflicts:
	settings/admin.php
	settings/templates/admin.php

4 files changed, 36 insertions, 5 deletions

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 8c2b6148a66..fac8a689883 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -37,6 +37,20 @@ if (!$_['isWebDavWorking']) {
 <?php
 }
 
+// if module fileinfo available?
+if (!$_['has_fileinfo']) {
+	?>
+<fieldset class="personalblock">
+	<legend><strong><?php echo $l->t('Module \'fileinfo\' missing');?></strong></legend>
+
+		<span class="connectionwarning">
+		<?php echo $l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with mime-type detection.'); ?>
+	</span>
+
+</fieldset>
+<?php
+}
+
 // is locale working ?
 if (!$_['islocaleworking']) {
 	?>
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 3f0d2a9d1c6..ed1232ac322 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -10,7 +10,7 @@
 	<a class="button" target="_blank" href="http://owncloud.org/dev"><?php echo $l->t('Add your App');?></a>
 	<a class="button" target="_blank" href="http://apps.owncloud.com"><?php echo $l->t('More Apps');?></a>
 </div>
-<ul id="leftcontent" class="applist">
+<ul id="leftcontent" class="applist hascontrols">
 	<?php foreach($_['apps'] as $app):?>
 	<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>" <?php if ( isset( $app['ocs_id'] ) ) { echo "data-id-ocs=\"{$app['ocs_id']}\""; } ?>
 		data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index b1cc6713923..398e65c0086 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -10,9 +10,9 @@
 
 <fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('Clients');?></strong></legend>
-	<a class="button" href="http://owncloud.org/sync-clients/" target="_blank"><?php echo $l->t('Download Desktop Clients');?></a>
-	<a class="button" href="https://play.google.com/store/apps/details?id=com.owncloud.android" target="_blank"><?php echo $l->t('Download Android Client');?></a>
-	<a class="button" href="https://itunes.apple.com/us/app/owncloud/id543672169?mt=8" target="_blank"><?php echo $l->t('Download iOS Client');?></a>
+	<a class="button" href="<?php echo $_['clients']['desktop']; ?>" target="_blank"><?php echo $l->t('Download Desktop Clients');?></a>
+	<a class="button" href="<?php echo $_['clients']['android']; ?>" target="_blank"><?php echo $l->t('Download Android Client');?></a>
+	<a class="button" href="<?php echo $_['clients']['ios']; ?>" target="_blank"><?php echo $l->t('Download iOS Client');?></a>
 </fieldset>
 
 <?php
@@ -33,6 +33,23 @@ if($_['passwordChangeSupported']) {
 }
 ?>
 
+<?php
+if($_['displayNameChangeSupported']) {
+?>
+<form id="displaynameform">
+	<fieldset class="personalblock">
+		<legend><strong><?php echo $l->t('Display Name');?></strong></legend>
+		<div id="displaynamechanged"><?php echo $l->t('Your display name was changed');?></div>
+		<div id="displaynameerror"><?php echo $l->t('Unable to change your display name');?></div>
+		<input type="text" id="displayName" name="displayName" value="<?php echo $_['displayName']?>" />
+		<input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php echo $_['displayName']?>" />
+		<input id="displaynamebutton" type="submit" value="<?php echo $l->t('Change display name');?>" />
+	</fieldset>
+</form>
+<?php
+}
+?>
+
 <form id="lostpassword">
 	<fieldset class="personalblock">
 		<legend><strong><?php echo $l->t('Email');?></strong></legend>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 4d7c29678ce..b3cab526947 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -73,7 +73,7 @@ $_['subadmingroups'] = array_flip($items);
 	</div>
 </div>
 
-<table data-groups="<?php echo implode(', ', $allGroups);?>">
+<table class="hascontrols" data-groups="<?php echo implode(', ', $allGroups);?>">
 	<thead>
 		<tr>
 			<th id='headerName'><?php echo $l->t('Login Name')?></th>