Skip to content
Snippets Groups Projects
Commit 5105ad8a authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#563 - refactoring: use button macros on chart pages

parent b0b895d0
No related branches found
No related tags found
No related merge requests found
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
<#import "../helpers/header.ftl" as header>
<#function getChartName chart> <#function getChartName chart>
<#if chart?? && chart.getName()??> <#if chart?? && chart.getName()??>
...@@ -26,11 +27,11 @@ ...@@ -26,11 +27,11 @@
</#macro> </#macro>
<#macro buttonNew> <#macro buttonNew>
<a href="<@s.url '/charts/newChart'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">add</i>${locale.getString("title.chart.new")}</a> <@header.buttonLink url='/charts/newChart' icon='add' localizationKey='title.chart.new'/>
</#macro> </#macro>
<#macro buttonShow> <#macro buttonShow>
<a href="<@s.url '/charts'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">show_chart</i>${locale.getString("home.menu.charts.action.show")}</a> <@header.buttonLink url='/charts' icon='show_chart' localizationKey='home.menu.charts.action.show'/>
</#macro> </#macro>
<#macro buttons> <#macro buttons>
......
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
<i class="material-icons">show_chart</i> ${locale.getString("title.charts")}</div> <i class="material-icons">show_chart</i> ${locale.getString("title.charts")}</div>
</div> </div>
</div> </div>
<br> <br>
<div class="center-align"> <div class="center-align"><@header.buttonLink url='/charts/manage' icon='edit' localizationKey='home.menu.charts.action.manage'/></div>
<a href="<@s.url '/charts/manage'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">edit</i>${locale.getString("home.menu.charts.action.manage")}
</a></div>
<br> <br>
<div class="container"> <div class="container">
<form name="NewChartSettings" action="<@s.url '/charts'/>" method="post"> <form name="NewChartSettings" action="<@s.url '/charts'/>" method="post">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/> <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
......
...@@ -72,26 +72,22 @@ ...@@ -72,26 +72,22 @@
<#-- buttons --> <#-- buttons -->
<div class="row hide-on-small-only"> <div class="row hide-on-small-only">
<div class="col s6 right-align"> <div class="col s6 right-align">
<a href="<@s.url '/charts/manage'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> <@header.buttonLink url='/charts/manage' icon='clear' localizationKey='cancel'/>
</div> </div>
<div class="col s6 left-align"> <div class="col s6 left-align">
<button class="btn waves-effect waves-light background-blue" type="submit" name="action" <#if (chart.getType().name() == "DEFAULT")>disabled</#if>> <@header.buttonSubmit name='action' icon='save' localizationKey='save' id='button-save-account' disabled=(chart.getType().name() == "DEFAULT")/>
<i class="material-icons left">save</i>${locale.getString("save")}
</button>
</div> </div>
</div> </div>
<div class="hide-on-med-and-up"> <div class="hide-on-med-and-up">
<div class="row center-align"> <div class="row center-align">
<div class="col s12"> <div class="col s12">
<a href="<@s.url '/charts/manage'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> <@header.buttonLink url='/charts/manage' icon='clear' localizationKey='cancel'/>
</div> </div>
</div> </div>
<div class="row center-align"> <div class="row center-align">
<div class="col s12"> <div class="col s12">
<button class="btn waves-effect waves-light background-blue" type="submit" name="buttonSave" <#if (chart.getType().name() == "DEFAULT")>disabled</#if>> <@header.buttonSubmit name='action' icon='save' localizationKey='save' id='button-save-account' disabled=(chart.getType().name() == "DEFAULT")/>
<i class="material-icons left">save</i>${locale.getString("save")}
</button>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -64,8 +64,8 @@ ...@@ -64,8 +64,8 @@
<a href="<@s.url url/>" id="${id}" class="waves-effect waves-light btn ${color} ${classes}"><i class="material-icons left">${icon}</i>${locale.getString(localizationKey)}</a> <a href="<@s.url url/>" id="${id}" class="waves-effect waves-light btn ${color} ${classes}"><i class="material-icons left">${icon}</i>${locale.getString(localizationKey)}</a>
</#macro> </#macro>
<#macro buttonSubmit name icon localizationKey id="" color="background-blue" classes=""> <#macro buttonSubmit name icon localizationKey id="" color="background-blue" classes="" disabled=false>
<button id="${id}" class="btn waves-effect waves-light ${color} ${classes}" type="submit" name="${name}"> <button id="${id}" class="btn waves-effect waves-light ${color} ${classes}" type="submit" name="${name}" <#if disabled>disabled</#if>>
<i class="material-icons left">${icon}</i>${locale.getString(localizationKey)} <i class="material-icons left">${icon}</i>${locale.getString(localizationKey)}
</button> </button>
</#macro> </#macro>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment