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
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
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
8 deletions
+10
-8
app/assets/stylesheets/header.scss
app/assets/stylesheets/header.scss
+0
-3
app/assets/stylesheets/themes/ui_mars.scss
app/assets/stylesheets/themes/ui_mars.scss
+1
-2
app/controllers/dashboard_controller.rb
app/controllers/dashboard_controller.rb
+2
-1
app/views/dashboard/index.html.haml
app/views/dashboard/index.html.haml
+6
-1
app/views/dashboard/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 {
...
@@ -125,9 +125,6 @@ header {
display
:
block
;
display
:
block
;
cursor
:
pointer
;
cursor
:
pointer
;
img
{
img
{
-moz-box-shadow
:
0
0
5px
#ccc
;
-webkit-box-shadow
:
0
0
5px
#ccc
;
box-shadow
:
0
0
5px
#ccc
;
border-radius
:
4px
;
border-radius
:
4px
;
right
:
5px
;
right
:
5px
;
position
:
absolute
;
position
:
absolute
;
...
...
app/assets/stylesheets/themes/ui_mars.scss
View file @
a69fc5dd
...
@@ -70,8 +70,7 @@
...
@@ -70,8 +70,7 @@
}
}
}
}
.separator
{
.separator
{
border-color
:
#444
;
display
:none
;
background
:
#31363E
;
}
}
}
}
...
...
app/controllers/dashboard_controller.rb
View file @
a69fc5dd
...
@@ -3,11 +3,12 @@ class DashboardController < ApplicationController
...
@@ -3,11 +3,12 @@ class DashboardController < ApplicationController
def
index
def
index
@projects
=
current_user
.
projects_with_events
.
page
(
params
[
:page
]).
per
(
40
)
@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
@last_push
=
current_user
.
recent_push
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
format
.
js
format
.
atom
{
render
:layout
=>
false
}
format
.
atom
{
render
:layout
=>
false
}
end
end
end
end
...
...
app/views/dashboard/index.html.haml
View file @
a69fc5dd
...
@@ -10,9 +10,10 @@
...
@@ -10,9 +10,10 @@
add new key
add new key
to your profile
to your profile
-
if
@events
.
any?
-
if
@events
.
any?
=
render
@events
.content_list
=
render
@events
-
else
-
else
%h4
.nothing_here_message
Projects activity will be displayed here
%h4
.nothing_here_message
Projects activity will be displayed here
.loading.hide
.side
.side
=
render
"events/event_last_push"
,
:event
=>
@last_push
=
render
"events/event_last_push"
,
:event
=>
@last_push
.projects_box
.projects_box
...
@@ -54,3 +55,7 @@
...
@@ -54,3 +55,7 @@
New Project »
New Project »
-
else
-
else
If you will be added to project - it will be displayed here
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
: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