diff --git a/src/main/twirl/account/repositories.scala.html b/src/main/twirl/account/repositories.scala.html index 100c2b4f6..1ad52dfa8 100644 --- a/src/main/twirl/account/repositories.scala.html +++ b/src/main/twirl/account/repositories.scala.html @@ -9,19 +9,24 @@ } else { @repositories.map { repository =>
-
- @repository.name - @if(repository.repository.isPrivate){ - - } +
+ @helper.html.repositoryicon(repository, true) +
+
+
+ @repository.name + @if(repository.repository.isPrivate){ + + } +
+ @if(repository.repository.originUserName.isDefined){ + + } + @if(repository.repository.description.isDefined){ +
@repository.repository.description
+ } +
Last updated: @datetime(repository.repository.lastActivityDate)
- @if(repository.repository.originUserName.isDefined){ - - } - @if(repository.repository.description.isDefined){ -
@repository.repository.description
- } -
Last updated: @datetime(repository.repository.lastActivityDate)
} } diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html index 39b156621..165343d54 100644 --- a/src/main/twirl/header.scala.html +++ b/src/main/twirl/header.scala.html @@ -11,15 +11,7 @@
}
- @if(repository.repository.isPrivate){ - - } else { - @if(repository.repository.originUserName.isDefined){ - - } else { - - } - } + @helper.html.repositoryicon(repository, true) @repository.owner / @repository.name @defining(repository.repository){ x => diff --git a/src/main/twirl/helper/repositoryicon.scala.html b/src/main/twirl/helper/repositoryicon.scala.html new file mode 100644 index 000000000..95daa2db2 --- /dev/null +++ b/src/main/twirl/helper/repositoryicon.scala.html @@ -0,0 +1,12 @@ +@(repository: service.RepositoryService.RepositoryInfo, large: Boolean)(implicit context: app.Context) +@import context._ +@import view.helpers._ +@if(repository.repository.isPrivate){ + +} else { + @if(repository.repository.originUserName.isDefined){ + + } else { + + } +} diff --git a/src/main/twirl/index.scala.html b/src/main/twirl/index.scala.html index 21db2e0e2..9e352c098 100644 --- a/src/main/twirl/index.scala.html +++ b/src/main/twirl/index.scala.html @@ -30,15 +30,7 @@ @userRepositories.map { repository => - @if(repository.repository.isPrivate){ - - } else { - @if(repository.repository.originUserName.isDefined){ - - } else { - - } - } + @helper.html.repositoryicon(repository, false) @if(repository.owner == loginAccount.get.userName){ @repository.name } else { @@ -57,7 +49,7 @@ Recent updated repositories - @if(recentRepositories.isEmpty){ + @if(recentRepositories.isEmpty){2 No repositories @@ -65,15 +57,7 @@ @recentRepositories.map { repository => - @if(repository.repository.isPrivate){ - - } else { - @if(repository.repository.originUserName.isDefined){ - - } else { - - } - } + @helper.html.repositoryicon(repository, false) @repository.owner/@repository.name diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index c8cd50188..fae4d3b73 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -376,6 +376,17 @@ ul.nav-stacked.side-menu li.active a:hover { -moz-border-radius-bottomleft: 0px; } +/****************************************************************************/ +/* Repositories */ +/****************************************************************************/ +div.repository-icon { + position: absolute; +} + +div.repository-content { + margin-left: 40px; +} + /****************************************************************************/ /* Activity */ /****************************************************************************/