From ada42e50fb21a4f35e068de3f59e16f88ff041a1 Mon Sep 17 00:00:00 2001
From: md678685 <1917406+md678685@users.noreply.github.com>
Date: Sat, 29 Aug 2020 15:20:27 +0100
Subject: [PATCH] Use correct colors in popoverColorPicker
---
.../hangar/controller/ChannelsController.java | 1 -
.../channels/helper/popoverColorPicker.ftlh | 16 ++++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/io/papermc/hangar/controller/ChannelsController.java b/src/main/java/io/papermc/hangar/controller/ChannelsController.java
index b9e0d69e9..a56914c69 100644
--- a/src/main/java/io/papermc/hangar/controller/ChannelsController.java
+++ b/src/main/java/io/papermc/hangar/controller/ChannelsController.java
@@ -44,7 +44,6 @@ public class ChannelsController extends HangarController {
public ModelAndView create(@PathVariable String author, @PathVariable String slug, @RequestParam("channel-input") String channelId, @RequestParam("channel-color-input") String channelHex) {
ProjectData projectData = projectService.getProjectData(author, slug);
channelService.addProjectChannel(projectData.getProject().getId(), channelId, Color.getByHexStr(channelHex));
- //TODO fix popoverColorPicker to select the color
return new ModelAndView("redirect:" + routeHelper.getRouteUrl("channels.showList", author, slug));
}
diff --git a/src/main/resources/templates/projects/channels/helper/popoverColorPicker.ftlh b/src/main/resources/templates/projects/channels/helper/popoverColorPicker.ftlh
index f6c7a8181..18bc4b3c8 100644
--- a/src/main/resources/templates/projects/channels/helper/popoverColorPicker.ftlh
+++ b/src/main/resources/templates/projects/channels/helper/popoverColorPicker.ftlh
@@ -20,32 +20,32 @@
- |
-
- |
-
-
- |
|
|
-
-
|
|
|
+
+
|
|
|
+
+
+ |
+
+
+ |