diff --git a/etc/icons.svg b/etc/icons.svg index bf4e833..565641e 100644 --- a/etc/icons.svg +++ b/etc/icons.svg @@ -35,8 +35,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.9899495" - inkscape:cx="827.57339" - inkscape:cy="496.04311" + inkscape:cx="658.37284" + inkscape:cy="201.93139" inkscape:document-units="px" inkscape:current-layer="layer1-9" showgrid="false" @@ -1185,7 +1185,7 @@ style="fill:#ffffff;stroke:#a0a0a0;stroke-width:22.72570610000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + + + + + + + + + diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html deleted file mode 100644 index 354188b..0000000 --- a/src/main/twirl/header.scala.html +++ /dev/null @@ -1,180 +0,0 @@ -@(active: String, - repository: service.RepositoryService.RepositoryInfo, - id: Option[String] = None, - expand: Boolean = false)(body: Html)(implicit context: app.Context) -@import context._ -@import view.helpers._ - -
- @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 -
- } - } -
-
-
- -
-
- - @if(expand){ -
- 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. -
- } - @id.map { id => - - } - } -
-
- @repository.repository.description.map { description => -

@description

- } - - - @body -
-
- diff --git a/src/main/twirl/issues/create.scala.html b/src/main/twirl/issues/create.scala.html index e9aacbc..e87ed97 100644 --- a/src/main/twirl/issues/create.scala.html +++ b/src/main/twirl/issues/create.scala.html @@ -6,7 +6,7 @@ @import context._ @import view.helpers._ @html.main(s"New Issue - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("issues", repository){ + @html.menu("issues", repository){ @tab("", repository)
diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html index 6f13e2f..d849ab0 100644 --- a/src/main/twirl/issues/issue.scala.html +++ b/src/main/twirl/issues/issue.scala.html @@ -9,7 +9,7 @@ @import context._ @import view.helpers._ @html.main(s"${issue.title} - Issue #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("issues", repository){ + @html.menu("issues", repository){ @tab("issues", repository)
  • Back to issue list
    • diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html index b1e0c41..c05aa92 100644 --- a/src/main/twirl/issues/list.scala.html +++ b/src/main/twirl/issues/list.scala.html @@ -16,7 +16,7 @@ @import context._ @import view.helpers._ @html.main(s"Issues - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("issues", repository){ + @html.menu("issues", repository){ @tab("issues", repository)
    diff --git a/src/main/twirl/issues/milestones/edit.scala.html b/src/main/twirl/issues/milestones/edit.scala.html index 6972700..f99f798 100644 --- a/src/main/twirl/issues/milestones/edit.scala.html +++ b/src/main/twirl/issues/milestones/edit.scala.html @@ -2,7 +2,7 @@ @import context._ @import view.helpers._ @html.main(s"Milestones - ${repository.owner}/${repository.name}"){ - @html.header("milestones", repository){ + @html.menu("milestones", repository){ @issues.html.tab("milestones", repository)
    diff --git a/src/main/twirl/issues/milestones/list.scala.html b/src/main/twirl/issues/milestones/list.scala.html index 5c12b26..1c9d9db 100644 --- a/src/main/twirl/issues/milestones/list.scala.html +++ b/src/main/twirl/issues/milestones/list.scala.html @@ -5,7 +5,7 @@ @import context._ @import view.helpers._ @html.main(s"Milestones - ${repository.owner}/${repository.name}"){ - @html.header("issues", repository){ + @html.menu("issues", repository){ @issues.html.tab("milestones", repository)
    diff --git a/src/main/twirl/menu.scala.html b/src/main/twirl/menu.scala.html new file mode 100644 index 0000000..a1d0fbc --- /dev/null +++ b/src/main/twirl/menu.scala.html @@ -0,0 +1,182 @@ +@(active: String, + repository: service.RepositoryService.RepositoryInfo, + id: Option[String] = None, + expand: Boolean = false)(body: Html)(implicit context: app.Context) +@import context._ +@import view.helpers._ + +
    + @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 +
    + } + } +
    +
    +
    + +
    +
    + + @if(expand){ +
    + 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. +
    + } + @id.map { id => + + } + } +
    +
    + + @if(expand){ + @repository.repository.description.map { description => +

    @description

    + } + + } + @body +
    +
    +@* + +*@ \ No newline at end of file diff --git a/src/main/twirl/pulls/compare.scala.html b/src/main/twirl/pulls/compare.scala.html index 37d026b..90fa6f2 100644 --- a/src/main/twirl/pulls/compare.scala.html +++ b/src/main/twirl/pulls/compare.scala.html @@ -12,7 +12,7 @@ @import context._ @import view.helpers._ @html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("pulls", repository){ + @html.menu("pulls", repository){
    Edit diff --git a/src/main/twirl/pulls/list.scala.html b/src/main/twirl/pulls/list.scala.html index 6c01bbb..a2fb30d 100644 --- a/src/main/twirl/pulls/list.scala.html +++ b/src/main/twirl/pulls/list.scala.html @@ -11,7 +11,7 @@ @import context._ @import view.helpers._ @html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("pulls", repository){ + @html.menu("pulls", repository){
      diff --git a/src/main/twirl/pulls/pullreq.scala.html b/src/main/twirl/pulls/pullreq.scala.html index bbd76e7..0a0774f 100644 --- a/src/main/twirl/pulls/pullreq.scala.html +++ b/src/main/twirl/pulls/pullreq.scala.html @@ -12,7 +12,7 @@ @import context._ @import view.helpers._ @html.main(s"${issue.title} - Pull Request #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("pulls", repository){ + @html.menu("pulls", repository){ @defining(dayByDayCommits.flatten){ commits =>
      @if(issue.closed) { diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html index bf19368..8e76a9e 100644 --- a/src/main/twirl/repo/blob.scala.html +++ b/src/main/twirl/repo/blob.scala.html @@ -7,7 +7,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository){ + @html.menu("code", repository){ @tab(branch, repository, "files")
      @repository.name / diff --git a/src/main/twirl/repo/branches.scala.html b/src/main/twirl/repo/branches.scala.html index c840191..d8a4f3f 100644 --- a/src/main/twirl/repo/branches.scala.html +++ b/src/main/twirl/repo/branches.scala.html @@ -4,7 +4,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository){ + @html.menu("code", repository){ @tab(repository.repository.defaultBranch, repository, "branches", true)

      Branches

      diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html index a77e7e0..1302c7c 100644 --- a/src/main/twirl/repo/commit.scala.html +++ b/src/main/twirl/repo/commit.scala.html @@ -9,7 +9,7 @@ @import view.helpers._ @import util.Implicits._ @html.main(commit.shortMessage, Some(repository)){ - @html.header("code", repository){ + @html.menu("code", repository){ @tab(commitId, repository, "commits")
      diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html index 4cde433..782896c 100644 --- a/src/main/twirl/repo/commits.scala.html +++ b/src/main/twirl/repo/commits.scala.html @@ -7,7 +7,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository){ + @html.menu("code", repository){ @tab(branch, repository, if(pathList.isEmpty) "commits" else "files")
      @if(pathList.isEmpty){ diff --git a/src/main/twirl/repo/delete.scala.html b/src/main/twirl/repo/delete.scala.html index cebb8d3..a6678fe 100644 --- a/src/main/twirl/repo/delete.scala.html +++ b/src/main/twirl/repo/delete.scala.html @@ -6,7 +6,7 @@ @import context._ @import view.helpers._ @html.main(s"Deleting ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository){ + @html.menu("code", repository){ @tab(branch, repository, "files")
      diff --git a/src/main/twirl/repo/editor.scala.html b/src/main/twirl/repo/editor.scala.html index 697e2bb..dc46583 100644 --- a/src/main/twirl/repo/editor.scala.html +++ b/src/main/twirl/repo/editor.scala.html @@ -6,7 +6,7 @@ @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){ + @html.menu("code", repository){ @tab(branch, repository, "files") diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index d36724d..f7bdf37 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -8,7 +8,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository, Some(branch), pathList.isEmpty){ + @html.menu("code", repository, Some(branch), pathList.isEmpty){ @tab(branch, repository, "files")
      @repository.name / diff --git a/src/main/twirl/repo/forked.scala.html b/src/main/twirl/repo/forked.scala.html index 25c7d0a..0e5b4fe 100644 --- a/src/main/twirl/repo/forked.scala.html +++ b/src/main/twirl/repo/forked.scala.html @@ -4,7 +4,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("network", repository){ + @html.menu("network", repository){ diff --git a/src/main/twirl/repo/guide.scala.html b/src/main/twirl/repo/guide.scala.html index 8e0b966..28d42a2 100644 --- a/src/main/twirl/repo/guide.scala.html +++ b/src/main/twirl/repo/guide.scala.html @@ -3,7 +3,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository){ + @html.menu("code", repository){ @if(!hasWritePermission){

      This is an empty repository

      } else { diff --git a/src/main/twirl/repo/tags.scala.html b/src/main/twirl/repo/tags.scala.html index 9da40d0..a7a1dab 100644 --- a/src/main/twirl/repo/tags.scala.html +++ b/src/main/twirl/repo/tags.scala.html @@ -2,7 +2,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository){ + @html.menu("code", repository){ @tab(repository.repository.defaultBranch, repository, "tags", true)

      Tags

      diff --git a/src/main/twirl/search/menu.scala.html b/src/main/twirl/search/menu.scala.html index 4cbd776..adc9156 100644 --- a/src/main/twirl/search/menu.scala.html +++ b/src/main/twirl/search/menu.scala.html @@ -2,7 +2,7 @@ repository: service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: app.Context) @import context._ @import view.helpers._ -@html.header("", repository){ +@html.menu("", repository){
      diff --git a/src/main/twirl/settings/collaborators.scala.html b/src/main/twirl/settings/collaborators.scala.html index 69235da..28efeb6 100644 --- a/src/main/twirl/settings/collaborators.scala.html +++ b/src/main/twirl/settings/collaborators.scala.html @@ -4,7 +4,7 @@ @import context._ @import view.helpers._ @html.main("Settings", Some(repository)){ - @html.header("settings", repository){ + @html.menu("settings", repository){ @menu("collaborators", repository){

      Manage Collaborators

        diff --git a/src/main/twirl/settings/danger.scala.html b/src/main/twirl/settings/danger.scala.html index f00eae0..ca74460 100644 --- a/src/main/twirl/settings/danger.scala.html +++ b/src/main/twirl/settings/danger.scala.html @@ -2,7 +2,7 @@ @import context._ @import view.helpers._ @html.main("Danger Zone", Some(repository)){ - @html.header("settings", repository){ + @html.menu("settings", repository){ @menu("danger", repository){
        Danger Zone
        diff --git a/src/main/twirl/settings/hooks.scala.html b/src/main/twirl/settings/hooks.scala.html index f6017a7..03d98ba 100644 --- a/src/main/twirl/settings/hooks.scala.html +++ b/src/main/twirl/settings/hooks.scala.html @@ -2,7 +2,7 @@ @import context._ @import view.helpers._ @html.main("Settings", Some(repository)){ - @html.header("settings", repository){ + @html.menu("settings", repository){ @menu("hooks", repository){ @helper.html.information(info)

        WebHook URLs

        diff --git a/src/main/twirl/settings/options.scala.html b/src/main/twirl/settings/options.scala.html index 2e7ff2c..b6949dc 100644 --- a/src/main/twirl/settings/options.scala.html +++ b/src/main/twirl/settings/options.scala.html @@ -2,7 +2,7 @@ @import context._ @import view.helpers._ @html.main("Settings", Some(repository)){ - @html.header("settings", repository){ + @html.menu("settings", repository){ @menu("options", repository){ @helper.html.information(info) diff --git a/src/main/twirl/wiki/compare.scala.html b/src/main/twirl/wiki/compare.scala.html index bdc43f5..97116cc 100644 --- a/src/main/twirl/wiki/compare.scala.html +++ b/src/main/twirl/wiki/compare.scala.html @@ -10,7 +10,7 @@ @import org.eclipse.jgit.diff.DiffEntry.ChangeType @html.main(s"Compare Revisions - ${repository.owner}/${repository.name}", Some(repository)){ @helper.html.information(info) - @html.header("wiki", repository){ + @html.menu("wiki", repository){ @tab("history", repository)
        • diff --git a/src/main/twirl/wiki/edit.scala.html b/src/main/twirl/wiki/edit.scala.html index 4d403d2..802c43b 100644 --- a/src/main/twirl/wiki/edit.scala.html +++ b/src/main/twirl/wiki/edit.scala.html @@ -4,7 +4,7 @@ @import context._ @import view.helpers._ @html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("wiki", repository){ + @html.menu("wiki", repository){ @tab("", repository)
          • diff --git a/src/main/twirl/wiki/history.scala.html b/src/main/twirl/wiki/history.scala.html index cc70b33..fecb9de 100644 --- a/src/main/twirl/wiki/history.scala.html +++ b/src/main/twirl/wiki/history.scala.html @@ -4,7 +4,7 @@ @import context._ @import view.helpers._ @html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("wiki", repository){ + @html.menu("wiki", repository){ @tab(if(pageName.isEmpty) "history" else "", repository)
            • diff --git a/src/main/twirl/wiki/page.scala.html b/src/main/twirl/wiki/page.scala.html index 967e3d0..5dcca1e 100644 --- a/src/main/twirl/wiki/page.scala.html +++ b/src/main/twirl/wiki/page.scala.html @@ -5,7 +5,7 @@ @import context._ @import view.helpers._ @html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("wiki", repository){ + @html.menu("wiki", repository){ @tab((if(pageName == "Home") "home" else ""), repository)
              • diff --git a/src/main/twirl/wiki/pages.scala.html b/src/main/twirl/wiki/pages.scala.html index 7f5d7dc..cd576de 100644 --- a/src/main/twirl/wiki/pages.scala.html +++ b/src/main/twirl/wiki/pages.scala.html @@ -4,7 +4,7 @@ @import context._ @import view.helpers._ @html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("wiki", repository){ + @html.menu("wiki", repository){ @tab("pages", repository)