(refs #2)Add issue and pull request icon.

src/main/scala/view/helpers.scala

@@ -51,6 +51,13 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   def link(value: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): Html =
     Html(convertRefsLinks(value, repository))
 
+  def cut(value: String, length: Int): String =
+    if(value.length > length){
+      value.substring(0, length) + "..."
+    } else {
+      value
+    }
+
   def activityMessage(message: String)(implicit context: app.Context): Html =
     Html(message
       .replaceAll("\\[issue:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]"   , s"""<a href="${context.path}/$$1/$$2/issues/$$3">$$1/$$2#$$3</a>""")

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

@@ -149,8 +149,10 @@
               <a href="@path/@issue.userName/@issue.repositoryName">@issue.repositoryName</a>&nbsp;&#xFF65;
               }
               @if(issue.isPullRequest){
+              <img src="@assets/common/images/pullreq-@(if(issue.closed) "closed" else "open").png"/>
               <a href="@path/@issue.userName/@issue.repositoryName/pull/@issue.issueId" class="issue-title">@issue.title</a>
               } else {
+              <img src="@assets/common/images/issue-@(if(issue.closed) "closed" else "open").png"/>
               <a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-title">@issue.title</a>
               }
               @labels.map { label =>
@@ -162,7 +164,7 @@
                 }
                 #@issue.issueId
               </span>
-              <div class="small muted">
+              <div class="small muted" style="margin-left: 20px;">
                 Opened by <a href="@url(issue.openedUserName)" class="username">@issue.openedUserName</a> @datetime(issue.registeredDate)&nbsp;
                 @if(commentCount > 0){
                   <i class="icon-comment"></i><a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count">@commentCount @plural(commentCount, "comment")</a>

src/main/twirl/pulls/list.scala.html

@@ -32,6 +32,7 @@
     <div class="span9">
       @if(hasWritePermission){
       <div class="pull-right">
+        @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 7, condition.toURL)
         <a href="@url(repository)/compare" class="btn btn-success">New pull request</a>
       </div>
       }
@@ -96,29 +97,22 @@
       @issues.map { case (issue, labels, commentCount) =>
         <tr>
           <td>
-            @if(hasWritePermission){
+            <img src="@assets/common/images/pullreq-@(if(issue.closed) "closed" else "open").png"/>
-            <label class="checkbox" style="cursor: default;">
+            <a href="@path/@issue.userName/@issue.repositoryName/pull/@issue.issueId" class="issue-title">@issue.title</a>
-              <input type="checkbox" value="@issue.issueId"/>
+            <span class="pull-right muted">#@issue.issueId</span>
-            }
+              <div style="margin-left: 20px;">
-              <a href="@path/@issue.userName/@issue.repositoryName/pull/@issue.issueId" class="issue-title">@issue.title</a>
+                @issue.content.map { content =>
-              @labels.map { label =>
+                  @cut(content, 90)
-              <span class="label-color small" style="background-color: #@label.color; color: #@label.fontColor; padding-left: 4px; padding-right: 4px">@label.labelName</span>
+                }.getOrElse {
-              }
+                  <span class="muted">No description available</span>
-              <span class="pull-right muted">
-                @issue.assignedUserName.map { userName =>
-                  @avatar(userName, 20, tooltip = true)
-                }
-                #@issue.issueId
-              </span>
-              <div class="small muted">
-                Opened by <a href="@url(issue.openedUserName)" class="username">@issue.openedUserName</a> @datetime(issue.registeredDate)&nbsp;
-                @if(commentCount > 0){
-                  <i class="icon-comment"></i><a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count">@commentCount @plural(commentCount, "comment")</a>
                 }
               </div>
-            @if(hasWritePermission){
+            <div class="small muted" style="margin-left: 20px;">
-            </label>
+              @avatar(issue.openedUserName, 20) by <a href="@url(issue.openedUserName)" class="username">@issue.openedUserName</a> @datetime(issue.registeredDate)&nbsp;
-            }
+              @if(commentCount > 0){
+                <i class="icon-comment"></i><a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count">@commentCount @plural(commentCount, "comment")</a>
+              }
+            </div>
           </td>
         </tr>
       }