Skip to content

Update ActionDialog Add method to ensure consistent button sizing #4998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 22, 2025
Merged

Update ActionDialog Add method to ensure consistent button sizing #4998

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6cf77e
Update ActionDialog Add method to ensure consistent button sizing
leigh-pointer Jan 17, 2025
f724389
Merge remote-tracking branch 'upstream/dev' into ActionDialogSize
leigh-pointer Jan 22, 2025
af6ed78
Update ActionDialog.razor
leigh-pointer Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 30 additions & 5 deletions Oqtane.Client/Modules/Controls/ActionDialog.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<div class="modal-footer">
@if (!string.IsNullOrEmpty(Action))
{
<button type="button" class="@Class" @onclick="Confirm">@((MarkupString)_iconSpan) @Text</button>
<button type="button" class="@ConfirmClass" @onclick="Confirm">@((MarkupString)_iconSpan) @Text</button>
}
<button type="button" class="btn btn-secondary" @onclick="DisplayModal">@SharedLocalizer["Cancel"]</button>
<button type="button" class="@CancelClass" @onclick="DisplayModal">@SharedLocalizer["Cancel"]</button>
</div>
</div>
</div>
Expand Down Expand Up @@ -66,12 +66,12 @@ else
{
<form method="post" @formname="@($"ActionDialogConfirmForm:{ModuleState.PageModuleId}:{Id}")" @onsubmit="Confirm" data-enhance>
<input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
<button type="submit" class="@Class">@((MarkupString)_iconSpan) @Text</button>
<button type="submit" class="@ConfirmClass">@((MarkupString)_iconSpan) @Text</button>
</form>
}
<form method="post" @formname="@($"ActionDialogCancelForm:{ModuleState.PageModuleId}:{Id}")" @onsubmit="DisplayModal" data-enhance>
<input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
<button type="submit" class="btn btn-secondary">@SharedLocalizer["Cancel"]</button>
<button type="submit" class="@CancelClass">@SharedLocalizer["Cancel"]</button>
</form>
</div>
</div>
Expand Down Expand Up @@ -128,6 +128,12 @@ else
[Parameter]
public string Class { get; set; } // optional
[Parameter]
public string ConfirmClass { get; set; } // optional - for Confirm modal button
[Parameter]
public string CancelClass { get; set; } // optional - for Cancel modal button
[Parameter]
public bool Disabled { get; set; } // optional
Expand Down Expand Up @@ -168,6 +174,16 @@ else
Class = "btn btn-success";
}

if (string.IsNullOrEmpty(ConfirmClass))
{
ConfirmClass = Class;
}

if (string.IsNullOrEmpty(CancelClass))
{
CancelClass = "btn btn-secondary";
}

if (!string.IsNullOrEmpty(EditMode))
{
_editmode = bool.Parse(EditMode);
Expand Down Expand Up @@ -196,7 +212,7 @@ else
_openIconSpan = $"<span class=\"{IconName}\"></span>{(IconOnly ? "" : "&nbsp")}";
_iconSpan = $"<span class=\"{IconName}\"></span>&nbsp";
}

_permissions = (PermissionList == null) ? ModuleState.PermissionList : PermissionList;
_authorized = IsAuthorized();

Expand All @@ -207,6 +223,15 @@ else
_visible = (PageState.QueryString["dialog"] == Id);
}
}
/// <summary>
/// Checks the Class that is used for the Action Button, if it is small make the Cancel Button small as well.
/// </summary>
/// <param name="Class"></param>
/// <returns></returns>
private string GetButtonSize()
{
return Class.Contains("btn-sm", StringComparison.OrdinalIgnoreCase) ? "btn-sm" : string.Empty;
}

private bool IsAuthorized()
{
Expand Down