From 127b93c1e2d63ed8d1eca8bb1bc79f3502ff5d02 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 6 Dec 2020 11:59:54 +0000
Subject: [PATCH] i2ptunnel: Move web resources to war
---
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java | 2 +-
.../i2ptunnel => i2ptunnel/jsp/themes}/dark/i2ptunnel.css | 0
.../i2ptunnel => i2ptunnel/jsp/themes}/light/i2ptunnel.css | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename apps/{routerconsole/jsp/themes/i2ptunnel => i2ptunnel/jsp/themes}/dark/i2ptunnel.css (100%)
rename apps/{routerconsole/jsp/themes/i2ptunnel => i2ptunnel/jsp/themes}/light/i2ptunnel.css (100%)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index d1ceca2ccf..92d6a23ec6 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -351,7 +351,7 @@ public class IndexBean {
if (_context.getProperty(PROP_DISABLE_OLD, DEFAULT_DISABLE_OLD))
theme = "light";
}
- return "/themes/i2ptunnel/" + theme + "/";
+ return "themes/" + theme + "/";
}
public int getTunnelCount() {
diff --git a/apps/routerconsole/jsp/themes/i2ptunnel/dark/i2ptunnel.css b/apps/i2ptunnel/jsp/themes/dark/i2ptunnel.css
similarity index 100%
rename from apps/routerconsole/jsp/themes/i2ptunnel/dark/i2ptunnel.css
rename to apps/i2ptunnel/jsp/themes/dark/i2ptunnel.css
diff --git a/apps/routerconsole/jsp/themes/i2ptunnel/light/i2ptunnel.css b/apps/i2ptunnel/jsp/themes/light/i2ptunnel.css
similarity index 100%
rename from apps/routerconsole/jsp/themes/i2ptunnel/light/i2ptunnel.css
rename to apps/i2ptunnel/jsp/themes/light/i2ptunnel.css
--
GitLab