Changeset 8854

Timestamp:

Jul 28, 2009, 4:52:59 AM (13 years ago)

Author:

kjg

Message:

(trunk web) progress bar shows seeding progress

Location:

trunk/web

Files:

• images/progress/progress.png (modified) (previous)
• javascript/torrent.js (modified) (2 diffs)
• stylesheets/common.css (modified) (2 diffs)

trunk/web/javascript/torrent.js

@@ -452 +452 @@
                 else
                 {
-                        // Update the 'in progress' bar
-                        e = root._progress_complete_container;
-                        c = 'torrent_progress_bar';
-                        c += (this.isActive()) ? ' complete' : ' complete_stopped';
-                        e.className = c;
-                        
                         // Create the 'progress details' label
                         // Eg: '698.05 MB, uploaded 8.59 GB (Ratio: 12.3)'
@@ -467 +461 @@
                         c += ')';
                         progress_details = c;
-                        
-                        // Hide the 'incomplete' bar
-                        root._progress_incomplete_container.style.display = 'none';
-                        
-                        // Set progress to maximum
-                        root._progress_complete_container.style.width =  MaxBarWidth + '%';
+
+                        var status = this.isActive() ? 'complete' : 'complete_stopped';
+
+                        if(this.isActive() && this.seedRatio() > 0){
+                                status = 'complete seeding'
+                                var seedRatioRatio = this._upload_ratio / this.seedRatio();
+                                var seedRatioPercent = Math.round( seedRatioRatio * 100 * MaxBarWidth ) / 100;
+
+                                root._progress_incomplete_container.className = 'torrent_progress_bar incomplete seeding'
+                                root._progress_incomplete_container.style.display = 'block';
+                                root._progress_incomplete_container.style.width = seedRatioPercent + '%';
+
+                                // Set progress to maximum
+                                root._progress_complete_container.style.width = MaxBarWidth - seedRatioPercent  + '%';
+                        }
+                        else
+                        {
+                                // Hide the 'incomplete' bar
+                                root._progress_incomplete_container.className = 'torrent_progress_bar incomplete'
+                                root._progress_incomplete_container.style.display = 'none';
+
+                                // Set progress to maximum
+                                root._progress_complete_container.style.width = MaxBarWidth + '%';
+                        }
+
+                        // Update the 'in progress' bar
+                        e = root._progress_complete_container;
+                        e.className = 'torrent_progress_bar ' + status;
                 }
                 

trunk/web/stylesheets/common.css

@@ -428 +428 @@
         border: 1px solid #29AD35;
 }
+ul.torrent_list li.torrent div.torrent_progress_bar.complete.seeding {
+        background-position: left -40px;
+        border: 1px solid #269e30;
+        border-right: none;
+}
 
 ul.torrent_list li.torrent div.torrent_progress_bar.in_progress {
@@ -440 +445 @@
         border: 1px solid #C8CACD;
         border-left: none;
+}
+
+ul.torrent_list li.torrent div.torrent_progress_bar.incomplete.seeding {
+        background-position: left -10px;
+        border: 1px solid #29AD35;
 }