This commit is contained in:
parent
ce49d751ea
commit
eb20c8f3b6
6 changed files with 32 additions and 42 deletions
|
|
@ -172,7 +172,7 @@ defmodule MvWeb.Layouts do
|
|||
<span class="font-bold">{@club_name}</span>
|
||||
</header>
|
||||
|
||||
<!-- Main Content (shared between mobile and desktop) -->
|
||||
<!-- Main Content (shared between mobile and desktop) -->
|
||||
<main class="px-4 py-8 sm:px-6 lg:px-8">
|
||||
<div class="mx-auto space-y-4 max-full">
|
||||
{render_slot(@inner_block)}
|
||||
|
|
|
|||
|
|
@ -26,8 +26,7 @@ defmodule MvWeb.Layouts.Sidebar do
|
|||
aria-label={gettext("Close sidebar")}
|
||||
class="drawer-overlay lg:hidden focus:outline-none focus:ring-2 focus:ring-primary"
|
||||
tabindex="-1"
|
||||
>
|
||||
</label>
|
||||
></label>
|
||||
<aside id="main-sidebar" class="sidebar" aria-label={gettext("Main navigation")}>
|
||||
{sidebar_header(assigns)}
|
||||
<%= if @current_user do %>
|
||||
|
|
@ -174,8 +173,7 @@ defmodule MvWeb.Layouts.Sidebar do
|
|||
<span
|
||||
class="absolute -top-0.5 -right-0.5 size-2 rounded-full bg-primary"
|
||||
aria-hidden="true"
|
||||
>
|
||||
</span>
|
||||
></span>
|
||||
<% end %>
|
||||
</span>
|
||||
<span class="menu-label">{@label}</span>
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ defmodule MvWeb.Components.MemberFilterComponent do
|
|||
<.icon name="hero-chevron-down" class="size-4" />
|
||||
</.button>
|
||||
|
||||
<!--
|
||||
<!--
|
||||
NOTE: We use a div panel instead of ul.menu/li structure to avoid DaisyUI menu styles
|
||||
(padding, display, hover, font sizes) that would interfere with our form controls.
|
||||
Filter controls are form elements (fieldset with legend, radio inputs), not menu items.
|
||||
|
|
@ -233,7 +233,7 @@ defmodule MvWeb.Components.MemberFilterComponent do
|
|||
</fieldset>
|
||||
</div>
|
||||
|
||||
<!-- Groups: one row per group with All / Yes / No (like Custom Fields) -->
|
||||
<!-- Groups: one row per group with All / Yes / No (like Custom Fields) -->
|
||||
<div :if={length(@groups) > 0} class="mb-4">
|
||||
<div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
|
||||
{gettext("Groups")}
|
||||
|
|
@ -300,7 +300,7 @@ defmodule MvWeb.Components.MemberFilterComponent do
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Fee Types: one row per fee type with All / Yes / No (same style as Groups) -->
|
||||
<!-- Fee Types: one row per fee type with All / Yes / No (same style as Groups) -->
|
||||
<div :if={length(@fee_types) > 0} class="mb-4">
|
||||
<div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
|
||||
{gettext("Fee types")}
|
||||
|
|
@ -367,7 +367,7 @@ defmodule MvWeb.Components.MemberFilterComponent do
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Dates Group (built-in fields: exit_date with mode selector, join_date range) -->
|
||||
<!-- Dates Group (built-in fields: exit_date with mode selector, join_date range) -->
|
||||
<div class="mb-4">
|
||||
<div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
|
||||
{gettext("Dates")}
|
||||
|
|
@ -485,7 +485,7 @@ defmodule MvWeb.Components.MemberFilterComponent do
|
|||
</fieldset>
|
||||
</div>
|
||||
|
||||
<!-- Custom Date Fields Group (in-memory filter; one row per :date custom field) -->
|
||||
<!-- Custom Date Fields Group (in-memory filter; one row per :date custom field) -->
|
||||
<div :if={length(@date_custom_fields) > 0} class="mb-4">
|
||||
<div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
|
||||
{gettext("Custom date fields")}
|
||||
|
|
@ -524,7 +524,7 @@ defmodule MvWeb.Components.MemberFilterComponent do
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Custom Fields Group -->
|
||||
<!-- Custom Fields Group -->
|
||||
<div :if={length(@boolean_custom_fields) > 0} class="mb-2">
|
||||
<div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
|
||||
{gettext("Individual datafields")}
|
||||
|
|
@ -591,7 +591,7 @@ defmodule MvWeb.Components.MemberFilterComponent do
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Footer -->
|
||||
<!-- Footer -->
|
||||
<div class="mt-4 flex justify-between pt-3 border-t border-base-200">
|
||||
<.button
|
||||
type="button"
|
||||
|
|
|
|||
|
|
@ -103,8 +103,7 @@
|
|||
sort_field={@sort_field}
|
||||
sort_order={@sort_order}
|
||||
>
|
||||
|
||||
<!-- <:col :let={member} label="Id">{member.id}</:col> -->
|
||||
<!-- <:col :let={member} label="Id">{member.id}</:col> -->
|
||||
<:col
|
||||
:let={member}
|
||||
col_click={&MvWeb.MemberLive.Index.checkbox_column_click/1}
|
||||
|
|
|
|||
|
|
@ -152,11 +152,9 @@ defmodule MvWeb.StatisticsLive do
|
|||
<p class="text-xs text-base-content/70 mt-2">
|
||||
<span class="inline-block w-2 h-2 rounded-full bg-success align-middle mr-1"></span>
|
||||
{gettext("Paid")}
|
||||
<span class="inline-block w-2 h-2 rounded-full bg-warning align-middle mx-2 mr-1">
|
||||
</span>
|
||||
<span class="inline-block w-2 h-2 rounded-full bg-warning align-middle mx-2 mr-1"></span>
|
||||
{gettext("Unpaid")}
|
||||
<span class="inline-block w-2 h-2 rounded-full bg-base-content/20 align-middle mx-2 mr-1">
|
||||
</span>
|
||||
<span class="inline-block w-2 h-2 rounded-full bg-base-content/20 align-middle mx-2 mr-1"></span>
|
||||
{gettext("Suspended")}
|
||||
</p>
|
||||
</div>
|
||||
|
|
@ -271,8 +269,7 @@ defmodule MvWeb.StatisticsLive do
|
|||
class="inline-block w-2 h-2 rounded-full bg-success shrink-0"
|
||||
aria-hidden="true"
|
||||
title={gettext("Joins")}
|
||||
>
|
||||
</span>
|
||||
></span>
|
||||
</span>
|
||||
</td>
|
||||
<td class="align-middle text-xs font-mono text-base-content whitespace-nowrap pt-0">
|
||||
|
|
@ -282,8 +279,7 @@ defmodule MvWeb.StatisticsLive do
|
|||
class="inline-block w-2 h-2 rounded-full bg-error shrink-0"
|
||||
aria-hidden="true"
|
||||
title={gettext("Exits")}
|
||||
>
|
||||
</span>
|
||||
></span>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -437,8 +433,7 @@ defmodule MvWeb.StatisticsLive do
|
|||
class="inline-block w-2 h-2 rounded-full bg-success shrink-0"
|
||||
aria-hidden="true"
|
||||
title={gettext("Paid")}
|
||||
>
|
||||
</span>
|
||||
></span>
|
||||
</span>
|
||||
</td>
|
||||
<td class="align-middle text-xs font-mono text-base-content whitespace-nowrap pt-0">
|
||||
|
|
@ -448,8 +443,7 @@ defmodule MvWeb.StatisticsLive do
|
|||
class="inline-block w-2 h-2 rounded-full bg-warning shrink-0"
|
||||
aria-hidden="true"
|
||||
title={gettext("Unpaid")}
|
||||
>
|
||||
</span>
|
||||
></span>
|
||||
</span>
|
||||
</td>
|
||||
<td class="align-middle text-xs font-mono text-base-content whitespace-nowrap pt-0">
|
||||
|
|
@ -459,8 +453,7 @@ defmodule MvWeb.StatisticsLive do
|
|||
class="inline-block w-2 h-2 rounded-full bg-base-content/20 shrink-0"
|
||||
aria-hidden="true"
|
||||
title={gettext("Suspended")}
|
||||
>
|
||||
</span>
|
||||
></span>
|
||||
</span>
|
||||
</td>
|
||||
<td class="align-middle text-xs font-mono text-base-content whitespace-nowrap pt-0">
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ defmodule MvWeb.UserLive.Form do
|
|||
</div>
|
||||
<% end %>
|
||||
|
||||
<!-- Password Section -->
|
||||
<!-- Password Section -->
|
||||
<div class="mt-6">
|
||||
<label class="flex items-center space-x-2">
|
||||
<input
|
||||
|
|
@ -130,7 +130,7 @@ defmodule MvWeb.UserLive.Form do
|
|||
autocomplete="new-password"
|
||||
/>
|
||||
|
||||
<!-- Only show password confirmation for new users (register_with_password) -->
|
||||
<!-- Only show password confirmation for new users (register_with_password) -->
|
||||
<%= if !@user do %>
|
||||
<.input
|
||||
field={@form[:password_confirmation]}
|
||||
|
|
@ -181,7 +181,7 @@ defmodule MvWeb.UserLive.Form do
|
|||
<% end %>
|
||||
</div>
|
||||
|
||||
<!-- Member Linking Section (admin only: only admins can link/unlink users to members) -->
|
||||
<!-- Member Linking Section (admin only: only admins can link/unlink users to members) -->
|
||||
<%= if @can_manage_member_linking do %>
|
||||
<div class="mt-6">
|
||||
<h2 class="mb-3 text-base font-semibold">{gettext("Linked Member")}</h2>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue