OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> |
2 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> | 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> |
3 <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 _behavior.html"> |
4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> |
5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
6 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 6 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
7 <link rel="import" href="chrome://resources/html/polymer.html"> | 7 <link rel="import" href="chrome://resources/html/polymer.html"> |
8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11 y-keys.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11 y-keys.html"> |
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input -container.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input -container.html"> |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
45 } | 45 } |
46 | 46 |
47 #exceptionsDiv network-proxy-exclusions { | 47 #exceptionsDiv network-proxy-exclusions { |
48 margin: 10px 0; | 48 margin: 10px 0; |
49 } | 49 } |
50 </style> | 50 </style> |
51 | 51 |
52 <!-- Policy indicator. Only one dom-if below will be shown. --> | 52 <!-- Policy indicator. Only one dom-if below will be shown. --> |
53 <template is="dom-if" | 53 <template is="dom-if" |
54 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> | 54 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> |
55 <div class="settings-box continuation single-column"> | 55 <div class="settings-box continuation single-column indent"> |
dschuyler
2017/03/20 19:11:31
Can "settings-box continuation single-column inden
stevenjb
2017/03/24 21:00:03
Done. It stretches the content, which is mostly go
| |
56 <div class="layout horizontal center"> | 56 <div class="layout horizontal center"> |
57 <cr-policy-network-indicator | 57 <cr-policy-network-indicator |
58 property="[[networkProperties.ProxySettings.Type]]" | 58 property="[[networkProperties.ProxySettings.Type]]" |
59 no-extension-indicator> | 59 no-extension-indicator> |
60 </cr-policy-network-indicator> | 60 </cr-policy-network-indicator> |
61 <div>$i18n{networkProxyEnforcedPolicy}</div> | 61 <div>$i18n{networkProxyEnforcedPolicy}</div> |
62 </div> | 62 </div> |
63 </div> | 63 </div> |
64 </template> | 64 </template> |
65 <template is="dom-if" | 65 <template is="dom-if" |
66 if="[[shouldShowExtensionIndicator_(networkProperties)]]"> | 66 if="[[shouldShowExtensionIndicator_(networkProperties)]]"> |
67 <div class="settings-box continuation single-column"> | 67 <div class="settings-box continuation single-column indent"> |
68 <extension-controlled-indicator | 68 <extension-controlled-indicator |
69 extension-id="[[prefs.proxy.extensionId]]" | 69 extension-id="[[prefs.proxy.extensionId]]" |
70 extension-name="[[prefs.proxy.controlledByName]]" | 70 extension-name="[[prefs.proxy.controlledByName]]" |
71 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]"> | 71 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]"> |
72 </extension-controlled-indicator> | 72 </extension-controlled-indicator> |
73 </div> | 73 </div> |
74 </template> | 74 </template> |
75 | 75 |
76 <!-- Allow shared proxies --> | 76 <!-- Allow shared proxies --> |
77 <div class="settings-box continuation" | 77 <div class="settings-box continuation indent" |
78 hidden$="[[!shouldShowAllowShared_( | 78 hidden$="[[!shouldShowAllowShared_( |
79 networkProperties.ProxySettings.Type)]]"> | 79 networkProperties.ProxySettings.Type)]]"> |
80 <settings-toggle-button id="allowShared" class="start" | 80 <settings-toggle-button id="allowShared" class="start" |
81 pref="{{prefs.settings.use_shared_proxies}}" | 81 pref="{{prefs.settings.use_shared_proxies}}" |
82 label="$i18n{networkProxyAllowShared}" | 82 label="$i18n{networkProxyAllowShared}" |
83 on-settings-boolean-control-change="onAllowSharedProxiesChange_" | 83 on-settings-boolean-control-change="onAllowSharedProxiesChange_" |
84 no-set-pref> | 84 no-set-pref> |
85 </settings-toggle-button> | 85 </settings-toggle-button> |
86 </div> | 86 </div> |
87 | 87 |
88 <!-- Proxy type dropdown --> | 88 <!-- Proxy type dropdown --> |
89 <div class="settings-box continuation"> | 89 <div class="settings-box continuation indent"> |
90 <div class="start">$i18n{networkProxyConnectionType}</div> | 90 <div class="start">$i18n{networkProxyConnectionType}</div> |
91 <div class="md-select-wrapper"> | 91 <div class="md-select-wrapper"> |
92 <select id="proxyType" class="md-select" on-change="onTypeChange_" | 92 <select id="proxyType" class="md-select" on-change="onTypeChange_" |
93 value="[[proxy_.Type]]" | 93 value="[[proxy_.Type]]" |
94 disabled="[[!isEditable_('Type', networkProperties, editable, | 94 disabled="[[!isEditable_('Type', networkProperties, editable, |
95 useSharedProxies_)]]"> | 95 useSharedProxies_)]]"> |
96 <template is="dom-repeat" items="[[proxyTypes_]]"> | 96 <template is="dom-repeat" items="[[proxyTypes_]]"> |
97 <option value="[[item]]">[[getProxyTypeDesc_(item)]]</option> | 97 <option value="[[item]]">[[getProxyTypeDesc_(item)]]</option> |
98 </template> | 98 </template> |
99 </select> | 99 </select> |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
214 </paper-button> | 214 </paper-button> |
215 <paper-button class="action-button" | 215 <paper-button class="action-button" |
216 on-tap="onAllowSharedDialogConfirm_"> | 216 on-tap="onAllowSharedDialogConfirm_"> |
217 $i18n{confirm} | 217 $i18n{confirm} |
218 </paper-button> | 218 </paper-button> |
219 </div> | 219 </div> |
220 </dialog> | 220 </dialog> |
221 </template> | 221 </template> |
222 <script src="network_proxy.js"></script> | 222 <script src="network_proxy.js"></script> |
223 </dom-module> | 223 </dom-module> |
OLD | NEW |