diff options
| -rw-r--r-- | mod/directory.php | 2 | ||||
| -rw-r--r-- | mod/dirsearch.php | 9 | ||||
| -rw-r--r-- | mod/ratingsearch.php | 6 | ||||
| -rw-r--r-- | view/css/mod_directory.css | 9 | ||||
| -rw-r--r-- | view/css/mod_ratings.css | 4 | ||||
| -rwxr-xr-x | view/tpl/direntry.tpl | 11 | ||||
| -rw-r--r-- | view/tpl/prep.tpl | 5 |
7 files changed, 19 insertions, 27 deletions
diff --git a/mod/directory.php b/mod/directory.php index 7f9283ba4..d9316ef67 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -192,6 +192,8 @@ function directory_content(&$a) { if($rr['total_ratings']) $total_ratings = sprintf( tt("%d rating", "%d ratings", $rr['total_ratings']), $rr['total_ratings']); + else + $total_ratings = ''; $profile = $rr; diff --git a/mod/dirsearch.php b/mod/dirsearch.php index fcd72e9eb..69b7e2eac 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -21,15 +21,6 @@ function dirsearch_content(&$a) { json_return_and_die($ret); } - - // If you've got a public directory server, you probably shouldn't block public access - - if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) { - $ret['message'] = 'permission denied'; - json_return_and_die($ret); - } - - if(argc() > 1 && argv(1) === 'sites') { $ret = list_public_sites(); json_return_and_die($ret); diff --git a/mod/ratingsearch.php b/mod/ratingsearch.php index 558b459eb..9a537bf97 100644 --- a/mod/ratingsearch.php +++ b/mod/ratingsearch.php @@ -12,12 +12,6 @@ function ratingsearch_init(&$a) { json_return_and_die($ret); } - if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) { - $ret['message'] = 'permission denied'; - json_return_and_die($ret); - } - - if(argc() > 1) $hash = argv(1); diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css index 20facbaf8..b156e322a 100644 --- a/view/css/mod_directory.css +++ b/view/css/mod_directory.css @@ -3,8 +3,15 @@ clear: both; } .directory-name { - text-align: center; +/* text-align: center; */ + float: left; + width: 250px; } +.directory-rating { + float: right; + margin-right: 20px; +} + .directory-photo { margin-left: 25px; } diff --git a/view/css/mod_ratings.css b/view/css/mod_ratings.css index bb29086da..86d6f5ed3 100644 --- a/view/css/mod_ratings.css +++ b/view/css/mod_ratings.css @@ -9,4 +9,8 @@ .directory-item { margin: 10px; +} + +.rating-value { + margin-top: 10px; }
\ No newline at end of file diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 450bddd95..1761ed12d 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -16,16 +16,9 @@ <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*}} -<div id="dir-rating-wrapper-{{$entry.id}}" style="float:right; width: 20%;">{{if $entry.total_ratings}}<a href="prep/{{$entry.hash}}"> -{{$entry.total_ratings}}</a>{{/if}}<br /> -<div id="dir-rating-slider-{{$entry.id}}" class="dir-slider" style="height: 32px; margin-right:10px;"> -<input id="dir-rating-range-{{$entry.id}}" type="text" value="0" name="fake-rating-{{$entry.id}}" style="display: none;"> +<div id="dir-rating-wrapper-{{$entry.id}}" class="directory-rating" >{{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}"><button class="btn btn-default">{{$entry.total_ratings}}</button></a>{{/if}} +<button class="btn btn-default"><i class="icon-pencil"></i></button> </div> -</div> -<div class="clear"></div> -<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 $entry.public_forum}} <div class="contact-forum"> diff --git a/view/tpl/prep.tpl b/view/tpl/prep.tpl index 49dea7d72..924bea252 100644 --- a/view/tpl/prep.tpl +++ b/view/tpl/prep.tpl @@ -12,9 +12,10 @@ </div> <div class="prep-details"> <a href="{{$r.xchan_url}}" class="directory-profile-link" id="directory-profile-link-{{$r.xchan_hash}}" ><div class="contact-name">{{$r.xchan_name}}</div></a> -{{$rating_lbl}} {{$r.xlink_rating}} +<div class="rating-value">{{$rating_lbl}} {{$r.xlink_rating}}</div> {{if $r.xlink_rating_text}} -{{$rating_text_label}} {{$r.xlink_rating_text}} +<div class="rating-text">{{$rating_text_label}} {{$r.xlink_rating_text}} +</div> {{/if}} </div> <div class="clear"></div> |