Changeset 6790

Timestamp:

Sep 19, 2008, 4:17:35 PM (14 years ago)

Author:

charles

Message:

(web) by Paweł Golonko
1: fix #1172 part 3
2: fix sort-by-progress reported by tziOm

3. fix preferences dialog typo

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• web/images/favicon.png (added)
• web/index.html (modified) (3 diffs)
• web/javascript/torrent.js (modified) (2 diffs)
• web/javascript/transmission.js (modified) (4 diffs)
• web/stylesheets/common.css (modified) (9 diffs)

trunk/Makefile.am

@@ -76 +76 @@
 clutch_images_DATA = \
   web/images/favicon.ico \
+  web/images/favicon.png \
   web/images/webclip-icon.png
 

trunk/web/index.html

@@ -7 +7 @@
                 <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
                 <link rel="apple-touch-icon" href="./images/webclip-icon.png"/>
-                <link href="./images/favicon.ico" rel="SHORTCUT ICON" />
+                <link href="./images/favicon.ico" rel="icon" />
+                <link href="./images/favicon.png" rel="shortcut icon" />
                 <script type="text/javascript" src="./javascript/jquery/jquery.min.js"></script>
                 <link media="only screen and (max-device-width: 480px)" href="./stylesheets/iphone.css" type= "text/css" rel="stylesheet" />
@@ -206 +207 @@
                                                 <label class="category">Network:</label>
                                                 <div class="formdiv">
-                                                        <label for="post" class="item">Incoming TCP Port:</label>
+                                                        <label for="port" class="item">Incoming TCP Port:</label>
                                                         <input type="text" id="port" name="port"/>
                                                 </div>
@@ -346 +347 @@
                                 <li id="context_toggle_inspector">Show Inspector</li>
                                 <li class="separator"></li>
-                                <li id="separator"></li>
                                 <li id="context_select_all" class="context_select_all">Select All</li>
                                 <li id="context_deselect_all" class="context_deselect_all">Deselect All</li>

trunk/web/javascript/torrent.js

@@ -131 +131 @@
         getPercentDone: function() {
                 if( !this._sizeWhenDone ) return 1.0;
+                if( !this._leftUntilDone ) return 1.0;
                 return ( this._sizeWhenDone - this._leftUntilDone )
                        / this._sizeWhenDone;
@@ -505 +506 @@
 /** Helper function for sortTorrents(). */
 Torrent.compareByProgress = function( a, b ) {
-        if( a._leftUntilDone !== b._leftUntilDone )
-                return a._leftUntilDone - b._leftUntilDone;
+        if( a.getPercentDone() !== b.getPercentDone() )
+                return a.getPercentDone() - b.getPercentDone();
         var a_ratio = Math.ratio( a._upload_total, a._download_total );
         var b_ratio = Math.ratio( b._upload_total, b._download_total );

trunk/web/javascript/transmission.js

@@ -844 +844 @@
                 var total_verified = 0;
                 var na = 'N/A';
+                
+                $("#torrent_inspector_size, .inspector_row div").css('color', '#222');
 
                 if( torrents.length == 0 )
@@ -869 +871 @@
                         setInnerHTML( $(ti+'comment')[0], na );
                         setInnerHTML( $(ti+'creator')[0], na );
-                        setInnerHTML( $(ti+'error')[0], na );
+                        setInnerHTML( $(ti+'error')[0], na );           
+                        $("#torrent_inspector_size, .inspector_row > div:contains('N/A')").css('color', '#666');
                         return;
                 }
@@ -930 +933 @@
                 if( have_private && have_public ) private_string = 'Mixed';
                 else if( have_private ) private_string = 'Private Torrent';
-                else if( have_public ) private_string = 'Public Torrent';
+                else if( have_public ) private_string = 'Public Torrent';       
 
                 var ti = '#torrent_inspector_';
@@ -955 +958 @@
                 $(ti+'creator')[0].innerHTML         = creator;
                 $(ti+'error')[0].innerHTML           = error;
+                
+                $(".inspector_row > div:contains('N/A')").css('color', '#666');
         },
     

trunk/web/stylesheets/common.css

@@ -632 +632 @@
         width: 100%;
         height: 100%;
-        z-index: 2;
+        z-index: 4;
         text-align: center;
         color: black;
@@ -640 +640 @@
 div.dialog_container div.dialog_window {
         background-color: #eee;
-        margin: 71px auto 0;
+        margin: -210px auto 0;
         filter: alpha(opacity=95);
         -moz-opacity: .95;
@@ -650 +650 @@
         position: relative;
         -webkit-box-shadow: 0 3px 6px rgba(0,0,0,0.7);
-}
+        top: 50%;
+}
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+        div.dialog_container div.dialog_window {
+                top: 0;
+                margin-top: 71px;
+        }
+} 
 
 div#prefs_container div.dialog_window {
@@ -747 +754 @@
 
 div#prefs_container label {
-        line-height: 25px;
-        vertical-align: middle;
         display: block;
 }
@@ -759 +764 @@
 
 div#prefs_container label.item {
+        font-size: 11px !important;
         margin: 0 5px 0 20px;
         float: left;
@@ -769 +775 @@
 
 div#prefs_container div.formdiv.checkbox label.item {
-        margin: 0 5px 0 41px;
-        clear: left;
+        margin: 0 5px 0 2px;
 }
 
@@ -778 +783 @@
 
 div#prefs_container div.preference input[type=checkbox] {
-        margin: 7px 7px 0 22px;
-        clear: left;
-        position: absolute; /* this plus z-index makes Opera show the checkboxes above the dialog */
-        z-index: 99;
-        left: 14px;
+        float: left;
+        margin-left: 20px;
+        margin-top: 9px;
 }
 @-moz-document url-prefix() {
         div#prefs_container div.preference input[type=checkbox] {
-                margin-top: 5px;
+                margin-top: 8px;
         }
 }
@@ -804 +807 @@
         width: 256px !important;
 }
+div#prefs_container div.download_location .checkbox input {
+        width: auto !important;
+}
 
 div#prefs_container div.formdiv {
         clear: both;
+        line-height: 30px;
 }
 
@@ -1011 +1018 @@
         -webkit-border-radius: 5px;
 }
+
+div#jqContextMenu li.separator, div#jqContextMenu li.separator:hover {
+        background: inherit !important;
+        border-top: 1px solid #ddd !important;
+        margin: 5px 0 !important;
+        padding: 0px;
+}