summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author无闻 <u@gogs.io>2015-08-12 03:44:30 +0800
committer无闻 <u@gogs.io>2015-08-12 03:44:30 +0800
commitd1a82a82b463271532f629d35f3f9fd0dfe5823b (patch)
treef679041d0a141d52ab3eff51c42a9a83323faead
parentf57235085a8250b0989c4fd0e4efdd74788558fc (diff)
parent4564d1349615c1d976b812acb4d7451852a6fbd2 (diff)
downloadgitea-d1a82a82b463271532f629d35f3f9fd0dfe5823b.tar.gz
gitea-d1a82a82b463271532f629d35f3f9fd0dfe5823b.zip
Merge pull request #1454 from gustavopaes/bug/1453
Remove SSH button when SSH it is disabled
-rw-r--r--public/ng/css/gogs.css2
-rw-r--r--public/ng/less/gogs/repository.less2
-rw-r--r--templates/repo/bare.tmpl12
3 files changed, 9 insertions, 7 deletions
diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index c35a7812ad..607c62a6c5 100644
--- a/public/ng/css/gogs.css
+++ b/public/ng/css/gogs.css
@@ -1496,7 +1496,7 @@ The register and sign-in page style
.repo-bare #repo-header-meta {
display: none;
}
-.repo-bare #repo-clone-ssh {
+.repo-bare .btn-first {
margin-left: 200px;
}
.repo-bare #repo-clone-copy {
diff --git a/public/ng/less/gogs/repository.less b/public/ng/less/gogs/repository.less
index 63c25d06b6..6b0a927e8f 100644
--- a/public/ng/less/gogs/repository.less
+++ b/public/ng/less/gogs/repository.less
@@ -345,7 +345,7 @@
#repo-header-meta {
display: none;
}
- #repo-clone-ssh {
+ .btn-first {
margin-left: 200px;
}
#repo-clone-copy {
diff --git a/templates/repo/bare.tmpl b/templates/repo/bare.tmpl
index d258c60f57..704baa7572 100644
--- a/templates/repo/bare.tmpl
+++ b/templates/repo/bare.tmpl
@@ -21,9 +21,11 @@
<div class="panel-content">
<div id="repo-clone" class="clear text-center">
<h2>{{.i18n.Tr "repo.clone_this_repo"}}</h2>
- <button class="btn btn-blue current left btn-left-radius" id="repo-clone-ssh" data-link="{{.CloneLink.SSH}}">SSH</button>
- <button class="btn btn-gray left" id="repo-clone-https" data-link="{{.CloneLink.HTTPS}}">HTTPS</button>
- <input id="repo-clone-url" type="text" class="ipt ipt-disabled left" value="{{.CloneLink.SSH}}" onclick="this.select()" readonly />
+ {{if not $.DisableSSH}}
+ <button class="btn btn-blue btn-first current left btn-left-radius" id="repo-clone-ssh" data-link="{{.CloneLink.SSH}}">SSH</button>
+ {{end}}
+ <button class="btn {{if $.DisableSSH}}btn-first btn-blue current{{else}}btn-gray{{end}} left" id="repo-clone-https" data-link="{{.CloneLink.HTTPS}}">HTTPS</button>
+ <input id="repo-clone-url" type="text" class="ipt ipt-disabled left" value="{{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}" onclick="this.select()" readonly />
<button class="btn btn-black left btn-right-radius" id="repo-clone-copy" data-copy-val="val" data-copy-from="#repo-clone-url">{{.i18n.Tr "repo.copy_link"}}</button>
<p class="text-center" id="repo-clone-help">{{.i18n.Tr "repo.clone_helper" "http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository" | Str2html}}</p>
<hr/>
@@ -34,14 +36,14 @@
git init
git add README.md
git commit -m "first commit"
-git remote add origin <span class="clone-url">{{.CloneLink.SSH}}</span>
+git remote add origin <span class="clone-url">{{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}</span>
git push -u origin master</code></pre>
<br/>
<hr/>
</div>
<div id="repo-bare-remote" class="text-center">
<h2>{{.i18n.Tr "repo.push_exist_repo"}}</h2>
- <pre class="text-left radius"><code>git remote add origin <span class="clone-url">{{.CloneLink.SSH}}</span>
+ <pre class="text-left radius"><code>git remote add origin <span class="clone-url">{{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}</span>
git push -u origin master</code></pre>
<br/>
</div>