diff --git a/themes/modern2/assets/images/polygon.svg b/themes/modern2/assets/images/polygon.svg index 14a0389a4..c624c1d25 100644 --- a/themes/modern2/assets/images/polygon.svg +++ b/themes/modern2/assets/images/polygon.svg @@ -1,3 +1,3 @@ - + diff --git a/themes/modern2/assets/images/svg/cancel.svg b/themes/modern2/assets/images/svg/cancel.svg index 7ed9756e6..f935e3555 100644 --- a/themes/modern2/assets/images/svg/cancel.svg +++ b/themes/modern2/assets/images/svg/cancel.svg @@ -1,6 +1,6 @@ - diff --git a/themes/modern2/layouts/master.htm b/themes/modern2/layouts/master.htm index d9c123c40..8aaa2072c 100644 --- a/themes/modern2/layouts/master.htm +++ b/themes/modern2/layouts/master.htm @@ -16,8 +16,8 @@ random = 0 - {% component 'SeoCmsPage' %} {% partial 'head' %} + {% component 'SeoCmsPage' %}
@@ -56,4 +56,4 @@ random = 0 - \ No newline at end of file + diff --git a/themes/modern2/pages/category.htm b/themes/modern2/pages/category.htm index 34552ac92..2bf9c6f66 100644 --- a/themes/modern2/pages/category.htm +++ b/themes/modern2/pages/category.htm @@ -21,7 +21,7 @@ postPage = "post" blogPosts && $this->blogPosts->category){ - + $this->page->title = $this->blogPosts->category->name; $this->page->meta_description = strip_tags($this->blogPosts->category->content)?:$this->blogPosts->category->name; $this->page->meta_keywords = $this->blogPosts->category->name; @@ -31,9 +31,9 @@ function onEnd(){ ==
-
+

{{category.name}} -

+ {% for item in blogPosts.posts %} {% partial 'post_list_item' post = item %} {% else %} @@ -48,4 +48,4 @@ function onEnd(){
{% put scripts %} -{% endput %} \ No newline at end of file +{% endput %} diff --git a/themes/modern2/pages/oldpost.htm b/themes/modern2/pages/oldpost.htm index 5fe3e5dc6..bc9ff00b2 100644 --- a/themes/modern2/pages/oldpost.htm +++ b/themes/modern2/pages/oldpost.htm @@ -26,7 +26,7 @@ localeUrl[en] = "/oldpost" @@ -93,4 +93,4 @@ localeUrl[en] = "/oldpost" } }); -{% endput %} \ No newline at end of file +{% endput %} diff --git a/themes/modern2/pages/post.htm b/themes/modern2/pages/post.htm index f11d7d14b..6bb03c273 100644 --- a/themes/modern2/pages/post.htm +++ b/themes/modern2/pages/post.htm @@ -59,7 +59,7 @@ post = "post" @@ -134,4 +134,4 @@ post = "post" } }); -{% endput %} \ No newline at end of file +{% endput %} diff --git a/themes/modern2/partials/head.htm b/themes/modern2/partials/head.htm index da8a54154..f7d53ceaa 100644 --- a/themes/modern2/partials/head.htm +++ b/themes/modern2/partials/head.htm @@ -1,5 +1,6 @@ [viewBag] == + - diff --git a/themes/modern2/partials/header.htm b/themes/modern2/partials/header.htm index 51e0cd455..ae914fbfb 100644 --- a/themes/modern2/partials/header.htm +++ b/themes/modern2/partials/header.htm @@ -39,12 +39,12 @@ code = "top-menu"
- +
-
{{posts.first.title}} diff --git a/themes/modern2/partials/index/category_posts2.htm b/themes/modern2/partials/index/category_posts2.htm index 2df2c3860..62ae3a0f5 100644 --- a/themes/modern2/partials/index/category_posts2.htm +++ b/themes/modern2/partials/index/category_posts2.htm @@ -21,13 +21,13 @@
-
{{posts.first.title}} diff --git a/themes/modern2/partials/index/mobile_app.htm b/themes/modern2/partials/index/mobile_app.htm index 4d7d6a24f..d563f9b9f 100644 --- a/themes/modern2/partials/index/mobile_app.htm +++ b/themes/modern2/partials/index/mobile_app.htm @@ -5,7 +5,7 @@ logo
- diff --git a/themes/modern2/partials/index/partner_news.htm b/themes/modern2/partials/index/partner_news.htm index 58f6f60f5..dab53e3f2 100644 --- a/themes/modern2/partials/index/partner_news.htm +++ b/themes/modern2/partials/index/partner_news.htm @@ -17,7 +17,7 @@ maxItems = 6
{{news.published_at|date('d.m.Y')}} - + {{news.published_at|date('H:i')}}
@@ -29,4 +29,4 @@ maxItems = 6 {% endfor %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/themes/modern2/partials/index/post_item.htm b/themes/modern2/partials/index/post_item.htm index d83cdefa4..e9aeaa07a 100644 --- a/themes/modern2/partials/index/post_item.htm +++ b/themes/modern2/partials/index/post_item.htm @@ -9,12 +9,12 @@ {{post.categories.implode('name',',')}} {% endif %} -
@@ -23,4 +23,4 @@ {{post.title}} -
\ No newline at end of file + diff --git a/themes/modern2/partials/latest_news.htm b/themes/modern2/partials/latest_news.htm index 35ffd428f..826cac096 100644 --- a/themes/modern2/partials/latest_news.htm +++ b/themes/modern2/partials/latest_news.htm @@ -16,11 +16,11 @@ exceptPost = "{{ :id }}"
@@ -40,4 +40,4 @@ exceptPost = "{{ :id }}" {{post.title}}
-{% endfor %} \ No newline at end of file +{% endfor %} diff --git a/themes/modern2/partials/post_card_item.htm b/themes/modern2/partials/post_card_item.htm index 50c3e83a7..3be1b4041 100644 --- a/themes/modern2/partials/post_card_item.htm +++ b/themes/modern2/partials/post_card_item.htm @@ -1,11 +1,11 @@
diff --git a/themes/modern2/partials/post_list_item.htm b/themes/modern2/partials/post_list_item.htm index 2afb4d30e..104062614 100644 --- a/themes/modern2/partials/post_list_item.htm +++ b/themes/modern2/partials/post_list_item.htm @@ -13,7 +13,7 @@ {{post.published_at|date('d.m.Y')}} - diff --git a/themes/modern2/partials/sidebar__cards.htm b/themes/modern2/partials/sidebar__cards.htm index 98720d796..3f99d78ca 100644 --- a/themes/modern2/partials/sidebar__cards.htm +++ b/themes/modern2/partials/sidebar__cards.htm @@ -16,7 +16,7 @@ maxItems = 6
{{news.published_at|date('d.m.Y')}} - + {{news.published_at|date('H:i')}}
@@ -27,4 +27,4 @@ maxItems = 6
{% endfor %}
-{% endif %} \ No newline at end of file +{% endif %} diff --git a/themes/modern2/partials/slider.htm b/themes/modern2/partials/slider.htm index 73ce126ea..d6df15b68 100644 --- a/themes/modern2/partials/slider.htm +++ b/themes/modern2/partials/slider.htm @@ -46,7 +46,7 @@ postPage = 404 {{post.published_at|date('H:i')}} - + {{post.published_at|date('d.m.Y')}} @@ -68,13 +68,13 @@ postPage = 404
-
-
@@ -82,13 +82,13 @@ postPage = 404
-
-
@@ -100,7 +100,7 @@ postPage = 404
{{post.published_at|date('H:i')}} - + {{post.published_at|date('d.m.Y')}}
diff --git a/themes/modern2/template/images/svg/cancel.svg b/themes/modern2/template/images/svg/cancel.svg index 7ed9756e6..f935e3555 100644 --- a/themes/modern2/template/images/svg/cancel.svg +++ b/themes/modern2/template/images/svg/cancel.svg @@ -1,6 +1,6 @@ -