diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-02-28 13:37:39 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-02-28 13:37:39 +0300 |
| commit | 56e6dac72781041fe54a6194ca247d6772f3a29c (patch) | |
| tree | c85812cead7a2ce02d4b10d06fb66aab24a3cd96 | |
| parent | 23eb41fc13469dc6d74bf216d283145416541ba5 (diff) | |
| parent | 983173ce27fb91a824508f5e27f76748494435eb (diff) | |
Merge branch '57788-project-labels-tooltip-missing' into 'master'
Fix bug where project topics truncate
Closes #57788
See merge request gitlab-org/gitlab-ce!25398
| -rw-r--r-- | app/presenters/project_presenter.rb | 4 | ||||
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 15 | ||||
| -rw-r--r-- | changelogs/unreleased/57788-project-labels-tooltip-missing.yml | 5 |
3 files changed, 20 insertions, 4 deletions
diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb index 4cac90c2567..000b7c433a2 100644 --- a/app/presenters/project_presenter.rb +++ b/app/presenters/project_presenter.rb @@ -315,6 +315,10 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated project.tag_list.take(MAX_TOPICS_TO_SHOW) # rubocop: disable CodeReuse/ActiveRecord end + def topics_not_shown + project.tag_list - topics_to_show + end + def count_of_extra_topics_not_shown if project.tag_list.count > MAX_TOPICS_TO_SHOW project.tag_list.count - MAX_TOPICS_TO_SHOW diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index bba303c906c..1d7287410ea 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -1,5 +1,6 @@ - empty_repo = @project.empty_repo? - show_auto_devops_callout = show_auto_devops_callout?(@project) +- max_project_topic_length = 15 .project-home-panel{ class: ("empty-project" if empty_repo) } .row.append-bottom-8 .home-panel-title-row.col-md-12.col-lg-6.d-flex @@ -19,15 +20,21 @@ %span.access-request-links.prepend-left-8 = render 'shared/members/access_request_links', source: @project - if @project.tag_list.present? - %span.home-panel-topic-list.d-inline-flex.prepend-left-8.has-tooltip{ data: { container: 'body' }, title: @project.has_extra_topics? ? @project.tag_list.join(', ') : nil } + %span.home-panel-topic-list.d-inline-flex.prepend-left-8 = sprite_icon('tag', size: 16, css_class: 'icon append-right-4') - @project.topics_to_show.each do |topic| - %a{ class: 'badge badge-pill badge-secondary append-right-5 str-truncated-30', href: explore_projects_path(tag: topic) } - = topic.titleize + - project_topics_classes = "badge badge-pill badge-secondary append-right-5" + - explore_project_topic_path = explore_projects_path(tag: topic) + - if topic.length > max_project_topic_length + %a{ class: "#{ project_topics_classes } str-truncated-30 has-tooltip", data: { container: "body" }, title: topic, href: explore_project_topic_path } + = topic.titleize + - else + %a{ class: project_topics_classes, href: explore_project_topic_path } + = topic.titleize - if @project.has_extra_topics? - .text-nowrap + .text-nowrap.has-tooltip{ data: { container: 'body' }, title: @project.has_extra_topics? ? @project.topics_not_shown.join(', ') : nil } = _("+ %{count} more") % { count: @project.count_of_extra_topics_not_shown } diff --git a/changelogs/unreleased/57788-project-labels-tooltip-missing.yml b/changelogs/unreleased/57788-project-labels-tooltip-missing.yml new file mode 100644 index 00000000000..9146af0e0f3 --- /dev/null +++ b/changelogs/unreleased/57788-project-labels-tooltip-missing.yml @@ -0,0 +1,5 @@ +--- +title: Fix bug where project topics truncate +merge_request: 25398 +author: +type: fixed |