Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-15 18:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1829 from kounoike/pr-dropdown-close-and-comment-button

Browse Source 
Change Close/Reopen button to dropdown-selectable button.
This commit is contained in:
Naoki Takezoe
2018-01-11 13:22:27 +09:00
committed by GitHub
parent 735e425984 c8d666baba
commit 8e8e794574
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/twirl/gitbucket/core/issues/commentform.scala.html
View File

@@ -22,12 +22,24 @@
elastic = true, elastic = true,
tabIndex = 1 tabIndex = 1
) )
<div class="text-right"> <div class="text-right">
<input type="hidden" name="issueId" value="@issue.issueId"/> <input type="hidden" name="issueId" value="@issue.issueId"/>
@if((reopenable || !issue.closed) && (isManageable || issue.openedUserName == context.loginAccount.get.userName)){ @if((reopenable || !issue.closed) && (isManageable || issue.openedUserName == context.loginAccount.get.userName)){
<input type="submit" class="btn btn-default" tabindex="3" formaction="@helpers.url(repository)/issue_comments/state" value="@{if(issue.closed) "Reopen" else "Close"}" id="action"/> <input type="hidden" id="action" name="action" value="comment"/>
} <div class="btn-group dropup">
<input type="submit" class="btn btn-success" tabindex="2" formaction="@helpers.url(repository)/issue_comments/new" value="Comment"/> <input type="submit" class="btn btn-success" tabindex="2" formaction="@helpers.url(repository)/issue_comments/new" value="Comment" id="submit-button"/>
<button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
</button>
<ul class="dropdown-menu dropdown-menu-right">
<li><a id="menu-comment">Comment</a></li>
<li><a id="menu-x-and-comment">@{if(issue.closed) "Reopen" else "Close"} and comment</a></li>
</ul>
</div>
} else {
<input type="submit" class="btn btn-success" tabindex="2" formaction="@helpers.url(repository)/issue_comments/new" value="Comment"/>
}
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -35,8 +47,13 @@
} }
<script> <script>
$(function(){ $(function(){
$('#action').click(function(){ $('#menu-comment').click(function(){
$('<input type="hidden">').attr('name', 'action').val($(this).val().toLowerCase()).appendTo('form'); $('#submit-button').attr('value', 'Comment').attr('formaction', '@helpers.url(repository)/issue_comments/new');
$('#action').val('comment');
});
$('#menu-x-and-comment').click(function(){
$('#submit-button').attr('value', '@{if(issue.closed) "Reopen" else "Close"} and comment').attr('formaction', '@helpers.url(repository)/issue_comments/state');
$('#action').val('@{if(issue.closed) "reopen" else "close"}');
}); });
}); });
</script> </script>