update

sidtSite/catalog/templates/base_generic.html

@@ -23,13 +23,31 @@
       {% block sidebar %}
       <ul class="sidebar-nav">
           <li><a href="{% url 'index' %}">Home</a></li>
-          <li><a href="">All books</a></li>
-          <li><a href="">All authors</a></li>
+          <li><a href="{% url 'books' %}">All books</a></li>
+          <li><a href="{% url 'authors' %}">All authors</a></li>
       </ul>
      {% endblock %}
       </div>
       <div class="col-sm-10 ">
-      {% block content %}{% endblock %}
+	{% block content %}{% endblock %}
+  
+	{% block pagination %}
+	  {% if is_paginated %}
+	      <div class="pagination">
+		  <span class="page-links">
+		      {% if page_obj.has_previous %}
+		          <a href="{{ request.path }}?page={{ page_obj.previous_page_number }}">previous</a>
+		      {% endif %}
+		      <span class="page-current">
+		          Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}.
+		      </span>
+		      {% if page_obj.has_next %}
+		          <a href="{{ request.path }}?page={{ page_obj.next_page_number }}">next</a>
+		      {% endif %}
+		  </span>
+	      </div>
+	  {% endif %}
+	{% endblock %}
       </div>
     </div>
 

sidtSite/catalog/templates/catalog/author_detail.html

+{% extends "base_generic.html" %}
+
+{% block content %}
+  <h1>Author: {{ author.first_name}} {{ author.last_name}}</h1>
+
+
+
+  <div style="margin-left:20px;margin-top:20px">
+    <h4>Books</h4>
+
+    {% for book in author.book_set.all %}
+    <hr>
+
+    <p><strong>Imprint:</strong> {{book.title}}</p>
+
+    {% endfor %}
+  </div>
+{% endblock %}

sidtSite/catalog/templates/catalog/author_list.html

+{% extends "base_generic.html" %}
+
+{% block content %}
+    <h1>Author List</h1>
+
+    {% if author_list %}
+    <ul>
+
+      {% for author in author_list %}
+      <li>
+        <a href="{{ author.get_absolute_url }}">{{ author.first_name}} {{author.last_name}}</a> ({{author.date_of_birth}}-{{author.date_of_death}})
+      </li>
+      {% endfor %}
+
+    </ul>
+    {% else %}
+      <p>There are no books in the library.</p>
+    {% endif %}       
+{% endblock %}

sidtSite/catalog/templates/catalog/book_detail.html

+{% extends "base_generic.html" %}
+
+{% block content %}
+  <h1>Title: {{ book.title }}</h1>
+
+  <p><strong>Author:</strong> <a href="">{{ book.author }}</a></p> <!-- author detail link not yet defined -->
+  <p><strong>Summary:</strong> {{ book.summary }}</p>
+  <p><strong>ISBN:</strong> {{ book.isbn }}</p> 
+  <p><strong>Language:</strong> {{ book.language }}</p>  
+  <p><strong>Genre:</strong> {% for genre in book.genre.all %} {{ genre }}{% if not forloop.last %}, {% endif %}{% endfor %}</p>  
+
+  <div style="margin-left:20px;margin-top:20px">
+    <h4>Copies</h4>
+
+    {% for copy in book.bookinstance_set.all %}
+    <hr>
+    <p class="{% if copy.status == 'a' %}text-success{% elif copy.status == 'd' %}text-danger{% else %}text-warning{% endif %}">{{ copy.get_status_display }}</p>
+    {% if copy.status != 'a' %}<p><strong>Due to be returned:</strong> {{copy.due_back}}</p>{% endif %}
+    <p><strong>Imprint:</strong> {{copy.imprint}}</p>
+    <p class="text-muted"><strong>Id:</strong> {{copy.id}}</p>
+    {% endfor %}
+  </div>
+{% endblock %}

sidtSite/catalog/templates/catalog/book_list.html

+{% extends "base_generic.html" %}
+
+{% block content %}
+    <h1>Book List</h1>
+
+    {% if book_list %}
+    <ul>
+
+      {% for book in book_list %}
+      <li>
+        <a href="{{ book.get_absolute_url }}">{{ book.title }}</a> ({{book.author}})
+      </li>
+      {% endfor %}
+
+    </ul>
+    {% else %}
+      <p>There are no books in the library.</p>
+    {% endif %}       
+{% endblock %}

sidtSite/catalog/urls.py

@@ -6,4 +6,7 @@ from . import views
 urlpatterns = [
 	url(r'^$', views.index, name='index'),
 	url(r'^books/$', views.BookListView.as_view(), name='books'),
+	url(r'^authors/$', views.AuthorListView.as_view(), name='authors'),
+	url(r'^book/(?P<pk>\d+)$', views.BookDetailView.as_view(), name='book-detail'),
+	url(r'^authors/(?P<pk>\d+)$', views.AuthorDetailView.as_view(), name='author-detail'),
 ]

sidtSite/catalog/views.py

@@ -26,3 +26,16 @@ def index(request):
 
 class BookListView(generic.ListView):
     model = Book
+    paginate_by = 10
+
+
+class BookDetailView(generic.DetailView):
+    model = Book
+
+
+class AuthorListView(generic.ListView):
+    model = Author
+    paginate_by = 10
+
+class AuthorDetailView(generic.DetailView):
+    model = Author