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

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

Powered by Google App Engine
This is Rietveld 408576698