(refs #28)Add avatar icon to the issue detail page.

This commit is contained in:
takezoe
2013-07-11 12:26:37 +09:00
parent 289ed85365
commit 7e4a295ef0
5 changed files with 33 additions and 16 deletions

View File

@@ -11,10 +11,11 @@
<form action="@url(repository)/issues/new" method="POST" validate="true"> <form action="@url(repository)/issues/new" method="POST" validate="true">
<div class="row-fluid"> <div class="row-fluid">
<div class="span9"> <div class="span9">
<div class="box"> <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
<div class="box issue-box">
<div class="box-content"> <div class="box-content">
<span id="error-title" class="error"></span> <span id="error-title" class="error"></span>
<input type="text" name="title" value="" placeholder="Title" style="width: 650px;"/> <input type="text" name="title" value="" placeholder="Title" style="width: 600px;"/>
<div> <div>
<span id="label-assigned">No one is assigned</span> <span id="label-assigned">No one is assigned</span>
@if(hasWritePermission){ @if(hasWritePermission){
@@ -42,10 +43,12 @@
</div> </div>
</div> </div>
<hr> <hr>
@helper.html.preview(repository, "", false, true, true, "width: 650px; height: 200px;") @helper.html.preview(repository, "", false, true, true, "width: 600px; height: 200px;")
</div> </div>
</div> </div>
<input type="submit" class="btn btn-success" value="Submit new issue"/> <div class="pull-right">
<input type="submit" class="btn btn-success" value="Submit new issue"/>
</div>
</div> </div>
<div class="span3"> <div class="span3">
@if(hasWritePermission){ @if(hasWritePermission){

View File

@@ -1,7 +1,7 @@
@(content: String, commentId: Int, owner: String, repository: String)(implicit context: app.Context) @(content: String, commentId: Int, owner: String, repository: String)(implicit context: app.Context)
@import context._ @import context._
<span id="error-edit-content-@commentId" class="error"></span> <span id="error-edit-content-@commentId" class="error"></span>
<textarea style="width: 730px; height: 100px;" id="edit-content-@commentId">@content</textarea> <textarea style="width: 680px; height: 100px;" id="edit-content-@commentId">@content</textarea>
<input type="button" class="btn btn-small" value="Update Comment"/> <input type="button" class="btn btn-small" value="Update Comment"/>
<span class="pull-right"><a class="btn btn-small btn-danger" href="#">Cancel</a></span> <span class="pull-right"><a class="btn btn-small btn-danger" href="#">Cancel</a></span>
<script> <script>

View File

@@ -1,8 +1,8 @@
@(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: 730px;" id="edit-title" value="@title"/> <input type="text" style="width: 680px;" id="edit-title" value="@title"/>
<textarea style="width: 730px; height: 100px;" id="edit-content">@content.getOrElse("")</textarea> <textarea style="width: 680px; height: 100px;" id="edit-content">@content.getOrElse("")</textarea>
<input type="button" class="btn btn-small" value="Update Issue"/> <input type="button" class="btn btn-small" value="Update Issue"/>
<span class="pull-right"><a class="btn btn-small btn-danger" href="#">Cancel</a></span> <span class="pull-right"><a class="btn btn-small btn-danger" href="#">Cancel</a></span>
<script> <script>

View File

@@ -17,7 +17,8 @@
</ul> </ul>
<div class="row-fluid"> <div class="row-fluid">
<div class="span10"> <div class="span10">
<div class="box"> <div class="issue-avatar-image">@avatar(issue.openedUserName, 48)</div>
<div class="box issue-box">
<div class="box-content" style="padding: 0px;"> <div class="box-content" style="padding: 0px;">
<div class="issue-header"> <div class="issue-header">
@if(hasWritePermission || loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){ @if(hasWritePermission || loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){
@@ -68,6 +69,7 @@
</div> </div>
</div> </div>
@comments.map { comment => @comments.map { comment =>
<div class="issue-avatar-image">@avatar(comment.commentedUserName, 48)</div>
<div class="box issue-comment-box" id="comment-@comment.commentId"> <div class="box issue-comment-box" id="comment-@comment.commentId">
<div class="box-header-small"> <div class="box-header-small">
<i class="icon-comment"></i> <i class="icon-comment"></i>
@@ -97,16 +99,19 @@
} }
@if(loginAccount.isDefined){ @if(loginAccount.isDefined){
<form action="@url(repository)/issue_comments/new" method="POST" validate="true"> <form action="@url(repository)/issue_comments/new" method="POST" validate="true">
<div class="box"> <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
<div class="box issue-comment-box">
<div class="box-content"> <div class="box-content">
@helper.html.preview(repository, "", false, true, true, "width: 730px; height: 100px;") @helper.html.preview(repository, "", false, true, true, "width: 680px; height: 100px;")
</div> </div>
</div> </div>
<input type="hidden" name="issueId" value="@issue.issueId"/> <div class="pull-right">
<input type="submit" class="btn btn-success" value="Comment"/> <input type="hidden" name="issueId" value="@issue.issueId"/>
@if(hasWritePermission || issue.openedUserName == loginAccount.get.userName){ <input type="submit" class="btn btn-success" value="Comment"/>
<input type="submit" class="btn" value="@{if(issue.closed) "Reopen" else "Close"}" id="action"/> @if(hasWritePermission || issue.openedUserName == loginAccount.get.userName){
} <input type="submit" class="btn" value="@{if(issue.closed) "Reopen" else "Close"}" id="action"/>
}
</div>
</form> </form>
} }
</div> </div>

View File

@@ -502,9 +502,18 @@ h4#issueTitle {
padding: 0px; padding: 0px;
} }
div.issue-avatar-image {
float: left;
}
div.issue-box {
margin-bottom: 15px;
margin-left: 50px;
}
div.issue-comment-box { div.issue-comment-box {
margin-bottom: 15px; margin-bottom: 15px;
margin-top: 25px; margin-left: 50px;
} }
div.issue-comment-action { div.issue-comment-action {