chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.html - Issue 7562008: Add new version of enrollment screen supporting OAuth.

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

Issue 7562008: Add new version of enrollment screen supporting OAuth. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments. Created 9 years, 4 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.js ('k') | chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js » ('j') | chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <div class="step right hidden" id="oauth-enrollment">
	James Hawkins 2011/08/05 17:01:01 id should be specified first. id should be specified first. Mattias Nissler (ping if slow) 2011/08/08 16:38:47 Done. Show quoted text On 2011/08/05 17:01:01, James Hawkins wrote: > id should be specified first. Done.
	2 <div id="oauth-enroll-container">

	3 <div id="oauth-enroll-step-signin">

	4 <iframe id="oauth-enroll-signin-frame"

	5 src="about:blank"
	James Hawkins 2011/08/05 17:01:01 Indentation is 4 spaces from the start of the tag. Indentation is 4 spaces from the start of the tag. Try to fit as many attributes on a line as possible though instead of one per line. Mattias Nissler (ping if slow) 2011/08/08 16:38:47 Done. Show quoted text On 2011/08/05 17:01:01, James Hawkins wrote: > Indentation is 4 spaces from the start of the tag. Try to fit as many > attributes on a line as possible though instead of one per line. Done.
	6 marginwidth="0"

	7 marginheight="0"

	8 frameborder="0"

	9 scrolling="no"></iframe>

	10 </div>

	11 <div id="oauth-enroll-step-working" class="oauth-enroll-step-center" hidden>

	12 <div class="oauth-enroll-step-content">

	13 <span class="oauth-enroll-step-icon">

	14 <span class="oauth-enroll-spinner"></span>

	15 </span>

	16 <span class="oauth-enroll-step-message"

	17 i18n-content="oauthEnrollWorking">

	18 </span>

	19 </div>

	20 </div>

	21 <div id="oauth-enroll-step-error" class="oauth-enroll-step-center" hidden>

	22 <div class="oauth-enroll-step-content">

	23 <span class="oauth-enroll-step-icon">

	24 <img src="chrome://theme/IDR_ENROLL_FAILURE">

	25 </span>

	26 <span class="oauth-enroll-step-message">

	27 <div id="oauth-enroll-error-message"></div>

	28 <a id='oauth-enroll-error-retry'

	29 onclick="chrome.send('oauthEnrollRetry', []);"
	whywhat 2011/08/05 07:24:58 nit: indent got off by one space here and on the n nit: indent got off by one space here and on the next line Mattias Nissler (ping if slow) 2011/08/05 07:33:16 Actually, it's indented 4 spaces after a line brea Show quoted text On 2011/08/05 07:24:58, whywhat wrote: > nit: indent got off by one space here and on the next line Actually, it's indented 4 spaces after a line break. Other oobe pages do the same thing, but I don't know what the style rule for breaking long elements is/should be though. whywhat 2011/08/05 07:38:53 Ah, ok. I thought you wanted to align attributes l Ah, ok. I thought you wanted to align attributes like with iframe tag above :) On 2011/08/05 07:33:16, Mattias Nissler wrote: Show quoted text > On 2011/08/05 07:24:58, whywhat wrote: > > nit: indent got off by one space here and on the next line > > Actually, it's indented 4 spaces after a line break. Other oobe pages do the > same thing, but I don't know what the style rule for breaking long elements > is/should be though. Mattias Nissler (ping if slow) 2011/08/05 07:40:59 You are right, that's inconsistent. I'll fix the i Show quoted text On 2011/08/05 07:38:53, whywhat wrote: > Ah, ok. I thought you wanted to align attributes like with iframe tag above :) > > On 2011/08/05 07:33:16, Mattias Nissler wrote: > > On 2011/08/05 07:24:58, whywhat wrote: > > > nit: indent got off by one space here and on the next line > > > > Actually, it's indented 4 spaces after a line break. Other oobe pages do the > > same thing, but I don't know what the style rule for breaking long elements > > is/should be though. > You are right, that's inconsistent. I'll fix the iframe then :) James Hawkins 2011/08/05 17:01:01 Move the JS to a .js file. Move the JS to a .js file. Mattias Nissler (ping if slow) 2011/08/08 16:38:47 Done. Show quoted text On 2011/08/05 17:01:01, James Hawkins wrote: > Move the JS to a .js file. Done.
	30 i18n-content="oauthEnrollRetry"></a>

	31 </span>

	32 </div>

	33 </div>

	34 <div id="oauth-enroll-step-success" class="oauth-enroll-step-center" hidden>

	35 <div class="oauth-enroll-step-content">

	36 <span class="oauth-enroll-step-icon">

	37 <img src="chrome://theme/IDR_ENROLL_SUCCESS">

	38 </span>

	39 <span class="oauth-enroll-step-message"

	40 i18n-content="oauthEnrollSuccess">

	41 </span>

	42 </div>

	43 </div>

	44 </div>

	45 </div>

OLD	NEW