diff --git a/mod/contacts.php b/mod/contacts.php index ea16e1475..a3263f395 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/mod/notifications.php b/mod/notifications.php index 4a0b54189..328045647 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('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')) )); diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl index 9d5063146..c63166aa7 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}} diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php index 72279daeb..9df9088ed 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 91e34e782..a7ba561b2 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")