Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Role tags missing - Description field explanation #16356

Merged
merged 2 commits into from
Jan 29, 2020
Merged

[FIX] Role tags missing - Description field explanation #16356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7ac39f
Addind text to the role description field
dudizilla Jan 28, 2020
e58435d
Adjustments in the alert
dudizilla Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/authorization/client/views/permissionsRole.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
<label for="mandatory2fa">{{_ "Users must use Two Factor Authentication"}} :</label>
<input id="mandatory2fa" type="checkbox" name="mandatory2fa" checked="{{mandatory2fa}}">
</div>

<div class="alert alert-warning">
<p for="mandatory2fa">{{_ "Leave the description field blank if you dont want to show the role"}}.</p>
</div>
<div class="rc-button__group">
{{#if editable}}
<button name="delete" class="rc-button rc-button--danger delete-role">{{_ "Delete"}}</button>
Expand Down
3 changes: 2 additions & 1 deletion app/theme/client/imports/general/base_old.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@
}

.rc-old .alert {
margin-bottom: 20px;
margin: 1rem 0;
padding: 0.5rem;

border-width: 1px;
border-radius: var(--border-radius);
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3377,6 +3377,7 @@
"Users_added": "The users have been added",
"Users_in_role": "Users in role",
"Users must use Two Factor Authentication": "Users must use Two Factor Authentication",
"Leave_the_description_field_blank_if_you_dont_want_to_show_the_role": "Leave the description field blank if you don't want to show the role",
"Uses": "Uses",
"Uses_left": "Uses left",
"UTF8_Names_Slugify": "UTF8 Names Slugify",
Expand Down