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

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

Issue 2846763003: MD Settings: Network and bluetooth polish (Closed)
Patch Set: Add button for third party vpn Created 3 years, 7 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/cr_expand_button/cr_expa nd_button.html"> 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">
2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 2 <link rel="import" href="chrome://resources/cr_elements/icons.html">
3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
5 <link rel="import" href="chrome://resources/html/polymer.html"> 5 <link rel="import" href="chrome://resources/html/polymer.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
9 <link rel="import" href="../prefs/prefs.html"> 9 <link rel="import" href="../prefs/prefs.html">
10 <link rel="import" href="../route.html"> 10 <link rel="import" href="../route.html">
11 <link rel="import" href="../settings_page/settings_animated_pages.html"> 11 <link rel="import" href="../settings_page/settings_animated_pages.html">
12 <link rel="import" href="../settings_page/settings_subpage.html"> 12 <link rel="import" href="../settings_page/settings_subpage.html">
13 <link rel="import" href="../settings_shared_css.html"> 13 <link rel="import" href="../settings_shared_css.html">
14 <link rel="import" href="internet_detail_page.html"> 14 <link rel="import" href="internet_detail_page.html">
15 <link rel="import" href="internet_known_networks_page.html"> 15 <link rel="import" href="internet_known_networks_page.html">
16 <link rel="import" href="internet_subpage.html"> 16 <link rel="import" href="internet_subpage.html">
17 <link rel="import" href="network_summary.html"> 17 <link rel="import" href="network_summary.html">
18 18
19 <dom-module id="settings-internet-page"> 19 <dom-module id="settings-internet-page">
20 <template> 20 <template>
21 <style include="settings-shared"> 21 <style include="settings-shared">
22 div.add-no-icon {
23 -webkit-margin-start: 36px
24 }
25
26 iron-icon { 22 iron-icon {
27 -webkit-margin-end: 12px; 23 -webkit-margin-end: 12px;
28 -webkit-margin-start: 4px; 24 -webkit-margin-start: 4px;
29 height: 24px; 25 height: 24px;
30 width: 24px; 26 width: 24px;
31 } 27 }
32 </style> 28 </style>
33 <settings-animated-pages id="pages" section="internet" 29 <settings-animated-pages id="pages" section="internet"
34 focus-config="[[focusConfig_]]"> 30 focus-config="[[focusConfig_]]">
35 <neon-animatable route-path="default"> 31 <neon-animatable route-path="default">
36 <network-summary default-network="{{defaultNetwork}}" 32 <network-summary default-network="{{defaultNetwork}}"
37 device-states="{{deviceStates}}" 33 device-states="{{deviceStates}}"
38 networking-private="[[networkingPrivate]]"> 34 networking-private="[[networkingPrivate]]">
39 </network-summary> 35 </network-summary>
40 <template is="dom-if" if="[[allowAddConnection_(globalPolicy_)]]"> 36 <template is="dom-if" if="[[allowAddConnection_(globalPolicy_)]]">
41 <div actionable class="settings-box two-line" 37 <div actionable class="settings-box two-line"
42 on-tap="onExpandAddConnectionsTap_"> 38 on-tap="onExpandAddConnectionsTap_">
43 <div class="start layout horizontal center"> 39 <div class="start layout horizontal center">
44 <div>$i18n{internetAddConnection}</div> 40 <div>$i18n{internetAddConnection}</div>
45 </div> 41 </div>
46 <cr-expand-button alt="$i18n{internetAddConnectionExpandA11yLabel}" 42 <cr-expand-button alt="$i18n{internetAddConnectionExpandA11yLabel}"
47 id="expandAddConnections" expanded="{{addConnectionExpanded_}}"> 43 id="expandAddConnections" expanded="{{addConnectionExpanded_}}">
48 </cr-expand-button> 44 </cr-expand-button>
49 </div> 45 </div>
50 <template is="dom-if" if="[[addConnectionExpanded_]]"> 46 <template is="dom-if" if="[[addConnectionExpanded_]]">
51 <template is="dom-if" if="[[deviceIsEnabled_(deviceStates.WiFi)]]"> 47 <div class="list-frame vertical-list">
52 <div actionable class="settings-box continuation center" 48 <template is="dom-if"
53 on-tap="onAddWiFiTap_"> 49 if="[[deviceIsEnabled_(deviceStates.WiFi)]]">
54 <div class="start add-no-icon">$i18n{internetAddWiFi}</div> 50 <div actionable class="list-item" on-tap="onAddWiFiTap_">
51 <div class="start">$i18n{internetAddWiFi}</div>
52 <button class="icon-external" is="paper-icon-button-light"
53 aria-label="$i18n{internetAddWiFi}">
54 </button>
55 </div>
56 </template>
57 <div actionable class="list-item" on-tap="onAddVPNTap_">
58 <div class="start">$i18n{internetAddVPN}</div>
55 <button class="icon-external" is="paper-icon-button-light" 59 <button class="icon-external" is="paper-icon-button-light"
56 aria-label="$i18n{internetAddWiFi}"> 60 aria-label="$i18n{internetAddVPN}">
57 </button> 61 </button>
58 </div> 62 </div>
59 </template> 63 <template is="dom-repeat" items="[[thirdPartyVpnProviders_]]">
60 <div actionable class="settings-box continuation center" 64 <div actionable class="list-item"
61 on-tap="onAddVPNTap_"> 65 on-tap="onAddThirdPartyVpnTap_" provider="[[item]]">
62 <div class="start add-no-icon">$i18n{internetAddVPN}</div> 66 <div class="start">[[getAddThirdParrtyVpnLabel_(item)]]</div>
63 <button class="icon-external" is="paper-icon-button-light" 67 <button class="icon-external" is="paper-icon-button-light"
64 aria-label="$i18n{internetAddVPN}"> 68 aria-label$="[[getAddThirdParrtyVpnLabel_(item)]]">
65 </button> 69 </button>
70 </div>
71 </template>
66 </div> 72 </div>
67 <template is="dom-repeat" items="[[thirdPartyVpnProviders_]]">
68 <div actionable class="settings-box continuation center"
69 on-tap="onAddThirdPartyVpnTap_" provider="[[item]]">
70 <div class="start add-no-icon">
71 [[getAddThirdParrtyVpnLabel_(item)]]
72 </div>
73 </div>
74 </template>
75 </template> 73 </template>
76 </template> 74 </template>
77 <template is="dom-if" if="[[!allowAddConnection_(globalPolicy_)]]"> 75 <template is="dom-if" if="[[!allowAddConnection_(globalPolicy_)]]">
78 <div class="settings-box"> 76 <div class="settings-box">
79 <iron-icon class="policy" icon="cr20:domain"></iron-icon> 77 <iron-icon class="policy" icon="cr20:domain"></iron-icon>
80 <div>$i18n{internetAddConnectionNotAllowed}</div> 78 <div>$i18n{internetAddConnectionNotAllowed}</div>
81 </div> 79 </div>
82 </template> 80 </template>
83 </neon-animatable> 81 </neon-animatable>
84 82
(...skipping 27 matching lines...) Expand all
112 networking-private="[[networkingPrivate]]" 110 networking-private="[[networkingPrivate]]"
113 show-spinner="{{showSpinner_}}"> 111 show-spinner="{{showSpinner_}}">
114 </settings-bluetooth-subpage> 112 </settings-bluetooth-subpage>
115 </settings-subpage> 113 </settings-subpage>
116 </template> 114 </template>
117 115
118 </settings-animated-pages> 116 </settings-animated-pages>
119 </template> 117 </template>
120 <script src="internet_page.js"></script> 118 <script src="internet_page.js"></script>
121 </dom-module> 119 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698