Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Side by Side Diff: chrome/browser/resources/settings/internet_page/network_proxy.html

Issue 2273093002: Settings: Internet: I18N (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html">
3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html">
1 <link rel="import" href="chrome://resources/html/polymer.html"> 4 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu-light.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu-light.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input -container.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input -container.html">
7 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
8 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html">
9 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html">
10 <link rel="import" href="internet_shared_css.html"> 10 <link rel="import" href="internet_shared_css.html">
11 <link rel="import" href="network_property_list.html"> 11 <link rel="import" href="network_property_list.html">
12 <link rel="import" href="network_proxy_exclusions.html">
12 <link rel="import" href="network_proxy_input.html"> 13 <link rel="import" href="network_proxy_input.html">
13 <link rel="import" href="network_proxy_exclusions.html">
14 14
15 <dom-module id="network-proxy"> 15 <dom-module id="network-proxy">
16 <template> 16 <template>
17 <style include="internet-shared"> 17 <style include="internet-shared">
18 cr-policy-network-indicator { 18 cr-policy-network-indicator {
19 -webkit-margin-end: 10px; 19 -webkit-margin-end: 10px;
20 } 20 }
21 21
22 network-proxy-input { 22 network-proxy-input {
23 margin-bottom: 10px; 23 margin-bottom: 10px;
24 } 24 }
25 25
26 #proxyDiv paper-checkbox {
27 padding: 10px 0;
28 }
29
30 #exceptionsDiv { 26 #exceptionsDiv {
31 padding: 10px 0; 27 padding: 10px 0;
32 } 28 }
33 29
34 #exceptionsDiv network-proxy-exclusions { 30 #exceptionsDiv network-proxy-exclusions {
35 margin: 10px 0; 31 margin: 10px 0;
36 } 32 }
33
34 #proxyDiv paper-checkbox {
35 padding: 10px 0;
36 }
37 </style> 37 </style>
38 <!-- Policy indicator --> 38 <!-- Policy indicator -->
39 <div class="settings-box first single-column" 39 <div class="settings-box first single-column"
40 hidden$="[[!isNetworkPolicyControlled( 40 hidden$="[[!isNetworkPolicyControlled(
41 networkProperties.ProxySettings.Type)]]"> 41 networkProperties.ProxySettings.Type)]]">
42 <div class="layout horizontal center"> 42 <div class="layout horizontal center">
43 <cr-policy-network-indicator 43 <cr-policy-network-indicator
44 property="[[networkProperties.ProxySettings.Type]]"> 44 property="[[networkProperties.ProxySettings.Type]]">
45 </cr-policy-network-indicator> 45 </cr-policy-network-indicator>
46 <div>This proxy is enforced by your administrator.</div> 46 <div>$i18n{networkProxyEnforced}</div>
47 </div> 47 </div>
48 </div> 48 </div>
49 49
50 <!-- Proxy type dropdown --> 50 <!-- Proxy type dropdown -->
51 <div class="settings-box continuation"> 51 <div class="settings-box continuation">
52 <div class="start">Connection type</div> 52 <div class="start">$i18n{networkProxyConnectionType}</div>
53 <paper-dropdown-menu-light vertical-align="auto" no-label-float> 53 <paper-dropdown-menu-light vertical-align="auto" no-label-float>
54 <paper-listbox class="dropdown-content" on-iron-activate="onTypeChange_" 54 <paper-listbox class="dropdown-content" on-iron-activate="onTypeChange_"
55 selected="[[proxy.Type]]" attr-for-selected="value"> 55 selected="[[proxy.Type]]" attr-for-selected="value">
56 <template is="dom-repeat" items="[[proxyTypes_]]"> 56 <template is="dom-repeat" items="[[proxyTypes_]]">
57 <button class="dropdown-item" role="option" value="[[item]]"> 57 <button class="dropdown-item" role="option" value="[[item]]">
58 [[proxyTypeDesc_(item)]] 58 [[proxyTypeDesc_(item)]]
59 </button> 59 </button>
60 </template> 60 </template>
61 </paper-listbox> 61 </paper-listbox>
62 </paper-dropdown-menu-light> 62 </paper-dropdown-menu-light>
63 </div> 63 </div>
64 64
65 <!-- Autoconfiguration (PAC) --> 65 <!-- Autoconfiguration (PAC) -->
66 <div class="settings-box continuation indented" 66 <div class="settings-box continuation indented"
67 hidden$="[[!matches_(proxy.Type, ProxySettingsType.PAC)]]"> 67 hidden$="[[!matches_(proxy.Type, ProxySettingsType.PAC)]]">
68 <div class="start">Autoconfiguration URL:</div> 68 <div class="start">$i18n{networkProxyAutoConfig}</div>
69 <paper-input no-label-float class="flex" value="{{proxy.PAC}}" 69 <paper-input no-label-float class="flex" value="{{proxy.PAC}}"
70 disabled="[[isNetworkPolicyEnforced( 70 disabled="[[isNetworkPolicyEnforced(
71 networkProperties.ProxySettings.PAC)]]" 71 networkProperties.ProxySettings.PAC)]]"
72 on-blur="onProxyInputChange_"> 72 on-blur="onProxyInputChange_">
73 </paper-input> 73 </paper-input>
74 </div> 74 </div>
75 75
76 <!-- Web Proxy Auto Discovery (WPAD) --> 76 <!-- Web Proxy Auto Discovery (WPAD) -->
77 <div class="settings-box continuation indented" 77 <div class="settings-box continuation indented"
78 hidden$="[[!matches_(proxy.Type, ProxySettingsType.WPAD)]]"> 78 hidden$="[[!matches_(proxy.Type, ProxySettingsType.WPAD)]]">
79 <div class="start">Web Proxy Auto Discovery URL:</div> 79 <div class="start">$i18n{networkSectionWpad}</div>
80 <div>[[WPAD]]</div> 80 <div>[[WPAD]]</div>
81 </div> 81 </div>
82 82
83 <!-- Manual --> 83 <!-- Manual -->
84 <div id="proxyDiv" class="settings-box continuation single-column indented" 84 <div id="proxyDiv" class="settings-box continuation single-column indented"
85 hidden$="[[!matches_(proxy.Type, ProxySettingsType.MANUAL)]]"> 85 hidden$="[[!matches_(proxy.Type, ProxySettingsType.MANUAL)]]">
86 <paper-checkbox checked="{{useSameProxy}}"> 86 <paper-checkbox checked="{{useSameProxy}}">
87 Use the same proxy for all protocols 87 $i18n{networkProxyUseSame}
88 </paper-checkbox> 88 </paper-checkbox>
89 <div hidden$="[[!useSameProxy]]" class="layout vertical"> 89 <div hidden$="[[!useSameProxy]]" class="layout vertical">
90 <network-proxy-input on-proxy-change="onProxyInputChange_" 90 <network-proxy-input
91 on-proxy-change="onProxyInputChange_"
91 editable="[[isPropertyEditable_(editable, networkProperties, 92 editable="[[isPropertyEditable_(editable, networkProperties,
92 'ProxySettings.Manual.HTTPProxy')]]" 93 'ProxySettings.Manual.HTTPProxy')]]"
93 value="{{proxy.Manual.HTTPProxy}}" label="Proxy"> 94 value="{{proxy.Manual.HTTPProxy}}"
95 label="$i18n{networkProxy}">
94 </network-proxy-input> 96 </network-proxy-input>
95 </div> 97 </div>
96 <div hidden$="[[useSameProxy]]" class="layout vertical"> 98 <div hidden$="[[useSameProxy]]" class="layout vertical">
97 <network-proxy-input on-proxy-change="onProxyInputChange_" 99 <network-proxy-input
100 on-proxy-change="onProxyInputChange_"
98 editable="[[isPropertyEditable_(editable, networkProperties, 101 editable="[[isPropertyEditable_(editable, networkProperties,
99 'ProxySettings.Manual.HTTPProxy)')]]" 102 'ProxySettings.Manual.HTTPProxy)')]]"
100 value="{{proxy.Manual.HTTPProxy}}" label="HTTP Proxy"> 103 value="{{proxy.Manual.HTTPProxy}}"
104 label="$i18n{networkProxyHttp}">
101 </network-proxy-input> 105 </network-proxy-input>
102 <network-proxy-input 106 <network-proxy-input
107 on-proxy-change="onProxyInputChange_"
103 editable="[[isPropertyEditable_(editable, networkProperties, 108 editable="[[isPropertyEditable_(editable, networkProperties,
104 'ProxySettings.Manual.SecureHTTPProxy)')]]" 109 'ProxySettings.Manual.SecureHTTPProxy)')]]"
105 value="{{proxy.Manual.SecureHTTPProxy}}" 110 value="{{proxy.Manual.SecureHTTPProxy}}"
106 label="Secure HTTP Proxy" on-proxy-change="onProxyInputChange_"> 111 label="$i18n{networkProxyShttp}">
107 </network-proxy-input> 112 </network-proxy-input>
108 <network-proxy-input on-proxy-change="onProxyInputChange_" 113 <network-proxy-input
114 on-proxy-change="onProxyInputChange_"
109 editable="[[isPropertyEditable_(editable, networkProperties, 115 editable="[[isPropertyEditable_(editable, networkProperties,
110 'ProxySettings.Manual.FTPProxy)')]]" 116 'ProxySettings.Manual.FTPProxy)')]]"
111 value="{{proxy.Manual.FTPProxy}}" label="FTP Proxy"> 117 value="{{proxy.Manual.FTPProxy}}"
118 label="$i18n{networkProxyFtp}">
112 </network-proxy-input> 119 </network-proxy-input>
113 <network-proxy-input on-proxy-change="onProxyInputChange_" 120 <network-proxy-input
121 on-proxy-change="onProxyInputChange_"
114 editable="[[isPropertyEditable_(editable, networkProperties, 122 editable="[[isPropertyEditable_(editable, networkProperties,
115 'ProxySettings.Manual.SOCKS)')]]" 123 'ProxySettings.Manual.SOCKS)')]]"
116 value="{{proxy.Manual.SOCKS}}" label="SOCKS host"> 124 value="{{proxy.Manual.SOCKS}}"
125 label="$i18n{networkProxySocks}">
117 </network-proxy-input> 126 </network-proxy-input>
118 </div> 127 </div>
119 128
120 <div id="exceptionsDiv"> 129 <div id="exceptionsDiv">
121 <div>Do not use the proxy settings for these hosts and domains:</div> 130 <div>$i18n{networkProxyExceptionList}</div>
122 <network-proxy-exclusions on-proxy-change="onProxyExclusionsChange_" 131 <network-proxy-exclusions on-proxy-change="onProxyExclusionsChange_"
123 exclusions="{{proxy.ExcludeDomains}}"> 132 exclusions="{{proxy.ExcludeDomains}}">
124 </network-proxy-exclusions> 133 </network-proxy-exclusions>
125 <div class="layout horizontal"> 134 <div class="layout horizontal">
126 <paper-input-container no-label-float class="flex"> 135 <paper-input-container no-label-float class="flex">
127 <input id="proxyExclusion" is="iron-input"> 136 <input id="proxyExclusion" is="iron-input">
128 </paper-input-container> 137 </paper-input-container>
129 <paper-button on-tap="onAddProxyExclusionTap_"> 138 <paper-button on-tap="onAddProxyExclusionTap_">
130 Add Exception 139 $i18n{networkProxyAddException}
131 </paper-button> 140 </paper-button>
132 </div> 141 </div>
133 </div> 142 </div>
134 </div> 143 </div>
135 </template> 144 </template>
136 <script src="network_proxy.js"></script> 145 <script src="network_proxy.js"></script>
137 </dom-module> 146 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698