Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
724ea16c
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
724ea16c
编写于
3月 19, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Activities page added. Dashboard few specs. Preparing for 2.3
上级
d87abbe9
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
121 addition
and
72 deletion
+121
-72
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+22
-4
app/assets/stylesheets/main.scss
app/assets/stylesheets/main.scss
+1
-1
app/assets/stylesheets/ui_basic.scss
app/assets/stylesheets/ui_basic.scss
+1
-1
app/controllers/dashboard_controller.rb
app/controllers/dashboard_controller.rb
+5
-0
app/views/dashboard/_events_feed.html.haml
app/views/dashboard/_events_feed.html.haml
+0
-2
app/views/dashboard/_issues_feed.html.haml
app/views/dashboard/_issues_feed.html.haml
+3
-1
app/views/dashboard/_merge_requests_feed.html.haml
app/views/dashboard/_merge_requests_feed.html.haml
+4
-3
app/views/dashboard/_projects_feed.html.haml
app/views/dashboard/_projects_feed.html.haml
+3
-1
app/views/dashboard/activities.html.haml
app/views/dashboard/activities.html.haml
+10
-0
app/views/dashboard/index.html.haml
app/views/dashboard/index.html.haml
+4
-1
app/views/layouts/_app_menu.html.haml
app/views/layouts/_app_menu.html.haml
+2
-1
app/views/profile/password.html.haml
app/views/profile/password.html.haml
+43
-39
app/views/projects/_show.html.haml
app/views/projects/_show.html.haml
+1
-1
app/views/projects/empty.html.haml
app/views/projects/empty.html.haml
+1
-1
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+6
-2
config/routes.rb
config/routes.rb
+1
-0
spec/requests/dashboard_spec.rb
spec/requests/dashboard_spec.rb
+14
-14
未找到文件。
app/assets/stylesheets/common.scss
浏览文件 @
724ea16c
...
...
@@ -3,7 +3,7 @@ a {
color
:
$link_color
;
&
:hover
{
text-decoration
:none
;
color
:
$
style_color
;
color
:
$
blue_link
;
}
&
.btn
{
...
...
@@ -838,12 +838,19 @@ p.time {
width
:
840px
;
margin
:auto
;
.wll
{
padding
:
5px
;
margin-top
:
5px
;
.dash_project_item
{
margin-bottom
:
10px
;
border
:none
;
&
:hover
{
background
:none
;
h4
{
color
:
#2FA0BB
;
.arrow
{
background
:
#2FA0BB
;
color
:
#fff
;
}
}
}
h4
{
...
...
@@ -988,3 +995,14 @@ p.time {
.merge_request_status_holder
{
margin-bottom
:
20px
;
}
.arrow
{
float
:
right
;
background
:
#E3E5EA
;
padding
:
10px
;
border-radius
:
5px
;
text-shadow
:
none
;
color
:
#999
;
line-height
:
16px
;
font-weight
:bold
;
}
app/assets/stylesheets/main.scss
浏览文件 @
724ea16c
...
...
@@ -15,7 +15,7 @@ $app_padding:20px;
$bg_color
:
#FFF
;
$styled_border_color
:
#2FA0BB
;
$color
:
"#4BB8D2"
;
$blue_link
:
"#2fa0bb"
;
$blue_link
:
#2fa0bb
;
/** Style colors **/
...
...
app/assets/stylesheets/ui_basic.scss
浏览文件 @
724ea16c
...
...
@@ -17,7 +17,7 @@
color
:
$link_color
;
&
:hover
{
text-decoration
:none
;
color
:
$
style_color
;
color
:
$
blue_link
;
}
}
...
...
app/controllers/dashboard_controller.rb
浏览文件 @
724ea16c
...
...
@@ -34,4 +34,9 @@ class DashboardController < ApplicationController
format
.
atom
{
render
:layout
=>
false
}
end
end
def
activities
@projects
=
current_user
.
projects
.
all
@events
=
Event
.
where
(
:project_id
=>
@projects
.
map
(
&
:id
)).
recent
.
limit
(
40
)
end
end
app/views/dashboard/_events_feed.html.haml
已删除
100644 → 0
浏览文件 @
d87abbe9
=
render
@events
app/views/dashboard/_issues_feed.html.haml
浏览文件 @
724ea16c
...
...
@@ -3,8 +3,10 @@
=
link_to
[
issue
.
project
,
issue
]
do
%p
%strong
%span
.label
=
issue
.
project
.
name
%span
.
pretty_
label
=
issue
.
project
.
name
–
Issue
#
=
issue
.
id
=
truncate
issue
.
title
,
:length
=>
50
%span
.right.cgray
=
issue
.
updated_at
.
stamp
(
"Aug 21, 2011"
)
app/views/dashboard/_merge_requests_feed.html.haml
浏览文件 @
724ea16c
...
...
@@ -3,8 +3,9 @@
=
link_to
[
merge_request
.
project
,
merge_request
]
do
%p
%strong
%span
.label
=
merge_request
.
project
.
name
%span
.
pretty_
label
=
merge_request
.
project
.
name
–
Merge Request
#
=
merge_request
.
id
Merge Request ##{merge_request.id}
=
truncate
merge_request
.
title
,
:length
=>
50
%span
.right.cgray
=
merge_request
.
updated_at
.
stamp
(
"Aug 21, 2011"
)
app/views/dashboard/_projects_feed.html.haml
浏览文件 @
724ea16c
-
projects
.
first
(
5
).
each
do
|
project
|
.wll
%div
.dash_project_item
=
link_to
project
do
%h4
%span
.ico.project
...
...
@@ -7,3 +7,5 @@
%small
last activity at
=
project
.
last_activity_date
.
stamp
(
"Aug 25, 2011"
)
%span
.right.arrow
→
app/views/dashboard/activities.html.haml
0 → 100644
浏览文件 @
724ea16c
-
if
@events
.
any?
%div
.dashboard_category
%h3
%span
.ico.activities
=
link_to
"Activities"
,
"#activities"
,
:id
=>
"activities"
%hr
=
render
@events
-
else
%h3
Nothing here
app/views/dashboard/index.html.haml
浏览文件 @
724ea16c
...
...
@@ -62,7 +62,10 @@
%h3
%span
.ico.activities
=
link_to
"Activities"
,
"#activities"
,
:id
=>
"activities"
%strong
.right
=
link_to
dashboard_activities_path
do
Visit activities page
→
%hr
.row
.dashboard_block
=
render
"dashboard/events_feed"
.dashboard_block
=
render
@events
app/views/layouts/_app_menu.html.haml
浏览文件 @
724ea16c
%nav
.main_menu
=
render
"layouts/const_menu_links"
=
link_to
"Projects"
,
projects_path
,
:class
=>
"
#{
"current"
if
current_page?
(
projects_path
)
}
"
=
link_to
"
Search"
,
search_path
,
:class
=>
"
#{
"current"
if
current_page?
(
search
_path
)
}
"
=
link_to
"
Activities"
,
dashboard_activities_path
,
:class
=>
"
#{
"current"
if
current_page?
(
dashboard_activities
_path
)
}
"
=
link_to
dashboard_issues_path
,
:class
=>
"
#{
"current"
if
current_page?
(
dashboard_issues_path
)
}
"
,
:id
=>
"issues_slide"
do
Issues
%span
.count
=
current_user
.
assigned_issues
.
opened
.
count
=
link_to
dashboard_merge_requests_path
,
:class
=>
"
#{
"current"
if
current_page?
(
dashboard_merge_requests_path
)
}
"
,
:id
=>
"merge_requests_slide"
do
Requests
%span
.count
=
current_user
.
cared_merge_requests
.
count
=
link_to
"Search"
,
search_path
,
:class
=>
"
#{
"current"
if
current_page?
(
search_path
)
}
"
=
link_to
"Help"
,
help_path
,
:class
=>
"
#{
"current"
if
controller
.
controller_name
==
"help"
}
"
app/views/profile/password.html.haml
浏览文件 @
724ea16c
%h3
Password
%hr
=
form_for
@user
,
:url
=>
profile_password_path
,
:method
=>
:put
do
|
f
|
.data
.alert-message.block-message.warning
%p
After successfull password update you will be redirected to login page where you should login with new password
-
if
@user
.
errors
.
any?
.alert-message.block-message.error
%ul
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.row
.span8
%h3
Password
%hr
=
form_for
@user
,
:url
=>
profile_password_path
,
:method
=>
:put
do
|
f
|
.data
.alert-message.block-message.warning
%p
After successfull password update you will be redirected to login page where you should login with new password
-
if
@user
.
errors
.
any?
.alert-message.block-message.error
%ul
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.clearfix
=
f
.
label
:password
.input
=
f
.
password_field
:password
.clearfix
=
f
.
label
:password_confirmation
.input
=
f
.
password_field
:password_confirmation
.actions
=
f
.
submit
'Save'
,
:class
=>
"btn"
.clearfix
=
f
.
label
:password
.input
=
f
.
password_field
:password
.clearfix
=
f
.
label
:password_confirmation
.input
=
f
.
password_field
:password_confirmation
.actions
=
f
.
submit
'Save'
,
:class
=>
"btn"
%h3
Private token
%span
.cred.right
keep it in secret!
%hr
=
form_for
@user
,
:url
=>
profile_reset_private_token_path
,
:method
=>
:put
do
|
f
|
.data
%p
Private token used to access application resources without authentication.
%p
For example its required to access commits feed.
.span7.right
%h3
Private token
%span
.cred.right
keep it in secret!
%hr
%p
.cgray
-
if
current_user
.
private_token
=
text_field_tag
"token"
,
current_user
.
private_token
-
else
You don`t have one yet. Click generate to fix it.
.actions
-
if
current_user
.
private_token
=
f
.
submit
'Reset'
,
:confirm
=>
"Are you sure?"
,
:class
=>
"btn"
-
else
=
f
.
submit
'Generate'
,
:class
=>
"btn"
=
form_for
@user
,
:url
=>
profile_reset_private_token_path
,
:method
=>
:put
do
|
f
|
.data
.alert-message.block-message.warning
%p
Private token used to access application resources without authentication.
%hr
%p
* required for rss feed
%p
.cgray
-
if
current_user
.
private_token
=
text_field_tag
"token"
,
current_user
.
private_token
-
else
You don`t have one yet. Click generate to fix it.
.actions
-
if
current_user
.
private_token
=
f
.
submit
'Reset'
,
:confirm
=>
"Are you sure?"
,
:class
=>
"btn"
-
else
=
f
.
submit
'Generate'
,
:class
=>
"btn"
app/views/projects/_show.html.haml
浏览文件 @
724ea16c
%h
4
.title
%h
5
.title
=
@project
.
name
%br
%div
...
...
app/views/projects/empty.html.haml
浏览文件 @
724ea16c
...
...
@@ -6,7 +6,7 @@
%li
Visit profile
→
keys and add public key of every machine you want to use for work with gitlabhq.
.alert-message.block-message.error
%ul
.alert_holder
%ul
.
unstyled.
alert_holder
%li
You should push repository to proceed.
%li
After push you will be able to browse code, commits etc.
...
...
app/views/projects/show.html.haml
浏览文件 @
724ea16c
...
...
@@ -21,9 +21,13 @@
=
text_field_tag
:project_clone
,
@project
.
url_to_repo
,
:class
=>
"xlarge one_click_select git_clone_url"
-
if
@project
.
description
.
present?
=
markdown
@project
.
description
.prettyprint
=
markdown
@project
.
description
-
unless
@events
.
blank?
%h5
.cgray
Recent Activity
%br
%h5
.cgray
%span
.ico.activities
Recent Activity
%hr
.content_list
=
render
@events
config/routes.rb
浏览文件 @
724ea16c
...
...
@@ -40,6 +40,7 @@ Gitlab::Application.routes.draw do
get
"dashboard"
,
:to
=>
"dashboard#index"
get
"dashboard/issues"
,
:to
=>
"dashboard#issues"
get
"dashboard/merge_requests"
,
:to
=>
"dashboard#merge_requests"
get
"dashboard/activities"
,
:to
=>
"dashboard#activities"
#get "profile/:id", :to => "profile#show"
...
...
spec/requests/dashboard_spec.rb
浏览文件 @
724ea16c
require
'spec_helper'
__END__
# Disabled for now
describe
"Dashboard"
do
before
do
@project
=
Factory
:project
...
...
@@ -22,19 +20,21 @@ describe "Dashboard" do
end
it
"should have projects panel"
do
within ".project-list" do
page.should have_content(@project.name)
end
page
.
should
have_content
(
@project
.
name
)
end
end
# Temporary disabled cause of travis
# TODO: fix or rewrite
#it "should have news feed" do
#within "#news-feed" do
#page.should have_content("commit")
#page.should have_content(@project.commit.author.name)
#page.should have_content(@project.commit.safe_message)
#end
#end
describe
"GET /dashboard/activities"
do
before
do
visit
dashboard_activities_path
end
it
"should be on dashboard page"
do
current_path
.
should
==
dashboard_activities_path
end
it
"should have projects panel"
do
page
.
should
have_content
(
@project
.
name
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录