Commit @9249da0373b443551941f6c4db62a40e1494938e

박완순 2014-03-25

Merge branch 'issue/milestone-color' of insanehong/hive

from pull request 729

@9249da0373b443551941f6c4db62a40e1494938e

0499487

9249da0

app/assets/stylesheets/less/_common.less

--- app/assets/stylesheets/less/_common.less

+++ app/assets/stylesheets/less/_common.less


 }
 
 /** file uploader **/
-.progress {
+.upload-progress {
     height: 7px;
     margin-bottom: 5px;
     background:#b1b1b1;

0499487

9249da0

app/assets/stylesheets/less/_page.less

--- app/assets/stylesheets/less/_page.less

+++ app/assets/stylesheets/less/_page.less


     padding: 4px;
 
     .progress {
-        background-color:@state-open;
         height:7px;
         width:100%;
 

                     color: #666;
                     &.over { color:#f36c22; }
                 }
-
-                .open { background-color: @state-open; color:#FFF;}
-                .closed { background-color: @state-closed; color:#FFF;}
-
-                .num-badge {
-                    color: #fff;
-                    margin-left:3px;
-                }
             }
+            
             .progress-wrap {
                 overflow: hidden;
                 color: #999;

                 margin-top:15px;
 
                 .progress {
-                    background-color: @state-open;
-
-                    &.empty { background-color: #B1B1B1; }
-
-                    .progress-bar {
-                        background-color: @state-closed;
-                        height: inherit;
-                    }
+                    height:14px;
                 }
 
             }

0499487

9249da0

app/views/common/fileUploader.scala.html

--- app/views/common/fileUploader.scala.html

+++ app/views/common/fileUploader.scala.html


         <strong class="name">${fileName}</strong>
         <span class="size">${fileSizeReadable}</span>
         <div class="progress-wrap pull-right">
-            <div class="progress n4"><div class="bar orange"></div></div>
+            <div class="upload-progress n4"><div class="bar orange"></div></div>
         </div>
         <button type="button" class="btn-transparent btn-delete pull-right">&times;</button>
         <span class="pull-right nbtn small white btn-insert">@Messages("common.attach.clickToPost")</span>

0499487

9249da0

app/views/milestone/list.scala.html

--- app/views/milestone/list.scala.html

+++ app/views/milestone/list.scala.html


 	)
 }
 
-@makeIssuesLink(mId: Long, _state: String) = @{
-	buildQueryString(routes.IssueApp.issues(project.owner, project.name, _state),
-		Map("milestoneId"->mId.toString)
-	)
-}
-
 @projectLayout(title, project, utils.MenuType.MILESTONE) {
 @projectMenu(project, utils.MenuType.MILESTONE, "")
 <div class="page-wrap-outer">

     	} else {
 
         <div class="filter-wrap milestone">
-            <div class="milestone-legend pull-left">
-                <i class="open"></i> @Messages("issue.state.open")
-                <i class="closed"></i> @Messages("issue.state.closed")
-
-            </div>
-
             @if(milestones.length > 1){
     		<div class="filters">
     			@makeFilterLink("dueDate", param.orderBy, param.orderDir, Messages("common.order.dueDate"))

                             </span>
                             }
                         }
-                        <div class="issue-wrap pull-right">
-                            <a href="@makeIssuesLink(milestone.id,"open")" class="ybtn open medium open-issue">
-                                @Messages("issue.state.open") <strong class="num-badge">@milestone.getNumOpenIssues</strong>
-                            </a>
-                            <a href="@makeIssuesLink(milestone.id,"closed")" class="ybtn closed medium closed-issue">
-                                @Messages("issue.state.closed") <strong class="num-badge">@milestone.getNumClosedIssues</strong>
-                            </a>
+                        <div class="pull-right">
+                            <strong class="title">@milestone.getNumClosedIssues / @(milestone.getNumOpenIssues + milestone.getNumClosedIssues)</strong>
                         </div>
                     </div>
 
                     <div class="progress-wrap">
-    					<div class="progress @if(milestone.getCompletionRate==0){empty}">
-    						<div class="progress-bar" style="width: @milestone.getCompletionRate%;"></div>
+    					<div class="progress progress-success progress-striped @if(milestone.state == State.OPEN) {active}">
+    						<div class="bar" style="width: @milestone.getCompletionRate%;"></div>
     					</div>
-
-    					<div class="progress-label">
-                            @if(milestone.getNumOpenIssues + milestone.getNumClosedIssues > 0) {
-    						<div class="pull-left">
-    							<a href="@makeIssuesLink(milestone.id,"closed")">@Messages("issue.state.closed") <strong>@milestone.getCompletionRate%</strong></a>
-    						</div>
-    						<div class="pull-right">
-    							<a href="@makeIssuesLink(milestone.id,"open")">@Messages("issue.state.open") <strong>@{100 - milestone.getCompletionRate}%</strong></a>
-    						</div>
-                            } else {
-                                <div class="empty-issue">@Messages("issue.is.empty")</div>
-                            }
-    					</div>
-
-    				</div>
+                    </div>
                 </div>
 
-                <div class="completion-rate @if(milestone.getCompletionRate == 100){done}">
+                <div class="completion-rate">
                     @if(milestone.getNumOpenIssues + milestone.getNumClosedIssues > 0) {
                     @milestone.getCompletionRate
                     <i>%</i>

0499487

9249da0

app/views/milestone/partial_status.scala.html

--- app/views/milestone/partial_status.scala.html

+++ app/views/milestone/partial_status.scala.html


 
 @urlToList = {@routes.MilestoneApp.milestones(project.owner, project.name)}
 
-@makeIssuesLink(mId: Long, _state: String) = @{
-    buildQueryString(routes.IssueApp.issues(project.owner, project.name, _state),
-        Map("milestoneId"->mId.toString)
-    )
-}
-
 <div class="milestone-info">
     <div class="meta-info">
         <a href="@routes.MilestoneApp.milestone(project.owner, project.name, milestone.id)" class="title">@milestone.title</a>

     </div>
 
     <div class="progress-wrap">
-        <div class="progress">
-            <div class="bar orange" style="width: @milestone.getCompletionRate%;"></div>
+        <div class="progress progress-success progress-striped nm">
+            <div class="bar" style="width: @milestone.getCompletionRate%;"></div>
         </div>
         <div class="progress-info">
-            <div class="pull-left" >
-                <a href="@makeIssuesLink(milestone.id,"closed")">@Messages("issue.state.closed") <strong>@milestone.getCompletionRate%</strong></a>
-            </div>
-            <div class="pull-right">
-                <a href="@makeIssuesLink(milestone.id,"open")">@Messages("issue.state.open") <strong>@{100 - milestone.getCompletionRate}%</strong></a>
-            </div>
+            <span class="pull-right">
+                <strong>@milestone.getNumClosedIssues / @(milestone.getNumOpenIssues + milestone.getNumClosedIssues)</strong>
+            </span>
         </div>
     </div>
 </div>

0499487

9249da0

app/views/milestone/view.scala.html

--- app/views/milestone/view.scala.html

+++ app/views/milestone/view.scala.html


                 </small>
             </h4>
 
-            <div class="progress @if(milestone.getCompletionRate==0){empty}">
-                <div class="progress-bar" style="width: @milestone.getCompletionRate%;"></div>
+            <div class="progress progress-success progress-striped @if(milestone.state == State.OPEN) {active}">
+                <div class="bar" style="width: @milestone.getCompletionRate%;"></div>
             </div>
-            <div class="progress-label clearfix">
-                @if(milestone.getNumOpenIssues + milestone.getNumClosedIssues > 0) {
-                <div class="pull-left">
-                    <a href="@makeIssuesLink(milestone.id,"closed")">@Messages("issue.state.closed") <strong>@milestone.getCompletionRate%</strong></a>
-                </div>
-                <div class="pull-right">
-                    <a href="@makeIssuesLink(milestone.id,"open")">@Messages("issue.state.open") <strong>@{100 - milestone.getCompletionRate}%</strong></a>
-                </div>
-                } else {
-                    <div class="empty-issue">@Messages("issue.is.empty")</div>
-                }
-            </div>
-
             <div class="milestone-desc">
                 <div markdown="true" class="markdown-wrap">@milestone.contents</div>
                 <div class="attachments" data-resourceType="@ResourceType.MILESTONE" data-resourceId="@milestone.id"></div>

0499487

9249da0

app/views/user/partial_milestones.scala.html

--- app/views/user/partial_milestones.scala.html

+++ app/views/user/partial_milestones.scala.html


             <span class="due-date">@Messages("label.dueDate") <strong>@milestone.getDueDateString</strong></span>
             <span class="date">(@milestone.until)</span>
             }
-            <div class="issue-wrap nbtn-group pull-right">
-                <a href="@makeIssuesLink(milestone.id,"open")" class="nbtn medium">
-                @Messages("issue.state.open") <strong class="num-badge open">@milestone.getNumOpenIssues</strong>
+            <div class="pull-right">
+                <a href="@makeIssuesLink(milestone.id,"open")">
+                @Messages("issue.state.open") <strong class="numberic nm">@milestone.getNumOpenIssues</strong>
                 </a>
-                <a href="@makeIssuesLink(milestone.id,"closed")" class="nbtn medium">
-                @Messages("issue.state.closed") <strong class="num-badge closed">@milestone.getNumClosedIssues</strong>
+                <a href="@makeIssuesLink(milestone.id,"closed")" class="ml10">
+                @Messages("issue.state.closed") <strong class="numberic nm">@milestone.getNumClosedIssues</strong>
                 </a>
             </div>
         </div>
 
         <div class="progress-wrap">
-            <div class="progress">
-                <div class="bar orange" style="width: @milestone.getCompletionRate%;"></div>
-            </div>
-            <div class="progress-label">
-                <div class="pull-left" style="width: @milestone.getCompletionRate%; min-width:100px;">
-                    <a href="@makeIssuesLink(milestone.id,"closed")">@Messages("issue.state.closed") <strong>@milestone.getCompletionRate%</strong></a>
-                </div>
-                <div class="pull-right">
-                    <a href="@makeIssuesLink(milestone.id,"open")">@Messages("issue.state.open") <strong>@{100 - milestone.getCompletionRate}%</strong></a>
-                </div>
+            <div class="progress progress-success progress-striped active">
+                <div class="bar" style="width: @milestone.getCompletionRate%;"></div>
             </div>
         </div>
     </div>
-    <div class="completion-rate @if(milestone.getCompletionRate == 100){done}"><!--
+    <div class="completion-rate"><!--
              -->@milestone.getCompletionRate<!--
              --><i>%</i>
     </div>

Add a comment

Open 0
Closed 0

List

...	...	@@ -101,7 +101,7 @@
101	101	}
102	102
103	103	/ file uploader /
104		-.progress {
	104	+.upload-progress {
105	105	height: 7px;
106	106	margin-bottom: 5px;
107	107	background:#b1b1b1;

...	...	@@ -1956,7 +1956,6 @@
1956	1956	padding: 4px;
1957	1957
1958	1958	.progress {
1959		- background-color:@state-open;
1960	1959	height:7px;
1961	1960	width:100%;
1962	1961
...	...	@@ -2021,15 +2020,8 @@
2021	2020	color: #666;
2022	2021	&.over { color:#f36c22; }
2023	2022	}
2024		-
2025		- .open { background-color: @state-open; color:#FFF;}
2026		- .closed { background-color: @state-closed; color:#FFF;}
2027		-
2028		- .num-badge {
2029		- color: #fff;
2030		- margin-left:3px;
2031		- }
2032	2023	}
	2024	+
2033	2025	.progress-wrap {
2034	2026	overflow: hidden;
2035	2027	color: #999;
...	...	@@ -2037,14 +2029,7 @@
2037	2029	margin-top:15px;
2038	2030
2039	2031	.progress {
2040		- background-color: @state-open;
2041		-
2042		- &.empty { background-color: #B1B1B1; }
2043		-
2044		- .progress-bar {
2045		- background-color: @state-closed;
2046		- height: inherit;
2047		- }
	2032	+ height:14px;
2048	2033	}
2049	2034
2050	2035	}

...	...	@@ -25,7 +25,7 @@
25	25	<strong class="name">${fileName}</strong>
26	26	<span class="size">${fileSizeReadable}</span>
27	27	<div class="progress-wrap pull-right">
28		- <div class="progress n4"><div class="bar orange"></div></div>
	28	+ <div class="upload-progress n4"><div class="bar orange"></div></div>
29	29	</div>
30	30	<button type="button" class="btn-transparent btn-delete pull-right">×</button>
31	31	<span class="pull-right nbtn small white btn-insert">@Messages("common.attach.clickToPost")</span>

...	...	@@ -21,12 +21,6 @@
21	21	)
22	22	}
23	23
24		-@makeIssuesLink(mId: Long, _state: String) = @{
25		- buildQueryString(routes.IssueApp.issues(project.owner, project.name, _state),
26		- Map("milestoneId"->mId.toString)
27		- )
28		-}
29		-
30	24	@projectLayout(title, project, utils.MenuType.MILESTONE) {
31	25	@projectMenu(project, utils.MenuType.MILESTONE, "")
32	26	<div class="page-wrap-outer">
...	...	@@ -61,12 +55,6 @@
61	55	} else {
62	56
63	57	<div class="filter-wrap milestone">
64		- <div class="milestone-legend pull-left">
65		- <i class="open"></i> @Messages("issue.state.open")
66		- <i class="closed"></i> @Messages("issue.state.closed")
67		-
68		- </div>
69		-
70	58	@if(milestones.length > 1){
71	59	<div class="filters">
72	60	@makeFilterLink("dueDate", param.orderBy, param.orderDir, Messages("common.order.dueDate"))
...	...	@@ -103,38 +91,19 @@
103	91	</span>
104	92	}
105	93	}
106		- <div class="issue-wrap pull-right">
107		- <a href="@makeIssuesLink(milestone.id,"open")" class="ybtn open medium open-issue">
108		- @Messages("issue.state.open") <strong class="num-badge">@milestone.getNumOpenIssues</strong>
109		- </a>
110		- <a href="@makeIssuesLink(milestone.id,"closed")" class="ybtn closed medium closed-issue">
111		- @Messages("issue.state.closed") <strong class="num-badge">@milestone.getNumClosedIssues</strong>
112		- </a>
	94	+ <div class="pull-right">
	95	+ <strong class="title">@milestone.getNumClosedIssues / @(milestone.getNumOpenIssues + milestone.getNumClosedIssues)</strong>
113	96	</div>
114	97	</div>
115	98
116	99	<div class="progress-wrap">
117		- <div class="progress @if(milestone.getCompletionRate==0){empty}">
118		- <div class="progress-bar" style="width: @milestone.getCompletionRate%;"></div>
	100	+ <div class="progress progress-success progress-striped @if(milestone.state == State.OPEN) {active}">
	101	+ <div class="bar" style="width: @milestone.getCompletionRate%;"></div>
119	102	</div>
120		-
121		- <div class="progress-label">
122		- @if(milestone.getNumOpenIssues + milestone.getNumClosedIssues > 0) {
123		- <div class="pull-left">
124		- <a href="@makeIssuesLink(milestone.id,"closed")">@Messages("issue.state.closed") <strong>@milestone.getCompletionRate%</strong></a>
125		- </div>
126		- <div class="pull-right">
127		- <a href="@makeIssuesLink(milestone.id,"open")">@Messages("issue.state.open") <strong>@{100 - milestone.getCompletionRate}%</strong></a>
128		- </div>
129		- } else {
130		- <div class="empty-issue">@Messages("issue.is.empty")</div>
131		- }
132		- </div>
133		-
134		- </div>
	103	+ </div>
135	104	</div>
136	105
137		- <div class="completion-rate @if(milestone.getCompletionRate == 100){done}">
	106	+ <div class="completion-rate">
138	107	@if(milestone.getNumOpenIssues + milestone.getNumClosedIssues > 0) {
139	108	@milestone.getCompletionRate
140	109	<i>%</i>

...	...	@@ -5,12 +5,6 @@
5	5
6	6	@urlToList = {@routes.MilestoneApp.milestones(project.owner, project.name)}
7	7
8		-@makeIssuesLink(mId: Long, _state: String) = @{
9		- buildQueryString(routes.IssueApp.issues(project.owner, project.name, _state),
10		- Map("milestoneId"->mId.toString)
11		- )
12		-}
13		-
14	8	<div class="milestone-info">
15	9	<div class="meta-info">
16	10	<a href="@routes.MilestoneApp.milestone(project.owner, project.name, milestone.id)" class="title">@milestone.title</a>
...	...	@@ -22,16 +16,13 @@
22	16	</div>
23	17
24	18	<div class="progress-wrap">
25		- <div class="progress">
26		- <div class="bar orange" style="width: @milestone.getCompletionRate%;"></div>
	19	+ <div class="progress progress-success progress-striped nm">
	20	+ <div class="bar" style="width: @milestone.getCompletionRate%;"></div>
27	21	</div>
28	22	<div class="progress-info">
29		- <div class="pull-left" >
30		- <a href="@makeIssuesLink(milestone.id,"closed")">@Messages("issue.state.closed") <strong>@milestone.getCompletionRate%</strong></a>
31		- </div>
32		- <div class="pull-right">
33		- <a href="@makeIssuesLink(milestone.id,"open")">@Messages("issue.state.open") <strong>@{100 - milestone.getCompletionRate}%</strong></a>
34		- </div>
	23	+ <span class="pull-right">
	24	+ <strong>@milestone.getNumClosedIssues / @(milestone.getNumOpenIssues + milestone.getNumClosedIssues)</strong>
	25	+ </span>
35	26	</div>
36	27	</div>
37	28	</div>

...	...	@@ -34,22 +34,9 @@
34	34	</small>
35	35	</h4>
36	36
37		- <div class="progress @if(milestone.getCompletionRate==0){empty}">
38		- <div class="progress-bar" style="width: @milestone.getCompletionRate%;"></div>
	37	+ <div class="progress progress-success progress-striped @if(milestone.state == State.OPEN) {active}">
	38	+ <div class="bar" style="width: @milestone.getCompletionRate%;"></div>
39	39	</div>
40		- <div class="progress-label clearfix">
41		- @if(milestone.getNumOpenIssues + milestone.getNumClosedIssues > 0) {
42		- <div class="pull-left">
43		- <a href="@makeIssuesLink(milestone.id,"closed")">@Messages("issue.state.closed") <strong>@milestone.getCompletionRate%</strong></a>
44		- </div>
45		- <div class="pull-right">
46		- <a href="@makeIssuesLink(milestone.id,"open")">@Messages("issue.state.open") <strong>@{100 - milestone.getCompletionRate}%</strong></a>
47		- </div>
48		- } else {
49		- <div class="empty-issue">@Messages("issue.is.empty")</div>
50		- }
51		- </div>
52		-
53	40	<div class="milestone-desc">
54	41	<div markdown="true" class="markdown-wrap">@milestone.contents</div>
55	42	<div class="attachments" data-resourceType="@ResourceType.MILESTONE" data-resourceId="@milestone.id"></div>

...	...	@@ -24,31 +24,23 @@
24	24	<span class="due-date">@Messages("label.dueDate") <strong>@milestone.getDueDateString</strong></span>
25	25	<span class="date">(@milestone.until)</span>
26	26	}
27		- <div class="issue-wrap nbtn-group pull-right">
28		- <a href="@makeIssuesLink(milestone.id,"open")" class="nbtn medium">
29		- @Messages("issue.state.open") <strong class="num-badge open">@milestone.getNumOpenIssues</strong>
	27	+ <div class="pull-right">
	28	+ <a href="@makeIssuesLink(milestone.id,"open")">
	29	+ @Messages("issue.state.open") <strong class="numberic nm">@milestone.getNumOpenIssues</strong>
30	30	</a>
31		- <a href="@makeIssuesLink(milestone.id,"closed")" class="nbtn medium">
32		- @Messages("issue.state.closed") <strong class="num-badge closed">@milestone.getNumClosedIssues</strong>
	31	+ <a href="@makeIssuesLink(milestone.id,"closed")" class="ml10">
	32	+ @Messages("issue.state.closed") <strong class="numberic nm">@milestone.getNumClosedIssues</strong>
33	33	</a>
34	34	</div>
35	35	</div>
36	36
37	37	<div class="progress-wrap">
38		- <div class="progress">
39		- <div class="bar orange" style="width: @milestone.getCompletionRate%;"></div>
40		- </div>
41		- <div class="progress-label">
42		- <div class="pull-left" style="width: @milestone.getCompletionRate%; min-width:100px;">
43		- <a href="@makeIssuesLink(milestone.id,"closed")">@Messages("issue.state.closed") <strong>@milestone.getCompletionRate%</strong></a>
44		- </div>
45		- <div class="pull-right">
46		- <a href="@makeIssuesLink(milestone.id,"open")">@Messages("issue.state.open") <strong>@{100 - milestone.getCompletionRate}%</strong></a>
47		- </div>
	38	+ <div class="progress progress-success progress-striped active">
	39	+ <div class="bar" style="width: @milestone.getCompletionRate%;"></div>
48	40	</div>
49	41	</div>
50	42	</div>
51		- <div class="completion-rate @if(milestone.getCompletionRate == 100){done}"><!--
	43	+ <div class="completion-rate"><!--
52	44	-->@milestone.getCompletionRate<!--
53	45	--><i>%</i>
54	46	</div>

Delete comment