kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ActionLink Improvements

Browse Source 
Adjustment to ActionLink component to support custom button classes.  Adjustment of all button styles inside of the project to swap to either btn-danger for delete operations or btn-secondary for cancel operations for consistency.
This commit is contained in:
Mitchel Sellers 2019-05-17 23:55:55 -05:00
parent 1e5df43e84
commit f8a048e5ac
10 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Login/Index.razor
View File

@ -21,7 +21,7 @@
<input type="password" name="Password" class="form-control" placeholder="Password" bind="@Password" /> <input type="password" name="Password" class="form-control" placeholder="Password" bind="@Password" />
</div> </div>
<button type="button" class="btn btn-primary" onclick="@Login">Login</button> <button type="button" class="btn btn-primary" onclick="@Login">Login</button>
<NavLink class="btn btn" href="/">Cancel</NavLink> <NavLink class="btn btn-secondary" href="/">Cancel</NavLink>
</div> </div>
@functions { @functions {

2
Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
View File

@ -64,7 +64,7 @@
</tr> </tr>
</table> </table>
<button class="btn btn-success" onclick="@SaveModule">Save</button> <button class="btn btn-success" onclick="@SaveModule">Save</button>
<NavLink class="btn btn" href="@NavigateUrl()">Cancel</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
@functions { @functions {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Edit; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Edit; } }

2
Oqtane.Client/Modules/Admin/Pages/Add.razor
View File

@ -113,7 +113,7 @@
</tr> </tr>
</table> </table>
<button class="btn btn-success" onclick="@SavePage">Save</button> <button class="btn btn-success" onclick="@SavePage">Save</button>
<NavLink class="btn btn" href="@NavigateUrl()">Cancel</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
@functions { @functions {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } }

4
Oqtane.Client/Modules/Admin/Pages/Delete.razor
View File

@ -112,8 +112,8 @@
</td> </td>
</tr> </tr>
</table> </table>
<button class="btn btn-success" onclick="@DeletePage">Delete</button> <button class="btn btn-danger" onclick="@DeletePage">Delete</button>
<NavLink class="btn btn" href="@NavigateUrl()">Cancel</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
@functions { @functions {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } }

2
Oqtane.Client/Modules/Admin/Pages/Edit.razor
View File

@ -113,7 +113,7 @@
</tr> </tr>
</table> </table>
<button class="btn btn-success" onclick="@SavePage">Save</button> <button class="btn btn-success" onclick="@SavePage">Save</button>
<NavLink class="btn btn" href="@NavigateUrl()">Cancel</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
@functions { @functions {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Admin; } }

2
Oqtane.Client/Modules/Admin/Pages/Index.razor
View File

@ -25,7 +25,7 @@ else
{ {
<tr> <tr>
<td><ActionLink Action="Edit" Parameters="@($"id=" + p.PageId.ToString())" /></td> <td><ActionLink Action="Edit" Parameters="@($"id=" + p.PageId.ToString())" /></td>
<td><ActionLink Action="Delete" Parameters="@($"id=" + p.PageId.ToString())" /></td> <td><ActionLink Action="Delete" Parameters="@($"id=" + p.PageId.ToString())" ButtonClass="btn-danger" /></td>
<td>@p.Path</td> <td>@p.Path</td>
<td>@p.Name</td> <td>@p.Name</td>
</tr> </tr>

2
Oqtane.Client/Modules/Admin/Register/Index.razor
View File

@ -18,7 +18,7 @@
<input type="password" name="Password" class="form-control" placeholder="Password" bind="@Password" /> <input type="password" name="Password" class="form-control" placeholder="Password" bind="@Password" />
</div> </div>
<button type="button" class="btn btn-primary">Register</button> <button type="button" class="btn btn-primary">Register</button>
<NavLink class="btn btn" href="/">Cancel</NavLink> <NavLink class="btn btn-secondary" href="/">Cancel</NavLink>
</div> </div>
@functions { @functions {

2
Oqtane.Client/Modules/Admin/Sites/Add.razor
View File

@ -26,7 +26,7 @@
</tr> </tr>
</table> </table>
<button class="btn btn-success" onclick="@SaveSite">Save</button> <button class="btn btn-success" onclick="@SaveSite">Save</button>
<NavLink class="btn btn" href="@NavigateUrl()">Cancel</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
@functions { @functions {
public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } } public override SecurityAccessLevelEnum SecurityAccessLevel { get { return SecurityAccessLevelEnum.Host; } }

13
Oqtane.Client/Modules/Controls/ActionLink.razor
View File

@ -7,7 +7,7 @@
@if (authorized) @if (authorized)
{ {
<NavLink class="btn btn-primary" href="@url">@text</NavLink> <NavLink class="@buttonClass" href="@url">@text</NavLink>
} }
@functions { @functions {
@ -20,9 +20,13 @@
[Parameter] [Parameter]
private string Parameters { get; set; } // optional private string Parameters { get; set; } // optional
[Parameter]
private string ButtonClass { get; set; } // optional
string text = ""; string text = "";
string url = ""; string url = "";
string parameters = ""; string parameters = "";
string buttonClass = "btn btn-primary";
bool authorized = false; bool authorized = false;
protected override void OnInit() protected override void OnInit()
@ -32,10 +36,17 @@
{ {
text = Text; text = Text;
} }
if (!String.IsNullOrEmpty(Parameters)) if (!String.IsNullOrEmpty(Parameters))
{ {
parameters = Parameters; parameters = Parameters;
} }
if (!string.IsNullOrEmpty(ButtonClass))
{
buttonClass = "btn " + ButtonClass;
}
url = EditUrl(Action, parameters); url = EditUrl(Action, parameters);
string typename = ModuleState.ModuleType.Replace(Utilities.GetTypeNameClass(ModuleState.ModuleType) + ",", Action + ","); string typename = ModuleState.ModuleType.Replace(Utilities.GetTypeNameClass(ModuleState.ModuleType) + ",", Action + ",");

2
Oqtane.Client/Modules/HtmlText/Edit.razor
View File

@ -20,7 +20,7 @@
</tr> </tr>
</table> </table>
<button class="btn btn-success" onclick="@SaveContent">Save</button> <button class="btn btn-success" onclick="@SaveContent">Save</button>
<NavLink class="btn btn" href="@NavigateUrl()">Cancel</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
</form> </form>
@functions { @functions {