diff options
author | FuXiaoHei <fuxiaohei@hexiaz.com> | 2014-05-08 21:01:47 +0800 |
---|---|---|
committer | FuXiaoHei <fuxiaohei@hexiaz.com> | 2014-05-08 21:01:47 +0800 |
commit | 11ca10ab2fa9c0e0c8036d33bd31f4815ceb490e (patch) | |
tree | 34403dce1ec4f7f366e6ed6b6a5aea033876992a | |
parent | 495d939ca580825c4a91612e38107ecc4339598a (diff) | |
download | gitea-11ca10ab2fa9c0e0c8036d33bd31f4815ceb490e.tar.gz gitea-11ca10ab2fa9c0e0c8036d33bd31f4815ceb490e.zip |
issue assignee ui
-rwxr-xr-x | public/css/gogs.css | 22 | ||||
-rw-r--r-- | public/js/app.js | 19 | ||||
-rw-r--r-- | templates/issue/create.tmpl | 16 |
3 files changed, 54 insertions, 3 deletions
diff --git a/public/css/gogs.css b/public/css/gogs.css index e4dfda4c64..bf43375b7e 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -1441,6 +1441,28 @@ html, body { margin-left: .8em; } +#issue .assignee,#issue .assignee ul{ + padding: 0; + margin: 0; + min-width: 300px; +} + +#issue .assignee li{ + padding: 4px 12px; + line-height: 30px; +} + +#issue .assignee li:hover{ + background-color: #e8f0ff; + cursor: pointer; +} + +#issue .assignee li img{ + width: 28px; + height: 28px; + margin-right: 12px; +} + /* wrapper and footer */ #wrapper { diff --git a/public/js/app.js b/public/js/app.js index 6093d23b94..d6c13a2931 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -532,7 +532,20 @@ function initIssue() { $('.issue-write a[data-toggle]').on("click", function () { $('.issue-preview-content').html("loading..."); }); - }()) + }()); + + // assignee + $('.assignee', '#issue').on('click', 'li', function () { + var uid = $(this).data("uid"); + $('#assignee').val(uid); + if (uid > 0) { + $('.clear-assignee').toggleShow(); + $('#assigned').text($(this).find("strong").text()) + } else { + $('.clear-assignee').toggleHide(); + $('#assigned').text($('#assigned').data("no-assigned")); + } + }); } @@ -580,7 +593,7 @@ function initRepoSetting() { }); $this.next().toggleShow(); $this.next().find('ul').html(html); - }else{ + } else { $this.next().toggleHide(); } } @@ -589,7 +602,7 @@ function initRepoSetting() { if (!$(this).val()) { $(this).next().toggleHide(); } - }).next().on("click",'li',function(){ + }).next().on("click", 'li', function () { $('#repo-collaborator').val($(this).text()); }); } diff --git a/templates/issue/create.tmpl b/templates/issue/create.tmpl index f6a65cc846..0306719c6e 100644 --- a/templates/issue/create.tmpl +++ b/templates/issue/create.tmpl @@ -15,6 +15,22 @@ <input class="form-control input-lg" type="text" name="title" required="required" placeholder="Title" value="{{.title}}" /> </div> <div class="form-group panel-body"> + <span><strong id="assigned" data-no-assigned="No one">No one</strong> will be assigned</span> + <input type="hidden" name="assigned" value="0" id="assignee"/> + <div style="display: inline-block;position: relative"> + <button type="button" class="dropdown-toggle btn btn-default btn-sm" data-toggle="dropdown"> + <i class="fa fa-group"></i> + <span class="caret"></span> + </button> + <div class="dropdown-menu assignee"> + <ul class="list-unstyled"> + <li data-uid="0" class="clear-assignee hidden"><i class="fa fa-times-circle-o"></i> Clear assignee</li> + <li data-uid="123"><img src="//1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132"><strong>fuxiaohei</strong> nickname</li> + </ul> + </div> + </div> + </div> + <div class="form-group panel-body"> <div class="md-help pull-right"><!-- todo help link --> Content with <a href="https://help.github.com/articles/markdown-basics">Markdown</a> </div> |