third_party
/
gitea
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Keep repo URL action right of ref combo & path

Browse Source 
Just use secondary menu instead custom ".head.meta", which simplifies code.

Also do not display repo URL action when we are in subdirectory or viewing a
file.
tokarchuk/v1.17
Adam Strzelecki 9 years ago
parent 3eae4ecde7
commit 314664892c
3 changed files with 73 additions and 108 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      public/css/gogs.css
  2. 16
      public/less/_repository.less
  3. 151
      templates/repo/home.tmpl

14
public/css/gogs.css
Unescape View File

@ -1854,20 +1854,6 @@ 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 thead th { .repository.file.list #repo-files-table thead th {
padding-top: 8px; padding-top: 8px;
padding-bottom: 5px; padding-bottom: 5px;

16
public/less/_repository.less
Unescape View File

@ -139,22 +139,6 @@
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 {
thead { thead {

151
templates/repo/home.tmpl
Unescape View File

@ -3,94 +3,64 @@
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
<div class="ui grid"> <p id="repo-desc">
<div class="ui ten wide column"> {{if .Repository.DescriptionHtml}}<span class="description">{{.Repository.DescriptionHtml}}</span>{{else}}<span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>{{end}}
<p id="repo-desc"> <a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a>
{{if .Repository.DescriptionHtml}}<span class="description">{{.Repository.DescriptionHtml}}</span>{{else}}<span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>{{end}} </p>
<a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a> <div class="ui secondary menu">
</p>
</div>
<div class="ui six wide column">
<div class="ui action small input" id="clone-panel">
{{if not $.DisableSSH}}
<button class="ui blue basic clone button" id="repo-clone-ssh" data-link="{{.CloneLink.SSH}}">
SSH
</button>
{{end}}
<button class="ui {{if $.DisableSSH}}blue{{end}} basic clone button" id="repo-clone-https" data-link="{{.CloneLink.HTTPS}}">
{{if UseHTTPS}}HTTPS{{else}}HTTP{{end}}
</button>
<input id="repo-clone-url" value="{{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}" readonly>
<button class="ui basic icon button poping up clipboard" id="clipboard-btn" data-original="{{.i18n.Tr "repo.copy_link"}}" data-success="{{.i18n.Tr "repo.copy_link_success"}}" data-error="{{.i18n.Tr "repo.copy_link_error"}}" data-content="{{.i18n.Tr "repo.copy_link"}}" data-variation="inverted tiny" data-clipboard-target="#repo-clone-url">
<i class="octicon octicon-clippy"></i>
</button>
<div class="ui basic jump dropdown icon button">
<i class="download icon"></i>
<div class="menu">
<a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.BranchName}}.zip"><i class="icon octicon octicon-file-zip"></i> ZIP</a>
<a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.BranchName}}.tar.gz"><i class="icon octicon octicon-file-zip"></i> TAR.GZ</a>
</div>
</div>
</div>
</div>
</div>
<ul class="head meta">
{{if and .IsRepositoryAdmin .Repository.BaseRepo}} {{if and .IsRepositoryAdmin .Repository.BaseRepo}}
<li> <div class="fitted item">
{{ $baseRepo := .Repository.BaseRepo}} {{ $baseRepo := .Repository.BaseRepo}}
<a href="{{AppSubUrl}}/{{$baseRepo.Owner.Name}}/{{$baseRepo.Name}}/compare/{{$.BaseDefaultBranch}}...{{$.Owner.Name}}:{{$.BranchName}}"> <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> <button class="ui green small button"><i class="octicon octicon-git-compare"></i></button>
</a> </a>
</li> </div>
{{end}} {{end}}
<li> <div class="fitted item choose reference">
<div class="choose reference"> <div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}">
<div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}"> <div class="ui basic small button">
<div class="ui basic small button"> <span class="text">
<span class="text"> <i class="octicon octicon-git-branch"></i>
<i class="octicon octicon-git-branch"></i> {{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}:
{{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}: <strong>{{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}}</strong>
<strong>{{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}}</strong> </span>
</span> <i class="dropdown icon"></i>
<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>
<div class="menu"> <div class="header">
<div class="ui icon search input"> <div class="ui grid">
<i class="filter icon"></i> <div class="two column row">
<input name="search" placeholder="{{.i18n.Tr "repo.filter_branch_and_tag"}}..."> <a class="reference column" href="#" data-target="#branch-list">
</div> <span class="text {{if .IsViewBranch}}black{{end}}">
<div class="header"> <i class="icon octicon octicon-git-branch"></i> {{.i18n.Tr "repo.branches"}}
<div class="ui grid"> </span>
<div class="two column row"> </a>
<a class="reference column" href="#" data-target="#branch-list"> <a class="reference column" href="#" data-target="#tag-list">
<span class="text {{if .IsViewBranch}}black{{end}}"> <span class="text {{if .IsTag}}black{{end}}">
<i class="icon octicon octicon-git-branch"></i> {{.i18n.Tr "repo.branches"}} <i class="reference tags icon"></i> {{.i18n.Tr "repo.tags"}}
</span> </span>
</a> </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> </div>
<div id="branch-list" class="scrolling menu" {{if .IsTag}}style="display: none"{{end}}> </div>
{{range .Branches}} <div id="branch-list" class="scrolling menu" {{if .IsTag}}style="display: none"{{end}}>
<div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/src/{{EscapePound .}}">{{.}}</div> {{range .Branches}}
{{end}} <div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/src/{{EscapePound .}}">{{.}}</div>
</div> {{end}}
<div id="tag-list" class="scrolling menu" {{if .IsViewBranch}}style="display: none"{{end}}> </div>
{{range .Tags}} <div id="tag-list" class="scrolling menu" {{if .IsViewBranch}}style="display: none"{{end}}>
<div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/src/{{EscapePound .}}">{{.}}</div> {{range .Tags}}
{{end}} <div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/src/{{EscapePound .}}">{{.}}</div>
</div> {{end}}
</div> </div>
</div> </div>
</div> </div>
</li> </div>
<li> <div class="item fitted">
<div class="ui breadcrumb"> <div class="ui breadcrumb">
<a class="section" href="{{.RepoLink}}/src/{{EscapePound .BranchName}}">{{.Repository.Name}}</a> <a class="section" href="{{.RepoLink}}/src/{{EscapePound .BranchName}}">{{.Repository.Name}}</a>
{{ $n := len .Treenames}} {{ $n := len .Treenames}}
@ -105,8 +75,33 @@
{{end}} {{end}}
{{end}} {{end}}
</div> </div>
</li> </div>
</ul> {{if eq $n 0}}
<div class="right fitted item">
<div class="ui action small input" id="clone-panel">
{{if not $.DisableSSH}}
<button class="ui blue basic clone button" id="repo-clone-ssh" data-link="{{.CloneLink.SSH}}">
SSH
</button>
{{end}}
<button class="ui {{if $.DisableSSH}}blue{{end}} basic clone button" id="repo-clone-https" data-link="{{.CloneLink.HTTPS}}">
{{if UseHTTPS}}HTTPS{{else}}HTTP{{end}}
</button>
<input id="repo-clone-url" value="{{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}" readonly>
<button class="ui basic icon button poping up clipboard" id="clipboard-btn" data-original="{{.i18n.Tr "repo.copy_link"}}" data-success="{{.i18n.Tr "repo.copy_link_success"}}" data-error="{{.i18n.Tr "repo.copy_link_error"}}" data-content="{{.i18n.Tr "repo.copy_link"}}" data-variation="inverted tiny" data-clipboard-target="#repo-clone-url">
<i class="octicon octicon-clippy"></i>
</button>
<div class="ui basic jump dropdown icon button">
<i class="download icon"></i>
<div class="menu">
<a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.BranchName}}.zip"><i class="icon octicon octicon-file-zip"></i> ZIP</a>
<a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.BranchName}}.tar.gz"><i class="icon octicon octicon-file-zip"></i> TAR.GZ</a>
</div>
</div>
</div>
</div>
{{end}}
</div>
{{if .IsFile}} {{if .IsFile}}
{{template "repo/view_file" .}} {{template "repo/view_file" .}}
{{else}} {{else}}

Write Preview
Loading…
Cancel
Save