김지한 2014-07-28
Merge branch 'improve/project-dashboard-140617' of dlab/hive
from pull request 1109
@cb27f9617ee28dbb2ee058e1b82e89089a52bbcb
app/assets/stylesheets/less/_yobiUI.less
--- app/assets/stylesheets/less/_yobiUI.less
+++ app/assets/stylesheets/less/_yobiUI.less
@@ -454,6 +454,12 @@
         height:100%;
         vertical-align:top;
     }
+
+    i {
+        width:100%; height:100%;
+        display:block; line-height:inherit;
+        text-align:center; color:#fff;
+    }
 }
 
 /** tab UI **/
app/views/project/partial_dashboard_issuesbyassignee.scala.html
--- app/views/project/partial_dashboard_issuesbyassignee.scala.html
+++ app/views/project/partial_dashboard_issuesbyassignee.scala.html
@@ -46,10 +46,9 @@
                         </div>
                         <div class="span3 num">
                             <strong>@assignedIssues</strong>
-                            <small>(@assignedPerc%)</small>
                         </div>
                         <div class="span3 nm">
-                            <div class="progress progress-warning @if(assignedPerc==0){empty}">
+                            <div class="progress progress-warning @if(assignedPerc==0){empty}" data-toggle="tooltip" title="@assignedPerc%">
                                 <div class="bar" style="width: @assignedPerc%;"></div>
                             </div>
                         </div>
@@ -63,16 +62,18 @@
         @defining(getPercent(notAssignedIssues, totalIssues)) { notAssignedPerc =>
             <div class="row-fluid">
                 <div class="span6">
-                    <a href="@makeIssuesLink(project, scala.collection.immutable.Map("assigneeId"->User.anonymous.id.toString))">
-                    @Messages("issue.noAssignee")
+                    <a href="@makeIssuesLink(project, scala.collection.immutable.Map("assigneeId"->User.anonymous.id.toString))" class="usf-group">
+                        <span class="avatar-wrap smaller">
+                          <i class="yobicon-blankstare"></i>
+                        </span>
+                        <span class="name">@Messages("issue.noAssignee")</span>
                     </a>
                 </div>
                 <div class="span3 num">
                     <strong>@notAssignedIssues</strong>
-                    <small>(@notAssignedPerc%)</small>
                 </div>
                 <div class="span3 nm">
-                    <div class="progress progress-warning @if(notAssignedPerc==0){empty}">
+                    <div class="progress progress-warning @if(notAssignedPerc==0){empty}" data-toggle="tooltip" title="@notAssignedPerc%">
                         <div class="bar" style="width: @notAssignedPerc%;"></div>
                     </div>
                 </div>
app/views/project/partial_dashboard_issuesbymilestone.scala.html
--- app/views/project/partial_dashboard_issuesbymilestone.scala.html
+++ app/views/project/partial_dashboard_issuesbymilestone.scala.html
@@ -43,7 +43,7 @@
                             <strong>@milestoneIssues</strong>
                         </div>
                         <div class="span3 nm">
-                            <div class="progress progress-success @if(milestoneIssues == 0){ empty }">
+                            <div class="progress progress-success @if(milestoneIssues == 0){ empty }" data-toggle="tooltip" title="@milestone.getCompletionRate%">
                                 <div class="bar bar-success" style="width:@milestone.getCompletionRate%"></div>
                             </div>
                         </div>
app/views/project/partial_dashboard_pullrequests.scala.html
--- app/views/project/partial_dashboard_pullrequests.scala.html
+++ app/views/project/partial_dashboard_pullrequests.scala.html
@@ -23,20 +23,20 @@
 @import utils.TemplateHelper._
 @import utils.JodaDateUtil
 
-@defining(models.PullRequest.findRecentlyReceivedOpen(project, 5)) { pullRequests =>
+@defining(models.PullRequest.findRecentlyReceivedOpen(project, 10)) { pullRequests =>
     @if(pullRequests.size > 0){
         @for(pullRequest <- pullRequests){
             <div class="row-fluid">
-                <div class="@if(project.isUsingReviewerCount){span8}else{span10} title">
+                <div class="span9 title">
+                    <a href="@routes.PullRequestApp.pullRequests(project.owner, project.name)?contributorId=@pullRequest.contributor.id" class="usf-group">
+                        <span class="avatar-wrap smaller" data-toggle="tooltip" title="@pullRequest.contributor.name (@{"@"}@pullRequest.contributor.loginId)">
+                            <img src="@pullRequest.contributor.avatarUrl" width="20" height="20">
+                        </span>
+                    </a>
                     <a href="@routes.PullRequestApp.pullRequest(pullRequest.toProject.owner, pullRequest.toProject.name, pullRequest.number)">@pullRequest.title</a>
                 </div>
-                @if(project.isUsingReviewerCount){
-                    <div class="span2 review @if(!pullRequest.isReviewed){disabled}">
-                        @Messages("pullRequest.review") <strong>@pullRequest.reviewers.size</strong>
-                    </div>
-                }
-                <div class="span2 num" title="@JodaDateUtil.getDateString(pullRequest.created)">
-                    <small>@agoOrDateString(pullRequest.created)</small>
+                <div class="span3 num right-txt" style="color:#999;">
+                    @agoOrDateString(pullRequest.created)
                 </div>
             </div>
         }
Add a comment
List