From 9e7d161610326e2b0a1a26ab20ce84dc736e59ef Mon Sep 17 00:00:00 2001 From: codylovell Date: Sat, 11 Nov 2017 23:37:31 -0500 Subject: [PATCH] Added bootstrap styling to pages and forms. --- learning_log/settings.py | 8 ++ .../templates/learning_logs/base.html | 79 +++++++++++++++---- .../templates/learning_logs/edit_entry.html | 16 ++-- .../templates/learning_logs/index.html | 16 +++- .../templates/learning_logs/new_entry.html | 18 +++-- .../templates/learning_logs/new_topic.html | 19 ++++- .../templates/learning_logs/topic.html | 30 ++++--- .../templates/learning_logs/topics.html | 14 +++- learning_logs/views.py | 11 ++- ll_venv/pip-selfcheck.json | 2 +- users/templates/users/login.html | 15 +++- users/templates/users/register.html | 13 ++- users/views.py | 2 +- 13 files changed, 179 insertions(+), 64 deletions(-) diff --git a/learning_log/settings.py b/learning_log/settings.py index df5a2de..bd3bb5b 100644 --- a/learning_log/settings.py +++ b/learning_log/settings.py @@ -38,6 +38,9 @@ 'django.contrib.messages', 'django.contrib.staticfiles', + #Third-party apps. + 'bootstrap3', + #myapps 'learning_logs', 'users', @@ -124,3 +127,8 @@ STATIC_URL = '/static/' LOGIN_URL = 'users/login/' + +#settings for bootstrap3 +BOOTSTRAP3 = { + 'include_jquery': True +} diff --git a/learning_logs/templates/learning_logs/base.html b/learning_logs/templates/learning_logs/base.html index 2aea23c..c7aa2cf 100644 --- a/learning_logs/templates/learning_logs/base.html +++ b/learning_logs/templates/learning_logs/base.html @@ -1,17 +1,62 @@ -

- Learning Log - - Topics -

-

- {% if user.is_authenticated %} - Hello, {{ user.username }} - log out - {% else %} - register - log in - {% endif %} -

- - - -{% block content %}{% endblock content %} \ No newline at end of file +{% load bootstrap3 %} + + + + + + + + + Learning Log + {% bootstrap_css %} + {% bootstrap_javascript %} + + + + + + + + +
+ +
+ {% block header %}{% endblock header %} +
+
+ {% block content %}{% endblock content %} +
+ +
+ + + \ No newline at end of file diff --git a/learning_logs/templates/learning_logs/edit_entry.html b/learning_logs/templates/learning_logs/edit_entry.html index d390add..cf2aefe 100644 --- a/learning_logs/templates/learning_logs/edit_entry.html +++ b/learning_logs/templates/learning_logs/edit_entry.html @@ -1,14 +1,18 @@ {% extends 'learning_logs/base.html' %} +{% load bootstrap3 %} -{% block content %} -

{{ topic }}

+{% block header %} +

Edit entry: {{ topic }}

+{% endblock header %} -

Edit entry:

+{% block content %} -
+ {% csrf_token %} - {{ form.as_p }} - + {% bootstrap_form form %} + {% buttons %} + + {% endbuttons %}
{% endblock content %} \ No newline at end of file diff --git a/learning_logs/templates/learning_logs/index.html b/learning_logs/templates/learning_logs/index.html index 00b9079..9112272 100644 --- a/learning_logs/templates/learning_logs/index.html +++ b/learning_logs/templates/learning_logs/index.html @@ -1,6 +1,18 @@ {% extends "learning_logs/base.html" %} +{% block header %} +
+

Track your learning.

+
+{% endblock header %} + {% block content %} -

Learning Log helps you keep track of your learning, - for any topic you are learning about.

+

+ Register an account to make your own + Learning Log, and list the topics you're learning about. +

+

+ Whenever you are learning something new about a topic, make an entry + summarizing what you've learned about. This helps retention. +

{% endblock content %} \ No newline at end of file diff --git a/learning_logs/templates/learning_logs/new_entry.html b/learning_logs/templates/learning_logs/new_entry.html index 0f51c81..d281381 100644 --- a/learning_logs/templates/learning_logs/new_entry.html +++ b/learning_logs/templates/learning_logs/new_entry.html @@ -1,15 +1,21 @@ {% extends 'learning_logs/base.html' %} +{% load bootstrap3 %} -{% block content %} +{% block header %} +

{{ topic }}

+{% endblock header %} -

{{ topic }}

+{% block content %} -

Add a new entry:

+

Add a new entry:

-
+ {% csrf_token %} - {{ form.as_p }} - + {% bootstrap_form form %} + + {% buttons %} + + {% endbuttons %}
{% endblock content %} \ No newline at end of file diff --git a/learning_logs/templates/learning_logs/new_topic.html b/learning_logs/templates/learning_logs/new_topic.html index 758395b..9a62c25 100644 --- a/learning_logs/templates/learning_logs/new_topic.html +++ b/learning_logs/templates/learning_logs/new_topic.html @@ -1,11 +1,22 @@ {% extends 'learning_logs/base.html' %} +{% load bootstrap3 %} + +{% block header %} +

Add a new topic:

+{% endblock header %} {% block content %} -

Add a new topic:

-
+ + {% csrf_token %} - {{ form.as_p }} - + + + {% bootstrap_form form %} + + {% buttons %} + + {% endbuttons %}
{% endblock content %} \ No newline at end of file diff --git a/learning_logs/templates/learning_logs/topic.html b/learning_logs/templates/learning_logs/topic.html index bad490d..049cfa8 100644 --- a/learning_logs/templates/learning_logs/topic.html +++ b/learning_logs/templates/learning_logs/topic.html @@ -1,26 +1,30 @@ {% extends 'learning_logs/base.html' %} +{% block header %} +

{{ topic }}

+{% endblock header %} {% block content %} - -

Topic: {{ topic }}

- -

Entries:

Add entry

{% endblock content %} \ No newline at end of file diff --git a/learning_logs/templates/learning_logs/topics.html b/learning_logs/templates/learning_logs/topics.html index 6062b04..d39e47d 100644 --- a/learning_logs/templates/learning_logs/topics.html +++ b/learning_logs/templates/learning_logs/topics.html @@ -1,17 +1,23 @@ {% extends 'learning_logs/base.html' %} -{% block content %} +{% block header %} +

Topics

+{% endblock header %} -

Topics

+{% block content %} -Add a new topic: +

Add new topic

{% endblock content %} \ No newline at end of file diff --git a/learning_logs/views.py b/learning_logs/views.py index 5d638c7..e79b7cc 100644 --- a/learning_logs/views.py +++ b/learning_logs/views.py @@ -23,7 +23,7 @@ def topics(request): def topic(request, topic_id): """Show a single topic and all of its entries""" topic = Topic.objects.get(id=topic_id) - check_topic_owner(request) + check_topic_owner(request, topic_id) entries = topic.entry_set.order_by('-date_added') context = {'topic': topic, 'entries': entries} return render(request, 'learning_logs/topic.html', context) @@ -50,6 +50,7 @@ def new_topic(request): def new_entry(request, topic_id): """Add a new entry for a particular topic.""" topic = Topic.objects.get(id=topic_id) + check_topic_owner(request, topic_id) if request.method != 'POST': # No data submitted; create a blank form @@ -58,7 +59,7 @@ def new_entry(request, topic_id): #POST data submitted; process data. form = EntryForm(data=request.POST) if form.is_valid(): - check_topic_owner(request) + check_topic_owner(request, topic_id) new_entry = form.save(commit=False) new_entry.topic = topic new_entry.save() @@ -73,7 +74,8 @@ def edit_entry(request, entry_id): """Edit an existing entry""" entry = Entry.objects.get(id=entry_id) topic = entry.topic - check_topic_owner(request) + if topic.owner != request.user: + raise Http404 if request.method != 'POST': form = EntryForm(instance=entry) @@ -87,6 +89,7 @@ def edit_entry(request, entry_id): context = {'entry': entry, 'topic': topic, 'form': form} return render(request, 'learning_logs/edit_entry.html', context) -def check_topic_owner(request): +def check_topic_owner(request, topic_id): + topic = Topic.objects.get(id=topic_id) if topic.owner != request.user: raise Http404 \ No newline at end of file diff --git a/ll_venv/pip-selfcheck.json b/ll_venv/pip-selfcheck.json index e540e85..40ff823 100644 --- a/ll_venv/pip-selfcheck.json +++ b/ll_venv/pip-selfcheck.json @@ -1 +1 @@ -{"last_check":"2017-11-04T09:42:36Z","pypi_version":"9.0.1"} \ No newline at end of file +{"last_check":"2017-11-11T10:30:54Z","pypi_version":"9.0.1"} \ No newline at end of file diff --git a/users/templates/users/login.html b/users/templates/users/login.html index c60ca02..ba12071 100644 --- a/users/templates/users/login.html +++ b/users/templates/users/login.html @@ -1,4 +1,9 @@ {% extends "learning_logs/base.html" %} +{% load bootstrap3 %} + +{% block header %} +

Log in to your account.

+{% endblock header %} {% block content %} @@ -6,10 +11,14 @@

Your username and password didnt match.Please try again

{% endif %} -
+ {% csrf_token %} - {{ form.as_p }} - + + {% bootstrap_form form %} + + {% buttons %} + + {% endbuttons %}
diff --git a/users/templates/users/register.html b/users/templates/users/register.html index 2c77545..190328a 100644 --- a/users/templates/users/register.html +++ b/users/templates/users/register.html @@ -1,12 +1,19 @@ {% extends "learning_logs/base.html" %} +{% load bootstrap3 %} + +{% block header %} +

Register for an account.

+{% endblock header %} {% block content %} -
+ {% csrf_token %} - {{ form.as_p }} + {% bootstrap_form form %} - + {% buttons %} + + {% endbuttons %}
{% endblock content %} \ No newline at end of file diff --git a/users/views.py b/users/views.py index fcee55a..68954d2 100644 --- a/users/views.py +++ b/users/views.py @@ -23,5 +23,5 @@ def register(request): login(request, authenticated_user) return HttpResponseRedirect(reverse('learning_logs:index')) - context = {'form': form} + context = {'form': form} return render(request, 'users/register.html', context) \ No newline at end of file