Skip to content

Commit

Permalink
Merge pull request #223 from wireapp/staging
Browse files Browse the repository at this point in the history 
release 2016-09-19
  • Loading branch information
Gregor Herdmann authored Sep 19, 2016
2 parents 270622b + 6ee4da1 commit 7888260
Show file tree
Hide file tree
Showing 39 changed files with 677 additions and 580 deletions.
135 changes: 85 additions & 50 deletions app/page/auth.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,21 @@

<div id="form-account-login" class="form">
<div class="selector selector-method">
<div class="column hide">
<button class="button btn-method btn-login-email"
data-bind="css: {'disabled': disabled_by_animation}, l10n_text: z.string.auth_account_sign_in_email"
<div class="column">
<button class="button btn-method btn-login-password"
data-bind="click: clicked_on_login_password, css: {'disabled': disabled_by_animation}, l10n_text: z.string.auth_account_sign_in_email"
data-uie-name="go-sign-in-email"></button>
</div>
<div class="column hide">
<div class="column">
<button class="button btn-method btn-login-phone"
data-bind="css: {'disabled': disabled_by_animation}, l10n_text: z.string.auth_account_sign_in_phone"
data-bind="click: clicked_on_login_phone, css: {'disabled': disabled_by_animation}, l10n_text: z.string.auth_account_sign_in_phone"
data-uie-name="go-sign-in-phone"></button>
</div>
</div>
<form id="login-method-email" class="method" data-bind="submit: sign_in_email">
<div id="wire-login-email-container" class="form-control">
<input class="input email" id="wire-login-email" type="text"
data-bind="css: {'input-error': failed_validation_email}, event: {input: clear_error}, l10n_tooltip: z.string.auth_placeholder_email, l10n_placeholder: z.string.auth_placeholder_email, textInput: email"
<form id="login-method-password" class="method" data-bind="submit: login_password">
<div id="wire-login-username-container" class="form-control">
<input class="input username" id="wire-login-username" type="text"
data-bind="css: {'input-error': failed_validation_email}, event: {input: clear_error}, l10n_tooltip: z.string.auth_placeholder_email, l10n_placeholder: z.string.auth_placeholder_email, textInput: username"
data-uie-name="enter-email">
</div>
<div id="wire-login-password-container" class="form-control">
Expand All @@ -69,16 +69,16 @@
<div class="expired-info" data-bind="visible: session_expired">
<div data-bind="l10n_text: z.string.auth_account_expiration" data-uie-name="status-expired"></div>
</div>
<div id="remember-me" data-bind="electron_remove">
<div class="checkbox">
<input type="checkbox" id="checkbox-remember-me" data-bind="checked: persist" data-uie-name="enter-remember-sign-in">
<label class="label-xs" for="checkbox-remember-me" data-bind="l10n_text: z.string.auth_account_remember_me"></label>
<div id="wire-login-password-remember" data-bind="electron_remove">
<div class="checkbox checkbox-remember">
<input type="checkbox" id="checkbox-remember-password" data-bind="checked: persist" data-uie-name="enter-remember-sign-in">
<label class="label-xs" for="checkbox-remember-password" data-bind="l10n_text: z.string.auth_account_remember_me"></label>
</div>
</div>
<div class="footer">
<div class="column">
<input id="wire-email-login" class="button button-white btn-action btn-sign-in-email" type="submit"
data-bind="enable: can_login_email, l10n_input: z.string.auth_account_sign_in"
<input id="wire-password-login" class="button button-white btn-action btn-sign-in-email" type="submit"
data-bind="enable: can_login_password, l10n_input: z.string.auth_account_sign_in"
data-uie-name="do-sign-in">
</div>
<div class="column">
Expand All @@ -89,7 +89,7 @@
</div>
</div>
</form>
<form id="login-method-phone" class="method">
<form id="login-method-phone" class="method" data-bind="submit: login_phone">
<div class="form-control input-select">
<select class="input phone" id="wire-login-country" name="select"
data-bind="event: {change: changed_country}, textInput: country"
Expand All @@ -112,12 +112,16 @@
data-uie-name="enter-phone">
</div>
</div>
<div class="spacer">
<ul class="error-list" data-uie-name="status-error">
<!-- ko foreach: validation_errors -->
<li class="error" data-bind="text: message"></li>
<!-- /ko -->
</ul>
<ul class="error-list" data-uie-name="status-error">
<!-- ko foreach: validation_errors -->
<li class="error" data-bind="text: message"></li>
<!-- /ko -->
</ul>
<div id="wire-login-phone-remember" data-bind="electron_remove">
<div class="checkbox checkbox-remember">
<input type="checkbox" id="checkbox-remember-phone" data-bind="checked: persist" data-uie-name="enter-remember-sign-in">
<label class="label-xs" for="checkbox-remember-phone" data-bind="l10n_text: z.string.auth_account_remember_me"></label>
</div>
</div>
<div class="footer">
<input id="wire-phone-login" class="button button-white btn-action btn-sign-in-phone" type="submit"
Expand All @@ -135,7 +139,7 @@
</div>
<div id="wire-register-email-container" class="form-control">
<input class="input email" id="wire-register-email" type="text" autocomplete="off" maxlength="128"
data-bind="css: {'input-error': failed_validation_email}, event: {input: clear_error}, l10n_tooltip: z.string.auth_placeholder_email, l10n_placeholder: z.string.auth_placeholder_email, textInput: email"
data-bind="css: {'input-error': failed_validation_email}, event: {input: clear_error}, l10n_tooltip: z.string.auth_placeholder_email, l10n_placeholder: z.string.auth_placeholder_email, textInput: username"
data-uie-name="enter-email" tabindex="2">
</div>
<div id="wire-register-password-container" class="form-control">
Expand Down Expand Up @@ -172,31 +176,64 @@
</div>

<div id="section-verify" class="section">
<form id="form-verify-account" class="form" data-bind="submit: verify_account">
<div class="auth-headline" data-bind="l10n_text: z.string.auth_verify_account_headline"></div>
<div class="auth-headline-sub" data-bind="l10n_text: z.string.auth_verify_account_detail"></div>
<div id="wire-verify-account-email-container" class="form-control">
<input class="input email" id="wire-verify-account-email" type="text" autocomplete="off" maxlength="128"
data-bind="css: {'input-error': failed_validation_email}, event: {input: clear_error}, l10n_tooltip: z.string.auth_placeholder_email, l10n_placeholder: z.string.auth_placeholder_email, textInput: username"
data-uie-name="enter-email">
</div>
<div id="wire-verify-account-password-container" class="form-control">
<input class="input password" id="wire-verify-account-password" type="password" maxlength="1024" autocomplete="off"
data-bind="css: {'input-error': failed_validation_password}, event: {input: clear_error_password}, l10n_tooltip: z.string.auth_placeholder_password_set, l10n_placeholder: z.string.auth_placeholder_password_set, textInput: password"
data-uie-name="enter-password">
</div>
<ul class="error-list" data-uie-name="status-error">
<!-- ko foreach: validation_errors -->
<li class="error" data-bind="text: message"></li>
<!-- /ko -->
</ul>
<div class="footer">
<div class="column">
<input id="wire-verify-account" class="button button-white btn-action" type="submit"
data-bind="enable: can_login_password, l10n_input: z.string.auth_verify_account_add"
data-uie-name="do-verify-account">
</div>
<div class="column">
<a class="auth-link-button"
data-bind="click: logout, l10n_text: z.string.auth_limit_button_sign_out"
data-uie-name="go-sign-out">
</a>
</div>
</div>
</form>

<form id="form-verify-code" class="form" data-bind="submit: verify_code">
<div class="auth-headline-sub verify-code-text" data-bind="text: verify_code_text"></div>
<div class="form-control">
<div class="input-group" data-bind="css: {'input-error': failed_validation_code}">
<input class="input input-code digit-one" id="wire-phone-code-digit-1" autocomplete="off"
<input class="input input-code digit-one" id="wire-verify-code-digit-1" autocomplete="off"
data-bind="event: {input: input_phone_code, keydown: keydown_phone_code},
textInput: code_digits()[0]()"
data-uie-name="enter-phone-code">
<input class="input input-code digit-two" id="wire-phone-code-digit-2" autocomplete="off"
<input class="input input-code digit-two" id="wire-verify-code-digit-2" autocomplete="off"
data-bind="event: {input: input_phone_code, keydown: keydown_phone_code},
textInput: code_digits()[1]()"
data-uie-name="enter-phone-code">
<input class="input input-code digit-three" id="wire-phone-code-digit-3" autocomplete="off"
<input class="input input-code digit-three" id="wire-verify-code-digit-3" autocomplete="off"
data-bind="event: {input: input_phone_code, keydown: keydown_phone_code},
textInput: code_digits()[2]"
data-uie-name="enter-phone-code">
<input class="input input-code digit-four" id="wire-phone-code-digit-4" autocomplete="off"
<input class="input input-code digit-four" id="wire-verify-code-digit-4" autocomplete="off"
data-bind="event: {input: input_phone_code, keydown: keydown_phone_code},
textInput: code_digits()[3]"
data-uie-name="enter-phone-code">
<input class="input input-code digit-five" id="wire-phone-code-digit-5" autocomplete="off"
<input class="input input-code digit-five" id="wire-verify-code-digit-5" autocomplete="off"
data-bind="event: {input: input_phone_code, keydown: keydown_phone_code},
textInput: code_digits()[4]"
data-uie-name="enter-phone-code">
<input class="input input-code digit-six" id="wire-phone-code-digit-6" autocomplete="off"
<input class="input input-code digit-six" id="wire-verify-code-digit-6" autocomplete="off"
data-bind="event: {input: input_phone_code, keydown: keydown_phone_code},
textInput: code_digits()[5]"
data-uie-name="enter-phone-code">
Expand All @@ -222,17 +259,11 @@
</div>
</form>

<form id="form-verify-email" class="form" data-bind="submit: verify_add_email">
<div class="auth-headline" data-bind="text: verify_email_headline"></div>
<div class="auth-headline-sub verify-email-text" data-bind="l10n_text: z.string.auth_verify_email_detail"></div>
<div id="wire-login-phone-mail-email-container" class="form-control">
<input class="input email" id="wire-mail-email" type="text" autocomplete="off" maxlength="128"
data-bind="css: {'input-error': failed_validation_email}, event: {input: clear_error}, l10n_tooltip: z.string.auth_placeholder_email, l10n_placeholder: z.string.auth_placeholder_email, textInput: email"
data-uie-name="enter-email">
</div>
<div id="wire-login-phone-mail-password-container" class="form-control">
<input class="input password" id="wire-mail-password" type="password" maxlength="1024" autocomplete="off"
data-bind="css: {'input-error': failed_validation_password}, event: {input: clear_error_password}, l10n_tooltip: z.string.auth_placeholder_password_set, l10n_placeholder: z.string.auth_placeholder_password_set, textInput: password"
<form id="form-verify-phone-password" class="form" data-bind="submit: verify_password">
<div class="auth-headline verify-password-text" data-bind="l10n_text: z.string.auth_verify_password_headline"></div>
<div id="wire-verify-phone-password-container" class="form-control">
<input class="input password" id="wire-verify-password-input" type="password" maxlength="1024" autocomplete="off"
data-bind="css: {'input-error': failed_validation_password}, event: {input: clear_error_password}, l10n_tooltip: z.string.auth_placeholder_password_put, l10n_placeholder: z.string.auth_placeholder_password_put, textInput: password"
data-uie-name="enter-password">
</div>
<ul class="error-list" data-uie-name="status-error">
Expand All @@ -242,9 +273,15 @@
</ul>
<div class="footer">
<div class="column">
<input id="wire-mail-add" class="button button-white btn-action" type="submit"
data-bind="enable: can_login_email, l10n_input: z.string.auth_verify_email_button"
data-uie-name="do-register">
<input id="wire-verify-password" class="button button-white btn-action" type="submit"
data-bind="enable: can_verify_password, l10n_input: z.string.auth_account_sign_in"
data-uie-name="do-login-in">
</div>
<div class="column">
<a class="auth-link-button"
data-bind="click: clicked_on_password, l10n_text: z.string.auth_account_password_forgot"
data-uie-name="go-forgot-password">
</a>
</div>
</div>
</form>
Expand Down Expand Up @@ -283,13 +320,11 @@
</div>

<div id="section-posted" class="section">
<div class="icon">
<div class="posted-icon">
<div class="icon-envelope"></div>
<div class="icon-check"></div>
<div class="icon-error"></div>
<div class="icon-spinner spin"></div>
</div>
<div class="posted-icon">
<div class="icon-envelope"></div>
<div class="icon-check"></div>
<div class="icon-error"></div>
<div class="icon-spinner spin"></div>
</div>
<div class="form-posted">
<div id="form-posted-offline" class="posted-content" data-bind="visible: posted_mode_offline">
Expand Down
2 changes: 1 addition & 1 deletion app/page/template/_dist/app.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<script src="/script/util/TimeTracker.js"></script>
<script src="/script/util/CountryCodes.js"></script>
<script src="/script/util/Invite.js"></script>
<script src="/script/util/worker.js"></script>
<!-- Storage -->
<script src="/script/storage/StorageError.js"></script>
<script src="/script/storage/StorageKey.js"></script>
Expand Down Expand Up @@ -62,7 +63,6 @@
<script src="/script/tracking/attribute/ConversationType.js"></script>
<script src="/script/tracking/attribute/DeleteType.js"></script>
<script src="/script/tracking/attribute/MessageType.js"></script>
<script src="/script/tracking/event/PhoneVerification.js"></script>
<script src="/script/tracking/event/PictureTakenEvent.js"></script>
<script src="/script/tracking/EventName.js"></script>
<script src="/script/tracking/EventTrackingRepository.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion app/page/template/conversation/conversation.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<!-- /ko -->

<!-- ko if: $root.conversation_repository.active_conversation().is_loaded() -->
#include('conversation/message-list.htm')
#include('conversation/conversation-titlebar.htm')
#include('conversation/message-list.htm')
#include('conversation/conversation-input.htm')
#include('conversation/participants.htm')
#include('conversation/detail-view.htm')
Expand Down
Loading

0 comments on commit 7888260

Please sign in to comment.