propagate from branch 'i2p.i2p.str4d.fux' (head 48cafeb29fb3408078a8b93c0bab0fc9d766a8bc)

to branch 'i2p.i2p' (head 47f04ff21e8edd00134a0fd68219f86fd3caba36)
This commit is contained in:
str4d
2012-07-16 16:17:19 +00:00
168 changed files with 5361 additions and 1949 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 415 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 406 B

View File

@@ -1,193 +0,0 @@
body {
background-color: #eef;
color:#001;
font-family:"Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
}
li {
color:#001;
line-height:12pt;
font-size:10pt;
margin-left:5mm;
margin-right:5mm;
}
p {
color:#001;
line-height:12pt;
margin-left:5mm;
margin-right:5mm;
font-size:10pt;
}
p.hl {
font-size:12pt;
letter-spacing:2pt;
line-height:18pt;
font-weight:bold;
}
p.text {
margin-left:10mm;
margin-right:10mm;
}
p.error {
color:#ff0000;
}
p.info {
color:#327BBF;
}
span.coloured {
color:#327BBF;
}
p.footer {
margin-left:10mm;
margin-right:10mm;
font-size:8pt;
line-height:10pt;
}
p.mailbody {
font: 10pt "Lucida Console", "DejaVu Sans Mono", Courier, mono;
margin-left:1cm;
margin-right:1cm;
text-align: left;
}
a {
color:#327BBF;
text-decoration:none;
}
a:hover {
text-decoration:underline;
}
td {
color:#001;
line-height:12pt;
margin-left:5mm;
margin-right:5mm;
font-size:10pt;
}
tr.list0 {
background-color:#e0e0e0;
}
tr.list1 {
background-color:#ffffff;
}
table.noborder {
margin-left:0mm;
margin-top:0mm;
margin-right:0mm;
}
pre {
font: 9pt "Lucida Console", "DejaVu Sans Mono", Courier, mono;
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: justify;
width: 100%;
}
th {
font-size: 10pt;
font-weight: bold;
}
form {
line-height: 160%
}
.mailhead {
font-size: 9pt;
font-weight: bold;
}
input.cancel, input.clearselection, input.logout {
background: #ddf url('/themes/console/images/cancel.png') no-repeat 2px center;
padding: 2px 3px 2px 20px;
min-height: 22px;
}
input.delete, input.delete_attachment, input.really_delete {
background: #ddf url('/themes/console/images/delete.png') no-repeat 2px center;
padding: 2px 3px 2px 20px;
min-height: 22px;
}
input.download, input.lastpage {
background: #ddf url('/themes/console/images/arrow_down.png') no-repeat 2px center;
padding: 2px 3px 2px 20px;
min-height: 22px;
}
input.firstpage {
background: #ddf url('/themes/console/images/arrow_up.png') no-repeat 2px center;
padding: 2px 3px 2px 20px;
min-height: 22px;
}
input.forward, input.login, input.nextpage, input.send {
background: #ddf url('/themes/console/images/arrow_right.png') no-repeat 2px center;
padding: 2px 3px 2px 20px;
min-height: 22px;
}
input.invertselection, input.reload, input.refresh {
background: #ddf url('/themes/console/images/arrow_refresh.png') no-repeat 2px center;
padding: 2px 3px 2px 20px;
min-height: 22px;
}
input.markall, input.show {
background: #ddf url('/themes/console/images/tick.png') no-repeat 2px center;
padding: 2px 3px 2px 20px;
min-height: 22px;
}
input.new, input.reply, input.replyall {
background: #ddf url('/themes/console/images/email.png') no-repeat 2px center;
padding: 2px 3px 2px 20px;
min-height: 22px;
}
input.prevpage {
background: #ddf url('/themes/console/images/arrow_left.png') no-repeat 2px center;
padding: 2px 3px 2px 20px;
min-height: 22px;
}
input.send, input.setpagesize {
background: #ddf url('/themes/console/images/accept.png') no-repeat 2px center;
padding: 2px 3px 2px 20px;
min-height: 22px;
}

View File

@@ -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 = "<th>&nbsp;</th>\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 + "&nbsp;<a href=\"" + myself + "?" + name + "=up\"><img src=\"3up.png\" border=\"0\" alt=\"^\"></a><a href=\"" + myself + "?" + name + "=down\"><img src=\"3down.png\" border=\"0\" alt=\"v\"></a>";
return "" + label + "&nbsp;<a href=\"" + myself + "?" + name + "=up\"><img src=\"" + imgPath + "3up.png\" border=\"0\" alt=\"^\"></a><a href=\"" + myself + "?" + name + "=down\"><img src=\"" + imgPath + "3down.png\" border=\"0\" alt=\"v\"></a>";
}
/**
* 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
"<head>\n" +
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n" +
"<title>susimail - " + subtitle + "</title>\n" +
"<link rel=\"stylesheet\" type=\"text/css\" href=\"css.css\">\n" +
"<link rel=\"stylesheet\" type=\"text/css\" href=\"" + sessionObject.themePath + "susimail.css\">\n" +
"</head>\n<body>\n" +
"<div class=\"page\"><p><img src=\"susimail.png\" alt=\"Susimail\"><br>&nbsp;</p>\n" +
"<div class=\"page\"><p><img src=\"" + sessionObject.imgPath + "susimail.png\" alt=\"Susimail\"><br>&nbsp;</p>\n" +
"<form method=\"POST\" enctype=\"multipart/form-data\" action=\"" + myself + "\">" );
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") ) + "<table cellspacing=\"0\" cellpadding=\"5\">\n" +
"<tr><td colspan=\"8\"><hr></td></tr>\n<tr>" +
thSpacer + "<th>" + sortHeader( SORT_SENDER, _("Sender") ) + "</th>" +
thSpacer + "<th>" + sortHeader( SORT_SUBJECT, _("Subject") ) + "</th>" +
thSpacer + "<th>" + sortHeader( SORT_DATE, _("Date") ) + sortHeader( SORT_ID, "" ) + "</th>" +
thSpacer + "<th>" + sortHeader( SORT_SIZE, _("Size") ) + "</th></tr>" );
thSpacer + "<th>" + sortHeader( SORT_SENDER, _("Sender"), sessionObject.imgPath ) + "</th>" +
thSpacer + "<th>" + sortHeader( SORT_SUBJECT, _("Subject"), sessionObject.imgPath ) + "</th>" +
thSpacer + "<th>" + sortHeader( SORT_DATE, _("Date"), sessionObject.imgPath ) + sortHeader( SORT_ID, "", sessionObject.imgPath ) + "</th>" +
thSpacer + "<th>" + sortHeader( SORT_SIZE, _("Size"), sessionObject.imgPath ) + "</th></tr>" );
int bg = 0;
int i = 0;
for( Iterator it = sessionObject.folder.currentPageIterator(); it != null && it.hasNext(); ) {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB