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
66360303
Commit
66360303
authored
Jan 14, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rs-milestone-buttons' into 'master'
Update button style on milestone pages See merge request !2414
parents
60d7cfc2
da3c5708
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
app/views/projects/milestones/_milestone.html.haml
app/views/projects/milestones/_milestone.html.haml
+4
-3
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+6
-6
No files found.
app/views/projects/milestones/_milestone.html.haml
View file @
66360303
...
@@ -21,10 +21,11 @@
...
@@ -21,10 +21,11 @@
=
render
'shared/milestone_expired'
,
milestone:
milestone
=
render
'shared/milestone_expired'
,
milestone:
milestone
.col-sm-6
.col-sm-6
-
if
can?
(
current_user
,
:admin_milestone
,
milestone
.
project
)
and
milestone
.
active?
-
if
can?
(
current_user
,
:admin_milestone
,
milestone
.
project
)
and
milestone
.
active?
=
link_to
edit_namespace_project_milestone_path
(
milestone
.
project
.
namespace
,
milestone
.
project
,
milestone
),
class:
"btn btn-xs
edit-milestone-link btn-grouped
"
do
=
link_to
edit_namespace_project_milestone_path
(
milestone
.
project
.
namespace
,
milestone
.
project
,
milestone
),
class:
"btn btn-xs"
do
%i
.fa.fa-pencil-square-o
=
icon
(
'pencil-square-o'
)
Edit
Edit
\
=
link_to
'Close Milestone'
,
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
remote:
true
,
class:
"btn btn-xs btn-close"
=
link_to
'Close Milestone'
,
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
remote:
true
,
class:
"btn btn-xs btn-close"
=
link_to
namespace_project_milestone_path
(
milestone
.
project
.
namespace
,
milestone
.
project
,
milestone
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-xs btn-remove"
do
=
link_to
namespace_project_milestone_path
(
milestone
.
project
.
namespace
,
milestone
.
project
,
milestone
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-xs btn-remove"
do
%i
.fa.fa-trash-o
=
icon
(
'trash-o'
)
Delete
Delete
app/views/projects/milestones/show.html.haml
View file @
66360303
...
@@ -20,16 +20,16 @@
...
@@ -20,16 +20,16 @@
.pull-right
.pull-right
-
if
can?
(
current_user
,
:admin_milestone
,
@project
)
-
if
can?
(
current_user
,
:admin_milestone
,
@project
)
-
if
@milestone
.
active?
-
if
@milestone
.
active?
=
link_to
'Close Milestone'
,
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-close btn-grouped"
=
link_to
'Close Milestone'
,
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-close btn-
nr btn-
grouped"
-
else
-
else
=
link_to
'Reopen Milestone'
,
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
,
milestone:
{
state_event: :activate
}),
method: :put
,
class:
"btn btn-reopen btn-grouped"
=
link_to
'Reopen Milestone'
,
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
,
milestone:
{
state_event: :activate
}),
method: :put
,
class:
"btn btn-reopen btn-
nr btn-
grouped"
=
link_to
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-grouped btn-remove"
do
=
link_to
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-grouped btn-
nr btn-
remove"
do
%i
.fa.fa-trash-o
=
icon
(
'trash-o'
)
Delete
Delete
=
link_to
edit_namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
),
class:
"btn btn-grouped"
do
=
link_to
edit_namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
),
class:
"btn btn-grouped
btn-nr
"
do
%i
.fa.fa-pencil-square-o
=
icon
(
'pencil-square-o'
)
Edit
Edit
.detail-page-description.gray-content-block.second-block
.detail-page-description.gray-content-block.second-block
...
...
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