Skip to content

GitLab

T
tangled
Commit 98dd6a21 authored by dconnelly@chromium.org's avatar dconnelly@chromium.org
Browse files
Options

Extract common HTML from oobe.html/login.html. 

By the way, using grit as a template engine is painfully awkward :(

BUG=232048

Review URL: https://chromiumcodereview.appspot.com/13881017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195155 0039d316-1c4b-4281-b951-d872f2087c98
parent 4c459f7a
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 149 deletions
chrome/browser/resources/chromeos/login/display_manager.js
View file @ 98dd6a21
......@@ -277,7 +277,8 @@ cr.define('cr.ui.login', function() {
}
} else {
// First screen on OOBE launch.
if (innerContainer.classList.contains('down')) {
if (document.body.classList.contains('oobe-display') &&
innerContainer.classList.contains('down')) {
innerContainer.classList.remove('down');
innerContainer.addEventListener(
'webkitTransitionEnd', function f(e) {
......
chrome/browser/resources/chromeos/login/login.html
View file @ 98dd6a21
......@@ -2,79 +2,11 @@
<html i18n-values="dir:textdirection;screen:screenType;lockanimations:lockAnimationsType;build:buildType">
<head>
<title i18n-content="title"></title>
<link rel="stylesheet" href="chrome://resources/css/butter_bar.css">
<link rel="stylesheet" href="chrome://resources/css/dialogs.css">
<link rel="stylesheet" href="chrome://resources/css/list.css">
<link rel="stylesheet" href="chrome://resources/css/menu_button.css">
<link rel="stylesheet" href="chrome://resources/css/menu.css">
<link rel="stylesheet" href="chrome://resources/css/spinner.css">
<link rel="stylesheet" href="chrome://resources/css/widgets.css">
<link rel="stylesheet" href="apps_menu.css">
<link rel="stylesheet" href="bubble.css">
<link rel="stylesheet" href="enterprise_info.css">
<link rel="stylesheet" href="header_bar.css">
<link rel="stylesheet" href="network_dropdown.css">
<link rel="stylesheet" href="oobe.css">
<link rel="stylesheet" href="screen_account_picker.css">
<link rel="stylesheet" href="screen_gaia_signin.css">
<link rel="stylesheet" href="screen_error_message.css">
<link rel="stylesheet" href="screen_tpm_error.css">
<link rel="stylesheet" href="screen_password_changed.css">
<link rel="stylesheet" href="screen_wrong_hwid.css">
<link rel="stylesheet" href="screen_locally_managed_user_creation.css">
<link rel="stylesheet" href="oobe_screen_terms_of_service.css">
<link rel="stylesheet" href="user_pod_row.css">
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/event_tracker.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script>
<script src="chrome://resources/js/cr/ui.js"></script>
<script src="chrome://resources/js/cr/ui/touch_handler.js"></script>
<script src="chrome://resources/js/cr/ui/array_data_model.js"></script>
<script src="chrome://resources/js/cr/ui/dialogs.js"></script>
<script src="chrome://resources/js/cr/ui/list_selection_controller.js"></script>
<script src="chrome://resources/js/cr/ui/list_selection_model.js"></script>
<script src="chrome://resources/js/cr/ui/list_single_selection_model.js"></script>
<script src="chrome://resources/js/cr/ui/list_item.js"></script>
<script src="chrome://resources/js/cr/ui/list.js"></script>
<script src="chrome://resources/js/cr/ui/grid.js"></script>
<script src="chrome://resources/js/cr/ui/position_util.js"></script>
<script src="chrome://resources/js/cr/ui/menu_item.js"></script>
<script src="chrome://resources/js/cr/ui/menu.js"></script>
<script src="chrome://resources/js/cr/ui/menu_button.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="chrome://oobe/strings.js"></script>
<include src="login_resources.html">
<script src="chrome://oobe/login.js"></script>
</head>
<body class="login-display" i18n-values=".style.fontFamily:fontfamily;">
<div id="background" class="background-initial"></div>
<include src="version.html">
<div id="outer-container">
<div id="oobe" class="faded">
<div id="inner-container">
<div id="step-logo" hidden>
<img src="chrome://theme/IDR_PRODUCT_LOGO" alt="">
<div id="header-sections">
</div>
</div>
<include src="oobe_screen_oauth_enrollment.html">
<include src="oobe_screen_user_image.html">
<include src="screen_gaia_signin.html">
<include src="screen_account_picker.html">
<include src="screen_error_message.html">
<include src="screen_tpm_error.html">
<include src="screen_password_changed.html">
<include src="screen_locally_managed_user_creation.html">
<include src="oobe_screen_reset.html">
<include src="oobe_screen_terms_of_service.html">
<include src="screen_wrong_hwid.html">
</div>
<div id="progress-dots"></div>
</div>
</div>
<div id="bubble" class="bubble faded" hidden></div>
<include src="header_bar.html">
<include src="user_pod_template.html">
<include src="login_screen_container.html">
<script src="chrome://resources/js/i18n_template2.js"></script>
</body>
</html>
chrome/browser/resources/chromeos/login/login_resources.html 0 → 100644
View file @ 98dd6a21
<link rel="stylesheet" href="chrome://resources/css/butter_bar.css">
<link rel="stylesheet" href="chrome://resources/css/dialogs.css">
<link rel="stylesheet" href="chrome://resources/css/list.css">
<link rel="stylesheet" href="chrome://resources/css/menu_button.css">
<link rel="stylesheet" href="chrome://resources/css/menu.css">
<link rel="stylesheet" href="chrome://resources/css/spinner.css">
<link rel="stylesheet" href="chrome://resources/css/widgets.css">
<link rel="stylesheet" href="apps_menu.css">
<link rel="stylesheet" href="bubble.css">
<link rel="stylesheet" href="enterprise_info.css">
<link rel="stylesheet" href="header_bar.css">
<link rel="stylesheet" href="network_dropdown.css">
<link rel="stylesheet" href="oobe.css">
<link rel="stylesheet" href="screen_account_picker.css">
<link rel="stylesheet" href="screen_gaia_signin.css">
<link rel="stylesheet" href="screen_error_message.css">
<link rel="stylesheet" href="screen_tpm_error.css">
<link rel="stylesheet" href="screen_password_changed.css">
<link rel="stylesheet" href="screen_wrong_hwid.css">
<link rel="stylesheet" href="screen_locally_managed_user_creation.css">
<link rel="stylesheet" href="oobe_screen_terms_of_service.css">
<link rel="stylesheet" href="user_pod_row.css">
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/event_tracker.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script>
<script src="chrome://resources/js/cr/ui.js"></script>
<script src="chrome://resources/js/cr/ui/touch_handler.js"></script>
<script src="chrome://resources/js/cr/ui/array_data_model.js"></script>
<script src="chrome://resources/js/cr/ui/dialogs.js"></script>
<script src="chrome://resources/js/cr/ui/list_selection_controller.js"></script>
<script src="chrome://resources/js/cr/ui/list_selection_model.js"></script>
<script src="chrome://resources/js/cr/ui/list_single_selection_model.js"></script>
<script src="chrome://resources/js/cr/ui/list_item.js"></script>
<script src="chrome://resources/js/cr/ui/list.js"></script>
<script src="chrome://resources/js/cr/ui/grid.js"></script>
<script src="chrome://resources/js/cr/ui/position_util.js"></script>
<script src="chrome://resources/js/cr/ui/menu_item.js"></script>
<script src="chrome://resources/js/cr/ui/menu.js"></script>
<script src="chrome://resources/js/cr/ui/menu_button.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="chrome://oobe/strings.js"></script>
chrome/browser/resources/chromeos/login/login_screen_container.html 0 → 100644
View file @ 98dd6a21
<div id="background" class="background-initial"></div>
<include src="version.html">
<div id="outer-container">
<div id="oobe" class="faded">
<div id="inner-container" class="down">
<div id="step-logo" hidden>
<img src="chrome://theme/IDR_PRODUCT_LOGO" alt>
<div id="header-sections">
</div>
</div>
<include src="login_screens.html">
</div>
<div id="progress-dots" class="down"></div>
</div>
</div>
<div id="bubble" class="bubble faded" hidden></div>
<include src="header_bar.html">
<include src="user_pod_template.html">
chrome/browser/resources/chromeos/login/login_screens.html 0 → 100644
View file @ 98dd6a21
<include src="oobe_screen_oauth_enrollment.html">
<include src="oobe_screen_reset.html">
<include src="oobe_screen_terms_of_service.html">
<include src="oobe_screen_user_image.html">
<include src="screen_account_picker.html">
<include src="screen_error_message.html">
<include src="screen_gaia_signin.html">
<include src="screen_locally_managed_user_creation.html">
<include src="screen_password_changed.html">
<include src="screen_tpm_error.html">
<include src="screen_wrong_hwid.html">
chrome/browser/resources/chromeos/login/oobe.css
View file @ 98dd6a21
......@@ -117,11 +117,11 @@ button:not(.custom-appearance) {
}
/* Only play this animation when 'down' class is removed. */
#inner-container:not(.down) {
.oobe-display #inner-container:not(.down) {
-webkit-transition: -webkit-transform 200ms ease-in-out;
}
#inner-container.down {
.oobe-display #inner-container.down {
-webkit-transform: translateY(50px) rotateX(-2.5deg);
}
......@@ -231,7 +231,7 @@ html[build=chromium] #header-sections {
}
/* Hidden for the duration of initial transition. */
#progress-dots.down {
.oobe-display #progress-dots.down {
visibility: hidden;
}
......
chrome/browser/resources/chromeos/login/oobe.html
View file @ 98dd6a21
......@@ -2,80 +2,13 @@
<html i18n-values="dir:textdirection;screen:screenType;lockanimations:lockAnimationsType;build:buildType">
<head>
<title i18n-content="title"></title>
<link rel="stylesheet" href="chrome://resources/css/butter_bar.css">
<link rel="stylesheet" href="chrome://resources/css/dialogs.css">
<link rel="stylesheet" href="chrome://resources/css/list.css">
<link rel="stylesheet" href="chrome://resources/css/menu_button.css">
<link rel="stylesheet" href="chrome://resources/css/menu.css">
<link rel="stylesheet" href="chrome://resources/css/spinner.css">
<link rel="stylesheet" href="chrome://resources/css/widgets.css">
<include src="login_resources.html">
<link rel="stylesheet" href="accessibility_menu.css">
<link rel="stylesheet" href="apps_menu.css">
<link rel="stylesheet" href="bubble.css">
<link rel="stylesheet" href="header_bar.css">
<link rel="stylesheet" href="enterprise_info.css">
<link rel="stylesheet" href="network_dropdown.css">
<link rel="stylesheet" href="oobe.css">
<link rel="stylesheet" href="screen_account_picker.css">
<link rel="stylesheet" href="screen_gaia_signin.css">
<link rel="stylesheet" href="screen_error_message.css">
<link rel="stylesheet" href="screen_tpm_error.css">
<link rel="stylesheet" href="screen_locally_managed_user_creation.css">
<link rel="stylesheet" href="screen_password_changed.css">
<link rel="stylesheet" href="oobe_screen_terms_of_service.css">
<link rel="stylesheet" href="screen_wrong_hwid.css">
<link rel="stylesheet" href="user_pod_row.css">
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/event_tracker.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script>
<script src="chrome://resources/js/cr/ui.js"></script>
<script src="chrome://resources/js/cr/ui/touch_handler.js"></script>
<script src="chrome://resources/js/cr/ui/array_data_model.js"></script>
<script src="chrome://resources/js/cr/ui/dialogs.js"></script>
<script src="chrome://resources/js/cr/ui/list_selection_controller.js"></script>
<script src="chrome://resources/js/cr/ui/list_selection_model.js"></script>
<script src="chrome://resources/js/cr/ui/list_single_selection_model.js"></script>
<script src="chrome://resources/js/cr/ui/list_item.js"></script>
<script src="chrome://resources/js/cr/ui/list.js"></script>
<script src="chrome://resources/js/cr/ui/grid.js"></script>
<script src="chrome://resources/js/cr/ui/position_util.js"></script>
<script src="chrome://resources/js/cr/ui/menu_item.js"></script>
<script src="chrome://resources/js/cr/ui/menu.js"></script>
<script src="chrome://resources/js/cr/ui/menu_button.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="chrome://oobe/strings.js"></script>
<script src="chrome://oobe/oobe.js"></script>
</head>
<body i18n-values=".style.fontFamily:fontfamily;">
<div id="background" class="background-initial"></div>
<include src="version.html">
<div id="outer-container">
<div id="oobe" class="faded">
<div id="inner-container" class="down">
<div id="step-logo" hidden>
<img src="chrome://theme/IDR_PRODUCT_LOGO" alt="">
<div id="header-sections">
</div>
</div>
<include src="oobe_screen_network.html">
<include src="oobe_screen_eula.html">
<include src="oobe_screen_update.html">
<include src="oobe_screen_oauth_enrollment.html">
<include src="oobe_screen_user_image.html">
<include src="screen_locally_managed_user_creation.html">
<include src="screen_gaia_signin.html">
<include src="screen_account_picker.html">
<include src="screen_error_message.html">
<include src="screen_tpm_error.html">
<include src="screen_password_changed.html">
<include src="screen_wrong_hwid.html">
<include src="oobe_screen_reset.html">
<include src="oobe_screen_terms_of_service.html">
</div>
<div id="progress-dots" class="down"></div>
</div>
</div>
<body class="oobe-display" i18n-values=".style.fontFamily:fontfamily;">
<include src="oobe_screen_container.html">
<include src="accessibility_menu.html">
<div id="popup-overlay" hidden>
<div id="installation-settings-popup">
<h1 i18n-content="eulaSystemInstallationSettings"></h1>
......@@ -97,10 +30,6 @@
</button>
</div>
</div>
<div id="bubble" class="bubble faded" hidden></div>
<include src="accessibility_menu.html">
<include src="header_bar.html">
<include src="user_pod_template.html">
<script src="chrome://resources/js/i18n_template2.js"></script>
</body>
</html>
chrome/browser/resources/chromeos/login/oobe_screen_container.html 0 → 100644
View file @ 98dd6a21
<div id="background" class="background-initial"></div>
<include src="version.html">
<div id="outer-container">
<div id="oobe" class="faded">
<div id="inner-container" class="down">
<div id="step-logo" hidden>
<img src="chrome://theme/IDR_PRODUCT_LOGO" alt>
<div id="header-sections">
</div>
</div>
<include src="oobe_screens.html">
</div>
<div id="progress-dots" class="down"></div>
</div>
</div>
<div id="bubble" class="bubble faded" hidden></div>
<include src="header_bar.html">
<include src="user_pod_template.html">
chrome/browser/resources/chromeos/login/oobe_screens.html 0 → 100644
View file @ 98dd6a21
<include src="oobe_screen_eula.html">
<include src="oobe_screen_network.html">
<include src="oobe_screen_oauth_enrollment.html">
<include src="oobe_screen_reset.html">
<include src="oobe_screen_terms_of_service.html">
<include src="oobe_screen_update.html">
<include src="oobe_screen_user_image.html">
<include src="screen_account_picker.html">
<include src="screen_error_message.html">
<include src="screen_gaia_signin.html">
<include src="screen_locally_managed_user_creation.html">
<include src="screen_password_changed.html">
<include src="screen_tpm_error.html">
<include src="screen_wrong_hwid.html">
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment