From cd21b56f3282cc9de4e9ba6ba4548f58c002dd04 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 8 Dec 2018 11:07:46 +0100
Subject: [PATCH] Fixed #369 - Fixed button layout on all pages
---
.../templates/accounts/newAccount.ftl | 4 +-
.../templates/categories/newCategory.ftl | 4 +-
src/main/resources/templates/settings.ftl | 48 +++++++++----------
.../templates/transactions/newTransaction.ftl | 37 ++++++++++++--
4 files changed, 59 insertions(+), 34 deletions(-)
diff --git a/src/main/resources/templates/accounts/newAccount.ftl b/src/main/resources/templates/accounts/newAccount.ftl
index a48f319f6..ad051018b 100644
--- a/src/main/resources/templates/accounts/newAccount.ftl
+++ b/src/main/resources/templates/accounts/newAccount.ftl
@@ -32,11 +32,11 @@
<#-- buttons -->
<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>
</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">
<i class="material-icons left">save</i>${locale.getString("save")}
</button>
diff --git a/src/main/resources/templates/categories/newCategory.ftl b/src/main/resources/templates/categories/newCategory.ftl
index d54c406aa..f05186905 100644
--- a/src/main/resources/templates/categories/newCategory.ftl
+++ b/src/main/resources/templates/categories/newCategory.ftl
@@ -64,11 +64,11 @@
<#-- buttons -->
<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>
</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">
<i class="material-icons left">save</i>${locale.getString("save")}
</button>
diff --git a/src/main/resources/templates/settings.ftl b/src/main/resources/templates/settings.ftl
index 984f6445d..323d53148 100644
--- a/src/main/resources/templates/settings.ftl
+++ b/src/main/resources/templates/settings.ftl
@@ -127,7 +127,7 @@
<#-- buttons -->
<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">
<i class="material-icons left">save</i>${locale.getString("save")}
</button>
@@ -143,38 +143,36 @@
<div class="headline">${locale.getString("menu.settings.database")}</div>
</div>
</div>
- <div class="container">
- <div class="row hide-on-small-only">
- <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>
- </div>
+ <div class="row hide-on-small-only">
+ <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>
+ </div>
- <div class="col m4 l4 center-align">
- <a href="/settings/database/requestExport" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">cloud_download</i>${locale.getString("settings.database.export")}</a>
- </div>
+ <div class="col m4 l4 center-align">
+ <a href="/settings/database/requestExport" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">cloud_download</i>${locale.getString("settings.database.export")}</a>
+ </div>
- <div class="col m4 l4 center-align">
- <a href="/settings/database/requestDelete" class="waves-effect waves-light btn budgetmaster-red"><i class="material-icons left">delete_forever</i>${locale.getString("settings.database.delete")}</a>
- </div>
+ <div class="col m4 l4 center-align">
+ <a href="/settings/database/requestDelete" class="waves-effect waves-light btn budgetmaster-red"><i class="material-icons left">delete_forever</i>${locale.getString("settings.database.delete")}</a>
</div>
+ </div>
- <div class="hide-on-med-and-up">
- <div class="row center-align">
- <div class="col s12">
- <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>
- </div>
+ <div class="hide-on-med-and-up">
+ <div class="row center-align">
+ <div class="col s12">
+ <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>
</div>
+ </div>
- <div class="row center-align">
- <div class="col s12">
- <a href="/settings/database/requestExport" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">cloud_download</i>${locale.getString("settings.database.export")}</a>
- </div>
+ <div class="row center-align">
+ <div class="col s12">
+ <a href="/settings/database/requestExport" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">cloud_download</i>${locale.getString("settings.database.export")}</a>
</div>
+ </div>
- <div class="row center-align">
- <div class="col s12">
- <a href="/settings/database/requestDelete" class="waves-effect waves-light btn budgetmaster-red"><i class="material-icons left">delete_forever</i>${locale.getString("settings.database.delete")}</a>
- </div>
+ <div class="row center-align">
+ <div class="col s12">
+ <a href="/settings/database/requestDelete" class="waves-effect waves-light btn budgetmaster-red"><i class="material-icons left">delete_forever</i>${locale.getString("settings.database.delete")}</a>
</div>
</div>
</div>
diff --git a/src/main/resources/templates/transactions/newTransaction.ftl b/src/main/resources/templates/transactions/newTransaction.ftl
index d6c384b21..8ba13b759 100644
--- a/src/main/resources/templates/transactions/newTransaction.ftl
+++ b/src/main/resources/templates/transactions/newTransaction.ftl
@@ -28,9 +28,9 @@
<#-- isPayment switch -->
<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="col m6 l4 offset-l2 right-align">
+ <div class="col s6 right-align">
<#assign isPayment = 1>
<#if transaction.getAmount()?? && (transaction.getAmount() > 0)>
@@ -41,7 +41,7 @@
</#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 class="col m6 l4 left-align">
+ <div class="col s6 left-align">
<#if transaction.getAmount()?? && (transaction.getAmount() > 0)>
<#assign colorButtonExpenditure = "budgetmaster-grey budgetmaster-text-isPayment">
<#else>
@@ -51,6 +51,33 @@
</div>
<input type="hidden" name="isPayment" id="input-isPayment" value="${isPayment}">
</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>
@@ -268,11 +295,11 @@
<#-- buttons -->
<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>
</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">
<i class="material-icons left">save</i>${locale.getString("save")}
</button>
--
GitLab