diff options
author | friendica <info@friendica.com> | 2015-01-29 18:17:24 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-01-29 18:17:24 -0800 |
commit | 3e22de0be01cc53e74ffd00f5b9d14d4bcc9b6c5 (patch) | |
tree | 39b1282e28c310696fd035cfb67ada4eaefc480b | |
parent | 219fe3a8e7f805eb0898c1931de304c602315eae (diff) | |
download | volse-hubzilla-3e22de0be01cc53e74ffd00f5b9d14d4bcc9b6c5.tar.gz volse-hubzilla-3e22de0be01cc53e74ffd00f5b9d14d4bcc9b6c5.tar.bz2 volse-hubzilla-3e22de0be01cc53e74ffd00f5b9d14d4bcc9b6c5.zip |
how did that stuff merge? grrrr....
-rw-r--r-- | mod/connedit.php | 2 | ||||
-rwxr-xr-x | view/tpl/direntry.tpl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mod/connedit.php b/mod/connedit.php index c613c3ba6..8c0212afe 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -564,7 +564,7 @@ function connedit_content(&$a) { } $poco_rating = get_config('system','poco_rating_enable'); - + $poco_rating = 0; // if unset default to enabled if($poco_rating === false) $poco_rating = true; diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index f51fd0908..6ba86a085 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -15,7 +15,7 @@ <div class='contact-info'> <div class="contact-name" id="directory-name-{{$entry.id}}" ><a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}} <i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</div> -{{*if $entry.rateme*}} +{{if $entry.rateme}} <div id="dir-rating-wrapper-{{$entry.id}}" style="float:right; width: 20%;"> 62 ratings<br /> <div id="dir-rating-slider-{{$entry.id}}" class="dir-slider" style="height: 32px; margin-right:10px;"> @@ -26,7 +26,7 @@ <script> $("#dir-rating-range-{{$entry.id}}").jRange({ from: -10, to: 10, step: 1, width:'100%', showLabels: false, showScale: true, scale : [ '-10','-5','0','5','10' ], onstatechange: function(v) { $("#contact-rating-mirror").val(v); } }); </script> -{{*/if*}} +{{/if}} {{if $entry.public_forum}} <div class="contact-forum"> {{$entry.forum_label}} @{{$entry.nickname}}+ |