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

settings: Move message edit settings to "Organization Permissions". 

The message-editing section of settings is moved from "Organization
Settings" to "Organization Permissions", which feels like a more
natural place for these settings.
This commit is contained in:
sahil839 2021-05-26 00:54:12 +05:30 committed by Tim Abbott
parent fa34f793a7
commit 4d20bce6e4
5 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
static/templates/settings/organization_permissions_admin.hbs
View File

@ -125,6 +125,70 @@
</div>
</div>
<div id="org-msg-editing" class="org-subsection-parent">
<div class="subsection-header">
<h3>{{t "Message editing" }}
{{> ../help_link_widget link="/help/configure-message-editing-and-deletion" }}
</h3>
{{> settings_save_discard_widget section_name="msg-editing" }}
</div>
<div class="inline-block organization-settings-parent">
<div class="input-group">
<label for="realm_msg_edit_limit_setting" class="dropdown-title">{{t "Allow message editing" }}</label>
<select name="realm_msg_edit_limit_setting" id="id_realm_msg_edit_limit_setting" class="prop-element">
{{#each msg_edit_limit_dropdown_values}}
<option value="{{0}}">{{1.text}}</option>
{{/each}}
</select>
<div class="dependent-inline-block">
<label for="id_realm_message_content_edit_limit_minutes" class="inline-block realm-time-limit-label">
{{t 'N' }}:
</label>
<input type="text" id="id_realm_message_content_edit_limit_minutes"
name="realm_message_content_edit_limit_minutes"
class="admin-realm-time-limit-input prop-element"
autocomplete="off"
value="{{ realm_message_content_edit_limit_minutes }}"/>
</div>
</div>
{{> settings_checkbox
setting_name="realm_allow_community_topic_editing"
prefix="id_"
is_checked=realm_allow_community_topic_editing
label=admin_settings_label.realm_allow_community_topic_editing}}
{{> settings_checkbox
setting_name="realm_allow_edit_history"
prefix="id_"
is_checked=realm_allow_edit_history
label=admin_settings_label.realm_allow_edit_history}}
<div class="input-group">
<label for="realm_msg_delete_limit_setting" class="dropdown-title">
{{t "Allow message deleting" }}
<i class="fa fa-info-circle settings-info-icon realm_allow_message_deleting_tooltip tippy-zulip-tooltip"
aria-hidden="true" data-tippy-content="{{t 'Administrators can always delete any message.' }}"></i>
</label>
<select name="realm_msg_delete_limit_setting" id="id_realm_msg_delete_limit_setting" class="prop-element">
{{#each msg_delete_limit_dropdown_values}}
<option value="{{0}}">{{1.text}}</option>
{{/each}}
</select>
<div class="dependent-inline-block">
<label for="id_realm_message_content_delete_limit_minutes" class="inline-block realm-time-limit-label">
{{t 'N' }}:
</label>
<input type="text" id="id_realm_message_content_delete_limit_minutes"
name="realm_message_content_delete_limit_minutes"
class="admin-realm-time-limit-input prop-element"
autocomplete="off"
value="{{ realm_message_content_delete_limit_minutes }}"/>
</div>
</div>
</div>
</div>
<div id="org-other-permissions" class="org-subsection-parent">
<div class="subsection-header">
<h3>{{t "Other permissions" }}</h3>

64
static/templates/settings/organization_settings_admin.hbs
View File

@ -1,70 +1,6 @@
<div id="organization-settings" data-name="organization-settings" class="settings-section">
<form class="form-horizontal admin-realm-form org-settings-form">
<div id="org-msg-editing" class="org-subsection-parent">
<div class="subsection-header">
<h3>{{t "Message editing" }}
{{> ../help_link_widget link="/help/configure-message-editing-and-deletion" }}
</h3>
{{> settings_save_discard_widget section_name="msg-editing" }}
</div>
<div class="inline-block organization-settings-parent">
<div class="input-group">
<label for="realm_msg_edit_limit_setting" class="dropdown-title">{{t "Allow message editing" }}</label>
<select name="realm_msg_edit_limit_setting" id="id_realm_msg_edit_limit_setting" class="prop-element">
{{#each msg_edit_limit_dropdown_values}}
<option value="{{0}}">{{1.text}}</option>
{{/each}}
</select>
<div class="dependent-inline-block">
<label for="id_realm_message_content_edit_limit_minutes" class="inline-block realm-time-limit-label">
{{t 'N' }}:
</label>
<input type="text" id="id_realm_message_content_edit_limit_minutes"
name="realm_message_content_edit_limit_minutes"
class="admin-realm-time-limit-input prop-element"
autocomplete="off"
value="{{ realm_message_content_edit_limit_minutes }}"/>
</div>
</div>
{{> settings_checkbox
setting_name="realm_allow_community_topic_editing"
prefix="id_"
is_checked=realm_allow_community_topic_editing
label=admin_settings_label.realm_allow_community_topic_editing}}
{{> settings_checkbox
setting_name="realm_allow_edit_history"
prefix="id_"
is_checked=realm_allow_edit_history
label=admin_settings_label.realm_allow_edit_history}}
<div class="input-group">
<label for="realm_msg_delete_limit_setting" class="dropdown-title">
{{t "Allow message deleting" }}
<i class="fa fa-info-circle settings-info-icon realm_allow_message_deleting_tooltip tippy-zulip-tooltip"
aria-hidden="true" data-tippy-content="{{t 'Administrators can always delete any message.' }}"></i>
</label>
<select name="realm_msg_delete_limit_setting" id="id_realm_msg_delete_limit_setting" class="prop-element">
{{#each msg_delete_limit_dropdown_values}}
<option value="{{0}}">{{1.text}}</option>
{{/each}}
</select>
<div class="dependent-inline-block">
<label for="id_realm_message_content_delete_limit_minutes" class="inline-block realm-time-limit-label">
{{t 'N' }}:
</label>
<input type="text" id="id_realm_message_content_delete_limit_minutes"
name="realm_message_content_delete_limit_minutes"
class="admin-realm-time-limit-input prop-element"
autocomplete="off"
value="{{ realm_message_content_delete_limit_minutes }}"/>
</div>
</div>
</div>
</div>
<div id="org-notifications" class="org-subsection-parent">
<div class="subsection-header">
<h3>{{t "Notifications" }}</h3>

2
templates/zerver/help/community-topic-edits.md
View File

@ -17,7 +17,7 @@ for details.
{start_tabs}
{settings_tab|organization-settings}
{settings_tab|organization-permissions}
2. Under **Message editing**, uncheck **Users can edit the topic of any message**.

2
templates/zerver/help/configure-message-editing-and-deletion.md
View File

@ -55,7 +55,7 @@ You can access the message editing and deletion settings as follows.
{start_tabs}
{settings_tab|organization-settings}
{settings_tab|organization-permissions}
4. Under **Message editing**, configure **Allow message editing**,
**Users can edit the topic of any message**, and **Allow message deleting**.

2
templates/zerver/help/disable-message-edit-history.md
View File

@ -13,7 +13,7 @@ also disable viewing of message edit history more generally.
{start_tabs}
{settings_tab|organization-settings}
{settings_tab|organization-permissions}
2. Under **Message editing**, uncheck **Enable message edit history**.