Changeset 718f73eb

Timestamp:

Jul 23, 2009 5:01:43 PM (11 years ago)

Author:

z3d <z3d@…>

Branches:

master

Children:

ca41537

Parents:

fb47eef

Message:

I2PSnark UI changes: add a splash of color! Fix for light i2ptunnels theme.

Files:

• apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java (modified) (12 diffs)
• apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java (modified) (8 diffs)
• installer/resources/themes/console/images/greentile.png (added)
• installer/resources/themes/console/images/orangetile.png (added)
• installer/resources/themes/console/images/orangetilealt.png (added)
• installer/resources/themes/console/images/redtile.png (added)
• installer/resources/themes/console/images/tabletitleorange.png (added)
• installer/resources/themes/console/images/yellowtile.png (added)
• installer/resources/themes/console/light/default.css (modified) (5 diffs)
• installer/resources/themes/console/snark.css (modified) (11 diffs)

apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

@@ -340 +340 @@
         if (_util.shouldUseOpenTrackers() != useOpenTrackers) {
             _config.setProperty(I2PSnarkUtil.PROP_USE_OPENTRACKERS, useOpenTrackers + "");
-            addMessage((useOpenTrackers ? "En" : "Dis") + "abled open trackers - torrent restart required to take effect");
+            addMessage((useOpenTrackers ? "En" : "Dis") + "abled open trackers - torrent restart required to take effect.");
             changed = true;
         }
@@ -346 +346 @@
             if (openTrackers.trim().length() > 0 && !openTrackers.trim().equals(_util.getOpenTrackerString())) {
                 _config.setProperty(I2PSnarkUtil.PROP_OPENTRACKERS, openTrackers.trim());
-                addMessage("Open Tracker list changed - torrent restart required to take effect");
+                addMessage("Open Tracker list changed - torrent restart required to take effect.");
                 changed = true;
             }
@@ -353 +353 @@
             saveConfig();
         } else {
-            addMessage("Configuration unchanged");
+            addMessage("Configuration unchanged.");
         }
     }
@@ -363 +363 @@
             }
         } catch (IOException ioe) {
-            addMessage("Unable to save the config to '" + _configFile.getAbsolutePath() + "'");
+            addMessage("Unable to save the config to '" + _configFile.getAbsolutePath() + "'.");
         }
     }
@@ -384 +384 @@
             boolean ok = _util.connect();
             if (!ok) {
-                addMessage("Error connecting to I2P - check your I2CP settings");
+                addMessage("Error connecting to I2P - check your I2CP settings!");
                 return;
             }
@@ -447 +447 @@
         if (!dontAutoStart && shouldAutoStart()) {
             torrent.startTorrent();
-            addMessage("Torrent added and started: '" + f.getName() + "'");
+            addMessage("Torrent added and started: '" + f.getName() + "'.");
         } else {
-            addMessage("Torrent added: '" + f.getName() + "'");
+            addMessage("Torrent added: '" + f.getName() + "'.");
         }
     }
@@ -545 +545 @@
         if ((!announce.startsWith("http://")) ||
             (announce.indexOf(".i2p/") < 0)) // need to do better than this
-            return "Non-i2p tracker in " + info.getName() + ", deleting it";
+            return "Non-i2p tracker in " + info.getName() + ", removing it from our list of trackers!";
         List files = info.getFiles();
         if ( (files != null) && (files.size() > MAX_FILES_PER_TORRENT) ) {
-            return "Too many files in " + info.getName() + " (" + files.size() + "), deleting it";
+            return "Too many files in " + info.getName() + " (" + files.size() + "), deleting it!";
         } else if (info.getPieces() <= 0) {
-            return "No pieces in " + info.getName() + "?  deleting it";
+            return "No pieces in " + info.getName() + "?  deleting it!";
         } else if (info.getPieceLength(0) > Storage.MAX_PIECE_SIZE) {
             return "Pieces are too large in " + info.getName() + " (" + DataHelper.formatSize(info.getPieceLength(0)) +
-                   "B), deleting it";
+                   "B), deleting it.";
         } else if (info.getTotalLength() > Storage.MAX_TOTAL_SIZE) {
             System.out.println("torrent info: " + info.toString());
@@ -559 +559 @@
             if (lengths != null)
                 for (int i = 0; i < lengths.size(); i++)
-                    System.out.println("File " + i + " is " + lengths.get(i) + " long");
+                    System.out.println("File " + i + " is " + lengths.get(i) + " long.");
             
             return "Torrents larger than " + DataHelper.formatSize(Storage.MAX_TOTAL_SIZE) +
-                   "B are not supported yet (because we're paranoid): " + info.getName() + ", deleting it";
+                   "B are not supported yet (because we're paranoid): " + info.getName() + ", deleting it!";
         } else {
             // ok
@@ -599 +599 @@
             }
             if (!wasStopped)
-                addMessage("Torrent stopped: '" + sfile.getName() + "'");
+                addMessage("Torrent stopped: '" + sfile.getName() + "'.");
         }
         return torrent;
@@ -614 +614 @@
             if (torrent.storage != null)
                 removeTorrentStatus(torrent.storage.getMetaInfo());
-            addMessage("Torrent removed: '" + torrentFile.getName() + "'");
+            addMessage("Torrent removed: '" + torrentFile.getName() + "'.");
         }
     }
@@ -647 +647 @@
         File f = new File(snark.torrent);
         long len = snark.meta.getTotalLength();
-        addMessage("Download complete of " + f.getName() + " (size: " + DataHelper.formatSize(len) + "B)");
+        addMessage("Download finished: " + f.getName() + " (size: " + DataHelper.formatSize(len) + "B)");
         updateStatus(snark);
     }
@@ -675 +675 @@
             } else {
                 if (shouldAutoStart() && !_util.connect())
-                    addMessage("Unable to connect to I2P");
+                    addMessage("Unable to connect to I2P!");
                 addTorrent((String)foundNames.get(i), !shouldAutoStart());
             }

apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

@@ -84 +84 @@
         out.write(HEADER);
         out.write("</head><body>");
-        out.write("<div class=\"page\"><table border=\"0\" width=\"100%\"><tr><td align=\"center\" class=\"snarkTitle\"><a href=\"" + req.getRequestURI() + peerString + "\" title=\"I2PSnark (Manual Page Refresh)\"><img src=\"/themes/console/images/i2psnark.png\" alt=\"I2PSnark Anonymous BitTorrent Client\" border=\"0\"></a><hr>");
-        out.write("<a href=\"http://forum.i2p/viewforum.php?f=21\" class=\"snarkRefresh\">Forum</a>\n");
+        out.write("<div class=\"page\"><table border=\"0\" width=\"100%\"><tr><td align=\"center\" class=\"snarkTitle\"><a href=\"" + req.getRequestURI() + peerString + "\" title=\"I2PSnark (Manual Page Refresh)\"><img src=\"/themes/console/images/i2psnark.png\" alt=\"I2PSnark Anonymous BitTorrent Client\" border=\"0\" class=\"snarklogo\"></a><br>");
+        out.write("<a href=\"http://forum.i2p/viewforum.php?f=21\" class=\"snarkRefresh\" target=\"_blank\">Forum</a>\n");
         Map trackers = _manager.getTrackers();
         for (Iterator iter = trackers.entrySet().iterator(); iter.hasNext(); ) {
@@ -95 +95 @@
                 continue;
             baseURL = baseURL.substring(e + 1);
-            out.write("<a href=\"" + baseURL + "\" class=\"snarkRefresh\">" + name + "</a>");
+            out.write("<a href=\"" + baseURL + "\" class=\"snarkRefresh\" target=\"_blank\">" + name + "</a>");
         }
         out.write("</table>\n");
-        out.write("<div class=\"section\"><div class=\"snarkMessages\"><table><tr><td valign=\"top\" align=\"left\"><pre>");
+        out.write("<div class=\"mainsection\"><div class=\"snarkMessages\"><table><tr><td valign=\"top\" align=\"left\"><pre>");
         List msgs = _manager.getMessages();
         for (int i = msgs.size()-1; i >= 0; i--) {
@@ -354 +354 @@
             }
         } else if ("StopAll".equals(action)) {
-            _manager.addMessage("Stopping all torrents and closing the I2P tunnel");
+            _manager.addMessage("Stopping all torrents and closing the I2P tunnel.");
             List snarks = getSortedSnarks(req);
             for (int i = 0; i < snarks.size(); i++) {
@@ -363 +363 @@
             if (_manager.util().connected()) {
                 _manager.util().disconnect();
-                _manager.addMessage("I2P tunnel closed");
+                _manager.addMessage("I2P tunnel closed.");
             }
         } else if ("StartAll".equals(action)) {
-            _manager.addMessage("Opening the I2P tunnel and starting all torrents");
+            _manager.addMessage("Opening the I2P tunnel and starting all torrents.");
             List snarks = getSortedSnarks(req);
             for (int i = 0; i < snarks.size(); i++) {
@@ -511 +511 @@
                     continue;
                 baseURL = baseURL.substring(e + 1);
-                out.write("&nbsp;&nbsp;&nbsp;(<a href=\"" + baseURL + "details.php?dllist=1&filelist=1&info_hash=");
+                out.write("&nbsp;&nbsp;&nbsp;[<a href=\"" + baseURL + "details.php?dllist=1&filelist=1&info_hash=");
                 out.write(TrackerClient.urlencode(snark.meta.getInfoHash()));
-                out.write("\" title=\"" + name + " Tracker\">Details</a>)");
+                out.write("\" title=\"" + name + " Tracker\">Details</a>]");
                 break;
             }
@@ -653 +653 @@
         out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
         out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" />\n");
-        out.write("<div class=\"section\"><span class=\"snarkConfigTitle\">Add Torrent:</span><br />\n");
+        out.write("<div class=\"addtorrentsection\"><span class=\"snarkConfigTitle\">Add Torrent:</span><br />\n");
         out.write("From URL&nbsp;: <input type=\"text\" name=\"newURL\" size=\"80\" value=\"" + newURL + "\" /> \n");
         // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve)
@@ -669 +669 @@
             baseFile = "";
         
-        out.write("<div class=\"section\"><span class=\"snarkNewTorrent\">\n");
+        out.write("<div class=\"newtorrentsection\"><span class=\"snarkNewTorrent\">\n");
         // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file
         out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
@@ -705 +705 @@
        
         out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
-        out.write("<div class=\"section\"><span class=\"snarkConfig\">\n");
+        out.write("<div class=\"configsection\"><span class=\"snarkConfig\">\n");
         out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" />\n");
         out.write("<span class=\"snarkConfigTitle\">Configuration:</span><br />\n");

installer/resources/themes/console/light/default.css

@@ -27 +27 @@
      float: left;
      width: 120px;
-     height: 28px;
+     height: 24px;
      font-weight: normal;
      text-align: right;
@@ -35 +35 @@
      box-sizing: border-box;
      line-height: 120%;
+     color: #427;
 }
 
@@ -85 +86 @@
 div.statusNotRunning {
      float: left;
-     width: 72px;
+     width: 68px;
      height: 24px;
      overflow: hidden;
@@ -96 +97 @@
 div.statusRunning {
    float: left;
-     width: 72px;
+     width: 68px;
      height: 24px;
      overflow: hidden;
@@ -107 +108 @@
 div.statusStarting {
      float: left;
-     width: 72px;
+     width: 68px;
      height: 24px;
      overflow: hidden;

installer/resources/themes/console/snark.css

@@ -13 +13 @@
 
 .snarkRefresh {
-  font-size: 9pt;
-}
-
-.snarkRefresh {
      border: 1px outset #001;
      padding: 1px 10px;
-     background: #ffb;
+     background: #eef;
      text-decoration: none;
      border-radius: 4px;
@@ -32 +28 @@
 }
 
+.snarkRefresh a:hover{
+     border: 1px inset #001;
+     padding: 1px 10px;
+     background: #003;
+     text-decoration: none;
+     border-radius: 4px;
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     font-size: 9pt;
+     font-weight: bold;
+     margin: -10px 3px 0 3px;
+     text-align: center;
+     vertical-align: middle;
+     text-transform: uppercase;
+     color: #f60;
+}
+
 .snarkMessages {
-  background-color: #fe9;
+  background-color: #f83;
   font-family: "Lucida Console", "DejaVu Sans Mono", Courier, mono !important;
   font-size: 9pt;
@@ -40 +53 @@
   margin: 0 0 15px 0;
   border: 0px;
-  padding: 5px;
+  padding: 0px;
   border-spacing: 0px;
   -moz-border-radius: 4px;
@@ -48 +61 @@
   text-align: center; 
   overflow-x: scroll;            
-  background: #ddf url('../console/light/images/lightbluetile.png');
+  background: #ddf url('../console/images/orangetile.png');
+  color: #531;
+  height: 64px;
 }
 
@@ -56 +71 @@
   font-size: 8pt;
   padding: 0;
+  text-align: left !important;
+  height: 8px;
 }
 
@@ -65 +82 @@
         border-spacing: 0px;
 }
+
 th {
-        background-color: #f91;
         padding: 5px;
-  font-size: 9pt;
+  font-size: 8pt;
   border-top: 1px outset #001;
   border-bottom: 1px inset #001;  
+  background: #f91 url('.../console/images/tabletitleorangealt.png') repeat-x;
+  text-align: center;
 }
 
@@ -80 +99 @@
 td {
         padding: 5px;
+  text-align: center;
 }
 .snarkTorrentEven {
         background-color: #fb1;
-  font-size: 8pt;
+  font-size: 7pt;
 }
 .snarkTorrentOdd {
         background-color: #fa1;
-  font-size: 8pt;
+  font-size: 7pt;
 }
 .snarkNewTorrent {
-        font-size: 10pt;
+        font-size: 9pt;
 }
 .snarkAddInfo {
-        font-size: 10pt;
+        font-size: 9pt;
   line-height: 130% !important;
 }
@@ -108 +128 @@
 .page {
         background-color: #fff;
-        color:#001;
+        color:#310;
   margin: 20px;
   padding: 10px 20px 5px 20px;
@@ -119 +139 @@
   -moz-box-shadow: inset 0px 0px 1px 0px #002;
   text-align: center;
-  background: #ddf url('../console/light/images/sandtile.png');
+  background: #ddf url('../console/light/images/lightbluetile.png');
 }
 
@@ -139 +159 @@
   height: 1px;
   border: 0px solid #003;
-  margin: 5px 0;
-}
-
-div.section {
-  margin: 0 0 20px 0;
-  padding: 10px;
-  background: #ffe;
-  border: 1px solid #001;
-  text-align: left;
-  color: #001;
-  -moz-border-radius: 4px;
-  -khtml-border-radius: 4px;
-  border-radius: 4px;
-  -moz-box-shadow: inset 0px 0px 1px 0px #002;
-  word-wrap: break-word;
+  width: 100%;
+  margin: 10px 0 7px 0;
   text-align: center;
 }
 
 a:link{
-     color: #830;
-     text-decoration: none;
-     font-weight: bold;
-     word-wrap: break-word;
+  color: #830;
+  text-decoration: none;
+  font-weight: bold;
+  word-wrap: break-word;
 }
 
 a:visited{
-     color: #606;
-     text-decoration: none;
-     font-weight: bold;
+  color: #606;
+  text-decoration: none;
+  font-weight: bold;
 }
 
 a:hover{
-     color: #f60;
-     font-weight: bold;
+  color: #f60;
+  font-weight: bold;
 }
 
@@ -189 +196 @@
   font-size: 9pt;
 }
-}
+
+img {
+  border: none;
+  margin: 5px 5px 10px 5px;
+}
+
+
+div.section {
+  margin: 0 0 20px 0;
+  padding: 10px;
+  background: #ffe;
+  border: 1px solid #001;
+  text-align: center;
+  color: #001;
+  -moz-border-radius: 4px;
+  -khtml-border-radius: 4px;
+  border-radius: 4px;
+  -moz-box-shadow: inset 0px 0px 1px 0px #002;
+  word-wrap: break-word;
+  text-align: center;
+  background: #ffe url('../console/light/images/tabletile.png');
+}
+
+div.mainsection {
+  margin: 0 0 20px 0;
+  padding: 10px;
+  background: #ffe;
+  border: 1px solid #001;
+  text-align: center;
+  color: #001;
+  -moz-border-radius: 4px;
+  -khtml-border-radius: 4px;
+  border-radius: 4px;
+  -moz-box-shadow: inset 0px 0px 1px 0px #002;
+  word-wrap: break-word;
+  text-align: center;
+  background: #ffe url('../console/light/images/tabletile.png');
+}
+
+div.newtorrentsection {
+  margin: 0 0 20px 0;
+  padding: 10px;
+  background: #ffe;
+  border: 1px solid #001;
+  text-align: center;
+  color: #001;
+  -moz-border-radius: 4px;
+  -khtml-border-radius: 4px;
+  border-radius: 4px;
+  -moz-box-shadow: inset 0px 0px 1px 0px #002;
+  word-wrap: break-word;
+  text-align: center;
+  background: #ffe url('../console/images/yellowtile.png');
+}
+
+div.addtorrentsection {
+  margin: 0 0 20px 0;
+  padding: 10px;
+  background: #ffe;
+  border: 1px solid #001;
+  text-align: center;
+  color: #001;
+  -moz-border-radius: 4px;
+  -khtml-border-radius: 4px;
+  border-radius: 4px;
+  -moz-box-shadow: inset 0px 0px 1px 0px #002;
+  word-wrap: break-word;
+  text-align: center;
+  background: #ffe url('../console/images/greentile.png');
+}
+
+div.configsection {
+  margin: 0 0 20px 0;
+  padding: 10px;
+  background: #ffe;
+  border: 1px solid #001;
+  text-align: center;
+  color: #fff;
+  -moz-border-radius: 4px;
+  -khtml-border-radius: 4px;
+  border-radius: 4px;
+  -moz-box-shadow: inset 0px 0px 1px 0px #002;
+  word-wrap: break-word;
+  text-align: center;
+  background: #ffe url('../console/images/redtile.png');
+}