BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
a69fc5dd
Commit
a69fc5dd
authored
Jul 21, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Endless event loading for dsahboard
parent
860fa116
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
8 deletions
+10
-8
header.scss
app/assets/stylesheets/header.scss
+0
-3
ui_mars.scss
app/assets/stylesheets/themes/ui_mars.scss
+1
-2
dashboard_controller.rb
app/controllers/dashboard_controller.rb
+2
-1
index.html.haml
app/views/dashboard/index.html.haml
+6
-1
index.js.haml
app/views/dashboard/index.js.haml
+1
-1
No files found.
app/assets/stylesheets/header.scss
View file @
a69fc5dd
...
...
@@ -125,9 +125,6 @@ header {
display
:
block
;
cursor
:
pointer
;
img
{
-moz-box-shadow
:
0
0
5px
#ccc
;
-webkit-box-shadow
:
0
0
5px
#ccc
;
box-shadow
:
0
0
5px
#ccc
;
border-radius
:
4px
;
right
:
5px
;
position
:
absolute
;
...
...
app/assets/stylesheets/themes/ui_mars.scss
View file @
a69fc5dd
...
...
@@ -70,8 +70,7 @@
}
}
.separator
{
border-color
:
#444
;
background
:
#31363E
;
display
:none
;
}
}
...
...
app/controllers/dashboard_controller.rb
View file @
a69fc5dd
...
...
@@ -3,11 +3,12 @@ class DashboardController < ApplicationController
def
index
@projects
=
current_user
.
projects_with_events
.
page
(
params
[
:page
]).
per
(
40
)
@events
=
Event
.
recent_for_user
(
current_user
).
limit
(
20
)
@events
=
Event
.
recent_for_user
(
current_user
).
limit
(
20
)
.
offset
(
params
[
:offset
]
||
0
)
@last_push
=
current_user
.
recent_push
respond_to
do
|
format
|
format
.
html
format
.
js
format
.
atom
{
render
:layout
=>
false
}
end
end
...
...
app/views/dashboard/index.html.haml
View file @
a69fc5dd
...
...
@@ -10,9 +10,10 @@
add new key
to your profile
-
if
@events
.
any?
=
render
@events
.content_list
=
render
@events
-
else
%h4
.nothing_here_message
Projects activity will be displayed here
.loading.hide
.side
=
render
"events/event_last_push"
,
:event
=>
@last_push
.projects_box
...
...
@@ -54,3 +55,7 @@
New Project »
-
else
If you will be added to project - it will be displayed here
:javascript
$
(
function
(){
Pager
.
init
(
20
);
});
app/views/dashboard/index.js.haml
View file @
a69fc5dd
:plain
$(".projects .activities").append(
"
#{
escape_javascript
(
render
(
@events
))
}
");
Pager.append(
#{
@events
.
count
}
,
"
#{
escape_javascript
(
render
(
@events
))
}
");
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