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
0bfb7124
Commit
0bfb7124
authored
Feb 25, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Created helper class to hide content in issue sidebar when collapsed
Closes #13764
parent
856153d7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
26 deletions
+19
-26
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+1
-8
app/views/shared/issuable/_participants.html.haml
app/views/shared/issuable/_participants.html.haml
+3
-2
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+15
-16
No files found.
app/assets/stylesheets/pages/issuable.scss
View file @
0bfb7124
...
@@ -203,14 +203,7 @@
...
@@ -203,14 +203,7 @@
overflow
:
hidden
;
overflow
:
hidden
;
}
}
.issuable-count
,
.hide-collapsed
{
.issuable-nav
,
.assignee
>
*,
.milestone
>
*,
.labels
>
*,
.participants
>
*,
.light
>
*,
.project-reference
>
*
{
display
:
none
;
display
:
none
;
}
}
...
...
app/views/shared/issuable/_participants.html.haml
View file @
0bfb7124
...
@@ -3,7 +3,8 @@
...
@@ -3,7 +3,8 @@
=
icon
(
'users'
)
=
icon
(
'users'
)
%span
%span
=
participants
.
count
=
participants
.
count
.title
.title
.hide-collapsed
=
pluralize
participants
.
count
,
"participant"
=
pluralize
participants
.
count
,
"participant"
-
participants
.
each
do
|
participant
|
-
participants
.
each
do
|
participant
|
=
link_to_member
(
@project
,
participant
,
name:
false
,
size:
24
)
%span
.hide-collapsed
=
link_to_member
(
@project
,
participant
,
name:
false
,
size:
24
)
app/views/shared/issuable/_sidebar.html.haml
View file @
0bfb7124
%aside
.right-sidebar
{
class:
sidebar_gutter_collapsed_class
}
%aside
.right-sidebar
{
class:
sidebar_gutter_collapsed_class
}
.issuable-sidebar
.issuable-sidebar
.block
.block
%span
.issuable-count.pull-left
%span
.issuable-count.
hide-collapsed.
pull-left
=
issuable
.
iid
=
issuable
.
iid
of
of
=
issuables_count
(
issuable
)
=
issuables_count
(
issuable
)
%span
.pull-right
%span
.pull-right
%a
.gutter-toggle
{
href:
'#'
}
%a
.gutter-toggle
{
href:
'#'
}
=
sidebar_gutter_toggle_icon
=
sidebar_gutter_toggle_icon
.issuable-nav.pull-right.btn-group
{
role:
'group'
,
"aria-label"
=>
'...'
}
.issuable-nav.
hide-collapsed.
pull-right.btn-group
{
role:
'group'
,
"aria-label"
=>
'...'
}
-
if
prev_issuable
=
prev_issuable_for
(
issuable
)
-
if
prev_issuable
=
prev_issuable_for
(
issuable
)
=
link_to
'Prev'
,
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
prev_issuable
],
class:
'btn btn-default prev-btn'
=
link_to
'Prev'
,
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
prev_issuable
],
class:
'btn btn-default prev-btn'
-
else
-
else
...
@@ -27,13 +27,13 @@
...
@@ -27,13 +27,13 @@
=
link_to_member_avatar
(
issuable
.
assignee
,
size:
24
)
=
link_to_member_avatar
(
issuable
.
assignee
,
size:
24
)
-
else
-
else
=
icon
(
'user'
)
=
icon
(
'user'
)
.title
.title
.hide-collapsed
%label
%label
Assignee
Assignee
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
.pull-right
.pull-right
=
link_to
'Edit'
,
'#'
,
class:
'edit-link'
=
link_to
'Edit'
,
'#'
,
class:
'edit-link'
.value
.value
.hide-collapsed
-
if
issuable
.
assignee
-
if
issuable
.
assignee
%strong
=
link_to_member
(
@project
,
issuable
.
assignee
,
size:
24
)
%strong
=
link_to_member
(
@project
,
issuable
.
assignee
,
size:
24
)
-
if
issuable
.
instance_of?
(
MergeRequest
)
&&
!
issuable
.
can_be_merged_by?
(
issuable
.
assignee
)
-
if
issuable
.
instance_of?
(
MergeRequest
)
&&
!
issuable
.
can_be_merged_by?
(
issuable
.
assignee
)
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
-
else
-
else
.light
None
.light
None
.selectbox
.selectbox
.hide-collapsed
=
users_select_tag
(
"
#{
issuable
.
class
.
table_name
.
singularize
}
[assignee_id]"
,
placeholder:
'Select assignee'
,
class:
'custom-form-control js-select2 js-assignee'
,
selected:
issuable
.
assignee_id
,
project:
@target_project
,
null_user:
true
,
current_user:
true
,
first_user:
true
)
=
users_select_tag
(
"
#{
issuable
.
class
.
table_name
.
singularize
}
[assignee_id]"
,
placeholder:
'Select assignee'
,
class:
'custom-form-control js-select2 js-assignee'
,
selected:
issuable
.
assignee_id
,
project:
@target_project
,
null_user:
true
,
current_user:
true
,
first_user:
true
)
.block.milestone
.block.milestone
...
@@ -53,13 +53,13 @@
...
@@ -53,13 +53,13 @@
=
issuable
.
milestone
.
title
=
issuable
.
milestone
.
title
-
else
-
else
No
No
.title
.title
.hide-collapsed
%label
%label
Milestone
Milestone
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
.pull-right
.pull-right
=
link_to
'Edit'
,
'#'
,
class:
'edit-link'
=
link_to
'Edit'
,
'#'
,
class:
'edit-link'
.value
.value
.hide-collapsed
-
if
issuable
.
milestone
-
if
issuable
.
milestone
%span
.back-to-milestone
%span
.back-to-milestone
=
link_to
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
issuable
.
milestone
)
do
=
link_to
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
issuable
.
milestone
)
do
...
@@ -68,7 +68,7 @@
...
@@ -68,7 +68,7 @@
=
issuable
.
milestone
.
title
=
issuable
.
milestone
.
title
-
else
-
else
.light
None
.light
None
.selectbox
.selectbox
.hide-collapsed
=
f
.
select
(
:milestone_id
,
milestone_options
(
issuable
),
{
include_blank:
true
},
{
class:
'select2 select2-compact js-select2 js-milestone'
,
data:
{
placeholder:
'Select milestone'
}})
=
f
.
select
(
:milestone_id
,
milestone_options
(
issuable
),
{
include_blank:
true
},
{
class:
'select2 select2-compact js-select2 js-milestone'
,
data:
{
placeholder:
'Select milestone'
}})
=
hidden_field_tag
:issuable_context
=
hidden_field_tag
:issuable_context
=
f
.
submit
class:
'btn hide'
=
f
.
submit
class:
'btn hide'
...
@@ -79,18 +79,18 @@
...
@@ -79,18 +79,18 @@
=
icon
(
'tags'
)
=
icon
(
'tags'
)
%span
%span
=
issuable
.
labels
.
count
=
issuable
.
labels
.
count
.title
.title
.hide-collapsed
%label
Labels
%label
Labels
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
.pull-right
.pull-right
=
link_to
'Edit'
,
'#'
,
class:
'edit-link'
=
link_to
'Edit'
,
'#'
,
class:
'edit-link'
.value.issuable-show-labels
.value.issuable-show-labels
.hide-collapsed
-
if
issuable
.
labels
.
any?
-
if
issuable
.
labels
.
any?
-
issuable
.
labels
.
each
do
|
label
|
-
issuable
.
labels
.
each
do
|
label
|
=
link_to_label
(
label
,
type:
issuable
.
to_ability_name
)
=
link_to_label
(
label
,
type:
issuable
.
to_ability_name
)
-
else
-
else
.light
None
.light
None
.selectbox
.selectbox
.hide-collapsed
=
f
.
collection_select
:label_ids
,
issuable
.
project
.
labels
.
all
,
:id
,
:name
,
=
f
.
collection_select
:label_ids
,
issuable
.
project
.
labels
.
all
,
:id
,
:name
,
{
selected:
issuable
.
label_ids
},
multiple:
true
,
class:
'select2 js-select2'
,
data:
{
placeholder:
"Select labels"
}
{
selected:
issuable
.
label_ids
},
multiple:
true
,
class:
'select2 js-select2'
,
data:
{
placeholder:
"Select labels"
}
...
@@ -101,12 +101,12 @@
...
@@ -101,12 +101,12 @@
.block.light
.block.light
.sidebar-collapsed-icon
.sidebar-collapsed-icon
=
icon
(
'rss'
)
=
icon
(
'rss'
)
.title
.title
.hide-collapsed
%label
.light
Notifications
%label
.light
Notifications
-
subscribtion_status
=
subscribed
?
'subscribed'
:
'unsubscribed'
-
subscribtion_status
=
subscribed
?
'subscribed'
:
'unsubscribed'
%button
.btn.btn-block.btn-gray.subscribe-button
{
:type
=>
'button'
}
%button
.btn.btn-block.btn-gray.subscribe-button
.hide-collapsed
{
:type
=>
'button'
}
%span
=
subscribed
?
'Unsubscribe'
:
'Subscribe'
%span
=
subscribed
?
'Unsubscribe'
:
'Subscribe'
.subscription-status
{
data:
{
status:
subscribtion_status
}}
.subscription-status
.hide-collapsed
{
data:
{
status:
subscribtion_status
}}
.unsubscribed
{
class:
(
'hidden'
if
subscribed
)}
.unsubscribed
{
class:
(
'hidden'
if
subscribed
)}
You're not receiving notifications from this thread.
You're not receiving notifications from this thread.
.subscribed
{
class:
(
'hidden'
unless
subscribed
)}
.subscribed
{
class:
(
'hidden'
unless
subscribed
)}
...
@@ -116,8 +116,7 @@
...
@@ -116,8 +116,7 @@
.block.project-reference
.block.project-reference
.sidebar-collapsed-icon
.sidebar-collapsed-icon
=
clipboard_button
(
clipboard_text:
project_ref
)
=
clipboard_button
(
clipboard_text:
project_ref
)
.title
.cross-project-reference.hide-collapsed
.cross-project-reference
%span
%span
Reference:
Reference:
%cite
{
title:
project_ref
}
%cite
{
title:
project_ref
}
...
...
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