- Microblog:
-
Home
-
Explore
- {% if current_user.is_anonymous %}
-
Login
- {% else %}
-
Profile
-
Logout
- {% endif %}
+{% extends 'bootstrap/base.html' %}
+
+{% block title %}
+ {% if title %}{{ title }} - Microblog{% else %}Welcome to Microblog{% endif %}
+{% endblock %}
+
+{% block navbar %}
+
+{% endblock %}
+
+{% block content %}
+
{% with messages = get_flashed_messages() %}
{% if messages %}
-
{% for message in messages %}
- - {{ message }}
+ {{ message }}
{% endfor %}
-
{% endif %}
{% endwith %}
- {% block content %}{% endblock %}
-
-
+
+ {# application content needs to be provided in the app_content block #}
+ {% block app_content %}{% endblock %}
+
+{% endblock %}
diff --git a/app/templates/edit_profile.html b/app/templates/edit_profile.html
index e2471ac..72cacda 100644
--- a/app/templates/edit_profile.html
+++ b/app/templates/edit_profile.html
@@ -1,23 +1,11 @@
{% extends "base.html" %}
+{% import 'bootstrap/wtf.html' as wtf %}
-{% block content %}
+{% block app_content %}
Edit Profile
-
+
+
+ {{ wtf.quick_form(form) }}
+
+
{% endblock %}
diff --git a/app/templates/index.html b/app/templates/index.html
index eb3f876..baf91d8 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -1,27 +1,27 @@
{% extends "base.html" %}
+{% import 'bootstrap/wtf.html' as wtf %}
-{% block content %}
+{% block app_content %}
Hi, {{ current_user.username }}!
{% if form %}
-
+ {{ wtf.quick_form(form) }}
+
{% endif %}
{% for post in posts %}
{% include '_post.html' %}
{% endfor %}
- {% if prev_url %}
-
Newer posts
- {% endif %}
- {% if next_url %}
-
Older posts
- {% endif %}
+
{% endblock %}
diff --git a/app/templates/login.html b/app/templates/login.html
index 2a54187..5b8d1b8 100644
--- a/app/templates/login.html
+++ b/app/templates/login.html
@@ -1,26 +1,14 @@
-{% extends "base.html" %}
+{% extends 'base.html' %}
+{% import 'bootstrap/wtf.html' as wtf %}
-{% block content %}
+{% block app_content %}
Sign In
-
+
+
+ {{ wtf.quick_form(form) }}
+
+
+
New User? Click to Register!
Forgot Your Password?
diff --git a/app/templates/register.html b/app/templates/register.html
index 37b7ac5..c87955c 100644
--- a/app/templates/register.html
+++ b/app/templates/register.html
@@ -1,37 +1,11 @@
{% extends "base.html" %}
+{% import 'bootstrap/wtf.html' as wtf %}
-{% block content %}
+{% block app_content %}
Register
-
+
+
+ {{ wtf.quick_form(form) }}
+
+
{% endblock %}
diff --git a/app/templates/reset_password.html b/app/templates/reset_password.html
index 92f0c8e..19d5bbf 100644
--- a/app/templates/reset_password.html
+++ b/app/templates/reset_password.html
@@ -1,23 +1,11 @@
{% extends "base.html" %}
+{% import 'bootstrap/wtf.html' as wtf %}
-{% block content %}
+{% block app_content %}
Reset Your Password
-
+
+
+ {{ wtf.quick_form(form) }}
+
+
{% endblock %}
diff --git a/app/templates/reset_password_request.html b/app/templates/reset_password_request.html
index 18bb0ae..a5f7d22 100644
--- a/app/templates/reset_password_request.html
+++ b/app/templates/reset_password_request.html
@@ -1,16 +1,11 @@
{% extends "base.html" %}
+{% import 'bootstrap/wtf.html' as wtf %}
-{% block content %}
+{% block app_content %}
Reset Password
-
+
+
+ {{ wtf.quick_form(form) }}
+
+
{% endblock %}
diff --git a/app/templates/user.html b/app/templates/user.html
index bcb0626..753b973 100644
--- a/app/templates/user.html
+++ b/app/templates/user.html
@@ -1,9 +1,9 @@
{% extends "base.html" %}
-{% block content %}
-
-
- |
+{% block app_content %}
+
+
+ |
User: {{ user.username }}
{% if user.about_me %}{{ user.about_me }} {% endif %}
@@ -19,14 +19,21 @@
|
-
{% for post in posts %}
{% include '_post.html' %}
{% endfor %}
- {% if prev_url %}
- Newer posts
- {% endif %}
- {% if next_url %}
- Older posts
- {% endif %}
+
{% endblock %}