Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

org settings: Add lock icon next to uneditable tabs. 

Add a lock icon to the right of tabs on which nothing is editable
for normal users. Add lock next to Custom emoji option if only admin
can edit them.

Tweaked by tabbott to use title for the lock icons, rather than
aria-hidden, since they do convey useful information.

Fixes: #10893.
This commit is contained in:
varunvaruns9 2018-12-04 19:54:25 +05:30 committed by Tim Abbott
parent 86536059b4
commit 4ff25d0366
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
static/styles/settings.scss
View File

@ -1562,13 +1562,14 @@ input[type=text]#settings_search {
}
#settings_page .sidebar li .text,
#settings_page .sidebar li .icon {
#settings_page .sidebar li .icon,
#settings_page .sidebar li .locked {
display: inline-block;
vertical-align: top;
}
#settings_page .sidebar li .text {
width: calc(100% - 55px);
width: calc(100% - 90px);
padding: 10px 12px 10px 0px;
}
@ -1584,6 +1585,18 @@ input[type=text]#settings_search {
background-repeat: no-repeat;
}
#settings_page .sidebar li .locked {
width: 18px;
height: 18px;
margin: 14px 8px 6px;
font-size: 1em;
color: hsl(0, 0%, 62%);
background-size: cover;
background-repeat: no-repeat;
}
#settings_page .sidebar .org-settings-list {
display: none;
}

30
templates/zerver/app/settings_overlay.html
View File

@ -47,18 +47,30 @@
<li tabindex="0" data-section="organization-profile">
<i class="icon fa fa-lock" aria-hidden="true"></i>
<div class="text">{{ _('Organization profile') }}</div>
{% if not is_admin %}
<i class="locked fa fa-lock" title="{{ _('Only organization administrators can edit these settings.') }}"></i>
{% endif %}
</li>
<li tabindex="0" data-section="organization-settings">
<i class="icon fa fa-flask" aria-hidden="true"></i>
<div class="text">{{ _('Organization settings') }}</div>
{% if not is_admin %}
<i class="locked fa fa-lock" title="{{ _('Only organization administrators can edit these settings.') }}"></i>
{% endif %}
</li>
<li tabindex="0" data-section="organization-permissions">
<i class="icon fa fa-lock" aria-hidden="true"></i>
<div class="text">{{ _('Organization permissions') }}</div>
{% if not is_admin %}
<i class="locked fa fa-lock" title="{{ _('Only organization administrators can edit these settings.') }}"></i>
{% endif %}
</li>
<li tabindex="0" data-section="emoji-settings">
<i class="icon fa fa-smile-o" aria-hidden="true"></i>
<div class="text">{{ _('Custom emoji') }}</div>
{% if not is_admin and user_profile.realm.add_emoji_by_admins_only %}
<i class="locked fa fa-lock" title="{{ _('Only organization administrators can edit these settings.') }}"></i>
{% endif %}
</li>
<li tabindex="0" data-section="user-groups-admin">
<i class="icon fa fa-group" aria-hidden="true"></i>
@ -67,10 +79,16 @@
<li tabindex="0" data-section="auth-methods">
<i class="icon fa fa-lock" aria-hidden="true"></i>
<div class="text">{{ _('Authentication methods') }}</div>
{% if not is_admin %}
<i class="locked fa fa-lock" title="{{ _('Only organization administrators can edit these settings.') }}"></i>
{% endif %}
</li>
<li tabindex="0" data-section="user-list-admin">
<i class="icon fa fa-user" aria-hidden="true"></i>
<div class="text">{{ _('Users') }}</div>
{% if not is_admin %}
<i class="locked fa fa-lock" title="{{ _('Only organization administrators can edit these settings.') }}"></i>
{% endif %}
</li>
{% if is_admin %}
<li tabindex="0" data-section="deactivated-users-admin">
@ -81,18 +99,30 @@
<li tabindex="0" data-section="bot-list-admin">
<i class="icon fa fa-github" aria-hidden="true"></i>
<div class="text">{{ _('Bots') }}</div>
{% if not is_admin %}
<i class="locked fa fa-lock" title="{{ _('Only organization administrators can edit these settings.') }}"></i>
{% endif %}
</li>
<li tabindex="0" data-section="default-streams-list">
<i class="icon fa fa-exchange" aria-hidden="true"></i>
<div class="text">{{ _('Default streams') }}</div>
{% if not is_admin %}
<i class="locked fa fa-lock" title="{{ _('Only organization administrators can edit these settings.') }}"></i>
{% endif %}
</li>
<li tabindex="0" data-section="filter-settings">
<i class="icon fa fa-font" aria-hidden="true"></i>
<div class="text">{{ _('Linkifiers') }}</div>
{% if not is_admin %}
<i class="locked fa fa-lock" title="{{ _('Only organization administrators can edit these settings.') }}"></i>
{% endif %}
</li>
<li tabindex="0" data-section="profile-field-settings">
<i class="icon fa fa-user" aria-hidden="true"></i>
<div class="text">{{ _('Custom profile fields') }}</div>
{% if not is_admin %}
<i class="locked fa fa-lock" title="{{ _('Only organization administrators can edit these settings.') }}"></i>
{% endif %}
</li>
{% if is_admin %}
<li tabindex="0" data-section="invites-list-admin">