Merge branch 'master' into files_encryption

config/config.sample.php

@@ -161,5 +161,9 @@ $CONFIG = array(
 		'class'=>'OC_User_IMAP',
 		'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX')
 	)
-)
+),
+//links to custom clients
+'customclient_desktop' => '', //http://owncloud.org/sync-clients/
+'customclient_android' => '', //https://play.google.com/store/apps/details?id=com.owncloud.android
+'customclient_ios' => '' //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8
 );

core/css/styles.css

@@ -238,7 +238,10 @@ fieldset.warning legend { color:#b94a48 !important; }
 #expand:hover, #expand:focus, #expand:active { color:#fff; }
 #expand img { opacity:.7; margin-bottom:-2px; }
 #expand:hover img, #expand:focus img, #expand:active img { opacity:1; }
-#expanddiv { position:absolute; right:0; top:45px; background-color:#444; border-bottom-left-radius:7px; box-shadow: 0 0 20px rgb(29,45,68); z-index:76; }
+#expanddiv {
+	position:absolute; right:0; top:45px; z-index:76; display:none;
+	background-color:#444; border-bottom-left-radius:7px; box-shadow: 0 0 20px rgb(29,45,68);
+}
 	#expanddiv a { display:block; color:#fff; text-shadow:0 -1px 0 #000; padding:0 8px; opacity:.7; }
 	#expanddiv a img { margin-bottom:-3px; }
 	#expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { opacity:1; }

core/templates/layout.user.php

@@ -35,7 +35,7 @@
 					<?php echo OCP\User::getDisplayName($user=null)?OCP\User::getDisplayName($user=null):(OC_User::getUser()?OC_User::getUser():'') ?>
 					<img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" />
 				</span>
-				<div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>>
+				<div id="expanddiv">
 				<?php foreach($_['settingsnavigation'] as $entry):?>
 					<li>
 						<a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>

settings/personal.php

@@ -39,12 +39,19 @@ foreach($languageCodes as $lang) {
 		$languages[]=array('code'=>$lang, 'name'=>$lang);
 	}
 }
+//links to clients
+$clients = array(
+	'desktop' => OC_Config::getValue('customclient_desktop', 'http://owncloud.org/sync-clients/'),
+	'android' => OC_Config::getValue('customclient_android', 'https://play.google.com/store/apps/details?id=com.owncloud.android'),
+	'ios'     => OC_Config::getValue('customclient_ios', 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8')
+);
 
 // Return template
 $tmpl = new OC_Template( 'settings', 'personal', 'user');
 $tmpl->assign('usage', OC_Helper::humanFileSize($storageInfo['used']));
 $tmpl->assign('total_space', OC_Helper::humanFileSize($storageInfo['total']));
 $tmpl->assign('usage_relative', $storageInfo['relative']);
+$tmpl->assign('clients', $clients);
 $tmpl->assign('email', $email);
 $tmpl->assign('languages', $languages);
 $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser()));

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