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
822bfafa
Commit
822bfafa
authored
Mar 23, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add basic sidebar functionality to milestones page
parent
f1e1e513
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
1 deletion
+23
-1
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+3
-0
app/helpers/nav_helper.rb
app/helpers/nav_helper.rb
+2
-1
app/views/dashboard/milestones/show.html.haml
app/views/dashboard/milestones/show.html.haml
+1
-0
app/views/groups/milestones/show.html.haml
app/views/groups/milestones/show.html.haml
+1
-0
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+4
-0
app/views/shared/milestones/_sidebar.html.haml
app/views/shared/milestones/_sidebar.html.haml
+9
-0
app/views/shared/milestones/_top.html.haml
app/views/shared/milestones/_top.html.haml
+3
-0
No files found.
app/assets/javascripts/dispatcher.js
View file @
822bfafa
...
...
@@ -33,6 +33,8 @@
/* global ProjectShow */
/* global Labels */
/* global Shortcuts */
/* global Sidebar */
import
Issue
from
'
./issue
'
;
import
BindInOut
from
'
./behaviors/bind_in_out
'
;
...
...
@@ -118,6 +120,7 @@ const ShortcutsBlob = require('./shortcuts_blob');
case
'
groups:milestones:show
'
:
case
'
dashboard:milestones:show
'
:
new
Milestone
();
new
Sidebar
();
break
;
case
'
dashboard:todos:index
'
:
new
gl
.
Todos
();
...
...
app/helpers/nav_helper.rb
View file @
822bfafa
...
...
@@ -6,7 +6,8 @@ module NavHelper
current_path?
(
'merge_requests#builds'
)
||
current_path?
(
'merge_requests#conflicts'
)
||
current_path?
(
'merge_requests#pipelines'
)
||
current_path?
(
'issues#show'
)
current_path?
(
'issues#show'
)
||
current_path?
(
'milestones#show'
)
if
cookies
[
:collapsed_gutter
]
==
'true'
"page-gutter right-sidebar-collapsed"
else
...
...
app/views/dashboard/milestones/show.html.haml
View file @
822bfafa
...
...
@@ -3,3 +3,4 @@
=
render
'shared/milestones/top'
,
milestone:
@milestone
=
render
'shared/milestones/summary'
,
milestone:
@milestone
=
render
'shared/milestones/tabs'
,
milestone:
@milestone
,
show_full_project_name:
true
=
render
'shared/milestones/sidebar'
,
milestone:
@milestone
,
affix_offset:
51
app/views/groups/milestones/show.html.haml
View file @
822bfafa
...
...
@@ -6,3 +6,4 @@
=
render
'shared/milestones/top'
,
milestone:
@milestone
,
group:
@group
=
render
'shared/milestones/summary'
,
milestone:
@milestone
=
render
'shared/milestones/tabs'
,
milestone:
@milestone
,
show_project_name:
true
=
render
'shared/milestones/sidebar'
,
milestone:
@milestone
,
affix_offset:
102
app/views/projects/milestones/show.html.haml
View file @
822bfafa
...
...
@@ -36,6 +36,9 @@
=
link_to
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-grouped btn-danger"
do
Delete
%a
.btn.btn-default.btn-grouped.pull-right.visible-xs-block.js-sidebar-toggle
{
href:
"#"
}
=
icon
(
'angle-double-left'
)
.detail-page-description.milestone-detail
{
class:
(
'hide-bottom-border'
unless
@milestone
.
description
.
present?
)
}
%h2
.title
=
markdown_field
(
@milestone
,
:title
)
...
...
@@ -55,3 +58,4 @@
=
render
'shared/milestones/summary'
,
milestone:
@milestone
,
project:
@project
=
render
'shared/milestones/tabs'
,
milestone:
@milestone
=
render
'shared/milestones/sidebar'
,
milestone:
@milestone
,
affix_offset:
153
app/views/shared/milestones/_sidebar.html.haml
0 → 100644
View file @
822bfafa
-
affix_offset
=
local_assigns
.
fetch
(
:affix_offset
,
"102"
)
%aside
.right-sidebar.js-right-sidebar
{
data:
{
"offset-top"
=>
affix_offset
,
"spy"
=>
"affix"
},
class:
sidebar_gutter_collapsed_class
,
'aria-live'
=>
'polite'
}
.issuable-sidebar
.block.issuable-sidebar-header
%span
.issuable-header-text.hide-collapsed.pull-left
Milestone
#{
milestone
.
try
(
:to_reference
)
||
milestone
.
title
}
%a
.gutter-toggle.pull-right.js-sidebar-toggle
{
role:
"button"
,
href:
"#"
,
"aria-label"
=>
"Toggle sidebar"
}
=
sidebar_gutter_toggle_icon
app/views/shared/milestones/_top.html.haml
View file @
822bfafa
...
...
@@ -3,6 +3,9 @@
-
group
=
local_assigns
[
:group
]
.detail-page-header
%a
.btn.btn-default.btn-grouped.pull-right.visible-xs-block.js-sidebar-toggle
{
href:
"#"
}
=
icon
(
'angle-double-left'
)
.status-box
{
class:
"status-box-#{milestone.closed? ? 'closed' : 'open'}"
}
-
if
milestone
.
closed?
Closed
...
...
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