| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list.
html"> | 1 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list.
html"> |
| 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout-classes.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout-classes.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.html"> | 5 <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/paper-icon-button/paper
-icon-button-light.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> |
| 8 <link rel="import" href="../settings_shared_css.html"> | 8 <link rel="import" href="../settings_shared_css.html"> |
| 9 | 9 |
| 10 <dom-module id="settings-internet-subpage"> | 10 <dom-module id="settings-internet-subpage"> |
| 11 <template> | 11 <template> |
| 12 <style include="settings-shared iron-flex"> | 12 <style include="settings-shared iron-flex"> |
| 13 #networkListDiv { | 13 #networkListDiv { |
| 14 /* cr-network-list is padded to the right to allow space for a ripple */ | 14 /* cr-network-list is padded to the right to allow space for a ripple */ |
| 15 -webkit-padding-end: calc(var(--settings-box-row-padding) - | 15 -webkit-padding-end: calc(var(--settings-box-row-padding) - |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 } | 47 } |
| 48 </style> | 48 </style> |
| 49 | 49 |
| 50 <template is="dom-if" if="[[enableToggleIsVisible_(deviceState)]]"> | 50 <template is="dom-if" if="[[enableToggleIsVisible_(deviceState)]]"> |
| 51 <div class="settings-box first"> | 51 <div class="settings-box first"> |
| 52 <div id="onOff" class="start" on$="[[deviceIsEnabled_(deviceState)]]"> | 52 <div id="onOff" class="start" on$="[[deviceIsEnabled_(deviceState)]]"> |
| 53 [[getOffOnString_(deviceState, | 53 [[getOffOnString_(deviceState, |
| 54 '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]] | 54 '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]] |
| 55 </div> | 55 </div> |
| 56 <!-- The add button in this row is only shown for WiFi networks. --> | 56 <!-- The add button in this row is only shown for WiFi networks. --> |
| 57 <paper-icon-button id="addButton" icon="settings:add-wifi" | 57 <button is="paper-icon-button-light" id="addButton" |
| 58 hidden$="[[!showAddButton_(deviceState, globalPolicy)]]" | 58 hidden$="[[!showAddButton_(deviceState, globalPolicy)]]" |
| 59 aria-label="$i18n{internetAddWiFi}" | 59 aria-label="$i18n{internetAddWiFi}" |
| 60 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]"> | 60 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]"> |
| 61 </paper-icon-button> | 61 <iron-icon icon="settings:add-wifi"></iron-icon> |
| 62 </button> |
| 62 <paper-toggle-button id="deviceEnabledButton" | 63 <paper-toggle-button id="deviceEnabledButton" |
| 63 aria-label$="[[getToggleA11yString_(deviceState)]]" | 64 aria-label$="[[getToggleA11yString_(deviceState)]]" |
| 64 checked="[[deviceIsEnabled_(deviceState)]]" | 65 checked="[[deviceIsEnabled_(deviceState)]]" |
| 65 enabled="[[enableToggleIsEnabled_(deviceState)]]" | 66 enabled="[[enableToggleIsEnabled_(deviceState)]]" |
| 66 on-tap="onDeviceEnabledTap_"> | 67 on-tap="onDeviceEnabledTap_"> |
| 67 </paper-toggle-button> | 68 </paper-toggle-button> |
| 68 </div> | 69 </div> |
| 69 </template> | 70 </template> |
| 70 | 71 |
| 71 <template is="dom-if" if="[[knownNetworksIsVisible_(deviceState)]]"> | 72 <template is="dom-if" if="[[knownNetworksIsVisible_(deviceState)]]"> |
| 72 <div actionable class="settings-box" on-tap="onKnownNetworksTap_"> | 73 <div actionable class="settings-box" on-tap="onKnownNetworksTap_"> |
| 73 <div class="start">$i18n{knownNetworksButton}</div> | 74 <div class="start">$i18n{knownNetworksButton}</div> |
| 74 <button class="subpage-arrow" is="paper-icon-button-light" | 75 <button class="subpage-arrow" is="paper-icon-button-light" |
| 75 aria-label="$i18n{knownNetworksButton}"> | 76 aria-label="$i18n{knownNetworksButton}"> |
| 76 </button> | 77 </button> |
| 77 </div> | 78 </div> |
| 78 </template> | 79 </template> |
| 79 | 80 |
| 80 <template is="dom-if" if="[[deviceIsEnabled_(deviceState)]]"> | 81 <template is="dom-if" if="[[deviceIsEnabled_(deviceState)]]"> |
| 81 <div id="networkListDiv" class="layout vertical flex"> | 82 <div id="networkListDiv" class="layout vertical flex"> |
| 82 <!-- VPN only header for built-in VPNs. --> | 83 <!-- VPN only header for built-in VPNs. --> |
| 83 <div class="vpn-header layout horizontal center" | 84 <div class="vpn-header layout horizontal center" |
| 84 hidden$="[[!isEqual_('VPN', deviceState.Type)]]"> | 85 hidden$="[[!isEqual_('VPN', deviceState.Type)]]"> |
| 85 <div class="flex">$i18n{networkVpnBuiltin}</div> | 86 <div class="flex">$i18n{networkVpnBuiltin}</div> |
| 86 <paper-icon-button icon="settings:add-circle" | 87 <button is="paper-icon-button-light" |
| 87 aria-label="$i18n{internetAddVPN}" | 88 aria-label="$i18n{internetAddVPN}" |
| 88 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]"> | 89 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]"> |
| 89 </paper-icon-button> | 90 <iron-icon icon="settings:add-circle"></iron-icon> |
| 91 </button> |
| 90 </div> | 92 </div> |
| 91 | 93 |
| 92 <!-- List of networks or 'None'. --> | 94 <!-- List of networks or 'None'. --> |
| 93 <cr-network-list id="networkList" show-buttons | 95 <cr-network-list id="networkList" show-buttons |
| 94 hidden$="[[!networkStateList_.length]]" | 96 hidden$="[[!networkStateList_.length]]" |
| 95 networks="[[networkStateList_]]" | 97 networks="[[networkStateList_]]" |
| 96 on-selected="onNetworkSelected_"> | 98 on-selected="onNetworkSelected_"> |
| 97 </cr-network-list> | 99 </cr-network-list> |
| 98 <div hidden$="[[networkStateList_.length]]" class="no-networks"> | 100 <div hidden$="[[networkStateList_.length]]" class="no-networks"> |
| 99 $i18n{internetNoNetworks} | 101 $i18n{internetNoNetworks} |
| 100 </div> | 102 </div> |
| 101 | 103 |
| 102 <!-- Third party VPNs. --> | 104 <!-- Third party VPNs. --> |
| 103 <template is="dom-if" if="[[isEqual_('VPN', deviceState.Type)]]"> | 105 <template is="dom-if" if="[[isEqual_('VPN', deviceState.Type)]]"> |
| 104 <template is="dom-repeat" items="[[thirdPartyVpnProviders]]"> | 106 <template is="dom-repeat" items="[[thirdPartyVpnProviders]]"> |
| 105 <div id="[[item.ProviderName]]" | 107 <div id="[[item.ProviderName]]" |
| 106 class="vpn-header layout horizontal center"> | 108 class="vpn-header layout horizontal center"> |
| 107 <div class="flex">[[item.ProviderName]]</div> | 109 <div class="flex">[[item.ProviderName]]</div> |
| 108 <paper-icon-button icon="settings:add-circle" | 110 <button is="paper-icon-button-light" |
| 109 aria-label$="[[getAddThirdPartyVpnA11yString_(item)]]" | 111 aria-label$="[[getAddThirdPartyVpnA11yString_(item)]]" |
| 110 on-tap="onAddThirdPartyVpnTap_" tabindex$="[[tabindex]]"> | 112 on-tap="onAddThirdPartyVpnTap_" tabindex$="[[tabindex]]"> |
| 111 </paper-icon-button> | 113 <iron-icon icon="settings:add-circle"></iron-icon> |
| 114 </button> |
| 112 </div> | 115 </div> |
| 113 <cr-network-list show-buttons | 116 <cr-network-list show-buttons |
| 114 hidden$="[[!haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" | 117 hidden$="[[!haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" |
| 115 networks="[[getThirdPartyVpnNetworks_(thirdPartyVpns_, item)]]" | 118 networks="[[getThirdPartyVpnNetworks_(thirdPartyVpns_, item)]]" |
| 116 on-selected="onNetworkSelected_"> | 119 on-selected="onNetworkSelected_"> |
| 117 </cr-network-list> | 120 </cr-network-list> |
| 118 <div hidden$="[[haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" | 121 <div hidden$="[[haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" |
| 119 class="no-networks"> | 122 class="no-networks"> |
| 120 $i18n{internetNoNetworks} | 123 $i18n{internetNoNetworks} |
| 121 </div> | 124 </div> |
| 122 </template> | 125 </template> |
| 123 </template> | 126 </template> |
| 124 </div> | 127 </div> |
| 125 | 128 |
| 126 </template> | 129 </template> |
| 127 | 130 |
| 128 </template> | 131 </template> |
| 129 <script src="internet_subpage.js"></script> | 132 <script src="internet_subpage.js"></script> |
| 130 </dom-module> | 133 </dom-module> |
| OLD | NEW |