how did that stuff merge? grrrr....

This commit is contained in:
friendica 2015-01-29 18:17:24 -08:00
parent 219fe3a8e7
commit 3e22de0be0
2 changed files with 3 additions and 3 deletions

View File

@ -564,7 +564,7 @@ function connedit_content(&$a) {
} }
$poco_rating = get_config('system','poco_rating_enable'); $poco_rating = get_config('system','poco_rating_enable');
$poco_rating = 0;
// if unset default to enabled // if unset default to enabled
if($poco_rating === false) if($poco_rating === false)
$poco_rating = true; $poco_rating = true;

View File

@ -15,7 +15,7 @@
<div class='contact-info'> <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> <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%;"> <div id="dir-rating-wrapper-{{$entry.id}}" style="float:right; width: 20%;">
62 ratings<br /> 62 ratings<br />
<div id="dir-rating-slider-{{$entry.id}}" class="dir-slider" style="height: 32px; margin-right:10px;"> <div id="dir-rating-slider-{{$entry.id}}" class="dir-slider" style="height: 32px; margin-right:10px;">
@ -26,7 +26,7 @@
<script> <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); } }); $("#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> </script>
{{*/if*}} {{/if}}
{{if $entry.public_forum}} {{if $entry.public_forum}}
<div class="contact-forum"> <div class="contact-forum">
{{$entry.forum_label}} @{{$entry.nickname}}+ {{$entry.forum_label}} @{{$entry.nickname}}+