diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/views/explore | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/views/explore')
-rw-r--r-- | app/views/explore/groups/_nav.html.haml | 6 | ||||
-rw-r--r-- | app/views/explore/projects/_nav.html.haml | 14 | ||||
-rw-r--r-- | app/views/explore/projects/topic.html.haml | 31 | ||||
-rw-r--r-- | app/views/explore/projects/topics.html.haml | 12 | ||||
-rw-r--r-- | app/views/explore/topics/_head.html.haml | 9 |
5 files changed, 58 insertions, 14 deletions
diff --git a/app/views/explore/groups/_nav.html.haml b/app/views/explore/groups/_nav.html.haml index c337149a2f3..3c9c4e9f76b 100644 --- a/app/views/explore/groups/_nav.html.haml +++ b/app/views/explore/groups/_nav.html.haml @@ -1,8 +1,6 @@ .top-area - %ul.nav-links.nav.nav-tabs - = nav_link(page: explore_groups_path) do - = link_to explore_groups_path do - = _("Explore Groups") + = gl_tabs_nav({ class: 'gl-display-flex gl-flex-grow-1 gl-border-none'}) do + = gl_tab_link_to _("Explore Groups"), explore_groups_path .nav-controls = render 'shared/groups/search_form' = render 'shared/groups/dropdown' diff --git a/app/views/explore/projects/_nav.html.haml b/app/views/explore/projects/_nav.html.haml index 65b7d055843..9d7a6f1ccfb 100644 --- a/app/views/explore/projects/_nav.html.haml +++ b/app/views/explore/projects/_nav.html.haml @@ -1,14 +1,8 @@ .top-area - %ul.nav-links.nav.nav-tabs - = nav_link(page: [explore_projects_path, explore_root_path]) do - = link_to explore_projects_path do - = _('All') - = nav_link(page: starred_explore_projects_path) do - = link_to starred_explore_projects_path do - = _('Most stars') - = nav_link(page: trending_explore_projects_path) do - = link_to trending_explore_projects_path do - = _('Trending') + = gl_tabs_nav({ class: 'gl-display-flex gl-flex-grow-1 gl-border-none'}) do + = gl_tab_link_to _('All'), explore_projects_path, { item_active: current_page?(explore_projects_path) || current_page?(explore_root_path) } + = gl_tab_link_to _('Most stars'), starred_explore_projects_path + = gl_tab_link_to _('Trending'), trending_explore_projects_path .nav-controls - unless current_user diff --git a/app/views/explore/projects/topic.html.haml b/app/views/explore/projects/topic.html.haml new file mode 100644 index 00000000000..aeb040ea61f --- /dev/null +++ b/app/views/explore/projects/topic.html.haml @@ -0,0 +1,31 @@ +- @hide_top_links = false +- @no_container = true +- page_title @topic.name, _("Topics") +- max_topic_name_length = 50 + += render_dashboard_ultimate_trial(current_user) + +.gl-text-center.gl-bg-gray-10.gl-pb-2.gl-pt-6 + .gl-pb-5.gl-align-items-center.gl-justify-content-center.gl-display-flex + .avatar-container.rect-avatar.s60.gl-flex-shrink-0 + = topic_icon(@topic, alt: _('Topic avatar'), class: 'avatar topic-avatar s60') + - if @topic.name.length > max_topic_name_length + %h1.gl-mt-3.str-truncated.has-tooltip{ title: @topic.name } + = truncate(@topic.name, length: max_topic_name_length) + - else + %h1.gl-mt-3 + = @topic.name + - if @topic.description.present? + .topic-description.gl-ml-4.gl-mr-4 + = markdown(@topic.description) + +%div{ class: container_class } + .gl-py-5.gl-border-gray-100.gl-border-b-solid.gl-border-b-1 + %h3.gl-m-0= _('Projects with this topic') + .top-area.gl-pt-2.gl-pb-2 + .nav-controls + = render 'shared/projects/search_form' + = render 'shared/projects/dropdown' + = render 'filter' + + = render 'projects', projects: @projects diff --git a/app/views/explore/projects/topics.html.haml b/app/views/explore/projects/topics.html.haml new file mode 100644 index 00000000000..228304d25b6 --- /dev/null +++ b/app/views/explore/projects/topics.html.haml @@ -0,0 +1,12 @@ +- @hide_top_links = true +- page_title _("Topics") +- header_title _("Topics"), topics_explore_projects_path + += render_dashboard_ultimate_trial(current_user) + +- if current_user + = render 'explore/topics/head' +- else + = render 'explore/head' + += render partial: 'shared/topics/list' diff --git a/app/views/explore/topics/_head.html.haml b/app/views/explore/topics/_head.html.haml new file mode 100644 index 00000000000..f5ee95b16c3 --- /dev/null +++ b/app/views/explore/topics/_head.html.haml @@ -0,0 +1,9 @@ +.page-title-holder.d-flex.align-items-center + %h1.page-title= _('Projects') + +.top-area.scrolling-tabs-container.inner-page-scroll-tabs + .fade-left= sprite_icon('chevron-lg-left', size: 12) + .fade-right= sprite_icon('chevron-lg-right', size: 12) + = render 'dashboard/projects_nav' + .nav-controls + = render 'shared/topics/search_form' |