From ba618915104c2cee782953c08c6e6ab20f97dafb Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 27 Mar 2016 19:05:09 +0900 Subject: [PATCH 1/3] Move the repository menu to the sidebar --- .../core/account/application.scala.html | 88 +++++++++--------- .../gitbucket/core/account/edit.scala.html | 13 +-- .../gitbucket/core/account/main.scala.html | 93 +++++++++---------- .../gitbucket/core/account/menu.scala.html | 2 +- .../gitbucket/core/account/ssh.scala.html | 64 ++++++------- .../gitbucket/core/admin/menu.scala.html | 38 ++++---- src/main/twirl/gitbucket/core/main.scala.html | 2 +- src/main/twirl/gitbucket/core/menu.scala.html | 37 ++++---- .../gitbucket/core/settings/menu.scala.html | 50 +++++----- .../twirl/gitbucket/core/wiki/page.scala.html | 31 +++---- .../webapp/assets/common/css/gitbucket.css | 5 + 11 files changed, 202 insertions(+), 221 deletions(-) diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html index de74c01f2..9275cc286 100644 --- a/src/main/twirl/gitbucket/core/account/application.scala.html +++ b/src/main/twirl/gitbucket/core/account/application.scala.html @@ -5,56 +5,52 @@ @import gitbucket.core.view.helpers._ @html.main("Applications"){
-
-
- @menu("application", settings.ssh) -
-
-
-
Personal access tokens
-
- @if(personalTokens.isEmpty && gneratedToken.isEmpty){ - No tokens. - } else { - Tokens you have generated that can be used to access the GitBucket API. -
- } - @gneratedToken.map{ case (token, tokenString) => -
- Make sure to copy your new personal access token now. You won't be able to see it again! -
- Delete -
- @helper.html.copy("generated-token-copy", tokenString){ - - } -
-
- } - @personalTokens.zipWithIndex.map { case (token, i) => - @if(i != 0){ -
+ @menu("application", settings.ssh) +
+
+
Personal access tokens
+
+ @if(personalTokens.isEmpty && gneratedToken.isEmpty){ + No tokens. + } else { + Tokens you have generated that can be used to access the GitBucket API. +
+ } + @gneratedToken.map{ case (token, tokenString) => +
+ Make sure to copy your new personal access token now. You won't be able to see it again! +
+ Delete +
+ @helper.html.copy("generated-token-copy", tokenString){ + } - @token.note - Delete +
+
+ } + @personalTokens.zipWithIndex.map { case (token, i) => + @if(i != 0){ +
} + @token.note + Delete + } +
+
+
+
+
Generate new token
+
+
+ +
+ +

What's this token for?

+
+
- -
-
Generate new token
-
-
- -
- -

What's this token for?

-
- -
-
-
-
+
} diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html index a549edeb5..3520ca751 100644 --- a/src/main/twirl/gitbucket/core/account/edit.scala.html +++ b/src/main/twirl/gitbucket/core/account/edit.scala.html @@ -4,14 +4,11 @@ @import gitbucket.core.view.helpers._ @html.main("Edit your profile"){
-
-
- @menu("profile", settings.ssh) -
-
- @helper.html.information(info) - @if(LDAPUtil.isDummyMailAddress(account)){
Please register your mail address.
} -
+ @menu("profile", settings.ssh) +
+ @helper.html.information(info) + @if(LDAPUtil.isDummyMailAddress(account)){
Please register your mail address.
} +
Profile
diff --git a/src/main/twirl/gitbucket/core/account/main.scala.html b/src/main/twirl/gitbucket/core/account/main.scala.html index aa193d3ee..17f642461 100644 --- a/src/main/twirl/gitbucket/core/account/main.scala.html +++ b/src/main/twirl/gitbucket/core/account/main.scala.html @@ -4,56 +4,51 @@ @import gitbucket.core.view.helpers._ @html.main(account.userName){
-
-
-
-
- - - -
-
- @if(account.url.isDefined){ - - } -
Joined on @date(account.registeredDate)
-
- @if(groupNames.nonEmpty){ -
-
Groups
- @groupNames.map { groupName => - @avatarLink(groupName, 36, tooltip = true) - } -
- } - -
-
- - @body -
+
+
+ + +
+
+ @if(account.url.isDefined){ + + } +
Joined on @date(account.registeredDate)
+
+ @if(groupNames.nonEmpty){ +
+
Groups
+ @groupNames.map { groupName => + @avatarLink(groupName, 36, tooltip = true) + } +
+ } +
+
+ + @body
} diff --git a/src/main/twirl/gitbucket/core/account/menu.scala.html b/src/main/twirl/gitbucket/core/account/menu.scala.html index ef4fbc5d9..2125e3b77 100644 --- a/src/main/twirl/gitbucket/core/account/menu.scala.html +++ b/src/main/twirl/gitbucket/core/account/menu.scala.html @@ -1,6 +1,6 @@ @(active: String, ssh: Boolean)(implicit context: gitbucket.core.controller.Context) @import context._ -
+
    Profile diff --git a/src/main/twirl/gitbucket/core/account/ssh.scala.html b/src/main/twirl/gitbucket/core/account/ssh.scala.html index 24f40f019..1e463858a 100644 --- a/src/main/twirl/gitbucket/core/account/ssh.scala.html +++ b/src/main/twirl/gitbucket/core/account/ssh.scala.html @@ -4,45 +4,41 @@ @import gitbucket.core.view.helpers._ @html.main("SSH Keys"){
    -
    -
    - @menu("ssh", settings.ssh) + @menu("ssh", settings.ssh) +
    +
    +
    SSH Keys
    +
    + @if(sshKeys.isEmpty){ + No keys + } + @sshKeys.zipWithIndex.map { case (key, i) => + @if(i != 0){ +
    + } + @key.title (@SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid.")) + Delete + } +
    -
    +
    -
    SSH Keys
    +
    Add an SSH Key
    - @if(sshKeys.isEmpty){ - No keys - } - @sshKeys.zipWithIndex.map { case (key, i) => - @if(i != 0){ -
    - } - @key.title (@SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid.")) - Delete - } +
    + +
    + +
    +
    + +
    + +
    +
    - -
    -
    Add an SSH Key
    -
    -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    +
    } diff --git a/src/main/twirl/gitbucket/core/admin/menu.scala.html b/src/main/twirl/gitbucket/core/admin/menu.scala.html index eac843ea2..d88465988 100644 --- a/src/main/twirl/gitbucket/core/admin/menu.scala.html +++ b/src/main/twirl/gitbucket/core/admin/menu.scala.html @@ -1,25 +1,23 @@ @(active: String)(body: Html)(implicit context: gitbucket.core.controller.Context) @import context._
    -
    -
    - -
    -
    - @body -
    +
    + +
    +
    + @body
    \ No newline at end of file diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html index 97d457ff3..33b43d111 100644 --- a/src/main/twirl/gitbucket/core/main.scala.html +++ b/src/main/twirl/gitbucket/core/main.scala.html @@ -44,7 +44,7 @@
    - @body +
      + @menuitem("" ,"files" ,"Files") + @if(repository.commitCount != 0) { + @menuitem("/branches" ,"branches" ,"Branches", repository.branchList.length) + @menuitem("/tags" ,"tags" ,"Tags", repository.tags.length) + } + @menuitem("/issues" ,"issues" ,"Issues", repository.issueCount) + @menuitem("/pulls" ,"pulls" ,"Pull Requests", repository.pullCount) + @menuitem("/issues/labels" ,"labels" ,"Labels") + @menuitem("/issues/milestones" ,"milestones" ,"Milestones") + @menuitem("/wiki" ,"wiki" ,"Wiki") + @menuitem("/network/members", "fork", "Forks", repository.forkedCount) + @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){ + @menuitem("/settings" , "settings" , "Settings") + } +
    +
    + @body +
    + diff --git a/src/main/twirl/gitbucket/core/settings/menu.scala.html b/src/main/twirl/gitbucket/core/settings/menu.scala.html index 5c7a46434..87d281678 100644 --- a/src/main/twirl/gitbucket/core/settings/menu.scala.html +++ b/src/main/twirl/gitbucket/core/settings/menu.scala.html @@ -1,31 +1,25 @@ @(active: String, repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: gitbucket.core.controller.Context) @import context._ @import gitbucket.core.view.helpers._ -
    -
    -
    - -
    -
    -
    - @body -
    -
    +
    + + @body +
    \ No newline at end of file diff --git a/src/main/twirl/gitbucket/core/wiki/page.scala.html b/src/main/twirl/gitbucket/core/wiki/page.scala.html index 77d490bed..9e9738b3e 100644 --- a/src/main/twirl/gitbucket/core/wiki/page.scala.html +++ b/src/main/twirl/gitbucket/core/wiki/page.scala.html @@ -10,23 +10,20 @@ @import gitbucket.core.service.WikiService.{wikiHttpUrl, wikiSshUrl} @html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("wiki", repository){ -
      -
    • -

      @pageName

      -
      - @page.committer edited this page @helper.html.datetimeago(page.time) +
      + @if(hasWritePermission){ +
      + Edit Page + New Page
      -
      • -
    • - @if(hasWritePermission){ - - } -
      • -
    -
    + } +

    @pageName

    +
    + @page.committer edited this page @helper.html.datetimeago(page.time) +
    +
    +
    +
    @defining(15){ max =>
    @@ -76,7 +73,7 @@
    }
    -
    +
    @markdown( markdown = page.content, diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index c337276c8..d74d09ea0 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -180,7 +180,12 @@ div.head div.forked { } div.container { + /* width: 980px; + */ + width: 100%; + padding-left: 10px; + padding-right: 10px; } div.container-wide { From 969da2c63bc17a88f97680edb4986c2caea332ac Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 27 Mar 2016 22:53:54 +0900 Subject: [PATCH 2/3] Tweak CSS styles --- .../core/account/application.scala.html | 5 ++- .../gitbucket/core/account/edit.scala.html | 19 +++++----- .../gitbucket/core/account/group.scala.html | 2 +- .../gitbucket/core/account/menu.scala.html | 7 ++-- .../gitbucket/core/account/newrepo.scala.html | 2 +- .../gitbucket/core/account/ssh.scala.html | 5 ++- .../gitbucket/core/admin/menu.scala.html | 4 +-- src/main/twirl/gitbucket/core/main.scala.html | 3 -- src/main/twirl/gitbucket/core/menu.scala.html | 36 ++++++++++--------- .../gitbucket/core/repo/branches.scala.html | 2 +- .../webapp/assets/common/css/gitbucket.css | 16 +++++++++ 11 files changed, 58 insertions(+), 43 deletions(-) diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html index 9275cc286..fd23ca6c9 100644 --- a/src/main/twirl/gitbucket/core/account/application.scala.html +++ b/src/main/twirl/gitbucket/core/account/application.scala.html @@ -5,8 +5,7 @@ @import gitbucket.core.view.helpers._ @html.main("Applications"){
    - @menu("application", settings.ssh) -
    + @menu("application", settings.ssh){
    Personal access tokens
    @@ -51,6 +50,6 @@
    -
    + }
    } diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html index 3520ca751..d303e18d5 100644 --- a/src/main/twirl/gitbucket/core/account/edit.scala.html +++ b/src/main/twirl/gitbucket/core/account/edit.scala.html @@ -4,8 +4,7 @@ @import gitbucket.core.view.helpers._ @html.main("Edit your profile"){
    - @menu("profile", settings.ssh) -
    + @menu("profile", settings.ssh){ @helper.html.information(info) @if(LDAPUtil.isDummyMailAddress(account)){
    Please register your mail address.
    }
    @@ -46,17 +45,17 @@
    -
    -
    - Delete account -
    - - @if(!LDAPUtil.isDummyMailAddress(account)){Cancel} -
    +
    +
    + Delete account +
    + + @if(!LDAPUtil.isDummyMailAddress(account)){Cancel} +
    -
    + }
    }