diff --git a/etc/icons.svg b/etc/icons.svg index c2efe0e..bf4e833 100644 --- a/etc/icons.svg +++ b/etc/icons.svg @@ -2,6 +2,7 @@ + id="defs4"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html index 165343d..07f18f3 100644 --- a/src/main/twirl/header.scala.html +++ b/src/main/twirl/header.scala.html @@ -1,60 +1,162 @@ -@(active: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) +@(active: String, repository: service.RepositoryService.RepositoryInfo, id: Option[String] = None)(body: Html)(implicit context: app.Context) @import context._ @import view.helpers._ -@if(repository.commitCount > 0){ -
-
- Fork - @repository.forkedCount +
+ @if(repository.commitCount > 0){ +
+
+ Fork + @repository.forkedCount +
+ } +
+ @helper.html.repositoryicon(repository, true) + @repository.owner / @repository.name + + @defining(repository.repository){ x => + @if(repository.repository.originRepositoryName.isDefined){ +
+ forked from @x.parentUserName/@x.parentRepositoryName +
+ } + }
+
+
+ +
+
+
    +
    • +
  • +
    Code +
    • +
  • +
    Issues + @if(repository.issueCount > 0){ +
    @repository.issueCount
    + } +
    • +
  • +
    Pull Requests + @if(repository.pullCount > 0){ +
    @repository.pullCount
    + } +
    • +
  • +
    Wiki +
    • +
  • +
  • +
    Settings +
    • +
+
+ HTTP clone URL +
+ @helper.html.copy("repository-url-copy", repository.httpUrl){ + @* + @if(settings.ssh && loginAccount.isDefined){ +
+ +
+ } else { + HTTP + } + *@ + + } + @if(settings.ssh && loginAccount.isDefined){ +
+ You can clone HTTP or SSH.
} - } -
-@repository.repository.description.map { description => -

@description

-} - - - - - - - - @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){ - +
+ @* + Download ZIP + *@ + Download ZIP +
+ +
+ @repository.repository.description.map { description => +

@description

} -
-
- Code - - Issues - @if(repository.issueCount > 0){ - @repository.issueCount - } - - Pull Requests - @if(repository.pullCount > 0){ - @repository.pullCount - } - - Wiki - - Network - - Settings -
+ +
+ + + + + + +
+ + @repository.commitCount commits + + + + @repository.branchList.length branches + + + + @repository.tags.length releases + +
+
+ @body +
+
diff --git a/src/main/twirl/repo/editor.scala.html b/src/main/twirl/repo/editor.scala.html index b303ef5..697e2bb 100644 --- a/src/main/twirl/repo/editor.scala.html +++ b/src/main/twirl/repo/editor.scala.html @@ -6,62 +6,63 @@ @import context._ @import view.helpers._ @html.main(if(fileName.isEmpty) "New File" else s"Editing ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository) - @tab(branch, repository, "files") -
- -
- @repository.name / - @pathList.zipWithIndex.map { case (section, i) => - @section / - } - - - - -
- - - - - - - -
-
- + @html.header("code", repository){ + @tab(branch, repository, "files") + + +
+ @repository.name / + @pathList.zipWithIndex.map { case (section, i) => + @section / + } + + + + +
+ + + + + + + +
+
+ +
+
+
+
+
@avatar(loginAccount.get.userName, 48)
+
+
+
+ Commit changes
-
-
-
-
@avatar(loginAccount.get.userName, 48)
-
-
-
- Commit changes -
-
- -
-
- @if(fileName.isEmpty){ - Cancel - } else { - Cancel - } - - - - +
+ +
+
+ @if(fileName.isEmpty){ + Cancel + } else { + Cancel + } + + + + +
-
-
+ + } } + + } } \ No newline at end of file diff --git a/src/main/twirl/wiki/page.scala.html b/src/main/twirl/wiki/page.scala.html index 7e43b5a..967e3d0 100644 --- a/src/main/twirl/wiki/page.scala.html +++ b/src/main/twirl/wiki/page.scala.html @@ -5,26 +5,27 @@ @import context._ @import view.helpers._ @html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("wiki", repository) - @tab((if(pageName == "Home") "home" else ""), repository) - -
- @markdown(page.content, repository, true, false) -
-
- Last edited by @page.committer at @datetime(page.time) -
+ @html.header("wiki", repository){ + @tab((if(pageName == "Home") "home" else ""), repository) + +
+ @markdown(page.content, repository, true, false) +
+
+ Last edited by @page.committer at @datetime(page.time) +
+ } } diff --git a/src/main/twirl/wiki/pages.scala.html b/src/main/twirl/wiki/pages.scala.html index 429c438..7f5d7dc 100644 --- a/src/main/twirl/wiki/pages.scala.html +++ b/src/main/twirl/wiki/pages.scala.html @@ -4,24 +4,24 @@ @import context._ @import view.helpers._ @html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("wiki", repository) - @tab("pages", repository) - - - + @html.header("wiki", repository){ + @tab("pages", repository) + + + } } \ No newline at end of file diff --git a/src/main/twirl/wiki/tab.scala.html b/src/main/twirl/wiki/tab.scala.html index e68c885..8c281ca 100644 --- a/src/main/twirl/wiki/tab.scala.html +++ b/src/main/twirl/wiki/tab.scala.html @@ -8,7 +8,7 @@ Pages Wiki History
  • - @helper.html.copy("repository-url-copy", httpUrl(repository), true){ + @helper.html.copy("repository-url-copy", httpUrl(repository)){ @if(settings.ssh && loginAccount.isDefined){
    diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index aac4c84..a17d73d 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -3,6 +3,7 @@ /****************************************************************************/ body { color: #333; + line-height: 100%; } li p { @@ -122,7 +123,7 @@ } .small { - font-size: 85%; + font-size: 80%; } .strong { @@ -436,6 +437,7 @@ th, td, .table th, .table td { padding-top: 4px; padding-bottom: 4px; + line-height: 100%; } div.commit-avatar-image { @@ -458,7 +460,16 @@ #repository-url { background-color: white; cursor: default; - width: 300px; + height: 16px; + width: 129px; + color: silver; + font-size: 9pt; + font-family: monospace; +} + +#repository-url-copy { + height: 18px; + padding-top: 2px; } ul#commit-file-list {