diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala index b308c5f..6bbf6b7 100644 --- a/src/main/scala/gitbucket/core/view/helpers.scala +++ b/src/main/scala/gitbucket/core/view/helpers.scala @@ -412,4 +412,30 @@ */ def readableSize(size: Option[Long]): String = FileUtil.readableSize(size.getOrElse(0)) + + /** + * + * @param icon icon name: fa-* or octicon-*, for compatibility, it accepts name of octicon without octicon- prefix. + * @return icon tag String + */ + def menuicon(icon:String): Html = { + icon match { + case i if i.startsWith("fa-") => + Html(s"""""") + case i if i.startsWith("octicon-") => + Html(s"""""") + case i => + Html(s"""""") + } + } + + /** + * make menu icon with octicon/font-awesome with Option[String] + * @param icon icon name: fa-* or octicon-*, for compatibility, it accepts name of octicon without octicon- prefix. + * @param defaultIcon default name for icon == None + * @return icon tag String + */ + def menuicon(icon: Option[String], defaultIcon: String): Html = { + menuicon(icon.getOrElse(defaultIcon)) + } } diff --git a/src/main/twirl/gitbucket/core/account/menu.scala.html b/src/main/twirl/gitbucket/core/account/menu.scala.html index a36bb9a..fab98ae 100644 --- a/src/main/twirl/gitbucket/core/account/menu.scala.html +++ b/src/main/twirl/gitbucket/core/account/menu.scala.html @@ -1,22 +1,35 @@ @(active: String, ssh: Boolean)(body: Html)(implicit context: gitbucket.core.controller.Context) +@import gitbucket.core.view.helpers