Commit Graph

1624 Commits (924300267b433fca921a036dab947b0ea1237ea1)

Author SHA1 Message Date
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
Andromeda Yelton 74a5710921 prettifying the footer 2011-11-15 16:14:09 -05:00
Raymond Yee d0336fdb59 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-15 12:58:07 -08:00
eric 04831c7011 fixed the tab scripts on works page- seems to be a jquery version issue 2011-11-15 15:53:38 -05:00
Raymond Yee daef075f5b Fixing the incorrect passing of a Goodreads shelf name -- and also incorrect display of number of books on wishlist. 2011-11-15 12:51:38 -08:00
eric 4348c08d3b fixed html errors in base.html footer 2011-11-15 15:00:48 -05:00
eric 83c48b5a92 somebody messed up the work page title 2011-11-15 14:40:23 -05:00
eric 769348bf2e more stuff rhtools 2011-11-15 14:35:03 -05:00
Raymond Yee c6e9d33685 Merge branch 'goodreads' of github.com:Gluejar/regluit 2011-11-15 11:20:18 -08:00
Raymond Yee 96d264c8a1 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-15 11:08:58 -08:00
Andromeda Yelton da108d0ae1 who wants a favicon? aw yeah 2011-11-15 13:54:13 -05:00
Raymond Yee d139a4b693 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-15 10:40:44 -08:00
Raymond Yee 45f58ae955 Merge branch 'master' of github.com:Gluejar/regluit into goodreads
Conflicts:
	frontend/urls.py
2011-11-15 10:37:19 -08:00
Andromeda Yelton 5ff5485194 grammar fix to hover text on badges 2011-11-15 13:12:03 -05:00
Andromeda Yelton 64bf1dc57f improving url encoding of parameters to handle spaces 2011-11-15 11:47:47 -05:00
Andromeda Yelton fdd8e55d9f merging conflicts after creating workstub page 2011-11-15 11:32:30 -05:00
Andromeda Yelton 4424ee513f titles on search results now link to work stub page 2011-11-15 11:27:32 -05:00
eric 8478f3c4a7 rights holder tools now lists platform agreements that user administers; rights@gluejar.com is now an admin account 2011-11-15 10:01:01 -05:00
eric 0328430169 first cut at UI for unglue.it admins to create rights holders and delegate ownership 2011-11-14 23:28:55 -05:00
Ed Summers 4e2e460903 added rudimentary view of subjects to get an idea of what is in there already 2011-11-14 21:13:39 -05:00
Ed Summers 8c3a4528fc real title 2011-11-14 19:09:34 -05:00
Ed Summers 008ae17e1e trying to add facebook link 2011-11-14 19:04:49 -05:00
eric 95f3991846 ungluer lists now shown in work view (the wished_by users) and search view( same as supporter) 2011-11-14 15:40:33 -05:00
eric 6a82ec5f1d explore column now shows up to 5 "randomly" chosen ungluers 2011-11-14 15:16:36 -05:00
Andromeda Yelton cee723524c Merge branch 'master' of github.com:Gluejar/regluit 2011-11-14 13:45:11 -05:00
Andromeda Yelton 34e245362f added tooltips to clarify badges 2011-11-14 13:43:47 -05:00
eric 4c65a11696 de-association from twitter and facebook are now supported 2011-11-14 13:23:26 -05:00
Andromeda Yelton 6b38e7d9b4 more comprehensively handling campaign states; grammar fix for singular vs. plural ungluers 2011-11-14 13:07:07 -05:00
Andromeda Yelton 1d9109a7d7 modified work.html to handle all campaign status options 2011-11-14 11:42:33 -05:00
Andromeda Yelton 17a382cbc8 Merge branch 'master' of github.com:Gluejar/regluit 2011-11-14 10:21:39 -05:00
Andromeda Yelton 93acfc6348 improving work page's handling of campaign statuses 2011-11-14 10:19:52 -05:00
eric f3122e5161 corrected alt in avatars 2011-11-13 20:35:29 -05:00
eric db3163b01b added twitter account association and profile image acquisiton
also added goodreads association url to UI for good measure
2011-11-12 16:36:31 -05:00
eric f2ecff619f added pic_url to user profile. migrate your schemas! connect to facebook adds your facebook profile pic 2011-11-12 15:02:47 -05:00
eric 2e00f6bbd0 added facebook association 2011-11-12 13:58:31 -05:00
eric bc3b8333b6 added librarything_id and facebook_id to profile model, wired to supporter template; started faq 2011-11-11 22:51:22 -05:00
Andromeda Yelton aa79208a14 adding display of author name 2011-11-11 15:09:39 -05:00
Raymond Yee 38105c3de9 First pass at writing the celery tasks to the db and displaying them. 2011-11-10 15:14:33 -08:00
Raymond Yee df8d1d9506 Put more logging into Goodreads handling to try to debug why shelf loading not working in some cases. 2011-11-10 07:36:17 -08:00
Raymond Yee a959d00508 Experiments with creating tasks and seeing how to manage them, especially how to create a custom state to track status of tasks. 2011-11-09 17:31:31 -08:00
Raymond Yee 49aca6428c The /pledge page now has the correct radio button to correpond to the premium clicked on.
HOWEVER, there's no enforcement currently of the pledge amount to be the same as the premium clicked on.
Also, no form validation on pledge page yet too.
2011-11-09 10:05:03 -08:00
eric 3a7ba8cb45 fixed bug https://www.pivotaltracker.com/story/show/20482327
also added error output on profile edit form
2011-11-09 12:24:26 -05:00
Andromeda Yelton 243778b40c tweaking css for panel hover state 2011-11-08 21:23:23 -05:00
Andromeda Yelton ba45db0e78 added live data to panel view hover state; put js that search & supporter share into separate files 2011-11-08 20:34:15 -05:00
Andromeda Yelton 3c33ca8bfa Merge branch 'master' of github.com:Gluejar/regluit 2011-11-08 11:28:55 -05:00
Andromeda Yelton 2173f16d4e panel view now has a hover state on supporter page 2011-11-08 11:28:35 -05:00
eric 4c29afdb94 fixed work template errror 2011-11-07 17:01:21 -05:00
eric ec9b69e012 removed support button if no campaign 2011-11-07 16:56:23 -05:00
Andromeda Yelton 2b063e78d1 merge conflicts 2011-11-07 16:16:36 -05:00
Andromeda Yelton abf3ec131e wiring supporter and search icons and percent unglued to live data 2011-11-07 16:12:53 -05:00
Ed Summers 7cf40e88de need to import Q 2011-11-07 16:04:37 -05:00
Raymond Yee a40cab0184 First take on integrating pledge 2011-11-07 16:01:08 -05:00
Ed Summers 7d44516189 Merge branch 'master' of github.com:Gluejar/regluit 2011-11-07 15:39:05 -05:00
Ed Summers 110b996769 added logic to display ebooks, badly for now 2011-11-07 15:39:02 -05:00
Andromeda Yelton 268c669b76 Merge branch 'master' of github.com:Gluejar/regluit 2011-11-07 15:12:12 -05:00
Andromeda Yelton 51d8c71069 aligned search box with main content container; fixed flow of panel view in search page; added bottom-padding to allow for cover images to be fully displayed in list view 2011-11-07 15:11:52 -05:00
Raymond Yee fa601f7dd4 fixed which wishlist being read by Ajax update for goodreads 2011-11-07 12:19:45 -05:00
Andromeda Yelton 7753c49656 James K. Polk did not actually write every book in our database 2011-11-07 11:58:48 -05:00
Andromeda Yelton a1055a01aa resolving merge conflicts 2011-11-07 11:06:01 -05:00
Andromeda Yelton 7635c1a701 fixing image display in search panel view 2011-11-07 11:04:09 -05:00
eric 9ba845ba6e Merge branch 'master' of https://github.com/Gluejar/regluit 2011-11-07 10:48:16 -05:00
eric 609b829f5c fixed missing style on support menu 2011-11-07 10:45:10 -05:00
Ed Summers e3c2ee3498 Merge branch 'master' of github.com:Gluejar/regluit 2011-11-07 10:18:58 -05:00
Ed Summers 6fe1ad049c pull in all premiums 2011-11-07 10:18:46 -05:00
Andromeda Yelton eab72eb48a Merge branch 'master' of github.com:Gluejar/regluit 2011-11-07 09:59:40 -05:00
Andromeda Yelton 46070801d6 changed search.html css to work with toggling (toggle toggle toggle) 2011-11-07 09:59:23 -05:00
Ed Summers 3bd3467152 need pass premiums to the template 2011-11-07 09:50:26 -05:00
eric 7c38ff7509 wired in setup_campaign 2011-11-06 18:56:33 -05:00
Andromeda Yelton 31b0fca4fe Merge branch 'master' of github.com:Gluejar/regluit 2011-11-06 18:45:06 -05:00
Andromeda Yelton 852125ff8a you can now toggle the supporter page between list and panel views. it's pretty badass. 2011-11-06 18:43:04 -05:00
Ed Summers 09fd66b107 need to pass premiums off to the work template if there is an active campaign 2011-11-06 18:38:33 -05:00
Ed Summers 997b771a6b Merge branch 'master' of github.com:Gluejar/regluit 2011-11-06 17:44:56 -05:00
Ed Summers 214e1c5ff8 pull in premiums from the campaign 2011-11-06 17:44:50 -05:00
eric 66e6de0ffa templatize campaignsetup; add last class to premium display 2011-11-06 17:33:11 -05:00
eric e18a6dd98c campaign display tweaks 2011-11-06 16:53:39 -05:00
Ed Summers e76df1d76a removed old work view and converted campaign view to work view 2011-11-06 16:46:46 -05:00
Andromeda Yelton cba17474c9 refactoring CSS. now sitewide.css is part of base.html and other files should be applied as appropriate. 2011-11-06 16:16:23 -05:00
Andromeda Yelton 96a3039434 fixing bugs resulting from am addition of last_campaign method 2011-11-06 15:24:16 -05:00
thatandromeda 26280b9c75 needs to use last_campaign_status method, not last_campaign.status, lest last_campaign return None 2011-11-06 14:34:15 -05:00
thatandromeda c948a6b090 fixing campaign status display 2011-11-06 14:32:29 -05:00
Andromeda Yelton f428634bf7 adding campaign page with live data; working on ability to switch between list and panel views on supporter page 2011-11-06 14:02:29 -05:00
Andromeda Yelton 2dcf1dfbee Merge branch 'master' of github.com:Gluejar/regluit 2011-11-03 16:30:36 -04:00
Andromeda Yelton 2c6a7e6f94 book panel view of supporter page now half-done; visible at /supporter2/username 2011-11-03 16:28:53 -04:00
Raymond Yee 91c3ccb0e7 Merge branch 'master' of github.com:Gluejar/regluit into goodreads
Conflicts:
	frontend/urls.py
2011-11-02 16:47:12 -07:00
Andromeda Yelton 0b891cc8b5 pages we need but do not yet have now link to stubs 2011-11-02 15:40:43 -04:00
Raymond Yee 6ddebadf87 Enough on goodreads for now. 2011-11-01 15:23:54 -07:00
Raymond Yee fa1806759b Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-01 14:24:18 -07:00
Raymond Yee d6fc0b6230 Refining display of Goodreads import 2011-11-01 14:09:04 -07:00
Andromeda Yelton c139e4dcfc adding option for supporters to pledge anonymously 2011-11-01 17:08:09 -04:00
Andromeda Yelton 60f29fc98c needed some exception handling 2011-11-01 16:21:38 -04:00
Raymond Yee 90cfdb9007 Added ability to clear wishlist 2011-11-01 10:41:39 -07:00
Andromeda Yelton 9e395e0a9f converted all text-oriented pages to run on basedocumentation.html style template 2011-11-01 13:18:44 -04:00
Raymond Yee 6f1ebb3247 Embedding api_key and username to get a functioning API call into goodreads_display.html 2011-11-01 09:50:05 -07:00
Raymond Yee f7ea58a602 Integrated Goodreads shelf loading to wishlist into UI 2011-10-31 17:26:05 -07:00
Raymond Yee ed4ea516c2 Storing goodreads info in user.profile 2011-10-29 15:40:00 -07:00
Raymond Yee 76e37a88a9 In supporter page:
* setting tab3 as the active one by default
* first attempt to sort books into the proper tab (though it's not totally accurate to say that books with successful last campaigns are the only unglued books
2011-10-28 12:36:04 -07:00
Raymond Yee a4dd33b047 Displaying some of the books from user shelf. 2011-10-25 16:07:44 -07:00
Raymond Yee 1aa6dff8f7 First pass at reading list of books from user 2011-10-25 14:20:10 -07:00
Raymond Yee 260a8ffa4d Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-10-25 07:11:50 -07:00
eric 559ff63aa3 added homepage url and twitter id to user profile model and form; reverted signalling
relying on signals to ensure that there's always a profile record
turned out to be a bad idea; django social auth signals are poorly
architected for this; and so it doesn't work. Catching exceptions
worked just fine, so I went back to that. Homepage and twitter buttons
now show only if they've been entered in settings. Twitter handle works
with or without '@' entered.
2011-10-24 23:32:32 -04:00
Raymond Yee 7c645886bd Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-10-24 18:53:23 -07:00
Raymond Yee 12c883e0f6 Provide a more precise link to where to deny access to unglue.it to Goodreads 2011-10-24 18:36:12 -07:00
Raymond Yee 809517e99a Ooops...forgot other files I had actually changed. 2011-10-24 18:29:01 -07:00
Raymond Yee 299d3d1be3 First take on Goodreads integration.
Can get userid, username, and display shelves info
Using sessions to store user info right now.
2011-10-24 18:09:30 -07:00
eric b1cce24154 using post_save signal to make sure every user has a profile 2011-10-24 13:36:26 -04:00
eric e6216e35ac creates a profile if there's not one already 2011-10-23 14:40:06 -04:00
Andromeda Yelton 246924c03f still merging changes after internet librarian 2011-10-21 15:35:31 -04:00
Andromeda Yelton e41e1e7b6d just merging my local codebase post-internet librarian... 2011-10-21 12:51:07 -04:00
Ed Summers 9901408b00 added list of supporters to the work page, just as a proof of concept more than anything. 2011-10-20 18:16:42 +00:00
Raymond Yee b1526ea284 Merge branch 'master' into tastypie2
Conflicts:
	core/models.py
2011-10-20 10:00:45 -07:00
Ed Summers e164744872 order editions by most recent to oldest 2011-10-20 05:42:49 +00:00
Ed Summers 0c1411f2e8 added celery async task for add_related that gets exercised when a book is added to a wishlist. includes new settings for the djkombu celery backend 2011-10-19 23:31:16 -04:00
Ed Summers a6e8d115db added celery async task for add_related that gets exercised when a book is added to a wishlist. includes new settings for the djkombu celery backend 2011-10-19 23:28:36 -04:00
Raymond Yee a2b622b061 Added status and current_total data to Campaign resource in the API.
Added an API help page to describe how to use the API and which shows a user's api_key and sample calls and link to campaign widgets.
Added facility to redirect back to current URL after sign in.
2011-10-19 17:08:17 -07:00
eric d9e4b06f99 don't render settings on somebody else's supporter page 2011-10-19 12:55:48 -04:00
eric 74e6f7a374 wired user profile edit form to supporter page
you can now edit tagline from supporter page
2011-10-19 03:13:29 -04:00
Raymond Yee 8cab4dc425 First pass integration of preapproval into campaign pledge form 2011-10-18 16:27:20 -07:00
Raymond Yee 8d27cfc89e Merge branch 'master', remote branch 'origin' into payment_integration 2011-10-18 07:43:42 -07:00
Ed Summers 5965687dbb added some hopefully not too cheesy info about adding to wishlist when a user has an empty wishlist 2011-10-18 00:21:49 -04:00
Ed Summers 1ddf12ddab anon user gets redirected to login page when attempting to add an item to a wishlist. fixes https://www.pivotaltracker.com/story/show/19249923 2011-10-17 22:32:31 -04:00
Ed Summers cdca7c6525 include book_list.css so we the remove/add areas appear clickable 2011-10-17 21:35:58 -04:00
Ed Summers f870cc6243 added regression test for non-logged in user viewing the supporter page 2011-10-17 18:37:31 +00:00
Ed Summers d09bc33989 fix for https://www.pivotaltracker.com/story/show/19784723 2011-10-17 18:16:34 +00:00
Raymond Yee 0d21e77fd3 Merge branch 'master' of github.com:Gluejar/regluit into payment_integration 2011-10-17 07:23:59 -07:00
Ed Summers bb3a445a79 put a bit of temporary whitespace in between the footer 2011-10-14 20:48:40 +00:00
Ed Summers d5badd0f7e shortened width of search box a teensy bit so that it does not break in half 2011-10-14 20:43:29 +00:00
Ed Summers 7596ceeebd these are important for when you are running with debug off 2011-10-14 20:38:09 +00:00
Raymond Yee d79b228d39 Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
Conflicts:
	core/tests.py
2011-10-14 07:42:33 -07:00
Ed Summers 93404d42ff when a user views another users contributor page, works they already have on their wishlist show up that way instead of as "add to wishlist" 2011-10-14 14:18:38 +00:00
Andromeda Yelton 548c48d03a added logic to determine wishlist and backing status info for profile 2011-10-14 09:49:52 -04:00
Andromeda Yelton a3de52e5f9 wiring live data into the css 2011-10-14 09:49:27 -04:00
Andromeda Yelton 6d51c521af add/remove functionality and alternate row styling 2011-10-14 09:44:23 -04:00
Ed Summers 97e630c196 removed tabs 2011-10-14 05:29:23 +00:00
Ed Summers 2c1b4ed8ad added ability to add books from someone elses wishlist 2011-10-14 05:23:46 +00:00
Ed Summers 7057887bf0 s/tweeter/twitter/ 2011-10-14 05:09:34 +00:00
Ed Summers be66e3372e put remove from wishlist back 2011-10-14 01:05:19 -04:00
Ed Summers 5138e3d817 added back a search box so at least we can search for books to add to a wishlist while logged in, until we know where the search box should go 2011-10-13 22:32:30 -04:00
Ed Summers ff5aea310c removed tabs 2011-10-13 22:19:14 -04:00
Raymond Yee e8c8f2dfc2 Got rid of a lot of code that was there to help RY learn about class based generic views.
Inserted a setting for the Gluejar paypal account email.
2011-10-13 19:16:28 -07:00
Raymond Yee ad9bad997e Display total current pledge/authorization in campaign_detail 2011-10-13 14:40:07 -07:00
Raymond Yee 319906774c Merge branch 'master' of github.com:Gluejar/regluit into payment_integration 2011-10-13 14:25:51 -07:00
Raymond Yee e0f1ef50cc Rewrote pledging to a campaign to integrate the testview into logic of CampaignFormView directly.
Allow configuration of where PayPal should return after transaction is completed.
2011-10-13 14:13:37 -07:00
Raymond Yee c0bd998732 First attempt to write out transactions associated with Campaign 2011-10-13 10:28:23 -07:00
Andromeda Yelton da3b41af9d fixing date format 2011-10-13 12:55:44 -04:00
Andromeda Yelton 206b722c5d Added logic to generate backed/backing/wished data for badge display 2011-10-13 12:23:57 -04:00
Andromeda Yelton 62c1773090 incorporating latest round of supporter page css 2011-10-13 12:23:16 -04:00
Raymond Yee f01d0c4df3 First cut at doing payment integration and understanding how to use class-based generic views 2011-10-12 10:47:48 -07:00
Raymond Yee 7e4f0a222b Ooops....forgot some files in previous commit 2011-10-11 10:03:40 -07:00
Raymond Yee 39037c3ec6 Current status: ugly first cut integration 2011-10-11 10:02:17 -07:00
Ed Summers 5e9439b965 reduced number of queries needed when displaying when a book is already on a user wishlist 2011-10-10 18:08:53 -04:00
Ed Summers 70a620b27f moved to using googlebooks api for data. required moving authors and subjects to be associated to editions, since we google books does not have a notion of a work 2011-10-10 12:57:10 -04:00
Ed Summers 4e65134ab1 no need for commented out imports, eh 2011-10-09 15:17:43 -04:00
Andromeda Yelton 5f411e49e0 converting css to a less system to improve maintainability. see http://lesscss.org/ 2011-10-04 16:18:59 -04:00
Andromeda Yelton 406a15e8b6 minor fix to footer 2011-10-03 14:51:31 -04:00
Andromeda Yelton 558ed5a8e5 merged changes to base.html 2011-10-03 12:52:52 -04:00
Andromeda Yelton d652c2ac06 added rightsholder tools link 2011-10-03 12:51:30 -04:00
thatandromeda 1acc2a6af8 adding rightsholder tools link to footer 2011-10-03 13:50:34 -03:00
eric 73c4ebde29 allow username setting and tagline in profile
started work on user profiles, with "tagline" field
the first a user signs in this google, they are redirected to a page
where they can set their username
2011-10-03 12:36:22 -04:00
Ed Summers ce080f893e Merge branch 'master' of github.com:Gluejar/regluit 2011-09-30 01:01:33 +00:00
Ed Summers dea578e019 bugfix for https://www.pivotaltracker.com/story/show/19054387 2011-09-30 01:01:28 +00:00
eric 1fe7bf3dc9 Merge branch 'master' of https://github.com/Gluejar/regluit 2011-09-29 19:32:23 -04:00
eric 459ffbc549 Revert "quote style"
This reverts commit 88abca0b33.
2011-09-29 19:32:14 -04:00
eric 88abca0b33 quote style 2011-09-29 19:28:16 -04:00
eric 146bb5639f resolving errors raised by django registration tests 2011-09-29 19:27:31 -04:00
Ed Summers d653277da6 no longer needed since this is inline in supporter.html and search.html 2011-09-29 16:44:38 +00:00
Ed Summers 3f1eae3105 remove from wishlist functionality 2011-09-29 16:42:19 +00:00
Ed Summers 9a44cfc436 added remove from wishlist 2011-09-29 11:44:03 +00:00
Ed Summers dde1253dea removed print statements 2011-09-29 02:30:13 -04:00
Ed Summers 5f43f87169 make on wishlist message the same 2011-09-29 02:28:10 -04:00
Ed Summers 409df080ce got search passably working and a somewhat functional ajax add to list 2011-09-29 02:23:50 -04:00
eric 41746e6063 added login form on the activation complete page
moved login form code to a separate template (DRY), which required
changing the view for activation_complete
2011-09-28 23:26:08 -04:00
Ed Summers 32ec8bd119 removed tabs 2011-09-28 22:02:33 -04:00
Ed Summers 23c4c48946 simplified privacy view to use direct_to_template generic view; now use render() from django 1.3 which is easier 2011-09-28 21:54:50 -04:00
Ed Summers 65457dd921 merged 2011-09-29 01:42:08 +00:00
Ed Summers 8a9f785c4e started adding back some search functionality 2011-09-29 01:36:47 +00:00
Andromeda Yelton 45aef0e947 privacy policy updated with paypal info 2011-09-28 13:28:12 -04:00
Ed Summers 433b853c05 removed tabs since they are evil 2011-09-27 09:45:03 +00:00
Ed Summers f8095e9513 added and used Campaign.cover_image_small 2011-09-27 09:27:47 +00:00
Ed Summers 195f6db360 redirect to supporter page if logged in 2011-09-27 09:27:15 +00:00
Ed Summers b709cf3d61 clicking on unglue.it icon takes you home 2011-09-27 09:11:26 +00:00
eshellman df05fcf3b3 <title> needed a space after "unglue.it" 2011-09-26 15:43:41 -03:00
Andromeda Yelton 781b749005 Merge remote branch 'origin_team/master' 2011-09-21 11:17:13 -04:00
Andromeda Yelton ac5e372131 new designs for home and supporter pages, take 1 2011-09-21 11:11:36 -04:00
Ed Summers 85079fd559 removed facebook and twitter from django-socialauth login/registration 2011-09-18 19:45:23 -04:00
Andromeda Yelton a8dffead58 privacy policy now displays in footer 2011-09-13 14:35:06 -04:00
thatandromeda 5a6c267ab5 added urlpattern for privacy page 2011-09-13 14:59:29 -03:00
Andromeda Yelton 8998789116 added privacy policy 2011-09-13 10:55:11 -04:00
Ed Summers bb4003ecab should have been supporter not contributor ... 2011-09-12 18:20:36 +00:00
Ed Summers ab3216f778 renamed user view to contributor, since that is what eric has been calling it 2011-09-12 15:23:33 +00:00
Ed Summers 962543c541 need to distinguish between the user being viewed (subscriber for now) and the logged in user 2011-09-12 15:13:21 +00:00
Ed Summers 5d69a5818d got title and author on back of panel 2011-09-12 13:10:50 +00:00
Ed Summers c7bd44cbca typo 2011-09-12 13:04:32 +00:00
Ed Summers 7720a73fb0 beginnings of a user wishlist display... 2011-09-12 01:53:54 -04:00
Ed Summers 4352743f13 initial pass at pulling in stefan's book panel templates 2011-09-11 23:44:21 -04:00
thatandromeda 826097609b friendlier wording 2011-09-07 10:27:00 -03:00
thatandromeda f393210439 minor wording change 2011-09-07 10:26:19 -03:00
Ed Summers bbffab436b removed redundant images subdirectory 2011-09-06 04:07:11 +00:00
Ed Summers 8d7d1087f9 minor wording change 2011-09-06 04:02:15 +00:00
Ed Summers 0ce0369792 small style changes, and signal to update email if available from facebook 2011-09-06 03:50:38 +00:00
Ed Summers 9e98be5b37 added django-social-auth for logins w/ google, twitter and facebook 2011-09-05 21:04:49 -04:00
Ed Summers 66dfa7f933 duplicate http:// 2011-09-04 15:12:28 +00:00
Ed Summers b7ae2146c4 got the menu bar changing when a user is logged in again 2011-09-04 01:29:18 -04:00
Ed Summers 98301544a8 removed gmail credentials and modified the installation to give instructions for creating a settings.me settings module where you can put your gmail credentials, which will not be put in git 2011-09-04 01:04:04 -04:00
Ed Summers 6bd5824fc4 introduced django-registration for user management 2011-09-04 00:21:51 -04:00
Ed Summers 139a866bf6 setup api, core and frontend apps, also added initial homepage template from stefan 2011-08-30 23:46:55 -04:00
Andromeda Yelton 83c5593d08 tweak all the css 2000-12-31 19:12:21 -05:00