foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-27 13:39:19 -05:00
Code Issues Wiki Activity

Merge pull request #2068 from nanoant/patch/repo-file-list-layout

Browse source 
Repo file list layout & misc fixes
This commit is contained in:
Unknwon 2015-12-02 19:44:16 -05:00
commit 73d9eebf01
28 changed files with 216 additions and 300 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
public/css/gogs.css
View file

@ -5,7 +5,9 @@
font-style: normal; font-style: normal;
} }
.octicon, .octicon,
.mega-octicon { .mega-octicon,
.icon.octicon,
.icon.mega-octicon {
font: normal normal normal 16px/1 octicons; font: normal normal normal 16px/1 octicons;
display: inline-block; display: inline-block;
text-decoration: none; text-decoration: none;
@ -911,6 +913,13 @@ pre.raw {
.ui .form .fake { .ui .form .fake {
display: none !important; display: none !important;
} }
.ui .sha.label {
font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace;
font-size: 13px;
padding: 6px 10px 4px 10px;
font-weight: normal;
margin: 0 6px;
}
.ui.status.buttons .octicon { .ui.status.buttons .octicon {
margin-right: 4px; margin-right: 4px;
} }
@ -1806,6 +1815,17 @@ footer .container .links > *:first-child {
margin: 1px; margin: 1px;
padding-right: 0; 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 { .repository #clone-panel {
margin-top: -8px; margin-top: -8px;
width: 100%; width: 100%;
@ -1834,54 +1854,21 @@ footer .container .links > *:first-child {
.repository.file.list .choose.reference .header .icon { .repository.file.list .choose.reference .header .icon {
font-size: 1.4em; font-size: 1.4em;
} }
.repository.file.list .head.meta {
padding: 0;
}
.repository.file.list .head.meta li {
list-style: none;
display: inline-block;
}
.repository.file.list .head.meta li .ui.breadcrumb {
margin-top: -5px;
}
.repository.file.list .head.meta li .ui.breadcrumb span,
.repository.file.list .head.meta li .ui.breadcrumb a {
font-size: 16px;
}
.repository.file.list #repo-files-table .table.list {
width: 80% !important;
}
.repository.file.list #repo-files-table thead th { .repository.file.list #repo-files-table thead th {
padding-top: 8px; padding-top: 8px;
padding-bottom: 5px; padding-bottom: 5px;
font-weight: normal; font-weight: normal;
} }
.repository.file.list #repo-files-table thead th #last-commit-message { .repository.file.list #repo-files-table thead th:first-child {
margin-left: 5px; display: block;
margin-bottom: -4px; position: relative;
width: 400px; width: 325%;
}
.repository.file.list #repo-files-table thead th .age {
margin-top: 2px;
} }
.repository.file.list #repo-files-table thead .ui.avatar { .repository.file.list #repo-files-table thead .ui.avatar {
margin-bottom: 5px; margin-bottom: 5px;
} }
.repository.file.list #repo-files-table tbody .icon { .repository.file.list #repo-files-table tbody .icon {
margin-left: 5px; margin-right: 5px;
}
.repository.file.list #repo-files-table tbody .name {
max-width: 120px;
}
.repository.file.list #repo-files-table tbody .message {
max-width: 300px;
}
.repository.file.list #repo-files-table tbody .age {
min-width: 150px;
}
.repository.file.list #repo-files-table tbody .text.truncate {
margin-bottom: -5px;
max-width: 100%;
} }
.repository.file.list #repo-files-table td { .repository.file.list #repo-files-table td {
padding-top: 8px; padding-top: 8px;
@ -2246,31 +2233,6 @@ footer .container .links > *:first-child {
font-weight: normal; font-weight: normal;
padding: 5px 10px; padding: 5px 10px;
} }
.repository .commits.table {
font-size: 13px;
}
.repository .commits.table th:first-child,
.repository .commits.table td:first-child {
padding-left: 15px;
}
.repository .commits.table td {
line-height: 15px;
}
.repository .commits.table .author {
min-width: 180px;
}
.repository .commits.table .message span {
max-width: 500px;
}
.repository .commits.table .date {
width: 120px;
}
.repository .sha.label {
font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace;
font-size: 14px;
padding: 6px 10px 4px 10px;
font-weight: normal;
}
.repository .diff-detail-box { .repository .diff-detail-box {
margin: 15px 0; margin: 15px 0;
line-height: 30px; line-height: 30px;

8
public/less/_base.less
View file

@ -219,6 +219,14 @@ pre {
} }
} }
.sha.label {
font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace;
font-size: 13px;
padding: 6px 10px 4px 10px;
font-weight: normal;
margin: 0 6px;
}
&.status.buttons { &.status.buttons {
.octicon { .octicon {
margin-right: 4px; margin-right: 4px;

4
public/less/_octicons.less
View file

@ -14,7 +14,9 @@
// .octicon is optimized for 16px. // .octicon is optimized for 16px.
// .mega-octicon is optimized for 32px but can be used larger. // .mega-octicon is optimized for 32px but can be used larger.
.octicon, .mega-octicon { .octicon, .mega-octicon,
// ensure Semantic UI .icon of 14px does not apply to .icon.octicon:
.icon.octicon, .icon.mega-octicon {
font: normal normal normal 16px/1 octicons; font: normal normal normal 16px/1 octicons;
display: inline-block; display: inline-block;
text-decoration: none; text-decoration: none;

88
public/less/_repository.less
View file

@ -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 { #clone-panel {
margin-top: -8px; margin-top: -8px;
width: 100%; width: 100%;
@ -125,41 +139,17 @@
font-size: 1.4em; font-size: 1.4em;
} }
} }
.head.meta {
padding: 0;
li {
list-style: none;
display: inline-block;
.ui.breadcrumb {
margin-top: -5px;
span,
a {
font-size: 16px;
}
}
}
}
#repo-files-table { #repo-files-table {
.table.list {
width: 80% !important;
}
thead { thead {
th { th {
padding-top: 8px; padding-top: 8px;
padding-bottom: 5px; padding-bottom: 5px;
font-weight: normal; font-weight: normal;
&:first-child {
#last-commit-message { display: block;
margin-left: 5px; position: relative;
margin-bottom: -4px; width: 325%;
width: 400px;
}
.age {
margin-top: 2px;
} }
} }
.ui.avatar { .ui.avatar {
@ -168,21 +158,7 @@
} }
tbody { tbody {
.icon { .icon {
margin-left: 5px; margin-right: 5px;
}
.name {
max-width: 120px;
}
.message {
max-width: 300px;
}
.age {
min-width: 150px;
}
.text.truncate {
margin-bottom: -5px;
max-width: 100%;
} }
} }
td { td {
@ -610,32 +586,6 @@
} }
} }
} }
.commits.table {
font-size: 13px;
th, td {
&:first-child {
padding-left: 15px;
}
}
td {
line-height: 15px;
}
.author {
min-width: 180px;
}
.message span {
max-width: 500px;
}
.date {
width: 120px;
}
}
.sha.label {
font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace;
font-size: 14px;
padding: 6px 10px 4px 10px;
font-weight: normal;
}
.diff-detail-box { .diff-detail-box {
margin: 15px 0; margin: 15px 0;

8
templates/repo/commits.tmpl
View file

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

17
templates/repo/commits_table.tmpl
View file

@ -16,13 +16,12 @@
{{if .Commits}} {{if .Commits}}
<div class="ui attached table segment"> <div class="ui attached table segment">
<table class="ui very basic striped commits table"> <table class="ui very basic striped fixed single line">
<thead> <thead>
<tr> <tr>
<th>{{.i18n.Tr "repo.commits.author"}}</th> <th class="four wide">{{.i18n.Tr "repo.commits.author"}}</th>
<th>SHA1</th> <th class="nine wide message"><span class="ui sha label">&nbsp;&nbsp;&nbsp;SHA1&nbsp;&nbsp;&nbsp;</span> {{.i18n.Tr "repo.commits.message"}}</th>
<th>{{.i18n.Tr "repo.commits.message"}}</th> <th class="three wide right aligned">{{.i18n.Tr "repo.commits.date"}}</th>
<th>{{.i18n.Tr "repo.commits.date"}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -36,9 +35,11 @@
<img class="ui avatar image" src="{{AvatarLink .Author.Email}}" alt=""/>&nbsp;&nbsp;{{.Author.Name}} <img class="ui avatar image" src="{{AvatarLink .Author.Email}}" alt=""/>&nbsp;&nbsp;{{.Author.Name}}
{{end}} {{end}}
</td> </td>
<td class="sha"><a rel="nofollow" class="ui green sha label" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.ID}} ">{{SubStr .ID.String 0 10}} </a></td> <td class="message">
<td class="message"><span class="text truncate">{{RenderCommitMessage .Summary $.RepoLink}}</span></td> <a rel="nofollow" class="ui green sha label" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.ID}}">{{ShortSha .ID.String}}</a>
<td class="date">{{TimeSince .Author.When $.Lang}}</td> {{RenderCommitMessage .Summary $.RepoLink}}
</td>
<td class="grey text right aligned">{{TimeSince .Author.When $.Lang}}</td>
</tr> </tr>
{{end}} {{end}}
</tbody> </tbody>

2
templates/repo/forks.tmpl
View file

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

1
templates/repo/header.tmpl
View file

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

157
templates/repo/home.tmpl
View file

@ -1,16 +1,83 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository file list"> <div class="repository file list">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}} <p id="repo-desc">
<div class="ui grid"> {{if .Repository.DescriptionHtml}}<span class="description">{{.Repository.DescriptionHtml}}</span>{{else}}<span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>{{end}}
<div class="ui ten wide column"> <a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a>
<p id="repo-desc"> </p>
{{if .Repository.DescriptionHtml}}<span class="description">{{.Repository.DescriptionHtml}}</span>{{else}}<span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>{{end}} <div class="ui secondary menu">
<a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a> {{if and .IsRepositoryAdmin .Repository.BaseRepo}}
</p> <div class="fitted item">
{{ $baseRepo := .Repository.BaseRepo}}
<a href="{{AppSubUrl}}/{{$baseRepo.Owner.Name}}/{{$baseRepo.Name}}/compare/{{$.BaseDefaultBranch}}...{{$.Owner.Name}}:{{$.BranchName}}">
<button class="ui green small button"><i class="octicon octicon-git-compare"></i></button>
</a>
</div> </div>
<div class="ui six wide column"> {{end}}
<div class="fitted item choose reference">
<div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}">
<div class="ui basic small button">
<span class="text">
<i class="octicon octicon-git-branch"></i>
{{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}:
<strong>{{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}}</strong>
</span>
<i class="dropdown icon"></i>
</div>
<div class="menu">
<div class="ui icon search input">
<i class="filter icon"></i>
<input name="search" placeholder="{{.i18n.Tr "repo.filter_branch_and_tag"}}...">
</div>
<div class="header">
<div class="ui grid">
<div class="two column row">
<a class="reference column" href="#" data-target="#branch-list">
<span class="text {{if .IsViewBranch}}black{{end}}">
<i class="icon octicon octicon-git-branch"></i> {{.i18n.Tr "repo.branches"}}
</span>
</a>
<a class="reference column" href="#" data-target="#tag-list">
<span class="text {{if .IsTag}}black{{end}}">
<i class="reference tags icon"></i> {{.i18n.Tr "repo.tags"}}
</span>
</a>
</div>
</div>
</div>
<div id="branch-list" class="scrolling menu" {{if .IsTag}}style="display: none"{{end}}>
{{range .Branches}}
<div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/src/{{EscapePound .}}">{{.}}</div>
{{end}}
</div>
<div id="tag-list" class="scrolling menu" {{if .IsViewBranch}}style="display: none"{{end}}>
{{range .Tags}}
<div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/src/{{EscapePound .}}">{{.}}</div>
{{end}}
</div>
</div>
</div>
</div>
<div class="item fitted">
<div class="ui breadcrumb">
<a class="section" href="{{.RepoLink}}/src/{{EscapePound .BranchName}}">{{.Repository.Name}}</a>
{{ $n := len .Treenames}}
{{ $l := Subtract $n 1}}
{{range $i, $v := .Treenames}}
<div class="divider"> / </div>
{{if eq $i $l}}
<span class="active section">{{$v}}</span>
{{else}}
{{ $p := index $.Paths $i}}
<span class="section"><a href="{{EscapePound $.BranchLink}}/{{EscapePound $p}}">{{$v}}</a></span>
{{end}}
{{end}}
</div>
</div>
{{if eq $n 0}}
<div class="right fitted item">
<div class="ui action small input" id="clone-panel"> <div class="ui action small input" id="clone-panel">
{{if not $.DisableSSH}} {{if not $.DisableSSH}}
<button class="ui blue basic clone button" id="repo-clone-ssh" data-link="{{.CloneLink.SSH}}"> <button class="ui blue basic clone button" id="repo-clone-ssh" data-link="{{.CloneLink.SSH}}">
@ -33,80 +100,8 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<ul class="head meta">
{{if and .IsRepositoryAdmin .Repository.BaseRepo}}
<li>
{{ $baseRepo := .Repository.BaseRepo}}
<a href="{{AppSubUrl}}/{{$baseRepo.Owner.Name}}/{{$baseRepo.Name}}/compare/{{$.BaseDefaultBranch}}...{{$.Owner.Name}}:{{$.BranchName}}">
<button class="ui green small button"><i class="octicon octicon-git-compare"></i></button>
</a>
</li>
{{end}} {{end}}
<li> </div>
<div class="choose reference">
<div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}">
<div class="ui basic small button">
<span class="text">
<i class="octicon octicon-git-branch"></i>
{{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}:
<strong>{{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}}</strong>
</span>
<i class="dropdown icon"></i>
</div>
<div class="menu">
<div class="ui icon search input">
<i class="filter icon"></i>
<input name="search" placeholder="{{.i18n.Tr "repo.filter_branch_and_tag"}}...">
</div>
<div class="header">
<div class="ui grid">
<div class="two column row">
<a class="reference column" href="#" data-target="#branch-list">
<span class="text {{if .IsViewBranch}}black{{end}}">
<i class="icon octicon octicon-git-branch"></i> {{.i18n.Tr "repo.branches"}}
</span>
</a>
<a class="reference column" href="#" data-target="#tag-list">
<span class="text {{if .IsTag}}black{{end}}">
<i class="reference tags icon"></i> {{.i18n.Tr "repo.tags"}}
</span>
</a>
</div>
</div>
</div>
<div id="branch-list" class="scrolling menu" {{if .IsTag}}style="display: none"{{end}}>
{{range .Branches}}
<div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/src/{{EscapePound .}}">{{.}}</div>
{{end}}
</div>
<div id="tag-list" class="scrolling menu" {{if .IsViewBranch}}style="display: none"{{end}}>
{{range .Tags}}
<div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/src/{{EscapePound .}}">{{.}}</div>
{{end}}
</div>
</div>
</div>
</div>
</li>
<li>
<div class="ui breadcrumb">
<a class="section" href="{{.RepoLink}}/src/{{EscapePound .BranchName}}">{{.Repository.Name}}</a>
{{ $n := len .Treenames}}
{{ $l := Subtract $n 1}}
{{range $i, $v := .Treenames}}
<div class="divider"> / </div>
{{if eq $i $l}}
<span class="active section">{{$v}}</span>
{{else}}
{{ $p := index $.Paths $i}}
<span class="section"><a href="{{EscapePound $.BranchLink}}/{{EscapePound $p}}">{{$v}}</a></span>
{{end}}
{{end}}
</div>
</li>
</ul>
{{if .IsFile}} {{if .IsFile}}
{{template "repo/view_file" .}} {{template "repo/view_file" .}}
{{else}} {{else}}

2
templates/repo/issue/labels.tmpl
View file

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

2
templates/repo/issue/list.tmpl
View file

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

2
templates/repo/issue/milestones.tmpl
View file

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

2
templates/repo/release/list.tmpl
View file

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

2
templates/repo/release/new.tmpl
View file

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

2
templates/repo/settings/collaboration.tmpl
View file

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

2
templates/repo/settings/deploy_keys.tmpl
View file

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

2
templates/repo/settings/githook_edit.tmpl
View file

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

2
templates/repo/settings/githooks.tmpl
View file

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

2
templates/repo/settings/hook_new.tmpl
View file

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

2
templates/repo/settings/hooks.tmpl
View file

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

2
templates/repo/settings/options.tmpl
View file

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

55
templates/repo/sidebar.tmpl
View file

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

50
templates/repo/view_list.tmpl
View file

@ -1,28 +1,26 @@
<table id="repo-files-table" class="ui table"> <table id="repo-files-table" class="ui fixed single line table">
<thead> <thead>
<tr> <tr>
<th colspan="5" class="clear"> <th class="four wide">
<span> {{if .LastCommitUser}}
{{if .LastCommitUser}} <img class="ui avatar image img-12" src="{{.LastCommitUser.AvatarLink}}" />
<img class="ui avatar image img-12" src="{{.LastCommitUser.AvatarLink}}" /> <a href="{{AppSubUrl}}/{{.LastCommitUser.Name}}"><strong>{{.LastCommit.Author.Name}}</strong></a>
<a href="{{AppSubUrl}}/{{.LastCommitUser.Name}}"><strong>{{.LastCommit.Author.Name}}</strong></a>: {{else}}
{{else}} <img class="ui avatar image img-12" src="{{AvatarLink .LastCommit.Author.Email}}" />
<img class="ui avatar image img-12" src="{{AvatarLink .LastCommit.Author.Email}}" /> <strong>{{.LastCommit.Author.Name}}</strong>
<strong>{{.LastCommit.Author.Name}}</strong>: {{end}}
{{end}} <a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.LastCommit.ID}}" rel="nofollow">{{ShortSha .LastCommit.ID.String}}</a>
</span> <span class="grey">{{RenderCommitMessage .LastCommit.Summary .RepoLink}}</span>
<a class="text black" href="{{.RepoLink}}/commit/{{.LastCommit.ID}}" rel="nofollow">
<strong>{{ShortSha .LastCommit.ID.String}}</strong></a>
<span class="text truncate grey" id="last-commit-message">{{RenderCommitMessage .LastCommit.Summary .RepoLink}}</span>
<span class="ui right text grey age">{{TimeSince .LastCommit.Author.When $.Lang}}</span>
</th> </th>
<th class="nine wide">
</th>
<th class="three wide text grey right age">{{TimeSince .LastCommit.Author.When $.Lang}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{{if .HasParentPath}} {{if .HasParentPath}}
<tr class="has-parent"> <tr class="has-parent">
<td><span class="octicon octicon-mail-reply"></span></td> <td colspan="3"><i class="icon octicon octicon-mail-reply"></i><a href="{{EscapePound .BranchLink}}{{.ParentPath}}">..</a></td>
<td><a href="{{EscapePound .BranchLink}}{{.ParentPath}}">..</a></td>
</tr> </tr>
{{end}} {{end}}
{{range $item := .Files}} {{range $item := .Files}}
@ -32,27 +30,21 @@
{{if $entry.IsSubModule}} {{if $entry.IsSubModule}}
<td> <td>
<span class="icon octicon octicon-file-submodule"></span> <span class="icon octicon octicon-file-submodule"></span>
</td>
<td>
{{if $commit.RefUrl}} {{if $commit.RefUrl}}
<a href="{{$commit.RefUrl}}" class="text truncate">{{$entry.Name}}</a> @ <a href="{{$commit.RefUrl}}/commit/{{$commit.RefId}}">{{ShortSha $commit.RefId}}</a> <a href="{{$commit.RefUrl}}">{{$entry.Name}}</a> @ <a href="{{$commit.RefUrl}}/commit/{{$commit.RefId}}">{{ShortSha $commit.RefId}}</a>
{{else}} {{else}}
{{$entry.Name}} @ {{ShortSha $commit.RefId}} {{$entry.Name}} @ {{ShortSha $commit.RefId}}
{{end}} {{end}}
</td> </td>
{{else}} {{else}}
<td>
<span class="icon octicon octicon-file-{{if or $entry.IsDir}}directory{{else}}text{{end}}"></span>
</td>
<td class="name"> <td class="name">
<a href="{{EscapePound $.BranchLink}}/{{EscapePound $.TreePath}}{{EscapePound $entry.Name}}" class="text truncate">{{$entry.Name}}</a> <span class="icon octicon octicon-file-{{if or $entry.IsDir}}directory{{else}}text{{end}}"></span>
<a href="{{EscapePound $.BranchLink}}/{{EscapePound $.TreePath}}{{EscapePound $entry.Name}}">{{$entry.Name}}</a>
</td> </td>
{{end}} {{end}}
<td class="sha"> <td class="message collapsing">
<a rel="nofollow" class="ui green sha label" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{$commit.ID}} ">{{SubStr $commit.ID.String 0 10}} </a> <a rel="nofollow" class="ui green sha label" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{$commit.ID}}">{{ShortSha $commit.ID.String}}</a>
</td> {{RenderCommitMessage $commit.Summary $.RepoLink}}
<td class="message">
<span class="text truncate">{{RenderCommitMessage $commit.Summary $.RepoLink}}</span>
</td> </td>
<td class="text grey right age">{{TimeSince $commit.Committer.When $.Lang}}</td> <td class="text grey right age">{{TimeSince $commit.Committer.When $.Lang}}</td>
</tr> </tr>

2
templates/repo/watchers.tmpl
View file

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

4
templates/repo/wiki/new.tmpl
View file

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

2
templates/repo/wiki/pages.tmpl
View file

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

2
templates/repo/wiki/start.tmpl
View file

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

2
templates/repo/wiki/view.tmpl
View file

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