Merge branch 'master' into tres

Conflicts:
	view/css/mod_events.css
	view/theme/redbasic/css/style.css

3 files changed, 71 insertions, 0 deletions

diff --git a/view/js/mod_directory.js b/view/js/mod_directory.js
index 74c8b414d..87e4f92b5 100644
--- a/view/js/mod_directory.js
+++ b/view/js/mod_directory.js
@@ -3,7 +3,40 @@ function dirdetails(hash) {
 	$.get('dirprofile' + '?f=&hash=' + hash, function( data ) {
 		$.colorbox({ maxWidth: "50%", maxHeight: "75%", html: data });
 	});
+}
+
+
+var ratingVal = 0;
+var ratingText = '';
+var currentHash = '';
+
+function fetchRatings(hash) {
+	$.get('prate/'+hash, function(data) {
+		if(typeof(data.rating) !== 'undefined') {
+			ratingVal = data.rating;
+			ratingText = data.rating_text;
+		}
+		buildRatingForm(hash);
+	});
+}
+
+
+function doRatings(hash) {
+	fetchRatings(hash);
+}
+
+function buildRatingForm(hash) {
+	var html = '<form id="ratings_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="'+ratingVal+'" name="rating" style="display: none;" /><div class="rating-text-label">'+aStr['rating_text']+'<input type="text" name="rating_text" class="directory-rating-text" value="'+ratingText+'" /><br /><input name="submit" class="directory-rating-submit" type="submit" value="'+aStr['submit']+'" onclick="postRatings(); return false;"></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, close: 'X' });
+	currentHash = hash;
+}
 
+function postRatings() {
+	$.post('prate',$('#ratings_form').serialize(),function(data) {
+		$.colorbox.remove();
+		$('#edited-'+currentHash).show();
+	},'json');
 }
 
 $(document).ready(function() {
diff --git a/view/js/mod_ratings.js b/view/js/mod_ratings.js
new file mode 100644
index 000000000..0f7cab5e3
--- /dev/null
+++ b/view/js/mod_ratings.js
@@ -0,0 +1,4 @@
+
+$(document).ready(function() {
+	collapseHeight();
+});
diff --git a/view/js/ratings.js b/view/js/ratings.js
new file mode 100644
index 000000000..3d48ecca5
--- /dev/null
+++ b/view/js/ratings.js
@@ -0,0 +1,34 @@
+
+var ratingVal = 0;
+var ratingText = '';
+var currentHash = '';
+
+function fetchRatings(hash) {
+	$.get('prate/'+hash, function(data) {
+		if(typeof(data.rating) !== 'undefined') {
+			ratingVal = data.rating;
+			ratingText = data.rating_text;
+		}
+		buildRatingForm(hash);
+	});
+}
+
+
+function doRatings(hash) {
+	fetchRatings(hash);
+}
+
+function buildRatingForm(hash) {
+	var html = '<form id="ratings_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="'+ratingVal+'" name="rating" style="display: none;" /><div class="rating-text-label">'+aStr['rating_text']+'<input type="text" name="rating_text" class="directory-rating-text" value="'+ratingText+'" /><br /><input name="submit" class="directory-rating-submit" type="submit" value="'+aStr['submit']+'" onclick="postRatings(); return false;"></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, close: 'X' });
+	currentHash = hash;
+}
+
+function postRatings() {
+	$.post('prate',$('#ratings_form').serialize(),function(data) {
+		$.colorbox.remove();
+		$('#edited-'+currentHash).show();
+	},'json');
+}
+