From 95bb039c0fa78704c161a4380620206032bff0b6 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 17 Nov 2018 18:16:55 +0100
Subject: [PATCH] #275 - rename "automatic update" to "automatic update search;
added new item to navbar that indicates an available update
---
.../budgetmaster/services/HelpersService.java | 5 +++++
src/main/resources/languages/_de.properties | 3 ++-
src/main/resources/languages/_en.properties | 3 ++-
src/main/resources/static/css/dark/style.css | 17 +++++++++++++++++
src/main/resources/static/css/style.css | 4 ++++
src/main/resources/templates/navbar.ftl | 11 ++++++++++-
6 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
index 77dc12055..0ec2ac00d 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
@@ -280,4 +280,9 @@ public class HelpersService
{
return categoryRepository.findByType(CategoryType.NONE).getID();
}
+
+ public boolean isUpdateAvailable()
+ {
+ return true;
+ }
}
\ No newline at end of file
diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties
index debb0381d..f04b60475 100644
--- a/src/main/resources/languages/_de.properties
+++ b/src/main/resources/languages/_de.properties
@@ -120,6 +120,7 @@ menu.settings.database=Datenbank
menu.about=�ber
menu.logout=Logout
menu.accounts=Konten
+menu.update=Update verf�gbar
category.new.label.name=Name
@@ -133,7 +134,7 @@ settings.darkTheme=Oberfl
settings.darkTheme.deactivated=Hell
settings.darkTheme.activated=Dunkel
settings.language=Sprache
-settings.updates=Automatische Updates
+settings.updates=Automatische Updatesuche
settings.updates.automatic.deactivated=Aus
settings.updates.automatic.activated=An
settings.updates.search=Suchen
diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties
index 867560199..ff5fba38b 100644
--- a/src/main/resources/languages/_en.properties
+++ b/src/main/resources/languages/_en.properties
@@ -121,6 +121,7 @@ menu.settings.database=Database
menu.about=About
menu.logout=Logout
menu.accounts=Accounts
+menu.update=Update available
category.new.label.name=Name
@@ -134,7 +135,7 @@ settings.darkTheme=Theme
settings.darkTheme.deactivated=Light
settings.darkTheme.activated=Dark
settings.language=Language
-settings.updates=Automatic Updates
+settings.updates=Automatic Update Search
settings.updates.automatic.deactivated=Off
settings.updates.automatic.activated=On
settings.updates.search=Search
diff --git a/src/main/resources/static/css/dark/style.css b/src/main/resources/static/css/dark/style.css
index 33ac83f39..8fc199f01 100644
--- a/src/main/resources/static/css/dark/style.css
+++ b/src/main/resources/static/css/dark/style.css
@@ -99,6 +99,14 @@ main {
color: rgba(0, 0, 0, 0.87);
}
+.budgetmaster-update {
+ background-color: #fcf7b6;
+}
+
+.budgetmaster-text-update {
+ color: #212121 !important;
+}
+
.side-nav, .side-nav-sub{
background-color: #444444;
}
@@ -109,12 +117,21 @@ main {
.side-nav li > a:hover, .side-nav-sub li > a:hover {
background-color: rgba(255, 255, 255, 0.1) !important;
+ color: #FFFFFF !important;
}
.side-nav li > a > i, .side-nav-sub li > a > i{
color: #FFFFFF !important;
}
+.side-nav li > a #icon-update {
+ color: #212121 !important;
+}
+
+.side-nav li > a:hover #icon-update {
+ color: #FFFFFF !important;
+}
+
.side-nav li.active {
background-color: rgba(255, 255, 255, 0.25);
}
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index 08a95bf33..b97f2acbf 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -98,6 +98,10 @@ main {
color: rgba(0,0,0,0.87);
}
+.budgetmaster-update {
+ background-color: #fcf7b6;
+}
+
.side-nav li.active {
background-color: rgba(0, 0, 0, 0.15);
}
diff --git a/src/main/resources/templates/navbar.ftl b/src/main/resources/templates/navbar.ftl
index 2d568a762..a2e423b53 100644
--- a/src/main/resources/templates/navbar.ftl
+++ b/src/main/resources/templates/navbar.ftl
@@ -25,6 +25,11 @@
<@itemDivider/>
<@itemWithIcon "logout", "javascript:\" onclick=\"$('#logout-form').submit();\"", locale.getString("menu.logout") "lock", "budgetmaster-red", activeID/>
+
+ <#if helpers.isUpdateAvailable()>
+ <@itemDivider/>
+ <@itemUpdate "/update", locale.getString("menu.update"), "system_update"/>
+ </#if>
</ul>
<a href="#" data-activates="slide-out" id="mobile-menu" class="mobile-menu"><i class="material-icons left mobile-menu-icon">menu</i>Menü</a>
<div class="hide-on-large-only"><br></div>
@@ -80,7 +85,11 @@
<li class="active"><a href="${link}" class="waves-effect no-padding"><div class="stripe ${activeColor}"></div><i class="material-icons">${icon}</i>${text}</a></li>
<#else>
<li><a href="${link}" class="waves-effect"><i class="material-icons">${icon}</i>${text}</a></li>
-</#if>
+ </#if>
+</#macro>
+
+<#macro itemUpdate link text icon>
+ <li><a href="${link}" class="waves-effect budgetmaster-update budgetmaster-text-update"><i class="material-icons" id="icon-update">${icon}</i>${text}</a></li>
</#macro>
<#macro subListStart ID text icon activeColor activeID>
--
GitLab