clone in ssh

diff --git a/conf/app.ini b/conf/app.ini
index f8ff81db7472024a249f504c4e2de868fd8f8d45..cc7d0a907ff01feeee7f98898cd0e64013f2ed49 100644 (file)
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -7,6 +7,7 @@ LANG_IGNS=Google Go|C|Python|Ruby
 LICENSES=Apache v2 License|GPL v2|MIT License|BSD (3-Clause) License
 
 [server]
+DOMAIN = gogits.org
 HTTP_ADDR = 
 HTTP_PORT = 3000
 

diff --git a/modules/base/conf.go b/modules/base/conf.go
index f1508d7a62661770503c0de3b4313c918d424f06..05412f38729d784f63fa6d5022281554249b2f56 100644 (file)
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -18,6 +18,7 @@ import (
 var (
        AppVer  string
        AppName string
+       Domain  string
        Cfg     *goconfig.ConfigFile
 )
 
@@ -58,4 +59,5 @@ func init() {
        Cfg.BlockMode = false
 
        AppName = Cfg.MustValue("", "APP_NAME")
+       Domain = Cfg.MustValue("server", "DOMAIN")
 }

diff --git a/modules/base/template.go b/modules/base/template.go
index 1a0b5977e365e6c2ac2236dbd1c5c9863c86ebea..4517cd47aad400595b5bb9d4205d08f256923b3d 100644 (file)
--- a/modules/base/template.go
+++ b/modules/base/template.go
@@ -19,6 +19,9 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
        "AppVer": func() string {
                return AppVer
        },
+       "AppDomain": func() string {
+               return Domain
+       },
        "AvatarLink": AvatarLink,
        "str2html":   Str2html,
        "TimeSince":  TimeSince,

diff --git a/public/css/gogs.css b/public/css/gogs.css
index 668df4f7c7af198b1a90faf1107fbdb3be3d8f3a..5352f8e3978eb06add229a554daa0ec94065158a 100755 (executable)
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -415,16 +415,8 @@ html, body {
     margin-left: 0;
 }
 
-.gogs-repo-btns {
-    margin-top: 18px;
-}
-
-.gogs-repo-btns .btn-group {
-    margin-left: 1em;
-}
-
-.gogs-repo-btns .btn-group .btn {
-    padding-left: 6px;
+.gogs-repo-nav .actions {
+    padding-top: 20px;
 }
 
 #gogs-repo-watching .dropdown-menu {

diff --git a/public/js/app.js b/public/js/app.js
index 58633718fc48d9c0613b8dde8db7cc8eda2eb73e..30296bc337c2638358e5a27dc8090057b12481fb 100644 (file)
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -40,6 +40,25 @@ var Gogits = {
             //container: "body"
         });
     };
+    Gogits.initPopovers = function () {
+        var hideAllPopovers = function() {
+           $('[data-toggle=popover]').each(function() {
+                $(this).popover('hide');
+            });  
+        };
+
+        $(document).on('click', function(e) {
+            var $e = $(e.target);
+            if($e.data('toggle') == 'popover'||$e.parents("[data-toggle=popover], .popover").length > 0){
+                return;
+            }
+            hideAllPopovers();
+        });
+
+        $("body").popover({
+            selector: "[data-toggle=popover]"
+        });
+    };
     Gogits.initTabs = function () {
         var $tabs = $('[data-init=tabs]');
         $tabs.find("li:eq(0) a").tab("show");
@@ -76,6 +95,7 @@ var Gogits = {
 
 function initCore() {
     Gogits.initTooltips();
+    Gogits.initPopovers();
     Gogits.initTabs();
     Gogits.initModals();
     Gogits.renderMarkdown();

diff --git a/templates/repo/nav.tmpl b/templates/repo/nav.tmpl
index 6637062a84b0ee9098cc975a077143e7d6025edd..b41b62d5d895062d64a9c3bb655dc65f49e7da11 100644 (file)
--- a/templates/repo/nav.tmpl
+++ b/templates/repo/nav.tmpl
@@ -1,42 +1,41 @@
 <div id="gogs-body-nav" class="gogs-repo-nav">
     <div class="container">
-        <div class="gogs-repo-btns pull-right">
-            <div class="btn-group" id="gogs-repo-clone">
-                <button type="button" class="btn btn-default"><i class="fa fa-download"></i>Clone</button>
-                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                    <span class="caret"></span>
-                    <span class="sr-only">Toggle Dropdown</span>
-                </button>
-                <div class="dropdown-menu" role="menu">
-                    <div data-val="down-http">http link</div>
-                    <div data-val="down-git">git link</div>
-                </div>
+        <div class="row">
+            <div class="col-md-6">
+                <h3><i class="fa fa-book fa-lg"></i><a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / {{.Repository.Name}}</h3>
             </div>
-            <div class="btn-group" id="gogs-repo-watching">
-                <button type="button" class="btn btn-default"><i class="fa fa-eye"></i>Watch {x}</button>
-                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                    <span class="caret"></span>
-                    <span class="sr-only">Toggle Dropdown</span>
-                </button>
-                <div class="dropdown-menu" role="menu">
-                    <div class="dropdown-item" data-val="not-watching">
-                        <h4 role="presentation" class="dropdown-header">Not Watching</h4>
-                        <p class="description">You only receive notifications for conversations in which you participate or are @mentioned.</p>
-                        <p class="divider"></p>
-                    </div>
-                    <div class="dropdown-item" data-val="watching">
-                        <h4 role="presentation" class="dropdown-header">Watching</h4>
-                        <p class="description">You receive notifications for all conversations in this repository.</p>
+            <div class="col-md-6 actions text-right">
+                <div class="btn-group" id="gogs-repo-clone">
+                    <button type="button" class="btn btn-default"><i class="fa fa-download"></i>Clone</button>
+                    <button type="button" class="btn btn-default dropdown-toggle" data-container="body" data-toggle="popover" data-placement="bottom" data-content="<label>SSH:</label><div class='input-group'><input type='text' class='form-control' value='git@{{AppDomain}}:{{.Owner.Name}}/{{.Repository.Name}}.git'></div>" data-html="1">
+                        <span class="caret"></span>
+                    </button>
+                </div>
+                <div class="btn-group" id="gogs-repo-watching">
+                    <button type="button" class="btn btn-default"><i class="fa fa-eye"></i>Watch {x}</button>
+                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                        <span class="caret"></span>
+                        <span class="sr-only">Toggle Dropdown</span>
+                    </button>
+                    <div class="dropdown-menu" role="menu">
+                        <div class="dropdown-item" data-val="not-watching">
+                            <h4 role="presentation" class="dropdown-header">Not Watching</h4>
+                            <p class="description">You only receive notifications for conversations in which you participate or are @mentioned.</p>
+                            <p class="divider"></p>
+                        </div>
+                        <div class="dropdown-item" data-val="watching">
+                            <h4 role="presentation" class="dropdown-header">Watching</h4>
+                            <p class="description">You receive notifications for all conversations in this repository.</p>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="btn-group">
-                <button type="button" class="btn btn-default"><i class="fa fa-star"></i>Star&nbsp;&nbsp;{{.Repository.NumStars}}</button>
-            </div>
-            <div class="btn-group">
-                <button type="button" class="btn btn-default"><i class="fa fa-code-fork"></i>Fork&nbsp;&nbsp;{{.Repository.NumForks}}</button>
+                <div class="btn-group">
+                    <button type="button" class="btn btn-default"><i class="fa fa-star"></i>Star&nbsp;&nbsp;{{.Repository.NumStars}}</button>
+                </div>
+                <div class="btn-group">
+                    <button type="button" class="btn btn-default"><i class="fa fa-code-fork"></i>Fork&nbsp;&nbsp;{{.Repository.NumForks}}</button>
+                </div>
             </div>
         </div>
-        <h3><i class="fa fa-book fa-lg"></i><a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / {{.Repository.Name}}</h3>
     </div>
 </div>
\ No newline at end of file