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

Fixed #369 - Fixed button layout on all pages

parent 2068a099
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/main/resources/templates/accounts/newAccount.ftl
+ 2
− 2
View file @ cd21b56f
...@@ -32,11 +32,11 @@ ...@@ -32,11 +32,11 @@
<#-- buttons --> <#-- buttons -->
<div class="row hide-on-small-only"> <div class="row hide-on-small-only">
<div class="col m6 l4 offset-l2 right-align"> <div class="col s6 right-align">
<a href="/accounts" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> <a href="/accounts" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a>
</div> </div>
<div class="col m6 l4 left-align"> <div class="col s6 left-align">
<button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action"> <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action">
<i class="material-icons left">save</i>${locale.getString("save")} <i class="material-icons left">save</i>${locale.getString("save")}
</button> </button>
......
src/main/resources/templates/categories/newCategory.ftl
+ 2
− 2
View file @ cd21b56f
...@@ -64,11 +64,11 @@ ...@@ -64,11 +64,11 @@
<#-- buttons --> <#-- buttons -->
<div class="row hide-on-small-only"> <div class="row hide-on-small-only">
<div class="col m6 l4 offset-l2 right-align"> <div class="col s6 right-align">
<a href="/categories" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> <a href="/categories" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a>
</div> </div>
<div class="col m6 l4 left-align"> <div class="col s6 left-align">
<button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action"> <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action">
<i class="material-icons left">save</i>${locale.getString("save")} <i class="material-icons left">save</i>${locale.getString("save")}
</button> </button>
......
src/main/resources/templates/settings.ftl
+ 23
− 25
View file @ cd21b56f
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<#-- buttons --> <#-- buttons -->
<div class="row"> <div class="row">
<div class="col s12 m12 l4 offset-l4 center-align"> <div class="col s12 center-align">
<button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action"> <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action">
<i class="material-icons left">save</i>${locale.getString("save")} <i class="material-icons left">save</i>${locale.getString("save")}
</button> </button>
...@@ -143,7 +143,6 @@ ...@@ -143,7 +143,6 @@
<div class="headline">${locale.getString("menu.settings.database")}</div> <div class="headline">${locale.getString("menu.settings.database")}</div>
</div> </div>
</div> </div>
<div class="container">
<div class="row hide-on-small-only"> <div class="row hide-on-small-only">
<div class="col m4 l4 center-align"> <div class="col m4 l4 center-align">
<a href="/settings/database/requestImport" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">cloud_upload</i>${locale.getString("settings.database.import")}</a> <a href="/settings/database/requestImport" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">cloud_upload</i>${locale.getString("settings.database.import")}</a>
...@@ -178,7 +177,6 @@ ...@@ -178,7 +177,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</main> </main>
<#if deleteDatabase??> <#if deleteDatabase??>
......
src/main/resources/templates/transactions/newTransaction.ftl
+ 32
− 5
View file @ cd21b56f
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
<#-- isPayment switch --> <#-- isPayment switch -->
<div class="row"> <div class="row">
<div class="col s12 m12 l8 offset-l2 center-align"> <div class="col s12 center-align">
<div class="row hide-on-small-only"> <div class="row hide-on-small-only">
<div class="col m6 l4 offset-l2 right-align"> <div class="col s6 right-align">
<#assign isPayment = 1> <#assign isPayment = 1>
<#if transaction.getAmount()?? && (transaction.getAmount() > 0)> <#if transaction.getAmount()?? && (transaction.getAmount() > 0)>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</#if> </#if>
<a class="waves-effect waves-light btn ${colorButtonIncome}" id="buttonIncome"><i class="material-icons left">file_download</i>${locale.getString("title.income")}</a> <a class="waves-effect waves-light btn ${colorButtonIncome}" id="buttonIncome"><i class="material-icons left">file_download</i>${locale.getString("title.income")}</a>
</div> </div>
<div class="col m6 l4 left-align"> <div class="col s6 left-align">
<#if transaction.getAmount()?? && (transaction.getAmount() > 0)> <#if transaction.getAmount()?? && (transaction.getAmount() > 0)>
<#assign colorButtonExpenditure = "budgetmaster-grey budgetmaster-text-isPayment"> <#assign colorButtonExpenditure = "budgetmaster-grey budgetmaster-text-isPayment">
<#else> <#else>
...@@ -51,6 +51,33 @@ ...@@ -51,6 +51,33 @@
</div> </div>
<input type="hidden" name="isPayment" id="input-isPayment" value="${isPayment}"> <input type="hidden" name="isPayment" id="input-isPayment" value="${isPayment}">
</div> </div>
<div class="hide-on-med-and-up">
<div class="row center-align">
<div class="col s12">
<#assign isPayment = 1>
<#if transaction.getAmount()?? && (transaction.getAmount() > 0)>
<#assign colorButtonIncome = "budgetmaster-green">
<#assign isPayment = 0>
<#else>
<#assign colorButtonIncome = "budgetmaster-grey budgetmaster-text-isPayment">
</#if>
<a class="waves-effect waves-light btn ${colorButtonIncome}" id="buttonIncome"><i class="material-icons left">file_download</i>${locale.getString("title.income")}</a>
</div>
</div>
<div class="row center-align">
<div class="col s12">
<#if transaction.getAmount()?? && (transaction.getAmount() > 0)>
<#assign colorButtonExpenditure = "budgetmaster-grey budgetmaster-text-isPayment">
<#else>
<#assign colorButtonExpenditure = "budgetmaster-red">
</#if>
<a class="waves-effect waves-light btn ${colorButtonExpenditure}" id="buttonExpenditure"><i class="material-icons left">file_upload</i>${locale.getString("title.expenditure")}</a>
</div>
<input type="hidden" name="isPayment" id="input-isPayment" value="${isPayment}">
</div>
</div>
</div> </div>
</div> </div>
...@@ -268,11 +295,11 @@ ...@@ -268,11 +295,11 @@
<#-- buttons --> <#-- buttons -->
<div class="row hide-on-small-only"> <div class="row hide-on-small-only">
<div class="col m6 l4 offset-l2 right-align"> <div class="col s6 right-align">
<a href="/transactions" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> <a href="/transactions" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a>
</div> </div>
<div class="col m6 l4 left-align"> <div class="col s6 left-align">
<button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action"> <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action">
<i class="material-icons left">save</i>${locale.getString("save")} <i class="material-icons left">save</i>${locale.getString("save")}
</button> </button>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment