Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
6c777ff8
Commit
6c777ff8
authored
Jan 07, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve milestone show page
parent
676a9a7e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
30 deletions
+26
-30
app/assets/javascripts/milestones.js.coffee
app/assets/javascripts/milestones.js.coffee
+4
-4
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/assets/stylesheets/gitlab_bootstrap/common.scss
+1
-0
app/views/milestones/show.html.haml
app/views/milestones/show.html.haml
+21
-26
No files found.
app/assets/javascripts/milestones.js.coffee
View file @
6c777ff8
$
->
$
->
$
(
'.milestone-issue-filter
tr
[data-closed]'
).
addClass
(
'hide'
)
$
(
'.milestone-issue-filter
li
[data-closed]'
).
addClass
(
'hide'
)
$
(
'.milestone-issue-filter ul.nav li a'
).
click
->
$
(
'.milestone-issue-filter ul.nav li a'
).
click
->
$
(
'.milestone-issue-filter li'
).
toggleClass
(
'active'
)
$
(
'.milestone-issue-filter li'
).
toggleClass
(
'active'
)
$
(
'.milestone-issue-filter
tr
[data-closed]'
).
toggleClass
(
'hide'
)
$
(
'.milestone-issue-filter
li
[data-closed]'
).
toggleClass
(
'hide'
)
false
false
$
(
'.milestone-merge-requests-filter
tr
[data-closed]'
).
addClass
(
'hide'
)
$
(
'.milestone-merge-requests-filter
li
[data-closed]'
).
addClass
(
'hide'
)
$
(
'.milestone-merge-requests-filter ul.nav li a'
).
click
->
$
(
'.milestone-merge-requests-filter ul.nav li a'
).
click
->
$
(
'.milestone-merge-requests-filter li'
).
toggleClass
(
'active'
)
$
(
'.milestone-merge-requests-filter li'
).
toggleClass
(
'active'
)
$
(
'.milestone-merge-requests-filter
tr
[data-closed]'
).
toggleClass
(
'hide'
)
$
(
'.milestone-merge-requests-filter
li
[data-closed]'
).
toggleClass
(
'hide'
)
false
false
app/assets/stylesheets/gitlab_bootstrap/common.scss
View file @
6c777ff8
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
/** PILLS & TABS**/
/** PILLS & TABS**/
.nav-pills
{
.nav-pills
{
.active
a
{
.active
a
{
background
:
$primary_color
;
}
}
>
li
>
a
{
>
li
>
a
{
...
...
app/views/milestones/show.html.haml
View file @
6c777ff8
...
@@ -38,51 +38,46 @@
...
@@ -38,51 +38,46 @@
=
gfm
escape_once
(
@milestone
.
title
)
=
gfm
escape_once
(
@milestone
.
title
)
.ui-box-body
.ui-box-body
%
h5
%
p
Progress:
Progress:
%small
#{
@milestone
.
closed_items_count
}
closed
#{
@milestone
.
closed_items_count
}
closed
–
–
#{
@milestone
.
open_items_count
}
open
#{
@milestone
.
open_items_count
}
open
%span
.right
=
@milestone
.
expires_at
%span
.right
=
@milestone
.
expires_at
.progress.progress-info
.progress.progress-info
.bar
{
style:
"width: #{@milestone.percent_complete}%;"
}
.bar
{
style:
"width: #{@milestone.percent_complete}%;"
}
-
if
@milestone
.
description
.
present?
-
if
@milestone
.
description
.
present?
.
bottom_box_content
.
ui-box-bottom
=
preserve
do
=
preserve
do
=
markdown
@milestone
.
description
=
markdown
@milestone
.
description
.row
.row
.span6
.span6
%table
.milestone-issue-filter
.ui-box.milestone-issue-filter
%thead
.title
%tr
%ul
.nav.nav-pills
%th
%li
.active
=
link_to
(
'Open Issues'
,
'#'
)
%ul
.nav.nav-pills
%li
=
link_to
(
'All Issues'
,
'#'
)
%li
.active
=
link_to
(
'Open Issues'
,
'#'
)
%ul
.well-list
%li
=
link_to
(
'All Issues'
,
'#'
)
-
@issues
.
each
do
|
issue
|
-
@issues
.
each
do
|
issue
|
%li
{
data:
{
closed:
issue
.
closed
}}
%tr
{
data:
{
closed:
issue
.
closed
}}
%td
=
link_to
[
@project
,
issue
]
do
=
link_to
[
@project
,
issue
]
do
%span
.badge.badge-info
##{issue.id}
%span
.badge.badge-info
##{issue.id}
–
–
=
link_to_gfm
truncate
(
issue
.
title
,
length:
60
),
[
@project
,
issue
]
=
link_to_gfm
truncate
(
issue
.
title
,
length:
60
),
[
@project
,
issue
]
.span6
.span6
%table
.milestone-merge-requests-filter
.ui-box.milestone-merge-requests-filter
%thead
.title
%tr
%ul
.nav.nav-pills
%th
%li
.active
=
link_to
(
'Open Merge Requests'
,
'#'
)
%ul
.nav.nav-pills
%li
=
link_to
(
'All Merge Requests'
,
'#'
)
%li
.active
=
link_to
(
'Open Merge Requests'
,
'#'
)
%ul
.well-list
%li
=
link_to
(
'All Merge Requests'
,
'#'
)
-
@merge_requests
.
each
do
|
merge_request
|
-
@merge_requests
.
each
do
|
merge_request
|
%li
{
data:
{
closed:
merge_request
.
closed
}}
%tr
{
data:
{
closed:
merge_request
.
closed
}}
%td
=
link_to
[
@project
,
merge_request
]
do
=
link_to
[
@project
,
merge_request
]
do
%span
.badge.badge-info
##{merge_request.id}
%span
.badge.badge-info
##{merge_request.id}
–
–
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment