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

home: Send rendered realm description for spectators.

Browse Source 
Display rendered markdown after passing it through our local
rendered_markdown JS library.
This commit is contained in:
Aman Agrawal
2022-02-15 09:58:53 +00:00
parent 73266350ef
commit c396c2f7a4
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/ui_init.js
View File

@@ -62,6 +62,7 @@ import * as realm_playground from "./realm_playground";
import * as realm_user_settings_defaults from "./realm_user_settings_defaults"; import * as realm_user_settings_defaults from "./realm_user_settings_defaults";
import * as recent_topics_util from "./recent_topics_util"; import * as recent_topics_util from "./recent_topics_util";
import * as reload from "./reload"; import * as reload from "./reload";
import * as rendered_markdown from "./rendered_markdown";
import * as resize from "./resize"; import * as resize from "./resize";
import * as rows from "./rows"; import * as rows from "./rows";
import * as scroll_bar from "./scroll_bar"; import * as scroll_bar from "./scroll_bar";
@@ -158,6 +159,11 @@ function initialize_right_sidebar() {
}); });
$("#right-sidebar-container").html(rendered_sidebar); $("#right-sidebar-container").html(rendered_sidebar);
if (page_params.is_spectator) {
rendered_markdown.update_elements(
$(".right-sidebar .realm-description .rendered_markdown"),
);
}
$("#user_presences").on("mouseenter", ".user_sidebar_entry", (e) => { $("#user_presences").on("mouseenter", ".user_sidebar_entry", (e) => {
const status_emoji = $(e.target).closest(".user_sidebar_entry").find("img.status_emoji"); const status_emoji = $(e.target).closest(".user_sidebar_entry").find("img.status_emoji");

5
static/styles/right_sidebar.css
View File

@@ -253,9 +253,4 @@
width: 100%; width: 100%;
margin-bottom: 10px; margin-bottom: 10px;
} }
ul,
ol {
margin-left: 0;
}
} }

2
static/templates/right_sidebar.hbs
View File

@@ -31,7 +31,7 @@
</a> </a>
<div class="only-visible-for-spectators"> <div class="only-visible-for-spectators">
<div class="realm-description"> <div class="realm-description">
<p>{{ realm_description }}</p> <div class="rendered_markdown">{{rendered_markdown realm_description }}</div>
<a href="/register" class="signup_button color_animated_button"> <a href="/register" class="signup_button color_animated_button">
<i class="fa fa-pencil-square-o"></i> <i class="fa fa-pencil-square-o"></i>
<span>{{t 'Sign up' }}</span> <span>{{t 'Sign up' }}</span>

6
zerver/lib/home.py
View File

@@ -15,6 +15,7 @@ from zerver.lib.i18n import (
get_language_list, get_language_list,
get_language_translation_data, get_language_translation_data,
) )
from zerver.lib.realm_description import get_realm_rendered_description
from zerver.lib.request import RequestNotes from zerver.lib.request import RequestNotes
from zerver.models import Message, Realm, Stream, UserProfile from zerver.models import Message, Realm, Stream, UserProfile
from zerver.views.message_flags import get_latest_update_message_flag_activity from zerver.views.message_flags import get_latest_update_message_flag_activity
@@ -239,4 +240,9 @@ def build_page_params_for_home_page_load(
page_params["translation_data"] = get_language_translation_data(request_language) page_params["translation_data"] = get_language_translation_data(request_language)
if user_profile is None:
# Get rendered version of realm description which is displayed in right
# sidebar for spectator.
page_params["realm_description"] = get_realm_rendered_description(realm)
return register_ret["queue_id"], page_params return register_ret["queue_id"], page_params