Merge remote-tracking branch 'upstream/develop' into 1502-improved-markdown

mod/contacts.php

@@ -482,6 +482,9 @@ function contacts_content(&$a) {
 		if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2)))
 			$poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled));
 
+		if ($contact['network'] == NETWORK_DFRN)
+			$profile_select = contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false));
+
 		$o .= replace_macros($tpl, array(
 			'$header' => t('Contact Editor'),
 			'$tab_str' => $tab_str,
@@ -509,7 +512,7 @@ function contacts_content(&$a) {
 			'$updpub' => t('Update public posts'),
 			'$last_update' => $last_update,
 			'$udnow' => t('Update now'),
-			'$profile_select' => contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false)),
+			'$profile_select' => $profile_select,
 			'$contact_id' => $contact['id'],
 			'$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
 			'$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),

mod/notifications.php

@@ -185,7 +185,7 @@ function notifications_content(&$a) {
 						'$intro_id' => $rr['intro_id'],
 						'$friend_selected' => $friend_selected,
 						'$fan_selected' => $fan_selected,
-						'$approve_as' => t('Approve as: '),
+						'$approve_as' => t('Choose "Friend" to allow to read and to subscribe to their posts. Choose "Fan" to allow to read if you do not want to read their posts. Approve as: '),
 						'$as_friend' => t('Friend'),
 						'$as_fan' => (($rr['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer'))
 					));

view/templates/contact_edit.tpl

@@ -84,15 +84,14 @@
 </div>
 <div id="contact-edit-info-end"></div>
 
-
-<div id="contact-edit-profile-select-text">
-<h4>{{$lbl_vis1}}</h4>
-<p>{{$lbl_vis2}}</p> 
-</div>
-{{$profile_select}}
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
-
+{{if $profile_select}}
+	<div id="contact-edit-profile-select-text">
+	<h4>{{$lbl_vis1}}</h4>
+	<p>{{$lbl_vis2}}</p> 
+	</div>
+	{{$profile_select}}
+	<div id="contact-edit-profile-select-end"></div>
+	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+{{/if}}
 </form>
 </div>

view/theme/vier/config.php

@@ -14,6 +14,9 @@ function theme_content(&$a){
 	if ($style == "")
 		$style = get_config('vier', 'style');
 
+	if ($style == "")
+		$style = "plus";
+
 	return vier_form($a,$style);
 }
 
@@ -41,12 +44,12 @@ function theme_admin_post(&$a){
 
 function vier_form(&$a, $style){
 	$styles = array(
-		"shadow"=>"Shadow",
-		"flat"=>"Flat",
-		"netcolour"=>"Coloured Networks",
-		"breathe"=>"Breathe",
 		"plus"=>"Plus",
-		"dark"=>"Dark"
+		"breathe"=>"Breathe",
+		"dark"=>"Dark",
+		"shadow"=>"Shadow",
+		"netcolour"=>"Coloured Networks",
+		"flat"=>"Flat"
 	);
 	$t = get_markup_template("theme_settings.tpl" );
 	$o .= replace_macros($t, array(

view/theme/vier/theme.php

@@ -21,6 +21,9 @@ $style = get_pconfig(local_user(), 'vier', 'style');
 if ($style == "")
 	$style = get_config('vier', 'style');
 
+if ($style == "")
+	$style = "plus";
+
 if ($style == "flat")
 	$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/flat.css" type="text/css" media="screen"/>'."\n";
 else if ($style == "netcolour")