Browse Source

UI: Make repository menu divide header and content

This is more inline with way GitHub looks like and feels much more natural and
in style with rest of the interface.
pull/2068/head
Adam Strzelecki 9 years ago
parent
commit
3eae4ecde7
  1. 11
      public/css/gogs.css
  2. 14
      public/less/_repository.less
  3. 8
      templates/repo/commits.tmpl
  4. 2
      templates/repo/forks.tmpl
  5. 1
      templates/repo/header.tmpl
  6. 2
      templates/repo/home.tmpl
  7. 2
      templates/repo/issue/labels.tmpl
  8. 2
      templates/repo/issue/list.tmpl
  9. 2
      templates/repo/issue/milestones.tmpl
  10. 2
      templates/repo/release/list.tmpl
  11. 2
      templates/repo/release/new.tmpl
  12. 2
      templates/repo/settings/collaboration.tmpl
  13. 2
      templates/repo/settings/deploy_keys.tmpl
  14. 2
      templates/repo/settings/githook_edit.tmpl
  15. 2
      templates/repo/settings/githooks.tmpl
  16. 2
      templates/repo/settings/hook_new.tmpl
  17. 2
      templates/repo/settings/hooks.tmpl
  18. 2
      templates/repo/settings/options.tmpl
  19. 53
      templates/repo/sidebar.tmpl
  20. 2
      templates/repo/watchers.tmpl
  21. 4
      templates/repo/wiki/new.tmpl
  22. 2
      templates/repo/wiki/pages.tmpl
  23. 2
      templates/repo/wiki/start.tmpl
  24. 2
      templates/repo/wiki/view.tmpl

11
public/css/gogs.css

@ -1815,6 +1815,17 @@ footer .container .links > *:first-child {
margin: 1px;
padding-right: 0;
}
.repository .ui.tabs.container {
margin-top: 14px;
margin-bottom: 0px;
}
.repository .ui.tabs.container .ui.menu {
border-bottom: none;
}
.repository .ui.tabs.divider {
margin-top: 0;
margin-bottom: 20px;
}
.repository #clone-panel {
margin-top: -8px;
width: 100%;

14
public/less/_repository.less

@ -91,6 +91,20 @@
}
}
.ui.tabs {
&.container {
margin-top: 14px;
margin-bottom: 0px;
.ui.menu {
border-bottom: none;
}
}
&.divider {
margin-top: 0;
margin-bottom: 20px;
}
}
#clone-panel {
margin-top: -8px;
width: 100%;

8
templates/repo/commits.tmpl

@ -1,9 +1,9 @@
{{template "base/head" .}}
<div class="repository commits">
{{template "repo/header" .}}
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
{{template "repo/commits_table" .}}
</div>
{{template "repo/commits_table" .}}
</div>
</div>
{{template "base/footer" .}}

2
templates/repo/forks.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository forks">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<h2 class="ui dividing header">
{{.i18n.Tr "repo.forks"}}
</h2>

1
templates/repo/header.tmpl

@ -44,5 +44,4 @@
</div><!-- end column -->
</div><!-- end grid -->
</div><!-- end container -->
<div class="ui divider"></div>
{{end}}

2
templates/repo/home.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository file list">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid">
<div class="ui ten wide column">
<p id="repo-desc">

2
templates/repo/issue/labels.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository labels">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<div class="navbar">
{{template "repo/issue/navbar" .}}
{{if .IsRepositoryAdmin}}

2
templates/repo/issue/list.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<div class="navbar">
{{template "repo/issue/navbar" .}}
<div class="ui right">

2
templates/repo/issue/milestones.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository milestones">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<div class="navbar">
{{template "repo/issue/navbar" .}}
{{if .IsRepositoryAdmin}}

2
templates/repo/release/list.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository release">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
{{template "base/alert" .}}
<h2 class="ui header">
{{.i18n.Tr "repo.release.releases"}}

2
templates/repo/release/new.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository new release">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<h2 class="ui dividing header">
{{if .PageIsEditRelease}}
{{.i18n.Tr "repo.release.edit_release"}}

2
templates/repo/settings/collaboration.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository settings collaboration">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid">
{{template "repo/settings/navbar" .}}
<div class="twelve wide column content">

2
templates/repo/settings/deploy_keys.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository settings">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid">
{{template "repo/settings/navbar" .}}
<div class="twelve wide column content">

2
templates/repo/settings/githook_edit.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository settings edit githook">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid">
{{template "repo/settings/navbar" .}}
<div class="twelve wide column content">

2
templates/repo/settings/githooks.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository settings githooks">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid">
{{template "repo/settings/navbar" .}}
<div class="twelve wide column content">

2
templates/repo/settings/hook_new.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository settings new webhook">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid">
{{template "repo/settings/navbar" .}}
<div class="twelve wide column content">

2
templates/repo/settings/hooks.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository settings webhooks">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid">
{{template "repo/settings/navbar" .}}
{{template "repo/settings/hook_list" .}}

2
templates/repo/settings/options.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository settings options">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid">
{{template "repo/settings/navbar" .}}
<div class="twelve wide column content">

53
templates/repo/sidebar.tmpl

@ -1,29 +1,34 @@
{{if not .IsBareRepo}}
<div class="ui secondary pointing menu navbar">
<a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}">
<i class="icon octicon octicon-code"></i> {{.i18n.Tr "repo.code"}}
</a>
<a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues">
<i class="icon octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues"}} <span class="ui {{if eq 0 .Repository.NumOpenIssues}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenIssues}}</span>
</a>
<a class="{{if .PageIsPullList}}active{{end}} item" href="{{.RepoLink}}/pulls">
<i class="icon octicon octicon-git-pull-request"></i> {{.i18n.Tr "repo.pulls"}} <span class="ui {{if eq 0 .Repository.NumOpenPulls}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenPulls}}</span>
</a>
<a class="{{if .PageIsCommits}}active{{end}} item" href="{{.RepoLink}}/commits/{{EscapePound .BranchName}}">
<i class="icon octicon octicon-history"></i> {{.i18n.Tr "repo.commits"}} <span class="ui {{if eq 0 .CommitsCount}}gray{{else}}blue{{end}} small label">{{.CommitsCount}}</span>
</a>
<a class="{{if .PageIsReleaseList}}active{{end}} item" href="{{.RepoLink}}/releases">
<i class="icon octicon octicon-tag"></i> {{.i18n.Tr "repo.releases"}} <span class="ui {{if eq 0 .Repository.NumTags}}gray{{else}}blue{{end}} small label">{{.Repository.NumTags}}</span>
</a>
<a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki">
<i class="icon octicon octicon-book"></i> {{.i18n.Tr "repo.wiki"}}
</a>
{{if .IsRepositoryAdmin}}
<div class="right menu">
<a class="{{if .PageIsSettings}}active{{end}} item" href="{{.RepoLink}}/settings">
<i class="icon octicon octicon-tools"></i> {{.i18n.Tr "repo.settings"}}
<div class="ui tabs container">
<div class="ui tabular menu navbar">
<a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}">
<i class="icon octicon octicon-code"></i> {{.i18n.Tr "repo.code"}}
</a>
<a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues">
<i class="icon octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues"}} <span class="ui {{if eq 0 .Repository.NumOpenIssues}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenIssues}}</span>
</a>
<a class="{{if .PageIsPullList}}active{{end}} item" href="{{.RepoLink}}/pulls">
<i class="icon octicon octicon-git-pull-request"></i> {{.i18n.Tr "repo.pulls"}} <span class="ui {{if eq 0 .Repository.NumOpenPulls}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenPulls}}</span>
</a>
<a class="{{if .PageIsCommits}}active{{end}} item" href="{{.RepoLink}}/commits/{{EscapePound .BranchName}}">
<i class="icon octicon octicon-history"></i> {{.i18n.Tr "repo.commits"}} <span class="ui {{if eq 0 .CommitsCount}}gray{{else}}blue{{end}} small label">{{.CommitsCount}}</span>
</a>
<a class="{{if .PageIsReleaseList}}active{{end}} item" href="{{.RepoLink}}/releases">
<i class="icon octicon octicon-tag"></i> {{.i18n.Tr "repo.releases"}} <span class="ui {{if eq 0 .Repository.NumTags}}gray{{else}}blue{{end}} small label">{{.Repository.NumTags}}</span>
</a>
<a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki">
<i class="icon octicon octicon-book"></i> {{.i18n.Tr "repo.wiki"}}
</a>
{{if .IsRepositoryAdmin}}
<div class="right menu">
<a class="{{if .PageIsSettings}}active{{end}} item" href="{{.RepoLink}}/settings">
<i class="icon octicon octicon-tools"></i> {{.i18n.Tr "repo.settings"}}
</a>
</div>
{{end}}
</div>
{{end}}
</div>
<div class="ui tabs divider"></div>
{{else}}
<div class="ui divider"></div>
{{end}}

2
templates/repo/watchers.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository watchers">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<h2 class="ui dividing header">
{{if .PageIsWatchers}}
{{.i18n.Tr "repo.watchers"}}

4
templates/repo/wiki/new.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository wiki new">
{{template "repo/header" .}}
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
{{template "base/alert" .}}
<div class="ui header">
{{.i18n.Tr "repo.wiki.new_page"}}

2
templates/repo/wiki/pages.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository wiki pages">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui header">
{{.i18n.Tr "repo.wiki.pages"}}
<div class="ui right">

2
templates/repo/wiki/start.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository wiki start">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui center segment">
<span class="mega-octicon octicon-book"></span>
<h2>{{.i18n.Tr "repo.wiki.welcome"}}</h2>

2
templates/repo/wiki/view.tmpl

@ -1,8 +1,8 @@
{{template "base/head" .}}
<div class="repository wiki view">
{{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid">
<div class="ui ten wide column">
<div class="choose page">

Loading…
Cancel
Save