From 1f6d927bac8c953565b9809ecb1a270b84cfdf3b Mon Sep 17 00:00:00 2001
From: Jordan Lee <jordan@transmissionbt.com>
Date: Sat, 15 Oct 2011 01:33:16 +0000
Subject: [PATCH] (trunk web) #4568 "Web Client blank content area in Opera
 Internet Browser" -- fix HTML5 validation errors reported by
 validator.w3.org. This fixed the blank content area problem seen with Opera.

---
 web/index.html                    | 8 +++-----
 web/javascript/inspector.js       | 3 ++-
 web/style/transmission/common.css | 8 +++++++-
 3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/web/index.html b/web/index.html
index 728547915..2fcdd07bb 100755
--- a/web/index.html
+++ b/web/index.html
@@ -2,8 +2,6 @@
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="cache-control" content="Private" />
-		<meta http-equiv="X-UA-Compatible" content="IE=7,IE=8,IE=9"><!-- ticket #4555 -->
 		<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
 		<meta name="apple-mobile-web-app-capable" content="yes" />
 		<link href="./images/favicon.ico" rel="icon" />
@@ -56,7 +54,7 @@
 		</div>
 
 		<div id="statusbar">
-			<input type="search" id="torrent_search" placeholder="Filter" results="0" />
+			<input type="search" id="torrent_search" placeholder="Filter" />
 			<div id='filter-button'></div>
 			<div id='speed-info'>
 				<span id="speed-dn-label">0 B/s</span>
@@ -162,7 +160,7 @@
 				<div id="prefs-page-network">
 					<div class="prefs-section">
 						<div class="title">Listening Port</div>
-						<div class="row"><div class="key"><label for="peer-port">Peer listening port:</div>
+						<div class="row"><div class="key"><label for="peer-port">Peer listening port:</label></div>
 						                 <div class="value"><input type="text" class="numberinput" id="peer-port"/></div></div>
 						<div class="row"><div class="key">&nbsp;</div>
 						                 <div class="value"><span id="port-label">Status: Unknown</span></div></div>
@@ -360,7 +358,7 @@
 		<div class="dialog_container" id="upload_container" style="display:none;">
 			<div class="dialog_top_bar"></div>
 			<div class="dialog_window">
-				<div class="dialog_logo" id="dialog_logo"></div>
+				<div class="dialog_logo" id="upload_dialog_logo"></div>
 				<h2 class="dialog_heading">Upload Torrent Files</h2>
 				<form action="#" method="post" id="torrent_upload_form"
 					enctype="multipart/form-data" target="torrent_upload_frame">
diff --git a/web/javascript/inspector.js b/web/javascript/inspector.js
index f3a813314..2cd946718 100644
--- a/web/javascript/inspector.js
+++ b/web/javascript/inspector.js
@@ -310,7 +310,8 @@ function Inspector(controller) {
             for (i=0; peer=peers[i]; ++i) {
                 parity = (i%2) ? 'odd' : 'even';
                 html.push('<tr class="inspector_peer_entry ', parity, '">',
-                       '<td>', (peer.isEncrypted ? '<img src="images/graphics/lock_icon.png" alt="Encrypted"/>' : ''), '</td>',
+                       '<td>', (peer.isEncrypted ? '<span class="encrypted-peer-cell">'
+                                                 : '<span class="unencrypted-peer-cell">'), '</span>', '</td>',
                        '<td>', (peer.rateToPeer ? fmt.speedBps(peer.rateToPeer) : ''), '</td>',
                        '<td>', (peer.rateToClient ? fmt.speedBps(peer.rateToClient) : ''), '</td>',
                        '<td class="percentCol">', Math.floor(peer.progress*100), '%', '</td>',
diff --git a/web/style/transmission/common.css b/web/style/transmission/common.css
index 8e648809d..56df5045d 100644
--- a/web/style/transmission/common.css
+++ b/web/style/transmission/common.css
@@ -766,6 +766,12 @@ tr.inspector_peer_entry {
 
 }
 
+tr.inspector_peer_entry span.encrypted-peer-cell {
+	width: 16px;
+	height: 16px;
+	background: transparent url('images/lock_icon.png') no-repeat;
+}
+
 tr.inspector_peer_entry.odd {
 	background-color: #EEEEEE;
 }
@@ -1064,7 +1070,7 @@ div.dialog_container div.dialog_window {
 	}
 }
 
-div.dialog_container #dialog_logo {
+div.dialog_container .dialog_logo {
 	width: 64px;
 	height: 64px;
 	margin: 20px 20px 0 20px;
-- 
2.40.0

