(refs #488) Move Milestone and Assignee.

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

@@ -42,7 +42,7 @@
         @commentform(issue, true, hasWritePermission, repository)
       </div>
       <div class="span2">
-        @issueinfo(issue, issueLabels, labels, hasWritePermission, repository)
+        @issueinfo(issue, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
         <hr/>
 
       </div>

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

@@ -1,5 +1,7 @@
 @(issue: model.Issue,
   issueLabels: List[model.Label],
+  collaborators: List[String],
+  milestones: List[(model.Milestone, Int, Int)],
   labels: List[model.Label],
   hasWritePermission: Boolean,
   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
@@ -28,12 +30,66 @@
 <hr/>
 <div style="margin-bottom: 8px;">
   <span class="muted small strong">Milestone</span>
-
+  <div class="pull-right">
+    <span id="label-milestone">
+      @issue.milestoneId.map { milestoneId =>
+        @milestones.collect { case (milestone, _, _) if(milestone.milestoneId == milestoneId) =>
+          Milestone: <span class="strong">@milestone.title</span>
+        }
+      }.getOrElse("No milestone")
+    </span>
+    <div id="milestone-progress-area">
+      @issue.milestoneId.map { milestoneId =>
+        @milestones.collect { case (milestone, openCount, closeCount) if(milestone.milestoneId == milestoneId) =>
+          @issues.milestones.html.progress(openCount + closeCount, closeCount)
+        }
+      }
+    </div>
+    @if(hasWritePermission){
+      @helper.html.dropdown() {
+        <li><a href="javascript:void(0);" class="milestone" data-id=""><i class="icon-remove-circle"></i> Clear this milestone</a></li>
+        @milestones.filter(_._1.closedDate.isEmpty).map { case (milestone, _, _) =>
+          <li>
+            <a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId" data-title="@milestone.title">
+              @helper.html.checkicon(Some(milestone.milestoneId) == issue.milestoneId) @milestone.title
+              <div class="small" style="padding-left: 20px;">
+                @milestone.dueDate.map { dueDate =>
+                  @if(isPast(dueDate)){
+                    <img src="@assets/common/images/alert_mono.png"/>Due in @date(dueDate)
+                  } else {
+                    <span class="muted">Due in @date(dueDate)</span>
+                  }
+                }.getOrElse {
+                  <span class="muted">No due date</span>
+                }
+              </div>
+            </a>
+          </li>
+        }
+      }
+    }
+  </div>
 </div>
 <hr/>
 <div style="margin-bottom: 8px;">
   <span class="muted small strong">Assignee</span>
-
+  <span id="label-assigned">
+    @issue.assignedUserName.map { userName =>
+      @avatar(userName, 20) @user(userName, styleClass="username strong") is assigned
+    }.getOrElse("No one is assigned")
+  </span>
+  @if(hasWritePermission){
+    @helper.html.dropdown() {
+      <li><a href="javascript:void(0);" class="assign" data-name=""><i class="icon-remove-circle"></i> Clear assignee</a></li>
+      @collaborators.map { collaborator =>
+        <li>
+          <a href="javascript:void(0);" class="assign" data-name="@collaborator">
+            @helper.html.checkicon(Some(collaborator) == issue.assignedUserName)@avatar(collaborator, 20) @collaborator
+          </a>
+        </li>
+      }
+    }
+  }
 </div>
 
 <script>

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

@@ -67,7 +67,7 @@
       </div>
     }
     <hr/>
-    @issues.html.issueinfo(issue, issueLabels, labels, hasWritePermission, repository)
+    @issues.html.issueinfo(issue, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
   </div>
 </div>
 <script>