diff --git a/ram/bookshelf/models.py b/ram/bookshelf/models.py index 107dcd7..1f33186 100644 --- a/ram/bookshelf/models.py +++ b/ram/bookshelf/models.py @@ -58,8 +58,8 @@ class Book(models.Model): def publisher_name(self): return self.publisher.name - # def get_absolute_url(self): - # return reverse("books", kwargs={"uuid": self.uuid}) + def get_absolute_url(self): + return reverse("book", kwargs={"uuid": self.uuid}) class BookImage(Image): diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html index cf47f37..0dca2e2 100644 --- a/ram/portal/templates/base.html +++ b/ram/portal/templates/base.html @@ -171,7 +171,7 @@
  • Real
    • - {% show_flatpage_menu %} + {% show_flatpages_menu %} {% show_bookshelf_menu %} {% include 'includes/search.html' %} diff --git a/ram/portal/templates/bookshelf/book.html b/ram/portal/templates/bookshelf/book.html new file mode 100644 index 0000000..5731e69 --- /dev/null +++ b/ram/portal/templates/bookshelf/book.html @@ -0,0 +1,125 @@ +{% extends 'base.html' %} + + {% block header %} + {% if book.tags.all %} +

    Tags: + {% for t in book.tags.all %} + {{ t.name }}{# new line is required #} + {% endfor %} +

    + {% endif %} + Updated {{ book.updated_time | date:"M d, Y H:i" }} + {% endblock %} + {% block carousel %} +
    + + {% endblock %} + {% block cards %} + {% endblock %} + {% block extra_content %} +
    +
    +
    + +
    + + +
    +
    + {% if request.user.is_staff %}Edit{% endif %} +
    +
    +
    +
    + {% endblock %} diff --git a/ram/portal/templates/books.html b/ram/portal/templates/bookshelf/books.html similarity index 93% rename from ram/portal/templates/books.html rename to ram/portal/templates/bookshelf/books.html index 63998a8..897d6a0 100644 --- a/ram/portal/templates/books.html +++ b/ram/portal/templates/bookshelf/books.html @@ -5,16 +5,16 @@
    {% if d.image.all %} - {# FIXME #} + {% for r in d.image.all %} {% if forloop.first %}Card image cap{% endif %} {% endfor %} - {# FIXME #} + {% endif %}

    {{ d }} - {# #} +

    {% if d.tags.all %}

    Tags: @@ -55,7 +55,7 @@

    - {# FIXME Show all data #} + Show all data {% if request.user.is_staff %}Edit{% endif %}
    diff --git a/ram/portal/templates/bookshelf_menu.html b/ram/portal/templates/bookshelf/bookshelf_menu.html similarity index 100% rename from ram/portal/templates/bookshelf_menu.html rename to ram/portal/templates/bookshelf/bookshelf_menu.html diff --git a/ram/portal/templates/flatpage.html b/ram/portal/templates/flatpages/flatpage.html similarity index 100% rename from ram/portal/templates/flatpage.html rename to ram/portal/templates/flatpages/flatpage.html diff --git a/ram/portal/templates/flatpage_menu.html b/ram/portal/templates/flatpages/flatpages_menu.html similarity index 86% rename from ram/portal/templates/flatpage_menu.html rename to ram/portal/templates/flatpages/flatpages_menu.html index 71267bf..f3fb850 100644 --- a/ram/portal/templates/flatpage_menu.html +++ b/ram/portal/templates/flatpages/flatpages_menu.html @@ -1,10 +1,10 @@ - {% if flatpage_menu %} + {% if flatpages_menu %}
    • - {% for m in flatpage_menu %} + {% for m in flatpages_menu %}
    • {{ m.name }}
      • {% endfor %}
    diff --git a/ram/portal/templatetags/show_menu.py b/ram/portal/templatetags/show_menu.py index 07f5270..c3748ed 100644 --- a/ram/portal/templatetags/show_menu.py +++ b/ram/portal/templatetags/show_menu.py @@ -5,12 +5,12 @@ from bookshelf.models import Book register = template.Library() -@register.inclusion_tag('bookshelf_menu.html') +@register.inclusion_tag('bookshelf/bookshelf_menu.html') def show_bookshelf_menu(): return {"bookshelf_menu": Book.objects.exists()} -@register.inclusion_tag('flatpage_menu.html') -def show_flatpage_menu(): +@register.inclusion_tag('flatpages/flatpages_menu.html') +def show_flatpages_menu(): menu = Flatpage.objects.filter(published=True).order_by("name") - return {"flatpage_menu": menu} + return {"flatpages_menu": menu} diff --git a/ram/portal/urls.py b/ram/portal/urls.py index fcc07a9..36cb875 100644 --- a/ram/portal/urls.py +++ b/ram/portal/urls.py @@ -13,6 +13,7 @@ from portal.views import ( Scales, Types, Books, + GetBook, SearchRoster, ) @@ -55,8 +56,9 @@ urlpatterns = [ path("scales/", Types.as_view(), name="scales_pagination"), path("types", Types.as_view(), name="types"), path("types/", Types.as_view(), name="types_pagination"), - path("books", Books.as_view(), name="books"), - path("books/", Books.as_view(), name="books_pagination"), + path("bookshelf/books", Books.as_view(), name="books"), + path("bookshelf/books/", Books.as_view(), name="books_pagination"), + path("bookshelf/book/", GetBook.as_view(), name="book"), path( "search", SearchRoster.as_view(http_method_names=["post"]), diff --git a/ram/portal/views.py b/ram/portal/views.py index 759a130..b5ce226 100644 --- a/ram/portal/views.py +++ b/ram/portal/views.py @@ -344,10 +344,33 @@ class Types(GetData): class Books(GetData): def __init__(self): self.title = "Books" - self.template = "books.html" + self.template = "bookshelf/books.html" self.data = Book.objects.all() +class GetBook(View): + def get(self, request, uuid): + try: + book = Book.objects.get(uuid=uuid) + except ObjectDoesNotExist: + raise Http404 + + book_properties = ( + book.property.all() + if request.user.is_authenticated + else book.property.filter(property__private=False) + ) + return render( + request, + "bookshelf/book.html", + { + "title": book, + "book_properties": book_properties, + "book": book, + }, + ) + + class GetFlatpage(View): def get(self, request, flatpage): try: @@ -359,6 +382,6 @@ class GetFlatpage(View): return render( request, - "flatpage.html", + "flatpages/flatpage.html", {"title": flatpage.name, "flatpage": flatpage}, )