zulip/templates/zephyr/index.html

<!DOCTYPE html>
<html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    <meta charset="utf-8">
    <title>Humbug, from Humbug Inc.</title>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">

    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
    <!--[if lt IE 9]>
      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
    <![endif]-->

{% load jstemplate %}


{% block content %}

{% icanhazjs "zephyr" %}
{% autoescape off %}
<link href="/static/third/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/third/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
<link href="/static/third/jquery/jquery-ui-1.8.23.custom.css" rel="stylesheet">
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
<link href="static/styles/zephyr.css" rel="stylesheet">
{# We need to import jQuery before Bootstrap #}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js"></script>
<script src="/static/third/bootstrap/js/bootstrap.min.js"></script>
<script src="/static/js/common.js"></script>
<script type="text/javascript" src="/static/third/jquery/jquery.form.js"></script>
<script type="text/javascript" src="/static/third/ich/ICanHaz.min.js"></script>
<script type="text/javascript" src="/static/js/zephyr.js"></script>
<script type="text/javascript">
var initial_zephyr_array = {{ zephyr_array }};
var zephyr_dict = {{ zephyr_dict }};
var initial_pointer = {{ user_profile.pointer }};
var username = "{{ user_profile.user.username }}";
var class_list = {{ classes }};
var instance_list = {{ instances }};
var people_list = {{ people }};
</script>
{% endautoescape %}

<div class="container-fluid">
  <div class="row-fluid">
    <div class="span3">
      <div class="zephyr_well well sidebar-nav">
        <ul class="nav nav-list nav-zephyr">
          <span class="my_fullname">{{ user_profile.full_name }}</span><br/>
          <span class="my_email">{{ user_profile.email }}</span>
          <span class="logout">(<a href="/accounts/logout?next=/">not you?</a>)</span>
          <li><a href="subscriptions/">Manage subscriptions</a></li>
          <li><a href="#">View starred messages</a></li>
          <li><a href="">Search</a></li>
          <li><a href="#">Invite a friend</a></li>
          <br>
          <a href="#" class="btn btn-large btn-block button-slide">New Message</a>
        </ul>
      </div><!--/.well -->
    </div><!--/span-->
        <div class="span9">
          <div class="zephyr_list" id="main_div">
            <br/><br/>
            <table class="zephyr_table" id="table">
              <tbody>
              </tbody>
            </table>
            <br/><br/>
            <div class="row" id="narrowbox">
              <div class="input-prepend input-append pull-left">
                <button id="show_all_messages" class="btn" disabled=disabled onclick="show_all_messages()"><i class="icon-arrow-left"></i></button>
                <span class="add-on"><span class="badge"><span id="currently_narrowed_to"></span><i class="badge_close_button icon-remove-sign icon-white" onclick="show_all_messages()"></i></span></span>
              </div>
            </div>
            <div id="bottom_whitespace"></div>
          </div>
    <div class="tabbable container zephyr_compose">
        <ul class="nav nav-tabs" id="zephyr-type-tabs">
            <li class="active"><a href="#class-message" data-toggle="tab">Stream</a></li>
            <li><a href="#personal-message" data-toggle="tab">Huddle</a></li>
            <li class="alert" id="send-status"></li>
            <li class="pull-right"><button type="button" class="close" onclick="hide_compose()">×</button></li>
        </ul>

        <div class="tab-content">
            <div class="tab-pane active" id="class-message">
          <div class="zephyr_comp">
            <br/>
            <table>
              <tbody>
                <tr>
<td class="pointer"><p></p></td>
                <form action="/zephyr/" method="post" class="zephyr">
                    <input type="hidden" name="type" value="class" />
                    {% csrf_token %}
                        </div>
                    </div>

                  <td class="zephyr_recipient">
                    <p>
                      <span class="zephyr_label_clickable zephyr_class">
                            <input type="text" class="zephyr_recipient_box" name="class" id="class" value="" placeholder="Stream"/>
                      </span>
                      <br/>
                      <span class="zephyr_label_clickable zephyr_instance">

                            <input type="text" class="zephyr_recipient_box" name="instance" id="instance" value="" placeholder="Topic"/>
                      </span>
                    </p>
                  </td>
                  <td class="messagebox compose">
                    <img class="profile_picture" src="http://www.gravatar.com/avatar/a?d=identicon"/>
                    <p class="zephyr_text">
                            <textarea class="zephyr_message" name="new_zephyr" id="new_zephyr" value="" placeholder="Compose your message here..."/></textarea>
                        <input type="submit" value="Send" class="btn send_zephyr"/>
                    </p>
                  </td>
                </tr>
                <tr>
                    <td></td><td></td><td>
                </form>
                    </td>
                </tr>
              </tbody>
            </table>
          </div>

            </div>
            <div class="tab-pane" id="personal-message">
                <form action="/zephyr/" method="post" class="zephyr">
                    <input type="hidden" name="type" value="personal" />
                    {% csrf_token %}
                    <div class="row-fluid">
                        <div class="span6">
                            <label>User</label>
                            <input type="text" name="recipient" id="recipient" value="" />
                        </div>
                    </div>
                    <div class="row-fluid">
                        <div class="span12">
                            <label>Content</label>
                            <textarea rows="4" cols="60" name="new_zephyr" id="new_personal_zephyr" value="" /></textarea>
                            <input type="submit" name="personal_zephyr" value="Send personal" class="btn" />
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>

        </div><!--/span-->
      </div><!--/row-->


    <div class="row-fluid" id="connection-error">
        <div class="span12">
            <div class="alert alert-error">
                <strong>Can't receive messages</strong> &mdash; try reloading the page.
            </div>
        </div>
    </div>
    <div class="alert" id="class-dne">
        <p>The class <span class="classname" id="class-dne-name"></span> does not exist.</p>
        <a id="create-it" class="btn btn-primary" href="#">Create and send</a>
        <a class="btn" onClick="$('#class-dne').stop(true).fadeOut(500);">Cancel message</a>
    </div>
    <div class="alert" id="class-nosub">
        <p>You're not subscribed to the class <span class="classname" id="class-nosub-name"></span>.</p>
        <a id="sub-it" class="btn btn-primary" href="#">Subscribe and send</a>
        <a class="btn" onClick="$('#class-nosub').stop(true).fadeOut(500);">Cancel message</a>
    </div>


{% endblock %}
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								<!DOCTYPE html>
 								<html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 								    <meta charset="utf-8">
 								    <title>Humbug, from Humbug Inc.</title>
 								    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-												Remove Bootstrap cutesy nonsense

(imported from commit fd959ce9cfb8df774fa438f8def61994f2ab8173)

											
										
										
											2012-09-11 20:15:41 +02:00
+								    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								    <!--[if lt IE 9]>
 								      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
 								    <![endif]-->
-												Initial Django commit: basic account, zephyr stream, narrowing, etc.

(imported from commit 3cd40521171a4020c19021eda0d20ee9f802af41)

											
										
										
											2012-08-28 18:44:51 +02:00
-												Send zephyr template inline with index.html using django-jstemplate

(imported from commit 58cc8a50d463548aa283658dbe0aae366ecab39f)

											
										
										
											2012-09-06 21:13:15 +02:00
+								{% load jstemplate %}
-												Add log out link

(imported from commit 89e489d5b96ba7ae02c77a384b4dfabaa9b28785)

											
										
										
											2012-08-28 22:04:10 +02:00
-												Initial Django commit: basic account, zephyr stream, narrowing, etc.

(imported from commit 3cd40521171a4020c19021eda0d20ee9f802af41)

											
										
										
											2012-08-28 18:44:51 +02:00
+								{% block content %}
-												Send zephyr template inline with index.html using django-jstemplate

(imported from commit 58cc8a50d463548aa283658dbe0aae366ecab39f)

											
										
										
											2012-09-06 21:13:15 +02:00
+								{% icanhazjs "zephyr" %}
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								{% autoescape off %}
-												Fix a bunch of code style problems

(imported from commit 473ae8fdd64783f7a0989b17cae39826de42d30d)

											
										
										
											2012-09-11 20:13:53 +02:00
+								<link href="/static/third/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 								<link href="/static/third/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
 								<link href="/static/third/jquery/jquery-ui-1.8.23.custom.css" rel="stylesheet">
-												Clean up more copy-paste fail

(imported from commit 27233b64439ca4e761060739f019ac03f92f8d56)

											
										
										
											2012-09-13 22:02:37 +02:00
+								<link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
 								<link href="static/styles/zephyr.css" rel="stylesheet">
-												Fix a bunch of code style problems

(imported from commit 473ae8fdd64783f7a0989b17cae39826de42d30d)

											
										
										
											2012-09-11 20:13:53 +02:00
+								{# We need to import jQuery before Bootstrap #}
 								<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
 								<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js"></script>
 								<script src="/static/third/bootstrap/js/bootstrap.min.js"></script>
 								<script src="/static/js/common.js"></script>
-												Move third-party components into static/third/

(imported from commit 709c78a6e41afcd4202a8264c9103ac7827158ec)

											
										
										
											2012-09-06 17:22:38 +02:00
+								<script type="text/javascript" src="/static/third/jquery/jquery.form.js"></script>
 								<script type="text/javascript" src="/static/third/ich/ICanHaz.min.js"></script>
-												Move javascript into its own file.

(imported from commit b0e9a5e2700e85f31f8cd5922ab489000c96781c)

											
										
										
											2012-08-29 17:12:21 +02:00
+								<script type="text/javascript" src="/static/js/zephyr.js"></script>
-												Move all zephyr HTML generation to the client

(imported from commit 3afec768a5cd220c14ce615e03c29ee22754fdf2)

											
										
										
											2012-08-30 19:56:15 +02:00
+								<script type="text/javascript">
-												Provide both a sequential list of zephyrs and an associative array.

The purpose of this is to ensure that we can reference a zephyr by its ID
and get all the data about the zephyr; in the future we may not have all
such data stored in TRs as we do now.

(imported from commit 9128ddd01b46396fd276124ca1e6430538d3dd63)

											
										
										
											2012-09-12 22:55:37 +02:00
+								var initial_zephyr_array = {{ zephyr_array }};
 								var zephyr_dict = {{ zephyr_dict }};
-												Replace get_state with a variable embedded into index.html

(imported from commit 3ef4a0163107248618a25e242ab30fdff5da17e0)

											
										
										
											2012-09-04 18:45:45 +02:00
+								var initial_pointer = {{ user_profile.pointer }};
-												Reply to the recipient instead of the sender if replying to my own personal

Previously, if hamlet wrote to iago, and then hit "r" on his own message,
the form would prompt hamlet to reply to himself. Now, Humbug will DTRT and
prefill the form with iago instead.

(imported from commit cb3260d1d0bc89b184dac84ebf1e5642d0bc1606)

											
										
										
											2012-08-31 22:50:24 +02:00
+								var username = "{{ user_profile.user.username }}";
-												Add autocomplete for personals, classes, and instances.

Here we pull in the jqueryui library and a style sheet to provide a widget
to do autocomplete for various fields. We populate a list of all ever-seen
classes, instances, and people (C/I/P) into JS arrays and then pass them to
jqueryui.

Each time a new C/I/P appears, we reinitialise the autocomplete functions
so they will notice the new data.

(imported from commit f1ab69c99d21f68ccf40c015bd43960f463c6ff2)

											
										
										
											2012-09-04 20:31:23 +02:00
+								var class_list = {{ classes }};
 								var instance_list = {{ instances }};
 								var people_list = {{ people }};
-												Move all zephyr HTML generation to the client

(imported from commit 3afec768a5cd220c14ce615e03c29ee22754fdf2)

											
										
										
											2012-08-30 19:56:15 +02:00
+								</script>
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								{% endautoescape %}
-												Initial Django commit: basic account, zephyr stream, narrowing, etc.

(imported from commit 3cd40521171a4020c19021eda0d20ee9f802af41)

											
										
										
											2012-08-28 18:44:51 +02:00
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								<div class="container-fluid">
 								  <div class="row-fluid">
 								    <div class="span3">
 								      <div class="zephyr_well well sidebar-nav">
 								        <ul class="nav nav-list nav-zephyr">
-												Less confusing names for some classes

(imported from commit 15475d7dc98702a3935b1eb8a1373ab222913a7c)

											
										
										
											2012-09-13 21:55:15 +02:00
+								          <span class="my_fullname">{{ user_profile.full_name }}</span><br/>
 								          <span class="my_email">{{ user_profile.email }}</span>
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								          <span class="logout">(<a href="/accounts/logout?next=/">not you?</a>)</span>
 								          <li><a href="subscriptions/">Manage subscriptions</a></li>
 								          <li><a href="#">View starred messages</a></li>
 								          <li><a href="">Search</a></li>
 								          <li><a href="#">Invite a friend</a></li>
 								          <br>
-												Make "new message" open the compose window.

(imported from commit d63f4915f884dfa2bc11653d17782e5ee4c6191e)

											
										
										
											2012-09-11 16:54:25 +02:00
+								          <a href="#" class="btn btn-large btn-block button-slide">New Message</a>
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								        </ul>
 								      </div><!--/.well -->
 								    </div><!--/span-->
 								        <div class="span9">
 								          <div class="zephyr_list" id="main_div">
-												Pad the top and bottom of the zephyr window.

(imported from commit f95a6fe7584add5f6b60db57824123ccba8badf0)

											
										
										
											2012-09-11 19:39:01 +02:00
+								            <br/><br/>
-												Fix a bunch of code style problems

(imported from commit 473ae8fdd64783f7a0989b17cae39826de42d30d)

											
										
										
											2012-09-11 20:13:53 +02:00
+								            <table class="zephyr_table" id="table">
 								              <tbody>
 								              </tbody>
 								            </table>
-												Pad the top and bottom of the zephyr window.

(imported from commit f95a6fe7584add5f6b60db57824123ccba8badf0)

											
										
										
											2012-09-11 19:39:01 +02:00
+								            <br/><br/>
-												Get rid of selectors like span.foo

Just write .foo.  We shouldn't have to care what type of tag it is.

(imported from commit 86c4eeecbe4f5c9875002e3fd81757cd49050268)

											
										
										
											2012-09-13 22:20:07 +02:00
+								            <div class="row" id="narrowbox">
-												Experimentally add a search bar.

I'm not exactly sure that this is the interface we'll want for
this, but it's the start of an experiment.

(imported from commit ea18a9b05106546475bc151229955ddafd8e7b8e)

											
										
										
											2012-09-12 17:08:16 +02:00
+								              <div class="input-prepend input-append pull-left">
-												Restyle the narrow bar slightly.

Put a little 'x' by the class or class-instance indicator, to make
it more analogous to the planned behavior of the view-in-context
search box.

(imported from commit fa01001cffa6a6094ba5fbdcbdc965addb2efa1c)

											
										
										
											2012-09-14 17:40:56 +02:00
+								                <button id="show_all_messages" class="btn" disabled=disabled onclick="show_all_messages()"><i class="icon-arrow-left"></i></button>
 								                <span class="add-on"><span class="badge"><span id="currently_narrowed_to"></span><i class="badge_close_button icon-remove-sign icon-white" onclick="show_all_messages()"></i></span></span>
-												Restyle narrowbar slightly.

I have some serious concerns with this implementation,
but I think it's still an incremental improvement.

(imported from commit 6ed8d2545c727e25bf85b98a1528dbf3d155bc92)

											
										
										
											2012-09-11 21:33:24 +02:00
+								              </div>
 								            </div>
-												Add a block of whitespace at the bottom of the zephyr feed.

That way you can see new zephyrs as they come in.

(imported from commit 6b72a7f2116130edc0444f601423453801ddb6b5)

											
										
										
											2012-09-11 20:12:39 +02:00
+								            <div id="bottom_whitespace"></div>
-												Fix a bunch of code style problems

(imported from commit 473ae8fdd64783f7a0989b17cae39826de42d30d)

											
										
										
											2012-09-11 20:13:53 +02:00
+								          </div>
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								    <div class="tabbable container zephyr_compose">
 								        <ul class="nav nav-tabs" id="zephyr-type-tabs">
-												Restyle compose window slightly, add close button.

I still don't love it visually, but it's getting there.
Some obvious issues:
 Personals window is totally unstyled
 Clicking 'new message' should perhaps give you a fresh new window
  not something prepopulated with old stuff. Think about this.

(imported from commit 8b28fd084d550db404eabbe63c056fa6866c0697)

											
										
										
											2012-09-14 18:19:16 +02:00
+								            <li class="active"><a href="#class-message" data-toggle="tab">Stream</a></li>
 								            <li><a href="#personal-message" data-toggle="tab">Huddle</a></li>
 								            <li class="alert" id="send-status"></li>
 								            <li class="pull-right"><button type="button" class="close" onclick="hide_compose()">×</button></li>
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								        </ul>
-												Restyle unhide button

(imported from commit c668f19a581fa111dabdba5b1304922c7387c5dd)

											
										
										
											2012-08-29 18:11:15 +02:00
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								        <div class="tab-content">
 								            <div class="tab-pane active" id="class-message">
 								          <div class="zephyr_comp">
-												Fix a bunch of code style problems

(imported from commit 473ae8fdd64783f7a0989b17cae39826de42d30d)

											
										
										
											2012-09-11 20:13:53 +02:00
+								            <br/>
 								            <table>
 								              <tbody>
 								                <tr>
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								<td class="pointer"><p></p></td>
 								                <form action="/zephyr/" method="post" class="zephyr">
 								                    <input type="hidden" name="type" value="class" />
 								                    {% csrf_token %}
 								                        </div>
-												Tab between class and personal message

(imported from commit f7ce9eebc8fe75ad0fcfd0f60dde9ae117681134)

											
										
										
											2012-08-29 01:05:57 +02:00
+								                    </div>
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
-												Fix a bunch of code style problems

(imported from commit 473ae8fdd64783f7a0989b17cae39826de42d30d)

											
										
										
											2012-09-11 20:13:53 +02:00
+								                  <td class="zephyr_recipient">
 								                    <p>
 								                      <span class="zephyr_label_clickable zephyr_class">
-												Restyle compose window slightly, add close button.

I still don't love it visually, but it's getting there.
Some obvious issues:
 Personals window is totally unstyled
 Clicking 'new message' should perhaps give you a fresh new window
  not something prepopulated with old stuff. Think about this.

(imported from commit 8b28fd084d550db404eabbe63c056fa6866c0697)

											
										
										
											2012-09-14 18:19:16 +02:00
+								                            <input type="text" class="zephyr_recipient_box" name="class" id="class" value="" placeholder="Stream"/>
-												Fix a bunch of code style problems

(imported from commit 473ae8fdd64783f7a0989b17cae39826de42d30d)

											
										
										
											2012-09-11 20:13:53 +02:00
+								                      </span>
 								                      <br/>
 								                      <span class="zephyr_label_clickable zephyr_instance">
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
-												Restyle compose window slightly, add close button.

I still don't love it visually, but it's getting there.
Some obvious issues:
 Personals window is totally unstyled
 Clicking 'new message' should perhaps give you a fresh new window
  not something prepopulated with old stuff. Think about this.

(imported from commit 8b28fd084d550db404eabbe63c056fa6866c0697)

											
										
										
											2012-09-14 18:19:16 +02:00
+								                            <input type="text" class="zephyr_recipient_box" name="instance" id="instance" value="" placeholder="Topic"/>
-												Fix a bunch of code style problems

(imported from commit 473ae8fdd64783f7a0989b17cae39826de42d30d)

											
										
										
											2012-09-11 20:13:53 +02:00
+								                      </span>
 								                    </p>
 								                  </td>
 								                  <td class="messagebox compose">
 								                    <img class="profile_picture" src="http://www.gravatar.com/avatar/a?d=identicon"/>
 								                    <p class="zephyr_text">
-												Restyle compose window slightly, add close button.

I still don't love it visually, but it's getting there.
Some obvious issues:
 Personals window is totally unstyled
 Clicking 'new message' should perhaps give you a fresh new window
  not something prepopulated with old stuff. Think about this.

(imported from commit 8b28fd084d550db404eabbe63c056fa6866c0697)

											
										
										
											2012-09-14 18:19:16 +02:00
+								                            <textarea class="zephyr_message" name="new_zephyr" id="new_zephyr" value="" placeholder="Compose your message here..."/></textarea>
 								                        <input type="submit" value="Send" class="btn send_zephyr"/>
-												Fix a bunch of code style problems

(imported from commit 473ae8fdd64783f7a0989b17cae39826de42d30d)

											
										
										
											2012-09-11 20:13:53 +02:00
+								                    </p>
 								                  </td>
 								                </tr>
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								                <tr>
 								                    <td></td><td></td><td>
 								                </form>
 								                    </td>
 								                </tr>
-												Fix a bunch of code style problems

(imported from commit 473ae8fdd64783f7a0989b17cae39826de42d30d)

											
										
										
											2012-09-11 20:13:53 +02:00
+								              </tbody>
 								            </table>
 								          </div>
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
 								            </div>
 								            <div class="tab-pane" id="personal-message">
 								                <form action="/zephyr/" method="post" class="zephyr">
 								                    <input type="hidden" name="type" value="personal" />
 								                    {% csrf_token %}
 								                    <div class="row-fluid">
 								                        <div class="span6">
 								                            <label>User</label>
 								                            <input type="text" name="recipient" id="recipient" value="" />
 								                        </div>
-												Tab between class and personal message

(imported from commit f7ce9eebc8fe75ad0fcfd0f60dde9ae117681134)

											
										
										
											2012-08-29 01:05:57 +02:00
+								                    </div>
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								                    <div class="row-fluid">
 								                        <div class="span12">
 								                            <label>Content</label>
 								                            <textarea rows="4" cols="60" name="new_zephyr" id="new_personal_zephyr" value="" /></textarea>
 								                            <input type="submit" name="personal_zephyr" value="Send personal" class="btn" />
 								                        </div>
-												Tab between class and personal message

(imported from commit f7ce9eebc8fe75ad0fcfd0f60dde9ae117681134)

											
										
										
											2012-08-29 01:05:57 +02:00
+								                    </div>
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								                </form>
 								            </div>
-												Tab between class and personal message

(imported from commit f7ce9eebc8fe75ad0fcfd0f60dde9ae117681134)

											
										
										
											2012-08-29 01:05:57 +02:00
+								        </div>
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								    </div>
 								        </div><!--/span-->
 								      </div><!--/row-->
 								    <div class="row-fluid" id="connection-error">
 								        <div class="span12">
 								            <div class="alert alert-error">
 								                <strong>Can't receive messages</strong> &mdash; try reloading the page.
 								            </div>
-												Tab between class and personal message

(imported from commit f7ce9eebc8fe75ad0fcfd0f60dde9ae117681134)

											
										
										
											2012-08-29 01:05:57 +02:00
+								        </div>
 								    </div>
-												Implement portions of Waseem's new UI.

This is mostly working; things that need to be implemented:
 - Ask users for their Real Name
 - Personal replies need skinning
 - Miscl UI changes to match mockups

(imported from commit 3638cf5ec2ba2306004ba6db6fa4c25c47f76517)

											
										
										
											2012-09-10 20:31:53 +02:00
+								    <div class="alert" id="class-dne">
 								        <p>The class <span class="classname" id="class-dne-name"></span> does not exist.</p>
 								        <a id="create-it" class="btn btn-primary" href="#">Create and send</a>
 								        <a class="btn" onClick="$('#class-dne').stop(true).fadeOut(500);">Cancel message</a>
 								    </div>
 								    <div class="alert" id="class-nosub">
 								        <p>You're not subscribed to the class <span class="classname" id="class-nosub-name"></span>.</p>
 								        <a id="sub-it" class="btn btn-primary" href="#">Subscribe and send</a>
 								        <a class="btn" onClick="$('#class-nosub').stop(true).fadeOut(500);">Cancel message</a>
 								    </div>
-												Initial Django commit: basic account, zephyr stream, narrowing, etc.

(imported from commit 3cd40521171a4020c19021eda0d20ee9f802af41)

											
										
										
											2012-08-28 18:44:51 +02:00
 								{% endblock %}