From 7132dfda949f7ad93a6542a24bd4ac3d1376df32 Mon Sep 17 00:00:00 2001 From: Kevin Glowacz Date: Sun, 6 Dec 2009 03:21:16 +0000 Subject: [PATCH] (trunk web) 'Start when added' checkbox when adding torrents. Patch from Grub (with fixes). Fixes #2295. --- web/index.html | 2 ++ web/javascript/transmission.js | 6 ++++-- web/javascript/transmission.remote.js | 2 +- web/stylesheets/common.css | 10 ++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/web/index.html b/web/index.html index 36f96bc2d..19583853c 100755 --- a/web/index.html +++ b/web/index.html @@ -322,6 +322,8 @@ + + Upload Cancel diff --git a/web/javascript/transmission.js b/web/javascript/transmission.js index 6fe3b776e..5c2448499 100644 --- a/web/javascript/transmission.js +++ b/web/javascript/transmission.js @@ -1410,6 +1410,7 @@ Transmission.prototype = if (! confirmed) { $('input#torrent_upload_file').attr('value', ''); $('input#torrent_upload_url').attr('value', ''); + $('input#torrent_auto_start').attr('checked', this[Prefs._AutoStart]); $('#upload_container').show(); if (!iPhone && Safari3) { setTimeout("$('div#upload_container div.dialog_window').css('top', '0px');",10); @@ -1419,10 +1420,11 @@ Transmission.prototype = } else { var tr = this; var args = { }; + var paused = !$('#torrent_auto_start').is(':checked'); if ('' != $('#torrent_upload_url').val()) { - tr.remote.addTorrentByUrl($('#torrent_upload_url').val(), { paused: !this[Prefs._AutoStart] }); + tr.remote.addTorrentByUrl($('#torrent_upload_url').val(), { paused: paused }); } else { - args.url = '/transmission/upload?paused=' + (this[Prefs._AutoStart] ? 'false' : 'true'); + args.url = '/transmission/upload?paused=' + paused; args.type = 'POST'; args.data = { 'X-Transmission-Session-Id' : tr.remote._token }; args.dataType = 'xml'; diff --git a/web/javascript/transmission.remote.js b/web/javascript/transmission.remote.js index 72d0f1ba8..84f7f3707 100644 --- a/web/javascript/transmission.remote.js +++ b/web/javascript/transmission.remote.js @@ -205,7 +205,7 @@ TransmissionRemote.prototype = var o = { method: 'torrent-add', arguments: { - paused: (options.paused ? 'true' : 'false'), + paused: (options.paused), filename: url } }; diff --git a/web/stylesheets/common.css b/web/stylesheets/common.css index f303df00d..0a4fc888e 100644 --- a/web/stylesheets/common.css +++ b/web/stylesheets/common.css @@ -894,6 +894,16 @@ div#upload_container div.dialog_window div.dialog_message input[type=text] { padding: 2px; } +div#upload_container div.dialog_window div.dialog_message input[type=checkbox] { + margin: 15px 3px 0 0; + display: inline; + width: auto; +} + +div#upload_container div.dialog_window div.dialog_message #auto_start_label { + display: inline; +} + div.dialog_container div.dialog_window form { margin: 0; padding: 0px;