Commit Graph

477 Commits

Author SHA1 Message Date
Waseem Daher 3e5008b143 Remove searchbar from narrowed view.
Today I'm of the mindset that searching is a fundamentally
distinct operation than narrowing, so this reflects that.
(There would be a separate screen and UI for searching,
 I guess.)

(imported from commit 432a4088612dafd06184bec228b63056961325dd)
2012-09-13 10:36:29 -04:00
Waseem Daher e8a1ecad94 Renaming some divs for additional clarity.
unhide -> show_all_messages
narrow_indicator -> currently_narrowed_to
narrow -> searchbox

This is a little clearer about what these buttons/functions
do, which will be useful as we add a little more complexity
associated with searching.

(imported from commit b51e745ea71c212d6735e04011eaea5e71bf6d5a)
2012-09-12 17:31:48 -04:00
Keegan McAllister e6d9b5fa27 register.html: Focus first field
(imported from commit 738227000c288b5f72fe6e91b9998ad72ab092c1)
2012-09-12 16:14:09 -04:00
Waseem Daher 3f42c8422f 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 11:19:33 -04:00
Waseem Daher 1d9fb55b1a Make the filter icon look less clickable.
This was a historical artifact of how that used
to be a search icon right by a textbox.

(imported from commit 6f73bc8b5d174e4c07f1503ffd08650110e80420)
2012-09-11 17:00:37 -04:00
Jessica McKellar bfdf2bef57 [schema] Collect and display names and e-mail addresses.
(imported from commit aa6bceb05fcd5b456c03288cbfed65b14050fe88)
2012-09-11 16:34:53 -04:00
Jessica McKellar 06711afa51 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 16:27:12 -04:00
Waseem Daher cca0e8f521 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 16:20:16 -04:00
Keegan McAllister a5d105dbae Move styles out of index.html
(imported from commit 8b3732ff67af71dac49886004370b6d4759b140f)
2012-09-11 14:38:33 -04:00
Keegan McAllister d8c3d60c18 Remove Bootstrap cutesy nonsense
(imported from commit fd959ce9cfb8df774fa438f8def61994f2ab8173)
2012-09-11 14:38:33 -04:00
Keegan McAllister 75c34a7f1b Fix a bunch of code style problems
(imported from commit 473ae8fdd64783f7a0989b17cae39826de42d30d)
2012-09-11 14:38:33 -04:00
Luke Faraone fef89daa46 Pad the top and bottom of the zephyr window.
(imported from commit f95a6fe7584add5f6b60db57824123ccba8badf0)
2012-09-11 13:39:01 -04:00
Luke Faraone 34b594b96b Reimplement the narrow bar.
(imported from commit 19e41c1238dff404813a21b9dc318458d5f29c64)
2012-09-11 12:12:02 -04:00
Keegan McAllister e5ac53674a Use fixed table layout
(imported from commit 12eb4882b03e6cf4b633334481a82da70b868ce1)
2012-09-11 11:56:34 -04:00
Luke Faraone 1da8c16367 Make "new message" open the compose window.
(imported from commit d63f4915f884dfa2bc11653d17782e5ee4c6191e)
2012-09-11 10:54:25 -04:00
Luke Faraone 4503aaae89 Implement gravatars.
(imported from commit 1e07d295ee7c12a95091e0785a9a9c3c4e856ede)
2012-09-10 18:18:09 -04:00
Luke Faraone cfc42b1d82 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 14:32:42 -04:00
Keegan McAllister 42fcb7789e subscriptions.html: Focus new subscriptions field on load
(imported from commit a3a0f84a83838aa04e69a951667bda6d5e508b93)
2012-09-07 11:35:17 -04:00
Keegan McAllister 474f08198b Send zephyr template inline with index.html using django-jstemplate
(imported from commit 58cc8a50d463548aa283658dbe0aae366ecab39f)
2012-09-06 15:48:15 -04:00
Keegan McAllister 8f1cee0b88 Move third-party components into static/third/
(imported from commit 709c78a6e41afcd4202a8264c9103ac7827158ec)
2012-09-06 15:48:15 -04:00
Keegan McAllister b1eb0fd0fd Inhibit caching of zephyr.css
(imported from commit 5e1af66b12454f791f7edfcc3f01be03b00e4b2f)
2012-09-06 14:54:10 -04:00
Luke Faraone f6b481546f Offer to subscribe / create classes if user zwrites to a non-subbed class
Here we check if a class exists. If not, we prompt the user to create, sub,
and send his message to the class. If the class exists but we're not subbed
we prompt the user to sub.

This commit also added a decorator to views.py and refactored out some
redundant code.

(imported from commit 7234ef6c080f2a6de6ff0922635dddd90032f7fe)
2012-09-06 14:33:55 -04:00
Tim Abbott 38b30e5997 [schema] Add realms to the schema.
Note that realms aren't actually used for anything, aren't prompted
for, etc, so this is mostly just a schema change and the refactoring
needed to allow setting the realm in the future.

(imported from commit b8b483dcc9601b288702284879e9c99707a50a5c)
2012-09-06 11:02:34 -04:00
Keegan McAllister 4dd1567426 Keep third-party jQuery style in the jquery dir
(imported from commit 9e34277b90c13b3ce71521fe0657014f186fc1c3)
2012-09-06 11:00:34 -04:00
Tim Abbott 84ece4b3fe Combine the zephyr() and personal_zephyr() functions.
(imported from commit a39b70f019901d0dd6994d4c440002111e4c29e1)
2012-09-04 19:14:46 -04:00
Luke Faraone 974b560659 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 16:14:48 -04:00
Keegan McAllister ac2553cdff Replace get_state with a variable embedded into index.html
(imported from commit 3ef4a0163107248618a25e242ab30fdff5da17e0)
2012-09-04 13:01:00 -04:00
Keegan McAllister 2e8b1fa14a Use client-side templating to render zephyrs
(imported from commit 5ac650c3df0fa8caa823407d9d1a65a38f7e63c6)
2012-09-04 13:01:00 -04:00
Tim Abbott d85e80483f Eliminate the dummy row.
(imported from commit 4f0cd12e77cbe4d6a29baed9902c7c7074fcff27)
2012-09-04 11:49:13 -04:00
Luke Faraone 37d02a232a Don't include zephyr.js in /subscriptions/
That code added no value and actually crashed on page load.

(imported from commit d6f0be6aaa5e1ac938a588387564800bd5807f90)
2012-09-04 11:08:27 -04:00
Keegan McAllister 115edb57b2 Eliminate tab characters from source code
(imported from commit 60c0742b8998ee08189b576b38cd0b4416f22b66)
2012-08-31 16:51:46 -04:00
Luke Faraone cd5b623cfd 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 16:50:24 -04:00
Keegan McAllister 2d30c9440d Retry if long polling fails
(imported from commit fc2d09976231974bf48efbcf5dfc480be36e26ec)
2012-08-31 15:33:04 -04:00
Jessica McKellar 99925f4aaf Add the ability to add new subscriptions.
(imported from commit 0a7fdc17087240b13631627a053c580c2e4b5319)
2012-08-30 17:17:59 -04:00
Jessica McKellar 7e56e7a0f4 Add a navigation link for managing subscriptions (for starters, just unsubbing).
(imported from commit 23274a8790bf1f017e9c33db52bf746e291f23ba)
2012-08-30 17:17:47 -04:00
Keegan McAllister d57d19e562 Move all zephyr HTML generation to the client
(imported from commit 3afec768a5cd220c14ce615e03c29ee22754fdf2)
2012-08-30 16:41:09 -04:00
Keegan McAllister ddacce81b7 More responsive UI for sending messages
(imported from commit 8a6c4e78788f46dde4fe166e17828eb9e7bdcaff)
2012-08-30 16:19:44 -04:00
Keegan McAllister a1a7291fe5 Send zephyrs via Ajax
(imported from commit cdfd69079212d36a9e4e9d2d01dc7b6a93b6a4e0)
2012-08-30 16:19:44 -04:00
Tim Abbott 70f96ad674 Fix log out URL.
(imported from commit b0405266792b1cbeea3b30f20e942fd3ad046eff)
2012-08-30 16:17:33 -04:00
Keegan McAllister 556837d3a6 Indicate clickability on labels
(imported from commit cc3c48879d50c0808d465492c20a887bef408a91)
2012-08-29 17:25:04 -04:00
Keegan McAllister d87fdaad99 Quote hrefs on accounts_home
(imported from commit 9b04e654be54b70ccaf91c1ca54d8d533e3a712a)
2012-08-29 17:25:04 -04:00
Jessica McKellar a8fa6b156a Turn newlines into linebreaks.
(imported from commit 67999641a8cff471be1430e421f259b1c558444d)
2012-08-29 16:47:53 -04:00
Keegan McAllister a0e59fbbc9 Narrow on all personals together
(imported from commit 2dc2646344767acbda7f1d8d6f847f8a69d597cf)
2012-08-29 16:23:56 -04:00
Keegan McAllister 03a087a654 Rework display of personals
Code cleanup, and add an arrow to indicate sender and recipient

(imported from commit 24881ee1e5f3bc9209f9ec485195dcd7178d86fb)
2012-08-29 15:53:38 -04:00
Keegan McAllister 053122c3d1 Drop the responsive navbar
(imported from commit 9ccf5a2f43242f35e510adab58ac6ca4715bceec)
2012-08-29 15:40:10 -04:00
Keegan McAllister aca034b29d Fix capitalization
(imported from commit c8bb901bcba58c760bde290bfe8b3eb2fe125e23)
2012-08-29 15:40:10 -04:00
Keegan McAllister 6832fa9489 Use 'BLACK RIGHT-POINTING TRIANGLE' for the 'selected' indicator
(imported from commit 713b24521f080e7772991d2d9808324ef6219ac5)
2012-08-29 15:40:10 -04:00
Keegan McAllister 6cdbe914c4 Style the send buttons
This happens automatically in Chrome, but not in Firefox.

(imported from commit 95c9d1e6110cdc51e6c97f743e8078ac262498bc)
2012-08-29 15:40:09 -04:00
Keegan McAllister a2777eaed4 Resize main_div to exactly take up remaining vertical space
Unfortunately, it's not so easy to do this with CSS only.

(imported from commit 93b58a53e20aae9ee651aa66b3163f68549a3982)
2012-08-29 15:40:09 -04:00
Keegan McAllister a1d852d124 Jump to personals tab on prepare_personal
(imported from commit 5f3fbc7a84a0af6742ceb1f1ab8806234870445f)
2012-08-29 15:40:09 -04:00
Keegan McAllister 395001d8db Indicate narrowing
(imported from commit 19682fc07393f0848481abf72339eefd56b30ab2)
2012-08-29 15:40:09 -04:00
Keegan McAllister 1b587fc2c6 Style class / instance / username labels
(imported from commit 2e0c9d72aa17971bdc12750dad62a59c46f646f1)
2012-08-29 15:40:09 -04:00
Keegan McAllister 8948b21758 Restyle unhide button
(imported from commit c668f19a581fa111dabdba5b1304922c7387c5dd)
2012-08-29 15:16:28 -04:00
Keegan McAllister 5bf0c7be8e Move Zephyr input tabs to the bottom
(imported from commit 646792708f18bf7504147996e63a52cada28be0d)
2012-08-29 15:16:28 -04:00
Keegan McAllister 3e45bd2ccc Use a Bootstrap alert class on failed login
(imported from commit d0e0048e4f3b99f9e2512c8b7f7249b6fa5201a3)
2012-08-29 15:16:28 -04:00
Keegan McAllister 3ef5334d9b Focus username field on loading login/register pages
(imported from commit 004a98ffaa59aebab34057cbe34f5e1038e44b62)
2012-08-29 15:16:28 -04:00
Tim Abbott cc01ad04bf Move javascript into its own file.
(imported from commit b0e9a5e2700e85f31f8cd5922ab489000c96781c)
2012-08-29 12:04:57 -04:00
Keegan McAllister 5e59c79d1d Tab between class and personal message
(imported from commit f7ce9eebc8fe75ad0fcfd0f60dde9ae117681134)
2012-08-28 19:09:48 -04:00
Keegan McAllister 2f2bb1b9c1 Some content for accounts_home
(imported from commit f42c0ee74a69d2668a1f77b1180c4e1ccb1def0c)
2012-08-28 19:09:48 -04:00
Keegan McAllister 473de4eb2a New layout
(imported from commit d44db3acf1d4c6a7b42a54aff9720bb86d01a754)
2012-08-28 19:09:48 -04:00
Keegan McAllister 9849cc91e9 Move bootstrap.js and jQuery into head
(imported from commit 8deddd6178f5612be275509bea0a23d20fb4693c)
2012-08-28 18:36:55 -04:00
Keegan McAllister 54622c9101 Create zephyr.css
(imported from commit 56c698496ba5cc59aeed4902dfee7bcfa248ffcf)
2012-08-28 18:36:55 -04:00
Keegan McAllister c454718f3a Add log out link
(imported from commit 89e489d5b96ba7ae02c77a384b4dfabaa9b28785)
2012-08-28 18:36:55 -04:00
Keegan McAllister f88882f9a2 Basic Bootstrapification
(imported from commit 54871fadcb5670a1ed3a68156b282bde1b50363f)
2012-08-28 18:36:55 -04:00
Keegan McAllister 098618df72 Add Bootstrap to base.html
(imported from commit fe05c9a68b5ea352a191f29292defb99dff136d7)
2012-08-28 18:36:55 -04:00
Keegan McAllister 316b32ef31 Make base.html more valid
(imported from commit 07ae94e9678deca71b2b6933df4c4503cda96be5)
2012-08-28 18:36:55 -04:00
Tim Abbott 74219b5e08 Move the message display code out of get_updates().
(imported from commit 9de20dbd11156cd98a11c736991945cba12b8118)
2012-08-28 17:38:36 -04:00
Tim Abbott 9625c17473 Change the last message received variable name to 'last_received'.
(imported from commit 37c34b54ce4bcbf601f934854c8e77340ba69117)
2012-08-28 17:38:36 -04:00
Jessica McKellar f6819d09d5 Add basic personals functionality.
(imported from commit a4fecbe40672f34295b1e908526b6c45056bcb7f)
2012-08-28 16:35:04 -04:00
Jessica McKellar 2b9a3205be Switch zephyrs to the notion of a "Recipient", which is either a class or user.
(imported from commit edc46267dab9cc972358b6020ca28b009e15d8c5)
2012-08-28 16:34:23 -04:00
Jessica McKellar 80a47ca2bc POST the pointer location on narrows (since the pointer moves).
Ideally this would be expressed as an event handler bound to the
in every place that the pointer changes, but I haven't found a way to
do that yet (this is easy for *inputs* but not arbitrary DOM
elements).

(imported from commit c190e23f5ed5fd3e3a4823b763682d611ec5b446)
2012-08-28 12:45:28 -04:00
Jessica McKellar 2bf27af375 Have the pointer track the highlighted zephyr on instance narrow.
(imported from commit b19e7950bb5e77067b9a24bcf9ee762fdc23b5ad)
2012-08-28 12:45:24 -04:00
Jessica McKellar 2c7a35596b Have the pointer track the highlighted zephyr on narrow/unnarrow.
(imported from commit 0fff361f08cf7849a751bcd533757a18fe752398)
2012-08-28 12:45:20 -04:00
Jessica McKellar c6fd3df60a Detect keydown instead of keypress, so holding the arrow down scrolls.
(imported from commit 8c3a9a2c22ced942d4a86845a9e0bf2f67dea795)
2012-08-28 12:45:16 -04:00
Jessica McKellar e509cc8a85 Autofill class and instance and move focus to textbox on 'r'.
(imported from commit f06b82539dbd0ef9ae46bf3c368a877947e3df19)
2012-08-28 12:45:06 -04:00
Jessica McKellar abbb9ee95d Add narrowing by instance.
(imported from commit e927192ded358dc3771c7add2b7c4c62e8be4452)
2012-08-28 12:45:01 -04:00
Jessica McKellar d90e8f6ec5 Initial Django commit: basic account, zephyr stream, narrowing, etc.
(imported from commit 3cd40521171a4020c19021eda0d20ee9f802af41)
2012-08-28 12:44:51 -04:00