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
Jérome Perrin
gitlab-ce
Commits
9023526c
Commit
9023526c
authored
Mar 24, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move milestone due date info to sidebar
parent
92e0bd9b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
9 deletions
+23
-9
app/assets/stylesheets/pages/milestone.scss
app/assets/stylesheets/pages/milestone.scss
+0
-4
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+1
-1
app/views/shared/milestones/_sidebar.html.haml
app/views/shared/milestones/_sidebar.html.haml
+22
-0
app/views/shared/milestones/_summary.html.haml
app/views/shared/milestones/_summary.html.haml
+0
-4
No files found.
app/assets/stylesheets/pages/milestone.scss
View file @
9023526c
...
@@ -62,10 +62,6 @@
...
@@ -62,10 +62,6 @@
}
}
}
}
.remaining-days
{
color
:
$orange-600
;
}
.milestone-stats-and-buttons
{
.milestone-stats-and-buttons
{
display
:
flex
;
display
:
flex
;
justify-content
:
flex-start
;
justify-content
:
flex-start
;
...
...
app/views/projects/milestones/show.html.haml
View file @
9023526c
...
@@ -58,4 +58,4 @@
...
@@ -58,4 +58,4 @@
=
render
'shared/milestones/summary'
,
milestone:
@milestone
,
project:
@project
=
render
'shared/milestones/summary'
,
milestone:
@milestone
,
project:
@project
=
render
'shared/milestones/tabs'
,
milestone:
@milestone
=
render
'shared/milestones/tabs'
,
milestone:
@milestone
=
render
'shared/milestones/sidebar'
,
milestone:
@milestone
,
affix_offset:
153
=
render
'shared/milestones/sidebar'
,
milestone:
@milestone
,
project:
@project
,
affix_offset:
153
app/views/shared/milestones/_sidebar.html.haml
View file @
9023526c
-
affix_offset
=
local_assigns
.
fetch
(
:affix_offset
,
"102"
)
-
affix_offset
=
local_assigns
.
fetch
(
:affix_offset
,
"102"
)
-
project
=
local_assigns
[
:project
]
%aside
.right-sidebar.js-right-sidebar
{
data:
{
"offset-top"
=>
affix_offset
,
"spy"
=>
"affix"
},
class:
sidebar_gutter_collapsed_class
,
'aria-live'
=>
'polite'
}
%aside
.right-sidebar.js-right-sidebar
{
data:
{
"offset-top"
=>
affix_offset
,
"spy"
=>
"affix"
},
class:
sidebar_gutter_collapsed_class
,
'aria-live'
=>
'polite'
}
.issuable-sidebar
.issuable-sidebar
...
@@ -9,6 +10,27 @@
...
@@ -9,6 +10,27 @@
%span
.issuable-header-text.hide-collapsed
%span
.issuable-header-text.hide-collapsed
Milestone
#{
milestone
.
try
(
:to_reference
)
||
milestone
.
title
}
Milestone
#{
milestone
.
try
(
:to_reference
)
||
milestone
.
title
}
-
if
project
.block.due_date
.sidebar-collapsed-icon
=
icon
(
'calendar'
,
'aria-hidden'
:
'true'
)
%span
.js-due-date-sidebar-value
=
milestone
.
due_date
.
try
(
:to_s
,
:medium
)
||
'None'
.title.hide-collapsed
Due date
-
if
can?
(
current_user
,
:admin_milestone
,
@project
)
=
link_to
'Edit'
,
edit_namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
),
class:
'edit-link pull-right'
.value.hide-collapsed
%span
.value-content
-
if
milestone
.
due_date
%span
.bold
=
milestone
.
due_date
.
to_s
(
:medium
)
-
else
%span
.no-value
No due date
-
remaining_days
=
milestone_remaining_days
(
milestone
)
-
if
remaining_days
.
present?
=
surround
'('
,
')'
do
%span
.remaining-days
=
remaining_days
-
milestone_ref
=
milestone
.
try
(
:to_reference
,
full:
true
)
-
milestone_ref
=
milestone
.
try
(
:to_reference
,
full:
true
)
-
if
milestone_ref
.
present?
-
if
milestone_ref
.
present?
.block
.block
...
...
app/views/shared/milestones/_summary.html.haml
View file @
9023526c
...
@@ -26,10 +26,6 @@
...
@@ -26,10 +26,6 @@
%span
.milestone-stat
%span
.milestone-stat
%strong
==
#{
milestone
.
percent_complete
(
current_user
)
}
%
%strong
==
#{
milestone
.
percent_complete
(
current_user
)
}
%
complete
complete
-
remaining_days
=
milestone_remaining_days
(
milestone
)
-
if
remaining_days
.
present?
%span
.milestone-stat
%span
.remaining-days
=
remaining_days
.milestone-progress-buttons
.milestone-progress-buttons
%span
.tab-issues-buttons
%span
.tab-issues-buttons
...
...
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