Add class=filters to filters forms

Wrap filter buttons with <noscript>
Since forms are already submitted on change, Oriol does not like the idea of having a useless button around breaking the form grid.
2023-05-23 14:50:46 +02:00 · 2023-05-23 14:34:46 +02:00 · 2023-05-23 14:21:04 +02:00 · 2023-05-23 14:18:26 +02:00
8 changed files with 74 additions and 62 deletions
--- a/po/ca.po
+++ b/po/ca.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: numerus\n"
 "Report-Msgid-Bugs-To: jordi@tandem.blog\n"
-"POT-Creation-Date: 2023-05-22 11:12+0200\n"
+"POT-Creation-Date: 2023-05-23 14:16+0200\n"
 "PO-Revision-Date: 2023-01-18 17:08+0100\n"
 "Last-Translator: jordi fita mas <jordi@tandem.blog>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@ -49,25 +49,24 @@ msgid "New Invoice"
 msgstr "Nova factura"

 #: web/template/invoices/products.gohtml:48
-#: web/template/products/index.gohtml:38
 msgctxt "product"
 msgid "All"
 msgstr "Tots"

 #: web/template/invoices/products.gohtml:49
-#: web/template/products/index.gohtml:39
+#: web/template/products/index.gohtml:38
 msgctxt "title"
 msgid "Name"
 msgstr "Nom"

 #: web/template/invoices/products.gohtml:50
-#: web/template/invoices/view.gohtml:62 web/template/products/index.gohtml:41
+#: web/template/invoices/view.gohtml:62 web/template/products/index.gohtml:40
 msgctxt "title"
 msgid "Price"
 msgstr "Preu"

 #: web/template/invoices/products.gohtml:64
-#: web/template/products/index.gohtml:81
+#: web/template/products/index.gohtml:79
 msgid "No products added yet."
 msgstr "No hi ha cap producte."

@ -126,7 +125,7 @@ msgctxt "title"
 msgid "Invoice Num."
 msgstr "Núm. factura"

-#: web/template/invoices/index.gohtml:49 web/template/contacts/index.gohtml:39
+#: web/template/invoices/index.gohtml:49 web/template/contacts/index.gohtml:38
 msgctxt "title"
 msgid "Customer"
 msgstr "Client"
@ -136,8 +135,8 @@ msgctxt "title"
 msgid "Status"
 msgstr "Estat"

-#: web/template/invoices/index.gohtml:51 web/template/contacts/index.gohtml:42
-#: web/template/expenses/index.gohtml:44 web/template/products/index.gohtml:40
+#: web/template/invoices/index.gohtml:51 web/template/contacts/index.gohtml:41
+#: web/template/expenses/index.gohtml:44 web/template/products/index.gohtml:39
 msgctxt "title"
 msgid "Tags"
 msgstr "Etiquetes"
@ -152,8 +151,8 @@ msgctxt "title"
 msgid "Download"
 msgstr "Descàrrega"

-#: web/template/invoices/index.gohtml:54 web/template/contacts/index.gohtml:43
-#: web/template/expenses/index.gohtml:47 web/template/products/index.gohtml:42
+#: web/template/invoices/index.gohtml:54 web/template/contacts/index.gohtml:42
+#: web/template/expenses/index.gohtml:47 web/template/products/index.gohtml:41
 msgctxt "title"
 msgid "Actions"
 msgstr "Accions"
@ -164,8 +163,8 @@ msgid "Select invoice %v"
 msgstr "Selecciona factura %v"

 #: web/template/invoices/index.gohtml:116 web/template/invoices/view.gohtml:19
-#: web/template/contacts/index.gohtml:73 web/template/expenses/index.gohtml:86
-#: web/template/products/index.gohtml:71
+#: web/template/contacts/index.gohtml:71 web/template/expenses/index.gohtml:86
+#: web/template/products/index.gohtml:69
 msgctxt "action"
 msgid "Edit"
 msgstr "Edita"
@ -216,8 +215,8 @@ msgstr "Edició de la factura «%s»"

 #: web/template/invoices/edit.gohtml:68
 msgctxt "action"
-msgid "Edit invoice"
-msgstr "Edita factura"
+msgid "Save"
+msgstr "Desa"

 #: web/template/form.gohtml:36
 msgctxt "input"
@ -316,22 +315,17 @@ msgctxt "action"
 msgid "New contact"
 msgstr "Nou contacte"

-#: web/template/contacts/index.gohtml:38
-msgctxt "contact"
-msgid "All"
-msgstr "Tots"
-
-#: web/template/contacts/index.gohtml:40
+#: web/template/contacts/index.gohtml:39
 msgctxt "title"
 msgid "Email"
 msgstr "Correu-e"

-#: web/template/contacts/index.gohtml:41
+#: web/template/contacts/index.gohtml:40
 msgctxt "title"
 msgid "Phone"
 msgstr "Telèfon"

-#: web/template/contacts/index.gohtml:83
+#: web/template/contacts/index.gohtml:81
 msgid "No contacts added yet."
 msgstr "No hi ha cap contacte."

@ -1031,6 +1025,14 @@ msgstr "No podeu deixar el codi postal en blanc."
 msgid "This value is not a valid postal code."
 msgstr "Aquest valor no és un codi postal vàlid."

+#~ msgctxt "action"
+#~ msgid "Edit invoice"
+#~ msgstr "Edita factura"
+
+#~ msgctxt "contact"
+#~ msgid "All"
+#~ msgstr "Tots"
+
 #~ msgid "Product ID can not be empty."
 #~ msgstr "No podeu deixar l’identificador del producte en blanc."

--- a/po/es.po
+++ b/po/es.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: numerus\n"
 "Report-Msgid-Bugs-To: jordi@tandem.blog\n"
-"POT-Creation-Date: 2023-05-22 11:12+0200\n"
+"POT-Creation-Date: 2023-05-23 14:16+0200\n"
 "PO-Revision-Date: 2023-01-18 17:45+0100\n"
 "Last-Translator: jordi fita mas <jordi@tandem.blog>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
@ -49,25 +49,24 @@ msgid "New Invoice"
 msgstr "Nueva factura"

 #: web/template/invoices/products.gohtml:48
-#: web/template/products/index.gohtml:38
 msgctxt "product"
 msgid "All"
 msgstr "Todos"

 #: web/template/invoices/products.gohtml:49
-#: web/template/products/index.gohtml:39
+#: web/template/products/index.gohtml:38
 msgctxt "title"
 msgid "Name"
 msgstr "Nombre"

 #: web/template/invoices/products.gohtml:50
-#: web/template/invoices/view.gohtml:62 web/template/products/index.gohtml:41
+#: web/template/invoices/view.gohtml:62 web/template/products/index.gohtml:40
 msgctxt "title"
 msgid "Price"
 msgstr "Precio"

 #: web/template/invoices/products.gohtml:64
-#: web/template/products/index.gohtml:81
+#: web/template/products/index.gohtml:79
 msgid "No products added yet."
 msgstr "No hay productos."

@ -126,7 +125,7 @@ msgctxt "title"
 msgid "Invoice Num."
 msgstr "Nº factura"

-#: web/template/invoices/index.gohtml:49 web/template/contacts/index.gohtml:39
+#: web/template/invoices/index.gohtml:49 web/template/contacts/index.gohtml:38
 msgctxt "title"
 msgid "Customer"
 msgstr "Cliente"
@ -136,8 +135,8 @@ msgctxt "title"
 msgid "Status"
 msgstr "Estado"

-#: web/template/invoices/index.gohtml:51 web/template/contacts/index.gohtml:42
-#: web/template/expenses/index.gohtml:44 web/template/products/index.gohtml:40
+#: web/template/invoices/index.gohtml:51 web/template/contacts/index.gohtml:41
+#: web/template/expenses/index.gohtml:44 web/template/products/index.gohtml:39
 msgctxt "title"
 msgid "Tags"
 msgstr "Etiquetes"
@ -152,8 +151,8 @@ msgctxt "title"
 msgid "Download"
 msgstr "Descargar"

-#: web/template/invoices/index.gohtml:54 web/template/contacts/index.gohtml:43
-#: web/template/expenses/index.gohtml:47 web/template/products/index.gohtml:42
+#: web/template/invoices/index.gohtml:54 web/template/contacts/index.gohtml:42
+#: web/template/expenses/index.gohtml:47 web/template/products/index.gohtml:41
 msgctxt "title"
 msgid "Actions"
 msgstr "Acciones"
@ -164,8 +163,8 @@ msgid "Select invoice %v"
 msgstr "Seleccionar factura %v"

 #: web/template/invoices/index.gohtml:116 web/template/invoices/view.gohtml:19
-#: web/template/contacts/index.gohtml:73 web/template/expenses/index.gohtml:86
-#: web/template/products/index.gohtml:71
+#: web/template/contacts/index.gohtml:71 web/template/expenses/index.gohtml:86
+#: web/template/products/index.gohtml:69
 msgctxt "action"
 msgid "Edit"
 msgstr "Editar"
@ -216,8 +215,8 @@ msgstr "Edición de la factura «%s»"

 #: web/template/invoices/edit.gohtml:68
 msgctxt "action"
-msgid "Edit invoice"
-msgstr "Editar factura"
+msgid "Save"
+msgstr "Guardad"

 #: web/template/form.gohtml:36
 msgctxt "input"
@ -316,22 +315,17 @@ msgctxt "action"
 msgid "New contact"
 msgstr "Nuevo contacto"

-#: web/template/contacts/index.gohtml:38
-msgctxt "contact"
-msgid "All"
-msgstr "Todos"
-
-#: web/template/contacts/index.gohtml:40
+#: web/template/contacts/index.gohtml:39
 msgctxt "title"
 msgid "Email"
 msgstr "Correo-e"

-#: web/template/contacts/index.gohtml:41
+#: web/template/contacts/index.gohtml:40
 msgctxt "title"
 msgid "Phone"
 msgstr "Teléfono"

-#: web/template/contacts/index.gohtml:83
+#: web/template/contacts/index.gohtml:81
 msgid "No contacts added yet."
 msgstr "No hay contactos."

@ -1031,6 +1025,14 @@ msgstr "No podéis dejar el código postal en blanco."
 msgid "This value is not a valid postal code."
 msgstr "Este valor no es un código postal válido válido."

+#~ msgctxt "action"
+#~ msgid "Edit invoice"
+#~ msgstr "Editar factura"
+
+#~ msgctxt "contact"
+#~ msgid "All"
+#~ msgstr "Todos"
+
 #~ msgid "Product ID can not be empty."
 #~ msgstr "No podéis dejar el identificador de producto en blanco."

--- a/web/template/contacts/index.gohtml
+++ b/web/template/contacts/index.gohtml
@ -19,7 +19,7 @@
 {{ define "content" }}
    {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.ContactsIndexPage*/ -}}
    <div aria-label="{{( pgettext "Filters" "title" )}}">
-        <form method="GET" action="{{ companyURI "/contacts"}}"
+        <form class="filters" method="GET" action="{{ companyURI "/contacts"}}"
              data-hx-target="main"
              data-hx-boost="true"
              data-hx-trigger="change,search,submit"
@ -29,13 +29,14 @@
                {{ template "tags-field" .Tags | addTagsAttr (print `data-conditions="` .TagsCondition.Name  `-field"`) }}
                {{ template "toggle-field" .TagsCondition }}
            {{ end }}
-            <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            <noscript>
+                <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            </noscript>
        </form>
    </div>
    <table>
        <thead>
        <tr>
-            <th>{{( pgettext "All" "contact" )}}</th>
            <th>{{( pgettext "Customer" "title" )}}</th>
            <th>{{( pgettext "Email" "title" )}}</th>
            <th>{{( pgettext "Phone" "title" )}}</th>
@ -47,8 +48,8 @@
        {{ with .Contacts }}
            {{- range $contact := . }}
                <tr>
-                    <td></td>
-                    <td><a href="{{ companyURI "/contacts/"}}{{ .Slug }}"  data-hx-target="main" data-hx-boost="true">{{ .Name }}</a></td>
+                    <td><a href="{{ companyURI "/contacts/"}}{{ .Slug }}" data-hx-target="main"
+                           data-hx-boost="true">{{ .Name }}</a></td>
                    <td><a href="mailto:{{ .Email }}">{{ .Email }}</a></td>
                    <td><a href="tel:{{ .Phone }}">{{ .Phone }}</a></td>
                    <td
@ -80,7 +81,7 @@
            {{- end }}
        {{ else }}
            <tr>
-                <td colspan="6">{{( gettext "No contacts added yet." )}}</td>
+                <td colspan="5">{{( gettext "No contacts added yet." )}}</td>
            </tr>
        {{ end }}
        </tbody>
--- a/web/template/dashboard.gohtml
+++ b/web/template/dashboard.gohtml
@ -19,7 +19,9 @@
            {{ with .Filters }}
                {{ template "radio-field" .Period }}
            {{ end }}
-            <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            <noscript>
+                <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            </noscript>
        </form>
    </div>
    <dl id="income-statement">
--- a/web/template/expenses/index.gohtml
+++ b/web/template/expenses/index.gohtml
@ -20,7 +20,7 @@
 {{ define "content" }}
    {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.expensesIndexPage*/ -}}
    <div aria-label="{{( pgettext "Filters" "title" )}}">
-        <form method="GET" action="{{ companyURI "/expenses"}}"
+        <form class="filters" method="GET" action="{{ companyURI "/expenses"}}"
              data-hx-target="main" data-hx-boost="true" data-hx-trigger="change,search,submit"
        >
            {{ with .Filters }}
@ -31,7 +31,9 @@
                {{ template "tags-field" .Tags | addTagsAttr (print `data-conditions="` .TagsCondition.Name  `-field"`) }}
                {{ template "toggle-field" .TagsCondition }}
            {{ end }}
-            <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            <noscript>
+                <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            </noscript>
        </form>
    </div>
    <table>
--- a/web/template/invoices/edit.gohtml
+++ b/web/template/invoices/edit.gohtml
@ -65,7 +65,7 @@
                        name="action" value="update"
                        type="submit">{{( pgettext "Update" "action" )}}</button>
                <button class="primary" name="_method" value="PUT"
-                        type="submit">{{( pgettext "Edit invoice" "action" )}}</button>
+                        type="submit">{{( pgettext "Save" "action" )}}</button>
            </fieldset>

        </form>
--- a/web/template/invoices/index.gohtml
+++ b/web/template/invoices/index.gohtml
@ -26,7 +26,7 @@
 {{ define "content" }}
    {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.InvoicesIndexPage*/ -}}
    <div aria-label="{{( pgettext "Filters" "title" )}}">
-        <form method="GET" action="{{ companyURI "/invoices"}}" data-hx-target="main" data-hx-boost="true"
+        <form class="filters" method="GET" action="{{ companyURI "/invoices"}}" data-hx-target="main" data-hx-boost="true"
              data-hx-trigger="change,search,submit">
            {{ with .Filters }}
                {{ template "select-field" .Customer }}
@ -37,7 +37,9 @@
                {{ template "tags-field" .Tags | addTagsAttr (print `data-conditions="` .TagsCondition.Name  `-field"`) }}
                {{ template "toggle-field" .TagsCondition }}
            {{ end }}
-            <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            <noscript>
+                <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            </noscript>
        </form>
    </div>
    <table class="no-padding">
--- a/web/template/products/index.gohtml
+++ b/web/template/products/index.gohtml
@ -19,7 +19,7 @@
 {{ define "content" }}
    {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.productsIndexPage*/ -}}
    <div aria-label="{{( pgettext "Filters" "title" )}}">
-        <form method="GET" action="{{ companyURI "/products"}}"
+        <form class="filters" method="GET" action="{{ companyURI "/products"}}"
              data-hx-target="main"
              data-hx-boost="true"
              data-hx-trigger="change,search,submit"
@ -29,13 +29,14 @@
                {{ template "tags-field" .Tags | addTagsAttr (print `data-conditions="` .TagsCondition.Name  `-field"`) }}
                {{ template "toggle-field" .TagsCondition }}
            {{ end }}
-            <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            <noscript>
+                <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            </noscript>
        </form>
    </div>
    <table>
        <thead>
        <tr>
-            <th>{{( pgettext "All" "product" )}}</th>
            <th>{{( pgettext "Name" "title" )}}</th>
            <th>{{( pgettext "Tags" "title" )}}</th>
            <th>{{( pgettext "Price" "title" )}}</th>
@ -46,8 +47,8 @@
        {{ with .Products }}
            {{- range $product := . }}
                <tr>
-                    <td></td>
-                    <td><a href="{{ companyURI "/products/"}}{{ .Slug }}" data-hx-target="main" data-hx-boost="true">{{ .Name }}</a></td>
+                    <td><a href="{{ companyURI "/products/"}}{{ .Slug }}" data-hx-target="main"
+                           data-hx-boost="true">{{ .Name }}</a></td>
                    <td
                            data-hx-get="{{companyURI "/products/"}}{{ .Slug }}/tags/edit"
                            data-hx-target="this"
@ -78,7 +79,7 @@
            {{- end }}
        {{ else }}
            <tr>
-                <td colspan="5">{{( gettext "No products added yet." )}}</td>
+                <td colspan="4">{{( gettext "No products added yet." )}}</td>
            </tr>
        {{ end }}
        </tbody>
Author	SHA1	Message	Date
jordi fita mas	d2a06dd1c0	Add class=filters to filters forms	2023-05-23 14:50:46 +02:00
jordi fita mas	9096cfe4f2	Wrap filter buttons with <noscript> Since forms are already submitted on change, Oriol does not like the idea of having a useless button around breaking the form grid.	2023-05-23 14:34:46 +02:00
jordi fita mas	e974406870	Remove the “all” columns from products and contacts That column was supposed to have a checkbox for batch operations, but we do not have any operation that would like to perform to many products or contacts at the same time. For now, at least.	2023-05-23 14:21:04 +02:00
jordi fita mas	6c7762057c	Change “Edit Invoice” button to just “Save”	2023-05-23 14:18:26 +02:00