From e0ff0c63c8ef45073cb0182140b1f338b6141e4d Mon Sep 17 00:00:00 2001 From: str4d Date: Sat, 14 Jul 2012 03:46:23 +0000 Subject: [PATCH] Moved susimail CSS into themes dir --- .../src/src/i2p/susi/webmail/WebMail.java | 22 +++++++++++------- .../themes/susimail/light/images}/3down.png | Bin .../themes/susimail/light/images}/3up.png | Bin .../susimail/light/images}/susimail.png | Bin .../themes/susimail/light/susimail.css | 0 5 files changed, 14 insertions(+), 8 deletions(-) rename {apps/susimail/src => installer/resources/themes/susimail/light/images}/3down.png (100%) rename {apps/susimail/src => installer/resources/themes/susimail/light/images}/3up.png (100%) rename {apps/susimail/src => installer/resources/themes/susimail/light/images}/susimail.png (100%) rename apps/susimail/src/css.css => installer/resources/themes/susimail/light/susimail.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 3f73b6533..65cb6404a 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -164,6 +164,9 @@ public class WebMail extends HttpServlet private static final String CONFIG_BCC_TO_SELF = "composer.bcc.to.self"; + private static final String CONFIG_THEME = "theme"; + private static final String DEFAULT_THEME = "light"; + private static final String spacer = "   "; private static final String thSpacer = " \n"; /** @@ -314,6 +317,7 @@ public class WebMail extends HttpServlet public String sentMail; public ArrayList attachments; public boolean reallyDelete; + String themePath, imgPath; SessionObject() @@ -357,9 +361,9 @@ public class WebMail extends HttpServlet * @param label * @return */ - private static String sortHeader( String name, String label ) + private static String sortHeader( String name, String label, String imgPath ) { - return "" + label + " \"^\"\"v\""; + return "" + label + " \"^\"\"v\""; } /** * check, if a given button "was pressed" in the received http request @@ -1202,6 +1206,8 @@ public class WebMail extends HttpServlet sessionObject.info = ""; sessionObject.pageChanged = false; sessionObject.showAttachment = null; + sessionObject.themePath = "/themes/susimail/" + Config.getProperty(CONFIG_THEME, DEFAULT_THEME) + '/'; + sessionObject.imgPath = sessionObject.themePath + "images/"; processStateChangeButtons( sessionObject, request ); @@ -1260,9 +1266,9 @@ public class WebMail extends HttpServlet "\n" + "\n" + "susimail - " + subtitle + "\n" + - "\n" + + "\n" + "\n\n" + - "

\"Susimail\"
 

\n" + + "

\"Susimail\"
 

\n" + "
" ); if( sessionObject.error != null && sessionObject.error.length() > 0 ) { @@ -1607,10 +1613,10 @@ public class WebMail extends HttpServlet button( RELOAD, _("Reload Config") ) + spacer + button( LOGOUT, _("Logout") ) + "\n" + "\n" + - thSpacer + "" + - thSpacer + "" + - thSpacer + "" + - thSpacer + "" ); + thSpacer + "" + + thSpacer + "" + + thSpacer + "" + + thSpacer + "" ); int bg = 0; int i = 0; for( Iterator it = sessionObject.folder.currentPageIterator(); it != null && it.hasNext(); ) { diff --git a/apps/susimail/src/3down.png b/installer/resources/themes/susimail/light/images/3down.png similarity index 100% rename from apps/susimail/src/3down.png rename to installer/resources/themes/susimail/light/images/3down.png diff --git a/apps/susimail/src/3up.png b/installer/resources/themes/susimail/light/images/3up.png similarity index 100% rename from apps/susimail/src/3up.png rename to installer/resources/themes/susimail/light/images/3up.png diff --git a/apps/susimail/src/susimail.png b/installer/resources/themes/susimail/light/images/susimail.png similarity index 100% rename from apps/susimail/src/susimail.png rename to installer/resources/themes/susimail/light/images/susimail.png diff --git a/apps/susimail/src/css.css b/installer/resources/themes/susimail/light/susimail.css similarity index 100% rename from apps/susimail/src/css.css rename to installer/resources/themes/susimail/light/susimail.css
" + sortHeader( SORT_SENDER, _("Sender") ) + "" + sortHeader( SORT_SUBJECT, _("Subject") ) + "" + sortHeader( SORT_DATE, _("Date") ) + sortHeader( SORT_ID, "" ) + "" + sortHeader( SORT_SIZE, _("Size") ) + "
" + sortHeader( SORT_SENDER, _("Sender"), sessionObject.imgPath ) + "" + sortHeader( SORT_SUBJECT, _("Subject"), sessionObject.imgPath ) + "" + sortHeader( SORT_DATE, _("Date"), sessionObject.imgPath ) + sortHeader( SORT_ID, "", sessionObject.imgPath ) + "" + sortHeader( SORT_SIZE, _("Size"), sessionObject.imgPath ) + "