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

Fix presentation of pull request page

Browse Source
This commit is contained in:
Naoki Takezoe
2016-05-30 09:19:11 +09:00
parent 2b730ef180
commit 0d4047b4ee
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
View File

@@ -84,7 +84,7 @@
} }
</div> </div>
@if(status.hasMergePermission){ @if(status.hasMergePermission){
<div style="padding:15px;border-top:solid 1px #e5e5e5;background:#fafafa"> <div style="padding:15px; border-top:solid 1px #e5e5e5; background:#fafafa">
<input type="button" class="btn @if(!status.hasProblem){btn-success} else {btn-default}" id="merge-pull-request-button" value="Merge pull request"@if(!status.canMerge){ disabled="true"}/> <input type="button" class="btn @if(!status.hasProblem){btn-success} else {btn-default}" id="merge-pull-request-button" value="Merge pull request"@if(!status.canMerge){ disabled="true"}/>
&nbsp;&nbsp;You can also merge branches on the <a href="#" class="show-command-line">command line</a>. &nbsp;&nbsp;You can also merge branches on the <a href="#" class="show-command-line">command line</a>.
<div id="command-line" style="display: none;margin-top: 15px;"> <div id="command-line" style="display: none;margin-top: 15px;">
@@ -135,15 +135,15 @@
</div> </div>
} }
</div> </div>
<div id="confirm-merge-form" style="display: none;"> <div id="confirm-merge-form" style="display: none; padding: 12px;">
<form method="POST" action="@url(originRepository)/pull/@pullreq.issueId/merge"> <form method="POST" action="@url(originRepository)/pull/@pullreq.issueId/merge">
<div class="strong"> <div class="strong">
Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch} Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch}
</div> </div>
<span id="error-message" class="error"></span> <span id="error-message" class="error"></span>
<textarea name="message" style="height: 80px;" class="form-control">@issue.title</textarea> <textarea name="message" style="height: 80px; margin-top: 8px; margin-bottom: 8px;" class="form-control">@issue.title</textarea>
<div> <div>
<input type="button" class="btn" value="Cancel" id="cancel-merge-pull-request"/> <input type="button" class="btn btn-default" value="Cancel" id="cancel-merge-pull-request"/>
<input type="submit" class="btn btn-success" value="Confirm merge"/> <input type="submit" class="btn btn-success" value="Confirm merge"/>
</div> </div>
</form> </form>
@@ -170,6 +170,10 @@ $(function(){
$('#merge-pull-request').hide(); $('#merge-pull-request').hide();
$('#confirm-merge-form').show(); $('#confirm-merge-form').show();
}); });
$('#cancel-merge-pull-request').click(function(){
$('#merge-pull-request').show();
$('#confirm-merge-form').hide();
});
@forkedRepository.sshUrl.map { sshUrl => @forkedRepository.sshUrl.map { sshUrl =>
$('#repository-url-http').click(function(e){ $('#repository-url-http').click(function(e){

2
src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
View File

@@ -28,7 +28,7 @@
<div class="edit-title pull-right" style="display: none;"> <div class="edit-title pull-right" style="display: none;">
<a class="btn btn-success" href="#" id="update">Save</a> <a class="btn btn-default" href="#" id="cancel">Cancel</a> <a class="btn btn-success" href="#" id="update">Save</a> <a class="btn btn-default" href="#" id="cancel">Cancel</a>
</div> </div>
<h1> <h1 class="body-title">
<span class="show-title"> <span class="show-title">
<span id="show-title">@issue.title</span> <span id="show-title">@issue.title</span>
<span class="muted">#@issue.issueId</span> <span class="muted">#@issue.issueId</span>

2
src/main/webapp/assets/common/css/gitbucket.css
View File

@@ -833,7 +833,6 @@ a.issue-title {
font-size: 120%; font-size: 120%;
} }
/*
.label-success { .label-success {
background-color: #6cc644; background-color: #6cc644;
} }
@@ -841,7 +840,6 @@ a.issue-title {
.label-important { .label-important {
background-color: #bd2c00; background-color: #bd2c00;
} }
*/
ul.label-list { ul.label-list {
list-style-type: none; list-style-type: none;