diff options
| -rw-r--r-- | app/builder/views.py | 24 | ||||
| -rw-r--r-- | app/jrnl/build.py | 10 | ||||
| -rw-r--r-- | app/src/views.py | 6 |
3 files changed, 18 insertions, 22 deletions
diff --git a/app/builder/views.py b/app/builder/views.py index 7057543..158b505 100644 --- a/app/builder/views.py +++ b/app/builder/views.py @@ -2,6 +2,7 @@ from django.shortcuts import render_to_response from django.template import RequestContext from builder.base import BuildWriting, BuildWritingFeed, BuildMap, BuildPhotos, BuildProjects, BuildSitemap, BuildPages, BuildBooks from src.build import builder as src_build +from jrnl.build import BuildJrnl options = { 'writing': BuildWriting, @@ -17,25 +18,15 @@ options = { def do_build(request): section = request.GET.get('id', '') context = {} - if section == 'newpost': - BuildWriting().build() - BuildMap().build() - BuildWritingFeed().build() - BuildSitemap().build() - context = {'message': 'Writing %s to Disk' % section} - elif section == 'builddetails': + if section == 'builddetails': context = {'message': 'Writing Jrnl Permalinks to Disk'} - BuildWriting().build_detail_pages() + BuildJrnl().build_detail_view() elif section == 'writingarchives': context = {'message': 'Writing Jrnl Archives to Disk'} - BuildWriting().build_writing_archives() - BuildWriting().build_country_archive_pages() - BuildWriting().build_region_archive_pages() - BuildWriting().writing_year_archives() - BuildWriting().writing_month_archives() + BuildJrnl().build_arc() elif section == 'buildrss': context = {'message': 'Writing RSS to Disk'} - BuildWritingFeed().build() + BuildJrnl().build_feed("jrnl:feed") elif section == 'homepage': context = {'message': 'Writing index to Disk'} BuildWriting().build_homepage() @@ -45,11 +36,6 @@ def do_build(request): elif section == 'src': context = {'message': 'Writing src section to Disk'} src_build() - elif section == 'scrapeflickr': - from photos.retriever import SyncFlickr - f = SyncFlickr() - f.sync_sets() - context = {'message': 'Crawling Flickr for new photosets'} else: options[section]().build() context = {'message': 'Writing %s to Disk' % section} diff --git a/app/jrnl/build.py b/app/jrnl/build.py index 7bebc13..0f0572b 100644 --- a/app/jrnl/build.py +++ b/app/jrnl/build.py @@ -17,6 +17,16 @@ class BuildJrnl(BuildNew): self.build_location_view() self.build_feed("jrnl:feed") + def build_arc(self): + self.build_list_view( + base_path=reverse("jrnl:live_redirect"), + paginate_by=24 + ) + self.build_year_view("jrnl:list_year") + self.build_month_view("jrnl:list_month") + self.build_location_view() + + def build_location_view(self): c = apps.get_model('locations', 'Country') r = apps.get_model('locations', 'Region') diff --git a/app/src/views.py b/app/src/views.py index 203a021..85a5242 100644 --- a/app/src/views.py +++ b/app/src/views.py @@ -36,9 +36,9 @@ class BookDetailView(DetailView): "amount": price, "item_name": book.title, "invoice": "unique-invoice-id", - "notify_url": "https://www.example.com" + reverse('src:paypal-ipn'), - "return_url": "https://www.example.com/your-return-location/", - "cancel_return": "https://www.example.com/your-cancel-location/", + "notify_url": "https://luxagraf.net/src/paypal/" + reverse('src:paypal-ipn'), + "return_url": "https://luxagraf.net/src/thank-you", + "cancel_return": "https://luxagraf.net/src/books/", } context['paypal_form'] = PayPalPaymentsForm(initial=paypal_dict) return context |