#275 - rename "automatic update" to "automatic update search; added new item...

#275 - rename "automatic update" to "automatic update search; added new item to navbar that indicates an available update

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

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 verfgbar
 
 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

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

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);
 }

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);
 }

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>
@@ -83,6 +88,10 @@
     </#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>
 <li>
     <ul class="collapsible collapsible-accordion no-padding side-nav-sub">