diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala index 570e9b1..1934938 100644 --- a/src/main/scala/gitbucket/core/view/helpers.scala +++ b/src/main/scala/gitbucket/core/view/helpers.scala @@ -222,8 +222,14 @@ * Generates the avatar link to the account page. * If user does not exist or disabled, this method returns avatar image without link. */ - def avatarLink(userName: String, size: Int, mailAddress: String = "", tooltip: Boolean = false)(implicit context: Context): Html = - userWithContent(userName, mailAddress)(avatar(userName, size, tooltip, mailAddress)) + def avatarLink(userName: String, size: Int, mailAddress: String = "", tooltip: Boolean = false, label: Boolean = false) + (implicit context: Context): Html = { + + val avatarHtml = avatar(userName, size, tooltip, mailAddress) + val contentHtml = if(label == true) Html(avatarHtml.body + " " + userName) else avatarHtml + + userWithContent(userName, mailAddress)(contentHtml) + } /** * Generates the avatar link to the account page. @@ -232,7 +238,8 @@ def avatarLink(commit: JGitUtil.CommitInfo, size: Int)(implicit context: Context): Html = userWithContent(commit.authorName, commit.authorEmailAddress)(avatar(commit, size)) - private def userWithContent(userName: String, mailAddress: String = "", styleClass: String = "")(content: Html)(implicit context: Context): Html = + private def userWithContent(userName: String, mailAddress: String = "", styleClass: String = "")(content: Html) + (implicit context: Context): Html = (if(mailAddress.isEmpty){ getAccountByUserName(userName) } else { diff --git a/src/main/twirl/gitbucket/core/account/main.scala.html b/src/main/twirl/gitbucket/core/account/main.scala.html index 8238341..9a074b6 100644 --- a/src/main/twirl/gitbucket/core/account/main.scala.html +++ b/src/main/twirl/gitbucket/core/account/main.scala.html @@ -3,29 +3,37 @@ @import context._ @import gitbucket.core.view.helpers._ @html.main(account.userName){ -
-
-
- - - +
+