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
3decd462
Commit
3decd462
authored
Jul 02, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better UI for closed/reopen buttons
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
8fcdd6bf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
app/assets/stylesheets/generic/buttons.scss
app/assets/stylesheets/generic/buttons.scss
+4
-4
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+2
-2
app/views/projects/milestones/_milestone.html.haml
app/views/projects/milestones/_milestone.html.haml
+1
-1
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+2
-2
No files found.
app/assets/stylesheets/generic/buttons.scss
View file @
3decd462
...
@@ -152,16 +152,16 @@
...
@@ -152,16 +152,16 @@
}
}
&
.btn-close
{
&
.btn-close
{
color
:
#B94A48
;
color
:
$bg_danger
;
font-weight
:
bold
;
border-color
:
$border_danger
;
&
:hover
{
&
:hover
{
color
:
#B94A48
;
color
:
#B94A48
;
}
}
}
}
&
.btn-reopen
{
&
.btn-reopen
{
color
:
#468847
;
color
:
$bg_success
;
font-weight
:
bold
;
border-color
:
$border_success
;
&
:hover
{
&
:hover
{
color
:
#468847
;
color
:
#468847
;
}
}
...
...
app/views/projects/issues/_issue.html.haml
View file @
3decd462
...
@@ -38,9 +38,9 @@
...
@@ -38,9 +38,9 @@
.issue-actions
.issue-actions
-
if
can?
current_user
,
:modify_issue
,
issue
-
if
can?
current_user
,
:modify_issue
,
issue
-
if
issue
.
closed?
-
if
issue
.
closed?
=
link_to
'Reopen'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
state_event: :reopen
},
status_only:
true
),
method: :put
,
class:
"btn btn-small btn-grouped reopen_issue"
,
remote:
true
=
link_to
'Reopen'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
state_event: :reopen
},
status_only:
true
),
method: :put
,
class:
"btn btn-small btn-grouped reopen_issue
btn-reopen
"
,
remote:
true
-
else
-
else
=
link_to
'Close'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
state_event: :close
},
status_only:
true
),
method: :put
,
class:
"btn btn-small btn-grouped close_issue"
,
remote:
true
=
link_to
'Close'
,
project_issue_path
(
issue
.
project
,
issue
,
issue:
{
state_event: :close
},
status_only:
true
),
method: :put
,
class:
"btn btn-small btn-grouped close_issue
btn-close
"
,
remote:
true
=
link_to
edit_project_issue_path
(
issue
.
project
,
issue
),
class:
"btn btn-small edit-issue-link btn-grouped"
do
=
link_to
edit_project_issue_path
(
issue
.
project
,
issue
),
class:
"btn btn-small edit-issue-link btn-grouped"
do
%i
.icon-edit
%i
.icon-edit
Edit
Edit
...
...
app/views/projects/milestones/_milestone.html.haml
View file @
3decd462
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
=
link_to
edit_project_milestone_path
(
milestone
.
project
,
milestone
),
class:
"btn btn-small edit-milestone-link btn-grouped"
do
=
link_to
edit_project_milestone_path
(
milestone
.
project
,
milestone
),
class:
"btn btn-small edit-milestone-link btn-grouped"
do
%i
.icon-edit
%i
.icon-edit
Edit
Edit
=
link_to
'Close Milestone'
,
project_milestone_path
(
@project
,
milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
remote:
true
,
class:
"btn btn-small btn-
remov
e"
=
link_to
'Close Milestone'
,
project_milestone_path
(
@project
,
milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
remote:
true
,
class:
"btn btn-small btn-
clos
e"
%h4
%h4
=
link_to_gfm
truncate
(
milestone
.
title
,
length:
100
),
project_milestone_path
(
milestone
.
project
,
milestone
)
=
link_to_gfm
truncate
(
milestone
.
title
,
length:
100
),
project_milestone_path
(
milestone
.
project
,
milestone
)
-
if
milestone
.
expired?
and
not
milestone
.
closed?
-
if
milestone
.
expired?
and
not
milestone
.
closed?
...
...
app/views/projects/milestones/show.html.haml
View file @
3decd462
...
@@ -7,9 +7,9 @@
...
@@ -7,9 +7,9 @@
%i
.icon-edit
%i
.icon-edit
Edit
Edit
-
if
@milestone
.
active?
-
if
@milestone
.
active?
=
link_to
'Close Milestone'
,
project_milestone_path
(
@project
,
@milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-
remov
e btn-grouped"
=
link_to
'Close Milestone'
,
project_milestone_path
(
@project
,
@milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-
clos
e btn-grouped"
-
else
-
else
=
link_to
'Reopen Milestone'
,
project_milestone_path
(
@project
,
@milestone
,
milestone:
{
state_event: :activate
}),
method: :put
,
class:
"btn btn-grouped"
=
link_to
'Reopen Milestone'
,
project_milestone_path
(
@project
,
@milestone
,
milestone:
{
state_event: :activate
}),
method: :put
,
class:
"btn btn-
reopen btn-
grouped"
-
if
@milestone
.
issues
.
any?
&&
@milestone
.
can_be_closed?
-
if
@milestone
.
issues
.
any?
&&
@milestone
.
can_be_closed?
.alert.alert-success
.alert.alert-success
...
...
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