Commit Graph

2551 Commits (8d80be5248f9fee8e276752c5b55dd4763b7228c)

Author SHA1 Message Date
eric 7e1c5eeec9 add github and wikibooks to allowed ebook sources 2014-11-17 11:51:36 -05:00
Raymond Yee db969f859d Merge pull request #412 from Gluejar/privacy
I will do the merge to test the dropbox functionality on just.
2014-11-14 14:43:27 -08:00
eric 3a465cf074 dash in hostname is not an edge case 2014-11-13 10:19:53 -05:00
eric bca0864d6b update news link 2014-11-11 00:39:07 -05:00
eric 080dde1dd0 might as well go all the way on avatar privacy
for download page only
2014-11-10 13:40:25 -05:00
eric 72f066ed73 self-host drm-free 2014-11-10 12:31:36 -05:00
eric 5a095c6110 self-host dropbox assets 2014-11-10 12:27:57 -05:00
eric 547adfea56 Change default avatar to one with more privacy
using a user's email in the gravatar hash can connect their account to
other sites. Stop doing this as default for new users.
2014-11-07 14:47:12 -05:00
eric 3c295a016a no need to invoke twitter tracker 2014-11-07 14:27:49 -05:00
eric e41dd676c8 add stub record indicator 2014-11-03 16:29:36 -05:00
eric c711747916 show marc download for b2u 2014-11-03 16:06:25 -05:00
eric fc261b0830 better descriptions 2014-11-03 15:22:53 -05:00
Raymond Yee a666427497 Merge pull request #404 from Gluejar/marc_package
Marc package
2014-10-31 12:55:46 -07:00
eric f9b785e69e fix user pref display
also add link to librarian settings
2014-10-31 13:52:19 -04:00
eric fafd37a973 Merge branch 'master' into marc_package
Conflicts:
	core/marc.py
	static/css/campaign2.css
2014-10-30 12:38:53 -04:00
eric 97e3260c2b [#29780355] no Why unglue this? if unglued 2014-10-29 15:41:51 -04:00
eric 5c23d888c7 always show GR, LT links 2014-10-29 15:21:06 -04:00
eric c5bb7220f2 don't link cover to google books if own cover 2014-10-29 15:18:32 -04:00
eric fa8f03eb0a pass tests 2014-10-27 20:11:23 -04:00
eric d0e305cfec rip out code 2014-10-27 19:11:44 -04:00
eric e1409ceac1 redo marc file upload 2014-10-27 16:57:35 -04:00
eric 3b4b836e6c add marc download tools 2014-10-27 11:55:46 -04:00
Raymond Yee 78ddf22c18 Merge branch 'master' into stub-marc 2014-10-22 02:04:00 +00:00
eric 892b970ae1 can download all records 2014-10-20 23:30:20 -04:00
eric 2feda33c4f records now served out of db 2014-10-20 16:57:46 -04:00
eric a5d3dfdf4f add_author method 2014-10-20 16:54:19 -04:00
eric be294aa8f0 Merge branch 'master' into stub-marc 2014-10-17 11:36:35 -04:00
eric fbe96bcfc7 basic stub records 2014-10-14 10:08:08 -04:00
Raymond Yee 08e1806db2 As suggested by Eric, we'll use a regex from https://mathiasbynens.be/demo/url-regex,
specifically the one by @imme_emosol
2014-10-13 16:21:30 -07:00
Raymond Yee 73435e399c Merge branch 'master' into allow-http-id 2014-10-09 15:21:34 -07:00
eric 05aea1b40b stop rounding the date! 2014-10-09 14:33:53 -04:00
eric 93c9b696b2 Allow staff to enter books with an http id
I'm finding LOTS of books that don't have ISBN or OCLCnum
2014-10-08 16:23:24 -04:00
eric ef6c4a659e ebook files activate and deactivate
when manager unselects 'add_ask', the system didn't revert to the files
without added ask. This fixes that. To test, toggle the add_ask
checkbox and save campaign.
2014-10-04 16:51:16 -04:00
Raymond Yee 0ddbdbc944 Merge pull request #384 from Gluejar/fix_optional_token
Fix optional token
2014-09-29 13:22:49 -07:00
Raymond Yee a02463c117 Merge pull request #388 from Gluejar/fix-inactive-ebooks
let ebook go to default
2014-09-29 11:44:12 -07:00
eric 5a6582ae66 let ebook go to default 2014-09-26 10:40:20 -04:00
eric cd162905fa fix the data instead of complaining 2014-09-25 13:32:01 -04:00
eshellman 2223446f36 Merge pull request #386 from Gluejar/pdf_ask
Insert Pdf/epub ask into served files [Take 2]
2014-09-17 04:48:46 -04:00
eric 93bba18b79 Merge branch 'master' into fix_optional_token 2014-09-13 16:24:22 -04:00
eric b72e0a1fe1 made a form that doesn't have Stripe Token 2014-09-13 16:19:47 -04:00
eric 9ae4ce42da this is even more correct, and the tests pass 2014-09-12 10:21:06 -04:00
eric 28434b06a1 now do the same for epubs 2014-09-05 16:35:57 -04:00
eric 30e50260a3 make ebooks when new files are uploaded, clean up old
the download bits are suppressed when the ask comes from the pdf
seems we weren't making new ebooks when new files were uploaded
old ebooks now deactivated so we don't loase download counts and history
add ask to pdf is triggered by file upload or THANKS campaign save
2014-09-04 18:33:20 -04:00
eric 8d71f65351 update landing page news 2014-08-30 13:38:53 -04:00
eric 8ce1550ea2 [fix #77927246] CCForm really should require a token
I think forms were still mysterious to me when I made it not required.
I think I set it to not required because I didn't know how to keep it
from reporting an error on initial render.
Need to make sure nothing else depends on allowing null stripe token
2014-08-30 13:28:13 -04:00
eric 40831b6161 incorporate add_ask into campaign management 2014-08-30 12:04:50 -04:00
eric 73c616092d campaign.add_ask_to_ebfs for pdfs 2014-08-28 15:29:41 -04:00
Raymond Yee 7b7c050fb2 Merge pull request #379 from Gluejar/edition_errata
Edition editing errata
2014-08-13 22:30:49 -07:00
Raymond Yee edb769317d Merge pull request #375 from Gluejar/new_campaign_options
no contrib form if the ask is all zero
2014-08-07 15:58:22 -07:00
eric ff7ffdf4e1 just get rid of the silly status icon 2014-08-06 17:44:11 -04:00
eric 5a2a3e60b6 add PD and GDFL to license choices; add pd-us
also all make list display facets for PD-US and GDFL; don't expose them
until we have content we like in them
2014-08-06 17:14:09 -04:00
eric 229301d4df add "feature this" to edit tools 2014-08-06 15:59:57 -04:00
eric 8f3957dc14 allow blank ISBN
version in production throws invalid isbn exception
made sure you can't delete an id if the edition is left id-les
fixed bug where using an existing id omits admin setting
2014-08-06 10:59:16 -04:00
eric 74e98b37c2 download button causes a fave
also adjusted "latest ungluing" to be less-creepy; only explicit faves
are reported
2014-07-28 18:22:26 -04:00
Raymond Yee ff1eb6ef0e Merge pull request #371 from Gluejar/opds_2
Opds 2
2014-07-25 14:17:27 -07:00
eric aa84366418 no contrib form if the ask is all zero 2014-07-25 14:43:54 -04:00
eric 8642a9d7ca update news 2014-07-24 15:25:33 -04:00
eric 0971a8c7ba corrected the label 2014-07-24 15:22:26 -04:00
eric 81e5b28a32 make the description edit note context sensitive 2014-07-24 15:20:59 -04:00
eric fa2c50dfea there's no publisher in edition edit form 2014-07-24 15:17:36 -04:00
eric 3d7b56248d fix bad html 2014-07-24 15:01:29 -04:00
eric 632b7efdc8 set width of publisher logo 2014-07-24 14:57:14 -04:00
Raymond Yee 5a5b47b180 Also catch Transaction.DoesNotExist in FundCompleteView 2014-07-23 10:07:49 -07:00
eric 7377063b2c catch the exception actually thrown by bad tie
pass transaction on the object; not in context (style only)
move the redirect logic into get
2014-07-22 16:27:55 -04:00
eric 2aed378814 fix the root problem 2014-07-22 16:20:44 -04:00
Raymond Yee 3d2980f9a1 make pledge complete page more forgiving 2014-07-21 17:37:28 -07:00
eric 6aa3e458ea move opds to api
and simplify code.
view no longer passing site and protocol to opds methods
facets now in a list
url adds /api/ in front
2014-07-16 16:47:32 -07:00
Raymond Yee 776f343fd7 forgot to add opds.xml 2014-07-11 15:13:09 -07:00
Raymond Yee 806e24dc80 Merge pull request #367 from Gluejar/OPDS
Opds
2014-07-11 14:13:13 -07:00
Raymond Yee 1a40583a44 Merge pull request #369 from Gluejar/isbn_input
isbn input now accepts dashes and isbn10, fixes bad check digits
2014-07-10 13:03:52 -07:00
Raymond Yee 84a102c640 Merge pull request #368 from Gluejar/featured_ebook
Featured ebook
2014-07-09 10:19:01 -07:00
Raymond Yee 3cdae2d6bb Merge pull request #366 from Gluejar/improve_rh_experience
Improve rh experience
2014-07-08 13:32:18 -07:00
Raymond Yee e216728ab8 campaigns -> campaign(s) in case only 1 campaign. 2014-07-08 13:28:49 -07:00
eric 21ac432d09 isbn input now accepts dashes and isbn10, fixes bad check digits 2014-07-04 20:29:42 -04:00
eric 9e98651039 improve open campaign UI 2014-07-03 21:36:52 -04:00
eric 461321c0bb Added dynamic contents to assist in navigation 2014-07-03 21:20:36 -04:00
eric 908bb7974f make the rest of the checklist dynamic 2014-07-03 21:07:50 -04:00
eric 77a4ef1c09 address "opening a campaign" comments
"hastens" isn't quite right; adding a tooltip to the delete function
would require mucking with django-selectable, and that will take more
time than its worth.
2014-07-03 20:26:36 -04:00
eric 6a9c89efb2 no more creencasts in rh tools
they were out of date; the embed instructions are still in faq
2014-07-03 20:05:47 -04:00
eric c105b0839d fix test 2014-07-03 16:36:36 -04:00
eric bf61227429 Add featured book to landing page 2014-07-03 15:43:49 -04:00
eric 773b6a0912 simple admin interface for featured 2014-07-01 14:09:21 -04:00
eric bc7850a2a9 add featured column, use it 2014-07-01 10:07:07 -07:00
Raymond Yee b356699c9b First pass at /opds/{facet} --> now with active_campaigns too 2014-06-25 18:05:57 -07:00
Raymond Yee 49133935a0 First draft of opds/creativecommons.xml 2014-06-24 15:27:40 -07:00
Raymond Yee e3f32da12b Put framework for both the navigation and crawlable feeds 2014-06-20 16:53:25 -04:00
eric 0b918fabe0 notice changed to reflect that we're not checking each claim 2014-06-20 15:39:20 -04:00
eric 420cbdf448 send rh to rh page after claiming work 2014-06-20 15:37:23 -04:00
eric 6cb8daf1b4 clean up instruction on rh tools page 2014-06-20 15:30:46 -04:00
eric eeb018df4f show pricing in buy-2-unglue panel view 2014-06-17 14:39:16 -04:00
eric d3e21944b0 uniform display of pice, with cents 2014-06-17 12:21:22 -04:00
eric 03f3dd1287 can now edit language via edition edit
Also, the language field is widened to support language ids such as
"zh-tw".
Migration required.
2014-06-06 14:32:34 -04:00
eric f7a5195ac3 one more try! 2014-05-27 14:24:27 -04:00
eric 8d1a9f44b0 fix dropbox on second load
The problem was that the dropbox saver checks to see if it's already
run before adding buttons. the lightbox was actually running the saver
a second time. on pages with multiple download buttons, the buttons
would get added only on the first lightbox.
2014-05-25 00:26:47 -04:00
Raymond Yee 1074afd6bf Merge pull request #354 from Gluejar/revise_landing
landing page now shows three categories
2014-05-23 14:51:41 -07:00
Raymond Yee 49682064da Merge pull request #356 from Gluejar/add_dropbox
purchased copies need full url
2014-05-22 19:46:22 -07:00
eric c497502766 this time I remembered to check the test 2014-05-22 22:38:42 -04:00
eric 12cf531e7b purchased copies need full url 2014-05-22 22:35:29 -04:00
Raymond Yee f0d1116d58 Merge pull request #355 from Gluejar/add_dropbox
close the anchor tags!
2014-05-22 13:38:58 -07:00
eric aa70595842 close the anchor tags! 2014-05-22 16:36:26 -04:00
eric fa221f484e landing page now shows three categories
site favorites is now omitted.
useless "withs" removed
category removed if no campaigns
category labels now are calls to action
2014-05-22 14:08:15 -04:00
Raymond Yee a83bd18b35 Merge pull request #352 from Gluejar/add_dropbox
Add dropbox
2014-05-22 08:58:10 -07:00
eric ba3878a4b3 remove call-to-action color on send-to-kindle if user not logged in 2014-05-21 15:24:00 -04:00
eric 314847459b remove readmill, add dropbox 2014-05-20 12:19:34 -04:00
eric b7e4b6defe can't thank the author with None
The thought originally was the user could enter 0. But that's not how
we're doing it
2014-05-19 12:09:47 -04:00
eric 358a67928a add rights for ebooks without campaigns that we list 2014-05-15 15:18:11 -04:00
Raymond Yee 4d359b53c1 Merge pull request #348 from Gluejar/list_by_license
List by license [#70951010]
2014-05-14 09:14:03 -07:00
eric 62c1538a76 refresh press links 2014-05-08 23:32:23 -04:00
eric 8ea10de26a bold the active license type 2014-05-08 13:17:00 -04:00
eric b6c58c4e35 add in active campaigns that match specific license 2014-05-08 13:10:57 -04:00
eric 9303f2639e added to page tests 2014-05-08 11:57:22 -04:00
eric 052f5adbc0 add license descriptions and badges to the pages 2014-05-08 11:54:09 -04:00
eric d102854d02 add license-specific view to CC display 2014-05-08 10:22:35 -04:00
Raymond Yee c92219f673 Revert "Reverting changes made to fix double click problem -- and moving changes to fix_double_click"
This reverts commit 643d8d358d.
2014-05-07 15:37:19 -07:00
Raymond Yee 10bfb0ca27 Merge pull request #345 from Gluejar/refix_b2u_calculator
Refix b2u calculator [#70704708] and [#70681088]
2014-05-05 14:25:18 -07:00
eric 362890e313 improve wording about revenue goal on campaign management page 2014-05-05 16:26:48 -04:00
eric a7b9581919 fix calculator
update_left() was setting current_total to zero
2014-05-05 15:55:20 -04:00
eric da7d6ccfc5 fix send_to_kindle 2014-05-05 12:21:59 -04:00
eric 935c7b4a4c fix issue when an anonymous user logs in (rare) 2014-05-05 12:21:44 -04:00
eric c85a13b05c acq shouldn't be in context for THANKS 2014-05-05 10:15:29 -04:00
eric 53ea120aae acknowledgement missing for logged in users 2014-05-05 10:15:05 -04:00
Raymond Yee 643d8d358d Reverting changes made to fix double click problem -- and moving changes to fix_double_click
Revert "move post monkey subscribe into a task"

This reverts commit 9556c4a792.
2014-05-02 13:59:04 -07:00
eric e4cb8f741c prevent double clicks on reg button
This definitely prevents to problem from occurring!
2014-05-02 14:09:01 -04:00
eric 810882ac0f point to launch announce on blog 2014-05-01 14:19:49 -04:00
eric 10256e9eb5 remove extra links
in b2u, it was assumed that an acq=> mobi and epub, but t4u uses acqs
just for  recording a contribution
2014-04-30 17:29:41 -04:00
eric 0b4d670226 keep the book panels where they belong 2014-04-29 21:51:52 -04:00
Raymond Yee 8e39548740 Merge pull request #336 from Gluejar/rh_create_work
rights holder can create new work
2014-04-29 18:16:25 -07:00
eric 0934984f8f rights holder can create new work 2014-04-29 21:07:24 -04:00
Raymond Yee 5ee4f7c4df Merge pull request #335 from Gluejar/improve_lists
Improve lists and landing page for launch
2014-04-29 18:01:27 -07:00
eric af17403e97 add links to campaigns from campaign faqs 2014-04-29 20:04:29 -04:00
eric 958d963f75 add campaign list for each campaign type 2014-04-29 20:03:33 -04:00
eric 6e034c58e0 unclutter the bottom of the landing page 2014-04-29 16:16:00 -04:00
eric ece091b812 edition editing and file upload was very confusing
hope this is an improvement
2014-04-29 14:53:18 -04:00
eric 59997cfda1 reset selected edition on campaign save 2014-04-29 14:51:49 -04:00
eric 390e6864f5 missed a commit 2014-04-28 16:31:31 -04:00
eric 2ee1a1d34d one more thing - indicate that download page is missing ebook links 2014-04-28 15:14:46 -04:00
eric 9287825d6e pdf and mobi not displayed in campaign management 2014-04-28 10:59:03 -04:00
eric d45bea58b0 add offers
needed to move book itemscope so it contains the offers
2014-04-16 16:15:19 -04:00
eric a78fdc4239 fix markup error 2014-04-16 16:14:22 -04:00
eric e12fa3f52c no-epub download page was showing bad ibooks button 2014-04-16 12:32:39 -04:00
eric 679263faa1 Merge branch 'master' into faq_revision 2014-04-11 13:09:25 -04:00
eric 7b96102e01 faq revision 2014-04-11 13:08:44 -04:00
eric 325dff59f2 fix repeated Fave button 2014-04-10 15:52:25 -04:00
eric bdde5f57e5 only meant to have explainer for landing page 2014-04-10 13:29:58 -04:00
eric bd0a315540 and the panel flipper script 2014-04-10 13:19:37 -04:00
eric 29207b7c89 update the template map 2014-04-10 13:16:11 -04:00
eric 2245e816b9 other doc pages needing added css 2014-04-10 13:15:08 -04:00
eric fc0670595a doc pages use learn more, need more css 2014-04-10 11:08:09 -04:00
Raymond Yee 90493d080e Merge pull request #323 from Gluejar/display_nits
Display nits
2014-04-09 13:58:38 -07:00
eric ed9b9953a5 html nit 2014-04-09 16:53:41 -04:00
eric 72bc22d1be Add rh link to top menu 2014-04-09 15:11:34 -04:00
eric 1c783f2e4a make sure goal is retotled when campaign is modified 2014-04-09 15:02:25 -04:00
eric c2fae4c16f fix the calculator- it was broken 2014-04-09 14:32:25 -04:00
eric 1d12fbf74d kwarg, not arg 2014-04-07 12:17:21 -04:00
eric f45f054755 bump landing page css version, tweaks
tweaks:
darker buy buttons in learn more
header for 3 ways section
2014-03-31 14:18:16 -04:00
eric 14759ac546 always show learn more to anonymous users
logged in users get still get the drop-down
2014-03-30 21:28:32 -04:00
eric 7f171c95ed revise learn_more to have dual creater/ungluer messages 2014-03-30 21:23:13 -04:00
eric 59f36bf194 noticed mistake in faq 2014-03-27 22:33:59 -04:00
eric 345b0d1682 replaced learn more block with explanation of 3 ways to free ebooks
could hire someone to make cute pictures in place of the words, but
should try this, first
2014-03-27 22:32:49 -04:00
eric b00b0b2c09 add font-awesome to landing page 2014-03-27 22:10:06 -04:00
eric 4f383c67c5 eliminate css duplication 2014-03-27 17:49:16 -04:00
eric d2cca9ff93 look before leaping 2014-03-21 09:49:49 -04:00
eric 9122be280b OMG I broke the downloads 2014-03-20 09:23:17 -04:00
eric 5661377207 if library supports t4u book, members of library don't see the ask
instead they see “your library has supported this free ebook!
2014-03-18 22:30:21 -04:00
eric b8e06d04d1 re-expose the ebook adding links, add link to work on editing page 2014-03-17 10:32:43 -04:00
eric ef1fa6b860 add t4u context sensitive exclamation in panel view 2014-03-16 21:29:00 -04:00
eric 434d3f9129 make the download ask insensitive to its length 2014-03-16 20:06:01 -04:00
eric d2ae3c2e2d more manage campaign tweaks 2014-03-16 18:28:47 -04:00
eric 13bd024f1f b2u for libraries
1. library license is autochecked when user is the library
2. the library owner is automatically made a member of the library
2014-03-14 15:12:23 -04:00
eric 878970df4b notification cleanup 2014-03-14 14:28:21 -04:00
eric f7fea1874e wish list was not getting set because of vestigial transaction type check
[fix #67399604]
2014-03-14 13:04:11 -04:00
eric 275dfb1068 show new edition link to campaign managers on work page
also, improve wording of ebook links
2014-03-13 15:22:03 -04:00
eric 437f9d0eac better wording 2014-03-13 08:39:58 -04:00
eric b8409a815b forgot to set status in new_edition 2014-03-12 19:32:56 -04:00
eric 4109778855 add link for campaign manager to create edition 2014-03-12 18:17:29 -04:00
eric fd896c8916 Merge branch 'improve_t4u_campaign' into improve_editions 2014-03-12 18:08:54 -04:00
eric d2dd926f80 let campaign manager edit work description in campaign management
also, revise documentation for campaigns
2014-03-12 18:03:50 -04:00
eric d49925d26c errata
1. distinguish title for editions page
2. reset earliest_publication on save new edition
2014-03-12 12:54:32 -04:00
eric 708d257b35 make short asks less ugly
Jake’s test exposed this issue
2014-03-11 22:06:36 -04:00
eric cce7c43d8f revamp edition display and editing
1. created editions display view (work(action=editions))
2. moved split function to new editions page (staff only)
3. added edition selector (staff only)
4. moved ebook link addition to edit edition page
5. standard work display shows only 10 newest editions (much faster!)
6. campaign managers should be able to edit editions
7. ebook links can’t be added when there’s a campaign.
8. more room for edition description editing
2014-03-11 17:34:27 -04:00
eric 58b664bc2b fix bug when creating new edition 2014-03-07 16:58:53 -05:00
eric db6648cc07 edition editor can now delete authors [#66337430] 2014-03-07 16:42:57 -05:00
Raymond Yee 38764a12d3 Merge pull request #302 from Gluejar/add_marvin
Add marvin, update ibooks, readmill instructions
2014-03-05 19:47:41 -08:00
eric 7fba1a212b Give more prominence to CC books on landing page 2014-03-05 14:02:12 -05:00
eric 4d0d42f5ae the request for money is only shown if the campaign is active, or in test mode 2014-03-04 15:49:59 -05:00
eric a1d5f5f5d9 various improvements in documentation 2014-03-03 22:11:43 -05:00
eric 6bcbf05095 assorted references to "wish list"
Still need work on press page
2014-03-03 18:21:01 -05:00
eric a3ec4b062d fix bugs found by Raymond 2014-03-03 16:51:33 -05:00
Raymond Yee 54cd6a42c6 Merge branch 't4u_download' into add_marvin 2014-03-03 11:37:25 -08:00
Raymond Yee 256c60fbfc Merge branch 'master' into t4u_download
Conflicts:
	core/models.py
2014-03-03 11:08:50 -08:00
Raymond Yee c292a6b3be Merge branch 'master' into add_marvin 2014-02-25 19:32:31 -08:00
Raymond Yee ae531e0d7d Merge branch 'master' into t4u_download 2014-02-25 19:10:01 -08:00
eric ccafd90625 Add ebookfile status and links to info page. 2014-02-25 14:47:16 -05:00
eric e72f55f919 it turns out that offer editing didn't quite work 2014-02-25 14:29:54 -05:00
eric 482d9be31d add b2u test links to campaign management page 2014-02-25 13:58:33 -05:00
eric bd829aff25 On reflection, files_reviewed was a bad idea 2014-02-25 12:54:14 -05:00
Raymond Yee 7fda4abd1c Merge branch 'master' into unglued_b2u_mobi 2014-02-24 14:44:13 -08:00
eric acfeb35c39 added an image of Facebook embedded browser in iPhone iOS7
we should probably be looking as adding iPhone stylesheets, but…
2014-02-24 17:18:05 -05:00
eric cc0f5d9fdb update for marvin, mavericks, read mill on android
for mavericks- ibooks should be pre-installed.
Readmill now available on Android.
Marvin is linking to us, we’re reciprocating
2014-02-24 16:58:16 -05:00
Raymond Yee 5547a54332 Merge branch 'master' into better_sendtokindle 2014-02-24 10:30:24 -08:00