Commit Graph

489 Commits

Author SHA1 Message Date
Luke Faraone 57d8b8d30c Add hr to the sidebar with zero margins.
(imported from commit 30fd816c55a9eaf7fecc5670d08f0a44c2489ac7)
2013-01-14 10:25:26 -05:00
Waseem Daher d9e50117be Frontend for invitations.
(imported from commit 8afab7cc5a4a5c14b605f1b27b48036c9414f7d0)
2013-01-14 10:25:26 -05:00
Jeff Arnold 7709e21a24 Notify the user when someone is speaking at them
(imported from commit 662ea67b2cf210bfd327ae2db6f924e4424d6d50)
2013-01-09 20:18:39 -05:00
Keegan McAllister 4a9d65c758 Disable desktop notifications in automated testing
CasperJS can't handle them; window.webkitNotifications.requestPermission()
throws a type error.  We can revisit this when we want to write tests for the
notification code.

(imported from commit 90f4d6ac3ddb387e74051b9af2c230698fa94479)
2013-01-09 14:03:40 -05:00
Luke Faraone c327446537 Add alternative terms acceptance workflow.
This view lives at /accounts/accept_terms, and (after getting an acceptance
from the user) sends an email to all@ documenting the acceptance.

(imported from commit 8f64286ab02887fd6544fa274b2967f6499b6dbc)
2013-01-08 17:48:42 -05:00
Keegan McAllister dbc4798594 Be consistent about when we display search buttons
Show the buttons iff

    - the search input is focused,
    - the search input has non-empty contents, or
    - we are narrowed.

(imported from commit f5c98471a2db4ab522160960dd1271471a9db555)
2013-01-08 12:18:31 -05:00
Keegan McAllister 3c9b9227f8 Get rid of the narrowbar
(imported from commit 53335b8177561d4b103659a51704d6b2ce7ec367)
2013-01-08 12:18:29 -05:00
Tyler Hallada 168ee1345c Enforce 10000 char limit on message box
Add maxlength attribute to the textarea which displays a tool tip (in Chrome)
for the user, telling them they are over the limit, so that the error is caught
before the send_message step (which is too late for Create and Send).

Fixes trac ticket #166.

(imported from commit 36b211a17f42dc8345e2235b4b4ca74c8f4e86c4)
2013-01-07 17:03:34 -05:00
Waseem Daher d9c41dd64f Mention mobile apps in MIT welcome email.
(imported from commit 7f32f1e51511a8386a23a1c73cf08d57c052a58e)
2013-01-03 17:57:27 -05:00
Tyler Hallada a3ccfdc78f Set bottom_whitespace height on resize with js
CSS height percentage was not working because parent div has an undefined
height, so instead it is set to 40% of the window height on resize (and initial
load) via JavaScript.

Fixes trac ticket #24.

(imported from commit 2c6a8489585c4bf70c44469ce8628264ec3fbc36)
2012-12-20 22:41:47 -05:00
Jeff Arnold db6f03d46d Make the back button work when narrowed
(imported from commit be922b06e7b53ec21751e67a490bb518333c3e6c)
2012-12-19 14:46:31 -05:00
Waseem Daher e0b8f4d3aa Make favicon have transparent background.
(imported from commit 841b1a21b2b4f01f298f0ceb099cf885f30d17b8)
2012-12-18 16:24:00 -05:00
Zev Benjamin 339ef0f139 Set the favicon a little more portably
http://en.wikipedia.org/wiki/Favicon claims this will work across all major browsers.

(imported from commit ab849cf3c0ac263fdff358c1ab77e079ccf90704)
2012-12-17 20:54:30 -05:00
Keegan McAllister 44b9925bfc Configure get_updates timeout in settings.py
(imported from commit 2a647bdd73c43ca5fed704925808efafc70da044)
2012-12-14 16:22:42 -05:00
Waseem Daher 4108f2f817 Add a 'realm' column to the activity page.
This makes it easier for me to, e.g. check on all of CUSTOMER1.

(imported from commit 1970df29b08b299cd1d00013abecefd7efbffb48)
2012-12-12 18:05:54 -05:00
Waseem Daher 4397400ab4 An ugly reminder of the shortcut for sending messages.
Hopefully this will make things slightly more discoverable;
the previous solution (putting a prompt in the initial text)
was not that discoverable.

(imported from commit f6a7fce1bfd27bda412522768e981b2ffc39f474)
2012-12-07 15:37:25 -05:00
Waseem Daher b5e63f8c1c Tweaks to Django 404 and 500 pages.
This fixes https://trac.humbughq.com/ticket/446
(by removing the "back" link).

(imported from commit 45a3cdcc8b20b843545e368449231a57d6d3c10b)
2012-12-06 15:54:54 -05:00
Jeff Arnold a8cd5539ff Revert "Rename the compose buttons based on feedback"
"Send to stream" is confusing.  Also, "Send to stream" is
asymmetric with the strangely verbless "Private message".

This reverts commit bb81f78948de20e78726c0cfbdeb91d7d21f32bf.

(imported from commit 1639e197d7acb2cc1d4ffd8dc67d3f3ca6712d0b)
2012-12-05 18:48:15 -05:00
Jeff Arnold d67e2cc4f3 Put the domain earlier in the titlebar, to help distinguish tabs
(imported from commit 225072a7cc044b011114a8630b02d74640b39d55)
2012-12-05 16:03:02 -05:00
Keegan McAllister ec3bef300b activity: Provide a link from the app
For humbughq.com users only.  Opens in a new tab.

(imported from commit 509905ebfacb45a454e863e8309896ffd3c538be)
2012-12-05 14:32:41 -05:00
Keegan McAllister 85507d6f26 activity: Load CSS and JS within <head>
This fixes (?) a glitch on load.

(imported from commit ecd4e2cdf5de114e5e371acf129b878cfa2717d0)
2012-12-05 14:32:41 -05:00
Jeff Arnold e77b0a3652 Make the send button more visually prominent
(imported from commit 34ee9441c1362652ea72cb9ad6bfc0d34edd3acf)
2012-12-05 13:22:52 -05:00
Jeff Arnold 26bcda29af Rename the compose buttons based on feedback
(imported from commit bb81f78948de20e78726c0cfbdeb91d7d21f32bf)
2012-12-05 12:49:52 -05:00
Keegan McAllister 97bcfbdbb8 activity: Put the three tables into Bootstrap tabs
(imported from commit 508c4b15a82df969b08b430ad892c4b13ed68092)
2012-12-05 12:35:05 -05:00
Keegan McAllister c256fcca15 activity: Right-align numeric columns
(imported from commit a09e961247a8747c96f23b8468c1a0dd5a4edbb8)
2012-12-05 11:42:09 -05:00
Keegan McAllister 5e8a6a846a activity: Shrink event count columns
This allocates more horizontal space to the date columns, which prevents them
from wrapping onto two lines.

(imported from commit 25105136850f74de0fd7c873a9365639db0984d5)
2012-12-05 11:42:09 -05:00
Keegan McAllister 23eef06ed0 activity: Initially sort rows by time of last activity
Doing this on the server is somewhat easier than making sorttable do it on page load.

(imported from commit 3ed7b127ba874d674d5cfe5b102c62a74be572f8)
2012-12-05 11:42:09 -05:00
Keegan McAllister 3f5d9902ab activity: Color rows for recently active or long inactive users
(imported from commit 5acc9317085acd7b4433b24b96bdf7fdebee5380)
2012-12-05 11:42:09 -05:00
Keegan McAllister 83d86f33ca activity: Clean up table computation a bit
(imported from commit c599d7ca572010c07b457ec15a305eef7dff78dd)
2012-12-05 11:42:08 -05:00
Keegan McAllister a54e009a3b activity: Display email addresses in bold
(imported from commit 09f6a821ac8a0dad98d69e69a411cba0af424cec)
2012-12-05 11:42:08 -05:00
Zev Benjamin 7e4776322d [manual] Unify huddles and personals into private messages on the receive path
feedback-bot and zephyr_mirror will need to be updated and restarted
when this is deployed to prod.

(imported from commit fe2b524424c174bcb1b717a851a5d3815fda3f69)
2012-12-04 18:01:51 -05:00
Luke Faraone ec0683cd86 Cosmetic fixes to tutorial page and copy.
Make it so the image is not squished, change some paragraphs into
headers, and wordsmith a bit.

(imported from commit 81295e1a8ddd4f1ecd4532c4dfb8a38467bb530e)
2012-12-04 13:12:01 -05:00
Waseem Daher 3867cc3fe2 Add a "tutorial" page at /new-user
This is an interim strategy for user education that'll be a stopgap
until we build something in the app itself.

(imported from commit 9022d4ceffca98e127f7045f73c012857fe6fc54)
2012-12-04 12:05:56 -05:00
Keegan McAllister 7907be735e hotkey: Make Enter an alias for 'r'
(imported from commit 9bf1b97304a4a4c1100826fefbba8edf1e4cff12)
2012-12-04 10:52:44 -05:00
Waseem Daher d5946454c9 Tab-Enter reminder.
(imported from commit 1b017d88bd15cc4e3beb3cfd57a2674c7d12874c)
2012-12-04 10:51:38 -05:00
Waseem Daher 745ca0d451 Include spectrum.js.
(imported from commit 9c082785108037fd9f2db70ef140bd75f4c521a3)
2012-12-03 12:46:26 -05:00
Zev Benjamin 46f4a5eb38 Add util module
(imported from commit 3844e136fb799c6f57f8823255addf00a07ef686)
2012-11-30 15:04:46 -05:00
Keegan McAllister a40ff15d7b Use target="_blank" for the formatting example link
This matches the real links and is less annoying if you click it.

(imported from commit b4c8a1c0a8b791ef0f674766caf91c9548ba8290)
2012-11-29 19:09:47 -05:00
Keegan McAllister 8cbb6ab95f Equalize the widths of the two columns in the formatting help table
(imported from commit f0a1c7216cfbee777eac4827209ab93c32056515)
2012-11-29 19:09:47 -05:00
Keegan McAllister 3d3e88ad2d Tweak code block examples
(imported from commit 4790e217320ad2dae0b85216321b11755b0ba88c)
2012-11-29 19:09:47 -05:00
Keegan McAllister 3e2acd1c50 Retitle "Commonly used Markdown" to "Message formatting"
(imported from commit 81ff25772017e0b4c335e87fad4a3d3b03dd41f5)
2012-11-29 19:09:47 -05:00
Keegan McAllister 27a5d81134 Make the heading of a striped table more distinct
e.g. in formatting help

(imported from commit 0a4123c412689fb2f90985028bd7237fa6cdfb19)
2012-11-29 19:09:47 -05:00
Keegan McAllister 2aaeb6e44b Move the "Formatting help" link next to the send button
The tabindex on this link doesn't actually do anything, because of the Safari
tab workaround.  I added it anyway in case we remove that workaround later.

(imported from commit 11f31f2561907300b350c11732be88589d736f94)
2012-11-29 19:09:23 -05:00
Keegan McAllister f8d83af2f0 Move the send button into a <div>
So we can float other things along with it.

(imported from commit a01e554bdb3ab3187557244400954194149fb172)
2012-11-29 19:09:23 -05:00
Keegan McAllister 1047bf49b4 Replace compose.toggle_mode with compose.set_mode
This fixes a bug where you could click on the already-selected mode button, and
it would switch modes without changing which button is selected.

(imported from commit 263ee0b52ba844c52a3a60968bb1bbff73482412)
2012-11-29 16:51:32 -05:00
Keegan McAllister 093c65fed2 Remove Tab hotkey to switch compose mode
Resolves #461.

(imported from commit 1ee64f0d6ca05064041e6619e8dbf1dc516c2c13)
2012-11-29 16:51:32 -05:00
Jeff Arnold 6d966eff27 Include a publicity clause in the terms of service
(imported from commit 3006cddbfee168fb018dbe4d356786418fe7e97b)
2012-11-29 15:50:56 -05:00
Jeff Arnold 56e3cc8790 Document that desktop notifications are Chrome only
(imported from commit 65943b04c8f90f50240b50780784c25bde3ed78d)
2012-11-29 15:50:51 -05:00
Waseem Daher fcc2fd5cdc Add ability to show/hide a "load more messages" spinner.
(imported from commit 611e53b2574ef50c9ab0a47fc2ebedd931a49dfd)
2012-11-29 14:18:38 -05:00
Jeff Arnold b52dbe1ca9 Auto-invoke "Load older messages" when at the top of the page
Resolves Trac #445

(imported from commit d7d96fe82e9e1cbef32e0dde284ce217e83aff55)
2012-11-29 14:18:38 -05:00
Tim Abbott aba2192ec2 Restore the time-travel functionality with Waseem's UI.
This restores the time-travel functionality and fixes Waseem's laundry
list of problems with its original UI.

(imported from commit e30e02c25af994435adb815d26284b3669c945a4)
2012-11-28 22:26:31 -05:00
Luke Faraone 1dbd806b6a Implement a favicon as a link rel.
This has the benefit of not getting cached forever by browsers.

(imported from commit c7c7877dfbb9d479e997d122827017036c5337f5)
2012-11-28 15:12:37 -05:00
Jeff Arnold 2f882b505a Show "how many messages have arrived while away" in the document title
(imported from commit 6e2a18be9953694048d107a56a03a67f8bc2bd5a)
2012-11-27 13:39:46 -05:00
Keegan McAllister 69801ce1db Remove link to change email address
We never implemented this; the link goes to a 404.  And it's unlikely that we
will get to it soon, because we currently use email address as the unique
identifier for a user.

Since it can't be changed, we remove it from the 'Settings' tab entirely.
It's still visible in the sidebar, anyway.

(imported from commit a18c0726fb67baf04429a90e36a383cacd03ad8a)
2012-11-26 18:16:25 -05:00
Tim Abbott 81672af751 mituser email: Emphasize the importance of mirroring script.
(imported from commit 00d2c6b4ba35ca40f414c295f41d0ea7bdb505d9)
2012-11-26 17:10:15 -05:00
Luke Faraone e57625d089 Submit form after the DOM is ready per trac #314
(imported from commit 8facaa097342c830353464989990edb853f2adf4)
2012-11-26 14:48:54 -05:00
Jeff Arnold 4cb0c6225e Add webkit desktop notifications
Partially addresses Trac #31

(imported from commit f1f04b5c50bf9f33b69c90926fd67015cd2dc219)
2012-11-26 14:43:55 -05:00
Jeff Arnold a6ec875268 [schema] Add enable_desktop_notifications to user profile
(imported from commit f5b543e8446263ce8855561441a6d4c1a8d41f4d)
2012-11-26 14:43:55 -05:00
Zev Benjamin 85e2bf9030 Remove dead code. We keep the message type and client name in JS instead of the DOM now
(imported from commit 79834160c53a5f7d99918d629fde311aa99fe280)
2012-11-26 14:42:27 -05:00
Zev Benjamin e35ec6e022 Stop using Bootstrap tabs for compose
(imported from commit 39dfbf9c427aaf3a85507e26ffeb1257da3dc435)
2012-11-26 14:42:27 -05:00
Waseem Daher 6d2b2f897a Implement safari composebox workaround in a less fragile way.
If Javascript breaks or stops working, the previous hack means that
Tab-Enter stops working on Firefox and Chrome (since the tab key now
needs to select two divs before it gets to the Send button.)

By putting the one div *after* the Send button, we ensure that this
keeps working gracefully on Firefox and Chrome (and presumably IE), at
the expense of Safari in this specific case.

(imported from commit 9c9a613b1b1718ff8f0b9ef7497ebb13db0ddc64)
2012-11-26 12:15:14 -05:00
Tim Abbott fac24df233 Show a user-visible error message when mirroring is not working.
The main problem with this code is that the error message doesn't go
away until you reload.  To fix this, we need to add a noblock option
on get_updates.

(imported from commit dc45af397bcf06a218bda5dd224ebd5fdf3462db)
2012-11-26 11:49:29 -05:00
Tim Abbott eefa5b2d7b API: Add support for nonblocking get_updates requests.
(imported from commit bf2ab19a83765c177fbb93abc1a61dccf5b4b2b7)
2012-11-26 11:49:29 -05:00
Luke Faraone 724dce78e4 Always allow registration if attempting to register for a non-MIT realm.
(imported from commit 00489ab74c376a4ffb23ad661699ef31c6c06818)
2012-11-21 16:42:15 -05:00
Luke Faraone 87d7ec57ee Use reference to view rather than direct URL.
(imported from commit 86ed3cbc93f7a4885bb9a87002dc39aaeae07820)
2012-11-21 16:42:15 -05:00
Luke Faraone 1c5ba6dc45 Remove Google Apps tease.
(imported from commit 57d46c26ba1888acde9117346782f8f99e371588)
2012-11-21 16:42:15 -05:00
Waseem Daher 5e321048b1 Put the realm in the <title> when you're logged in.
This resolves Trac #145.

(imported from commit 680c11ecb25e22201a1a335f97b014290aa25a06)
2012-11-20 21:15:26 -05:00
Zev Benjamin 90e0fc6259 Module pattern for ui.js
(imported from commit 951984ec1006e93a0ffc7e299b52fa02c10eb976)
2012-11-19 23:31:22 -05:00
Keegan McAllister 702dcbf210 Document that three tildes is enough for a code block
(imported from commit f50a9b0016f4c3e489258d1f3382fbc3b1c77189)
2012-11-19 14:34:18 -05:00
Keegan McAllister 4da83759dc Use a more illustrative example to document code blocks
(imported from commit 07d56d9df973fa4820b3c82bab9314c42bff2015)
2012-11-19 13:04:40 -05:00
Keegan McAllister 6782ff9f48 Document code highlighting syntax
(imported from commit 6d061081c03a67f55368e7bddf1008cf2bff02d4)
2012-11-19 13:04:40 -05:00
Waseem Daher f214c2df75 Lay the groundwork for a "typeahead helper" module.
(imported from commit 0b73238e935fac7c13d7152b262d3e71a714f3ea)
2012-11-18 19:41:03 -05:00
Waseem Daher 95706ce9a2 Create a searchbox typeahead where enter does not submit the form.
(imported from commit 38105e2f31611dda8c9767212f18c1a73640df45)
2012-11-17 23:58:16 -05:00
Tim Abbott 542f8695ad Add 'try now' link when not receiving messages.
(imported from commit f52a376a62f2aed213d641e31a6f4c0380057d12)
2012-11-15 15:09:25 -05:00
Luke Faraone 6f345e393e Update MIT template in collab with Waseem for clarity.
(imported from commit 99a406277b72dbb67ab08764e7984ef2b8953e53)
2012-11-15 11:36:57 -05:00
Waseem Daher 834c812a14 Rename "send_message" to "send_message_form" for clarity.
(imported from commit 25d9bde3390e47390724a8d4b3fd1fe95b44bd71)
2012-11-14 16:19:56 -05:00
Waseem Daher 3cf29025ec Prevent composebox form-handling code from running on all forms.
(imported from commit aee10dac671b1da83295d9e197eec4d3a0a7ceeb)
2012-11-14 16:14:48 -05:00
Waseem Daher b7a9e17b67 Rename 'search' input element to 'search_query'.
If we don't do this, we get all kinds of nasty shadowing where
references to 'search.whatever' seem to be references to the
HTML input element, rather than our search.js module.

(imported from commit 4e4b562ddf895baea9619316d9fab27ae5e9fc4e)
2012-11-14 15:29:18 -05:00
Waseem Daher a1c4aa6865 Modularize search.js.
(imported from commit 72f00f832846124d833071fdd46b026c99189512)
2012-11-14 15:29:18 -05:00
Zev Benjamin 534a1fd2ec frontend-tests: Click on the buttons the user would for sending
Previously we bypassed the big buttons on the left bar and clicked on
the anchor tag inside the compose box.  This bypassed the
compose.start() call.

(imported from commit 2b627825596c8d3c21441e58db895b8e488e624b)
2012-11-13 15:40:53 -05:00
Zev Benjamin 195bdb07c9 Unify huddles and personals into private messages on the send path
Personals are now just private messages between two people (which
sometimes manifests as a private message with one recipient).  The
new message type on the send path is 'private'.  Note that the receive
path still has 'personal' and 'huddle' message types.

(imported from commit 97a438ef5c0b3db4eb3e6db674ea38a081265dd3)
2012-11-13 15:40:53 -05:00
Jeff Arnold 488370b681 Fix various compose box bugs involving typeahead and field navigation
(imported from commit 08fe92794d566163bd935d43ec5bd7eb69978f90)
2012-11-12 18:04:31 -05:00
Jeff Arnold 8bd2e5abf3 onchange is not needed for these compose box input fields
And having the onchange there e.g. breaks shift+tab in the subject
field after you've entered new text into the subject field

(imported from commit 080e81bd847a1b6d3defadb62b6c3640910e5aa0)
2012-11-11 13:25:17 -05:00
Jeff Arnold 8ba2d2ea8b Chrome prefers onclick="this.select()" to onfocus="this.select()"
http://stackoverflow.com/questions/2939122/problem-with-chrome-form-handling-input-onfocus-this-select

(imported from commit 15e87a3e79172e31cb76e68319014b5eb1d6deac)
2012-11-11 13:24:38 -05:00
Jeff Arnold 7ada59fe88 Clicking in subject/stream/huddle boxes should select all
Resolves Trac #86

(imported from commit 0e4d470fce01d7c4b1ad9103fe5f1dc726dcd984)
2012-11-11 12:28:26 -05:00
Jessica McKellar d6ad978c1a activity monitor: style tables and make them sortable.
(imported from commit 03c5002e6a289ca123b47f99c065b41cfc013762)
2012-11-09 16:45:18 -05:00
Luke Faraone 7605eaf646 Document confirm_preregistrationuser.html per trac #314
(imported from commit d9a19fa18fa4a8933cf4dbb9b286da28aa036956)
2012-11-09 15:03:08 -05:00
Tim Abbott 30b43ebee2 Uniformize /json/ and /api/ URLs to end with no trailing slash.
(imported from commit c35b30bcc43982db3a2f774ea69269e5424a6159)
2012-11-09 14:30:10 -05:00
Tim Abbott 85423bc010 Add a /activity page displaying data on user activity on the site.
(imported from commit 3877be49e4e0b89cadfead88b5c51f955759a996)
2012-11-09 12:28:38 -05:00
Waseem Daher 055d18b484 Add a "New private message" button.
(imported from commit fd15f26b73d0fedb536763d51fb4f0b50b2912bb)
2012-11-08 13:54:16 -05:00
Jessica McKellar 4cad5f6e96 settings: Update name and gravatar without a reload.
(imported from commit 961c9f64d7c39b4345ece036062854e8d474d2c0)
2012-11-06 16:33:22 -05:00
Luke Faraone 87b3d0c581 Enable basic password reset functionality.
(imported from commit 5ac0d15912173067d946b31be1c1251bc12a940a)
2012-11-06 16:33:21 -05:00
Waseem Daher 7cc630e518 Clarify the titles on the stream/pm selector.
(imported from commit 28bfb7955ae0f52d8752978770217c3490e90bd1)
2012-11-06 13:39:39 -05:00
Waseem Daher ce2023b348 Make 'v' the new hotkey for "Show all private messages".
(imported from commit a7299633bf363cf832ff7099c963bc56abfdf734)
2012-11-06 13:37:24 -05:00
Waseem Daher 6b149af91d Rename 'huddle'->'Private message' in user-facing strings.
(imported from commit d3bdccc37a4fb7b373c6c1c69091353f39fecafd)
2012-11-06 13:37:24 -05:00
Waseem Daher 300f151c8b Disable animations on modals.
This seems to fix the page-scroll issue and is also a little less
ostentatious.

Fixes https://trac.humbughq.com/ticket/243

(imported from commit 5fdbcc62a251303d134aea46a0755984df125c63)
2012-11-05 18:39:20 -05:00
Keegan McAllister 4cd5cdbcd6 Revert "Clean up how we deal with the message type tabs"
This reverts commit 429e055d3eca65af8bc0fe58481a7becf9ced66a.

There is some inconsistency between the names 'huddle' and 'personal' that is
breaking things.

(imported from commit 4c81853fca9d88d13ce8f23e2d6884c33cdc57d2)
2012-11-05 15:01:49 -05:00
Keegan McAllister 477bad9536 Clean up how we deal with the message type tabs
(imported from commit 429e055d3eca65af8bc0fe58481a7becf9ced66a)
2012-11-05 11:49:01 -05:00
Keegan McAllister 02f7ac42e7 settings: Set the for=... attribute on <label>s
This means you can click the label to focus the corresponding box.

Also, it's more consistent with our other HTML, and may have accessibility
benefits.

(imported from commit c40de1e4137eb8ce5c69775ebcae346af9ae4e32)
2012-11-05 11:49:01 -05:00
Keegan McAllister 294eab4cc5 index.html: Clarify comments
The spacing around these gave the wrong implication.

(imported from commit 2e64a2e360d29739dc0ba867594a3f40ceb3e057)
2012-11-05 11:49:01 -05:00