Merge remote-tracking branch 'origin/master'

src/main/scala/model/Issue.scala

@@ -18,9 +18,10 @@ object Issues extends Table[Issue]("ISSUE") {
   def assignedUserName = column[String]("ASSIGNED_USER_NAME")
   def title = column[String]("TITLE")
   def content = column[String]("CONTENT")
+  def closed = column[Boolean]("CLOSED")
   def registeredDate = column[java.sql.Date]("REGISTERED_DATE")	// TODO convert java.util.Date later
   def updatedDate = column[java.sql.Date]("UPDATED_DATE")
-  def * = userName ~ repositoryName ~ issueId ~ openedUserName ~ milestoneId.? ~ assignedUserName.? ~ title ~ content.? ~ registeredDate ~ updatedDate <> (Issue, Issue.unapply _)
+  def * = userName ~ repositoryName ~ issueId ~ openedUserName ~ milestoneId.? ~ assignedUserName.? ~ title ~ content.? ~ closed ~ registeredDate ~ updatedDate <> (Issue, Issue.unapply _)
 }
 
 case class Issue(
@@ -32,5 +33,6 @@ case class Issue(
     assignedUserName: Option[String],
     title: String,
     content: Option[String],
+    closed: Boolean,
     registeredDate: java.sql.Date,
     updatedDate: java.sql.Date)

src/main/scala/service/IssuesService.scala

@@ -31,6 +31,7 @@ trait IssuesService {
           None,
           title,
           content,
+          false,
           new java.sql.Date(System.currentTimeMillis),	// TODO
           new java.sql.Date(System.currentTimeMillis))
 

src/main/twirl/issues/issue.scala.html

@@ -5,9 +5,11 @@
   @html.header("issues", repository)
   @issuestab("issues", repository)
   <ul class="nav nav-tabs">
-    <li class="pull-left"><a href="@path/@repository.owner/@repository.name/issues">&#8592; Back to issue list</a></li>
+    <li class="pull-left"><a href="@path/@repository.owner/@repository.name/issues"><i class="icon-arrow-left"></i> Back to issue list</a></li>
     <li class="pull-right">Issue #@issue.issueId</li>
   </ul>
+  <div class="row-fluid">
+    <div class="span10">
       <div class="box">
         <div class="box-content">
           <div class="small"><a href="#">@issue.openedUserName</a> opened this issue <time title="2013-06-03 15:56:05">TODO June 03, 2013</time></div>
@@ -19,9 +21,20 @@
       </div>
       <div class="box">
         <div class="box-content">
-      @html.preview(repository, "Leave a comment", false, true, true)
+          @html.preview(repository, "", false, true, true, "width: 730px; height: 100px;")
         </div>
       </div>
       <input type="submit" class="btn btn-success" value="Comment"/>
-
+    </div>
+    <div class="span2">
+      @if(issue.closed) {
+        <div class="label label-important">Closed</div>
+      } else {
+        <div class="label label-success">Open</div>
+      }
+      <div class="small">3 comments</div>
+      <hr/>
+      <strong>Labels</strong>
+    </div>
+  </div>
 }

src/main/twirl/issues/issueedit.scala.html

@@ -38,7 +38,7 @@
             </li>
           </ul>
           *@
-          @html.preview(repository, "Leave a comment", false, true, true, "width: 650px; height: 200px;")
+          @html.preview(repository, "", false, true, true, "width: 650px; height: 200px;")
         </div>
       </div>
       <input type="submit" class="btn btn-success" value="Submit new issue"/>