chrome/browser/resources/chromeos/login/oobe.html - Issue 9416097: Add butter bar to login screen to show device enrollement info.

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

Issue 9416097: Add butter bar to login screen to show device enrollement info. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address nkostylev's comments. Created 8 years, 9 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 | Annotate | Revision Log

« chrome/browser/resources/chromeos/login/oobe.css ('K') | « chrome/browser/resources/chromeos/login/oobe.css ('k') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE HTML>	1 <!DOCTYPE HTML>

2 <html i18n-values="dir:textdirection">	2 <html i18n-values="dir:textdirection">

3 <head>	3 <head>

4 <title i18n-content="title"></title>	4 <title i18n-content="title"></title>

5 <link rel="stylesheet" href="chrome://resources/css/button.css">	5 <link rel="stylesheet" href="chrome://resources/css/button.css">

6 <link rel="stylesheet" href="chrome://resources/css/dialogs.css"></link>	6 <link rel="stylesheet" href="chrome://resources/css/dialogs.css"></link>

7 <link rel="stylesheet" href="chrome://resources/css/list.css">	7 <link rel="stylesheet" href="chrome://resources/css/list.css">

8 <link rel="stylesheet" href="chrome://resources/css/select.css">	8 <link rel="stylesheet" href="chrome://resources/css/select.css">

9 <link rel="stylesheet" href="chrome://resources/css/spinner.css">	9 <link rel="stylesheet" href="chrome://resources/css/spinner.css">

10 <link rel="stylesheet" href="chrome://resources/css/throbber.css">	10 <link rel="stylesheet" href="chrome://resources/css/throbber.css">

11 <link rel="stylesheet" href="bubble.css">	11 <link rel="stylesheet" href="bubble.css">

	12 <link rel="stylesheet" href="butter_bar.css">

12 <link rel="stylesheet" href="header_bar.css">	13 <link rel="stylesheet" href="header_bar.css">

13 <link rel="stylesheet" href="network_dropdown.css">	14 <link rel="stylesheet" href="network_dropdown.css">

14 <link rel="stylesheet" href="oobe.css">	15 <link rel="stylesheet" href="oobe.css">

15 <link rel="stylesheet" href="screen_account_picker.css">	16 <link rel="stylesheet" href="screen_account_picker.css">

16 <link rel="stylesheet" href="screen_gaia_signin.css">	17 <link rel="stylesheet" href="screen_gaia_signin.css">

17 <link rel="stylesheet" href="screen_error_message.css">	18 <link rel="stylesheet" href="screen_error_message.css">

18 <link rel="stylesheet" href="user_pod_row.css">	19 <link rel="stylesheet" href="user_pod_row.css">

19 <script src="chrome://resources/js/cr.js"></script>	20 <script src="chrome://resources/js/cr.js"></script>

20 <script src="chrome://resources/js/cr/event_target.js"></script>	21 <script src="chrome://resources/js/cr/event_target.js"></script>

21 <script src="chrome://resources/js/cr/ui.js"></script>	22 <script src="chrome://resources/js/cr/ui.js"></script>

(...skipping 18 matching lines...) Expand all Loading...
40 <script src="oobe_screen_update.js"></script>	41 <script src="oobe_screen_update.js"></script>

41 <script src="oobe_screen_user_image.js"></script>	42 <script src="oobe_screen_user_image.js"></script>

42 <script src="oobe_screen_oauth_enrollment.js"></script>	43 <script src="oobe_screen_oauth_enrollment.js"></script>

43 <script src="screen_account_picker.js"></script>	44 <script src="screen_account_picker.js"></script>

44 <script src="screen_gaia_signin.js"></script>	45 <script src="screen_gaia_signin.js"></script>

45 <script src="screen_error_message.js"></script>	46 <script src="screen_error_message.js"></script>

46 <script src="user_pod_row.js"></script>	47 <script src="user_pod_row.js"></script>

47 </head>	48 </head>

48 <body i18n-values=".style.fontFamily:fontfamily;">	49 <body i18n-values=".style.fontFamily:fontfamily;">

49 <include src="header_bar.html">	50 <include src="header_bar.html">

	51 <div id="notification-area">
	Nikita (slow) 2012/02/28 09:45:33 nit: You may as well extract this block into a but nit: You may as well extract this block into a butter_bar.html to avoid duplication.
	52 <div class="butter-bar" id="enterprise-info-container">
	James Hawkins 2012/02/28 16:45:33 nit: \|id\| goes first. nit: \|id\| goes first. Patrick Dubroy 2012/03/15 14:31:17 Done. Show quoted text On 2012/02/28 16:45:33, James Hawkins wrote: > nit: \|id\| goes first. Done.
	53 <span id="enterprise-info-message"></span>

	54 <!-- TODO(dubroy): Add "Learn more" link here. -->

	55 </div>

	56 </div>

50 <div id="outer-container">	57 <div id="outer-container">

51 <div id="oobe" class="faded">	58 <div id="oobe" class="faded">

52 <div id="header">	59 <div id="header">

53 <span i18n-content="productName"></span>	60 <span i18n-content="productName"></span>

54 <div id="header-sections"></div>	61 <div id="header-sections"></div>

55 </div>	62 </div>

56 <hr class="top shadow">	63 <hr class="top shadow">

57 <div id="inner-container">	64 <div id="inner-container">

58 <include src="oobe_screen_network.html">	65 <include src="oobe_screen_network.html">

59 <include src="oobe_screen_eula.html">	66 <include src="oobe_screen_eula.html">

(...skipping 28 matching lines...) Expand all Loading...
88 <p id="tpm-password" hidden></p>	95 <p id="tpm-password" hidden></p>

89 </div>	96 </div>

90 <button id="security-ok-button" i18n-content="eulaTpmOkButton"></button>	97 <button id="security-ok-button" i18n-content="eulaTpmOkButton"></button>

91 </div>	98 </div>

92 </div>	99 </div>

93 <div id="bubble" class="bubble faded" hidden></div>	100 <div id="bubble" class="bubble faded" hidden></div>

94 <include src="version.html">	101 <include src="version.html">

95 <include src="user_pod_template.html">	102 <include src="user_pod_template.html">

96 </body>	103 </body>

97 </html>	104 </html>

OLD	NEW