diff --git a/flangr/circles/urls.py b/flangr/circles/urls.py index 54d0d59..d911ce4 100644 --- a/flangr/circles/urls.py +++ b/flangr/circles/urls.py @@ -6,5 +6,5 @@ app_name = "circles" urlpatterns = [ path("", views.CircleListView.as_view(), name="circle_list"), path("circle/", views.CircleUpdateView.as_view(), name="circle_update"), - path("add", views.CircleCreateView.as_view(), name="circle_create"), + path("circle/new", views.CircleCreateView.as_view(), name="circle_create"), ] diff --git a/flangr/posts/urls.py b/flangr/posts/urls.py index 74a376a..fe472ee 100644 --- a/flangr/posts/urls.py +++ b/flangr/posts/urls.py @@ -5,6 +5,11 @@ from . import views app_name = "posts" urlpatterns = [ path("post/", views.PostDetailView.as_view(), name="post_detail"), + path( + "post//fullscreen", + views.PostDetailView.as_view(template_name_suffix="_fullscreen"), + name="post_fullscreen", + ), path("post/new", views.PostCreateView.as_view(), name="post_create"), path("posts", views.PostListView.as_view(), name="post_list"), ] diff --git a/flangr/templates/circles/circle_form.html b/flangr/templates/circles/circle_form.html index 1ccb008..622f6ac 100644 --- a/flangr/templates/circles/circle_form.html +++ b/flangr/templates/circles/circle_form.html @@ -1,9 +1,17 @@ {% extends "base.html" %} +{% load django_bootstrap5 %} + {% block content %} -

Circle {{ object.name }}

-
- {% csrf_token %} - {{ form }} - -
+
+
+
+

Create a new circle

+
+ {% csrf_token %} + {% bootstrap_form form %} + {% bootstrap_button button_type="submit" content="OK" %} +
+
+
+
{% endblock content %} diff --git a/flangr/templates/circles/circle_list.html b/flangr/templates/circles/circle_list.html index e608e86..899e1ca 100644 --- a/flangr/templates/circles/circle_list.html +++ b/flangr/templates/circles/circle_list.html @@ -1,9 +1,22 @@ {% extends "base.html" %} {% block content %} -

Your Circles

- +
+
+
+

Your Circles

+ + + + + + {% for circle in object_list %} + + + + + {% endfor %} +
NameMembers
{{ circle.name }}{{ circle.members.all }}
+
+
+
{% endblock content %} diff --git a/flangr/templates/posts/post_detail.html b/flangr/templates/posts/post_detail.html index 57d573c..726e5c2 100644 --- a/flangr/templates/posts/post_detail.html +++ b/flangr/templates/posts/post_detail.html @@ -1,20 +1,30 @@ {% extends "base.html" %} +{% load django_bootstrap5 %} + {% block content %} - {% if object.title %} -

{{ object.title }}

- {% else %} -

{{ object.user.username }}

- {% endif %} - -

Comments

-
    - {% for comment in object.comments.all %} -
  • {{ comment.user }} - {{ comment.comment }}
    • - {% endfor %} -
-
- {% csrf_token %} - {{ form }} - -
+
+
+
+ {% if object.title %} +

{{ object.title }}

+ {% else %} +

{{ object.user.username }}

+ {% endif %} + +
+
+

Comments

+
    + {% for comment in object.comments.all %} +
  • {{ comment.user }} - {{ comment.comment }}
    • + {% endfor %} +
+
+ {% csrf_token %} + {% bootstrap_form form %} + {% bootstrap_button button_type="submit" content="OK" %} +
+
+
+
{% endblock content %} diff --git a/flangr/templates/posts/post_form.html b/flangr/templates/posts/post_form.html index 66bfaba..09ae82c 100644 --- a/flangr/templates/posts/post_form.html +++ b/flangr/templates/posts/post_form.html @@ -1,10 +1,19 @@ {% extends "base.html" %} +{% load django_bootstrap5 %} {% block content %} -

Upload a new picture

-
- {% csrf_token %} - {{ form }} - -
+
+
+
+

Upload a new picture

+
+ {% csrf_token %} + {% bootstrap_form form %} + {% bootstrap_button button_type="submit" content="OK" %} + +
+
+
+
+ {% endblock content %} diff --git a/flangr/templates/posts/post_fullscreen.html b/flangr/templates/posts/post_fullscreen.html new file mode 100644 index 0000000..9200f39 --- /dev/null +++ b/flangr/templates/posts/post_fullscreen.html @@ -0,0 +1,16 @@ +{% extends "base.html" %} +{% load django_bootstrap5 %} + +{% block nav %}{% endblock nav %} + +{% block content %} +
+
+

{{ object.title }}

+ X +
+
+ +
+
+{% endblock content %} diff --git a/flangr/templates/posts/post_list.html b/flangr/templates/posts/post_list.html index a4e002b..5bc3c66 100644 --- a/flangr/templates/posts/post_list.html +++ b/flangr/templates/posts/post_list.html @@ -1,9 +1,15 @@ {% extends "base.html" %} {% block content %} -

Posts Shared with you

- +
+
+
+

Posts Shared with you

+ +
+
+
{% endblock content %} diff --git a/flangr/templates/registration/login.html b/flangr/templates/registration/login.html index 21dad4a..fda684b 100644 --- a/flangr/templates/registration/login.html +++ b/flangr/templates/registration/login.html @@ -1,10 +1,19 @@ {% extends "base.html" %} +{% load django_bootstrap5 %} {% block content %} -

Login

-
- {% csrf_token %} - {{ form }} - -
+
+
+
+

Login

+
+ {% csrf_token %} + {% bootstrap_form form %} + {% bootstrap_button button_type="submit" content="OK" %} +
+
+
+
+ + {% endblock content %} diff --git a/flangr/urls.py b/flangr/urls.py index e836cd4..3485708 100644 --- a/flangr/urls.py +++ b/flangr/urls.py @@ -16,6 +16,7 @@ Including another URLconf from django.conf import settings from django.conf.urls.static import static from django.contrib import admin +from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.urls import include from django.urls import path @@ -31,3 +32,4 @@ urlpatterns = [ if settings.DEBUG: urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + urlpatterns += staticfiles_urlpatterns()