diff --git a/apps/susidns/src/css.css b/apps/susidns/src/css.css
index 0db3ed7a5ad7972cfc7690ceccc88d780c453032..0ee2432d62a6c67a8b03eb49a7236680c12e4646 100644
--- a/apps/susidns/src/css.css
+++ b/apps/susidns/src/css.css
@@ -110,27 +110,15 @@ p.footer {
}
.page {
- margin: 10px;
- padding: 10px;
+ background-color: #fff;
+ color:#001;
+ margin: 20px;
+ padding: 10px 20px 20px 20px;
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
border-radius: 4px;
border: 1px solid #001;
- font-size: 10pt;
+ font-size: 10pt !important;
+ line-height: 160% !important;
-moz-box-shadow: inset 0px 0px 1px 0px #002;
- background: #fff;
-}
-
-.page {
- background-color: #fff;
- color:#001;
- margin: 20px;
- padding: 10px 20px 20px 20px;
- -moz-border-radius: 4px;
- -khtml-border-radius: 4px;
- border-radius: 4px;
- border: 1px solid #001;
- font-size: 10pt !important;
- line-height: 160% !important;
- -moz-box-shadow: inset 0px 0px 1px 0px #002;
}
\ No newline at end of file
diff --git a/apps/susimail/src/css.css b/apps/susimail/src/css.css
index 59b6e0c46b8ab7f89b1642df3604d7d68190ec04..25cef948b027f9d1290bd2e81fc76a5e23372a4e 100644
--- a/apps/susimail/src/css.css
+++ b/apps/susimail/src/css.css
@@ -1,9 +1,11 @@
body {
- background-color:white;
+ background-color: #eef;
+ color:#001;
+ font-family:"Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
}
li {
- font-family:Verdana,Tahoma,Arial,Helvetica;
+
color:black;
line-height:12pt;
font-size:10pt;
@@ -12,7 +14,7 @@ li {
}
p {
- font-family:Verdana,Tahoma,Arial,Helvetica;
+
color:black;
line-height:12pt;
margin-left:5mm;
@@ -67,7 +69,7 @@ a:hover {
}
td {
- font-family:Verdana,Tahoma,Arial,Helvetica;
+
color:black;
line-height:12pt;
margin-left:5mm;
@@ -93,4 +95,29 @@ pre {
font-family:Courier-Fixed;
margin-left:1cm;
margin-right:1cm;
+}
+
+.page {
+ background-color: #fff;
+ color:#001;
+ margin: 20px;
+ padding: 0 20px;
+ -moz-border-radius: 4px;
+ -khtml-border-radius: 4px;
+ border-radius: 4px;
+ border: 1px solid #001;
+ font-size: 10pt !important;
+ line-height: 160% !important;
+ -moz-box-shadow: inset 0px 0px 1px 0px #002;
+ text-align: center;
+}
+
+table {
+ text-align: center;
+ width: 100%;
+}
+
+th {
+ font-size: 10pt;
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index 8d3086c746eb23f0f89c345d88fa1e7f0bce1242..12d48e7344541ab9d07b714ce9d5853f584b2080 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -503,7 +503,7 @@ public class WebMail extends HttpServlet
}
}
if( html )
- out.println( "<tr class=\"mailbody\"><td colspan=\"2\">" );
+ out.println( "<tr class=\"mailbody\"><td colspan=\"2\" align=\"center\">" );
if( reason != null && reason.length() > 0 ) {
if( html )
out.println( "<p class=\"info\">");
@@ -1271,7 +1271,7 @@ public class WebMail extends HttpServlet
* write header
*/
out.println( "<head>\n<title>susimail v0." + version + " - " + subtitle +
- "</title>\n<link rel=\"stylesheet\" type=\"text/css\" href=\"css.css\">\n</head>\n<body>\n<p><img src=\"susimail.png\" alt=\"Susimail\"><br> </p>\n<form method=\"POST\" enctype=\"multipart/form-data\" action=\"" + myself + "\">" );
+ "</title>\n<link rel=\"stylesheet\" type=\"text/css\" href=\"css.css\">\n</head>\n<body>\n<div class=\"page\"><p><img src=\"susimail.png\" alt=\"Susimail\"><br> </p>\n<form method=\"POST\" enctype=\"multipart/form-data\" action=\"" + myself + "\">" );
if( sessionObject.error != null && sessionObject.error.length() > 0 ) {
out.println( "<p class=\"error\">" + sessionObject.error + "</p>" );
@@ -1294,7 +1294,7 @@ public class WebMail extends HttpServlet
else if( sessionObject.state == STATE_NEW )
showCompose( out, sessionObject, request );
- out.println( "</form>\n<p class=\"footer\">susimail v0." + version +" " + ( RELEASE ? "release" : "development" ) + " © 2004-2005 <a href=\"mailto:susi23@mail.i2p\">susi</a></body>\n</html>");
+ out.println( "</form><hr><p class=\"footer\">susimail v0." + version +" " + ( RELEASE ? "release" : "development" ) + " © 2004-2005 <a href=\"mailto:susi23@mail.i2p\">susi</a></div></body>\n</html>");
out.flush();
}
}
@@ -1539,26 +1539,26 @@ public class WebMail extends HttpServlet
sessionObject.body = null;
out.println( "<table cellspacing=\"0\" cellpadding=\"5\">\n" +
- "<tr><td colspan=\"2\"><hr></td></tr>\n" +
- "<tr><td align=\"right\">From:</td><td><input type=\"text\" size=\"80\" name=\"" + NEW_FROM + "\" value=\"" + from + "\" " + ( fixed.compareToIgnoreCase( "false" ) != 0 ? "disabled" : "" ) +"></td></tr>\n" +
- "<tr><td align=\"right\">To:</td><td><input type=\"text\" size=\"80\" name=\"" + NEW_TO + "\" value=\"" + to + "\"></td></tr>\n" +
- "<tr><td align=\"right\">Cc:</td><td><input type=\"text\" size=\"80\" name=\"" + NEW_CC + "\" value=\"" + cc + "\"></td></tr>\n" +
- "<tr><td align=\"right\">Bcc:</td><td><input type=\"text\" size=\"80\" name=\"" + NEW_BCC + "\" value=\"" + bcc + "\"></td></tr>\n" +
- "<tr><td align=\"right\">Subject:</td><td><input type=\"text\" size=\"80\" name=\"" + NEW_SUBJECT + "\" value=\"" + subject + "\"></td></tr>\n" +
- "<tr><td> </td><td><input type=\"checkbox\" name=\"" + NEW_BCC_TO_SELF + "\" value=\"1\"" + ( bccToSelf.compareToIgnoreCase( "false" ) != 0 ? "checked" : "" )+ ">Bcc to self</td></tr>\n" +
- "<tr><td colspan=\"2\"><textarea cols=\"" + Config.getProperty( CONFIG_COMPOSER_COLS, 80 )+ "\" rows=\"" + Config.getProperty( CONFIG_COMPOSER_ROWS, 10 )+ "\" name=\"" + NEW_TEXT + "\">" + text + "</textarea>" +
- "<tr><td colspan=\"2\"><hr></td></tr>\n" +
- "<tr><td align=\"right\">New Attachment:</td><td><input type=\"file\" name=\"" + NEW_FILENAME + "\" value=\"\"><input type=\"submit\" name=\"" + NEW_UPLOAD + "\" value=\"Upload File\"></td></tr>" );
+ "<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.compareToIgnoreCase( "false" ) != 0 ? "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\">Subject:</td><td align=\"left\"><input type=\"text\" size=\"80\" name=\"" + NEW_SUBJECT + "\" value=\"" + subject + "\"></td></tr>\n" +
+ "<tr><td> </td><td align=\"left\"><input type=\"checkbox\" name=\"" + NEW_BCC_TO_SELF + "\" value=\"1\"" + ( bccToSelf.compareToIgnoreCase( "false" ) != 0 ? "checked" : "" )+ ">Bcc to self</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\">New Attachment:</td><td align=\"left\"><input type=\"file\" size=\"50%\" name=\"" + NEW_FILENAME + "\" value=\"\"><input type=\"submit\" name=\"" + NEW_UPLOAD + "\" value=\"Upload File\"></td></tr>" );
if( sessionObject.attachments != null && sessionObject.attachments.size() > 0 ) {
boolean wroteHeader = false;
for( Iterator it = sessionObject.attachments.iterator(); it.hasNext(); ) {
if( !wroteHeader ) {
- out.println( "<tr><td colspan=\"2\">Attachments:</td></tr>" );
+ out.println( "<tr><td colspan=\"2\" align=\"center\">Attachments:</td></tr>" );
wroteHeader = true;
}
Attachment attachment = (Attachment)it.next();
- out.println( "<tr><td colspan=\"2\"><input type=\"checkbox\" name=\"check" + attachment.hashCode() + "\" value=\"1\"> " + attachment.getFileName() + "</td></tr>");
+ out.println( "<tr><td colspan=\"2\" align=\"center\"><input type=\"checkbox\" name=\"check" + attachment.hashCode() + "\" value=\"1\"> " + attachment.getFileName() + "</td></tr>");
}
}
out.println( "</table>" );
@@ -1576,11 +1576,11 @@ public class WebMail extends HttpServlet
String smtp = Config.getProperty( CONFIG_PORTS_SMTP, "" + DEFAULT_SMTPPORT );
out.println( "<table cellspacing=\"0\" cellpadding=\"5\">\n" +
- "<tr><td>User</td><td><input type=\"text\" size=\"32\" name=\"" + USER + "\" value=\"" + ( RELEASE ? "" : "test") + "\"></td></tr>\n" +
- "<tr><td>Pass</td><td><input type=\"password\" size=\"32\" name=\"pass\" value=\"" + ( RELEASE ? "" : "test") + "\"></td></tr>\n" +
- "<tr><td>Host</td><td><input type=\"text\" size=\"32\" name=\"" + HOST +"\" value=\"" + host + "\"" + ( fixed ? " disabled" : "" ) + "></td></tr>\n" +
- "<tr><td>POP3-Port</td><td><input type=\"text\" size=\"32\" name=\"" + POP3 +"\" value=\"" + pop3 + "\"" + ( fixed ? " disabled" : "" ) + "></td></tr>\n" +
- "<tr><td>SMTP-Port</td><td><input type=\"text\" size=\"32\" name=\"" + SMTP +"\" value=\"" + smtp + "\"" + ( fixed ? " disabled" : "" ) + "></td></tr>\n" +
+ "<tr><td align=\"right\" width=\"30%\">User</td><td width=\"40%\" align=\"left\"><input type=\"text\" size=\"32\" name=\"" + USER + "\" value=\"" + ( RELEASE ? "" : "test") + "\"></td></tr>\n" +
+ "<tr><td align=\"right\" width=\"30%\">Pass</td><td width=\"40%\" align=\"left\"><input type=\"password\" size=\"32\" name=\"pass\" value=\"" + ( RELEASE ? "" : "test") + "\"></td></tr>\n" +
+ "<tr><td align=\"right\" width=\"30%\">Host</td><td width=\"40%\" align=\"left\"><input type=\"text\" size=\"32\" name=\"" + HOST +"\" value=\"" + host + "\"" + ( fixed ? " disabled" : "" ) + "></td></tr>\n" +
+ "<tr><td align=\"right\" width=\"30%\">POP3-Port</td><td width=\"40%\" align=\"left\"><input type=\"text\" size=\"32\" name=\"" + POP3 +"\" value=\"" + pop3 + "\"" + ( fixed ? " disabled" : "" ) + "></td></tr>\n" +
+ "<tr><td align=\"right\" width=\"30%\">SMTP-Port</td><td width=\"40%\" align=\"left\"><input type=\"text\" size=\"32\" name=\"" + SMTP +"\" value=\"" + smtp + "\"" + ( fixed ? " disabled" : "" ) + "></td></tr>\n" +
"<tr><td align=\"center\" colspan=\"2\"><a href=\"http://hq.postman.i2p/?page_id=16\">Create Account</a> " + button( LOGIN, "Login" ) + " <input type=\"reset\" value=\"Reset\"></td></tr>\n" +
"</table>");
}
@@ -1686,21 +1686,21 @@ public class WebMail extends HttpServlet
button( LOGOUT, "Logout" ) );
if( mail != null ) {
out.println( "<table cellspacing=\"0\" cellpadding=\"5\">\n" +
- "<tr><td colspan=\"2\"><hr></td></tr>\n" +
- "<tr class=\"mailhead\"><td align=\"right\">From:</td><td>" + quoteHTML( mail.formattedSender ) + "</td></tr>\n" +
- "<tr class=\"mailhead\"><td align=\"right\">Date:</td><td>" + mail.quotedDate + "</td></tr>\n" +
- "<tr class=\"mailhead\"><td align=\"right\">Subject:</td><td>" + quoteHTML( mail.formattedSubject ) + "</td></tr>\n" +
- "<tr><td colspan=\"2\"><hr></td></tr>" );
+ "<tr><td colspan=\"2\" align=\"center\"><hr></td></tr>\n" +
+ "<tr class=\"mailhead\"><td align=\"right\">From:</td><td align=\"left\">" + quoteHTML( mail.formattedSender ) + "</td></tr>\n" +
+ "<tr class=\"mailhead\"><td align=\"right\">Date:</td><td align=\"left\">" + mail.quotedDate + "</td></tr>\n" +
+ "<tr class=\"mailhead\"><td align=\"right\">Subject:</td><td align=\"left\">" + quoteHTML( mail.formattedSubject ) + "</td></tr>\n" +
+ "<tr><td colspan=\"2\" align=\"center\"><hr></td></tr>" );
if( mail.body != null ) {
showPart( out, mail.part, 0, SHOW_HTML );
}
else {
- out.println( "<tr class=\"mailbody\"><td colspan=\"2\"><p class=\"error\">Could not fetch mail body.</p></td></tr>" );
+ out.println( "<tr class=\"mailbody\"><td colspan=\"2\" align=\"center\"><p class=\"error\">Could not fetch mail body.</p></td></tr>" );
}
}
else {
- out.println( "<tr class=\"mailbody\"><td colspan=\"2\"><p class=\"error\">Could not fetch mail.</p></td></tr>" );
+ out.println( "<tr class=\"mailbody\"><td colspan=\"2\" align=\"center\"><p class=\"error\">Could not fetch mail.</p></td></tr>" );
}
- out.println( "<tr><td colspan=\"2\"><hr></td></tr>\n</table>" );
+ out.println( "<tr><td colspan=\"2\" align=\"center\"><hr></td></tr>\n</table>" );
}
}