forked from I2P_Developers/i2p.i2p
Susimail: Show user name on folder view
This commit is contained in:
@@ -3277,7 +3277,7 @@ public class WebMail extends HttpServlet
|
|||||||
}
|
}
|
||||||
folder.setCurrentPage(page);
|
folder.setCurrentPage(page);
|
||||||
}
|
}
|
||||||
showPageButtons(out, folderName, page, folder.getPages(), true);
|
showPageButtons(out, sessionObject.user, folderName, page, folder.getPages(), true);
|
||||||
out.println("</div>");
|
out.println("</div>");
|
||||||
|
|
||||||
String curSort = folder.getCurrentSortBy();
|
String curSort = folder.getCurrentSortBy();
|
||||||
@@ -3406,7 +3406,7 @@ public class WebMail extends HttpServlet
|
|||||||
if (folder.getPages() > 1 && i > 30) {
|
if (folder.getPages() > 1 && i > 30) {
|
||||||
// show the buttons again if page is big
|
// show the buttons again if page is big
|
||||||
out.println("<div class=\"topbuttons\">");
|
out.println("<div class=\"topbuttons\">");
|
||||||
showPageButtons(out, folderName, page, folder.getPages(), false);
|
showPageButtons(out, sessionObject.user, folderName, page, folder.getPages(), false);
|
||||||
out.println("</div>");
|
out.println("</div>");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3415,8 +3415,13 @@ public class WebMail extends HttpServlet
|
|||||||
* Folder selector, then, if pages greater than 1:
|
* Folder selector, then, if pages greater than 1:
|
||||||
* first prev next last
|
* first prev next last
|
||||||
*/
|
*/
|
||||||
private static void showPageButtons(PrintWriter out, String folderName, int page, int pages, boolean outputHidden) {
|
private static void showPageButtons(PrintWriter out, String user, String folderName, int page, int pages, boolean outputHidden) {
|
||||||
out.println("<table id=\"pagenav\"><tr><td>");
|
out.println("<table id=\"pagenav\"><tr><td>");
|
||||||
|
if (!user.contains("@")) {
|
||||||
|
String domain = Config.getProperty( CONFIG_SENDER_DOMAIN, "mail.i2p" );
|
||||||
|
user += '@' + domain;
|
||||||
|
}
|
||||||
|
out.println(DataHelper.escapeHTML(user) + " ");
|
||||||
String name = folderName.equals(DIR_FOLDER) ? "Inbox" : folderName;
|
String name = folderName.equals(DIR_FOLDER) ? "Inbox" : folderName;
|
||||||
out.println(_t("Folder") + ": " + _t(name) + " "); // TODO css to center it
|
out.println(_t("Folder") + ": " + _t(name) + " "); // TODO css to center it
|
||||||
out.println(button(SWITCH_TO, _t("Change to Folder") + ':'));
|
out.println(button(SWITCH_TO, _t("Change to Folder") + ':'));
|
||||||
|
Reference in New Issue
Block a user