Merge branch 'main' into feat/421_accessibility

lib/mv_web/live/member_field_live/form_component.ex

@@ -42,11 +42,13 @@ defmodule MvWeb.MemberFieldLive.FormComponent do
         <div class="flex items-center gap-4 mb-4">
           <.button
             type="button"
+            variant="neutral"
             phx-click="cancel"
             phx-target={@myself}
-            aria-label={gettext("Back to Settings")}
+            aria-label={gettext("Back to settings")}
           >
-            <.icon name="hero-arrow-left" class="w-4 h-4" />
+            <.icon name="hero-arrow-left" class="size-4" />
+            {gettext("Back")}
           </.button>
           <h3 class="card-title">
             {gettext("Edit Field: %{field}", field: @field_label)}
@@ -176,7 +178,7 @@ defmodule MvWeb.MemberFieldLive.FormComponent do
           </div>
 
           <div class="justify-end mt-4 card-actions">
-            <.button type="button" phx-click="cancel" phx-target={@myself}>
+            <.button type="button" variant="neutral" phx-click="cancel" phx-target={@myself}>
               {gettext("Cancel")}
             </.button>
             <.button phx-disable-with={gettext("Saving...")} variant="primary">

lib/mv_web/live/member_field_live/index_component.ex

@@ -52,6 +52,12 @@ defmodule MvWeb.MemberFieldLive.IndexComponent do
         :if={!@show_form}
         id="member_fields"
         rows={@member_fields}
+        row_click={
+          fn {field_name, _field_data} ->
+            JS.push("edit_member_field", value: %{"field" => field_name}, target: @myself)
+          end
+        }
+        row_tooltip={gettext("Click to edit datafield")}
       >
         <:col :let={{_field_name, field_data}} label={gettext("Name")}>
           {MemberFields.label(field_data.field)}
@@ -86,16 +92,6 @@ defmodule MvWeb.MemberFieldLive.IndexComponent do
             {gettext("No")}
           </.badge>
         </:col>
-
-        <:action :let={{_field_name, field_data}}>
-          <.link
-            phx-click="edit_member_field"
-            phx-value-field={Atom.to_string(field_data.field)}
-            phx-target={@myself}
-          >
-            {gettext("Edit")}
-          </.link>
-        </:action>
       </.table>
     </div>
     """