Changeset 6790
- Timestamp:
- Sep 19, 2008, 4:17:35 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.am
r6788 r6790 76 76 clutch_images_DATA = \ 77 77 web/images/favicon.ico \ 78 web/images/favicon.png \ 78 79 web/images/webclip-icon.png 79 80 -
trunk/web/index.html
r6787 r6790 7 7 <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> 8 8 <link rel="apple-touch-icon" href="./images/webclip-icon.png"/> 9 <link href="./images/favicon.ico" rel="SHORTCUT ICON" /> 9 <link href="./images/favicon.ico" rel="icon" /> 10 <link href="./images/favicon.png" rel="shortcut icon" /> 10 11 <script type="text/javascript" src="./javascript/jquery/jquery.min.js"></script> 11 12 <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> 207 208 <div class="formdiv"> 208 <label for="po st" class="item">Incoming TCP Port:</label>209 <label for="port" class="item">Incoming TCP Port:</label> 209 210 <input type="text" id="port" name="port"/> 210 211 </div> … … 346 347 <li id="context_toggle_inspector">Show Inspector</li> 347 348 <li class="separator"></li> 348 <li id="separator"></li>349 349 <li id="context_select_all" class="context_select_all">Select All</li> 350 350 <li id="context_deselect_all" class="context_deselect_all">Deselect All</li> -
trunk/web/javascript/torrent.js
r6690 r6790 131 131 getPercentDone: function() { 132 132 if( !this._sizeWhenDone ) return 1.0; 133 if( !this._leftUntilDone ) return 1.0; 133 134 return ( this._sizeWhenDone - this._leftUntilDone ) 134 135 / this._sizeWhenDone; … … 505 506 /** Helper function for sortTorrents(). */ 506 507 Torrent.compareByProgress = function( a, b ) { 507 if( a. _leftUntilDone !== b._leftUntilDone)508 return a. _leftUntilDone - b._leftUntilDone;508 if( a.getPercentDone() !== b.getPercentDone() ) 509 return a.getPercentDone() - b.getPercentDone(); 509 510 var a_ratio = Math.ratio( a._upload_total, a._download_total ); 510 511 var b_ratio = Math.ratio( b._upload_total, b._download_total ); -
trunk/web/javascript/transmission.js
r6787 r6790 844 844 var total_verified = 0; 845 845 var na = 'N/A'; 846 847 $("#torrent_inspector_size, .inspector_row div").css('color', '#222'); 846 848 847 849 if( torrents.length == 0 ) … … 869 871 setInnerHTML( $(ti+'comment')[0], na ); 870 872 setInnerHTML( $(ti+'creator')[0], na ); 871 setInnerHTML( $(ti+'error')[0], na ); 873 setInnerHTML( $(ti+'error')[0], na ); 874 $("#torrent_inspector_size, .inspector_row > div:contains('N/A')").css('color', '#666'); 872 875 return; 873 876 } … … 930 933 if( have_private && have_public ) private_string = 'Mixed'; 931 934 else if( have_private ) private_string = 'Private Torrent'; 932 else if( have_public ) private_string = 'Public Torrent'; 935 else if( have_public ) private_string = 'Public Torrent'; 933 936 934 937 var ti = '#torrent_inspector_'; … … 955 958 $(ti+'creator')[0].innerHTML = creator; 956 959 $(ti+'error')[0].innerHTML = error; 960 961 $(".inspector_row > div:contains('N/A')").css('color', '#666'); 957 962 }, 958 963 -
trunk/web/stylesheets/common.css
r6787 r6790 632 632 width: 100%; 633 633 height: 100%; 634 z-index: 2;634 z-index: 4; 635 635 text-align: center; 636 636 color: black; … … 640 640 div.dialog_container div.dialog_window { 641 641 background-color: #eee; 642 margin: 71px auto 0;642 margin: -210px auto 0; 643 643 filter: alpha(opacity=95); 644 644 -moz-opacity: .95; … … 650 650 position: relative; 651 651 -webkit-box-shadow: 0 3px 6px rgba(0,0,0,0.7); 652 } 652 top: 50%; 653 } 654 @media screen and (-webkit-min-device-pixel-ratio:0) { 655 div.dialog_container div.dialog_window { 656 top: 0; 657 margin-top: 71px; 658 } 659 } 653 660 654 661 div#prefs_container div.dialog_window { … … 747 754 748 755 div#prefs_container label { 749 line-height: 25px;750 vertical-align: middle;751 756 display: block; 752 757 } … … 759 764 760 765 div#prefs_container label.item { 766 font-size: 11px !important; 761 767 margin: 0 5px 0 20px; 762 768 float: left; … … 769 775 770 776 div#prefs_container div.formdiv.checkbox label.item { 771 margin: 0 5px 0 41px; 772 clear: left; 777 margin: 0 5px 0 2px; 773 778 } 774 779 … … 778 783 779 784 div#prefs_container div.preference input[type=checkbox] { 780 margin: 7px 7px 0 22px; 781 clear: left; 782 position: absolute; /* this plus z-index makes Opera show the checkboxes above the dialog */ 783 z-index: 99; 784 left: 14px; 785 float: left; 786 margin-left: 20px; 787 margin-top: 9px; 785 788 } 786 789 @-moz-document url-prefix() { 787 790 div#prefs_container div.preference input[type=checkbox] { 788 margin-top: 5px;791 margin-top: 8px; 789 792 } 790 793 } … … 804 807 width: 256px !important; 805 808 } 809 div#prefs_container div.download_location .checkbox input { 810 width: auto !important; 811 } 806 812 807 813 div#prefs_container div.formdiv { 808 814 clear: both; 815 line-height: 30px; 809 816 } 810 817 … … 1011 1018 -webkit-border-radius: 5px; 1012 1019 } 1020 1021 div#jqContextMenu li.separator, div#jqContextMenu li.separator:hover { 1022 background: inherit !important; 1023 border-top: 1px solid #ddd !important; 1024 margin: 5px 0 !important; 1025 padding: 0px; 1026 }
Note: See TracChangeset
for help on using the changeset viewer.