(web) by Paweł Golonko
1: fix #1172 part 3 2: fix sort-by-progress reported by tziOm 3. fix preferences dialog typo
This commit is contained in:
Charles Kerr
parent
b6c9fa56e0
commit
21c141a4ef
|
|
@ -75,6 +75,7 @@ clutch_jquery_DATA = \
|
|||
clutch_imagesdir = $(clutchdir)/images
|
||||
clutch_images_DATA = \
|
||||
web/images/favicon.ico \
|
||||
web/images/favicon.png \
|
||||
web/images/webclip-icon.png
|
||||
|
||||
clutch_graphicsdir = $(clutch_imagesdir)/graphics
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 841 B |
|
|
@ -6,7 +6,8 @@
|
|||
<meta http-equiv="cache-control" content="Private" />
|
||||
<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" />
|
||||
<link media="screen and (min-device-width: 481px)" href="./stylesheets/common.css" type="text/css" rel="stylesheet" />
|
||||
|
|
@ -205,7 +206,7 @@
|
|||
<div class="preference port">
|
||||
<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>
|
||||
</div>
|
||||
|
|
@ -345,7 +346,6 @@
|
|||
<li id="context_remove">Remove From List...</li>
|
||||
<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>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -130,6 +130,7 @@ Torrent.prototype =
|
|||
peersGettingFromUs: function() { return this._peers_getting_from_us; },
|
||||
getPercentDone: function() {
|
||||
if( !this._sizeWhenDone ) return 1.0;
|
||||
if( !this._leftUntilDone ) return 1.0;
|
||||
return ( this._sizeWhenDone - this._leftUntilDone )
|
||||
/ this._sizeWhenDone;
|
||||
},
|
||||
|
|
@ -504,8 +505,8 @@ Torrent.compareByActivity = function( a, b ) {
|
|||
|
||||
/** 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 );
|
||||
return a_ratio - b_ratio;
|
||||
|
|
|
|||
|
|
@ -843,6 +843,8 @@ Transmission.prototype =
|
|||
var total_upload_speed = 0;
|
||||
var total_verified = 0;
|
||||
var na = 'N/A';
|
||||
|
||||
$("#torrent_inspector_size, .inspector_row div").css('color', '#222');
|
||||
|
||||
if( torrents.length == 0 )
|
||||
{
|
||||
|
|
@ -868,7 +870,8 @@ Transmission.prototype =
|
|||
setInnerHTML( $(ti+'progress')[0], na );
|
||||
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;
|
||||
}
|
||||
|
||||
|
|
@ -929,7 +932,7 @@ Transmission.prototype =
|
|||
var private_string = '';
|
||||
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_';
|
||||
$(ti+'name')[0].innerHTML = name;
|
||||
|
|
@ -954,6 +957,8 @@ Transmission.prototype =
|
|||
$(ti+'comment')[0].innerHTML = comment;
|
||||
$(ti+'creator')[0].innerHTML = creator;
|
||||
$(ti+'error')[0].innerHTML = error;
|
||||
|
||||
$(".inspector_row > div:contains('N/A')").css('color', '#666');
|
||||
},
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -631,7 +631,7 @@ div.dialog_container {
|
|||
margin: 0px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 2;
|
||||
z-index: 4;
|
||||
text-align: center;
|
||||
color: black;
|
||||
font-size: 1.1em;
|
||||
|
|
@ -639,7 +639,7 @@ div.dialog_container {
|
|||
|
||||
div.dialog_container div.dialog_window {
|
||||
background-color: #eee;
|
||||
margin: 71px auto 0;
|
||||
margin: -210px auto 0;
|
||||
filter: alpha(opacity=95);
|
||||
-moz-opacity: .95;
|
||||
opacity: .95;
|
||||
|
|
@ -649,7 +649,14 @@ div.dialog_container div.dialog_window {
|
|||
height: 145px;
|
||||
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 {
|
||||
width: 410px;
|
||||
|
|
@ -746,8 +753,6 @@ iframe#torrent_upload_frame {
|
|||
}
|
||||
|
||||
div#prefs_container label {
|
||||
line-height: 25px;
|
||||
vertical-align: middle;
|
||||
display: block;
|
||||
}
|
||||
|
||||
|
|
@ -758,6 +763,7 @@ div#prefs_container label.category {
|
|||
}
|
||||
|
||||
div#prefs_container label.item {
|
||||
font-size: 11px !important;
|
||||
margin: 0 5px 0 20px;
|
||||
float: left;
|
||||
}
|
||||
|
|
@ -768,8 +774,7 @@ div#prefs_container label.suffix {
|
|||
}
|
||||
|
||||
div#prefs_container div.formdiv.checkbox label.item {
|
||||
margin: 0 5px 0 41px;
|
||||
clear: left;
|
||||
margin: 0 5px 0 2px;
|
||||
}
|
||||
|
||||
div#prefs_container div.limit_total label.item {
|
||||
|
|
@ -777,15 +782,13 @@ div#prefs_container div.limit_total label.item {
|
|||
}
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -803,9 +806,13 @@ div#prefs_container div.preference input {
|
|||
div#prefs_container div.download_location input {
|
||||
width: 256px !important;
|
||||
}
|
||||
div#prefs_container div.download_location .checkbox input {
|
||||
width: auto !important;
|
||||
}
|
||||
|
||||
div#prefs_container div.formdiv {
|
||||
clear: both;
|
||||
line-height: 30px;
|
||||
}
|
||||
|
||||
div#prefs_container a {
|
||||
|
|
@ -1010,3 +1017,10 @@ div#jqContextMenu ul {
|
|||
-webkit-box-shadow: 0 10px 25px rgba(0,0,0,0.4);
|
||||
-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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue