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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
755a894c
Commit
755a894c
authored
Mar 22, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issues pagination
parent
1fefd7cb
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
107 additions
and
5 deletions
+107
-5
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+30
-1
app/controllers/issues_controller.rb
app/controllers/issues_controller.rb
+1
-1
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+1
-1
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+1
-1
app/views/issues/_issues.html.haml
app/views/issues/_issues.html.haml
+2
-0
app/views/issues/index.html.haml
app/views/issues/index.html.haml
+0
-1
app/views/kaminari/admin/_first_page.html.haml
app/views/kaminari/admin/_first_page.html.haml
+0
-0
app/views/kaminari/admin/_gap.html.haml
app/views/kaminari/admin/_gap.html.haml
+0
-0
app/views/kaminari/admin/_last_page.html.haml
app/views/kaminari/admin/_last_page.html.haml
+0
-0
app/views/kaminari/admin/_next_page.html.haml
app/views/kaminari/admin/_next_page.html.haml
+0
-0
app/views/kaminari/admin/_page.html.haml
app/views/kaminari/admin/_page.html.haml
+0
-0
app/views/kaminari/admin/_paginator.html.haml
app/views/kaminari/admin/_paginator.html.haml
+0
-0
app/views/kaminari/admin/_prev_page.html.haml
app/views/kaminari/admin/_prev_page.html.haml
+0
-0
app/views/kaminari/gitlab/_first_page.html.haml
app/views/kaminari/gitlab/_first_page.html.haml
+9
-0
app/views/kaminari/gitlab/_gap.html.haml
app/views/kaminari/gitlab/_gap.html.haml
+8
-0
app/views/kaminari/gitlab/_last_page.html.haml
app/views/kaminari/gitlab/_last_page.html.haml
+9
-0
app/views/kaminari/gitlab/_next_page.html.haml
app/views/kaminari/gitlab/_next_page.html.haml
+9
-0
app/views/kaminari/gitlab/_page.html.haml
app/views/kaminari/gitlab/_page.html.haml
+10
-0
app/views/kaminari/gitlab/_paginator.html.haml
app/views/kaminari/gitlab/_paginator.html.haml
+18
-0
app/views/kaminari/gitlab/_prev_page.html.haml
app/views/kaminari/gitlab/_prev_page.html.haml
+9
-0
No files found.
app/assets/stylesheets/common.scss
View file @
755a894c
...
@@ -461,9 +461,28 @@ img.lil_av {
...
@@ -461,9 +461,28 @@ img.lil_av {
border-top
:none
;
border-top
:none
;
form
{
form
{
padding-top
:
16px
;
padding
:
9px
0
;
margin
:
0px
;
}
.pills
{
li
{
padding
:
3px
0
;
&
.active
a
{
background-color
:
$style_color
;
}
a
{
border-radius
:
7px
;
}
}
}
}
}
}
&
.bottom
{
padding
:
0
10px
;
background
:
#f5f5f5
;
border-top
:
1px
solid
#eee
;
@include
round-borders-bottom
(
4px
);
border-bottom
:none
;
}
&
.padded
{
&
.padded
{
h5
,
.title
{
h5
,
.title
{
...
@@ -1008,3 +1027,13 @@ p.time {
...
@@ -1008,3 +1027,13 @@ p.time {
.thin_area
{
.thin_area
{
height
:
150px
;
height
:
150px
;
}
}
.gitlab_pagination
{
span
{
padding
:
0
10px
;
a
{
color
:
$link_color
;
}
}
}
app/controllers/issues_controller.rb
View file @
755a894c
...
@@ -28,7 +28,7 @@ class IssuesController < ApplicationController
...
@@ -28,7 +28,7 @@ class IssuesController < ApplicationController
when
2
then
@project
.
issues
.
closed
when
2
then
@project
.
issues
.
closed
when
3
then
@project
.
issues
.
opened
.
assigned
(
current_user
)
when
3
then
@project
.
issues
.
opened
.
assigned
(
current_user
)
else
@project
.
issues
.
opened
else
@project
.
issues
.
opened
end
end
.
page
(
params
[
:page
]).
per
(
10
)
@issues
=
@issues
.
includes
(
:author
,
:project
)
@issues
=
@issues
.
includes
(
:author
,
:project
)
...
...
app/views/admin/projects/index.html.haml
View file @
755a894c
...
@@ -19,4 +19,4 @@
...
@@ -19,4 +19,4 @@
%td
=
last_commit
(
project
)
%td
=
last_commit
(
project
)
%td
=
link_to
'Edit'
,
edit_admin_project_path
(
project
),
:id
=>
"edit_
#{
dom_id
(
project
)
}
"
,
:class
=>
"btn small"
%td
=
link_to
'Edit'
,
edit_admin_project_path
(
project
),
:id
=>
"edit_
#{
dom_id
(
project
)
}
"
,
:class
=>
"btn small"
%td
=
link_to
'Destroy'
,
[
:admin
,
project
],
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"btn small danger"
%td
=
link_to
'Destroy'
,
[
:admin
,
project
],
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"btn small danger"
=
paginate
@admin_projects
=
paginate
@admin_projects
,
:theme
=>
"admin"
app/views/admin/users/index.html.haml
View file @
755a894c
...
@@ -20,4 +20,4 @@
...
@@ -20,4 +20,4 @@
%td
=
link_to
'Edit'
,
edit_admin_user_path
(
user
),
:id
=>
"edit_
#{
dom_id
(
user
)
}
"
,
:class
=>
"btn small"
%td
=
link_to
'Edit'
,
edit_admin_user_path
(
user
),
:id
=>
"edit_
#{
dom_id
(
user
)
}
"
,
:class
=>
"btn small"
%td
=
link_to
'Destroy'
,
[
:admin
,
user
],
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"btn small danger"
%td
=
link_to
'Destroy'
,
[
:admin
,
user
],
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"btn small danger"
=
paginate
@admin_users
=
paginate
@admin_users
,
:theme
=>
"admin"
app/views/issues/_issues.html.haml
View file @
755a894c
...
@@ -3,3 +3,5 @@
...
@@ -3,3 +3,5 @@
-
@issues
.
non_critical
.
each
do
|
issue
|
-
@issues
.
non_critical
.
each
do
|
issue
|
=
render
(
:partial
=>
'issues/show'
,
:locals
=>
{
:issue
=>
issue
})
=
render
(
:partial
=>
'issues/show'
,
:locals
=>
{
:issue
=>
issue
})
%li
=
paginate
@issues
,
:remote
=>
true
,
:theme
=>
"gitlab"
app/views/issues/index.html.haml
View file @
755a894c
...
@@ -38,7 +38,6 @@
...
@@ -38,7 +38,6 @@
-
if
@issues
.
blank?
-
if
@issues
.
blank?
%li
%li
%p
.padded
Nothing to show here
%p
.padded
Nothing to show here
:javascript
:javascript
var
href
=
$
(
'
.issue_search
'
).
parent
().
attr
(
'
action
'
);
var
href
=
$
(
'
.issue_search
'
).
parent
().
attr
(
'
action
'
);
var
last_terms
=
''
;
var
last_terms
=
''
;
...
...
app/views/kaminari/_first_page.html.haml
→
app/views/kaminari/
admin/
_first_page.html.haml
View file @
755a894c
File moved
app/views/kaminari/_gap.html.haml
→
app/views/kaminari/
admin/
_gap.html.haml
View file @
755a894c
File moved
app/views/kaminari/_last_page.html.haml
→
app/views/kaminari/
admin/
_last_page.html.haml
View file @
755a894c
File moved
app/views/kaminari/_next_page.html.haml
→
app/views/kaminari/
admin/
_next_page.html.haml
View file @
755a894c
File moved
app/views/kaminari/_page.html.haml
→
app/views/kaminari/
admin/
_page.html.haml
View file @
755a894c
File moved
app/views/kaminari/_paginator.html.haml
→
app/views/kaminari/
admin/
_paginator.html.haml
View file @
755a894c
File moved
app/views/kaminari/_prev_page.html.haml
→
app/views/kaminari/
admin/
_prev_page.html.haml
View file @
755a894c
File moved
app/views/kaminari/gitlab/_first_page.html.haml
0 → 100644
View file @
755a894c
-# Link to the "First" page
-# available local variables
-# url: url to the first page
-# current_page: a page object for the currently displayed page
-# num_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
%span
.first
=
link_to_unless
current_page
.
first?
,
raw
(
t
'views.pagination.first'
),
url
,
:remote
=>
remote
app/views/kaminari/gitlab/_gap.html.haml
0 → 100644
View file @
755a894c
-# Non-link tag that stands for skipped pages...
-# available local variables
-# current_page: a page object for the currently displayed page
-# num_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
%span
.page.gap
=
raw
(
t
'views.pagination.truncate'
)
app/views/kaminari/gitlab/_last_page.html.haml
0 → 100644
View file @
755a894c
-# Link to the "Last" page
-# available local variables
-# url: url to the last page
-# current_page: a page object for the currently displayed page
-# num_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
%span
.last
=
link_to_unless
current_page
.
last?
,
raw
(
t
'views.pagination.last'
),
url
,
{
:remote
=>
remote
}
app/views/kaminari/gitlab/_next_page.html.haml
0 → 100644
View file @
755a894c
-# Link to the "Next" page
-# available local variables
-# url: url to the next page
-# current_page: a page object for the currently displayed page
-# num_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
%span
.next
=
link_to_unless
current_page
.
last?
,
raw
(
t
'views.pagination.next'
),
url
,
:rel
=>
'next'
,
:remote
=>
remote
app/views/kaminari/gitlab/_page.html.haml
0 → 100644
View file @
755a894c
-# Link showing page number
-# available local variables
-# page: a page object for "this" page
-# url: url to this page
-# current_page: a page object for the currently displayed page
-# num_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
%span
{
:class
=>
"page#{' current' if page.current?}"
}
=
link_to_unless
page
.
current?
,
page
,
url
,
{
:remote
=>
remote
,
:rel
=>
page
.
next?
?
'next'
:
page
.
prev?
?
'prev'
:
nil
}
app/views/kaminari/gitlab/_paginator.html.haml
0 → 100644
View file @
755a894c
-# The container tag
-# available local variables
-# current_page: a page object for the currently displayed page
-# num_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
-# paginator: the paginator that renders the pagination tags inside
=
paginator
.
render
do
%nav
.gitlab_pagination
-#= first_page_tag unless current_page.first?
=
prev_page_tag
-
each_page
do
|
page
|
-
if
page
.
left_outer?
||
page
.
right_outer?
||
page
.
inside_window?
=
page_tag
page
-
elsif
!
page
.
was_truncated?
=
gap_tag
=
next_page_tag
-#= last_page_tag unless current_page.last?
app/views/kaminari/gitlab/_prev_page.html.haml
0 → 100644
View file @
755a894c
-# Link to the "Previous" page
-# available local variables
-# url: url to the previous page
-# current_page: a page object for the currently displayed page
-# num_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
%span
.prev
=
link_to_unless
current_page
.
first?
,
raw
(
t
'views.pagination.previous'
),
url
,
:rel
=>
'prev'
,
:remote
=>
remote
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