Commit Graph

655 Commits (5f62194c845642351249dbc014b99b1e1b67a797)

Author SHA1 Message Date
Raymond Yee a4957a5bf6 Merge branch 'master' of github.com:Gluejar/regluit 2012-01-09 12:47:51 -05:00
Andromeda Yelton a7009b1998 whoops, should probably commit the version that passes tests 2012-01-09 12:44:35 -05:00
Raymond Yee 2d1ab0dba6 Merge branch 'master' of github.com:Gluejar/regluit 2012-01-09 12:40:03 -05:00
Raymond Yee a174b3eb93 Putting in skeleton for pledge cancel and complete PayPal callbacks 2012-01-09 12:36:03 -05:00
Andromeda Yelton a9fc98b771 work page now displays a modify-pledge button where appropriate. not yet wired to modification functionality. 2012-01-09 11:50:48 -05:00
Andromeda Yelton 9d8bf7be69 Merge branch 'master' of github.com:Gluejar/regluit 2012-01-06 11:04:17 -05:00
Andromeda Yelton 8460fba0bb organizing the FAQ 2012-01-06 10:42:17 -05:00
Raymond Yee 8ba7570ea1 Adding a "thank you" to the pledge page 2012-01-04 21:14:58 -05:00
Raymond Yee 9182affeda Merge branch 'master' of github.com:Gluejar/regluit into ry 2012-01-04 17:21:39 -05:00
Raymond Yee 13b01c2838 Added a test to ensure that a user needs to be logged in for the pledge view. 2012-01-04 17:14:37 -05:00
Andromeda Yelton 96587a0a2d Merge branch 'master' of github.com:Gluejar/regluit 2012-01-04 12:51:45 -05:00
Andromeda Yelton 8e04bf3419 expanding the faq 2012-01-04 12:51:34 -05:00
Raymond Yee 68f0c255d5 Force login on PledgeView as a whole 2012-01-04 12:03:50 -05:00
thatandromeda 79e7d9d7df grammar! 2012-01-04 11:34:31 -05:00
Andromeda Yelton aa10713e49 menu is more location-specific 2012-01-03 16:47:00 -05:00
Andromeda Yelton 7de1051448 it is not unlike a sidebar organizing the FAQs 2012-01-03 16:17:04 -05:00
Andromeda Yelton 1986b37857 tidying book panel 2012-01-03 09:59:17 -05:00
Andromeda Yelton 69087b0a33 suppressing useless add-wishlist element 2012-01-03 09:47:06 -05:00
Andromeda Yelton 8a59fc75f8 green circle+arrow in learn more area makes no sense outside of landing page 2012-01-03 09:19:50 -05:00
Andromeda Yelton 2ede7d7e7b size of unglue definition text box does not change now as definitions change 2012-01-03 09:12:31 -05:00
eric 9030e87b70 unhid wished_by from search results. Why was it hidden? 2012-01-02 19:08:24 -05:00
eric 739fccbe83 roemoved vestigial code from search view 2012-01-02 19:08:23 -05:00
Andromeda Yelton 8d7f7fe612 now the unglue definitions are not placeholders 2012-01-02 17:17:35 -05:00
Andromeda Yelton 1e2e76cc69 Merge branch 'master' of github.com:Gluejar/regluit 2012-01-02 16:31:53 -05:00
Andromeda Yelton 4e23363a80 now the text before the learn more button randomizes onload and onclick 2012-01-02 16:20:07 -05:00
Andromeda Yelton dfd20a7957 needed a comma 2012-01-02 13:39:58 -05:00
Andromeda Yelton fba09f60a3 comments needs padding between avatar and text 2012-01-02 13:10:20 -05:00
eric 8e383ce229 embed needs protocol 2012-01-02 12:59:26 -05:00
Andromeda Yelton 3a6ae3da94 maybe a more robust way to obtain the url base 2012-01-02 11:22:03 -05:00
Andromeda Yelton 29e6ba7ee0 build_absolute_uri returns the WHOLE uri, not the base, so lines had to be rewritten accordingly. don't use it for the embed line since that requires ONLY the url base 2012-01-02 11:10:33 -05:00
Andromeda Yelton e287f6028d replacing remove-this option with pledged where applicable 2012-01-02 11:09:48 -05:00
Andromeda Yelton fb6d715429 user now sees pledged indicator rather than remove-wishlist option for pledged works 2012-01-02 10:59:00 -05:00
Andromeda Yelton 30703cdabc Merge branch 'master' of github.com:Gluejar/regluit 2012-01-02 09:41:16 -05:00
Andromeda Yelton 03d94bfbc5 tweaking email sharing 2012-01-02 09:39:11 -05:00
eric 1cad25da28 detab source file 2011-12-31 13:49:23 -05:00
eric 9d6066c929 catch IndexErrors to fix HermanCain bug; there is a work with zero editions 2011-12-31 13:48:54 -05:00
eric c2789350d0 We have comments! sync your dbs. 2011-12-30 22:08:04 -05:00
Andromeda Yelton a2ebda17b1 one more place to truncate 2011-12-29 12:57:43 -05:00
Andromeda Yelton 1ddbbf55a5 now there is a truncatechars filter, applied where relevant 2011-12-29 12:50:09 -05:00
Andromeda Yelton 9358004c9b Merge branch 'master' of github.com:Gluejar/regluit 2011-12-29 10:40:51 -05:00
Andromeda Yelton 0550f9ac43 added some default field prepopulation to email share form 2011-12-29 10:40:35 -05:00
eric 4f17b86878 more reversion to make login?next= work correctly 2011-12-29 00:11:28 -05:00
eric afccb45fe4 fixed redirect loop 2011-12-28 23:31:42 -05:00
Andromeda Yelton a742773799 merging work.html changes 2011-12-28 23:19:18 -05:00
Andromeda Yelton 79bc9ac15a now email share has marginal styling and returns users to their original page after form submission 2011-12-28 23:17:39 -05:00
eric f9adbd0bc3 social widgets on basedocumentation lit up 2011-12-28 21:13:32 -05:00
Andromeda Yelton 0717479238 lo-fi email sharing now works 2011-12-28 20:43:52 -05:00
eric a348743385 discovered at d applied the useful request.build_absolute_uri 2011-12-28 20:41:07 -05:00
eric 57939300b1 another try for email activation 2011-12-28 15:02:12 -05:00
eric 4c7e5e7f8c revert; will need to use http rewrite in apache to enforce https 2011-12-28 13:58:28 -05:00
eric f493312782 Revert "added htmlbase to enforce https login"
This reverts commit 93afadcf46.
2011-12-28 13:51:24 -05:00
eric 93afadcf46 added htmlbase to enforce https login 2011-12-28 12:34:43 -05:00
eric 697ee04a43 added site fixtures to make email registration emails work 2011-12-28 12:34:41 -05:00
Andromeda Yelton 97ee0a7fc4 shortened publication date in work page header, made book list cover clickable 2011-12-28 07:27:56 -05:00
Andromeda Yelton f0e1d47ac4 remove this button on work page returns page to add-to-wishlist state 2011-12-27 21:39:40 -05:00
Andromeda Yelton 50aae788c6 further tidying up panel view hover state and making sure it works properly in widget form too 2011-12-27 19:17:44 -05:00
eric 5fb28b709f revived book covers 2011-12-27 13:00:42 -05:00
Andromeda Yelton d940c9a46a tidied up panel hover state: layout, more sensitivity to campaign status, live pledge link 2011-12-26 21:10:32 -05:00
Andromeda Yelton a35ffb2ffa Merge branch 'master' of github.com:Gluejar/regluit 2011-12-26 12:53:36 -05:00
Andromeda Yelton c79b3bdd10 replaced useless status indicators with wished-by indicators on supporter page for status = initailized or no campaign and destroyed GR/LT modal dialog 2011-12-26 12:53:28 -05:00
Raymond Yee ad2dd36613 Changed order of campaign classes in campaign_admin 2011-12-23 11:46:09 -05:00
Raymond Yee c721c9c6b2 Now in campaign admin, you can pick specific campaign to take action on. 2011-12-23 09:59:07 -05:00
Raymond Yee a757f6f99b Versions that include movement to utcnow() and changing what comes out PaymentManager.checkStatus() -- but payment to primary recipient is now broken. Need to investigate 2011-12-22 20:34:24 -05:00
Andromeda Yelton 5c8f3beccc working on goodreads/librarything import UI. in an intermediate state right now. 2011-12-22 16:03:15 -05:00
Andromeda Yelton 6f64434b4e Merge branch 'master' of github.com:Gluejar/regluit 2011-12-22 09:51:59 -05:00
Andromeda Yelton 7130ee5625 progress icon replaced by wished-by-N text for books on supporter page with no campaign yet 2011-12-22 09:51:49 -05:00
Raymond Yee 81c99c8724 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-21 18:37:22 -05:00
Raymond Yee 17d4acceab changed PaymentManager.cancel to PaymentManager.cancel_transaction and added PaymentManager.cancel_campaign to parallel other methods in PaymentManager
morphing the campaign_admin view towards being able to push all the campaigns through the various states
2011-12-21 17:32:08 -05:00
Andromeda Yelton ddcee58eeb badges on supporter page now stay put regardless of whose page you're looking at and whether they have a tagline 2011-12-21 14:33:48 -05:00
Andromeda Yelton 614b36d15c Merge branch 'master' of github.com:Gluejar/regluit 2011-12-21 13:48:45 -05:00
Andromeda Yelton d0b2809c9e moving badges for recommended and popular into tab area 2011-12-21 13:48:34 -05:00
Raymond Yee 322f03a460 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-21 12:33:44 -05:00
Andromeda Yelton e8860238e0 on-wishlist checkmark now displays properly on supporter page 2011-12-21 11:34:35 -05:00
Andromeda Yelton 2428a5eef9 moved support button on work page to be more prominent and align better with other icons 2011-12-21 10:59:49 -05:00
Raymond Yee 75fceed7c5 Now display the campaigns with three different types of transactions: ACTIVE, INCOMPLETE, COMPLETED on the campaign_admin view 2011-12-20 20:36:27 -05:00
Raymond Yee 4e36892910 Putting in stub for campaign_admin.
Let admin do a PaymentManger.checkStatus() to get the latest information about Transactions (using the PayPal PaymentDetails and PreapprovalDetails API methods)
2011-12-20 17:42:06 -05:00
Andromeda Yelton 12a3f7f72f Merge branch 'master' of github.com:Gluejar/regluit 2011-12-20 16:13:28 -05:00
Andromeda Yelton c7293e253a updating look of campaign and landing page to match latest from Stefan 2011-12-20 15:33:20 -05:00
Raymond Yee c055767173 set the expiry date based on the campaign deadline. There is a setting PREAPPROVAL_PERIOD_AFTER_CAMPAIGN for specifying how many days after the campaign deadline should we ask for a preapproval deadline. I've put in 90 days. 2011-12-20 14:56:01 -05:00
Raymond Yee 47399ab23a Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-20 14:07:43 -05:00
Andromeda Yelton 2432b991b5 the learn more section: it toggles. toggle toggle toggle 2011-12-20 13:31:20 -05:00
Andromeda Yelton 269ebc4789 Merge branch 'master' of github.com:Gluejar/regluit 2011-12-20 10:39:14 -05:00
Andromeda Yelton c8c61b5ef9 separating the color green from an abstract call-to-action color(also at present green) 2011-12-20 10:39:02 -05:00
Raymond Yee aab7b6f926 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-20 10:35:42 -05:00
eric f81a4e8e6d removed isbn_10 column and fixed many isbn13 non-compliance issues
apply migrations!
2011-12-19 23:26:55 -05:00
Raymond Yee bad343e3d2 views.py: wiring in the email address of partnering non-profit
payment/manager.py: wire in the email address of the campaign recipient and the Gluejar commission rate
move the Gluejar commission rate to dev.py/prod.py
2011-12-19 18:34:30 -05:00
eric 22da90659c added frontend tests; test_view_by_anonymous is now by anonymous 2011-12-19 17:09:12 -05:00
Andromeda Yelton c703b1b367 tab coloring on support page and hover states in share column on work page 2011-12-19 12:22:00 -05:00
Ed Summers 2417886169 removing 0014_populate_subjects migration since it is problematic to run with South ORM, instead have people run add_openlibrary management command 2011-12-19 02:20:24 -05:00
Ed Summers 3282a24f7c remove hard tabs 2011-12-19 02:10:35 -05:00
Ed Summers 55656e2d3d now getting subjects from openlibrary instead of from googlebooks. You will need to APPLY MIGRATIONS! 2011-12-19 01:33:13 -05:00
Andromeda Yelton ea728750ae draft terms added 2011-12-16 17:19:59 -05:00
Andromeda Yelton cd53080ac6 eleventy billion css tweaks part quattuor 2011-12-16 12:17:08 -05:00
Andromeda Yelton 9085ce6db3 clicking header sign up button on home page now lightboxes signup form 2011-12-16 12:16:30 -05:00
Andromeda Yelton b32cf80471 eleventy billion css tweaks, part tres 2011-12-15 13:55:26 -05:00
Andromeda Yelton 6e152acfe8 eleventy billion css tweaks, part deux 2011-12-15 10:28:23 -05:00
Andromeda Yelton 754fcc394e eleventy billion css tweaks, part one 2011-12-14 16:49:36 -05:00
Andromeda Yelton e624a35359 Merge branch 'master' of github.com:Gluejar/regluit 2011-12-13 16:37:55 -05:00
Andromeda Yelton ffd8bdc0a2 added magnifying glass button back into landing page search box 2011-12-13 16:37:45 -05:00
eric deabe01385 moved as-yet unsaid campaign actions into their own table. Apply migrations! 2011-12-13 16:24:56 -05:00
Andromeda Yelton a8c546e3b1 restored magnifying glass to default search box 2011-12-13 16:17:51 -05:00
Andromeda Yelton 43c0dfa67d distributing image links to google across servers better 2011-12-13 14:49:41 -05:00
Andromeda Yelton ddceff17c4 twitter sharing is less lame 2011-12-13 14:30:37 -05:00
Andromeda Yelton a4d609c76f added google books branding to extra search box on empty search results page 2011-12-13 13:32:29 -05:00
Andromeda Yelton ea292c5600 Merge branch 'master' of github.com:Gluejar/regluit 2011-12-13 13:15:43 -05:00
Andromeda Yelton fd9f0a8e0c both supporter.html and base.html were including jquery, leading to script failures. removed include from supporter. 2011-12-13 13:14:56 -05:00
thatandromeda db47fafaf8 changed "Search results" to "Google Books search results" in compliance with Books API usage guidelines: http://code.google.com/apis/books/branding.html#naming 2011-12-13 11:55:34 -05:00
Andromeda Yelton 5188bfa519 Merge branch 'master' of github.com:Gluejar/regluit 2011-12-13 10:50:33 -05:00
Andromeda Yelton 8848ce9a0b now ungluer avatar and book cover in who's ungluing list on landing page are clickable 2011-12-13 10:50:21 -05:00
thatandromeda 4ba3081311 changed "Governing Agreement" to "Platform Services Agreement" and "rightsholder" to "Rights Holder" for consistency with current language 2011-12-13 09:35:14 -05:00
Ed Summers d08e939cc3 order editions in reverse chronological order 2011-12-12 21:44:35 -05:00
Andromeda Yelton 35014da286 watermark ALL the things 2011-12-12 16:09:18 -05:00
Andromeda Yelton 26806673e4 added google watermark to landing page search box 2011-12-12 14:10:49 -05:00
Andromeda Yelton eb79099fbe moving all the rightsholder stuff to the top of the details tab so editions stuff doesn't hide it 2011-12-09 16:17:10 -05:00
Andromeda Yelton 27e88e5458 Merge branch 'master' of github.com:Gluejar/regluit 2011-12-09 16:15:24 -05:00
Andromeda Yelton 66ebeaf07e links to edition-specific google books in detail view 2011-12-09 16:15:11 -05:00
Ed Summers 33532029c1 removing print statement (oops) 2011-12-09 13:23:28 -05:00
eric e5aab951a7 googreads, librarything links now show only when a member is logged in 2011-12-09 13:03:28 -05:00
eric eca82b3911 wired recent events to landing page ungluers 2011-12-08 19:12:26 -05:00
eric 167dccf574 Wishlists are now filled using the Wishes intermediate table. It's named the same as previous intermediate table, and I've edited the migration so data is not lost.
Also, I've added methods od Wishlists to add and remove Works. There
are "source" and created columns on the Wishes table
2011-12-08 18:22:20 -05:00
Andromeda Yelton aa0a935d16 details tab displays editions 2011-12-08 16:23:31 -05:00
Andromeda Yelton 60f4b141fc Merge branch 'master' of github.com:Gluejar/regluit 2011-12-08 15:28:30 -05:00
Andromeda Yelton 1c623dcac7 made sure arrow and graphic aligned in a cross-browser way and moved long text to learn more space 2011-12-08 15:24:38 -05:00
Andromeda Yelton 1bef255813 now the embed text is in a textarea 2011-12-08 15:24:05 -05:00
eric 5a8d7e8fa3 put a real query into landing page campaign slider 2011-12-08 08:10:58 -05:00
Andromeda Yelton 80a4fa5618 now the slideshow does not autoadvance 2011-12-07 15:07:39 -05:00
Andromeda Yelton 53f9f1d87e you can create accounts from the landing page now\! hooray\! 2011-12-07 12:56:23 -05:00
Andromeda Yelton e07c5506b4 wishlist add/remove now working on work page 2011-12-07 12:05:31 -05:00
eric d00adef207 campaign searches now use the status field 2011-12-06 16:37:03 -05:00
Andromeda Yelton 3f8c6321c7 Merge github.com:Gluejar/regluit 2011-12-06 15:08:55 -05:00
Andromeda Yelton 2396a3ff69 now there are book panels on the landing page with real (albeit silly) data. hover state of panels not working yet. 2011-12-06 15:08:36 -05:00
eric 93cb548b42 fixed bug where non-logged in user trips on missing work.id in search results 2011-12-06 14:40:29 -05:00
Ed Summers 2adc23b380 when a lookup on openlibrary fails, fall back to doing a search 2011-12-06 09:53:53 -05:00
eric 7dba126848 when a user is not logged in, clicking add to wishlist now ends them at the work page
...where we need to have the add functionality
2011-12-05 23:31:03 -05:00
Andromeda Yelton 8c63b29785 we now have half a landing page. more changes to come. 2011-12-05 16:16:42 -05:00
Ed Summers ec09c4754b for crawlers so they do not activate lookups at librarything, goodreads, etc 2011-12-05 07:37:10 -05:00
Ed Summers 411a254ee6 got librarything, goodreads and openlibrary links working when ids are available, with fallbacks to isbn routing and canned search urls 2011-12-05 00:56:24 -05:00
eric 95c89d06fc "Remove from Wishlist" shortened to "Remove This" to pretty list 2011-12-03 15:20:28 -05:00
Ed Summers 97daddea5d Merge branch 'master' of github.com:Gluejar/regluit 2011-12-02 23:08:10 -05:00
Ed Summers 641e4904d9 link to googlebooks 2011-12-02 23:07:55 -05:00
eric e0fbb3d324 Added Ungluers and facet display to CampaignListView 2011-12-02 22:53:39 -05:00
eric c171741c5b added facet name to work list display 2011-12-02 22:32:26 -05:00
eric 7f4976bde5 added ungluers to WorkListViews 2011-12-02 22:32:25 -05:00
eric 98b5deef1f git tripping over a newline 2011-12-02 19:46:47 -05:00
eric 3dc38b0cf0 remerge 2011-12-02 19:39:09 -05:00
eric 34dd5237af merged with raymond's commit 2011-12-02 19:37:27 -05:00
eric dd6add1e44 Implemented WorkListView- does popular and recommended lists 2011-12-02 19:29:23 -05:00
eric 569342c8a1 removed counter on search and cleaned js ordering while trying to debug broken add-to-wishlist 2011-12-02 19:28:13 -05:00
eric 9ad77a952e fixed broken add to wishlist 2011-12-02 19:26:41 -05:00
eric 1ae38663f4 removed ref to "book-panel.css"; "book_panel.css" is what we're using. 2011-12-02 19:24:12 -05:00
eric 87f07bd9c3 removed "closest" campaign list; added most pledges list and biggest campaign list 2011-12-01 17:32:53 -05:00
eric 68b0d4b73a implemented a generic view class for campaigns.
Ending and newest views are reverse sorted. campaign status is dealt
with except for successful campaigns
2011-12-01 13:17:33 -05:00
eric 0bd6475906 OK, the explore bar now explores! 2011-12-01 09:41:08 -05:00
eric f094efdca2 removed superfluous "shared_works" code
this is more efficiently done by accessing request.user.wishlist in the
templates.
2011-12-01 08:47:58 -05:00
eric b1cd55b6ca fixed bookpanel indication of works "on your wishlist" 2011-12-01 08:42:03 -05:00
eric 552ede6089 yes, I really want to change book-panel 2011-11-30 21:24:12 -05:00
eric 461fc48c32 made the tab active. 2011-11-30 21:07:17 -05:00
eric a83586b981 made this more readable while disassembling book-panel and fixing html validation
changing a span to a div broke the book panel; the next commit fixes
it. some class rearrangement as well.
2011-11-30 21:05:19 -05:00
eric 819753a268 book-panel.js reoved; appears to have been replaced by greenpanel.js 2011-11-30 20:57:28 -05:00
eric 828ca6f022 1st pass at new UI for /campaigns/ 2011-11-30 13:14:38 -05:00
eric e0c31ca6a4 minor html corrections; toggle icons now have alt text 2011-11-30 12:23:25 -05:00
Raymond Yee 6567369ed7 Tweaked work.html to handle the case of a single Ungluer who has pledged.
Added comment to pledge.html
2011-11-30 09:13:00 -08:00
Raymond Yee b8cebfa0dd Refining the interaction of Premium choice and pledge amount 2011-11-30 08:58:26 -08:00
Raymond Yee b44379e6cd First pass at tying the premium selected and the pledge amount 2011-11-29 18:02:51 -08:00
eric 8768a55571 added statcounter code to base template; the javascript was messing up the supporter page hidden settings, so I omitted the js there
also added a css block so we can have all css load before js
2011-11-29 18:15:33 -05:00
eric 1fc644aacd implemented a minimum campaign term; other campaign management tweaks 2011-11-29 10:48:37 -05:00
eric 9cbcea0f72 the open campaign form now automatically sets the end date and target to allowed values 2011-11-28 23:37:31 -05:00
Raymond Yee 45885be2e6 Listing for campaign detail 2011-11-29 00:42:31 +00:00
Raymond Yee 2cbdd797d5 Stripped some parameters from payment/parameters that belong in settings 2011-11-28 16:38:28 -08:00
Raymond Yee f6a5c98b4e Adding more details to transaction display (for debugging) 2011-11-28 16:21:57 -08:00
Raymond Yee 42a8af4c5e Link from campaigns to the respective work page (not campaign page) 2011-11-28 16:13:06 -08:00
Raymond Yee 57640ec7b2 First pass at unwiring campaign_detail from the real pledge view. 2011-11-28 15:39:06 -08:00
Andromeda Yelton 440047145a making errors more obvious on campaign management page and goal more obvious on work page 2011-11-28 11:38:31 -05:00
Andromeda Yelton 0e33932435 improving display of hover state of book panel (still in progress) 2011-11-28 10:13:21 -05:00
eric f96b5e4637 fixed bug where anonymous user can't view work page 2011-11-26 17:09:33 -05:00
eric e38d78ecc3 rights holder FAQ 2011-11-25 21:59:17 -05:00
eric b398a948dc refactored campaign management savable constraints out of view and into form 2011-11-25 21:23:37 -05:00
eric d5bae40c00 refactored launchable into campaign model. fixed date camparison bug. moved target and deadline limits to settings file 2011-11-23 21:41:06 -05:00
eric 3671b0a182 marked campaign description and details as safe 2011-11-23 19:28:30 -05:00
eric a89485be01 campaign data now appears in campaign tab; campaign stuff is now triggered only by active campaigns 2011-11-23 17:28:29 -05:00
Raymond Yee 83b006b2d3 Turning off embedded PayPal UI to see whether paypal redirect works properly on please 2011-11-23 13:14:39 -08:00
Raymond Yee 38d38ff844 I keep forgetting to import sys 2011-11-23 10:54:02 -08:00
Raymond Yee 0ec0416c0f Print out to stderr the PayPal URL 2011-11-23 10:50:29 -08:00
Andromeda Yelton 017fb9fac9 Merge branch 'master' of github.com:Gluejar/regluit 2011-11-23 12:29:15 -05:00
Andromeda Yelton 14a008421d refactored search.html to use book_panel.html. required altering labels of some data sources so that they have the same names when they hit book_panel regardless of where it's included from 2011-11-23 12:28:59 -05:00
eric 20cc607193 claim form now uses ModelChoiceField; tests for previous claims 2011-11-23 12:23:53 -05:00
eric 39eface590 Merge branch 'master' of https://github.com/Gluejar/regluit 2011-11-22 17:27:59 -05:00
eric 50bdf7b312 minor template enhancements 2011-11-22 17:27:41 -05:00
Raymond Yee 4cfabf6efe Turning on embedded view to test 2011-11-22 14:17:54 -08:00
Raymond Yee 9b815e7e28 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-11-22 11:53:06 -08:00
Raymond Yee 979a403a06 Merge branch 'jkace' of github.com:Gluejar/regluit into payment
Conflicts:
	frontend/templates/campaign_detail.html
	frontend/views.py
2011-11-22 11:30:45 -08:00
Andromeda Yelton 47754ddd6c now you can get embed code from the work page 2011-11-22 14:28:27 -05:00
Andromeda Yelton f544b7684a now there is Twitter sharing 2011-11-22 13:59:37 -05:00
Andromeda Yelton c9e899bac1 fixed widget sizing 2011-11-22 13:59:25 -05:00
Andromeda Yelton 25d2177ca4 restoring background color alternation of books in list view of supporter page after widgetization 2011-11-22 13:33:57 -05:00
Raymond Yee 5f4496a290 Merge branch 'master' of github.com:Gluejar/regluit into campaign_widget 2011-11-22 06:45:07 -08:00
Jason 58eb67e0aa Adding code to support embedded payments 2011-11-22 06:14:58 -05:00
eric 0bad939bfb Though the form is ugly, a campaign manager can now launch a campaign and set info
I also learned what it means when a form is bound to a model object
2011-11-22 00:28:16 -05:00
Raymond Yee 726f086c4c Adjust the size of the iframe 2011-11-21 20:36:14 -08:00
Raymond Yee 78339e3de5 Added a rough textarea for someone to copy embedding iframe for widget 2011-11-21 18:06:44 -08:00
Raymond Yee e09cf8186d Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-21 17:34:44 -08:00
Raymond Yee 994be3f732 Attempt to factor out book panel so it can be used in widget and supporter page 2011-11-21 17:21:06 -08:00
Ed Summers 8008a5df51 added /googlebooks/{googlebooks_id}/ route which will add the book to gluejar and redirect to the new work url, for use on the search results page 2011-11-21 20:12:13 -05:00
Andromeda Yelton bdf30251c4 Merge branch 'master' of github.com:Gluejar/regluit 2011-11-21 16:08:12 -05:00
Andromeda Yelton b48d6c1091 styling tweaks; working on making sure everything can & does use same version of jquery (1.6.3) 2011-11-21 16:05:55 -05:00
eric a6c84aea89 should now be back where I was 2011-11-21 15:49:29 -05:00
eric 6e5d51f24f is_staff, not is_staff() 2011-11-21 15:08:28 -05:00
Andromeda Yelton b865086cb4 figured out why documentation.css was not being applied to all descendants of basedocumentation.html; fixed that. descendant extrahead content should go in the extra_extra_head block now. 2011-11-21 15:07:10 -05:00
Andromeda Yelton 495f447b1a now the supporters tab on the work page is populated 2011-11-21 13:06:23 -05:00
Andromeda Yelton a749c165cb fixing layout of pagination div to avoid clashes with panel view 2011-11-21 11:32:05 -05:00
Andromeda Yelton 44e14ab2a8 pushed some logic into views so that work page will be making fewer db calls on net 2011-11-21 10:51:50 -05:00
eric 43d3f3f553 halfway through implementation of campaign management. can't launch campaigns yet. migrate schemas! 2011-11-20 22:23:51 -05:00
eric 8169e7ecb3 fixed assorted html errors 2011-11-20 17:43:55 -05:00
eric 1189ab02c4 switched to using is_staff set by django admin to determine website "staff" (also fixed a bug from last commit) 2011-11-20 14:22:51 -05:00
eric fa68e52260 switched campaign manager field to AutoCompleteSelectMultipleField 2011-11-20 14:02:09 -05:00
eric 497d883a43 fixed no results bug in gluejar-search; started passing remote IP address to google api 2011-11-20 09:20:08 -05:00
eric 9638ff9a97 moved claiming form back to Details Tab 2011-11-19 22:54:59 -05:00
eric 3eb3653947 robots.txt 2011-11-19 22:15:26 -05:00
Ed Summers f193ea396e use local mailserver instead of google mail ; also now routing all /admin and /accounts traffic through ssl 2011-11-20 02:48:26 +00:00
eric 409c9746cb renamed file 2011-11-19 21:22:54 -05:00
eric a6bf130b24 Andromeda von Rightsholder can now open campaigns from her rightsholder tools page; apply migrations! 2011-11-19 21:22:54 -05:00
Ed Summers c167ed2965 admin view uses default login page 2011-11-19 18:27:15 -05:00
Ed Summers 7dd821fccb enabling admin, and added created column on models that did not have them 2011-11-19 11:55:35 -05:00
Ed Summers 0d096737be unix line endings 2011-11-19 10:51:51 -05:00
eric e5eaf14ad0 prettied up logins. fixed not-logged-in on admin bug. provided path to password reset for social auth users 2011-11-18 19:50:47 -05:00
eric d73304e1a6 cleaning up user change form 2011-11-18 17:57:36 -05:00
Andromeda Yelton 3b80d18829 wording tweaks 2011-11-18 15:11:17 -05:00
Andromeda Yelton c7637586fb merging simultaneous changes to rights holder template 2011-11-18 13:34:25 -05:00
Andromeda Yelton 43912006ae prettifying the documentation pages with new css 2011-11-18 13:27:26 -05:00
eric 6cc05817a8 woo hoo! autocomplete input on rightsholder creation form. uses app django-selectable 2011-11-18 09:24:31 -05:00
Ed Summers 6a9a213632 added pagination with django-endless-pagination 2011-11-17 23:09:23 -05:00
eric a720089525 unglue it admin users can now approve rightsholder claims! 2011-11-17 14:35:41 -05:00
Raymond Yee 7b5b1456dc Since the librarything key is being used right now only for a librarything debug page, I've added exception handling in case there is no settings with a librarything api key. 2011-11-17 07:40:40 -08:00
Raymond Yee 11027f6bc1 First attempt at placing a Librarything import button 2011-11-16 16:47:29 -08:00
Raymond Yee a22d23b184 The setting page now sends Goodreads auth to /goodreads/auth instead of calling Goodreads immediately to generate an auth request 2011-11-16 14:16:57 -08:00
Raymond Yee 2ac1909ce0 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-16 12:47:02 -08:00
Raymond Yee 3ebcf2edae Wired Goodreads authorization into the supporter settings panel. 2011-11-16 12:45:33 -08:00
Andromeda Yelton f748bb220e Merge branch 'master' of github.com:Gluejar/regluit 2011-11-16 15:25:06 -05:00
Andromeda Yelton d431fecbfc don't need supporter_panel any more; it's been integrated into supporter.html 2011-11-16 15:24:47 -05:00
Raymond Yee 5df81cc52e Merge branch 'master' of github.com:Gluejar/regluit into goodreads
Conflicts:
	frontend/urls.py
2011-11-16 11:58:39 -08:00
eric d5a2b88768 Awesome Unglue.it Administration page added; will require a migration to add claim status 2011-11-16 14:45:37 -05:00
Raymond Yee 73596b33e8 Forgot the template file for librarything 2011-11-16 10:30:02 -08:00
Raymond Yee 3be4e6fab4 First pass at integrating LT into the UI 2011-11-16 10:20:10 -08:00
Andromeda Yelton 8bbee39312 Merge branch 'master' of github.com:Gluejar/regluit 2011-11-16 12:38:18 -05:00
Andromeda Yelton f2fcd05a33 updating supporter page with new icons 2011-11-16 12:36:24 -05:00
eric 2cc4d718a1 Added claim list on rh-tools. omitted claim display for non-rightsholders. fixed related name on claim model 2011-11-16 12:20:19 -05:00
Andromeda Yelton 1a7a04cbc3 adding 404 page and improving footer layout 2011-11-16 11:01:45 -05:00
eric 6a2e690f18 claim form now creates a claim 2011-11-16 00:22:29 -05:00
eric 354b46085f Approved rights holders get a claim form on work pages; still need to make a view that does the actual claiming 2011-11-15 18:20:29 -05:00
Andromeda Yelton d4fd3748dc Merge branch 'master' of github.com:Gluejar/regluit
Conflicts:
	frontend/templates/base.html
2011-11-15 16:16:35 -05:00