From ec3bfa3cb7843f9b06f58c8437f6aa9218c12120 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 6 Dec 2020 12:03:27 +0000 Subject: [PATCH] susimail: Move web resources to war --- .../src/src/i2p/susi/webmail/WebMail.java | 4 +- .../src/themes}/dark/images/3down.png | Bin .../src/themes}/dark/images/3up.png | Bin .../src/themes}/dark/images/account.png | Bin .../src/themes}/dark/images/edit.png | Bin .../src/themes}/dark/images/first.png | Bin .../src/themes}/dark/images/first_active.png | Bin .../themes}/dark/images/first_disabled.png | Bin .../src/themes}/dark/images/first_hover.png | Bin .../src/themes}/dark/images/folder.png | Bin .../src/themes}/dark/images/help.png | Bin .../src/themes}/dark/images/last.png | Bin .../src/themes}/dark/images/last_active.png | Bin .../src/themes}/dark/images/last_disabled.png | Bin .../src/themes}/dark/images/last_hover.png | Bin .../src/themes}/dark/images/login.png | Bin .../src/themes}/dark/images/logout.png | Bin .../src/themes}/dark/images/mail.png | Bin .../src/themes}/dark/images/next.png | Bin .../src/themes}/dark/images/next_active.png | Bin .../src/themes}/dark/images/next_disabled.png | Bin .../src/themes}/dark/images/next_hover.png | Bin .../src/themes}/dark/images/offline.png | Bin .../src/themes}/dark/images/previous.png | Bin .../themes}/dark/images/previous_active.png | Bin .../themes}/dark/images/previous_disabled.png | Bin .../themes}/dark/images/previous_hover.png | Bin .../src/themes}/dark/images/refresh.png | Bin .../src/themes}/dark/images/settings.png | Bin .../src/themes}/dark/mobile.css | 0 .../src/themes}/dark/susimail.css | 8 +- .../src/themes}/images/all.png | Bin .../src/themes}/images/attach.png | Bin .../src/themes}/images/compose.png | Bin .../src/themes}/images/compose_hover.png | Bin .../src/themes}/images/first.png | Bin .../src/themes}/images/folder-open.png | Bin .../src/themes}/images/folder.png | Bin .../src/themes}/images/forward.png | Bin .../src/themes}/images/last.png | Bin .../src/themes}/images/login.png | Bin .../src/themes}/images/login_hover.png | Bin .../src/themes}/images/logout.png | Bin .../src/themes}/images/logout_hover.png | Bin .../src/themes}/images/next.png | Bin .../src/themes}/images/none.png | Bin .../src/themes}/images/offline.png | Bin .../src/themes}/images/offline_hover.png | Bin .../src/themes}/images/previous.png | Bin .../src/themes}/images/reply-all.png | Bin .../src/themes}/images/reply.png | Bin .../src/themes}/images/save.png | Bin .../src/themes}/images/save_hover.png | Bin .../src/themes}/images/selection.png | Bin .../src/themes}/images/send.png | Bin .../src/themes}/images/send_hover.png | Bin .../src/themes}/images/status.png | Bin .../src/themes}/images/susimail.png | Bin .../src/themes}/light/images/3down.png | Bin .../src/themes}/light/images/3up.png | Bin .../src/themes}/light/images/account.png | Bin .../src/themes}/light/images/book.png | Bin .../src/themes}/light/images/edit.png | Bin .../src/themes}/light/images/folder.png | Bin .../src/themes}/light/images/help.png | Bin .../src/themes}/light/images/login.png | Bin .../src/themes}/light/images/logout.png | Bin .../src/themes}/light/images/offline.png | Bin .../src/themes}/light/images/refresh.png | Bin .../src/themes}/light/images/settings.png | Bin .../src/themes}/light/mobile.css | 0 .../src/themes}/light/susimail.css | 126 +++++++++--------- apps/susimail/src/{css => themes}/print.css | 0 73 files changed, 69 insertions(+), 69 deletions(-) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/3down.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/3up.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/account.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/edit.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/first.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/first_active.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/first_disabled.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/first_hover.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/folder.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/help.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/last.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/last_active.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/last_disabled.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/last_hover.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/login.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/logout.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/mail.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/next.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/next_active.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/next_disabled.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/next_hover.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/offline.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/previous.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/previous_active.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/previous_disabled.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/previous_hover.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/refresh.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/images/settings.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/mobile.css (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/dark/susimail.css (98%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/all.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/attach.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/compose.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/compose_hover.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/first.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/folder-open.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/folder.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/forward.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/last.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/login.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/login_hover.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/logout.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/logout_hover.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/next.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/none.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/offline.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/offline_hover.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/previous.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/reply-all.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/reply.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/save.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/save_hover.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/selection.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/send.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/send_hover.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/status.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/images/susimail.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/light/images/3down.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/light/images/3up.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/light/images/account.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/light/images/book.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/light/images/edit.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/light/images/folder.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/light/images/help.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/light/images/login.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/light/images/logout.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/light/images/offline.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/light/images/refresh.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/light/images/settings.png (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/light/mobile.css (100%) rename apps/{routerconsole/jsp/themes/susimail => susimail/src/themes}/light/susimail.css (84%) rename apps/susimail/src/{css => themes}/print.css (100%) diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java index 49536ac86..29b4dc147 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -2029,7 +2029,7 @@ public class WebMail extends HttpServlet synchronized( sessionObject ) { sessionObject.pageChanged = false; - sessionObject.themePath = "/themes/susimail/" + theme + '/'; + sessionObject.themePath = "themes/" + theme + '/'; sessionObject.imgPath = sessionObject.themePath + "images/"; sessionObject.isMobile = isMobile; @@ -2340,7 +2340,7 @@ public class WebMail extends HttpServlet "" ); } if(state != State.AUTH) - out.println(""); + out.println(""); if (state == State.NEW || state == State.CONFIG) { // TODO cancel if to and body are empty out.println(""); diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/3down.png b/apps/susimail/src/themes/dark/images/3down.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/3down.png rename to apps/susimail/src/themes/dark/images/3down.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/3up.png b/apps/susimail/src/themes/dark/images/3up.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/3up.png rename to apps/susimail/src/themes/dark/images/3up.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/account.png b/apps/susimail/src/themes/dark/images/account.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/account.png rename to apps/susimail/src/themes/dark/images/account.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/edit.png b/apps/susimail/src/themes/dark/images/edit.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/edit.png rename to apps/susimail/src/themes/dark/images/edit.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/first.png b/apps/susimail/src/themes/dark/images/first.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/first.png rename to apps/susimail/src/themes/dark/images/first.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/first_active.png b/apps/susimail/src/themes/dark/images/first_active.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/first_active.png rename to apps/susimail/src/themes/dark/images/first_active.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/first_disabled.png b/apps/susimail/src/themes/dark/images/first_disabled.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/first_disabled.png rename to apps/susimail/src/themes/dark/images/first_disabled.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/first_hover.png b/apps/susimail/src/themes/dark/images/first_hover.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/first_hover.png rename to apps/susimail/src/themes/dark/images/first_hover.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/folder.png b/apps/susimail/src/themes/dark/images/folder.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/folder.png rename to apps/susimail/src/themes/dark/images/folder.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/help.png b/apps/susimail/src/themes/dark/images/help.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/help.png rename to apps/susimail/src/themes/dark/images/help.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/last.png b/apps/susimail/src/themes/dark/images/last.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/last.png rename to apps/susimail/src/themes/dark/images/last.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/last_active.png b/apps/susimail/src/themes/dark/images/last_active.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/last_active.png rename to apps/susimail/src/themes/dark/images/last_active.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/last_disabled.png b/apps/susimail/src/themes/dark/images/last_disabled.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/last_disabled.png rename to apps/susimail/src/themes/dark/images/last_disabled.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/last_hover.png b/apps/susimail/src/themes/dark/images/last_hover.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/last_hover.png rename to apps/susimail/src/themes/dark/images/last_hover.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/login.png b/apps/susimail/src/themes/dark/images/login.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/login.png rename to apps/susimail/src/themes/dark/images/login.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/logout.png b/apps/susimail/src/themes/dark/images/logout.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/logout.png rename to apps/susimail/src/themes/dark/images/logout.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/mail.png b/apps/susimail/src/themes/dark/images/mail.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/mail.png rename to apps/susimail/src/themes/dark/images/mail.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/next.png b/apps/susimail/src/themes/dark/images/next.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/next.png rename to apps/susimail/src/themes/dark/images/next.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/next_active.png b/apps/susimail/src/themes/dark/images/next_active.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/next_active.png rename to apps/susimail/src/themes/dark/images/next_active.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/next_disabled.png b/apps/susimail/src/themes/dark/images/next_disabled.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/next_disabled.png rename to apps/susimail/src/themes/dark/images/next_disabled.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/next_hover.png b/apps/susimail/src/themes/dark/images/next_hover.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/next_hover.png rename to apps/susimail/src/themes/dark/images/next_hover.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/offline.png b/apps/susimail/src/themes/dark/images/offline.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/offline.png rename to apps/susimail/src/themes/dark/images/offline.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/previous.png b/apps/susimail/src/themes/dark/images/previous.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/previous.png rename to apps/susimail/src/themes/dark/images/previous.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/previous_active.png b/apps/susimail/src/themes/dark/images/previous_active.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/previous_active.png rename to apps/susimail/src/themes/dark/images/previous_active.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/previous_disabled.png b/apps/susimail/src/themes/dark/images/previous_disabled.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/previous_disabled.png rename to apps/susimail/src/themes/dark/images/previous_disabled.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/previous_hover.png b/apps/susimail/src/themes/dark/images/previous_hover.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/previous_hover.png rename to apps/susimail/src/themes/dark/images/previous_hover.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/refresh.png b/apps/susimail/src/themes/dark/images/refresh.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/refresh.png rename to apps/susimail/src/themes/dark/images/refresh.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/images/settings.png b/apps/susimail/src/themes/dark/images/settings.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/images/settings.png rename to apps/susimail/src/themes/dark/images/settings.png diff --git a/apps/routerconsole/jsp/themes/susimail/dark/mobile.css b/apps/susimail/src/themes/dark/mobile.css similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/dark/mobile.css rename to apps/susimail/src/themes/dark/mobile.css diff --git a/apps/routerconsole/jsp/themes/susimail/dark/susimail.css b/apps/susimail/src/themes/dark/susimail.css similarity index 98% rename from apps/routerconsole/jsp/themes/susimail/dark/susimail.css rename to apps/susimail/src/themes/dark/susimail.css index cbe271ad6..1c90ad1e8 100644 --- a/apps/routerconsole/jsp/themes/susimail/dark/susimail.css +++ b/apps/susimail/src/themes/dark/susimail.css @@ -205,8 +205,8 @@ table#mailbox { } #mailbox th:nth-child(2) { - background: url(/themes/susimail/images/status.png) center center no-repeat, linear-gradient(to bottom, #1a261a 0%, #223022 7%, #212f21 9%, #172317 21%, #091109 49%, #050d05 50%, #020602 51%, #010301 53%, #000000 56%, #000000 100%) !important; - background: url(/themes/susimail/images/status.png) center center no-repeat !important; + background: url(../images/status.png) center center no-repeat, linear-gradient(to bottom, #1a261a 0%, #223022 7%, #212f21 9%, #172317 21%, #091109 49%, #050d05 50%, #020602 51%, #010301 53%, #000000 56%, #000000 100%) !important; + background: url(../images/status.png) center center no-repeat !important; } #mailbox th:nth-child(2):not(old) { @@ -214,7 +214,7 @@ table#mailbox { } #mailbox th:nth-child(2)::after { - content: url(/themes/susimail/images/status.png); + content: url(../images/status.png); margin: 0; height: 16px; vertical-align: middle; @@ -879,7 +879,7 @@ div.attached { margin: 0 -1px -1px; border-radius: 0 0 2px 2px; padding: 10px 10px 10px 30px !important; - background: url(/themes/susimail/images/attach.png) 10px center no-repeat; + background: url(../images/attach.png) 10px center no-repeat; } .attached img { diff --git a/apps/routerconsole/jsp/themes/susimail/images/all.png b/apps/susimail/src/themes/images/all.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/all.png rename to apps/susimail/src/themes/images/all.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/attach.png b/apps/susimail/src/themes/images/attach.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/attach.png rename to apps/susimail/src/themes/images/attach.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/compose.png b/apps/susimail/src/themes/images/compose.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/compose.png rename to apps/susimail/src/themes/images/compose.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/compose_hover.png b/apps/susimail/src/themes/images/compose_hover.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/compose_hover.png rename to apps/susimail/src/themes/images/compose_hover.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/first.png b/apps/susimail/src/themes/images/first.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/first.png rename to apps/susimail/src/themes/images/first.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/folder-open.png b/apps/susimail/src/themes/images/folder-open.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/folder-open.png rename to apps/susimail/src/themes/images/folder-open.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/folder.png b/apps/susimail/src/themes/images/folder.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/folder.png rename to apps/susimail/src/themes/images/folder.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/forward.png b/apps/susimail/src/themes/images/forward.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/forward.png rename to apps/susimail/src/themes/images/forward.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/last.png b/apps/susimail/src/themes/images/last.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/last.png rename to apps/susimail/src/themes/images/last.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/login.png b/apps/susimail/src/themes/images/login.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/login.png rename to apps/susimail/src/themes/images/login.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/login_hover.png b/apps/susimail/src/themes/images/login_hover.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/login_hover.png rename to apps/susimail/src/themes/images/login_hover.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/logout.png b/apps/susimail/src/themes/images/logout.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/logout.png rename to apps/susimail/src/themes/images/logout.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/logout_hover.png b/apps/susimail/src/themes/images/logout_hover.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/logout_hover.png rename to apps/susimail/src/themes/images/logout_hover.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/next.png b/apps/susimail/src/themes/images/next.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/next.png rename to apps/susimail/src/themes/images/next.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/none.png b/apps/susimail/src/themes/images/none.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/none.png rename to apps/susimail/src/themes/images/none.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/offline.png b/apps/susimail/src/themes/images/offline.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/offline.png rename to apps/susimail/src/themes/images/offline.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/offline_hover.png b/apps/susimail/src/themes/images/offline_hover.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/offline_hover.png rename to apps/susimail/src/themes/images/offline_hover.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/previous.png b/apps/susimail/src/themes/images/previous.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/previous.png rename to apps/susimail/src/themes/images/previous.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/reply-all.png b/apps/susimail/src/themes/images/reply-all.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/reply-all.png rename to apps/susimail/src/themes/images/reply-all.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/reply.png b/apps/susimail/src/themes/images/reply.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/reply.png rename to apps/susimail/src/themes/images/reply.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/save.png b/apps/susimail/src/themes/images/save.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/save.png rename to apps/susimail/src/themes/images/save.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/save_hover.png b/apps/susimail/src/themes/images/save_hover.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/save_hover.png rename to apps/susimail/src/themes/images/save_hover.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/selection.png b/apps/susimail/src/themes/images/selection.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/selection.png rename to apps/susimail/src/themes/images/selection.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/send.png b/apps/susimail/src/themes/images/send.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/send.png rename to apps/susimail/src/themes/images/send.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/send_hover.png b/apps/susimail/src/themes/images/send_hover.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/send_hover.png rename to apps/susimail/src/themes/images/send_hover.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/status.png b/apps/susimail/src/themes/images/status.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/status.png rename to apps/susimail/src/themes/images/status.png diff --git a/apps/routerconsole/jsp/themes/susimail/images/susimail.png b/apps/susimail/src/themes/images/susimail.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/images/susimail.png rename to apps/susimail/src/themes/images/susimail.png diff --git a/apps/routerconsole/jsp/themes/susimail/light/images/3down.png b/apps/susimail/src/themes/light/images/3down.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/light/images/3down.png rename to apps/susimail/src/themes/light/images/3down.png diff --git a/apps/routerconsole/jsp/themes/susimail/light/images/3up.png b/apps/susimail/src/themes/light/images/3up.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/light/images/3up.png rename to apps/susimail/src/themes/light/images/3up.png diff --git a/apps/routerconsole/jsp/themes/susimail/light/images/account.png b/apps/susimail/src/themes/light/images/account.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/light/images/account.png rename to apps/susimail/src/themes/light/images/account.png diff --git a/apps/routerconsole/jsp/themes/susimail/light/images/book.png b/apps/susimail/src/themes/light/images/book.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/light/images/book.png rename to apps/susimail/src/themes/light/images/book.png diff --git a/apps/routerconsole/jsp/themes/susimail/light/images/edit.png b/apps/susimail/src/themes/light/images/edit.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/light/images/edit.png rename to apps/susimail/src/themes/light/images/edit.png diff --git a/apps/routerconsole/jsp/themes/susimail/light/images/folder.png b/apps/susimail/src/themes/light/images/folder.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/light/images/folder.png rename to apps/susimail/src/themes/light/images/folder.png diff --git a/apps/routerconsole/jsp/themes/susimail/light/images/help.png b/apps/susimail/src/themes/light/images/help.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/light/images/help.png rename to apps/susimail/src/themes/light/images/help.png diff --git a/apps/routerconsole/jsp/themes/susimail/light/images/login.png b/apps/susimail/src/themes/light/images/login.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/light/images/login.png rename to apps/susimail/src/themes/light/images/login.png diff --git a/apps/routerconsole/jsp/themes/susimail/light/images/logout.png b/apps/susimail/src/themes/light/images/logout.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/light/images/logout.png rename to apps/susimail/src/themes/light/images/logout.png diff --git a/apps/routerconsole/jsp/themes/susimail/light/images/offline.png b/apps/susimail/src/themes/light/images/offline.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/light/images/offline.png rename to apps/susimail/src/themes/light/images/offline.png diff --git a/apps/routerconsole/jsp/themes/susimail/light/images/refresh.png b/apps/susimail/src/themes/light/images/refresh.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/light/images/refresh.png rename to apps/susimail/src/themes/light/images/refresh.png diff --git a/apps/routerconsole/jsp/themes/susimail/light/images/settings.png b/apps/susimail/src/themes/light/images/settings.png similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/light/images/settings.png rename to apps/susimail/src/themes/light/images/settings.png diff --git a/apps/routerconsole/jsp/themes/susimail/light/mobile.css b/apps/susimail/src/themes/light/mobile.css similarity index 100% rename from apps/routerconsole/jsp/themes/susimail/light/mobile.css rename to apps/susimail/src/themes/light/mobile.css diff --git a/apps/routerconsole/jsp/themes/susimail/light/susimail.css b/apps/susimail/src/themes/light/susimail.css similarity index 84% rename from apps/routerconsole/jsp/themes/susimail/light/susimail.css rename to apps/susimail/src/themes/light/susimail.css index 5f5a1e69e..19af80d60 100644 --- a/apps/routerconsole/jsp/themes/susimail/light/susimail.css +++ b/apps/susimail/src/themes/light/susimail.css @@ -21,12 +21,12 @@ body.iframed { body.iframed { background: url(/themes/console/images/transparent.gif), - url(/themes/susimail/images/compose_hover.png) no-repeat, - url(/themes/susimail/images/login_hover.png) no-repeat, + url(../images/compose_hover.png) no-repeat, + url(../images/login_hover.png) no-repeat, url(images/logout.png) no-repeat, - url(/themes/susimail/images/offline_hover.png) no-repeat, - url(/themes/susimail/images/save_hover.png) no-repeat, - url(/themes/susimail/images/send_hover.png) no-repeat, + url(../images/offline_hover.png) no-repeat, + url(../images/save_hover.png) no-repeat, + url(../images/send_hover.png) no-repeat, url(/themes/console/images/buttons/configure_hover.png), url(/themes/console/images/buttons/delete_hover.png), url(/themes/console/images/buttons/update_hover.png), transparent !important; @@ -324,8 +324,8 @@ table#mailbox { } #mailbox th:nth-child(2) { - background: #fff url(/themes/susimail/images/status.png) center center no-repeat; - background: url(/themes/susimail/images/status.png) center center no-repeat, linear-gradient(to bottom, #fafaff 50%, #f2f2ff 50%); + background: #fff url(../images/status.png) center center no-repeat; + background: url(../images/status.png) center center no-repeat, linear-gradient(to bottom, #fafaff 50%, #f2f2ff 50%); background-blend-mode: luminosity, normal; } @@ -553,14 +553,14 @@ input.cancel:hover { } input.clearselection { - background: #eee url(/themes/susimail/images/none.png) no-repeat 6px center; - background: url(/themes/susimail/images/none.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); + background: #eee url(../images/none.png) no-repeat 6px center; + background: url(../images/none.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); padding: 5px 7px 5px 24px; } input.clearselection:hover { - background: #fff url(/themes/susimail/images/none.png) no-repeat 6px center; - background: url(/themes/susimail/images/none.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); + background: #fff url(../images/none.png) no-repeat 6px center; + background: url(../images/none.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); } input.delete, input.delete_attachment, input.really_delete { @@ -586,14 +586,14 @@ input.download:hover { } input.offline { - background: #eee url(/themes/susimail/images/offline.png) no-repeat 6px center; + background: #eee url(../images/offline.png) no-repeat 6px center; background: #f8f9fa; border-radius: 15px; padding: 7px; } input.offline:hover { - background: #fff url(/themes/susimail/images/offline_hover.png) no-repeat 6px center; + background: #fff url(../images/offline_hover.png) no-repeat 6px center; background: #f1f3f5; } @@ -610,25 +610,25 @@ input.list:hover, input.moveto:hover, input.switchto:hover { } input.forward { - background: #eee url(/themes/susimail/images/forward.png) no-repeat 6px center; - background: url(/themes/susimail/images/forward.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); + background: #eee url(../images/forward.png) no-repeat 6px center; + background: url(../images/forward.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); padding: 5px 7px 5px 24px; } input.forward:hover { - background: #fff url(/themes/susimail/images/forward.png) no-repeat 6px center; - background: url(/themes/susimail/images/forward.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); + background: #fff url(../images/forward.png) no-repeat 6px center; + background: url(../images/forward.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); } input.login { - background: #eee url(/themes/susimail/images/login.png) no-repeat 6px center; + background: #eee url(../images/login.png) no-repeat 6px center; background: #f8f9fa; border-radius: 15px; padding: 7px; } input.login:hover { - background: #fff url(/themes/susimail/images/login_hover.png) no-repeat 6px center; + background: #fff url(../images/login_hover.png) no-repeat 6px center; background: #f1f3f5; } @@ -655,14 +655,14 @@ input.reload:hover, input.refresh:hover { } input.invertselection { - background: #eee url(/themes/susimail/images/selection.png) no-repeat 6px center; - background: url(/themes/susimail/images/selection.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); + background: #eee url(../images/selection.png) no-repeat 6px center; + background: url(../images/selection.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); padding: 5px 7px 5px 24px; } input.invertselection:hover { - background: #eee url(/themes/susimail/images/selection.png) no-repeat 6px center; - background: url(/themes/susimail/images/selection.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); + background: #eee url(../images/selection.png) no-repeat 6px center; + background: url(../images/selection.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); } input.show { @@ -700,25 +700,25 @@ input.new:hover { } input.reply { - background: #eee url(/themes/susimail/images/reply.png) no-repeat 6px center; - background: url(/themes/susimail/images/reply.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); + background: #eee url(../images/reply.png) no-repeat 6px center; + background: url(../images/reply.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); padding: 5px 7px 5px 24px; } input.reply:hover { - background: #fff url(/themes/susimail/images/reply.png) no-repeat 6px center; - background: url(/themes/susimail/images/reply.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); + background: #fff url(../images/reply.png) no-repeat 6px center; + background: url(../images/reply.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); } input.replyall { - background: #eee url(/themes/susimail/images/reply-all.png) no-repeat 6px center; - background: url(/themes/susimail/images/reply-all.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); + background: #eee url(../images/reply-all.png) no-repeat 6px center; + background: url(../images/reply-all.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); padding: 5px 7px 5px 24px; } input.replyall:hover { - background: #fff url(/themes/susimail/images/reply-all.png) no-repeat 6px center; - background: url(/themes/susimail/images/reply-all.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); + background: #fff url(../images/reply-all.png) no-repeat 6px center; + background: url(../images/reply-all.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); } /* pagenav */ @@ -734,54 +734,54 @@ input.replyall:hover { input.firstpage, input[name="firstpage"], input.firstpage[disabled]:hover, input[name="firstpage"][disabled]:hover { - background: #eee url(/themes/susimail/images/first.png) no-repeat center center; - background: url(/themes/susimail/images/first.png) no-repeat center center, linear-gradient(to bottom, #fff, #efefff); + background: #eee url(../images/first.png) no-repeat center center; + background: url(../images/first.png) no-repeat center center, linear-gradient(to bottom, #fff, #efefff); padding: 4px 10px; text-indent: -99999px; } input.firstpage:hover, input[name="firstpage"]:hover { - background: #fff url(/themes/susimail/images/first.png) no-repeat center center; - background: url(/themes/susimail/images/first.png) no-repeat center center, linear-gradient(to bottom, #eee, #fff); + background: #fff url(../images/first.png) no-repeat center center; + background: url(../images/first.png) no-repeat center center, linear-gradient(to bottom, #eee, #fff); } input.lastpage, input[name="lastpage"], input.lastpage[disabled]:hover, input[name="lastpage"][disabled]:hover { - background: #eee url(/themes/susimail/images/last.png) no-repeat center center; - background: url(/themes/susimail/images/last.png) no-repeat center center, linear-gradient(to bottom, #fff, #efefff); + background: #eee url(../images/last.png) no-repeat center center; + background: url(../images/last.png) no-repeat center center, linear-gradient(to bottom, #fff, #efefff); padding: 4px 10px; text-indent: -99999px; } input.lastpage:hover, input[name="lastpage"]:hover { - background: #fff url(/themes/susimail/images/last.png) no-repeat center center; - background: url(/themes/susimail/images/last.png) no-repeat center center, linear-gradient(to bottom, #eee, #fff); + background: #fff url(../images/last.png) no-repeat center center; + background: url(../images/last.png) no-repeat center center, linear-gradient(to bottom, #eee, #fff); } input.prevpage, input.prev, input[name="prev"], input[name="prevpage"], input.prevpage[disabled]:hover, input.prev[disabled]:hover, input[name="prev"][disabled]:hover, input[name="prevpage"][disabled]:hover { - background: #eee url(/themes/susimail/images/previous.png) no-repeat center center; - background: url(/themes/susimail/images/previous.png) no-repeat center center, linear-gradient(to bottom, #fff, #efefff); + background: #eee url(../images/previous.png) no-repeat center center; + background: url(../images/previous.png) no-repeat center center, linear-gradient(to bottom, #fff, #efefff); padding: 4px 10px; text-indent: -99999px; } input[name="prev"]:hover, input[name="prevpage"]:hover { - background: #fff url(/themes/susimail/images/previous.png) no-repeat center center; - background: url(/themes/susimail/images/previous.png) no-repeat center center, linear-gradient(to bottom, #eee, #fff); + background: #fff url(../images/previous.png) no-repeat center center; + background: url(../images/previous.png) no-repeat center center, linear-gradient(to bottom, #eee, #fff); } input.nextpage, input.next, input[name="nextpage"], input[name="next"], input.nextpage[disabled]:hover, input.next[disabled]:hover, input[name="nextpage"][disabled]:hover, input[name="next"][disabled]:hover { - background: #eee url(/themes/susimail/images/next.png) no-repeat center center; - background: url(/themes/susimail/images/next.png) no-repeat center center, linear-gradient(to bottom, #fff, #efefff); + background: #eee url(../images/next.png) no-repeat center center; + background: url(../images/next.png) no-repeat center center, linear-gradient(to bottom, #fff, #efefff); padding: 4px 10px; text-indent: -99999px; } input.nextpage:hover, input.next:hover, input[name="nextpage"]:hover { - background: #fff url(/themes/susimail/images/next.png) no-repeat center center; - background: url(/themes/susimail/images/next.png) no-repeat center center, linear-gradient(to bottom, #eee, #fff); + background: #fff url(../images/next.png) no-repeat center center; + background: url(../images/next.png) no-repeat center center, linear-gradient(to bottom, #eee, #fff); } /* end pagenav */ @@ -797,14 +797,14 @@ input.setpagesize { } input.send { - background: #eee url(/themes/susimail/images/send.png) no-repeat 6px center; - background: url(/themes/susimail/images/send.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); + background: #eee url(../images/send.png) no-repeat 6px center; + background: url(../images/send.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); padding: 5px 7px 5px 24px; } input.send:hover { - background: #fff url(/themes/susimail/images/send_hover.png) no-repeat 6px center; - background: url(/themes/susimail/images/send_hover.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); + background: #fff url(../images/send_hover.png) no-repeat 6px center; + background: url(../images/send_hover.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); } input.configure { @@ -820,25 +820,25 @@ input.configure:hover { } input.saveas { - background: #eee url(/themes/susimail/images/save.png) no-repeat 6px center; - background: url(/themes/susimail/images/save.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); + background: #eee url(../images/save.png) no-repeat 6px center; + background: url(../images/save.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); padding: 5px 7px 5px 24px; } input.saveas:hover { - background: #fff url(/themes/susimail/images/save_hover.png) no-repeat 6px center; - background: url(/themes/susimail/images/save_hover.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); + background: #fff url(../images/save_hover.png) no-repeat 6px center; + background: url(../images/save_hover.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); } input.new_upload { - background: #eee url(/themes/susimail/images/attach.png) no-repeat 6px center; - background: url(/themes/susimail/images/attach.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); + background: #eee url(../images/attach.png) no-repeat 6px center; + background: url(../images/attach.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); padding: 5px 7px 5px 24px; } input.new_upload:hover { - background: #fff url(/themes/susimail/images/attach.png) no-repeat 6px center; - background: url(/themes/susimail/images/attach.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); + background: #fff url(../images/attach.png) no-repeat 6px center; + background: url(../images/attach.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); } input.new_upload { @@ -1351,12 +1351,12 @@ tr.bottombuttons:empty { z-index: 10; opacity: 0.85; border-top: 1px solid #fff; - background: url(/themes/snark/light/images/delete.png) right 24px top 4px no-repeat #113; + background: url(../snark/light/images/delete.png) right 24px top 4px no-repeat #113; background-blend-mode: luminosity; } .iframed .notifications { - background: url(/themes/snark/light/images/delete.png) right 6px top 5px no-repeat #113; + background: url(../snark/light/images/delete.png) right 6px top 5px no-repeat #113; margin-bottom: 9px; border-radius: 4px 4px 0 0; border: none; @@ -1364,7 +1364,7 @@ tr.bottombuttons:empty { } .notifications:hover { - background-image: url(/themes/snark/light/images/delete_hover.png); + background-image: url(../snark/light/images/delete_hover.png); background-blend-mode: normal; } @@ -1405,7 +1405,7 @@ td p.error { text-align: left; border-top: 1px solid #7778bf; box-shadow: inset 0 0 0 1px #fff; - background: url(/themes/susimail/images/attach.png) 10px center no-repeat, rgba(220,220,255,0.2); + background: url(../images/attach.png) 10px center no-repeat, rgba(220,220,255,0.2); } .attached img { diff --git a/apps/susimail/src/css/print.css b/apps/susimail/src/themes/print.css similarity index 100% rename from apps/susimail/src/css/print.css rename to apps/susimail/src/themes/print.css