diff --git a/src/main/scala/app/IndexController.scala b/src/main/scala/app/IndexController.scala index ddf888d..b710ea5 100644 --- a/src/main/scala/app/IndexController.scala +++ b/src/main/scala/app/IndexController.scala @@ -2,12 +2,13 @@ import service._ -class IndexController extends IndexControllerBase with RepositoryService with AccountService +class IndexController extends IndexControllerBase with RepositoryService with AccountService with SystemSettingsService -trait IndexControllerBase extends ControllerBase { self: RepositoryService => +trait IndexControllerBase extends ControllerBase { self: RepositoryService with SystemSettingsService => get("/"){ - html.index(getAccessibleRepositories(context.loginAccount, baseUrl)) + html.index(getAccessibleRepositories(context.loginAccount, baseUrl), loadSystemSettings(), + context.loginAccount.map{ account => getRepositoryNamesOfUser(account.userName) }.getOrElse(Nil)) } } \ No newline at end of file diff --git a/src/main/scala/app/SignInController.scala b/src/main/scala/app/SignInController.scala index babc1fd..e840c77 100644 --- a/src/main/scala/app/SignInController.scala +++ b/src/main/scala/app/SignInController.scala @@ -31,7 +31,7 @@ get("/signout"){ session.invalidate - redirect("/signin") + redirect("/") } } \ No newline at end of file diff --git a/src/main/twirl/account/useredit.scala.html b/src/main/twirl/account/useredit.scala.html index 8c64348..2c97247 100644 --- a/src/main/twirl/account/useredit.scala.html +++ b/src/main/twirl/account/useredit.scala.html @@ -1,7 +1,12 @@ @(account: Option[model.Account])(implicit context: app.Context) @import context._ @import view.helpers._ -@html.main((if(account.isDefined) "Your Profile" else "Create account")){ +@html.main((if(account.isDefined) "Edit your profile" else "Create your account")){ + @if(account.isDefined){ +

Edit your profile

+ } else { +

Create your account

+ }
@if(account.isEmpty){
diff --git a/src/main/twirl/index.scala.html b/src/main/twirl/index.scala.html index 40adbc3..4cab6a0 100644 --- a/src/main/twirl/index.scala.html +++ b/src/main/twirl/index.scala.html @@ -1,11 +1,14 @@ -@(repositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context) +@(repositories: List[service.RepositoryService.RepositoryInfo], systemSettings: service.SystemSettingsService.SystemSettings, + userRepositories: List[String])(implicit context: app.Context) @import context._ @import view.helpers._ @main("GitBucket"){ +
+

Recent updated repositories

@repositories.map { repository =>
-
+
@repository.owner / @repository.name @@ -19,4 +22,23 @@
Last updated: @datetime(repository.repository.lastActivityDate)
} +
+
+ @if(loginAccount.isEmpty){ + @signinform(systemSettings) + } else { + + + + + @userRepositories.map { repositoryName => + + + + } +
Your repositories (@userRepositories.size)
@repositoryName
+ } +
+ +
} \ No newline at end of file diff --git a/src/main/twirl/signin.scala.html b/src/main/twirl/signin.scala.html index 0d0a659..abe033e 100644 --- a/src/main/twirl/signin.scala.html +++ b/src/main/twirl/signin.scala.html @@ -1,18 +1,7 @@ @(systemSettings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context) @import context._ @main("Sign in"){ - - - - - - - -
- - @if(systemSettings.allowAccountRegistration){ - Create new account - } -
- + } diff --git a/src/main/twirl/signinform.scala.html b/src/main/twirl/signinform.scala.html new file mode 100644 index 0000000..1984597 --- /dev/null +++ b/src/main/twirl/signinform.scala.html @@ -0,0 +1,25 @@ +@(systemSettings: service.SystemSettingsService.SystemSettings)(implicit context: app.Context) +@import context._ + + + + + + + +
Sign in
+
+ + + + + + +
+ + @if(systemSettings.allowAccountRegistration){ + Create new account + } +
+
+
\ No newline at end of file diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index a78187b..3c0497f 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -172,6 +172,11 @@ margin-bottom: 4px; } +div.signin-form { + width: 350px; + margin: 30px auto; +} + /****************************************************************************/ /* Repository Viewer */ /****************************************************************************/