Updates

Author: Defman

Diff for: Ebog/models.py

@@ -4,6 +4,7 @@
 from sortedm2m.fields import SortedManyToManyField
 from sorl.thumbnail import ImageField
 from taggit.managers import TaggableManager
+from django.core.urlresolvers import reverse
 
 # Create your models here.
 
@@ -51,4 +52,7 @@ class Book(models.Model):
     author = models.ForeignKey(User)
 
     created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    def get_absolute_url(self):
+        reverse("ebook:detail", self.slug);

Diff for: Ebog/urls.py

@@ -3,8 +3,9 @@
 from .views import *
 
 urlpatterns = [
-    url(r'^list/(?:page-(?P<page>\d+)/)?$', Book.List.as_view(), name="list"),
-    url(r'^create/$', Book.Create.as_view(), name="create"),
-    url(r'^section/create$', Section.Create.as_view(), name="create_section"),
-    url(r'^section/page/create/$', Page.Create.as_view(), name="create_page"),
+    url(r'^list/(?:page-(?P<page>\d+)/)?$', BookView.List.as_view(), name="list"),
+    url(r'^create/$', BookView.Create.as_view(), name="create"),
+    url(r'^(?P<slug>[\w-]+)', BookView.Detail.as_view()),
+    url(r'^section/create$', SectionView.Create.as_view(), name="create_section"),
+    url(r'^section/page/create/$', PageView.Create.as_view(), name="create_page"),
 ]

Diff for: Ebog/views.py

@@ -7,7 +7,7 @@
 # Create your views here.
 
 
-class Book:
+class BookView:
     class List(generic.ListView):
         template_name = "book_list.html"
         model = Book
@@ -24,7 +24,10 @@ class Create(generic.CreateView):
         form_class = BookFormCreate
         success_url = reverse_lazy('ebook:list')
 
-
+        def form_valid(self, form):
+            form.instance.author = self.request.user
+            form.instance.slug = self.title
+            return super(BookView.Create, self).form_valid(form)
 
     class Edit(generic.UpdateView):
         model = Book
@@ -34,13 +37,14 @@ class Delete(generic.DeleteView):
         model = Book
 
 
-class Section:
+class SectionView:
     class Detail(generic.DetailView):
         model = Book
         template_name = "Ebog/detail.html"
 
     class Create(generic.CreateView):
         model = Book
+        template_name = "form.html"
         form_class = BookFormCreate
 
     class Edit(generic.UpdateView):
@@ -51,7 +55,7 @@ class Delete(generic.DeleteView):
         model = Book
 
 
-class Page:
+class PageView:
     class Detail(generic.DetailView):
         model = Book
         template_name = "Ebog/detail.html"

Diff for: bookprofile/templates/login.html

@@ -1,4 +1,43 @@
 {% extends "base.html" %}
 {% block content %}
+{% load crispy_forms_tags %}
 
+{% if form.non_field_errors %}
+{% for error in form.non_field_errors %}
+<p class="errornote">
+    {{ error }}
+</p>
+{% endfor %}
+{% endif %}
+
+<div class="center">
+
+{% if user.is_authenticated %}
+<p class="errornote">
+    You are authenticated as {{ user.username }}, Would you like to login to a different account?
+</p>
+{% endif %}
+
+<form action="{{ app_path }}" method="post" id="login-form">{% csrf_token %}
+    <div class="form-group">
+    {{ form.username.errors }}
+      <label for="exampleInputEmail1">Email address</label>
+    {{ form.username.label_tag }} {{ form.username }}
+  </div>
+  <div class="form-group">
+    {{ form.password.errors }}
+    {{ form.password.label_tag }} {{ form.password }}
+    <input type="hidden" name="next" value="{{ next }}" />
+  </div>
+  {% url 'admin_password_reset' as password_reset_url %}
+  {% if password_reset_url %}
+  <div class="password-reset-link">
+    <a href="{{ password_reset_url }}">Forgotten your password or username?</a>
+  </div>
+  {% endif %}
+  <div class="submit-row">
+    <label>&nbsp;</label><input type="submit" value="Log in" />
+  </div>
+</form>
+</div>
 {% endblock %}

Diff for: requirements.txt

@@ -6,4 +6,5 @@ django-easy-select2
 django-crispy-forms
 django-sortedm2m
 sorl-thumbnail
-pillow
+pillow
+django-filter