diff --git a/.DS_Store b/.DS_Store index 8ef8a69..4adf542 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/bloggy/templates/base-with-header-footer.html b/bloggy/templates/base-with-header-footer.html index e434095..e341d5b 100644 --- a/bloggy/templates/base-with-header-footer.html +++ b/bloggy/templates/base-with-header-footer.html @@ -23,14 +23,14 @@
- {% include "partials/header.html" %} + {% include "partials/header2.html" %}
-
+ {% comment %}
StackTips -
+
{% endcomment %}
{% if messages %}
diff --git a/bloggy/templates/base-with-header.html b/bloggy/templates/base-with-header.html index bf4ce6d..1620062 100644 --- a/bloggy/templates/base-with-header.html +++ b/bloggy/templates/base-with-header.html @@ -18,7 +18,8 @@
- {% include "partials/header.html" %} +{# {% include "partials/header.html" %}#} + {% include "partials/header2.html" %}
{% if messages %} diff --git a/bloggy/templates/pages/archive/categories.html b/bloggy/templates/pages/archive/categories.html index b225810..8c3cb45 100644 --- a/bloggy/templates/pages/archive/categories.html +++ b/bloggy/templates/pages/archive/categories.html @@ -2,11 +2,12 @@ {% load static %} {% spaceless %} {% block content %} - + {# #} -
+ +

Browse tutorial by

-
-
- {% if categories|length <= 0 %} -

No contents found!

- {% endif %} - {% for category in categories %} -
-
-
-
-
-

{{ category.title }}

- - {{ category.article_count }} article{{ category.article_count | pluralize }} - -
- {% if category.thumbnail %} -
-
- {% endif %} -
+
+ +
+ {% for category in categories %} + +

{{ category.title }}

+

+ {{ category.article_count }} article{{ category.article_count | pluralize }} +

+ {% if category.excerpt %} - {{ category.excerpt }} +

{{ category.excerpt | slice:"0:120"}}..

{% endif %} + + {% endfor %} -
- -
-
-
-
- {% endfor %} +
-
+ + + + {#
#} + {#
#} + {# {% if categories|length <= 0 %}#} + {#

No contents found!

#} + {# {% endif %}#} + {##} + {# {% for category in categories %}#} + {#
#} + {#
#} + {#
#} + {#
#} + {#
#} + {#

{{ category.title }}

#} + {# #} + {# {{ category.article_count }} article{{ category.article_count | pluralize }}#} + {# #} + {#
#} + {# {% if category.thumbnail %}#} + {#
#} + {#
#} + {# {% endif %}#} + {#
#} + {# {% if category.excerpt %}#} + {# {{ category.excerpt }}#} + {# {% endif %}#} + {##} + {#
#} + {# #} + {#
#} + {#
#} + {#
#} + {#
#} + {# {% endfor %}#} + {#
#} + {#
#} {% endblock content %} {% endspaceless %} \ No newline at end of file diff --git a/bloggy/templates/pages/archive/posts.html b/bloggy/templates/pages/archive/posts.html index 3854362..8ccd91b 100644 --- a/bloggy/templates/pages/archive/posts.html +++ b/bloggy/templates/pages/archive/posts.html @@ -3,34 +3,32 @@ {% spaceless %} {% load custom_widgets %} {% block content %} -
- {% include "partials/category_archive_banner.html" with category=selected_category %} -
-
-
+
+
+
+
{% categories_widget count=99 content_type="post" widget_style="list" %} -
-
- {% if posts|length <= 0 %} -

No contents found!

- {% endif %} +
- {% for post in posts %} -
- {% include "partials/post_list_item.html" with post=post cssClass="card-rounded" %} -
- {% if forloop.counter == 3 %} - {% include "partials/course_row_grid.html" with courses=courses %} - {% endif %} +
+ {% if posts|length <= 0 %} +

No contents found!

+ {% endif %} - {% endfor %} - {% include "partials/paging.html" with posts=posts %} + {% for post in posts %} +
+ {% include "partials/post_list_item.html" with post=post cssClass="card-rounded" %}
-
+ {% if forloop.counter == 3 %} + {% include "partials/course_row_grid.html" with courses=courses %} + {% endif %} + + {% endfor %} + {% include "partials/paging.html" with posts=posts %}
-