Milestone: change partial status like to list

Change style of partial milestone status to looks like milestone info on list
naver · Aug 14, 2014 · 6543ad2 · 6543ad2
1 parent f1bb99c
commit 6543ad2
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 32 deletions.
diff --git a/app/assets/stylesheets/less/_page.less b/app/assets/stylesheets/less/_page.less
@@ -2014,10 +2014,7 @@ label.inline-list {
 
 .milestone-info {
     margin:10px 0;
-    /*border: 2px solid #DADADA;*/
     background-color: #fff;
-    /*border-radius: 5px;
-    box-shadow: 1px 1px #999;*/
     padding: 4px;
 
     .progress {
@@ -2032,8 +2029,11 @@ label.inline-list {
     .meta-info {
         margin:5px;
         .title    { font-size:12px; font-weight:bold; }
-        .sp       { margin: 0 5px; color:#E4E4E4; }
-        .due-date { color: #666; /*999;*/ }
+        .due-date {
+            color: #666;
+            &.over { color:@primary; }
+            .date  { font-size:11px; }
+        }
     }
     .progress-wrap {
         overflow: hidden;
@@ -2049,6 +2049,22 @@ label.inline-list {
         .border-radius(2px);
     }
 }
+.issue-option {
+    .milestone-info .meta-info {
+        margin:5px 0;
+        .due-date { display:block; }
+    }
+}
+.project-home {
+    .milestone-info {
+        .meta-info {
+            .due-date {
+                display: block;
+            }
+        }
+        .progress-wrap { margin:0 5px; }
+    }
+}
 
 .milestones {
     list-style: none;
@@ -3261,21 +3277,22 @@ div.markdown-preview {
 }
 
 .issue-option {
-       width:100%;
-       margin-bottom:16px !important;
-
-       dt { margin-bottom:5px; }
-       dd {
-           margin:0;
-           .btn-group { width:100%; }
-           select {
-             width: 100%;
-           }
-       }
-       span {
-           &.over { color:#f36c22; }
-       }
+    width:100%;
+    margin-bottom:16px !important;
+
+    dt { margin-bottom:5px; }
+    dd {
+        margin:0;
+        .btn-group { width:100%; }
+        select {
+          width: 100%;
+        }
+    }
+    span {
+        &.over { color:#f36c22 !important; }
+    }
 }
+
 .label-editor {
     padding-top:10px;
     border-top:1px solid #ddd;

diff --git a/app/views/issue/partial_searchform.scala.html b/app/views/issue/partial_searchform.scala.html
@@ -117,19 +117,18 @@
                     }
                     </optgroup>
                 </select>
+                @if(param.milestoneId != null){
+                    @defining(Milestone.findById(param.milestoneId)){ milestone =>
+                        @if(milestone != null){
+                            @views.html.milestone.partial_status(milestone, project)
+                            <hr>
+                        }
+                    }
+                }
+                }
             </dd>
         </dl>
 
-        @if(param.milestoneId != null){
-            @defining(Milestone.findById(param.milestoneId)){ milestone =>
-                @if(milestone != null){
-                    <hr>
-                    @views.html.milestone.partial_status(milestone, project)
-                }
-            }
-        }
-        }
-
         <dl class="issue-option">
             <dt>@Messages("issue.dueDate")</dt>
             <dd class="search search-bar">

diff --git a/app/views/milestone/partial_status.scala.html b/app/views/milestone/partial_status.scala.html
@@ -29,9 +29,15 @@
     <div class="meta-info">
         <a href="@routes.MilestoneApp.milestone(project.owner, project.name, milestone.id)" class="title">@milestone.title</a>
         @if(milestone.dueDate != null) {
-            <span class="sp">|</span>
-            <span class="due-date">@Messages("label.dueDate") <strong>@milestone.getDueDateString</strong></span>
-            <span class="date">(@milestone.until)</span>
+            <span class="due-date @if(milestone.state != State.CLOSED && milestone.isOverDueDate){over}">
+                @Messages("label.dueDate")
+                <strong>@milestone.getDueDateString</strong>
+                @if(milestone.state != State.CLOSED){
+                <span class="date">
+                    (@milestone.until)
+                </span>
+                }
+            </span>
         }
     </div>