diff --git a/.travis.yml b/.travis.yml
index d39e7f9..dc863a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
language: scala
sudo: true
+jdk:
+ - oraclejdk8
script:
- sbt test
before_script:
@@ -14,40 +16,3 @@
- $HOME/.coursier
- $HOME/.embedmysql
- $HOME/.embedpostgresql
-matrix:
- include:
- - jdk: oraclejdk8
- addons:
- apt:
- packages:
- - libaio1
- - dist: trusty
- group: edge
- sudo: required
- jdk: oraclejdk9
- addons:
- apt:
- packages:
- - libaio1
- before_install:
- - cd ~
- - JDK9_URL=`curl http://jdk.java.net/9/ | grep "lin64JDK" | grep "tar.gz\"" | sed -e "s/\"/ /g" | awk '{print $5}'`
- - wget -O jdk-9_linux-x64_bin.tar.gz $JDK9_URL
- - tar -xzf jdk-9_linux-x64_bin.tar.gz
- - cd -
- script:
- # https://github.com/sbt/sbt/pull/2951
- - git clone https://github.com/retronym/java9-rt-export
- - cd java9-rt-export/
- - git checkout 1019a2873d057dd7214f4135e84283695728395d
- - jdk_switcher use oraclejdk8
- - sbt package
-# - jdk_switcher use oraclejdk9
- - export JAVA_HOME=~/jdk-9
- - PATH=$JAVA_HOME/bin:$PATH
- - java -version
- - mkdir -p $HOME/.sbt/0.13/java9-rt-ext; java -jar target/java9-rt-export-*.jar $HOME/.sbt/0.13/java9-rt-ext/rt.jar
- - jar tf $HOME/.sbt/0.13/java9-rt-ext/rt.jar | grep java/lang/Object
- - cd ..
- - wget https://raw.githubusercontent.com/paulp/sbt-extras/9ade5fa54914ca8aded44105bf4b9a60966f3ccd/sbt && chmod +x ./sbt
- - ./sbt -Dscala.ext.dirs=$HOME/.sbt/0.13/java9-rt-ext test
diff --git a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
index 7841721..54541f7 100644
--- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
@@ -63,7 +63,8 @@
"tls" -> trim(label("Enable TLS", optional(boolean()))),
"ssl" -> trim(label("Enable SSL", optional(boolean()))),
"keystore" -> trim(label("Keystore", optional(text())))
- )(Ldap.apply))
+ )(Ldap.apply)),
+ "skinName" -> trim(label("AdminLTE skin name", text(required)))
)(SystemSettings.apply).verifying { settings =>
Vector(
if(settings.ssh && settings.baseUrl.isEmpty){
diff --git a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
index 248d122..c73ed35 100644
--- a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
+++ b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
@@ -54,6 +54,7 @@
ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
}
}
+ props.setProperty(SkinName, settings.skinName.toString)
using(new java.io.FileOutputStream(GitBucketConf)){ out =>
props.store(out, null)
}
@@ -111,7 +112,8 @@
getOptionValue(props, LdapKeystore, None)))
} else {
None
- }
+ },
+ getValue(props, SkinName, "skin-blue")
)
}
}
@@ -136,7 +138,8 @@
useSMTP: Boolean,
smtp: Option[Smtp],
ldapAuthentication: Boolean,
- ldap: Option[Ldap]){
+ ldap: Option[Ldap],
+ skinName: String){
def baseUrl(request: HttpServletRequest): String = baseUrl.fold(request.baseUrl)(_.stripSuffix("/"))
def sshAddress:Option[SshAddress] =
@@ -219,6 +222,7 @@
private val LdapTls = "ldap.tls"
private val LdapSsl = "ldap.ssl"
private val LdapKeystore = "ldap.keystore"
+ private val SkinName = "skinName"
private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A = {
getSystemProperty(key).getOrElse(getEnvironmentVariable(key).getOrElse {
diff --git a/src/main/twirl/gitbucket/core/admin/system.scala.html b/src/main/twirl/gitbucket/core/admin/system.scala.html
index 4234243..4496e65 100644
--- a/src/main/twirl/gitbucket/core/admin/system.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/system.scala.html
@@ -1,5 +1,6 @@
@(info: Option[Any])(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.util.DatabaseConfig
+@import gitbucket.core.view.helpers
@gitbucket.core.html.main("System settings"){
@gitbucket.core.admin.html.menu("system"){
@gitbucket.core.helper.html.information(info)
@@ -344,6 +345,36 @@
*@
+
+
+
+
+
+
diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html
index 2324f6e..612491a 100644
--- a/src/main/twirl/gitbucket/core/main.scala.html
+++ b/src/main/twirl/gitbucket/core/main.scala.html
@@ -16,7 +16,7 @@
-
+
@@ -42,7 +42,7 @@
}
-
+