From 59b9260b28d330f89cb493a7c0ebfbf177be9e8c Mon Sep 17 00:00:00 2001 From: Yaroslsav-95 Date: Mon, 8 Oct 2018 12:21:24 +0300 Subject: minor fixes --- weblog/locale/es/LC_MESSAGES/django.mo | Bin 3794 -> 3855 bytes weblog/locale/es/LC_MESSAGES/django.po | 2 -- weblog/locale/ru/LC_MESSAGES/django.mo | Bin 4772 -> 4827 bytes weblog/locale/ru/LC_MESSAGES/django.po | 2 -- weblog/static/weblog/js/weblog.js | 2 +- weblog/templates/weblog/post.html | 26 ++++++++++++-------------- 6 files changed, 13 insertions(+), 19 deletions(-) mode change 100755 => 100644 weblog/locale/es/LC_MESSAGES/django.mo mode change 100755 => 100644 weblog/locale/ru/LC_MESSAGES/django.mo diff --git a/weblog/locale/es/LC_MESSAGES/django.mo b/weblog/locale/es/LC_MESSAGES/django.mo old mode 100755 new mode 100644 index 1fba8ea..fcff025 Binary files a/weblog/locale/es/LC_MESSAGES/django.mo and b/weblog/locale/es/LC_MESSAGES/django.mo differ diff --git a/weblog/locale/es/LC_MESSAGES/django.po b/weblog/locale/es/LC_MESSAGES/django.po index 58aa82d..e38a930 100755 --- a/weblog/locale/es/LC_MESSAGES/django.po +++ b/weblog/locale/es/LC_MESSAGES/django.po @@ -209,8 +209,6 @@ msgid "Read more..." msgstr "Leer más..." #: templates/weblog/index.html:69 -#, fuzzy -#| msgid "Read more..." msgctxt "Load more pages" msgid "Load more..." msgstr "Mostrar más..." diff --git a/weblog/locale/ru/LC_MESSAGES/django.mo b/weblog/locale/ru/LC_MESSAGES/django.mo old mode 100755 new mode 100644 index 82203fb..956ebf8 Binary files a/weblog/locale/ru/LC_MESSAGES/django.mo and b/weblog/locale/ru/LC_MESSAGES/django.mo differ diff --git a/weblog/locale/ru/LC_MESSAGES/django.po b/weblog/locale/ru/LC_MESSAGES/django.po index fa92785..3c417c2 100755 --- a/weblog/locale/ru/LC_MESSAGES/django.po +++ b/weblog/locale/ru/LC_MESSAGES/django.po @@ -209,8 +209,6 @@ msgid "Read more..." msgstr "Читать далее..." #: templates/weblog/index.html:69 -#, fuzzy -#| msgid "Read more..." msgctxt "Load more pages" msgid "Load more..." msgstr "Ещё..." diff --git a/weblog/static/weblog/js/weblog.js b/weblog/static/weblog/js/weblog.js index 654fb4a..3e9ceba 100755 --- a/weblog/static/weblog/js/weblog.js +++ b/weblog/static/weblog/js/weblog.js @@ -20,8 +20,8 @@ function floatSidebar(){ document.querySelector(".breadcrumb").offsetHeight; if((document.body.scrollTop > offset || document.documentElement.scrollTop > offset)){ sidebar.classList.add("float"); - sidebar.style.left = blog_content.offsetLeft + blog_content.offsetWidth + "px"; sidebar_filler.classList.remove("hidden"); + sidebar.style.left = blog_content.offsetLeft + blog_content.offsetWidth + "px"; } else{ sidebar.classList.remove("float"); diff --git a/weblog/templates/weblog/post.html b/weblog/templates/weblog/post.html index 7a7a09a..ec999c7 100755 --- a/weblog/templates/weblog/post.html +++ b/weblog/templates/weblog/post.html @@ -60,24 +60,22 @@ {% endif %} {% endif %} -
- {% for comment in comments %} -
-
-

{% if comment.author %}{{ comment.author.get_username }}{% else %}{% trans 'Anonymous' context 'Unauthenticated comment poster' %}{% endif %}

-

{{ comment.content }}

-

{{ comment.publish_date }}

-
+ {% for comment in comments %} +
+
+

{% if comment.author %}{{ comment.author.get_username }}{% else %}{% trans 'Anonymous' context 'Unauthenticated comment poster' %}{% endif %}

+

{{ comment.content }}

+

{{ comment.publish_date }}

- {% endfor %} - {% else %} -
-
-

{% trans 'Nobody has left a comment on this post yet' %}

- {% endif %} + {% endfor %} + {% else %} +
+
+

{% trans 'Nobody has left a comment on this post yet' %}

{% endif %} + {% endif %}