Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
cf8b3692
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,发现更多精彩内容 >>
提交
cf8b3692
编写于
11月 29, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2105 from jouve/improve_admin_views
Improve admin section
上级
a0aa0212
e0a9ffcd
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
38 addition
and
33 deletion
+38
-33
app/views/admin/dashboard/index.html.haml
app/views/admin/dashboard/index.html.haml
+25
-22
app/views/admin/groups/index.html.haml
app/views/admin/groups/index.html.haml
+0
-1
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+0
-1
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+0
-1
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+0
-1
app/views/admin/shared/_projects_head.html.haml
app/views/admin/shared/_projects_head.html.haml
+0
-5
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+1
-1
app/views/layouts/admin.html.haml
app/views/layouts/admin.html.haml
+3
-1
features/admin/active_tab.feature
features/admin/active_tab.feature
+5
-0
features/steps/admin/admin_active_tab.rb
features/steps/admin/admin_active_tab.rb
+4
-0
未找到文件。
app/views/admin/dashboard/index.html.haml
浏览文件 @
cf8b3692
.admin_dash.row
.span4
.span3
.ui-box
%h5
Projects
.data.padded
=
link_to
admin_projects_path
do
%h1
=
Project
.
count
%hr
=
link_to
'New Project'
,
new_project_path
,
class:
"btn small"
.span3
.ui-box
%h5
Groups
.data.padded
=
link_to
admin_groups_path
do
%h1
=
Group
.
count
%hr
=
link_to
'New Group'
,
new_admin_group_path
,
class:
"btn small"
.span3
.ui-box
%h5
Users
.data.padded
=
link_to
admin_users_path
do
%h1
=
User
.
count
%hr
=
link_to
'New User'
,
new_admin_user_path
,
class:
"btn small"
.span3
.ui-box
%h5
Resque Workers
...
...
@@ -19,27 +43,6 @@
%p
%strong
Resque status unknown
.span4
.ui-box
%h5
Projects
.data.padded
=
link_to
admin_projects_path
do
%h1
=
Project
.
count
%hr
=
link_to
'New Project'
,
new_project_path
,
class:
"btn small"
=
link_to
'New Group'
,
new_admin_group_path
,
class:
"btn small"
.span4
.ui-box
%h5
Users
.data.padded
=
link_to
admin_users_path
do
%h1
=
User
.
count
%hr
=
link_to
'New User'
,
new_admin_user_path
,
class:
"btn small"
.row
.span6
%h3
Latest projects
...
...
app/views/admin/groups/index.html.haml
浏览文件 @
cf8b3692
=
render
'admin/shared/projects_head'
%h3
.page_title
Groups
%small
...
...
app/views/admin/groups/show.html.haml
浏览文件 @
cf8b3692
=
render
'admin/shared/projects_head'
%h3
.page_title
Group:
#{
@group
.
name
}
=
link_to
edit_admin_group_path
(
@group
),
class:
"btn right"
do
...
...
app/views/admin/projects/index.html.haml
浏览文件 @
cf8b3692
=
render
'admin/shared/projects_head'
%h3
.page_title
Projects
=
link_to
'New Project'
,
new_project_path
,
class:
"btn small right"
...
...
app/views/admin/projects/show.html.haml
浏览文件 @
cf8b3692
=
render
'admin/shared/projects_head'
%h3
.page_title
Project:
#{
@project
.
name_with_namespace
}
=
link_to
edit_admin_project_path
(
@project
),
class:
"btn right"
do
...
...
app/views/admin/shared/_projects_head.html.haml
已删除
100644 → 0
浏览文件 @
a0aa0212
%ul
.nav.nav-tabs
=
nav_link
(
controller: :projects
)
do
=
link_to
'Projects'
,
admin_projects_path
,
class:
"tab"
=
nav_link
(
controller: :groups
)
do
=
link_to
'Groups'
,
admin_groups_path
,
class:
"tab"
app/views/layouts/_head_panel.html.haml
浏览文件 @
cf8b3692
...
...
@@ -18,7 +18,7 @@
%li
=
link_to
profile_path
,
title:
"Your Profile"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'Your profile'
do
%i
.icon-user
%
span
.separator
%
li
.separator
%li
=
render
"layouts/search"
%li
...
...
app/views/layouts/admin.html.haml
浏览文件 @
cf8b3692
...
...
@@ -8,8 +8,10 @@
%ul
.main_menu
=
nav_link
(
controller: :dashboard
,
html_options:
{
class:
'home'
})
do
=
link_to
"Stats"
,
admin_root_path
=
nav_link
(
controller:
[
:projects
,
:groups
]
)
do
=
nav_link
(
controller:
:projects
)
do
=
link_to
"Projects"
,
admin_projects_path
=
nav_link
(
controller: :groups
)
do
=
link_to
"Groups"
,
admin_groups_path
=
nav_link
(
controller: :users
)
do
=
link_to
"Users"
,
admin_users_path
=
nav_link
(
controller: :logs
)
do
...
...
features/admin/active_tab.feature
浏览文件 @
cf8b3692
...
...
@@ -12,6 +12,11 @@ Feature: Admin active tab
Then
the active main tab should be Projects
And
no other main tabs should be active
Scenario
:
On Admin Groups
Given
I visit admin groups page
Then
the active main tab should be Groups
And
no other main tabs should be active
Scenario
:
On Admin Users
Given
I visit admin users page
Then
the active main tab should be Users
...
...
features/steps/admin/admin_active_tab.rb
浏览文件 @
cf8b3692
...
...
@@ -11,6 +11,10 @@ class AdminActiveTab < Spinach::FeatureSteps
ensure_active_main_tab
(
'Projects'
)
end
Then
'the active main tab should be Groups'
do
ensure_active_main_tab
(
'Groups'
)
end
Then
'the active main tab should be Users'
do
ensure_active_main_tab
(
'Users'
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录