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

home: Make emojiset an explicit parameter.

Browse Source 
This is cleaner than accessing the UserProfile object directly (we
don't really do that anywhere else).
This commit is contained in:
Tim Abbott
2018-05-06 22:35:53 -07:00
parent b3e4c702d1
commit 602b13db34
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zerver/app/index.html
View File

@@ -14,7 +14,7 @@
{% block customhead %} {% block customhead %}
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<link href="/static/images/logo/apple-touch-icon-precomposed.png" rel="apple-touch-icon-precomposed"> <link href="/static/images/logo/apple-touch-icon-precomposed.png" rel="apple-touch-icon-precomposed">
<link id="emoji-spritesheet" href="/static/generated/emoji/{{ user_profile.emojiset }}_sprite.css" rel="stylesheet" type="text/css"> <link id="emoji-spritesheet" href="/static/generated/emoji/{{ emojiset }}_sprite.css" rel="stylesheet" type="text/css">
<style type="text/css"> <style type="text/css">
#css-loading { #css-loading {
background: white; background: white;

1
zerver/views/home.py
View File

@@ -241,6 +241,7 @@ def home_real(request: HttpRequest) -> HttpResponse:
csp_nonce = generate_random_token(48) csp_nonce = generate_random_token(48)
response = render(request, 'zerver/app/index.html', response = render(request, 'zerver/app/index.html',
context={'user_profile': user_profile, context={'user_profile': user_profile,
'emojiset': user_profile.emojiset,
'page_params': JSONEncoderForHTML().encode(page_params), 'page_params': JSONEncoderForHTML().encode(page_params),
'csp_nonce': csp_nonce, 'csp_nonce': csp_nonce,
'avatar_url': avatar_url(user_profile), 'avatar_url': avatar_url(user_profile),