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
Léo-Paul Géneau
gitlab-ce
Commits
89df4a79
Commit
89df4a79
authored
Sep 03, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New UI for explore groups and trending pages
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
0195b085
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
+6
-8
app/views/explore/groups/index.html.haml
app/views/explore/groups/index.html.haml
+3
-3
app/views/explore/projects/trending.html.haml
app/views/explore/projects/trending.html.haml
+2
-2
app/views/shared/groups/_group.html.haml
app/views/shared/groups/_group.html.haml
+1
-3
No files found.
app/views/explore/groups/index.html.haml
View file @
89df4a79
-
page_title
"Groups"
-
page_title
"Groups"
-
if
current_user
-
if
current_user
=
render
'dashboard/groups_head'
=
render
'dashboard/groups_head'
.
clearfix.append-bottom-10
.
gray-content-block.clearfix
.pull-left
.pull-left
=
form_tag
explore_groups_path
,
method: :get
,
class:
'form-inline form-tiny'
do
|
f
|
=
form_tag
explore_groups_path
,
method: :get
,
class:
'form-inline form-tiny'
do
|
f
|
=
hidden_field_tag
:sort
,
@sort
=
hidden_field_tag
:sort
,
@sort
.form-group
.form-group
=
search_field_tag
:search
,
params
[
:search
],
placeholder:
"Filter by name"
,
class:
"form-control search-text-input"
,
id:
"groups_search"
=
search_field_tag
:search
,
params
[
:search
],
placeholder:
"Filter by name"
,
class:
"form-control search-text-input"
,
id:
"groups_search"
.form-group
.form-group
=
button_tag
'Search'
,
class:
"btn btn-
primary wide
"
=
button_tag
'Search'
,
class:
"btn btn-
default
"
.pull-right
.pull-right
.dropdown.inline
.dropdown.inline
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
=
link_to
explore_groups_path
(
sort:
sort_value_oldest_updated
)
do
=
link_to
explore_groups_path
(
sort:
sort_value_oldest_updated
)
do
=
sort_title_oldest_updated
=
sort_title_oldest_updated
%ul
.
bordered
-list
%ul
.
content
-list
-
@groups
.
each
do
|
group
|
-
@groups
.
each
do
|
group
|
=
render
'shared/groups/group'
,
group:
group
=
render
'shared/groups/group'
,
group:
group
-
unless
@groups
.
present?
-
unless
@groups
.
present?
...
...
app/views/explore/projects/trending.html.haml
View file @
89df4a79
-
page_title
"Trending Projects"
-
page_title
"Trending Projects"
-
if
current_user
-
if
current_user
=
render
'dashboard/projects_head'
=
render
'dashboard/projects_head'
.explore-title
.gray-content-block.explore-title
%h3
%h3
Explore GitLab
Explore GitLab
%p
.lead
%p
.lead
Discover projects and groups. Share your projects with others
Discover projects and groups. Share your projects with others
%hr
.explore-trending-block
.explore-trending-block
.lead
.lead
%i
.fa.fa-comments-o
%i
.fa.fa-comments-o
...
...
app/views/shared/groups/_group.html.haml
View file @
89df4a79
...
@@ -5,11 +5,9 @@
...
@@ -5,11 +5,9 @@
-
if
can?
(
current_user
,
:admin_group
,
group
)
-
if
can?
(
current_user
,
:admin_group
,
group
)
=
link_to
edit_group_path
(
group
),
class:
"btn-sm btn btn-grouped"
do
=
link_to
edit_group_path
(
group
),
class:
"btn-sm btn btn-grouped"
do
%i
.fa.fa-cogs
%i
.fa.fa-cogs
Settings
=
link_to
leave_group_group_members_path
(
group
),
data:
{
confirm:
leave_group_message
(
group
.
name
)
},
method: :delete
,
class:
"btn-sm btn btn-grouped"
,
title:
'Leave this group'
do
=
link_to
leave_group_group_members_path
(
group
),
data:
{
confirm:
leave_group_message
(
group
.
name
)
},
method: :delete
,
class:
"btn-sm btn btn-grouped"
,
title:
'Leave this group'
do
%i
.fa.fa-sign-out
%i
.fa.fa-sign-out
Leave
=
image_tag
group_icon
(
group
),
class:
"avatar s48 hidden-xs"
=
image_tag
group_icon
(
group
),
class:
"avatar s48 hidden-xs"
=
link_to
group
,
class:
'group-name'
do
=
link_to
group
,
class:
'group-name'
do
...
@@ -17,7 +15,7 @@
...
@@ -17,7 +15,7 @@
-
if
group_member
-
if
group_member
as
as
%s
trong
#{
group_member
.
human_access
}
%s
pan
#{
group_member
.
human_access
}
%div
.light
%div
.light
#{
pluralize
(
group
.
projects
.
count
,
"project"
)
}
,
#{
pluralize
(
group
.
users
.
count
,
"user"
)
}
#{
pluralize
(
group
.
projects
.
count
,
"project"
)
}
,
#{
pluralize
(
group
.
users
.
count
,
"user"
)
}
...
...
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