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

#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
parent 8969198d
No related branches found
No related tags found
No related merge requests found
Pipeline #311 passed
...@@ -280,4 +280,9 @@ public class HelpersService ...@@ -280,4 +280,9 @@ public class HelpersService
{ {
return categoryRepository.findByType(CategoryType.NONE).getID(); return categoryRepository.findByType(CategoryType.NONE).getID();
} }
public boolean isUpdateAvailable()
{
return true;
}
} }
\ No newline at end of file
...@@ -120,6 +120,7 @@ menu.settings.database=Datenbank ...@@ -120,6 +120,7 @@ menu.settings.database=Datenbank
menu.about=ber menu.about=ber
menu.logout=Logout menu.logout=Logout
menu.accounts=Konten menu.accounts=Konten
menu.update=Update verfgbar
category.new.label.name=Name category.new.label.name=Name
...@@ -133,7 +134,7 @@ settings.darkTheme=Oberfl ...@@ -133,7 +134,7 @@ settings.darkTheme=Oberfl
settings.darkTheme.deactivated=Hell settings.darkTheme.deactivated=Hell
settings.darkTheme.activated=Dunkel settings.darkTheme.activated=Dunkel
settings.language=Sprache settings.language=Sprache
settings.updates=Automatische Updates settings.updates=Automatische Updatesuche
settings.updates.automatic.deactivated=Aus settings.updates.automatic.deactivated=Aus
settings.updates.automatic.activated=An settings.updates.automatic.activated=An
settings.updates.search=Suchen settings.updates.search=Suchen
......
...@@ -121,6 +121,7 @@ menu.settings.database=Database ...@@ -121,6 +121,7 @@ menu.settings.database=Database
menu.about=About menu.about=About
menu.logout=Logout menu.logout=Logout
menu.accounts=Accounts menu.accounts=Accounts
menu.update=Update available
category.new.label.name=Name category.new.label.name=Name
...@@ -134,7 +135,7 @@ settings.darkTheme=Theme ...@@ -134,7 +135,7 @@ settings.darkTheme=Theme
settings.darkTheme.deactivated=Light settings.darkTheme.deactivated=Light
settings.darkTheme.activated=Dark settings.darkTheme.activated=Dark
settings.language=Language settings.language=Language
settings.updates=Automatic Updates settings.updates=Automatic Update Search
settings.updates.automatic.deactivated=Off settings.updates.automatic.deactivated=Off
settings.updates.automatic.activated=On settings.updates.automatic.activated=On
settings.updates.search=Search settings.updates.search=Search
......
...@@ -99,6 +99,14 @@ main { ...@@ -99,6 +99,14 @@ main {
color: rgba(0, 0, 0, 0.87); color: rgba(0, 0, 0, 0.87);
} }
.budgetmaster-update {
background-color: #fcf7b6;
}
.budgetmaster-text-update {
color: #212121 !important;
}
.side-nav, .side-nav-sub{ .side-nav, .side-nav-sub{
background-color: #444444; background-color: #444444;
} }
...@@ -109,12 +117,21 @@ main { ...@@ -109,12 +117,21 @@ main {
.side-nav li > a:hover, .side-nav-sub li > a:hover { .side-nav li > a:hover, .side-nav-sub li > a:hover {
background-color: rgba(255, 255, 255, 0.1) !important; background-color: rgba(255, 255, 255, 0.1) !important;
color: #FFFFFF !important;
} }
.side-nav li > a > i, .side-nav-sub li > a > i{ .side-nav li > a > i, .side-nav-sub li > a > i{
color: #FFFFFF !important; 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 { .side-nav li.active {
background-color: rgba(255, 255, 255, 0.25); background-color: rgba(255, 255, 255, 0.25);
} }
......
...@@ -98,6 +98,10 @@ main { ...@@ -98,6 +98,10 @@ main {
color: rgba(0,0,0,0.87); color: rgba(0,0,0,0.87);
} }
.budgetmaster-update {
background-color: #fcf7b6;
}
.side-nav li.active { .side-nav li.active {
background-color: rgba(0, 0, 0, 0.15); background-color: rgba(0, 0, 0, 0.15);
} }
......
...@@ -25,6 +25,11 @@ ...@@ -25,6 +25,11 @@
<@itemDivider/> <@itemDivider/>
<@itemWithIcon "logout", "javascript:\" onclick=\"$('#logout-form').submit();\"", locale.getString("menu.logout") "lock", "budgetmaster-red", activeID/> <@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> </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> <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> <div class="hide-on-large-only"><br></div>
...@@ -83,6 +88,10 @@ ...@@ -83,6 +88,10 @@
</#if> </#if>
</#macro> </#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> <#macro subListStart ID text icon activeColor activeID>
<li> <li>
<ul class="collapsible collapsible-accordion no-padding side-nav-sub"> <ul class="collapsible collapsible-accordion no-padding side-nav-sub">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment