From 14884ebb14e6085bbf76ab04717b645d687c1532 Mon Sep 17 00:00:00 2001
From: Azareal <azareal@users.noreply.github.com>
Date: Mon, 3 Dec 2018 22:32:46 +1000
Subject: [PATCH] Quasi mod group-forum presets now show up as Custom rather
 than blank on all themes. Forum permission group-forum presets now show up on
 Nox. Fixed levels breaking onto multiple lines in Nox.

Added the panel_perms_quasi_mod phrase.
---
 common/forum_perms.go                 |  8 ++++----
 langs/english.json                    |  1 +
 themes/cosora/public/panel.css        |  3 +++
 themes/nox/public/main.css            |  3 +++
 themes/nox/public/panel.css           | 28 +++++++++++++++++++++++++++
 themes/tempra-simple/public/panel.css |  4 ++++
 6 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/common/forum_perms.go b/common/forum_perms.go
index e6107fe2..5fb52adc 100644
--- a/common/forum_perms.go
+++ b/common/forum_perms.go
@@ -237,10 +237,10 @@ func ForumPermsToGroupForumPreset(fperms *ForumPerms) string {
 		return "can_moderate"
 	}
 	if fperms.EditTopic || fperms.DeleteTopic || fperms.EditReply || fperms.DeleteReply || fperms.PinTopic || fperms.CloseTopic || fperms.MoveTopic {
-		if !canPost {
-			return "custom"
-		}
-		return "quasi_mod"
+		//if !canPost {
+		return "custom"
+		//}
+		//return "quasi_mod"
 	}
 
 	if canPost {
diff --git a/langs/english.json b/langs/english.json
index 978c7180..1cd6e020 100644
--- a/langs/english.json
+++ b/langs/english.json
@@ -396,6 +396,7 @@
 		"panel_perms_read_only":"Read Only",
 		"panel_perms_can_post":"Can Post",
 		"panel_perms_can_moderate":"Can Moderate",
+		"panel_perms_quasi_mod":"Partial Mod",
 		"panel_perms_custom":"Custom",
 		"panel_perms_default":"Default",
 
diff --git a/themes/cosora/public/panel.css b/themes/cosora/public/panel.css
index 8673846e..f6701d1f 100644
--- a/themes/cosora/public/panel.css
+++ b/themes/cosora/public/panel.css
@@ -217,6 +217,9 @@
 	content: "{{index .Phrases "panel_perms_can_moderate" }}";
 	color: hsl(240,100%,20%);
 }
+.perm_preset_quasi_mod:before {
+	content: "{{index .Phrases "panel_perms_quasi_mod" }}";
+}
 .perm_preset_custom:before {
 	content: "{{index .Phrases "panel_perms_custom" }}";
 	color: hsl(0,0%,20%);
diff --git a/themes/nox/public/main.css b/themes/nox/public/main.css
index a860519c..6e8bd03a 100644
--- a/themes/nox/public/main.css
+++ b/themes/nox/public/main.css
@@ -906,6 +906,9 @@ input[type=checkbox]:checked + label .sel {
 .level_inprogress .levelBit {
 	display: inline;
 }
+.level_inprogress .levelBit a {
+	white-space: nowrap;
+}
 .level_inprogress .progressWrap {
 	width: 100%;
 	padding-left: 0px;
diff --git a/themes/nox/public/panel.css b/themes/nox/public/panel.css
index 3478c0d4..33cf2d9c 100644
--- a/themes/nox/public/panel.css
+++ b/themes/nox/public/panel.css
@@ -142,6 +142,34 @@ button, .formbutton, .panel_right_button:not(.has_inner_button), #panel_users .p
 	margin-right: auto;
 }
 
+.perm_preset_no_access:before {
+	content: "{{index .Phrases "panel_perms_no_access" }}";
+	/*color: hsl(0,100%,20%);*/
+}
+/*.perm_preset_read_only:before, .perm_preset_can_post:before {
+	color: hsl(120,100%,20%);
+}*/
+.perm_preset_read_only:before {
+	content: "{{index .Phrases "panel_perms_read_only" }}";
+}
+.perm_preset_can_post:before {
+	content: "{{index .Phrases "panel_perms_can_post" }}";
+}
+.perm_preset_can_moderate:before {
+	content: "{{index .Phrases "panel_perms_can_moderate" }}";
+	/*color: hsl(240,100%,20%);*/
+}
+.perm_preset_quasi_mod:before {
+	content: "{{index .Phrases "panel_perms_quasi_mod" }}";
+}
+.perm_preset_custom:before {
+	content: "{{index .Phrases "panel_perms_custom" }}";
+	/*color: hsl(0,0%,20%);*/
+}
+.perm_preset_default:before {
+	content: "{{index .Phrases "panel_perms_default" }}";
+}
+
 .panel_submitrow {
 	margin-top: 8px;
 }
diff --git a/themes/tempra-simple/public/panel.css b/themes/tempra-simple/public/panel.css
index 8d20d844..c71197eb 100644
--- a/themes/tempra-simple/public/panel.css
+++ b/themes/tempra-simple/public/panel.css
@@ -120,6 +120,10 @@
 	content: "{{index .Phrases "panel_perms_can_moderate" }}";
 	color: darkblue;
 }
+.perm_preset_quasi_mod:before {
+	content: "{{index .Phrases "panel_perms_quasi_mod" }}";
+	color: darkblue;
+}
 .perm_preset_custom:before {
 	content: "{{index .Phrases "panel_perms_custom" }}";
 	color: black;