From 4f2861ed36338365ec11c2c942e1792478bbd62a Mon Sep 17 00:00:00 2001 From: Leonid Vygovskiy Date: Sun, 28 Sep 2014 14:50:48 +0400 Subject: [PATCH 01/10] UserService works with trait GenericProfile instead of BasicProfile Reasons: 1. Scala doesn't allow to extends case class from case class. 2. Coding into interfaces is good OOP practices --- .../test/helpers/MockHttpService.scala | 4 +- module-code/test/helpers/package.scala | 4 +- .../test/scenarios/GoogleLoginSpec.scala | 49 ++++++++----------- module-code/test/scenarios/helpers/Api.scala | 26 +++++----- .../scenarios/helpers/TestUserService.scala | 26 +++++----- .../test/scenarios/helpers/package.scala | 8 +-- .../securesocial/core/OAuth1ClientSpec.scala | 44 ++++++++--------- .../securesocial/core/OAuth2ClientSpec.scala | 28 ++++------- .../scala/demo/test/ApplicationScenario.scala | 6 +-- samples/scala/demo/test/ApplicationSpec.scala | 8 +-- 10 files changed, 92 insertions(+), 111 deletions(-) diff --git a/module-code/test/helpers/MockHttpService.scala b/module-code/test/helpers/MockHttpService.scala index 5f5c6892b..eb1c2354b 100644 --- a/module-code/test/helpers/MockHttpService.scala +++ b/module-code/test/helpers/MockHttpService.scala @@ -1,7 +1,7 @@ package helpers import org.specs2.mock.Mockito -import play.api.http.{ContentTypeOf, Writeable, HeaderNames} +import play.api.http.{ ContentTypeOf, Writeable, HeaderNames } import play.api.libs.ws._ import play.api.http.Status._ import scala.concurrent.Future @@ -20,7 +20,7 @@ class MockHttpService extends Mockito with HttpService { val request = mock[WSRequestHolder].as(s"Request($hashCode)") val response = mock[Response].as(s"Response($hashCode") - val urls:collection.mutable.Buffer[String] = new collection.mutable.ArrayBuffer[String]() + val urls: collection.mutable.Buffer[String] = new collection.mutable.ArrayBuffer[String]() response.status returns OK response.header(HeaderNames.CONTENT_TYPE) returns Some("text/html;charset=UTF-8") diff --git a/module-code/test/helpers/package.scala b/module-code/test/helpers/package.scala index 058b17ce7..187144e5f 100644 --- a/module-code/test/helpers/package.scala +++ b/module-code/test/helpers/package.scala @@ -1,9 +1,9 @@ -import java.util.concurrent.{Executor, Executors} +import java.util.concurrent.{ Executor, Executors } import scala.concurrent.ExecutionContext package object helpers { class CurrentThreadExecutor extends Executor { - def execute(r:Runnable) { + def execute(r: Runnable) { r.run() } } diff --git a/module-code/test/scenarios/GoogleLoginSpec.scala b/module-code/test/scenarios/GoogleLoginSpec.scala index e6972fe1a..31c637fdc 100644 --- a/module-code/test/scenarios/GoogleLoginSpec.scala +++ b/module-code/test/scenarios/GoogleLoginSpec.scala @@ -2,12 +2,12 @@ package scenarios import org.specs2.mutable.Specification import org.specs2.mock.Mockito -import play.api.test.{FakeApplication, PlaySpecification, WithApplication} +import play.api.test.{ FakeApplication, PlaySpecification, WithApplication } -import scenarios.helpers.{TestGlobal, DemoUser, TestUserService} +import scenarios.helpers.{ TestGlobal, DemoUser, TestUserService } import securesocial.core.providers.GoogleProvider -import securesocial.core.{IdentityProvider, EventListener, RuntimeEnvironment} -import securesocial.core.services.{HttpService, UserService, RoutesService} +import securesocial.core.{ IdentityProvider, EventListener, RuntimeEnvironment } +import securesocial.core.services.{ HttpService, UserService, RoutesService } import play.api.libs.ws.WS.WSRequestHolder import org.specs2.matcher.Matcher import play.api.libs.ws.Response @@ -19,12 +19,11 @@ import java.io.File class GoogleLoginSpec extends PlaySpecification with Mockito { - - def hasCode:Matcher[Map[String,Seq[String]]]=(map:Map[String,Seq[String]])=>map must contain("code" -> Seq("code")) + def hasCode: Matcher[Map[String, Seq[String]]] = (map: Map[String, Seq[String]]) => map must contain("code" -> Seq("code")) "an application using secure social" should { - val testGlobal=new TestGlobal(new TestEnvironment(_httpService = mock[HttpService])) - val application: FakeApplication = FakeApplication(withGlobal = Some(testGlobal), additionalConfiguration = googleConfig ) - "log a valid google user" in new WithApplication(application){ + val testGlobal = new TestGlobal(new TestEnvironment(_httpService = mock[HttpService])) + val application: FakeApplication = FakeApplication(withGlobal = Some(testGlobal), additionalConfiguration = googleConfig) + "log a valid google user" in new WithApplication(application) { val _httpService: HttpService = mock[HttpService].as("_httpService") val userInfoHolder: WSRequestHolder = mock[WSRequestHolder].as("userInfoHolder") val userInfoResponse: Response = mock[Response].as("userInfoResponse") @@ -32,7 +31,7 @@ class GoogleLoginSpec extends PlaySpecification with Mockito { val accessTokenResponse: Response = mock[Response].as("accessTokenResponse") _httpService.url("accessTokenUrl") returns accessTokenHolder _httpService.url("https://www.googleapis.com/oauth2/v1/userinfo?access_token=accessToken") returns userInfoHolder - accessTokenHolder.post(any[Map[String,Seq[String]]])(any,any) returns Future.successful(accessTokenResponse) + accessTokenHolder.post(any[Map[String, Seq[String]]])(any, any) returns Future.successful(accessTokenResponse) userInfoHolder.get() returns Future.successful(userInfoResponse) accessTokenResponse.json returns Json.parse( """ @@ -48,43 +47,35 @@ class GoogleLoginSpec extends PlaySpecification with Mockito { |"email": "test@example.com" |} """.stripMargin) - testGlobal.runtimeEnvironment=new TestEnvironment(_httpService = _httpService) + testGlobal.runtimeEnvironment = new TestEnvironment(_httpService = _httpService) val loginResponse = authenticate(GoogleProvider.Google) status(loginResponse) === 303 val location: Option[String] = redirectLocation(loginResponse) location must beSome(startWith("authorizationUrl")) val state = "state=([^&]*)".r.findFirstMatchIn(location.get).get.group(1) - val sid=session(loginResponse).get("sid").get + val sid = session(loginResponse).get("sid").get - val authenticateResponse = callback(GoogleProvider.Google,Some(state), Some("code"), session=List(("sid",sid))) + val authenticateResponse = callback(GoogleProvider.Google, Some(state), Some("code"), session = List(("sid", sid))) status(authenticateResponse) === 303 - redirectLocation(authenticateResponse)=== Some("/") + redirectLocation(authenticateResponse) === Some("/") } } - + import scala.collection.immutable.ListMap - class TestEnvironment( _routes: => RoutesService = new RoutesService.Default(), - _userService: =>UserService[DemoUser] = new TestUserService(), - _eventListeners: => List[EventListener[DemoUser]] = Nil, - _httpService : => HttpService = new HttpService.Default() - ) extends RuntimeEnvironment.Default[DemoUser] { + class TestEnvironment(_routes: => RoutesService = new RoutesService.Default(), + _userService: => UserService[DemoUser] = new TestUserService(), + _eventListeners: => List[EventListener[DemoUser]] = Nil, + _httpService: => HttpService = new HttpService.Default()) extends RuntimeEnvironment.Default[DemoUser] { override lazy val routes: RoutesService = _routes override lazy val userService: UserService[DemoUser] = _userService override lazy val eventListeners: List[EventListener[DemoUser]] = _eventListeners - override lazy val httpService : HttpService = _httpService + override lazy val httpService: HttpService = _httpService override lazy val providers: ListMap[String, IdentityProvider] = ListMap(include(new GoogleProvider(routes, cacheService, oauth2ClientFor(GoogleProvider.Google)))) } val googleConfig = Map( - "smtp.mock"->true - , "application.secret"->"secret" - , "application.router"->"securesocial.Routes" - , "securesocial.google.clientId"->"clientid" - , "securesocial.google.clientSecret"->"clientsecret" - , "securesocial.google.authorizationUrl"->"authorizationUrl" - , "securesocial.google.accessTokenUrl"->"accessTokenUrl" - , "securesocial.google.scope"->"scope" + "smtp.mock" -> true, "application.secret" -> "secret", "application.router" -> "securesocial.Routes", "securesocial.google.clientId" -> "clientid", "securesocial.google.clientSecret" -> "clientsecret", "securesocial.google.authorizationUrl" -> "authorizationUrl", "securesocial.google.accessTokenUrl" -> "accessTokenUrl", "securesocial.google.scope" -> "scope" ) } diff --git a/module-code/test/scenarios/helpers/Api.scala b/module-code/test/scenarios/helpers/Api.scala index 4be48978d..f1bd6fbe4 100644 --- a/module-code/test/scenarios/helpers/Api.scala +++ b/module-code/test/scenarios/helpers/Api.scala @@ -1,22 +1,22 @@ package scenarios.helpers -import play.api.test.{PlayRunners, Writeables, RouteInvokers, FakeRequest} +import play.api.test.{ PlayRunners, Writeables, RouteInvokers, FakeRequest } import play.api.Logger import securesocial.Routes -trait SocialProviders{ - self:ApiExecutor => - def authenticate(provider:String, redirectTo: Option[String]=None)={ - val redirectParam = redirectTo.map(s=>s"redirectTo=$s") - val params = List(redirectParam).flatten.mkString("?","&","") - route(FakeRequest(GET,s"/authenticate/google$params")).get +trait SocialProviders { + self: ApiExecutor => + def authenticate(provider: String, redirectTo: Option[String] = None) = { + val redirectParam = redirectTo.map(s => s"redirectTo=$s") + val params = List(redirectParam).flatten.mkString("?", "&", "") + route(FakeRequest(GET, s"/authenticate/google$params")).get } - def callback(provider:String, state:Option[String]=None, code:Option[String]=None,redirectTo: Option[String]=None, session:Seq[(String, String)] = Nil)={ - val redirectParam = redirectTo.map(s=>s"redirectTo=$s") - val stateParam = state.map(s=>s"state=$s") - val codeParam = code.map(s=>s"code=$s") - val params = List(redirectParam, stateParam, codeParam).flatten.mkString("?","&","") - route(FakeRequest(GET,s"/authenticate/google$params").withSession(session:_*)).get + def callback(provider: String, state: Option[String] = None, code: Option[String] = None, redirectTo: Option[String] = None, session: Seq[(String, String)] = Nil) = { + val redirectParam = redirectTo.map(s => s"redirectTo=$s") + val stateParam = state.map(s => s"state=$s") + val codeParam = code.map(s => s"code=$s") + val params = List(redirectParam, stateParam, codeParam).flatten.mkString("?", "&", "") + route(FakeRequest(GET, s"/authenticate/google$params").withSession(session: _*)).get } } diff --git a/module-code/test/scenarios/helpers/TestUserService.scala b/module-code/test/scenarios/helpers/TestUserService.scala index 32891a377..5f525fe74 100644 --- a/module-code/test/scenarios/helpers/TestUserService.scala +++ b/module-code/test/scenarios/helpers/TestUserService.scala @@ -18,10 +18,9 @@ package scenarios.helpers import play.api.Logger import securesocial.core._ -import securesocial.core.providers.{UsernamePasswordProvider, MailToken} +import securesocial.core.providers.{ UsernamePasswordProvider, MailToken } import scala.concurrent.Future -import securesocial.core.services.{UserService, SaveMode} - +import securesocial.core.services.{ UserService, SaveMode } /** * A Sample In Memory user service in Scala @@ -38,11 +37,11 @@ class TestUserService extends UserService[DemoUser] { private var tokens = Map[String, MailToken]() def find(providerId: String, userId: String): Future[Option[BasicProfile]] = { - if ( logger.isDebugEnabled ) { + if (logger.isDebugEnabled) { logger.debug("users = %s".format(users)) } val result = for ( - user <- users.values ; + user <- users.values; basicProfile <- user.identities.find(su => su.providerId == providerId && su.userId == userId) ) yield { basicProfile @@ -51,12 +50,12 @@ class TestUserService extends UserService[DemoUser] { } def findByEmailAndProvider(email: String, providerId: String): Future[Option[BasicProfile]] = { - if ( logger.isDebugEnabled ) { + if (logger.isDebugEnabled) { logger.debug("users = %s".format(users)) } val someEmail = Some(email) val result = for ( - user <- users.values ; + user <- users.values; basicProfile <- user.identities.find(su => su.providerId == providerId && su.email == someEmail) ) yield { basicProfile @@ -74,13 +73,13 @@ class TestUserService extends UserService[DemoUser] { } // first see if there is a user with this BasicProfile already. val maybeUser = users.find { - case (key, value) if value.identities.exists(su => su.providerId == user.providerId && su.userId == user.userId ) => true + case (key, value) if value.identities.exists(su => su.providerId == user.providerId && su.userId == user.userId) => true case _ => false } maybeUser match { case Some(existingUser) => val identities = existingUser._2.identities - val updatedList = identities.patch( identities.indexWhere( i => i.providerId == user.providerId && i.userId == user.userId ), Seq(user), 1) + val updatedList = identities.patch(identities.indexWhere(i => i.providerId == user.providerId && i.userId == user.userId), Seq(user), 1) val updatedUser = existingUser._2.copy(identities = updatedList) users = users + (existingUser._1 -> updatedUser) Future.successful(updatedUser) @@ -93,7 +92,7 @@ class TestUserService extends UserService[DemoUser] { } def link(current: DemoUser, to: BasicProfile): Future[DemoUser] = { - if ( current.identities.exists(i => i.providerId == to.providerId && i.userId == to.userId)) { + if (current.identities.exists(i => i.providerId == to.providerId && i.userId == to.userId)) { Future.successful(current) } else { val added = to :: current.identities @@ -125,9 +124,9 @@ class TestUserService extends UserService[DemoUser] { } } -// def deleteTokens(): Future { -// tokens = Map() -// } + // def deleteTokens(): Future { + // tokens = Map() + // } def deleteExpiredTokens() { tokens = tokens.filter(!_._2.isExpired) @@ -163,4 +162,3 @@ class TestUserService extends UserService[DemoUser] { // a simple User class that can have multiple identities case class DemoUser(main: BasicProfile, identities: List[BasicProfile]) - diff --git a/module-code/test/scenarios/helpers/package.scala b/module-code/test/scenarios/helpers/package.scala index 00dd7a69d..7b055c2a5 100644 --- a/module-code/test/scenarios/helpers/package.scala +++ b/module-code/test/scenarios/helpers/package.scala @@ -1,14 +1,14 @@ package scenarios import java.lang.reflect.Constructor -import play.api.test.{Writeables, RouteInvokers, PlayRunners} +import play.api.test.{ Writeables, RouteInvokers, PlayRunners } import securesocial.core.RuntimeEnvironment -import securesocial.core.services.{UserService, RoutesService} +import securesocial.core.services.{ UserService, RoutesService } package object helpers { type ApiExecutor = PlayRunners with RouteInvokers with Writeables - class TestGlobal[U]( var runtimeEnvironment:RuntimeEnvironment[U]) extends play.api.GlobalSettings { + class TestGlobal[U](var runtimeEnvironment: RuntimeEnvironment[U]) extends play.api.GlobalSettings { /** * An implementation that checks if the controller expects a RuntimeEnvironment and @@ -21,7 +21,7 @@ package object helpers { * @return */ override def getControllerInstance[A](controllerClass: Class[A]): A = { - val instance = controllerClass.getConstructors.find { c => + val instance = controllerClass.getConstructors.find { c => val params = c.getParameterTypes params.length == 1 && params(0) == classOf[RuntimeEnvironment[U]] }.map { diff --git a/module-code/test/securesocial/core/OAuth1ClientSpec.scala b/module-code/test/securesocial/core/OAuth1ClientSpec.scala index bc90af068..c8d57bf7e 100644 --- a/module-code/test/securesocial/core/OAuth1ClientSpec.scala +++ b/module-code/test/securesocial/core/OAuth1ClientSpec.scala @@ -13,11 +13,11 @@ import play.api.libs.oauth.RequestToken import play.api.libs.oauth.ConsumerKey class OAuth1ClientSpec extends Specification with Mockito { - val fakeServiceInfo= new ServiceInfo("requestTokenUrl","accessTokenUrl", "authorizationUrl", ConsumerKey("consumerKey","consumerSecret")) + val fakeServiceInfo = new ServiceInfo("requestTokenUrl", "accessTokenUrl", "authorizationUrl", ConsumerKey("consumerKey", "consumerSecret")) "The default OAuth1Client" should { "provide the redirectUrl given a token" in { - val client=aDefaultClient() + val client = aDefaultClient() val token: String = "token" val expectedRedirectUrl: String = "redirectUrl" client.client.redirectUrl(token) returns expectedRedirectUrl @@ -27,9 +27,9 @@ class OAuth1ClientSpec extends Specification with Mockito { } "retrieve the requestToken when the endpoint is correct" in { implicit val ec = helpers.sequentialExecutionContext - val client=aDefaultClient() + val client = aDefaultClient() val callbackUrl: String = "callbackUrl" - val expectedRequestToken = RequestToken("token","secret") + val expectedRequestToken = RequestToken("token", "secret") client.client.retrieveRequestToken(callbackUrl) returns Right(expectedRequestToken) val actualRequestToken = client.retrieveRequestToken(callbackUrl) @@ -38,9 +38,9 @@ class OAuth1ClientSpec extends Specification with Mockito { } "fail to retrieve the requestToken with an OAuthException when the endpoint is incorrect" in { implicit val ec = helpers.sequentialExecutionContext - val client=aDefaultClient() + val client = aDefaultClient() val callbackUrl: String = "incorrectCallbackUrl" - val expectedException= new OAuthException("invalid endpoint") {} + val expectedException = new OAuthException("invalid endpoint") {} client.client.retrieveRequestToken(callbackUrl) returns Left(expectedException) val actualRequestToken = client.retrieveRequestToken(callbackUrl) @@ -49,49 +49,49 @@ class OAuth1ClientSpec extends Specification with Mockito { } "retrieve the OAuth1Info given a valid request token and a verifier" in { implicit val ec = helpers.sequentialExecutionContext - val client=aDefaultClient() + val client = aDefaultClient() val verifier: String = "verifier" - val requestToken = RequestToken("requestToken","requestSecret") + val requestToken = RequestToken("requestToken", "requestSecret") val accessToken: RequestToken = RequestToken("accessToken", "accessSecret") - client.client.retrieveAccessToken(requestToken,verifier) returns Right(accessToken) + client.client.retrieveAccessToken(requestToken, verifier) returns Right(accessToken) - val actualOAuth1Info= client.retrieveOAuth1Info(requestToken,verifier) + val actualOAuth1Info = client.retrieveOAuth1Info(requestToken, verifier) - actualOAuth1Info must beEqualTo(OAuth1Info(accessToken.token,accessToken.secret)).await + actualOAuth1Info must beEqualTo(OAuth1Info(accessToken.token, accessToken.secret)).await } "fail to retrieve the OAuth1Info given an invalid request token and a verifier" in { implicit val ec = helpers.sequentialExecutionContext - val client=aDefaultClient() + val client = aDefaultClient() val verifier: String = "verifier" - val requestToken = RequestToken("invalidRequestToken","requestSecret") - val expectedException= new OAuthException("invalid endpoint") {} + val requestToken = RequestToken("invalidRequestToken", "requestSecret") + val expectedException = new OAuthException("invalid endpoint") {} - client.client.retrieveAccessToken(requestToken,verifier) returns Left(expectedException) + client.client.retrieveAccessToken(requestToken, verifier) returns Left(expectedException) - val actualOAuth1Info= client.retrieveOAuth1Info(requestToken,verifier) + val actualOAuth1Info = client.retrieveOAuth1Info(requestToken, verifier) actualOAuth1Info must throwAn(expectedException).await } "retrieve the json profile given the profile api url and the OAuth1Info" in { implicit val ec = helpers.sequentialExecutionContext val httpService: MockHttpService = new MockHttpService() - val client=aDefaultClient(httpService) + val client = aDefaultClient(httpService) val profileApiUrl: String = "profileApiUrl" - val oauth1info = OAuth1Info("accessToken","accessSecret") - val expectedJsonProfile = Json.obj("id"->"success") + val oauth1info = OAuth1Info("accessToken", "accessSecret") + val expectedJsonProfile = Json.obj("id" -> "success") httpService.request.sign(any[OAuthCalculator]) returns httpService.request //make sure the request is signed httpService.response.json returns expectedJsonProfile - val actualJsonProfile= client.retrieveProfile(profileApiUrl, oauth1info) + val actualJsonProfile = client.retrieveProfile(profileApiUrl, oauth1info) actualJsonProfile must beEqualTo(expectedJsonProfile).await } } - private def aDefaultClient(httpService:HttpService = new MockHttpService())={ - new OAuth1Client.Default(fakeServiceInfo, httpService){ + private def aDefaultClient(httpService: HttpService = new MockHttpService()) = { + new OAuth1Client.Default(fakeServiceInfo, httpService) { override val client = mock[OAuth] } } diff --git a/module-code/test/securesocial/core/OAuth2ClientSpec.scala b/module-code/test/securesocial/core/OAuth2ClientSpec.scala index a5ad8dc04..a2b1c9907 100644 --- a/module-code/test/securesocial/core/OAuth2ClientSpec.scala +++ b/module-code/test/securesocial/core/OAuth2ClientSpec.scala @@ -5,8 +5,8 @@ import org.specs2.mutable.Specification import securesocial.core.services.HttpService import helpers.MockHttpService import scala.concurrent.Future -import play.api.libs.oauth.{ConsumerKey, ServiceInfo} -import play.api.libs.json.{JsValue, JsObject, Json} +import play.api.libs.oauth.{ ConsumerKey, ServiceInfo } +import play.api.libs.json.{ JsValue, JsObject, Json } import play.api.libs.ws.Response class OAuth2ClientSpec extends Specification with Mockito { @@ -16,16 +16,15 @@ class OAuth2ClientSpec extends Specification with Mockito { implicit val ec = helpers.sequentialExecutionContext val httpService: MockHttpService = new MockHttpService() val client = aDefaultClient(httpService) - val (code,callbackUrl)=("code", "callbackUrl") + val (code, callbackUrl) = ("code", "callbackUrl") val expectedJson: JsObject = Json.obj("expected" -> "object") val expectedToken = OAuth2Info("accessToken") httpService.request.post(any[Params])(any[ParamsWriter], any[ContentTypeOfParams]) returns Future.successful(httpService.response) httpService.response.json returns expectedJson - val builder:Response => OAuth2Info= (response:Response) => if(response.json == expectedJson) expectedToken else throw new RuntimeException(s"Expected ${response.json} to be $expectedJson") - val token: Future[OAuth2Info] = client.exchangeCodeForToken(code, callbackUrl,builder) - + val builder: Response => OAuth2Info = (response: Response) => if (response.json == expectedJson) expectedToken else throw new RuntimeException(s"Expected ${response.json} to be $expectedJson") + val token: Future[OAuth2Info] = client.exchangeCodeForToken(code, callbackUrl, builder) token must beEqualTo(expectedToken).await } @@ -33,27 +32,20 @@ class OAuth2ClientSpec extends Specification with Mockito { implicit val ec = helpers.sequentialExecutionContext val httpService: MockHttpService = new MockHttpService() val client = aDefaultClient(httpService) - val profileUrl="profileUrl" + val profileUrl = "profileUrl" val expectedJson: JsObject = Json.obj("expected" -> "object") httpService.response.json returns expectedJson val actualProfile = client.retrieveProfile(profileUrl) - actualProfile must beEqualTo(expectedJson).await } } - private def aDefaultClient(httpService:HttpService = new MockHttpService())={ - new OAuth2Client.Default(httpService,fakeOAuth2Settings){ + private def aDefaultClient(httpService: HttpService = new MockHttpService()) = { + new OAuth2Client.Default(httpService, fakeOAuth2Settings) { } } - val fakeOAuth2Settings= new OAuth2Settings( - "authorizationUrl" - ,"accessTokenUrl" - , "clientId" - , "clientSecret" - , Some("scope") - , Map.empty - , Map.empty) + val fakeOAuth2Settings = new OAuth2Settings( + "authorizationUrl", "accessTokenUrl", "clientId", "clientSecret", Some("scope"), Map.empty, Map.empty) } diff --git a/samples/scala/demo/test/ApplicationScenario.scala b/samples/scala/demo/test/ApplicationScenario.scala index 479ccbfeb..77c5036da 100644 --- a/samples/scala/demo/test/ApplicationScenario.scala +++ b/samples/scala/demo/test/ApplicationScenario.scala @@ -1,12 +1,12 @@ -import play.api.test.{FakeRequest, WithApplication, FakeApplication, PlaySpecification} +import play.api.test.{ FakeRequest, WithApplication, FakeApplication, PlaySpecification } -class ApplicationScenario extends PlaySpecification { +class ApplicationScenario extends PlaySpecification { def app = FakeApplication(additionalPlugins = Seq("securesocial.testkit.AlwaysValidIdentityProvider")) "A logged in user can view the index" in new WithApplication(app) { //Given val creds1 = cookies(route(FakeRequest(POST, "/authenticate/naive").withTextBody("user")).get) //When - val Some(response)=route(FakeRequest(GET, "/").withCookies(creds1.get("id").get)) + val Some(response) = route(FakeRequest(GET, "/").withCookies(creds1.get("id").get)) //Then status(response) must equalTo(OK) diff --git a/samples/scala/demo/test/ApplicationSpec.scala b/samples/scala/demo/test/ApplicationSpec.scala index dcde28fef..796f7435b 100644 --- a/samples/scala/demo/test/ApplicationSpec.scala +++ b/samples/scala/demo/test/ApplicationSpec.scala @@ -1,13 +1,13 @@ import controllers.Application import org.specs2.matcher.ShouldMatchers import play.api.http.HeaderNames -import play.api.mvc.{Request, AnyContent} -import play.api.test.{PlaySpecification, FakeApplication, FakeRequest} +import play.api.mvc.{ Request, AnyContent } +import play.api.test.{ PlaySpecification, FakeApplication, FakeRequest } import securesocial.testkit.WithLoggedUser class ApplicationSpec extends PlaySpecification with ShouldMatchers { import WithLoggedUser._ - def minimalApp = FakeApplication(withoutPlugins=excludedPlugins,additionalPlugins = includedPlugins) + def minimalApp = FakeApplication(withoutPlugins = excludedPlugins, additionalPlugins = includedPlugins) "Access secured index " in new WithLoggedUser(minimalApp) { val req: Request[AnyContent] = FakeRequest(). @@ -16,7 +16,7 @@ class ApplicationSpec extends PlaySpecification with ShouldMatchers { val result = Application.index.apply(req) - val actual: Int= status(result) + val actual: Int = status(result) actual must be equalTo OK } } From 6c3c80827c5741553c7dc58c90a5b39648890584 Mon Sep 17 00:00:00 2001 From: Leonid Vygovskiy Date: Tue, 30 Sep 2014 00:25:03 +0400 Subject: [PATCH 02/10] UserService works with trait GenericProfile instead of BasicProfile Reasons: 1. Scala doesn't allow to extends case class from case class. 2. Coding into interfaces is good OOP practices --- .../controllers/PasswordChange.scala | 4 +-- .../controllers/PasswordReset.scala | 2 +- .../controllers/ViewsPlugin.scala | 18 +++++----- .../securesocial/core/IdentityProvider.scala | 2 +- .../app/securesocial/core/UserProfile.scala | 31 ++++++++++------ .../core/java/BaseUserService.java | 36 +++++++++---------- .../providers/UsernamePasswordProvider.scala | 2 +- .../core/providers/utils/Mailer.scala | 18 +++++----- .../core/services/UserService.scala | 12 +++---- .../mails/alreadyRegisteredEmail.scala.html | 2 +- .../mails/passwordChangedNotice.scala.html | 2 +- .../views/mails/passwordResetEmail.scala.html | 2 +- .../views/mails/welcomeEmail.scala.html | 2 +- .../scenarios/helpers/TestUserService.scala | 18 +++++----- samples/java/demo/app/service/DemoUser.java | 7 ++-- .../demo/app/service/InMemoryUserService.java | 27 +++++++------- .../java/demo/app/views/linkResult.scala.html | 2 +- .../app/service/InMemoryUserService.scala | 18 +++++----- samples/scala/demo/app/views/index.scala.html | 2 +- 19 files changed, 109 insertions(+), 98 deletions(-) diff --git a/module-code/app/securesocial/controllers/PasswordChange.scala b/module-code/app/securesocial/controllers/PasswordChange.scala index 6b61dc7fc..3b6fba6d1 100644 --- a/module-code/app/securesocial/controllers/PasswordChange.scala +++ b/module-code/app/securesocial/controllers/PasswordChange.scala @@ -27,11 +27,11 @@ import scala.Some import scala.concurrent.{ Await, ExecutionContext, Future } /** - * A default PasswordChange controller that uses the BasicProfile as the user type + * A default PasswordChange controller that uses the GenericProfile as the user type * * @param env An environment */ -class PasswordChange(override implicit val env: RuntimeEnvironment[BasicProfile]) extends BasePasswordChange[BasicProfile] +class PasswordChange(override implicit val env: RuntimeEnvironment[GenericProfile]) extends BasePasswordChange[GenericProfile] /** * A trait that defines the password change functionality diff --git a/module-code/app/securesocial/controllers/PasswordReset.scala b/module-code/app/securesocial/controllers/PasswordReset.scala index b432b91ab..327f31a85 100644 --- a/module-code/app/securesocial/controllers/PasswordReset.scala +++ b/module-code/app/securesocial/controllers/PasswordReset.scala @@ -114,7 +114,7 @@ trait BasePasswordReset[U] extends MailTokenBasedOperations[U] { case Some(profile) => val hashed = env.currentHasher.hash(p._1) for ( - updated <- env.userService.save(profile.copy(passwordInfo = Some(hashed)), SaveMode.PasswordChange); + updated <- env.userService.save(profile.withPasswordInfo(Some(hashed)), SaveMode.PasswordChange); deleted <- env.userService.deleteToken(token) ) yield { env.mailer.sendPasswordChangedNotice(profile) diff --git a/module-code/app/securesocial/controllers/ViewsPlugin.scala b/module-code/app/securesocial/controllers/ViewsPlugin.scala index 29ceba36b..b459883dd 100644 --- a/module-code/app/securesocial/controllers/ViewsPlugin.scala +++ b/module-code/app/securesocial/controllers/ViewsPlugin.scala @@ -18,7 +18,7 @@ package securesocial.controllers import play.api.mvc.{ Controller, RequestHeader } import play.api.templates.{ Html, Txt } -import securesocial.core.{ BasicProfile, RuntimeEnvironment } +import securesocial.core.{ GenericProfile, RuntimeEnvironment } import play.api.data.Form import play.api.i18n.Lang @@ -88,7 +88,7 @@ trait MailTemplates extends Controller { * @param request the current request * @return a tuple with the text and/or html body for the email */ - def getAlreadyRegisteredEmail(user: BasicProfile)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) + def getAlreadyRegisteredEmail(user: GenericProfile)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) /** * Returns the welcome email sent when the user finished the sign up process @@ -97,7 +97,7 @@ trait MailTemplates extends Controller { * @param request the current request * @return a String with the text and/or html body for the email */ - def getWelcomeEmail(user: BasicProfile)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) + def getWelcomeEmail(user: GenericProfile)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) /** * Returns the email sent when a user tries to reset the password but there is no account for @@ -116,7 +116,7 @@ trait MailTemplates extends Controller { * @param request the current http request * @return a String with the text and/or html body for the email */ - def getSendPasswordResetEmail(user: BasicProfile, token: String)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) + def getSendPasswordResetEmail(user: GenericProfile, token: String)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) /** * Returns the email sent as a confirmation of a password change @@ -125,7 +125,7 @@ trait MailTemplates extends Controller { * @param request the current http request * @return a String with the text and/or html body for the email */ - def getPasswordChangedNoticeEmail(user: BasicProfile)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) + def getPasswordChangedNoticeEmail(user: GenericProfile)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) } @@ -177,11 +177,11 @@ object MailTemplates { (None, Some(securesocial.views.html.mails.signUpEmail(token)(request, lang))) } - def getAlreadyRegisteredEmail(user: BasicProfile)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) = { + def getAlreadyRegisteredEmail(user: GenericProfile)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) = { (None, Some(securesocial.views.html.mails.alreadyRegisteredEmail(user)(request, lang, env))) } - def getWelcomeEmail(user: BasicProfile)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) = { + def getWelcomeEmail(user: GenericProfile)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) = { (None, Some(securesocial.views.html.mails.welcomeEmail(user)(request, lang, env))) } @@ -189,11 +189,11 @@ object MailTemplates { (None, Some(securesocial.views.html.mails.unknownEmailNotice()(request, lang))) } - def getSendPasswordResetEmail(user: BasicProfile, token: String)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) = { + def getSendPasswordResetEmail(user: GenericProfile, token: String)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) = { (None, Some(securesocial.views.html.mails.passwordResetEmail(user, token)(request, lang, env))) } - def getPasswordChangedNoticeEmail(user: BasicProfile)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) = { + def getPasswordChangedNoticeEmail(user: GenericProfile)(implicit request: RequestHeader, lang: Lang): (Option[Txt], Option[Html]) = { (None, Some(securesocial.views.html.mails.passwordChangedNotice(user)(request, lang, env))) } } diff --git a/module-code/app/securesocial/core/IdentityProvider.scala b/module-code/app/securesocial/core/IdentityProvider.scala index 10bd70401..242287ecc 100644 --- a/module-code/app/securesocial/core/IdentityProvider.scala +++ b/module-code/app/securesocial/core/IdentityProvider.scala @@ -110,7 +110,7 @@ object AuthenticationResult { * Returned when the user was succesfully authenticated * @param profile the authenticated user profile */ - case class Authenticated(profile: BasicProfile) extends AuthenticationResult + case class Authenticated(profile: GenericProfile) extends AuthenticationResult /** * Returned when the authentication process failed for some reason. diff --git a/module-code/app/securesocial/core/UserProfile.scala b/module-code/app/securesocial/core/UserProfile.scala index 8dec3d78b..6996582a0 100644 --- a/module-code/app/securesocial/core/UserProfile.scala +++ b/module-code/app/securesocial/core/UserProfile.scala @@ -37,23 +37,32 @@ trait GenericProfile extends UserProfile { def oAuth1Info: Option[OAuth1Info] def oAuth2Info: Option[OAuth2Info] def passwordInfo: Option[PasswordInfo] + + def withPasswordInfo(passwordInfo: Option[PasswordInfo]): GenericProfile + + def withAvatarUrl(avatarUrl: Option[String]): GenericProfile } /** * An implementation of the GenericProfile */ case class BasicProfile( - providerId: String, - userId: String, - firstName: Option[String], - lastName: Option[String], - fullName: Option[String], - email: Option[String], - avatarUrl: Option[String], - authMethod: AuthenticationMethod, - oAuth1Info: Option[OAuth1Info] = None, - oAuth2Info: Option[OAuth2Info] = None, - passwordInfo: Option[PasswordInfo] = None) extends GenericProfile + providerId: String, + userId: String, + firstName: Option[String], + lastName: Option[String], + fullName: Option[String], + email: Option[String], + avatarUrl: Option[String], + authMethod: AuthenticationMethod, + oAuth1Info: Option[OAuth1Info] = None, + oAuth2Info: Option[OAuth2Info] = None, + passwordInfo: Option[PasswordInfo] = None) extends GenericProfile { + + override def withPasswordInfo(passwordInfo: Option[PasswordInfo]) = copy(passwordInfo = passwordInfo) + + override def withAvatarUrl(avatarUrl: Option[String]) = copy(avatarUrl = avatarUrl) +} /** * The OAuth 1 details diff --git a/module-code/app/securesocial/core/java/BaseUserService.java b/module-code/app/securesocial/core/java/BaseUserService.java index 9a3a690fb..512f92d6e 100644 --- a/module-code/app/securesocial/core/java/BaseUserService.java +++ b/module-code/app/securesocial/core/java/BaseUserService.java @@ -21,7 +21,7 @@ import scala.*; import scala.Option; import scala.concurrent.Future; -import securesocial.core.BasicProfile; +import securesocial.core.GenericProfile; import securesocial.core.PasswordInfo; import securesocial.core.providers.MailToken; import securesocial.core.services.SaveMode; @@ -45,10 +45,10 @@ protected BaseUserService() { * @return an optional user */ @Override - public Future> find(String providerId, String userId) { - return doFind(providerId, userId).map(new F.Function>() { + public Future> find(String providerId, String userId) { + return doFind(providerId, userId).map(new F.Function>() { @Override - public Option apply(BasicProfile user) throws Throwable { + public Option apply(GenericProfile user) throws Throwable { return Scala.Option(user); } }).wrapped(); @@ -65,9 +65,9 @@ public Option apply(BasicProfile user) throws Throwable { * @return */ @Override - public Future> findByEmailAndProvider(String email, String providerId) { - return doFindByEmailAndProvider(email, providerId).map(new F.Function>() { - public Option apply(BasicProfile user) throws Throwable { + public Future> findByEmailAndProvider(String email, String providerId) { + return doFindByEmailAndProvider(email, providerId).map(new F.Function>() { + public Option apply(GenericProfile user) throws Throwable { return Scala.Option(user); } }).wrapped(); @@ -80,7 +80,7 @@ public Option apply(BasicProfile user) throws Throwable { * @param user */ @Override - public Future save(BasicProfile user, SaveMode mode) { + public Future save(GenericProfile user, SaveMode mode) { return doSave(user, mode).wrapped(); } @@ -91,7 +91,7 @@ public Future save(BasicProfile user, SaveMode mode) { * @param to The Identity that needs to be linked to the current user */ @Override - public Future link(U current, BasicProfile to) { + public Future link(U current, GenericProfile to) { return doLink(current, to).wrapped(); } @@ -106,11 +106,11 @@ public Option apply(PasswordInfo passwordInfo) throws Throwable { } @Override - public Future> updatePasswordInfo(U user, PasswordInfo info) { - return doUpdatePasswordInfo(user, info).map(new F.Function>() { + public Future> updatePasswordInfo(U user, PasswordInfo info) { + return doUpdatePasswordInfo(user, info).map(new F.Function>() { @Override - public Option apply(BasicProfile basicProfile) throws Throwable { - return Scala.Option(basicProfile); + public Option apply(GenericProfile GenericProfile) throws Throwable { + return Scala.Option(GenericProfile); } }).wrapped(); } @@ -192,7 +192,7 @@ public void deleteExpiredTokens() { * * @param user */ - public abstract F.Promise doSave(BasicProfile user, SaveMode mode); + public abstract F.Promise doSave(GenericProfile user, SaveMode mode); /** * Saves a token @@ -210,17 +210,17 @@ public void deleteExpiredTokens() { * @param current The Identity of the current user * @param to The Identity that needs to be linked to the current user */ - public abstract F.Promise doLink(U current, BasicProfile to); + public abstract F.Promise doLink(U current, GenericProfile to); /** * Finds the user in the backing store. * @return an Identity instance or null if no user matches the specified id */ - public abstract F.Promise doFind(String providerId, String userId); + public abstract F.Promise doFind(String providerId, String userId); public abstract F.Promise doPasswordInfoFor(U user); - public abstract F.Promise doUpdatePasswordInfo(U user, PasswordInfo info); + public abstract F.Promise doUpdatePasswordInfo(U user, PasswordInfo info); /** * Finds a token @@ -244,7 +244,7 @@ public void deleteExpiredTokens() { * @param providerId - the provider id * @return an Identity instance or null if no user matches the specified id */ - public abstract F.Promise doFindByEmailAndProvider(String email, String providerId); + public abstract F.Promise doFindByEmailAndProvider(String email, String providerId); /** * Deletes a token diff --git a/module-code/app/securesocial/core/providers/UsernamePasswordProvider.scala b/module-code/app/securesocial/core/providers/UsernamePasswordProvider.scala index 44f39f0c5..833a965f2 100644 --- a/module-code/app/securesocial/core/providers/UsernamePasswordProvider.scala +++ b/module-code/app/securesocial/core/providers/UsernamePasswordProvider.scala @@ -79,7 +79,7 @@ class UsernamePasswordProvider[U](userService: UserService[U], email <- u.email ) yield { service.urlFor(email).map { - case avatar if avatar != u.avatarUrl => u.copy(avatarUrl = avatar) + case avatar if avatar != u.avatarUrl => u.withAvatarUrl(avatar) case _ => u } map { Authenticated diff --git a/module-code/app/securesocial/core/providers/utils/Mailer.scala b/module-code/app/securesocial/core/providers/utils/Mailer.scala index 02574c3cd..2eea2da43 100644 --- a/module-code/app/securesocial/core/providers/utils/Mailer.scala +++ b/module-code/app/securesocial/core/providers/utils/Mailer.scala @@ -16,7 +16,7 @@ */ package securesocial.core.providers.utils -import securesocial.core.BasicProfile +import securesocial.core.GenericProfile import play.api.Play import securesocial.controllers.MailTemplates import Play.current @@ -29,12 +29,12 @@ import play.api.templates.{ Html, Txt } * A helper trait to send email notifications */ trait Mailer { - def sendAlreadyRegisteredEmail(user: BasicProfile)(implicit request: RequestHeader, lang: Lang) + def sendAlreadyRegisteredEmail(user: GenericProfile)(implicit request: RequestHeader, lang: Lang) def sendSignUpEmail(to: String, token: String)(implicit request: RequestHeader, lang: Lang) - def sendWelcomeEmail(user: BasicProfile)(implicit request: RequestHeader, lang: Lang) - def sendPasswordResetEmail(user: BasicProfile, token: String)(implicit request: RequestHeader, lang: Lang) + def sendWelcomeEmail(user: GenericProfile)(implicit request: RequestHeader, lang: Lang) + def sendPasswordResetEmail(user: GenericProfile, token: String)(implicit request: RequestHeader, lang: Lang) def sendUnkownEmailNotice(email: String)(implicit request: RequestHeader, lang: Lang) - def sendPasswordChangedNotice(user: BasicProfile)(implicit request: RequestHeader, lang: Lang) + def sendPasswordChangedNotice(user: GenericProfile)(implicit request: RequestHeader, lang: Lang) def sendEmail(subject: String, recipient: String, body: (Option[Txt], Option[Html])) } @@ -55,7 +55,7 @@ object Mailer { val UnknownEmailNoticeSubject = "mails.unknownEmail.subject" val PasswordResetOkSubject = "mails.passwordResetOk.subject" - override def sendAlreadyRegisteredEmail(user: BasicProfile)(implicit request: RequestHeader, lang: Lang) { + override def sendAlreadyRegisteredEmail(user: GenericProfile)(implicit request: RequestHeader, lang: Lang) { val txtAndHtml = mailTemplates.getAlreadyRegisteredEmail(user) sendEmail(Messages(AlreadyRegisteredSubject), user.email.get, txtAndHtml) @@ -66,13 +66,13 @@ object Mailer { sendEmail(Messages(SignUpEmailSubject), to, txtAndHtml) } - override def sendWelcomeEmail(user: BasicProfile)(implicit request: RequestHeader, lang: Lang) { + override def sendWelcomeEmail(user: GenericProfile)(implicit request: RequestHeader, lang: Lang) { val txtAndHtml = mailTemplates.getWelcomeEmail(user) sendEmail(Messages(WelcomeEmailSubject), user.email.get, txtAndHtml) } - override def sendPasswordResetEmail(user: BasicProfile, token: String)(implicit request: RequestHeader, lang: Lang) { + override def sendPasswordResetEmail(user: GenericProfile, token: String)(implicit request: RequestHeader, lang: Lang) { val txtAndHtml = mailTemplates.getSendPasswordResetEmail(user, token) sendEmail(Messages(PasswordResetSubject), user.email.get, txtAndHtml) } @@ -82,7 +82,7 @@ object Mailer { sendEmail(Messages(UnknownEmailNoticeSubject), email, txtAndHtml) } - override def sendPasswordChangedNotice(user: BasicProfile)(implicit request: RequestHeader, lang: Lang) { + override def sendPasswordChangedNotice(user: GenericProfile)(implicit request: RequestHeader, lang: Lang) { val txtAndHtml = mailTemplates.getPasswordChangedNoticeEmail(user) sendEmail(Messages(PasswordResetOkSubject), user.email.get, txtAndHtml) } diff --git a/module-code/app/securesocial/core/services/UserService.scala b/module-code/app/securesocial/core/services/UserService.scala index 2154ecb3d..25257a83d 100644 --- a/module-code/app/securesocial/core/services/UserService.scala +++ b/module-code/app/securesocial/core/services/UserService.scala @@ -17,7 +17,7 @@ package securesocial.core.services import scala.concurrent.Future -import securesocial.core.{ PasswordInfo, BasicProfile } +import securesocial.core.{ PasswordInfo, GenericProfile } import securesocial.core.providers.MailToken trait UserService[U] { @@ -29,7 +29,7 @@ trait UserService[U] { * @param userId the user id * @return an optional profile */ - def find(providerId: String, userId: String): Future[Option[BasicProfile]] + def find(providerId: String, userId: String): Future[Option[GenericProfile]] /** * Finds a profile by email and provider @@ -38,7 +38,7 @@ trait UserService[U] { * @param providerId - the provider id * @return an optional profile */ - def findByEmailAndProvider(email: String, providerId: String): Future[Option[BasicProfile]] + def findByEmailAndProvider(email: String, providerId: String): Future[Option[GenericProfile]] /** * Saves a profile. This method gets called when a user logs in, registers or changes his password. @@ -47,7 +47,7 @@ trait UserService[U] { * @param profile the user profile * @param mode a mode that tells you why the save method was called */ - def save(profile: BasicProfile, mode: SaveMode): Future[U] + def save(profile: GenericProfile, mode: SaveMode): Future[U] /** * Links the current user to another profile @@ -55,7 +55,7 @@ trait UserService[U] { * @param current The current user instance * @param to the profile that needs to be linked to */ - def link(current: U, to: BasicProfile): Future[U] + def link(current: U, to: GenericProfile): Future[U] /** * Returns an optional PasswordInfo instance for a given user @@ -72,7 +72,7 @@ trait UserService[U] { * @param info the password info * @return */ - def updatePasswordInfo(user: U, info: PasswordInfo): Future[Option[BasicProfile]] + def updatePasswordInfo(user: U, info: PasswordInfo): Future[Option[GenericProfile]] /** * Saves a mail token. This is needed for users that diff --git a/module-code/app/securesocial/views/mails/alreadyRegisteredEmail.scala.html b/module-code/app/securesocial/views/mails/alreadyRegisteredEmail.scala.html index 8d8a1625b..7407922d5 100644 --- a/module-code/app/securesocial/views/mails/alreadyRegisteredEmail.scala.html +++ b/module-code/app/securesocial/views/mails/alreadyRegisteredEmail.scala.html @@ -1,4 +1,4 @@ -@(user: securesocial.core.BasicProfile)(implicit request: RequestHeader, lang: Lang, env: securesocial.core.RuntimeEnvironment[_]) +@(user: securesocial.core.GenericProfile)(implicit request: RequestHeader, lang: Lang, env: securesocial.core.RuntimeEnvironment[_]) diff --git a/module-code/app/securesocial/views/mails/passwordChangedNotice.scala.html b/module-code/app/securesocial/views/mails/passwordChangedNotice.scala.html index c02f9f9b5..040f4bce5 100644 --- a/module-code/app/securesocial/views/mails/passwordChangedNotice.scala.html +++ b/module-code/app/securesocial/views/mails/passwordChangedNotice.scala.html @@ -1,4 +1,4 @@ -@(user: securesocial.core.BasicProfile)(implicit request: RequestHeader, lang: Lang, env: securesocial.core.RuntimeEnvironment[_]) +@(user: securesocial.core.GenericProfile)(implicit request: RequestHeader, lang: Lang, env: securesocial.core.RuntimeEnvironment[_]) diff --git a/module-code/app/securesocial/views/mails/passwordResetEmail.scala.html b/module-code/app/securesocial/views/mails/passwordResetEmail.scala.html index 72360254e..8b0738195 100644 --- a/module-code/app/securesocial/views/mails/passwordResetEmail.scala.html +++ b/module-code/app/securesocial/views/mails/passwordResetEmail.scala.html @@ -1,4 +1,4 @@ -@(user: securesocial.core.BasicProfile, mailToken: String)(implicit request: RequestHeader, lang: Lang, env: securesocial.core.RuntimeEnvironment[_]) +@(user: securesocial.core.GenericProfile, mailToken: String)(implicit request: RequestHeader, lang: Lang, env: securesocial.core.RuntimeEnvironment[_]) @import securesocial.core.IdentityProvider diff --git a/module-code/app/securesocial/views/mails/welcomeEmail.scala.html b/module-code/app/securesocial/views/mails/welcomeEmail.scala.html index 771af954a..5f202e0e1 100644 --- a/module-code/app/securesocial/views/mails/welcomeEmail.scala.html +++ b/module-code/app/securesocial/views/mails/welcomeEmail.scala.html @@ -1,4 +1,4 @@ -@(user: securesocial.core.BasicProfile)(implicit request: RequestHeader, lang: Lang, env: securesocial.core.RuntimeEnvironment[_]) +@(user: securesocial.core.GenericProfile)(implicit request: RequestHeader, lang: Lang, env: securesocial.core.RuntimeEnvironment[_])

Welcome @user.firstName,

diff --git a/module-code/test/scenarios/helpers/TestUserService.scala b/module-code/test/scenarios/helpers/TestUserService.scala index 5f525fe74..82db22c3f 100644 --- a/module-code/test/scenarios/helpers/TestUserService.scala +++ b/module-code/test/scenarios/helpers/TestUserService.scala @@ -33,10 +33,10 @@ class TestUserService extends UserService[DemoUser] { // var users = Map[(String, String), DemoUser]() - //private var identities = Map[String, BasicProfile]() + //private var identities = Map[String, GenericProfile]() private var tokens = Map[String, MailToken]() - def find(providerId: String, userId: String): Future[Option[BasicProfile]] = { + def find(providerId: String, userId: String): Future[Option[GenericProfile]] = { if (logger.isDebugEnabled) { logger.debug("users = %s".format(users)) } @@ -49,7 +49,7 @@ class TestUserService extends UserService[DemoUser] { Future.successful(result.headOption) } - def findByEmailAndProvider(email: String, providerId: String): Future[Option[BasicProfile]] = { + def findByEmailAndProvider(email: String, providerId: String): Future[Option[GenericProfile]] = { if (logger.isDebugEnabled) { logger.debug("users = %s".format(users)) } @@ -63,7 +63,7 @@ class TestUserService extends UserService[DemoUser] { Future.successful(result.headOption) } - def save(user: BasicProfile, mode: SaveMode): Future[DemoUser] = { + def save(user: GenericProfile, mode: SaveMode): Future[DemoUser] = { mode match { case SaveMode.SignUp => val newUser = DemoUser(user, List(user)) @@ -71,7 +71,7 @@ class TestUserService extends UserService[DemoUser] { case SaveMode.LoggedIn => } - // first see if there is a user with this BasicProfile already. + // first see if there is a user with this GenericProfile already. val maybeUser = users.find { case (key, value) if value.identities.exists(su => su.providerId == user.providerId && su.userId == user.userId) => true case _ => false @@ -91,7 +91,7 @@ class TestUserService extends UserService[DemoUser] { } } - def link(current: DemoUser, to: BasicProfile): Future[DemoUser] = { + def link(current: DemoUser, to: GenericProfile): Future[DemoUser] = { if (current.identities.exists(i => i.providerId == to.providerId && i.userId == to.userId)) { Future.successful(current) } else { @@ -132,14 +132,14 @@ class TestUserService extends UserService[DemoUser] { tokens = tokens.filter(!_._2.isExpired) } - override def updatePasswordInfo(user: DemoUser, info: PasswordInfo): Future[Option[BasicProfile]] = { + override def updatePasswordInfo(user: DemoUser, info: PasswordInfo): Future[Option[GenericProfile]] = { Future.successful { for ( found <- users.values.find(_ == user); identityWithPasswordInfo <- found.identities.find(_.providerId == UsernamePasswordProvider.UsernamePassword) ) yield { val idx = found.identities.indexOf(identityWithPasswordInfo) - val updated = identityWithPasswordInfo.copy(passwordInfo = Some(info)) + val updated = identityWithPasswordInfo.withPasswordInfo(Some(info)) val updatedIdentities = found.identities.patch(idx, Seq(updated), 1) found.copy(identities = updatedIdentities) updated @@ -160,5 +160,5 @@ class TestUserService extends UserService[DemoUser] { } // a simple User class that can have multiple identities -case class DemoUser(main: BasicProfile, identities: List[BasicProfile]) +case class DemoUser(main: GenericProfile, identities: List[GenericProfile]) diff --git a/samples/java/demo/app/service/DemoUser.java b/samples/java/demo/app/service/DemoUser.java index 99e1035b9..2fd4f3263 100644 --- a/samples/java/demo/app/service/DemoUser.java +++ b/samples/java/demo/app/service/DemoUser.java @@ -17,18 +17,19 @@ package service; import securesocial.core.BasicProfile; +import securesocial.core.GenericProfile; import java.io.Serializable; import java.util.ArrayList; import java.util.List; public class DemoUser implements Serializable { - public DemoUser(BasicProfile user) { + public DemoUser(GenericProfile user) { this.main = user; identities = new ArrayList<>(); identities.add(user); } - public BasicProfile main; - public List identities; + public GenericProfile main; + public List identities; } diff --git a/samples/java/demo/app/service/InMemoryUserService.java b/samples/java/demo/app/service/InMemoryUserService.java index af399f3c0..3e6c064c6 100644 --- a/samples/java/demo/app/service/InMemoryUserService.java +++ b/samples/java/demo/app/service/InMemoryUserService.java @@ -18,7 +18,8 @@ import play.Logger; import play.libs.F; -import securesocial.core.BasicProfile; +import scala.concurrent.Future; +import securesocial.core.GenericProfile; import securesocial.core.PasswordInfo; import securesocial.core.services.SaveMode; import securesocial.core.java.BaseUserService; @@ -42,7 +43,7 @@ public class InMemoryUserService extends BaseUserService { private HashMap tokens = new HashMap(); @Override - public F.Promise doSave(BasicProfile profile, SaveMode mode) { + public F.Promise doSave(GenericProfile profile, SaveMode mode) { DemoUser result = null; if (mode == SaveMode.SignUp()) { result = new DemoUser(profile); @@ -50,7 +51,7 @@ public F.Promise doSave(BasicProfile profile, SaveMode mode) { } else if (mode == SaveMode.LoggedIn()) { for (Iterator it = users.values().iterator() ; it.hasNext() && result == null ; ) { DemoUser user = it.next(); - for ( BasicProfile p : user.identities) { + for ( GenericProfile p : user.identities) { if ( p.userId().equals(profile.userId()) && p.providerId().equals(profile.providerId())) { user.identities.remove(p); user.identities.add(profile); @@ -62,7 +63,7 @@ public F.Promise doSave(BasicProfile profile, SaveMode mode) { } else if (mode == SaveMode.PasswordChange()) { for (Iterator it = users.values().iterator() ; it.hasNext() && result == null ; ) { DemoUser user = it.next(); - for (BasicProfile p : user.identities) { + for (GenericProfile p : user.identities) { if (p.userId().equals(profile.userId()) && p.providerId().equals(UsernamePasswordProvider.UsernamePassword())) { user.identities.remove(p); user.identities.add(profile); @@ -78,7 +79,7 @@ public F.Promise doSave(BasicProfile profile, SaveMode mode) { } @Override - public F.Promise doLink(DemoUser current, BasicProfile to) { + public F.Promise doLink(DemoUser current, GenericProfile to) { DemoUser target = null; for ( DemoUser u: users.values() ) { @@ -94,7 +95,7 @@ public F.Promise doLink(DemoUser current, BasicProfile to) { } boolean alreadyLinked = false; - for ( BasicProfile p : target.identities) { + for ( GenericProfile p : target.identities) { if ( p.userId().equals(to.userId()) && p.providerId().equals(to.providerId())) { alreadyLinked = true; break; @@ -111,14 +112,14 @@ public F.Promise doSaveToken(Token token) { } @Override - public F.Promise doFind(String providerId, String userId) { + public F.Promise doFind(String providerId, String userId) { if(logger.isDebugEnabled()){ logger.debug("Finding user " + userId); } - BasicProfile found = null; + GenericProfile found = null; for ( DemoUser u: users.values() ) { - for ( BasicProfile i : u.identities ) { + for ( GenericProfile i : u.identities ) { if ( i.providerId().equals(providerId) && i.userId().equals(userId) ) { found = i; break; @@ -135,7 +136,7 @@ public F.Promise doPasswordInfoFor(DemoUser user) { } @Override - public F.Promise doUpdatePasswordInfo(DemoUser user, PasswordInfo info) { + public F.Promise doUpdatePasswordInfo(DemoUser user, PasswordInfo info) { throw new RuntimeException("doUpdatePasswordInfo is not implemented yet in sample app"); } @@ -146,11 +147,11 @@ public F.Promise doFindToken(String tokenId) { @Override - public F.Promise doFindByEmailAndProvider(String email, String providerId) { - BasicProfile found = null; + public F.Promise doFindByEmailAndProvider(String email, String providerId) { + GenericProfile found = null; for ( DemoUser u: users.values() ) { - for ( BasicProfile i : u.identities ) { + for ( GenericProfile i : u.identities ) { if ( i.providerId().equals(providerId) && i.email().isDefined() && i.email().get().equals(email) ) { found = i; break; diff --git a/samples/java/demo/app/views/linkResult.scala.html b/samples/java/demo/app/views/linkResult.scala.html index fc91b9614..150fdb3cb 100644 --- a/samples/java/demo/app/views/linkResult.scala.html +++ b/samples/java/demo/app/views/linkResult.scala.html @@ -1,4 +1,4 @@ -@(current: service.DemoUser, linkedIdentities: java.util.List[securesocial.core.BasicProfile]) +@(current: service.DemoUser, linkedIdentities: java.util.List[securesocial.core.GenericProfile]) @main("SecureSocial - Account Link Result") {
diff --git a/samples/scala/demo/app/service/InMemoryUserService.scala b/samples/scala/demo/app/service/InMemoryUserService.scala index 5d09b65be..9cdcd92bb 100644 --- a/samples/scala/demo/app/service/InMemoryUserService.scala +++ b/samples/scala/demo/app/service/InMemoryUserService.scala @@ -33,10 +33,10 @@ class InMemoryUserService extends UserService[DemoUser] { // var users = Map[(String, String), DemoUser]() - //private var identities = Map[String, BasicProfile]() + //private var identities = Map[String, GenericProfile]() private var tokens = Map[String, MailToken]() - def find(providerId: String, userId: String): Future[Option[BasicProfile]] = { + def find(providerId: String, userId: String): Future[Option[GenericProfile]] = { if (logger.isDebugEnabled) { logger.debug("users = %s".format(users)) } @@ -49,7 +49,7 @@ class InMemoryUserService extends UserService[DemoUser] { Future.successful(result.headOption) } - def findByEmailAndProvider(email: String, providerId: String): Future[Option[BasicProfile]] = { + def findByEmailAndProvider(email: String, providerId: String): Future[Option[GenericProfile]] = { if (logger.isDebugEnabled) { logger.debug("users = %s".format(users)) } @@ -63,7 +63,7 @@ class InMemoryUserService extends UserService[DemoUser] { Future.successful(result.headOption) } - def save(user: BasicProfile, mode: SaveMode): Future[DemoUser] = { + def save(user: GenericProfile, mode: SaveMode): Future[DemoUser] = { mode match { case SaveMode.SignUp => val newUser = DemoUser(user, List(user)) @@ -71,7 +71,7 @@ class InMemoryUserService extends UserService[DemoUser] { case SaveMode.LoggedIn => } - // first see if there is a user with this BasicProfile already. + // first see if there is a user with this GenericProfile already. val maybeUser = users.find { case (key, value) if value.identities.exists(su => su.providerId == user.providerId && su.userId == user.userId) => true case _ => false @@ -91,7 +91,7 @@ class InMemoryUserService extends UserService[DemoUser] { } } - def link(current: DemoUser, to: BasicProfile): Future[DemoUser] = { + def link(current: DemoUser, to: GenericProfile): Future[DemoUser] = { if (current.identities.exists(i => i.providerId == to.providerId && i.userId == to.userId)) { Future.successful(current) } else { @@ -132,14 +132,14 @@ class InMemoryUserService extends UserService[DemoUser] { tokens = tokens.filter(!_._2.isExpired) } - override def updatePasswordInfo(user: DemoUser, info: PasswordInfo): Future[Option[BasicProfile]] = { + override def updatePasswordInfo(user: DemoUser, info: PasswordInfo): Future[Option[GenericProfile]] = { Future.successful { for ( found <- users.values.find(_ == user); identityWithPasswordInfo <- found.identities.find(_.providerId == UsernamePasswordProvider.UsernamePassword) ) yield { val idx = found.identities.indexOf(identityWithPasswordInfo) - val updated = identityWithPasswordInfo.copy(passwordInfo = Some(info)) + val updated = identityWithPasswordInfo.changePasswordInfo(Some(info)) val updatedIdentities = found.identities.patch(idx, Seq(updated), 1) found.copy(identities = updatedIdentities) updated @@ -160,5 +160,5 @@ class InMemoryUserService extends UserService[DemoUser] { } // a simple User class that can have multiple identities -case class DemoUser(main: BasicProfile, identities: List[BasicProfile]) +case class DemoUser(main: GenericProfile, identities: List[GenericProfile]) diff --git a/samples/scala/demo/app/views/index.scala.html b/samples/scala/demo/app/views/index.scala.html index 9c5711678..46c206a3b 100644 --- a/samples/scala/demo/app/views/index.scala.html +++ b/samples/scala/demo/app/views/index.scala.html @@ -1,4 +1,4 @@ -@(user: securesocial.core.BasicProfile)(implicit request: RequestHeader, env: securesocial.core.RuntimeEnvironment[service.DemoUser]) +@(user: securesocial.core.GenericProfile)(implicit request: RequestHeader, env: securesocial.core.RuntimeEnvironment[service.DemoUser]) @import securesocial.core.IdentityProvider @import securesocial.core.IdentityProvider From 07c7ba619f8cd69d374a1c6c2284f274caf9b1d3 Mon Sep 17 00:00:00 2001 From: Leonid Vygovskiy Date: Tue, 30 Sep 2014 00:34:33 +0400 Subject: [PATCH 03/10] UserService works with trait GenericProfile instead of BasicProfile Fixed some compiles problems (checked via sbt publishLocal) --- samples/java/demo/app/controllers/Application.java | 5 +++-- samples/scala/demo/app/service/InMemoryUserService.scala | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/samples/java/demo/app/controllers/Application.java b/samples/java/demo/app/controllers/Application.java index fce8076c5..1327c51dc 100644 --- a/samples/java/demo/app/controllers/Application.java +++ b/samples/java/demo/app/controllers/Application.java @@ -21,6 +21,7 @@ import play.mvc.Controller; import play.mvc.Result; import securesocial.core.BasicProfile; +import securesocial.core.GenericProfile; import securesocial.core.RuntimeEnvironment; import securesocial.core.java.SecureSocial; import securesocial.core.java.SecuredAction; @@ -43,7 +44,7 @@ public class Application extends Controller { * * @param env */ - public Application(RuntimeEnvironment env) { + public Application(RuntimeEnvironment env) { this.env = env; } /** @@ -66,7 +67,7 @@ public Result userAware() { DemoUser demoUser = (DemoUser) ctx().args.get(SecureSocial.USER_KEY); String userName ; if ( demoUser != null ) { - BasicProfile user = demoUser.main; + GenericProfile user = demoUser.main; if ( user.firstName().isDefined() ) { userName = user.firstName().get(); } else if ( user.fullName().isDefined()) { diff --git a/samples/scala/demo/app/service/InMemoryUserService.scala b/samples/scala/demo/app/service/InMemoryUserService.scala index 9cdcd92bb..5034748a3 100644 --- a/samples/scala/demo/app/service/InMemoryUserService.scala +++ b/samples/scala/demo/app/service/InMemoryUserService.scala @@ -139,7 +139,7 @@ class InMemoryUserService extends UserService[DemoUser] { identityWithPasswordInfo <- found.identities.find(_.providerId == UsernamePasswordProvider.UsernamePassword) ) yield { val idx = found.identities.indexOf(identityWithPasswordInfo) - val updated = identityWithPasswordInfo.changePasswordInfo(Some(info)) + val updated = identityWithPasswordInfo.withPasswordInfo(Some(info)) val updatedIdentities = found.identities.patch(idx, Seq(updated), 1) found.copy(identities = updatedIdentities) updated From 87863bf405331889c8c44e7feeefe8089cbe01d0 Mon Sep 17 00:00:00 2001 From: Leonid Vygovskiy Date: Wed, 21 Jan 2015 01:32:25 +0300 Subject: [PATCH 04/10] Initial building settings (changes from original version) - changed project name to SecSoc - added author (Leonid Vygovskiy) - removed java-demo module --- module-code/build.sbt | 29 +- project/Common.scala | 4 +- project/plugins.sbt | 2 +- samples/java/demo/README | 13 - samples/java/demo/app/Global.java | 45 - .../demo/app/controllers/Application.java | 114 - .../demo/app/controllers/WithProvider.java | 30 - samples/java/demo/app/service/DemoUser.java | 35 - .../demo/app/service/InMemoryUserService.java | 180 - .../java/demo/app/service/MyEnvironment.scala | 24 - samples/java/demo/app/views/index.scala.html | 62 - .../java/demo/app/views/linkResult.scala.html | 49 - samples/java/demo/app/views/main.scala.html | 26 - samples/java/demo/conf/application.conf | 59 - samples/java/demo/conf/play.plugins | 1 - samples/java/demo/conf/routes | 14 - samples/java/demo/conf/securesocial.conf | 217 - samples/java/demo/javaDemo.sbt | 11 - samples/java/demo/project/build.properties | 1 - samples/java/demo/project/plugins.sbt | 8 - .../bootstrap/css/bootstrap-responsive.css | 808 --- .../css/bootstrap-responsive.min.css | 9 - .../demo/public/bootstrap/css/bootstrap.css | 4960 ----------------- .../public/bootstrap/css/bootstrap.min.css | 9 - .../img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../bootstrap/img/glyphicons-halflings.png | Bin 13826 -> 0 bytes .../demo/public/bootstrap/js/bootstrap.js | 1824 ------ .../demo/public/bootstrap/js/bootstrap.min.js | 6 - samples/java/demo/public/images/favicon.png | Bin 687 -> 0 bytes .../public/javascripts/jquery-1.7.1.min.js | 4 - samples/java/demo/public/stylesheets/main.css | 0 securesocial.sbt | 6 +- 32 files changed, 24 insertions(+), 8526 deletions(-) delete mode 100644 samples/java/demo/README delete mode 100644 samples/java/demo/app/Global.java delete mode 100644 samples/java/demo/app/controllers/Application.java delete mode 100644 samples/java/demo/app/controllers/WithProvider.java delete mode 100644 samples/java/demo/app/service/DemoUser.java delete mode 100644 samples/java/demo/app/service/InMemoryUserService.java delete mode 100644 samples/java/demo/app/service/MyEnvironment.scala delete mode 100644 samples/java/demo/app/views/index.scala.html delete mode 100644 samples/java/demo/app/views/linkResult.scala.html delete mode 100644 samples/java/demo/app/views/main.scala.html delete mode 100644 samples/java/demo/conf/application.conf delete mode 100644 samples/java/demo/conf/play.plugins delete mode 100644 samples/java/demo/conf/routes delete mode 100644 samples/java/demo/conf/securesocial.conf delete mode 100644 samples/java/demo/javaDemo.sbt delete mode 100644 samples/java/demo/project/build.properties delete mode 100644 samples/java/demo/project/plugins.sbt delete mode 100644 samples/java/demo/public/bootstrap/css/bootstrap-responsive.css delete mode 100644 samples/java/demo/public/bootstrap/css/bootstrap-responsive.min.css delete mode 100644 samples/java/demo/public/bootstrap/css/bootstrap.css delete mode 100644 samples/java/demo/public/bootstrap/css/bootstrap.min.css delete mode 100644 samples/java/demo/public/bootstrap/img/glyphicons-halflings-white.png delete mode 100644 samples/java/demo/public/bootstrap/img/glyphicons-halflings.png delete mode 100644 samples/java/demo/public/bootstrap/js/bootstrap.js delete mode 100644 samples/java/demo/public/bootstrap/js/bootstrap.min.js delete mode 100644 samples/java/demo/public/images/favicon.png delete mode 100644 samples/java/demo/public/javascripts/jquery-1.7.1.min.js delete mode 100644 samples/java/demo/public/stylesheets/main.css diff --git a/module-code/build.sbt b/module-code/build.sbt index eeac8ee63..9c4d66da9 100644 --- a/module-code/build.sbt +++ b/module-code/build.sbt @@ -20,11 +20,9 @@ resolvers ++= Seq( Resolver.typesafeRepo("releases") ) -organization := "ws.securesocial" +organization := "io.github.secsoc" -organizationName := "SecureSocial" - -organizationHomepage := Some(new URL("http://www.securesocial.ws")) +organizationName := "SecSoc" publishMavenStyle := true @@ -40,26 +38,37 @@ publishTo := { Some("releases" at nexus + "service/local/staging/deploy/maven2") } -startYear := Some(2012) +startYear := Some(2015) -description := "An authentication module for Play Framework applications supporting OAuth, OAuth2, OpenID, Username/Password and custom authentication schemes." +description := """An authentication module for Play Framework applications supporting OAuth, OAuth2, OpenID, Username/Password and custom authentication schemes. + It's lite fork of SecureSocial project, that exclude any default UI and Java support. It's allow only core functions of authentications. + """ licenses := Seq("The Apache Software License, Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")) -homepage := Some(url("http://www.securesocial.ws")) +homepage := Some(url("http://leonidv.github.io/secsoc")) pomExtra := ( - https://github.com/jaliss/securesocial - scm:git:git@github.com:jaliss/securesocial.git - scm:git:https://github.com/jaliss/securesocial.git + https://github.com/leonidv/secsoc + scm:git:git@github.com:leonidv/secsoc.git + scm:git:https://github.com/leonidv/secsoc.git + + leonidv + Leonid Vygovskiy + Leonid.Vygovskiy [at] gmail.com + http://vygovskiy.com + jaliss Jorge Aliss jaliss [at] gmail.com https://twitter.com/jaliss + + Author of original SecureSocial project + ) diff --git a/project/Common.scala b/project/Common.scala index 83573a22c..ecb64103e 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -3,6 +3,6 @@ import Keys._ object Common { def version = "master-SNAPSHOT" - def playVersion = System.getProperty("play.version", "2.3.2") - def scalaVersion = System.getProperty("scala.version", "2.11.1") + def playVersion = System.getProperty("play.version", "2.3.7") + def scalaVersion = System.getProperty("scala.version", "2.11.4") } diff --git a/project/plugins.sbt b/project/plugins.sbt index 8c9445fb7..d6fddbcdb 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ logLevel := Level.Warn resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/" // Use the Play sbt plugin for Play projects -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.2") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.7") // Add Scalariform addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0") diff --git a/samples/java/demo/README b/samples/java/demo/README deleted file mode 100644 index a1614788c..000000000 --- a/samples/java/demo/README +++ /dev/null @@ -1,13 +0,0 @@ -Sample SecureSocial 2 Application (Java version) -================================================= -To run this sample you need to: - -1) Create an application in the developer site of each provider you want to try and configure the OAuth -settings in the securesocial.conf file. - -2) Configure an email account that the app can use to send emails - -3) Open the play console and execute the app - -Check the User Guide at http://securesocial.ws/guide/getting-started.html for more information on SecureSocial. - diff --git a/samples/java/demo/app/Global.java b/samples/java/demo/app/Global.java deleted file mode 100644 index ffaaf4140..000000000 --- a/samples/java/demo/app/Global.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright 2012-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import play.GlobalSettings; -import play.Logger; -import securesocial.core.RuntimeEnvironment; -import service.MyEnvironment; - -import java.util.HashMap; - -public class Global extends GlobalSettings { - private RuntimeEnvironment env = new MyEnvironment(); - private HashMap instances = new HashMap<>(); - - @Override - public A getControllerInstance(Class controllerClass) throws Exception { - A result = (A) instances.get(controllerClass.getName()); - Logger.debug("result = " + result); - if ( result == null ) { - Logger.debug("creating controller: " + controllerClass.getName()); - try { - result = controllerClass.getDeclaredConstructor(RuntimeEnvironment.class).newInstance(env); - } catch (NoSuchMethodException e) { - // the controller does not receive a RuntimeEnvironment, delegate creation to base class. - result = super.getControllerInstance(controllerClass); - } - instances.put(controllerClass.getName(), result); - } - return result; - } -} diff --git a/samples/java/demo/app/controllers/Application.java b/samples/java/demo/app/controllers/Application.java deleted file mode 100644 index 1327c51dc..000000000 --- a/samples/java/demo/app/controllers/Application.java +++ /dev/null @@ -1,114 +0,0 @@ -/** - * Copyright 2012-214 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package controllers; - -import play.Logger; -import play.libs.F; -import play.mvc.Controller; -import play.mvc.Result; -import securesocial.core.BasicProfile; -import securesocial.core.GenericProfile; -import securesocial.core.RuntimeEnvironment; -import securesocial.core.java.SecureSocial; -import securesocial.core.java.SecuredAction; -import securesocial.core.java.UserAwareAction; -import service.DemoUser; -import views.html.index; -import views.html.linkResult; - - -/** - * A sample controller - */ -public class Application extends Controller { - public static Logger.ALogger logger = Logger.of("application.controllers.Application"); - private RuntimeEnvironment env; - - /** - * A constructor needed to get a hold of the environment instance. - * This could be injected using a DI framework instead too. - * - * @param env - */ - public Application(RuntimeEnvironment env) { - this.env = env; - } - /** - * This action only gets called if the user is logged in. - * - * @return - */ - - @SecuredAction - public Result index() { - if(logger.isDebugEnabled()){ - logger.debug("access granted to index"); - } - DemoUser user = (DemoUser) ctx().args.get(SecureSocial.USER_KEY); - return ok(index.render(user, SecureSocial.env())); - } - - @UserAwareAction - public Result userAware() { - DemoUser demoUser = (DemoUser) ctx().args.get(SecureSocial.USER_KEY); - String userName ; - if ( demoUser != null ) { - GenericProfile user = demoUser.main; - if ( user.firstName().isDefined() ) { - userName = user.firstName().get(); - } else if ( user.fullName().isDefined()) { - userName = user.fullName().get(); - } else { - userName = "authenticated user"; - } - } else { - userName = "guest"; - } - return ok("Hello " + userName + ", you are seeing a public page"); - } - - @SecuredAction(authorization = WithProvider.class, params = {"twitter"}) - public Result onlyTwitter() { - return ok("You are seeing this because you logged in using Twitter"); - } - - @SecuredAction - public Result linkResult() { - DemoUser current = (DemoUser) ctx().args.get(SecureSocial.USER_KEY); - return ok(linkResult.render(current, current.identities)); - } - - /** - * Sample use of SecureSocial.currentUser. Access the /current-user to test it - */ - public F.Promise currentUser() { - return SecureSocial.currentUser(env).map( new F.Function() { - @Override - public Result apply(Object maybeUser) throws Throwable { - String id; - - if ( maybeUser != null ) { - DemoUser user = (DemoUser) maybeUser; - id = user.main.userId(); - } else { - id = "not available. Please log in."; - } - return ok("your id is " + id); - } - }); - } -} diff --git a/samples/java/demo/app/controllers/WithProvider.java b/samples/java/demo/app/controllers/WithProvider.java deleted file mode 100644 index bda94c0b5..000000000 --- a/samples/java/demo/app/controllers/WithProvider.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright 2013-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package controllers; - -import securesocial.core.java.Authorization; -import service.DemoUser; - -/** - * A sample authorization implementation that lets you filter requests based - * on the provider that authenticated the user - */ -public class WithProvider implements Authorization { - public boolean isAuthorized(DemoUser user, String params[]) { - return user.main.providerId().equals(params[0]); - } -} diff --git a/samples/java/demo/app/service/DemoUser.java b/samples/java/demo/app/service/DemoUser.java deleted file mode 100644 index 2fd4f3263..000000000 --- a/samples/java/demo/app/service/DemoUser.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright 2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package service; - -import securesocial.core.BasicProfile; -import securesocial.core.GenericProfile; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -public class DemoUser implements Serializable { - public DemoUser(GenericProfile user) { - this.main = user; - identities = new ArrayList<>(); - identities.add(user); - } - - public GenericProfile main; - public List identities; -} diff --git a/samples/java/demo/app/service/InMemoryUserService.java b/samples/java/demo/app/service/InMemoryUserService.java deleted file mode 100644 index 3e6c064c6..000000000 --- a/samples/java/demo/app/service/InMemoryUserService.java +++ /dev/null @@ -1,180 +0,0 @@ -/** - * Copyright 2012-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package service; - -import play.Logger; -import play.libs.F; -import scala.concurrent.Future; -import securesocial.core.GenericProfile; -import securesocial.core.PasswordInfo; -import securesocial.core.services.SaveMode; -import securesocial.core.java.BaseUserService; -import securesocial.core.java.Token; -import securesocial.core.providers.UsernamePasswordProvider; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -/** - * A Sample In Memory user service in Java - * - * Note: This is NOT suitable for a production environment and is provided only as a guide. - * A real implementation would persist things in a database - */ -public class InMemoryUserService extends BaseUserService { - public Logger.ALogger logger = play.Logger.of("application.service.InMemoryUserService"); - - private HashMap users = new HashMap(); - private HashMap tokens = new HashMap(); - - @Override - public F.Promise doSave(GenericProfile profile, SaveMode mode) { - DemoUser result = null; - if (mode == SaveMode.SignUp()) { - result = new DemoUser(profile); - users.put(profile.providerId() + profile.userId(), result); - } else if (mode == SaveMode.LoggedIn()) { - for (Iterator it = users.values().iterator() ; it.hasNext() && result == null ; ) { - DemoUser user = it.next(); - for ( GenericProfile p : user.identities) { - if ( p.userId().equals(profile.userId()) && p.providerId().equals(profile.providerId())) { - user.identities.remove(p); - user.identities.add(profile); - result = user; - break; - } - } - } - } else if (mode == SaveMode.PasswordChange()) { - for (Iterator it = users.values().iterator() ; it.hasNext() && result == null ; ) { - DemoUser user = it.next(); - for (GenericProfile p : user.identities) { - if (p.userId().equals(profile.userId()) && p.providerId().equals(UsernamePasswordProvider.UsernamePassword())) { - user.identities.remove(p); - user.identities.add(profile); - result = user; - break; - } - } - } - } else { - throw new RuntimeException("Unknown mode"); - } - return F.Promise.pure(result); - } - - @Override - public F.Promise doLink(DemoUser current, GenericProfile to) { - DemoUser target = null; - - for ( DemoUser u: users.values() ) { - if ( u.main.providerId().equals(current.main.providerId()) && u.main.userId().equals(current.main.userId()) ) { - target = u; - break; - } - } - - if ( target == null ) { - // this should not happen - throw new RuntimeException("Can't find user : " + current.main.userId()); - } - - boolean alreadyLinked = false; - for ( GenericProfile p : target.identities) { - if ( p.userId().equals(to.userId()) && p.providerId().equals(to.providerId())) { - alreadyLinked = true; - break; - } - } - if (!alreadyLinked) target.identities.add(to); - return F.Promise.pure(target); - } - - @Override - public F.Promise doSaveToken(Token token) { - tokens.put(token.uuid, token); - return F.Promise.pure(token); - } - - @Override - public F.Promise doFind(String providerId, String userId) { - if(logger.isDebugEnabled()){ - logger.debug("Finding user " + userId); - } - GenericProfile found = null; - - for ( DemoUser u: users.values() ) { - for ( GenericProfile i : u.identities ) { - if ( i.providerId().equals(providerId) && i.userId().equals(userId) ) { - found = i; - break; - } - } - } - - return F.Promise.pure(found); - } - - @Override - public F.Promise doPasswordInfoFor(DemoUser user) { - throw new RuntimeException("doPasswordInfoFor is not implemented yet in sample app"); - } - - @Override - public F.Promise doUpdatePasswordInfo(DemoUser user, PasswordInfo info) { - throw new RuntimeException("doUpdatePasswordInfo is not implemented yet in sample app"); - } - - @Override - public F.Promise doFindToken(String tokenId) { - return F.Promise.pure(tokens.get(tokenId)); - } - - - @Override - public F.Promise doFindByEmailAndProvider(String email, String providerId) { - GenericProfile found = null; - - for ( DemoUser u: users.values() ) { - for ( GenericProfile i : u.identities ) { - if ( i.providerId().equals(providerId) && i.email().isDefined() && i.email().get().equals(email) ) { - found = i; - break; - } - } - } - - return F.Promise.pure(found); - } - - @Override - public F.Promise doDeleteToken(String uuid) { - return F.Promise.pure(tokens.remove(uuid)); - } - - @Override - public void doDeleteExpiredTokens() { - Iterator> iterator = tokens.entrySet().iterator(); - while ( iterator.hasNext() ) { - Map.Entry entry = iterator.next(); - if ( entry.getValue().isExpired() ) { - iterator.remove(); - } - } - } -} diff --git a/samples/java/demo/app/service/MyEnvironment.scala b/samples/java/demo/app/service/MyEnvironment.scala deleted file mode 100644 index ac86b33f9..000000000 --- a/samples/java/demo/app/service/MyEnvironment.scala +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright 2012-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package service - -import securesocial.core.RuntimeEnvironment -import securesocial.core.services.UserService - -class MyEnvironment extends RuntimeEnvironment.Default[DemoUser] { - override val userService: UserService[DemoUser] = new InMemoryUserService() -} \ No newline at end of file diff --git a/samples/java/demo/app/views/index.scala.html b/samples/java/demo/app/views/index.scala.html deleted file mode 100644 index 97b7724d4..000000000 --- a/samples/java/demo/app/views/index.scala.html +++ /dev/null @@ -1,62 +0,0 @@ -@(user: service.DemoUser, env: securesocial.core.RuntimeEnvironment[service.DemoUser]) -@import securesocial.core.IdentityProvider -@import securesocial.core.AuthenticationMethod._ -@import Http.Context.Implicit - -@main("SecureSocial - Sample Protected Page") { -
-

@user.main.fullName Welcome @user.main.firstName

-
- -
-

User Details

- -
    -
  • User Id: @user.main.userId
    • -
  • Logged in from: @user.main.providerId
    • -
  • Fist name: @user.main.firstName
    • -
  • Last name: @user.main.lastName
    • -
  • Full name: @user.main.fullName
    • -
  • Email: @user.main.email.map { email => @email }.getOrElse("Not Available")
    • -
  • Authentication method: @user.main.authMethod
    • -
- - @user.main.oAuth1Info.map { info => -

OAuth1 Info

- -
    -
  • Token: @info.token
    • -
  • Secret: @info.secret
    • -
- } - - @user.main.oAuth2Info.map { info => -

OAuth2 Info

- -
    -
  • Access Token: @info.accessToken
    • - @info.tokenType.map { t =>
  • Token Type: @t
    • } - @info.expiresIn.map { exp =>
  • Expires in: @exp seconds
    • } - @info.refreshToken.map { rt =>
  • Refresh Token: @rt
    • } -
- } -
- @user.main.passwordInfo.map { info => - Change Password - } - - Link this account to - - @env.providers.values.map { provider => - @if( provider.authMethod == OAuth1 || provider.authMethod == OAuth2 ) { - @defining( "images/providers/%s.png".format(provider.id) ) { imageUrl => - - } - } - } - - -
- Logout -
-} diff --git a/samples/java/demo/app/views/linkResult.scala.html b/samples/java/demo/app/views/linkResult.scala.html deleted file mode 100644 index 150fdb3cb..000000000 --- a/samples/java/demo/app/views/linkResult.scala.html +++ /dev/null @@ -1,49 +0,0 @@ -@(current: service.DemoUser, linkedIdentities: java.util.List[securesocial.core.GenericProfile]) - - @main("SecureSocial - Account Link Result") { -
-

@current.main.firstName.getOrElse( Hey @current.main.firstName.getOrElse("")

-
- -
-

You are linked to the following accounts:

- - @linkedIdentities.map { linked => -

@linked.providerId -

-
    -
  • User Id: @linked.userId
    • -
  • Fist name: @linked.firstName
    • -
  • Last name: @linked.lastName
    • -
  • Full name: @linked.fullName
    • -
  • Logged in from: @linked.providerId
    • -
  • Email: @linked.email.map { email => @email }.getOrElse("Not Available")
    • -
  • Authentication method: @linked.authMethod
    • -
- - @linked.oAuth1Info.map { info => -

OAuth1 Info

- -
    -
  • Token: @info.token
    • -
  • Secret: @info.secret
    • -
- } - - @linked.oAuth2Info.map { info => -

OAuth2 Info

- -
    -
  • Access Token: @info.accessToken
    • - @info.tokenType.map { t =>
  • Token Type: @t
    • } - @info.expiresIn.map { exp =>
  • Expires in: @exp seconds
    • } - @info.refreshToken.map { rt =>
  • Refresh Token: @rt
    • } -
- } - -
- } -
- -Ok -} \ No newline at end of file diff --git a/samples/java/demo/app/views/main.scala.html b/samples/java/demo/app/views/main.scala.html deleted file mode 100644 index 42af763d2..000000000 --- a/samples/java/demo/app/views/main.scala.html +++ /dev/null @@ -1,26 +0,0 @@ -@(title: String)(content: Html) - - - - - - @title - - - - - -
-
-
- SecureSocial 2 Java Sample -
-
-
- -
- @content -
` - - - diff --git a/samples/java/demo/conf/application.conf b/samples/java/demo/conf/application.conf deleted file mode 100644 index 3d399be49..000000000 --- a/samples/java/demo/conf/application.conf +++ /dev/null @@ -1,59 +0,0 @@ -# This is the main configuration file for the application. -# ~~~~~ - -# Secret key -# ~~~~~ -# The secret key is used to secure cryptographics functions. -# If you deploy your application to several instances be sure to use the same key! -application.secret=":hcl=cwZ8^kLxj^rC/eFNMBK_Sku/9OHbEOcHCUCORy0E4^<9e" - -# The application languages -# ~~~~~ -application.langs="en,es,de,fr,fa,nl,pt-BR,sr,ar,hu,pl,ru,zh-CN,zh-TW,he" - -# Global object class -# ~~~~~ -# Define the Global object class for this application. -# Default to Global in the root package. -# global=Global - -# Database configuration -# ~~~~~ -# You can declare as many datasources as you want. -# By convention, the default datasource is named `default` -# -# db.default.driver=org.h2.Driver -# db.default.url="jdbc:h2:mem:play" -# db.default.user=sa -# db.default.password= -# -# You can expose this datasource via JNDI if needed (Useful for JPA) -# db.default.jndiName=DefaultDS - -# Evolutions -# ~~~~~ -# You can disable evolutions if needed -# evolutionplugin=disabled - -# Ebean configuration -# ~~~~~ -# You can declare as many Ebean servers as you want. -# By convention, the default server is named `default` -# -# ebean.default="models.*" - -# Logger -# ~~~~~ -# You can also configure logback (http://logback.qos.ch/), by providing a logger.xml file in the conf directory . - -# Root logger: -logger.root=ERROR - -# Logger used by the framework: -logger.play=INFO - -# Logger provided to your application: -logger.application=DEBUG -logger.securesocial=DEBUG - -include "securesocial.conf" diff --git a/samples/java/demo/conf/play.plugins b/samples/java/demo/conf/play.plugins deleted file mode 100644 index 84e64c87c..000000000 --- a/samples/java/demo/conf/play.plugins +++ /dev/null @@ -1 +0,0 @@ -1500:com.typesafe.plugin.CommonsMailerPlugin diff --git a/samples/java/demo/conf/routes b/samples/java/demo/conf/routes deleted file mode 100644 index 6360cee72..000000000 --- a/samples/java/demo/conf/routes +++ /dev/null @@ -1,14 +0,0 @@ -# Routes -# This file defines all application routes (Higher priority routes first) -# ~~~~ - -# Home page -GET / @controllers.Application.index -GET /userAware @controllers.Application.userAware -GET /only-twitter @controllers.Application.onlyTwitter -GET /link-result @controllers.Application.linkResult -GET /current-user @controllers.Application.currentUser - -# Map static resources from the /public folder to the /assets URL path -GET /assets/*file controllers.Assets.at(path="/public", file) --> /auth securesocial.Routes \ No newline at end of file diff --git a/samples/java/demo/conf/securesocial.conf b/samples/java/demo/conf/securesocial.conf deleted file mode 100644 index bfcda6761..000000000 --- a/samples/java/demo/conf/securesocial.conf +++ /dev/null @@ -1,217 +0,0 @@ -##################################################################################### -# -# SecureSocial 2 Settings -# -##################################################################################### - -smtp { - host=smtp.gmail.com - #port=25 - ssl=true - user="your_user" - password=your_password - from="your_from_address" -} - -securesocial { - # - # If enabled, sets the path to your copy of Bootstrap.css to be used instead of the default one provided by SecureSocial - # - #bootstrapCssPath="your path" - - - # - # If enabled, sets the Favicon to display when in SecureSocial pages - # - #faviconPath="your path" - - - # - # If enabled, sets the path to your copy of JQuery to be used instead of the default one provided by SecureSocial - # - #jqueryPath="your path" - - - # - # If enabled, injects this Css file into all SecureSocial pages, allowing for minor style customizations - # If you want to do major changes, please read about custom templates in SecureSocial - # - #customCssPath="your path" - - # - # Where to redirect the user if SecureSocial can't figure that out from - # the request that led the use to the login page - # - onLoginGoTo=/ - - # - # Where to redirect the user when he logs out. If not set SecureSocial will redirect to the login page - # - #onLogoutGoTo=/login - - # - # Where to redirect the user when he/she starts the signup process. - # If not set SecureSocial will redirect to the login page - # - #onStartSignUpGoTo=/login - - # - # Where to redirect the user when he/she signs up. - # If not set SecureSocial will redirect to the login page - # - #onSignUpGoTo=/login - - # - # Where to redirect the user when he starts the password reset process. - # If not set SecureSocial will redirect to the login page - # - #onStartResetPasswordGoTo=/login - - # - # Where to redirect the user when he resets his/her password. - # If not set SecureSocial will redirect to the login page - # - #onResetPasswordGoTo=/login - - # - # Where to redirect the user when he changes his/her password. - # If not set SecureSocial will redirect to the password change page - # - #onPasswordChangeGoTo=/password - - # - # Enable SSL for oauth callback urls, login/signup/password recovery pages and the authenticator cookie - # - ssl=false - - - # - # Parameters for the cookie used to track users. - # - cookie { - # - # The cookie name (defaults to 'id') - #name=id - - # - # The path for which the cookie should be sent by the browser (defaults to /) - # - #path=/ - - # - # The domain for which the cookie should be sent (it is left empty by default) - # - #domain=some_domain - - # - # If set to true, the cookie is not readable by a client side script (defaults to true). - # - #httpOnly=true - - # - # The amount of time the session id will remain valid since the last request - # - idleTimeoutInMinutes=30 - - # - # The amount of time the session id will be valid since the user authenticated. - # After this the user will need to re-authenticate - # - absoluteTimeOutInMinutes=720 - } - - twitter { - requestTokenUrl="https://twitter.com/oauth/request_token" - accessTokenUrl="https://twitter.com/oauth/access_token" - authorizationUrl="https://twitter.com/oauth/authenticate" - consumerKey=your_consumer_key - consumerSecret=your_consumer_secret - } - - facebook { - authorizationUrl="https://graph.facebook.com/oauth/authorize" - accessTokenUrl="https://graph.facebook.com/oauth/access_token" - clientId=your_client_id - clientSecret=your_client_secret - # this scope is the minimum SecureSocial requires. You can add more if required by your app. - scope=email - } - - google { - authorizationUrl="https://accounts.google.com/o/oauth2/auth" - accessTokenUrl="https://accounts.google.com/o/oauth2/token" - clientId=your_client_id - clientSecret=your_client_secret - scope="profile email" - } - - linkedin { - requestTokenUrl="https://api.linkedin.com/uas/oauth/requestToken" - accessTokenUrl="https://api.linkedin.com/uas/oauth/accessToken" - authorizationUrl="https://api.linkedin.com/uas/oauth/authenticate" - consumerKey=your_consumer_key - consumerSecret=your_consumer_secret - } - - github { - authorizationUrl="https://github.com/login/oauth/authorize" - accessTokenUrl="https://github.com/login/oauth/access_token" - clientId=your_client_id - clientSecret=your_client_secret - } - - foursquare { - authorizationUrl="https://foursquare.com/oauth2/authenticate" - accessTokenUrl="https://foursquare.com/oauth2/access_token" - clientId=your_client_id - clientSecret=your_client_secret - } - - dropbox { - authorizationUrl="https://www.dropbox.com/1/oauth2/authorize" - accessTokenUrl="https://api.dropbox.com/1/oauth2/token" - clientId=your_app_key - clientSecret=your_app_secret - } - - xing { - requestTokenUrl="https://api.xing.com/v1/request_token" - accessTokenUrl="https://api.xing.com/v1/access_token" - authorizationUrl="https://api.xing.com/v1/authorize" - consumerKey=your_consumer_key - consumerSecret=your_consumer_secret - } - - instagram { - authorizationUrl="https://api.instagram.com/oauth/authorize" - accessTokenUrl="https://api.instagram.com/oauth/access_token" - clientId=your_client_id - clientSecret=your_client_secret - } - - vk { - authorizationUrl="http://oauth.vk.com/authorize" - accessTokenUrl="https://oauth.vk.com/access_token" - clientId=your_client_id - clientSecret=your_client_secret - } - - weibo { - authorizationUrl="https://api.weibo.com/oauth2/authorize" - accessTokenUrl="https://api.weibo.com/oauth2/access_token" - clientId=your_client_id - clientSecret=your_client_secret - } - - userpass { - # - # Enable username support, otherwise SecureSocial will use the emails as user names - # - withUserNameSupport=false - sendWelcomeEmail=true - enableGravatarSupport=true - tokenDuration=60 - tokenDeleteInterval=5 - signupSkipLogin=false - } -} diff --git a/samples/java/demo/javaDemo.sbt b/samples/java/demo/javaDemo.sbt deleted file mode 100644 index c8b0633b4..000000000 --- a/samples/java/demo/javaDemo.sbt +++ /dev/null @@ -1,11 +0,0 @@ -name := "java-demo" - -version := Common.version - -scalaVersion := Common.scalaVersion - -scalariformSettings - -libraryDependencies ++= Seq("ws.securesocial" %% "securesocial" % version.value, javaCore) - -resolvers += Resolver.sonatypeRepo("snapshots") diff --git a/samples/java/demo/project/build.properties b/samples/java/demo/project/build.properties deleted file mode 100644 index be6c454fb..000000000 --- a/samples/java/demo/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=0.13.5 diff --git a/samples/java/demo/project/plugins.sbt b/samples/java/demo/project/plugins.sbt deleted file mode 100644 index 44ad23ad5..000000000 --- a/samples/java/demo/project/plugins.sbt +++ /dev/null @@ -1,8 +0,0 @@ -// Comment to get more information during initialization -logLevel := Level.Warn - -// The Typesafe repository -resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/" - -// Use the Play sbt plugin for Play projects -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % System.getProperty("play.version")) diff --git a/samples/java/demo/public/bootstrap/css/bootstrap-responsive.css b/samples/java/demo/public/bootstrap/css/bootstrap-responsive.css deleted file mode 100644 index 7f669d573..000000000 --- a/samples/java/demo/public/bootstrap/css/bootstrap-responsive.css +++ /dev/null @@ -1,808 +0,0 @@ -/*! - * Bootstrap Responsive v2.0.3 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 28px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; -} - -.hidden { - display: none; - visibility: hidden; -} - -.visible-phone { - display: none !important; -} - -.visible-tablet { - display: none !important; -} - -.hidden-desktop { - display: none !important; -} - -@media (max-width: 767px) { - .visible-phone { - display: inherit !important; - } - .hidden-phone { - display: none !important; - } - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important; - } -} - -@media (min-width: 768px) and (max-width: 979px) { - .visible-tablet { - display: inherit !important; - } - .hidden-tablet { - display: none !important; - } - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important ; - } -} - -@media (max-width: 480px) { - .nav-collapse { - -webkit-transform: translate3d(0, 0, 0); - } - .page-header h1 small { - display: block; - line-height: 18px; - } - input[type="checkbox"], - input[type="radio"] { - border: 1px solid #ccc; - } - .form-horizontal .control-group > label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - .form-horizontal .controls { - margin-left: 0; - } - .form-horizontal .control-list { - padding-top: 0; - } - .form-horizontal .form-actions { - padding-right: 10px; - padding-left: 10px; - } - .modal { - position: absolute; - top: 10px; - right: 10px; - left: 10px; - width: auto; - margin: 0; - } - .modal.fade.in { - top: auto; - } - .modal-header .close { - padding: 10px; - margin: -10px; - } - .carousel-caption { - position: static; - } -} - -@media (max-width: 767px) { - body { - padding-right: 20px; - padding-left: 20px; - } - .navbar-fixed-top, - .navbar-fixed-bottom { - margin-right: -20px; - margin-left: -20px; - } - .container-fluid { - padding: 0; - } - .dl-horizontal dt { - float: none; - width: auto; - clear: none; - text-align: left; - } - .dl-horizontal dd { - margin-left: 0; - } - .container { - width: auto; - } - .row-fluid { - width: 100%; - } - .row, - .thumbnails { - margin-left: 0; - } - [class*="span"], - .row-fluid [class*="span"] { - display: block; - float: none; - width: auto; - margin-left: 0; - } - .input-large, - .input-xlarge, - .input-xxlarge, - input[class*="span"], - select[class*="span"], - textarea[class*="span"], - .uneditable-input { - display: block; - width: 100%; - min-height: 28px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - } - .input-prepend input, - .input-append input, - .input-prepend input[class*="span"], - .input-append input[class*="span"] { - display: inline-block; - width: auto; - } -} - -@media (min-width: 768px) and (max-width: 979px) { - .row { - margin-left: -20px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - margin-left: 20px; - } - .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 724px; - } - .span12 { - width: 724px; - } - .span11 { - width: 662px; - } - .span10 { - width: 600px; - } - .span9 { - width: 538px; - } - .span8 { - width: 476px; - } - .span7 { - width: 414px; - } - .span6 { - width: 352px; - } - .span5 { - width: 290px; - } - .span4 { - width: 228px; - } - .span3 { - width: 166px; - } - .span2 { - width: 104px; - } - .span1 { - width: 42px; - } - .offset12 { - margin-left: 764px; - } - .offset11 { - margin-left: 702px; - } - .offset10 { - margin-left: 640px; - } - .offset9 { - margin-left: 578px; - } - .offset8 { - margin-left: 516px; - } - .offset7 { - margin-left: 454px; - } - .offset6 { - margin-left: 392px; - } - .offset5 { - margin-left: 330px; - } - .offset4 { - margin-left: 268px; - } - .offset3 { - margin-left: 206px; - } - .offset2 { - margin-left: 144px; - } - .offset1 { - margin-left: 82px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 28px; - margin-left: 2.762430939%; - *margin-left: 2.709239449638298%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .span12 { - width: 99.999999993%; - *width: 99.9468085036383%; - } - .row-fluid .span11 { - width: 91.436464082%; - *width: 91.38327259263829%; - } - .row-fluid .span10 { - width: 82.87292817100001%; - *width: 82.8197366816383%; - } - .row-fluid .span9 { - width: 74.30939226%; - *width: 74.25620077063829%; - } - .row-fluid .span8 { - width: 65.74585634900001%; - *width: 65.6926648596383%; - } - .row-fluid .span7 { - width: 57.182320438000005%; - *width: 57.129128948638304%; - } - .row-fluid .span6 { - width: 48.618784527%; - *width: 48.5655930376383%; - } - .row-fluid .span5 { - width: 40.055248616%; - *width: 40.0020571266383%; - } - .row-fluid .span4 { - width: 31.491712705%; - *width: 31.4385212156383%; - } - .row-fluid .span3 { - width: 22.928176794%; - *width: 22.874985304638297%; - } - .row-fluid .span2 { - width: 14.364640883%; - *width: 14.311449393638298%; - } - .row-fluid .span1 { - width: 5.801104972%; - *width: 5.747913482638298%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 714px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 652px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 590px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 528px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 466px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 404px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 342px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 280px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 218px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 156px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 94px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 32px; - } -} - -@media (min-width: 1200px) { - .row { - margin-left: -30px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - margin-left: 30px; - } - .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 1170px; - } - .span12 { - width: 1170px; - } - .span11 { - width: 1070px; - } - .span10 { - width: 970px; - } - .span9 { - width: 870px; - } - .span8 { - width: 770px; - } - .span7 { - width: 670px; - } - .span6 { - width: 570px; - } - .span5 { - width: 470px; - } - .span4 { - width: 370px; - } - .span3 { - width: 270px; - } - .span2 { - width: 170px; - } - .span1 { - width: 70px; - } - .offset12 { - margin-left: 1230px; - } - .offset11 { - margin-left: 1130px; - } - .offset10 { - margin-left: 1030px; - } - .offset9 { - margin-left: 930px; - } - .offset8 { - margin-left: 830px; - } - .offset7 { - margin-left: 730px; - } - .offset6 { - margin-left: 630px; - } - .offset5 { - margin-left: 530px; - } - .offset4 { - margin-left: 430px; - } - .offset3 { - margin-left: 330px; - } - .offset2 { - margin-left: 230px; - } - .offset1 { - margin-left: 130px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 28px; - margin-left: 2.564102564%; - *margin-left: 2.510911074638298%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.45299145300001%; - *width: 91.3997999636383%; - } - .row-fluid .span10 { - width: 82.905982906%; - *width: 82.8527914166383%; - } - .row-fluid .span9 { - width: 74.358974359%; - *width: 74.30578286963829%; - } - .row-fluid .span8 { - width: 65.81196581200001%; - *width: 65.7587743226383%; - } - .row-fluid .span7 { - width: 57.264957265%; - *width: 57.2117657756383%; - } - .row-fluid .span6 { - width: 48.717948718%; - *width: 48.6647572286383%; - } - .row-fluid .span5 { - width: 40.170940171000005%; - *width: 40.117748681638304%; - } - .row-fluid .span4 { - width: 31.623931624%; - *width: 31.5707401346383%; - } - .row-fluid .span3 { - width: 23.076923077%; - *width: 23.0237315876383%; - } - .row-fluid .span2 { - width: 14.529914530000001%; - *width: 14.4767230406383%; - } - .row-fluid .span1 { - width: 5.982905983%; - *width: 5.929714493638298%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 1160px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 1060px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 960px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 860px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 760px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 660px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 560px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 460px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 360px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 260px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 160px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 60px; - } - .thumbnails { - margin-left: -30px; - } - .thumbnails > li { - margin-left: 30px; - } - .row-fluid .thumbnails { - margin-left: 0; - } -} - -@media (max-width: 979px) { - body { - padding-top: 0; - } - .navbar-fixed-top { - position: static; - margin-bottom: 18px; - } - .navbar-fixed-top .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - .navbar .brand { - padding-right: 10px; - padding-left: 10px; - margin: 0 0 0 -5px; - } - .nav-collapse { - clear: both; - } - .nav-collapse .nav { - float: none; - margin: 0 0 9px; - } - .nav-collapse .nav > li { - float: none; - } - .nav-collapse .nav > li > a { - margin-bottom: 2px; - } - .nav-collapse .nav > .divider-vertical { - display: none; - } - .nav-collapse .nav .nav-header { - color: #999999; - text-shadow: none; - } - .nav-collapse .nav > li > a, - .nav-collapse .dropdown-menu a { - padding: 6px 15px; - font-weight: bold; - color: #999999; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - } - .nav-collapse .btn { - padding: 4px 10px 4px; - font-weight: normal; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - } - .nav-collapse .dropdown-menu li + li a { - margin-bottom: 2px; - } - .nav-collapse .nav > li > a:hover, - .nav-collapse .dropdown-menu a:hover { - background-color: #222222; - } - .nav-collapse.in .btn-group { - padding: 0; - margin-top: 5px; - } - .nav-collapse .dropdown-menu { - position: static; - top: auto; - left: auto; - display: block; - float: none; - max-width: none; - padding: 0; - margin: 0 15px; - background-color: transparent; - border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .nav-collapse .dropdown-menu:before, - .nav-collapse .dropdown-menu:after { - display: none; - } - .nav-collapse .dropdown-menu .divider { - display: none; - } - .nav-collapse .navbar-form, - .nav-collapse .navbar-search { - float: none; - padding: 9px 15px; - margin: 9px 0; - border-top: 1px solid #222222; - border-bottom: 1px solid #222222; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - } - .navbar .nav-collapse .nav.pull-right { - float: none; - margin-left: 0; - } - .nav-collapse, - .nav-collapse.collapse { - height: 0; - overflow: hidden; - } - .navbar .btn-navbar { - display: block; - } - .navbar-static .navbar-inner { - padding-right: 10px; - padding-left: 10px; - } -} - -@media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - overflow: visible !important; - } -} diff --git a/samples/java/demo/public/bootstrap/css/bootstrap-responsive.min.css b/samples/java/demo/public/bootstrap/css/bootstrap-responsive.min.css deleted file mode 100644 index dd134a1bd..000000000 --- a/samples/java/demo/public/bootstrap/css/bootstrap-responsive.min.css +++ /dev/null @@ -1,9 +0,0 @@ -/*! - * Bootstrap Responsive v2.0.3 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}@media(max-width:767px){.visible-phone{display:inherit!important}.hidden-phone{display:none!important}.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}}@media(min-width:768px) and (max-width:979px){.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:18px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.modal{position:absolute;top:10px;right:10px;left:10px;width:auto;margin:0}.modal.fade.in{top:auto}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:auto;margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;content:""}.row:after{clear:both}[class*="span"]{float:left;margin-left:20px}.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:28px;margin-left:2.762430939%;*margin-left:2.709239449638298%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:99.999999993%;*width:99.9468085036383%}.row-fluid .span11{width:91.436464082%;*width:91.38327259263829%}.row-fluid .span10{width:82.87292817100001%;*width:82.8197366816383%}.row-fluid .span9{width:74.30939226%;*width:74.25620077063829%}.row-fluid .span8{width:65.74585634900001%;*width:65.6926648596383%}.row-fluid .span7{width:57.182320438000005%;*width:57.129128948638304%}.row-fluid .span6{width:48.618784527%;*width:48.5655930376383%}.row-fluid .span5{width:40.055248616%;*width:40.0020571266383%}.row-fluid .span4{width:31.491712705%;*width:31.4385212156383%}.row-fluid .span3{width:22.928176794%;*width:22.874985304638297%}.row-fluid .span2{width:14.364640883%;*width:14.311449393638298%}.row-fluid .span1{width:5.801104972%;*width:5.747913482638298%}input,textarea,.uneditable-input{margin-left:0}input.span12,textarea.span12,.uneditable-input.span12{width:714px}input.span11,textarea.span11,.uneditable-input.span11{width:652px}input.span10,textarea.span10,.uneditable-input.span10{width:590px}input.span9,textarea.span9,.uneditable-input.span9{width:528px}input.span8,textarea.span8,.uneditable-input.span8{width:466px}input.span7,textarea.span7,.uneditable-input.span7{width:404px}input.span6,textarea.span6,.uneditable-input.span6{width:342px}input.span5,textarea.span5,.uneditable-input.span5{width:280px}input.span4,textarea.span4,.uneditable-input.span4{width:218px}input.span3,textarea.span3,.uneditable-input.span3{width:156px}input.span2,textarea.span2,.uneditable-input.span2{width:94px}input.span1,textarea.span1,.uneditable-input.span1{width:32px}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;content:""}.row:after{clear:both}[class*="span"]{float:left;margin-left:30px}.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:28px;margin-left:2.564102564%;*margin-left:2.510911074638298%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145300001%;*width:91.3997999636383%}.row-fluid .span10{width:82.905982906%;*width:82.8527914166383%}.row-fluid .span9{width:74.358974359%;*width:74.30578286963829%}.row-fluid .span8{width:65.81196581200001%;*width:65.7587743226383%}.row-fluid .span7{width:57.264957265%;*width:57.2117657756383%}.row-fluid .span6{width:48.717948718%;*width:48.6647572286383%}.row-fluid .span5{width:40.170940171000005%;*width:40.117748681638304%}.row-fluid .span4{width:31.623931624%;*width:31.5707401346383%}.row-fluid .span3{width:23.076923077%;*width:23.0237315876383%}.row-fluid .span2{width:14.529914530000001%;*width:14.4767230406383%}.row-fluid .span1{width:5.982905983%;*width:5.929714493638298%}input,textarea,.uneditable-input{margin-left:0}input.span12,textarea.span12,.uneditable-input.span12{width:1160px}input.span11,textarea.span11,.uneditable-input.span11{width:1060px}input.span10,textarea.span10,.uneditable-input.span10{width:960px}input.span9,textarea.span9,.uneditable-input.span9{width:860px}input.span8,textarea.span8,.uneditable-input.span8{width:760px}input.span7,textarea.span7,.uneditable-input.span7{width:660px}input.span6,textarea.span6,.uneditable-input.span6{width:560px}input.span5,textarea.span5,.uneditable-input.span5{width:460px}input.span4,textarea.span4,.uneditable-input.span4{width:360px}input.span3,textarea.span3,.uneditable-input.span3{width:260px}input.span2,textarea.span2,.uneditable-input.span2{width:160px}input.span1,textarea.span1,.uneditable-input.span1{width:60px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top{position:static;margin-bottom:18px}.navbar-fixed-top .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 9px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#999;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:6px 15px;font-weight:bold;color:#999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .dropdown-menu a:hover{background-color:#222}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:block;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:9px 15px;margin:9px 0;border-top:1px solid #222;border-bottom:1px solid #222;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}} diff --git a/samples/java/demo/public/bootstrap/css/bootstrap.css b/samples/java/demo/public/bootstrap/css/bootstrap.css deleted file mode 100644 index 09e2833dc..000000000 --- a/samples/java/demo/public/bootstrap/css/bootstrap.css +++ /dev/null @@ -1,4960 +0,0 @@ -/*! - * Bootstrap v2.0.3 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} - -audio, -canvas, -video { - display: inline-block; - *display: inline; - *zoom: 1; -} - -audio:not([controls]) { - display: none; -} - -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} - -a:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -a:hover, -a:active { - outline: 0; -} - -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} - -sup { - top: -0.5em; -} - -sub { - bottom: -0.25em; -} - -img { - max-width: 100%; - vertical-align: middle; - border: 0; - -ms-interpolation-mode: bicubic; -} - -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} - -button, -input { - *overflow: visible; - line-height: normal; -} - -button::-moz-focus-inner, -input::-moz-focus-inner { - padding: 0; - border: 0; -} - -button, -input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; -} - -input[type="search"] { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; - -webkit-appearance: textfield; -} - -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; -} - -textarea { - overflow: auto; - vertical-align: top; -} - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 28px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; -} - -body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #333333; - background-color: #ffffff; -} - -a { - color: #0088cc; - text-decoration: none; -} - -a:hover { - color: #005580; - text-decoration: underline; -} - -.row { - margin-left: -20px; - *zoom: 1; -} - -.row:before, -.row:after { - display: table; - content: ""; -} - -.row:after { - clear: both; -} - -[class*="span"] { - float: left; - margin-left: 20px; -} - -.container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.span12 { - width: 940px; -} - -.span11 { - width: 860px; -} - -.span10 { - width: 780px; -} - -.span9 { - width: 700px; -} - -.span8 { - width: 620px; -} - -.span7 { - width: 540px; -} - -.span6 { - width: 460px; -} - -.span5 { - width: 380px; -} - -.span4 { - width: 300px; -} - -.span3 { - width: 220px; -} - -.span2 { - width: 140px; -} - -.span1 { - width: 60px; -} - -.offset12 { - margin-left: 980px; -} - -.offset11 { - margin-left: 900px; -} - -.offset10 { - margin-left: 820px; -} - -.offset9 { - margin-left: 740px; -} - -.offset8 { - margin-left: 660px; -} - -.offset7 { - margin-left: 580px; -} - -.offset6 { - margin-left: 500px; -} - -.offset5 { - margin-left: 420px; -} - -.offset4 { - margin-left: 340px; -} - -.offset3 { - margin-left: 260px; -} - -.offset2 { - margin-left: 180px; -} - -.offset1 { - margin-left: 100px; -} - -.row-fluid { - width: 100%; - *zoom: 1; -} - -.row-fluid:before, -.row-fluid:after { - display: table; - content: ""; -} - -.row-fluid:after { - clear: both; -} - -.row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 28px; - margin-left: 2.127659574%; - *margin-left: 2.0744680846382977%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; -} - -.row-fluid [class*="span"]:first-child { - margin-left: 0; -} - -.row-fluid .span12 { - width: 99.99999998999999%; - *width: 99.94680850063828%; -} - -.row-fluid .span11 { - width: 91.489361693%; - *width: 91.4361702036383%; -} - -.row-fluid .span10 { - width: 82.97872339599999%; - *width: 82.92553190663828%; -} - -.row-fluid .span9 { - width: 74.468085099%; - *width: 74.4148936096383%; -} - -.row-fluid .span8 { - width: 65.95744680199999%; - *width: 65.90425531263828%; -} - -.row-fluid .span7 { - width: 57.446808505%; - *width: 57.3936170156383%; -} - -.row-fluid .span6 { - width: 48.93617020799999%; - *width: 48.88297871863829%; -} - -.row-fluid .span5 { - width: 40.425531911%; - *width: 40.3723404216383%; -} - -.row-fluid .span4 { - width: 31.914893614%; - *width: 31.8617021246383%; -} - -.row-fluid .span3 { - width: 23.404255317%; - *width: 23.3510638276383%; -} - -.row-fluid .span2 { - width: 14.89361702%; - *width: 14.8404255306383%; -} - -.row-fluid .span1 { - width: 6.382978723%; - *width: 6.329787233638298%; -} - -.container { - margin-right: auto; - margin-left: auto; - *zoom: 1; -} - -.container:before, -.container:after { - display: table; - content: ""; -} - -.container:after { - clear: both; -} - -.container-fluid { - padding-right: 20px; - padding-left: 20px; - *zoom: 1; -} - -.container-fluid:before, -.container-fluid:after { - display: table; - content: ""; -} - -.container-fluid:after { - clear: both; -} - -p { - margin: 0 0 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; -} - -p small { - font-size: 11px; - color: #999999; -} - -.lead { - margin-bottom: 18px; - font-size: 20px; - font-weight: 200; - line-height: 27px; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 0; - font-family: inherit; - font-weight: bold; - color: inherit; - text-rendering: optimizelegibility; -} - -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - font-weight: normal; - color: #999999; -} - -h1 { - font-size: 30px; - line-height: 36px; -} - -h1 small { - font-size: 18px; -} - -h2 { - font-size: 24px; - line-height: 36px; -} - -h2 small { - font-size: 18px; -} - -h3 { - font-size: 18px; - line-height: 27px; -} - -h3 small { - font-size: 14px; -} - -h4, -h5, -h6 { - line-height: 18px; -} - -h4 { - font-size: 14px; -} - -h4 small { - font-size: 12px; -} - -h5 { - font-size: 12px; -} - -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; -} - -.page-header { - padding-bottom: 17px; - margin: 18px 0; - border-bottom: 1px solid #eeeeee; -} - -.page-header h1 { - line-height: 1; -} - -ul, -ol { - padding: 0; - margin: 0 0 9px 25px; -} - -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} - -ul { - list-style: disc; -} - -ol { - list-style: decimal; -} - -li { - line-height: 18px; -} - -ul.unstyled, -ol.unstyled { - margin-left: 0; - list-style: none; -} - -dl { - margin-bottom: 18px; -} - -dt, -dd { - line-height: 18px; -} - -dt { - font-weight: bold; - line-height: 17px; -} - -dd { - margin-left: 9px; -} - -.dl-horizontal dt { - float: left; - width: 120px; - overflow: hidden; - clear: left; - text-align: right; - text-overflow: ellipsis; - white-space: nowrap; -} - -.dl-horizontal dd { - margin-left: 130px; -} - -hr { - margin: 18px 0; - border: 0; - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #ffffff; -} - -strong { - font-weight: bold; -} - -em { - font-style: italic; -} - -.muted { - color: #999999; -} - -abbr[title] { - cursor: help; - border-bottom: 1px dotted #ddd; -} - -abbr.initialism { - font-size: 90%; - text-transform: uppercase; -} - -blockquote { - padding: 0 0 0 15px; - margin: 0 0 18px; - border-left: 5px solid #eeeeee; -} - -blockquote p { - margin-bottom: 0; - font-size: 16px; - font-weight: 300; - line-height: 22.5px; -} - -blockquote small { - display: block; - line-height: 18px; - color: #999999; -} - -blockquote small:before { - content: '\2014 \00A0'; -} - -blockquote.pull-right { - float: right; - padding-right: 15px; - padding-left: 0; - border-right: 5px solid #eeeeee; - border-left: 0; -} - -blockquote.pull-right p, -blockquote.pull-right small { - text-align: right; -} - -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} - -address { - display: block; - margin-bottom: 18px; - font-style: normal; - line-height: 18px; -} - -small { - font-size: 100%; -} - -cite { - font-style: normal; -} - -code, -pre { - padding: 0 3px 2px; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; - font-size: 12px; - color: #333333; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -code { - padding: 2px 4px; - color: #d14; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} - -pre { - display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; - word-break: break-all; - word-wrap: break-word; - white-space: pre; - white-space: pre-wrap; - background-color: #f5f5f5; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -pre.prettyprint { - margin-bottom: 18px; -} - -pre code { - padding: 0; - color: inherit; - background-color: transparent; - border: 0; -} - -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} - -form { - margin: 0 0 18px; -} - -fieldset { - padding: 0; - margin: 0; - border: 0; -} - -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; - color: #333333; - border: 0; - border-bottom: 1px solid #eee; -} - -legend small { - font-size: 13.5px; - color: #999999; -} - -label, -input, -button, -select, -textarea { - font-size: 13px; - font-weight: normal; - line-height: 18px; -} - -input, -button, -select, -textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} - -label { - display: block; - margin-bottom: 5px; - color: #333333; -} - -input, -textarea, -select, -.uneditable-input { - display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; - color: #555555; - background-color: #ffffff; - border: 1px solid #cccccc; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.uneditable-textarea { - width: auto; - height: auto; -} - -label input, -label textarea, -label select { - display: block; -} - -input[type="image"], -input[type="checkbox"], -input[type="radio"] { - width: auto; - height: auto; - padding: 0; - margin: 3px 0; - *margin-top: 0; - /* IE7 */ - - line-height: normal; - cursor: pointer; - background-color: transparent; - border: 0 \9; - /* IE9 and down */ - - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -input[type="image"] { - border: 0; -} - -input[type="file"] { - width: auto; - padding: initial; - line-height: initial; - background-color: #ffffff; - background-color: initial; - border: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -input[type="button"], -input[type="reset"], -input[type="submit"] { - width: auto; - height: auto; -} - -select, -input[type="file"] { - height: 28px; - /* In IE7, the height of the select element cannot be changed by height, only font-size */ - - *margin-top: 4px; - /* For IE7, add top margin to align select with labels */ - - line-height: 28px; -} - -input[type="file"] { - line-height: 18px \9; -} - -select { - width: 220px; - background-color: #ffffff; -} - -select[multiple], -select[size] { - height: auto; -} - -input[type="image"] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -textarea { - height: auto; -} - -input[type="hidden"] { - display: none; -} - -.radio, -.checkbox { - min-height: 18px; - padding-left: 18px; -} - -.radio input[type="radio"], -.checkbox input[type="checkbox"] { - float: left; - margin-left: -18px; -} - -.controls > .radio:first-child, -.controls > .checkbox:first-child { - padding-top: 5px; -} - -.radio.inline, -.checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; -} - -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { - margin-left: 10px; -} - -input, -textarea { - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} - -input:focus, -textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -} - -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus, -select:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.input-mini { - width: 60px; -} - -.input-small { - width: 90px; -} - -.input-medium { - width: 150px; -} - -.input-large { - width: 210px; -} - -.input-xlarge { - width: 270px; -} - -.input-xxlarge { - width: 530px; -} - -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"] { - float: none; - margin-left: 0; -} - -input, -textarea, -.uneditable-input { - margin-left: 0; -} - -input.span12, -textarea.span12, -.uneditable-input.span12 { - width: 930px; -} - -input.span11, -textarea.span11, -.uneditable-input.span11 { - width: 850px; -} - -input.span10, -textarea.span10, -.uneditable-input.span10 { - width: 770px; -} - -input.span9, -textarea.span9, -.uneditable-input.span9 { - width: 690px; -} - -input.span8, -textarea.span8, -.uneditable-input.span8 { - width: 610px; -} - -input.span7, -textarea.span7, -.uneditable-input.span7 { - width: 530px; -} - -input.span6, -textarea.span6, -.uneditable-input.span6 { - width: 450px; -} - -input.span5, -textarea.span5, -.uneditable-input.span5 { - width: 370px; -} - -input.span4, -textarea.span4, -.uneditable-input.span4 { - width: 290px; -} - -input.span3, -textarea.span3, -.uneditable-input.span3 { - width: 210px; -} - -input.span2, -textarea.span2, -.uneditable-input.span2 { - width: 130px; -} - -input.span1, -textarea.span1, -.uneditable-input.span1 { - width: 50px; -} - -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - cursor: not-allowed; - background-color: #eeeeee; - border-color: #ddd; -} - -input[type="radio"][disabled], -input[type="checkbox"][disabled], -input[type="radio"][readonly], -input[type="checkbox"][readonly] { - background-color: transparent; -} - -.control-group.warning > label, -.control-group.warning .help-block, -.control-group.warning .help-inline { - color: #c09853; -} - -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - color: #c09853; - border-color: #c09853; -} - -.control-group.warning input:focus, -.control-group.warning select:focus, -.control-group.warning textarea:focus { - border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; -} - -.control-group.warning .input-prepend .add-on, -.control-group.warning .input-append .add-on { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; -} - -.control-group.error > label, -.control-group.error .help-block, -.control-group.error .help-inline { - color: #b94a48; -} - -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - color: #b94a48; - border-color: #b94a48; -} - -.control-group.error input:focus, -.control-group.error select:focus, -.control-group.error textarea:focus { - border-color: #953b39; - -webkit-box-shadow: 0 0 6px #d59392; - -moz-box-shadow: 0 0 6px #d59392; - box-shadow: 0 0 6px #d59392; -} - -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; -} - -.control-group.success > label, -.control-group.success .help-block, -.control-group.success .help-inline { - color: #468847; -} - -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - color: #468847; - border-color: #468847; -} - -.control-group.success input:focus, -.control-group.success select:focus, -.control-group.success textarea:focus { - border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; -} - -.control-group.success .input-prepend .add-on, -.control-group.success .input-append .add-on { - color: #468847; - background-color: #dff0d8; - border-color: #468847; -} - -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { - color: #b94a48; - border-color: #ee5f5b; -} - -input:focus:required:invalid:focus, -textarea:focus:required:invalid:focus, -select:focus:required:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} - -.form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - *zoom: 1; -} - -.form-actions:before, -.form-actions:after { - display: table; - content: ""; -} - -.form-actions:after { - clear: both; -} - -.uneditable-input { - overflow: hidden; - white-space: nowrap; - cursor: not-allowed; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} - -:-moz-placeholder { - color: #999999; -} - -::-webkit-input-placeholder { - color: #999999; -} - -.help-block, -.help-inline { - color: #555555; -} - -.help-block { - display: block; - margin-bottom: 9px; -} - -.help-inline { - display: inline-block; - *display: inline; - padding-left: 5px; - vertical-align: middle; - *zoom: 1; -} - -.input-prepend, -.input-append { - margin-bottom: 5px; -} - -.input-prepend input, -.input-append input, -.input-prepend select, -.input-append select, -.input-prepend .uneditable-input, -.input-append .uneditable-input { - position: relative; - margin-bottom: 0; - *margin-left: 0; - vertical-align: middle; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} - -.input-prepend input:focus, -.input-append input:focus, -.input-prepend select:focus, -.input-append select:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { - z-index: 2; -} - -.input-prepend .uneditable-input, -.input-append .uneditable-input { - border-left-color: #ccc; -} - -.input-prepend .add-on, -.input-append .add-on { - display: inline-block; - width: auto; - height: 18px; - min-width: 16px; - padding: 4px 5px; - font-weight: normal; - line-height: 18px; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; - background-color: #eeeeee; - border: 1px solid #ccc; -} - -.input-prepend .add-on, -.input-append .add-on, -.input-prepend .btn, -.input-append .btn { - margin-left: -1px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-prepend .active, -.input-append .active { - background-color: #a9dba9; - border-color: #46a546; -} - -.input-prepend .add-on, -.input-prepend .btn { - margin-right: -1px; -} - -.input-prepend .add-on:first-child, -.input-prepend .btn:first-child { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} - -.input-append input, -.input-append select, -.input-append .uneditable-input { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} - -.input-append .uneditable-input { - border-right-color: #ccc; - border-left-color: #eee; -} - -.input-append .add-on:last-child, -.input-append .btn:last-child { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} - -.input-prepend.input-append input, -.input-prepend.input-append select, -.input-prepend.input-append .uneditable-input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-prepend.input-append .add-on:first-child, -.input-prepend.input-append .btn:first-child { - margin-right: -1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} - -.input-prepend.input-append .add-on:last-child, -.input-prepend.input-append .btn:last-child { - margin-left: -1px; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} - -.search-query { - padding-right: 14px; - padding-right: 4px \9; - padding-left: 14px; - padding-left: 4px \9; - /* IE7-8 doesn't have border-radius, so don't indent the padding */ - - margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; -} - -.form-search input, -.form-inline input, -.form-horizontal input, -.form-search textarea, -.form-inline textarea, -.form-horizontal textarea, -.form-search select, -.form-inline select, -.form-horizontal select, -.form-search .help-inline, -.form-inline .help-inline, -.form-horizontal .help-inline, -.form-search .uneditable-input, -.form-inline .uneditable-input, -.form-horizontal .uneditable-input, -.form-search .input-prepend, -.form-inline .input-prepend, -.form-horizontal .input-prepend, -.form-search .input-append, -.form-inline .input-append, -.form-horizontal .input-append { - display: inline-block; - *display: inline; - margin-bottom: 0; - *zoom: 1; -} - -.form-search .hide, -.form-inline .hide, -.form-horizontal .hide { - display: none; -} - -.form-search label, -.form-inline label { - display: inline-block; -} - -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - margin-bottom: 0; -} - -.form-search .radio, -.form-search .checkbox, -.form-inline .radio, -.form-inline .checkbox { - padding-left: 0; - margin-bottom: 0; - vertical-align: middle; -} - -.form-search .radio input[type="radio"], -.form-search .checkbox input[type="checkbox"], -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { - float: left; - margin-right: 3px; - margin-left: 0; -} - -.control-group { - margin-bottom: 9px; -} - -legend + .control-group { - margin-top: 18px; - -webkit-margin-top-collapse: separate; -} - -.form-horizontal .control-group { - margin-bottom: 18px; - *zoom: 1; -} - -.form-horizontal .control-group:before, -.form-horizontal .control-group:after { - display: table; - content: ""; -} - -.form-horizontal .control-group:after { - clear: both; -} - -.form-horizontal .control-label { - float: left; - width: 140px; - padding-top: 5px; - text-align: right; -} - -.form-horizontal .controls { - *display: inline-block; - *padding-left: 20px; - margin-left: 160px; - *margin-left: 0; -} - -.form-horizontal .controls:first-child { - *padding-left: 160px; -} - -.form-horizontal .help-block { - margin-top: 9px; - margin-bottom: 0; -} - -.form-horizontal .form-actions { - padding-left: 160px; -} - -table { - max-width: 100%; - background-color: transparent; - border-collapse: collapse; - border-spacing: 0; -} - -.table { - width: 100%; - margin-bottom: 18px; -} - -.table th, -.table td { - padding: 8px; - line-height: 18px; - text-align: left; - vertical-align: top; - border-top: 1px solid #dddddd; -} - -.table th { - font-weight: bold; -} - -.table thead th { - vertical-align: bottom; -} - -.table caption + thead tr:first-child th, -.table caption + thead tr:first-child td, -.table colgroup + thead tr:first-child th, -.table colgroup + thead tr:first-child td, -.table thead:first-child tr:first-child th, -.table thead:first-child tr:first-child td { - border-top: 0; -} - -.table tbody + tbody { - border-top: 2px solid #dddddd; -} - -.table-condensed th, -.table-condensed td { - padding: 4px 5px; -} - -.table-bordered { - border: 1px solid #dddddd; - border-collapse: separate; - *border-collapse: collapsed; - border-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.table-bordered th, -.table-bordered td { - border-left: 1px solid #dddddd; -} - -.table-bordered caption + thead tr:first-child th, -.table-bordered caption + tbody tr:first-child th, -.table-bordered caption + tbody tr:first-child td, -.table-bordered colgroup + thead tr:first-child th, -.table-bordered colgroup + tbody tr:first-child th, -.table-bordered colgroup + tbody tr:first-child td, -.table-bordered thead:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child td { - border-top: 0; -} - -.table-bordered thead:first-child tr:first-child th:first-child, -.table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; -} - -.table-bordered thead:first-child tr:first-child th:last-child, -.table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; -} - -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 4px; - -moz-border-radius: 0 0 0 4px; - border-radius: 0 0 0 4px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; -} - -.table-bordered thead:last-child tr:last-child th:last-child, -.table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; -} - -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { - background-color: #f9f9f9; -} - -.table tbody tr:hover td, -.table tbody tr:hover th { - background-color: #f5f5f5; -} - -table .span1 { - float: none; - width: 44px; - margin-left: 0; -} - -table .span2 { - float: none; - width: 124px; - margin-left: 0; -} - -table .span3 { - float: none; - width: 204px; - margin-left: 0; -} - -table .span4 { - float: none; - width: 284px; - margin-left: 0; -} - -table .span5 { - float: none; - width: 364px; - margin-left: 0; -} - -table .span6 { - float: none; - width: 444px; - margin-left: 0; -} - -table .span7 { - float: none; - width: 524px; - margin-left: 0; -} - -table .span8 { - float: none; - width: 604px; - margin-left: 0; -} - -table .span9 { - float: none; - width: 684px; - margin-left: 0; -} - -table .span10 { - float: none; - width: 764px; - margin-left: 0; -} - -table .span11 { - float: none; - width: 844px; - margin-left: 0; -} - -table .span12 { - float: none; - width: 924px; - margin-left: 0; -} - -table .span13 { - float: none; - width: 1004px; - margin-left: 0; -} - -table .span14 { - float: none; - width: 1084px; - margin-left: 0; -} - -table .span15 { - float: none; - width: 1164px; - margin-left: 0; -} - -table .span16 { - float: none; - width: 1244px; - margin-left: 0; -} - -table .span17 { - float: none; - width: 1324px; - margin-left: 0; -} - -table .span18 { - float: none; - width: 1404px; - margin-left: 0; -} - -table .span19 { - float: none; - width: 1484px; - margin-left: 0; -} - -table .span20 { - float: none; - width: 1564px; - margin-left: 0; -} - -table .span21 { - float: none; - width: 1644px; - margin-left: 0; -} - -table .span22 { - float: none; - width: 1724px; - margin-left: 0; -} - -table .span23 { - float: none; - width: 1804px; - margin-left: 0; -} - -table .span24 { - float: none; - width: 1884px; - margin-left: 0; -} - -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - *margin-right: .3em; - line-height: 14px; - vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; -} - -[class^="icon-"]:last-child, -[class*=" icon-"]:last-child { - *margin-left: 0; -} - -.icon-white { - background-image: url("../img/glyphicons-halflings-white.png"); -} - -.icon-glass { - background-position: 0 0; -} - -.icon-music { - background-position: -24px 0; -} - -.icon-search { - background-position: -48px 0; -} - -.icon-envelope { - background-position: -72px 0; -} - -.icon-heart { - background-position: -96px 0; -} - -.icon-star { - background-position: -120px 0; -} - -.icon-star-empty { - background-position: -144px 0; -} - -.icon-user { - background-position: -168px 0; -} - -.icon-film { - background-position: -192px 0; -} - -.icon-th-large { - background-position: -216px 0; -} - -.icon-th { - background-position: -240px 0; -} - -.icon-th-list { - background-position: -264px 0; -} - -.icon-ok { - background-position: -288px 0; -} - -.icon-remove { - background-position: -312px 0; -} - -.icon-zoom-in { - background-position: -336px 0; -} - -.icon-zoom-out { - background-position: -360px 0; -} - -.icon-off { - background-position: -384px 0; -} - -.icon-signal { - background-position: -408px 0; -} - -.icon-cog { - background-position: -432px 0; -} - -.icon-trash { - background-position: -456px 0; -} - -.icon-home { - background-position: 0 -24px; -} - -.icon-file { - background-position: -24px -24px; -} - -.icon-time { - background-position: -48px -24px; -} - -.icon-road { - background-position: -72px -24px; -} - -.icon-download-alt { - background-position: -96px -24px; -} - -.icon-download { - background-position: -120px -24px; -} - -.icon-upload { - background-position: -144px -24px; -} - -.icon-inbox { - background-position: -168px -24px; -} - -.icon-play-circle { - background-position: -192px -24px; -} - -.icon-repeat { - background-position: -216px -24px; -} - -.icon-refresh { - background-position: -240px -24px; -} - -.icon-list-alt { - background-position: -264px -24px; -} - -.icon-lock { - background-position: -287px -24px; -} - -.icon-flag { - background-position: -312px -24px; -} - -.icon-headphones { - background-position: -336px -24px; -} - -.icon-volume-off { - background-position: -360px -24px; -} - -.icon-volume-down { - background-position: -384px -24px; -} - -.icon-volume-up { - background-position: -408px -24px; -} - -.icon-qrcode { - background-position: -432px -24px; -} - -.icon-barcode { - background-position: -456px -24px; -} - -.icon-tag { - background-position: 0 -48px; -} - -.icon-tags { - background-position: -25px -48px; -} - -.icon-book { - background-position: -48px -48px; -} - -.icon-bookmark { - background-position: -72px -48px; -} - -.icon-print { - background-position: -96px -48px; -} - -.icon-camera { - background-position: -120px -48px; -} - -.icon-font { - background-position: -144px -48px; -} - -.icon-bold { - background-position: -167px -48px; -} - -.icon-italic { - background-position: -192px -48px; -} - -.icon-text-height { - background-position: -216px -48px; -} - -.icon-text-width { - background-position: -240px -48px; -} - -.icon-align-left { - background-position: -264px -48px; -} - -.icon-align-center { - background-position: -288px -48px; -} - -.icon-align-right { - background-position: -312px -48px; -} - -.icon-align-justify { - background-position: -336px -48px; -} - -.icon-list { - background-position: -360px -48px; -} - -.icon-indent-left { - background-position: -384px -48px; -} - -.icon-indent-right { - background-position: -408px -48px; -} - -.icon-facetime-video { - background-position: -432px -48px; -} - -.icon-picture { - background-position: -456px -48px; -} - -.icon-pencil { - background-position: 0 -72px; -} - -.icon-map-marker { - background-position: -24px -72px; -} - -.icon-adjust { - background-position: -48px -72px; -} - -.icon-tint { - background-position: -72px -72px; -} - -.icon-edit { - background-position: -96px -72px; -} - -.icon-share { - background-position: -120px -72px; -} - -.icon-check { - background-position: -144px -72px; -} - -.icon-move { - background-position: -168px -72px; -} - -.icon-step-backward { - background-position: -192px -72px; -} - -.icon-fast-backward { - background-position: -216px -72px; -} - -.icon-backward { - background-position: -240px -72px; -} - -.icon-play { - background-position: -264px -72px; -} - -.icon-pause { - background-position: -288px -72px; -} - -.icon-stop { - background-position: -312px -72px; -} - -.icon-forward { - background-position: -336px -72px; -} - -.icon-fast-forward { - background-position: -360px -72px; -} - -.icon-step-forward { - background-position: -384px -72px; -} - -.icon-eject { - background-position: -408px -72px; -} - -.icon-chevron-left { - background-position: -432px -72px; -} - -.icon-chevron-right { - background-position: -456px -72px; -} - -.icon-plus-sign { - background-position: 0 -96px; -} - -.icon-minus-sign { - background-position: -24px -96px; -} - -.icon-remove-sign { - background-position: -48px -96px; -} - -.icon-ok-sign { - background-position: -72px -96px; -} - -.icon-question-sign { - background-position: -96px -96px; -} - -.icon-info-sign { - background-position: -120px -96px; -} - -.icon-screenshot { - background-position: -144px -96px; -} - -.icon-remove-circle { - background-position: -168px -96px; -} - -.icon-ok-circle { - background-position: -192px -96px; -} - -.icon-ban-circle { - background-position: -216px -96px; -} - -.icon-arrow-left { - background-position: -240px -96px; -} - -.icon-arrow-right { - background-position: -264px -96px; -} - -.icon-arrow-up { - background-position: -289px -96px; -} - -.icon-arrow-down { - background-position: -312px -96px; -} - -.icon-share-alt { - background-position: -336px -96px; -} - -.icon-resize-full { - background-position: -360px -96px; -} - -.icon-resize-small { - background-position: -384px -96px; -} - -.icon-plus { - background-position: -408px -96px; -} - -.icon-minus { - background-position: -433px -96px; -} - -.icon-asterisk { - background-position: -456px -96px; -} - -.icon-exclamation-sign { - background-position: 0 -120px; -} - -.icon-gift { - background-position: -24px -120px; -} - -.icon-leaf { - background-position: -48px -120px; -} - -.icon-fire { - background-position: -72px -120px; -} - -.icon-eye-open { - background-position: -96px -120px; -} - -.icon-eye-close { - background-position: -120px -120px; -} - -.icon-warning-sign { - background-position: -144px -120px; -} - -.icon-plane { - background-position: -168px -120px; -} - -.icon-calendar { - background-position: -192px -120px; -} - -.icon-random { - background-position: -216px -120px; -} - -.icon-comment { - background-position: -240px -120px; -} - -.icon-magnet { - background-position: -264px -120px; -} - -.icon-chevron-up { - background-position: -288px -120px; -} - -.icon-chevron-down { - background-position: -313px -119px; -} - -.icon-retweet { - background-position: -336px -120px; -} - -.icon-shopping-cart { - background-position: -360px -120px; -} - -.icon-folder-close { - background-position: -384px -120px; -} - -.icon-folder-open { - background-position: -408px -120px; -} - -.icon-resize-vertical { - background-position: -432px -119px; -} - -.icon-resize-horizontal { - background-position: -456px -118px; -} - -.icon-hdd { - background-position: 0 -144px; -} - -.icon-bullhorn { - background-position: -24px -144px; -} - -.icon-bell { - background-position: -48px -144px; -} - -.icon-certificate { - background-position: -72px -144px; -} - -.icon-thumbs-up { - background-position: -96px -144px; -} - -.icon-thumbs-down { - background-position: -120px -144px; -} - -.icon-hand-right { - background-position: -144px -144px; -} - -.icon-hand-left { - background-position: -168px -144px; -} - -.icon-hand-up { - background-position: -192px -144px; -} - -.icon-hand-down { - background-position: -216px -144px; -} - -.icon-circle-arrow-right { - background-position: -240px -144px; -} - -.icon-circle-arrow-left { - background-position: -264px -144px; -} - -.icon-circle-arrow-up { - background-position: -288px -144px; -} - -.icon-circle-arrow-down { - background-position: -312px -144px; -} - -.icon-globe { - background-position: -336px -144px; -} - -.icon-wrench { - background-position: -360px -144px; -} - -.icon-tasks { - background-position: -384px -144px; -} - -.icon-filter { - background-position: -408px -144px; -} - -.icon-briefcase { - background-position: -432px -144px; -} - -.icon-fullscreen { - background-position: -456px -144px; -} - -.dropup, -.dropdown { - position: relative; -} - -.dropdown-toggle { - *margin-bottom: -3px; -} - -.dropdown-toggle:active, -.open .dropdown-toggle { - outline: 0; -} - -.caret { - display: inline-block; - width: 0; - height: 0; - vertical-align: top; - border-top: 4px solid #000000; - border-right: 4px solid transparent; - border-left: 4px solid transparent; - content: ""; - opacity: 0.3; - filter: alpha(opacity=30); -} - -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} - -.dropdown:hover .caret, -.open .caret { - opacity: 1; - filter: alpha(opacity=100); -} - -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - padding: 4px 0; - margin: 1px 0 0; - list-style: none; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - *border-right-width: 2px; - *border-bottom-width: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -} - -.dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.dropdown-menu .divider { - *width: 100%; - height: 1px; - margin: 8px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.dropdown-menu a { - display: block; - padding: 3px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #333333; - white-space: nowrap; -} - -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #0088cc; -} - -.open { - *z-index: 1000; -} - -.open .dropdown-menu { - display: block; -} - -.pull-right .dropdown-menu { - right: 0; - left: auto; -} - -.dropup .caret, -.navbar-fixed-bottom .dropdown .caret { - border-top: 0; - border-bottom: 4px solid #000000; - content: "\2191"; -} - -.dropup .dropdown-menu, -.navbar-fixed-bottom .dropdown .dropdown-menu { - top: auto; - bottom: 100%; - margin-bottom: 1px; -} - -.typeahead { - margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -} - -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} - -.well-large { - padding: 24px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.well-small { - padding: 9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.fade { - opacity: 0; - filter: alpha(opacity=0); - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; -} - -.fade.in { - opacity: 1; - filter: alpha(opacity=100); -} - -.collapse { - position: relative; - height: 0; - overflow: hidden; - -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; -} - -.collapse.in { - height: auto; -} - -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 18px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); -} - -.close:hover { - color: #000000; - text-decoration: none; - cursor: pointer; - opacity: 0.4; - filter: alpha(opacity=40); -} - -button.close { - padding: 0; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; -} - -.btn { - display: inline-block; - *display: inline; - padding: 4px 10px 4px; - margin-bottom: 0; - *margin-left: .3em; - font-size: 13px; - line-height: 18px; - *line-height: 20px; - color: #333333; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; - cursor: pointer; - background-color: #f5f5f5; - *background-color: #e6e6e6; - background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(top, #ffffff, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-repeat: repeat-x; - border: 1px solid #cccccc; - *border: 0; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-bottom-color: #b3b3b3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn:hover, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - background-color: #e6e6e6; - *background-color: #d9d9d9; -} - -.btn:active, -.btn.active { - background-color: #cccccc \9; -} - -.btn:first-child { - *margin-left: 0; -} - -.btn:hover { - color: #333333; - text-decoration: none; - background-color: #e6e6e6; - *background-color: #d9d9d9; - /* Buttons in IE7 don't get borders, so darken on hover */ - - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -ms-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} - -.btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.btn.active, -.btn:active { - background-color: #e6e6e6; - background-color: #d9d9d9 \9; - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn.disabled, -.btn[disabled] { - cursor: default; - background-color: #e6e6e6; - background-image: none; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.btn-large [class^="icon-"] { - margin-top: 1px; -} - -.btn-small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; -} - -.btn-small [class^="icon-"] { - margin-top: -1px; -} - -.btn-mini { - padding: 2px 6px; - font-size: 11px; - line-height: 14px; -} - -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} - -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-inverse.active { - color: rgba(255, 255, 255, 0.75); -} - -.btn { - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} - -.btn-primary { - background-color: #0074cc; - *background-color: #0055cc; - background-image: -ms-linear-gradient(top, #0088cc, #0055cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0055cc); - background-image: -o-linear-gradient(top, #0088cc, #0055cc); - background-image: -moz-linear-gradient(top, #0088cc, #0055cc); - background-image: linear-gradient(top, #0088cc, #0055cc); - background-repeat: repeat-x; - border-color: #0055cc #0055cc #003580; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} - -.btn-primary:hover, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - background-color: #0055cc; - *background-color: #004ab3; -} - -.btn-primary:active, -.btn-primary.active { - background-color: #004099 \9; -} - -.btn-warning { - background-color: #faa732; - *background-color: #f89406; - background-image: -ms-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); - background-repeat: repeat-x; - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} - -.btn-warning:hover, -.btn-warning:active, -.btn-warning.active, -.btn-warning.disabled, -.btn-warning[disabled] { - background-color: #f89406; - *background-color: #df8505; -} - -.btn-warning:active, -.btn-warning.active { - background-color: #c67605 \9; -} - -.btn-danger { - background-color: #da4f49; - *background-color: #bd362f; - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} - -.btn-danger:hover, -.btn-danger:active, -.btn-danger.active, -.btn-danger.disabled, -.btn-danger[disabled] { - background-color: #bd362f; - *background-color: #a9302a; -} - -.btn-danger:active, -.btn-danger.active { - background-color: #942a25 \9; -} - -.btn-success { - background-color: #5bb75b; - *background-color: #51a351; - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} - -.btn-success:hover, -.btn-success:active, -.btn-success.active, -.btn-success.disabled, -.btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; -} - -.btn-success:active, -.btn-success.active { - background-color: #408140 \9; -} - -.btn-info { - background-color: #49afcd; - *background-color: #2f96b4; - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} - -.btn-info:hover, -.btn-info:active, -.btn-info.active, -.btn-info.disabled, -.btn-info[disabled] { - background-color: #2f96b4; - *background-color: #2a85a0; -} - -.btn-info:active, -.btn-info.active { - background-color: #24748c \9; -} - -.btn-inverse { - background-color: #414141; - *background-color: #222222; - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); - background-repeat: repeat-x; - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} - -.btn-inverse:hover, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - background-color: #222222; - *background-color: #151515; -} - -.btn-inverse:active, -.btn-inverse.active { - background-color: #080808 \9; -} - -button.btn, -input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; -} - -button.btn::-moz-focus-inner, -input[type="submit"].btn::-moz-focus-inner { - padding: 0; - border: 0; -} - -button.btn.btn-large, -input[type="submit"].btn.btn-large { - *padding-top: 7px; - *padding-bottom: 7px; -} - -button.btn.btn-small, -input[type="submit"].btn.btn-small { - *padding-top: 3px; - *padding-bottom: 3px; -} - -button.btn.btn-mini, -input[type="submit"].btn.btn-mini { - *padding-top: 1px; - *padding-bottom: 1px; -} - -.btn-group { - position: relative; - *margin-left: .3em; - *zoom: 1; -} - -.btn-group:before, -.btn-group:after { - display: table; - content: ""; -} - -.btn-group:after { - clear: both; -} - -.btn-group:first-child { - *margin-left: 0; -} - -.btn-group + .btn-group { - margin-left: 5px; -} - -.btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; -} - -.btn-toolbar .btn-group { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; -} - -.btn-group > .btn { - position: relative; - float: left; - margin-left: -1px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-group > .btn:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; -} - -.btn-group > .btn:last-child, -.btn-group > .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; -} - -.btn-group > .btn.large:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; -} - -.btn-group > .btn.large:last-child, -.btn-group > .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; -} - -.btn-group > .btn:hover, -.btn-group > .btn:focus, -.btn-group > .btn:active, -.btn-group > .btn.active { - z-index: 2; -} - -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} - -.btn-group > .dropdown-toggle { - *padding-top: 4px; - padding-right: 8px; - *padding-bottom: 4px; - padding-left: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-group > .btn-mini.dropdown-toggle { - padding-right: 5px; - padding-left: 5px; -} - -.btn-group > .btn-small.dropdown-toggle { - *padding-top: 4px; - *padding-bottom: 4px; -} - -.btn-group > .btn-large.dropdown-toggle { - padding-right: 12px; - padding-left: 12px; -} - -.btn-group.open .dropdown-toggle { - background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-group.open .btn.dropdown-toggle { - background-color: #e6e6e6; -} - -.btn-group.open .btn-primary.dropdown-toggle { - background-color: #0055cc; -} - -.btn-group.open .btn-warning.dropdown-toggle { - background-color: #f89406; -} - -.btn-group.open .btn-danger.dropdown-toggle { - background-color: #bd362f; -} - -.btn-group.open .btn-success.dropdown-toggle { - background-color: #51a351; -} - -.btn-group.open .btn-info.dropdown-toggle { - background-color: #2f96b4; -} - -.btn-group.open .btn-inverse.dropdown-toggle { - background-color: #222222; -} - -.btn .caret { - margin-top: 7px; - margin-left: 0; -} - -.btn:hover .caret, -.open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} - -.btn-mini .caret { - margin-top: 5px; -} - -.btn-small .caret { - margin-top: 6px; -} - -.btn-large .caret { - margin-top: 6px; - border-top-width: 5px; - border-right-width: 5px; - border-left-width: 5px; -} - -.dropup .btn-large .caret { - border-top: 0; - border-bottom: 5px solid #000000; -} - -.btn-primary .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret, -.btn-success .caret, -.btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); -} - -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: 18px; - color: #c09853; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #fbeed5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.alert-heading { - color: inherit; -} - -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: 18px; -} - -.alert-success { - color: #468847; - background-color: #dff0d8; - border-color: #d6e9c6; -} - -.alert-danger, -.alert-error { - color: #b94a48; - background-color: #f2dede; - border-color: #eed3d7; -} - -.alert-info { - color: #3a87ad; - background-color: #d9edf7; - border-color: #bce8f1; -} - -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} - -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} - -.alert-block p + p { - margin-top: 5px; -} - -.nav { - margin-bottom: 18px; - margin-left: 0; - list-style: none; -} - -.nav > li > a { - display: block; -} - -.nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; -} - -.nav > .pull-right { - float: right; -} - -.nav .nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: 18px; - color: #999999; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-transform: uppercase; -} - -.nav li + .nav-header { - margin-top: 9px; -} - -.nav-list { - padding-right: 15px; - padding-left: 15px; - margin-bottom: 0; -} - -.nav-list > li > a, -.nav-list .nav-header { - margin-right: -15px; - margin-left: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} - -.nav-list > li > a { - padding: 3px 15px; -} - -.nav-list > .active > a, -.nav-list > .active > a:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} - -.nav-list [class^="icon-"] { - margin-right: 2px; -} - -.nav-list .divider { - *width: 100%; - height: 1px; - margin: 8px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.nav-tabs, -.nav-pills { - *zoom: 1; -} - -.nav-tabs:before, -.nav-pills:before, -.nav-tabs:after, -.nav-pills:after { - display: table; - content: ""; -} - -.nav-tabs:after, -.nav-pills:after { - clear: both; -} - -.nav-tabs > li, -.nav-pills > li { - float: left; -} - -.nav-tabs > li > a, -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; -} - -.nav-tabs { - border-bottom: 1px solid #ddd; -} - -.nav-tabs > li { - margin-bottom: -1px; -} - -.nav-tabs > li > a { - padding-top: 8px; - padding-bottom: 8px; - line-height: 18px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} - -.nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; -} - -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { - color: #555555; - cursor: default; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; -} - -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.nav-pills > .active > a, -.nav-pills > .active > a:hover { - color: #ffffff; - background-color: #0088cc; -} - -.nav-stacked > li { - float: none; -} - -.nav-stacked > li > a { - margin-right: 0; -} - -.nav-tabs.nav-stacked { - border-bottom: 0; -} - -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} - -.nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.nav-tabs.nav-stacked > li > a:hover { - z-index: 2; - border-color: #ddd; -} - -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} - -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; -} - -.nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; -} - -.nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { - margin-top: 6px; - border-top-color: #0088cc; - border-bottom-color: #0088cc; -} - -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { - border-top-color: #005580; - border-bottom-color: #005580; -} - -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; - border-bottom-color: #333333; -} - -.nav > .dropdown.active > a:hover { - color: #000000; - cursor: pointer; -} - -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; -} - -.nav li.dropdown.open .caret, -.nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); -} - -.tabs-stacked .open > a:hover { - border-color: #999999; -} - -.tabbable { - *zoom: 1; -} - -.tabbable:before, -.tabbable:after { - display: table; - content: ""; -} - -.tabbable:after { - clear: both; -} - -.tab-content { - overflow: auto; -} - -.tabs-below > .nav-tabs, -.tabs-right > .nav-tabs, -.tabs-left > .nav-tabs { - border-bottom: 0; -} - -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} - -.tab-content > .active, -.pill-content > .active { - display: block; -} - -.tabs-below > .nav-tabs { - border-top: 1px solid #ddd; -} - -.tabs-below > .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} - -.tabs-below > .nav-tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.tabs-below > .nav-tabs > li > a:hover { - border-top-color: #ddd; - border-bottom-color: transparent; -} - -.tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} - -.tabs-left > .nav-tabs > li, -.tabs-right > .nav-tabs > li { - float: none; -} - -.tabs-left > .nav-tabs > li > a, -.tabs-right > .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} - -.tabs-left > .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} - -.tabs-left > .nav-tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.tabs-left > .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; -} - -.tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; -} - -.tabs-right > .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} - -.tabs-right > .nav-tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.tabs-right > .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; -} - -.tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: #ffffff; -} - -.navbar { - *position: relative; - *z-index: 2; - margin-bottom: 18px; - overflow: visible; -} - -.navbar-inner { - min-height: 40px; - padding-right: 20px; - padding-left: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -} - -.navbar .container { - width: auto; -} - -.nav-collapse.collapse { - height: auto; -} - -.navbar { - color: #999999; -} - -.navbar .brand:hover { - text-decoration: none; -} - -.navbar .brand { - display: block; - float: left; - padding: 8px 20px 12px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - line-height: 1; - color: #999999; -} - -.navbar .navbar-text { - margin-bottom: 0; - line-height: 40px; -} - -.navbar .navbar-link { - color: #999999; -} - -.navbar .navbar-link:hover { - color: #ffffff; -} - -.navbar .btn, -.navbar .btn-group { - margin-top: 5px; -} - -.navbar .btn-group .btn { - margin: 0; -} - -.navbar-form { - margin-bottom: 0; - *zoom: 1; -} - -.navbar-form:before, -.navbar-form:after { - display: table; - content: ""; -} - -.navbar-form:after { - clear: both; -} - -.navbar-form input, -.navbar-form select, -.navbar-form .radio, -.navbar-form .checkbox { - margin-top: 5px; -} - -.navbar-form input, -.navbar-form select { - display: inline-block; - margin-bottom: 0; -} - -.navbar-form input[type="image"], -.navbar-form input[type="checkbox"], -.navbar-form input[type="radio"] { - margin-top: 3px; -} - -.navbar-form .input-append, -.navbar-form .input-prepend { - margin-top: 6px; - white-space: nowrap; -} - -.navbar-form .input-append input, -.navbar-form .input-prepend input { - margin-top: 0; -} - -.navbar-search { - position: relative; - float: left; - margin-top: 6px; - margin-bottom: 0; -} - -.navbar-search .search-query { - padding: 4px 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - color: #ffffff; - background-color: #626262; - border: 1px solid #151515; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} - -.navbar-search .search-query:-moz-placeholder { - color: #cccccc; -} - -.navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; -} - -.navbar-search .search-query:focus, -.navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - outline: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -} - -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: 1030; - margin-bottom: 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { - padding-right: 0; - padding-left: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.navbar-fixed-top { - top: 0; -} - -.navbar-fixed-bottom { - bottom: 0; -} - -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} - -.navbar .nav.pull-right { - float: right; -} - -.navbar .nav > li { - display: block; - float: left; -} - -.navbar .nav > li > a { - float: none; - padding: 9px 10px 11px; - line-height: 19px; - color: #999999; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} - -.navbar .btn { - display: inline-block; - padding: 4px 10px 4px; - margin: 5px 5px 6px; - line-height: 18px; -} - -.navbar .btn-group { - padding: 5px 5px 6px; - margin: 0; -} - -.navbar .nav > li > a:hover { - color: #ffffff; - text-decoration: none; - background-color: transparent; -} - -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #222222; -} - -.navbar .divider-vertical { - width: 1px; - height: 40px; - margin: 0 9px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} - -.navbar .nav.pull-right { - margin-right: 0; - margin-left: 10px; -} - -.navbar .btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-right: 5px; - margin-left: 5px; - background-color: #2c2c2c; - *background-color: #222222; - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-image: -moz-linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -} - -.navbar .btn-navbar:hover, -.navbar .btn-navbar:active, -.navbar .btn-navbar.active, -.navbar .btn-navbar.disabled, -.navbar .btn-navbar[disabled] { - background-color: #222222; - *background-color: #151515; -} - -.navbar .btn-navbar:active, -.navbar .btn-navbar.active { - background-color: #080808 \9; -} - -.navbar .btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -} - -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} - -.navbar .dropdown-menu:before { - position: absolute; - top: -7px; - left: 9px; - display: inline-block; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-left: 7px solid transparent; - border-bottom-color: rgba(0, 0, 0, 0.2); - content: ''; -} - -.navbar .dropdown-menu:after { - position: absolute; - top: -6px; - left: 10px; - display: inline-block; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - border-left: 6px solid transparent; - content: ''; -} - -.navbar-fixed-bottom .dropdown-menu:before { - top: auto; - bottom: -7px; - border-top: 7px solid #ccc; - border-bottom: 0; - border-top-color: rgba(0, 0, 0, 0.2); -} - -.navbar-fixed-bottom .dropdown-menu:after { - top: auto; - bottom: -6px; - border-top: 6px solid #ffffff; - border-bottom: 0; -} - -.navbar .nav li.dropdown .dropdown-toggle .caret, -.navbar .nav li.dropdown.open .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar .nav li.dropdown.active .caret { - opacity: 1; - filter: alpha(opacity=100); -} - -.navbar .nav li.dropdown.open > .dropdown-toggle, -.navbar .nav li.dropdown.active > .dropdown-toggle, -.navbar .nav li.dropdown.open.active > .dropdown-toggle { - background-color: transparent; -} - -.navbar .nav li.dropdown.active > .dropdown-toggle:hover { - color: #ffffff; -} - -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.navbar .pull-right .dropdown-menu:before, -.navbar .dropdown-menu.pull-right:before { - right: 12px; - left: auto; -} - -.navbar .pull-right .dropdown-menu:after, -.navbar .dropdown-menu.pull-right:after { - right: 13px; - left: auto; -} - -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - list-style: none; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); - background-repeat: repeat-x; - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} - -.breadcrumb li { - display: inline-block; - *display: inline; - text-shadow: 0 1px 0 #ffffff; - *zoom: 1; -} - -.breadcrumb .divider { - padding: 0 5px; - color: #999999; -} - -.breadcrumb .active a { - color: #333333; -} - -.pagination { - height: 36px; - margin: 18px 0; -} - -.pagination ul { - display: inline-block; - *display: inline; - margin-bottom: 0; - margin-left: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - *zoom: 1; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.pagination li { - display: inline; -} - -.pagination a { - float: left; - padding: 0 14px; - line-height: 34px; - text-decoration: none; - border: 1px solid #ddd; - border-left-width: 0; -} - -.pagination a:hover, -.pagination .active a { - background-color: #f5f5f5; -} - -.pagination .active a { - color: #999999; - cursor: default; -} - -.pagination .disabled span, -.pagination .disabled a, -.pagination .disabled a:hover { - color: #999999; - cursor: default; - background-color: transparent; -} - -.pagination li:first-child a { - border-left-width: 1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} - -.pagination li:last-child a { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} - -.pagination-centered { - text-align: center; -} - -.pagination-right { - text-align: right; -} - -.pager { - margin-bottom: 18px; - margin-left: 0; - text-align: center; - list-style: none; - *zoom: 1; -} - -.pager:before, -.pager:after { - display: table; - content: ""; -} - -.pager:after { - clear: both; -} - -.pager li { - display: inline; -} - -.pager a { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -.pager a:hover { - text-decoration: none; - background-color: #f5f5f5; -} - -.pager .next a { - float: right; -} - -.pager .previous a { - float: left; -} - -.pager .disabled a, -.pager .disabled a:hover { - color: #999999; - cursor: default; - background-color: #fff; -} - -.modal-open .dropdown-menu { - z-index: 2050; -} - -.modal-open .dropdown.open { - *z-index: 2050; -} - -.modal-open .popover { - z-index: 2060; -} - -.modal-open .tooltip { - z-index: 2070; -} - -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; -} - -.modal-backdrop.fade { - opacity: 0; -} - -.modal-backdrop, -.modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.modal { - position: fixed; - top: 50%; - left: 50%; - z-index: 1050; - width: 560px; - margin: -250px 0 0 -280px; - overflow: auto; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} - -.modal.fade { - top: -25%; - -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; - -moz-transition: opacity 0.3s linear, top 0.3s ease-out; - -ms-transition: opacity 0.3s linear, top 0.3s ease-out; - -o-transition: opacity 0.3s linear, top 0.3s ease-out; - transition: opacity 0.3s linear, top 0.3s ease-out; -} - -.modal.fade.in { - top: 50%; -} - -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; -} - -.modal-header .close { - margin-top: 2px; -} - -.modal-body { - max-height: 400px; - padding: 15px; - overflow-y: auto; -} - -.modal-form { - margin-bottom: 0; -} - -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - text-align: right; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} - -.modal-footer:before, -.modal-footer:after { - display: table; - content: ""; -} - -.modal-footer:after { - clear: both; -} - -.modal-footer .btn + .btn { - margin-bottom: 0; - margin-left: 5px; -} - -.modal-footer .btn-group .btn + .btn { - margin-left: -1px; -} - -.tooltip { - position: absolute; - z-index: 1020; - display: block; - padding: 5px; - font-size: 11px; - opacity: 0; - filter: alpha(opacity=0); - visibility: visible; -} - -.tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.tooltip.top { - margin-top: -2px; -} - -.tooltip.right { - margin-left: 2px; -} - -.tooltip.bottom { - margin-top: 2px; -} - -.tooltip.left { - margin-left: -2px; -} - -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-top: 5px solid #000000; - border-right: 5px solid transparent; - border-left: 5px solid transparent; -} - -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} - -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; - border-left: 5px solid transparent; -} - -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-right: 5px solid #000000; - border-bottom: 5px solid transparent; -} - -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; -} - -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} - -.popover.top { - margin-top: -5px; -} - -.popover.right { - margin-left: 5px; -} - -.popover.bottom { - margin-top: 5px; -} - -.popover.left { - margin-left: -5px; -} - -.popover.top .arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-top: 5px solid #000000; - border-right: 5px solid transparent; - border-left: 5px solid transparent; -} - -.popover.right .arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-right: 5px solid #000000; - border-bottom: 5px solid transparent; -} - -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; - border-left: 5px solid transparent; -} - -.popover.left .arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} - -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} - -.popover-inner { - width: 280px; - padding: 3px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -} - -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} - -.popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} - -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; -} - -.thumbnails { - margin-left: -20px; - list-style: none; - *zoom: 1; -} - -.thumbnails:before, -.thumbnails:after { - display: table; - content: ""; -} - -.thumbnails:after { - clear: both; -} - -.row-fluid .thumbnails { - margin-left: 0; -} - -.thumbnails > li { - float: left; - margin-bottom: 18px; - margin-left: 20px; -} - -.thumbnail { - display: block; - padding: 4px; - line-height: 1; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -} - -a.thumbnail:hover { - border-color: #0088cc; - -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -} - -.thumbnail > img { - display: block; - max-width: 100%; - margin-right: auto; - margin-left: auto; -} - -.thumbnail .caption { - padding: 9px; -} - -.label, -.badge { - font-size: 10.998px; - font-weight: bold; - line-height: 14px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - white-space: nowrap; - vertical-align: baseline; - background-color: #999999; -} - -.label { - padding: 1px 4px 2px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.badge { - padding: 1px 9px 2px; - -webkit-border-radius: 9px; - -moz-border-radius: 9px; - border-radius: 9px; -} - -a.label:hover, -a.badge:hover { - color: #ffffff; - text-decoration: none; - cursor: pointer; -} - -.label-important, -.badge-important { - background-color: #b94a48; -} - -.label-important[href], -.badge-important[href] { - background-color: #953b39; -} - -.label-warning, -.badge-warning { - background-color: #f89406; -} - -.label-warning[href], -.badge-warning[href] { - background-color: #c67605; -} - -.label-success, -.badge-success { - background-color: #468847; -} - -.label-success[href], -.badge-success[href] { - background-color: #356635; -} - -.label-info, -.badge-info { - background-color: #3a87ad; -} - -.label-info[href], -.badge-info[href] { - background-color: #2d6987; -} - -.label-inverse, -.badge-inverse { - background-color: #333333; -} - -.label-inverse[href], -.badge-inverse[href] { - background-color: #1a1a1a; -} - -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-moz-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-ms-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-o-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} - -@keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -.progress { - height: 18px; - margin-bottom: 18px; - overflow: hidden; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -} - -.progress .bar { - width: 0; - height: 18px; - font-size: 12px; - color: #ffffff; - text-align: center; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} - -.progress-striped .bar { - background-color: #149bdf; - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} - -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - -ms-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} - -.progress-danger .bar { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); -} - -.progress-danger.progress-striped .bar { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-success .bar { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); -} - -.progress-success.progress-striped .bar { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-info .bar { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); -} - -.progress-info.progress-striped .bar { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-warning .bar { - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); -} - -.progress-warning.progress-striped .bar { - background-color: #fbb450; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.accordion { - margin-bottom: 18px; -} - -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.accordion-heading { - border-bottom: 0; -} - -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} - -.accordion-toggle { - cursor: pointer; -} - -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} - -.carousel { - position: relative; - margin-bottom: 18px; - line-height: 1; -} - -.carousel-inner { - position: relative; - width: 100%; - overflow: hidden; -} - -.carousel .item { - position: relative; - display: none; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} - -.carousel .item > img { - display: block; - line-height: 1; -} - -.carousel .active, -.carousel .next, -.carousel .prev { - display: block; -} - -.carousel .active { - left: 0; -} - -.carousel .next, -.carousel .prev { - position: absolute; - top: 0; - width: 100%; -} - -.carousel .next { - left: 100%; -} - -.carousel .prev { - left: -100%; -} - -.carousel .next.left, -.carousel .prev.right { - left: 0; -} - -.carousel .active.left { - left: -100%; -} - -.carousel .active.right { - left: 100%; -} - -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: #ffffff; - text-align: center; - background: #222222; - border: 3px solid #ffffff; - -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; - opacity: 0.5; - filter: alpha(opacity=50); -} - -.carousel-control.right { - right: 15px; - left: auto; -} - -.carousel-control:hover { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); -} - -.carousel-caption { - position: absolute; - right: 0; - bottom: 0; - left: 0; - padding: 10px 15px 5px; - background: #333333; - background: rgba(0, 0, 0, 0.75); -} - -.carousel-caption h4, -.carousel-caption p { - color: #ffffff; -} - -.hero-unit { - padding: 60px; - margin-bottom: 30px; - background-color: #eeeeee; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; - color: inherit; -} - -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; - color: inherit; -} - -.pull-right { - float: right; -} - -.pull-left { - float: left; -} - -.hide { - display: none; -} - -.show { - display: block; -} - -.invisible { - visibility: hidden; -} diff --git a/samples/java/demo/public/bootstrap/css/bootstrap.min.css b/samples/java/demo/public/bootstrap/css/bootstrap.min.css deleted file mode 100644 index 1c75d0c07..000000000 --- a/samples/java/demo/public/bootstrap/css/bootstrap.min.css +++ /dev/null @@ -1,9 +0,0 @@ -/*! - * Bootstrap v2.0.3 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover{color:#005580;text-decoration:underline}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;content:""}.row:after{clear:both}[class*="span"]{float:left;margin-left:20px}.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:28px;margin-left:2.127659574%;*margin-left:2.0744680846382977%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:99.99999998999999%;*width:99.94680850063828%}.row-fluid .span11{width:91.489361693%;*width:91.4361702036383%}.row-fluid .span10{width:82.97872339599999%;*width:82.92553190663828%}.row-fluid .span9{width:74.468085099%;*width:74.4148936096383%}.row-fluid .span8{width:65.95744680199999%;*width:65.90425531263828%}.row-fluid .span7{width:57.446808505%;*width:57.3936170156383%}.row-fluid .span6{width:48.93617020799999%;*width:48.88297871863829%}.row-fluid .span5{width:40.425531911%;*width:40.3723404216383%}.row-fluid .span4{width:31.914893614%;*width:31.8617021246383%}.row-fluid .span3{width:23.404255317%;*width:23.3510638276383%}.row-fluid .span2{width:14.89361702%;*width:14.8404255306383%}.row-fluid .span1{width:6.382978723%;*width:6.329787233638298%}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;content:""}.container-fluid:after{clear:both}p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px}p small{font-size:11px;color:#999}.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px}h1,h2,h3,h4,h5,h6{margin:0;font-family:inherit;font-weight:bold;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999}h1{font-size:30px;line-height:36px}h1 small{font-size:18px}h2{font-size:24px;line-height:36px}h2 small{font-size:18px}h3{font-size:18px;line-height:27px}h3 small{font-size:14px}h4,h5,h6{line-height:18px}h4{font-size:14px}h4 small{font-size:12px}h5{font-size:12px}h6{font-size:11px;color:#999;text-transform:uppercase}.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eee}.page-header h1{line-height:1}ul,ol{padding:0;margin:0 0 9px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}ul{list-style:disc}ol{list-style:decimal}li{line-height:18px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}dl{margin-bottom:18px}dt,dd{line-height:18px}dt{font-weight:bold;line-height:17px}dd{margin-left:9px}.dl-horizontal dt{float:left;width:120px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:130px}hr{margin:18px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}strong{font-weight:bold}em{font-style:italic}.muted{color:#999}abbr[title]{cursor:help;border-bottom:1px dotted #ddd}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px}blockquote small{display:block;line-height:18px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:18px;font-style:normal;line-height:18px}small{font-size:100%}cite{font-style:normal}code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12.025px;line-height:18px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:18px}pre code{padding:0;color:inherit;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 18px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333;border:0;border-bottom:1px solid #eee}legend small{font-size:13.5px;color:#999}label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:18px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px;color:#333}input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555;background-color:#fff;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.uneditable-textarea{width:auto;height:auto}label input,label textarea,label select{display:block}input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;background-color:transparent;border:0 \9;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}input[type="image"]{border:0}input[type="file"]{width:auto;padding:initial;line-height:initial;background-color:#fff;background-color:initial;border:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto}select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px}input[type="file"]{line-height:18px \9}select{width:220px;background-color:#fff}select[multiple],select[size]{height:auto}input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}textarea{height:auto}input[type="hidden"]{display:none}.radio,.checkbox{min-height:18px;padding-left:18px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-ms-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}input:focus,textarea:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus,select:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}input,textarea,.uneditable-input{margin-left:0}input.span12,textarea.span12,.uneditable-input.span12{width:930px}input.span11,textarea.span11,.uneditable-input.span11{width:850px}input.span10,textarea.span10,.uneditable-input.span10{width:770px}input.span9,textarea.span9,.uneditable-input.span9{width:690px}input.span8,textarea.span8,.uneditable-input.span8{width:610px}input.span7,textarea.span7,.uneditable-input.span7{width:530px}input.span6,textarea.span6,.uneditable-input.span6{width:450px}input.span5,textarea.span5,.uneditable-input.span5{width:370px}input.span4,textarea.span4,.uneditable-input.span4{width:290px}input.span3,textarea.span3,.uneditable-input.span3{width:210px}input.span2,textarea.span2,.uneditable-input.span2{width:130px}input.span1,textarea.span1,.uneditable-input.span1{width:50px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee;border-color:#ddd}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;*zoom:1}.form-actions:before,.form-actions:after{display:table;content:""}.form-actions:after{clear:both}.uneditable-input{overflow:hidden;white-space:nowrap;cursor:not-allowed;background-color:#fff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}:-moz-placeholder{color:#999}::-webkit-input-placeholder{color:#999}.help-block,.help-inline{color:#555}.help-block{display:block;margin-bottom:9px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-prepend,.input-append{margin-bottom:5px}.input-prepend input,.input-append input,.input-prepend select,.input-append select,.input-prepend .uneditable-input,.input-append .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:middle;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.input-prepend input:focus,.input-append input:focus,.input-prepend select:focus,.input-append select:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{z-index:2}.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc}.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;height:18px;min-width:16px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #fff;vertical-align:middle;background-color:#eee;border:1px solid #ccc}.input-prepend .add-on,.input-append .add-on,.input-prepend .btn,.input-append .btn{margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.input-append .uneditable-input{border-right-color:#ccc;border-left-color:#eee}.input-append .add-on:last-child,.input-append .btn:last-child{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:9px}legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:18px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:140px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:160px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:160px}.form-horizontal .help-block{margin-top:9px;margin-bottom:0}.form-horizontal .form-actions{padding-left:160px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:18px}.table th,.table td{padding:8px;line-height:18px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapsed;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9}.table tbody tr:hover td,.table tbody tr:hover th{background-color:#f5f5f5}table .span1{float:none;width:44px;margin-left:0}table .span2{float:none;width:124px;margin-left:0}table .span3{float:none;width:204px;margin-left:0}table .span4{float:none;width:284px;margin-left:0}table .span5{float:none;width:364px;margin-left:0}table .span6{float:none;width:444px;margin-left:0}table .span7{float:none;width:524px;margin-left:0}table .span8{float:none;width:604px;margin-left:0}table .span9{float:none;width:684px;margin-left:0}table .span10{float:none;width:764px;margin-left:0}table .span11{float:none;width:844px;margin-left:0}table .span12{float:none;width:924px;margin-left:0}table .span13{float:none;width:1004px;margin-left:0}table .span14{float:none;width:1084px;margin-left:0}table .span15{float:none;width:1164px;margin-left:0}table .span16{float:none;width:1244px;margin-left:0}table .span17{float:none;width:1324px;margin-left:0}table .span18{float:none;width:1404px;margin-left:0}table .span19{float:none;width:1484px;margin-left:0}table .span20{float:none;width:1564px;margin-left:0}table .span21{float:none;width:1644px;margin-left:0}table .span22{float:none;width:1724px;margin-left:0}table .span23{float:none;width:1804px;margin-left:0}table .span24{float:none;width:1884px;margin-left:0}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0}.icon-white{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{background-position:-384px -120px}.icon-folder-open{background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:"";opacity:.3;filter:alpha(opacity=30)}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown:hover .caret,.open .caret{opacity:1;filter:alpha(opacity=100)}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:4px 0;margin:1px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#333;white-space:nowrap}.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;text-decoration:none;background-color:#08c}.open{*z-index:1000}.open .dropdown-menu{display:block}.pull-right .dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:"\2191"}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0,0,0,0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;filter:alpha(opacity=0);-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-ms-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1;filter:alpha(opacity=100)}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-ms-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 10px 4px;margin-bottom:0;*margin-left:.3em;font-size:13px;line-height:18px;*line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-ms-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(top,#fff,#e6e6e6);background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #ccc;*border:0;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff',endColorstr='#e6e6e6',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover{color:#333;text-decoration:none;background-color:#e6e6e6;*background-color:#d9d9d9;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-ms-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-color:#e6e6e6;background-color:#d9d9d9 \9;background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-color:#e6e6e6;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.btn-large [class^="icon-"]{margin-top:1px}.btn-small{padding:5px 9px;font-size:11px;line-height:16px}.btn-small [class^="icon-"]{margin-top:-1px}.btn-mini{padding:2px 6px;font-size:11px;line-height:14px}.btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover,.btn-inverse,.btn-inverse:hover{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn{border-color:#ccc;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.btn-primary{background-color:#0074cc;*background-color:#05c;background-image:-ms-linear-gradient(top,#08c,#05c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#05c));background-image:-webkit-linear-gradient(top,#08c,#05c);background-image:-o-linear-gradient(top,#08c,#05c);background-image:-moz-linear-gradient(top,#08c,#05c);background-image:linear-gradient(top,#08c,#05c);background-repeat:repeat-x;border-color:#05c #05c #003580;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#0088cc',endColorstr='#0055cc',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#05c;*background-color:#004ab3}.btn-primary:active,.btn-primary.active{background-color:#004099 \9}.btn-warning{background-color:#faa732;*background-color:#f89406;background-image:-ms-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(top,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450',endColorstr='#f89406',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{background-color:#da4f49;*background-color:#bd362f;background-image:-ms-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(top,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b',endColorstr='#bd362f',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{background-color:#5bb75b;*background-color:#51a351;background-image:-ms-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(top,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#62c462',endColorstr='#51a351',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{background-color:#49afcd;*background-color:#2f96b4;background-image:-ms-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(top,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de',endColorstr='#2f96b4',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{background-color:#414141;*background-color:#222;background-image:-ms-linear-gradient(top,#555,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#555),to(#222));background-image:-webkit-linear-gradient(top,#555,#222);background-image:-o-linear-gradient(top,#555,#222);background-image:-moz-linear-gradient(top,#555,#222);background-image:linear-gradient(top,#555,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#555555',endColorstr='#222222',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-group{position:relative;*margin-left:.3em;*zoom:1}.btn-group:before,.btn-group:after{display:table;content:""}.btn-group:after{clear:both}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:9px;margin-bottom:9px}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1}.btn-group>.btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.dropdown-toggle{*padding-top:4px;padding-right:8px;*padding-bottom:4px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini.dropdown-toggle{padding-right:5px;padding-left:5px}.btn-group>.btn-small.dropdown-toggle{*padding-top:4px;*padding-bottom:4px}.btn-group>.btn-large.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#05c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:7px;margin-left:0}.btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100)}.btn-mini .caret{margin-top:5px}.btn-small .caret{margin-top:6px}.btn-large .caret{margin-top:6px;border-top-width:5px;border-right-width:5px;border-left-width:5px}.dropup .btn-large .caret{border-top:0;border-bottom:5px solid #000}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:.75;filter:alpha(opacity=75)}.alert{padding:8px 35px 8px 14px;margin-bottom:18px;color:#c09853;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert-heading{color:inherit}.alert .close{position:relative;top:-2px;right:-21px;line-height:18px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:18px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>.pull-right{float:right}.nav .nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:18px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.nav-tabs.nav-stacked>li>a:hover{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px}.nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333;border-bottom-color:#333}.nav>.dropdown.active>a:hover{color:#000;cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.navbar{*position:relative;*z-index:2;margin-bottom:18px;overflow:visible}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top,#333,#222);background-image:-ms-linear-gradient(top,#333,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#333),to(#222));background-image:-webkit-linear-gradient(top,#333,#222);background-image:-o-linear-gradient(top,#333,#222);background-image:linear-gradient(top,#333,#222);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#333333',endColorstr='#222222',GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1)}.navbar .container{width:auto}.nav-collapse.collapse{height:auto}.navbar{color:#999}.navbar .brand:hover{text-decoration:none}.navbar .brand{display:block;float:left;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#999}.navbar .navbar-text{margin-bottom:0;line-height:40px}.navbar .navbar-link{color:#999}.navbar .navbar-link:hover{color:#fff}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn{margin:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#fff;background-color:#626262;border:1px solid #151515;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none}.navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-bottom{bottom:0}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right}.navbar .nav>li{display:block;float:left}.navbar .nav>li>a{float:none;padding:9px 10px 11px;line-height:19px;color:#999;text-decoration:none;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar .btn{display:inline-block;padding:4px 10px 4px;margin:5px 5px 6px;line-height:18px}.navbar .btn-group{padding:5px 5px 6px;margin:0}.navbar .nav>li>a:hover{color:#fff;text-decoration:none;background-color:transparent}.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#fff;text-decoration:none;background-color:#222}.navbar .divider-vertical{width:1px;height:40px;margin:0 9px;overflow:hidden;background-color:#222;border-right:1px solid #333}.navbar .nav.pull-right{margin-right:0;margin-left:10px}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;background-color:#2c2c2c;*background-color:#222;background-image:-ms-linear-gradient(top,#333,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#333),to(#222));background-image:-webkit-linear-gradient(top,#333,#222);background-image:-o-linear-gradient(top,#333,#222);background-image:linear-gradient(top,#333,#222);background-image:-moz-linear-gradient(top,#333,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#333333',endColorstr='#222222',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{background-color:#222;*background-color:#151515}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#080808 \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown .dropdown-toggle .caret,.navbar .nav li.dropdown.open .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar .nav li.dropdown.active .caret{opacity:1;filter:alpha(opacity=100)}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{background-color:transparent}.navbar .nav li.dropdown.active>.dropdown-toggle:hover{color:#fff}.navbar .pull-right .dropdown-menu,.navbar .dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right .dropdown-menu:before,.navbar .dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right .dropdown-menu:after,.navbar .dropdown-menu.pull-right:after{right:13px;left:auto}.breadcrumb{padding:7px 14px;margin:0 0 18px;list-style:none;background-color:#fbfbfb;background-image:-moz-linear-gradient(top,#fff,#f5f5f5);background-image:-ms-linear-gradient(top,#fff,#f5f5f5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f5f5f5));background-image:-webkit-linear-gradient(top,#fff,#f5f5f5);background-image:-o-linear-gradient(top,#fff,#f5f5f5);background-image:linear-gradient(top,#fff,#f5f5f5);background-repeat:repeat-x;border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff',endColorstr='#f5f5f5',GradientType=0);-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.breadcrumb li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb .divider{padding:0 5px;color:#999}.breadcrumb .active a{color:#333}.pagination{height:36px;margin:18px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination li{display:inline}.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0}.pagination a:hover,.pagination .active a{background-color:#f5f5f5}.pagination .active a{color:#999;cursor:default}.pagination .disabled span,.pagination .disabled a,.pagination .disabled a:hover{color:#999;cursor:default;background-color:transparent}.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pager{margin-bottom:18px;margin-left:0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;content:""}.pager:after{clear:both}.pager li{display:inline}.pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager a:hover{text-decoration:none;background-color:#f5f5f5}.pager .next a{float:right}.pager .previous a{float:left}.pager .disabled a,.pager .disabled a:hover{color:#999;cursor:default;background-color:#fff}.modal-open .dropdown-menu{z-index:2050}.modal-open .dropdown.open{*z-index:2050}.modal-open .popover{z-index:2060}.modal-open .tooltip{z-index:2070}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:50%;left:50%;z-index:1050;width:560px;margin:-250px 0 0 -280px;overflow:auto;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-ms-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}.modal.fade.in{top:50%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-body{max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.tooltip{position:absolute;z-index:1020;display:block;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{margin-top:-2px}.tooltip.right{margin-left:2px}.tooltip.bottom{margin-top:2px}.tooltip.left{margin-left:-2px}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top:5px solid #000;border-right:5px solid transparent;border-left:5px solid transparent}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-right:5px solid transparent;border-bottom:5px solid #000;border-left:5px solid transparent}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-right:5px solid #000;border-bottom:5px solid transparent}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px}.popover.top{margin-top:-5px}.popover.right{margin-left:5px}.popover.bottom{margin-top:5px}.popover.left{margin-left:-5px}.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-top:5px solid #000;border-right:5px solid transparent;border-left:5px solid transparent}.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-right:5px solid #000;border-bottom:5px solid transparent}.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-right:5px solid transparent;border-bottom:5px solid #000;border-left:5px solid transparent}.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000}.popover .arrow{position:absolute;width:0;height:0}.popover-inner{width:280px;padding:3px;overflow:hidden;background:#000;background:rgba(0,0,0,0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3)}.popover-title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0}.popover-content{padding:14px;background-color:#fff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:18px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:0 1px 1px rgba(0,0,0,0.075);box-shadow:0 1px 1px rgba(0,0,0,0.075)}a.thumbnail:hover{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px}.label,.badge{font-size:10.998px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{padding:1px 4px 2px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding:1px 9px 2px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}a.label:hover,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:18px;margin-bottom:18px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-ms-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(top,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#f5f5f5',endColorstr='#f9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{width:0;height:18px;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(top,#149bdf,#0480be);background-image:-ms-linear-gradient(top,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#149bdf',endColorstr='#0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-ms-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-striped .bar{background-color:#149bdf;background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-ms-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(top,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b',endColorstr='#c43c35',GradientType=0)}.progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-ms-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(top,#62c462,#57a957);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#62c462',endColorstr='#57a957',GradientType=0)}.progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-ms-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(top,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de',endColorstr='#339bb9',GradientType=0)}.progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-ms-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(top,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450',endColorstr='#f89406',GradientType=0)}.progress-warning.progress-striped .bar{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:18px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:18px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel .item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-ms-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel .item>img{display:block;line-height:1}.carousel .active,.carousel .next,.carousel .prev{display:block}.carousel .active{left:0}.carousel .next,.carousel .prev{position:absolute;top:0;width:100%}.carousel .next{left:100%}.carousel .prev{left:-100%}.carousel .next.left,.carousel .prev.right{left:0}.carousel .active.left{left:-100%}.carousel .active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:10px 15px 5px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{color:#fff}.hero-unit{padding:60px;margin-bottom:30px;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit p{font-size:18px;font-weight:200;line-height:27px;color:inherit}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden} diff --git a/samples/java/demo/public/bootstrap/img/glyphicons-halflings-white.png b/samples/java/demo/public/bootstrap/img/glyphicons-halflings-white.png deleted file mode 100644 index 3bf6484a29d8da269f9bc874b25493a45fae3bae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8777 zcmZvC1yGz#v+m*$LXcp=A$ZWB0fL7wNbp_U*$~{_gL`my3oP#L!5tQYy99Ta`+g_q zKlj|KJ2f@c)ARJx{q*bbkhN_!|Wn*Vos8{TEhUT@5e;_WJsIMMcG5%>DiS&dv_N`4@J0cnAQ-#>RjZ z00W5t&tJ^l-QC*ST1-p~00u^9XJ=AUl7oW-;2a+x2k__T=grN{+1c4XK0ZL~^z^i$ zp&>vEhr@4fZWb380S18T&!0cQ3IKpHF)?v=b_NIm0Q>vwY7D0baZ)n z31Fa5sELUQARIVaU0nqf0XzT+fB_63aA;@<$l~wse|mcA;^G1TmX?-)e)jkGPfkuA z92@|!<>h5S_4f8QP-JRq>d&7)^Yin8l7K8gED$&_FaV?gY+wLjpoW%~7NDe=nHfMG z5DO3j{R9kv5GbssrUpO)OyvVrlx>u0UKD0i;Dpm5S5dY16(DL5l{ixz|mhJU@&-OWCTb7_%}8-fE(P~+XIRO zJU|wp1|S>|J3KrLcz^+v1f&BDpd>&MAaibR4#5A_4(MucZwG9E1h4@u0P@C8;oo+g zIVj7kfJi{oV~E(NZ*h(@^-(Q(C`Psb3KZ{N;^GB(a8NE*Vwc715!9 zr-H4Ao|T_c6+VT_JH9H+P3>iXSt!a$F`>s`jn`w9GZ_~B!{0soaiV|O_c^R2aWa%}O3jUE)WO=pa zs~_Wz08z|ieY5A%$@FcBF9^!1a}m5ks@7gjn;67N>}S~Hrm`4sM5Hh`q7&5-N{|31 z6x1{ol7BnskoViZ0GqbLa#kW`Z)VCjt1MysKg|rT zi!?s##Ck>8c zpi|>$lGlw#@yMNi&V4`6OBGJ(H&7lqLlcTQ&1zWriG_fL>BnFcr~?;E93{M-xIozQ zO=EHQ#+?<}%@wbWWv23#!V70h9MOuUVaU>3kpTvYfc|LBw?&b*89~Gc9i&8tlT#kF ztpbZoAzkdB+UTy=tx%L3Z4)I{zY(Kb)eg{InobSJmNwPZt$14aS-uc4eKuY8h$dtfyxu^a%zA)>fYI&)@ZXky?^{5>xSC?;w4r&td6vBdi%vHm4=XJH!3yL3?Ep+T5aU_>i;yr_XGq zxZfCzUU@GvnoIk+_Nd`aky>S&H!b*{A%L>?*XPAgWL(Vf(k7qUS}>Zn=U(ZfcOc{B z3*tOHH@t5Ub5D~#N7!Fxx}P2)sy{vE_l(R7$aW&CX>c|&HY+7};vUIietK%}!phrCuh+;C@1usp;XLU<8Gq8P!rEI3ieg#W$!= zQcZr{hp>8sF?k&Yl0?B84OneiQxef-4TEFrq3O~JAZR}yEJHA|Xkqd49tR&8oq{zP zY@>J^HBV*(gJvJZc_0VFN7Sx?H7#75E3#?N8Z!C+_f53YU}pyggxx1?wQi5Yb-_`I`_V*SMx5+*P^b=ec5RON-k1cIlsBLk}(HiaJyab0`CI zo0{=1_LO$~oE2%Tl_}KURuX<`+mQN_sTdM&* zkFf!Xtl^e^gTy6ON=&gTn6)$JHQq2)33R@_!#9?BLNq-Wi{U|rVX7Vny$l6#+SZ@KvQt@VYb%<9JfapI^b9j=wa+Tqb4ei;8c5 z&1>Uz@lVFv6T4Z*YU$r4G`g=91lSeA<=GRZ!*KTWKDPR}NPUW%peCUj`Ix_LDq!8| zMH-V`Pv!a~QkTL||L@cqiTz)*G-0=ytr1KqTuFPan9y4gYD5>PleK`NZB$ev@W%t= zkp)_=lBUTLZJpAtZg;pjI;7r2y|26-N7&a(hX|`1YNM9N8{>8JAuv}hp1v`3JHT-=5lbXpbMq7X~2J5Kl zh7tyU`_AusMFZ{ej9D;Uyy;SQ!4nwgSnngsYBwdS&EO3NS*o04)*juAYl;57c2Ly0(DEZ8IY?zSph-kyxu+D`tt@oU{32J#I{vmy=#0ySPK zA+i(A3yl)qmTz*$dZi#y9FS;$;h%bY+;StNx{_R56Otq+?pGe^T^{5d7Gs&?`_r`8 zD&dzOA|j8@3A&FR5U3*eQNBf<4^4W_iS_()*8b4aaUzfk2 zzIcMWSEjm;EPZPk{j{1>oXd}pXAj!NaRm8{Sjz!D=~q3WJ@vmt6ND_?HI~|wUS1j5 z9!S1MKr7%nxoJ3k`GB^7yV~*{n~O~n6($~x5Bu{7s|JyXbAyKI4+tO(zZYMslK;Zc zzeHGVl{`iP@jfSKq>R;{+djJ9n%$%EL()Uw+sykjNQdflkJZSjqV_QDWivbZS~S{K zkE@T^Jcv)Dfm93!mf$XYnCT--_A$zo9MOkPB6&diM8MwOfV?+ApNv`moV@nqn>&lv zYbN1-M|jc~sG|yLN^1R2=`+1ih3jCshg`iP&mY$GMTcY^W^T`WOCX!{-KHmZ#GiRH zYl{|+KLn5!PCLtBy~9i}`#d^gCDDx$+GQb~uc;V#K3OgbbOG0j5{BRG-si%Bo{@lB zGIt+Ain8^C`!*S0d0OSWVO+Z89}}O8aFTZ>p&k}2gGCV zh#<$gswePFxWGT$4DC^8@84_e*^KT74?7n8!$8cg=sL$OlKr&HMh@Rr5%*Wr!xoOl zo7jItnj-xYgVTX)H1=A2bD(tleEH57#V{xAeW_ezISg5OC zg=k>hOLA^urTH_e6*vSYRqCm$J{xo}-x3@HH;bsHD1Z`Pzvsn}%cvfw%Q(}h`Dgtb z0_J^niUmoCM5$*f)6}}qi(u;cPgxfyeVaaVmOsG<)5`6tzU4wyhF;k|~|x>7-2hXpVBpc5k{L4M`Wbe6Q?tr^*B z`Y*>6*&R#~%JlBIitlZ^qGe3s21~h3U|&k%%jeMM;6!~UH|+0+<5V-_zDqZQN79?n?!Aj!Nj`YMO9?j>uqI9-Tex+nJD z%e0#Yca6(zqGUR|KITa?9x-#C0!JKJHO(+fy@1!B$%ZwJwncQW7vGYv?~!^`#L~Um zOL++>4qmqW`0Chc0T23G8|vO)tK=Z2`gvS4*qpqhIJCEv9i&&$09VO8YOz|oZ+ubd zNXVdLc&p=KsSgtmIPLN69P7xYkYQ1vJ?u1g)T!6Ru`k2wkdj*wDC)VryGu2=yb0?F z>q~~e>KZ0d_#7f3UgV%9MY1}vMgF{B8yfE{HL*pMyhYF)WDZ^^3vS8F zGlOhs%g_~pS3=WQ#494@jAXwOtr^Y|TnQ5zki>qRG)(oPY*f}U_=ip_{qB0!%w7~G zWE!P4p3khyW-JJnE>eECuYfI?^d366Shq!Wm#x&jAo>=HdCllE$>DPO0N;y#4G)D2y#B@5=N=+F%Xo2n{gKcPcK2!hP*^WSXl+ut; zyLvVoY>VL{H%Kd9^i~lsb8j4>$EllrparEOJNT?Ym>vJa$(P^tOG)5aVb_5w^*&M0 zYOJ`I`}9}UoSnYg#E(&yyK(tqr^@n}qU2H2DhkK-`2He% zgXr_4kpXoQHxAO9S`wEdmqGU4j=1JdG!OixdqB4PPP6RXA}>GM zumruUUH|ZG2$bBj)Qluj&uB=dRb)?^qomw?Z$X%#D+Q*O97eHrgVB2*mR$bFBU`*} zIem?dM)i}raTFDn@5^caxE^XFXVhBePmH9fqcTi`TLaXiueH=@06sl}>F%}h9H_e9 z>^O?LxM1EjX}NVppaO@NNQr=AtHcH-BU{yBT_vejJ#J)l^cl69Z7$sk`82Zyw7Wxt z=~J?hZm{f@W}|96FUJfy65Gk8?^{^yjhOahUMCNNpt5DJw}ZKH7b!bGiFY9y6OY&T z_N)?Jj(MuLTN36ZCJ6I5Xy7uVlrb$o*Z%=-)kPo9s?<^Yqz~!Z* z_mP8(unFq65XSi!$@YtieSQ!<7IEOaA9VkKI?lA`*(nURvfKL8cX}-+~uw9|_5)uC2`ZHcaeX7L8aG6Ghleg@F9aG%X$#g6^yP5apnB>YTz&EfS{q z9UVfSyEIczebC)qlVu5cOoMzS_jrC|)rQlAzK7sfiW0`M8mVIohazPE9Jzn*qPt%6 zZL8RELY@L09B83@Be;x5V-IHnn$}{RAT#<2JA%ttlk#^(%u}CGze|1JY5MPhbfnYG zIw%$XfBmA-<_pKLpGKwbRF$#P;@_)ech#>vj25sv25VM$ouo)?BXdRcO{)*OwTw)G zv43W~T6ekBMtUD%5Bm>`^Ltv!w4~65N!Ut5twl!Agrzyq4O2Fi3pUMtCU~>9gt_=h-f% z;1&OuSu?A_sJvIvQ+dZNo3?m1%b1+s&UAx?8sUHEe_sB7zkm4R%6)<@oYB_i5>3Ip zIA+?jVdX|zL{)?TGpx+=Ta>G80}0}Ax+722$XFNJsC1gcH56{8B)*)eU#r~HrC&}` z|EWW92&;6y;3}!L5zXa385@?-D%>dSvyK;?jqU2t_R3wvBW;$!j45uQ7tyEIQva;Db}r&bR3kqNSh)Q_$MJ#Uj3Gj1F;)sO|%6z#@<+ zi{pbYsYS#u`X$Nf($OS+lhw>xgjos1OnF^$-I$u;qhJswhH~p|ab*nO>zBrtb0ndn zxV0uh!LN`&xckTP+JW}gznSpU492)u+`f{9Yr)js`NmfYH#Wdtradc0TnKNz@Su!e zu$9}G_=ku;%4xk}eXl>)KgpuT>_<`Ud(A^a++K&pm3LbN;gI}ku@YVrA%FJBZ5$;m zobR8}OLtW4-i+qPPLS-(7<>M{)rhiPoi@?&vDeVq5%fmZk=mDdRV>Pb-l7pP1y6|J z8I>sF+TypKV=_^NwBU^>4JJq<*14GLfM2*XQzYdlqqjnE)gZsPW^E@mp&ww* zW9i>XL=uwLVZ9pO*8K>t>vdL~Ek_NUL$?LQi5sc#1Q-f6-ywKcIT8Kw?C(_3pbR`e|)%9S-({if|E+hR2W!&qfQ&UiF^I!|M#xhdWsenv^wpKCBiuxXbnp85`{i|;BM?Ba`lqTA zyRm=UWJl&E{8JzYDHFu>*Z10-?#A8D|5jW9Ho0*CAs0fAy~MqbwYuOq9jjt9*nuHI zbDwKvh)5Ir$r!fS5|;?Dt>V+@F*v8=TJJF)TdnC#Mk>+tGDGCw;A~^PC`gUt*<(|i zB{{g{`uFehu`$fm4)&k7`u{xIV)yvA(%5SxX9MS80p2EKnLtCZ>tlX>*Z6nd&6-Mv$5rHD*db;&IBK3KH&M<+ArlGXDRdX1VVO4)&R$f4NxXI>GBh zSv|h>5GDAI(4E`@F?EnW zS>#c&Gw6~_XL`qQG4bK`W*>hek4LX*efn6|_MY+rXkNyAuu?NxS%L7~9tD3cn7&p( zCtfqe6sjB&Q-Vs7BP5+%;#Gk};4xtwU!KY0XXbmkUy$kR9)!~?*v)qw00!+Yg^#H> zc#8*z6zZo>+(bud?K<*!QO4ehiTCK&PD4G&n)Tr9X_3r-we z?fI+}-G~Yn93gI6F{}Dw_SC*FLZ)5(85zp4%uubtD)J)UELLkvGk4#tw&Tussa)mTD$R2&O~{ zCI3>fr-!-b@EGRI%g0L8UU%%u_<;e9439JNV;4KSxd|78v+I+8^rmMf3f40Jb}wEszROD?xBZu>Ll3;sUIoNxDK3|j3*sam2tC@@e$ z^!;+AK>efeBJB%ALsQ{uFui)oDoq()2USi?n=6C3#eetz?wPswc={I<8x=(8lE4EIsUfyGNZ{|KYn1IR|=E==f z(;!A5(-2y^2xRFCSPqzHAZn5RCN_bp22T(KEtjA(rFZ%>a4@STrHZflxKoqe9Z4@^ zM*scx_y73?Q{vt6?~WEl?2q*;@8 z3M*&@%l)SQmXkcUm)d@GT2#JdzhfSAP9|n#C;$E8X|pwD!r#X?0P>0ZisQ~TNqupW z*lUY~+ikD`vQb?@SAWX#r*Y+;=_|oacL$2CL$^(mV}aKO77pg}O+-=T1oLBT5sL2i z42Qth2+0@C`c+*D0*5!qy26sis<9a7>LN2{z%Qj49t z=L@x`4$ALHb*3COHoT?5S_c(Hs}g!V>W^=6Q0}zaubkDn)(lTax0+!+%B}9Vqw6{H zvL|BRM`O<@;eVi1DzM!tXtBrA20Ce@^Jz|>%X-t`vi-%WweXCh_LhI#bUg2*pcP~R z*RuTUzBKLXO~~uMd&o$v3@d0shHfUjC6c539PE6rF&;Ufa(Rw@K1*m7?f5)t`MjH0 z)_V(cajV5Am>f!kWcI@5rE8t6$S>5M=k=aRZROH6fA^jJp~2NlR4;Q2>L$7F#RT#9 z>4@1RhWG`Khy>P2j1Yx^BBL{S`niMaxlSWV-JBU0-T9zZ%>7mR3l$~QV$({o0;jTI ze5=cN^!Bc2bT|BcojXp~K#2cM>OTe*cM{Kg-j*CkiW)EGQot^}s;cy8_1_@JA0Whq zlrNr+R;Efa+`6N)s5rH*|E)nYZ3uqkk2C(E7@A|3YI`ozP~9Lexx#*1(r8luq+YPk z{J}c$s` zPM35Fx(YWB3Z5IYnN+L_4|jaR(5iWJi2~l&xy}aU7kW?o-V*6Av2wyZTG!E2KSW2* zGRLQkQU;Oz##ie-Z4fI)WSRxn$(ZcD;TL+;^r=a4(G~H3ZhK$lSXZj?cvyY8%d9JM zzc3#pD^W_QnWy#rx#;c&N@sqHhrnHRmj#i;s%zLm6SE(n&BWpd&f7>XnjV}OlZntI70fq%8~9<7 zMYaw`E-rp49-oC1N_uZTo)Cu%RR2QWdHpzQIcNsoDp`3xfP+`gI?tVQZ4X={qU?(n zV>0ASES^Xuc;9JBji{)RnFL(Lez;8XbB1uWaMp@p?7xhXk6V#!6B@aP4Rz7-K%a>i z?fvf}va_DGUXlI#4--`A3qK7J?-HwnG7O~H2;zR~RLW)_^#La!=}+>KW#anZ{|^D3 B7G?kd diff --git a/samples/java/demo/public/bootstrap/img/glyphicons-halflings.png b/samples/java/demo/public/bootstrap/img/glyphicons-halflings.png deleted file mode 100644 index 79bc568c21395d5a5ceab62fadb04457094b2ac7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13826 zcma)jby!@B+o%-915yyF0YFyB4?Ne(CRg z-#O<#&wb84`D17H-t*49Gi$BAvS#fBDJx22pcA4aAt7PN%1EdpAw8RXk~3bSJRMO{ zLOPzl2q2PL5H+wV#M#IJgd}PLHU^Q&+8CLER6#~2F82K(0VJg7mlo<;5G{o-d_b@b zi_u>l7MP9Q6B-FgKp19c1hfJ{$c#Z|7Pf*EM~$r%WELiZ6q=k0YzlVbAae^DR|k-q ztD-v4)e6XKLLn?fCII7mGGGIO7?HtjtZg0nV1g9?*yVeY|6XRLAp1uJVkJoNAEdMt zl*z=w4j?j47B*%e8y7nn*Jl>?&uqM(d6~#Qv9YtUvVUS_<7Q@Os%DRy=VF;OnbPZB&l+~Sg=;$olKxc@r)Yv8{FpRTZ&JYl7zK5_7had2=;im|h^ zOS1E@^NNabNpOiuiHY)jW|#UmR@T-LVq^;h{dM{mYw=&$PyZv9Puu}y1OYp!gTdDS z?kdXWUuEt5GU<9?B8*-aqzJHUs!SW&!V4sCD=ZRit}=F za#FB9kud@CK`bEFpnvsHQESM*Bx{Smy@b!&$kyyB9n2;mQzNJ~ghI&7+QrV?0tmKs zG<38vvbHufF>%IThd>Rse#s3_OPbdF5nnAWt zL)hVIta5&^8bd;2&ytl8Rfo+Tcz~_-Bx?#ZE2<3oUBe})+zpAGX&=O$_aCJBN!CBt zv~LUxtg{dH^uI`jCU#YZa*6x&AyIg@k@bxImc$%rVne48BslqY$+TLFj(v37h7yfx z$^jmG#g_Rs?ETA?`?LMJ^OpUDIY(RQdGlgR?XG$OKf8PyqRZyid2g!3%@a^C1igpD z2NKzV@|1wiF}EtKQRH|$CJJ9)q3e}#g7m#Zl(d`W;iCBregW~kz}j^J z#1PLChA^$dal^V@@cK(w}dv%n2!w4^wV*y35J)-xE{$fXwc@pa}RzJm5M)#tr)iJZA7 zBA<^jjwJWvLx1>RPDIS^k*z$pgpiQZ-O2S}m#&N|A4@|nID3F1~ z+{<)-J1C8b8ezW2FI#gotv2}C#wQERQ(Bd4_} zR$QREVi8_9nE3}6@Vks1@*cVLJrSLt#`lb0$M?!xg%%C;C!jFg2$sX)U0bprNA043 zt1cd;7oNIanP3?<(O0mgAc`)87;35OB;`nL3-yw7Fq`<#Hqz;v+Mj? z%y|w07f93V#m`17f@xa3g&Kss@<20hE22A#Ba2fDjWQe?u<#pkgd4DKg$db>BIa`q zqEeb}1&O#H`nWg^GT=P^c&c$+@UcRMn~k-y&+aN^ic}0j)s9vGd$m}}SL4iw!tr4e z74SRhmFujYvTL$e!;=bil=GRdGp3UA1~R?@@XL?>oK21E-g3xj0Gu;SC|l|8wmd~d zG@8i53Tu3s9ldBp@%(!A6E=rZOl&LAvv1Nkj=ysQ(9(~g-8X6}A>#Y#1a(KQ1TAh( z`*b|k%zN|vOG$C7_4PTiy8Lhr&rZ~I!*iV zG+W%bI&HR#n{T~n|CLrV#?k5#Et)n4f;XdM7~@Er-K9uS8vPNM>uZUibWxth=wqXp zt{0wO*|bZs%9J3Y;Tj4)?d>OBZ>YUb@tFh)1KiKdOeB10_CBOTMml4P#hsP|NnH`$ zn8C$aG#8|gqT#i}vYTeH^aF(r1JFKcz$K3~!6}2FX0@^RHCL+33v-FhYXz#e!VN4~ z3pAY$kL`HvPAaz%ZKvX4N680T6G=`cF|!UT=iU?gUR}#z>rLnIjH4UiW&X!Z2Ih$B z#MDHe_%!Yd4!bTFMGeNcO(+vEfWe=Y&#$#Dh_vk`s>hf<^Bj2jofdTiH?Cvh55o&b zE2N(49<70oDa2DrZnfjbhn{Jl;CT6QCOL517jsNXxh ztk>S%Nl!1kKE!_Y1E%82zuk(#fmi4VMZZ|C9XG#t=_a%pE(?AS@K%j{n=lj?kEKY< zW|3b0>CWE2bkN^RapDK@3*dIhwI~%Mb87ZxnF|-bX;tNwFf}3s_Ti{S8}(TUA=c4( zY2Z!UZS&H=Pk;r%irg?jcz?{s!|V*#QA4{2Fzp37$r+}Z-K{*#DE7B^Inz!%Q9nU} zU%!E(b~61SJ_R5KSY88G!*+2Crm?Vp1DUFviD)lB1c&Atk+dP7K7{oK1?N#HTx(Jx zis^|e#sUW_TPZE3IGu1R+xV`&BV&1NNkrD4j;(NEKdkpSdz8YLZ}ya474taW7yY@8 zsA-+N{3&saE60RSnI802s?NYn0KiULv+`y9hNB!6%B_qCFHMhVOa;O!ge!LzPKbk( zbOnDN{s12ui~i)C55qt9+S4F%_rqna@M}~Kvh3z-^-K67%2T=8H8g<_=LYj#`6IF< z&#}t=5w#4@^{y}B4J8rm?|c7nu!l2bJZ`U-W4@aT)V{Bm!c%#8HewtNPwZ4>dYBdQ z$`?MJMLJt7`j`p7Y7C@WWmQu(B(vQ&FMa>ZZpX>;(|`+m?2Yl|fhX43DejM5BMl`? zr(v=9l4R8Y3}+Abj6x1X^T?$#`1;s>I24lFFFn~&HRgQK%%Ey(mn=20z;U>um1z~Q zJG*-wAw;tG!?{U#JnA5M5rX*u%NF+}y;0xPbTQppWv;^8{aGUxG$gD!0YAlLo;KuE zkFzemm@vHoQYYv<_b|t(esPHC%z-nLF5Q9^?&hl?0?g0d9hVSdDc=X~B?dQzaRfp; z+2*{_ss{}_cv+!%k7WX20;r5{GER*rd{={D1l}-^Se~*W+_M}?z+w9HX;SR@AB6by zI0}UM&nJY!1O!_&a8xRuf`=Drhp4bwFD4GN;7|wXEpdq}@{E+u#{VT}-UEwtWPkxKl^Wa8Qi?#AQLxY4w+?_Y4 zd1glMwHFc0bglfOS-7V_h zjsOP>)fG0TPo!`fIkeDn-b_WlxJH)NqQqX{Cjt1+PPI$%JFTSWT#$Mj_6O?PY#fK3 zMy2&j?Y~|hc!Xla$G$#xZ0%AyTx!yYt=5!)nk&0@J-$=t?&(X;8%~rQYD<{9lr1z zs@8X~WZq3R1+cmT>`KWeE&^_UF>|q&Ay^}*sN63yo7B9nz}D!eQt$6m26sKn>O$P zmvsnQ7b9nJQ46`zs$s*Wtto!ux2}?)U%;Z5%hb7!$w!&8C`>TRG+*DdD0JLss5Xff zBThm&kGp*Qxmrsc3GjV@6TVB6)l|r!wyRJP)U%eM@Of-k4FDYmUY)1+7EUyRGbs_` zleaIf78kfz<{vx`Ls^b4Ogd8_rSR#I2AH%NK)|Vfh#}z~2k0bJcEvc$3He?p;bGVK zyam;#Nl5X&J8j^k<~QS18sq4NPR$kE>m%=`^Ki#+ieKpZYF?TTM#Jv80{<7eYn$&q2aN=p)lq6fG9}Dv2}g_RSVx*Iv-0C}kEWsUw>e$24l?hUH3zqG z2Sa%=_ql^t*`t3yW7`PZ(-yol6mNfiUV1c7e)%BgzOh%HQQd^uq9gC3O*vPSi&V!$ zuJ-gy-6_@)r?@+~#wK_V|QHgllM9B^dZanlnPLZqhL-@Wql1PDLO_j>7Nz?o z+_&sbFV42Gr7019rPl3IUH2}h2Wl+=p46k?>x70Pnt9Gn_CduyDht`=S4b}9&F^387k|mAZg2^t9(aD+I+W{ z#iMaSJ%Slg$*$}d;|(Q|7`BKm3z9) zh-*c!-WX<4{kD>(FE8TvP+#HUL}QrAKt*0vVL7!~ovM)?Ur`?N{))Ew;yk>PkfjG- z*)^I$qo~mV?U!~Gwi(1*M)0+vT9Jy~`kGC^1<}kh2R4PgR^?53j%>|Ns{2kn=ewGn zvPvguwaHo(xrDKI-r{x~q$onf~4u$MK|{q*`g)sDyNO(})q!R?7xZH;c=m6iWiHEU8Q0KT-e zKaAgECVApd!3(FjK2!e|a^g^-5f7L7jB^GFCrwQ_*B`o?=jeoDN_*x+cXrv8gf$36NQ*!QC!Kwg5~wLak^RyUvu(CifB7CA>(1lu6}+@1^DvB!>VYXX?9Ys*9wd&0abG}7TGJ`WsH;FX_s&}n4v(1m|Q)++R8J>#?XO`$8g+3q` zwN~X&6{@){!8Q1(2!in4P8(_gYuOhhFGZ;=C-6kTb%~vBQQ*b-=z*J+>E;6ujm;wX zvb?kY(oC=+ca4)i4a#h@{dTzWSLS3ag^66Gpkn{ke!AC9A{1jMRP%OcQ)<<@nxJH} zZIr?|jBinPoiR)snBOcecjcb@Wuh3my1iVRzl-u;gB}~Rjhub`?Cfu)nPL3L+b$kL zO32z2XK-0_shy`%ZT9<2V<1qI5Rel|E7W{`Hg#M|m&O0`Ua-&p;v}tapS>wTE*On` z756q!EO*AN?oxlV&@ybUeVWd1q~Tg`kpqG}F@V;VsN#&)R^`V00X5}(4*PmNqShEg zQih?Ga1nmgvx@-!Wngeg;A+L{F-(i zf_X7=?WU?j|23>ePpP8OODXHU69Lw_MmSudzHtic8)MWn1BPdI_Ae4ykPB0u9il*G zJ?$Q@);~I`)dd=AQuaxcTe2HSse|E|ii5U_*5>3~bz~#PL%91W(Nyd|=|ZA6*w`c7 z$R1sRD@XhF^&4gJ#exDQRqq3%$Y|oPc!wXV-=n37^UJ=Olj%RP#gEAol|$!AAbjxW zXq&hxEZQyPL4JOa6I*343W#)9&u%!GDhw_3B>yJ7)O`Ae76GRZenb(|eWOMZU_spF zuD{--T)B0<*4E?|ri0F<=p!twyj!hH;HlUN0Htt?hj8zO#!~F83W|K9Lvq z3{RaoPbjaDFu@z{^qW3cjj7kS$GR|;9I%R~LZ@6(ENvrteZFbkkow-9p%qZBx>J+M zq8}TEyApxpU@n((iw0bRrJvc6Cd$y8wbf4?-w4%S5$Slysc^DTKW~+Y`!?zI;_DZL zV9KO0`~P=A@%O2`KlPzF{xwsO>z5=mqo0Z23o-D!NekrdbEa^%TfV56v|FDM?4cKX z@rrk@JJ?1_5irzO66hc^C*{*Ke&o=Ijw!R*ZAgtQC0ezeL17SocQu_m!6VUsNTcVG zpwRaCZCIJ=OR~@li`X(c8LO9k&wjr&0Gd_GRou<{3Hu`Css}PU72iy4PZtFd(l9VK zR)fk*&dPTy&yMX{o8@~bPnX0_Q@UX-RN+o|sC$;fpA|xTEugMj7@)yJ{4@bO3x^+O zH0OTqp82(iEah+>0QWS z$@9x&MNFG_ayE3OJxi@l$%9i2{OAD1go7t5}Sv8p*L*?_XV-Inr zpe~mOfBekpsM*iZA4B0U-_aDDuQGQ>$du+c-pHfXyBaLv@T`?*-je(+>E!q1bXa1q z14-*PWvM+oFg(z{YlRS2em5Pw1U1&De`{t$Pg={frAk6|^cDRB$0e*ut zvJ=N0<2rG{&|2ECVoU=~V0R9rfUWk0Z${R3(A&#kkMCPoz`s?k7N+_8!1v32J*zyO zR9Lv8#NK_E; zsf^8eBN5l`rT5}^m`=Z(Oaw_(G`KLa6xX%V@W0keWi;An4+N4QThS_k{n&Vyk{0!?N_d)(8r)?>J|F`-ZusfRTzNO)+h%L=-)$92e&Ck?1oAE(~~ z$-n~o0g*n;RB*mqiaAn=Wlm0w2D6Yu&4fY#;MU1bvU(~NK6m1FUoPk+w;|b?nzGkO z_PUIl=pfDRhrLvm<;sb9>BFB~Sc4oJ;hS&xb#O~;Q7(2b8< zQ9Hg8isf_ddK#6OY$>r#Kxz@D+gtkY>hy|#o8Z-=^bH`o)WbuhhdK98@PHbw2Zt=7 zV$-oYeC$U<;|pnaU4187;%~hxdnq*JOnEGam?8hex6Iy=ZlWGzZv-4 zoJ{KX4x(J5=P>qor+5;Qvhp3GFBpXJ9fO3crB!vqua&Y$iFJdsGsQL15;##Wtx)a! zYY)JHGBW`d%x6ZI`{f6_r^+OdBbZk{<-B0y4iS|--^SLDWVMu&VT?M2Z|8*E=pfeq z);Kt;$?dDKuIJvdZG|d_=QWvbk?X!+UMjWng_S4uk_M}7f`V03>h!f-=Qxpm9ReU7 za!V9@Dytw&Y;Dn_tG@+O7`;DiSse1^ilx|o^~@+CRqBxKgXtuFTdkV9s}V3?Sy6{S z*XctI(Eyb3h^4g}R#0C=Al$1x3GX$~3fA}}eX>>DF+LFj4zJ()a-xd1d6P?W{`m*D z*x%43iLpP6D8xOj1Z<^h)%1C*{`|uBM zAKe~zJa>JT4Tqn|wxn>-+P9_i;yHBP@*ap6jMJgu7>d2GIq{>J`g;o%tKlmpM-RrSw{_pAKK; zSq)!`7M=VE#*z4?xSugikUTPD}y7GXhB{U`6@}s8z0d@C`F9EQ3#s|A3?{zk{KOin$?&5UgsTdnL zO1i!hQhbL?LiIIX*RA*iV$~) zB>zWXKyBeJC4}W_3SGU)PQseJzO;g~99>U&xx8@V2Qp$StzgO_?GxT!9UmQV2vt-^ zkab;==s?$tI#Akh4J+G|pAPYZQ5vA(8|@a9T2-p=)uPN{@6f@tmW11S)1s z!h%|zyG6Dc);F%IdWaK*t#r*khD51^8Ay)ixzUtt=#AX2VmjE zOFg-|2AdD>SmMSf?bo9uRB)zYaT{m9I%7Vs)$dLGX>bj<#I2?S8OUQRh(mJrJhADZ zT_^gL-3m0*JIokIbOUyiA83%98nW2{Wp2BW5akVi?klylc_3UwSpIlPTwb zEIG-t+EJ;a3(OZ-sGt+R_j^Z;x|qvjBr|7-{wn4kOG&^GRt$u`kMx zzV;Zy-UA7<xMJg(rd2`sKuS9&FoYuUoug>t*^~eJTjg>pWcBUABu-7%@{xM zICt)A_$aq9KQ1!{${`~7GXd+8ZDmu`rjx$oiC@GP<}zwn_dR8&M)WQdC&iw3E)YGG z>3e7ZNZUGzmYhW2?kKOPphuHB2q3zn7e!n3V8t*?@hpE5fc7snCI0l&iE)SiOs(W%=b1^y8b;aHjB&KaO|McF*t%v`zlW*&h5@1@_C^ zu@=`+#rV2TS56EeCh=>uP<-lPc^}fc208qOOb9~TKo;7L zA~1!rYZOt)&{UFvJI5a$VIW+Rn=eIQsZ^sU)8hNGK};PpknpE84hIhht07)(ER+4_ zxLhMx$;116i@tQodN*XTcFS{`!fPjk0n} z1udu3=k`@uaQK?j)YF!Z2n=fc zY`~>$*#BZX+mGk=DFM0Z|L3%DK(H(w+__!4UF`kf9Jf(YzE zR+p>6%a^g;g${|zdmK6-Gj(({7pl{TV*3&Z!Tg4cKvV0j;*Hb(Z#qmw#wdm`wZ8ts zjIUMJ`h#Vh4=S1zDw~a^H)q+6{ z#Hz!oYPE7ZFi~~AG7n#q$;s}pANs@VyV5vhU2&d`=@Es*pQh}pgHHCW`KB+GEa9ck zW`9DlW`Wvi6+8Jp#bM-ebD50CjykM&Y5Nb{=n_#L!>gatGhc`j`D$a>B*m5@1=_tY z1!7V55YfU?hSlU@@flw?^BFXCnLzGQ5nOAvVvjQP>otW|mQj7Pc1evAEdaVt_O7si zLf)Opv3>@Ky-^Y?)9yR;H}8pcbX&{bu?-8JE^rhUOvU2ko_d9PU&9pXO^>cRZ#zZo zCkq39jb4}nCKp>1oQXcr)#BC}eH;uS!al|lo`b0S;{)B1C!B9NGJ7sRRf8u~;@IH-gDB{~GwmgyVn+go-vI%&pi z&YpjGP!eesJV1P}>w0bDVqj#o(Td$rcY=Dy(vmsW4Lu7vblFZ1AkwFt&8yEeH+$MF z-`f?Kpo$}2=fdkh7scLN3X|LFczR*OC>3vQN$>T`HJ{7Et7(nPTo6piDNA7Mqp=3RT0d>DNW?+-b;wgbWc@xKrOgn@*hcG0Bl300~zM z1cqJaF;{x*c%r%A4-dBquj5*G&bu!gKwoO_nS;LQT^1W`?RvhSP_8$3==>+aY-PTt z>bq-vSj!54>+X4cy9uFc7n4e89$B@NcVD5A-ZJOxHgc`}0Xekmrnv zFXt>J(de%xG=HqM%#sdc`1MGQF^WDoQiWxMaI(4dHmX&4!LlBo`(Of>F#wiHG2!fZ zvB{2Q#2#f}GF24rrVMQV1q+OtDek8cd8z74b#rGk91~90FBtkjwVnDn53id&|26Z`rO1<>1bMNki zIionO>*HS1J4(aUYgwsF#kSB3LoKM6=_L4awnOEIti-PdFWHKvSHkYopzzkmO{#f! zBCp*D{8xF0vlect8R3v&sfl^TuDXSf&P%wC74{#9?N5X!pC24A7h4?)2V-9N|c{C;w5wl|z8<2X0es$`*M5j(oF{0r&32 z`U~-Q8qfbA;nM54%Pd-|nK@0LdSA=5KyqV*g)A>?W!gQiNj|kKfej`z+TWeH!`Hpg z4x)z(>^8nLqTC<9RW5iJvCjWHv7}1afGXDDjvlcDu^s2txL;E`C?VN3k?3wy4?Rg4 znmrvze0;v4z1-miFC~klv>fjZbDDi1Sb3^nk~4(v>AQ0kEgcS!BT@@JFn156+M2%+9d~_aj?sf*d7G$H=KZ+;~_5OXv~HkLZB`D1C0=ySHh6%$1n_d9W{Z z&m>oGu#UW7!b=#@N;S*cUt1_&zh6G6Pp&1MS&qW^nP8>f9Vydi7A|Q=nJs1UqHe~% zo8!0@d07eTQ)zRgq2lRbPX=U9X)}<}K~;F^6$@(xJg{M=ogF(BJK$Va())Mp;3$9P zb1zLrct_$*_$9%}3(n0%gfU}7>#&k71PXy}!LO#cR3p!xc`NR8zFQw{A$DKq6Oeuw z;ZC#iv;VMss-vmXR&ElJ5dxInx1l|}uEaG5i80LcV~4TkD%!RUD@5+~l+kiSOpS0( zJ-iwpm}JCR@Sy?BW$_tvO%K-fQUFm-UCi;NK$-MsQoWnQXO+(qUd!{zFS!JepUfxD zmmoFLB>{OkHam{gP2#GXZaq&=xio1Kop4j#`v}Qz6U1D0dc!ks4ikn{Y6ti#ZeqYgF+ z0jQIIQUvnReW)_53Z+>u>)Lw((~vxa6AFrr%d}nI!o7{spwl@ir`qH9j7o=6JXYD| zsp>X-yI}#VHc1S{c}{E|acAh>zF%*}R`4 zM+xtI9F&>Xs(IJooneFYo;l{cU*-2DT~2TUm;QwTC9RXwFSwqHS82mcZmDj8xVn(+ zhjg5e>~E9?3K-*RvJ)uCq0UIdRl~D85$B^#Nph2%)6FN1>6!u6+%oE;F=J5B=`W{` zL<6;Qu8Pq|0+tS%yP10nmIgUV^r%Hyjyo|#W0hIVR`qiw@r)O7`K*l4Ma$$u=XQc$ z^#q3KLI6#VtuIxX4b;#_lx#bieZGmNS8?8jxHeTsE52O+t4ih5iw}=p7@DZs*!jev z{i#&SO#GsN^zjC{G<~Nu|2>~?q2Z@)UnNDB&2?wHQCn?p9v7YpNRPW1 zWM9#550th&<~(gv_Sok5g3e8tnTzkV2|gxe#kE{nUT{aP8n5=}qg4mCp!JuEcz=Ht z&y3I7&uxdKU%P7D+5NV%Ok}hj@mimhKlv+R1bd8?zb|20JJD?Q?=vElsc#c2!VJmq z&W&vW+CaWx`FG1VfMsEf)`p}0TTes}|I{%_X{vj;}wDxh!zb$|D=4e756H z7dp8?Ul~60@eSwbY!+Crzr*mLMSqj6ofW&@mJB8fIGm%=B28`wnbx8F8YnigN|~sB z)ie@y57LaLin3|;u`JzFDsS0JCrG!Z4g+Nd*=-JadG7AesG5y*rMun?dHJhkCMW_% zCal ztKYWr0+ECjETkqk!9jw#hv?D8BB>sVztP<9s&fY3kg7O(65kdl!pnzWhNl>mkKBOP z9wGNuspXb&`T7gZLu#Y670KyIg|D$foZ^6CxK^NurqGjTAORgOb-D`MnNNRW8Xw=g z8)`pHz^^@&DlTfcLBTlT7>c#c{d1Rs^_EM?6rpWz{8ZrZ3&E3&F=tOC;zGnc>6#NjY1JQMZ!+8#j*!95<*U{5CE&b@6WIV= z`L8w`z0>!&Y?@c9IUIXc)WVTOpF}^_=xxWoJZGv|AT41`N;g@MZhWeGa@pxlgGji8 zR3?G5Rb3_fNj8zy!w)Nl>leQXO0(UI&kdY+N-i0G7Z%q|`!Oo^N%yZLWCBLMop?7) z`#d}b79JtI-AG(Fx@TIi!6u-D3-^!Dlae;43Yp1%MZ9XATQ^#ln*F21RntEEXZFkB z`SV+qf>QWy^~x~X!#q&<(a*gW8Npq#5?J;o^D1<$rOl;PQ2b4cBvE-R>e$@3lbK}qIv=--S zEeI|aC9>S#V3jN>JO#=lUV`ja4_n@N34a(b9DsX~5L~fhJpe=AgZbr~VX+0ZQY{x^ z(k)K(A0~mNkFt zA8e)|)*K0!nFmOg^$p@)RlWA0%f_jul)Ga}wOT-A_SHF)3v!5Ywj5XdkuSTR2s1b> z60lzNZMkjx`b~_wapzIo-Eku>H`NV#XFRgb*F@gDM&yDMiwX=D%B zmzw)_!+aX+zV8mY9at~%ev^rb^(0rwKSp(3};ZpMvxEwD2OjDaVA6Ry$0&8rtZV3pHxzf$? zzAjYXA~;b|XCc95MUR%dTT@Z>0}uY+8y=;wW1vky{pKP;cOV}6&6tV$I;>`FK z906wPfPrz9t=;&M?(Wwdm z0?&;KzLQk84srC-9#ap*I_9GregSZjm<$6oiZ>h3ACEnS7A^faq{fPmD!rT69qQG% zRVF#+RDZ(-Ue?g!$?;NT#p=8F8SV%EZ5ry{-5J)UN6Jj~-klPlw7o4w&aUp0pn@@) zM(jp3}a6rP@=sC1ZvM zV)jL-HO|elZ@x|hHXkrmGu9uS2%=Jqa zgIqpCmA+s{=XewW1!LqE)3%%mIO z(8jQbk;xApH`iS0;h7M96j^_3N=#|-xP-=*>3=obmL(W)Au>jdy3E<UjD;R zOI^Va(lW(qH`MjF&}RqCOifgKKA39SANA9=Qv4z+3Qey|4BJBzex_v%9=l5D-xJaG`?IF#?EKul!io4R+`>v>t_65&VXqROwiMr@*>SD)gNHL4^Ml5(vgCqodJjd$~XNSPzt@GziL=mgy;Y+qBZh&1qKxwm{>$kMCyH2rN?F2%^-bX#z9QBC| zNx?aIaFXEMqAKsMWDfWB@Pt3@$5LZ%DVDT70icB1BXM`F_#4rYqTkpk%wf tVgFekgZM{XhA!KlmFcR^%iaf4$rSfz)nO-hfB%&wE2$_^D)!aq{{YOB6}SKZ diff --git a/samples/java/demo/public/bootstrap/js/bootstrap.js b/samples/java/demo/public/bootstrap/js/bootstrap.js deleted file mode 100644 index 724495410..000000000 --- a/samples/java/demo/public/bootstrap/js/bootstrap.js +++ /dev/null @@ -1,1824 +0,0 @@ -/* =================================================== - * bootstrap-transition.js v2.0.3 - * http://twitter.github.com/bootstrap/javascript.html#transitions - * =================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - $(function () { - - "use strict"; // jshint ;_; - - - /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) - * ======================================================= */ - - $.support.transition = (function () { - - var transitionEnd = (function () { - - var el = document.createElement('bootstrap') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd' - , 'msTransition' : 'MSTransitionEnd' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] - } - } - - }()) - - return transitionEnd && { - end: transitionEnd - } - - })() - - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.0.3 - * http://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* ALERT CLASS DEFINITION - * ====================== */ - - var dismiss = '[data-dismiss="alert"]' - , Alert = function (el) { - $(el).on('click', dismiss, this.close) - } - - Alert.prototype.close = function (e) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - - e && e.preventDefault() - - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - - $parent.trigger(e = $.Event('close')) - - if (e.isDefaultPrevented()) return - - $parent.removeClass('in') - - function removeElement() { - $parent - .trigger('closed') - .remove() - } - - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() - } - - - /* ALERT PLUGIN DEFINITION - * ======================= */ - - $.fn.alert = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.alert.Constructor = Alert - - - /* ALERT DATA-API - * ============== */ - - $(function () { - $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) - }) - -}(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.0.3 - * http://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ - - var Button = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } - - Button.prototype.setState = function (state) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val](data[state] || this.options[state]) - - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - Button.prototype.toggle = function () { - var $parent = this.$element.parent('[data-toggle="buttons-radio"]') - - $parent && $parent - .find('.active') - .removeClass('active') - - this.$element.toggleClass('active') - } - - - /* BUTTON PLUGIN DEFINITION - * ======================== */ - - $.fn.button = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - $.fn.button.defaults = { - loadingText: 'loading...' - } - - $.fn.button.Constructor = Button - - - /* BUTTON DATA-API - * =============== */ - - $(function () { - $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.0.3 - * http://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CAROUSEL CLASS DEFINITION - * ========================= */ - - var Carousel = function (element, options) { - this.$element = $(element) - this.options = options - this.options.slide && this.slide(this.options.slide) - this.options.pause == 'hover' && this.$element - .on('mouseenter', $.proxy(this.pause, this)) - .on('mouseleave', $.proxy(this.cycle, this)) - } - - Carousel.prototype = { - - cycle: function (e) { - if (!e) this.paused = false - this.options.interval - && !this.paused - && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) - return this - } - - , to: function (pos) { - var $active = this.$element.find('.active') - , children = $active.parent().children() - , activePos = children.index($active) - , that = this - - if (pos > (children.length - 1) || pos < 0) return - - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } - - if (activePos == pos) { - return this.pause().cycle() - } - - return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) - } - - , pause: function (e) { - if (!e) this.paused = true - clearInterval(this.interval) - this.interval = null - return this - } - - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - , e = $.Event('slide') - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - if ($next.hasClass('active')) return - - if ($.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) - } else { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } - - isCycling && this.cycle() - - return this - } - - } - - - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ - - $.fn.carousel = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (typeof option == 'string' || (option = options.slide)) data[option]() - else if (options.interval) data.cycle() - }) - } - - $.fn.carousel.defaults = { - interval: 5000 - , pause: 'hover' - } - - $.fn.carousel.Constructor = Carousel - - - /* CAROUSEL DATA-API - * ================= */ - - $(function () { - $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) - $target.carousel(options) - e.preventDefault() - }) - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.0.3 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* COLLAPSE PUBLIC CLASS DEFINITION - * ================================ */ - - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options.parent) { - this.$parent = $(this.options.parent) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension - , scroll - , actives - , hasData - - if (this.transitioning) return - - dimension = this.dimension() - scroll = $.camelCase(['scroll', dimension].join('-')) - actives = this.$parent && this.$parent.find('> .accordion-group > .in') - - if (actives && actives.length) { - hasData = actives.data('collapse') - if (hasData && hasData.transitioning) return - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', $.Event('show'), 'shown') - this.$element[dimension](this.$element[0][scroll]) - } - - , hide: function () { - var dimension - if (this.transitioning) return - dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', $.Event('hide'), 'hidden') - this.$element[dimension](0) - } - - , reset: function (size) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') - - return this - } - - , transition: function (method, startEvent, completeEvent) { - var that = this - , complete = function () { - if (startEvent.type == 'show') that.reset() - that.transitioning = 0 - that.$element.trigger(completeEvent) - } - - this.$element.trigger(startEvent) - - if (startEvent.isDefaultPrevented()) return - - this.transitioning = 1 - - this.$element[method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* COLLAPSIBLE PLUGIN DEFINITION - * ============================== */ - - $.fn.collapse = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = typeof option == 'object' && option - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSIBLE DATA-API - * ==================== */ - - $(function () { - $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $(target).collapse(option) - }) - }) - -}(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.0.3 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle="dropdown"]' - , Dropdown = function (element) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } - - Dropdown.prototype = { - - constructor: Dropdown - - , toggle: function (e) { - var $this = $(this) - , $parent - , selector - , isActive - - if ($this.is('.disabled, :disabled')) return - - selector = $this.attr('data-target') - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - $parent.length || ($parent = $this.parent()) - - isActive = $parent.hasClass('open') - - clearMenus() - - if (!isActive) $parent.toggleClass('open') - - return false - } - - } - - function clearMenus() { - $(toggle).parent().removeClass('open') - } - - - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ - - $.fn.dropdown = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.dropdown.Constructor = Dropdown - - - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ - - $(function () { - $('html').on('click.dropdown.data-api', clearMenus) - $('body') - .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() }) - .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) - }) - -}(window.jQuery);/* ========================================================= - * bootstrap-modal.js v2.0.3 - * http://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================= */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function (content, options) { - this.options = options - this.$element = $(content) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) - } - - Modal.prototype = { - - constructor: Modal - - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } - - , show: function () { - var that = this - , e = $.Event('show') - - this.$element.trigger(e) - - if (this.isShown || e.isDefaultPrevented()) return - - $('body').addClass('modal-open') - - this.isShown = true - - escape.call(this) - backdrop.call(this, function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - if (!that.$element.parent().length) { - that.$element.appendTo(document.body) //don't move modals dom position - } - - that.$element - .show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element.addClass('in') - - transition ? - that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : - that.$element.trigger('shown') - - }) - } - - , hide: function (e) { - e && e.preventDefault() - - var that = this - - e = $.Event('hide') - - this.$element.trigger(e) - - if (!this.isShown || e.isDefaultPrevented()) return - - this.isShown = false - - $('body').removeClass('modal-open') - - escape.call(this) - - this.$element.removeClass('in') - - $.support.transition && this.$element.hasClass('fade') ? - hideWithTransition.call(this) : - hideModal.call(this) - } - - } - - - /* MODAL PRIVATE METHODS - * ===================== */ - - function hideWithTransition() { - var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - hideModal.call(that) - }, 500) - - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - hideModal.call(that) - }) - } - - function hideModal(that) { - this.$element - .hide() - .trigger('hidden') - - backdrop.call(this) - } - - function backdrop(callback) { - var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $('
') - .appendTo(document.body) - - if (this.options.backdrop != 'static') { - this.$backdrop.click($.proxy(this.hide, this)) - } - - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - - this.$backdrop.addClass('in') - - doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') - - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) : - removeBackdrop.call(this) - - } else if (callback) { - callback() - } - } - - function removeBackdrop() { - this.$backdrop.remove() - this.$backdrop = null - } - - function escape() { - var that = this - if (this.isShown && this.options.keyboard) { - $(document).on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - $(document).off('keyup.dismiss.modal') - } - } - - - /* MODAL PLUGIN DEFINITION - * ======================= */ - - $.fn.modal = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else if (options.show) data.show() - }) - } - - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - , show: true - } - - $.fn.modal.Constructor = Modal - - - /* MODAL DATA-API - * ============== */ - - $(function () { - $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data()) - - e.preventDefault() - $target.modal(option) - }) - }) - -}(window.jQuery);/* =========================================================== - * bootstrap-tooltip.js v2.0.3 - * http://twitter.github.com/bootstrap/javascript.html#tooltips - * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ - - var Tooltip = function (element, options) { - this.init('tooltip', element, options) - } - - Tooltip.prototype = { - - constructor: Tooltip - - , init: function (type, element, options) { - var eventIn - , eventOut - - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true - - if (this.options.trigger != 'manual') { - eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this)) - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function (options) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) return self.show() - - clearTimeout(this.timeout) - self.hoverState = 'in' - this.timeout = setTimeout(function() { - if (self.hoverState == 'in') self.show() - }, self.options.delay.show) - } - - , leave: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.hide) return self.hide() - - clearTimeout(this.timeout) - self.hoverState = 'out' - this.timeout = setTimeout(function() { - if (self.hoverState == 'out') self.hide() - }, self.options.delay.hide) - } - - , show: function () { - var $tip - , inside - , pos - , actualWidth - , actualHeight - , placement - , tp - - if (this.hasContent() && this.enabled) { - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - inside = /in/.test(placement) - - $tip - .remove() - .css({ top: 0, left: 0, display: 'block' }) - .appendTo(inside ? this.$element : document.body) - - pos = this.getPosition(inside) - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - switch (inside ? placement.split(' ')[1] : placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - $tip - .css(tp) - .addClass(placement) - .addClass('in') - } - } - - , isHTML: function(text) { - // html string detection logic adapted from jQuery - return typeof text != 'string' - || ( text.charAt(0) === "<" - && text.charAt( text.length - 1 ) === ">" - && text.length >= 3 - ) || /^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(text) - } - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - - $tip.find('.tooltip-inner')[this.isHTML(title) ? 'html' : 'text'](title) - $tip.removeClass('fade in top bottom left right') - } - - , hide: function () { - var that = this - , $tip = this.tip() - - $tip.removeClass('in') - - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).remove() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.remove() - }) - } - - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.remove() - } - - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') - } - } - - , hasContent: function () { - return this.getTitle() - } - - , getPosition: function (inside) { - return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) - } - - , getTitle: function () { - var title - , $e = this.$element - , o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - , enable: function () { - this.enabled = true - } - - , disable: function () { - this.enabled = false - } - - , toggleEnabled: function () { - this.enabled = !this.enabled - } - - , toggle: function () { - this[this.tip().hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - $.fn.tooltip.defaults = { - animation: true - , placement: 'top' - , selector: false - , template: '
' - , trigger: 'hover' - , title: '' - , delay: 0 - } - -}(window.jQuery);/* =========================================================== - * bootstrap-popover.js v2.0.3 - * http://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* POPOVER PUBLIC CLASS DEFINITION - * =============================== */ - - var Popover = function ( element, options ) { - this.init('popover', element, options) - } - - - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - - constructor: Popover - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() - - $tip.find('.popover-title')[this.isHTML(title) ? 'html' : 'text'](title) - $tip.find('.popover-content > *')[this.isHTML(content) ? 'html' : 'text'](content) - - $tip.removeClass('fade top bottom left right in') - } - - , hasContent: function () { - return this.getTitle() || this.getContent() - } - - , getContent: function () { - var content - , $e = this.$element - , o = this.options - - content = $e.attr('data-content') - || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - - return content - } - - , tip: function () { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } - - }) - - - /* POPOVER PLUGIN DEFINITION - * ======================= */ - - $.fn.popover = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.popover.Constructor = Popover - - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , content: '' - , template: '

' - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-scrollspy.js v2.0.3 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* SCROLLSPY CLASS DEFINITION - * ========================== */ - - function ScrollSpy( element, options) { - var process = $.proxy(this.process, this) - , $element = $(element).is('body') ? $(window) : $(element) - , href - this.options = $.extend({}, $.fn.scrollspy.defaults, options) - this.$scrollElement = $element.on('scroll.scroll.data-api', process) - this.selector = (this.options.target - || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - || '') + ' .nav li > a' - this.$body = $('body') - this.refresh() - this.process() - } - - ScrollSpy.prototype = { - - constructor: ScrollSpy - - , refresh: function () { - var self = this - , $targets - - this.offsets = $([]) - this.targets = $([]) - - $targets = this.$body - .find(this.selector) - .map(function () { - var $el = $(this) - , href = $el.data('target') || $el.attr('href') - , $href = /^#\w/.test(href) && $(href) - return ( $href - && href.length - && [[ $href.position().top, href ]] ) || null - }) - .sort(function (a, b) { return a[0] - b[0] }) - .each(function () { - self.offsets.push(this[0]) - self.targets.push(this[1]) - }) - } - - , process: function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight - , maxScroll = scrollHeight - this.$scrollElement.height() - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i - - if (scrollTop >= maxScroll) { - return activeTarget != (i = targets.last()[0]) - && this.activate ( i ) - } - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activate( targets[i] ) - } - } - - , activate: function (target) { - var active - , selector - - this.activeTarget = target - - $(this.selector) - .parent('.active') - .removeClass('active') - - selector = this.selector - + '[data-target="' + target + '"],' - + this.selector + '[href="' + target + '"]' - - active = $(selector) - .parent('li') - .addClass('active') - - if (active.parent('.dropdown-menu')) { - active = active.closest('li.dropdown').addClass('active') - } - - active.trigger('activate') - } - - } - - - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - $.fn.scrollspy = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('scrollspy') - , options = typeof option == 'object' && option - if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.scrollspy.Constructor = ScrollSpy - - $.fn.scrollspy.defaults = { - offset: 10 - } - - - /* SCROLLSPY DATA-API - * ================== */ - - $(function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - $spy.scrollspy($spy.data()) - }) - }) - -}(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.0.3 - * http://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TAB CLASS DEFINITION - * ==================== */ - - var Tab = function ( element ) { - this.element = $(element) - } - - Tab.prototype = { - - constructor: Tab - - , show: function () { - var $this = this.element - , $ul = $this.closest('ul:not(.dropdown-menu)') - , selector = $this.attr('data-target') - , previous - , $target - , e - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - if ( $this.parent('li').hasClass('active') ) return - - previous = $ul.find('.active a').last()[0] - - e = $.Event('show', { - relatedTarget: previous - }) - - $this.trigger(e) - - if (e.isDefaultPrevented()) return - - $target = $(selector) - - this.activate($this.parent('li'), $ul) - this.activate($target, $target.parent(), function () { - $this.trigger({ - type: 'shown' - , relatedTarget: previous - }) - }) - } - - , activate: function ( element, container, callback) { - var $active = container.find('> .active') - , transition = callback - && $.support.transition - && $active.hasClass('fade') - - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - - callback && callback() - } - - transition ? - $active.one($.support.transition.end, next) : - next() - - $active.removeClass('in') - } - } - - - /* TAB PLUGIN DEFINITION - * ===================== */ - - $.fn.tab = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tab') - if (!data) $this.data('tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tab.Constructor = Tab - - - /* TAB DATA-API - * ============ */ - - $(function () { - $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.0.3 - * http://twitter.github.com/bootstrap/javascript.html#typeahead - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function($){ - - "use strict"; // jshint ;_; - - - /* TYPEAHEAD PUBLIC CLASS DEFINITION - * ================================= */ - - var Typeahead = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.typeahead.defaults, options) - this.matcher = this.options.matcher || this.matcher - this.sorter = this.options.sorter || this.sorter - this.highlighter = this.options.highlighter || this.highlighter - this.updater = this.options.updater || this.updater - this.$menu = $(this.options.menu).appendTo('body') - this.source = this.options.source - this.shown = false - this.listen() - } - - Typeahead.prototype = { - - constructor: Typeahead - - , select: function () { - var val = this.$menu.find('.active').attr('data-value') - this.$element - .val(this.updater(val)) - .change() - return this.hide() - } - - , updater: function (item) { - return item - } - - , show: function () { - var pos = $.extend({}, this.$element.offset(), { - height: this.$element[0].offsetHeight - }) - - this.$menu.css({ - top: pos.top + pos.height - , left: pos.left - }) - - this.$menu.show() - this.shown = true - return this - } - - , hide: function () { - this.$menu.hide() - this.shown = false - return this - } - - , lookup: function (event) { - var that = this - , items - , q - - this.query = this.$element.val() - - if (!this.query) { - return this.shown ? this.hide() : this - } - - items = $.grep(this.source, function (item) { - return that.matcher(item) - }) - - items = this.sorter(items) - - if (!items.length) { - return this.shown ? this.hide() : this - } - - return this.render(items.slice(0, this.options.items)).show() - } - - , matcher: function (item) { - return ~item.toLowerCase().indexOf(this.query.toLowerCase()) - } - - , sorter: function (items) { - var beginswith = [] - , caseSensitive = [] - , caseInsensitive = [] - , item - - while (item = items.shift()) { - if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) - else if (~item.indexOf(this.query)) caseSensitive.push(item) - else caseInsensitive.push(item) - } - - return beginswith.concat(caseSensitive, caseInsensitive) - } - - , highlighter: function (item) { - var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') - return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { - return '' + match + '' - }) - } - - , render: function (items) { - var that = this - - items = $(items).map(function (i, item) { - i = $(that.options.item).attr('data-value', item) - i.find('a').html(that.highlighter(item)) - return i[0] - }) - - items.first().addClass('active') - this.$menu.html(items) - return this - } - - , next: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , next = active.next() - - if (!next.length) { - next = $(this.$menu.find('li')[0]) - } - - next.addClass('active') - } - - , prev: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , prev = active.prev() - - if (!prev.length) { - prev = this.$menu.find('li').last() - } - - prev.addClass('active') - } - - , listen: function () { - this.$element - .on('blur', $.proxy(this.blur, this)) - .on('keypress', $.proxy(this.keypress, this)) - .on('keyup', $.proxy(this.keyup, this)) - - if ($.browser.webkit || $.browser.msie) { - this.$element.on('keydown', $.proxy(this.keypress, this)) - } - - this.$menu - .on('click', $.proxy(this.click, this)) - .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) - } - - , keyup: function (e) { - switch(e.keyCode) { - case 40: // down arrow - case 38: // up arrow - break - - case 9: // tab - case 13: // enter - if (!this.shown) return - this.select() - break - - case 27: // escape - if (!this.shown) return - this.hide() - break - - default: - this.lookup() - } - - e.stopPropagation() - e.preventDefault() - } - - , keypress: function (e) { - if (!this.shown) return - - switch(e.keyCode) { - case 9: // tab - case 13: // enter - case 27: // escape - e.preventDefault() - break - - case 38: // up arrow - if (e.type != 'keydown') break - e.preventDefault() - this.prev() - break - - case 40: // down arrow - if (e.type != 'keydown') break - e.preventDefault() - this.next() - break - } - - e.stopPropagation() - } - - , blur: function (e) { - var that = this - setTimeout(function () { that.hide() }, 150) - } - - , click: function (e) { - e.stopPropagation() - e.preventDefault() - this.select() - } - - , mouseenter: function (e) { - this.$menu.find('.active').removeClass('active') - $(e.currentTarget).addClass('active') - } - - } - - - /* TYPEAHEAD PLUGIN DEFINITION - * =========================== */ - - $.fn.typeahead = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('typeahead') - , options = typeof option == 'object' && option - if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.typeahead.defaults = { - source: [] - , items: 8 - , menu: '
    ' - , item: '
    • ' - } - - $.fn.typeahead.Constructor = Typeahead - - - /* TYPEAHEAD DATA-API - * ================== */ - - $(function () { - $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - e.preventDefault() - $this.typeahead($this.data()) - }) - }) - -}(window.jQuery); \ No newline at end of file diff --git a/samples/java/demo/public/bootstrap/js/bootstrap.min.js b/samples/java/demo/public/bootstrap/js/bootstrap.min.js deleted file mode 100644 index 1f87730a3..000000000 --- a/samples/java/demo/public/bootstrap/js/bootstrap.min.js +++ /dev/null @@ -1,6 +0,0 @@ -/*! -* Bootstrap.js by @fat & @mdo -* Copyright 2012 Twitter, Inc. -* http://www.apache.org/licenses/LICENSE-2.0.txt -*/ -!function(a){a(function(){"use strict",a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",msTransition:"MSTransitionEnd",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=c,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(b){return b||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(a){return a||(this.paused=!0),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this,j=a.Event("slide");this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;if(a.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(j);if(j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})}else{this.$element.trigger(j);if(j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=a.extend({},a.fn.carousel.defaults,typeof c=="object"&&c);e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():f.interval&&e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b,c,d,e;if(this.transitioning)return;b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find("> .accordion-group > .in");if(d&&d.length){e=d.data("collapse");if(e&&e.transitioning)return;d.collapse("hide"),e||d.data("collapse",null)}this.$element[b](0),this.transition("addClass",a.Event("show"),"shown"),this.$element[b](this.$element[0][c])},hide:function(){var b;if(this.transitioning)return;b=this.dimension(),this.reset(this.$element[b]()),this.transition("removeClass",a.Event("hide"),"hidden"),this.$element[b](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a!==null?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c.type=="show"&&e.reset(),e.transitioning=0,e.$element.trigger(d)};this.$element.trigger(c);if(c.isDefaultPrevented())return;this.transitioning=1,this.$element[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e,f,g;if(c.is(".disabled, :disabled"))return;return f=c.attr("data-target"),f||(f=c.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,"")),e=a(f),e.length||(e=c.parent()),g=e.hasClass("open"),d(),g||e.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown",".dropdown form",function(a){a.stopPropagation()}).on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('
    ').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;a("body").addClass("modal-open"),this.isShown=!0,g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();var e=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=a.extend({},a.fn.modal.defaults,d.data(),typeof c=="object"&&c);e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():f.show&&e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.show)return c.show();clearTimeout(this.timeout),c.hoverState="in",this.timeout=setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show)},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.hide)return c.hide();clearTimeout(this.timeout),c.hoverState="out",this.timeout=setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide)},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},isHTML:function(a){return typeof a!="string"||a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3||/^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(a)},setContent:function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.isHTML(b)?"html":"text"](b),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
    ',trigger:"hover",title:"",delay:0}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.isHTML(b)?"html":"text"](b),a.find(".popover-content > *")[this.isHTML(c)?"html":"text"](c),a.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'

    '})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body"),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){var b=this,c;this.offsets=a([]),this.targets=a([]),c=this.$body.find(this.selector).map(function(){var b=a(this),c=b.data("target")||b.attr("href"),d=/^#\w/.test(c)&&a(c);return d&&c.length&&[[d.position().top,c]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,c=b-this.$scrollElement.height(),d=this.offsets,e=this.targets,f=this.activeTarget,g;if(a>=c)return f!=(g=e.last()[0])&&this.activate(g);for(g=d.length;g--;)f!=e[g]&&a>=d[g]&&(!d[g+1]||a<=d[g+1])&&this.activate(e[g])},activate:function(b){var c,d;this.activeTarget=b,a(this.selector).parent(".active").removeClass("active"),d=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',c=a(d).parent("li").addClass("active"),c.parent(".dropdown-menu")&&(c=c.closest("li.dropdown").addClass("active")),c.trigger("activate")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f,g;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],g=a.Event("show",{relatedTarget:e}),b.trigger(g);if(g.isDefaultPrevented())return;f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(a)).change(),this.hide()},updater:function(a){return a},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){return c.matcher(a)}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){var b=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return a.replace(new RegExp("("+b+")","ig"),function(a,b){return""+b+""})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},keypress:function(a){if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:if(a.type!="keydown")break;a.preventDefault(),this.prev();break;case 40:if(a.type!="keydown")break;a.preventDefault(),this.next()}a.stopPropagation()},blur:function(a){var b=this;setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'
      ',item:'
      • '},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery); \ No newline at end of file diff --git a/samples/java/demo/public/images/favicon.png b/samples/java/demo/public/images/favicon.png deleted file mode 100644 index c7d92d2ae47434d9a61c90bc205e099b673b9dd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 687 zcmV;g0#N;lP)ezT{T_ZJ?}AL z5NC{NW(ESID=>(O3&Eg8 zmA9J&6c`h4_f6L;=bU>_H8aNG`kfvCj9zomNt)?O;rzWqZs0LEt%1WB218%1fo9uB zsW^yhBR7C(mqN%GEK9&msg0~ zWY?#bf4q8G-~2KttQZ($odJvy&_-~f?9*ThK@fwR$U^1)p*8=_+^3BXx0$i1BC8XC zr21u6D5nVK&^!dOAw&|1E;qC3uFNj3*Jj#&%Oje@0D-nhfmM*o%^5f}-pxQ07(95H z3|LoV>V19w#rLgmRmtVy9!T3M3FUE3><0T8&b3yEsWcLW`0(=1+qsqc(k(ymBLK0h zK!6(6$7MX~M`-QA2$wk7n(7hhkJ}4Rwi-Vd(_ZFX1Yk7TXuB0IJYpo@kLb2G8m)E{ z`9v=!hi}fOytKckfN^C@6+Z*+MVI9-W_p@_3yyR#UYc0FTpD}i#k>c!wYCS)4v@E$ zchZCo=zV@)`v^$;V18ixdjFMY#q^2$wEX%{f(XD8POnsn$bpbClpC@hPxjzyO>pY|*pF3UU2tYcCN?rUk{Sskej70Mmu9vPwMYhO1m{AxAt(zqDT|0jP7FaX=6 V`?~}E4H^Id002ovPDHLkV1hC)G==~G diff --git a/samples/java/demo/public/javascripts/jquery-1.7.1.min.js b/samples/java/demo/public/javascripts/jquery-1.7.1.min.js deleted file mode 100644 index 198b3ff07..000000000 --- a/samples/java/demo/public/javascripts/jquery-1.7.1.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v1.7.1 jquery.com | jquery.org/license */ -(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;g=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
      a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="
      "+""+"
      ",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="
      t
      ",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="
      ",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; -f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

      ";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
      ";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
      ","
      "],thead:[1,"","
      "],tr:[2,"","
      "],td:[3,"","
      "],col:[2,"","
      "],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
      ","
      "]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() -{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
      ").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff --git a/samples/java/demo/public/stylesheets/main.css b/samples/java/demo/public/stylesheets/main.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/securesocial.sbt b/securesocial.sbt index ccd5e6884..1fe64ffc5 100644 --- a/securesocial.sbt +++ b/securesocial.sbt @@ -1,4 +1,4 @@ -name := "SecureSocial-parent" +name := "SecSoc-parent" version := Common.version @@ -8,8 +8,6 @@ lazy val core = project.in( file("module-code") ).enablePlugins(PlayScala) lazy val scalaDemo = project.in( file("samples/scala/demo") ).enablePlugins(PlayScala).dependsOn(core) -lazy val javaDemo = project.in( file("samples/java/demo") ).enablePlugins(PlayJava).dependsOn(core) - -lazy val root = project.in( file(".") ).aggregate(core, scalaDemo, javaDemo) .settings( +lazy val root = project.in( file(".") ).aggregate(core, scalaDemo) .settings( aggregate in update := false ) From 279e279b1c1bdd5a782a8bda34ebaadc59c468fa Mon Sep 17 00:00:00 2001 From: Leonid Vygovskiy Date: Wed, 21 Jan 2015 01:37:43 +0300 Subject: [PATCH 05/10] Removes Java support from module. Sorry, Java-guys. --- .../securesocial/core/java/Authorization.java | 24 -- .../core/java/BasePasswordHasher.java | 28 -- .../core/java/BasePasswordValidator.java | 46 --- .../core/java/BaseUserService.java | 267 ------------------ .../java/DefaultSecuredActionResponses.java | 72 ----- .../core/java/DummyAuthorization.java | 28 -- .../securesocial/core/java/SecureSocial.java | 86 ------ .../app/securesocial/core/java/Secured.java | 100 ------- .../securesocial/core/java/SecuredAction.java | 52 ---- .../core/java/SecuredActionResponses.java | 34 --- .../app/securesocial/core/java/Token.java | 50 ---- .../app/securesocial/core/java/UserAware.java | 77 ----- .../core/java/UserAwareAction.java | 35 --- 13 files changed, 899 deletions(-) delete mode 100644 module-code/app/securesocial/core/java/Authorization.java delete mode 100644 module-code/app/securesocial/core/java/BasePasswordHasher.java delete mode 100644 module-code/app/securesocial/core/java/BasePasswordValidator.java delete mode 100644 module-code/app/securesocial/core/java/BaseUserService.java delete mode 100644 module-code/app/securesocial/core/java/DefaultSecuredActionResponses.java delete mode 100644 module-code/app/securesocial/core/java/DummyAuthorization.java delete mode 100644 module-code/app/securesocial/core/java/SecureSocial.java delete mode 100644 module-code/app/securesocial/core/java/Secured.java delete mode 100644 module-code/app/securesocial/core/java/SecuredAction.java delete mode 100644 module-code/app/securesocial/core/java/SecuredActionResponses.java delete mode 100644 module-code/app/securesocial/core/java/Token.java delete mode 100644 module-code/app/securesocial/core/java/UserAware.java delete mode 100644 module-code/app/securesocial/core/java/UserAwareAction.java diff --git a/module-code/app/securesocial/core/java/Authorization.java b/module-code/app/securesocial/core/java/Authorization.java deleted file mode 100644 index 692cadffb..000000000 --- a/module-code/app/securesocial/core/java/Authorization.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright 2012-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package securesocial.core.java; - -/** - * The interface that defines the authorization implementation. - */ -public interface Authorization { - boolean isAuthorized(U user, String[] params); -} diff --git a/module-code/app/securesocial/core/java/BasePasswordHasher.java b/module-code/app/securesocial/core/java/BasePasswordHasher.java deleted file mode 100644 index aeac951c9..000000000 --- a/module-code/app/securesocial/core/java/BasePasswordHasher.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Copyright 2012-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package securesocial.core.java; - -import securesocial.core.providers.utils.PasswordHasher; - -/** - * Base class for all password hashers written in Java. - * - * This is deprecated, extend PasswordHasher directly. - */ -@Deprecated -public abstract class BasePasswordHasher extends PasswordHasher { -} diff --git a/module-code/app/securesocial/core/java/BasePasswordValidator.java b/module-code/app/securesocial/core/java/BasePasswordValidator.java deleted file mode 100644 index dc47f6dde..000000000 --- a/module-code/app/securesocial/core/java/BasePasswordValidator.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Copyright 2012-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package securesocial.core.java; - -import scala.Tuple2; -import scala.collection.JavaConverters; -import scala.collection.Seq; -import securesocial.core.providers.utils.PasswordValidator; - -import java.util.List; - -/** - * The base class for all Java password validators. - * Subclasses need to implement: - * - * public boolean isValid(String password) - * public Tuple2> errorMessage() - * - * Use the helper method toScalaTuple to create the result for errorMessage() - */ -public abstract class BasePasswordValidator implements PasswordValidator { - /** - * A helper method to create the tuple expected by PasswordValidator from a Java String and List objects. - * - * @param message - * @param params - * @return - */ - protected Tuple2> toScalaTuple(String message, List params) { - return new Tuple2>(message, JavaConverters.collectionAsScalaIterableConverter(params).asScala().toSeq()); - } -} diff --git a/module-code/app/securesocial/core/java/BaseUserService.java b/module-code/app/securesocial/core/java/BaseUserService.java deleted file mode 100644 index 512f92d6e..000000000 --- a/module-code/app/securesocial/core/java/BaseUserService.java +++ /dev/null @@ -1,267 +0,0 @@ -/** - * Copyright 2012-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package securesocial.core.java; - -import play.libs.F; -import play.libs.Scala; -import scala.*; -import scala.Option; -import scala.concurrent.Future; -import securesocial.core.GenericProfile; -import securesocial.core.PasswordInfo; -import securesocial.core.providers.MailToken; -import securesocial.core.services.SaveMode; -import securesocial.core.services.UserService; - -import java.lang.Boolean; - -/** - * A base user service for developers that want to write their UserService in Java. - * - * Note: You need to implement all the doXXX methods below. - * - */ -public abstract class BaseUserService implements UserService { - protected BaseUserService() { - } - - /** - * Finds an Identity that maches the specified id - * - * @return an optional user - */ - @Override - public Future> find(String providerId, String userId) { - return doFind(providerId, userId).map(new F.Function>() { - @Override - public Option apply(GenericProfile user) throws Throwable { - return Scala.Option(user); - } - }).wrapped(); - } - - /** - * Finds an Identity by email and provider id. - * - * Note: If you do not plan to use the UsernamePassword provider just provide en empty - * implementation. - * - * @param email - the user email - * @param providerId - the provider id - * @return - */ - @Override - public Future> findByEmailAndProvider(String email, String providerId) { - return doFindByEmailAndProvider(email, providerId).map(new F.Function>() { - public Option apply(GenericProfile user) throws Throwable { - return Scala.Option(user); - } - }).wrapped(); - } - - /** - * Saves the Identity. This method gets called when a user logs in. - * This is your chance to save the user information in your backing store. - * - * @param user - */ - @Override - public Future save(GenericProfile user, SaveMode mode) { - return doSave(user, mode).wrapped(); - } - - /** - * Links the current user Identity to another - * - * @param current The Identity of the current user - * @param to The Identity that needs to be linked to the current user - */ - @Override - public Future link(U current, GenericProfile to) { - return doLink(current, to).wrapped(); - } - - @Override - public Future> passwordInfoFor(U user) { - return doPasswordInfoFor(user).map(new F.Function>() { - @Override - public Option apply(PasswordInfo passwordInfo) throws Throwable { - return Scala.Option(passwordInfo); - } - }).wrapped(); - } - - @Override - public Future> updatePasswordInfo(U user, PasswordInfo info) { - return doUpdatePasswordInfo(user, info).map(new F.Function>() { - @Override - public Option apply(GenericProfile GenericProfile) throws Throwable { - return Scala.Option(GenericProfile); - } - }).wrapped(); - } - - /** - * Saves a token. This is needed for users that - * are creating an account in the system instead of using one in a 3rd party system. - * - * Note: If you do not plan to use the UsernamePassword provider just provide en empty - * implementation - * - * @param mailToken The token to save - * @return A string with a uuid that will be embedded in the welcome email. - */ - @Override - public Future saveToken(MailToken mailToken) { - return doSaveToken(Token.fromScala(mailToken)).map(new F.Function() { - @Override - public MailToken apply(Token token) throws Throwable { - return token.toScala(); - } - }).wrapped(); - } - - /** - * Finds a token - * - * Note: If you do not plan to use the UsernamePassword provider just provide en empty - * implementation - * - * @param token the token id - * @return - */ - @Override - public Future> findToken(String token) { - return doFindToken(token).map(new F.Function>() { - @Override - public Option apply(Token token) throws Throwable { - MailToken scalaToken = token != null ? token.toScala() : null; - return Scala.Option(scalaToken); - } - }).wrapped(); - } - - /** - * Deletes a token - * - * Note: If you do not plan to use the UsernamePassword provider just provide en empty - * implementation - * - * @param uuid the token id - */ - @Override - public Future> deleteToken(String uuid) { - return doDeleteToken(uuid).map(new F.Function>() { - @Override - public Option apply(Token token) throws Throwable { - MailToken scalaToken = token != null ? token.toScala() : null; - return Scala.Option(scalaToken); - } - }).wrapped(); - } - - /** - * Deletes all expired tokens - * - * Note: If you do not plan to use the UsernamePassword provider just provide en empty - * implementation - * - */ - @Override - public void deleteExpiredTokens() { - doDeleteExpiredTokens(); - } - - /** - * Saves the Identity. This method gets called when a user logs in. - * This is your chance to save the user information in your backing store. - * - * @param user - */ - public abstract F.Promise doSave(GenericProfile user, SaveMode mode); - - /** - * Saves a token - * - * Note: If you do not plan to use the UsernamePassword provider just provide en empty - * implementation - * - * @param token - */ - public abstract F.Promise doSaveToken(Token token); - - /** - * Links the current user Identity to another - * - * @param current The Identity of the current user - * @param to The Identity that needs to be linked to the current user - */ - public abstract F.Promise doLink(U current, GenericProfile to); - - /** - * Finds the user in the backing store. - * @return an Identity instance or null if no user matches the specified id - */ - public abstract F.Promise doFind(String providerId, String userId); - - public abstract F.Promise doPasswordInfoFor(U user); - - public abstract F.Promise doUpdatePasswordInfo(U user, PasswordInfo info); - - /** - * Finds a token - * - * Note: If you do not plan to use the UsernamePassword provider just provide en empty - * implementation - * - * @param tokenId the token id - * @return a Token instance or null if no token matches the specified id - */ - public abstract F.Promise doFindToken(String tokenId); - - - /** - * Finds an identity by email and provider id. - * - * Note: If you do not plan to use the UsernamePassword provider just provide en empty - * implementation. - * - * @param email - the user email - * @param providerId - the provider id - * @return an Identity instance or null if no user matches the specified id - */ - public abstract F.Promise doFindByEmailAndProvider(String email, String providerId); - - /** - * Deletes a token - * - * Note: If you do not plan to use the UsernamePassword provider just provide en empty - * implementation - * - * @param uuid the token id - */ - public abstract F.Promise doDeleteToken(String uuid); - - /** - * Deletes all expired tokens - * - * Note: If you do not plan to use the UsernamePassword provider just provide en empty - * implementation - * - */ - public abstract void doDeleteExpiredTokens(); -} diff --git a/module-code/app/securesocial/core/java/DefaultSecuredActionResponses.java b/module-code/app/securesocial/core/java/DefaultSecuredActionResponses.java deleted file mode 100644 index ae0d73c77..000000000 --- a/module-code/app/securesocial/core/java/DefaultSecuredActionResponses.java +++ /dev/null @@ -1,72 +0,0 @@ -/** - * Copyright 2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package securesocial.core.java; - -import com.fasterxml.jackson.databind.node.ObjectNode; -import play.libs.F; -import play.libs.Json; -import play.mvc.Controller; -import play.mvc.Http; -import play.mvc.Result; -import play.twirl.api.Html; - -/** - * The default responses sent when the invoker is not authenticated or authorized to execute a protected - * action. - * - * @see securesocial.core.java.SecuredActionResponses - */ -public class DefaultSecuredActionResponses extends Controller implements SecuredActionResponses { - public Html notAuthorizedPage(Http.Context ctx) { - return securesocial.views.html.notAuthorized.render(ctx._requestHeader(), ctx.lang(), SecureSocial.env()); - } - - public F.Promise notAuthenticatedResult(Http.Context ctx) { - Http.Request req = ctx.request(); - Result result; - - if ( req.accepts("text/html")) { - ctx.flash().put("error", play.i18n.Messages.get("securesocial.loginRequired")); - ctx.session().put(SecureSocial.ORIGINAL_URL, ctx.request().uri()); - result = redirect(SecureSocial.env().routes().loginPageUrl(ctx._requestHeader())); - } else if ( req.accepts("application/json")) { - ObjectNode node = Json.newObject(); - node.put("error", "Credentials required"); - result = unauthorized(node); - } else { - result = unauthorized("Credentials required"); - } - return F.Promise.pure(result); - } - - public F.Promise notAuthorizedResult(Http.Context ctx) { - Http.Request req = ctx.request(); - Result result; - - if ( req.accepts("text/html")) { - result = forbidden(notAuthorizedPage(ctx)); - } else if ( req.accepts("application/json")) { - ObjectNode node = Json.newObject(); - node.put("error", "Not authorized"); - result = forbidden(node); - } else { - result = forbidden("Not authorized"); - } - - return F.Promise.pure(result); - } -} diff --git a/module-code/app/securesocial/core/java/DummyAuthorization.java b/module-code/app/securesocial/core/java/DummyAuthorization.java deleted file mode 100644 index 232cb6a2e..000000000 --- a/module-code/app/securesocial/core/java/DummyAuthorization.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Copyright 2012-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package securesocial.core.java; - -/** - * A dummy authorization that just allows all executions. Used when no custom Authorization implementation - * is specified. - */ -class DummyAuthorization implements Authorization { - @Override - public boolean isAuthorized(U user, String[] params) { - return true; - } -} \ No newline at end of file diff --git a/module-code/app/securesocial/core/java/SecureSocial.java b/module-code/app/securesocial/core/java/SecureSocial.java deleted file mode 100644 index 7364a6621..000000000 --- a/module-code/app/securesocial/core/java/SecureSocial.java +++ /dev/null @@ -1,86 +0,0 @@ -/** -* Copyright 2012-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -*/ -package securesocial.core.java; - -import play.api.mvc.RequestHeader; -import play.libs.F; -import play.libs.HttpExecution; -import play.mvc.Http; -import scala.Option; -import scala.concurrent.ExecutionContext; -import securesocial.core.RuntimeEnvironment; -import securesocial.core.SecureSocial$; - -/** -* -*/ -public class SecureSocial { - /** - * The user key - */ - public static final String USER_KEY = "securesocial.user"; - - /** - * The original url key - */ - public static final String ORIGINAL_URL = "original-url"; - - /** - * Returns the current environment. - */ - public static RuntimeEnvironment env() { - return (RuntimeEnvironment) Http.Context.current().args.get("securesocial-env"); - } - - /** - * Returns the current user. Invoke this only if you are executing code - * without a SecuredAction or UserAware action available (eg: using WebSockets). For other cases this - * should not be needed. - * - * @param env the environment - * @return the current user object or null if there isn't one available - */ - public static F.Promise currentUser(RuntimeEnvironment env) { - return currentUser(env, HttpExecution.defaultContext()); - } - - /** - * Returns the current user. Invoke this only if you are executing code - * without a SecuredAction or UserAware action available (eg: using WebSockets). For other cases this - * should not be needed. - * - * @param env the environment - * @param executor an ExecutionContext - * @return the current user object or null if there isn't one available - */ - public static F.Promise currentUser(RuntimeEnvironment env, ExecutionContext executor) { - RequestHeader requestHeader = Http.Context.current()._requestHeader(); - if (requestHeader == null || env == null) { - return F.Promise.promise(null); - } else { - scala.concurrent.Future scalaFuture = SecureSocial$.MODULE$.currentUser(requestHeader, env, executor); - F.Function, Object> mapFunction = new F.Function, Object>() { - - @Override - public Object apply(Option objectOption) throws Throwable { - return objectOption.isDefined() ? objectOption.get() : null; - } - }; - return F.Promise.wrap(scalaFuture).map(mapFunction); - } - } -} diff --git a/module-code/app/securesocial/core/java/Secured.java b/module-code/app/securesocial/core/java/Secured.java deleted file mode 100644 index 29945c9b6..000000000 --- a/module-code/app/securesocial/core/java/Secured.java +++ /dev/null @@ -1,100 +0,0 @@ -/** - * Copyright 2012-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package securesocial.core.java; - -import play.libs.F; -import play.mvc.Action; -import play.mvc.Http; -import play.mvc.Result; -import scala.Option; -import securesocial.core.RuntimeEnvironment; -import securesocial.core.authenticator.Authenticator; - -/** - * Protects an action with SecureSocial - * - * Sample usage: - * - * @SecuredAction - * public static Result index() { - * User user = (User) ctx().args.get(SecureSocial.USER_KEY); - * return ok("Hello " + user.displayName); - * } - */ -public class Secured extends Action { - - private RuntimeEnvironment env; - private Authorization authorizationInstance; - private SecuredActionResponses responses; - - public Secured(RuntimeEnvironment env) throws Throwable { - this.env = env; - } - - static void initEnv(RuntimeEnvironment env) throws IllegalAccessException, InstantiationException { - if ( SecureSocial.env() == null ) { - Http.Context.current().args.put("securesocial-env", env); - } - } - - - @Override - public F.Promise call(final Http.Context ctx) throws Throwable { - initEnv(env); - authorizationInstance = configuration.authorization().newInstance(); - responses = configuration.responses().newInstance(); - return F.Promise.wrap(env.authenticatorService().fromRequest(ctx._requestHeader())).flatMap( - new F.Function, F.Promise>() { - @Override - public F.Promise apply(Option authenticatorOption) throws Throwable { - if (authenticatorOption.isDefined() && authenticatorOption.get().isValid()) { - final Authenticator authenticator = authenticatorOption.get(); - Object user = authenticator.user(); - if (authorizationInstance.isAuthorized(user, configuration.params())) { - return F.Promise.wrap(authenticator.touch()).flatMap(new F.Function>() { - @Override - public F.Promise apply(Authenticator touched) throws Throwable { - ctx.args.put(SecureSocial.USER_KEY, touched.user()); - return F.Promise.wrap(touched.touching(ctx)).flatMap(new F.Function>() { - @Override - public F.Promise apply(scala.runtime.BoxedUnit unit) throws Throwable { - return delegate.call(ctx); - } - }); - } - }); - } else { - return responses.notAuthorizedResult(ctx); - } - } else { - if (authenticatorOption.isDefined()) { - return F.Promise.wrap(authenticatorOption.get().discarding(ctx)).flatMap( - new F.Function>() { - @Override - public F.Promise apply(Authenticator authenticator) throws Throwable { - return responses.notAuthenticatedResult(ctx); - } - } - ); - } - return responses.notAuthenticatedResult(ctx); - } - } - } - ); - } -} \ No newline at end of file diff --git a/module-code/app/securesocial/core/java/SecuredAction.java b/module-code/app/securesocial/core/java/SecuredAction.java deleted file mode 100644 index c1986d16a..000000000 --- a/module-code/app/securesocial/core/java/SecuredAction.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * Copyright 2012-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package securesocial.core.java; - -import play.mvc.With; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * An annotation to mark actions as protected by SecureSocial - * - * @see securesocial.core.java.Secured - */ -@With(Secured.class) -@Target({ElementType.TYPE, ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -public @interface SecuredAction { - /** - * The Authorization implementation that checks if the user is allowed to execute this action. - * By default, all requests are accepted. - */ - Class authorization() default DummyAuthorization.class; - - /** - * The responses sent when the invoker is not authorized or authenticated - * - * @see securesocial.core.java.DefaultSecuredActionResponses - */ - Class responses() default DefaultSecuredActionResponses.class; - - /** - * The parameters that are passed to the Authorization.isAuthorized implementation - */ - String[] params() default {}; -} \ No newline at end of file diff --git a/module-code/app/securesocial/core/java/SecuredActionResponses.java b/module-code/app/securesocial/core/java/SecuredActionResponses.java deleted file mode 100644 index cd01d5b30..000000000 --- a/module-code/app/securesocial/core/java/SecuredActionResponses.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Copyright 2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package securesocial.core.java; - -import play.twirl.api.Html; -import play.libs.F; -import play.mvc.Http; -import play.mvc.Result; - -/** - * An interface that defines the responses that will be sent wheen the invoker is not authenticated or - * authorized to execute a protected action. - * - * @see securesocial.core.java.DefaultSecuredActionResponses - */ -public interface SecuredActionResponses { - Html notAuthorizedPage(Http.Context ctx); - F.Promise notAuthenticatedResult(Http.Context ctx); - F.Promise notAuthorizedResult(Http.Context ctx); -} diff --git a/module-code/app/securesocial/core/java/Token.java b/module-code/app/securesocial/core/java/Token.java deleted file mode 100644 index 2a175ba41..000000000 --- a/module-code/app/securesocial/core/java/Token.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Copyright 2012-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package securesocial.core.java; - -import org.joda.time.DateTime; - -/** - * A token used for reset password and sign up operations - */ -public class Token { - public String uuid; - public String email; - public DateTime creationTime; - public DateTime expirationTime; - public boolean isSignUp; - - public boolean isExpired() { - return expirationTime.isBeforeNow(); - } - - public securesocial.core.providers.MailToken toScala() { - return securesocial.core.providers.MailToken$.MODULE$.apply( - uuid, email, creationTime, expirationTime, isSignUp - ); - } - - public static Token fromScala(securesocial.core.providers.MailToken scalaToken) { - Token javaToken = new Token(); - javaToken.uuid = scalaToken.uuid(); - javaToken.email = scalaToken.email(); - javaToken.creationTime = scalaToken.creationTime(); - javaToken.expirationTime = scalaToken.expirationTime(); - javaToken.isSignUp = scalaToken.isSignUp(); - return javaToken; - } -} diff --git a/module-code/app/securesocial/core/java/UserAware.java b/module-code/app/securesocial/core/java/UserAware.java deleted file mode 100644 index 6c12eefb4..000000000 --- a/module-code/app/securesocial/core/java/UserAware.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Copyright 2012-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package securesocial.core.java; - -import play.libs.F; -import play.mvc.Action; -import play.mvc.Http; -import play.mvc.Result; -import scala.Option; -import securesocial.core.RuntimeEnvironment; -import securesocial.core.authenticator.Authenticator; - -import static play.libs.F.Promise; - -/** - * An action that puts the current user in the context if there's one available. This is useful in - * public actions that need to access the user information if there's one logged in. - * - * Sample usage: - * - * @UserAwareAction - * public static Result index() { - * User user = (User) ctx().args.get(SecureSocial.USER_KEY); - * String name = user == null ? "guest" : user.displayName; - * return ok("Hello " + name); - * } - * @see securesocial.core.java.UserAwareAction - */ -public class UserAware extends Action { - RuntimeEnvironment env; - - public UserAware(RuntimeEnvironment env) throws Throwable { - this.env = env; - } - - @Override - public F.Promise call(final Http.Context ctx) throws Throwable { - Secured.initEnv(env); - return (F.Promise) F.Promise.wrap(env.authenticatorService().fromRequest(ctx._requestHeader())).flatMap( - new F.Function, Promise>() { - @Override - public F.Promise apply(Option authenticatorOption) throws Throwable { - if (authenticatorOption.isDefined() && authenticatorOption.get().isValid()) { - Authenticator authenticator = authenticatorOption.get(); - return F.Promise.wrap(authenticator.touch()).flatMap(new F.Function>() { - @Override - public Promise apply(Authenticator touched) throws Throwable { - ctx.args.put(SecureSocial.USER_KEY, touched.user()); - return F.Promise.wrap(touched.touching(ctx)).flatMap(new F.Function>() { - @Override - public Promise apply(scala.runtime.BoxedUnit unit) throws Throwable { - return delegate.call(ctx); - } - }); - } - }); - } else { - return delegate.call(ctx); - } - } - }); - } -} \ No newline at end of file diff --git a/module-code/app/securesocial/core/java/UserAwareAction.java b/module-code/app/securesocial/core/java/UserAwareAction.java deleted file mode 100644 index 9bde1b18f..000000000 --- a/module-code/app/securesocial/core/java/UserAwareAction.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright 2012-2014 Jorge Aliss (jaliss at gmail dot com) - twitter: @jaliss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package securesocial.core.java; - - -import play.mvc.With; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** -* Actions annotated with UserAwareAction get the current user set in the Context.args holder -* if there's one available. -*/ -@With(UserAware.class) -@Target({ElementType.TYPE, ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -public @interface UserAwareAction { -} From 7faa1a7778fda15a2eca86f198223a14cadcc65e Mon Sep 17 00:00:00 2001 From: Leonid Vygovskiy Date: Fri, 30 Jan 2015 01:44:13 +0300 Subject: [PATCH 06/10] Remove async support in mostly used places. AuthenticationException is required message string now. --- .../securesocial/controllers/LoginApi.scala | 47 +++--- .../securesocial/controllers/LoginPage.scala | 12 +- .../MailTokenBasedOperations.scala | 28 ++-- .../controllers/PasswordChange.scala | 55 ++++--- .../controllers/PasswordReset.scala | 98 +++++++----- .../controllers/ProviderController.scala | 107 +++++++------ .../controllers/Registration.scala | 149 ++++++++---------- .../core/AuthenticationException.scala | 2 +- .../app/securesocial/core/Events.scala | 2 +- .../securesocial/core/IdentityProvider.scala | 4 +- .../securesocial/core/OAuth1Provider.scala | 94 ++++++----- .../securesocial/core/OAuth2Provider.scala | 123 ++++++++------- .../core/RuntimeEnvironment.scala | 4 +- .../app/securesocial/core/SecureSocial.scala | 51 +++--- .../core/authenticator/Authenticator.scala | 25 +-- .../authenticator/AuthenticatorStore.scala | 15 +- .../authenticator/CookieAuthenticator.scala | 59 +++---- .../HttpHeaderAuthenticator.scala | 31 ++-- .../core/authenticator/IdGenerator.scala | 13 +- .../StoreBackedAuthenticator.scala | 28 ++-- .../core/providers/DropboxProvider.scala | 10 +- .../core/providers/FacebookProvider.scala | 19 +-- .../core/providers/FoursquareProvider.scala | 10 +- .../core/providers/GitHubProvider.scala | 15 +- .../core/providers/GoogleProvider.scala | 10 +- .../core/providers/InstagramProvider.scala | 10 +- .../providers/LinkedInOAuth2Provider.scala | 12 +- .../core/providers/LinkedInProvider.scala | 12 +- .../core/providers/TwitterProvider.scala | 5 +- .../providers/UsernamePasswordProvider.scala | 68 ++++---- .../core/providers/VkProvider.scala | 12 +- .../core/providers/WeiboProvider.scala | 15 +- .../core/providers/XingProvider.scala | 5 +- .../core/services/AuthenticatorService.scala | 13 +- .../core/services/AvatarService.scala | 35 ++-- .../core/services/CacheService.scala | 20 +-- .../core/services/HttpService.scala | 6 +- .../core/services/UserService.scala | 20 +-- module-code/app/securesocial/core/utils.scala | 14 +- module-code/build.sbt | 4 +- .../demo/app/controllers/Application.scala | 16 +- .../app/service/InMemoryUserService.scala | 125 +++++++++------ .../demo/app/service/MyEventListener.scala | 2 +- .../demo/app/views/linkResult.scala.html | 2 +- samples/scala/demo/scalaDemo.sbt | 2 +- 45 files changed, 750 insertions(+), 659 deletions(-) diff --git a/module-code/app/securesocial/controllers/LoginApi.scala b/module-code/app/securesocial/controllers/LoginApi.scala index ff6c773f9..6e7333afa 100644 --- a/module-code/app/securesocial/controllers/LoginApi.scala +++ b/module-code/app/securesocial/controllers/LoginApi.scala @@ -18,7 +18,7 @@ package securesocial.controllers import org.joda.time.DateTime import securesocial.core._ -import play.api.mvc.Action +import play.api.mvc.{RequestHeader, Action, Result} import scala.concurrent.{ ExecutionContext, Future } import securesocial.core.SignUpEvent import securesocial.core.AuthenticationResult.Authenticated @@ -36,7 +36,7 @@ class LoginApi(override implicit val env: RuntimeEnvironment[BasicProfile]) exte * * @tparam U The application user type */ -trait BaseLoginApi[U] extends SecureSocial[U] { +trait BaseLoginApi[U <: GenericProfile] extends SecureSocial[U] { import play.api.libs.json._ @@ -51,29 +51,15 @@ trait BaseLoginApi[U] extends SecureSocial[U] { def authenticate(providerId: String, builderId: String) = Action.async { implicit request => import ExecutionContext.Implicits.global val result = for ( - builder <- env.authenticatorService.find(builderId); provider <- env.providers.get(providerId) if provider.isInstanceOf[ApiSupport] ) yield { provider.asInstanceOf[ApiSupport].authenticateForApi.flatMap { case authenticated: Authenticated => - val profile = authenticated.profile - env.userService.find(profile.providerId, profile.userId).flatMap { - maybeExisting => - val mode = if (maybeExisting.isDefined) SaveMode.LoggedIn else SaveMode.SignUp - env.userService.save(authenticated.profile, mode).flatMap { - userForAction => - logger.debug(s"[securesocial] user completed authentication: provider = ${profile.providerId}, userId: ${profile.userId}, mode = $mode") - val evt = if (mode == SaveMode.LoggedIn) new LoginEvent(userForAction) else new SignUpEvent(userForAction) - // we're not using a session here .... review this. - Events.fire(evt) - builder.fromUser(userForAction).map { authenticator => - val token = TokenResponse(authenticator.id, authenticator.expirationDate) - Ok(Json.toJson(token)) - } - } - } + Future.successful(processSuccessAuthentication(authenticated, builderId)); + case failed: AuthenticationResult.Failed => Future.successful(BadRequest(Json.toJson(Map("error" -> failed.error))).as("application/json")) + case other => // todo: review this status logger.error(s"[securesocial] unexpected result from authenticateForApi: $other") @@ -83,12 +69,27 @@ trait BaseLoginApi[U] extends SecureSocial[U] { result.getOrElse(Future.successful(NotFound.as("application/json"))) } - def logout = Action.async { implicit request => + private def processSuccessAuthentication(authenticated: Authenticated, builderId : String)(implicit requestHeader : RequestHeader) : Result = { + val builder = env.authenticatorService.find(builderId).get + val profile = authenticated.profile + val maybeExisting = env.userService.find(profile.providerId, profile.userId) + + val mode = if (maybeExisting.isDefined) SaveMode.LoggedIn else SaveMode.SignUp + val userForAction = env.userService.save(authenticated.profile, mode) + logger.debug(s"[securesocial] user completed authentication: provider = ${profile.providerId}, userId: ${profile.userId}, mode = $mode") + val evt = if (mode == SaveMode.LoggedIn) new LoginEvent(userForAction) else new SignUpEvent(userForAction) + // we're not using a session here .... review this. + Events.fire(evt) + val authenticator = builder.fromUser(userForAction) + val token = TokenResponse(authenticator.id, authenticator.expirationDate) + Ok(Json.toJson(token)) + } + + def logout = Action { implicit request => import securesocial.core.utils._ - import ExecutionContext.Implicits.global - env.authenticatorService.fromRequest(request).flatMap { + env.authenticatorService.fromRequest(request) match { case Some(authenticator) => Ok("").discardingAuthenticator(authenticator) - case None => Future.successful(Ok("")) + case None => Ok("") } } } diff --git a/module-code/app/securesocial/controllers/LoginPage.scala b/module-code/app/securesocial/controllers/LoginPage.scala index 8e7be00ca..ccd038e5c 100644 --- a/module-code/app/securesocial/controllers/LoginPage.scala +++ b/module-code/app/securesocial/controllers/LoginPage.scala @@ -33,7 +33,7 @@ class LoginPage(override implicit val env: RuntimeEnvironment[BasicProfile]) ext /** * The trait that defines the login page controller */ -trait BaseLoginPage[U] extends SecureSocial[U] { +trait BaseLoginPage[U <: GenericProfile] extends SecureSocial[U] { private val logger = play.api.Logger("securesocial.controllers.LoginPage") /** @@ -66,20 +66,18 @@ trait BaseLoginPage[U] extends SecureSocial[U] { * * @return */ - def logout = UserAwareAction.async { + def logout = UserAwareAction{ implicit request => val redirectTo = Redirect(Play.configuration.getString(onLogoutGoTo).getOrElse(env.routes.loginPageUrl)) val result = for { user <- request.user authenticator <- request.authenticator } yield { - import ExecutionContext.Implicits.global - redirectTo.discardingAuthenticator(authenticator).map { - _.withSession(Events.fire(new LogoutEvent(user)).getOrElse(request.session)) - } + val result = redirectTo.discardingAuthenticator(authenticator) + result.withSession(Events.fire(new LogoutEvent(user)).getOrElse(request.session)) } result.getOrElse { - Future.successful(redirectTo) + redirectTo } } } diff --git a/module-code/app/securesocial/controllers/MailTokenBasedOperations.scala b/module-code/app/securesocial/controllers/MailTokenBasedOperations.scala index 6c4fa7f86..cadb689a9 100644 --- a/module-code/app/securesocial/controllers/MailTokenBasedOperations.scala +++ b/module-code/app/securesocial/controllers/MailTokenBasedOperations.scala @@ -24,8 +24,8 @@ import play.api.data.Form import play.api.data.Forms._ import play.api.data.validation.Constraints._ import play.api.i18n.Messages -import play.api.mvc.{ RequestHeader, SimpleResult } -import securesocial.core.SecureSocial +import play.api.mvc.{ RequestHeader, Result } +import securesocial.core.{GenericProfile, SecureSocial} import securesocial.core.providers.MailToken import scala.concurrent.Future @@ -34,7 +34,7 @@ import scala.concurrent.Future * The base controller for password reset and password change operations * */ -abstract class MailTokenBasedOperations[U] extends SecureSocial[U] { +abstract class MailTokenBasedOperations[U <: GenericProfile] extends SecureSocial[U] { val Success = "success" val Error = "error" val Email = "email" @@ -53,12 +53,16 @@ abstract class MailTokenBasedOperations[U] extends SecureSocial[U] { * @param isSignUp a boolean indicating if the token is used for a signup or password reset operation * @return a MailToken instance */ - def createToken(email: String, isSignUp: Boolean): Future[MailToken] = { + def createToken(email: String, isSignUp: Boolean): MailToken = { val now = DateTime.now - Future.successful(MailToken( - UUID.randomUUID().toString, email.toLowerCase, now, now.plusMinutes(TokenDuration), isSignUp = isSignUp - )) + MailToken( + UUID.randomUUID().toString, + email.toLowerCase, + now, + now.plusMinutes(TokenDuration), + isSignUp = isSignUp + ) } /** @@ -72,14 +76,14 @@ abstract class MailTokenBasedOperations[U] extends SecureSocial[U] { * @return the action result */ protected def executeForToken(token: String, isSignUp: Boolean, - f: MailToken => Future[SimpleResult])(implicit request: RequestHeader): Future[SimpleResult] = + f: MailToken => Result)(implicit request: RequestHeader): Result = { import scala.concurrent.ExecutionContext.Implicits.global - env.userService.findToken(token).flatMap { + env.userService.findToken(token) match { case Some(t) if !t.isExpired && t.isSignUp == isSignUp => f(t) case _ => val to = if (isSignUp) env.routes.signUpUrl else env.routes.resetPasswordUrl - Future.successful(Redirect(to).flashing(Error -> Messages(BaseRegistration.InvalidLink))) + Redirect(to).flashing(Error -> Messages(BaseRegistration.InvalidLink)) } } @@ -89,7 +93,7 @@ abstract class MailTokenBasedOperations[U] extends SecureSocial[U] { * @param request the current request * @return the action result */ - protected def handleStartResult()(implicit request: RequestHeader): SimpleResult = Redirect(env.routes.loginPageUrl) + protected def handleStartResult()(implicit request: RequestHeader): Result = Redirect(env.routes.loginPageUrl) /** * The result sent after the operation has been completed by the user @@ -97,5 +101,5 @@ abstract class MailTokenBasedOperations[U] extends SecureSocial[U] { * @param request the current request * @return the action result */ - protected def confirmationResult()(implicit request: RequestHeader): SimpleResult = Redirect(env.routes.loginPageUrl) + protected def confirmationResult()(implicit request: RequestHeader): Result = Redirect(env.routes.loginPageUrl) } diff --git a/module-code/app/securesocial/controllers/PasswordChange.scala b/module-code/app/securesocial/controllers/PasswordChange.scala index 3b6fba6d1..654b2e4d9 100644 --- a/module-code/app/securesocial/controllers/PasswordChange.scala +++ b/module-code/app/securesocial/controllers/PasswordChange.scala @@ -17,7 +17,7 @@ package securesocial.controllers import securesocial.core._ -import play.api.mvc.SimpleResult +import play.api.mvc.Result import play.api.Play import play.api.data.Form import play.api.data.Forms._ @@ -38,7 +38,7 @@ class PasswordChange(override implicit val env: RuntimeEnvironment[GenericProfil * * @tparam U the user object type */ -trait BasePasswordChange[U] extends SecureSocial[U] { +trait BasePasswordChange[U <: GenericProfile] extends SecureSocial[U] { val CurrentPassword = "currentPassword" val InvalidPasswordMessage = "securesocial.passwordChange.invalidPassword" val NewPassword = "newPassword" @@ -65,9 +65,8 @@ trait BasePasswordChange[U] extends SecureSocial[U] { * @tparam A the type of the user object * @return a future boolean */ - def checkCurrentPassword[A](suppliedPassword: String)(implicit request: SecuredRequest[A]): Future[Boolean] = { - import ExecutionContext.Implicits.global - env.userService.passwordInfoFor(request.user).map { + def checkCurrentPassword[A](suppliedPassword: String)(implicit request: SecuredRequest[A]): Boolean = { + env.userService.passwordInfoFor(request.user) match { case Some(info) => env.passwordHashers.get(info.hasher).exists { _.matches(info, suppliedPassword) @@ -76,14 +75,13 @@ trait BasePasswordChange[U] extends SecureSocial[U] { } } - private def execute[A](f: Form[ChangeInfo] => Future[SimpleResult])(implicit request: SecuredRequest[A]): Future[SimpleResult] = { + private def execute[A](f: Form[ChangeInfo] => Result) (implicit request: SecuredRequest[A]): Result = { import ExecutionContext.Implicits.global val form = Form[ChangeInfo]( mapping( CurrentPassword -> nonEmptyText.verifying(Messages(InvalidPasswordMessage), { suppliedPassword => - import scala.concurrent.duration._ - Await.result(checkCurrentPassword(suppliedPassword), 10.seconds) + checkCurrentPassword(suppliedPassword) }), NewPassword -> tuple( @@ -94,11 +92,11 @@ trait BasePasswordChange[U] extends SecureSocial[U] { )((currentPassword, newPassword) => ChangeInfo(currentPassword, newPassword._1))((changeInfo: ChangeInfo) => Some("", ("", ""))) ) - env.userService.passwordInfoFor(request.user).flatMap { + env.userService.passwordInfoFor(request.user) match { case Some(info) => f(form) case None => - Future.successful(Forbidden) + Forbidden } } @@ -107,11 +105,9 @@ trait BasePasswordChange[U] extends SecureSocial[U] { * * @return */ - def page = SecuredAction.async { implicit request => + def page = SecuredAction { implicit request => execute { form: Form[ChangeInfo] => - Future.successful { Ok(env.viewTemplates.getPasswordChangePage(form)) - } } } @@ -120,26 +116,33 @@ trait BasePasswordChange[U] extends SecureSocial[U] { * * @return */ - def handlePasswordChange = SecuredAction.async { implicit request => + def handlePasswordChange = SecuredAction{ implicit request => execute { form: Form[ChangeInfo] => form.bindFromRequest()(request).fold( - errors => Future.successful(BadRequest(env.viewTemplates.getPasswordChangePage(errors))), + errors => + BadRequest(env.viewTemplates.getPasswordChangePage(errors)), info => { - val newPasswordInfo = env.currentHasher.hash(info.newPassword) - import ExecutionContext.Implicits.global - implicit val userLang = request2lang(request) - env.userService.updatePasswordInfo(request.user, newPasswordInfo).map { - case Some(u) => - env.mailer.sendPasswordChangedNotice(u)(request, userLang) - val result = Redirect(onHandlePasswordChangeGoTo).flashing(Success -> Messages(OkMessage)(userLang)) - Events.fire(new PasswordChangeEvent(request.user)).map(result.withSession).getOrElse(result) - case None => - Redirect(onHandlePasswordChangeGoTo).flashing(Error -> Messages("securesocial.password.error")(userLang)) - } + changePassword(info) } ) } } + + private def changePassword(info: ChangeInfo)(implicit request : SecuredRequest[_]) : Result = { + val newPasswordInfo = env.currentHasher.hash(info.newPassword) + + implicit val userLang = request2lang(request) + + env.userService.updatePasswordInfo(request.user, newPasswordInfo) match { + case Some(u) => + env.mailer.sendPasswordChangedNotice(u)(request, userLang) + val result = Redirect(onHandlePasswordChangeGoTo).flashing(Success -> Messages(OkMessage)(userLang)) + Events.fire(new PasswordChangeEvent(request.user)).map(result.withSession).getOrElse(result) + case None => + Redirect(onHandlePasswordChangeGoTo).flashing(Error -> Messages("securesocial.password.error")(userLang)) + } + + } } /** diff --git a/module-code/app/securesocial/controllers/PasswordReset.scala b/module-code/app/securesocial/controllers/PasswordReset.scala index 327f31a85..d33235cbd 100644 --- a/module-code/app/securesocial/controllers/PasswordReset.scala +++ b/module-code/app/securesocial/controllers/PasswordReset.scala @@ -16,12 +16,13 @@ */ package securesocial.controllers +import oauth.signpost.http.HttpRequest import play.api.data.Form import play.api.data.Forms._ import play.api.i18n.Messages -import play.api.mvc.Action +import play.api.mvc.{RequestHeader, Action, Result} import securesocial.core._ -import securesocial.core.providers.UsernamePasswordProvider +import securesocial.core.providers.{MailToken, UsernamePasswordProvider} import securesocial.core.providers.utils.PasswordValidator import securesocial.core.services.SaveMode @@ -39,7 +40,7 @@ class PasswordReset(override implicit val env: RuntimeEnvironment[BasicProfile]) * * @tparam U the user type */ -trait BasePasswordReset[U] extends MailTokenBasedOperations[U] { +trait BasePasswordReset[U <: GenericProfile] extends MailTokenBasedOperations[U] { private val logger = play.api.Logger("securesocial.controllers.BasePasswordReset") val PasswordUpdated = "securesocial.password.passwordUpdated" @@ -64,37 +65,42 @@ trait BasePasswordReset[U] extends MailTokenBasedOperations[U] { /** * Handles form submission for the start page */ - def handleStartResetPassword = Action.async { + def handleStartResetPassword = Action { implicit request => import scala.concurrent.ExecutionContext.Implicits.global startForm.bindFromRequest.fold( - errors => Future.successful(BadRequest(env.viewTemplates.getStartResetPasswordPage(errors))), - email => env.userService.findByEmailAndProvider(email, UsernamePasswordProvider.UsernamePassword).map { - maybeUser => - maybeUser match { - case Some(user) => - createToken(email, isSignUp = false).map { token => - env.mailer.sendPasswordResetEmail(user, token.uuid) - env.userService.saveToken(token) - } - case None => - env.mailer.sendUnkownEmailNotice(email) - } - handleStartResult().flashing(Success -> Messages(BaseRegistration.ThankYouCheckEmail)) - } + errors => + BadRequest(env.viewTemplates.getStartResetPasswordPage(errors)), + + email => + preparePasswordReset(email) ) } + private def preparePasswordReset(email : String)(implicit requestHeader : RequestHeader) : Result = { + val maybeUser : Option[GenericProfile] = env.userService.findByEmailAndProvider(email, UsernamePasswordProvider.UsernamePassword) + maybeUser match { + case Some(user) => + val token = createToken(email, isSignUp = false) + env.mailer.sendPasswordResetEmail(user, token.uuid) + env.userService.saveToken(token) + + case None => + env.mailer.sendUnkownEmailNotice(email) + } + handleStartResult().flashing(Success -> Messages(BaseRegistration.ThankYouCheckEmail)) + } + /** * Renders the reset password page * * @param token the token that identifies the user request */ - def resetPassword(token: String) = Action.async { + def resetPassword(token: String) = Action { implicit request => executeForToken(token, false, { t => - Future.successful(Ok(env.viewTemplates.getResetPasswordPage(changePasswordForm, token))) + Ok(env.viewTemplates.getResetPasswordPage(changePasswordForm, token)) }) } @@ -103,29 +109,43 @@ trait BasePasswordReset[U] extends MailTokenBasedOperations[U] { * * @param token the token that identifies the user request */ - def handleResetPassword(token: String) = Action.async { implicit request => + def handleResetPassword(token: String) = Action { implicit request => import scala.concurrent.ExecutionContext.Implicits.global executeForToken(token, false, { t => - changePasswordForm.bindFromRequest.fold(errors => - Future.successful(BadRequest(env.viewTemplates.getResetPasswordPage(errors, token))), - p => - env.userService.findByEmailAndProvider(t.email, UsernamePasswordProvider.UsernamePassword).flatMap { - case Some(profile) => - val hashed = env.currentHasher.hash(p._1) - for ( - updated <- env.userService.save(profile.withPasswordInfo(Some(hashed)), SaveMode.PasswordChange); - deleted <- env.userService.deleteToken(token) - ) yield { - env.mailer.sendPasswordChangedNotice(profile) - val eventSession = Events.fire(new PasswordResetEvent(updated)).getOrElse(request.session) - confirmationResult().withSession(eventSession).flashing(Success -> Messages(PasswordUpdated)) - } - case _ => - logger.error("[securesocial] could not find user with email %s during password reset".format(t.email)) - Future.successful(confirmationResult().flashing(Error -> Messages(ErrorUpdatingPassword))) - } + changePasswordForm.bindFromRequest.fold( + errors => + BadRequest(env.viewTemplates.getResetPasswordPage(errors, token)), + + data => + resetPassword(t, data._1) ) }) } + + /** + * Change password for given token and delete token. + * @param token + * @param newPassword + * @param requestHeader + * @return + */ + private def resetPassword(token : MailToken, newPassword : String)(implicit requestHeader : RequestHeader) : Result = { + env.userService.findByEmailAndProvider(token.email, UsernamePasswordProvider.UsernamePassword) match { + case Some(profile) => + val hashed = env.currentHasher.hash(newPassword); + val changePasswordProfile = profile.withPasswordInfo(Some(hashed)); + + val updated = env.userService.save(changePasswordProfile, SaveMode.PasswordChange); + env.userService.deleteToken(token.uuid) + + env.mailer.sendPasswordChangedNotice(profile) + val eventSession = Events.fire(new PasswordResetEvent(updated)).getOrElse(requestHeader.session) + confirmationResult().withSession(eventSession).flashing(Success -> Messages(PasswordUpdated)) + + case _ => + logger.error("[securesocial] could not find user with email %s during password reset".format(token.email)) + confirmationResult().flashing(Error -> Messages(ErrorUpdatingPassword)) + } + } } diff --git a/module-code/app/securesocial/controllers/ProviderController.scala b/module-code/app/securesocial/controllers/ProviderController.scala index a6884c809..1c4e08fb3 100644 --- a/module-code/app/securesocial/controllers/ProviderController.scala +++ b/module-code/app/securesocial/controllers/ProviderController.scala @@ -38,7 +38,7 @@ class ProviderController(override implicit val env: RuntimeEnvironment[BasicProf * * @tparam U the user type */ -trait BaseProviderController[U] extends SecureSocial[U] { +trait BaseProviderController[U <: GenericProfile] extends SecureSocial[U] { import securesocial.controllers.ProviderControllerHelper.{ logger, toUrl } /** @@ -75,69 +75,47 @@ trait BaseProviderController[U] extends SecureSocial[U] { private def builder() = { //todo: this should be configurable maybe env.authenticatorService.find(CookieAuthenticator.Id).getOrElse { - logger.error(s"[securesocial] missing CookieAuthenticatorBuilder") - throw new AuthenticationException() + val m = "missing CookieAuthenticatorBuilder" + logger.error(m) + throw new AuthenticationException(m) } } /** * Common method to handle GET and POST authentication requests * - * @param provider the provider that needs to handle the flow + * @param providerId the provider that needs to handle the flow * @param redirectTo the url the user needs to be redirected to after being authenticated */ - private def handleAuth(provider: String, redirectTo: Option[String]) = UserAwareAction.async { implicit request => + private def handleAuth(providerId: String, redirectTo: Option[String]) = UserAwareAction.async { implicit request => import scala.concurrent.ExecutionContext.Implicits.global val authenticationFlow = request.user.isEmpty - val modifiedSession = overrideOriginalUrl(request.session, redirectTo) - env.providers.get(provider).map { - _.authenticate().flatMap { - case denied: AuthenticationResult.AccessDenied => - Future.successful(Redirect(env.routes.loginPageUrl).flashing("error" -> Messages("securesocial.login.accessDenied"))) + + env.providers.get(providerId).map { identityProvider => + val futureAuth : Future[AuthenticationResult] = identityProvider.authenticate(); + futureAuth.flatMap { + + case denied: AuthenticationResult.AccessDenied => Future.successful { + Redirect(env.routes.loginPageUrl).flashing("error" -> Messages("securesocial.login.accessDenied")) + } + case failed: AuthenticationResult.Failed => - logger.error(s"[securesocial] authentication failed, reason: ${failed.error}") - throw new AuthenticationException() + val m = s"authentication failed, reason: ${failed.error}" + logger.error(m) + throw new AuthenticationException(m) + case flow: AuthenticationResult.NavigationFlow => Future.successful { redirectTo.map { url => flow.result.addToSession(SecureSocial.OriginalUrlKey -> url) } getOrElse flow.result } + case authenticated: AuthenticationResult.Authenticated => if (authenticationFlow) { - val profile = authenticated.profile - env.userService.find(profile.providerId, profile.userId).flatMap { maybeExisting => - val mode = if (maybeExisting.isDefined) SaveMode.LoggedIn else SaveMode.SignUp - env.userService.save(authenticated.profile, mode).flatMap { userForAction => - logger.debug(s"[securesocial] user completed authentication: provider = ${profile.providerId}, userId: ${profile.userId}, mode = $mode") - val evt = if (mode == SaveMode.LoggedIn) new LoginEvent(userForAction) else new SignUpEvent(userForAction) - val sessionAfterEvents = Events.fire(evt).getOrElse(request.session) - import scala.concurrent.ExecutionContext.Implicits.global - builder().fromUser(userForAction).flatMap { authenticator => - Redirect(toUrl(sessionAfterEvents)).withSession(sessionAfterEvents - - SecureSocial.OriginalUrlKey - - IdentityProvider.SessionId - - OAuth1Provider.CacheKey).startingAuthenticator(authenticator) - } - } - } + Future.successful(byAuthenticateFlow(authenticated)) } else { - request.user match { - case Some(currentUser) => - for ( - linked <- env.userService.link(currentUser, authenticated.profile); - updatedAuthenticator <- request.authenticator.get.updateUser(linked); - result <- Redirect(toUrl(modifiedSession)).withSession(modifiedSession - - SecureSocial.OriginalUrlKey - - IdentityProvider.SessionId - - OAuth1Provider.CacheKey).touchingAuthenticator(updatedAuthenticator) - ) yield { - logger.debug(s"[securesocial] linked $currentUser to: providerId = ${authenticated.profile.providerId}") - result - } - case _ => - Future.successful(Unauthorized) - } + Future.successful(withoutAuthenticateFlow(authenticated, redirectTo)) } } recover { case e => @@ -148,6 +126,47 @@ trait BaseProviderController[U] extends SecureSocial[U] { Future.successful(NotFound) } } + + private def byAuthenticateFlow(authenticated : AuthenticationResult.Authenticated)(implicit request : Request[_]) : Result = { + val profile = authenticated.profile + val maybeExisting = env.userService.find(profile.providerId, profile.userId) + + val mode = if (maybeExisting.isDefined) SaveMode.LoggedIn else SaveMode.SignUp + + val userForAction = env.userService.save(authenticated.profile, mode) + logger.debug(s"[securesocial] user completed authentication: provider = ${profile.providerId}, userId: ${profile.userId}, mode = $mode") + + val evt = if (mode == SaveMode.LoggedIn) new LoginEvent(userForAction) else new SignUpEvent(userForAction) + + val sessionAfterEvents = Events.fire(evt).getOrElse(request.session) + + import scala.concurrent.ExecutionContext.Implicits.global + val authenticator = builder().fromUser(userForAction) + Redirect(toUrl(sessionAfterEvents)).withSession(sessionAfterEvents - + SecureSocial.OriginalUrlKey - + IdentityProvider.SessionId - + OAuth1Provider.CacheKey).startingAuthenticator(authenticator) + + } + + private def withoutAuthenticateFlow(authenticated : AuthenticationResult.Authenticated, redirectTo: Option[String])(implicit request : RequestWithUser[_]): Result = { + val modifiedSession = overrideOriginalUrl(request.session, redirectTo) + request.user match { + case Some(currentUser) => + val linked = env.userService.link(currentUser, authenticated.profile) + val updatedAuthenticator = request.authenticator.get.updateUser(linked); + logger.debug(s"[securesocial] linked $currentUser to: providerId = ${authenticated.profile.providerId}") + + Redirect(toUrl(modifiedSession)).withSession(modifiedSession - + SecureSocial.OriginalUrlKey - + IdentityProvider.SessionId - + OAuth1Provider.CacheKey).touchingAuthenticator(updatedAuthenticator) + + case _ => + Unauthorized + } + + } } object ProviderControllerHelper { diff --git a/module-code/app/securesocial/controllers/Registration.scala b/module-code/app/securesocial/controllers/Registration.scala index 39f25851b..189b5e9cf 100644 --- a/module-code/app/securesocial/controllers/Registration.scala +++ b/module-code/app/securesocial/controllers/Registration.scala @@ -19,13 +19,12 @@ package securesocial.controllers import play.api.data.Forms._ import play.api.data._ import play.api.i18n.Messages -import play.api.mvc.Action +import play.api.mvc.{Request, Action, Result, RequestHeader} import securesocial.core._ import securesocial.core.authenticator.CookieAuthenticator import securesocial.core.providers.UsernamePasswordProvider import securesocial.core.providers.utils._ import securesocial.core.services.SaveMode - import scala.concurrent.{ Await, ExecutionContext, Future } /** @@ -40,7 +39,7 @@ class Registration(override implicit val env: RuntimeEnvironment[BasicProfile]) * * @tparam U the user type */ -trait BaseRegistration[U] extends MailTokenBasedOperations[U] { +trait BaseRegistration[U <: GenericProfile] extends MailTokenBasedOperations[U] { import securesocial.controllers.BaseRegistration._ @@ -55,21 +54,16 @@ trait BaseRegistration[U] extends MailTokenBasedOperations[U] { val formWithUsername = Form[RegistrationInfo]( mapping( UserName -> nonEmptyText.verifying(Messages(UserNameAlreadyTaken), userName => { - // todo: see if there's a way to avoid waiting here :-\ - import scala.concurrent.duration._ - Await.result(env.userService.find(providerId, userName), 20.seconds).isEmpty + env.userService.find(providerId, userName).isEmpty }), FirstName -> nonEmptyText, LastName -> nonEmptyText, Password -> tuple( Password1 -> nonEmptyText.verifying(PasswordValidator.constraint), - Password2 -> nonEmptyText - ).verifying(Messages(PasswordsDoNotMatch), passwords => passwords._1 == passwords._2) - ) // binding - ((userName, firstName, lastName, password) => RegistrationInfo(Some(userName), firstName, lastName, password._1)) // unbinding - (info => Some(info.userName.getOrElse(""), info.firstName, info.lastName, ("", ""))) - ) + Password2 -> nonEmptyText).verifying(Messages(PasswordsDoNotMatch), passwords => passwords._1 == passwords._2)) // binding + ((userName, firstName, lastName, password) => RegistrationInfo(Some(userName), firstName, lastName, password._1)) // unbinding + (info => Some(info.userName.getOrElse(""), info.firstName, info.lastName, ("", "")))) val formWithoutUsername = Form[RegistrationInfo]( mapping( @@ -78,12 +72,9 @@ trait BaseRegistration[U] extends MailTokenBasedOperations[U] { Password -> tuple( Password1 -> nonEmptyText.verifying(PasswordValidator.constraint), - Password2 -> nonEmptyText - ).verifying(Messages(PasswordsDoNotMatch), passwords => passwords._1 == passwords._2) - ) // binding - ((firstName, lastName, password) => RegistrationInfo(None, firstName, lastName, password._1)) // unbinding - (info => Some(info.firstName, info.lastName, ("", ""))) - ) + Password2 -> nonEmptyText).verifying(Messages(PasswordsDoNotMatch), passwords => passwords._1 == passwords._2)) // binding + ((firstName, lastName, password) => RegistrationInfo(None, firstName, lastName, password._1)) // unbinding + (info => Some(info.firstName, info.lastName, ("", "")))) val form = if (UsernamePasswordProvider.withUserNameSupport) formWithUsername else formWithoutUsername @@ -99,60 +90,52 @@ trait BaseRegistration[U] extends MailTokenBasedOperations[U] { } } - def handleStartSignUp = Action.async { - implicit request => - startForm.bindFromRequest.fold( - errors => { - Future.successful(BadRequest(env.viewTemplates.getStartSignUpPage(errors))) - }, - e => { - val email = e.toLowerCase - // check if there is already an account for this email address - import scala.concurrent.ExecutionContext.Implicits.global - env.userService.findByEmailAndProvider(email, UsernamePasswordProvider.UsernamePassword).map { - maybeUser => - maybeUser match { - case Some(user) => - // user signed up already, send an email offering to login/recover password - env.mailer.sendAlreadyRegisteredEmail(user) - case None => - import scala.concurrent.ExecutionContext.Implicits.global - createToken(email, isSignUp = true).flatMap { token => - env.mailer.sendSignUpEmail(email, token.uuid) - env.userService.saveToken(token) - } - } - handleStartResult().flashing(Success -> Messages(ThankYouCheckEmail), Email -> email) - } + def handleStartSignUp = Action { implicit request => + startForm.bindFromRequest.fold( + errors => { + BadRequest(env.viewTemplates.getStartSignUpPage(errors)) + }, + e => { + val email = e.toLowerCase + val maybeUser = env.userService.findByEmailAndProvider(email, UsernamePasswordProvider.UsernamePassword); + maybeUser match { + case Some(user) => + // user signed up already, send an email offering to login/recover password + env.mailer.sendAlreadyRegisteredEmail(user) + case None => + import scala.concurrent.ExecutionContext.Implicits.global + val token = createToken(email, isSignUp = true) + env.mailer.sendSignUpEmail(email, token.uuid) + env.userService.saveToken(token) + } - ) + handleStartResult().flashing(Success -> Messages(ThankYouCheckEmail), Email -> email) + }) } /** * Renders the sign up page * @return */ - def signUp(token: String) = Action.async { + def signUp(token: String) = Action{ implicit request => logger.debug("[securesocial] trying sign up with token %s".format(token)) executeForToken(token, true, { _ => - Future.successful(Ok(env.viewTemplates.getSignUpPage(form, token))) + Ok(env.viewTemplates.getSignUpPage(form, token)) }) } /** * Handles posts from the sign up page */ - def handleSignUp(token: String) = Action.async { - implicit request => - import scala.concurrent.ExecutionContext.Implicits.global + def handleSignUp(token: String) = Action { implicit request => executeForToken(token, true, { t => form.bindFromRequest.fold( errors => { logger.debug("[securesocial] errors " + errors) - Future.successful(BadRequest(env.viewTemplates.getSignUpPage(errors, t.uuid))) + BadRequest(env.viewTemplates.getSignUpPage(errors, t.uuid)) }, info => { val id = if (UsernamePasswordProvider.withUserNameSupport) info.userName.get else t.email @@ -165,41 +148,47 @@ trait BaseRegistration[U] extends MailTokenBasedOperations[U] { Some(t.email), None, AuthenticationMethod.UserPassword, - passwordInfo = Some(env.currentHasher.hash(info.password)) - ) - - val withAvatar = env.avatarService.map { - _.urlFor(t.email).map { url => - if (url != newUser.avatarUrl) newUser.copy(avatarUrl = url) else newUser - } - }.getOrElse(Future.successful(newUser)) - - import securesocial.core.utils._ - val result = for ( - toSave <- withAvatar; - saved <- env.userService.save(toSave, SaveMode.SignUp); - deleted <- env.userService.deleteToken(t.uuid) - ) yield { - if (UsernamePasswordProvider.sendWelcomeEmail) - env.mailer.sendWelcomeEmail(newUser) - val eventSession = Events.fire(new SignUpEvent(saved)).getOrElse(request.session) - if (UsernamePasswordProvider.signupSkipLogin) { - env.authenticatorService.find(CookieAuthenticator.Id).map { - _.fromUser(saved).flatMap { authenticator => - confirmationResult().flashing(Success -> Messages(SignUpDone)).startingAuthenticator(authenticator) - } - } getOrElse { - logger.error(s"[securesocial] There isn't CookieAuthenticator registered in the RuntimeEnvironment") - Future.successful(confirmationResult().flashing(Error -> Messages("There was an error signing you up"))) + passwordInfo = Some(env.currentHasher.hash(info.password))) + + val withAvatar = env.avatarService.map { avatarService => + val avatarUrl = avatarService.urlFor(t.email) + if (avatarUrl != newUser.avatarUrl) { + newUser.copy(avatarUrl = avatarUrl) + } else { + newUser } - } else { - Future.successful(confirmationResult().flashing(Success -> Messages(SignUpDone)).withSession(eventSession)) - } + }.getOrElse(newUser) + + val saved = env.userService.save(withAvatar, SaveMode.SignUp); + val deleted = env.userService.deleteToken(t.uuid); + + if (UsernamePasswordProvider.sendWelcomeEmail) { + env.mailer.sendWelcomeEmail(newUser) + } + + val eventSession = Events.fire(new SignUpEvent(saved)).getOrElse(request.session) + + val result : Result = if (UsernamePasswordProvider.signupSkipLogin) { + skipLogin(saved) + } else { + confirmationResult().flashing(Success -> Messages(SignUpDone)).withSession(eventSession) } - result.flatMap(f => f) + result; }) }) } + + private def skipLogin(user : U)(implicit request : RequestHeader): Result = { + import securesocial.core.utils._ + + env.authenticatorService.find(CookieAuthenticator.Id).map {authBuilder => + val authenticator = authBuilder.fromUser(user) + confirmationResult().flashing(Success -> Messages(SignUpDone)).startingAuthenticator(authenticator) + } getOrElse { + logger.error(s"[securesocial] There isn't CookieAuthenticator registered in the RuntimeEnvironment") + confirmationResult().flashing(Error -> Messages("There was an error signing you up")) + } + } } object BaseRegistration { diff --git a/module-code/app/securesocial/core/AuthenticationException.scala b/module-code/app/securesocial/core/AuthenticationException.scala index d200dfa2b..ef83a4e55 100644 --- a/module-code/app/securesocial/core/AuthenticationException.scala +++ b/module-code/app/securesocial/core/AuthenticationException.scala @@ -19,4 +19,4 @@ package securesocial.core /** * An exception thrown when there is an error in the authentication flow */ -case class AuthenticationException() extends Exception +case class AuthenticationException(message : String) extends Exception(message) diff --git a/module-code/app/securesocial/core/Events.scala b/module-code/app/securesocial/core/Events.scala index 1a0b22501..8c6acafae 100644 --- a/module-code/app/securesocial/core/Events.scala +++ b/module-code/app/securesocial/core/Events.scala @@ -84,7 +84,7 @@ object Events { } } - def fire[U](event: Event[U])(implicit request: RequestHeader, env: RuntimeEnvironment[U]): Option[Session] = { + def fire[U <: GenericProfile](event: Event[U])(implicit request: RequestHeader, env: RuntimeEnvironment[U]): Option[Session] = { val result = doFire(env.eventListeners, event, request, request.session) if (result == request.session) None else Some(result) } diff --git a/module-code/app/securesocial/core/IdentityProvider.scala b/module-code/app/securesocial/core/IdentityProvider.scala index 242287ecc..2953d6910 100644 --- a/module-code/app/securesocial/core/IdentityProvider.scala +++ b/module-code/app/securesocial/core/IdentityProvider.scala @@ -16,7 +16,7 @@ */ package securesocial.core -import play.api.mvc.{ SimpleResult, AnyContent, Request } +import play.api.mvc.{ Result, AnyContent, Request } import play.api.Play import concurrent.Future @@ -104,7 +104,7 @@ object AuthenticationResult { /** * An intermetiate result during the authentication flow (maybe a redirection to the external provider page) */ - case class NavigationFlow(result: SimpleResult) extends AuthenticationResult + case class NavigationFlow(result: Result) extends AuthenticationResult /** * Returned when the user was succesfully authenticated diff --git a/module-code/app/securesocial/core/OAuth1Provider.scala b/module-code/app/securesocial/core/OAuth1Provider.scala index 6ae575d68..fb4f6dee7 100644 --- a/module-code/app/securesocial/core/OAuth1Provider.scala +++ b/module-code/app/securesocial/core/OAuth1Provider.scala @@ -18,7 +18,7 @@ package securesocial.core import _root_.java.util.UUID import play.api.libs.oauth._ -import play.api.mvc.{ AnyContent, Request } +import play.api.mvc.{RequestHeader, AnyContent, Request} import play.api.mvc.Results.Redirect import oauth.signpost.exception.OAuthException import scala.concurrent.{ ExecutionContext, Future } @@ -109,58 +109,68 @@ abstract class OAuth1Provider(routesService: RoutesService, def authMethod = AuthenticationMethod.OAuth1 def authenticate()(implicit request: Request[AnyContent]): Future[AuthenticationResult] = { - import ExecutionContext.Implicits.global + if (request.queryString.get("denied").isDefined) { // the user did not grant access to the account Future.successful(AuthenticationResult.AccessDenied()) } val verifier = request.queryString.get("oauth_verifier").map(_.head) if (verifier.isEmpty) { - // this is the 1st step in the auth flow. We need to get the request tokens - val callbackUrl = routesService.authenticationUrl(id) - logger.debug("[securesocial] callback url = " + callbackUrl) - client.retrieveRequestToken(callbackUrl).flatMap { - case accessToken => - val cacheKey = UUID.randomUUID().toString - val redirect = Redirect(client.redirectUrl(accessToken.token)).withSession(request.session + - (OAuth1Provider.CacheKey -> cacheKey)) - // set the cache key timeoutfor 5 minutes, plenty of time to log in - cacheService.set(cacheKey, accessToken, 300).map { - u => - AuthenticationResult.NavigationFlow(redirect) - } - } recover { - case e => - logger.error("[securesocial] error retrieving request token", e) - throw new AuthenticationException() - } + + processFirstStep() } else { - // 2nd step in the oauth flow - val cacheKey = request.session.get(OAuth1Provider.CacheKey).getOrElse { - logger.error("[securesocial] missing cache key in session during OAuth1 flow") - throw new AuthenticationException() - } - for ( - requestToken <- cacheService.getAs[RequestToken](cacheKey).recover { - case e => - logger.error("[securesocial] error retrieving entry from cache", e) - throw new AuthenticationException() - }; - accessToken <- client.retrieveOAuth1Info( - RequestToken(requestToken.get.token, requestToken.get.secret), verifier.get - ).recover { - case e => - logger.error("[securesocial] error retrieving access token", e) - throw new AuthenticationException() - }; - result <- fillProfile(accessToken) - ) yield { + processSecondStep(verifier.get) + } + } + + /** + * 45This is the 1st step in the auth flow. We need to get the request tokens + * @param requestHeader + * @return + */ + private def processFirstStep()(implicit requestHeader : RequestHeader) : Future[AuthenticationResult] = { + import ExecutionContext.Implicits.global + + val callbackUrl = routesService.authenticationUrl(id) + logger.debug("[securesocial] callback url = " + callbackUrl) + client.retrieveRequestToken(callbackUrl).flatMap { + case accessToken => + val cacheKey = UUID.randomUUID().toString + val redirect = Redirect(client.redirectUrl(accessToken.token)).withSession(requestHeader.session + + (OAuth1Provider.CacheKey -> cacheKey)) + // set the cache key timeoutfor 5 minutes, plenty of time to log in + cacheService.set(cacheKey, accessToken, 300) + Future.successful(AuthenticationResult.NavigationFlow(redirect)) + + } recover { + case e => + val m = "error retrieving request token" + logger.error(m, e) + throw new AuthenticationException(m) + } + } + + private def processSecondStep(verifier : String)(implicit requestHeader : RequestHeader) : Future[AuthenticationResult] = { + import scala.concurrent.ExecutionContext.Implicits.global + + val cacheKey = requestHeader.session.get(OAuth1Provider.CacheKey).getOrElse { + val message = "missing cache key in session during OAuth1 flow" + logger.error(message) + throw new AuthenticationException(message) + } + val requestToken : Option[RequestToken] = cacheService.getAs[RequestToken](cacheKey); + + for ( + accessToken <- client.retrieveOAuth1Info( + RequestToken(requestToken.get.token, requestToken.get.secret), verifier); + result <- fillProfile(accessToken) + ) yield { AuthenticationResult.Authenticated(result) - } } + } - def fillProfile(info: OAuth1Info): Future[BasicProfile] + def fillProfile(info: OAuth1Info): Future[GenericProfile] } object OAuth1Provider { diff --git a/module-code/app/securesocial/core/OAuth2Provider.scala b/module-code/app/securesocial/core/OAuth2Provider.scala index 791990d8c..9ba0e67d2 100644 --- a/module-code/app/securesocial/core/OAuth2Provider.scala +++ b/module-code/app/securesocial/core/OAuth2Provider.scala @@ -74,8 +74,9 @@ abstract class OAuth2Provider(routesService: RoutesService, client.exchangeCodeForToken(code, callbackUrl, buildInfo) .recover { case e => - logger.error("[securesocial] error trying to get an access token for provider %s".format(id), e) - throw new AuthenticationException() + val m = "error trying to get an access token for provider %s".format(id); + logger.error("m", e) + throw new AuthenticationException("m") } } @@ -96,63 +97,79 @@ abstract class OAuth2Provider(routesService: RoutesService, case OAuth2Constants.AccessDenied => Future.successful(AuthenticationResult.AccessDenied()) case error => Future.failed { - logger.error(s"[securesocial] error '$error' returned by the authorization server. Provider is $id") - throw new AuthenticationException() + val m = s"[securesocial] error '$error' returned by the authorization server. Provider is $id" + logger.error(m) + throw new AuthenticationException(m) } } request.queryString.get(OAuth2Constants.Code).flatMap(_.headOption) match { - case Some(code) => - // we're being redirected back from the authorization server with the access code. - val result = for ( - // check if the state we sent is equal to the one we're receiving now before continuing the flow. - // todo: review this -> clustered environments - stateOk <- request.session.get(IdentityProvider.SessionId).map(cacheService.getAs[String](_).map { - originalState => - val stateInQueryString = request.queryString.get(OAuth2Constants.State).flatMap(_.headOption) - originalState == stateInQueryString - }) - .getOrElse { - Future.failed { - logger.error("[securesocial] missing sid in session.") - throw new AuthenticationException() - } - }; - accessToken <- getAccessToken(code) if stateOk; - user <- fillProfile(OAuth2Info(accessToken.accessToken, accessToken.tokenType, accessToken.expiresIn, accessToken.refreshToken)) - ) yield { - logger.debug(s"[securesocial] user loggedin using provider $id = $user") - AuthenticationResult.Authenticated(user) - } - result recover { - case e => - logger.error("[securesocial] error authenticating user", e) - throw e - } case None => - // There's no code in the request, this is the first step in the oauth flow - val state = UUID.randomUUID().toString - val sessionId = request.session.get(IdentityProvider.SessionId).getOrElse(UUID.randomUUID().toString) - cacheService.set(sessionId, state, 300).map { - unit => - var params = List( - (OAuth2Constants.ClientId, settings.clientId), - (OAuth2Constants.RedirectUri, routesService.authenticationUrl(id)), - (OAuth2Constants.ResponseType, OAuth2Constants.Code), - (OAuth2Constants.State, state)) - settings.scope.foreach(s => { - params = (OAuth2Constants.Scope, s) :: params - }) - settings.authorizationUrlParams.foreach(e => { - params = e :: params - }) - val url = settings.authorizationUrl + - params.map(p => URLEncoder.encode(p._1, "UTF-8") + "=" + URLEncoder.encode(p._2, "UTF-8")).mkString("?", "&", "") - logger.debug("[securesocial] authorizationUrl = %s".format(settings.authorizationUrl)) - logger.debug("[securesocial] redirecting to: [%s]".format(url)) - AuthenticationResult.NavigationFlow(Results.Redirect(url).withSession(request.session + (IdentityProvider.SessionId -> sessionId))) - } + processFirstStep(); + + case Some(code) => + processSecondStep(code) + } + } + + private def processFirstStep()(implicit requestHeader : RequestHeader): Future[AuthenticationResult] = { + // There's no code in the request, this is the first step in the oauth flow + val state = UUID.randomUUID().toString + val sessionId = requestHeader.session.get(IdentityProvider.SessionId).getOrElse(UUID.randomUUID().toString) + cacheService.set(sessionId, state, 300) + var params = List( + (OAuth2Constants.ClientId, settings.clientId), + (OAuth2Constants.RedirectUri, routesService.authenticationUrl(id)), + (OAuth2Constants.ResponseType, OAuth2Constants.Code), + (OAuth2Constants.State, state)) + settings.scope.foreach(s => { + params = (OAuth2Constants.Scope, s) :: params + }) + settings.authorizationUrlParams.foreach(e => { + params = e :: params + }) + val url = settings.authorizationUrl + + params.map(p => URLEncoder.encode(p._1, "UTF-8") + "=" + URLEncoder.encode(p._2, "UTF-8")).mkString("?", "&", "") + logger.debug("[securesocial] authorizationUrl = %s".format(settings.authorizationUrl)) + logger.debug("[securesocial] redirecting to: [%s]".format(url)) + val redirect : Result = Results.Redirect(url) + val authSession : Session = requestHeader.session + (IdentityProvider.SessionId -> sessionId) + Future.successful(AuthenticationResult.NavigationFlow(redirect.withSession(authSession))) + } + + /** + * We're being redirected back from the authorization server with the access code. + * @param code + * @param request + * @return + */ + private def processSecondStep(code : String)(implicit request : Request[AnyContent]) : Future[AuthenticationResult] = { + import scala.concurrent.ExecutionContext.Implicits.global + + // check if the state we sent is equal to the one we're receiving now before continuing the flow. + // todo: review this -> clustered environments + val sessionId = request.session.get(IdentityProvider.SessionId).get; + val originalState = cacheService.getAs[String](sessionId) + if (originalState.isEmpty) { + return Future.successful(AuthenticationResult.Failed("original state is missing")) + } + + val stateInQueryString : Option[String] = request.queryString.get(OAuth2Constants.State).flatMap(_.headOption) + if (stateInQueryString.isEmpty) { + logger.warn("missing sid in session.") + throw new AuthenticationException("missing sid in session") + } + + val stateOk = originalState == stateInQueryString + + val result = for ( + accessToken <- getAccessToken(code) if stateOk; + user <- fillProfile(OAuth2Info(accessToken.accessToken, accessToken.tokenType, accessToken.expiresIn, accessToken.refreshToken)) + ) yield { + logger.debug(s"[securesocial] user loggedin using provider $id = $user") + AuthenticationResult.Authenticated(user) } + result } def fillProfile(info: OAuth2Info): Future[BasicProfile] diff --git a/module-code/app/securesocial/core/RuntimeEnvironment.scala b/module-code/app/securesocial/core/RuntimeEnvironment.scala index bcab54792..61c55c3cd 100644 --- a/module-code/app/securesocial/core/RuntimeEnvironment.scala +++ b/module-code/app/securesocial/core/RuntimeEnvironment.scala @@ -11,7 +11,7 @@ import scala.collection.immutable.ListMap /** * A runtime environment where the services needed are available */ -trait RuntimeEnvironment[U] { +trait RuntimeEnvironment[U <: GenericProfile] { val routes: RoutesService val viewTemplates: ViewTemplates @@ -43,7 +43,7 @@ object RuntimeEnvironment { * A default runtime environment. All built in services are included. * You can start your app with with by only adding a userService to handle users. */ - abstract class Default[U] extends RuntimeEnvironment[U] { + abstract class Default[U <: GenericProfile] extends RuntimeEnvironment[U] { override lazy val routes: RoutesService = new RoutesService.Default() override lazy val viewTemplates: ViewTemplates = new ViewTemplates.Default(this) diff --git a/module-code/app/securesocial/core/SecureSocial.scala b/module-code/app/securesocial/core/SecureSocial.scala index e88fe0649..c44408a2f 100644 --- a/module-code/app/securesocial/core/SecureSocial.scala +++ b/module-code/app/securesocial/core/SecureSocial.scala @@ -21,19 +21,19 @@ import play.api.i18n.Messages import play.api.libs.json.Json import play.api.http.HeaderNames import scala.concurrent.{ ExecutionContext, Future } -import play.api.templates.Html +import play.twirl.api.Html import securesocial.core.utils._ import securesocial.core.authenticator._ -import scala.Some -import play.api.mvc.SimpleResult +import play.api.mvc.Result + /** * Provides the actions that can be used to protect controllers and retrieve the current user * if available. * */ -trait SecureSocial[U] extends Controller { +trait SecureSocial[U <: GenericProfile] extends Controller { implicit val env: RuntimeEnvironment[U] /** @@ -46,7 +46,7 @@ trait SecureSocial[U] extends Controller { protected val notAuthorizedJson = Forbidden(Json.toJson(Map("error" -> "Not authorized"))).as(JSON) protected def notAuthorizedPage()(implicit request: RequestHeader): Html = securesocial.views.html.notAuthorized() - protected def notAuthenticatedResult[A](implicit request: Request[A]): Future[SimpleResult] = { + protected def notAuthenticatedResult[A](implicit request: Request[A]): Future[Result] = { Future.successful { render { case Accepts.Json() => notAuthenticatedJson @@ -58,7 +58,7 @@ trait SecureSocial[U] extends Controller { } } - protected def notAuthorizedResult[A](implicit request: Request[A]): Future[SimpleResult] = { + protected def notAuthorizedResult[A](implicit request: Request[A]): Future[Result] = { Future.successful { render { case Accepts.Json() => notAuthorizedJson @@ -105,25 +105,29 @@ trait SecureSocial[U] extends Controller { private val logger = play.api.Logger("securesocial.core.SecuredActionBuilder") def invokeSecuredBlock[A](authorize: Option[Authorization[U]], request: Request[A], - block: SecuredRequest[A] => Future[SimpleResult]): Future[SimpleResult] = + block: SecuredRequest[A] => Future[Result]): Future[Result] = { import ExecutionContext.Implicits.global - env.authenticatorService.fromRequest(request).flatMap { + env.authenticatorService.fromRequest(request) match { case Some(authenticator) if authenticator.isValid => - authenticator.touch.flatMap { updatedAuthenticator => + val updatedAuthenticator = authenticator.touch val user = updatedAuthenticator.user if (authorize.isEmpty || authorize.get.isAuthorized(user, request)) { - block(SecuredRequest(user, updatedAuthenticator, request)).flatMap { - _.touchingAuthenticator(updatedAuthenticator) + val securedRequest = SecuredRequest(user, updatedAuthenticator, request); + block(securedRequest).flatMap {result => + Future.successful(result.touchingAuthenticator(updatedAuthenticator)) } } else { notAuthorizedResult(request) } - } + case Some(authenticator) if !authenticator.isValid => logger.debug("[securesocial] user tried to access with invalid authenticator : '%s'".format(request.uri)) import ExecutionContext.Implicits.global - notAuthenticatedResult(request).flatMap { _.discardingAuthenticator(authenticator) } + notAuthenticatedResult(request).flatMap {result=> + Future.successful(result.discardingAuthenticator(authenticator)) + } + case None => logger.debug("[securesocial] anonymous user trying to access : '%s'".format(request.uri)) notAuthenticatedResult(request) @@ -131,7 +135,7 @@ trait SecureSocial[U] extends Controller { } override def invokeBlock[A](request: Request[A], - block: (SecuredRequest[A]) => Future[SimpleResult]): Future[SimpleResult] = + block: (SecuredRequest[A]) => Future[Result]): Future[Result] = { invokeSecuredBlock(authorize, request, block) } @@ -149,16 +153,19 @@ trait SecureSocial[U] extends Controller { */ class UserAwareActionBuilder extends ActionBuilder[({ type R[A] = RequestWithUser[A] })#R] { override def invokeBlock[A](request: Request[A], - block: (RequestWithUser[A]) => Future[SimpleResult]): Future[SimpleResult] = + block: (RequestWithUser[A]) => Future[Result]): Future[Result] = { import ExecutionContext.Implicits.global - env.authenticatorService.fromRequest(request).flatMap { + env.authenticatorService.fromRequest(request) match { case Some(authenticator) if authenticator.isValid => - authenticator.touch.flatMap { - a => block(RequestWithUser(Some(a.user), Some(a), request)) - } + val auth = authenticator.touch + val requestWithUser = RequestWithUser(Some(auth.user), Some(auth), request); + block(requestWithUser) + case Some(authenticator) if !authenticator.isValid => - block(RequestWithUser(None, None, request)).flatMap(_.discardingAuthenticator(authenticator)) + block(RequestWithUser(None, None, request)).flatMap {result => + Future.successful(result.discardingAuthenticator(authenticator)) + } case None => block(RequestWithUser(None, None, request)) } @@ -220,8 +227,8 @@ object SecureSocial { * @tparam U the user type * @return a future with an option user */ - def currentUser[U](implicit request: RequestHeader, env: RuntimeEnvironment[U], ec: ExecutionContext): Future[Option[U]] = { - env.authenticatorService.fromRequest.map { + def currentUser[U <: GenericProfile](implicit request: RequestHeader, env: RuntimeEnvironment[U], ec: ExecutionContext): Option[U] = { + env.authenticatorService.fromRequest match { case Some(authenticator) if authenticator.isValid => Some(authenticator.user) case _ => None } diff --git a/module-code/app/securesocial/core/authenticator/Authenticator.scala b/module-code/app/securesocial/core/authenticator/Authenticator.scala index 57abb20ad..202fd7aba 100644 --- a/module-code/app/securesocial/core/authenticator/Authenticator.scala +++ b/module-code/app/securesocial/core/authenticator/Authenticator.scala @@ -17,7 +17,8 @@ package securesocial.core.authenticator import org.joda.time.DateTime -import play.api.mvc.{ SimpleResult, RequestHeader } +import play.api.mvc.{ Result, RequestHeader } +import securesocial.core.GenericProfile import scala.concurrent.Future /** @@ -25,7 +26,7 @@ import scala.concurrent.Future * * @tparam U the user object type */ -trait Authenticator[U] { +trait Authenticator[U <: GenericProfile] { /** * An id for this authenticator */ @@ -65,7 +66,7 @@ trait Authenticator[U] { * * @return an updated instance */ - def touch: Future[Authenticator[U]] + def touch: Authenticator[U] /** * Updated the user associated with this authenticator. This method can be used @@ -74,7 +75,7 @@ trait Authenticator[U] { * @param user the user object * @return an updated instance */ - def updateUser(user: U): Future[Authenticator[U]] + def updateUser(user: U): Authenticator[U] /** * Starts an authenticator session. This is invoked when the user logs in. @@ -82,7 +83,7 @@ trait Authenticator[U] { * @param result the result that is about to be sent to the client * @return the result modified to signal a new session has been created. */ - def starting(result: SimpleResult): Future[SimpleResult] + def starting(result: Result): Result /** * Ends an authenticator session. This is invoked when the user logs out or if the @@ -91,7 +92,7 @@ trait Authenticator[U] { * @param result the result that is about to be sent to the client. * @return the result modified to signal the authenticator is no longer valid */ - def discarding(result: SimpleResult): Future[SimpleResult] + def discarding(result: Result): Result /** * Invoked after a protected action is executed. This can be used to @@ -101,7 +102,7 @@ trait Authenticator[U] { * @param result the result that is about to be sent to the client. * @return the result modified with the updated authenticator */ - def touching(result: SimpleResult): Future[SimpleResult] + def touching(result: Result): Result // java results /** @@ -112,7 +113,7 @@ trait Authenticator[U] { * @param javaContext the current http context * @return the http context modified with the updated authenticator */ - def touching(javaContext: play.mvc.Http.Context): Future[Unit] + def touching(javaContext: play.mvc.Http.Context): Unit /** * Ends an authenticator session. This is invoked when the authenticator becomes invalid (for Java actions) @@ -120,7 +121,7 @@ trait Authenticator[U] { * @param javaContext the current http context * @return the current http context modified to signal the authenticator is no longer valid */ - def discarding(javaContext: play.mvc.Http.Context): Future[Unit] + def discarding(javaContext: play.mvc.Http.Context): Unit } /** @@ -129,7 +130,7 @@ trait Authenticator[U] { * * @tparam U the user object type */ -trait AuthenticatorBuilder[U] { +trait AuthenticatorBuilder[U <: GenericProfile] { val id: String /** @@ -138,7 +139,7 @@ trait AuthenticatorBuilder[U] { * @param request the incoming request * @return an instance of an authenticator if the user is authenticated or None otherwise. */ - def fromRequest(request: RequestHeader): Future[Option[Authenticator[U]]] + def fromRequest(request: RequestHeader): Option[Authenticator[U]] /** * Creates an authenticator for the given user @@ -146,5 +147,5 @@ trait AuthenticatorBuilder[U] { * @param user the user object * @return an Authenticator associated with the user */ - def fromUser(user: U): Future[Authenticator[U]] + def fromUser(user: U): Authenticator[U] } diff --git a/module-code/app/securesocial/core/authenticator/AuthenticatorStore.scala b/module-code/app/securesocial/core/authenticator/AuthenticatorStore.scala index 34d5c67e8..d7cf2ed18 100644 --- a/module-code/app/securesocial/core/authenticator/AuthenticatorStore.scala +++ b/module-code/app/securesocial/core/authenticator/AuthenticatorStore.scala @@ -33,7 +33,7 @@ trait AuthenticatorStore[A <: Authenticator[_]] { * @param ct the class tag for the Authenticator type * @return an optional future Authenticator */ - def find(id: String)(implicit ct: ClassTag[A]): Future[Option[A]] + def find(id: String)(implicit ct: ClassTag[A]): Option[A] /** * Saves/updates an authenticator in the backing store @@ -42,7 +42,7 @@ trait AuthenticatorStore[A <: Authenticator[_]] { * @param timeoutInSeconds the timeout. after this time has passed the backing store needs to remove the entry. * @return the saved authenticator */ - def save(authenticator: A, timeoutInSeconds: Int): Future[A] + def save(authenticator: A, timeoutInSeconds: Int): A /** * Deletes an Authenticator from the backing store @@ -50,7 +50,7 @@ trait AuthenticatorStore[A <: Authenticator[_]] { * @param id the authenticator id * @return a future of Unit */ - def delete(id: String): Future[Unit] + def delete(id: String): Unit } object AuthenticatorStore { @@ -68,7 +68,7 @@ object AuthenticatorStore { * @param ct the class tag for the Authenticator type * @return an optional future Authenticator */ - override def find(id: String)(implicit ct: ClassTag[A]): Future[Option[A]] = { + override def find(id: String)(implicit ct: ClassTag[A]): Option[A] = { cacheService.getAs[A](id)(ct) } @@ -79,9 +79,10 @@ object AuthenticatorStore { * @param timeoutInSeconds the timeout. * @return the saved authenticator */ - override def save(authenticator: A, timeoutInSeconds: Int): Future[A] = { + override def save(authenticator: A, timeoutInSeconds: Int): A = { import ExecutionContext.Implicits.global - cacheService.set(authenticator.id, authenticator, timeoutInSeconds).map { _ => authenticator } + cacheService.set(authenticator.id, authenticator, timeoutInSeconds) + authenticator } /** @@ -90,7 +91,7 @@ object AuthenticatorStore { * @param id the authenticator id * @return a future of Unit */ - override def delete(id: String): Future[Unit] = { + override def delete(id: String): Unit = { cacheService.remove(id) } } diff --git a/module-code/app/securesocial/core/authenticator/CookieAuthenticator.scala b/module-code/app/securesocial/core/authenticator/CookieAuthenticator.scala index f83c55c6a..ee4d6c60c 100644 --- a/module-code/app/securesocial/core/authenticator/CookieAuthenticator.scala +++ b/module-code/app/securesocial/core/authenticator/CookieAuthenticator.scala @@ -17,8 +17,8 @@ package securesocial.core.authenticator import org.joda.time.DateTime -import play.api.mvc.{ Cookie, SimpleResult, DiscardingCookie, RequestHeader } -import securesocial.core.IdentityProvider +import play.api.mvc.{ Cookie, Result, DiscardingCookie, RequestHeader } +import securesocial.core.{GenericProfile, IdentityProvider} import scala.concurrent.{ ExecutionContext, Future } import play.api.Play @@ -38,7 +38,7 @@ import play.api.Play * @see AuthenticatorStore * @see RuntimeEnvironment */ -case class CookieAuthenticator[U](id: String, user: U, expirationDate: DateTime, +case class CookieAuthenticator[U <: GenericProfile](id: String, user: U, expirationDate: DateTime, lastUsed: DateTime, creationDate: DateTime, @transient store: AuthenticatorStore[CookieAuthenticator[U]]) extends StoreBackedAuthenticator[U, CookieAuthenticator[U]] { @@ -71,11 +71,9 @@ case class CookieAuthenticator[U](id: String, user: U, expirationDate: DateTime, * @param result the result that is about to be sent to the client. * @return the result modified to signal the authenticator is no longer valid */ - override def discarding(result: SimpleResult): Future[SimpleResult] = { - import ExecutionContext.Implicits.global - store.delete(id).map { _ => - result.discardingCookies(CookieAuthenticator.discardingCookie) - } + override def discarding(result: Result): Result = { + store.delete(id) + result.discardingCookies(CookieAuthenticator.discardingCookie) } /** @@ -84,8 +82,7 @@ case class CookieAuthenticator[U](id: String, user: U, expirationDate: DateTime, * @param result the result that is about to be sent to the client * @return the result with the authenticator cookie set */ - override def starting(result: SimpleResult): Future[SimpleResult] = { - Future.successful { + override def starting(result: Result): Result = { result.withCookies( Cookie( CookieAuthenticator.cookieName, @@ -99,7 +96,6 @@ case class CookieAuthenticator[U](id: String, user: U, expirationDate: DateTime, httpOnly = CookieAuthenticator.cookieHttpOnly ) ) - } } /** @@ -107,16 +103,15 @@ case class CookieAuthenticator[U](id: String, user: U, expirationDate: DateTime, * * @param javaContext the current invocation context */ - override def discarding(javaContext: play.mvc.Http.Context): Future[Unit] = { + override def discarding(javaContext: play.mvc.Http.Context): Unit = { import ExecutionContext.Implicits.global - store.delete(id).map { _ => - javaContext.response().discardCookie( - CookieAuthenticator.cookieName, - CookieAuthenticator.cookiePath, - CookieAuthenticator.cookieDomain.getOrElse(null), - CookieAuthenticator.cookieSecure - ) - } + store.delete(id) + javaContext.response().discardCookie( + CookieAuthenticator.cookieName, + CookieAuthenticator.cookiePath, + CookieAuthenticator.cookieDomain.getOrElse(null), + CookieAuthenticator.cookieSecure + ) } } @@ -127,7 +122,7 @@ case class CookieAuthenticator[U](id: String, user: U, expirationDate: DateTime, * @param generator a session id generator * @tparam U the user object type */ -class CookieAuthenticatorBuilder[U](store: AuthenticatorStore[CookieAuthenticator[U]], generator: IdGenerator) extends AuthenticatorBuilder[U] { +class CookieAuthenticatorBuilder[U <: GenericProfile](store: AuthenticatorStore[CookieAuthenticator[U]], generator: IdGenerator) extends AuthenticatorBuilder[U] { val id = CookieAuthenticator.Id /** @@ -136,13 +131,12 @@ class CookieAuthenticatorBuilder[U](store: AuthenticatorStore[CookieAuthenticato * @param request the incoming request * @return an optional CookieAuthenticator instance. */ - override def fromRequest(request: RequestHeader): Future[Option[CookieAuthenticator[U]]] = { - import ExecutionContext.Implicits.global + override def fromRequest(request: RequestHeader): Option[CookieAuthenticator[U]] = { request.cookies.get(CookieAuthenticator.cookieName) match { case Some(cookie) => store.find(cookie.value).map { retrieved => - retrieved.map { _.copy(store = store) } + retrieved.copy(store = store) } - case None => Future.successful(None) + case None => None } } @@ -152,15 +146,12 @@ class CookieAuthenticatorBuilder[U](store: AuthenticatorStore[CookieAuthenticato * @param user the user * @return a CookieAuthenticator instance. */ - override def fromUser(user: U): Future[CookieAuthenticator[U]] = { - import ExecutionContext.Implicits.global - generator.generate.flatMap { - id => - val now = DateTime.now() - val expirationDate = now.plusMinutes(CookieAuthenticator.absoluteTimeout) - val authenticator = CookieAuthenticator(id, user, expirationDate, now, now, store) - store.save(authenticator, CookieAuthenticator.absoluteTimeoutInSeconds) - } + override def fromUser(user: U): CookieAuthenticator[U] = { + val id = generator.generate + val now = DateTime.now() + val expirationDate = now.plusMinutes(CookieAuthenticator.absoluteTimeout) + val authenticator = CookieAuthenticator(id, user, expirationDate, now, now, store) + store.save(authenticator, CookieAuthenticator.absoluteTimeoutInSeconds) } } diff --git a/module-code/app/securesocial/core/authenticator/HttpHeaderAuthenticator.scala b/module-code/app/securesocial/core/authenticator/HttpHeaderAuthenticator.scala index da2b74352..62044aad2 100644 --- a/module-code/app/securesocial/core/authenticator/HttpHeaderAuthenticator.scala +++ b/module-code/app/securesocial/core/authenticator/HttpHeaderAuthenticator.scala @@ -18,10 +18,11 @@ package securesocial.core.authenticator import org.joda.time.DateTime import play.api.mvc._ +import securesocial.core.GenericProfile import scala.concurrent.{ ExecutionContext, Future } import play.api.Play import scala.Some -import play.api.mvc.SimpleResult +import play.api.mvc.Result /** * A http header based authenticator. This authenticator works using the X-Auth-Token header in the http request @@ -39,7 +40,7 @@ import play.api.mvc.SimpleResult * @see AuthenticatorStore * @see RuntimeEnvironment */ -case class HttpHeaderAuthenticator[U](id: String, user: U, expirationDate: DateTime, +case class HttpHeaderAuthenticator[U <: GenericProfile](id: String, user: U, expirationDate: DateTime, lastUsed: DateTime, creationDate: DateTime, @transient store: AuthenticatorStore[HttpHeaderAuthenticator[U]]) extends StoreBackedAuthenticator[U, HttpHeaderAuthenticator[U]] { @@ -68,8 +69,8 @@ case class HttpHeaderAuthenticator[U](id: String, user: U, expirationDate: DateT * @param result the result that is about to be sent to the client * @return the result with the authenticator header set */ - override def starting(result: SimpleResult): Future[SimpleResult] = { - Future.successful { result } + override def starting(result: Result): Result = { + result } } @@ -80,7 +81,7 @@ case class HttpHeaderAuthenticator[U](id: String, user: U, expirationDate: DateT * @param generator a session id generator * @tparam U the user object type */ -class HttpHeaderAuthenticatorBuilder[U](store: AuthenticatorStore[HttpHeaderAuthenticator[U]], generator: IdGenerator) extends AuthenticatorBuilder[U] { +class HttpHeaderAuthenticatorBuilder[U <: GenericProfile](store: AuthenticatorStore[HttpHeaderAuthenticator[U]], generator: IdGenerator) extends AuthenticatorBuilder[U] { val id = HttpHeaderAuthenticator.Id /** @@ -89,13 +90,13 @@ class HttpHeaderAuthenticatorBuilder[U](store: AuthenticatorStore[HttpHeaderAuth * @param request the incoming request * @return an optional HttpHeaderAuthenticator instance. */ - override def fromRequest(request: RequestHeader): Future[Option[HttpHeaderAuthenticator[U]]] = { + override def fromRequest(request: RequestHeader): Option[HttpHeaderAuthenticator[U]] = { import ExecutionContext.Implicits.global request.headers.get("X-Auth-Token") match { case Some(value) => store.find(value).map { retrieved => - retrieved.map { _.copy(store = store) } + retrieved.copy(store = store) } - case None => Future.successful(None) + case None => None } } @@ -105,15 +106,13 @@ class HttpHeaderAuthenticatorBuilder[U](store: AuthenticatorStore[HttpHeaderAuth * @param user the user * @return a HttpHeaderAuthenticator instance. */ - override def fromUser(user: U): Future[HttpHeaderAuthenticator[U]] = { + override def fromUser(user: U): HttpHeaderAuthenticator[U] = { import ExecutionContext.Implicits.global - generator.generate.flatMap { - id => - val now = DateTime.now() - val expirationDate = now.plusMinutes(HttpHeaderAuthenticator.absoluteTimeout) - val authenticator = HttpHeaderAuthenticator(id, user, expirationDate, now, now, store) - store.save(authenticator, HttpHeaderAuthenticator.absoluteTimeoutInSeconds) - } + val id = generator.generate + val now = DateTime.now() + val expirationDate = now.plusMinutes(HttpHeaderAuthenticator.absoluteTimeout) + val authenticator = HttpHeaderAuthenticator(id, user, expirationDate, now, now, store) + store.save(authenticator, HttpHeaderAuthenticator.absoluteTimeoutInSeconds) } } diff --git a/module-code/app/securesocial/core/authenticator/IdGenerator.scala b/module-code/app/securesocial/core/authenticator/IdGenerator.scala index e63218ac6..219c8451c 100644 --- a/module-code/app/securesocial/core/authenticator/IdGenerator.scala +++ b/module-code/app/securesocial/core/authenticator/IdGenerator.scala @@ -24,7 +24,7 @@ import play.api.libs.Codecs * An Authenticator Id generator. */ trait IdGenerator { - def generate: Future[String] + def generate: String } object IdGenerator { @@ -44,13 +44,10 @@ object IdGenerator { * * @return the generated id */ - def generate: Future[String] = { - //todo: review the usage of future here - Future.successful { - var randomValue = new Array[Byte](IdSizeInBytes) - random.nextBytes(randomValue) - Codecs.toHexString(randomValue) - } + def generate: String = { + val randomValue = new Array[Byte](IdSizeInBytes) + random.nextBytes(randomValue) + Codecs.toHexString(randomValue) } } } \ No newline at end of file diff --git a/module-code/app/securesocial/core/authenticator/StoreBackedAuthenticator.scala b/module-code/app/securesocial/core/authenticator/StoreBackedAuthenticator.scala index b61b6e774..0a7404873 100644 --- a/module-code/app/securesocial/core/authenticator/StoreBackedAuthenticator.scala +++ b/module-code/app/securesocial/core/authenticator/StoreBackedAuthenticator.scala @@ -17,9 +17,10 @@ package securesocial.core.authenticator import org.joda.time.DateTime +import securesocial.core.GenericProfile import scala.annotation.meta.getter import scala.concurrent.{ ExecutionContext, Future } -import play.api.mvc.SimpleResult +import play.api.mvc.Result /** * Base trait for the Cookie and Http Header based authenticators @@ -27,7 +28,7 @@ import play.api.mvc.SimpleResult * @tparam U the user object type * @tparam T the authenticator type */ -trait StoreBackedAuthenticator[U, T <: Authenticator[U]] extends Authenticator[U] { +trait StoreBackedAuthenticator[U <: GenericProfile, T <: Authenticator[U]] extends Authenticator[U] { @transient protected val logger = play.api.Logger(this.getClass.getName) @@ -65,7 +66,7 @@ trait StoreBackedAuthenticator[U, T <: Authenticator[U]] extends Authenticator[U * * @return a future with the updated authenticator */ - override def touch: Future[T] = { + override def touch: T = { val updated = withLastUsedTime(DateTime.now()) logger.debug(s"touched: lastUsed = $lastUsed") store.save(updated, absoluteTimeoutInSeconds) @@ -77,7 +78,7 @@ trait StoreBackedAuthenticator[U, T <: Authenticator[U]] extends Authenticator[U * @param user the user object * @return a future with the updated authenticator */ - override def updateUser(user: U): Future[T] = { + override def updateUser(user: U): T = { val updated = withUser(user) logger.debug(s"updated user: $updated") store.save(updated, absoluteTimeoutInSeconds) @@ -115,8 +116,8 @@ trait StoreBackedAuthenticator[U, T <: Authenticator[U]] extends Authenticator[U * @param result * @return */ - override def touching(result: SimpleResult): Future[SimpleResult] = { - Future.successful(result) + override def touching(result: Result): Result = { + result } /** @@ -125,9 +126,7 @@ trait StoreBackedAuthenticator[U, T <: Authenticator[U]] extends Authenticator[U * * @param javaContext the current invocation context */ - def touching(javaContext: play.mvc.Http.Context): Future[Unit] = { - Future.successful(()) - } + def touching(javaContext: play.mvc.Http.Context): Unit = ??? /** * Ends an authenticator session. This is invoked when the user logs out or if the @@ -136,9 +135,9 @@ trait StoreBackedAuthenticator[U, T <: Authenticator[U]] extends Authenticator[U * @param result the result that is about to be sent to the client. * @return the result modified to signal the authenticator is no longer valid */ - override def discarding(result: SimpleResult): Future[SimpleResult] = { - import ExecutionContext.Implicits.global - store.delete(id).map { _ => result } + override def discarding(result: Result): Result = { + store.delete(id) + result } /** @@ -147,8 +146,7 @@ trait StoreBackedAuthenticator[U, T <: Authenticator[U]] extends Authenticator[U * @param javaContext the current http context * @return the current http context modified to signal the authenticator is no longer valid */ - override def discarding(javaContext: play.mvc.Http.Context): Future[Unit] = { - import ExecutionContext.Implicits.global - store.delete(id).map { _ => () } + override def discarding(javaContext: play.mvc.Http.Context) : Unit = { + store.delete(id) } } \ No newline at end of file diff --git a/module-code/app/securesocial/core/providers/DropboxProvider.scala b/module-code/app/securesocial/core/providers/DropboxProvider.scala index 5721e0f1f..070c46f66 100644 --- a/module-code/app/securesocial/core/providers/DropboxProvider.scala +++ b/module-code/app/securesocial/core/providers/DropboxProvider.scala @@ -48,13 +48,15 @@ class DropboxProvider(routesService: RoutesService, val fullName = (data \ FormattedName).asOpt[String] BasicProfile(id, userId, None, None, fullName, None, None, authMethod, None, Some(info)) case _ => - Logger.error("[securesocial] Dropbox account info request returned error: " + response.body) - throw new AuthenticationException() + val m = s"Dropbox account info request returned error: $response.body" + Logger.error(m) + throw new AuthenticationException(m) } } recover { case e => - Logger.error("[securesocial] error retrieving profile information from Dropbox", e) - throw new AuthenticationException() + val m = "error retrieving profile information from Dropbox"; + Logger.error(m, e) + throw new AuthenticationException(m) } } } diff --git a/module-code/app/securesocial/core/providers/FacebookProvider.scala b/module-code/app/securesocial/core/providers/FacebookProvider.scala index 59203b33e..4184b18be 100644 --- a/module-code/app/securesocial/core/providers/FacebookProvider.scala +++ b/module-code/app/securesocial/core/providers/FacebookProvider.scala @@ -53,8 +53,9 @@ class FacebookProvider(routesService: RoutesService, case Array(AccessToken, token, Expires, expiresIn) => OAuth2Info(token, None, Some(expiresIn.toInt)) case Array(AccessToken, token) => OAuth2Info(token) case _ => - logger.error("[securesocial] invalid response format for accessToken") - throw new AuthenticationException() + val m: String = "invalid response format for accessToken" + logger.error(m) + throw new AuthenticationException(m) } } @@ -66,11 +67,10 @@ class FacebookProvider(routesService: RoutesService, case Some(error) => val message = (error \ Message).as[String] val errorType = (error \ Type).as[String] - logger.error( - "[securesocial] error retrieving profile information from Facebook. Error type: %s, message: %s". - format(errorType, message) - ) - throw new AuthenticationException() + val m = "error retrieving profile information from Facebook. Error type: %s, message: %s". + format(errorType, message) + logger.error(m) + throw new AuthenticationException(m) case _ => val userId = (me \ Id).as[String] val name = (me \ Name).asOpt[String] @@ -84,8 +84,9 @@ class FacebookProvider(routesService: RoutesService, } recover { case e: AuthenticationException => throw e case e => - logger.error("[securesocial] error retrieving profile information from Facebook", e) - throw new AuthenticationException() + val m: String = "error retrieving profile information from Facebook" + logger.error(m, e) + throw new AuthenticationException(m) } } } diff --git a/module-code/app/securesocial/core/providers/FoursquareProvider.scala b/module-code/app/securesocial/core/providers/FoursquareProvider.scala index 03f9cf14f..8b509e48b 100644 --- a/module-code/app/securesocial/core/providers/FoursquareProvider.scala +++ b/module-code/app/securesocial/core/providers/FoursquareProvider.scala @@ -51,8 +51,9 @@ class FoursquareProvider(routesService: RoutesService, client.retrieveProfile(GetAuthenticatedUser.format(info.accessToken)).map { me => (me \ "response" \ "user").asOpt[String] match { case Some(msg) => - logger.error("[securesocial] error retrieving profile information from Foursquare. Message = %s".format(msg)) - throw new AuthenticationException() + val m: String = "error retrieving profile information from Foursquare. Message = %s".format(msg) + logger.error(m) + throw new AuthenticationException(m) case _ => val userId = (me \ Response \ User \ Id).as[String] val lastName = (me \ Response \ User \ LastName).asOpt[String] @@ -66,8 +67,9 @@ class FoursquareProvider(routesService: RoutesService, } recover { case e: AuthenticationException => throw e case e => - logger.error("[securesocial] error retrieving profile information from Foursquare", e) - throw new AuthenticationException() + val m: String = "error retrieving profile information from Foursquare" + logger.error(m, e) + throw new AuthenticationException(m) } } } diff --git a/module-code/app/securesocial/core/providers/GitHubProvider.scala b/module-code/app/securesocial/core/providers/GitHubProvider.scala index 94e687e98..724b96159 100644 --- a/module-code/app/securesocial/core/providers/GitHubProvider.scala +++ b/module-code/app/securesocial/core/providers/GitHubProvider.scala @@ -46,8 +46,9 @@ class GitHubProvider(routesService: RoutesService, .map(r => (r(0), r(1)))(collection.breakOut) val accessToken = values.get(OAuth2Constants.AccessToken) if (accessToken.isEmpty) { - logger.error(s"[securesocial] did not get accessToken from $id") - throw new AuthenticationException() + val m: String = s"did not get accessToken from $id" + logger.error(m) + throw new AuthenticationException(m) } OAuth2Info( accessToken.get, @@ -62,8 +63,9 @@ class GitHubProvider(routesService: RoutesService, client.retrieveProfile(GetAuthenticatedUser.format(info.accessToken)).map { me => (me \ Message).asOpt[String] match { case Some(msg) => - logger.error(s"[securesocial] error retrieving profile information from GitHub. Message = $msg") - throw new AuthenticationException() + val m: String = s"error retrieving profile information from GitHub. Message = $msg" + logger.error(m) + throw new AuthenticationException(m) case _ => val userId = (me \ Id).as[Int] val displayName = (me \ Name).asOpt[String] @@ -74,8 +76,9 @@ class GitHubProvider(routesService: RoutesService, } recover { case e: AuthenticationException => throw e case e => - logger.error("[securesocial] error retrieving profile information from github", e) - throw new AuthenticationException() + val m: String = "error retrieving profile information from github" + logger.error(m, e) + throw new AuthenticationException(m) } } } diff --git a/module-code/app/securesocial/core/providers/GoogleProvider.scala b/module-code/app/securesocial/core/providers/GoogleProvider.scala index 76d5991c9..fb83d8c4d 100644 --- a/module-code/app/securesocial/core/providers/GoogleProvider.scala +++ b/module-code/app/securesocial/core/providers/GoogleProvider.scala @@ -55,8 +55,9 @@ class GoogleProvider(routesService: RoutesService, case Some(error) => val message = (error \ Message).as[String] val errorCode = (error \ Code).as[String] - logger.error(s"[securesocial] error retrieving profile information from Google. Error type = $errorCode, message = $message") - throw new AuthenticationException() + val m: String = s"error retrieving profile information from Google. Error type = $errorCode, message = $message" + logger.error(m) + throw new AuthenticationException(m) case _ => val userId = (me \ Id).as[String] val firstName = (me \ Name \ GivenName).asOpt[String] @@ -70,8 +71,9 @@ class GoogleProvider(routesService: RoutesService, } recover { case e: AuthenticationException => throw e case e => - logger.error("[securesocial] error retrieving profile information from Google", e) - throw new AuthenticationException() + val m: String = "error retrieving profile information from Google" + logger.error(m, e) + throw new AuthenticationException(m) } } } diff --git a/module-code/app/securesocial/core/providers/InstagramProvider.scala b/module-code/app/securesocial/core/providers/InstagramProvider.scala index 02dd924d1..168e74d44 100644 --- a/module-code/app/securesocial/core/providers/InstagramProvider.scala +++ b/module-code/app/securesocial/core/providers/InstagramProvider.scala @@ -45,8 +45,9 @@ class InstagramProvider(routesService: RoutesService, client.retrieveProfile(GetAuthenticatedUser.format(info.accessToken)).map { me => (me \ "response" \ "user").asOpt[String] match { case Some(msg) => { - logger.error(s"[securesocial] error retrieving profile information from Instagram. Message = $msg") - throw new AuthenticationException() + val m: String = s"error retrieving profile information from Instagram. Message = $msg" + logger.error(m) + throw new AuthenticationException(m) } case _ => val userId = (me \ Data \ Id).as[String] @@ -57,8 +58,9 @@ class InstagramProvider(routesService: RoutesService, } recover { case e: AuthenticationException => throw e case e: Exception => - logger.error("[securesocial] error retrieving profile information from Instagram", e) - throw new AuthenticationException() + val m: String = "error retrieving profile information from Instagram" + logger.error(m, e) + throw new AuthenticationException(m) } } } diff --git a/module-code/app/securesocial/core/providers/LinkedInOAuth2Provider.scala b/module-code/app/securesocial/core/providers/LinkedInOAuth2Provider.scala index caf9aaa84..9597ea5b5 100644 --- a/module-code/app/securesocial/core/providers/LinkedInOAuth2Provider.scala +++ b/module-code/app/securesocial/core/providers/LinkedInOAuth2Provider.scala @@ -40,10 +40,9 @@ class LinkedInOAuth2Provider(routesService: RoutesService, val message = (me \ Message).asOpt[String] val requestId = (me \ RequestId).asOpt[String] val timestamp = (me \ Timestamp).asOpt[String] - logger.error( - s"Error retrieving information from LinkedIn. Error code: $error, requestId: $requestId, message: $message, timestamp: $timestamp" - ) - throw new AuthenticationException() + val m: String = s"Error retrieving information from LinkedIn. Error code: $error, requestId: $requestId, message: $message, timestamp: $timestamp" + logger.error(m) + throw new AuthenticationException(m) } case _ => { val userId = (me \ Id).as[String] @@ -58,8 +57,9 @@ class LinkedInOAuth2Provider(routesService: RoutesService, } recover { case e: AuthenticationException => throw e case e => - logger.error("[securesocial] error retrieving profile information from LinkedIn", e) - throw new AuthenticationException() + val m: String = "error retrieving profile information from LinkedIn" + logger.error(m, e) + throw new AuthenticationException(m) } } } diff --git a/module-code/app/securesocial/core/providers/LinkedInProvider.scala b/module-code/app/securesocial/core/providers/LinkedInProvider.scala index b678a5f3b..45a2c761b 100644 --- a/module-code/app/securesocial/core/providers/LinkedInProvider.scala +++ b/module-code/app/securesocial/core/providers/LinkedInProvider.scala @@ -45,10 +45,9 @@ class LinkedInProvider( val message = (me \ Message).asOpt[String] val requestId = (me \ RequestId).asOpt[String] val timestamp = (me \ Timestamp).asOpt[String] - logger.error( - s"Error retrieving information from LinkedIn. Error code: $error, requestId: $requestId, message: $message, timestamp: $timestamp" - ) - throw new AuthenticationException() + val m: String = s"Error retrieving information from LinkedIn. Error code: $error, requestId: $requestId, message: $message, timestamp: $timestamp" + logger.error(m) + throw new AuthenticationException(m) } case _ => val userId = (me \ Id).as[String] @@ -62,8 +61,9 @@ class LinkedInProvider( } recover { case e: AuthenticationException => throw e case e => - logger.error("[securesocial] error retrieving profile information from LinkedIn", e) - throw new AuthenticationException() + val m: String = "error retrieving profile information from LinkedIn" + logger.error(m, e) + throw new AuthenticationException(m) } } } diff --git a/module-code/app/securesocial/core/providers/TwitterProvider.scala b/module-code/app/securesocial/core/providers/TwitterProvider.scala index bef5a1d71..ea31f9f80 100644 --- a/module-code/app/securesocial/core/providers/TwitterProvider.scala +++ b/module-code/app/securesocial/core/providers/TwitterProvider.scala @@ -45,8 +45,9 @@ class TwitterProvider( BasicProfile(id, userId, None, None, name, None, avatar, authMethod, Some(info)) } recover { case e => - logger.error("[securesocial] error retrieving profile information from Twitter", e) - throw new AuthenticationException() + val m: String = "error retrieving profile information from Twitter" + logger.error(m, e) + throw new AuthenticationException(m) } } } diff --git a/module-code/app/securesocial/core/providers/UsernamePasswordProvider.scala b/module-code/app/securesocial/core/providers/UsernamePasswordProvider.scala index 833a965f2..ff84eb529 100644 --- a/module-code/app/securesocial/core/providers/UsernamePasswordProvider.scala +++ b/module-code/app/securesocial/core/providers/UsernamePasswordProvider.scala @@ -32,7 +32,7 @@ import scala.concurrent.Future /** * A username password provider */ -class UsernamePasswordProvider[U](userService: UserService[U], +class UsernamePasswordProvider[U <: GenericProfile](userService: UserService[U], avatarService: Option[AvatarService], viewTemplates: ViewTemplates, passwordHashers: Map[String, PasswordHasher]) @@ -45,60 +45,60 @@ class UsernamePasswordProvider[U](userService: UserService[U], val InvalidCredentials = "securesocial.login.invalidCredentials" def authenticateForApi(implicit request: Request[AnyContent]): Future[AuthenticationResult] = { - doAuthentication(apiMode = true) + Future.successful(doAuthentication(apiMode = true)) } def authenticate()(implicit request: Request[AnyContent]): Future[AuthenticationResult] = { - doAuthentication() + Future.successful(doAuthentication()) } - private def doAuthentication[A](apiMode: Boolean = false)(implicit request: Request[A]): Future[AuthenticationResult] = { + private def doAuthentication[A](apiMode: Boolean = false)(implicit request: Request[A]): AuthenticationResult = { import scala.concurrent.ExecutionContext.Implicits.global val form = UsernamePasswordProvider.loginForm.bindFromRequest() form.fold( - errors => Future.successful { + errors => { if (apiMode) AuthenticationResult.Failed("Invalid credentials") else AuthenticationResult.NavigationFlow(badRequest(errors)(request)) - }, + } + , credentials => { val userId = credentials._1.toLowerCase - userService.find(id, userId).flatMap { maybeUser => - val loggedIn = for ( - user <- maybeUser; - pinfo <- user.passwordInfo; - hasher <- passwordHashers.get(pinfo.hasher) if hasher.matches(pinfo, credentials._2) - ) yield { - user - } + val maybeUser = userService.find(id, userId) + + val loggedIn : Option[GenericProfile] = for ( + user <- maybeUser; + pinfo <- user.passwordInfo; + hasher <- passwordHashers.get(pinfo.hasher) if hasher.matches(pinfo, credentials._2) + ) yield { + user + } - val authenticatedAndUpdated = for ( - u <- loggedIn; - service <- avatarService; - email <- u.email - ) yield { - service.urlFor(email).map { - case avatar if avatar != u.avatarUrl => u.withAvatarUrl(avatar) - case _ => u - } map { - Authenticated - } + val authenticatedAndUpdated : Option[AuthenticationResult] = for ( + u <- loggedIn; + service <- avatarService; + email <- u.email + ) yield { + service.urlFor(email).map { + case avatar if avatar != u.avatarUrl.get => u.withAvatarUrl(Some(avatar)) + case _ => u + } map { profile => + Authenticated(profile) } + }.get - authenticatedAndUpdated.getOrElse { - Future.successful { - if (apiMode) - AuthenticationResult.Failed("Invalid credentials") - else - NavigationFlow(badRequest(UsernamePasswordProvider.loginForm, Some(InvalidCredentials))) - } - } + authenticatedAndUpdated.getOrElse { + if (apiMode) + AuthenticationResult.Failed("Invalid credentials") + else + NavigationFlow(badRequest(UsernamePasswordProvider.loginForm, Some(InvalidCredentials))) } + }) } - private def badRequest[A](f: Form[(String, String)], msg: Option[String] = None)(implicit request: Request[A]): SimpleResult = { + private def badRequest[A](f: Form[(String, String)], msg: Option[String] = None)(implicit request: Request[A]): Result = { Results.BadRequest(viewTemplates.getLoginPage(f, msg)) } } diff --git a/module-code/app/securesocial/core/providers/VkProvider.scala b/module-code/app/securesocial/core/providers/VkProvider.scala index 34a4b60d1..ac1c58d2f 100644 --- a/module-code/app/securesocial/core/providers/VkProvider.scala +++ b/module-code/app/securesocial/core/providers/VkProvider.scala @@ -33,10 +33,9 @@ class VkProvider(routesService: RoutesService, case Some(error) => val message = (error \ ErrorMessage).as[String] val errorCode = (error \ ErrorCode).as[Int] - logger.error( - s"[securesocial] error retrieving profile information from Vk. Error code = $errorCode, message = $message" - ) - throw new AuthenticationException() + val m: String = s"error retrieving profile information from Vk. Error code = $errorCode, message = $message" + logger.error(m) + throw new AuthenticationException(m) case _ => val me = (json \ Response).apply(0) val userId = (me \ Id).as[Long].toString @@ -48,8 +47,9 @@ class VkProvider(routesService: RoutesService, } recover { case e: AuthenticationException => throw e case e: Exception => - logger.error("[securesocial] error retrieving profile information from VK", e) - throw new AuthenticationException() + val m: String = "error retrieving profile information from VK" + logger.error(m, e) + throw new AuthenticationException(m) } } } diff --git a/module-code/app/securesocial/core/providers/WeiboProvider.scala b/module-code/app/securesocial/core/providers/WeiboProvider.scala index c6b5b9a45..a589f2fef 100644 --- a/module-code/app/securesocial/core/providers/WeiboProvider.scala +++ b/module-code/app/securesocial/core/providers/WeiboProvider.scala @@ -74,15 +74,17 @@ class WeiboProvider(routesService: RoutesService, val accessToken = info.accessToken val weiboUserId = info.tokenType.getOrElse { - logger.error("[securesocial] Can't found weiboUserId") - throw new AuthenticationException() + val m: String = "Can't found weiboUserId" + logger.error(m) + throw new AuthenticationException(m) } client.retrieveProfile(GetAuthenticatedUser.format(weiboUserId, info.accessToken)).flatMap { me => (me \ Message).asOpt[String] match { case Some(msg) => - logger.error("[securesocial] error retrieving profile information from Weibo. Message = %s".format(msg)) - throw new AuthenticationException() + val m: String = "error retrieving profile information from Weibo. Message = %s".format(msg) + logger.error(m) + throw new AuthenticationException(m) case _ => val userId = (me \ Id).as[String] val displayName = (me \ Name).asOpt[String] @@ -93,8 +95,9 @@ class WeiboProvider(routesService: RoutesService, } } recover { case e => - logger.error("[securesocial] error retrieving profile information from weibo", e) - throw new AuthenticationException() + val m: String = "error retrieving profile information from weibo" + logger.error(m, e) + throw new AuthenticationException(m) } } diff --git a/module-code/app/securesocial/core/providers/XingProvider.scala b/module-code/app/securesocial/core/providers/XingProvider.scala index 2dde31e3a..0382b11a2 100644 --- a/module-code/app/securesocial/core/providers/XingProvider.scala +++ b/module-code/app/securesocial/core/providers/XingProvider.scala @@ -49,8 +49,9 @@ class XingProvider( BasicProfile(id, userId, displayName, firstName, lastName, email, profileImage, authMethod, Some(info)) } recover { case e => - logger.error("[securesocial] error retrieving profile information from Xing", e) - throw new AuthenticationException() + val m: String = "error retrieving profile information from Xing" + logger.error(m, e) + throw new AuthenticationException(m) } } } diff --git a/module-code/app/securesocial/core/services/AuthenticatorService.scala b/module-code/app/securesocial/core/services/AuthenticatorService.scala index dc25aac2c..c20c2ed83 100644 --- a/module-code/app/securesocial/core/services/AuthenticatorService.scala +++ b/module-code/app/securesocial/core/services/AuthenticatorService.scala @@ -17,12 +17,13 @@ package securesocial.core.services import play.api.mvc.RequestHeader +import securesocial.core.GenericProfile import scala.concurrent.{ ExecutionContext, Future } import securesocial.core.authenticator.{ Authenticator, AuthenticatorBuilder } import scala.reflect.ClassTag import org.apache.commons.lang3.reflect.TypeUtils -class AuthenticatorService[U](builders: AuthenticatorBuilder[U]*) { +class AuthenticatorService[U <: GenericProfile](builders: AuthenticatorBuilder[U]*) { val asMap = builders.map { builder => builder.id -> builder }.toMap def find(id: String): Option[AuthenticatorBuilder[U]] = { @@ -35,15 +36,15 @@ class AuthenticatorService[U](builders: AuthenticatorBuilder[U]*) { } } - def fromRequest(implicit request: RequestHeader): Future[Option[Authenticator[U]]] = { + def fromRequest(implicit request: RequestHeader): Option[Authenticator[U]] = { import ExecutionContext.Implicits.global - def iterateIt(seq: Seq[AuthenticatorBuilder[U]]): Future[Option[Authenticator[U]]] = { + def iterateIt(seq: Seq[AuthenticatorBuilder[U]]): Option[Authenticator[U]] = { if (seq.isEmpty) - Future.successful(None) + None else { - seq.head.fromRequest(request).flatMap { - case Some(authenticator) => Future.successful(Some(authenticator)) + seq.head.fromRequest(request) match { + case Some(authenticator) => Some(authenticator) case None => iterateIt(seq.tail) } } diff --git a/module-code/app/securesocial/core/services/AvatarService.scala b/module-code/app/securesocial/core/services/AvatarService.scala index b0c9a95d6..46c995f51 100644 --- a/module-code/app/securesocial/core/services/AvatarService.scala +++ b/module-code/app/securesocial/core/services/AvatarService.scala @@ -16,13 +16,14 @@ */ package securesocial.core.services -import scala.concurrent.{ ExecutionContext, Future } +import scala.concurrent.{Await, ExecutionContext, Future} +import scala.concurrent.duration._ /** * A mockable interface for the avatar service */ trait AvatarService { - def urlFor(userId: String): Future[Option[String]] + def urlFor(userId: String): Option[String] } object AvatarService { @@ -39,30 +40,24 @@ object AvatarService { val GravatarUrl = "http://www.gravatar.com/avatar/%s?d=404" val Md5 = "MD5" - override def urlFor(userId: String): Future[Option[String]] = { - import ExecutionContext.Implicits.global - hash(userId).map(hash => { - val url = GravatarUrl.format(hash) - httpService.url(url).get().map { response => - if (response.status == 200) Some(url) else None - } recover { - case e => - logger.error("[securesocial] error invoking gravatar", e) - None + override def urlFor(userId: String): Option[String] = { + if (userId.trim.toLowerCase.isEmpty) { + None; + } else { + val avatarUrl = GravatarUrl.format(hash(userId)) + val response = Await.result(httpService.url(avatarUrl).get(),3.second) + if (response.status == 200) { + Some(avatarUrl) + } else { + None; } - }) getOrElse { - Future.successful(None) } } private def hash(email: String): Option[String] = { val s = email.trim.toLowerCase - if (s.length > 0) { - val out = MessageDigest.getInstance(Md5).digest(s.getBytes) - Some(BigInt(1, out).toString(16)) - } else { - None - } + val out = MessageDigest.getInstance(Md5).digest(s.getBytes) + Some(BigInt(1, out).toString(16)) } } } diff --git a/module-code/app/securesocial/core/services/CacheService.scala b/module-code/app/securesocial/core/services/CacheService.scala index 996805a69..d1d88c252 100644 --- a/module-code/app/securesocial/core/services/CacheService.scala +++ b/module-code/app/securesocial/core/services/CacheService.scala @@ -16,8 +16,6 @@ */ package securesocial.core.services -import scala.concurrent.Future - /** * An interface for the Cache API */ @@ -25,11 +23,11 @@ trait CacheService { import scala.reflect.ClassTag - def set[T](key: String, value: T, ttlInSeconds: Int = 0): Future[Unit] + def set[T](key: String, value: T, ttlInSeconds: Int = 0): Unit - def getAs[T](key: String)(implicit ct: ClassTag[T]): Future[Option[T]] + def getAs[T](key: String)(implicit ct: ClassTag[T]): Option[T] - def remove(key: String): Future[Unit] + def remove(key: String): Unit } object CacheService { @@ -42,15 +40,11 @@ object CacheService { import scala.reflect.ClassTag import play.api.Play.current - override def set[T](key: String, value: T, ttlInSeconds: Int): Future[Unit] = - Future.successful(Cache.set(key, value)) + override def set[T](key: String, value: T, ttlInSeconds: Int): Unit = Cache.set(key, value) + + override def getAs[T](key: String)(implicit ct: ClassTag[T]): Option[T] = Cache.getAs[T](key) - override def getAs[T](key: String)(implicit ct: ClassTag[T]): Future[Option[T]] = Future.successful { - Cache.getAs[T](key) - } + override def remove(key: String): Unit = Cache.remove(key) - override def remove(key: String): Future[Unit] = Future.successful { - Cache.remove(key) - } } } diff --git a/module-code/app/securesocial/core/services/HttpService.scala b/module-code/app/securesocial/core/services/HttpService.scala index 7a9d860f7..9cd9ff9b2 100644 --- a/module-code/app/securesocial/core/services/HttpService.scala +++ b/module-code/app/securesocial/core/services/HttpService.scala @@ -16,11 +16,13 @@ */ package securesocial.core.services +import play.api.libs.ws._ + /** * A mockable interface for the http client */ trait HttpService { - import play.api.libs.ws.WS.WSRequestHolder + def url(url: String): WSRequestHolder } @@ -31,8 +33,6 @@ object HttpService { * A default implementation for HttpService based on the Play WS client. */ class Default extends HttpService { - import play.api.libs.ws.WS - import play.api.libs.ws.WS._ import play.api.Play.current def url(url: String): WSRequestHolder = WS.url(url) diff --git a/module-code/app/securesocial/core/services/UserService.scala b/module-code/app/securesocial/core/services/UserService.scala index 25257a83d..2288df6d2 100644 --- a/module-code/app/securesocial/core/services/UserService.scala +++ b/module-code/app/securesocial/core/services/UserService.scala @@ -20,7 +20,7 @@ import scala.concurrent.Future import securesocial.core.{ PasswordInfo, GenericProfile } import securesocial.core.providers.MailToken -trait UserService[U] { +trait UserService[U <: GenericProfile] { /** * Finds a SocialUser that maches the specified id @@ -29,7 +29,7 @@ trait UserService[U] { * @param userId the user id * @return an optional profile */ - def find(providerId: String, userId: String): Future[Option[GenericProfile]] + def find(providerId: String, userId: String): Option[GenericProfile] /** * Finds a profile by email and provider @@ -38,7 +38,7 @@ trait UserService[U] { * @param providerId - the provider id * @return an optional profile */ - def findByEmailAndProvider(email: String, providerId: String): Future[Option[GenericProfile]] + def findByEmailAndProvider(email: String, providerId: String): Option[GenericProfile] /** * Saves a profile. This method gets called when a user logs in, registers or changes his password. @@ -47,7 +47,7 @@ trait UserService[U] { * @param profile the user profile * @param mode a mode that tells you why the save method was called */ - def save(profile: GenericProfile, mode: SaveMode): Future[U] + def save(profile: GenericProfile, mode: SaveMode): U /** * Links the current user to another profile @@ -55,7 +55,7 @@ trait UserService[U] { * @param current The current user instance * @param to the profile that needs to be linked to */ - def link(current: U, to: GenericProfile): Future[U] + def link(current: U, to: GenericProfile): U /** * Returns an optional PasswordInfo instance for a given user @@ -63,7 +63,7 @@ trait UserService[U] { * @param user a user instance * @return returns an optional PasswordInfo */ - def passwordInfoFor(user: U): Future[Option[PasswordInfo]] + def passwordInfoFor(user: U): Option[PasswordInfo] /** * Updates the PasswordInfo for a given user @@ -72,7 +72,7 @@ trait UserService[U] { * @param info the password info * @return */ - def updatePasswordInfo(user: U, info: PasswordInfo): Future[Option[GenericProfile]] + def updatePasswordInfo(user: U, info: PasswordInfo): Option[GenericProfile] /** * Saves a mail token. This is needed for users that @@ -83,7 +83,7 @@ trait UserService[U] { * * @param token The token to save */ - def saveToken(token: MailToken): Future[MailToken] + def saveToken(token: MailToken): MailToken /** * Finds a token @@ -94,7 +94,7 @@ trait UserService[U] { * @param token the token id * @return */ - def findToken(token: String): Future[Option[MailToken]] + def findToken(token: String): Option[MailToken] /** * Deletes a token @@ -104,7 +104,7 @@ trait UserService[U] { * * @param uuid the token id */ - def deleteToken(uuid: String): Future[Option[MailToken]] + def deleteToken(uuid: String): Option[MailToken] /** * Deletes all expired tokens diff --git a/module-code/app/securesocial/core/utils.scala b/module-code/app/securesocial/core/utils.scala index 765df464c..8571590d4 100644 --- a/module-code/app/securesocial/core/utils.scala +++ b/module-code/app/securesocial/core/utils.scala @@ -16,7 +16,7 @@ */ package securesocial.core -import play.api.mvc.{ Cookies, Session, SimpleResult } +import play.api.mvc.{ Cookies, Session, Result} import play.api.http.HeaderNames import securesocial.core.authenticator.Authenticator @@ -26,13 +26,13 @@ import securesocial.core.authenticator.Authenticator object utils { /** - * Helper methods for SimpleResult - * @param r a SimpleResult instance + * Helper methods for Result + * @param r a Resultinstance */ - implicit class SimpleResultMethods(val r: SimpleResult) { - def startingAuthenticator[A](authenticator: Authenticator[A]) = authenticator.starting(r) - def discardingAuthenticator[A](authenticator: Authenticator[A]) = authenticator.discarding(r) - def touchingAuthenticator[A](authenticator: Authenticator[A]) = authenticator.touching(r) + implicit class ResultMethods(val r: Result) { + def startingAuthenticator[U <: GenericProfile](authenticator: Authenticator[U]) = authenticator.starting(r) + def discardingAuthenticator[U <: GenericProfile](authenticator: Authenticator[U]) = authenticator.discarding(r) + def touchingAuthenticator[U <: GenericProfile](authenticator: Authenticator[U]) = authenticator.touching(r) def addToSession(values: (String, String)*) = { val cookies = Cookies(r.header.headers.get(HeaderNames.SET_COOKIE)) val resultSession = Session.decodeFromCookie(cookies.get(Session.COOKIE_NAME)) diff --git a/module-code/build.sbt b/module-code/build.sbt index 9c4d66da9..b1aa118af 100644 --- a/module-code/build.sbt +++ b/module-code/build.sbt @@ -1,4 +1,4 @@ -name := "SecureSocial" +name := "SecSoc" version := Common.version @@ -14,7 +14,7 @@ libraryDependencies ++= Seq( "org.mockito" % "mockito-all" % "1.9.5" % "test" ) -scalariformSettings +//scalariformSettings resolvers ++= Seq( Resolver.typesafeRepo("releases") diff --git a/samples/scala/demo/app/controllers/Application.scala b/samples/scala/demo/app/controllers/Application.scala index be36bfc50..e92916d38 100644 --- a/samples/scala/demo/app/controllers/Application.scala +++ b/samples/scala/demo/app/controllers/Application.scala @@ -22,7 +22,7 @@ import play.api.mvc.{ Action, RequestHeader } class Application(override implicit val env: RuntimeEnvironment[DemoUser]) extends securesocial.core.SecureSocial[DemoUser] { def index = SecuredAction { implicit request => - Ok(views.html.index(request.user.main)) + Ok(views.html.index(request.user)) } // a sample action using an authorization implementation @@ -37,18 +37,18 @@ class Application(override implicit val env: RuntimeEnvironment[DemoUser]) exten /** * Sample use of SecureSocial.currentUser. Access the /current-user to test it */ - def currentUser = Action.async { implicit request => - import play.api.libs.concurrent.Execution.Implicits._ - SecureSocial.currentUser[DemoUser].map { maybeUser => - val userId = maybeUser.map(_.main.userId).getOrElse("unknown") - Ok(s"Your id is $userId") - } + def currentUser = Action { implicit request => + import scala.concurrent.ExecutionContext.Implicits.global + + val user: Option[GenericProfile] = SecureSocial.currentUser[DemoUser] + val userId = user.map(_.userId).getOrElse("unknown") + Ok(s"Your id is userId") } } // An Authorization implementation that only authorizes uses that logged in using twitter case class WithProvider(provider: String) extends Authorization[DemoUser] { def isAuthorized(user: DemoUser, request: RequestHeader) = { - user.main.providerId == provider + user.providerId == provider } } \ No newline at end of file diff --git a/samples/scala/demo/app/service/InMemoryUserService.scala b/samples/scala/demo/app/service/InMemoryUserService.scala index 5034748a3..95f79bc21 100644 --- a/samples/scala/demo/app/service/InMemoryUserService.scala +++ b/samples/scala/demo/app/service/InMemoryUserService.scala @@ -36,7 +36,7 @@ class InMemoryUserService extends UserService[DemoUser] { //private var identities = Map[String, GenericProfile]() private var tokens = Map[String, MailToken]() - def find(providerId: String, userId: String): Future[Option[GenericProfile]] = { + def find(providerId: String, userId: String): Option[GenericProfile] = { if (logger.isDebugEnabled) { logger.debug("users = %s".format(users)) } @@ -46,10 +46,10 @@ class InMemoryUserService extends UserService[DemoUser] { ) yield { basicProfile } - Future.successful(result.headOption) + result.headOption } - def findByEmailAndProvider(email: String, providerId: String): Future[Option[GenericProfile]] = { + def findByEmailAndProvider(email: String, providerId: String): Option[GenericProfile] = { if (logger.isDebugEnabled) { logger.debug("users = %s".format(users)) } @@ -60,10 +60,10 @@ class InMemoryUserService extends UserService[DemoUser] { ) yield { basicProfile } - Future.successful(result.headOption) + result.headOption } - def save(user: GenericProfile, mode: SaveMode): Future[DemoUser] = { + def save(user: GenericProfile, mode: SaveMode): DemoUser = { mode match { case SaveMode.SignUp => val newUser = DemoUser(user, List(user)) @@ -82,45 +82,41 @@ class InMemoryUserService extends UserService[DemoUser] { val updatedList = identities.patch(identities.indexWhere(i => i.providerId == user.providerId && i.userId == user.userId), Seq(user), 1) val updatedUser = existingUser._2.copy(identities = updatedList) users = users + (existingUser._1 -> updatedUser) - Future.successful(updatedUser) + updatedUser case None => val newUser = DemoUser(user, List(user)) users = users + ((user.providerId, user.userId) -> newUser) - Future.successful(newUser) + newUser } } - def link(current: DemoUser, to: GenericProfile): Future[DemoUser] = { + def link(current: DemoUser, to: GenericProfile): DemoUser = { if (current.identities.exists(i => i.providerId == to.providerId && i.userId == to.userId)) { - Future.successful(current) + current } else { val added = to :: current.identities val updatedUser = current.copy(identities = added) - users = users + ((current.main.providerId, current.main.userId) -> updatedUser) - Future.successful(updatedUser) + users = users + ((current.providerId, current.userId) -> updatedUser) + updatedUser } } - def saveToken(token: MailToken): Future[MailToken] = { - Future.successful { - tokens += (token.uuid -> token) - token - } + def saveToken(token: MailToken): MailToken = { + tokens += (token.uuid -> token) + token } - def findToken(token: String): Future[Option[MailToken]] = { - Future.successful { tokens.get(token) } + def findToken(token: String): Option[MailToken] = { + tokens.get(token) } - def deleteToken(uuid: String): Future[Option[MailToken]] = { - Future.successful { - tokens.get(uuid) match { - case Some(token) => - tokens -= uuid - Some(token) - case None => None - } + def deleteToken(uuid: String): Option[MailToken] = { + tokens.get(uuid) match { + case Some(token) => + tokens -= uuid + Some(token) + case None => None } } @@ -132,33 +128,66 @@ class InMemoryUserService extends UserService[DemoUser] { tokens = tokens.filter(!_._2.isExpired) } - override def updatePasswordInfo(user: DemoUser, info: PasswordInfo): Future[Option[GenericProfile]] = { - Future.successful { - for ( - found <- users.values.find(_ == user); - identityWithPasswordInfo <- found.identities.find(_.providerId == UsernamePasswordProvider.UsernamePassword) - ) yield { - val idx = found.identities.indexOf(identityWithPasswordInfo) - val updated = identityWithPasswordInfo.withPasswordInfo(Some(info)) - val updatedIdentities = found.identities.patch(idx, Seq(updated), 1) - found.copy(identities = updatedIdentities) - updated - } + override def updatePasswordInfo(user: DemoUser, info: PasswordInfo): Option[GenericProfile] = { + for ( + found <- users.values.find(_ == user); + identityWithPasswordInfo <- found.identities.find(_.providerId == UsernamePasswordProvider.UsernamePassword) + ) yield { + val idx = found.identities.indexOf(identityWithPasswordInfo) + val updated = identityWithPasswordInfo.withPasswordInfo(Some(info)) + val updatedIdentities = found.identities.patch(idx, Seq(updated), 1) + found.copy(identities = updatedIdentities) + updated } } - override def passwordInfoFor(user: DemoUser): Future[Option[PasswordInfo]] = { - Future.successful { - for ( - found <- users.values.find(_ == user); - identityWithPasswordInfo <- found.identities.find(_.providerId == UsernamePasswordProvider.UsernamePassword) - ) yield { - identityWithPasswordInfo.passwordInfo.get - } + override def passwordInfoFor(user: DemoUser): Option[PasswordInfo] = { + for ( + found <- users.values.find(_ == user); + identityWithPasswordInfo <- found.identities.find(_.providerId == UsernamePasswordProvider.UsernamePassword) + ) yield { + identityWithPasswordInfo.passwordInfo.get } } } -// a simple User class that can have multiple identities -case class DemoUser(main: GenericProfile, identities: List[GenericProfile]) +case class DemoUser( + providerId: String, + userId: String, + firstName: Option[String], + lastName: Option[String], + fullName: Option[String], + email: Option[String], + avatarUrl: Option[String], + authMethod: AuthenticationMethod, + oAuth1Info: Option[OAuth1Info] = None, + oAuth2Info: Option[OAuth2Info] = None, + passwordInfo: Option[PasswordInfo] = None, + identities: List[GenericProfile] = List()) extends GenericProfile { + + override def withPasswordInfo(passwordInfo: Option[PasswordInfo]) = copy(passwordInfo = passwordInfo) + + override def withAvatarUrl(avatarUrl: Option[String]) = copy(avatarUrl = avatarUrl) +} +// a simple User class that can have multiple identities +//case class DemoUser(identities: List[GenericProfile]) extends GenericProfile + +object DemoUser { + def apply(profile : GenericProfile, identities : List[GenericProfile]) : DemoUser = { + DemoUser( + providerId = profile.providerId, + userId = profile.userId, + firstName = profile.firstName, + lastName = profile.lastName, + fullName = profile.fullName, + email = profile.email, + avatarUrl = profile.avatarUrl, + authMethod = profile.authMethod, + oAuth1Info = profile.oAuth1Info, + oAuth2Info = profile.oAuth2Info, + passwordInfo = profile.passwordInfo, + identities = identities + ) + } +} diff --git a/samples/scala/demo/app/service/MyEventListener.scala b/samples/scala/demo/app/service/MyEventListener.scala index 410e30008..9702fe8c2 100644 --- a/samples/scala/demo/app/service/MyEventListener.scala +++ b/samples/scala/demo/app/service/MyEventListener.scala @@ -33,7 +33,7 @@ class MyEventListener extends EventListener[DemoUser] { case PasswordChangeEvent(u) => "password change" } - Logger.info("traced %s event for user %s".format(eventName, event.user.main.userId)) + Logger.info("traced %s event for user %s".format(eventName, event.user.userId)) // retrieving the current language Logger.info("current language is %s".format(request2lang(request))) diff --git a/samples/scala/demo/app/views/linkResult.scala.html b/samples/scala/demo/app/views/linkResult.scala.html index d4b858ac9..e1fdef80f 100644 --- a/samples/scala/demo/app/views/linkResult.scala.html +++ b/samples/scala/demo/app/views/linkResult.scala.html @@ -2,7 +2,7 @@ @main("SecureSocial - Account Link Result") {
      -

      @current.main.firstName.getOrElse( Hey @current.main.firstName.getOrElse("")

      +

      @current.firstName.getOrElse( Hey @current.firstName.getOrElse("")

      diff --git a/samples/scala/demo/scalaDemo.sbt b/samples/scala/demo/scalaDemo.sbt index 8870a3fa8..5ddd69d59 100644 --- a/samples/scala/demo/scalaDemo.sbt +++ b/samples/scala/demo/scalaDemo.sbt @@ -4,7 +4,7 @@ version := Common.version scalaVersion := Common.scalaVersion -scalariformSettings +//scalariformSettings libraryDependencies += "ws.securesocial" %% "securesocial" % version.value From 0e13353d5be65826933415691c090dfaaf010f6e Mon Sep 17 00:00:00 2001 From: Leonid Vygovskiy Date: Fri, 30 Jan 2015 02:03:13 +0300 Subject: [PATCH 07/10] Add information about SecSoc to readme. --- README.textile | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/README.textile b/README.textile index 31ff157ef..0a2592327 100644 --- a/README.textile +++ b/README.textile @@ -1,15 +1,24 @@ -h1. SecureSocial for Play 2 +h1. SecSoc for Play 2 -SecureSocial allows you to add an authentication UI to your app that works with services based on OAuth1, OAuth2 and OpenID protocols. SecureSocial provides Scala and Java APIs so you can integrate it using your preferred language. +SecSoc allows you to add an authentication to your app that works with services based on OAuth1, OAuth2 and OpenID protocols. +SecSoc provides only Scala APIs. -Check the project web site for more information: http://www.securesocial.ws +h2. SecureSocial +SesSoc is fork from SecureSocial project (http://www.securesocial.ws). -h1. SecureSocial for Play 1.x +SecureSocial written by Jorge Aliss (@jaliss) -The old version of SecureSocial is under the 1.x branch now. The 'master' branch is for the Play 2 version only. +h2. Difference from SecureSocial +Main goal of SecSoc is light version of SecureSocial. So SecSoc miss next SecureSocial features: -Written by Jorge Aliss (@jaliss) +* Java API. I don't write in Java so can't support it. +* UI support. Authentication UI is good for very quick start. But it also make your project not flexible. For example, + integrate single page authentication and registration is not possible in standard SecureSocial UI. +* Async support. I removed most of Future from function return to plain. I think that it's very overused in SecureSocial +(may be I'm wrong). + +Any way, if you need these features you should take original SecureSocial library. h2. License -SecureSocial is distributed under the "Apache License, Version 2.0":http://www.apache.org/licenses/LICENSE-2.0.html. +SecSoc is distributed under the "Apache License, Version 2.0":http://www.apache.org/licenses/LICENSE-2.0.html. From e9a149f3591e7922dea0176d59e162da1bd3d4a7 Mon Sep 17 00:00:00 2001 From: Leonid Vygovskiy Date: Fri, 30 Jan 2015 02:03:39 +0300 Subject: [PATCH 08/10] Update README.textile --- README.textile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.textile b/README.textile index 0a2592327..074f549f3 100644 --- a/README.textile +++ b/README.textile @@ -4,11 +4,13 @@ SecSoc allows you to add an authentication to your app that works with services SecSoc provides only Scala APIs. h2. SecureSocial + SesSoc is fork from SecureSocial project (http://www.securesocial.ws). SecureSocial written by Jorge Aliss (@jaliss) h2. Difference from SecureSocial + Main goal of SecSoc is light version of SecureSocial. So SecSoc miss next SecureSocial features: * Java API. I don't write in Java so can't support it. From 9bee92f8323ff20183a51fd1f778d711b42a0591 Mon Sep 17 00:00:00 2001 From: Leonid Vygovskiy Date: Sat, 31 Jan 2015 02:33:44 +0300 Subject: [PATCH 09/10] Adds publish to bintray --- module-code/build.sbt | 15 ++++++--------- module-code/project/plugins.sbt | 9 +++++++++ project/Common.scala | 2 +- project/plugins.sbt | 9 ++++++++- samples/scala/demo/scalaDemo.sbt | 4 +++- securesocial.sbt | 2 ++ 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/module-code/build.sbt b/module-code/build.sbt index b1aa118af..b49ef6453 100644 --- a/module-code/build.sbt +++ b/module-code/build.sbt @@ -1,3 +1,5 @@ +organization := "io.github.secsoc" + name := "SecSoc" version := Common.version @@ -15,28 +17,23 @@ libraryDependencies ++= Seq( ) //scalariformSettings +seq(bintrayPublishSettings:_*) resolvers ++= Seq( Resolver.typesafeRepo("releases") ) -organization := "io.github.secsoc" organizationName := "SecSoc" + publishMavenStyle := true publishArtifact in Test := false pomIncludeRepository := { _ => false } -publishTo := { - val nexus = "https://oss.sonatype.org/" - if (version.value.trim.endsWith("SNAPSHOT")) - Some("snapshots" at nexus + "content/repositories/snapshots") - else - Some("releases" at nexus + "service/local/staging/deploy/maven2") -} + startYear := Some(2015) @@ -44,7 +41,7 @@ description := """An authentication module for Play Framework applications suppo It's lite fork of SecureSocial project, that exclude any default UI and Java support. It's allow only core functions of authentications. """ -licenses := Seq("The Apache Software License, Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")) +licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")) homepage := Some(url("http://leonidv.github.io/secsoc")) diff --git a/module-code/project/plugins.sbt b/module-code/project/plugins.sbt index 9483a9f01..74830bf2d 100644 --- a/module-code/project/plugins.sbt +++ b/module-code/project/plugins.sbt @@ -4,8 +4,17 @@ logLevel := Level.Warn // The Typesafe repository resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/" +resolvers += Resolver.url( + "bintray-sbt-plugin-releases", + url("https://dl.bintray.com/content/sbt/sbt-plugin-releases"))( + Resolver.ivyStylePatterns) + // Use the Play sbt plugin for Play projects addSbtPlugin("com.typesafe.play" % "sbt-plugin" % System.getProperty("play.version")) // PGP signing addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8") + + + +addSbtPlugin("me.lessis" % "bintray-sbt" % "0.1.2") diff --git a/project/Common.scala b/project/Common.scala index ecb64103e..7ce7f9bf0 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -2,7 +2,7 @@ import sbt._ import Keys._ object Common { - def version = "master-SNAPSHOT" + def version = "0.1" def playVersion = System.getProperty("play.version", "2.3.7") def scalaVersion = System.getProperty("scala.version", "2.11.4") } diff --git a/project/plugins.sbt b/project/plugins.sbt index d6fddbcdb..21500a6e0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,9 +1,14 @@ // Comment to get more information during initialization -logLevel := Level.Warn +//logLevel := Level.Warn // The Typesafe repository resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/" +resolvers += Resolver.url( + "bintray-sbt-plugin-releases", + url("https://dl.bintray.com/content/sbt/sbt-plugin-releases"))( + Resolver.ivyStylePatterns) + // Use the Play sbt plugin for Play projects addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.7") @@ -12,3 +17,5 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0") // PGP signing addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3") + +addSbtPlugin("me.lessis" % "bintray-sbt" % "0.1.2") diff --git a/samples/scala/demo/scalaDemo.sbt b/samples/scala/demo/scalaDemo.sbt index 5ddd69d59..d56faae7d 100644 --- a/samples/scala/demo/scalaDemo.sbt +++ b/samples/scala/demo/scalaDemo.sbt @@ -1,3 +1,5 @@ +organization := "io.github.secsoc" + name := "scala-demo" version := Common.version @@ -6,7 +8,7 @@ scalaVersion := Common.scalaVersion //scalariformSettings -libraryDependencies += "ws.securesocial" %% "securesocial" % version.value +libraryDependencies += "io.github.secsoc" %% "secsoc" % version.value resolvers += Resolver.sonatypeRepo("snapshots") diff --git a/securesocial.sbt b/securesocial.sbt index 1fe64ffc5..16dc3fbba 100644 --- a/securesocial.sbt +++ b/securesocial.sbt @@ -1,3 +1,5 @@ +organization := "io.github.secsoc" + name := "SecSoc-parent" version := Common.version From 0e574ba90bf94734867e71bc894be4b4855063f5 Mon Sep 17 00:00:00 2001 From: Leonid Vygovskiy Date: Wed, 4 Feb 2015 02:05:12 +0300 Subject: [PATCH 10/10] Version is changed to 1.0-SNAPSHOT --- project/Common.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Common.scala b/project/Common.scala index 7ce7f9bf0..b4a2f9e55 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -2,7 +2,7 @@ import sbt._ import Keys._ object Common { - def version = "0.1" + def version = "1.0-SNAPSHOT" def playVersion = System.getProperty("play.version", "2.3.7") def scalaVersion = System.getProperty("scala.version", "2.11.4") }