Books updates.

Author: ajrbyers

files.py

@@ -47,7 +47,11 @@ def serve_book_file(book_format):
         response = StreamingHttpResponse(FileWrapper(open(file_path, 'rb'), 8192),
                                          content_type=files.guess_mime(book_format.filename))
         response['Content-Length'] = os.path.getsize(file_path)
-        response['Content-Disposition'] = 'attachment; filename="{0}{1}"'.format(slugify(filename), extension)
+        response['Content-Disposition'] = 'attachment;' \
+                                          ' filename="{0}{1}"'.format(
+            slugify(book_format.book.full_title()),
+            extension
+        )
 
         return response
     else:

migrations/0005_auto_20190624_1119.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-06-24 11:19
+from __future__ import unicode_literals
+
+import django.core.files.storage
+from django.db import migrations, models
+import plugins.books.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0004_auto_20170905_1757'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='book',
+            name='is_open_access',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AlterField(
+            model_name='book',
+            name='cover',
+            field=models.FileField(blank=True, null=True, storage=django.core.files.storage.FileSystemStorage(location='/vol/janeway/src/media'), upload_to=plugins.books.models.cover_images_upload_path),
+        ),
+    ]

models.py

@@ -29,6 +29,7 @@ class Book(models.Model):
     pages = models.PositiveIntegerField()
 
     is_edited_volume = models.BooleanField(default=False)
+    is_open_access = models.BooleanField(default=True)
     date_published = models.DateField(blank=True, null=True)
 
     publisher_name = models.CharField(max_length=100)
@@ -85,7 +86,6 @@ def cover_width(self):
         return width
 
 
-
 class Contributor(models.Model):
     book = models.ForeignKey(Book)
     first_name = models.CharField(max_length=100)

templates/books/admin.html

@@ -19,7 +19,9 @@ <h2>Books</h2>
             <table id="books">
                 <thead>
                 <tr>
+                    <th>ID</th>
                     <th>Title</th>
+                    <th>Subtile</th>
                     <th>First Author</th>
                     <th>ISBN</th>
                     <th>DOI</th>
@@ -29,7 +31,9 @@ <h2>Books</h2>
                 <tbody>
                 {% for book in books %}
                     <tr>
+                        <td>{{ book.pk }}</td>
                         <td><a href="{% url 'books_edit_book' book.pk %}">{{ book.title }}</a></td>
+                        <td>{{ book.subtitle }}</td>
                         <td>{{ book.first_contributor }}</td>
                         <td>{{ book.isbn }}</td>
                         <td>{{ book.doi }}</td>

templates/books/book.html

@@ -1,4 +1,4 @@
-{% extends "press/core/base.html" %}
+{% extends "core/base.html" %}
 
 {% block title %}{{ book.title }}{% endblock %}
 

templates/books/book_detail.html

@@ -1,33 +1,49 @@
+{% load static from staticfiles %}
 <div class="large-12 columns">
     <div class="content clearfix">
-        <div class="large-2 columns">
+        <div class="large-3 columns">
             <img src="{% if book.cover %}{{ book.cover.url }}{% endif %}" alt="">
+            {% if book.is_open_access %}
+                <img src="{% static 'media/books/oa.png' %}" alt="Open Access Logo" style="padding: 30px; padding-bottom: 0;">
+            {% endif %}
             {% if not books %}<p><a href="{% url 'books_index' %}"><i class="fa fa-arrow-left">&nbsp;</i>Back to Listing</a></p>{% endif %}
         </div>
-        <div class="large-7 columns">
-            <a href="{% url 'books_book' book.pk %}"><h2>{{ book.full_title }}</h2></a>
-            <h6>{% for contributor in book.contributor_set.all %}{% if not forloop.first and not forloop.last %},
-            {% elif forloop.last and not forloop.first %} & {% endif %}{{ contributor }}{% endfor %}</h6>
-            {{ book.description|safe|linebreaksbr }}
-        </div>
-        <div class="large-3 columns">
-            <h6>About this Book</h6>
-            <strong>Published</strong> {{ book.date_published }}<br/><br/>
-            <strong>Published by</strong> {{ book.publisher_name }}<br/><br/>
-            {% if book.pages %}<strong>Pages</strong> {{ book.pages }}<br/><br/>{% endif %}
-            {% if book.isbn %}<strong>ISBN</strong> {{ book.isbn }}<br/><br/>{% endif %}
-            {% if book.doi %}<strong>DOI</strong> <a href="https://doi.org/{{ book.doi }}">{{ book.doi }}</a><br/>
-                <br/>{% endif %}
-            {% if book.format_set.all %}
-            <h6>Downloads</h6>
-            {% endif %}
+        <div class="large-9 columns">
+            <h2>{% if books %}<a href="{% url 'books_book' book.pk %}">{% endif %}{{ book.full_title }}{% if books %}</a>{% endif %}</h2>
+            <h6><em>{% for contributor in book.contributor_set.all %}{% if not forloop.first and not forloop.last %},
+            {% elif forloop.last and not forloop.first %} & {% endif %}{{ contributor }}{% endfor %}</em></h6>
+
             {% for format in book.format_set.all %}
-                <a href="{% url 'books_download_format' book.pk format.pk %}" class="button">{{ format.title }}</a>
+                <a href="{% url 'books_download_format' book.pk format.pk %}" class="button"><i class="fa fa-download">&nbsp;</i> Download {{ format.title }}</a>
             {% endfor %}
-            {% if book.purchase_url %}
-                <h6>Purchase</h6>
-                <a href="{{ book.purchase_url }}" class="button" target="_blank">Buy this Book</a>
-            {% endif %}
+            {% if book.purchase_url %}<a href="{{ book.purchase_url }}" class="button" target="_blank"><i class="fa fa-external-link"></i>&nbsp;Buy this Book</a>{% endif %}
+
+            <table class="table" style="margin-bottom: 0;">
+                <tr>
+                    <th>Description</th>
+                </tr>
+                <tr>
+                    <td>{{ book.description|safe }}</td>
+                </tr>
+            </table>
+
+            <table class="table">
+                <tr>
+                    <th>Published</th>
+                    <th>Published By</th>
+                    <th>Pages</th>
+                    {% if book.isbn %}<th>ISBN</th>{% endif %}
+                    {% if book.doi %}<th>DOI</th>{% endif %}
+                </tr>
+                <tr>
+                    <td>{{ book.date_published }}</td>
+                    <td>{{ book.publisher_name }}</td>
+                    <td>{{ book.pages }}</td>
+                    {% if book.isbn %}<td>{{ book.isbn }}</td>{% endif %}
+                    {% if book.doi %}<td>{{ book.doi }}</td>{% endif %}
+                </tr>
+            </table>
+
         </div>
     </div>
-</div>
+</div>

templates/books/index.html

@@ -1,4 +1,4 @@
-{% extends "press/core/base.html" %}
+{% extends "core/base.html" %}
 
 {% block title %}Books{% endblock %}
 
@@ -13,6 +13,7 @@ <h4>Published Books</h4>
                         {% include "books/book_detail.html" with book=book %}
                     </div>
                 </div>
+                <hr />
             {% empty %}
                 <p>There are no published books to display.</p>
             {% endfor %}

views.py

@@ -1,7 +1,7 @@
 import csv
 
 from django.shortcuts import render, get_object_or_404, redirect, HttpResponse
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib import messages
 
@@ -10,7 +10,11 @@
 
 
 def index(request):
-    books = models.Book.objects.filter(date_published__isnull=False)
+    books = models.Book.objects.filter(
+        date_published__isnull=False,
+    ).order_by(
+        '-date_published',
+    )
 
     template = 'books/index.html'
     context = {