paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream_settings: Replace non-standard tooltip for "Announce stream" hint.

Browse Source 
The tooltip for the "Announce Stream" hint was not consistent with the
rest of the settings so it has now been replaced with the standard tippy
tooltip. The "?" icon has also been replaced by the "i" icon to match
the other settings.

Fixes: #21312.
This commit is contained in:
Raghav Luthra
2022-03-26 01:11:10 +05:30
committed by Tim Abbott
parent a9ce02348b
commit bbda7a5bb0
2 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
static/js/stream_create.js
View File

@@ -1,4 +1,5 @@
import $ from "jquery"; import $ from "jquery";
import tippy from "tippy.js";
import render_announce_stream_docs from "../templates/announce_stream_docs.hbs"; import render_announce_stream_docs from "../templates/announce_stream_docs.hbs";
import render_subscription_invites_warning_modal from "../templates/confirm_dialog/confirm_subscription_invites_warning.hbs"; import render_subscription_invites_warning_modal from "../templates/confirm_dialog/confirm_subscription_invites_warning.hbs";
@@ -14,6 +15,7 @@ import * as stream_create_subscribers from "./stream_create_subscribers";
import * as stream_data from "./stream_data"; import * as stream_data from "./stream_data";
import * as stream_settings_ui from "./stream_settings_ui"; import * as stream_settings_ui from "./stream_settings_ui";
import * as ui_report from "./ui_report"; import * as ui_report from "./ui_report";
import {parse_html} from "./ui_util";
let created_stream; let created_stream;
@@ -385,28 +387,13 @@ export function set_up_handlers() {
stream_name_error.pre_validate(stream_name); stream_name_error.pre_validate(stream_name);
}); });
$container.on("mouseover", "#announce-stream-docs", (e) => { tippy("#announce-stream-docs", {
const $announce_stream_docs = $("#announce-stream-docs"); content: () =>
$announce_stream_docs.popover({ parse_html(
placement: "right", render_announce_stream_docs({
content: render_announce_stream_docs({ notifications_stream: stream_data.get_notifications_stream(),
notifications_stream: stream_data.get_notifications_stream(), }),
}), ),
html: true,
trigger: "manual",
});
$announce_stream_docs.popover("show");
$announce_stream_docs.data("popover").tip().css("z-index", 2000);
$announce_stream_docs
.data("popover")
.tip()
.find(".popover-content")
.css("margin", "9px 14px");
e.stopPropagation();
});
$container.on("mouseout", "#announce-stream-docs", (e) => {
$("#announce-stream-docs").popover("hide");
e.stopPropagation();
}); });
// Do not allow the user to enter newline characters while typing out the // Do not allow the user to enter newline characters while typing out the

2
static/templates/stream_settings/stream_types.hbs
View File

@@ -20,7 +20,7 @@
<span></span> <span></span>
{{t "Announce stream" }} {{t "Announce stream" }}
</label> </label>
<span class="fa fa-question-circle settings-info-icon" aria-hidden="true" id="announce-stream-docs"></span> <span class="fa fa-info-circle settings-info-icon" aria-hidden="true" id="announce-stream-docs"></span>
</div> </div>
{{/if}} {{/if}}