Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #8074 from asutherland/email-revised-layout-v1
Browse files Browse the repository at this point in the history 
Bug 808576 - Revise layout of New Mail Account (cherry picked from commit  1968b88) a=approval-gaiva-v1
  • Loading branch information
@asutherland
asutherland committed Feb 13, 2013
2 parents 9595bb1 + aa88772 commit ff2b046
Show file tree
Hide file tree
Showing 5 changed files with 296 additions and 264 deletions.
268 changes: 133 additions & 135 deletions apps/email/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,88 +375,76 @@ <h3 class="msg-envelope-subject"></h3>
</div>
</div>
<!-- Enter your e-mail address, password, name -->
<div class="card-setup-account-info form-card card">
<section class="sup-account-header" role="region">
<header>
<a href="#" class="sup-back-btn collapsed">
<span class="icon icon-back"></span>
</a>
<menu type="toolbar">
<button class="sup-info-next-btn" disabled="">
<span data-l10n-id="setup-info-next">NexT</span>
</button>
</menu>
<h1 class="sup-account-header-label"
data-l10n-id="setup-account-header3">NeW AccounT</h1>
</header>
</section>
<section class="card-setup-account-info form-card card skin-organic"
role="region">
<header class="sup-account-header">
<a href="#" class="sup-back-btn collapsed">
<span class="icon icon-back"></span>
</a>
<menu type="toolbar">
<button class="sup-info-next-btn" disabled="">
<span data-l10n-id="setup-info-next">NexT</span>
</button>
</menu>
<h1 class="sup-account-header-label"
data-l10n-id="setup-account-header3">NeW AccounT</h1>
</header>
<div class="scrollregion-below-header">
<div class="sup-error-region collapsed">
<div class="sup-error-message"></div>
<div class="sup-error-code"></div>
</div>
<div class="sup-form">
<h3 class="sup-info-label sup-form-label"
data-l10n-id="setup-info-header">YouR LogiN InformatioN</h3>
<form>
<p>
<!-- x-inputmode is a temporary v1 B2G stop-gap -->
<input class="sup-info-name" type="text"
data-l10n-id="setup-info-name"
x-inputmode="verbatim"
inputmode="verbatim"
required />
<button type="reset"></button>
</p>
<p>
<input class="sup-info-email" type="email"
data-l10n-id="setup-info-email"
required />
<button type="reset"></button>
</p>
<p>
<input class="sup-info-password" type="password"
data-l10n-id="setup-info-password"
required />
<button type="reset"></button>
</p>
</form>
<hr />
<div class="sup-manual-prompt"
data-l10n-id="setup-manual-prompt"></div>
<button class="sup-manual-config-btn sup-form-btn"
data-l10n-id="setup-manual-config2">
ManuaL SetuP
</button>
</div>
<form class="sup-form sup-account-form">
<p>
<!-- x-inputmode is a temporary v1 B2G stop-gap -->
<input class="sup-info-name" type="text"
data-l10n-id="setup-info-name"
x-inputmode="verbatim"
inputmode="verbatim"
required />
<button type="reset"></button>
</p>
<p>
<input class="sup-info-email" type="email"
data-l10n-id="setup-info-email"
required />
<button type="reset"></button>
</p>
<p>
<input class="sup-info-password" type="password"
data-l10n-id="setup-info-password"
required />
<button type="reset"></button>
</p>
</form>
<a href="#" class="sup-manual-config-btn sup-form-link"
data-l10n-id="setup-manual-config2">
ManuaL SetuP
</a>
</div>
</div>
</section>
<!-- I am setting up your account, please wait or read errors! -->
<div class="card-setup-progress card">
<section class="sup-account-header" role="region">
<header>
<a href="#" class="sup-back-btn">
<span class="icon icon-back"></span>
</a>
<h1 class="sup-account-header-label"
data-l10n-id="setup-account-header3">NeW AccounT</h1>
</header>
</section>
<section class="card-setup-progress card skin-organic" role="region">
<header class="sup-account-header">
<a href="#" class="sup-back-btn">
<span class="icon icon-back"></span>
</a>
<h1 class="sup-account-header-label"
data-l10n-id="setup-account-header3">NeW AccounT</h1>
</header>
<div class="sup-progress-region">
<span class="sup-progress-label" data-l10n-id="setup-progress-wait">
PleasE WaiT WhilE I SeT UP YouR AccounT
</span>
<span class="sup-progress-spinner"></span>
<progress class="sup-progress-spinner"></progress>
</div>
</div>
</section>
<!-- Account all setup, add another or read your mail? -->
<div class="card-setup-done card">
<section class="sup-account-header" role="region">
<header>
<h1 class="sup-account-header-label"
<section class="card-setup-done card skin-organic" role="region">
<header class="sup-account-header">
<h1 class="sup-account-header-label"
data-l10n-id="setup-completed-header">MaiL AccounT SetuP</h1>
</header>
</section>
</header>
<h2 class="sup-account-done-label sup-form-label"
data-l10n-id="setup-completed-label">AlL DonE!</h2>
<button class="sup-add-another-account-btn sup-form-btn"
Expand All @@ -467,141 +455,151 @@ <h3 class="msg-envelope-subject"></h3>
data-l10n-id="setup-show-mail">
ContinuE tO MaiL
</button>
</div>
</section>

<div class="card-setup-manual-config form-card card">
<section class="sup-account-header" role="region">
<header>
<a href="#" class="sup-back-btn">
<span class="icon icon-back"></span>
</a>
<h1 class="sup-account-header-label header-label"
data-l10n-id="setup-manual-config-header">ManuaL SetuP</h1>
</header>
</section>
<section class="card-setup-manual-config form-card card skin-organic"
role="region">
<header class="sup-account-header">
<a href="#" class="sup-back-btn">
<span class="icon icon-back"></span>
</a>
<menu type="toolbar">
<button class="sup-manual-next-btn" disabled>
<span data-l10n-id="setup-info-next">NexT</span>
</button>
</menu>
<h1 class="sup-account-header-label header-label"
data-l10n-id="setup-manual-config-header">ManuaL SetuP</h1>
</header>
<div class="scrollregion-below-header">
<div class="sup-error-region collapsed">
<div class="sup-error-message"></div>
<div class="sup-error-code"></div>
</div>
<div class="sup-form">
<div class="sup-manual-common">
<form>
<p>
<!-- x-inputmode is a temporary v1 B2G stop-gap -->
<input class="sup-info-name" type="text"
data-l10n-id="setup-info-name"
x-inputmode="verbatim"
inputmode="verbatim"
required />
<button type="reset"></button>
</p>
<p>
<input class="sup-info-email" type="email"
data-l10n-id="setup-info-email"
required />
<button type="reset"></button>
</p>
<p>
<input class="sup-info-password" type="password"
data-l10n-id="setup-info-password"
required />
<button type="reset"></button>
</p>
</form>
<header class="collapsed"></header>
<form class="sup-manual-form">
<div class="sup-manual-common sup-form">
<p>
<!-- x-inputmode is a temporary v1 B2G stop-gap -->
<input class="sup-info-name" type="text"
data-l10n-id="setup-info-name"
x-inputmode="verbatim"
inputmode="verbatim"
required />
<button type="reset"></button>
</p>
<p>
<input class="sup-info-email" type="email"
data-l10n-id="setup-info-email"
required />
<button type="reset"></button>
</p>
<p>
<input class="sup-info-password" type="password"
data-l10n-id="setup-info-password"
required />
<button type="reset"></button>
</p>
</div>
<hr />

<span data-l10n-id="setup-manual-account-type">AccounT TypE</span>
<!-- These don't need L10N as they are protocol names. -->
<select class="mail-select sup-manual-account-type">
<option value="imap+smtp">IMAP+SMTP</option>
<option value="activesync">ActiveSync</option>
</select>
<hr />
<div class="sup-form sup-form-item">
<span data-l10n-id="setup-manual-account-type">AccounT TypE</span>
<!-- These don't need L10N as they are protocol names. -->
<select class="mail-select sup-manual-account-type end">
<option value="imap+smtp">IMAP+SMTP</option>
<option value="activesync">ActiveSync</option>
</select>
</div>

<div class="sup-manual-imap-smtp">
<form>
<section class="sup-manual-imap-smtp" role="region">
<header class="collapsed"></header>
<header>
<h2 data-l10n-id="setup-manual-imap-header">ImaP SettingS</h2>
</header>
<div class="sup-form">
<p>
<input class="sup-manual-imap-username" type="text"
data-l10n-id="setup-manual-username"
required />
data-maybe-required />
<button type="reset"></button>
</p>
<p>
<input class="sup-manual-imap-hostname" type="text"
data-l10n-id="setup-manual-hostname"
required />
data-maybe-required />
<button type="reset"></button>
</p>
<p>
<input class="sup-manual-imap-port" type="text"
data-l10n-id="setup-manual-port" value="993"
required />
data-maybe-required />
<button type="reset"></button>
</p>
<p>
<p class="collapsed">
<span data-l10n-id="setup-manual-socket">SockeT TypE</span>
<select class="mail-select sup-manual-imap-socket">
<option value="SSL" data-l10n-id="setup-manual-socket-ssl">
SsL</option>
</select>
</p>
</div>

<header>
<h2 data-l10n-id="setup-manual-smtp-header">SmtP SettingS</h2>
</header>
<div class="sup-form">
<p>
<input class="sup-manual-smtp-username" type="text"
data-l10n-id="setup-manual-username"
required />
data-maybe-required />
<button type="reset"></button>
</p>
<p>
<input class="sup-manual-smtp-hostname" type="text"
data-l10n-id="setup-manual-hostname"
required />
data-maybe-required />
<button type="reset"></button>
</p>
<p>
<input class="sup-manual-smtp-port" type="text"
data-l10n-id="setup-manual-port" value="465"
required />
data-maybe-required />
<button type="reset"></button>
</p>
<p>
<p class="collapsed">
<span data-l10n-id="setup-manual-socket">SockeT TypE</span>
<select class="mail-select sup-manual-smtp-socket">
<option value="SSL" data-l10n-id="setup-manual-socket-ssl">
SsL</option>
</select>
</p>
</form>
</div>
</div>
</section>

<div class="sup-manual-activesync collapsed">
<form>
<section class="sup-manual-activesync collapsed" role="region">
<header class="collapsed"></header>
<header>
<h2 data-l10n-id="setup-manual-activesync-header">
ActivesynC SettingS</h2>
</header>
<div class="sup-form">
<p>
<input class="sup-manual-activesync-hostname" type="text"
data-l10n-id="setup-manual-hostname"
required />
data-maybe-required />
<button type="reset"></button>
</p>
<p>
<input class="sup-manual-activesync-username" type="text"
data-l10n-id="setup-manual-username"
required />
data-maybe-required />
<button type="reset"></button>
</p>
</form>
</div>

<button class="sup-manual-next-btn sup-form-btn recommend"
data-l10n-id="setup-manual-next">NexT</button>
</div>
</div>
</section>
</form>
</div>
</div>
</section>

<div class="card-setup-fix-password card">
<div class="sup-account-header top-header">
Expand Down
Loading

0 comments on commit ff2b046

Please sign in to comment.