Commit Graph

347 Commits (456a341885e014ce72f03215b0823479ad147f88)

Author SHA1 Message Date
eric 1881660089 intoduce Publisher and PublisherName Models
Also change our by publisher lists to key on the new name ids rather
than the names, which was yucky.
Migrations!
Data migration takes a while, don't be allarmed if it sits a while.
2013-03-25 23:41:19 -04:00
eric d905f288d7 merge from master 2013-03-22 16:45:41 -04:00
eric 50ec6ddb06 merge from master 2013-03-19 14:38:09 -04:00
eric af8c3ff1fd merge from master 2013-03-19 10:02:06 -04:00
eric 392a751abb html nits 2013-03-18 22:07:19 -04:00
eric bd9a746422 merge in master 2013-03-18 21:50:22 -04:00
Andromeda Yelton dc8dea0768 moving countdown out of context to models.py, standardizing button appearance 2013-03-15 15:51:17 -04:00
eric 7f64189284 create and deploy avatar_source and avatar_url 2013-03-14 15:43:24 -04:00
eric 6143c6a3aa normalize invocation of supporter url, fix wrong user for comment links 2013-03-14 15:33:00 -04:00
eric 54d0aa1d59 merge master into seo
schema.org stuff into work page
2013-03-13 10:48:36 -04:00
eric 28045aed77 merge master into improve_registration 2013-03-13 10:40:20 -04:00
Andromeda Yelton 2da23dbd64 Merge branch 'master' into work_page_CTAs
Conflicts:
	frontend/templates/work.html
	frontend/views.py
	static/css/campaign.css
2013-03-12 15:59:24 -04:00
thatandromeda 7dc1f4cba3 Merge pull request #129 from Gluejar/manager_supporter_msgs
Managers and staff can send messages to supporters [#36991391]
2013-03-12 11:52:43 -07:00
Andromeda Yelton fae6c8f3a9 reverting to earlir add-wishlist functionality 2013-03-12 14:48:20 -04:00
eric cb55922036 Doublecheck the merge 2013-03-11 22:46:26 -04:00
eric 57ebbc087e merge master into work_page_CTAs 2013-03-11 22:39:48 -04:00
eric 55b30f494e schema.org metadata! 2013-03-09 20:25:47 -05:00
eric 62627a80cf fix "next" behavior, poor sign-up/pledge flow [#40841931]
Sign In lightbox had broken cookie pusher on reg/auth pages.
Many holes had developed that broke return-to-page-after-auth (for
example, sign-in from pledge page).
Sporadic encoding issues.
2013-03-08 02:43:11 -05:00
eric 339d4653ab migrate and clean urls 2013-03-07 21:53:32 -05:00
eric 06b43ed8d1 basic by-publisher list [#45617641]
a bit slow, but that's a separate issue.
Not conspicuously surfaces yet, look at the links in the editions list
in rights tab.
2013-03-05 16:18:54 -05:00
eric 2153a6c589 added hover to message icon, moved css and js to files 2013-03-04 23:25:22 -05:00
eric 282f877890 wire up msg view to wishlist_message notification [#36991391] 2013-02-26 12:43:54 -05:00
eric 89221fbe82 ajax submission and error handling 2013-02-25 18:32:22 -05:00
eric 596d19596c UI work for managers to contact supporters [#36991391] 2013-02-21 15:10:01 -05:00
Andromeda Yelton f674278b02 mouseover shows exact percent of goal 2013-02-18 11:58:38 -05:00
eric 08967a008e html nit 2013-02-09 19:21:04 -05:00
Andromeda Yelton 61b2859a02 testing all the edge cases and editing accordingly 2013-02-08 15:55:43 -05:00
eric 02f10de83a review of html title tag for all pages 2013-02-08 10:12:28 -05:00
Andromeda Yelton 918ce0f904 aligning book detail layout in pledge and work pages 2013-02-07 15:25:14 -05:00
Andromeda Yelton a060cf0f51 improving gradient 2013-02-07 14:10:00 -05:00
Andromeda Yelton cf58570c2e moving informational and call-to-action elements of work page 2013-02-07 13:37:54 -05:00
Andromeda Yelton c761d5819d first pass at moving big button 2013-02-06 16:26:07 -05:00
Andromeda Yelton a322baa195 addressing pull request feedback 2013-01-17 15:46:31 -05:00
Andromeda Yelton a27e319e5a more status-sensitive twitter share text 2013-01-16 11:13:23 -05:00
Andromeda Yelton fa7e0b20de addressing feedback 2013-01-04 15:12:35 -05:00
Andromeda Yelton 924300267b more pointers to contextually appropriate actions for RHs 2013-01-03 13:18:26 -05:00
Andromeda Yelton 8d321d46dc final incorporation of all stray CSS changes 2013-01-02 15:55:10 -05:00
Andromeda Yelton 4ac487a7c9 unwinding useful changes from discarded two-tab model 2013-01-02 15:48:49 -05:00
eshellman c22403356c Merge pull request #99 from Gluejar/correct_ungluing_date
add success_date property to campaign so we can accurately report it whe...
2012-12-31 12:28:47 -08:00
Andromeda Yelton 47c44b20d5 add success_date property to campaign so we can accurately report it when it differs from campaign deadline 2012-12-31 11:00:45 -05:00
Andromeda Yelton 4a307a1e00 addressing CSS comments and also fixing some invalid html 2012-12-17 14:23:23 -05:00
Andromeda Yelton ab2d3d51b6 Merge branch 'master' into unglued_books_tab 2012-12-14 10:46:11 -05:00
Andromeda Yelton b001aefeeb separating unglued and PD works on ready-to-read page 2012-12-13 15:25:01 -05:00
eric fec7f33d9e staff only UI for merging works [finish #39297681]
staff-only link in rights tab of every work!
2012-12-12 22:35:35 -05:00
Andromeda Yelton a2abb92038 makes pledge action clearer by describing in more contexts and using Pledge rather than Support 2012-11-20 09:56:04 -05:00
Andromeda Yelton 81e27e234e decided that phrasing was confusing 2012-11-20 09:09:03 -05:00
Andromeda Yelton 0b657cf1c1 clarify that acks are in the unglued ebook itself 2012-11-19 11:23:32 -05:00
Andromeda Yelton 78c62ef553 Merge branch 'master' of github.com:Gluejar/regluit
Conflicts:
	frontend/templates/work.html
2012-10-25 09:43:29 -04:00
Andromeda Yelton 4a87253ca7 only show the premiums section if there actually are premiums 2012-10-24 11:34:22 -04:00
Andromeda Yelton 9eb0323768 add case where ungluer has not yet pledged 2012-10-24 11:30:37 -04:00
Andromeda Yelton 89b92b4dba add acknowledgements to support menu 2012-10-24 11:25:17 -04:00
Andromeda Yelton cc18eb20d3 add acknowledgements to support menu 2012-10-24 11:24:46 -04:00
Andromeda Yelton 82e0e17017 stopgap for [#37714043] 2012-10-14 15:20:55 -04:00
Andromeda Yelton ec0ba04d76 created editions may have cover images but not google books ids 2012-10-11 09:48:55 -04:00
eric 94ed8fa8df removed unbalanced <span> 2012-09-28 17:09:21 -04:00
eshellman 8cb4586f78 Merge pull request #20 from Gluejar/relaunch
Relaunch
2012-09-28 07:55:07 -07:00
eshellman f327db6efd Merge pull request #19 from Gluejar/improvify_download_page
Improvify download page with readmill [finish #36156381]
2012-09-26 13:04:39 -07:00
Andromeda Yelton 38d115e5a1 no longer need readmill script since we're pulling send script directly 2012-09-25 10:53:23 -04:00
eric ccc082545a [#32289887] add worldcat learn more...
test it on /work/82838/
2012-09-24 15:36:39 -04:00
Raymond Yee a91a70e6ef Merge pull request #12 from Gluejar/master
merge all the mester into relaunch
2012-09-24 09:07:44 -07:00
eshellman 5589e5d209 Merge pull request #7 from Gluejar/improvify_download_page
Improvify download page
2012-09-20 12:58:45 -07:00
Andromeda Yelton 5419c869ed now the readmill script works on the lightbox too 2012-09-19 12:08:27 -04:00
Andromeda Yelton 82f6ceffd4 addressing comment 2012-09-18 13:09:19 -04:00
Andromeda Yelton b0c2f0926b whoops there are other cases 2012-09-18 12:12:50 -04:00
Andromeda Yelton 35180252e0 bugfix [#36104625] 2012-09-18 11:10:53 -04:00
Andromeda Yelton f03855f2de bugfix [#36104625] 2012-09-18 11:10:01 -04:00
Raymond Yee b08643a0ac Merge branch 'master' into relaunch 2012-09-13 10:50:43 -07:00
Andromeda Yelton b383c9717d hijax script should be in base so it works sitewide, and hijax class must be applied to download link to trigger 2012-09-11 14:14:57 -04:00
Raymond Yee deee2ab75a Merge branch 'master' into relaunch
Conflicts:
	core/signals.py
	frontend/views.py
2012-09-10 14:25:43 -07:00
Andromeda Yelton 3a0d09db33 edition-adding on rights tab was hard to read with multiple editions 2012-09-10 14:37:37 -04:00
eric 4700e63b06 resolve conflict 2012-09-07 16:26:09 -04:00
eric 6f63c047ce DRY pub year code moved to work model 2012-09-07 16:07:47 -04:00
Andromeda Yelton 48e20a7cdd bringing all the lightboxes under the hijax.js system 2012-08-27 15:35:29 -04:00
Andromeda Yelton a6e034a36a rudimentary download page plus logic to serve it 2012-08-24 15:14:32 -04:00
Andromeda Yelton aa3667d260 working on download page 2012-08-23 13:38:48 -04:00
thatandromeda df147937aa phrasing was unclear, scary. we're not space-limited here like we used to be. 2012-07-11 12:37:23 -03:00
eric 1764cd62d6 small optimization of supporter count 2012-07-07 16:38:23 -04:00
eric b6d77a7645 usernames were not being URLescaped. [#finish #32365703] 2012-07-06 12:25:20 -04:00
eric 011dc4ffde [#32289649] validation nit 2012-07-06 11:19:51 -04:00
Andromeda Yelton 9152655587 list ungluers in two-column format by reverse of date wished [#32289815] 2012-07-05 11:33:57 -04:00
Andromeda Yelton 3ce4db8e9a change support to premiums and make it clickable [#32289833] 2012-07-05 10:39:19 -04:00
Andromeda Yelton 325765e453 loose ends from anaheim [#32290011] [#32289649] [#32289951] 2012-07-05 10:05:04 -04:00
eric bc2e5ac3be better handling of successful campaigns on work page 2012-06-21 10:49:55 -04:00
Andromeda Yelton 3d5cf5107f embiggening font sitewide (almost nothing below 13px), making font size a less variable so it's easier to change in future and we don't have so many different font sizes 2012-06-13 13:31:21 -03:00
Andromeda Yelton d652db5c03 removing is_preview since it's no longer needed 2012-06-13 09:41:23 -03:00
eric d784715407 Round dollar amount to nearest dollar [#30073593] 2012-05-25 18:34:16 -04:00
Andromeda Yelton 30adccdd37 put ungluer count on second line and changed text placement accordingly to prevent overflow with high ungluer count numbers 2012-05-23 10:40:13 -04:00
Andromeda Yelton 54368ffbca adding pledged checkmark next to relevant premium on work page when supporter has pledged 2012-05-22 07:34:42 -04:00
Andromeda Yelton 1a53d8b86d that div was ugly and contentless 2012-05-21 12:19:50 -04:00
eric 3de07e973f [finish #29780503] add link to CC licence to rights tab of campaign page 2012-05-20 00:22:12 -04:00
Andromeda Yelton a47f48e777 showing percent campaign has proceeded toward goal more clearly 2012-05-17 09:24:57 -04:00
Andromeda Yelton c4053a4b59 communicating stuff more clearly 2012-05-16 14:03:14 -04:00
eric 3c98e65217 whoops. So used to django knowing what I meant... 2012-05-13 23:11:06 -04:00
eric aad5593c1d resolve conflicts 2012-05-13 15:37:20 -04:00
eric 0cdac29c22 apply intcomma to currency display everywhere and add humanize 2012-05-13 15:32:32 -04:00
Andromeda Yelton 9a6ea26266 check to see if people have pledged and if so direct them to pledge_modify from sidebar rather than spawning new pledge 2012-05-13 15:23:04 -04:00
eric 76b8b9f33d [#29488053] no use linking to google books if no google books id 2012-05-11 22:46:41 -04:00
eric feb8650c10 [#29488053] add to wishlist now works for works without googlebooks_id 2012-05-11 21:29:03 -04:00
eric 81d158f505 [#28851641] Edition creation and editing !!! Needs a schema migration. 2012-05-11 14:13:09 -04:00
Andromeda Yelton 11c19b950d preventing information leakage about campaign status changes during preview and preventing non-staff from launching campaigns 2012-05-08 15:51:17 -04:00
Andromeda Yelton 7dbb2e2276 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-08 09:50:32 -04:00
Andromeda Yelton 5b617370a8 moved boilerplate paragraph 2012-05-07 13:09:41 -04:00
eric 1d005fae95 [finish #29170153] Improved display of no-google works 2012-05-07 11:36:34 -04:00
eric a32b09a4cb Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration""
This reverts commit 2d344a09c6.
2012-05-07 01:18:11 -04:00
eric c0cb99e040 Revert "Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration"""
This reverts commit c8be251ffa.
2012-05-07 01:18:11 -04:00
eric d334fa58b0 Revert "Revert "Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration""""
This reverts commit b21787a590.
2012-05-07 01:18:11 -04:00
eric e10136f1b2 Revert "Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration"""
This reverts commit 1bbac102a2.
2012-05-07 01:18:11 -04:00
eric 1bbac102a2 Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration""
This reverts commit 2d344a09c6.
2012-05-07 01:14:47 -04:00
eric b21787a590 Revert "Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration"""
This reverts commit c8be251ffa.
2012-05-07 01:14:47 -04:00
eric c8be251ffa Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration""
This reverts commit 2d344a09c6.
2012-05-07 01:14:01 -04:00
eric 2d344a09c6 Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration"
This reverts commit 7043e71c39.
2012-05-07 01:11:26 -04:00
eric 7043e71c39 [#28945859] removed description from edition. Be sure to do data migration before applying this schema migration
also fixed issues with tests failing in add_openlibrary
2012-05-07 00:42:11 -04:00
Andromeda Yelton 3deb660ce3 more css tweaks per stefan 2012-05-01 13:49:23 -04:00
Andromeda Yelton ce36f6771d css changes per Stefan, part 1 2012-05-01 09:56:19 -04:00
Andromeda Yelton 8999afb7f1 Merge branch 'master' of github.com:Gluejar/regluit 2012-04-30 11:28:52 -04:00
Andromeda Yelton 5421793f02 minor styling tweaks 2012-04-30 11:03:15 -04:00
eric 4f524a792f [#24088823] ebook downloads now drop down if more than 1 2012-04-28 21:05:41 -04:00
eric bc9f1d3cd3 [fix #28759049] prefixing ebook contribution form not handled properly in view or form 2012-04-27 17:14:57 -04:00
eric 274762d7de [deliver #24088823] rights and filetype images for pd, cc books 2012-04-26 17:26:27 -04:00
Andromeda Yelton d652767a79 change supporters to ungluers on work page tab, see if that helps overflow problem 2012-04-23 12:08:11 -04:00
Andromeda Yelton 911f6f6212 pledge and pledge_modify don't need to use different templates, just an if statement or two. DRY 2012-04-19 10:50:40 -04:00
Andromeda Yelton 8dda3369b5 minor language tweak per AM 2012-04-17 10:10:40 -04:00
Andromeda Yelton 89d385d51f less and more text should toggle when editions info toggles 2012-04-10 14:33:34 -04:00
eric be909bba69 change language on claim status [accept #27384493] 2012-04-05 11:58:26 -04:00
Andromeda Yelton 903356cbd6 merge 2012-04-04 08:52:50 -04:00
Raymond Yee 23d7ae9c86 Getting rid of http://platform.twitter.com -> //platform.twitter.com 2012-04-03 15:43:27 -07:00
Raymond Yee 96b10a2776 Commenting out number of supporters in the tab right now on work.html until we figure out how to display without overflowing tab space 2012-04-03 15:14:52 -07:00
Andromeda Yelton e3573c3157 Merge github.com:Gluejar/regluit 2012-04-03 14:58:43 -04:00
Andromeda Yelton 49677c3a45 manage campaign links replaced with big green buttons 2012-04-03 14:58:32 -04:00
Ed Summers 1187a346ee use https urls for google books cover images 2012-04-03 13:55:45 -04:00
Andromeda Yelton 24674d8a2d improving display of active campaign notice 2012-04-03 12:30:34 -04:00
eric 0319185251 resolve conflicts 2012-04-03 10:54:31 -04:00
Andromeda Yelton 24b7a77228 modifying display of claim status 2012-04-03 09:56:41 -04:00
eric c7f9996444 added status display on work page 2012-03-28 14:12:00 -04:00
Andromeda Yelton 2ab92b6a2f Merge github.com:Gluejar/regluit 2012-03-28 09:00:31 -04:00
Andromeda Yelton 4c4697740b small changes to tabs to communicate better 2012-03-28 08:59:45 -04:00
eric 8892a935dd Implemented limited edition premiums, front and back end [finish #27011359] 2012-03-26 18:47:02 -04:00
eric 7264b9846f Added management of custom premiums. (migration needed) [finish #26921893] 2012-03-26 15:32:23 -04:00
eric 0f61bd8d66 added license selection to campaigns. Simple migration to apply. 2012-03-23 12:30:49 -04:00
Raymond Yee 46ca784030 [#23019867] First pass at allow for pledges to be modified 2012-03-19 16:32:37 -07:00
Andromeda Yelton b5c284cc2d better text for twitter and email sharing 2012-03-12 13:18:11 -04:00
Andromeda Yelton 8d2f56c7bc Merge branch 'master' of github.com:Gluejar/regluit 2012-03-09 19:08:39 -05:00
Andromeda Yelton 141bb54cc2 correcting a stupid mistake 2012-03-09 19:05:06 -05:00
eric 39e1faaca6 add-wishlist and remove-wishlist span ids were duplicate
needs change in wishlist.js
2012-03-09 15:15:35 -05:00
eric 345331043e html syntax fixes; work page is now valid [#26203269]
moved embed code div out of ul, entified ampersands in some img src's
2012-03-09 13:00:16 -05:00
Andromeda Yelton 760d9c5b81 added you must be logged in to comment in work page for not-logged-in users 2012-03-09 11:00:09 -05:00
eric de4f5fcc86 HTML sytax corrections 2012-03-07 22:07:01 -05:00
Andromeda Yelton 000d78dbd0 improving cover image linking behavior per https://www.pivotaltracker.com/story/show/24253139 2012-03-07 15:01:12 -05:00
Andromeda Yelton 9e978ac251 merging 2012-03-07 13:54:02 -05:00
Andromeda Yelton 05860bfa06 foregrounding search and browse features when own wishlist is empty 2012-03-07 13:23:34 -05:00