summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunwox <me@unwox.com>2025-09-14 21:22:02 +0600
committerunwox <me@unwox.com>2025-09-14 21:22:02 +0600
commitd29f796b047c2a90db8f1e143d7da2a0159f9b7e (patch)
tree2f4ec0e8c2326ff619cc0afd4e53e270b6e6e24c
parentf3a8179ba51eb877b96a79d2806dfa58bd6100bd (diff)
small improvements
-rw-r--r--forms.fnl4
-rw-r--r--pages/shop/add.fnl21
-rw-r--r--pages/shop/index.fnl2
3 files changed, 17 insertions, 10 deletions
diff --git a/forms.fnl b/forms.fnl
index 4e57125..9b035e1 100644
--- a/forms.fnl
+++ b/forms.fnl
@@ -230,8 +230,8 @@
[:option
(fn [] {:value option.value :selected (= value option.value)})
option.label])))]
- (if error [:div {:class "form-error"} error] "")
- (if help [:div {:class "form-help"} help] "")]))})
+ (if error (HTML [:div {:class "form-error"} error]) "")
+ (if help (HTML [:div {:class "form-help"} help]) "")]))})
(fn render-form [form data errors]
(HTML
diff --git a/pages/shop/add.fnl b/pages/shop/add.fnl
index e95ad38..5d41793 100644
--- a/pages/shop/add.fnl
+++ b/pages/shop/add.fnl
@@ -15,14 +15,17 @@
(.. "Уникальное название чая на латинице, без пробелов, "
"в нижнем регистре."))
(forms.text-input "title" "Полное название" true 0 200)
- (forms.select-input "type" "Вид продукта" true dicts.product-type)
+ (forms.select-input "type" "Вид товара" true dicts.product-type)
(forms.select-input "packaging" "Упаковка" true dicts.tea-packaging)
(forms.number-input "year" "Год изготовления" false 1950
- (tonumber (os.date "%Y")))
- (forms.select-input "season" "Сезон изготовления" false dicts.tea-season)
+ (tonumber (os.date "%Y")) "Для чая.")
+ (forms.select-input "season" "Сезон изготовления" false dicts.tea-season
+ "Для чая.")
(forms.text-input "region" "Место изготовления" false 0 500)
- (forms.textarea-input "short_description" "Короткое описание" true 0 1000)
- (forms.textarea-input "description" "Полное описание" false 0 20000)
+ (forms.textarea-input "short_description" "Короткое описание" true 0 1000
+ "Суть и основные качества товара в одном предложении.")
+ (forms.textarea-input "description" "Полное описание" false 0 20000
+ "Отображается на странице товара.")
(forms.textarea-input "recommendations" "Рекомендации по завариванию"
false 0 20000)
(forms.number-input "price_per" "Цена" true 0 100000
@@ -32,8 +35,12 @@
{:title "Фото"
:fields [
- (forms.file-input "image1" "Первое" true ".jpg" 512)
- (forms.file-input "image2" "Второе" false ".jpg,.webm" 512)
+ (forms.file-input "image1" "Первое" true ".jpg" 512
+ (..
+ "Основное отображение, его посетители будут видеть "
+ "первым в списке и на странице товара."))
+ (forms.file-input "image2" "Второе" false ".jpg,.webm" 512
+ "Дополнительные изображения или видео.")
(forms.file-input "image3" "Третье" false ".jpg,.webm" 512)
(forms.file-input "image4" "Четвертое" false ".jpg,.webm" 512)
(forms.file-input "image5" "Пятое" false ".jpg,.webm" 512)]}
diff --git a/pages/shop/index.fnl b/pages/shop/index.fnl
index 06642a5..5c1d734 100644
--- a/pages/shop/index.fnl
+++ b/pages/shop/index.fnl
@@ -77,7 +77,7 @@
[:div {:style "font-style: italic; margin-bottom: 0.25rem;"}
(or (dicts.label dicts.product-type product.type) product.type) ", "
(if (= product.packaging "piece")
- (HTML [:strong {} product.price-per "₽ за 1 шт."])
+ (HTML [:strong {} product.price-per "₽"])
(HTML [:strong {} (* 50 product.price-per) "₽ за 50 гр. "]))]
;; [:div {:class "shop-item-price"}
;; [:form {:method "POST"}