Merge pull request #10 from bbortt/feature/fancy_theme

Feature/fancy theme
bbortt · Dec 13, 2016 · 368118e · 368118e
2 parents e309b10 + 879c89e
commit 368118e
Show file tree

Hide file tree

Showing 67 changed files with 1,021 additions and 1,869 deletions.
diff --git a/conf/application.properties b/conf/application.properties
@@ -1,5 +1,6 @@
 application.display.name=VMLauncher 2.0
-application.display.theme=starter-theme
+application.display.themes.folder=resources/themes
+application.display.themes.current=Color-Splash Theme
 
 application.modules.launcher=true
 application.modules.backup=true

diff --git a/conf/log4j.properties b/conf/log4j.properties
@@ -5,10 +5,7 @@ log4j.rootLogger=INFO, application, error, stdout
 log4j.appender.application=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.application.file=log/application.log
 log4j.appender.application.Threshold=DEBUG
-#log4j.appender.application.MaxFileSize=10MB
-#log4j.appender.application.MaxBackupIndex=10
 log4j.appender.application.DatePattern='.'yyyy-MM-dd-HH-mm
-#log4j.appender.application.RollingPolicy=org.apache.log4j.rolling.TimeBasedRollingPolicy
 log4j.appender.application.RollingPolicy.FileNamePattern=log/application.log.%d{yyyy-MM-dd-HH-mm-ss}
 log4j.appender.application.layout=org.apache.log4j.PatternLayout
 log4j.appender.application.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
@@ -17,10 +14,7 @@ log4j.appender.application.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p
 log4j.appender.error=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.error.file=log/error.log
 log4j.appender.error.Threshold=ERROR
-#log4j.appender.error.MaxFileSize=10MB
-#log4j.appender.error.MaxBackupIndex=10
 log4j.appender.error.DatePattern='.'yyyy-MM-dd-HH-mm
-#log4j.appender.error.RollingPolicy=org.apache.log4j.rolling.TimeBasedRollingPolicy
 log4j.appender.error.RollingPolicy.FileNamePattern=log/error.log.%d{yyyy-MM-dd-HH-mm-ss}
 log4j.appender.error.layout=org.apache.log4j.PatternLayout
 log4j.appender.error.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n

diff --git a/resources/default material-design/backup_view.html b/resources/default material-design/backup_view.html
diff --git a/resources/default material-design/create_session_view.html b/resources/default material-design/create_session_view.html