From dfaabeb41d2e27c6b6eb2d909262838bd03766c5 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 14 Feb 2016 23:41:07 +0900 Subject: [PATCH 01/11] Move sidemenu to header --- .../twirl/gitbucket/core/index.scala.html | 2 +- src/main/twirl/gitbucket/core/menu.scala.html | 102 ++++----- .../webapp/assets/common/css/gitbucket.css | 213 ++++++++---------- 3 files changed, 142 insertions(+), 175 deletions(-) diff --git a/src/main/twirl/gitbucket/core/index.scala.html b/src/main/twirl/gitbucket/core/index.scala.html index 035dde60b..5d499dc2a 100644 --- a/src/main/twirl/gitbucket/core/index.scala.html +++ b/src/main/twirl/gitbucket/core/index.scala.html @@ -22,7 +22,7 @@ } @if(loginAccount.isEmpty){ - @signinform(settings) +
@signinform(settings)
} else {
diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html index 465f1ff84..f39279267 100644 --- a/src/main/twirl/gitbucket/core/menu.scala.html +++ b/src/main/twirl/gitbucket/core/menu.scala.html @@ -10,12 +10,11 @@ @import gitbucket.core.service.RepositoryService._ @sidemenu(path: String, name: String, icon: String, label: String, count: Int = 0) = { -
  • +
  • - - @if(expand){ @label} - @if(expand && count > 0){ -
    @count
    + @label + @if(count > 0){ + @count }
    • @@ -24,58 +23,55 @@
    @helper.html.information(info) @helper.html.error(error) -
    -
    - @if(repository.commitCount > 0){ -
    - - - @if(loginAccount.isEmpty){ - Fork +
    + @if(repository.commitCount > 0){ +
    + + + @if(loginAccount.isEmpty){ + Fork + } else { + @if(isNoGroup) { + Fork } else { - @if(isNoGroup) { - Fork - } else { - Fork - } + Fork } - - @repository.forkedCount + } -
    - @if(loginAccount.isDefined && isNoGroup){ - - } + @repository.forkedCount + +
    + @if(loginAccount.isDefined && isNoGroup){ + } - @helper.html.repositoryicon(repository, true) - @repository.owner / @repository.name + } + @helper.html.repositoryicon(repository, true) + @repository.owner / @repository.name - @defining(repository.repository){ x => - @if(repository.repository.originRepositoryName.isDefined){ -
    - forked from @x.parentUserName/@x.parentRepositoryName -
    - } + @defining(repository.repository){ x => + @if(repository.repository.originRepositoryName.isDefined){ +
    + forked from @x.parentUserName/@x.parentRepositoryName +
    } -
    + }
    +
      + @sidemenu("" , "code" , "code" , "Code") + @sidemenu("/issues", "issues" , "issue-opened" , "Issues", repository.issueCount) + @sidemenu("/pulls" , "pulls" , "git-pull-request" , "Pull Requests", repository.pullCount) + @sidemenu("/wiki" , "wiki" , "book" , "Wiki") + @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){ + @sidemenu("/settings" , "settings" , "tools", "Settings") + } +
    +
    -
    -
      -
      • - @sidemenu("" , "code" , "code" , "Code") - @sidemenu("/issues", "issues" , "issue-opened" , "Issues", repository.issueCount) - @sidemenu("/pulls" , "pulls" , "git-pull-request" , "Pull Requests", repository.pullCount) - @sidemenu("/wiki" , "wiki" , "book" , "Wiki") - @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){ - @sidemenu("/settings" , "settings" , "tools", "Settings") - } -
      • -
    +@* @if(expand){
    HTTP clone URL @@ -97,15 +93,13 @@ - @* - *@ } } -
    -
    +*@ +@*
    *@ @if(expand){ @repository.repository.description.map { description =>

    @detectAndRenderLinks(description)

    @@ -141,7 +135,7 @@ } @body
    -
    +@*
    *@ diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html index b272a3b37..0a0f18186 100644 --- a/src/main/twirl/gitbucket/core/repo/files.scala.html +++ b/src/main/twirl/gitbucket/core/repo/files.scala.html @@ -11,6 +11,7 @@ error: Option[Any] = None)(implicit context: gitbucket.core.controller.Context) @import context._ @import gitbucket.core.view.helpers._ +@import gitbucket.core.service.RepositoryService._ @html.main( if(pathList.isEmpty){ if(branch == repository.repository.defaultBranch){ @@ -23,12 +24,32 @@ }, Some(repository)) { @html.menu("code", repository, Some(branch), pathList.isEmpty, groupNames.isEmpty, info, error){
    -
    - - @if(pathList.nonEmpty){ - - } -
    + @if(pathList.isEmpty){ +
    + @if(platform != "linux" && platform != null){ + + } + Download ZIP +
    +
    +
    + @helper.html.copy("repository-url-copy", repository.httpUrl){ + + } +
    +
    +
    +
    + Find file + @* + @if(pathList.nonEmpty){ + History + } + *@ +
    +
    + } + @branchPullRequest.map{ case (pullRequest, issue) => #@pullRequest.issueId }.getOrElse{ From 760d443f7410b37eebd89231f01723105b0ef954 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 15 Feb 2016 09:11:57 +0900 Subject: [PATCH 04/11] Tweak top margin of contents --- .../core/account/application.scala.html | 2 +- .../gitbucket/core/account/edit.scala.html | 2 +- .../gitbucket/core/account/group.scala.html | 2 +- .../gitbucket/core/account/main.scala.html | 2 +- .../gitbucket/core/account/newrepo.scala.html | 2 +- .../core/account/register.scala.html | 2 +- .../gitbucket/core/account/ssh.scala.html | 2 +- .../gitbucket/core/admin/menu.scala.html | 2 +- .../core/dashboard/issues.scala.html | 10 +- .../gitbucket/core/dashboard/pulls.scala.html | 10 +- .../twirl/gitbucket/core/index.scala.html | 136 +++++----- .../webapp/assets/common/css/gitbucket.css | 248 +----------------- 12 files changed, 93 insertions(+), 327 deletions(-) diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html index f36e84006..2b722eed5 100644 --- a/src/main/twirl/gitbucket/core/account/application.scala.html +++ b/src/main/twirl/gitbucket/core/account/application.scala.html @@ -4,7 +4,7 @@ @import context._ @import gitbucket.core.view.helpers._ @html.main("Applications"){ -
    +
    @menu("application", settings.ssh) diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html index ba16103df..a549edeb5 100644 --- a/src/main/twirl/gitbucket/core/account/edit.scala.html +++ b/src/main/twirl/gitbucket/core/account/edit.scala.html @@ -3,7 +3,7 @@ @import context._ @import gitbucket.core.view.helpers._ @html.main("Edit your profile"){ -
    +
    @menu("profile", settings.ssh) diff --git a/src/main/twirl/gitbucket/core/account/group.scala.html b/src/main/twirl/gitbucket/core/account/group.scala.html index 92a840e38..60b3d724f 100644 --- a/src/main/twirl/gitbucket/core/account/group.scala.html +++ b/src/main/twirl/gitbucket/core/account/group.scala.html @@ -2,7 +2,7 @@ @import context._ @import gitbucket.core.view.helpers._ @html.main(if(account.isEmpty) "Create group" else "Edit group"){ -
    +
    diff --git a/src/main/twirl/gitbucket/core/account/main.scala.html b/src/main/twirl/gitbucket/core/account/main.scala.html index dcf5a4052..aa193d3ee 100644 --- a/src/main/twirl/gitbucket/core/account/main.scala.html +++ b/src/main/twirl/gitbucket/core/account/main.scala.html @@ -3,7 +3,7 @@ @import context._ @import gitbucket.core.view.helpers._ @html.main(account.userName){ -
    +
    diff --git a/src/main/twirl/gitbucket/core/account/newrepo.scala.html b/src/main/twirl/gitbucket/core/account/newrepo.scala.html index 9233e0afb..b79605351 100644 --- a/src/main/twirl/gitbucket/core/account/newrepo.scala.html +++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html @@ -3,7 +3,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C @import context._ @import gitbucket.core.view.helpers._ @html.main("Create a New Repository"){ -
    +

    Create a new repository

    A repository contains all the files for your project, including the revision history. diff --git a/src/main/twirl/gitbucket/core/account/register.scala.html b/src/main/twirl/gitbucket/core/account/register.scala.html index 07e798a2b..94f95abeb 100644 --- a/src/main/twirl/gitbucket/core/account/register.scala.html +++ b/src/main/twirl/gitbucket/core/account/register.scala.html @@ -2,7 +2,7 @@ @import context._ @import gitbucket.core.view.helpers._ @html.main("Create your account"){ -

    +

    Create your account

    diff --git a/src/main/twirl/gitbucket/core/account/ssh.scala.html b/src/main/twirl/gitbucket/core/account/ssh.scala.html index fcf5bdaa9..7b1f2a029 100644 --- a/src/main/twirl/gitbucket/core/account/ssh.scala.html +++ b/src/main/twirl/gitbucket/core/account/ssh.scala.html @@ -3,7 +3,7 @@ @import context._ @import gitbucket.core.view.helpers._ @html.main("SSH Keys"){ -
    +
    @menu("ssh", settings.ssh) diff --git a/src/main/twirl/gitbucket/core/admin/menu.scala.html b/src/main/twirl/gitbucket/core/admin/menu.scala.html index df32fbd3d..dba5f63db 100644 --- a/src/main/twirl/gitbucket/core/admin/menu.scala.html +++ b/src/main/twirl/gitbucket/core/admin/menu.scala.html @@ -11,7 +11,7 @@ System Settings - Plugins + Plugins
  • H2 Console diff --git a/src/main/twirl/gitbucket/core/dashboard/issues.scala.html b/src/main/twirl/gitbucket/core/dashboard/issues.scala.html index af395e570..8b3e140fc 100644 --- a/src/main/twirl/gitbucket/core/dashboard/issues.scala.html +++ b/src/main/twirl/gitbucket/core/dashboard/issues.scala.html @@ -8,9 +8,11 @@ @import context._ @import gitbucket.core.view.helpers._ @html.main("Issues"){ - @dashboard.html.tab("issues") -
    - @issuesnavi(filter, "issues", condition) - @issueslist(issues, page, openCount, closedCount, condition, filter, groups) +
    + @dashboard.html.tab("issues") +
    + @issuesnavi(filter, "issues", condition) + @issueslist(issues, page, openCount, closedCount, condition, filter, groups) +
    } diff --git a/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html b/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html index 46dba3055..23367257b 100644 --- a/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html +++ b/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html @@ -8,9 +8,11 @@ @import context._ @import gitbucket.core.view.helpers._ @html.main("Pull Requests"){ - @dashboard.html.tab("pulls") -
    - @issuesnavi(filter, "pulls", condition) - @issueslist(issues, page, openCount, closedCount, condition, filter, groups) +
    + @dashboard.html.tab("pulls") +
    + @issuesnavi(filter, "pulls", condition) + @issueslist(issues, page, openCount, closedCount, condition, filter, groups) +
    } diff --git a/src/main/twirl/gitbucket/core/index.scala.html b/src/main/twirl/gitbucket/core/index.scala.html index 5d499dc2a..d3e6b38b6 100644 --- a/src/main/twirl/gitbucket/core/index.scala.html +++ b/src/main/twirl/gitbucket/core/index.scala.html @@ -4,79 +4,81 @@ @import context._ @import gitbucket.core.view.helpers._ @main("GitBucket"){ - @dashboard.html.tab() -
    -
    -
    -
    - activities -
    - @helper.html.activities(activities) -
    - -
    - @settings.information.map { information => -
    - - @Html(information) +
    + @dashboard.html.tab() +
    +
    +
    +
    + activities
    - } - @if(loginAccount.isEmpty){ -
    @signinform(settings)
    - } else { -
    -
    -
    - New repository -
    - Your repositories @userRepositories.size + @helper.html.activities(activities) +
    + +
    + @settings.information.map { information => +
    + + @Html(information)
    - +
    diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 80573e504..f36161d04 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -58,7 +58,7 @@ h6 { margin-right: 5px; } -.head .octicon,.head .mega-octicon{ +.head .octicon, .head .mega-octicon{ color : #BBB; } @@ -70,57 +70,6 @@ blockquote p { font-size: 15px; } -/* -.nav { - margin-bottom: 12px; -} - -.table-bordered { - border-collapse: inherit; - border: none; -} - -.table-bordered > thead > tr > th, -.table-bordered > tbody > tr > th, -.table-bordered > tbody > tr > td { - border-bottom: none; -} - -.table-bordered > thead > tr:first-child > th:nth-of-type(1), -.table-bordered > tbody > tr:first-child > th:nth-of-type(1), -.table-bordered > tbody > tr:first-child > td:nth-of-type(1) { - border-top-left-radius: 4px; -} - -.table-bordered > thead > tr:first-child > th:nth-last-of-type(1), -.table-bordered > tbody > tr:first-child > th:nth-last-of-type(1), -.table-bordered > tbody > tr:first-child > td:nth-last-of-type(1) { - border-top-right-radius: 4px; -} - -.table-bordered > tbody > tr:last-child > td:nth-of-type(1) { - border-bottom-left-radius: 4px; -} - -.table-bordered > tbody > tr:last-child > td:nth-last-of-type(1) { - border-bottom-right-radius: 4px; -} - -.table-bordered > tbody > tr:last-child > td { - border-bottom: 1px solid #dddddd; -} -*/ -/* -.table-bordered > thead > tr > th, -.table-bordered > thead > tr > td { - border-bottom-width: 1px; -} -*/ -/* -.tab-content { - margin-top: 20px; -} -*/ .danger { color: #900; } @@ -167,43 +116,6 @@ pre.reset { /* ======================================================================== */ /* Global Header */ /* ======================================================================== */ -/* -div.navbar-inner { - border-radius: 0px; - -webkit-border-radius: 0px; - -moz-border-radius: 0px; - border-top: none; - border-left: none; - border-right: none; - border-bottom: 1px solid #d4d4d4; - padding-right: 0px; -} - -div.header-menu { - line-height: 40px; -} - -div.header-menu .octicon{ - color: #333; -} - -div.header-menu input, -div.header-menu a.btn { - margin-top: 0px; - margin-bottom: 0px; -} - -/* -div.nav-collapse a.menu { - margin-right: 12px; -} - -div.nav-collapse a.btn-last, -div.nav-collapse a.menu-last { - margin-right: 30px; -} -*/ - .navbar-brand { height: unset; padding: 8px; @@ -278,6 +190,7 @@ div.pagination { */ div.body { + margin-top: 20px; margin-bottom: 40px; } @@ -413,23 +326,6 @@ div.box-content { padding: 4px; border-radius: 3px; } -/* -div > div.box-content-row:nth-of-type(1) { - border: none; -} - -div.box-content-row { - border-top: 1px solid #d8d8d8; - padding: 4px; -} -*/ -/* -div.repo-link { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} -*/ li.repo-link, li.page-link { padding-top: 4px; @@ -632,18 +528,6 @@ a#show-pages-index { text-decoration: none; } -/* -ul.nav-stacked.side-menu li span.header { - border-top-right-radius: 3px; - border-top-left-radius: 3px; - border: 1px solid #d8d8d8; - display: block; - padding: 8px 15px 9px; - margin-right: 2px; - background-color: #f5f5f5; -} -*/ - ul.nav-stacked.side-menu li a:hover { background-color: transparent; } @@ -746,7 +630,6 @@ div.repository-content { padding: 0 3px; } - /****************************************************************************/ /* Activity */ /****************************************************************************/ @@ -974,73 +857,6 @@ span.simplified-path { color: #0088cc; } -/****************************************************************************/ -/* nav pulls group */ -/****************************************************************************/ - - -/* -.nav-pills-group:after { - display: table; - line-height: 0; - content: ""; -} - -.nav-pills-group:after { - clear: both; -} - -.nav-pills-group > li { - float: left; -} -*/ -/* -.nav-pills > li + li { - margin-left: 0px; -} - -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - line-height: 14px; - color: #666; - font-weight: bold; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.nav-pills > li > a { - padding-top: 10px; - padding-bottom: 10px; - border-left : 1px solid #e5e5e5; - border-top : 1px solid #e5e5e5; - border-bottom : 1px solid #e5e5e5; -} - -.nav-pills > li:nth-of-type(1) > a { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.nav-pills > li:nth-last-of-type(1) > a { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; - border-right : 1px solid #e5e5e5; -} -*/ -/* -.nav-pills-group > .active > a, -.nav-pills-group > .active > a:hover, -.nav-pills-group > .active > a:focus { - color: #ffffff; - background-color: #0088cc; - border-color: #0088cc; -} -*/ - /****************************************************************************/ /* Issues */ /****************************************************************************/ @@ -1077,11 +893,11 @@ table.table-issues { margin-top: 12px; } -table.table-issues td .octicon-issue-opened,table.table-issues td .octicon-git-pull-request .open { +table.table-issues td .octicon-issue-opened, table.table-issues td .octicon-git-pull-request .open { color: #6CC644; } -table.table-issues td .octicon-issue-closed,table.table-issues td .octicon-git-pull-request .closed{ +table.table-issues td .octicon-issue-closed, table.table-issues td .octicon-git-pull-request .closed{ color : #BD2C00;; } @@ -1153,47 +969,6 @@ div.milestone-menu a.delete { color: #b00; } -/* -div#milestone-progress-area { - display: inline-block; -} - -div#milestone-progress-area div.milestone-progress { - width: 130px; - margin-bottom: -6px; -} - -div.milestone-progress { - position: relative; - height: 10px; - color: white; - margin-bottom: 4px; - font-weight: bold; - font-size: 12px; - text-shadow: 0px 0px 5px #444; - background-color: silver; - border-radius: 4px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; -} - -span.milestone-progress { - position: absolute; - height: 100%; - background-color: green; - border-radius: 4px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; -} - -div.issue-header { - padding-left: 8px; - padding-right: 8px; - padding-top: 12px; - padding-bottom: 12px; -} -*/ - div.issue-info { border-top: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5; @@ -1203,21 +978,6 @@ div.issue-info { margin-right: 0px; } -/* -div.issue-content { - padding: 13px; - background-color: #fff; -} - -div.issue-content p:first-child { - margin-top: 0; -} - -div.issue-content p:last-child { - margin-bottom: 0; -} -*/ - h4#issueTitle { font-size: large; font-weight: bold; From 5a90848c7588b6fbcaf482539f3200279e59fba2 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 15 Feb 2016 09:20:36 +0900 Subject: [PATCH 05/11] Remove unused code --- src/main/twirl/gitbucket/core/menu.scala.html | 98 +++++++------------ 1 file changed, 34 insertions(+), 64 deletions(-) diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html index d41832895..2c47f6afb 100644 --- a/src/main/twirl/gitbucket/core/menu.scala.html +++ b/src/main/twirl/gitbucket/core/menu.scala.html @@ -70,71 +70,41 @@
    -@* - @if(expand){ -
    - HTTP clone URL -
    - @helper.html.copy("repository-url-copy", repository.httpUrl){ - - } - @if(repository.sshUrl.isDefined){ -
    - You can clone HTTP or SSH. -
    - } - @id.map { id => - @if(context.platform != "linux" && context.platform != null){ - - } - - - } + @if(isRepoTop){ + @repository.repository.description.map { description => +

    @detectAndRenderLinks(description)

    } -*@ -@*
    *@ - @if(isRepoTop){ - @repository.repository.description.map { description => -

    @detectAndRenderLinks(description)

    - } -
    - - - - - - -
    - - - @if(repository.commitCount > 10000){ - 10000+ commits - } else { - @repository.commitCount commits - } - - - - - @repository.branchList.length branches - - - - - @repository.tags.length releases - -
    -
    - } - @body -
    -@*
    *@ +
    + + + + + + +
    + + + @if(repository.commitCount > 10000){ + 10000+ commits + } else { + @repository.commitCount commits + } + + + + + @repository.branchList.length branches + + + + + @repository.tags.length releases + +
    +
    + } + @body +
    diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index f36161d04..2880ab324 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -1185,18 +1185,6 @@ a.absent { color: #c00; } -/* -div.wiki-index-header { - background-color: #f5f5f5; - color: #333333; - margin: 0; - border-top-left-radius: 3px; - border-top-right-radius: 3px; - border: 1px solid #d8d8d8; - padding: 8px 8px 8px 8px; -} -*/ - div.wiki-sidebar { background-color: white; border: 1px solid #d8d8d8; @@ -1226,18 +1214,6 @@ div.wiki-footer { color: gray; } -/* -div.wiki-index-content { - background-color: white; - border: 1px solid #d8d8d8; - padding: 0px; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - margin-bottom: 20px; - border-top: none; -} -*/ - /****************************************************************************/ /* Commit */ /****************************************************************************/ From 4d39f63ef74276b12c37988899a6a88d4d5d6ca0 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Tue, 16 Feb 2016 02:36:45 +0900 Subject: [PATCH 08/11] Tweak header buttons --- .../twirl/gitbucket/core/repo/blob.scala.html | 2 +- .../gitbucket/core/repo/files.scala.html | 33 +++++++++---------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/main/twirl/gitbucket/core/repo/blob.scala.html b/src/main/twirl/gitbucket/core/repo/blob.scala.html index ea97b8e40..bae4c53a4 100644 --- a/src/main/twirl/gitbucket/core/repo/blob.scala.html +++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html @@ -11,7 +11,7 @@ @html.menu("code", repository){
    - + Find file
    Newer diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html index 48b77455e..1a1397d03 100644 --- a/src/main/twirl/gitbucket/core/repo/files.scala.html +++ b/src/main/twirl/gitbucket/core/repo/files.scala.html @@ -59,30 +59,29 @@ }
    -
    -
    - New file - Find file - @* - @if(pathList.nonEmpty){ - History - } - *@ -
    -
    } +
    +
    + New file + Find file + @if(pathList.nonEmpty){ + History + } +
    +
    @helper.html.branchcontrol(branch, repository, hasWritePermission){ @repository.branchList.map { x =>
  • @helper.html.checkicon(x == branch) @x
    • } } - @branchPullRequest.map{ case (pullRequest, issue) => - View #@pullRequest.issueId - }.getOrElse { - New pull request - } - @if(pathList.nonEmpty) { + @if(pathList.isEmpty){ + @branchPullRequest.map{ case (pullRequest, issue) => + View #@pullRequest.issueId + }.getOrElse { + New pull request + } + } else { @repository.name / @pathList.zipWithIndex.map { case (section, i) => @section / From 1af561115949e6b882eb4c97248c2ebe00ebb104 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Tue, 16 Feb 2016 02:51:09 +0900 Subject: [PATCH 09/11] Mobile view improvement --- src/main/twirl/gitbucket/core/menu.scala.html | 19 +------------------ .../gitbucket/core/repo/files.scala.html | 8 ++++---- .../twirl/gitbucket/core/wiki/page.scala.html | 2 +- .../webapp/assets/common/css/gitbucket.css | 7 +++++-- 4 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html index 2c47f6afb..c26bc8159 100644 --- a/src/main/twirl/gitbucket/core/menu.scala.html +++ b/src/main/twirl/gitbucket/core/menu.scala.html @@ -11,7 +11,7 @@ @menuitem(path: String, name: String, icon: String, label: String, count: Int = 0) = {
  • - @label + @label @if(count > 0){ @count } @@ -143,22 +143,5 @@ $(function(){ $('#fork-form').submit(); }); } -@* - @repository.sshUrl.map { sshUrl => - $('#repository-url-http').click(function(){ - $('#repository-url-proto').text('HTTP'); - $('#repository-url').val('@repository.httpUrl'); - $('#repository-clone-url').attr('href', '@openRepoUrl(repository.httpUrl)') - $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val()); - }); - - $('#repository-url-ssh').click(function(){ - $('#repository-url-proto').text('SSH'); - $('#repository-url').val('@sshUrl'); - $('#repository-clone-url').attr('href', '@openRepoUrl(sshUrl)'); - $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val()); - }); - } -*@ }); diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html index 1a1397d03..c2b5d2ce9 100644 --- a/src/main/twirl/gitbucket/core/repo/files.scala.html +++ b/src/main/twirl/gitbucket/core/repo/files.scala.html @@ -25,13 +25,13 @@ @html.menu("code", repository, Some(branch), pathList.isEmpty, groupNames.isEmpty, info, error){
    @if(pathList.isEmpty){ -
    +
    @if(platform != "linux" && platform != null){ } Download ZIP
    -
    +
    @helper.html.copy("repository-url-copy", repository.httpUrl){ @if(repository.sshUrl.isDefined){ @@ -62,8 +62,8 @@ }
    - New file - Find file + New file + Find file @if(pathList.nonEmpty){ History } diff --git a/src/main/twirl/gitbucket/core/wiki/page.scala.html b/src/main/twirl/gitbucket/core/wiki/page.scala.html index 9bc6a8099..cf5963a29 100644 --- a/src/main/twirl/gitbucket/core/wiki/page.scala.html +++ b/src/main/twirl/gitbucket/core/wiki/page.scala.html @@ -26,7 +26,7 @@ }
    • -
    +
    @defining(15){ max =>
    diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 2880ab324..9f764ad84 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -1965,6 +1965,9 @@ div.container.blame-container{ .body>div.pull-left { width: auto !important; } + .pc { + display: none; + } /* Adjust issue search box size and position */ #search-filter-box { @@ -1985,7 +1988,7 @@ div.container.blame-container{ overflow: hidden; display: inline-block; } - +/* .nav-tabs a.btn[href$="/_edit"] { width: 24px; white-space: nowrap; @@ -1993,7 +1996,7 @@ div.container.blame-container{ padding: 4px 6px; margin: 3px 4px 0 0; } - +*/ body>div.container.body { margin: 0 -12px 40px -12px; } From 8494c682a763da7444f35f8222fc005af64a567b Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Tue, 16 Feb 2016 15:02:34 +0900 Subject: [PATCH 10/11] Fix search box style for mobile --- src/main/webapp/assets/common/css/gitbucket.css | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 9f764ad84..75c6df62c 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -1971,17 +1971,16 @@ div.container.blame-container{ /* Adjust issue search box size and position */ #search-filter-box { - width: 98% !important; - position: absolute; - left: 4px; - margin-top: 42px; + width: 100% !important; } - form#search-filter-form { float: none !important; - margin-bottom: 80px !important; + margin-bottom: 10px; + } + form#search-filter-form>div.form-group { + width: 100% !important; + margin-bottom: 10px; } - .table-issues a.button-link { width: 42px; height: 16px; From 0cf1f43deb24b6939675acb5cf10c3e5823d69f6 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Tue, 16 Feb 2016 17:34:21 +0900 Subject: [PATCH 11/11] Adjust issue / comment form --- src/main/twirl/gitbucket/core/issues/create.scala.html | 2 +- src/main/webapp/assets/common/css/gitbucket.css | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/twirl/gitbucket/core/issues/create.scala.html b/src/main/twirl/gitbucket/core/issues/create.scala.html index 6b2865d3a..39665d1ef 100644 --- a/src/main/twirl/gitbucket/core/issues/create.scala.html +++ b/src/main/twirl/gitbucket/core/issues/create.scala.html @@ -14,7 +14,7 @@
    - + @helper.html.preview( repository = repository, content = "", diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 75c6df62c..78b70d8ff 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -1969,6 +1969,15 @@ div.container.blame-container{ display: none; } + /* Adjust issue / comment form */ + #issue-title { + width: 100% !important; + } + div.attachable>textarea, + div.attachable>div.clickable { + width: 100% !important; + } + /* Adjust issue search box size and position */ #search-filter-box { width: 100% !important;