ea292c5600
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-13 13:15:43 -05:00
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
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
5188bfa519
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-13 10:50:33 -05:00
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
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
35014da286
watermark ALL the things
2011-12-12 16:09:18 -05:00
26806673e4
added google watermark to landing page search box
2011-12-12 14:10:49 -05:00
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
27e88e5458
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-09 16:15:24 -05:00
66ebeaf07e
links to edition-specific google books in detail view
2011-12-09 16:15:11 -05:00
e5aab951a7
googreads, librarything links now show only when a member is logged in
2011-12-09 13:03:28 -05:00
eca82b3911
wired recent events to landing page ungluers
2011-12-08 19:12:26 -05:00
aa0a935d16
details tab displays editions
2011-12-08 16:23:31 -05:00
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
1bef255813
now the embed text is in a textarea
2011-12-08 15:24:05 -05:00
80a4fa5618
now the slideshow does not autoadvance
2011-12-07 15:07:39 -05:00
53f9f1d87e
you can create accounts from the landing page now\! hooray\!
2011-12-07 12:56:23 -05:00
e07c5506b4
wishlist add/remove now working on work page
2011-12-07 12:05:31 -05:00
3f8c6321c7
Merge github.com:Gluejar/regluit
2011-12-06 15:08:55 -05:00
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
93cb548b42
fixed bug where non-logged in user trips on missing work.id in search results
2011-12-06 14:40:29 -05:00
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
8c63b29785
we now have half a landing page. more changes to come.
2011-12-05 16:16:42 -05:00
ec09c4754b
for crawlers so they do not activate lookups at librarything, goodreads, etc
2011-12-05 07:37:10 -05:00
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
95c89d06fc
"Remove from Wishlist" shortened to "Remove This" to pretty list
2011-12-03 15:20:28 -05:00
97daddea5d
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-02 23:08:10 -05:00
641e4904d9
link to googlebooks
2011-12-02 23:07:55 -05:00
e0fbb3d324
Added Ungluers and facet display to CampaignListView
2011-12-02 22:53:39 -05:00
c171741c5b
added facet name to work list display
2011-12-02 22:32:26 -05:00
34dd5237af
merged with raymond's commit
2011-12-02 19:37:27 -05:00
dd6add1e44
Implemented WorkListView- does popular and recommended lists
2011-12-02 19:29:23 -05:00
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
9ad77a952e
fixed broken add to wishlist
2011-12-02 19:26:41 -05:00
1ae38663f4
removed ref to "book-panel.css"; "book_panel.css" is what we're using.
2011-12-02 19:24:12 -05:00
87f07bd9c3
removed "closest" campaign list; added most pledges list and biggest campaign list
2011-12-01 17:32:53 -05:00
0bd6475906
OK, the explore bar now explores!
2011-12-01 09:41:08 -05:00
b1cd55b6ca
fixed bookpanel indication of works "on your wishlist"
2011-12-01 08:42:03 -05:00
552ede6089
yes, I really want to change book-panel
2011-11-30 21:24:12 -05:00
461fc48c32
made the tab active.
2011-11-30 21:07:17 -05:00
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
819753a268
book-panel.js reoved; appears to have been replaced by greenpanel.js
2011-11-30 20:57:28 -05:00
828ca6f022
1st pass at new UI for /campaigns/
2011-11-30 13:14:38 -05:00
e0c31ca6a4
minor html corrections; toggle icons now have alt text
2011-11-30 12:23:25 -05:00
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
b8cebfa0dd
Refining the interaction of Premium choice and pledge amount
2011-11-30 08:58:26 -08:00
b44379e6cd
First pass at tying the premium selected and the pledge amount
2011-11-29 18:02:51 -08:00
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
9cbcea0f72
the open campaign form now automatically sets the end date and target to allowed values
2011-11-28 23:37:31 -05:00
45885be2e6
Listing for campaign detail
2011-11-29 00:42:31 +00:00
2cbdd797d5
Stripped some parameters from payment/parameters that belong in settings
2011-11-28 16:38:28 -08:00
f6a5c98b4e
Adding more details to transaction display (for debugging)
2011-11-28 16:21:57 -08:00
42a8af4c5e
Link from campaigns to the respective work page (not campaign page)
2011-11-28 16:13:06 -08:00
57640ec7b2
First pass at unwiring campaign_detail from the real pledge view.
2011-11-28 15:39:06 -08:00
440047145a
making errors more obvious on campaign management page and goal more obvious on work page
2011-11-28 11:38:31 -05:00
0e33932435
improving display of hover state of book panel (still in progress)
2011-11-28 10:13:21 -05:00
f96b5e4637
fixed bug where anonymous user can't view work page
2011-11-26 17:09:33 -05:00
e38d78ecc3
rights holder FAQ
2011-11-25 21:59:17 -05:00
3671b0a182
marked campaign description and details as safe
2011-11-23 19:28:30 -05:00
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
017fb9fac9
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-23 12:29:15 -05:00
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
20cc607193
claim form now uses ModelChoiceField; tests for previous claims
2011-11-23 12:23:53 -05:00
39eface590
Merge branch 'master' of https://github.com/Gluejar/regluit
2011-11-22 17:27:59 -05:00
50bdf7b312
minor template enhancements
2011-11-22 17:27:41 -05:00
9b815e7e28
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-11-22 11:53:06 -08:00
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
47754ddd6c
now you can get embed code from the work page
2011-11-22 14:28:27 -05:00
f544b7684a
now there is Twitter sharing
2011-11-22 13:59:37 -05:00
c9e899bac1
fixed widget sizing
2011-11-22 13:59:25 -05:00
25d2177ca4
restoring background color alternation of books in list view of supporter page after widgetization
2011-11-22 13:33:57 -05:00
5f4496a290
Merge branch 'master' of github.com:Gluejar/regluit into campaign_widget
2011-11-22 06:45:07 -08:00
58eb67e0aa
Adding code to support embedded payments
2011-11-22 06:14:58 -05:00
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
726f086c4c
Adjust the size of the iframe
2011-11-21 20:36:14 -08:00
78339e3de5
Added a rough textarea for someone to copy embedding iframe for widget
2011-11-21 18:06:44 -08:00
e09cf8186d
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-21 17:34:44 -08:00
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
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
bdf30251c4
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-21 16:08:12 -05:00
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
a6c84aea89
should now be back where I was
2011-11-21 15:49:29 -05:00
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
495f447b1a
now the supporters tab on the work page is populated
2011-11-21 13:06:23 -05:00
a749c165cb
fixing layout of pagination div to avoid clashes with panel view
2011-11-21 11:32:05 -05:00
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
43d3f3f553
halfway through implementation of campaign management. can't launch campaigns yet. migrate schemas!
2011-11-20 22:23:51 -05:00
8169e7ecb3
fixed assorted html errors
2011-11-20 17:43:55 -05:00
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
497d883a43
fixed no results bug in gluejar-search; started passing remote IP address to google api
2011-11-20 09:20:08 -05:00
9638ff9a97
moved claiming form back to Details Tab
2011-11-19 22:54:59 -05:00
3eb3653947
robots.txt
2011-11-19 22:15:26 -05:00
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
409c9746cb
renamed file
2011-11-19 21:22:54 -05:00
a6bf130b24
Andromeda von Rightsholder can now open campaigns from her rightsholder tools page; apply migrations!
2011-11-19 21:22:54 -05:00
c167ed2965
admin view uses default login page
2011-11-19 18:27:15 -05:00
7dd821fccb
enabling admin, and added created column on models that did not have them
2011-11-19 11:55:35 -05:00
0d096737be
unix line endings
2011-11-19 10:51:51 -05:00
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
d73304e1a6
cleaning up user change form
2011-11-18 17:57:36 -05:00
3b80d18829
wording tweaks
2011-11-18 15:11:17 -05:00
c7637586fb
merging simultaneous changes to rights holder template
2011-11-18 13:34:25 -05:00
43912006ae
prettifying the documentation pages with new css
2011-11-18 13:27:26 -05:00
6cc05817a8
woo hoo! autocomplete input on rightsholder creation form. uses app django-selectable
2011-11-18 09:24:31 -05:00
6a9a213632
added pagination with django-endless-pagination
2011-11-17 23:09:23 -05:00
a720089525
unglue it admin users can now approve rightsholder claims!
2011-11-17 14:35:41 -05:00
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
11027f6bc1
First attempt at placing a Librarything import button
2011-11-16 16:47:29 -08:00
2ac1909ce0
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-16 12:47:02 -08:00
3ebcf2edae
Wired Goodreads authorization into the supporter settings panel.
2011-11-16 12:45:33 -08:00
f748bb220e
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-16 15:25:06 -05:00
d431fecbfc
don't need supporter_panel any more; it's been integrated into supporter.html
2011-11-16 15:24:47 -05:00
5df81cc52e
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
frontend/urls.py
2011-11-16 11:58:39 -08:00
d5a2b88768
Awesome Unglue.it Administration page added; will require a migration to add claim status
2011-11-16 14:45:37 -05:00
73596b33e8
Forgot the template file for librarything
2011-11-16 10:30:02 -08:00
8bbee39312
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-16 12:38:18 -05:00
f2fcd05a33
updating supporter page with new icons
2011-11-16 12:36:24 -05:00
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
1a7a04cbc3
adding 404 page and improving footer layout
2011-11-16 11:01:45 -05:00
6a2e690f18
claim form now creates a claim
2011-11-16 00:22:29 -05:00
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
d4fd3748dc
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
frontend/templates/base.html
2011-11-15 16:16:35 -05:00
74a5710921
prettifying the footer
2011-11-15 16:14:09 -05:00
d0336fdb59
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-15 12:58:07 -08:00
04831c7011
fixed the tab scripts on works page- seems to be a jquery version issue
2011-11-15 15:53:38 -05:00
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
4348c08d3b
fixed html errors in base.html footer
2011-11-15 15:00:48 -05:00
83c48b5a92
somebody messed up the work page title
2011-11-15 14:40:23 -05:00
769348bf2e
more stuff rhtools
2011-11-15 14:35:03 -05:00
c6e9d33685
Merge branch 'goodreads' of github.com:Gluejar/regluit
2011-11-15 11:20:18 -08:00
96d264c8a1
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-15 11:08:58 -08:00
da108d0ae1
who wants a favicon? aw yeah
2011-11-15 13:54:13 -05:00
d139a4b693
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-15 10:40:44 -08:00
45f58ae955
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
frontend/urls.py
2011-11-15 10:37:19 -08:00
5ff5485194
grammar fix to hover text on badges
2011-11-15 13:12:03 -05:00
fdd8e55d9f
merging conflicts after creating workstub page
2011-11-15 11:32:30 -05:00
4424ee513f
titles on search results now link to work stub page
2011-11-15 11:27:32 -05:00
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
0328430169
first cut at UI for unglue.it admins to create rights holders and delegate ownership
2011-11-14 23:28:55 -05:00
4e2e460903
added rudimentary view of subjects to get an idea of what is in there already
2011-11-14 21:13:39 -05:00
8c3a4528fc
real title
2011-11-14 19:09:34 -05:00
008ae17e1e
trying to add facebook link
2011-11-14 19:04:49 -05:00
6a82ec5f1d
explore column now shows up to 5 "randomly" chosen ungluers
2011-11-14 15:16:36 -05:00
cee723524c
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-14 13:45:11 -05:00
34e245362f
added tooltips to clarify badges
2011-11-14 13:43:47 -05:00
4c65a11696
de-association from twitter and facebook are now supported
2011-11-14 13:23:26 -05:00
6b38e7d9b4
more comprehensively handling campaign states; grammar fix for singular vs. plural ungluers
2011-11-14 13:07:07 -05:00
1d9109a7d7
modified work.html to handle all campaign status options
2011-11-14 11:42:33 -05:00
17a382cbc8
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-14 10:21:39 -05:00
93acfc6348
improving work page's handling of campaign statuses
2011-11-14 10:19:52 -05:00
f3122e5161
corrected alt in avatars
2011-11-13 20:35:29 -05:00
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
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
2e00f6bbd0
added facebook association
2011-11-12 13:58:31 -05:00
bc3b8333b6
added librarything_id and facebook_id to profile model, wired to supporter template; started faq
2011-11-11 22:51:22 -05:00
aa79208a14
adding display of author name
2011-11-11 15:09:39 -05:00
38105c3de9
First pass at writing the celery tasks to the db and displaying them.
2011-11-10 15:14:33 -08:00
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
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
243778b40c
tweaking css for panel hover state
2011-11-08 21:23:23 -05:00
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
3c33ca8bfa
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-08 11:28:55 -05:00
2173f16d4e
panel view now has a hover state on supporter page
2011-11-08 11:28:35 -05:00
4c29afdb94
fixed work template errror
2011-11-07 17:01:21 -05:00
ec9b69e012
removed support button if no campaign
2011-11-07 16:56:23 -05:00
2b063e78d1
merge conflicts
2011-11-07 16:16:36 -05:00
abf3ec131e
wiring supporter and search icons and percent unglued to live data
2011-11-07 16:12:53 -05:00
a40cab0184
First take on integrating pledge
2011-11-07 16:01:08 -05:00
7d44516189
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-07 15:39:05 -05:00
110b996769
added logic to display ebooks, badly for now
2011-11-07 15:39:02 -05:00
268c669b76
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-07 15:12:12 -05:00
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
fa601f7dd4
fixed which wishlist being read by Ajax update for goodreads
2011-11-07 12:19:45 -05:00
7753c49656
James K. Polk did not actually write every book in our database
2011-11-07 11:58:48 -05:00
a1055a01aa
resolving merge conflicts
2011-11-07 11:06:01 -05:00
7635c1a701
fixing image display in search panel view
2011-11-07 11:04:09 -05:00
609b829f5c
fixed missing style on support menu
2011-11-07 10:45:10 -05:00
46070801d6
changed search.html css to work with toggling (toggle toggle toggle)
2011-11-07 09:59:23 -05:00
7c38ff7509
wired in setup_campaign
2011-11-06 18:56:33 -05:00
31b0fca4fe
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-06 18:45:06 -05:00
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
997b771a6b
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-06 17:44:56 -05:00
214e1c5ff8
pull in premiums from the campaign
2011-11-06 17:44:50 -05:00
66e6de0ffa
templatize campaignsetup; add last class to premium display
2011-11-06 17:33:11 -05:00
e18a6dd98c
campaign display tweaks
2011-11-06 16:53:39 -05:00
e76df1d76a
removed old work view and converted campaign view to work view
2011-11-06 16:46:46 -05:00
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
96a3039434
fixing bugs resulting from am addition of last_campaign method
2011-11-06 15:24:16 -05:00
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
c948a6b090
fixing campaign status display
2011-11-06 14:32:29 -05:00
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
2dcf1dfbee
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-03 16:30:36 -04:00
2c6a7e6f94
book panel view of supporter page now half-done; visible at /supporter2/username
2011-11-03 16:28:53 -04:00
91c3ccb0e7
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
frontend/urls.py
2011-11-02 16:47:12 -07:00
0b891cc8b5
pages we need but do not yet have now link to stubs
2011-11-02 15:40:43 -04:00
6ddebadf87
Enough on goodreads for now.
2011-11-01 15:23:54 -07:00
fa1806759b
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-01 14:24:18 -07:00
d6fc0b6230
Refining display of Goodreads import
2011-11-01 14:09:04 -07:00
90cfdb9007
Added ability to clear wishlist
2011-11-01 10:41:39 -07:00
Andromeda Yelton
eric
Ed Summers
Raymond Yee
Raymond Yee
Jason
Andromeda Yelton