diff --git a/themes/buha/layouts/partials/l1/media.html b/themes/buha/layouts/partials/layout/media.html
similarity index 63%
rename from themes/buha/layouts/partials/l1/media.html
rename to themes/buha/layouts/partials/layout/media.html
index e339049..6f036e0 100644
--- a/themes/buha/layouts/partials/l1/media.html
+++ b/themes/buha/layouts/partials/layout/media.html
@@ -4,7 +4,7 @@
{{ end }}
diff --git a/themes/buha/layouts/partials/l1/section_list.html b/themes/buha/layouts/partials/layout/section_list.html
similarity index 100%
rename from themes/buha/layouts/partials/l1/section_list.html
rename to themes/buha/layouts/partials/layout/section_list.html
diff --git a/themes/buha/layouts/partials/layout/tags_n_categories.html b/themes/buha/layouts/partials/layout/tags_n_categories.html
new file mode 100644
index 0000000..fffd49c
--- /dev/null
+++ b/themes/buha/layouts/partials/layout/tags_n_categories.html
@@ -0,0 +1,6 @@
+
diff --git a/themes/buha/layouts/partials/snippets/article_metadata.html b/themes/buha/layouts/partials/snippets/article_metadata.html
index aad40bb..33ace3b 100644
--- a/themes/buha/layouts/partials/snippets/article_metadata.html
+++ b/themes/buha/layouts/partials/snippets/article_metadata.html
@@ -1,4 +1,4 @@
-{{ if or .when .price .contact .covid }}
+{{ if or .when .price .contact_mail .covid .insta }}
{{ if .when }}
@@ -13,8 +13,11 @@
{{ if i18n "entry" }}{{ i18n "entry" }}{{ else }}{{ "Entry" }}{{ end }}: {{ .price }}
{{ end }}
{{ end }}
- {{ if .contact }}
-
{{ if i18n "contact" }}{{ i18n "contact" }}{{ else }}{{ "Contact" }}{{ end }} {{ .contact | markdownify }} {{ if i18n "or" }}{{ i18n "or" }}{{ else }}{{ "or" }}{{ end }}
{{ site.Params.imprintdata.tel }}
+ {{ if .insta }}
+
+ {{ end }}
+ {{ if .contact_mail }}
+
{{ if i18n "mail" }}{{ i18n "mail" }}{{ else }}{{ "mail" }}{{ end }} {{ .contact_mail | markdownify }}
{{ end }}
{{ if .covid }}
Covid: {{ .covid }}
diff --git a/themes/buha/layouts/partials/snippets/single_chooser.html b/themes/buha/layouts/partials/snippets/single_chooser.html
deleted file mode 100644
index 8f2ba07..0000000
--- a/themes/buha/layouts/partials/snippets/single_chooser.html
+++ /dev/null
@@ -1,12 +0,0 @@
- {{ partial "debug" (dict "context" .context "caller" "single_chooser.html")}}
- {{ $partial_before := "" }}
- {{ $partial := "layout/single/article" }}
- {{ $pic := .pic }}
- {{ if eq .context.Params.tool "generator" }}
- {{ $partial = "layout/single/generator" }}
- {{ else if eq .context.Params.tool "nottranslated" }}
- {{ $partial = "layout/single/nottranslated" }}
- {{ end }}
-
- {{ partial $partial (dict "context" .context "pic" $pic "content" .context.Content "partial_before" $partial_before) }}
-
diff --git a/themes/buha/static/js/generator.js b/themes/buha/static/js/generator.js
index 9502022..c138386 100644
--- a/themes/buha/static/js/generator.js
+++ b/themes/buha/static/js/generator.js
@@ -41,7 +41,8 @@ function showInput(e) {
var when = form.elements['when'].value;
var covid = form.elements['covid'].value;
var price = form.elements['price'].value;
- var contact = form.elements['contact'].value;
+ var contact_mail = form.elements['contact_mail'].value;
+ var insta = form.elements['insta'].value;
var events = check_checkboxes('events');
if (form.elements['newevents']) { var newevents = testor(form.elements['newevents'].value.split(',')); }
var categories = check_checkboxes('categories');
@@ -50,6 +51,7 @@ function showInput(e) {
if (form.elements['newtags']) { var newtags = testor(form.elements['newtags'].value.split(',')); }
var featured = check_checkboxes('featured');
var about = check_checkboxes('about');
+ var recurrent = check_checkboxes('recurrent');
var foundations = check_checkboxes('foundations');
if (form.elements['newfoundations']) { var newfoundations = testor(form.elements['newfoundations'].value.split(',')); }
@@ -120,14 +122,9 @@ function showInput(e) {
if (!title) {
display.innerHTML += "Title is missing..
"
}
+
- if (!content) {
- display.innerHTML += "Content is missing..
"
- }
-
-
-
- if (title && content) {
+ if (title) {
display.innerHTML += "---
";
display.innerHTML += "title: \"" + title + "\"
";
@@ -144,6 +141,10 @@ function showInput(e) {
display.innerHTML += "about: true
";
}
+ if (recurrent != '') {
+ display.innerHTML += "recurrent: true
";
+ }
+
if (when) {
display.innerHTML += "when: \"" + when + "\"
";
}
@@ -170,8 +171,11 @@ function showInput(e) {
display.innerHTML += "price: \"" + price + "\"
";
}
- if (contact) {
- display.innerHTML += "contact: \"" + contact + "\"
";
+ if (contact_mail) {
+ display.innerHTML += "contact_mail: \"" + contact_mail + "\"
";
+ }
+ if (insta) {
+ display.innerHTML += "insta: \"" + insta + "\"
";
}
display.innerHTML += "---
";
if (content) {