diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html index a065e66..0bd5f99 100644 --- a/src/main/twirl/gitbucket/core/account/application.scala.html +++ b/src/main/twirl/gitbucket/core/account/application.scala.html @@ -2,7 +2,6 @@ personalTokens: List[gitbucket.core.model.AccessToken], gneratedToken: Option[(gitbucket.core.model.AccessToken, String)])(implicit context: gitbucket.core.controller.Context) @gitbucket.core.html.main("Applications"){ -
@gitbucket.core.account.html.menu("application", context.settings.ssh){
Personal access tokens
@@ -49,5 +48,4 @@
} -
} diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html index 757e068..9237745 100644 --- a/src/main/twirl/gitbucket/core/account/edit.scala.html +++ b/src/main/twirl/gitbucket/core/account/edit.scala.html @@ -2,7 +2,6 @@ @import gitbucket.core.util.LDAPUtil @import gitbucket.core.view.helpers @gitbucket.core.html.main("Edit your profile"){ -
@gitbucket.core.account.html.menu("profile", context.settings.ssh){ @gitbucket.core.helper.html.information(info) @gitbucket.core.helper.html.error(error) @@ -61,7 +60,6 @@
} - } - +
  • - @label @if(count > 0) { @count } + + @label + @if(count > 0){ + @count + } } else { - @label @if(count > 0) { @count } + + @label + @if(count > 0) { + @count + } }
    • } -
    -
    -
      - @menuitem("", "files", "Files", "code") - @if(repository.branchList.nonEmpty) { - @menuitem("/branches", "branches", "Branches", "git-branch", repository.branchList.length) - @menuitem("/tags", "tags", "Tags", "tag", repository.tags.length) +
      +
      +
        + @menuitem("", "files", "Files", "code") + @if(repository.branchList.nonEmpty) { + @menuitem("/branches", "branches", "Branches", "git-branch", repository.branchList.length) + @menuitem("/tags", "tags", "Tags", "tag", repository.tags.length) + } + @if(repository.repository.options.issuesOption != "DISABLE") { + @menuitem("/issues", "issues", "Issues", "issue-opened", repository.issueCount) + @menuitem("/pulls", "pulls", "Pull requests", "git-pull-request", repository.pullCount) + @menuitem("/issues/labels", "labels", "Labels", "tag") + @menuitem("/issues/milestones", "milestones", "Milestones", "milestone") + } else { + @repository.repository.options.externalIssuesUrl.map { externalIssuesUrl => + @menuitem(externalIssuesUrl, "issues", "Issues", "issue-opened") } - @if(repository.repository.options.issuesOption != "DISABLE") { - @menuitem("/issues", "issues", "Issues", "issue-opened", repository.issueCount) - @menuitem("/pulls", "pulls", "Pull requests", "git-pull-request", repository.pullCount) - @menuitem("/issues/labels", "labels", "Labels", "tag") - @menuitem("/issues/milestones", "milestones", "Milestones", "milestone") - } else { - @repository.repository.options.externalIssuesUrl.map { externalIssuesUrl => - @menuitem(externalIssuesUrl, "issues", "Issues", "issue-opened") - } + } + @if(repository.repository.options.wikiOption != "DISABLE") { + @menuitem("/wiki", "wiki", "Wiki", "book") + } else { + @repository.repository.options.externalWikiUrl.map { externalWikiUrl => + @menuitem(externalWikiUrl, "wiki", "Wiki", "book") } - @if(repository.repository.options.wikiOption != "DISABLE") { - @menuitem("/wiki", "wiki", "Wiki", "book") - } else { - @repository.repository.options.externalWikiUrl.map { externalWikiUrl => - @menuitem(externalWikiUrl, "wiki", "Wiki", "book") - } + } + @if(repository.repository.options.allowFork) { + @menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount) + } + @if(context.loginAccount.isDefined && (context.loginAccount.get.isAdmin || repository.managers.contains(context.loginAccount.get.userName))){ + @menuitem("/settings", "settings", "Settings", "tools") + } + @gitbucket.core.plugin.PluginRegistry().getRepositoryMenus.map { menu => + @menu(repository, context).map { link => + @menuitem(link.path, link.id, link.label, link.icon.getOrElse("ruby")) } - @if(repository.repository.options.allowFork) { - @menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount) - } - @if(context.loginAccount.isDefined && (context.loginAccount.get.isAdmin || repository.managers.contains(context.loginAccount.get.userName))){ - @menuitem("/settings", "settings", "Settings", "tools") - } - @gitbucket.core.plugin.PluginRegistry().getRepositoryMenus.map { menu => - @menu(repository, context).map { link => - @menuitem(link.path, link.id, link.label, link.icon.getOrElse("ruby")) - } - } -
      -
      + } +
    -
    -
    -
    -
    - @gitbucket.core.helper.html.information(info) - @gitbucket.core.helper.html.error(error) -
    - @gitbucket.core.helper.html.repositoryicon(repository, true) - @repository.owner / @repository.name +
    +
    +
    +
    +
    + @gitbucket.core.helper.html.information(info) + @gitbucket.core.helper.html.error(error) +
    + @gitbucket.core.helper.html.repositoryicon(repository, true) + @repository.owner / @repository.name - @defining(repository.repository){ x => - @if(repository.repository.originRepositoryName.isDefined){ -
    - forked from @x.parentUserName/@x.parentRepositoryName -
    - } - @x.description.map { description => -
    @Html(helpers.detectAndRenderLinks(description, repository))
    - } + @defining(repository.repository){ x => + @if(repository.repository.originRepositoryName.isDefined){ +
    + forked from @x.parentUserName/@x.parentRepositoryName +
    } -
    + @x.description.map { description => +
    @Html(helpers.detectAndRenderLinks(description, repository))
    + } + }
    - @body
    + @body
    diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index bff9c48..4e22054 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -264,14 +264,6 @@ border-radius: 3px; } -li.repo-link, li.page-link { - padding-top: 4px; - padding-bottom: 4px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - div.box-content-bottom { background-color: white; border: 1px solid #d8d8d8; @@ -1842,3 +1834,15 @@ -o-transition: none !important; transition: none !important; } + +body.sidebar-collapse .main-sidebar li.menu-item-hover:not(:hover) span.pull-right-container { + display: inline !important; + position: absolute; + top: 8px; + right: 0px; + font-size: 9px; +} + +body.sidebar-collapse .main-sidebar li.treeview:not(:hover) span.pull-right-container span.label { + padding: 2px 4px; +}