Skip to content

Commit

Permalink
Regression: Account pages layout (#12735)
Browse files Browse the repository at this point in the history
* Remove duplicated .eslintignore entry

* Add missing i18n string

* Make Account Preferences layout match Administration layout

* Make Account Security layout match Administration layout

* Make Account Integrations layout match Administration layout

* Make Account Personal Access Tokens layout match Administration layout

* Adjust margins for buttons
  • Loading branch information
tassoevan authored and rodrigok committed Nov 27, 2018
1 parent d46cb97 commit 9eabcef
Show file tree
Hide file tree
Showing 7 changed files with 335 additions and 342 deletions.
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ packages/rocketchat-livechat/.app/.meteor
packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
packages/rocketchat-livechat/assets/rocket-livechat.js
packages/rocketchat_theme/client/minicolors/jquery.minicolors.js
packages/rocketchat_theme/client/minicolors/jquery.minicolors.js
packages/rocketchat_theme/client/vendor/
packages/rocketchat-ui/client/lib/customEventPolyfill.js
packages/rocketchat-ui/client/lib/Modernizr.js
Expand Down
34 changes: 13 additions & 21 deletions imports/personal-access-tokens/client/personalAccessTokens.html
Original file line number Diff line number Diff line change
@@ -1,30 +1,22 @@
<template name="accountTokens">
<section class="preferences-page preferences-page--new">
<section class="preferences-page preferences-page--new page-container page-home page-static page-settings">
{{> header sectionName="Personal_Access_Tokens" hideHelp=true fullpage=true}}
<div class="preferences-page__content">
{{# if isAllowed}}
<h2>{{_ "API_Personal_Access_Tokens_To_REST_API"}}</h2>
<br>
<form id="form-tokens" class="">

<div class="rc-form-group rc-form-group--inline">
<!-- <input id="input-token-name"
type="text"
name="tokenName"
placeholder={{_ "Enter_a_name"}}
value="{{tokenName}}"> -->
<div class="rc-input rc-input--small rc-directory-search rc-form-item-inline">
<label class="rc-input__label">
<div class="rc-input__wrapper">
<input type="text" class="rc-input__element rc-input__element--small js-search" name="tokenName" id="tokenName"
placeholder={{_ "API_Add_Personal_Access_Token"}} autocomplete="off">
</div>
</label>
<div class="content">
{{# if isAllowed}}
<form id="form-tokens">
<div class="section-content border-component-color">
<div class="input-line double-col">
<label for="tokenName" class="setting-label">{{_ "API_Personal_Access_Tokens_To_REST_API"}}</label>
<div class="setting-field">
<input type="text" class="rc-input__element js-search" name="tokenName" id="tokenName"
placeholder={{_ "API_Add_Personal_Access_Token"}} autocomplete="off" />
</div>
<button name="add" class="rc-button rc-button--primary setting-action save-token">{{_ "Add"}}</button>
</div>
<button name="add" class="rc-button rc-button--primary rc-form-item-inline save-token">{{_ "Add"}}</button>
</div>
</form>
<br>

<div class="rc-table-content">
{{#table}}
<thead>
Expand Down
59 changes: 28 additions & 31 deletions packages/rocketchat-2fa/client/accountSecurity.html
Original file line number Diff line number Diff line change
@@ -1,47 +1,44 @@
<template name="accountSecurity">
<section class="preferences-page preferences-page--new">
<section class="preferences-page preferences-page--new page-settings">
{{> header sectionName="Security" fullpage=true}}
<div class="preferences-page__content">
<form id="security" autocomplete="off" class="container">
{{# if isAllowed}}
<fieldset>
<div class="section">
<h1>{{_ "Two-factor_authentication"}}</h1>
<div class="section-content border-component-color">
{{#if isEnabled}}
<button class="rc-button rc-button--cancel disable-2fa">{{_ "Disable_two-factor_authentication"}}</button>
{{else}}
{{#unless isRegistering}}
<p>{{_ "Two-factor_authentication_is_currently_disabled"}}</p>
<div class="section">
<h1>{{_ "Two-factor_authentication"}}</h1>
<div class="section-content border-component-color">
{{#if isEnabled}}
<button class="rc-button rc-button--cancel disable-2fa">{{_ "Disable_two-factor_authentication"}}</button>
{{else}}
{{#unless isRegistering}}
<p>{{_ "Two-factor_authentication_is_currently_disabled"}}</p>

<button class="rc-button rc-button--primary enable-2fa">{{_ "Enable_two-factor_authentication"}}</button>
{{else}}
<p>{{_ "Scan_QR_code"}}</p>
<p>{{_ "Scan_QR_code_alternative_s" code=imageSecret}}</p>
<button class="rc-button rc-button--primary enable-2fa">{{_ "Enable_two-factor_authentication"}}</button>
{{else}}
<p>{{_ "Scan_QR_code"}}</p>
<p>{{_ "Scan_QR_code_alternative_s" code=imageSecret}}</p>

<img src="{{imageData}}">
<img src="{{imageData}}">

<form class="inline">
<form>
<div class="input-line double-col">
<input type="text" class="rc-input__element" id="testCode" placeholder="{{_ "Enter_authentication_code"}}">
<button class="rc-button rc-button--primary verify-code">{{_ "Verify"}}</button>
</form>
{{/unless}}
{{/if}}
</div>
<button class="rc-button rc-button--primary setting-action verify-code">{{_ "Verify"}}</button>
</div>
</form>
{{/unless}}
{{/if}}
</div>
</fieldset>

</div>

{{#if isEnabled}}
<fieldset>
<div class="section">
<h1>{{_ "Backup_codes"}}</h1>
<div class="section-content border-component-color">
<p>{{codesRemaining}}</p>
<button class="rc-button rc-button--secondary regenerate-codes">{{_ "Regenerate_codes"}}</button>
</div>
<div class="section">
<h1>{{_ "Backup_codes"}}</h1>
<div class="section-content border-component-color">
<p>{{codesRemaining}}</p>
<button class="rc-button rc-button--secondary regenerate-codes">{{_ "Regenerate_codes"}}</button>
</div>
</fieldset>
</div>
{{/if}}
{{/if}}
</form>
Expand Down
3 changes: 2 additions & 1 deletion packages/rocketchat-i18n/i18n/en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -1924,6 +1924,7 @@
"Mute_user": "Mute user",
"Muted": "Muted",
"My_Account": "My Account",
"My Data": "My Data",
"My_location": "My location",
"n_messages": "%s messages",
"N_new_messages": "%s new messages",
Expand Down Expand Up @@ -3014,4 +3015,4 @@
"Your_push_was_sent_to_s_devices": "Your push was sent to %s devices",
"Your_server_link": "Your server link",
"Your_workspace_is_ready": "Your workspace is ready to use 🎉"
}
}
32 changes: 15 additions & 17 deletions packages/rocketchat-ui-account/client/accountIntegrations.html
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
<template name="accountIntegrations">
<section class="page-container page-home page-static">
{{> header sectionName="Integrations"}}
<section class="preferences-page preferences-page--new page-static page-settings">
{{> header sectionName="Integrations" fullpage=true}}

<div class="content">
<form id="integrations" autocomplete="off">
<fieldset class="rc-form-legend">
<div class="section">
<h1>{{_ "WebDAV"}}</h1>
<div class="section-content border-component-color">
<div class="input-line double-col">
<label for="webdav-accounts">{{_ "WebDAV_Accounts"}}</label>
<div class="rc-select">
<select id="webdav-accounts" class="rc-select__element" style="text-transform: none" multiple>
{{#each webdavAccounts}}
<option value="{{this._id}}">{{getOptionValue this}}</option>
{{/each}}
</select>
</div>
<button class="rc-button rc-button--cancel webdav-account-remove"><span>{{_ "Remove"}}</span></button>
<div class="section">
<h1>{{_ "WebDAV"}}</h1>
<div class="section-content border-component-color">
<div class="input-line double-col">
<label for="webdav-accounts" class="setting-label">{{_ "WebDAV_Accounts"}}</label>
<div class="rc-select setting-field">
<select id="webdav-accounts" class="rc-select__element" style="text-transform: none" multiple>
{{#each webdavAccounts}}
<option value="{{this._id}}">{{getOptionValue this}}</option>
{{/each}}
</select>
</div>
<button class="rc-button rc-button--cancel setting-action webdav-account-remove"><span>{{_ "Remove"}}</span></button>
</div>
</div>
</fieldset>
</div>
</form>
</div>
</section>
Expand Down
Loading

0 comments on commit 9eabcef

Please sign in to comment.