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 45fa70f47..7e61f65d5 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -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("\n" + + ""); + buf.append(_t("Download files in order")); + buf.append(":" + + ""); + } buf.append("\n"); } - boolean showInOrder = storage != null && !storage.complete() && - meta != null && meta.getFiles() != null && meta.getFiles().size() > 1; - if (showInOrder) { - buf.append(""); - buf.append(_t("Download files in order")); - buf.append(":" + - "" + - "\n"); - } } else { // snark == null // shouldn't happen diff --git a/history.txt b/history.txt index 8da436916..893a3d7e0 100644 --- a/history.txt +++ b/history.txt @@ -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 diff --git a/installer/resources/themes/snark/classic/snark.css b/installer/resources/themes/snark/classic/snark.css index a5cfa0141..900b6841f 100644 --- a/installer/resources/themes/snark/classic/snark.css +++ b/installer/resources/themes/snark/classic/snark.css @@ -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; diff --git a/installer/resources/themes/snark/dark/snark.css b/installer/resources/themes/snark/dark/snark.css index d4abc4d4e..6e622f9a6 100644 --- a/installer/resources/themes/snark/dark/snark.css +++ b/installer/resources/themes/snark/dark/snark.css @@ -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; } diff --git a/installer/resources/themes/snark/light/snark.css b/installer/resources/themes/snark/light/snark.css index 7906cdd19..13ca13979 100644 --- a/installer/resources/themes/snark/light/snark.css +++ b/installer/resources/themes/snark/light/snark.css @@ -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; } diff --git a/installer/resources/themes/snark/midnight/snark.css b/installer/resources/themes/snark/midnight/snark.css index 64c7a6464..4ce223405 100644 --- a/installer/resources/themes/snark/midnight/snark.css +++ b/installer/resources/themes/snark/midnight/snark.css @@ -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; } diff --git a/installer/resources/themes/snark/ubergine/snark.css b/installer/resources/themes/snark/ubergine/snark.css index 031928cd7..0142b41a9 100644 --- a/installer/resources/themes/snark/ubergine/snark.css +++ b/installer/resources/themes/snark/ubergine/snark.css @@ -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; diff --git a/installer/resources/themes/snark/vanilla/snark.css b/installer/resources/themes/snark/vanilla/snark.css index 8021707f3..31d5ab0e4 100644 --- a/installer/resources/themes/snark/vanilla/snark.css +++ b/installer/resources/themes/snark/vanilla/snark.css @@ -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; diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 7ca1a3ec2..5a58b19bc 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -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 = "";