Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6c791f7d
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,发现更多精彩内容 >>
未验证
提交
6c791f7d
编写于
3月 14, 2016
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Redesign project tabs on group page
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
d324bf84
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
27 addition
and
42 deletion
+27
-42
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+4
-0
app/views/groups/_projects.html.haml
app/views/groups/_projects.html.haml
+1
-12
app/views/groups/_shared_projects.html.haml
app/views/groups/_shared_projects.html.haml
+1
-18
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+21
-12
未找到文件。
app/assets/stylesheets/framework/blocks.scss
浏览文件 @
6c791f7d
...
@@ -120,6 +120,10 @@
...
@@ -120,6 +120,10 @@
.cover-desc
{
.cover-desc
{
padding
:
0
$gl-padding
3px
;
padding
:
0
$gl-padding
3px
;
color
:
$gl-text-color
;
color
:
$gl-text-color
;
&
.username
:last-child
{
padding-bottom
:
$gl-padding
;
}
}
}
.cover-controls
{
.cover-controls
{
...
...
app/views/groups/_projects.html.haml
浏览文件 @
6c791f7d
.top-area
=
render
'shared/projects/list'
,
projects:
projects
,
stars:
false
,
skip_namespace:
true
.nav-controls
=
form_tag
request
.
original_url
,
method: :get
,
class:
'project-filter-form'
,
id:
'project-filter-form'
do
|
f
|
-
if
@projects
.
present?
=
search_field_tag
:filter_projects
,
nil
,
placeholder:
'Filter by name'
,
class:
'projects-list-filter form-control'
,
spellcheck:
false
=
render
'shared/projects/dropdown'
-
if
can?
current_user
,
:create_projects
,
@group
=
link_to
new_project_path
(
namespace_id:
@group
.
id
),
class:
'btn btn-new pull-right'
do
=
icon
(
'plus'
)
New Project
=
render
'shared/projects/list'
,
projects:
@projects
,
stars:
false
,
skip_namespace:
true
app/views/groups/_shared_projects.html.haml
浏览文件 @
6c791f7d
-
if
projects
.
present?
=
render
'shared/projects/list'
,
projects:
projects
,
stars:
false
,
skip_namespace:
false
.panel.panel-default
.panel-heading
Projects shared with
%strong
#{
@group
.
name
}
(
#{
projects
.
count
}
)
%ul
.well-list
-
projects
.
each
do
|
project
|
%li
.project-row
=
link_to
namespace_project_path
(
project
.
namespace
,
project
),
class:
dom_class
(
project
)
do
%span
.namespace-name
-
if
project
.
namespace
=
project
.
namespace
.
human_name
\/
%span
.project-name
=
truncate
(
project
.
name
,
length:
25
)
%span
.arrow
%i
.icon-angle-right
app/views/groups/show.html.haml
浏览文件 @
6c791f7d
...
@@ -27,22 +27,31 @@
...
@@ -27,22 +27,31 @@
.cover-desc.description
.cover-desc.description
=
markdown
(
@group
.
description
,
pipeline: :description
)
=
markdown
(
@group
.
description
,
pipeline: :description
)
-
if
can?
(
current_user
,
:read_group
,
@group
)
%div
{
class:
container_class
}
.top-area
%ul
.nav-links
%ul
.nav-links
%li
.active
%li
.active
=
link_to
"#projects"
,
'data-toggle'
=>
'tab'
do
=
link_to
"#projects"
,
'data-toggle'
=>
'tab'
do
Projects
All
Projects
-
if
@shared_projects
.
present?
-
if
@shared_projects
.
present?
%li
%li
=
link_to
"#shared"
,
'data-toggle'
=>
'tab'
do
=
link_to
"#shared"
,
'data-toggle'
=>
'tab'
do
Shared Projects
Shared Projects
.nav-controls
=
form_tag
request
.
original_url
,
method: :get
,
class:
'project-filter-form'
,
id:
'project-filter-form'
do
|
f
|
=
search_field_tag
:filter_projects
,
nil
,
placeholder:
'Filter by name'
,
class:
'projects-list-filter form-control'
,
spellcheck:
false
=
render
'shared/projects/dropdown'
-
if
can?
current_user
,
:create_projects
,
@group
=
link_to
new_project_path
(
namespace_id:
@group
.
id
),
class:
'btn btn-new pull-right'
do
=
icon
(
'plus'
)
New Project
-
if
can?
(
current_user
,
:read_group
,
@group
)
%div
{
class:
container_class
}
.tab-content
.tab-content
.tab-pane.active
#projects
.tab-pane.active
#projects
=
render
"projects"
,
projects:
@projects
=
render
"projects"
,
projects:
@projects
-
if
@shared_projects
.
present?
.tab-pane
#shared
.tab-pane
#shared
=
render
"shared_projects"
,
projects:
@shared_projects
=
render
"shared_projects"
,
projects:
@shared_projects
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录