From 285039078776e1a334a258edc75b0124775c62c1 Mon Sep 17 00:00:00 2001 From: Alex Mayer Date: Mon, 9 Mar 2020 20:33:25 -0400 Subject: Fix Indentation Add missing which indentation exposed. --- blog/templates/blog/blog_index_page.html | 80 ++++++++++++++-------------- blog/templates/blog/blog_post.html | 24 +++------ blog/templates/blog/blog_tag_index_page.html | 25 ++++----- home/templates/home/home_page.html | 7 --- home/templates/home/tags/top_menu.html | 34 ++++++------ jthanio/templates/base.html | 77 +++++++++++++------------- jthanio/templates/navigation.html | 4 +- jthanio/templates/search.html | 28 +++++----- search/templates/search/search.html | 50 ++++++++--------- 9 files changed, 151 insertions(+), 178 deletions(-) diff --git a/blog/templates/blog/blog_index_page.html b/blog/templates/blog/blog_index_page.html index d58d1a9..7fb04ff 100644 --- a/blog/templates/blog/blog_index_page.html +++ b/blog/templates/blog/blog_index_page.html @@ -7,65 +7,63 @@ {% block content %}
-
-
-

{{ page.title }} {{ page.intro }}

+
{% for post in blogpages %} - {% with post=post.specific %} - - -
- {% if post.main_image %} - {% image post.main_image fill-750x300-c100 class="card-img-top" %} - {% endif %} -
-

{{ post.title }}

-

{{ post.intro }}

- Read Post -
-
- Posted on {{ post.date }} -
-
- {% endwith %} + {% with post=post.specific %} + +
+ {% if post.main_image %} + {% image post.main_image fill-750x300-c100 class="card-img-top" %} + {% endif %} +
+

{{ post.title }}

+

{{ post.intro }}

+ Read Post +
+
+ Posted on {{ post.date }} +
+
+ {% endwith %} {% endfor %} {% if blogpages.paginator.num_pages > 1 %} -
    - {% if blogpages.has_previous %} -
  • - ← Newer -
    • - {% else %} -
  • - ← Newer -
    • - {% endif %} - {% if blogpages.has_next %} -
  • - Older → -
    • - {% else %} -
  • - Older → -
    • - {% endif %} +
      + {% if blogpages.has_previous %} +
    • + ← Newer +
      • + {% else %} +
    • + ← Newer +
      • + {% endif %} + {% if blogpages.has_next %} +
    • + Older → +
      • + {% else %} +
    • + Older → +
      • + {% endif %} +
    {% endif %}
- {% include "search.html" %} + {% include "search.html" %}
-
+
{% endblock %} diff --git a/blog/templates/blog/blog_post.html b/blog/templates/blog/blog_post.html index 6bd48f8..541c69f 100644 --- a/blog/templates/blog/blog_post.html +++ b/blog/templates/blog/blog_post.html @@ -7,34 +7,28 @@ {% block body_class %}template-blogpage{% endblock %} {% block content %} -
-
-
-

{{ page.title }}

{% with categories=page.categories.all %} -

Posted on {{ page.date }}{% if categories %} in {{ categories|join:", " }}{% endif %}

+

Posted on {{ page.date }}{% if categories %} in {{ categories|join:", " }}{% endif %}

{% endwith %}
{% if page.main_image %} - {% image page.main_image fill-900x300-c100 class="img-fluid rounded" %} -
+ {% image page.main_image fill-900x300-c100 class="img-fluid rounded" %} +
{% endif %}

{{ page.intro }}

{% include_block page.body %} - -
@@ -48,20 +42,18 @@
    {% if page.tags.all.count %} - {% for tag in page.tags.all %} - {{ tag }} - {% endfor %} + {% for tag in page.tags.all %} + {{ tag }} + {% endfor %} {% else %} - No tags for this post + No tags for this post {% endif %} +
- - -

Return to previous page

diff --git a/blog/templates/blog/blog_tag_index_page.html b/blog/templates/blog/blog_tag_index_page.html index fda427b..789627c 100644 --- a/blog/templates/blog/blog_tag_index_page.html +++ b/blog/templates/blog/blog_tag_index_page.html @@ -3,17 +3,14 @@ {% block content %}
-
-
+ {% if request.GET.tag|length %} +

Showing pages tagged "{{ request.GET.tag }}"

- {% if request.GET.tag|length %} -

Showing pages tagged "{{ request.GET.tag }}"

- - {% for post in blogpages %} - {% with post=post.specific %} + {% for post in blogpages %} + {% with post=post.specific %}
@@ -25,19 +22,17 @@ Posted on {{ post.date }}
- {% endwith %} - {% endfor %} - {% else %} -

No pages with tag {{request.GET.tag }} available

- {% endif %} -

Return to previous page

+ {% endwith %} + {% endfor %} + {% else %} +

No pages with tag {{request.GET.tag }} available

+ {% endif %} +

Return to previous page

{% include "search.html" %}
-
- {% endblock %} diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index d7cc373..9374dfb 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -6,28 +6,21 @@ {% block content %}
-
-
-

{{ page.title }}

{% include_block page.body %} -
{% include "search.html" %}
-
- {% endblock %} - diff --git a/home/templates/home/tags/top_menu.html b/home/templates/home/tags/top_menu.html index 3b6697c..aac45df 100644 --- a/home/templates/home/tags/top_menu.html +++ b/home/templates/home/tags/top_menu.html @@ -2,23 +2,23 @@ {% get_site_root as site_root %} + + diff --git a/jthanio/templates/base.html b/jthanio/templates/base.html index 242ded6..f4a49db 100644 --- a/jthanio/templates/base.html +++ b/jthanio/templates/base.html @@ -1,49 +1,48 @@ {% load static wagtailuserbar %} - - - - {% block title %} - {% if self.seo_title %}{{ self.seo_title }}{% else %}{{ self.title }}{% endif %} - {% endblock %} - {% block title_suffix %} - {% with self.get_site.site_name as site_name %} - {% if site_name %}- {{ site_name }}{% endif %} - {% endwith %} - {% endblock %} - - - + + + + {% block title %} + {% if self.seo_title %}{{ self.seo_title }}{% else %}{{ self.title }}{% endif %} + {% endblock %} + {% block title_suffix %} + {% with self.get_site.site_name as site_name %} + {% if site_name %}- {{ site_name }}{% endif %} + {% endwith %} + {% endblock %} + + + - {# Global stylesheets #} - - + {# Global stylesheets #} + + - - {% block extra_css %} - {# Override this in templates to add extra stylesheets #} - {% endblock %} - - + {% block extra_css %} + {# Override this in templates to add extra stylesheets #} + {% endblock %} + +
- {% include "navigation.html" %} + {% include "navigation.html" %} - {% wagtailuserbar %} - {% block content %}{% endblock %} + {% wagtailuserbar %} + {% block content %}{% endblock %} - {% block extra_js %} - {# Override this in templates to add extra javascript #} - {% endblock %} -
- + {% block extra_js %} + {# Override this in templates to add extra javascript #} + {% endblock %} + + - {# Global javascript #} - - - + {# Global javascript #} + + + diff --git a/jthanio/templates/navigation.html b/jthanio/templates/navigation.html index 0b6026d..5424821 100644 --- a/jthanio/templates/navigation.html +++ b/jthanio/templates/navigation.html @@ -1,5 +1,5 @@ {% load navigation_tags %} {% block menu %} - {% get_site_root as site_root %} - {% top_menu parent=site_root calling_page=self %} + {% get_site_root as site_root %} + {% top_menu parent=site_root calling_page=self %} {% endblock %} diff --git a/jthanio/templates/search.html b/jthanio/templates/search.html index aea81d4..a906c5e 100644 --- a/jthanio/templates/search.html +++ b/jthanio/templates/search.html @@ -1,14 +1,14 @@ - -
-
Search
-
-
-
- - - - -
-
-
-
+ +
+
Search
+
+
+
+ + + + +
+
+
+
diff --git a/search/templates/search/search.html b/search/templates/search/search.html index e91c0d8..d18e8fd 100644 --- a/search/templates/search/search.html +++ b/search/templates/search/search.html @@ -7,39 +7,36 @@ {% block content %}
- -
- - -
- +
+ +
{% if search_results %}

Showing search results for "{{ search_query }}"

{% for result in search_results %} - {% with post=result.specific %} - -
-
-

{{ post.title }}

-

{{ post.intro }}

- Read Post -
-
- Posted on {{ post.date }} -
+ {% with post=result.specific %} + +
+
+

{{ post.title }}

+

{{ post.intro }}

+ Read Post
- {% endwith %} - {% endfor %} +
+ Posted on {{ post.date }} +
+
+ {% endwith %} + {% endfor %} {% elif search_query %} -

No results found

+

No results found

{% endif %}

Return to previous page

-
- -
- {% include "search.html" %} -
+
+ +
+ {% include "search.html" %} +
-
-
+
{% endblock %} -- cgit v1.2.3