Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <div class="page" id="proxyPage" hidden> | 1 <div id="proxyPage" class="page" hidden> |
| 2 <h1 i18n-content="proxyPage"></h1> | 2 <h1 i18n-content="proxyPage"></h1> |
| 3 <section> | 3 <section> |
| 4 <h3 i18n-content="proxy_config_title"></h3> | 4 <h3 i18n-content="proxy_config_title"></h3> |
| 5 <div> | 5 <div> |
| 6 <div class="radio"> | 6 <div class="radio"> |
| 7 <label> | 7 <label> |
| 8 <input type="radio" id="directProxy" name="proxytype" | 8 <input id="directProxy" type="radio" name="proxytype" value="1" |
| 9 pref="cros.session.proxy.type" value="1"> | 9 pref="cros.session.proxy.type"> |
| 10 <span i18n-content="proxyDirectInternetConnection"></span> | 10 <span i18n-content="proxyDirectInternetConnection"></span> |
| 11 </label> | 11 </label> |
| 12 </div> | 12 </div> |
| 13 <div class="radio"> | 13 <div class="radio"> |
| 14 <label> | 14 <label> |
| 15 <input type="radio" id="manualProxy" name="proxytype" | 15 <input id="manualProxy" type="radio" name="proxytype" value="2" |
| 16 pref="cros.session.proxy.type" value="2"> | 16 pref="cros.session.proxy.type"> |
| 17 <span i18n-content="proxyManual"></span> | 17 <span i18n-content="proxyManual"></span> |
| 18 </label> | 18 </label> |
| 19 </div> | 19 </div> |
| 20 <div class="checkbox"> | 20 <div class="checkbox"> |
| 21 <label> | 21 <label> |
| 22 <input id="proxyAllProtocols" type="checkbox" | 22 <input id="proxyAllProtocols" type="checkbox" |
| 23 pref="cros.session.proxy.single"> | 23 pref="cros.session.proxy.single"> |
| 24 <span i18n-content="sameProxyProtocols"></span> | 24 <span i18n-content="sameProxyProtocols"></span> |
| 25 </label> | 25 </label> |
| 26 </div> | 26 </div> |
| 27 <div id="singleProxy"> | 27 <div id="singleProxy"> |
| 28 <table> | 28 <table> |
| 29 <tr><td><span | 29 <tr> |
| 30 i18n-content="httpProxy"></span> | 30 <td> |
| 31 <input id="proxyHostSingleName" type="text" size="30" pref="cros.sessi on.proxy.singlehttp" disabled> | 31 <span i18n-content="httpProxy"></span> |
| 32 </td><td> | 32 <input id="proxyHostSingleName" type="text" size="30" |
| 33 <span | 33 pref="cros.session.proxy.singlehttp" disabled> |
| 34 i18n-content="proxyPort"></span> | 34 </td> |
| 35 <input id="proxyHostSinglePort" type="text" dataType="number" size="5" pref="cros.session.proxy.singlehttpport" disabled> | 35 <td> |
| 36 </td></tr> | 36 <span i18n-content="proxyPort"></span> |
| 37 <input id="proxyHostSinglePort" type="text" dataType="number" size ="5" | |
| 38 pref="cros.session.proxy.singlehttpport" disabled> | |
| 39 </td> | |
| 40 </tr> | |
| 37 </table> | 41 </table> |
| 38 </div> | 42 </div> |
| 39 <div id="multiProxy"> | 43 <div id="multiProxy"> |
| 40 <table> | 44 <table> |
| 41 <tr> | 45 <tr> |
| 42 <td><span | 46 <td> |
| 43 i18n-content="httpProxy"></span></td><td> | 47 <span i18n-content="httpProxy"></span> |
| 44 <input id="proxyHostName" type="text" size="30" pref="cros.session.pro xy.httpurl" disabled> | 48 </td> |
| 45 </td><td> | 49 <td> |
| 46 <span | 50 <input id="proxyHostName" type="text" size="30" |
| 47 i18n-content="proxyPort"></span></td><td> | 51 pref="cros.session.proxy.httpurl" disabled> |
| 48 <input id="proxyHostPort" type="text" dataType="number" size="5" pref="c ros.session.proxy.httpport" disabled> | 52 </td> |
| 49 </td></tr> | 53 <td> |
| 50 <tr> | 54 <span i18n-content="proxyPort"></span></td><td> |
|
csilv
2011/05/25 00:21:00
Line wrap the </td> and <td> at the end of this li
James Hawkins
2011/05/25 00:27:25
Done.
| |
| 51 <td><span | 55 <input id="proxyHostPort" type="text" dataType="number" size="5" |
| 52 i18n-content="secureHttpProxy"></span></td><td> | 56 pref="cros.session.proxy.httpport" disabled> |
| 53 <input id="secureProxyHostName" type="text" size="30" pref="cros.session .proxy.httpsurl" disabled> | 57 </td> |
| 54 </td><td> | 58 </tr> |
| 55 <span | 59 <tr> |
| 56 i18n-content="proxyPort"></span></td><td> | 60 <td> |
| 57 <input id="secureProxyPort" type="text" dataType="number" size="5" pref= "cros.session.proxy.httpsport" disabled> | 61 <span i18n-content="secureHttpProxy"></span> |
| 58 </td></tr> | 62 </td> |
| 59 <tr> | 63 <td> |
| 60 <td><span | 64 <input id="secureProxyHostName" type="text" size="30" |
| 61 i18n-content="ftpProxy"></span></td><td> | 65 pref="cros.session.proxy.httpsurl" disabled> |
| 62 <input id="ftpProxy" type="text" size="30" pref="cros.session.proxy.ft purl" disabled> | 66 </td> |
| 63 </td><td> | 67 <td> |
| 64 <span | 68 <span i18n-content="proxyPort"></span> |
| 65 i18n-content="proxyPort"></span></td><td> | 69 </td> |
| 66 <input id="ftpProxyPort" type="text" dataType="number" size="5" pref=" cros.session.proxy.ftpport" disabled> | 70 <td> |
| 67 </td></tr> | 71 <input id="secureProxyPort" type="text" dataType="number" size="5" |
| 68 <tr> | 72 pref="cros.session.proxy.httpsport" disabled> |
| 69 <td><span | 73 </td> |
| 70 i18n-content="socksHost"></span></td><td> | 74 </tr> |
| 71 <input id="socksHost" type="text" size="30" pref="cros.session.proxy.s ocks" disabled> | 75 <tr> |
| 72 </td><td> | 76 <td> |
| 73 <span | 77 <span i18n-content="ftpProxy"></span> |
| 74 i18n-content="proxyPort"></span></td><td> | 78 </td> |
| 75 <input id="socksPort" type="text" dataType="number" size="5" pref="cro s.session.proxy.socksport" disabled> | 79 <td> |
| 76 </td></tr> | 80 <input id="ftpProxy" type="text" size="30" |
| 81 pref="cros.session.proxy.ftpurl" disabled> | |
| 82 </td> | |
| 83 <td> | |
| 84 <span i18n-content="proxyPort"></span></td><td> | |
|
csilv
2011/05/25 00:21:00
Line wrap the </td> and <td> at the end of this li
James Hawkins
2011/05/25 00:27:25
Done.
| |
| 85 <input id="ftpProxyPort" type="text" dataType="number" size="5" | |
| 86 pref="cros.session.proxy.ftpport" disabled> | |
| 87 </td> | |
| 88 </tr> | |
| 89 <tr> | |
| 90 <td> | |
| 91 <span i18n-content="socksHost"></span> | |
| 92 </td> | |
| 93 <td> | |
| 94 <input id="socksHost" type="text" size="30" | |
| 95 pref="cros.session.proxy.socks" disabled> | |
| 96 </td> | |
| 97 <td> | |
| 98 <span i18n-content="proxyPort"></span> | |
| 99 </td> | |
| 100 <td> | |
| 101 <input id="socksPort" type="text" dataType="number" size="5" | |
| 102 pref="cros.session.proxy.socksport" disabled> | |
| 103 </td> | |
| 104 </tr> | |
| 77 </table> | 105 </table> |
| 78 </div> | 106 </div> |
| 79 <div class="radio"> | 107 <div class="radio"> |
| 80 <label> | 108 <label> |
| 81 <input type="radio" id="autoProxy" name="proxytype" | 109 <input id="autoProxy" type="radio" name="proxytype" value="3" |
| 82 pref="cros.session.proxy.type" value="3"> | 110 pref="cros.session.proxy.type"> |
| 83 <span i18n-content="proxyAutomatic"></span> | 111 <span i18n-content="proxyAutomatic"></span> |
| 84 <label> | 112 <label> |
| 85 </div> | 113 </div> |
| 86 <div> | 114 <div> |
| 87 <label> | 115 <label> |
| 88 <span i18n-content="proxyConfigUrl"></span> | 116 <span i18n-content="proxyConfigUrl"></span> |
| 89 <input id="proxyConfig" type="url" size="60" | 117 <input id="proxyConfig" type="url" size="60" |
| 90 pref="cros.session.proxy.pacurl"> | 118 pref="cros.session.proxy.pacurl"> |
| 91 </label> | 119 </label> |
| 92 </div> | 120 </div> |
| 93 </div> | 121 </div> |
| 94 </section> | 122 </section> |
| 95 <section id="advancedConfig"> | 123 <section id="advancedConfig"> |
| 96 <h3 i18n-content="advanced_proxy_config"></h3> | 124 <h3 i18n-content="advanced_proxy_config"></h3> |
| 97 <div class="option"> | 125 <div class="option"> |
| 98 <div i18n-content="proxyBypass"></div> | 126 <div i18n-content="proxyBypass"></div> |
| 99 <list id="ignoredHostList"></list> | 127 <list id="ignoredHostList"></list> |
| 100 <input id="newHost" type="url" size="30"> | 128 <input id="newHost" type="url" size="30"> |
| 101 <button id="addHost" | 129 <button id="addHost" i18n-content="addHost"></button> |
| 102 i18n-content="addHost"></button> | 130 <button id="removeHost" i18n-content="removeHost"></button> |
| 103 <button id="removeHost" | |
| 104 i18n-content="removeHost"></button> | |
| 105 </div> | 131 </div> |
| 106 </section> | 132 </section> |
| 107 </div> | 133 </div> |
| OLD | NEW |