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

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

Issue 2921533005: Settings: Network: Fix some spacing issues (Closed)
Patch Set: Rebase Created 3 years, 6 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
« no previous file with comments | « chrome/browser/resources/settings/internet_page/network_property_list.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 2
3 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> 3 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html ">
4 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> 4 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html">
5 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> 5 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html"> 6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html">
7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> 7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html">
8 <link rel="import" href="chrome://resources/html/assert.html"> 8 <link rel="import" href="chrome://resources/html/assert.html">
9 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> 9 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
10 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 10 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 } 45 }
46 46
47 #manualProxy { 47 #manualProxy {
48 @apply(--settings-list-frame-padding); 48 @apply(--settings-list-frame-padding);
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="list-frame"> 55 <div class="settings-box">
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="list-frame"> 67 <div class="settings-box">
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 indent" 77 <div class="settings-box continuation"
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 indent"> 89 <div class="settings-box continuation">
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 aria-label="$i18n{networkProxyConnectionType}"> 96 aria-label="$i18n{networkProxyConnectionType}">
97 <template is="dom-repeat" items="[[proxyTypes_]]"> 97 <template is="dom-repeat" items="[[proxyTypes_]]">
98 <option value="[[item]]">[[getProxyTypeDesc_(item)]]</option> 98 <option value="[[item]]">[[getProxyTypeDesc_(item)]]</option>
99 </template> 99 </template>
100 </select> 100 </select>
101 <span class="md-select-underline"></span> 101 <span class="md-select-underline"></span>
102 </div> 102 </div>
103 </div> 103 </div>
104 104
105 <!-- Autoconfiguration (PAC) --> 105 <!-- Autoconfiguration (PAC) -->
106 <div class="settings-box continuation indent" 106 <div class="settings-box continuation"
107 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.PAC)]]"> 107 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.PAC)]]">
108 <div>$i18n{networkProxyAutoConfig}</div> 108 <div>$i18n{networkProxyAutoConfig}</div>
109 <paper-input no-label-float class="middle" value="{{proxy_.PAC}}" 109 <paper-input no-label-float class="middle" value="{{proxy_.PAC}}"
110 disabled="[[!isEditable_('PAC', networkProperties, editable, 110 disabled="[[!isEditable_('PAC', networkProperties, editable,
111 useSharedProxies_)]]" 111 useSharedProxies_)]]"
112 on-change="onPACChange_"> 112 on-change="onPACChange_">
113 </paper-input> 113 </paper-input>
114 </div> 114 </div>
115 115
116 <!-- Web Proxy Auto Discovery (WPAD) --> 116 <!-- Web Proxy Auto Discovery (WPAD) -->
117 <div class="settings-box continuation indent" 117 <div class="settings-box continuation"
118 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.WPAD)]]"> 118 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.WPAD)]]">
119 <div>$i18n{networkSectionWpad}</div> 119 <div>$i18n{networkSectionWpad}</div>
120 <div class="middle">[[WPAD_]]</div> 120 <div class="middle">[[WPAD_]]</div>
121 </div> 121 </div>
122 122
123 <!-- Manual --> 123 <!-- Manual -->
124 <div class="settings-box continuation indent" 124 <div class="settings-box continuation"
125 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> 125 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]">
126 <div id="networkProxyToggleLabel" class="flex"> 126 <div id="networkProxyToggleLabel" class="flex">
127 $i18n{networkProxyUseSame} 127 $i18n{networkProxyUseSame}
128 </div> 128 </div>
129 <paper-toggle-button checked="{{useSameProxy_}}" 129 <paper-toggle-button checked="{{useSameProxy_}}"
130 disabled="[[!isEditable_('Type', networkProperties, editable, 130 disabled="[[!isEditable_('Type', networkProperties, editable,
131 useSharedProxies_)]]" 131 useSharedProxies_)]]"
132 aria-labelledby="networkProxyToggleLabel"> 132 aria-labelledby="networkProxyToggleLabel">
133 </paper-toggle-button> 133 </paper-toggle-button>
134 </div> 134 </div>
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 </paper-button> 215 </paper-button>
216 <paper-button class="action-button" 216 <paper-button class="action-button"
217 on-tap="onAllowSharedDialogConfirm_"> 217 on-tap="onAllowSharedDialogConfirm_">
218 $i18n{confirm} 218 $i18n{confirm}
219 </paper-button> 219 </paper-button>
220 </div> 220 </div>
221 </dialog> 221 </dialog>
222 </template> 222 </template>
223 <script src="network_proxy.js"></script> 223 <script src="network_proxy.js"></script>
224 </dom-module> 224 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/internet_page/network_property_list.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698