From 6bccf0be7960159866255c98b40b37ebc9401480 Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Wed, 4 Feb 2015 16:13:07 +0100 Subject: [PATCH 1/4] Added help text as requested in #1349. --- mod/notifications.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/notifications.php b/mod/notifications.php index 4a0b541891..1c0c11ae52 100644 --- a/mod/notifications.php +++ b/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('Shall your connection be bidirectional or not? "Friend" implies that you allow to read and you subscribe to their posts. "Fan" means that you allow to read but you do not want to read theirs. Approve as: '), '$as_friend' => t('Friend'), '$as_fan' => (($rr['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer')) )); From cdd30894442907c3e69b680b5455de6c3d142aac Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Wed, 4 Feb 2015 16:43:31 +0100 Subject: [PATCH 2/4] Help text sounded too complicated --- mod/notifications.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/notifications.php b/mod/notifications.php index 1c0c11ae52..3280456474 100644 --- a/mod/notifications.php +++ b/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('Shall your connection be bidirectional or not? "Friend" implies that you allow to read and you subscribe to their posts. "Fan" means that you allow to read but you do not want to read theirs. 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')) )); From 19af382ffb42806f1486040bc5dc81fecffdfc5a Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 21 Feb 2015 09:44:13 +0100 Subject: [PATCH 3/4] "plus" is now the default style at "vier" for new installations --- view/theme/vier/config.php | 13 ++++++++----- view/theme/vier/theme.php | 3 +++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php index 72279daebc..9df9088ed8 100644 --- a/view/theme/vier/config.php +++ b/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( diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 91e34e7824..a7ba561b23 100644 --- a/view/theme/vier/theme.php +++ b/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'] .= ''."\n"; else if ($style == "netcolour") From f3cc065e66c8522b64a87cc84d3baf7b51eb9a9b Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 21 Feb 2015 20:03:02 +0100 Subject: [PATCH 4/4] Show the profile visibility only for Friendica contacts. --- mod/contacts.php | 5 ++++- view/templates/contact_edit.tpl | 19 +++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/mod/contacts.php b/mod/contacts.php index ea16e1475c..a3263f3959 100644 --- a/mod/contacts.php +++ b/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') ), diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl index 9d5063146e..c63166aa75 100644 --- a/view/templates/contact_edit.tpl +++ b/view/templates/contact_edit.tpl @@ -84,15 +84,14 @@
- -
-

{{$lbl_vis1}}

-

{{$lbl_vis2}}

-
-{{$profile_select}} -
- - - +{{if $profile_select}} +
+

{{$lbl_vis1}}

+

{{$lbl_vis2}}

+
+ {{$profile_select}} +
+ +{{/if}}