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

Side by Side Diff: chrome/browser/resources/chromeos/login/oobe_welcome.html

Issue 2398383002: ChromeOS: Update Welcome screen material design OOBE. (Closed)
Patch Set: Update after review. Created 4 years, 2 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 <!-- Copyright 2016 The Chromium Authors. All rights reserved. 1 <!-- Copyright 2016 The Chromium Authors. All rights reserved.
2 Use of this source code is governed by a BSD-style license that can be 2 Use of this source code is governed by a BSD-style license that can be
3 found in the LICENSE file. --> 3 found in the LICENSE file. -->
4 4
5 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html"> 5 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html">
6 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_selec t.html"> 6 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_selec t.html">
7 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> 7 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i conset-svg.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i conset-svg.html">
11 11
12 <iron-iconset-svg name="oobe-welcome" size="24"> 12 <iron-iconset-svg name="oobe-welcome" size="24">
13 <svg> 13 <svg>
14 <defs> 14 <defs>
15 <g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path></g> 15 <g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path></g>
16 <g id="wifi"><path d="M1 9l2 2c4.97-4.97 13.03-4.97 18 0l2-2C16.93 2.93 7. 08 2.93 1 9zm8 8l3 3 3-3c-1.65-1.66-4.34-1.66-6 0zm-4-4l2 2c2.76-2.76 7.24-2.76 10 0l2-2C15.14 9.14 8.87 9.14 5 13z"></path></g> 16 <g id="wifi"><path d="M1 9l2 2c4.97-4.97 13.03-4.97 18 0l2-2C16.93 2.93 7. 08 2.93 1 9zm8 8l3 3 3-3c-1.65-1.66-4.34-1.66-6 0zm-4-4l2 2c2.76-2.76 7.24-2.76 10 0l2-2C15.14 9.14 8.87 9.14 5 13z"></path></g>
17 </defs> 17 </defs>
18 </svg> 18 </svg>
19 </iron-iconset-svg> 19 </iron-iconset-svg>
20 20
21 <dom-module name="oobe-welcome-md"> 21 <dom-module name="oobe-welcome-md">
22 <template> 22 <template>
23 <link rel="stylesheet" href="oobe_dialog_host.css"> 23 <link rel="stylesheet" href="oobe_dialog_host.css">
24 <link rel="stylesheet" href="oobe_welcome.css"> 24 <link rel="stylesheet" href="oobe_welcome.css">
25 <link rel="stylesheet" href="oobe_dialog_parameters.css"> 25 <link rel="stylesheet" href="oobe_dialog_parameters.css">
26 <oobe-dialog id="welcomeScreen" hidden="[[!welcomeScreenShown]]" 26 <oobe-welcome-dialog id="welcomeScreen" hidden="[[!welcomeScreenShown]]"
27 welcome-screen> 27 current-language="[[currentLanguage]]"
28 <div class="header layout vertical end-justified center"> 28 on-language-button-clicked="onWelcomeSelectLanguageButtonClicked_"
29 <h1 class="title" i18n-content="networkScreenGreeting"></h1> 29 on-accessibility-button-clicked="onWelcomeAccessibilityButtonClicked_"
30 </div> 30 on-next-button-clicked="onWelcomeNextButtonClicked_">
31 <div class="footer flex layout vertical center"> 31 </oobe-welcome-dialog>
32 <img id="welcomeIllustration" src="images/welcome_illustration_1x.png">
33 <oobe-text-button id="welcomeNextButton" inverse
34 on-tap="onWelcomeNextButtonClicked_"
35 i18n-content="welcomeNextButtonText">
36 </oobe-text-button>
37 <div id="welcomeButtons" class="flex horizontal layout justified">
38 <div class="layout vertical relative"
39 on-tap="onWelcomeSelectLanguageButtonClicked_">
40 <iron-icon icon="icons:language" class="action-icon">
41 </iron-icon>
42 <div class="buttonbox-text">[[currentLanguage]]</div>
43 </div>
44 <div class="action-icon-spacer"></div>
45 <div class="layout vertical relative"
46 on-tap="onWelcomeAccessibilityButtonClicked_">
47 <iron-icon icon="icons:accessibility" class="action-icon">
48 </iron-icon>
49 <div class="buttonbox-text" i18n-content="accessibilityLink"></div>
50 </div>
51 </div>
52 </div>
53 </oobe-dialog>
54 <oobe-dialog id="languageScreen" hidden="[[!languageSelectionScreenShown]]" 32 <oobe-dialog id="languageScreen" hidden="[[!languageSelectionScreenShown]]"
55 has-buttons> 33 has-buttons>
56 <iron-icon icon="icons:language" class="oobe-icon"></iron-icon> 34 <iron-icon icon="icons:language" class="oobe-icon"></iron-icon>
57 <div class="header"> 35 <div class="header">
58 <h1 class="title" i18n-content="languageSectionTitle"></h1> 36 <h1 class="title" i18n-content="languageSectionTitle"></h1>
59 </div> 37 </div>
60 <div class="footer layout vertical"> 38 <div class="footer layout vertical">
61 <template is="dom-if" if="[[enabled]]"> 39 <template is="dom-if" if="[[enabled]]">
62 <div id="languageDropdownContainer" 40 <div id="languageDropdownContainer"
63 class="flex layout horizontal justified language-selection-entry"> 41 class="flex layout horizontal justified language-selection-entry">
(...skipping 11 matching lines...) Expand all
75 i18n-content="keyboardDropdownTitle"> 53 i18n-content="keyboardDropdownTitle">
76 </div> 54 </div>
77 <oobe-i18n-dropdown id="keyboardSelect" items="[[keyboards]]" 55 <oobe-i18n-dropdown id="keyboardSelect" items="[[keyboards]]"
78 on-select-item="onKeyboardSelected_" 56 on-select-item="onKeyboardSelected_"
79 label="$i18n{keyboardDropdownTitle}"> 57 label="$i18n{keyboardDropdownTitle}">
80 </oobe-i18n-dropdown> 58 </oobe-i18n-dropdown>
81 </div> 59 </div>
82 </template> 60 </template>
83 </div> 61 </div>
84 <div class="bottom-buttons layout horizontal end-justified"> 62 <div class="bottom-buttons layout horizontal end-justified">
85 <oobe-text-button inverse on-tap="closeLanguageSection_" 63 <oobe-text-button inverse on-tap="closeLanguageSection_">
86 i18n-content="oobeOKButtonText"> 64 <div i18n-content="oobeOKButtonText"></div>
87 </oobe-text-button> 65 </oobe-text-button>
88 </div> 66 </div>
89 </oobe-dialog> 67 </oobe-dialog>
90 <oobe-dialog id="accessibilityScreen" 68 <oobe-dialog id="accessibilityScreen"
91 hidden="[[!accessibilityOptionsScreenShown]]" has-buttons> 69 hidden="[[!accessibilityOptionsScreenShown]]" has-buttons>
92 <iron-icon icon="icons:accessibility" class="oobe-icon"></iron-icon> 70 <iron-icon icon="icons:accessibility" class="oobe-icon"></iron-icon>
93 <div class="header"> 71 <div class="header">
94 <h1 class="title" i18n-content="accessibilitySectionTitle"></h1> 72 <h1 class="title" i18n-content="accessibilitySectionTitle"></h1>
95 <div class="subtitle" i18n-content="accessibilitySectionHint"></div> 73 <div class="subtitle" i18n-content="accessibilitySectionHint"></div>
96 </div> 74 </div>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 on-change="onA11yOptionChanged_" 113 on-change="onA11yOptionChanged_"
136 chrome-message="enableVirtualKeyboard"> 114 chrome-message="enableVirtualKeyboard">
137 <span class="title" i18n-content="virtualKeyboardOption"></span> 115 <span class="title" i18n-content="virtualKeyboardOption"></span>
138 <span class="checked-value" i18n-content="virtualKeyboardOptionOn"> 116 <span class="checked-value" i18n-content="virtualKeyboardOptionOn">
139 </span> 117 </span>
140 <span class="unchecked-value" i18n-content="virtualKeyboardOptionOff"> 118 <span class="unchecked-value" i18n-content="virtualKeyboardOptionOff">
141 </span> 119 </span>
142 </oobe-a11y-option> 120 </oobe-a11y-option>
143 </div> 121 </div>
144 <div class="bottom-buttons layout horizontal end-justified"> 122 <div class="bottom-buttons layout horizontal end-justified">
145 <oobe-text-button inverse on-tap="closeAccessibilitySection_" 123 <oobe-text-button inverse on-tap="closeAccessibilitySection_">
146 i18n-content="oobeOKButtonText"> 124 <div i18n-content="oobeOKButtonText"></div>
147 </oobe-text-button> 125 </oobe-text-button>
148 </div> 126 </div>
149 </oobe-dialog> 127 </oobe-dialog>
150 <oobe-dialog hidden="[[!networkSelectionScreenShown]]"> 128 <oobe-dialog hidden="[[!networkSelectionScreenShown]]">
151 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon> 129 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon>
152 <div class="header"> 130 <div class="header">
153 <h1 class="title" i18n-content="networkSectionTitle"></h1> 131 <h1 class="title" i18n-content="networkSectionTitle"></h1>
154 <div class="subtitle" i18n-content="networkSectionHint"></div> 132 <div class="subtitle" i18n-content="networkSectionHint"></div>
155 </div> 133 </div>
156 <div class="footer layout vertical"> 134 <div class="footer layout vertical">
157 <cr-network-select id="networkSelect" 135 <cr-network-select id="networkSelect"
158 on-network-connected="onNetworkConnected_" 136 on-network-connected="onNetworkConnected_"
159 on-network-item-selected="onNetworkListNetworkItemSelected_" 137 on-network-item-selected="onNetworkListNetworkItemSelected_"
160 on-custom-item-selected="onNetworkListCustomItemSelected_" 138 on-custom-item-selected="onNetworkListCustomItemSelected_"
161 custom-items="[[_getNetworkCustomItems()]]" 139 custom-items="[[_getNetworkCustomItems()]]"
162 max-height="385"> 140 max-height="385">
163 </cr-network-select> 141 </cr-network-select>
164 </div> 142 </div>
165 </oobe-dialog> 143 </oobe-dialog>
166 </template> 144 </template>
167 </dom-module> 145 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698