From bfe96780481ec14442b8893fbb594db9be2e94fe Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sat, 20 Feb 2021 10:44:26 +0100 Subject: [PATCH] #563 - refactoring: use button macros on account pages --- src/main/resources/templates/accounts/accounts.ftl | 2 +- src/main/resources/templates/accounts/newAccount.ftl | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/resources/templates/accounts/accounts.ftl b/src/main/resources/templates/accounts/accounts.ftl index 9eae61547..604721dd3 100644 --- a/src/main/resources/templates/accounts/accounts.ftl +++ b/src/main/resources/templates/accounts/accounts.ftl @@ -17,7 +17,7 @@ </div> </div> <br> - <div class="center-align"><a href="<@s.url '/accounts/newAccount'/>" id="button-new-account" class="waves-effect waves-light btn background-blue"><i class="material-icons left">add</i>${locale.getString("title.account.new")}</a></div> + <div class="center-align"><@header.buttonLink url='/accounts/newAccount' icon='add' localizationKey='title.account.new' id='button-new-account'/></div> <br> <div class="container account-container"> <table class="bordered"> diff --git a/src/main/resources/templates/accounts/newAccount.ftl b/src/main/resources/templates/accounts/newAccount.ftl index 3b64c0b29..4ad99ca15 100644 --- a/src/main/resources/templates/accounts/newAccount.ftl +++ b/src/main/resources/templates/accounts/newAccount.ftl @@ -45,26 +45,22 @@ <#-- buttons --> <div class="row hide-on-small-only"> <div class="col s6 right-align"> - <a href="<@s.url '/accounts'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> + <@header.buttonLink url='/accounts' icon='clear' localizationKey='cancel'/> </div> <div class="col s6 left-align"> - <button id="button-save-account" class="btn waves-effect waves-light background-blue" type="submit" name="action"> - <i class="material-icons left">save</i>${locale.getString("save")} - </button> + <@header.buttonSubmit name='action' icon='save' localizationKey='save' id='button-save-account'/> </div> </div> <div class="hide-on-med-and-up"> <div class="row center-align"> <div class="col s12"> - <a href="<@s.url '/accounts'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> + <@header.buttonLink url='/accounts' icon='clear' localizationKey='cancel'/> </div> </div> <div class="row center-align"> <div class="col s12"> - <button id="button-save-account" class="btn waves-effect waves-light background-blue" type="submit" name="buttonSave"> - <i class="material-icons left">save</i>${locale.getString("save")} - </button> + <@header.buttonSubmit name='action' icon='save' localizationKey='save' id='button-save-account'/> </div> </div> </div> -- GitLab