diff --git a/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm b/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm index cfcc3aa13..1f7589ac8 100644 --- a/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm +++ b/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm @@ -6,16 +6,17 @@ {{ form_open(__SELF__.getFormAttributes) }} +
{% for field in __SELF__.fields %} {{ __SELF__.getFieldHtmlCode(field)|raw }} - + {% if loop.index == 2 %}
{% endif %} {% endfor %} {{ __SELF__.getAntispamFieldHtmlCode({})|raw }} {{ __SELF__.getDescriptionFieldHtmlCode({})|raw }} - + {{ __SELF__.getRedirectFieldHtmlCode({})|raw }} {% if (settingsGet('google_recaptcha_version') is null or settingsGet('google_recaptcha_version') == 'v2checkbox') and settingsGet('add_google_recaptcha') and settingsGet('google_recaptcha_site_key') %} @@ -33,16 +34,16 @@ {{ form_close() }} {% if settingsGet('add_google_recaptcha') and settingsGet('google_recaptcha_scripts_allow') %} - + {% if settingsGet('google_recaptcha_version') == 'v2invisible' %} +{% framework extras %} + + + diff --git a/themes/modern/layouts/master.htm b/themes/modern/layouts/master.htm index f2d443a16..35573623d 100644 --- a/themes/modern/layouts/master.htm +++ b/themes/modern/layouts/master.htm @@ -10,9 +10,9 @@ forceUrl = 1 {% partial 'footer' %} + {% framework extras %} {% scripts %} - diff --git a/themes/modern/layouts/static.htm b/themes/modern/layouts/static.htm index 1141edf72..e26ca5ea4 100644 --- a/themes/modern/layouts/static.htm +++ b/themes/modern/layouts/static.htm @@ -10,18 +10,17 @@ default = 0 {% partial 'head' %} {% partial 'header' %} -
+
-
- {% page %} -
+ {% page %}
{% partial 'footer' %} + {% framework extras %} - + diff --git a/themes/modern/pages/category.htm b/themes/modern/pages/category.htm index faff0c4f1..e7bd58663 100644 --- a/themes/modern/pages/category.htm +++ b/themes/modern/pages/category.htm @@ -1,4 +1,14 @@ title = "Рубрика" url = "/category/:slug" +layout = "master" is_hidden = 0 + +[blogPosts] +pageNumber = "{{ :page }}" +categoryFilter = "{{ :slug }}" +postsPerPage = 10 +noPostsMessage = "No posts found" +sortOrder = "published_at desc" +categoryPage = "category" +postPage = "post" == \ No newline at end of file diff --git a/themes/modern/pages/index.htm b/themes/modern/pages/index.htm index f391ed920..5c3c3630b 100644 --- a/themes/modern/pages/index.htm +++ b/themes/modern/pages/index.htm @@ -5,4 +5,18 @@ is_hidden = 0 [viewBag] localeTitle[en] = "Home" -== \ No newline at end of file +== +{% partial 'slider' %} +{% partial 'partners' %} +{% put scripts %} + + +{% endput %} diff --git a/themes/modern/pages/post.htm b/themes/modern/pages/post.htm index 526e3f6db..48b873093 100644 --- a/themes/modern/pages/post.htm +++ b/themes/modern/pages/post.htm @@ -5,4 +5,8 @@ is_hidden = 0 [viewBag] localeTitle[en] = "Post" + +[blogPost] +slug = "{{ :slug }}" +categoryPage = "blog/category" == \ No newline at end of file diff --git a/themes/modern/partials/head.htm b/themes/modern/partials/head.htm index f92cc9cf8..8c89c4a27 100644 --- a/themes/modern/partials/head.htm +++ b/themes/modern/partials/head.htm @@ -8,7 +8,6 @@ rel="stylesheet"> - diff --git a/themes/modern/partials/header.htm b/themes/modern/partials/header.htm index 2ff81f09d..154a655a4 100644 --- a/themes/modern/partials/header.htm +++ b/themes/modern/partials/header.htm @@ -44,7 +44,7 @@ code = "top-menu"
- +