From 3cc447c5f26d5831f529f87e61475b39e3e1f2d8 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Thu, 5 Jul 2012 11:36:10 +0000
Subject: [PATCH] Put icon/thumbnail for snark filemanager in separate td
---
.../org/klomp/snark/web/I2PSnarkServlet.java | 22 ++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index 63c4ba96a0..cd39438d17 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -2121,7 +2121,7 @@ public class I2PSnarkServlet extends DefaultServlet {
}
// second row - dir info
- buf.append("<tr><th>")
+ buf.append("<tr><th colspan=2>")
.append("<img alt=\"\" border=\"0\" src=\"" + _imgPath + "file.png\" > ")
.append(_("Directory")).append(": ").append(directory).append("</th><th align=\"right\">")
.append("<img alt=\"\" border=\"0\" src=\"" + _imgPath + "size.png\" > ")
@@ -2134,7 +2134,7 @@ public class I2PSnarkServlet extends DefaultServlet {
.append("<img alt=\"\" border=\"0\" src=\"" + _imgPath + "priority.png\" > ")
.append(_("Priority")).append("</th>");
buf.append("</tr></thead>\n");
- buf.append("<tr><td colspan=\"" + (showPriority ? '4' : '3') + "\" class=\"ParentDir\"><A HREF=\"");
+ buf.append("<tr><td colspan=\"" + (showPriority ? '5' : '4') + "\" class=\"ParentDir\"><A HREF=\"");
buf.append(URIUtil.addPaths(base,"../"));
buf.append("\"><img alt=\"\" border=\"0\" src=\"" + _imgPath + "up.png\"> ")
.append(_("Up to higher level directory")).append("</A></td></tr>\n");
@@ -2153,8 +2153,7 @@ public class I2PSnarkServlet extends DefaultServlet {
Resource item = r.addPath(ls[i]);
String rowClass = (i % 2 == 0 ? "snarkTorrentEven" : "snarkTorrentOdd");
- buf.append("<TR class=\"").append(rowClass).append("\"><TD class=\"snarkFileName ")
- .append(rowClass).append("\">");
+ buf.append("<TR class=\"").append(rowClass).append("\">");
// Get completeness and status string
boolean complete = false;
@@ -2206,6 +2205,8 @@ public class I2PSnarkServlet extends DefaultServlet {
path=URIUtil.addPaths(path,"/");
String icon = toIcon(item);
+ buf.append("<TD class=\"snarkFileIcon ")
+ .append(rowClass).append("\">");
if (complete) {
buf.append("<a href=\"").append(path).append("\">");
// thumbnail ?
@@ -2213,16 +2214,17 @@ public class I2PSnarkServlet extends DefaultServlet {
if (plc.endsWith(".jpg") || plc.endsWith(".jpeg") || plc.endsWith(".png") ||
plc.endsWith(".gif") || plc.endsWith(".ico")) {
buf.append("<img alt=\"\" border=\"0\" class=\"thumb\" src=\"")
- .append(path).append("\"></a> ");
+ .append(path).append("\"></a>");
} else {
- buf.append(toImg(icon, _("Open"))).append("</a> ");
+ buf.append(toImg(icon, _("Open"))).append("</a>");
}
- buf.append("<A HREF=\"");
- buf.append(path);
- buf.append("\">");
} else {
- buf.append(toImg(icon)).append(' ');
+ buf.append(toImg(icon));
}
+ buf.append("</TD><TD class=\"snarkFileName ")
+ .append(rowClass).append("\">");
+ if (complete)
+ buf.append("<a href=\"").append(path).append("\">");
buf.append(ls[i]);
if (complete)
buf.append("</a>");
--
GitLab