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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
6c791f7d
Commit
6c791f7d
authored
Mar 14, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Redesign project tabs on group page
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
d324bf84
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
42 deletions
+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
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
6c791f7d
...
...
@@ -120,6 +120,10 @@
.cover-desc
{
padding
:
0
$gl-padding
3px
;
color
:
$gl-text-color
;
&
.username
:last-child
{
padding-bottom
:
$gl-padding
;
}
}
.cover-controls
{
...
...
app/views/groups/_projects.html.haml
View file @
6c791f7d
.top-area
.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
=
render
'shared/projects/list'
,
projects:
projects
,
stars:
false
,
skip_namespace:
true
app/views/groups/_shared_projects.html.haml
View file @
6c791f7d
-
if
projects
.
present?
.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
=
render
'shared/projects/list'
,
projects:
projects
,
stars:
false
,
skip_namespace:
false
app/views/groups/show.html.haml
View file @
6c791f7d
...
...
@@ -27,24 +27,33 @@
.cover-desc.description
=
markdown
(
@group
.
description
,
pipeline: :description
)
%ul
.nav-links
%li
.active
=
link_to
"#projects"
,
'data-toggle'
=>
'tab'
do
Projects
-
if
@shared_projects
.
present?
%li
=
link_to
"#shared"
,
'data-toggle'
=>
'tab'
do
Shared Projects
-
if
can?
(
current_user
,
:read_group
,
@group
)
%div
{
class:
container_class
}
.top-area
%ul
.nav-links
%li
.active
=
link_to
"#projects"
,
'data-toggle'
=>
'tab'
do
All Projects
-
if
@shared_projects
.
present?
%li
=
link_to
"#shared"
,
'data-toggle'
=>
'tab'
do
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
.tab-content
.tab-pane.active
#projects
=
render
"projects"
,
projects:
@projects
.tab-pane
#shared
=
render
"shared_projects"
,
projects:
@shared_projects
-
if
@shared_projects
.
present?
.tab-pane
#shared
=
render
"shared_projects"
,
projects:
@shared_projects
-
else
%p
.nav-links.no-top
...
...
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