@@ -234,6 +234,11 @@ settings.update_webhook = 更新 Web 钩子 | |||||
settings.update_hook_success = Web 钩子更新成功! | settings.update_hook_success = Web 钩子更新成功! | ||||
settings.delete_webhook = 删除 Web 钩子 | settings.delete_webhook = 删除 Web 钩子 | ||||
settings.recent_deliveries = 最近推送记录 | settings.recent_deliveries = 最近推送记录 | ||||
settings.hook_type = 钩子类型 | |||||
settings.add_slack_hook_desc = 为您的仓库增加 <a href="http://slack.com">Slack</a> 集成 | |||||
settings.slack_token = 令牌 | |||||
settings.slack_domain = 域名 | |||||
settings.slack_channel = 频道 | |||||
[org] | [org] | ||||
org_name_holder = 组织名称 | org_name_holder = 组织名称 | ||||
@@ -44,14 +44,14 @@ | |||||
</button> | </button> | ||||
</a> | </a> | ||||
</li> | </li> | ||||
<li id="repo-header-fork"> | |||||
<!-- <li id="repo-header-fork"> | |||||
<a id="repo-header-fork-btn" href="{{.RepoLink}}/action/fork"> | <a id="repo-header-fork-btn" href="{{.RepoLink}}/action/fork"> | ||||
<button class="btn btn-gray text-bold btn-radius"> | <button class="btn btn-gray text-bold btn-radius"> | ||||
<i class="octicon octicon-repo-forked"></i>{{.i18n.Tr "repo.fork"}} | <i class="octicon octicon-repo-forked"></i>{{.i18n.Tr "repo.fork"}} | ||||
<span class="num">{{.Repository.NumForks}}</span> | <span class="num">{{.Repository.NumForks}}</span> | ||||
</button> | </button> | ||||
</a> | </a> | ||||
</li> | |||||
</li> --> | |||||
</ul> | </ul> | ||||
</div> | </div> | ||||
</div> | </div> |
@@ -9,11 +9,11 @@ | |||||
<a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a> | <a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a> | ||||
</p> | </p> | ||||
<ul id="repo-file-nav" class="clear menu menu-line"> | <ul id="repo-file-nav" class="clear menu menu-line"> | ||||
<li> | |||||
<!-- <li> | |||||
<a href="#"> | <a href="#"> | ||||
<button class="btn btn-green btn-small btn-radius" id="repo-compare-btn"><i class="octicon octicon-git-compare"></i></button> | <button class="btn btn-green btn-small btn-radius" id="repo-compare-btn"><i class="octicon octicon-git-compare"></i></button> | ||||
</a> | </a> | ||||
</li> | |||||
</li> --> | |||||
<li id="repo-branch-switch" class="down drop"> | <li id="repo-branch-switch" class="down drop"> | ||||
<a href="#"> | <a href="#"> | ||||
<button class="btn btn-gray btn-small btn-radius"> | <button class="btn btn-gray btn-small btn-radius"> | ||||
@@ -22,24 +22,24 @@ | |||||
</button> | </button> | ||||
</a> | </a> | ||||
<div class="drop-down panel"> | <div class="drop-down panel"> | ||||
<p class="panel-header text-bold">Branches & Tags</p> | |||||
<input id="repo-branch-filter-ipt" class="ipt ipt-large" type="text" placeholder="find branches / tags"/> | |||||
<p class="panel-header text-bold">Branches <!-- & Tags --></p> | |||||
<!-- <input id="repo-branch-filter-ipt" class="ipt ipt-large" type="text" placeholder="find branches / tags"/> --> | |||||
<div id="repo-branch-tag"> | <div id="repo-branch-tag"> | ||||
<ul class="menu menu-line tab-nav clear" id="repo-branch-tab-nav"> | <ul class="menu menu-line tab-nav clear" id="repo-branch-tab-nav"> | ||||
<li class="js-tab-nav js-tab-nav-show left" data-tab-target="#repo-branch-list"><a href="#">Branches</a></li> | <li class="js-tab-nav js-tab-nav-show left" data-tab-target="#repo-branch-list"><a href="#">Branches</a></li> | ||||
<li class="js-tab-nav left" data-tab-target="#repo-tag-list"><a href="#">Tags</a></li> | |||||
<!-- <li class="js-tab-nav left" data-tab-target="#repo-tag-list"><a href="#">Tags</a></li> --> | |||||
</ul> | </ul> | ||||
<ul class="menu menu-vertical switching-list" id="repo-branch-list"> | <ul class="menu menu-vertical switching-list" id="repo-branch-list"> | ||||
{{range .Branches}} | {{range .Branches}} | ||||
<li {{if eq . $.BranchName}}class="checked"{{end}}><a href="{{$.RepoLink}}/src/{{.}}"><i class="octicon octicon-check"></i>{{.}}</a></li> | <li {{if eq . $.BranchName}}class="checked"{{end}}><a href="{{$.RepoLink}}/src/{{.}}"><i class="octicon octicon-check"></i>{{.}}</a></li> | ||||
{{end}} | {{end}} | ||||
</ul> | </ul> | ||||
<ul class="menu menu-vertical switching-list" id="repo-tag-list"> | |||||
<!-- <ul class="menu menu-vertical switching-list" id="repo-tag-list"> | |||||
<li><a href="#"><i class="octicon octicon-check"></i>0.3.3</a></li> | <li><a href="#"><i class="octicon octicon-check"></i>0.3.3</a></li> | ||||
<li><a href="#"><i class="octicon octicon-check"></i>0.4.4</a></li> | <li><a href="#"><i class="octicon octicon-check"></i>0.4.4</a></li> | ||||
<li class="checked"><a href="#"><i class="octicon octicon-check"></i>0.1</a></li> | <li class="checked"><a href="#"><i class="octicon octicon-check"></i>0.1</a></li> | ||||
<li><a href="#"><i class="octicon octicon-check"></i>0.1 beta</a></li> | <li><a href="#"><i class="octicon octicon-check"></i>0.1 beta</a></li> | ||||
</ul> | |||||
</ul> --> | |||||
</div> | </div> | ||||
</div> | </div> | ||||
</li> | </li> | ||||
@@ -55,7 +55,7 @@ | |||||
{{end}} | {{end}} | ||||
{{end}} | {{end}} | ||||
</li> | </li> | ||||
<li id="repo-commits-jump" class="repo-jump right"> | |||||
<!-- <li id="repo-commits-jump" class="repo-jump right"> | |||||
<a href="#"> | <a href="#"> | ||||
<button class="btn btn-small btn-gray btn-right-radius"><i class="octicon octicon-git-commit"></i></button> | <button class="btn btn-small btn-gray btn-right-radius"><i class="octicon octicon-git-commit"></i></button> | ||||
</a> | </a> | ||||
@@ -64,7 +64,7 @@ | |||||
<a href="#"> | <a href="#"> | ||||
<button class="btn btn-small btn-gray btn-left-radius"><i class="octicon octicon-list-unordered"></i></button> | <button class="btn btn-small btn-gray btn-left-radius"><i class="octicon octicon-list-unordered"></i></button> | ||||
</a> | </a> | ||||
</li> | |||||
</li> --> | |||||
</ul> | </ul> | ||||
{{if .IsFile}} | {{if .IsFile}} | ||||
{{template "repo/view_file" .}} | {{template "repo/view_file" .}} | ||||
@@ -1,4 +1,4 @@ | |||||
<div id="gogs" class="{{if (and .PageIsSettingsHooksEdit (not (eq .HookType "gogs")))}}hidden{{end}}"> | |||||
<div id="gogs" class="{{if (and .PageIsSettingsHooksEdit (not (eq .HookType "Gogs")))}}hidden{{end}}"> | |||||
<form class="form form-align panel-body repo-setting-form" id="repo-setting-form-gogs" action="{{.RepoLink}}/settings/hooks/gogs/{{if .PageIsSettingsHooksNew}}new{{else}}{{.Webhook.Id}}{{end}}" method="post"> | <form class="form form-align panel-body repo-setting-form" id="repo-setting-form-gogs" action="{{.RepoLink}}/settings/hooks/gogs/{{if .PageIsSettingsHooksNew}}new{{else}}{{.Webhook.Id}}{{end}}" method="post"> | ||||
{{.CsrfTokenHtml}} | {{.CsrfTokenHtml}} | ||||
<input type="hidden" name="hook_type" value="gogs"> | <input type="hidden" name="hook_type" value="gogs"> |
@@ -14,8 +14,8 @@ | |||||
<strong>{{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}</strong> | <strong>{{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}</strong> | ||||
</div> | </div> | ||||
{{template "repo/settings/hook_types" .}} | {{template "repo/settings/hook_types" .}} | ||||
{{template "repo/settings/gogs_hook" .}} | |||||
{{template "repo/settings/slack_hook" .}} | |||||
{{template "repo/settings/hook_gogs" .}} | |||||
{{template "repo/settings/hook_slack" .}} | |||||
</div> | </div> | ||||
</div> | </div> | ||||
{{if .PageIsSettingsHooksEdit}} | {{if .PageIsSettingsHooksEdit}} | ||||
@@ -1,4 +1,4 @@ | |||||
<div id="slack" class="{{if or .PageIsSettingsHooksNew (and .PageIsSettingsHooksEdit (not (eq .HookType "slack")))}}hidden{{end}}"> | |||||
<div id="slack" class="{{if or .PageIsSettingsHooksNew (and .PageIsSettingsHooksEdit (not (eq .HookType "Slack")))}}hidden{{end}}"> | |||||
<form class="form form-align panel-body repo-setting-form" id="repo-setting-form-slack" action="{{.RepoLink}}/settings/hooks/slack/{{if .PageIsSettingsHooksNew}}new{{else}}{{.Webhook.Id}}{{end}}" method="post"> | <form class="form form-align panel-body repo-setting-form" id="repo-setting-form-slack" action="{{.RepoLink}}/settings/hooks/slack/{{if .PageIsSettingsHooksNew}}new{{else}}{{.Webhook.Id}}{{end}}" method="post"> | ||||
{{.CsrfTokenHtml}} | {{.CsrfTokenHtml}} | ||||
<input type="hidden" name="hook_type" value="slack"> | <input type="hidden" name="hook_type" value="slack"> |
@@ -5,7 +5,7 @@ | |||||
<li {{if .PageIsSettingsOptions}}class="current"{{end}}><a href="{{.RepoLink}}/settings">{{.i18n.Tr "repo.settings.options"}}</a></li> | <li {{if .PageIsSettingsOptions}}class="current"{{end}}><a href="{{.RepoLink}}/settings">{{.i18n.Tr "repo.settings.options"}}</a></li> | ||||
<li {{if .PageIsSettingsCollaboration}}class="current"{{end}}><a href="{{.RepoLink}}/settings/collaboration">{{.i18n.Tr "repo.settings.collaboration"}}</a></li> | <li {{if .PageIsSettingsCollaboration}}class="current"{{end}}><a href="{{.RepoLink}}/settings/collaboration">{{.i18n.Tr "repo.settings.collaboration"}}</a></li> | ||||
<li {{if .PageIsSettingsHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks">{{.i18n.Tr "repo.settings.hooks"}}</a></li> | <li {{if .PageIsSettingsHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks">{{.i18n.Tr "repo.settings.hooks"}}</a></li> | ||||
<li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.i18n.Tr "repo.settings.deploy_keys"}}</a></li> | |||||
<!-- <li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.i18n.Tr "repo.settings.deploy_keys"}}</a></li> --> | |||||
</ul> | </ul> | ||||
</div> | </div> | ||||
</div> | </div> |
@@ -3,23 +3,23 @@ | |||||
<li> | <li> | ||||
<a class="radius" href="{{.RepoLink}}/issues"><i class="octicon octicon-issue-opened"></i>Issues<span class="num right label label-blue label-radius">{{.Repository.NumOpenIssues}}</span></a> | <a class="radius" href="{{.RepoLink}}/issues"><i class="octicon octicon-issue-opened"></i>Issues<span class="num right label label-blue label-radius">{{.Repository.NumOpenIssues}}</span></a> | ||||
</li> | </li> | ||||
<li> | |||||
<!-- <li> | |||||
<a class="radius" href="{{.RepoLink}}/pulls"><i class="octicon octicon-git-pull-request"></i>Pull Requests<span class="num right label label-blue label-radius">{{.Repository.NumOpenPulls}}</span></a> | <a class="radius" href="{{.RepoLink}}/pulls"><i class="octicon octicon-git-pull-request"></i>Pull Requests<span class="num right label label-blue label-radius">{{.Repository.NumOpenPulls}}</span></a> | ||||
</li> | |||||
</li> --> | |||||
<li class="border-bottom"></li> | <li class="border-bottom"></li> | ||||
<li class="head">{{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}}</li> | <li class="head">{{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}}</li> | ||||
<li> | <li> | ||||
<a class="radius" href="{{.RepoLink}}/commits/{{.BranchName}}"><i class="octicon octicon-history"></i>Commits <span class="num right label label-gray label-radius">{{.CommitsCount}}</span></a> | <a class="radius" href="{{.RepoLink}}/commits/{{.BranchName}}"><i class="octicon octicon-history"></i>Commits <span class="num right label label-gray label-radius">{{.CommitsCount}}</span></a> | ||||
</li> | </li> | ||||
<li> | |||||
<!-- <li> | |||||
<a class="radius" href="{{.RepoLink}}/branches"><i class="octicon octicon-git-branch"></i>Branches<span class="num right label label-gray label-radius">{{.BrancheCount}}</span></a> | <a class="radius" href="{{.RepoLink}}/branches"><i class="octicon octicon-git-branch"></i>Branches<span class="num right label label-gray label-radius">{{.BrancheCount}}</span></a> | ||||
</li> | |||||
</li> --> | |||||
<li> | <li> | ||||
<a class="radius" href="{{.RepoLink}}/releases"><i class="octicon octicon-tag"></i>Releases <span class="num right label label-gray label-radius">{{.Repository.NumTags}}</span></a> | <a class="radius" href="{{.RepoLink}}/releases"><i class="octicon octicon-tag"></i>Releases <span class="num right label label-gray label-radius">{{.Repository.NumTags}}</span></a> | ||||
</li> | </li> | ||||
<li> | |||||
<!-- <li> | |||||
<a class="radius" href="#"><i class="octicon octicon-organization"></i>contributors <span class="num right label label-gray label-radius">43</span></a> | <a class="radius" href="#"><i class="octicon octicon-organization"></i>contributors <span class="num right label label-gray label-radius">43</span></a> | ||||
</li> | |||||
</li> --> | |||||
<li class="border-bottom"></li> | <li class="border-bottom"></li> | ||||
<li> | <li> | ||||
<a class="radius" href="{{.RepoLink}}/settings"><i class="octicon octicon-tools"></i>settings</a> | <a class="radius" href="{{.RepoLink}}/settings"><i class="octicon octicon-tools"></i>settings</a> | ||||
@@ -24,21 +24,23 @@ | |||||
</a> | </a> | ||||
</li> | </li> | ||||
{{end}} | {{end}} | ||||
<li> | |||||
<!-- <li> | |||||
<a href="/user/settings/orgs"><i class="octicon octicon-organization"></i>{{.i18n.Tr "manage_org"}}</a> | <a href="/user/settings/orgs"><i class="octicon octicon-organization"></i>{{.i18n.Tr "manage_org"}}</a> | ||||
</li> | |||||
</li> --> | |||||
<li> | <li> | ||||
<a href="/org/create"><i class="octicon octicon-plus"></i>{{.i18n.Tr "new_org"}}</a> | <a href="/org/create"><i class="octicon octicon-plus"></i>{{.i18n.Tr "new_org"}}</a> | ||||
</li> | </li> | ||||
</ul> | </ul> | ||||
</div> | </div> | ||||
</li> | </li> | ||||
{{if not .ContextUser.IsOrganization}} | |||||
<li class="right"> | <li class="right"> | ||||
<a {{if $.PageIsIssues}}class="current"{{end}} href="{{.ContextUser.DashboardLink}}issues"><i class="octicon octicon-issue-opened"></i>{{.i18n.Tr "issues"}}</a> | <a {{if $.PageIsIssues}}class="current"{{end}} href="{{.ContextUser.DashboardLink}}issues"><i class="octicon octicon-issue-opened"></i>{{.i18n.Tr "issues"}}</a> | ||||
</li> | </li> | ||||
<li class="right"> | |||||
{{end}} | |||||
<!-- <li class="right"> | |||||
<a {{if .PageIsPulls}}class="current"{{end}} href="{{.ContextUser.DashboardLink}}pulls"><i class="octicon octicon-git-pull-request"></i>{{.i18n.Tr "pull_requests"}}</a> | <a {{if .PageIsPulls}}class="current"{{end}} href="{{.ContextUser.DashboardLink}}pulls"><i class="octicon octicon-git-pull-request"></i>{{.i18n.Tr "pull_requests"}}</a> | ||||
</li> | |||||
</li> --> | |||||
<li class="right"> | <li class="right"> | ||||
<a {{if $.PageIsNews}}class="current"{{end}} href="{{.ContextUser.DashboardLink}}"><i class="octicon octicon-rss"></i>{{.i18n.Tr "news_feed"}}</a> | <a {{if $.PageIsNews}}class="current"{{end}} href="{{.ContextUser.DashboardLink}}"><i class="octicon octicon-rss"></i>{{.i18n.Tr "news_feed"}}</a> | ||||
</li> | </li> | ||||