Merge pull request jaliss#489 from tro2102/master

jaliss · jaliss · commit 05826997086b · 2015-11-29T00:15:02.000-03:00
Add support for path to custom bootstrap css file
diff --git a/module-code/app/securesocial/core/services/RoutesService.scala b/module-code/app/securesocial/core/services/RoutesService.scala
@@ -90,6 +90,7 @@ trait RoutesService {
   def authenticationUrl(provider: String, redirectTo: Option[String] = None)(implicit req: RequestHeader): String
   def faviconPath: Call
   def jqueryPath: Call
+  def bootstrapCssPath: Call
   def customCssPath: Option[Call]
 }
 
@@ -104,9 +105,11 @@ object RoutesService {
 
     val FaviconKey = "securesocial.faviconPath"
     val JQueryKey = "securesocial.jqueryPath"
+    val BootstrapCssKey = "securesocial.bootstrapCssPath"
     val CustomCssKey = "securesocial.customCssPath"
     val DefaultFaviconPath = "images/favicon.png"
     val DefaultJqueryPath = "javascripts/jquery-1.7.1.min.js"
+    val DefaultBootstrapCssPath = "bootstrap/css/bootstrap.min.css"
 
     protected def absoluteUrl(call: Call)(implicit req: RequestHeader): String = {
       call.absoluteURL(IdentityProvider.sslEnabled)
@@ -182,6 +185,11 @@ object RoutesService {
      */
     override val jqueryPath = valueFor(JQueryKey, DefaultJqueryPath)
 
+    /**
+     * Loads the Bootstrap CSS file to use from configuration, using a default one if not provided
+     * @return the path to Bootstrap CSS file to use
+     */
+    override val bootstrapCssPath = valueFor(BootstrapCssKey, DefaultBootstrapCssPath)
     /**
      * Loads the Custom Css file to use from configuration. If there is none define, none will be used
      * @return Option containing a custom css file or None
diff --git a/module-code/app/securesocial/views/main.scala.html b/module-code/app/securesocial/views/main.scala.html
@@ -5,7 +5,7 @@
 <html>
     <head>
         <title>@title</title>
-        <link rel="stylesheet" media="screen" href="@securesocial.controllers.routes.Assets.at("bootstrap/css/bootstrap.min.css")">
+        <link rel="stylesheet" media="screen" href="@env.routes.bootstrapCssPath">
         <link rel="shortcut icon" type="image/png" href="@env.routes.faviconPath">
         @env.routes.customCssPath.map { customPath =>
             <link rel="stylesheet" media="screen" href="@customPath">
