diff --git a/components/html-head.tpl b/components/html-head.tpl index a57937e..10f6825 100644 --- a/components/html-head.tpl +++ b/components/html-head.tpl @@ -16,7 +16,7 @@ {% if site.data.touch_icon %}{% endif %} {% comment %}STYLESHEETS{% endcomment %} -{% stylesheet_link "main.min.css?v=barcelona-2.4.1" %} + {% if editmode %}{% endif %} {% comment %}Google fonts for Design Editor{% endcomment %} diff --git a/components/javascripts.tpl b/components/javascripts.tpl index 7a2c25a..9b62cc8 100644 --- a/components/javascripts.tpl +++ b/components/javascripts.tpl @@ -3,11 +3,11 @@ - + {% sitejs_include %} {%- if editmode -%} - + {%- endif -%} {% comment %}Site search related javascript components.{% endcomment %} diff --git a/components/template-settings-json.tpl b/components/template-settings-json.tpl new file mode 100644 index 0000000..a2ea1ff --- /dev/null +++ b/components/template-settings-json.tpl @@ -0,0 +1,3 @@ +{ + "version": "barcelona-2.4.1" +} diff --git a/components/template-settings.tpl b/components/template-settings.tpl new file mode 100644 index 0000000..eeeadb9 --- /dev/null +++ b/components/template-settings.tpl @@ -0,0 +1,5 @@ +{%- capture template_settings_json -%} + {% include 'template-settings-json' %} +{%- endcapture -%} + +{%- assign template_settings = template_settings_json | replace: 'PREFIX', 'barcelona' | json_parse -%} diff --git a/layouts/auto_generated_product.tpl b/layouts/auto_generated_product.tpl index fa325a9..1102030 100644 --- a/layouts/auto_generated_product.tpl +++ b/layouts/auto_generated_product.tpl @@ -1,5 +1,6 @@ - {% include "template-variables" %} + {%- include "template-settings" -%} + {%- include "template-variables" -%} {% include "edicy-tools-variables" %} diff --git a/layouts/blog___news.tpl b/layouts/blog___news.tpl index 1482504..7af1f7d 100644 --- a/layouts/blog___news.tpl +++ b/layouts/blog___news.tpl @@ -1,6 +1,7 @@ -{% include "template-variables" %} -{% include "blog-article-variables" %} +{%- include "template-settings" -%} +{%- include "template-variables" -%} +{%- include "blog-article-variables" -%} {% assign blog_page = true %} diff --git a/layouts/blog_article.tpl b/layouts/blog_article.tpl index afbac29..6698ca0 100644 --- a/layouts/blog_article.tpl +++ b/layouts/blog_article.tpl @@ -1,7 +1,8 @@ -{% include "template-variables" %} -{% include "blog-article-variables" %} -{% include "blog-settings-variables" %} +{%- include "template-settings" -%} +{%- include "template-variables" -%} +{%- include "blog-article-variables" -%} +{%- include "blog-settings-variables" -%} {% include "edicy-tools-variables" %} diff --git a/layouts/common_page.tpl b/layouts/common_page.tpl index d5af3df..9921892 100644 --- a/layouts/common_page.tpl +++ b/layouts/common_page.tpl @@ -1,5 +1,6 @@ -{% include "template-variables" %} +{%- include "template-settings" -%} +{%- include "template-variables" -%} {% include "edicy-tools-variables" %} diff --git a/layouts/feature_page.tpl b/layouts/feature_page.tpl index b93b3ee..2966f72 100644 --- a/layouts/feature_page.tpl +++ b/layouts/feature_page.tpl @@ -1,5 +1,6 @@ -{% include "template-variables" %} +{%- include "template-settings" -%} +{%- include "template-variables" -%} {% assign front_page = true %} diff --git a/layouts/front_page.tpl b/layouts/front_page.tpl index 53f199b..b7b19f2 100644 --- a/layouts/front_page.tpl +++ b/layouts/front_page.tpl @@ -1,6 +1,7 @@ -{% include "template-variables" %} -{% include "blog-article-variables" %} +{%- include "template-settings" -%} +{%- include "template-variables" -} +{%- include "blog-article-variables" -%} {% assign blog_page = true %} diff --git a/layouts/product.tpl b/layouts/product.tpl index 902f6c8..d94a9c8 100644 --- a/layouts/product.tpl +++ b/layouts/product.tpl @@ -1,5 +1,6 @@ - {% include "template-variables" %} + {%- include "template-settings" -%} + {%- include "template-variables" -%} {% include "edicy-tools-variables" %} @@ -72,4 +73,4 @@ {% include "javascripts" %} {% include "edicy-tools" %} - \ No newline at end of file + diff --git a/layouts/product_list.tpl b/layouts/product_list.tpl index 43b94ca..22ee38d 100644 --- a/layouts/product_list.tpl +++ b/layouts/product_list.tpl @@ -1,5 +1,6 @@ - {% include "template-variables" %} + {%- include "template-settings" -%} + {%- include "template-variables" -%} {% include "edicy-tools-variables" %} @@ -40,4 +41,4 @@ {% include "javascripts" %} {% include "edicy-tools" %} - \ No newline at end of file + diff --git a/manifest.json b/manifest.json index 9f8925b..fbdd079 100644 --- a/manifest.json +++ b/manifest.json @@ -320,6 +320,20 @@ "layout_name": "template-meta", "title": "template-meta" }, + { + "content_type": "component", + "component": true, + "file": "components/template-settings-json.tpl", + "layout_name": "template-settings-json", + "title": "template-settings-json" + }, + { + "content_type": "component", + "component": true, + "file": "components/template-settings.tpl", + "layout_name": "template-settings", + "title": "template-settings" + }, { "content_type": "component", "component": true,