ratings - mopping up, most everything but directory sync implemented

5 files changed, 30 insertions, 8 deletions

diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
index e93f23ec6..d4cf23b39 100644
--- a/view/css/mod_directory.css
+++ b/view/css/mod_directory.css
@@ -10,14 +10,24 @@
 	float: right;
 	margin-right: 5px;
 }
-.directory-slider {
+
+.slider-container {
 	padding: 15px;
-	width: 100px;
 }
-.directory-rating-text {
+
+.rating-text {
 	margin-top: 30px;
 }
 
+.directory-rating-text {
+	width: 90%;
+	margin-left: 5%;
+}
+
+.directory-rating-submit {
+	margin-top: 15px;
+}
+
 .directory-photo {
 	margin-left: 25px;
 }
diff --git a/view/js/mod_directory.js b/view/js/mod_directory.js
index 60bfe98ba..09b103352 100644
--- a/view/js/mod_directory.js
+++ b/view/js/mod_directory.js
@@ -8,9 +8,9 @@ function dirdetails(hash) {
 
 function doRatings(hash) {
 
-	var html = '<form action="prate" method="post"><input type="hidden" name="target" value="'+hash+'" /><input id="dir-rating-range" class="directory-slider" type="text" value="0" name="rating" style="display: none;" /><input type="text" name="rating-text" class="directory-rating-text" /><input name="submit" type="submit" value="submit" ></form><div class="clear"></div><script>$("#dir-rating-range").jRange({ from: -10, to: 10, step: 1, width:"100%", showLabels: false, showScale: true, scale : [ "-10","-5","0","5","10" ], onstatechange: function(v) { $("#dir-rating-range").val(v); } });</script>';
+	var html = '<form action="prate" method="post"><input type="hidden" name="target" value="'+hash+'" /><div class="rating-desc">'+aStr['rating_desc']+'</div><input id="dir-rating-range" class="directory-slider" type="text" value="0" name="rating" style="display: none;" /><div class="rating-text">'+aStr['rating_text']+'<input type="text" name="rating-text" class="directory-rating-text" /><br /><input name="submit" class="directory-rating-submit" type="submit" value="submit" ></form><div class="clear"></div><script>$("#dir-rating-range").jRange({ from: -10, to: 10, step: 1, showLabels: false, showScale: true, scale : [ "-10","-5","0","5","10" ], onstatechange: function(v) { $("#dir-rating-range").val(v); } });</script>';
 
-	$.colorbox({maxwidth: "50%", maxHeight: "50%", html: html });
+	$.colorbox({maxwidth: "50%", maxHeight: "50%", html: html, close: 'X' });
 
 }
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c637f30e4..cebc516da 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -575,6 +575,15 @@ footer {
 
 #cboxContent {
     color: $dirpopup_txtcol;
+	margin: 5px;
+}
+
+#cboxClose {
+	margin: 10px;
+}
+
+#colorbox {
+	margin: 5px;
 }
 
 #cboxContent a {
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index 461c5dcde..1b84bca56 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -15,11 +15,11 @@
 <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.viewrate}}
 <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" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i></button>
+{{if $entry.canrate}}<button class="btn btn-default" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i></button>{{/if}}
 </div>
-{{*/if*}}
+{{/if}}
 {{if $entry.public_forum}}
 <div class="contact-forum">
 {{$entry.forum_label}} @{{$entry.nickname}}+
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index eb78c669f..9cfd84cf8 100755
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -16,6 +16,9 @@
 		'permschange' : "{{$permschange}}",
 		'closeAll'    : "{{$closeAll}}",
 		'nothingnew'  : "{{$nothingnew}}",
+		'rating_desc' : "{{$rating_desc}}",
+		'rating_val'  : "{{$rating_val}}",
+		'rating_text' : "{{$rating_text}}",
 
 		't01' : "{{$t01}}",
 		't02' : "{{$t02}}",