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
Boxiang Sun
gitlab-ce
Commits
f64e3506
Commit
f64e3506
authored
Jan 27, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add js to expand and contract side menu
parent
ee89e9c8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
14 deletions
+39
-14
app/assets/javascripts/application.js.coffee
app/assets/javascripts/application.js.coffee
+21
-0
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+9
-4
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+3
-3
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+6
-7
No files found.
app/assets/javascripts/application.js.coffee
View file @
f64e3506
...
@@ -212,4 +212,25 @@ $ ->
...
@@ -212,4 +212,25 @@ $ ->
$this
=
$
(
this
)
$this
=
$
(
this
)
$this
.
attr
'value'
,
$this
.
val
()
$this
.
attr
'value'
,
$this
.
val
()
$
(
'.right-sidebar'
).
on
'click'
,
'.gutter-toggle'
,
(
e
)
->
e
.
preventDefault
()
$this
=
$
(
this
)
$thisIcon
=
$this
.
find
'i'
if
$thisIcon
.
hasClass
(
'fa-angle-double-right'
)
$thisIcon
.
removeClass
(
'fa-angle-double-right'
)
.
addClass
(
'fa-angle-double-left'
)
$this
.
closest
(
'aside'
)
.
removeClass
(
'right-sidebar-expanded'
)
.
addClass
(
'right-sidebar-collapsed'
)
else
$thisIcon
.
removeClass
(
'fa-angle-double-left'
)
.
addClass
(
'fa-angle-double-right'
)
$this
.
closest
(
'aside'
)
.
removeClass
(
'right-sidebar-collapsed'
)
.
addClass
(
'right-sidebar-expanded'
)
console
.
log
(
'collapse'
)
new
Aside
()
new
Aside
()
app/assets/stylesheets/pages/issuable.scss
View file @
f64e3506
...
@@ -42,8 +42,6 @@
...
@@ -42,8 +42,6 @@
.issuable-details
{
.issuable-details
{
section
{
section
{
border-right
:
1px
solid
$border-white-light
;
.issuable-discussion
{
.issuable-discussion
{
margin-right
:
1px
;
margin-right
:
1px
;
}
}
...
@@ -92,7 +90,7 @@
...
@@ -92,7 +90,7 @@
}
}
.gutter-
collaps
e
{
.gutter-
toggl
e
{
margin-left
:
10px
;
margin-left
:
10px
;
border-left
:
1px
solid
#F0F0F0
;
border-left
:
1px
solid
#F0F0F0
;
padding-left
:
10px
;
padding-left
:
10px
;
...
@@ -162,9 +160,16 @@
...
@@ -162,9 +160,16 @@
transition-duration
:
.3s
;
transition-duration
:
.3s
;
background
:
$gray-light
;
background
:
$gray-light
;
overflow
:
scroll
;
overflow
:
scroll
;
width
:
$gutter_width
;
padding
:
10px
20px
;
padding
:
10px
20px
;
&
.right-sidebar-expanded
{
width
:
$gutter_width
;
}
&
.right-sidebar-collapsed
{
width
:
$sidebar_collapsed_width
;
}
.btn
{
.btn
{
background
:
$gray-normal
;
background
:
$gray-normal
;
border
:
1px
solid
$gray-darkest
;
border
:
1px
solid
$gray-darkest
;
...
...
app/helpers/application_helper.rb
View file @
f64e3506
...
@@ -303,7 +303,7 @@ module ApplicationHelper
...
@@ -303,7 +303,7 @@ module ApplicationHelper
end
end
end
end
def
next_issuable_for
(
project
)
def
next_issuable_for
(
project
,
id
)
if
project
.
nil?
if
project
.
nil?
nil
nil
elsif
current_controller?
(
:issues
)
elsif
current_controller?
(
:issues
)
...
@@ -313,13 +313,13 @@ module ApplicationHelper
...
@@ -313,13 +313,13 @@ module ApplicationHelper
end
end
end
end
def
prev_issuable_for
(
project
)
def
prev_issuable_for
(
project
,
id
)
if
project
.
nil?
if
project
.
nil?
nil
nil
elsif
current_controller?
(
:issues
)
elsif
current_controller?
(
:issues
)
project
.
issues
.
where
(
"id < ?"
,
id
).
last
project
.
issues
.
where
(
"id < ?"
,
id
).
last
elsif
current_controller?
(
:merge_requests
)
elsif
current_controller?
(
:merge_requests
)
project
.
merge_requests
.
where
(
"id
>
?"
,
id
).
last
project
.
merge_requests
.
where
(
"id
<
?"
,
id
).
last
end
end
end
end
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
f64e3506
%aside
.right-sidebar
%aside
.right-sidebar
.right-sidebar-expanded
.issuable-sidebar
.issuable-sidebar
.block
.block
%span
.issuable-count.pull-left
%span
.issuable-count.pull-left
=
issuable
.
iid
=
issuable
.
iid
of
of
=
issuable_count
(
:all
,
@project
)
=
issuable_count
(
:all
,
@project
)
%span
.gutter-collapse.pull-right
%span
.pull-right
=
icon
(
'angle-double-right'
)
%a
.gutter-toggle
{
href:
'#'
}
=
icon
(
'angle-double-right'
)
.issuable-nav.pull-right.btn-group
{
role:
'group'
,
"aria-label"
=>
'...'
}
.issuable-nav.pull-right.btn-group
{
role:
'group'
,
"aria-label"
=>
'...'
}
%a
.btn.btn-default
{
href:
'#'
}
=
link_to
'Prev'
,
namespace_project_issue_path
(
namespace_id:
@project
,
id:
prev_issuable_for
(
@project
,
issuable
.
id
)),
class:
'btn btn-default'
Prev
=
link_to
'Next'
,
namespace_project_issue_path
(
namespace_id:
@project
,
id:
next_issuable_for
(
@project
,
issuable
.
id
)),
class:
'btn btn-default'
%a
.btn.btn-default
{
href:
'#'
}
Next
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
issuable
],
remote:
true
,
html:
{
class:
'issuable-context-form inline-update js-issuable-update'
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
issuable
],
remote:
true
,
html:
{
class:
'issuable-context-form inline-update js-issuable-update'
}
do
|
f
|
.block.assignee
.block.assignee
...
...
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