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

Simplify issue and pull request creation form

Browse Source
This commit is contained in:
Naoki Takezoe
2016-03-22 14:22:20 +09:00
parent 0d2c923664
commit 7ab260e688
3 changed files with 38 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/twirl/gitbucket/core/issues/create.scala.html
View File

@@ -10,26 +10,21 @@
<form action="@url(repository)/issues/new" method="POST" validate="true" class="form-group"> <form action="@url(repository)/issues/new" method="POST" validate="true" class="form-group">
<div class="row"> <div class="row">
<div class="col-md-9"> <div class="col-md-9">
<div class="issue-avatar-image">@avatarLink(loginAccount.get.userName, 48)</div> <span id="error-title" class="error"></span>
<div class="panel panel-default issue-box"> <input type="text" id="issue-title" name="title" class="form-control" value="" placeholder="Title" style="margin-bottom: 6px;" autofocus/>
<div class="panel-body"> @helper.html.preview(
<span id="error-title" class="error"></span> repository = repository,
<input type="text" id="issue-title" name="title" class="form-control" value="" placeholder="Title" autofocus/> content = "",
@helper.html.preview( enableWikiLink = false,
repository = repository, enableRefsLink = true,
content = "", enableLineBreaks = true,
enableWikiLink = false, enableTaskList = true,
enableRefsLink = true, hasWritePermission = hasWritePermission,
enableLineBreaks = true, style = "height: 200px; max-height: 250px;",
enableTaskList = true, elastic = true
hasWritePermission = hasWritePermission, )
style = "height: 200px; max-height: 250px;", <div class="align-right">
elastic = true <input type="submit" class="btn btn-success" value="Submit new issue"/>
)
<div class="align-right">
<input type="submit" class="btn btn-success" value="Submit new issue"/>
</div>
</div>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">

51
src/main/twirl/gitbucket/core/pulls/compare.scala.html
View File

@@ -54,36 +54,31 @@
<div id="pull-request-form" @*class="box"*@ style="display: none; margin-bottom: 20px;"> <div id="pull-request-form" @*class="box"*@ style="display: none; margin-bottom: 20px;">
<form method="POST" action="@path/@originRepository.owner/@originRepository.name/pulls/new" validate="true"> <form method="POST" action="@path/@originRepository.owner/@originRepository.name/pulls/new" validate="true">
<div class="row"> <div class="row">
<div class="col-md-10"> <div class="col-md-9">
<div class="issue-avatar-image">@avatarLink(loginAccount.get.userName, 48)</div> <span class="error" id="error-title"></span>
<div class="panel panel-default issue-box"> <input type="text" name="title" class="form-control" style="margin-bottom: 6px;" placeholder="Title"/>
<div class="panel-body"> @helper.html.preview(
<span class="error" id="error-title"></span> repository = repository,
<input type="text" name="title" class="form-control input-lg" placeholder="Title"/> content = "",
@helper.html.preview( enableWikiLink = false,
repository = repository, enableRefsLink = true,
content = "", enableLineBreaks = true,
enableWikiLink = false, enableTaskList = true,
enableRefsLink = true, hasWritePermission = true,
enableLineBreaks = true, style = "height: 200px;"
enableTaskList = true, )
hasWritePermission = true, <input type="hidden" name="targetUserName" value="@originRepository.owner"/>
style = "height: 200px;" <input type="hidden" name="targetBranch" value="@originId"/>
) <input type="hidden" name="requestUserName" value="@forkedRepository.owner"/>
<input type="hidden" name="targetUserName" value="@originRepository.owner"/> <input type="hidden" name="requestRepositoryName" value="@forkedRepository.name"/>
<input type="hidden" name="targetBranch" value="@originId"/> <input type="hidden" name="requestBranch" value="@forkedId"/>
<input type="hidden" name="requestUserName" value="@forkedRepository.owner"/> <input type="hidden" name="commitIdFrom" value="@sourceId"/>
<input type="hidden" name="requestRepositoryName" value="@forkedRepository.name"/> <input type="hidden" name="commitIdTo" value="@commitId"/>
<input type="hidden" name="requestBranch" value="@forkedId"/> <div class="align-right">
<input type="hidden" name="commitIdFrom" value="@sourceId"/> <input type="submit" class="btn btn-success" value="Create pull request"/>
<input type="hidden" name="commitIdTo" value="@commitId"/>
<div class="align-right">
<input type="submit" class="btn btn-success" value="Create pull request"/>
</div>
</div>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
@issues.html.issueinfo(None, Nil, Nil, collaborators, milestones.map((_, 0, 0)), labels, hasOriginWritePermission, repository) @issues.html.issueinfo(None, Nil, Nil, collaborators, milestones.map((_, 0, 0)), labels, hasOriginWritePermission, repository)
</div> </div>
</div> </div>

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

@@ -874,11 +874,6 @@ div.issue-avatar-image {
float: left; float: left;
} }
div.issue-box {
margin-bottom: 5px;
margin-left: 50px;
}
div.issue-participants { div.issue-participants {
margin-bottom: 15px; margin-bottom: 15px;
margin-left: 50px; margin-left: 50px;
@@ -891,10 +886,6 @@ div.issue-comment-box, div.commit-comment-box {
/*padding: 8px;*/ /*padding: 8px;*/
} }
div.issue-box > div.panel-body {
padding: 4px;
}
div.issue-comment-box > div.panel-body, div.issue-comment-box > div.panel-body,
div.commit-comment-box > div.panel-body { div.commit-comment-box > div.panel-body {
padding: 8px; padding: 8px;