(trunk web) enable open dialog on iPhone

diff --git a/web/javascript/common.js b/web/javascript/common.js
index b1ed84bda3ac71498c8e075c5af30d3f51c8d387..edb08d0e142497e83893e96065ba4714ebffb77a 100644 (file)
--- a/web/javascript/common.js
+++ b/web/javascript/common.js
@@ -70,14 +70,15 @@ $(document).ready( function() {
                // different padding.
                $('div.dialog_container div.dialog_window a').css('padding', '2px 10px 3px');
        }
-    if (iPhone){
-                       window.onload = function(){ setTimeout(function() { window.scrollTo(0,1); },500); };
-                       window.onorientationchange = function(){ setTimeout( function() { window.scrollTo(0,1); },100); };
-        if(window.navigator.standalone)
-            // Fix min height for iPhone when run in full screen mode from home screen
-            // so the footer appears in the right place
-            $('body div#torrent_container').css('min-height', '338px');
-    }
+       if (iPhone){
+               window.onload = function(){ setTimeout(function() { window.scrollTo(0,1); },500); };
+               window.onorientationchange = function(){ setTimeout( function() { window.scrollTo(0,1); },100); };
+               if(window.navigator.standalone)
+                       // Fix min height for iPhone when run in full screen mode from home screen
+                       // so the footer appears in the right place
+                       $('body div#torrent_container').css('min-height', '338px');
+               $("label[for=torrent_upload_url]").text("URL: ");
+       }
 });
 
 /*

diff --git a/web/javascript/transmission.js b/web/javascript/transmission.js
index 3a6fbfba2ffb887a386e3c7153237fc0b80b3f4f..4a513af84931c3e085e1ce3c20611f9147cd3f63 100644 (file)
--- a/web/javascript/transmission.js
+++ b/web/javascript/transmission.js
@@ -49,17 +49,17 @@ Transmission.prototype =
                $('.inspector_tab').bind('click', function(e){ tr.inspectorTabClicked(e, this); });
                $('.file_wanted_control').live('click', function(e){ tr.fileWantedClicked(e, this); });
                $('.file_priority_control').live('click', function(e){ tr.filePriorityClicked(e, this); });
+               $('#open_link').bind('click', function(e){ tr.openTorrentClicked(e); });
+               $('#upload_confirm_button').bind('click', function(e){ tr.confirmUploadClicked(e); return false;});
+               $('#upload_cancel_button').bind('click', function(e){ tr.cancelUploadClicked(e); return false; });
                if (iPhone) {
                        $('#inspector_close').bind('click', function(e){ tr.hideInspector(); });
                        $('#preferences_link').bind('click', function(e){ tr.releaseClutchPreferencesButton(e); });
                } else {
                        $(document).bind('keydown',  function(e){ tr.keyDown(e); });
                        $('#torrent_container').bind('click', function(e){ tr.deselectAll( true ); });
-                       $('#open_link').bind('click', function(e){ tr.openTorrentClicked(e); });
                        $('#filter_toggle_link').bind('click', function(e){ tr.toggleFilterClicked(e); });
                        $('#inspector_link').bind('click', function(e){ tr.toggleInspectorClicked(e); });
-                       $('#upload_confirm_button').bind('click', function(e){ tr.confirmUploadClicked(e); return false;});
-                       $('#upload_cancel_button').bind('click', function(e){ tr.cancelUploadClicked(e); return false; });
                
                        this.setupSearchBox();
                        this.createContextMenu();

diff --git a/web/stylesheets/iphone.css b/web/stylesheets/iphone.css
index 491133898462109df6774904e58fe8b307a941f5..971a5931e46f03b285bcf995ad82117aff17e91e 100644 (file)
--- a/web/stylesheets/iphone.css
+++ b/web/stylesheets/iphone.css
@@ -42,7 +42,10 @@ body.landscape div#dialog_container, body.landscape div#torrent_inspector {
        min-height: 143px;
 }
 
-body.inspector_showing #torrent_filter_bar, body.inspector_showing #torrent_container, body.dialog_showing #torrent_filter_bar, body.dialog_showing #torrent_container, body.dialog_showing #torrent_inspector, body.dialog_showing #prefs_container, body.prefs_showing #torrent_inspector, body.prefs_showing #torrent_filter_bar, body.prefs_showing #torrent_container {
+body.inspector_showing #torrent_filter_bar, body.inspector_showing #torrent_container,
+body.dialog_showing #torrent_filter_bar, body.dialog_showing #torrent_container, body.dialog_showing #torrent_inspector, body.dialog_showing #prefs_container,
+body.prefs_showing #torrent_inspector, body.prefs_showing #torrent_filter_bar, body.prefs_showing #torrent_container,
+body.open_showing #torrent_filter_bar, body.open_showing #torrent_container {
        display: none !important;
 }
 
@@ -81,7 +84,7 @@ div.torrent_global_menu ul li {
        display: inline-block;
 }
 
-li#remove {
+li#remove, li#open {
        float: left;
 }
 
@@ -106,10 +109,6 @@ div.torrent_global_menu ul li.disabled {
        opacity: 0.25;
 }
 
-div.torrent_global_menu ul li#open {
-       display: none;
-}
-
 div.torrent_global_menu ul li div div.toolbar_image {
        width: 32px;
        height: 32px;
@@ -178,7 +177,7 @@ div.torrent_global_details div#torrent_global_transfer {
        float: left;
 }
 
-div.torrent_global_details div#torrent_global_upload, 
+div.torrent_global_details div#torrent_global_upload,
 div.torrent_global_details div#torrent_global_download {
        float: right;
 }
@@ -394,6 +393,10 @@ div#dialog_message.dialog_message {
        padding-bottom: 0;
 }
 
+#torrent_upload_file, label[for="torrent_upload_file"]{
+  display:none;
+}
+
 h2.dialog_heading {
        text-align: center;
        width: 300px;
@@ -407,12 +410,11 @@ div.dialog_container a {
        background: #222;
        text-decoration: none;
        border: 2px solid white;
-       margin: 0 0 0;
+       margin: 5px 5px 0;
        font-weight: bold;
        -webkit-border-radius: 16px;
-       display: block;
+       display: inline-block;
        width: 90px;
-       position: absolute;
        font-size: 12px;
        text-align: center;
 }