CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-30 21:11:04 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

message_edit: Remove Bootstrap cruft from message edit form.

Browse Source 
* Remove likely useless use of `controls` Bootstrap class.
* Remove outer control-group elements, which just added 10px bottom margin, and
  were always used with .no-margin, which removed that margin :).
* Rename message-edit-timer-control-group to message-edit-timer, since
  it isn't a control-group.
This commit is contained in:
Tim Abbott 2022-08-06 21:57:14 -07:00
parent 9c1c0016ed
commit 98c7427bfc
3 changed files with 36 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/message_edit.js
View File

@ -550,7 +550,7 @@ function edit_message($row, raw_content) {
editability !== editability_types.NO &&
page_params.realm_message_content_edit_limit_seconds > 0
) {
$row.find(".message-edit-timer-control-group").show();
$row.find(".message-edit-timer").show();
}
// add timer

6
static/styles/zulip.css
View File

@ -1458,7 +1458,7 @@ div.focused_table {
color: hsl(0, 0%, 63%);
}
.message-edit-timer-control-group {
.message-edit-timer {
float: right;
display: none;
margin-top: 5px;
@ -2549,10 +2549,6 @@ div.topic_edit_spinner .loading_indicator_spinner {
(which even has a background color of its own!). */
resize: none !important;
}
.control-group.no-margin {
margin-bottom: 0;
}
}
#topic_edit_form {

72
static/templates/message_edit_form.hbs
View File

@ -6,49 +6,45 @@
<span class="error-msg"></span>
</div>
{{#if is_stream}}
<div class="control-group no-margin">
<div class="controls edit-controls">
<div class="message_edit_header">
<div class="stream_header_colorblock" {{#unless is_stream_editable}}style="display:none"{{/unless}}></div>
<div class="select_stream_setting" {{#unless is_stream_editable}}style="display:none"{{/unless}}>
{{> settings/dropdown_list_widget
widget_name=select_move_stream_widget_name
list_placeholder=(t 'Filter streams')}}
</div>
<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>
<select class='message_edit_topic_propagate' style='display:none;'>
<option value="change_one"> {{t "Move only this message" }}</option>
<option selected="selected" value="change_later"> {{t "Move this and all following messages in this topic" }}</option>
<option value="change_all"> {{t "Move all messages in this topic" }}</option>
</select>
<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>
{{t "Send notification to new topic" }}
</label>
<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>
{{t "Send notification to old topic" }}
</label>
<div class="edit-controls">
<div class="message_edit_header">
<div class="stream_header_colorblock" {{#unless is_stream_editable}}style="display:none"{{/unless}}></div>
<div class="select_stream_setting" {{#unless is_stream_editable}}style="display:none"{{/unless}}>
{{> settings/dropdown_list_widget
widget_name=select_move_stream_widget_name
list_placeholder=(t 'Filter streams')}}
</div>
<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>
<select class='message_edit_topic_propagate' style='display:none;'>
<option value="change_one"> {{t "Move only this message" }}</option>
<option selected="selected" value="change_later"> {{t "Move this and all following messages in this topic" }}</option>
<option value="change_all"> {{t "Move all messages in this topic" }}</option>
</select>
<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>
{{t "Send notification to new topic" }}
</label>
<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>
{{t "Send notification to old topic" }}
</label>
</div>
</div>
{{/if}}
<div class="control-group no-margin">
<div class="controls edit-controls">
{{> copy_message_button message_id=this.message_id}}
<textarea class="message_edit_content" maxlength="{{ max_message_length }}">{{content}}</textarea>
<div class="scrolling_list preview_message_area" id="preview_message_area_{{message_id}}" style="display:none;">
<div class="markdown_preview_spinner"></div>
<div class="preview_content rendered_markdown"></div>
</div>
<div class="edit-controls">
{{> copy_message_button message_id=this.message_id}}
<textarea class="message_edit_content" maxlength="{{ max_message_length }}">{{content}}</textarea>
<div class="scrolling_list preview_message_area" id="preview_message_area_{{message_id}}" style="display:none;">
<div class="markdown_preview_spinner"></div>
<div class="preview_content rendered_markdown"></div>
</div>
</div>
<div class="control-group action-buttons">
<div class="action-buttons">
<div class="message_edit_spinner"></div>
<div class="controls edit-controls">
{{#if is_editable}}
@ -70,7 +66,7 @@
<button type="button" class="button small rounded message_edit_close">{{t "Close" }}</button>
{{/if}}
{{#if has_been_editable}}
<div class="message-edit-timer-control-group">
<div class="message-edit-timer">
<span class="message_edit_countdown_timer"></span>
<span>
<i id="message_edit_tooltip" class="tippy-zulip-tooltip message_edit_tooltip fa fa-question-circle" aria-hidden="true"