From 307d3673461de1c6f20aa89a1b45eeee03bdd9c0 Mon Sep 17 00:00:00 2001 From: Waseem Daher Date: Tue, 15 Jul 2014 14:21:03 -0700 Subject: [PATCH] Initial support for white-labeling Zulip as "Dropbox Chat" or otherwise. Known issues: * No support for whitelabeling in the email * No whitelabeling for any externally-visible branding (imported from commit 9eab7b0744e56a87007b8621a8bb18bbb1080256) --- static/images/logo/dbxcornerlogo@2x.png | Bin 0 -> 6099 bytes static/js/notifications.js | 2 +- static/templates/settings_tab.handlebars | 6 +++--- templates/zerver/base.html | 2 +- templates/zerver/home.html | 2 +- templates/zerver/invite_user.html | 2 +- templates/zerver/markdown_help.html | 12 ++++++------ templates/zerver/navbar.html | 7 +++---- templates/zerver/right-sidebar.html | 10 +++++----- zerver/views/__init__.py | 9 +++++++++ 10 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 static/images/logo/dbxcornerlogo@2x.png diff --git a/static/images/logo/dbxcornerlogo@2x.png b/static/images/logo/dbxcornerlogo@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ee41c0f28240649e97031ddd9e5008918d4932f6 GIT binary patch literal 6099 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 Z_#e&Ms@bKCo8kZf002ovPDHLkV1g=Nx`6-y literal 0 HcmV?d00001 diff --git a/static/js/notifications.js b/static/js/notifications.js index 4e1e8e72df..b8e3b3caea 100644 --- a/static/js/notifications.js +++ b/static/js/notifications.js @@ -143,7 +143,7 @@ exports.redraw_title = function () { var n; var new_title = (new_message_count ? ("(" + new_message_count + ") ") : "") - + page_params.realm_name + " - Zulip"; + + page_params.realm_name + " - " + page_params.product_name; if (document.title === new_title) { return; diff --git a/static/templates/settings_tab.handlebars b/static/templates/settings_tab.handlebars index f7fe3ee5fc..c090fbd783 100644 --- a/static/templates/settings_tab.handlebars +++ b/static/templates/settings_tab.handlebars @@ -89,7 +89,7 @@
Notifications
-
You'll receive notifications when a message arrives and Zulip isn't in focus or the message is offscreen.
+
You'll receive notifications when a message arrives and {{ page_params.product_name }} isn't in focus or the message is offscreen.

Stream messages

@@ -314,11 +314,11 @@ {{#if_or page_params.show_autoscroll_forever_option page_params.show_default_desktop_notifications_option}}
-
Zulip Labs
+
{{ page_params.product_name }} Labs

- Zulip Labs is where you can try out some experimental new + {{ page_params.product_name }} Labs is where you can try out some experimental new features we're working on. Let us know what you think!

diff --git a/templates/zerver/base.html b/templates/zerver/base.html index 155532f207..895a8d32ab 100644 --- a/templates/zerver/base.html +++ b/templates/zerver/base.html @@ -9,7 +9,7 @@ {% block title %} {% if user_profile.realm.name %} - {{user_profile.realm.name}} - Zulip + {{user_profile.realm.name}} - {{product_name}} {% else %} Zulip {% endif %} diff --git a/templates/zerver/home.html b/templates/zerver/home.html index e12ce841bf..6410ba104f 100644 --- a/templates/zerver/home.html +++ b/templates/zerver/home.html @@ -3,7 +3,7 @@
-

Welcome to Zulip

+

Welcome to {{product_name}}

See, the thing about it is... there aren't any messages here for you right now. I'm sure someone will eventually send you one.

diff --git a/templates/zerver/invite_user.html b/templates/zerver/invite_user.html index f5def7e661..416e0ca5fd 100644 --- a/templates/zerver/invite_user.html +++ b/templates/zerver/invite_user.html @@ -2,7 +2,7 @@ aria-labelledby="invite-user-label" aria-hidden="true">
-

Invite coworkers to Zulip

+

Invite coworkers to {{product_name}}

{% csrf_token %} diff --git a/templates/zerver/markdown_help.html b/templates/zerver/markdown_help.html index b448ba3923..ba5037ba24 100644 --- a/templates/zerver/markdown_help.html +++ b/templates/zerver/markdown_help.html @@ -18,8 +18,8 @@ bold - [Zulip](http://zulip.com) - Zulip + [{{product_name}}](https://zulip.com) + {{product_name}} * Archimedes
@@ -54,19 +54,19 @@ ``` def zulip(): - print "Zulip" + print "{{product_name}}" ``` 
def zulip():
-    print "Zulip"
+ print "{{product_name}}" ``` .py def zulip(): - print "Zulip" + print "{{product_name}}" ``` 
def zulip():
-    print "Zulip"
+ print "{{product_name}}"
diff --git a/templates/zerver/navbar.html b/templates/zerver/navbar.html index 023e1c32f6..290b3c5ca2 100644 --- a/templates/zerver/navbar.html +++ b/templates/zerver/navbar.html @@ -1,7 +1,7 @@
- +