From e110b558b886c9ce2db08bfe55b598c9adbf166f Mon Sep 17 00:00:00 2001 From: im-mi Date: Sun, 11 Sep 2016 23:26:20 -0400 Subject: [PATCH 1/4] Hide the rating editor outside of edit mode --- ext/rating/theme.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ext/rating/theme.php b/ext/rating/theme.php index 889988d6..756304e8 100644 --- a/ext/rating/theme.php +++ b/ext/rating/theme.php @@ -10,13 +10,17 @@ class RatingsTheme extends Themelet { $s_checked = $rating == 's' ? " checked" : ""; $q_checked = $rating == 'q' ? " checked" : ""; $e_checked = $rating == 'e' ? " checked" : ""; + $human_rating = Ratings::rating_to_human($rating); $html = " Rating - - - + $human_rating + + + + + "; From 001a1176cce84d46dd94c2487db49d4c8ea52f5a Mon Sep 17 00:00:00 2001 From: im-mi Date: Sun, 11 Sep 2016 23:34:56 -0400 Subject: [PATCH 2/4] Show image rating in image info box even when not logged in --- ext/rating/main.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ext/rating/main.php b/ext/rating/main.php index 22b331d8..2dc8b189 100644 --- a/ext/rating/main.php +++ b/ext/rating/main.php @@ -103,9 +103,7 @@ class Ratings extends Extension { } public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event) { - if($this->can_rate()) { - $event->add_part($this->theme->get_rater_html($event->image->id, $event->image->rating), 80); - } + $event->add_part($this->theme->get_rater_html($event->image->id, $event->image->rating), 80); } public function onImageInfoSet(ImageInfoSetEvent $event) { From 4dcee0eede9c3830a4af737ffa78764f182f3c80 Mon Sep 17 00:00:00 2001 From: im-mi Date: Sun, 11 Sep 2016 23:32:13 -0400 Subject: [PATCH 3/4] Removed trailing period from "Parent: None." for consistency --- ext/relatationships/theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/relatationships/theme.php b/ext/relatationships/theme.php index abc4302e..c53483c1 100644 --- a/ext/relatationships/theme.php +++ b/ext/relatationships/theme.php @@ -30,7 +30,7 @@ class RelationshipsTheme extends Themelet { global $user; $h_parent_id = $image->parent_id; - $s_parent_id = $h_parent_id ?: "None."; + $s_parent_id = $h_parent_id ?: "None"; $html = "\n". " Parent\n". From 3e52e332dec0fbb90375ac1f8846e4c67c126ca6 Mon Sep 17 00:00:00 2001 From: im-mi Date: Tue, 13 Sep 2016 02:10:48 -0400 Subject: [PATCH 4/4] Only show image rater if user can rate --- ext/rating/main.php | 2 +- ext/rating/theme.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ext/rating/main.php b/ext/rating/main.php index 2dc8b189..c3018331 100644 --- a/ext/rating/main.php +++ b/ext/rating/main.php @@ -103,7 +103,7 @@ class Ratings extends Extension { } public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event) { - $event->add_part($this->theme->get_rater_html($event->image->id, $event->image->rating), 80); + $event->add_part($this->theme->get_rater_html($event->image->id, $event->image->rating, $this->can_rate()), 80); } public function onImageInfoSet(ImageInfoSetEvent $event) { diff --git a/ext/rating/theme.php b/ext/rating/theme.php index 756304e8..d3836c5d 100644 --- a/ext/rating/theme.php +++ b/ext/rating/theme.php @@ -6,7 +6,7 @@ class RatingsTheme extends Themelet { * @param string $rating * @return string */ - public function get_rater_html(/*int*/ $image_id, /*string*/ $rating) { + public function get_rater_html(/*int*/ $image_id, /*string*/ $rating, /*bool*/ $can_rate) { $s_checked = $rating == 's' ? " checked" : ""; $q_checked = $rating == 'q' ? " checked" : ""; $e_checked = $rating == 'e' ? " checked" : ""; @@ -15,12 +15,16 @@ class RatingsTheme extends Themelet { Rating + ".($can_rate ? " $human_rating + " : " + $human_rating + ")." ";