Merge pull request #4998 from leigh-pointer/ActionDialogSize
Update ActionDialog Add method to ensure consistent button sizing
This commit is contained in:
		| @ -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> | ||||
| @ -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> | ||||
| @ -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 | ||||
|  | ||||
| @ -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); | ||||
| @ -196,7 +212,7 @@ else | ||||
|             _openIconSpan = $"<span class=\"{IconName}\"></span>{(IconOnly ? "" : " ")}"; | ||||
|             _iconSpan = $"<span class=\"{IconName}\"></span> "; | ||||
|         } | ||||
|          | ||||
|  | ||||
|         _permissions = (PermissionList == null) ? ModuleState.PermissionList : PermissionList; | ||||
|         _authorized = IsAuthorized(); | ||||
|  | ||||
| @ -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() | ||||
|     { | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Shaun Walker
					Shaun Walker