From 07fedb7ee9e46343fee34ffe50222e19cc0159aa Mon Sep 17 00:00:00 2001 From: beeankha Date: Tue, 24 Mar 2020 23:01:39 -0400 Subject: [PATCH 01/65] Initial commit for styling with bootstrap --- Baby'sFirstDjango/learning_log/settings.py | 5 +- .../templates/learning_logs/base.html | 74 +++++++++++++++---- .../templates/learning_logs/index.html | 2 +- .../templates/learning_logs/topic.html | 4 +- .../templates/learning_logs/topics.html | 2 +- Baby'sFirstDjango/learning_logs/views.py | 4 +- 6 files changed, 71 insertions(+), 20 deletions(-) diff --git a/Baby'sFirstDjango/learning_log/settings.py b/Baby'sFirstDjango/learning_log/settings.py index a4f419a..5d52f60 100644 --- a/Baby'sFirstDjango/learning_log/settings.py +++ b/Baby'sFirstDjango/learning_log/settings.py @@ -36,7 +36,10 @@ # It’s important to place your own apps before the default apps in case you need # to override any behavior of the default apps with your own custom behavior. 'users', - + + # Third party apps. + 'bootstrap4', + # Default Django apps: 'django.contrib.admin', 'django.contrib.auth', diff --git a/Baby'sFirstDjango/learning_logs/templates/learning_logs/base.html b/Baby'sFirstDjango/learning_logs/templates/learning_logs/base.html index 5e3e2f8..50cc25a 100644 --- a/Baby'sFirstDjango/learning_logs/templates/learning_logs/base.html +++ b/Baby'sFirstDjango/learning_logs/templates/learning_logs/base.html @@ -1,13 +1,61 @@ -

- Learning Log - - Topics - - {% if user.is_authenticated %} - Hello, {{ user.username }}. - Log out - {% else %} - Register - - Log in - {% endif %} -

- -{% block content %}{% endblock content %} +{% load boostrap4 %} + + + + + + + Learning Log + + {% bootstrap_css %} + {% boostrap_javascript jquery='full' %} + + + + + + +
+
+ {% block page_header %}{% endblock content %} +
+
+ + + + diff --git a/Baby'sFirstDjango/learning_logs/templates/learning_logs/index.html b/Baby'sFirstDjango/learning_logs/templates/learning_logs/index.html index b54d520..427acef 100644 --- a/Baby'sFirstDjango/learning_logs/templates/learning_logs/index.html +++ b/Baby'sFirstDjango/learning_logs/templates/learning_logs/index.html @@ -1,6 +1,6 @@ {% extends "learning_logs/base.html" %} {% block content %} -

Learning Log helps you keep track of your learning, for any topic you're +

Learning Log helps you keep track of your learning, for any topic you're learning about.

{% endblock content %} diff --git a/Baby'sFirstDjango/learning_logs/templates/learning_logs/topic.html b/Baby'sFirstDjango/learning_logs/templates/learning_logs/topic.html index a6063b6..67ea1e7 100644 --- a/Baby'sFirstDjango/learning_logs/templates/learning_logs/topic.html +++ b/Baby'sFirstDjango/learning_logs/templates/learning_logs/topic.html @@ -2,9 +2,9 @@ {% block content %} -

Topic: {{ topic }}

+

Topic: {{ topic }}

-

Entries:

+

Entries:

Add new entry diff --git a/Baby'sFirstDjango/learning_logs/templates/learning_logs/topics.html b/Baby'sFirstDjango/learning_logs/templates/learning_logs/topics.html index 070b85e..a35940b 100644 --- a/Baby'sFirstDjango/learning_logs/templates/learning_logs/topics.html +++ b/Baby'sFirstDjango/learning_logs/templates/learning_logs/topics.html @@ -2,7 +2,7 @@ {% block content %} -

Topics

+

Topics