diff options
Diffstat (limited to 'app/views/projects/issues')
-rw-r--r-- | app/views/projects/issues/_by_email_description.html.haml | 6 | ||||
-rw-r--r-- | app/views/projects/issues/_work_item_links.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/issues/edit.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/issues/index.html.haml | 31 | ||||
-rw-r--r-- | app/views/projects/issues/new.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/issues/service_desk.html.haml | 8 | ||||
-rw-r--r-- | app/views/projects/issues/service_desk/_alert_moved_from_service_desk.html.haml (renamed from app/views/projects/issues/_alert_moved_from_service_desk.html.haml) | 2 | ||||
-rw-r--r-- | app/views/projects/issues/service_desk/_nav_btns.html.haml (renamed from app/views/projects/issues/_nav_btns.html.haml) | 0 | ||||
-rw-r--r-- | app/views/projects/issues/service_desk/_service_desk_empty_state.html.haml (renamed from app/views/projects/issues/_service_desk_empty_state.html.haml) | 2 | ||||
-rw-r--r-- | app/views/projects/issues/service_desk/_service_desk_info_content.html.haml (renamed from app/views/projects/issues/_service_desk_info_content.html.haml) | 2 |
10 files changed, 16 insertions, 43 deletions
diff --git a/app/views/projects/issues/_by_email_description.html.haml b/app/views/projects/issues/_by_email_description.html.haml deleted file mode 100644 index aeed5fb69c9..00000000000 --- a/app/views/projects/issues/_by_email_description.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -The subject will be used as the title of the new issue, and the message will be the description. - -= link_to 'Quick actions', help_page_path('user/project/quick_actions'), target: '_blank', rel: 'noopener noreferrer' -and styling with -= link_to 'Markdown', help_page_path('user/markdown'), target: '_blank', rel: 'noopener noreferrer' -are supported. diff --git a/app/views/projects/issues/_work_item_links.html.haml b/app/views/projects/issues/_work_item_links.html.haml new file mode 100644 index 00000000000..55a8eb720b6 --- /dev/null +++ b/app/views/projects/issues/_work_item_links.html.haml @@ -0,0 +1,2 @@ +- if Feature.enabled?(:work_items_hierarchy, @project) + .js-work-item-links-root{ data: { issuable_id: @issue.id } } diff --git a/app/views/projects/issues/edit.html.haml b/app/views/projects/issues/edit.html.haml index 353ff9c1cc2..c2b620280d8 100644 --- a/app/views/projects/issues/edit.html.haml +++ b/app/views/projects/issues/edit.html.haml @@ -1,6 +1,6 @@ - page_title _("Edit"), "#{@issue.title} (#{@issue.to_reference})", _("Issues") -%h3.page-title +%h1.page-title.gl-font-size-h-display Edit Issue ##{@issue.iid} %hr diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index fe2be0f73c9..b730eb5072e 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -1,10 +1,5 @@ -- @can_bulk_update = can?(current_user, :admin_issue, @project) - -- page_title _("Issues") -- new_issue_email = @project.new_issuable_address(current_user, 'issue') +- page_title _('Issues') - add_page_specific_style 'page_bundles/issues_list' -- issuable_type = 'issue' - = content_for :meta_tags do = auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{@project.name} issues") @@ -13,24 +8,6 @@ issues_path: project_issues_path(@project), project_path: @project.full_path } } -- if Feature.enabled?(:vue_issues_list, @project&.group) - .js-issues-list{ data: project_issues_list_data(@project, current_user) } - - if @can_bulk_update - = render 'shared/issuable/bulk_update_sidebar', type: :issues -- elsif project_issues(@project).exists? - .top-area - = render 'shared/issuable/nav', type: :issues - = render "projects/issues/nav_btns" - = render 'shared/issuable/search_bar', type: :issues - - - if @can_bulk_update - = render 'shared/issuable/bulk_update_sidebar', type: :issues - - .issues-holder - = render 'issues' - - if new_issue_email - .gl-text-center.gl-pt-5.gl-pb-7 - .js-issuable-by-email{ data: { initial_email: new_issue_email, issuable_type: issuable_type, emails_help_page_path: help_page_path('development/emails', anchor: 'email-namespace'), quick_actions_help_path: help_page_path('user/project/quick_actions'), markdown_help_path: help_page_path('user/markdown'), reset_path: new_issuable_address_project_path(@project, issuable_type: issuable_type) } } -- else - - new_project_issue_button_path = @project.archived? ? false : new_project_issue_path(@project) - = render 'shared/empty_states/issues', new_project_issue_button_path: new_project_issue_button_path, show_import_button: true +.js-issues-list{ data: project_issues_list_data(@project, current_user) } +- if can?(current_user, :admin_issue, @project) + = render 'shared/issuable/bulk_update_sidebar', type: :issues diff --git a/app/views/projects/issues/new.html.haml b/app/views/projects/issues/new.html.haml index b18027f0f25..617579cdd6f 100644 --- a/app/views/projects/issues/new.html.haml +++ b/app/views/projects/issues/new.html.haml @@ -2,7 +2,7 @@ - breadcrumb_title _("New") - page_title _("New Issue") -.top-area.flex-lg-row - %h3.page-title= _("New Issue") +.top-area.gl-lg-flex-direction-row.gl-border-bottom-0 + %h1.page-title.gl-font-size-h-display= _("New Issue") = render "form" diff --git a/app/views/projects/issues/service_desk.html.haml b/app/views/projects/issues/service_desk.html.haml index fb5880f633a..93cb5ddd7e2 100644 --- a/app/views/projects/issues/service_desk.html.haml +++ b/app/views/projects/issues/service_desk.html.haml @@ -3,7 +3,7 @@ - page_title _("Service Desk") - add_page_specific_style 'page_bundles/issues_list' - content_for :breadcrumbs_extra do - = render "projects/issues/nav_btns", show_export_button: false, show_rss_button: false + = render "projects/issues/service_desk/nav_btns", show_export_button: false, show_rss_button: false - support_bot_attrs = { service_desk_enabled: @project.service_desk_enabled?, **UserSerializer.new.represent(User.support_bot) }.to_json @@ -11,12 +11,12 @@ .top-area = render 'shared/issuable/nav', type: :issues .nav-controls.d-block.d-sm-none - = render "projects/issues/nav_btns", show_feed_buttons: false, show_import_button: false, show_export_button: false + = render "projects/issues/service_desk/nav_btns", show_feed_buttons: false, show_import_button: false, show_export_button: false - if @issues.present? = render 'shared/issuable/search_bar', type: :issues - if Gitlab::ServiceDesk.supported? - = render 'service_desk_info_content' + = render 'projects/issues/service_desk/service_desk_info_content' .issues-holder - = render 'projects/issues/issues', empty_state_path: 'service_desk_empty_state' + = render 'projects/issues/issues', empty_state_path: 'projects/issues/service_desk/service_desk_empty_state' diff --git a/app/views/projects/issues/_alert_moved_from_service_desk.html.haml b/app/views/projects/issues/service_desk/_alert_moved_from_service_desk.html.haml index 291edf014c3..cc8d5bdaeec 100644 --- a/app/views/projects/issues/_alert_moved_from_service_desk.html.haml +++ b/app/views/projects/issues/service_desk/_alert_moved_from_service_desk.html.haml @@ -3,6 +3,6 @@ - service_desk_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: service_desk_link_url } = render Pajamas::AlertComponent.new(variant: :warning, - alert_class: 'hide js-alert-moved-from-service-desk-warning gl-mt-5') do |c| + alert_options: { class: 'hide js-alert-moved-from-service-desk-warning gl-mt-5' }) do |c| = c.body do = s_('This project does not have %{service_desk_link_start}Service Desk%{service_desk_link_end} enabled, so the user who created the issue will no longer receive email notifications about new activity.').html_safe % { service_desk_link_start: service_desk_link_start, service_desk_link_end: '</a>'.html_safe } diff --git a/app/views/projects/issues/_nav_btns.html.haml b/app/views/projects/issues/service_desk/_nav_btns.html.haml index 8d16c3d978f..8d16c3d978f 100644 --- a/app/views/projects/issues/_nav_btns.html.haml +++ b/app/views/projects/issues/service_desk/_nav_btns.html.haml diff --git a/app/views/projects/issues/_service_desk_empty_state.html.haml b/app/views/projects/issues/service_desk/_service_desk_empty_state.html.haml index efc319ed8df..1c9143c633d 100644 --- a/app/views/projects/issues/_service_desk_empty_state.html.haml +++ b/app/views/projects/issues/service_desk/_service_desk_empty_state.html.haml @@ -21,7 +21,7 @@ - if can_edit_project_settings && !service_desk_enabled .text-center - = link_to s_("ServiceDesk|Enable Service Desk"), edit_project_path(@project), class: 'gl-button btn btn-success' + = link_to s_("ServiceDesk|Enable Service Desk"), edit_project_path(@project), class: 'gl-button btn btn-confirm' - else .empty-state .svg-content diff --git a/app/views/projects/issues/_service_desk_info_content.html.haml b/app/views/projects/issues/service_desk/_service_desk_info_content.html.haml index f0ec68ba54b..bad75ac2cd9 100644 --- a/app/views/projects/issues/_service_desk_info_content.html.haml +++ b/app/views/projects/issues/service_desk/_service_desk_info_content.html.haml @@ -21,4 +21,4 @@ - if can_edit_project_settings && !service_desk_enabled .gl-mt-3 - = link_to s_("ServiceDesk|Enable Service Desk"), edit_project_path(@project), class: 'gl-button btn btn-success' + = link_to s_("ServiceDesk|Enable Service Desk"), edit_project_path(@project), class: 'gl-button btn btn-confirm' |