kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

New UI for explore groups and trending pages

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2015-09-03 18:19:31 +02:00
parent 0195b085a1
commit 89df4a7922
No known key found for this signature in database
GPG key ID: 161B5D6A44D3D88A
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/explore/groups/index.html.haml
View file

@ -1,14 +1,14 @@
- 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 @@
= 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?

4
app/views/explore/projects/trending.html.haml
View file

@ -1,12 +1,12 @@
- 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

4
app/views/shared/groups/_group.html.haml
View file

@ -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 @@
- if group_member - if group_member
as as
%strong #{group_member.human_access} %span #{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")}