Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

HTML templates: Switch from Humbug to Zulip in user-visible text. 

(imported from commit 07b4e92c270d3b7b0967ea5b6cf5821bf95d166a)
This commit is contained in:
Jessica McKellar 2013-07-10 16:14:08 -04:00
parent 116ad8da5f
commit 3f3b229578
17 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/zephyr/api.html
View File

@ -41,7 +41,7 @@
<span class="na">email</span><span class="o">=</span><span class="s">BOT_EMAIL_ADDRESS</span>
</pre></div>
<p><strong>Don't want to make it yourself?</strong> Humbug <a href="/integrations">already integrates with lots of services</a>.</p>
<p><strong>Don't want to make it yourself?</strong> Zulip <a href="/integrations">already integrates with lots of services</a>.</p>
<p>&nbsp;</p>
@ -58,7 +58,7 @@
<p>No download required!</p>
{% comment %}
These code snippets are generated using our very own Humbug tool, by
These code snippets are generated using our very own Zulip tool, by
sending them to myself in a code block, and then using the inspector
to pull out the resulting HTML :)
{% endcomment %}
@ -115,7 +115,7 @@ to pull out the resulting HTML :)
<div class="tab-pane" id="commandline">
<p>You can use <code>humbug-send</code> (found in <code>bin/</code> in the tarball) to easily send Humbugs from the command-line, providing the message to be sent on STDIN.
<p>You can use <code>humbug-send</code> (found in <code>bin/</code> in the tarball) to easily send Zulips from the command-line, providing the message to be sent on STDIN.
<h4>Stream message</h4>
<div class="codehilite"><pre>humbug-send --stream Denmark --subject Castle \

4
templates/zephyr/base.html
View File

@ -8,9 +8,9 @@
<head>
<meta charset="UTF-8">
{% if user_profile.realm.domain %}
<title>{{user_profile.realm.domain}} - Humbug</title>
<title>{{user_profile.realm.domain}} - Zulip</title>
{% else %}
<title>Humbug</title>
<title>Zulip</title>
{% endif %}
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>

8
templates/zephyr/features.html
View File

@ -69,7 +69,7 @@
<i class="icon-vector-envelope icon-vector-2x pull-left"></i>
<h4>Emails for important missed messages</h4>
<p>If you're missing important conversations when you're away from
Humbug, we'll send you an email summary so you're always in the
Zulip, we'll send you an email summary so you're always in the
loop.</p>
</div>
<div>
@ -143,14 +143,14 @@
<div>
<i class="icon-vector-mobile-phone icon-vector-2x pull-left"></i>
<h4>Mobile apps</h4>
<p>Check Humbug on the go with native <a href="/apps">iOS and
<p>Check Zulip on the go with native <a href="/apps">iOS and
Android apps</a>.</p>
</div>
<div>
<i class="icon-vector-desktop icon-vector-2x pull-left"></i>
<h4>OSX desktop app</h4>
<p>Prefer Humbug in its own window with its own Dock icon?
Enjoy <a href="/apps">Humbug for Mac</a>.</p>
<p>Prefer Zulip in its own window with its own Dock icon?
Enjoy <a href="/apps">Zulip for Mac</a>.</p>
</div>
</div>
</div>

2
templates/zephyr/home.html
View File

@ -40,7 +40,7 @@
<div id="loading_more_messages_indicator"></div>
<div id="page_loading_indicator"></div>
<div id="first_run_message" class="empty_feed_notice">
<h4>Welcome to Humbug</h4>
<h4>Welcome to Zulip</h4>
<p>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.</p>

2
templates/zephyr/invite_user.html
View File

@ -2,7 +2,7 @@
aria-labelledby="invite-user-label" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="invite-user-label">Invite coworkers to Humbug</h3>
<h3 id="invite-user-label">Invite coworkers to Zulip</h3>
</div>
<form id="invite_user_form" class="form-horizontal"
action="/json/invite_users" method="POST">{% csrf_token %}

2
templates/zephyr/jobs/index.html
View File

@ -3,7 +3,7 @@
{% block portico_content %}
<div class="row-fluid">
<div class="span8">
<h1>Jobs at Humbug</h1>
<h1>Jobs at Zulip</h1>
<ul class="breadcrumb">
<li><a href="/">Home</a> <span class="divider">/</span></li>
<li class="active">Jobs</li>

20
templates/zephyr/markdown_help.html
View File

@ -18,8 +18,8 @@
<td><b>bold</b></td>
</tr>
<tr>
<td>[Bah!](http://humbughq.com)</td>
<td><a href="http://humbughq.com" target="_blank">Bah!</a></td>
<td>[Zulip](http://zulip.com)</td>
<td><a href="http://zulip.com" target="_blank">Zulip</a></td>
</tr>
<tr>
<td>* Archimedes<br/>
@ -45,20 +45,20 @@
</tr>
<tr>
<td class="preserve_spaces">~~~
def bah():
print "Humbug"
def zulip():
print "Zulip"
~~~</td>
<td><pre>def bah():
print "Humbug"</pre></td>
<td><pre>def zulip():
print "Zulip"</pre></td>
</tr>
<tr>
<td class="preserve_spaces">~~~ .py
def bah():
print "Humbug"
def zulip():
print "Zulip"
~~~</td>
<td>
<div class="codehilite"><pre><span class="k">def</span> <span class="nf">bah</span><span class="p">():</span>
<span class="k">print</span> <span class="s">"Humbug"</span></pre></div>
<div class="codehilite"><pre><span class="k">def</span> <span class="nf">zulip</span><span class="p">():</span>
<span class="k">print</span> <span class="s">"Zulip"</span></pre></div>
</td>
</tr>
<tr>

8
templates/zephyr/missed_message_email.txt
View File

@ -17,17 +17,17 @@ While you were away you received {{ messages|length }} new message{{ messages|pl
{% endfor %}
Click here to log in to Humbug and view your new messages:
Click here to log in to Zulip and view your new messages:
{{ url }}
{% if reply_warning %}
Please do not reply to this automated message. To respond to the missed messages you have received, please log on to Humbug and send your replies there.
Please do not reply to this automated message. To respond to the missed messages you have received, please log on to Zulip and send your replies there.
{% endif %}
Cheers,
The Humbug Team
The Zulip Team
Note: click here to open your Humbug Settings page and disable future email notifications:
Note: click here to open your Zulip Settings page and disable future email notifications:
https://humbughq.com/#settings

8
templates/zephyr/missed_message_email_html.txt
View File

@ -27,14 +27,14 @@ While you were away you received {{ message_count }} new message{{ message_count
</div>
<p><a href="{{ url }}">Click here to log in to Humbug and view your new messages.</a></p>
<p><a href="{{ url }}">Click here to log in to Zulip and view your new messages.</a></p>
{% if reply_warning %}
<p>Please do not reply to this automated message. To respond to the missed messages you have received, please log on to Humbug and send your replies there.</p>
<p>Please do not reply to this automated message. To respond to the missed messages you have received, please log on to Zulip and send your replies there.</p>
{% endif %}
<p>Cheers,
<br>
The Humbug Team</p>
The Zulip Team</p>
<p>Note: click <a href="https://humbughq.com/#settings">here</a> to open your Humbug Settings page and disable future email notifications</p>
<p>Note: click <a href="https://humbughq.com/#settings">here</a> to open your Zulip Settings page and disable future email notifications</p>

4
templates/zephyr/navbar.html
View File

@ -3,7 +3,7 @@
<div class="container-fluid">
<div class="row-fluid position-relative">
<div class="span2 hidden-phone">
<a class="brand logo" href="#">Humbug</a>
<a class="brand logo" href="#">Zulip</a>
</div>
<div class="span8" id="navbar-middle">
<a class="brand skinny-user-gravatar visible-phone" href="#"
@ -58,7 +58,7 @@
</li>
<li class="divider"></li>
{% if show_invites %}
<li title="Invite coworkers to Humbug">
<li title="Invite coworkers to Zulip">
<a href="#invite-user" role="button" data-toggle="modal">
<i class="icon-plus-sign"></i> Invite coworkers
</a>

8
templates/zephyr/new-user.html
View File

@ -11,7 +11,7 @@
<li class="active">New user guide</li>
</ul>
<p>Humbug is a little different than some chat systems you may have already
<p>Zulip is a little different than some chat systems you may have already
used.<br />
Here's what you need to know:</p>
@ -35,14 +35,14 @@
<p>Here, we have three conversations occurring simultaneously:</p>
<ul>
<li>One on stream "humbug" with subject "Lunch", about where to go to lunch</li>
<li>One on stream "humbug" with subject "Humbug testers", about early beta testers</li>
<li>One on stream "zulip" with subject "Lunch", about where to go to lunch</li>
<li>One on stream "zulip" with subject "Zulip testers", about early beta testers</li>
<li>One automated notification on stream "commits", about a commit made to the repository</li>
</ul>
<h3>Some things to know</h3>
<ul>
<li>"Enter" will start a reply to the message with the blue line by it (in the example above, the one with subject "Humbug testers")</li>
<li>"Enter" will start a reply to the message with the blue line by it (in the example above, the one with subject "Zulip testers")</li>
<li>When you send the reply, it will appear at the very bottom of the stream (not directly below the message you reply to)</li>
<li>We have mobile apps, an API, and integrations with many popular services</li>
</ul>

4
templates/zephyr/portico.html
View File

@ -18,7 +18,7 @@ hence the name.
<div class="navbar navbar-inverse">
<div class="navbar-inner">
<div class="content">
<a class="brand" href="/">Humbug</a>
<a class="brand" href="/">Zulip</a>
<ul class="nav pull-right">
<li><a href="/accounts/login/?next=/">Log in</a></li>
{# TODO: Can we make this more buttony? #}
@ -34,7 +34,7 @@ hence the name.
<div class="content">
<div id="portico-area" class="offset2 span10">
<div class="title">
<a class="title" href="/">Humbug</a>
<a class="title" href="/">Zulip</a>
<span class="for_you">{% block for_you %}{% endblock %}</span>
</div>
{% block portico_content %}

6
templates/zephyr/right-sidebar.html
View File

@ -1,11 +1,11 @@
<div class="row right_sidebar">
<div class="span2 sidebar-nav affix" id="right-sidebar">
<div class="alert alert_sidebar alert-error home-error-bar" id="connection-error">
<strong>Unable to connect to Humbug.</strong> Updates may be delayed.
<strong>Unable to connect to Zulip.</strong> Updates may be delayed.
<br /><br /> Retrying soon... <br /><br /> <a class="restart_get_updates_button">Try now</a>.
</div>
<div class="alert alert_sidebar alert-error home-error-bar" id="get_old_messages_error">
<strong>Unable to connect to Humbug.</strong> Could not fetch messages.
<strong>Unable to connect to Zulip.</strong> Could not fetch messages.
<br /><br /> Retrying soon... <br /><br />
</div>
<div id="feedback_section">
@ -14,7 +14,7 @@
</button>
</div>
<div id="onboarding">
<p id="onboarding-header">Get started with Humbug!</p>
<p id="onboarding-header">Get started with Zulip!</p>
<div id="onboarding-checklist">
</div>
</div>

8
templates/zephyr/signup.html
View File

@ -12,7 +12,7 @@
<div class="content">
<div class="span12 main-headline">
<h1>Sign up now!</h1>
<h4>Humbug is currently in closed beta, but we're constantly
<h4>Zulip is currently in closed beta, but we're constantly
adding new beta customer sites.</h4>
</div>
</div>
@ -46,7 +46,7 @@
<form method="post" class="letter-form" id="beta-user-form" action="{% url 'beta-signup-submission' %}">
{% csrf_token %}
<p>&nbsp;</p>
<p>Hi Humbugs,</p>
<p>Hi Zulips,</p>
<p>My name is <input class="input-medium" type="text"
id="name" name="name" placeholder="Wolfgang A. Mozart" />, and
@ -57,7 +57,7 @@
<p>I work at <input class="input-large" type="text"
name="company" id="company" placeholder="Salzburg Court" />,
and I wanted to try Humbug. There are
and I wanted to try Zulip. There are
about <input class="input-mini" type="text" id="count"
name="count" placeholder="10" /> of us, and today we use
<input class="input-small" type="text" id="product"
@ -76,7 +76,7 @@
<div class="row-fluid shaded-background landing-page-bottom">
<div class="content">
<div class="span6 offset3 muted">
Does your company already use Humbug? <a href="{% url 'register' %}">Register your account here</a>.
Does your company already use Zulip? <a href="{% url 'register' %}">Register your account here</a>.
</div>
</div>
</div>

6
templates/zephyr/tutorial_finale.html
View File

@ -1,7 +1,7 @@
<div class="modal hide" id="tutorial-finale" tabindex="-1" role="dialog"
aria-labelledby="tutorial-finale-label" aria-hidden="true">
<div class="modal-header">
<h3 id="tutorial-finale-label">Why Humbug?</h3>
<h3 id="tutorial-finale-label">Why Zulip?</h3>
</div>
<div class="modal-body">
<b>We make it easy for you to see the things you care about.</b>
@ -11,11 +11,11 @@
interest you, and quickly ignore the ones that don't.
</p>
<p>
This is critical, because it means you can return to Humbug after being
This is critical, because it means you can return to Zulip after being
away for hours without missing the important stuff.
</p>
<p>
Now go forth and enjoy Humbug!
Now go forth and enjoy Zulip!
</p>
</div>
<div class="modal-footer">

4
templates/zephyr/what-is-humbug.html
View File

@ -8,7 +8,7 @@
<p class="lead">The group communication product you've always wanted.</p>
<ul class="breadcrumb">
<li><a href="/">Home</a> <span class="divider">/</span></li>
<li class="active">What is Humbug?</li>
<li class="active">What is Zulip?</li>
</ul>
<p>Email. We all get too much of it.</p>
@ -33,7 +33,7 @@
<li>Let you easily follow many different conversations</li>
</ul>
<p><strong>That's where Humbug comes in</strong>. Based on our
<p><strong>That's where Zulip comes in</strong>. Based on our
experience at MIT, Ksplice, and Oracle, we're solving this
problem, with a webapp and native mobile apps for Android and
iPhone. We are currently in closed beta.</p>

22
templates/zephyr/zephyr.html
View File

@ -5,13 +5,13 @@
{% block portico_content %}
<div class="row-fluid">
<div class="span8">
<h2>Zephyr Mirroring for Humbug</h2>
<h2>Zephyr Mirroring for Zulip</h2>
<p>Thanks for giving Humbug a try! This page describes how to use
Humbug as to use MIT Zephyr; if you're not a current Zephyr user,
you probably want to visit the main Humbug website.</p>
<p>Thanks for giving Zulip a try! This page describes how to use
Zulip as to use MIT Zephyr; if you're not a current Zephyr user,
you probably want to visit the main Zulip website.</p>
<p>There are a few steps you need to take to setup Humbug for your
<p>There are a few steps you need to take to setup Zulip for your
MIT Zephyr account.</p>
<h3>First time setup</h3>
@ -28,12 +28,12 @@ MIT Zephyr account.</p>
run the following command:<br />
<code>/mit/tabbott/humbug/zephyr_mirror.py --sync-subscriptions</code></p>
<p> NOTE: Humbug does not fully support the equivalent of Barnowl
<p> NOTE: Zulip does not fully support the equivalent of Barnowl
filters. If you have too many subscriptions (you know who you
are), you may want to either manually subscribe to just your main
barnowl view or make extensive use of the "Not in home view"
option on streams. You can add or remove subscriptions from the
Humbug app (or your Humbug home view) by clicking the gear in the
Zulip app (or your Zulip home view) by clicking the gear in the
upper right-hand corner and then selecting "Streams."</p>
</ol>
@ -47,9 +47,9 @@ MIT Zephyr account.</p>
<p><strong>IMPORTANT: You must keep the Zephyr mirroring script
always running in a session with unexpired Kerberos
tickets.</strong> The script forwards personals you receive on
Zephyr to Humbug, and forwards messages you send in Humbug to
Zephyr. <strong>If it is not running, only other Humbug users
will receive messages you send from Humbug!</strong>. The Humbug
Zephyr to Zulip, and forwards messages you send in Zulip to
Zephyr. <strong>If it is not running, only other Zulip users
will receive messages you send from Zulip!</strong>. The Zulip
web application will warn you if the Zephyr mirroring script is
not running.</p>
@ -78,7 +78,7 @@ MIT Zephyr account.</p>
<p>This will run the Zephyr Mirroring script inside a screen
session, and use `/mit/kchen/bin/cont-renew-notify` to continually
renew your Kerberos tickets for up to a week; each week, it will
send you a Zephyr/Humbug letting you know that you need to renew
send you a Zephyr/Zulip letting you know that you need to renew
your tickets. To do so, login to the server that you setup the
screen session on and use the following procedure:</p>