Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #4998 from leigh-pointer/ActionDialogSize

Browse Source 
Update ActionDialog Add method to ensure consistent button sizing
This commit is contained in:
Shaun Walker
2025-01-22 07:42:04 -05:00
committed by GitHub
parent 9db2a55a5a af6ed78b8e
commit bd54ce5017
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Oqtane.Client/Modules/Controls/ActionDialog.razor
View File

@ -22,9 +22,9 @@
<div class="modal-footer"> <div class="modal-footer">
@if (!string.IsNullOrEmpty(Action)) @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> </div>
</div> </div>
@ -66,12 +66,12 @@ else
{ {
<form method="post" @formname="@($"ActionDialogConfirmForm:{ModuleState.PageModuleId}:{Id}")" @onsubmit="Confirm" data-enhance> <form method="post" @formname="@($"ActionDialogConfirmForm:{ModuleState.PageModuleId}:{Id}")" @onsubmit="Confirm" data-enhance>
<input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" /> <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>
} }
<form method="post" @formname="@($"ActionDialogCancelForm:{ModuleState.PageModuleId}:{Id}")" @onsubmit="DisplayModal" data-enhance> <form method="post" @formname="@($"ActionDialogCancelForm:{ModuleState.PageModuleId}:{Id}")" @onsubmit="DisplayModal" data-enhance>
<input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" /> <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> </form>
</div> </div>
</div> </div>
@ -128,6 +128,12 @@ else
[Parameter] [Parameter]
public string Class { get; set; } // optional 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] [Parameter]
public bool Disabled { get; set; } // optional public bool Disabled { get; set; } // optional
@ -168,6 +174,16 @@ else
Class = "btn btn-success"; Class = "btn btn-success";
} }
if (string.IsNullOrEmpty(ConfirmClass))
{
ConfirmClass = Class;
}
if (string.IsNullOrEmpty(CancelClass))
{
CancelClass = "btn btn-secondary";
}
if (!string.IsNullOrEmpty(EditMode)) if (!string.IsNullOrEmpty(EditMode))
{ {
_editmode = bool.Parse(EditMode); _editmode = bool.Parse(EditMode);
@ -207,6 +223,15 @@ else
_visible = (PageState.QueryString["dialog"] == Id); _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() private bool IsAuthorized()
{ {