diff options
Diffstat (limited to 'app/views')
10 files changed, 13 insertions, 106 deletions
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 78c3270114e..f7b2ba59549 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -6,6 +6,8 @@ = auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{current_user.name} issues") = render_dashboard_ultimate_trial(current_user) += render_if_exists 'shared/dashboard/saml_reauth_notice', + groups_requiring_saml_reauth: user_groups_requiring_reauth .page-title-holder.gl-display-flex.gl-align-items-center %h1.page-title.gl-font-size-h-display= _('Issues') diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index 91cec50226b..d29cb56db07 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -11,6 +11,8 @@ add_page_specific_style 'page_bundles/issuable_list' = render_dashboard_ultimate_trial(current_user) += render_if_exists 'shared/dashboard/saml_reauth_notice', + groups_requiring_saml_reauth: user_groups_requiring_reauth .page-title-holder.d-flex.align-items-start.flex-column.flex-sm-row.align-items-sm-center %h1.page-title.gl-font-size-h-display= title diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml index 1b0bd10db77..0587ba61db4 100644 --- a/app/views/dashboard/todos/index.html.haml +++ b/app/views/dashboard/todos/index.html.haml @@ -2,7 +2,10 @@ = render_two_factor_auth_recovery_settings_check = render_dashboard_ultimate_trial(current_user) -= render_if_exists 'dashboard/todos/saml_reauth_notice' + += render_if_exists 'shared/dashboard/saml_reauth_notice', + groups_requiring_saml_reauth: todo_groups_requiring_saml_reauth(@todos) + - add_page_specific_style 'page_bundles/todos' - add_page_specific_style 'page_bundles/issuable' - filter_by_done = params[:state] == 'done' diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index 0ae2e5337f5..a7e078b074a 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -2,7 +2,7 @@ - custom_text = custom_sign_in_description !!! 5 %html.html-devise-layout{ class: user_application_theme, lang: I18n.locale } - = render "layouts/head", { startup_filename: 'signin' } + = render "layouts/head" %body.gl-h-full.login-page.navless{ class: "#{system_message_class} #{client_class_list}", data: { page: body_data_page, testid: 'login-page' } } = header_message = render "layouts/init_client_detection_flags" @@ -15,12 +15,12 @@ .row.gl-mt-5.gl-row-gap-5 .col-md.order-12.sm-bg-gray .col-sm-12 - %h1.mb-3.gl-font-size-h2 + %h1.gl-mb-5.gl-font-size-h2 = brand_title = custom_text .col-md.order-md-12 .col-sm-12.bar - .gl-text-center + .gl-text-center.gl-mb-5 = brand_image = yield - else diff --git a/app/views/projects/gcp/artifact_registry/docker_images/_docker_image.html.haml b/app/views/projects/gcp/artifact_registry/docker_images/_docker_image.html.haml deleted file mode 100644 index 750dea9896f..00000000000 --- a/app/views/projects/gcp/artifact_registry/docker_images/_docker_image.html.haml +++ /dev/null @@ -1,33 +0,0 @@ -.gl-display-flex.gl-flex-direction-column - .gl-display-flex.gl-flex-direction-column.gl-border-b-solid.gl-border-t-solid.gl-border-t-1.gl-border-b-1.gl-border-t-transparent.gl-border-b-gray-100 - .gl-display-flex.gl-align-items-center.gl-py-3 - .gl-display-flex.gl-flex-direction-column.gl-sm-flex-direction-row.gl-justify-content-space-between.gl-align-items-stretch.gl-flex-grow-1 - .gl-display-flex.gl-flex-direction-column.gl-mb-3.gl-sm-mb-0.gl-min-w-0.gl-flex-grow-1 - .gl-display-flex.gl-align-items-center.gl-text-body.gl-font-weight-bold.gl-font-size-h2 - %span.gl-text-body.gl-font-weight-bold= docker_image.short_name - .gl-bg-gray-50.gl-inset-border-1-gray-100.gl-rounded-base.gl-pt-6 - .gl-display-flex.gl-align-items-top.gl-font-monospace.gl-font-sm.gl-word-break-all.gl-p-4.gl-border-b-solid.gl-border-gray-100.gl-border-b-1 - = sprite_icon('information-o', css_class: 'gl-text-gray-500 gl-mr-3 gl-icon s16') - Full name: #{docker_image.name} - .gl-display-flex.gl-align-items-top.gl-font-monospace.gl-font-sm.gl-word-break-all.gl-p-4.gl-border-b-solid.gl-border-gray-100.gl-border-b-1 - = sprite_icon('earth', css_class: 'gl-text-gray-500 gl-mr-3 gl-icon s16') - %a{ href: docker_image.details_url, target: 'blank', rel: 'noopener noreferrer' } - Artifact Registry details page - .gl-display-flex.gl-align-items-top.gl-font-monospace.gl-font-sm.gl-word-break-all.gl-p-4.gl-border-b-solid.gl-border-gray-100.gl-border-b-1 - = sprite_icon('doc-code', css_class: 'gl-text-gray-500 gl-mr-3 gl-icon s16') - Media Type: #{docker_image.media_type} - .gl-display-flex.gl-align-items-top.gl-font-monospace.gl-font-sm.gl-word-break-all.gl-p-4.gl-border-b-solid.gl-border-gray-100.gl-border-b-1 - = sprite_icon('archive', css_class: 'gl-text-gray-500 gl-mr-3 gl-icon s16') - Size: #{number_to_human_size(docker_image.image_size_bytes)} - .gl-display-flex.gl-align-items-top.gl-font-monospace.gl-font-sm.gl-word-break-all.gl-p-4.gl-border-b-solid.gl-border-gray-100.gl-border-b-1 - = sprite_icon('calendar', css_class: 'gl-text-gray-500 gl-mr-3 gl-icon s16') - Built at: #{docker_image.built_at&.to_fs} - .gl-display-flex.gl-align-items-top.gl-font-monospace.gl-font-sm.gl-word-break-all.gl-p-4.gl-border-b-solid.gl-border-gray-100.gl-border-b-1 - = sprite_icon('calendar', css_class: 'gl-text-gray-500 gl-mr-3 gl-icon s16') - Uploaded at: #{docker_image.uploaded_at&.to_fs} - .gl-display-flex.gl-align-items-top.gl-font-monospace.gl-font-sm.gl-word-break-all.gl-p-4.gl-border-b-solid.gl-border-gray-100.gl-border-b-1 - = sprite_icon('calendar', css_class: 'gl-text-gray-500 gl-mr-3 gl-icon s16') - Updated at: #{docker_image.updated_at&.to_fs} - - if docker_image.tags.present? - .gl-display-flex.gl-align-items-center.gl-text-gray-500.gl-min-h-6.gl-min-w-0.gl-flex-grow-1.gl-pt-4 - = render partial: 'docker_image_tag', collection: docker_image.tags diff --git a/app/views/projects/gcp/artifact_registry/docker_images/_docker_image_tag.html.haml b/app/views/projects/gcp/artifact_registry/docker_images/_docker_image_tag.html.haml deleted file mode 100644 index a030cd7d634..00000000000 --- a/app/views/projects/gcp/artifact_registry/docker_images/_docker_image_tag.html.haml +++ /dev/null @@ -1 +0,0 @@ -%a.gl-button.btn.btn-md.btn-default.gl-mr-3!= docker_image_tag diff --git a/app/views/projects/gcp/artifact_registry/docker_images/_pagination.html.haml b/app/views/projects/gcp/artifact_registry/docker_images/_pagination.html.haml deleted file mode 100644 index df98ba8d68e..00000000000 --- a/app/views/projects/gcp/artifact_registry/docker_images/_pagination.html.haml +++ /dev/null @@ -1,13 +0,0 @@ -.gl-display-flex.gl-justify-content-center - %nav.gl-pagination.gl-mt-3 - .gl-keyset-pagination.btn-group - - if @page > 1 - = link_to 'Prev', namespace_project_gcp_artifact_registry_docker_images_path(params[:namespace_id], params[:project_id], page_token: @previous_page_token, page_tokens: @page_tokens, page: @page - 1, gcp_project_id: params[:gcp_project_id], gcp_location: params[:gcp_location], gcp_ar_repository: params[:gcp_ar_repository], gcp_wlif_url: params[:gcp_wlif_url]), class: 'btn btn-default btn-md gl-button' - - else - %span.btn.btn-default.btn-md.gl-button.disabled= 'Prev' - - if @next_page_token.present? - = link_to 'Next', namespace_project_gcp_artifact_registry_docker_images_path(params[:namespace_id], params[:project_id], page_token: @next_page_token, page_tokens: @page_tokens, page: @page + 1, gcp_project_id: params[:gcp_project_id], gcp_location: params[:gcp_location], gcp_ar_repository: params[:gcp_ar_repository], gcp_wlif_url: params[:gcp_wlif_url]), class: 'btn btn-default btn-md gl-button' - - else - %span.btn.btn-default.btn-md.gl-button.disabled= 'Next' - - diff --git a/app/views/projects/gcp/artifact_registry/docker_images/index.html.haml b/app/views/projects/gcp/artifact_registry/docker_images/index.html.haml deleted file mode 100644 index b487a175691..00000000000 --- a/app/views/projects/gcp/artifact_registry/docker_images/index.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -- page_title 'Artifact Registry Docker Images' - -- unless @error - .gl-display-flex.gl-flex-direction-column - .gl-display-flex.gl-justify-content-space-between.gl-py-3 - .gl-flex-direction-column.gl-flex-grow-1 - .gl-display-flex - .gl-display-flex.gl-flex-direction-column - %h2.gl-font-size-h1.gl-mt-3.gl-mb-0 Docker Images of #{@artifact_repository_name} - = render partial: 'pagination' - = render partial: 'docker_image', collection: @docker_images - = render partial: 'pagination' -- else - .flash-container.flash-container-page.sticky - .gl-alert.flash-notice.gl-alert-info - .gl-alert-icon-container - = sprite_icon('information-o', css_class: 's16 gl-alert-icon gl-alert-icon-no-title') - .gl-alert-content - .gl-alert-body - - if @error - = @error - - else - Nothing to show here. diff --git a/app/views/projects/gcp/artifact_registry/setup/new.html.haml b/app/views/projects/gcp/artifact_registry/setup/new.html.haml deleted file mode 100644 index 39ce0093372..00000000000 --- a/app/views/projects/gcp/artifact_registry/setup/new.html.haml +++ /dev/null @@ -1,31 +0,0 @@ -- page_title 'Artifact Registry Setup' - -- if @error.present? - .flash-container.flash-container-page.sticky - .gl-alert.flash-notice.gl-alert-info - .gl-alert-icon-container - = sprite_icon('information-o', css_class: 's16 gl-alert-icon gl-alert-icon-no-title') - .gl-alert-content - .gl-alert-body= @error -- else - %p - - = form_tag namespace_project_gcp_artifact_registry_docker_images_path , method: :get do - .form-group.row - = label_tag :gcp_project_id, 'Google Project ID', class: 'col-form-label col-md-2' - .col-md-4 - = text_field_tag :gcp_project_id, nil, class: 'form-control gl-form-input gl-mr-3' - .form-group.row - = label_tag :gcp_location, 'Google Project Location', class: 'col-form-label col-md-2' - .col-md-4 - = text_field_tag :gcp_location, nil, class: 'form-control gl-form-input gl-mr-3' - .form-group.row - = label_tag :gcp_ar_repository, 'Artifact Registry Repository Name', class: 'col-form-label col-md-2' - .col-md-4 - = text_field_tag :gcp_ar_repository, nil, class: 'form-control gl-form-input gl-mr-3' - .form-group.row - = label_tag :gcp_wlif_url, 'Worflow Identity Federation url', class: 'col-form-label col-md-2' - .col-md-4 - = text_field_tag :gcp_wlif_url, nil, class: 'form-control gl-form-input gl-mr-3' - .form-actions - = submit_tag 'Setup', class: 'gl-button btn btn-confirm' diff --git a/app/views/shared/wikis/edit.html.haml b/app/views/shared/wikis/edit.html.haml index ce8c7782c7f..ffe479329b4 100644 --- a/app/views/shared/wikis/edit.html.haml +++ b/app/views/shared/wikis/edit.html.haml @@ -1,3 +1,4 @@ +- breadcrumb_title(s_("Wiki|New Page")) unless @page.persisted? - wiki_page_title @page, @page.persisted? ? _('Edit') : _('New') - add_page_specific_style 'page_bundles/wiki' - @gfm_form = true @@ -16,7 +17,7 @@ · = s_("Wiki|Edit Page") - else - = s_("Wiki|Create New Page") + = s_("Wiki|New Page") .nav-controls.pb-md-3.pb-lg-0 - if @page.persisted? |