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

Merge branch 'master' of https://github.com/takezoe/gitbucket

Browse Source
This commit is contained in:
takezoe
2014-05-18 23:03:37 +09:00
parent 2a4b0f5ddb bb66e2201f
commit e57464fc5e
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/twirl/issues/commentform.scala.html
View File

@@ -8,7 +8,7 @@
<div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div> <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
<div class="box issue-comment-box"> <div class="box issue-comment-box">
<div class="box-content"> <div class="box-content">
@helper.html.preview(repository, "", false, true, "width: 680px; height: 100px; max-height: 150px;", elastic = true) @helper.html.preview(repository, "", false, true, "width: 635px; height: 100px; max-height: 150px;", elastic = true)
</div> </div>
</div> </div>
<div class="pull-right"> <div class="pull-right">

2
src/main/twirl/issues/editcomment.scala.html
View File

@@ -2,7 +2,7 @@
@import context._ @import context._
<span id="error-edit-content-@commentId" class="error"></span> <span id="error-edit-content-@commentId" class="error"></span>
@helper.html.attached(owner, repository){ @helper.html.attached(owner, repository){
<textarea style="width: 680px; height: 100px;" id="edit-content-@commentId">@content</textarea> <textarea style="width: 635px; height: 100px;" id="edit-content-@commentId">@content</textarea>
} }
<div> <div>
<input type="button" id="update-comment-@commentId" class="btn btn-small" value="Update Comment"/> <input type="button" id="update-comment-@commentId" class="btn btn-small" value="Update Comment"/>

4
src/main/twirl/issues/editissue.scala.html
View File

@@ -1,9 +1,9 @@
@(title: String, content: Option[String], issueId: Int, owner: String, repository: String)(implicit context: app.Context) @(title: String, content: Option[String], issueId: Int, owner: String, repository: String)(implicit context: app.Context)
@import context._ @import context._
<span id="error-edit-title" class="error"></span> <span id="error-edit-title" class="error"></span>
<input type="text" style="width: 680px;" id="edit-title" value="@title"/> <input type="text" style="width: 635px;" id="edit-title" value="@title"/>
@helper.html.attached(owner, repository){ @helper.html.attached(owner, repository){
<textarea style="width: 680px; height: 100px; max-height: 300px;" id="edit-content">@content.getOrElse("")</textarea> <textarea style="width: 635px; height: 100px; max-height: 300px;" id="edit-content">@content.getOrElse("")</textarea>
} }
<div> <div>
<input type="button" id="update" class="btn btn-small" value="Update Issue"/> <input type="button" id="update" class="btn btn-small" value="Update Issue"/>

2
src/main/twirl/pulls/discussion.scala.html
View File

@@ -27,7 +27,7 @@
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="width: 680px; height: 80px;">@issue.title</textarea> <textarea name="message" style="width: 635px; height: 80px;">@issue.title</textarea>
<div> <div>
<input type="button" class="btn" value="Cancel" id="cancel-merge-pull-request"/> <input type="button" class="btn" 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"/>