From 6535505e4d6ea00210e56febae7acc475a7d5b30 Mon Sep 17 00:00:00 2001 From: eric Date: Sat, 3 Nov 2018 17:23:07 -0400 Subject: [PATCH] Revert "Merge branch 'master' into master" This reverts commit bd52df020dd9071f69ac528c43f15e3d4edbe448, reversing changes made to e455d9a766948e9a27c26f92707502ff07784290. --- .gitignore | 5 +- .travis.yml | 8 +- README.md | 27 +- Vagrantfile | 56 - core/mobi.py | 4 +- core/models/__init__.py | 3 +- core/models/bibmodels.py | 37 +- core/tests.py | 4 +- frontend/forms/__init__.py | 12 +- frontend/templates/base.html | 150 +- frontend/templates/basedocumentation.html | 35 +- frontend/templates/book_panel.html | 27 +- frontend/templates/campaign_list.html | 1 + frontend/templates/cc_list.html | 1 + frontend/templates/comments.html | 1 + frontend/templates/download.html | 750 +- frontend/templates/faceted_list.html | 1 + frontend/templates/faq_b2u.html | 8 +- frontend/templates/faqmenu.html | 118 +- frontend/templates/home.html | 206 +- frontend/templates/learn_more.html | 127 +- frontend/templates/libraryauth/library.html | 3 +- frontend/templates/pledge_complete.html | 4 +- frontend/templates/read.html | 123 - frontend/templates/registration/login.html | 17 +- .../templates/registration/login_form.html | 5 +- .../registration/registration_base.html | 15 +- .../registration/registration_form.html | 43 +- frontend/templates/registration/welcome.html | 35 +- frontend/templates/search.html | 1 + frontend/templates/supporter.html | 3 +- frontend/templates/unglued_list.html | 1 + frontend/templates/work.html | 696 +- frontend/templates/work_list.html | 1 + frontend/urls.py | 3 +- frontend/views/__init__.py | 15 +- settings/common.py | 37 +- setup.py | 25 - start.sh | 5 - static/css/reader/annotations.css | 3 - static/css/reader/main.css | 817 - static/css/reader/normalize.css | 505 - static/css/reader/popup.css | 96 - static/fonts/fontello.eot | Bin 10204 -> 0 bytes static/fonts/fontello.svg | 33 - static/fonts/fontello.ttf | Bin 10036 -> 0 bytes static/fonts/fontello.woff | Bin 6032 -> 0 bytes static/images/reader/loader.gif | Bin 6820 -> 0 bytes static/js/greenpanel.js | 14 + static/js/reader/epub.min.js | 8 - static/js/reader/epub.min.map | 1 - static/js/reader/hooks.min.js | 1 - static/js/reader/hooks.min.map | 1 - .../js/reader/hooks/extensions/highlight.js | 14 - static/js/reader/libs/jquery.min.js | 4 - static/js/reader/libs/localforage.min.js | 7 - static/js/reader/libs/screenfull.js | 145 - static/js/reader/libs/screenfull.min.js | 7 - static/js/reader/libs/zip.min.js | 14 - static/js/reader/plugins/hypothesis.js | 80 - static/js/reader/plugins/search.js | 125 - static/js/reader/reader.min.js | 1 - static/js/reader/reader.min.map | 1 - static/js/sitewide1.js | 75 +- static/scss/book_detail.scss | 4 +- static/scss/book_list.css | 4 +- static/scss/book_list.scss | 49 +- static/scss/book_panel2.css | 4 +- static/scss/book_panel2.scss | 13 +- static/scss/bookview.css | 3 - static/scss/bookview.scss | 183 - static/scss/campaign2.css | 2 +- static/scss/campaign2.scss | 2 +- static/scss/colors.scss | 1 - static/scss/comments.css | 3 + static/scss/documentation2.css | 4 +- static/scss/documentation2.scss | 3 +- static/scss/download.css | 3 - static/scss/download.scss | 166 +- static/scss/enhanced_download.css | 2 +- static/scss/enhanced_download_ie.css | 2 +- static/scss/faq.css | 3 - static/scss/faq.scss | 45 - static/scss/font-awesome.min.css | 4 + static/scss/foundation/.babelrc | 13 - static/scss/foundation/.bowerrc | 4 - static/scss/foundation/.editorconfig | 12 - static/scss/foundation/.eslintrc | 65 - static/scss/foundation/.gitignore | 57 - static/scss/foundation/.jshintrc | 3 - static/scss/foundation/.npmignore | 20 - static/scss/foundation/.sass-lint.yml | 409 - static/scss/foundation/.travis.yml | 9 - static/scss/foundation/.versions | 14 - static/scss/foundation/CONTRIBUTING.md | 55 - static/scss/foundation/LICENSE | 22 - static/scss/foundation/README.md | 57 - .../normalize-scss/sass/_normalize.scss | 3 - .../sass/normalize/_import-now.scss | 11 - .../sass/normalize/_normalize-mixin.scss | 676 - .../sass/normalize/_variables.scss | 36 - .../sass/normalize/_vertical-rhythm.scss | 61 - .../stylesheets/functions/_contain.scss | 31 - .../stylesheets/functions/_purge.scss | 38 - .../stylesheets/functions/_remove.scss | 31 - .../stylesheets/functions/_replace.scss | 46 - .../stylesheets/functions/_to-list.scss | 27 - .../helpers/_missing-dependencies.scss | 25 - .../stylesheets/helpers/_true.scss | 13 - .../foundation/assets/foundation-float.scss | 5 - .../assets/foundation-prototype.scss | 3 - .../foundation/assets/foundation-rtl.scss | 5 - static/scss/foundation/assets/foundation.scss | 3 - static/scss/foundation/bower.json | 34 - static/scss/foundation/browserstack.json | 32 - static/scss/foundation/code-of-conduct.md | 43 - static/scss/foundation/composer.json | 27 - .../scss/foundation/customizer/complete.json | 49 - static/scss/foundation/customizer/config.yml | 172 - .../scss/foundation/customizer/essential.json | 12 - static/scss/foundation/customizer/index.html | 171 - .../scss/foundation/customizer/lib/index.js | 4 - static/scss/foundation/customizer/lib/js.js | 54 - static/scss/foundation/customizer/lib/sass.js | 76 - .../scss/foundation/dist/js/foundation.d.ts | 496 - static/scss/foundation/dist/js/foundation.js | 11788 ------------- .../scss/foundation/dist/js/foundation.min.js | 5 - static/scss/foundation/dist/js/npm.js | 104 - .../dist/js/plugins/foundation.abide.js | 781 - .../dist/js/plugins/foundation.abide.min.js | 1 - .../dist/js/plugins/foundation.accordion.js | 511 - .../js/plugins/foundation.accordion.min.js | 1 - .../js/plugins/foundation.accordionMenu.js | 527 - .../plugins/foundation.accordionMenu.min.js | 1 - .../dist/js/plugins/foundation.core.js | 860 - .../dist/js/plugins/foundation.core.min.js | 1 - .../dist/js/plugins/foundation.drilldown.js | 759 - .../js/plugins/foundation.drilldown.min.js | 1 - .../dist/js/plugins/foundation.dropdown.js | 1151 -- .../js/plugins/foundation.dropdown.min.js | 1 - .../js/plugins/foundation.dropdownMenu.js | 677 - .../js/plugins/foundation.dropdownMenu.min.js | 1 - .../dist/js/plugins/foundation.equalizer.js | 542 - .../js/plugins/foundation.equalizer.min.js | 1 - .../dist/js/plugins/foundation.interchange.js | 399 - .../js/plugins/foundation.interchange.min.js | 1 - .../dist/js/plugins/foundation.magellan.js | 449 - .../js/plugins/foundation.magellan.min.js | 1 - .../dist/js/plugins/foundation.offcanvas.js | 1054 -- .../js/plugins/foundation.offcanvas.min.js | 1 - .../dist/js/plugins/foundation.orbit.js | 767 - .../dist/js/plugins/foundation.orbit.min.js | 1 - .../foundation.responsiveAccordionTabs.js | 440 - .../foundation.responsiveAccordionTabs.min.js | 1 - .../js/plugins/foundation.responsiveMenu.js | 362 - .../plugins/foundation.responsiveMenu.min.js | 1 - .../js/plugins/foundation.responsiveToggle.js | 336 - .../foundation.responsiveToggle.min.js | 1 - .../dist/js/plugins/foundation.reveal.js | 1065 -- .../dist/js/plugins/foundation.reveal.min.js | 1 - .../dist/js/plugins/foundation.slider.js | 1235 -- .../dist/js/plugins/foundation.slider.min.js | 1 - .../js/plugins/foundation.smoothScroll.js | 303 - .../js/plugins/foundation.smoothScroll.min.js | 1 - .../dist/js/plugins/foundation.sticky.js | 1000 -- .../dist/js/plugins/foundation.sticky.min.js | 1 - .../dist/js/plugins/foundation.tabs.js | 678 - .../dist/js/plugins/foundation.tabs.min.js | 1 - .../dist/js/plugins/foundation.toggler.js | 601 - .../dist/js/plugins/foundation.toggler.min.js | 1 - .../dist/js/plugins/foundation.tooltip.js | 1194 -- .../dist/js/plugins/foundation.tooltip.min.js | 1 - .../dist/js/plugins/foundation.util.box.js | 343 - .../js/plugins/foundation.util.box.min.js | 1 - .../js/plugins/foundation.util.imageLoader.js | 163 - .../foundation.util.imageLoader.min.js | 1 - .../js/plugins/foundation.util.keyboard.js | 298 - .../plugins/foundation.util.keyboard.min.js | 1 - .../js/plugins/foundation.util.mediaQuery.js | 354 - .../plugins/foundation.util.mediaQuery.min.js | 1 - .../dist/js/plugins/foundation.util.motion.js | 231 - .../js/plugins/foundation.util.motion.min.js | 1 - .../dist/js/plugins/foundation.util.nest.js | 181 - .../js/plugins/foundation.util.nest.min.js | 1 - .../dist/js/plugins/foundation.util.timer.js | 170 - .../js/plugins/foundation.util.timer.min.js | 1 - .../foundation.util.timerAndImageLoader.js | 90 - ...foundation.util.timerAndImageLoader.min.js | 1 - .../dist/js/plugins/foundation.util.touch.js | 275 - .../js/plugins/foundation.util.touch.min.js | 1 - .../js/plugins/foundation.util.triggers.js | 398 - .../plugins/foundation.util.triggers.min.js | 1 - .../foundation.zf.responsiveAccordionTabs.js | 262 - ...undation.zf.responsiveAccordionTabs.min.js | 1 - static/scss/foundation/docslink.sh | 3 - static/scss/foundation/gulpfile.js | 27 - .../js/entries/foundation-plugins.js | 67 - .../scss/foundation/js/entries/foundation.js | 117 - .../js/entries/plugins/foundation.abide.js | 4 - .../entries/plugins/foundation.accordion.js | 4 - .../plugins/foundation.accordionMenu.js | 5 - .../js/entries/plugins/foundation.core.js | 22 - .../entries/plugins/foundation.drilldown.js | 4 - .../js/entries/plugins/foundation.dropdown.js | 5 - .../plugins/foundation.dropdownMenu.js | 4 - .../entries/plugins/foundation.equalizer.js | 4 - .../entries/plugins/foundation.interchange.js | 4 - .../js/entries/plugins/foundation.magellan.js | 4 - .../entries/plugins/foundation.offcanvas.js | 4 - .../js/entries/plugins/foundation.orbit.js | 5 - .../foundation.responsiveAccordionTabs.js | 5 - .../plugins/foundation.responsiveMenu.js | 5 - .../plugins/foundation.responsiveToggle.js | 5 - .../js/entries/plugins/foundation.reveal.js | 4 - .../js/entries/plugins/foundation.slider.js | 5 - .../plugins/foundation.smoothScroll.js | 5 - .../js/entries/plugins/foundation.sticky.js | 5 - .../js/entries/plugins/foundation.tabs.js | 5 - .../js/entries/plugins/foundation.toggler.js | 5 - .../js/entries/plugins/foundation.tooltip.js | 4 - .../js/entries/plugins/foundation.util.box.js | 4 - .../plugins/foundation.util.imageLoader.js | 5 - .../plugins/foundation.util.keyboard.js | 4 - .../plugins/foundation.util.mediaQuery.js | 5 - .../entries/plugins/foundation.util.motion.js | 5 - .../entries/plugins/foundation.util.nest.js | 5 - .../entries/plugins/foundation.util.timer.js | 5 - .../entries/plugins/foundation.util.touch.js | 7 - .../plugins/foundation.util.triggers.js | 5 - static/scss/foundation/js/foundation.abide.js | 587 - .../foundation/js/foundation.accordion.js | 329 - .../foundation/js/foundation.accordionMenu.js | 340 - static/scss/foundation/js/foundation.core.js | 337 - .../foundation/js/foundation.drilldown.js | 621 - .../scss/foundation/js/foundation.dropdown.js | 438 - .../foundation/js/foundation.dropdownMenu.js | 457 - .../foundation/js/foundation.equalizer.js | 318 - .../foundation/js/foundation.interchange.js | 210 - .../scss/foundation/js/foundation.magellan.js | 276 - .../foundation/js/foundation.offcanvas.js | 556 - static/scss/foundation/js/foundation.orbit.js | 531 - .../scss/foundation/js/foundation.plugin.js | 54 - .../foundation/js/foundation.positionable.js | 214 - .../js/foundation.responsiveAccordionTabs.js | 243 - .../js/foundation.responsiveMenu.js | 155 - .../js/foundation.responsiveToggle.js | 156 - .../scss/foundation/js/foundation.reveal.js | 596 - .../scss/foundation/js/foundation.slider.js | 712 - .../foundation/js/foundation.smoothScroll.js | 135 - .../scss/foundation/js/foundation.sticky.js | 507 - static/scss/foundation/js/foundation.tabs.js | 502 - .../scss/foundation/js/foundation.toggler.js | 150 - .../scss/foundation/js/foundation.tooltip.js | 462 - .../scss/foundation/js/foundation.util.box.js | 231 - .../foundation/js/foundation.util.core.js | 64 - .../js/foundation.util.imageLoader.js | 45 - .../foundation/js/foundation.util.keyboard.js | 162 - .../js/foundation.util.mediaQuery.js | 234 - .../foundation/js/foundation.util.motion.js | 104 - .../foundation/js/foundation.util.nest.js | 67 - .../foundation/js/foundation.util.timer.js | 48 - .../foundation/js/foundation.util.touch.js | 149 - .../foundation/js/foundation.util.triggers.js | 268 - static/scss/foundation/meteor-README.md | 149 - static/scss/foundation/package-lock.json | 14159 ---------------- static/scss/foundation/package.js | 93 - static/scss/foundation/package.json | 155 - static/scss/foundation/sache.json | 5 - static/scss/foundation/scss/_global.scss | 250 - .../scss/components/_accordion-menu.scss | 171 - .../scss/components/_accordion.scss | 155 - .../foundation/scss/components/_badge.scss | 63 - .../scss/components/_breadcrumbs.scss | 117 - .../scss/components/_button-group.scss | 270 - .../foundation/scss/components/_button.scss | 418 - .../foundation/scss/components/_callout.scss | 106 - .../foundation/scss/components/_card.scss | 129 - .../scss/components/_close-button.scss | 102 - .../scss/components/_drilldown.scss | 142 - .../scss/components/_dropdown-menu.scss | 274 - .../foundation/scss/components/_dropdown.scss | 79 - .../scss/components/_flex-video.scss | 1 - .../foundation/scss/components/_flex.scss | 117 - .../foundation/scss/components/_float.scss | 27 - .../foundation/scss/components/_label.scss | 64 - .../scss/components/_media-object.scss | 114 - .../scss/components/_menu-icon.scss | 9 - .../foundation/scss/components/_menu.scss | 495 - .../scss/components/_off-canvas.scss | 506 - .../foundation/scss/components/_orbit.scss | 196 - .../scss/components/_pagination.scss | 193 - .../scss/components/_progress-bar.scss | 64 - .../scss/components/_responsive-embed.scss | 70 - .../foundation/scss/components/_reveal.scss | 178 - .../foundation/scss/components/_slider.scss | 137 - .../foundation/scss/components/_sticky.scss | 39 - .../foundation/scss/components/_switch.scss | 247 - .../foundation/scss/components/_table.scss | 330 - .../foundation/scss/components/_tabs.scss | 197 - .../scss/components/_thumbnail.scss | 67 - .../scss/components/_title-bar.scss | 84 - .../foundation/scss/components/_tooltip.scss | 160 - .../foundation/scss/components/_top-bar.scss | 175 - .../scss/components/_visibility.scss | 132 - .../scss/foundation/scss/forms/_checkbox.scss | 41 - static/scss/foundation/scss/forms/_error.scss | 88 - .../scss/foundation/scss/forms/_fieldset.scss | 53 - static/scss/foundation/scss/forms/_forms.scss | 34 - .../foundation/scss/forms/_help-text.scss | 30 - .../foundation/scss/forms/_input-group.scss | 138 - static/scss/foundation/scss/forms/_label.scss | 50 - static/scss/foundation/scss/forms/_meter.scss | 116 - .../scss/foundation/scss/forms/_progress.scss | 94 - static/scss/foundation/scss/forms/_range.scss | 149 - .../scss/foundation/scss/forms/_select.scss | 86 - static/scss/foundation/scss/forms/_text.scss | 179 - static/scss/foundation/scss/foundation.scss | 133 - .../scss/foundation/scss/grid/_classes.scss | 189 - static/scss/foundation/scss/grid/_column.scss | 112 - .../scss/foundation/scss/grid/_flex-grid.scss | 260 - static/scss/foundation/scss/grid/_grid.scss | 48 - static/scss/foundation/scss/grid/_gutter.scss | 82 - static/scss/foundation/scss/grid/_layout.scss | 76 - .../scss/foundation/scss/grid/_position.scss | 76 - static/scss/foundation/scss/grid/_row.scss | 99 - static/scss/foundation/scss/grid/_size.scss | 24 - .../foundation/scss/prototype/_arrow.scss | 36 - .../scss/prototype/_border-box.scss | 35 - .../scss/prototype/_border-none.scss | 35 - .../foundation/scss/prototype/_bordered.scss | 54 - .../scss/foundation/scss/prototype/_box.scss | 23 - .../foundation/scss/prototype/_display.scss | 50 - .../scss/prototype/_font-styling.scss | 95 - .../scss/prototype/_list-style-type.scss | 95 - .../foundation/scss/prototype/_overflow.scss | 72 - .../foundation/scss/prototype/_position.scss | 114 - .../foundation/scss/prototype/_prototype.scss | 87 - .../foundation/scss/prototype/_relation.scss | 157 - .../foundation/scss/prototype/_rotate.scss | 31 - .../foundation/scss/prototype/_rounded.scss | 61 - .../foundation/scss/prototype/_separator.scss | 96 - .../foundation/scss/prototype/_shadow.scss | 43 - .../foundation/scss/prototype/_sizing.scss | 73 - .../foundation/scss/prototype/_spacing.scss | 177 - .../scss/prototype/_text-decoration.scss | 48 - .../scss/prototype/_text-transformation.scss | 48 - .../scss/prototype/_text-utilities.scss | 88 - .../foundation/scss/settings/_settings.scss | 869 - .../scss/typography/_alignment.scss | 22 - .../foundation/scss/typography/_base.scss | 499 - .../foundation/scss/typography/_helpers.scss | 107 - .../foundation/scss/typography/_print.scss | 86 - .../scss/typography/_typography.scss | 26 - .../foundation/scss/util/_breakpoint.scss | 357 - static/scss/foundation/scss/util/_color.scss | 139 - .../scss/foundation/scss/util/_direction.scss | 31 - static/scss/foundation/scss/util/_flex.scss | 90 - static/scss/foundation/scss/util/_math.scss | 72 - static/scss/foundation/scss/util/_mixins.scss | 330 - .../scss/foundation/scss/util/_selector.scss | 41 - .../foundation/scss/util/_typography.scss | 26 - static/scss/foundation/scss/util/_unit.scss | 152 - static/scss/foundation/scss/util/_util.scss | 14 - static/scss/foundation/scss/util/_value.scss | 160 - .../scss/foundation/scss/xy-grid/_cell.scss | 178 - .../foundation/scss/xy-grid/_classes.scss | 476 - .../foundation/scss/xy-grid/_collapse.scss | 74 - .../scss/foundation/scss/xy-grid/_frame.scss | 86 - .../scss/foundation/scss/xy-grid/_grid.scss | 35 - .../foundation/scss/xy-grid/_gutters.scss | 45 - .../scss/foundation/scss/xy-grid/_layout.scss | 33 - .../foundation/scss/xy-grid/_position.scss | 28 - .../foundation/scss/xy-grid/_xy-grid.scss | 51 - static/scss/foundation/webpack.config.js | 29 - static/scss/foundation/yarn.lock | 8212 --------- static/scss/global.css | 3 - static/scss/global.scss | 93 - static/scss/header.css | 3 - static/scss/header.scss | 126 - static/scss/home.css | 3 - static/scss/home.scss | 189 - static/scss/landingpage4.css | 4 +- static/scss/landingpage4.scss | 34 + static/scss/liblist.css | 3 + static/scss/libraries.css | 2 +- static/scss/libraries.scss | 6 + static/scss/lists.css | 2 +- static/scss/manage_campaign.css | 3 + static/scss/notices.css | 3 + static/scss/pledge.css | 2 +- static/scss/read.css | 3 - static/scss/read.scss | 3 - static/scss/registration.css | 3 - static/scss/registration.scss | 69 - static/scss/registration2.css | 2 +- static/scss/registration2.scss | 124 + static/scss/search.css | 2 +- static/scss/searchandbrowse2.css | 2 +- static/scss/settings.scss | 870 - static/scss/sitewide4.css | 4 +- static/scss/sitewide4.scss | 251 +- static/scss/supporter_layout.css | 2 +- static/scss/variables.scss | 5 +- test/travis-host.py.enc | Bin 544 -> 544 bytes utils/{encryption.py => crypto.py} | 0 405 files changed, 1957 insertions(+), 85250 deletions(-) delete mode 100644 Vagrantfile delete mode 100644 frontend/templates/read.html delete mode 100644 setup.py delete mode 100755 start.sh delete mode 100644 static/css/reader/annotations.css delete mode 100755 static/css/reader/main.css delete mode 100755 static/css/reader/normalize.css delete mode 100644 static/css/reader/popup.css delete mode 100644 static/fonts/fontello.eot delete mode 100644 static/fonts/fontello.svg delete mode 100644 static/fonts/fontello.ttf delete mode 100644 static/fonts/fontello.woff delete mode 100644 static/images/reader/loader.gif create mode 100644 static/js/greenpanel.js delete mode 100644 static/js/reader/epub.min.js delete mode 100644 static/js/reader/epub.min.map delete mode 100644 static/js/reader/hooks.min.js delete mode 100644 static/js/reader/hooks.min.map delete mode 100644 static/js/reader/hooks/extensions/highlight.js delete mode 100644 static/js/reader/libs/jquery.min.js delete mode 100644 static/js/reader/libs/localforage.min.js delete mode 100644 static/js/reader/libs/screenfull.js delete mode 100644 static/js/reader/libs/screenfull.min.js delete mode 100644 static/js/reader/libs/zip.min.js delete mode 100644 static/js/reader/plugins/hypothesis.js delete mode 100644 static/js/reader/plugins/search.js delete mode 100644 static/js/reader/reader.min.js delete mode 100644 static/js/reader/reader.min.map delete mode 100644 static/scss/bookview.css delete mode 100644 static/scss/bookview.scss delete mode 100644 static/scss/colors.scss create mode 100644 static/scss/comments.css delete mode 100644 static/scss/download.css delete mode 100644 static/scss/faq.css delete mode 100644 static/scss/faq.scss create mode 100644 static/scss/font-awesome.min.css delete mode 100644 static/scss/foundation/.babelrc delete mode 100644 static/scss/foundation/.bowerrc delete mode 100644 static/scss/foundation/.editorconfig delete mode 100644 static/scss/foundation/.eslintrc delete mode 100644 static/scss/foundation/.gitignore delete mode 100644 static/scss/foundation/.jshintrc delete mode 100644 static/scss/foundation/.npmignore delete mode 100644 static/scss/foundation/.sass-lint.yml delete mode 100644 static/scss/foundation/.travis.yml delete mode 100644 static/scss/foundation/.versions delete mode 100644 static/scss/foundation/CONTRIBUTING.md delete mode 100644 static/scss/foundation/LICENSE delete mode 100644 static/scss/foundation/README.md delete mode 100644 static/scss/foundation/_vendor/normalize-scss/sass/_normalize.scss delete mode 100644 static/scss/foundation/_vendor/normalize-scss/sass/normalize/_import-now.scss delete mode 100644 static/scss/foundation/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss delete mode 100644 static/scss/foundation/_vendor/normalize-scss/sass/normalize/_variables.scss delete mode 100644 static/scss/foundation/_vendor/normalize-scss/sass/normalize/_vertical-rhythm.scss delete mode 100644 static/scss/foundation/_vendor/sassy-lists/stylesheets/functions/_contain.scss delete mode 100644 static/scss/foundation/_vendor/sassy-lists/stylesheets/functions/_purge.scss delete mode 100644 static/scss/foundation/_vendor/sassy-lists/stylesheets/functions/_remove.scss delete mode 100644 static/scss/foundation/_vendor/sassy-lists/stylesheets/functions/_replace.scss delete mode 100644 static/scss/foundation/_vendor/sassy-lists/stylesheets/functions/_to-list.scss delete mode 100644 static/scss/foundation/_vendor/sassy-lists/stylesheets/helpers/_missing-dependencies.scss delete mode 100644 static/scss/foundation/_vendor/sassy-lists/stylesheets/helpers/_true.scss delete mode 100644 static/scss/foundation/assets/foundation-float.scss delete mode 100644 static/scss/foundation/assets/foundation-prototype.scss delete mode 100644 static/scss/foundation/assets/foundation-rtl.scss delete mode 100644 static/scss/foundation/assets/foundation.scss delete mode 100644 static/scss/foundation/bower.json delete mode 100644 static/scss/foundation/browserstack.json delete mode 100644 static/scss/foundation/code-of-conduct.md delete mode 100644 static/scss/foundation/composer.json delete mode 100644 static/scss/foundation/customizer/complete.json delete mode 100644 static/scss/foundation/customizer/config.yml delete mode 100644 static/scss/foundation/customizer/essential.json delete mode 100644 static/scss/foundation/customizer/index.html delete mode 100644 static/scss/foundation/customizer/lib/index.js delete mode 100644 static/scss/foundation/customizer/lib/js.js delete mode 100644 static/scss/foundation/customizer/lib/sass.js delete mode 100644 static/scss/foundation/dist/js/foundation.d.ts delete mode 100644 static/scss/foundation/dist/js/foundation.js delete mode 100644 static/scss/foundation/dist/js/foundation.min.js delete mode 100644 static/scss/foundation/dist/js/npm.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.abide.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.abide.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.accordion.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.accordion.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.accordionMenu.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.accordionMenu.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.core.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.core.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.drilldown.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.drilldown.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.dropdown.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.dropdown.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.dropdownMenu.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.dropdownMenu.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.equalizer.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.equalizer.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.interchange.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.interchange.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.magellan.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.magellan.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.offcanvas.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.offcanvas.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.orbit.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.orbit.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.responsiveAccordionTabs.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.responsiveAccordionTabs.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.responsiveMenu.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.responsiveMenu.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.responsiveToggle.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.responsiveToggle.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.reveal.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.reveal.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.slider.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.slider.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.smoothScroll.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.smoothScroll.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.sticky.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.sticky.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.tabs.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.tabs.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.toggler.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.toggler.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.tooltip.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.tooltip.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.box.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.box.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.imageLoader.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.imageLoader.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.keyboard.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.keyboard.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.mediaQuery.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.mediaQuery.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.motion.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.motion.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.nest.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.nest.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.timer.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.timer.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.timerAndImageLoader.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.timerAndImageLoader.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.touch.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.touch.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.triggers.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.util.triggers.min.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.zf.responsiveAccordionTabs.js delete mode 100644 static/scss/foundation/dist/js/plugins/foundation.zf.responsiveAccordionTabs.min.js delete mode 100755 static/scss/foundation/docslink.sh delete mode 100644 static/scss/foundation/gulpfile.js delete mode 100644 static/scss/foundation/js/entries/foundation-plugins.js delete mode 100644 static/scss/foundation/js/entries/foundation.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.abide.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.accordion.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.accordionMenu.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.core.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.drilldown.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.dropdown.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.dropdownMenu.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.equalizer.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.interchange.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.magellan.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.offcanvas.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.orbit.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.responsiveAccordionTabs.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.responsiveMenu.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.responsiveToggle.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.reveal.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.slider.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.smoothScroll.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.sticky.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.tabs.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.toggler.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.tooltip.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.util.box.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.util.imageLoader.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.util.keyboard.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.util.mediaQuery.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.util.motion.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.util.nest.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.util.timer.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.util.touch.js delete mode 100644 static/scss/foundation/js/entries/plugins/foundation.util.triggers.js delete mode 100644 static/scss/foundation/js/foundation.abide.js delete mode 100644 static/scss/foundation/js/foundation.accordion.js delete mode 100644 static/scss/foundation/js/foundation.accordionMenu.js delete mode 100644 static/scss/foundation/js/foundation.core.js delete mode 100644 static/scss/foundation/js/foundation.drilldown.js delete mode 100644 static/scss/foundation/js/foundation.dropdown.js delete mode 100644 static/scss/foundation/js/foundation.dropdownMenu.js delete mode 100644 static/scss/foundation/js/foundation.equalizer.js delete mode 100644 static/scss/foundation/js/foundation.interchange.js delete mode 100644 static/scss/foundation/js/foundation.magellan.js delete mode 100644 static/scss/foundation/js/foundation.offcanvas.js delete mode 100644 static/scss/foundation/js/foundation.orbit.js delete mode 100644 static/scss/foundation/js/foundation.plugin.js delete mode 100644 static/scss/foundation/js/foundation.positionable.js delete mode 100644 static/scss/foundation/js/foundation.responsiveAccordionTabs.js delete mode 100644 static/scss/foundation/js/foundation.responsiveMenu.js delete mode 100644 static/scss/foundation/js/foundation.responsiveToggle.js delete mode 100644 static/scss/foundation/js/foundation.reveal.js delete mode 100644 static/scss/foundation/js/foundation.slider.js delete mode 100644 static/scss/foundation/js/foundation.smoothScroll.js delete mode 100644 static/scss/foundation/js/foundation.sticky.js delete mode 100644 static/scss/foundation/js/foundation.tabs.js delete mode 100644 static/scss/foundation/js/foundation.toggler.js delete mode 100644 static/scss/foundation/js/foundation.tooltip.js delete mode 100644 static/scss/foundation/js/foundation.util.box.js delete mode 100644 static/scss/foundation/js/foundation.util.core.js delete mode 100644 static/scss/foundation/js/foundation.util.imageLoader.js delete mode 100644 static/scss/foundation/js/foundation.util.keyboard.js delete mode 100644 static/scss/foundation/js/foundation.util.mediaQuery.js delete mode 100644 static/scss/foundation/js/foundation.util.motion.js delete mode 100644 static/scss/foundation/js/foundation.util.nest.js delete mode 100644 static/scss/foundation/js/foundation.util.timer.js delete mode 100644 static/scss/foundation/js/foundation.util.touch.js delete mode 100644 static/scss/foundation/js/foundation.util.triggers.js delete mode 100644 static/scss/foundation/meteor-README.md delete mode 100644 static/scss/foundation/package-lock.json delete mode 100644 static/scss/foundation/package.js delete mode 100644 static/scss/foundation/package.json delete mode 100644 static/scss/foundation/sache.json delete mode 100644 static/scss/foundation/scss/_global.scss delete mode 100644 static/scss/foundation/scss/components/_accordion-menu.scss delete mode 100644 static/scss/foundation/scss/components/_accordion.scss delete mode 100644 static/scss/foundation/scss/components/_badge.scss delete mode 100644 static/scss/foundation/scss/components/_breadcrumbs.scss delete mode 100644 static/scss/foundation/scss/components/_button-group.scss delete mode 100644 static/scss/foundation/scss/components/_button.scss delete mode 100644 static/scss/foundation/scss/components/_callout.scss delete mode 100644 static/scss/foundation/scss/components/_card.scss delete mode 100644 static/scss/foundation/scss/components/_close-button.scss delete mode 100644 static/scss/foundation/scss/components/_drilldown.scss delete mode 100644 static/scss/foundation/scss/components/_dropdown-menu.scss delete mode 100644 static/scss/foundation/scss/components/_dropdown.scss delete mode 100644 static/scss/foundation/scss/components/_flex-video.scss delete mode 100644 static/scss/foundation/scss/components/_flex.scss delete mode 100644 static/scss/foundation/scss/components/_float.scss delete mode 100644 static/scss/foundation/scss/components/_label.scss delete mode 100644 static/scss/foundation/scss/components/_media-object.scss delete mode 100644 static/scss/foundation/scss/components/_menu-icon.scss delete mode 100644 static/scss/foundation/scss/components/_menu.scss delete mode 100644 static/scss/foundation/scss/components/_off-canvas.scss delete mode 100644 static/scss/foundation/scss/components/_orbit.scss delete mode 100644 static/scss/foundation/scss/components/_pagination.scss delete mode 100644 static/scss/foundation/scss/components/_progress-bar.scss delete mode 100644 static/scss/foundation/scss/components/_responsive-embed.scss delete mode 100644 static/scss/foundation/scss/components/_reveal.scss delete mode 100755 static/scss/foundation/scss/components/_slider.scss delete mode 100644 static/scss/foundation/scss/components/_sticky.scss delete mode 100644 static/scss/foundation/scss/components/_switch.scss delete mode 100644 static/scss/foundation/scss/components/_table.scss delete mode 100644 static/scss/foundation/scss/components/_tabs.scss delete mode 100644 static/scss/foundation/scss/components/_thumbnail.scss delete mode 100644 static/scss/foundation/scss/components/_title-bar.scss delete mode 100644 static/scss/foundation/scss/components/_tooltip.scss delete mode 100644 static/scss/foundation/scss/components/_top-bar.scss delete mode 100644 static/scss/foundation/scss/components/_visibility.scss delete mode 100644 static/scss/foundation/scss/forms/_checkbox.scss delete mode 100644 static/scss/foundation/scss/forms/_error.scss delete mode 100644 static/scss/foundation/scss/forms/_fieldset.scss delete mode 100644 static/scss/foundation/scss/forms/_forms.scss delete mode 100644 static/scss/foundation/scss/forms/_help-text.scss delete mode 100644 static/scss/foundation/scss/forms/_input-group.scss delete mode 100644 static/scss/foundation/scss/forms/_label.scss delete mode 100644 static/scss/foundation/scss/forms/_meter.scss delete mode 100644 static/scss/foundation/scss/forms/_progress.scss delete mode 100644 static/scss/foundation/scss/forms/_range.scss delete mode 100644 static/scss/foundation/scss/forms/_select.scss delete mode 100644 static/scss/foundation/scss/forms/_text.scss delete mode 100644 static/scss/foundation/scss/foundation.scss delete mode 100644 static/scss/foundation/scss/grid/_classes.scss delete mode 100644 static/scss/foundation/scss/grid/_column.scss delete mode 100644 static/scss/foundation/scss/grid/_flex-grid.scss delete mode 100644 static/scss/foundation/scss/grid/_grid.scss delete mode 100644 static/scss/foundation/scss/grid/_gutter.scss delete mode 100644 static/scss/foundation/scss/grid/_layout.scss delete mode 100644 static/scss/foundation/scss/grid/_position.scss delete mode 100644 static/scss/foundation/scss/grid/_row.scss delete mode 100644 static/scss/foundation/scss/grid/_size.scss delete mode 100644 static/scss/foundation/scss/prototype/_arrow.scss delete mode 100644 static/scss/foundation/scss/prototype/_border-box.scss delete mode 100644 static/scss/foundation/scss/prototype/_border-none.scss delete mode 100644 static/scss/foundation/scss/prototype/_bordered.scss delete mode 100644 static/scss/foundation/scss/prototype/_box.scss delete mode 100644 static/scss/foundation/scss/prototype/_display.scss delete mode 100644 static/scss/foundation/scss/prototype/_font-styling.scss delete mode 100644 static/scss/foundation/scss/prototype/_list-style-type.scss delete mode 100644 static/scss/foundation/scss/prototype/_overflow.scss delete mode 100644 static/scss/foundation/scss/prototype/_position.scss delete mode 100644 static/scss/foundation/scss/prototype/_prototype.scss delete mode 100644 static/scss/foundation/scss/prototype/_relation.scss delete mode 100644 static/scss/foundation/scss/prototype/_rotate.scss delete mode 100644 static/scss/foundation/scss/prototype/_rounded.scss delete mode 100644 static/scss/foundation/scss/prototype/_separator.scss delete mode 100644 static/scss/foundation/scss/prototype/_shadow.scss delete mode 100644 static/scss/foundation/scss/prototype/_sizing.scss delete mode 100644 static/scss/foundation/scss/prototype/_spacing.scss delete mode 100644 static/scss/foundation/scss/prototype/_text-decoration.scss delete mode 100644 static/scss/foundation/scss/prototype/_text-transformation.scss delete mode 100644 static/scss/foundation/scss/prototype/_text-utilities.scss delete mode 100644 static/scss/foundation/scss/settings/_settings.scss delete mode 100644 static/scss/foundation/scss/typography/_alignment.scss delete mode 100644 static/scss/foundation/scss/typography/_base.scss delete mode 100644 static/scss/foundation/scss/typography/_helpers.scss delete mode 100644 static/scss/foundation/scss/typography/_print.scss delete mode 100644 static/scss/foundation/scss/typography/_typography.scss delete mode 100644 static/scss/foundation/scss/util/_breakpoint.scss delete mode 100644 static/scss/foundation/scss/util/_color.scss delete mode 100644 static/scss/foundation/scss/util/_direction.scss delete mode 100644 static/scss/foundation/scss/util/_flex.scss delete mode 100644 static/scss/foundation/scss/util/_math.scss delete mode 100644 static/scss/foundation/scss/util/_mixins.scss delete mode 100644 static/scss/foundation/scss/util/_selector.scss delete mode 100644 static/scss/foundation/scss/util/_typography.scss delete mode 100644 static/scss/foundation/scss/util/_unit.scss delete mode 100644 static/scss/foundation/scss/util/_util.scss delete mode 100644 static/scss/foundation/scss/util/_value.scss delete mode 100644 static/scss/foundation/scss/xy-grid/_cell.scss delete mode 100644 static/scss/foundation/scss/xy-grid/_classes.scss delete mode 100644 static/scss/foundation/scss/xy-grid/_collapse.scss delete mode 100644 static/scss/foundation/scss/xy-grid/_frame.scss delete mode 100644 static/scss/foundation/scss/xy-grid/_grid.scss delete mode 100644 static/scss/foundation/scss/xy-grid/_gutters.scss delete mode 100644 static/scss/foundation/scss/xy-grid/_layout.scss delete mode 100644 static/scss/foundation/scss/xy-grid/_position.scss delete mode 100644 static/scss/foundation/scss/xy-grid/_xy-grid.scss delete mode 100644 static/scss/foundation/webpack.config.js delete mode 100644 static/scss/foundation/yarn.lock delete mode 100644 static/scss/global.css delete mode 100644 static/scss/global.scss delete mode 100644 static/scss/header.css delete mode 100644 static/scss/header.scss delete mode 100644 static/scss/home.css delete mode 100644 static/scss/home.scss create mode 100644 static/scss/liblist.css create mode 100644 static/scss/manage_campaign.css create mode 100644 static/scss/notices.css delete mode 100644 static/scss/read.css delete mode 100644 static/scss/read.scss delete mode 100644 static/scss/registration.css delete mode 100644 static/scss/registration.scss create mode 100644 static/scss/registration2.scss delete mode 100644 static/scss/settings.scss rename utils/{encryption.py => crypto.py} (100%) diff --git a/.gitignore b/.gitignore index 2a1aff013..4a693c5d3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,14 +6,11 @@ settings/keys/* *.dot reports ENV -venv .DS_Store build deploy/last-update logs/* -cache/* celerybeat.pid celerybeat-schedule .gitignore~ -static/scss/**/*.css.map -*.retry \ No newline at end of file +static/scss/*.css.map diff --git a/.travis.yml b/.travis.yml index 96d4df1d0..8f981b211 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,14 +10,14 @@ services: env: global: - DJANGO_SETTINGS_MODULE=regluit.settings.travis - - PYTHONPATH=/home/travis/build/EbookFoundation/ + - PYTHONPATH=/home/travis/build/Gluejar/ before_install: - sudo mkdir /var/log/django - sudo chmod 777 /var/log/django - - mkdir ~/build/EbookFoundation/regluit/settings/keys/ - - cp ~/build/EbookFoundation/regluit/settings/dummy/__init__.py ~/build/EbookFoundation/regluit/settings/keys/__init__.py - - openssl aes-256-cbc -K $encrypted_56eb2b7cc527_key -iv $encrypted_56eb2b7cc527_iv -in ~/build/EbookFoundation/regluit/test/travis-host.py.enc -out ~/build/EbookFoundation/regluit/settings/keys/host.py -d + - mkdir ~/build/Gluejar/regluit/settings/keys/ + - cp ~/build/Gluejar/regluit/settings/dummy/__init__.py ~/build/Gluejar/regluit/settings/keys/__init__.py + - openssl aes-256-cbc -K $encrypted_56eb2b7cc527_key -iv $encrypted_56eb2b7cc527_iv -in ~/build/Gluejar/regluit/test/travis-host.py.enc -out ~/build/Gluejar/regluit/settings/keys/host.py -d install: - pip install -r requirements_versioned.pip diff --git a/README.md b/README.md index 66fc4a291..5eaf79d25 100644 --- a/README.md +++ b/README.md @@ -12,32 +12,7 @@ The partitioning between these modules is not as clean as would be ideal. `payme regluit was originally developed on Django 1.3 (python 2.7) and currently runs on Django 1.8. -Development (Vagrant + Virtualbox) -------- - -The recommended method for local development is to create a virtual machine with [Vagrant](https://www.vagrantup.com/) and [Virtualbox](https://www.virtualbox.org/wiki/Downloads). -With this method, the only requirements on the host machine are `virtualbox` and `vagrant`. -Vagrant will use the `ansible-local` provisioner, therefore installing python and ansible on the host machine is not necessary. - -__Instructions for Ubuntu 16:__ -1. Install virtualbox: `sudo apt-get install virtualbox` -2. Install vagrant: `sudo apt-get install vagrant` -3. Clone the `EbookFoundation/regluit` repository. -4. Navigate to the base directory of the cloned repo (where `Vagrantfile` is located). -5. Run `vagrant up` to create the VM, install dependencies, and start necessary services. - * Note: This step may take up to 15 minutes to complete. -6. Once the VM has been created, run `vagrant ssh` to log in to the virtual machine you just created. If provisioning was successful, you should see a success message upon login. - * If virtualenv doesn't activate upon login, you can do it manually by running `cd /opt/regluit && source venv/bin/activate` -7. Within the VM, run `./manage.py runserver 0.0.0.0:8000` to start the Django development server. -8. On your host machine, open your web browser of choice and navigate to `http://127.0.0.1:8000` - -__Instructions for other platforms (Windows/OSX):__ -* Steps are essentially the same, except for the installation of Vagrant and Virtualbox. Refer to each package's documentation for specific installation instructions. - -_NOTE:_ If running Windows on your host machine, ensure you are running `vagrant up` from an elevated command prompt, e.g. right click on Command Prompt -> Run As Administrator. - - -Development (Host Machine) +Develop ------- Here are some instructions for setting up regluit for development on diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 0ad9cdbc6..000000000 --- a/Vagrantfile +++ /dev/null @@ -1,56 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# All Vagrant configuration is done below. The "2" in Vagrant.configure -# configures the configuration version (we support older styles for -# backwards compatibility). Please don't change it unless you know what -# you're doing. -Vagrant.configure("2") do |config| - # The most common configuration options are documented and commented below. - # For a complete reference, please see the online documentation at - # https://docs.vagrantup.com. - # Every Vagrant development environment requires a box. You can search for - # boxes at https://vagrantcloud.com/search. - config.vm.box = "ubuntu/xenial64" - - # Disable automatic box update checking. If you disable this, then - # boxes will only be checked for updates when the user runs - # `vagrant box outdated`. This is not recommended. - config.vm.box_check_update = false - - # Setup specific for local machine - config.vm.define "regluit-local", primary: true do |local| - # Create a private network - local.vm.network "private_network", type: "dhcp" - local.vm.hostname = "regluit-local" - - # VirtuaLBox provider settings for running locally with Oracle VirtualBox - # --uartmode1 disconnected is necessary to disable serial interface, which - # is known to cause issues with Ubuntu 16 VM's - local.vm.provider "virtualbox" do |vb| - vb.name = "regluit-local" - vb.memory = 1024 - vb.cpus = 2 - vb.customize [ "modifyvm", :id, "--uartmode1", "disconnected" ] - end - - end - - config.vm.synced_folder ".", "/vagrant", disabled: true - config.vm.synced_folder ".", "/opt/regluit" - - config.vm.network "forwarded_port", guest: 8000, host: 8000 - - # Provision node with Ansible running on the Vagrant host - # This requires you have Ansible installed locally - # Vagrant autogenerates an ansible inventory file to use - config.vm.provision "ansible_local" do |ansible| - ansible.playbook = "/opt/regluit/provisioning/setup-regluit.yml" - ansible.provisioning_path = "/opt/regluit" - ansible.verbose = true - ansible.install = true - end - - config.vm.post_up_message = "Successfully created regluit-local VM. Run 'vagrant ssh' to log in and start the development server." - -end diff --git a/core/mobi.py b/core/mobi.py index b26d43e6b..07bbbc9dd 100644 --- a/core/mobi.py +++ b/core/mobi.py @@ -13,8 +13,7 @@ def convert_to_mobi(input_url, input_format="application/epub+zip"): return a string with the output of mobigen computation """ - if mobigen_url and mobigen_user_id and mobigen_password: - print 'settings ok' + # using verify=False since at the moment, using a self-signed SSL cert. payload = requests.get(input_url).content @@ -27,6 +26,5 @@ def convert_to_mobi(input_url, input_format="application/epub+zip"): if r.status_code == 200: return r.content else: - print "{0}: {1}".format(r.status_code, r.content) raise Exception("{0}: {1}".format(r.status_code, r.content)) diff --git a/core/models/__init__.py b/core/models/__init__.py index 6f7aebf49..9b9ab519e 100755 --- a/core/models/__init__.py +++ b/core/models/__init__.py @@ -47,8 +47,7 @@ TRANSACTION_STATUS_FAILED, TRANSACTION_STATUS_INCOMPLETE ) - -from regluit.utils import encryption as crypto +from regluit.utils import crypto from regluit.utils.localdatetime import date_today from regluit.core.parameters import ( diff --git a/core/models/bibmodels.py b/core/models/bibmodels.py index 61d002ced..ab66eb4d1 100644 --- a/core/models/bibmodels.py +++ b/core/models/bibmodels.py @@ -108,10 +108,10 @@ def get_or_add(type='goog', value=None, edition=None, work=None): def __unicode__(self): return u'{0}:{1}'.format(self.type, self.value) - + def label(self): return ID_CHOICES_MAP.get(self.type, self.type) - + def url(self): return id_url(self.type, self.value) @@ -129,7 +129,7 @@ class Work(models.Model): is_free = models.BooleanField(default=False) landings = GenericRelation(Landing, related_query_name='works') related = models.ManyToManyField('self', symmetrical=False, blank=True, through='WorkRelation', related_name='reverse_related') - age_level = models.CharField(max_length=5, choices=AGE_LEVEL_CHOICES, default='', blank=True) + age_level = models.CharField(max_length=5, choices=AGE_LEVEL_CHOICES, default='', blank=True) class Meta: ordering = ['title'] @@ -165,7 +165,7 @@ def delete(self, cascade=True, *args, **kwargs): for work_relation in self.works_related_from.all(): work_relation.delete() super(Work, self).delete(*args, **kwargs) # Call the "real" save() method. - + def id_for(self, type): return id_for(self, type) @@ -233,7 +233,7 @@ def openlibrary_id(self): @property def openlibrary_url(self): return id_url('olwk', self.openlibrary_id) - + def cover_filetype(self): if self.uses_google_cover(): return 'jpeg' @@ -431,14 +431,14 @@ def mobifiles(self): def pdffiles(self): return EbookFile.objects.filter(edition__work=self, format='pdf').exclude(file='').order_by('-created') - + def versions(self): version_labels = [] for ebook in self.ebooks_all(): if ebook.version_label and not ebook.version_label in version_labels: version_labels.append(ebook.version_label) return version_labels - + def formats(self): fmts = [] for fmt in ['pdf', 'epub', 'mobi', 'html']: @@ -450,7 +450,7 @@ def formats(self): def remove_old_ebooks(self): # this method is triggered after an file upload or new ebook saved old = Ebook.objects.filter(edition__work=self, active=True).order_by('-version_iter', '-created') - + # keep highest version ebook for each format and version label done_format_versions = [] for eb in old: @@ -459,7 +459,7 @@ def remove_old_ebooks(self): eb.deactivate() else: done_format_versions.append(format_version) - + # check for failed uploads. null_files = EbookFile.objects.filter(edition__work=self, file='') for ebf in null_files: @@ -796,12 +796,12 @@ class Subject(models.Model): class Meta: ordering = ['name'] - + @classmethod def set_by_name(cls, subject, work=None, authority=None): ''' use this method whenever you would be creating a new subject!''' subject = subject.strip() - + # make sure it's not a ; delineated list subjects = subject.split(';') for additional_subject in subjects[1:]: @@ -826,12 +826,12 @@ def set_by_name(cls, subject, work=None, authority=None): if not subject_obj.authority and authority: subject_obj.authority = authority subject_obj.save() - + subject_obj.works.add(work) - return subject_obj + return subject_obj else: return None - + def __unicode__(self): return self.name @@ -1123,6 +1123,7 @@ def make_mobi(self): asking=self.asking, source=self.file.url ) + new_mobi_ebf.file.save(path_for_file(new_mobi_ebf, None), mobi_cf) new_mobi_ebf.save() if self.ebook: @@ -1222,7 +1223,7 @@ def version(self): return '.{}'.format(self.version_iter) else: return '().{}'.format(self.version_label, self.version_iter) - + def set_version(self, version): #set both version_label and version_iter with one string with format "version.iter" version_pattern = r'(.*)\.(\d+)$' @@ -1232,11 +1233,11 @@ def set_version(self, version): else: self.version_label = version self.save() - + def set_next_iter(self): # set the version iter to the next unused iter for that version for ebook in Ebook.objects.filter( - edition=self.edition, + edition=self.edition, version_label=self.version_label, format=self.format, provider=self.provider @@ -1245,7 +1246,7 @@ def set_next_iter(self): break self.version_iter = iter + 1 self.save() - + @property def rights_badge(self): if self.rights is None: diff --git a/core/tests.py b/core/tests.py index 5c5050bd7..2b15e5e70 100755 --- a/core/tests.py +++ b/core/tests.py @@ -998,8 +998,8 @@ def test_download_page(self): anon_client = Client() response = anon_client.get("/work/%s/download/" % w.id, follow=True) - self.assertContains(response, "/download_ebook/%s/"% eb1.id, count=11) - self.assertContains(response, "/download_ebook/%s/"% eb2.id, count=4) + self.assertContains(response, "/download_ebook/%s/"% eb1.id, count=11) + self.assertContains(response, "/download_ebook/%s/"% eb2.id, count=5) self.assertTrue(eb1.edition.work.is_free) eb1.delete() self.assertTrue(eb2.edition.work.is_free) diff --git a/frontend/forms/__init__.py b/frontend/forms/__init__.py index 1277b430d..55d96018d 100644 --- a/frontend/forms/__init__.py +++ b/frontend/forms/__init__.py @@ -281,9 +281,7 @@ class Meta: class CampaignPurchaseForm(forms.Form): - anonymous = forms.BooleanField(required=False, - label_suffix='', - label=_("Make this purchase anonymous")) + anonymous = forms.BooleanField(required=False, label=_("Make this purchase anonymous, please")) offer_id = forms.IntegerField(required=False) offer = None library_id = forms.IntegerField(required=False) @@ -348,8 +346,7 @@ def trans_extra(self): class CampaignThanksForm(forms.Form): anonymous = forms.BooleanField( required=False, - label_suffix='', - label=_("Make this contribution anonymous") + label=_("Make this contribution anonymous, please") ) preapproval_amount = forms.DecimalField( required = True, @@ -383,10 +380,7 @@ class CampaignPledgeForm(forms.Form): def amount(self): return self.cleaned_data["preapproval_amount"] if self.cleaned_data else None - anonymous = forms.BooleanField( - required=False, - label_suffix='', - label=_("Make this support anonymous")) + anonymous = forms.BooleanField(required=False, label=_("Make this support anonymous, please")) ack_name = forms.CharField( required=False, max_length=64, diff --git a/frontend/templates/base.html b/frontend/templates/base.html index eb357f806..dce99c0a6 100644 --- a/frontend/templates/base.html +++ b/frontend/templates/base.html @@ -1,30 +1,20 @@ {% load sass_tags %} - + - unglue.it {% block title %}{% endblock %} - {% block extra_meta %}{% endblock %} - - {% block extra_css %}{% endblock %} - - - - - - + - {% block extra_js %} {% endblock %} {% if show_langs %} @@ -53,86 +43,84 @@ -
-