add collaboration page ui

2 files changed, 102 insertions, 5 deletions

diff --git a/public/css/gogs.css b/public/css/gogs.css
index 12b6d8b058..ce9f27e410 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -387,6 +387,12 @@ html, body {
 
 /* gogits user setting */
 
+#user-setting-nav {
+    background-color: #FFF;
+    border: 1px solid #CCC;
+    padding: 0;
+}
+
 #user-setting-nav > h4, #user-setting-container > h4, #user-setting-container > div > h4,
 #ssh-keys > h4, #user-delete > h4, #repo-setting-container .tab-pane > h4 {
     padding-bottom: 18px;
@@ -396,13 +402,14 @@ html, body {
 
 #user-setting-nav .list-group .list-group-item a {
     margin-left: 0;
-    padding: .6em;
+    padding: .6em 1.2em;
     font-size: 14px;
     color: #3B73AF;
 }
 
 #user-setting-nav .list-group .list-group-item {
     background-color: transparent;
+    margin-bottom: .6em;
 }
 
 #user-setting-nav .list-group .list-group-item-success a {
@@ -431,10 +438,60 @@ html, body {
     border-left: 4px solid #DD4B39;
 }
 
+#repo-setting-container{
+    padding-right: 0;
+}
+
 #repo-setting-container .form-horizontal label {
     line-height: 30px;
 }
 
+#repo-collab-list li.collab{
+    margin-bottom: .6em;
+}
+
+#repo-collab-list .avatar{
+    margin-right: 1em;
+    width: 40px;
+}
+
+#repo-collab-list a.member{
+    color: #444;
+}
+
+#repo-collab-list .remove-collab{
+    color: #DD4B39;
+}
+
+#repo-collab-form .dropdown-menu{
+    margin-left: 15px;
+    margin-top: 4px;
+    padding: 0;
+}
+
+#repo-collab-form .dropdown-menu li{
+    padding: 0 1em;
+    line-height: 36px;
+    cursor: pointer;
+    font-weight: bold;
+}
+
+#repo-collab-form .dropdown-menu li:hover{
+    background-color: #e8f0ff;
+}
+
+#repo-collab-form .dropdown-menu img{
+    width: 28px;
+    height: 28px;
+    margin-right: 1em;
+    vertical-align: middle;
+    margin-top: -3px;
+}
+
+#repo-collab-form .dropdown-menu ul{
+    margin-bottom: 0;
+}
+
 /* gogits user ssh keys */
 
 #ssh-keys .list-group-item {
@@ -649,6 +706,10 @@ html, body {
     padding: 0;
 }
 
+#repo-toolbar ul.navbar-right {
+    margin-right: 0;
+}
+
 .activity-list {
     font-size: 14px;
 }
diff --git a/public/js/app.js b/public/js/app.js
index 30e9d5d0bb..7d70b7fece 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -240,7 +240,7 @@ var Gogits = {
             }
         });
 
-        $(window).on('hashchange',function (e) {
+        $(window).on('hashchange', function (e) {
             var m = window.location.hash.match(/^#(L\d+)\-(L\d+)$/);
             var $list = $('.code-view ol.linenums > li');
             if (m) {
@@ -387,7 +387,7 @@ function initRepository() {
         var $clone = $('.clone-group-btn');
         if ($clone.length) {
             var $url = $('.clone-group-url');
-            $clone.find('button[data-link]').on("click",function (e) {
+            $clone.find('button[data-link]').on("click", function (e) {
                 var $this = $(this);
                 if (!$this.hasClass('btn-primary')) {
                     $clone.find('.input-group-btn .btn-primary').removeClass('btn-primary').addClass("btn-default");
@@ -408,7 +408,7 @@ function initRepository() {
         var $watch = $('#repo-watching'),
             watchLink = $watch.data("watch"),
             unwatchLink = $watch.data("unwatch");
-        $watch.on('click', '.to-watch',function () {
+        $watch.on('click', '.to-watch', function () {
             if ($watch.hasClass("watching")) {
                 return false;
             }
@@ -468,7 +468,7 @@ function initRepository() {
 function initInstall() {
     // database type change
     (function () {
-        var mysql_default    = '127.0.0.1:3306'
+        var mysql_default = '127.0.0.1:3306'
         var postgres_default = '127.0.0.1:5432'
 
         $('#install-database').on("change", function () {
@@ -585,6 +585,39 @@ function initRelease() {
     }());
 }
 
+function initRepoSetting() {
+    // repo member add
+    $('#repo-collaborator').on('keyup', function () {
+        var $this = $(this);
+        if (!$this.val()) {
+            $this.next().toggleHide();
+            return;
+        }
+        $.ajax({
+            url: '/api/v1/users/search?q=' + $this.val(),
+            dataType: "json",
+            success: function (json) {
+                if (json.ok && json.data) {
+                    var html = '';
+                    $.each(json.data, function (i, item) {
+                        html += '<li><img src="' + item.avatar + '">' + item.username + '</li>';
+                    });
+                    $this.next().toggleShow();
+                    $this.next().find('ul').html(html);
+                }else{
+                    $this.next().toggleHide();
+                }
+            }
+        });
+    }).on('focus', function () {
+        if (!$(this).val()) {
+            $(this).next().toggleHide();
+        }
+    }).next().on("click",'li',function(){
+        $('#repo-collaborator').val($(this).text());
+    });
+}
+
 (function ($) {
     $(function () {
         initCore();
@@ -607,5 +640,8 @@ function initRelease() {
         if ($('#release').length) {
             initRelease();
         }
+        if ($('#repo-setting-container').length) {
+            initRepoSetting();
+        }
     });
 })(jQuery);