diff --git a/templates/articles_list_page.html b/templates/articles_list_page.html new file mode 100644 index 0000000..7af9ca8 --- /dev/null +++ b/templates/articles_list_page.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} + +{% block content %} +
+
+

{% block header %}{% endblock %}

+
+ + {% include 'include/paginated_posts.html' %} + +
+{% endblock content %} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index b916f61..75fdb82 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,6 +3,9 @@ {% block head %} {% block title %}{{ SITENAME }}{% endblock title %} + {% if FAVICON %} + + {% endif %} {% if THEME_COLOUR %} @@ -75,6 +78,10 @@ {% if SOCIAL_LINKEDIN %}
  • LinkedIn
    • {% endif %} + {% if SOCIAL_YOUTUBE %} +
  • LinkedIn
    • + {% endif %} + {% if FEED_ALL_ATOM %}
  • atom feed
    • {% endif %} diff --git a/templates/category.html b/templates/category.html index 14d7ff0..8ced1fa 100644 --- a/templates/category.html +++ b/templates/category.html @@ -1,8 +1,9 @@ -{% extends "index.html" %} +{% extends "articles_list_page.html" %} -{% block title %}{{ SITENAME }} - {{ category }} category{% endblock %} +{% block title %}{{ category }}{% endblock %} -{% block content_title %} -

    Articles in the {{ category }} category

    +{% block meta_description %} + {% endblock %} +{% block header %}All posts in category: {{ category }}{% endblock %} \ No newline at end of file diff --git a/templates/include/cornerstone.html b/templates/include/cornerstone.html index 780fa61..80e0404 100644 --- a/templates/include/cornerstone.html +++ b/templates/include/cornerstone.html @@ -1,23 +1,32 @@ +
    +

    Resources

    +
    -

    TEST 1

    +

    Electrical Safety

    - -
    Some TEXT TO GET CLICKS
    + +
    Electrical safety is a nebulous thing, but we define it as the set of systems designed to lower the risks associated with the electrical hazards of shock, arc flash and arc blast, to an acceptable level. In our day-to-day life this is handled for us
    +
    + +
    -

    TEST 1

    +

    Smart Grid

    - -
    Some TEXT TO GET CLICKS
    -
    -
    -
    -

    TEST 1

    -
    - -
    Some TEXT TO GET CLICKS
    + +
    An electricity supply network that uses digital communications technology to detect and react to local changes in usage. – Oxford English Dictionary Smart Grid is a concept describing the evolution of the power system. Among the desired future power.
    +
    + +
    +
    + + diff --git a/templates/include/paginated_posts.html b/templates/include/paginated_posts.html new file mode 100644 index 0000000..949ba87 --- /dev/null +++ b/templates/include/paginated_posts.html @@ -0,0 +1,36 @@ +
    + {% for article in articles_page.object_list %} +
    +
    +

    {{ article.title }}

    +
    + + {% if article.photo_image %} + + {% endif %} + {% if (article.category != MICROBLOG ) %} +
    {{ article.summary }}
    + {% if INCLUDECATEGORY == True %} + {% if article.category %} +
    + Posted in: {{ article.category }} +
    + {% endif %} + {% endif %} + {% if MOREBUTTON == True %} +
    + +
    + {% endif %} + + {% endif %} +
    + {% endfor %} + +
    + +
    + {% include 'pagination.html' %} +
    \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index 6a271ec..d1b8b1d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,11 +1,24 @@ {% extends "base.html" %} {% block content %} -{% if TAGLINE or TAGLINEHEAD %} +{% if BANNER == True %} {% endif %} @@ -19,55 +32,31 @@ {% endif %} {% if NEWSLETTER %} - -
    -

    Our Newsletter

    - {{ NEWSLETTER }} -
    + {% endif %}
    {% block content_title %} -

    All articles

    +
    +

    Articles

    +
    {% endblock %} -
    - {% for article in articles_page.object_list %} -
    -

    {{ article.title }}

    - {% if article.photo_image %} - - {% endif %} - {% if (article.category != MICROBLOG ) %} - - - -
    {{ article.summary }}
    - {% if INCLUDECATEGORY == True %} - {% if article.category %} -
    - Posted in: {{ article.category }} -
    - {% endif %} - {% endif %} - {% if MOREBUTTON == True %} -
    - -
    - {% endif %} - - {% endif %} -
    - {% endfor %} - -
    -{% if articles_page.has_other_pages() %} - {% include 'pagination.html' %} -{% endif %} +{% include 'include/paginated_posts.html' %} + +
    {% endblock content %} diff --git a/templates/tag.html b/templates/tag.html index 9c95803..398d71a 100644 --- a/templates/tag.html +++ b/templates/tag.html @@ -1,7 +1,9 @@ -{% extends "index.html" %} +{% extends "articles_list_page.html" %} {% block title %}{{ SITENAME }} - {{ tag }} tag{% endblock %} -{% block content_title %} -

    Articles tagged with {{ tag }}

    +{% block meta_description %} + {% endblock %} + +{% block header %}All posts tagged: {{ tag }}{% endblock %} \ No newline at end of file