From 4564d1349615c1d976b812acb4d7451852a6fbd2 Mon Sep 17 00:00:00 2001 From: Gustavo Paes <gustavo.paes@gmail.com> Date: Sun, 9 Aug 2015 14:38:26 -0300 Subject: [PATCH] Remove SSH button when SSH is disabled --- public/ng/css/gogs.css | 2 +- public/ng/less/gogs/repository.less | 2 +- templates/repo/bare.tmpl | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css index 17c8af909a..16b287a2c4 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>