Commit Graph

508 Commits

Author SHA1 Message Date
Waseem Daher 30bed51a65 Style the green 'online now' dot entirely in CSS.
This lets us clean up the HTML a little bit in preparation
for a later change which will cause the stream and people
lists to scroll independently of one another.

Also it feels a bit more fun.

(imported from commit b3b49149d7ec2960fd752fe50b41e55d363c1a98)
2013-02-11 23:15:19 -05:00
Zev Benjamin 57b6d6eb50 Make integral easter-egg font-neutral
(imported from commit 2a6c751ab7e872e4b4ddd6bafcb86b0e5d091c1e)
2013-02-11 18:37:34 -05:00
Leo Franchi 83011f7f47 Show a user activity list in the sidebar
(imported from commit 95aaa55c7e4cc39f844518b5308866bedf2cd1c5)
2013-02-11 18:05:57 -05:00
Keegan McAllister 16d62fe5de Combine the actions popover with the timeinfo popover
The message timestamp is now always clickable, and the popover contains the
full long-form date and time.  This addresses one problem from usability
testing (see #470).

(imported from commit ad502dff128ad1c934fc0d3faaf5e2931c91c37e)
2013-02-11 13:59:18 -05:00
Keegan McAllister 520d7b1f97 Rename userinfo_popover -> actions_popover
(imported from commit fab5a44af1acaf93640a2f57ffc25b3e97f55d2e)
2013-02-11 13:59:18 -05:00
Luke Faraone 8dbda2cd64 Use full emails rather than just usernames in /activity.
(imported from commit c0397d6429fe85f0bd6e57731dd2132ed1e11b85)
2013-02-11 10:33:16 -05:00
Waseem Daher c94f561eda Promote our integrations on the API page.
(imported from commit 5091c88f8927c7a52af0d95a425211ed6b48ef06)
2013-02-09 21:35:29 -05:00
Waseem Daher 481dbf299e Remove an errant <p>.
(imported from commit 0ac6288c3fc3bfb608f3834a905595ad50a793ea)
2013-02-09 21:34:34 -05:00
Waseem Daher dc02e236df Document our Jenkins integration.
(imported from commit a2711e10eaf5ae4b06de5becf94f9857b535a63b)
2013-02-09 20:54:10 -05:00
Waseem Daher bc9133883b Typo fix.
(imported from commit a4426e0eda9de230debcb96b3c69e5ce8a38c589)
2013-02-09 19:38:57 -05:00
Keegan McAllister d68674be83 Remove CUSTOMER30-specific account views
Reverts c4b6f744 (inexactly, since there are some other changes along the way).

(imported from commit 5c7294fb13cd0bc523ae55c137dc5254b7cb0121)
2013-02-08 13:33:28 -05:00
Luke Faraone fd1d790b72 Don't show the stream list on Humbug for MIT.
(imported from commit d9f952aaeb910a7c57ce1174141686331224c8c0)
2013-02-08 12:02:05 -05:00
Luke Faraone 686c709788 Add a link to filter to all private messages
(imported from commit 115f84b42c14acdc8d1827bd8d914a9ac6acab43)
2013-02-07 15:35:46 -05:00
Luke Faraone 9c86db20fc Add support for "labels" in the left sidebar.
(imported from commit 5e942a8d0c7f459148a4961736f4c5305e0c51b4)
2013-02-07 15:35:46 -05:00
Waseem Daher 2a6fa085a1 Remove signup button from new-user.
Most people who have gotten this page haven't been in a position
to click this button; furthermore, most of our early users will
be invited into the system with an invite link.

To see this page with a button you can't actually use is kind
of confusing, so, removing it.

(imported from commit 20fbb1baf1ed4db6a6713fb112922d72a8360b03)
2013-02-07 14:58:49 -05:00
Waseem Daher 75ebd7c7fb integrations: Update path to integrations.
(imported from commit 38382cf03afe259ec044de2cfcf497664a5bb0c8)
2013-02-07 14:12:02 -05:00
Waseem Daher a44aa44e6c Add a somewhat cheeky explanation of what an integration is.
(imported from commit 76d3627333a4df04019101315c368136963887bf)
2013-02-06 19:30:22 -05:00
Waseem Daher 8bc57ecf42 Fix some integrations page issues.
* tickybox -> checkbox
* Fix up the "register" URL (a stray linebreak  was messing them up)
* Fix image blurriness issues
  (style != class)
* Wrap a long line

(imported from commit 47fd8bf5c9c2c9665aaf8a0cb3c65d08b399b3b0)
2013-02-06 19:17:30 -05:00
Waseem Daher 209a1bee3b integrations: Trac documentation.
(imported from commit 14978913711e3386ce3c845e434fc8e16ed0adf0)
2013-02-06 17:37:44 -05:00
Waseem Daher d8b9151a31 Initial documentation page for integrations.
(imported from commit cd73c63306ab7ed8c886c30488d5ab928fac6c06)
2013-02-06 16:53:13 -05:00
Waseem Daher c7447e19d9 Add a footer to all our portico content.
This makes /api look less abruptly cut off at the end.

(imported from commit 296e431dad2aa1f72b02bb59f5572c0bf33a7bc9)
2013-02-06 14:11:00 -05:00
Luke Faraone 3de93f2b2b Pass stream information in initial template.
This allows us to remove fetch_colors() entirely, and should speed up page
load a bit.

We also JSONEncoderForHTML instead of dumps so that the result is safe
to embed.

(imported from commit 013630911960e2ac1d0bae6f5df31ad342750594)
2013-02-05 15:34:37 -05:00
Jessica McKellar 018f45d151 subscriptions: add HTML and templates for new stream creation modal.
(imported from commit d19991c7fcdd29feafa877ca8203034028b1e0b2)
2013-02-05 10:01:44 -05:00
Waseem Daher d9a06ba8fd Initial API documentation page.
(imported from commit 06a5e902edf03ab781b30dd80f5fbfbaa790bc0a)
2013-02-04 17:58:12 -05:00
Jacob Hurwitz 1d113a4b03 Add the ability to show a custom notification in the bar
(imported from commit b7b763dc364e143409d862838322d63a05daacc1)
2013-02-02 01:16:26 -05:00
Jacob Hurwitz 61acc58947 Add a notifications bar when there are additional messages out of view
(imported from commit 38fa78f63fd520d0b1f09921ba064cba010a6f99)
2013-02-02 01:16:25 -05:00
Waseem Daher 768725cb7c Provide visual feedback that we're working on your invitation request.
This is a tricky one because it's kind of hard to see locally, but
there's a bit of a delay between when you click "Invite" and when we
get back to you. So we give the button a "loading" state so you know
not to click again.

(imported from commit 9c3389a3d06def777427c846d6106f6d9b30cc8b)
2013-02-01 11:26:46 -05:00
Waseem Daher 7e2271dd18 Replace HTML comments with Django template comments, in the navbar.
(imported from commit 3c313f2f4a0014ff705332cf068c40a4baed968e)
2013-02-01 10:36:17 -05:00
Waseem Daher 2c954c8f82 Move navbar code into its own "navbar.html".
(imported from commit 4fa1c5d5ffa0af0ae8d608fad762470bf737205c)
2013-02-01 10:36:17 -05:00
Waseem Daher f3bbb7b294 Move all of the "alerts" into a row in our navbar.
This is literally a pure "move HTML" operation; no actual code
changes.

This will make them always visible, even when we're in skinny mode
(and will also make more room for our list-of-streams-and-people
sidebar on the left.)

This does have the side-effect that the errors cover up the rest of
the application (in particular, the floating narrowbar). I don't view
this as the end of the world, though the more robust solution would be
for navbar-spacer to grow when the navbar does, and for everything
else to be correspondingly pushed down.

You can visualize an extreme version of what this looks like with
   $(".alert").show()
in the Javascript console.

This fixes Trac #720.

(imported from commit 7a3b12aebcca389465bd1e5852cef5d08fafe3e7)
2013-02-01 10:32:51 -05:00
Keegan McAllister 5178c663ae Remove documentation of italic syntax
(imported from commit ca487e3b2d89890c55d2061e338210afad9e674b)
2013-01-31 16:28:57 -05:00
Keegan McAllister 6990260b59 [manual] Minify JavaScript and CSS in production
Manual deployment steps: The same Nginx reload as for "Get rid of the
static-access-control mechanism".  If deploying both commits at once,
just do it once.

(imported from commit dd8dbbf14b95fce0a4b6f66f462fa0a6b50bfb8c)
2013-01-31 15:41:01 -05:00
Keegan McAllister 5e9b0ba79d [manual] Get rid of the static-access-control mechanism
We will minify our code, rather than trying to restrict who can see the
un-minified code.  Removing access control first simplifies things.

Manual deployment steps:

    scp servers/puppet/files/nginx/humbug-include/app root@staging.humbughq.com:/etc/nginx/humbug-include/
    ssh root@staging.humbughq.com service nginx reload

and then the same for app.humbughq.com once deployed to prod.

(imported from commit 63788aa3fa7ba5fd97fcf85b05760abb5e7cae4b)
2013-01-31 15:34:12 -05:00
Jacob Hurwitz 85db4eba46 The Subscriptions tab is now the Streams item on the gear menu
(imported from commit ca96339e2ceee4509fb6e3e2a35d1152b3415178)
2013-01-30 18:57:50 -05:00
Jacob Hurwitz b4ba07df0d We're a communication tool, not an instant messaging tool
(imported from commit 21230b2375a96b23e2af86e5778112f49c820d90)
2013-01-30 17:36:17 -05:00
Zev Benjamin 30a1409a3d Make 'create stream' input box size responsive
(imported from commit 5daf788bbf3ae7f2960da5f70ab5945880151287)
2013-01-29 15:58:51 -05:00
Zev Benjamin 1ba381c4a9 Account for the new top navigation bar when setting the main div height
This fixes #704

(imported from commit 5e73bf38cf0cda661a4c7070eea760934b30e454)
2013-01-25 14:09:30 -05:00
Zev Benjamin 65e5513bcc Rename 'Subscriptions' page to 'Streams'
I didn't rename all the files and HTML elements in case we decide we
like the old name better.

(imported from commit d8a8d30662e22e69e60df9cd2b1341a9128a1902)
2013-01-24 17:59:03 -05:00
Zev Benjamin df712b7794 Move the "create new stream" form into the subscriptions table
(imported from commit 6cfccf01b4253423e271a08c74f6077cbc10fce3)
2013-01-24 17:59:03 -05:00
Zev Benjamin 1ae42fba9b Remove dead form
(imported from commit 4f2b82c3945f184c416862ae59ebe9ae18f3dd05)
2013-01-24 17:59:03 -05:00
Waseem Daher 3b891d2f74 Use Glyphicons font for gear icon, rather than image.
(imported from commit 46e2524ab0bcf4e52bd09525b45d15198a82da03)
2013-01-22 17:23:18 -05:00
Waseem Daher 8c74164412 Use Glyphicons cogwheel for our settings menu.
This should also be prettified, with like, a hover effect
and stuff as well.

(imported from commit d06addbcf3992d5976c510eda7b1595d866a3196)
2013-01-22 17:20:43 -05:00
Waseem Daher 504dff9a51 Move search and navigation menu into a "settings" gear at the top.
This is really the first step of implementing the "Oppa Gmail Style!"
redesign, and is largely an HTML/CSS-based change, with some
slight JS tweaks to deal with things being renamed or being no
longer necessary.

(imported from commit e05adc283ea066f0f90009cf712c4f3657c2485a)
2013-01-22 17:18:50 -05:00
Waseem Daher f08dc13f73 Add a fixed navbar at the top of the page.
(imported from commit 1e131932503afe97ddd08e8538b2a0f43727313c)
2013-01-22 17:18:50 -05:00
Waseem Daher dfadc79dc9 activity: Display the user portion of the email address rather than short_name.
Apparently short_name is not consistently the person's username
in our system -- for many MIT people, it's their full name.

(imported from commit d975300a59c7afe5ee20b4a0db1bd51110c3df33)
2013-01-18 13:47:43 -05:00
Waseem Daher 068c702883 activity: Display short name instead of full email address.
As of this writing, short_name is the part before the @-sign,
and we already display the realm, so no need to display it
twice.

(imported from commit f5f9b29bff99b36b0c23176348c2869193467c38)
2013-01-18 13:34:39 -05:00
Waseem Daher 764047e113 activity: Add names to the table.
(imported from commit d4554690a9381dd0b72c7c03116dc01145960a5b)
2013-01-18 13:29:53 -05:00
Zev Benjamin 8b5e492c76 Clarify step 2 of the MIT confirmation email instructions
(imported from commit 2ed9c893fafafda8b01e6911c54edd73ef8f80c3)
2013-01-17 14:34:46 -05:00
Zev Benjamin 661632673b Show a loading indicator on the subscriptions page
(imported from commit f5c4847e016921827354df09a544d98ceef16bee)
2013-01-17 14:19:37 -05:00
Reid Barton 3e928cec48 Simplify navbar at phone size in lurk mode
(imported from commit b4e7336174d4cde4947c96fa82473c311c6ed2b5)
2013-01-17 12:17:06 -05:00