diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java index 77dc12055ee344c81e5df12fee09c0c6adf93590..0ec2ac00da18030c4fe2a10bb19e0cb9e3e56378 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 debb0381d57d8622e96f606518b86e72d0b8d3f7..f04b6047531720b0125a390795fccd7cb795ca4d 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 8675601996ff24209f5e962f1b598322441c0e00..ff5fba38b415740d82589d5301e202b5982718a7 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 33ac83f39db7347d07906d4cc6693fe589397124..8fc199f0111415cefd81afaab1c9410e96555938 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 08a95bf33518007438609e720571712d2884f23d..b97f2acbf0944b140147064ba667773be09626c4 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 2d568a762864fee4cd1d34f2f4e1e29fb136a8a4..a2e423b53a3a02851a32fccfdfc95e551affea0c 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>