echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2psnark: CSS for in-order form (ticket #2234)

Browse Source
This commit is contained in:
zzz
2018-07-13 16:58:55 +00:00
parent 17c2a2a580
commit 2a0b927022
9 changed files with 76 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
View File

@ -3285,25 +3285,23 @@ public class I2PSnarkServlet extends BasicServlet {
.append(_t("Check integrity of the downloaded files"))
.append("\">\n");
}
boolean showInOrder = storage != null && !storage.complete() &&
meta != null && meta.getFiles() != null && meta.getFiles().size() > 1;
if (showInOrder) {
buf.append("</td></tr>\n" +
"<tr id=\"torrentOrderControl\"><td colspan=\"2\">");
buf.append(_t("Download files in order"));
buf.append(":<input type=\"checkbox\" class=\"optbox\" name=\"enableInOrder\" id=\"enableInOrder\" ");
if (storage.getInOrder())
buf.append("checked=\"checked\"");
buf.append(">" +
"<input type=\"submit\" name=\"setInOrderEnabled\" value=\"");
buf.append(_t("Save Preference"));
buf.append("\" class=\"accept\">");
}
buf.append("</td></tr>\n");
}
boolean showInOrder = storage != null && !storage.complete() &&
meta != null && meta.getFiles() != null && meta.getFiles().size() > 1;
if (showInOrder) {
buf.append("<tr id=\"torrentOrderControl\"><td colspan=\"2\">");
buf.append(_t("Download files in order"));
buf.append(":<label><input type=\"checkbox\" class=\"optbox\" name=\"enableInOrder\" id=\"enableInOrder\" ");
if (storage.getInOrder())
buf.append("checked=\"checked\"");
buf.append(">&nbsp;");
buf.append(_t("Enable for this torrent"));
buf.append("</label>" +
"<input type=\"submit\" name=\"setInOrderEnabled\" value=\"");
buf.append(_t("Save Preference"));
buf.append("\" class=\"accept\">" +
"</td></tr>\n");
}
} else {
// snark == null
// shouldn't happen

3
history.txt
View File

@ -1,3 +1,6 @@
2018-07-13 zzz
* i2psnark: Add sequential order option (ticket #2234)
2018-07-10 zzz
* Installer (ticket #1864):
- Fix wrapper selection on Windows 10

11
installer/resources/themes/snark/classic/snark.css
View File

@ -616,13 +616,22 @@ tt {
border-top: 1px solid #89f !important;
}
#torrentInfoControl td {
#torrentInfoControl td, #torrentOrderControl td {
padding: 7px 5px !important;
text-align: right !important;
border-top: 1px solid #89f !important;
background: linear-gradient(to bottom, #fff, #eef);
}
#torrentOrderControl td {
background: #eef;
}
#enableInOrder {
margin-left: 8px;
margin-right: 20px;
}
.SnarkTorrentInfo {
margin-bottom: 1px !important;
border-bottom: 1px solid #89f;

11
installer/resources/themes/snark/dark/snark.css
View File

@ -601,13 +601,18 @@ th.snarkTorrentStatus {
min-width: 85px;
}
#torrentInfoControl td, #setPriority th {
#torrentInfoControl td, #torrentOrderControl td, #setPriority th {
text-align: right !important;
padding: 11px 8px 10px !important;
background: none !important;
box-shadow: inset 0 0 0 1px #030;
}
#enableInOrder {
margin-left: 8px;
margin-right: 20px;
}
#setPriority th {
padding: 13px 8px 10px !important;
}
@ -682,7 +687,7 @@ th.snarkTorrentStatus {
border-bottom: 1px solid #494 !important;
}
#setPriority, #torrentInfoControl, .commentAction[colspan="5"] {
#setPriority, #torrentInfoControl, #torrentOrderControl, .commentAction[colspan="5"] {
background: url(/themes/console/dark/images/camotile2.png) repeat scroll center bottom #001100 !important;
background: repeating-linear-gradient(135deg, #000 1px, #000 2px, rgba(0,16,0,0.5) 2px, rgba(0,16,0,0.5) 4px), repeating-linear-gradient(45deg, #000 1px, #000 2px, rgba(0,200,0,0.5) 2px, rgba(0,200,0,0.5) 4px), url(/themes/console/dark/images/camotile2.png) top left repeat !important;
background-blend-mode: exclusion, darken, normal;
@ -690,7 +695,7 @@ th.snarkTorrentStatus {
border-bottom: 1px solid #494 !important;
}
_:-ms-lang(x), #setPriority, #torrentInfoControl {
_:-ms-lang(x), #setPriority, #torrentInfoControl, #torrentOrderControl {
background: url(/themes/console/dark/images/camotile2.png) repeat scroll center bottom #001100 !important;
}

11
installer/resources/themes/snark/light/snark.css
View File

@ -2048,16 +2048,25 @@ hr.debug:last-child {
margin: 8px;
}
#torrentInfoControl td, #setPriority th {
#torrentInfoControl td, #torrentOrderControl td, #setPriority th {
text-align: right !important;
padding: 5px !important;
background: linear-gradient(to bottom, #fff, #eef) !important;
}
#torrentOrderControl td {
background: #eef !important;
}
#torrentInfoControl input {
display: inline;
}
#enableInOrder {
margin-left: 8px;
margin-right: 20px;
}
#setPriority th {
border-bottom: 1px solid #7778bf;
}

9
installer/resources/themes/snark/midnight/snark.css
View File

@ -350,6 +350,15 @@ thead th, #torrentInfoControl td {
background: linear-gradient(to bottom, #121225, #00000d) !important;
}
#torrentOrderControl td {
background: #00000d !important;
}
#enableInOrder {
margin-left: 8px;
margin-right: 20px;
}
th:first-child {
text-align: left !important;
}

13
installer/resources/themes/snark/ubergine/snark.css
View File

@ -836,12 +836,12 @@ _:-ms-lang(x), .snarkTorrents tbody tr:hover, .snarkDirInfo tbody tr:hover {
user-select: all;
}
#torrentInfoControl td {
#torrentInfoControl td, #torrentOrderControl td {
text-align: right !important;
border-top: 1px solid #101;
}
#torrentInfoControl td, #setPriority th {
#torrentInfoControl td, #torrentOrderControl td, #setPriority th {
box-shadow: inset 0 0 0 1px #303;
}
@ -850,6 +850,15 @@ _:-ms-lang(x), .snarkTorrents tbody tr:hover, .snarkDirInfo tbody tr:hover {
padding: 8px 5px !important;
}
#torrentOrderControl td {
background: #101;
}
#enableInOrder {
margin-left: 8px;
margin-right: 20px;
}
.SnarkTorrentInfo, .snarkDirInfo {
margin: 0 !important;
border: 1px solid #101;

11
installer/resources/themes/snark/vanilla/snark.css
View File

@ -919,13 +919,22 @@ _:-ms-lang(x), .snarkTorrents tbody tr:hover, .snarkDirInfo tbody tr:hover {
border-top: 1px solid #6f533e;
}
#torrentInfoControl td {
#torrentInfoControl td, #torrentOrderControl td {
border-bottom: none !important;
background: linear-gradient(to bottom, #efefef, #cfc7c2);
text-align: right !important;
padding-right: 8px !important;
}
#torrentOrderControl td {
background: #cfc7c2;
}
#enableInOrder {
margin-left: 8px;
margin-right: 20px;
}
.snarkDirInfo {
margin-top: 10px !important;
margin-bottom: 0;

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 10;
public final static long BUILD = 11;
/** for example "-test" */
public final static String EXTRA = "";