diff options
author | Martin Wortschack <mwortschack@gitlab.com> | 2019-06-24 14:30:03 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-06-24 14:30:03 +0000 |
commit | e978df014cdf2e6e7913a7b3213b9f98a7fb74c6 (patch) | |
tree | 55c7622270837f05226a8bde709f351bd604aef6 /app/views | |
parent | 6a71eea9acef04c3a21e27342a9fd1a8edf688ac (diff) | |
download | gitlab-ce-e978df014cdf2e6e7913a7b3213b9f98a7fb74c6.tar.gz |
Add identifiers for onboarding popovers
- Add button styles for onboarding welcome page
- Fix qa selector (due to additional class)
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/layouts/header/_new_dropdown.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 16 | ||||
-rw-r--r-- | app/views/projects/branches/_branch.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/commits/_commit.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/issues/_issue.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/app/views/layouts/header/_new_dropdown.haml b/app/views/layouts/header/_new_dropdown.haml index 438340464bd..1d7a501e5c2 100644 --- a/app/views/layouts/header/_new_dropdown.haml +++ b/app/views/layouts/header/_new_dropdown.haml @@ -1,5 +1,5 @@ %li.header-new.dropdown{ data: { track_label: "new_dropdown", track_event: "click_dropdown" } } - = link_to new_project_path, class: "header-new-dropdown-toggle has-tooltip qa-new-menu-toggle", title: _("New..."), ref: 'tooltip', aria: { label: _("New...") }, data: { toggle: 'dropdown', placement: 'bottom', container: 'body', display: 'static' } do + = link_to new_project_path, class: "header-new-dropdown-toggle has-tooltip qa-new-menu-toggle", id: "js-onboarding-new-project-link", title: _("New..."), ref: 'tooltip', aria: { label: _("New...") }, data: { toggle: 'dropdown', placement: 'bottom', container: 'body', display: 'static' } do = sprite_icon('plus-square', size: 16) = sprite_icon('angle-down', css_class: 'caret-down') .dropdown-menu.dropdown-menu-right diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index 49ff976f8e8..e401488ecff 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -50,7 +50,7 @@ = link_to project_tree_path(@project), class: 'shortcuts-tree qa-project-menu-repo' do .nav-icon-container = sprite_icon('doc-text') - %span.nav-item-name + %span.nav-item-name#js-onboarding-repo-link = _('Repository') %ul.sidebar-sub-level-items @@ -64,11 +64,11 @@ = _('Files') = nav_link(controller: [:commit, :commits]) do - = link_to project_commits_path(@project, current_ref) do + = link_to project_commits_path(@project, current_ref), id: 'js-onboarding-commits-link' do = _('Commits') = nav_link(html_options: {class: branches_tab_class}) do - = link_to project_branches_path(@project), class: 'qa-branches-link' do + = link_to project_branches_path(@project), class: 'qa-branches-link', id: 'js-onboarding-branches-link' do = _('Branches') = nav_link(controller: [:tags]) do @@ -98,7 +98,7 @@ = link_to project_issues_path(@project), class: 'shortcuts-issues qa-issues-item' do .nav-icon-container = sprite_icon('issues') - %span.nav-item-name + %span.nav-item-name#js-onboarding-issues-link = _('Issues') - if @project.issues_enabled? %span.badge.badge-pill.count.issue_counter @@ -153,7 +153,7 @@ = link_to project_merge_requests_path(@project), class: 'shortcuts-merge_requests qa-merge-requests-link' do .nav-icon-container = sprite_icon('git-merge') - %span.nav-item-name + %span.nav-item-name#js-onboarding-mr-link = _('Merge Requests') %span.badge.badge-pill.count.merge_counter.js-merge-counter = number_with_delimiter(@project.open_merge_requests_count) @@ -170,7 +170,7 @@ = link_to project_pipelines_path(@project), class: 'shortcuts-pipelines qa-link-pipelines' do .nav-icon-container = sprite_icon('rocket') - %span.nav-item-name + %span.nav-item-name#js-onboarding-pipelines-link = _('CI / CD') %ul.sidebar-sub-level-items @@ -335,7 +335,7 @@ = link_to edit_project_path(@project), class: 'shortcuts-tree' do .nav-icon-container = sprite_icon('settings') - %span.nav-item-name.qa-settings-item + %span.nav-item-name.qa-settings-item#js-onboarding-settings-link = _('Settings') %ul.sidebar-sub-level-items @@ -351,7 +351,7 @@ %span = _('General') = nav_link(controller: :project_members) do - = link_to project_project_members_path(@project), title: _('Members'), class: 'qa-link-members-settings' do + = link_to project_project_members_path(@project), title: _('Members'), class: 'qa-link-members-settings', id: 'js-onboarding-settings-members-link' do %span = _('Members') - if can_edit diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index a5eaae2dff4..33f449287b6 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -56,7 +56,7 @@ - if branch.name != @repository.root_ref = link_to project_compare_path(@project, @repository.root_ref, branch.name), - class: "btn btn-default #{'prepend-left-10' unless merge_project}", + class: "btn btn-default js-onboarding-compare-branches #{'prepend-left-10' unless merge_project}", title: s_('Branches|Compare') do = s_('Branches|Compare') diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index 87b9920e8b4..2c78e74be2f 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -20,9 +20,9 @@ .commit-detail.flex-list .commit-content.qa-commit-content - if view_details && merge_request - = link_to commit.title, project_commit_path(project, commit.id, merge_request_iid: merge_request.iid), class: "commit-row-message item-title" + = link_to commit.title, project_commit_path(project, commit.id, merge_request_iid: merge_request.iid), class: "commit-row-message item-title js-onboarding-commit-item" - else - = link_to_markdown_field(commit, :title, link, class: "commit-row-message item-title") + = link_to_markdown_field(commit, :title, link, class: "commit-row-message item-title js-onboarding-commit-item") %span.commit-row-message.d-inline.d-sm-none · = commit.short_id diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index 9293aa1b309..4759991449e 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -6,7 +6,7 @@ .issuable-info-container .issuable-main-info .issue-title.title - %span.issue-title-text{ dir: "auto" } + %span.issue-title-text.js-onboarding-issue-item{ dir: "auto" } - if issue.confidential? %span.has-tooltip{ title: _('Confidential') } = confidential_icon(issue) diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 67e5e4ca62d..eb516684e52 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -6,7 +6,7 @@ .issuable-info-container .issuable-main-info .merge-request-title.title - %span.merge-request-title-text + %span.merge-request-title-text.js-onboarding-mr-item = link_to merge_request.title, merge_request_path(merge_request) - if merge_request.tasks? %span.task-status.d-none.d-sm-inline-block |