diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml
index bb80ea274432e3781541429ab3f12e73ab9568c0..4c0e49e6f0e09cc1992b1473789d22d4a059753e 100644
--- a/apps/susimail/build.xml
+++ b/apps/susimail/build.xml
@@ -66,6 +66,10 @@
<copy todir="src/WEB-INF/classes/icons" >
<fileset dir="src/icons" />
</copy>
+ <mkdir dir="src/WEB-INF/classes/css" />
+ <copy todir="src/WEB-INF/classes/css" >
+ <fileset dir="src/css" />
+ </copy>
<war destfile="susimail.war" webxml="src/WEB-INF/web.xml"
basedir="src/" excludes="WEB-INF/web.xml LICENSE src/**/*">
<manifest>
diff --git a/apps/susimail/src/css/print.css b/apps/susimail/src/css/print.css
new file mode 100644
index 0000000000000000000000000000000000000000..6f56a1fd98910a4e3d69f069a13f6361b95f428a
--- /dev/null
+++ b/apps/susimail/src/css/print.css
@@ -0,0 +1,27 @@
+.header, .footer, .topbuttons, .bottombuttons {
+ display: none;
+}
+
+p.error, p.info {
+ display: none;
+}
+
+a.sort, img.sort {
+ display: none;
+}
+
+input.optbox {
+ display: none;
+}
+
+div.page, table {
+ width: 100%;
+ margin: 0;
+ float: none;
+}
+
+textarea, input[type=text] {
+ border-style: none;
+ border-color: Transparent;
+ overflow: auto;
+}
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index 1539a5cde822831bde6be4acfe328200f309a5ea..399b6f0043f69fbf96500202f10a55e21e94ce6d 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -506,17 +506,17 @@ public class WebMail extends HttpServlet
StringBuilder buf = new StringBuilder(128);
buf.append(label).append(" ");
if (name.equals(currentName) && currentOrder == Folder.SortOrder.UP) {
- buf.append("<img src=\"").append(imgPath).append("3up.png\" border=\"0\" alt=\"^\">\n");
+ buf.append("<img class=\"sort\" src=\"").append(imgPath).append("3up.png\" border=\"0\" alt=\"^\">\n");
} else {
- buf.append("<a href=\"").append(myself).append('?').append(name).append("=up\">");
- buf.append("<img src=\"").append(imgPath).append("3up.png\" border=\"0\" alt=\"^\" style=\"opacity: 0.4;\">");
+ buf.append("<a class=\"sort\" href=\"").append(myself).append('?').append(name).append("=up\">");
+ buf.append("<img class=\"sort\" src=\"").append(imgPath).append("3up.png\" border=\"0\" alt=\"^\" style=\"opacity: 0.4;\">");
buf.append("</a>\n");
}
if (name.equals(currentName) && currentOrder == Folder.SortOrder.DOWN) {
- buf.append("<img src=\"").append(imgPath).append("3down.png\" border=\"0\" alt=\"v\">");
+ buf.append("<img class=\"sort\" src=\"").append(imgPath).append("3down.png\" border=\"0\" alt=\"v\">");
} else {
- buf.append("<a href=\"").append(myself).append('?').append(name).append("=down\">");
- buf.append("<img src=\"").append(imgPath).append("3down.png\" border=\"0\" alt=\"v\" style=\"opacity: 0.4;\">");
+ buf.append("<a class=\"sort\" href=\"").append(myself).append('?').append(name).append("=down\">");
+ buf.append("<img class=\"sort\" src=\"").append(imgPath).append("3down.png\" border=\"0\" alt=\"v\" style=\"opacity: 0.4;\">");
buf.append("</a>");
}
return buf.toString();
@@ -711,8 +711,8 @@ public class WebMail extends HttpServlet
String host = request.getParameter( HOST );
String pop3Port = request.getParameter( POP3 );
String smtpPort = request.getParameter( SMTP );
- String fixedPorts = Config.getProperty( CONFIG_PORTS_FIXED, "true" );
- if( !fixedPorts.equalsIgnoreCase("false")) {
+ boolean fixedPorts = Boolean.parseBoolean(Config.getProperty( CONFIG_PORTS_FIXED, "true" ));
+ if (fixedPorts) {
host = Config.getProperty( CONFIG_HOST, DEFAULT_HOST );
pop3Port = Config.getProperty( CONFIG_PORTS_POP3, "" + DEFAULT_POP3PORT );
smtpPort = Config.getProperty( CONFIG_PORTS_SMTP, "" + DEFAULT_SMTPPORT );
@@ -1702,21 +1702,23 @@ public class WebMail extends HttpServlet
out.println( "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes\" />\n" +
"<link rel=\"stylesheet\" type=\"text/css\" href=\"" + sessionObject.themePath + "mobile.css\" />\n" );
}
+ if(sessionObject.state != STATE_AUTH)
+ out.println("<link rel=\"stylesheet\" href=\"/susimail/css/print.css\" type=\"text/css\" media=\"print\" />");
if (sessionObject.state == STATE_NEW) {
// TODO cancel if to and body are empty
out.println(
- "<script type = \"text/javascript\">" +
+ "<script type = \"text/javascript\">\n" +
"window.onbeforeunload = function () {" +
"return \"" + _("Message has not been sent. Do you want to discard it?") + "\";" +
- "};" +
+ "};\n" +
"function cancelPopup() {" +
"window.onbeforeunload = null;" +
- "};" +
+ "};\n" +
"</script>"
);
}
out.println( "</head>\n<body>\n" +
- "<div class=\"page\"><p><img src=\"" + sessionObject.imgPath + "susimail.png\" alt=\"Susimail\"></p>\n" +
+ "<div class=\"page\"><div class=\"header\"><img class=\"header\" src=\"" + sessionObject.imgPath + "susimail.png\" alt=\"Susimail\"></div>\n" +
"<form method=\"POST\" enctype=\"multipart/form-data\" action=\"" + myself + "\" accept-charset=\"UTF-8\">" );
if( sessionObject.error != null && sessionObject.error.length() > 0 ) {
@@ -1744,7 +1746,7 @@ public class WebMail extends HttpServlet
showConfig(out, sessionObject);
//out.println( "</form><div id=\"footer\"><hr><p class=\"footer\">susimail v0." + version +" " + ( RELEASE ? "release" : "development" ) + " © 2004-2005 <a href=\"mailto:susi23@mail.i2p\">susi</a></div></div></body>\n</html>");
- out.println( "</form><div id=\"footer\"><hr><p class=\"footer\">susimail © 2004-2005 susi</div></div></body>\n</html>");
+ out.println( "</form><div class=\"footer\"><hr><p class=\"footer\">susimail © 2004-2005 susi</p></div></div></body>\n</html>");
out.flush();
}
}
@@ -1831,9 +1833,9 @@ public class WebMail extends HttpServlet
String subject = request.getParameter( NEW_SUBJECT, _("no subject") );
String text = request.getParameter( NEW_TEXT, "" );
- String prop = Config.getProperty( CONFIG_SENDER_FIXED, "true" );
- String domain = Config.getProperty( CONFIG_SENDER_DOMAIN, "mail.i2p" );
- if( !prop.equalsIgnoreCase("false")) {
+ boolean fixed = Boolean.parseBoolean(Config.getProperty( CONFIG_SENDER_FIXED, "true" ));
+ if (fixed) {
+ String domain = Config.getProperty( CONFIG_SENDER_DOMAIN, "mail.i2p" );
from = "<" + sessionObject.user + "@" + domain + ">";
}
ArrayList<String> toList = new ArrayList<String>();
@@ -1979,16 +1981,18 @@ public class WebMail extends HttpServlet
*/
private static void showCompose( PrintWriter out, SessionObject sessionObject, RequestWrapper request )
{
+ out.println("<div class=\"topbuttons\">");
out.println( button( SEND, _("Send") ) + spacer +
button( CANCEL, _("Cancel") ));
+ out.println("</div>");
//if (Config.hasConfigFile())
// out.println(button( RELOAD, _("Reload Config") ) + spacer);
//out.println(button( LOGOUT, _("Logout") ) );
String from = request.getParameter( NEW_FROM );
- String fixed = Config.getProperty( CONFIG_SENDER_FIXED, "true" );
+ boolean fixed = Boolean.parseBoolean(Config.getProperty( CONFIG_SENDER_FIXED, "true" ));
- if( from == null || !fixed.equalsIgnoreCase("false")) {
+ if (from == null || !fixed) {
String user = sessionObject.user;
String name = Config.getProperty(CONFIG_SENDER_NAME);
if (name != null) {
@@ -2001,10 +2005,12 @@ public class WebMail extends HttpServlet
from = "";
}
if (user.contains("@")) {
+ from += '<' + user + '>';
+ } else {
String domain = Config.getProperty( CONFIG_SENDER_DOMAIN, "mail.i2p" );
+ if (from.length() == 0)
+ from = user + ' ';
from += '<' + user + '@' + domain + '>';
- } else {
- from += '<' + user + '>';
}
}
@@ -2020,17 +2026,17 @@ public class WebMail extends HttpServlet
out.println( "<table cellspacing=\"0\" cellpadding=\"5\">\n" +
"<tr><td colspan=\"2\" align=\"center\"><hr></td></tr>\n" +
- "<tr><td align=\"right\">" + _("From") + ":</td><td align=\"left\"><input type=\"text\" size=\"80\" name=\"" + NEW_FROM + "\" value=\"" + from + "\" " + ( !fixed.equalsIgnoreCase("false") ? "disabled" : "" ) +"></td></tr>\n" +
+ "<tr><td align=\"right\">" + _("From") + ":</td><td align=\"left\"><input type=\"text\" size=\"80\" name=\"" + NEW_FROM + "\" value=\"" + from + "\" " + ( fixed ? "disabled" : "" ) +"></td></tr>\n" +
"<tr><td align=\"right\">" + _("To") + ":</td><td align=\"left\"><input type=\"text\" size=\"80\" name=\"" + NEW_TO + "\" value=\"" + to + "\"></td></tr>\n" +
"<tr><td align=\"right\">" + _("Cc") + ":</td><td align=\"left\"><input type=\"text\" size=\"80\" name=\"" + NEW_CC + "\" value=\"" + cc + "\"></td></tr>\n" +
"<tr><td align=\"right\">" + _("Bcc") + ":</td><td align=\"left\"><input type=\"text\" size=\"80\" name=\"" + NEW_BCC + "\" value=\"" + bcc + "\"></td></tr>\n" +
"<tr><td align=\"right\">" + _("Bcc to self") + ": </td><td align=\"left\"><input type=\"checkbox\" class=\"optbox\" name=\"" + NEW_BCC_TO_SELF + "\" value=\"1\" " + (sessionObject.bccToSelf ? "checked" : "" ) + "></td></tr>\n" +
"<tr><td align=\"right\">" + _("Subject") + ":</td><td align=\"left\"><input type=\"text\" size=\"80\" name=\"" + NEW_SUBJECT + "\" value=\"" + subject + "\"></td></tr>\n" +
"<tr><td colspan=\"2\" align=\"center\"><textarea cols=\"" + Config.getProperty( CONFIG_COMPOSER_COLS, 80 )+ "\" rows=\"" + Config.getProperty( CONFIG_COMPOSER_ROWS, 10 )+ "\" name=\"" + NEW_TEXT + "\">" + text + "</textarea>" +
- "<tr><td colspan=\"2\" align=\"center\"><hr></td></tr>\n" +
- "<tr><td align=\"right\">" + _("Add Attachment") + ":</td><td align=\"left\"><input type=\"file\" size=\"50%\" name=\"" + NEW_FILENAME + "\" value=\"\"></td></tr>" +
+ "<tr class=\"bottombuttons\"><td colspan=\"2\" align=\"center\"><hr></td></tr>\n" +
+ "<tr class=\"bottombuttons\"><td align=\"right\">" + _("Add Attachment") + ":</td><td align=\"left\"><input type=\"file\" size=\"50%\" name=\"" + NEW_FILENAME + "\" value=\"\"></td></tr>" +
// TODO disable/hide in JS if no file selected
- "<tr><td> </td><td align=\"left\">" + button(NEW_UPLOAD, _("Add another attachment")) + "</td></tr>");
+ "<tr class=\"bottombuttons\"><td> </td><td align=\"left\">" + button(NEW_UPLOAD, _("Add another attachment")) + "</td></tr>");
if( sessionObject.attachments != null && !sessionObject.attachments.isEmpty() ) {
boolean wroteHeader = false;
@@ -2044,7 +2050,7 @@ public class WebMail extends HttpServlet
out.println("<td align=\"left\"><input type=\"checkbox\" class=\"optbox\" name=\"check" + attachment.hashCode() + "\" value=\"1\"> " + attachment.getFileName() + "</td></tr>");
}
// TODO disable in JS if none selected
- out.println("<tr><td> </td><td align=\"left\">" +
+ out.println("<tr class=\"bottombuttons\"><td> </td><td align=\"left\">" +
button( DELETE_ATTACHMENT, _("Delete selected attachments") ) +
"</td></tr>");
}
@@ -2057,8 +2063,7 @@ public class WebMail extends HttpServlet
*/
private static void showLogin( PrintWriter out )
{
- String fixedPorts = Config.getProperty( CONFIG_PORTS_FIXED, "true" );
- boolean fixed = !fixedPorts.equalsIgnoreCase("false");
+ boolean fixed = Boolean.parseBoolean(Config.getProperty( CONFIG_PORTS_FIXED, "true" ));
String host = Config.getProperty( CONFIG_HOST, DEFAULT_HOST );
String pop3 = Config.getProperty( CONFIG_PORTS_POP3, "" + DEFAULT_POP3PORT );
String smtp = Config.getProperty( CONFIG_PORTS_SMTP, "" + DEFAULT_SMTPPORT );
@@ -2098,6 +2103,7 @@ public class WebMail extends HttpServlet
*/
private static void showFolder( PrintWriter out, SessionObject sessionObject, RequestWrapper request )
{
+ out.println("<div class=\"topbuttons\">");
out.println( button( NEW, _("New") ) + spacer);
// In theory, these are valid and will apply to the first checked message,
// but that's not obvious and did it work?
@@ -2109,9 +2115,10 @@ public class WebMail extends HttpServlet
//if (Config.hasConfigFile())
// out.println(button( RELOAD, _("Reload Config") ) + spacer);
out.println(button( LOGOUT, _("Logout") ));
-
if (sessionObject.folder.getPages() > 1)
showPageButtons(out, sessionObject.folder);
+ out.println("</div>");
+
String curSort = sessionObject.folder.getCurrentSortBy();
Folder.SortOrder curOrder = sessionObject.folder.getCurrentSortingDirection();
@@ -2177,14 +2184,14 @@ public class WebMail extends HttpServlet
if (i == 0)
out.println("<tr><td colspan=\"9\" align=\"center\"><i>" + _("No messages") + "</i></td></tr>\n</table>");
if (i > 0) {
- out.println( "<tr><td colspan=\"9\"><hr></td></tr>");
+ out.println( "<tr class=\"bottombuttons\"><td colspan=\"9\"><hr></td></tr>");
if (sessionObject.folder.getPages() > 1 && i > 30) {
// show the buttons again if page is big
- out.println("<tr><td colspan=\"9\" align=\"center\">");
+ out.println("<tr class=\"bottombuttons\"><td colspan=\"9\" align=\"center\">");
showPageButtons(out, sessionObject.folder);
out.println("</td></tr>");
}
- out.println("<tr><td colspan=\"5\" align=\"left\">");
+ out.println("<tr class=\"bottombuttons\"><td colspan=\"5\" align=\"left\">");
if( sessionObject.reallyDelete ) {
// TODO ngettext
out.println("<p class=\"error\">" + _("Really delete the marked messages?") +
@@ -2209,7 +2216,7 @@ public class WebMail extends HttpServlet
// button( SETPAGESIZE, _("Set") ) );
out.print("<br>");
out.print(button(CONFIGURE, _("Settings")));
- out.println("</td>");
+ out.println("</td></tr>");
}
out.println( "</table>");
}
@@ -2251,6 +2258,7 @@ public class WebMail extends HttpServlet
out.println( quoteHTML( new String(body.content, body.offset, body.length ) ) );
out.println( "-->" );
}
+ out.println("<div class=\"topbuttons\">");
out.println( button( NEW, _("New") ) + spacer +
button( REPLY, _("Reply") ) +
button( REPLYALL, _("Reply All") ) +
@@ -2260,6 +2268,7 @@ public class WebMail extends HttpServlet
( sessionObject.folder.isFirstElement( sessionObject.showUIDL ) ? button2( PREV, _("Previous") ) : button( PREV, _("Previous") ) ) + spacer +
button( LIST, _("Back to Folder") ) + spacer +
( sessionObject.folder.isLastElement( sessionObject.showUIDL ) ? button2( NEXT, _("Next") ) : button( NEXT, _("Next") ) ));
+ out.println("</div>");
//if (Config.hasConfigFile())
// out.println(button( RELOAD, _("Reload Config") ) + spacer);
//out.println(button( LOGOUT, _("Logout") ) );
@@ -2298,24 +2307,28 @@ public class WebMail extends HttpServlet
sz = sessionObject.folder.getPageSize();
else
sz = Config.getProperty(Folder.PAGESIZE, Folder.DEFAULT_PAGESIZE);
+ out.println("<div class=\"topbuttons\">");
out.println(
_("Folder Page Size") + ": <input type=\"text\" style=\"text-align: right;\" name=\"" + PAGESIZE +
"\" size=\"4\" value=\"" + sz + "\">" +
" " +
button( SETPAGESIZE, _("Set") ) );
out.println("<p>");
+ out.println("</div>");
out.print(_("Advanced Configuration"));
- out.print(":</p><textarea cols=\"80\" rows=\"20\" spellcheck=\"false\" name=\"" + CONFIG_TEXT + "\">");
Properties config = Config.getProperties();
+ out.print(":</p><textarea cols=\"80\" rows=\"" + Math.max(8, config.size() + 2) + "\" spellcheck=\"false\" name=\"" + CONFIG_TEXT + "\">");
for (Map.Entry<Object, Object> e : config.entrySet()) {
out.print(e.getKey());
out.print('=');
out.println(e.getValue());
}
out.println("</textarea>");
- out.println("</br>");
+ out.println("<div id=\"bottombuttons\">");
+ out.println("<br>");
out.println(button(SAVE, _("Save Configuration")));
out.println(button(CANCEL, _("Cancel")));
+ out.println("</div>");
}
/** translate */
diff --git a/installer/resources/themes/susimail/dark/mobile.css b/installer/resources/themes/susimail/dark/mobile.css
index 2bfa5c5486367753acf821d8cdcf29bc700e029b..e30f878be95f39e78bcd818a810d6d1c611e35e3 100644
--- a/installer/resources/themes/susimail/dark/mobile.css
+++ b/installer/resources/themes/susimail/dark/mobile.css
@@ -11,3 +11,7 @@
#mailbox .optbox {
float: left;
}
+
+div.header, div.footer {
+ display: none;
+}
diff --git a/installer/resources/themes/susimail/dark/susimail.css b/installer/resources/themes/susimail/dark/susimail.css
index 1f7686b8357c4e8e0a1e61056551e8ff6aed0fcd..bd239b5c3d7a4bc7b4dc4fd1ea93566c8fefb21c 100644
--- a/installer/resources/themes/susimail/dark/susimail.css
+++ b/installer/resources/themes/susimail/dark/susimail.css
@@ -88,6 +88,11 @@ p.mailbody {
text-align: left;
}
+.iframed .header {
+ display: none;
+}
+
+
.mailbody {
display: block !important;
}
diff --git a/installer/resources/themes/susimail/light/mobile.css b/installer/resources/themes/susimail/light/mobile.css
index 2bfa5c5486367753acf821d8cdcf29bc700e029b..e30f878be95f39e78bcd818a810d6d1c611e35e3 100644
--- a/installer/resources/themes/susimail/light/mobile.css
+++ b/installer/resources/themes/susimail/light/mobile.css
@@ -11,3 +11,7 @@
#mailbox .optbox {
float: left;
}
+
+div.header, div.footer {
+ display: none;
+}
diff --git a/installer/resources/themes/susimail/light/susimail.css b/installer/resources/themes/susimail/light/susimail.css
index 48f5ccd9175b307f3e40aac8d492e5feab568d8d..d602efd93c67fbc84377554b9e98d94ac32e0bc4 100644
--- a/installer/resources/themes/susimail/light/susimail.css
+++ b/installer/resources/themes/susimail/light/susimail.css
@@ -56,7 +56,7 @@ p.footer {
line-height:10pt;
}
-.iframed #footer {
+.iframed .footer {
display: none;
}
@@ -67,7 +67,7 @@ p.mailbody {
text-align: left;
}
-.iframed p img {
+.iframed .header {
display: none;
}