paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 12:33:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

message_edit: Replace checkboxes with settings_checkbox partial.

Browse Source 
This commits replaces the custom `send_notification` message_edit
checkboxes with our `settings_checkbox` partial.

The main intention is to also support the feature of selecting a
checkbox by clicking over its corresponding label as we have
in the case of the organization settings checkboxes.

Due to above change, this commit also removes the redundant
`break-row` HTML class along with it styles.
This commit is contained in:
aryanshridhar
2021-07-21 13:41:25 +00:00
committed by Tim Abbott
parent a8887948cb
commit 54a1c73c78
4 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/message_edit.js
View File

@@ -832,10 +832,10 @@ export function save_message_row_edit(row) {
const selected_topic_propagation =
row.find("select.message_edit_topic_propagate").val() || "change_later";
const send_notification_to_old_thread = row
.find(".send_notification_to_old_thread")
.find("#id_send_notification_to_old_thread")
.is(":checked");
const send_notification_to_new_thread = row
.find(".send_notification_to_new_thread")
.find("#id_send_notification_to_new_thread")
.is(":checked");
request.propagate_mode = selected_topic_propagation;
request.send_notification_to_old_thread = send_notification_to_old_thread;

7
static/styles/app_components.css
View File

@@ -9,13 +9,6 @@
justify-content: center;
}
/* Inserting this collapsed row between two flex items will make
* the flex item that comes after it break to a new row */
.break-row {
flex-basis: 100%;
height: 0;
}
.hide {
display: none;
}

5
static/styles/zulip.css
View File

@@ -2544,6 +2544,11 @@ div.topic_edit_spinner .loading_indicator_spinner {
border-radius: 1px 4px 4px 1px !important;
}
/* Remove the bottom margin from the notification checkboxes */
.message_edit_breadcrumb_messages .input-group {
margin-bottom: 0;
}
.stream_header_colorblock {
margin-bottom: 20px;
}

21
static/templates/message_edit_form.hbs
View File

@@ -18,17 +18,16 @@
<i class="fa fa-angle-right" aria-hidden="true" {{#unless is_stream_editable}}style="display:none"{{/unless}}></i>
<input type="text" placeholder="{{topic}}" value="{{topic}}" class="message_edit_topic" id="message_edit_topic" autocomplete="off" />
<div class="message_edit_breadcrumb_messages" style='display:none;'>
<label class="checkbox">
<input class="send_notification_to_new_thread" name="send_notification_to_new_thread" type="checkbox" {{#if notify_new_thread}}checked="checked"{{/if}} />
<span></span>
</label>
<label for="send_notification_to_new_thread">{{t "Send notification to new topic" }}</label>
<div class="break-row"></div> <!-- break -->
<label class="checkbox">
<input class="send_notification_to_old_thread" name="send_notification_to_old_thread" type="checkbox" {{#if notify_old_thread}}checked="checked"{{/if}} />
<span></span>
</label>
<label for="send_notification_to_old_thread">{{t "Send notification to old topic" }}</label>
{{> settings/settings_checkbox
setting_name="send_notification_to_new_thread"
prefix="id_"
is_checked=notify_new_thread
label=(t 'Send notification to new topic')}}
{{> settings/settings_checkbox
setting_name="send_notification_to_old_thread"
prefix="id_"
is_checked=notify_old_thread
label=(t 'Send notification to old topic')}}
</div>
<select class='message_edit_topic_propagate' style='display:none;'>
<option selected="selected" value="change_later"> {{t "Change later messages to this topic" }}</option>