From 3fd2e4b716aaf4626b774ac5d808cc4088e6f3f2 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 Apr 2015 19:51:58 -0700 Subject: program the affinity slider labels --- include/widgets.php | 31 ++++++++++++++++++++++++------- mod/connedit.php | 28 ++++++++++++++++++++++------ view/tpl/contact_slider.tpl | 2 +- view/tpl/main_slider.tpl | 2 +- 4 files changed, 48 insertions(+), 15 deletions(-) diff --git a/include/widgets.php b/include/widgets.php index e84c029d2..4a9032a21 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -420,18 +420,35 @@ function widget_affinity($arr) { $cmin = ((x($_REQUEST,'cmin')) ? intval($_REQUEST['cmin']) : 0); $cmax = ((x($_REQUEST,'cmax')) ? intval($_REQUEST['cmax']) : 99); + if(feature_enabled(local_channel(),'affinity')) { + + $labels = array( + t('Me'), + t('Family'), + t('Friends'), + t('Acquaintances'), + t('All') + ); + call_hooks('affinity_labels',$labels); + $label_str = ''; + + if($labels) { + foreach($labels as $l) { + if($label_str) { + $label_str .= ", '|'"; + $label_str .= ", '" . $l . "'"; + } + else + $label_str .= "'" . $l . "'"; + } + } + $tpl = get_markup_template('main_slider.tpl'); $x = replace_macros($tpl,array( '$val' => $cmin . ',' . $cmax, '$refresh' => t('Refresh'), - '$me' => t('Me'), - '$intimate' => t('Best Friends'), - '$friends' => t('Friends'), - '$coworkers' => t('Co-workers'), - '$oldfriends' => t('Former Friends'), - '$acquaintances' => t('Acquaintances'), - '$world' => t('All') + '$labels' => $label_str, )); $arr = array('html' => $x); call_hooks('main_slider',$arr); diff --git a/mod/connedit.php b/mod/connedit.php index 2c4c0cef8..70839e373 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -558,16 +558,32 @@ function connedit_content(&$a) { if(feature_enabled(local_channel(),'affinity')) { + $labels = array( + t('Me'), + t('Family'), + t('Friends'), + t('Acquaintances'), + t('All') + ); + call_hooks('affinity_labels',$labels); + $label_str = ''; + + if($labels) { + foreach($labels as $l) { + if($label_str) { + $label_str .= ", '|'"; + $label_str .= ", '" . $l . "'"; + } + else + $label_str .= "'" . $l . "'"; + } + } + $slider_tpl = get_markup_template('contact_slider.tpl'); $slide = replace_macros($slider_tpl,array( - '$me' => t('Me'), '$min' => 1, '$val' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 99), - '$intimate' => t('Best Friends'), - '$friends' => t('Friends'), - '$oldfriends' => t('Former Friends'), - '$acquaintances' => t('Acquaintances'), - '$world' => t('Unknown') + '$labels' => $label_str, )); } diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl index 09a79edd8..5c15e1c2c 100755 --- a/view/tpl/contact_slider.tpl +++ b/view/tpl/contact_slider.tpl @@ -1,4 +1,4 @@
diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl index d423e6691..d88bc1370 100755 --- a/view/tpl/main_slider.tpl +++ b/view/tpl/main_slider.tpl @@ -2,7 +2,7 @@