diff options
| author | 6543 <24977596+6543@users.noreply.github.com> | 2019-08-26 12:47:41 +0200 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-08-26 13:47:41 +0300 |
| commit | 5409dec8fd29dfb7fcd7c0afb8a2d9682abc48b1 (patch) | |
| tree | ccf3cd85cc243af211cf6f7c9a3f49d9d04630e2 /templates | |
| parent | c9546d4cdd5f7de8f56b7d4a9806d1aca784cf3f (diff) | |
| download | gitea-5409dec8fd29dfb7fcd7c0afb8a2d9682abc48b1.tar.gz gitea-5409dec8fd29dfb7fcd7c0afb8a2d9682abc48b1.zip | |
[Branch View] show "New Pull Request" Button only if posible (#7977)
* add check Commits Ahead is gt 0
* code format
to start drone-ci test again
and formate code is also nice :)
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/admin/config.tmpl | 36 | ||||
| -rw-r--r-- | templates/repo/branch/list.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/graph.tmpl | 5 |
3 files changed, 19 insertions, 24 deletions
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index b8bf1ec028..79eec31dfd 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -88,8 +88,8 @@ <dt>{{.i18n.Tr "admin.config.ssh_minimum_key_size_check"}}</dt> <dd><i class="fa fa{{if .SSH.MinimumKeySizeCheck}}-check{{end}}-square-o"></i></dd> {{if .SSH.MinimumKeySizeCheck}} - <dt>{{.i18n.Tr "admin.config.ssh_minimum_key_sizes"}}</dt> - <dd>{{.SSH.MinimumKeySizes}}</dd> + <dt>{{.i18n.Tr "admin.config.ssh_minimum_key_sizes"}}</dt> + <dd>{{.SSH.MinimumKeySizes}}</dd> {{end}} {{end}} {{end}} @@ -120,20 +120,20 @@ <dt>{{.i18n.Tr "admin.config.db_type"}}</dt> <dd>{{.DbCfg.Type}}</dd> {{if not (or (eq .DbCfg.Type "sqlite3") (eq .DbCfg.Type "tidb"))}} - <dt>{{.i18n.Tr "admin.config.db_host"}}</dt> - <dd>{{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}</dd> - <dt>{{.i18n.Tr "admin.config.db_name"}}</dt> - <dd>{{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}</dd> - <dt>{{.i18n.Tr "admin.config.db_user"}}</dt> - <dd>{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}</dd> + <dt>{{.i18n.Tr "admin.config.db_host"}}</dt> + <dd>{{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}</dd> + <dt>{{.i18n.Tr "admin.config.db_name"}}</dt> + <dd>{{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}</dd> + <dt>{{.i18n.Tr "admin.config.db_user"}}</dt> + <dd>{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}</dd> {{end}} {{if eq .DbCfg.Type "postgres"}} - <dt>{{.i18n.Tr "admin.config.db_ssl_mode"}}</dt> - <dd>{{if .DbCfg.SSLMode}}{{.DbCfg.SSLMode}}{{else}}-{{end}}</dd> + <dt>{{.i18n.Tr "admin.config.db_ssl_mode"}}</dt> + <dd>{{if .DbCfg.SSLMode}}{{.DbCfg.SSLMode}}{{else}}-{{end}}</dd> {{end}} {{if or (eq .DbCfg.Type "sqlite3") (eq .DbCfg.Type "tidb")}} - <dt>{{.i18n.Tr "admin.config.db_path"}}</dt> - <dd>{{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}}</dd> + <dt>{{.i18n.Tr "admin.config.db_path"}}</dt> + <dd>{{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}}</dd> {{end}} </dl> </div> @@ -250,14 +250,14 @@ <dt>{{.i18n.Tr "admin.config.cache_adapter"}}</dt> <dd>{{.CacheAdapter}}</dd> {{if eq .CacheAdapter "memory"}} - <dt>{{.i18n.Tr "admin.config.cache_interval"}}</dt> - <dd>{{.CacheInterval}} {{.i18n.Tr "tool.raw_seconds"}}</dd> + <dt>{{.i18n.Tr "admin.config.cache_interval"}}</dt> + <dd>{{.CacheInterval}} {{.i18n.Tr "tool.raw_seconds"}}</dd> {{end}} {{if .CacheConn}} - <dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt> - <dd><code>{{.CacheConn}}</code></dd> - <dt>{{.i18n.Tr "admin.config.cache_item_ttl"}}</dt> - <dd><code>{{.CacheItemTTL}}</code></dd> + <dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt> + <dd><code>{{.CacheConn}}</code></dd> + <dt>{{.i18n.Tr "admin.config.cache_item_ttl"}}</dt> + <dd><code>{{.CacheItemTTL}}</code></dd> {{end}} </dl> </div> diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 370e323960..9c53f4e67a 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -75,7 +75,7 @@ </td> <td class="two wide right aligned"> {{if not .LatestPullRequest}} - {{if and (not .IsDeleted) $.AllowsPulls}} + {{if and (not .IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} <a href="{{$.RepoLink}}/compare/{{$.DefaultBranch | EscapePound}}...{{if ne $.Repository.Owner.Name $.Owner.Name}}{{$.Owner.Name}}:{{end}}{{.Name | EscapePound}}"> <button id="new-pull-request" class="ui compact basic button">{{$.i18n.Tr "repo.pulls.compare_changes"}}</button> </a> diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl index 14fbfac6d7..2e8d0b5d91 100644 --- a/templates/repo/graph.tmpl +++ b/templates/repo/graph.tmpl @@ -2,8 +2,6 @@ <div class="repository commits"> {{template "repo/header" .}} <div class="ui container"> - - <div id="git-graph-container" class="ui segment"> <h1>{{.i18n.Tr "repo.commit_graph"}}</h1> <div id="rel-container"> @@ -37,9 +35,6 @@ </ul> </div> </div> - - - </div> </div> {{template "base/footer" .}} |