aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Willingham <beardyunixer@beardyunixer.com>2014-12-02 00:59:20 +0000
committerThomas Willingham <beardyunixer@beardyunixer.com>2014-12-02 00:59:20 +0000
commit460d379e7efc074808109b4c9acd0aea46460d16 (patch)
tree0838c4ffcad0e6b92f97d6c74b6ee62d80321de4
parentdef10df816ec7ca25fe463bf029e84ba7dfdba61 (diff)
downloadvolse-hubzilla-460d379e7efc074808109b4c9acd0aea46460d16.tar.gz
volse-hubzilla-460d379e7efc074808109b4c9acd0aea46460d16.tar.bz2
volse-hubzilla-460d379e7efc074808109b4c9acd0aea46460d16.zip
Don't allow affinity of 0 in connedit.
-rw-r--r--mod/connedit.php1
-rw-r--r--version.inc2
-rwxr-xr-xview/tpl/contact_slider.tpl2
3 files changed, 3 insertions, 2 deletions
diff --git a/mod/connedit.php b/mod/connedit.php
index 917e2c73b..fbc2c8c33 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -504,6 +504,7 @@ function connedit_content(&$a) {
$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'),
diff --git a/version.inc b/version.inc
index 6578428cf..ad51b921f 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-11-28.873
+2014-12-02.877
diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl
index 33cd3fb71..93d0cc625 100755
--- a/view/tpl/contact_slider.tpl
+++ b/view/tpl/contact_slider.tpl
@@ -1,4 +1,4 @@
<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div>
<script>
- $("#contact-range").slider({ from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } });
+ $("#contact-range").slider({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } });
</script>