diff --git a/blog/static/css/new.css b/blog/static/css/new.css index cfbce16..a28b0ec 100644 --- a/blog/static/css/new.css +++ b/blog/static/css/new.css @@ -23,6 +23,14 @@ a { letter-spacing: 1px; margin-right: 10px; } + .delete { + right: 80px; + } + .edit { + position: absolute; + right: 10px; + bottom: 10px; + } input#button-search { background: url('https://touchit.com.ua/static/images/icons/search-25.png') no-repeat center center; border: none; diff --git a/blog/templates/blog/base.html b/blog/templates/blog/base.html index 73fa3e9..a7a9e3e 100644 --- a/blog/templates/blog/base.html +++ b/blog/templates/blog/base.html @@ -5,10 +5,9 @@ BLOG - + + - -
- {% block content %} - {% endblock %} -
-Hop hey
-
-
-

Меню

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

Меню

+ +
+
+

Последние

+ +
+
-
-

Последние

- -
-
-
- - - + diff --git a/blog/templates/blog/post_detail.html b/blog/templates/blog/post_detail.html index 356a146..4900290 100644 --- a/blog/templates/blog/post_detail.html +++ b/blog/templates/blog/post_detail.html @@ -4,22 +4,21 @@

{{ post.title }}

Теги: - {% if tags %} - {% for tag in tags %} - {{ tag }} - {% endfor %} - {% endif %} + {% if tags %} + {% for tag in tags %} + {{ tag }} + {% endfor %} + {% endif %}

-

{{ post.text|safe|linebreaksbr }}

- {% if post.published_date %} - {{ post.published_date }} - {% endif %} + {% if post.published_date %} + {{ post.published_date }} + {% endif %} -edit post -delete +edit post +delete

diff --git a/blog/templates/blog/post_edit.html b/blog/templates/blog/post_edit.html index b1f8264..ad15faa 100644 --- a/blog/templates/blog/post_edit.html +++ b/blog/templates/blog/post_edit.html @@ -1,11 +1,11 @@ - {% extends 'blog/base.html' %} +{% extends 'blog/base.html' %} - {% block content %} +{% block content %}
-
{% csrf_token %} - {{ form.as_p }} - -
-
+
{% csrf_token %} + {{ form.as_p }} + +
+
{% endblock %} diff --git a/blog/templates/blog/post_list.html b/blog/templates/blog/post_list.html index 241fb98..32628f1 100644 --- a/blog/templates/blog/post_list.html +++ b/blog/templates/blog/post_list.html @@ -1,25 +1,24 @@ {% extends 'blog/base.html' %} {% load pagination_tags %} -{% block content %} +{% block content %}
- {% for post in posts %} + {% for post in posts %}

{{ post.title }}

{{ post.published_date}}
- {% if post.tags.names %} -
- - {% for tag in post.tags.names %} - {{ tag }} + {% if post.tags.names %} +
+ + {% for tag in post.tags.names %} + {{ tag }} {% endfor %} -
-{% endif %} -
- {{ post.text|safe|linebreaksbr|truncatewords:80 }}
-
- -{% endfor %} -
+
+ {% endif %} +
+ {{ post.text|safe|linebreaksbr|truncatewords:80 }}
+
+ {% endfor %} + {% endblock content %} diff --git a/blog/templates/blog/tag_listing.html b/blog/templates/blog/tag_listing.html index 9d9cc41..cc0cbfd 100644 --- a/blog/templates/blog/tag_listing.html +++ b/blog/templates/blog/tag_listing.html @@ -1,24 +1,19 @@ {% extends 'blog/base.html' %} {% load pagination_tags %} + {% block content %} - {% for post in tagged_posts %} -
-

{{ post.title }}

- - {{ post.text|safe|linebreaksbr|truncatewords:80 }} - -
-

Tags: - {% for tag in post.tags.names %} - {{ tag }} - {% endfor %} -

- -

- {{ post.published_date}} -

-
+
+

{{ post.title }}

+ {{ post.text|safe|linebreaksbr|truncatewords:80 }}
+

Tags: + {% for tag in post.tags.names %} + {{ tag }} + {% endfor %} +

+

+ {{ post.published_date}} +

+
{% endfor %} - {% endblock content %}