diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 79ad0bd77353ec23421113413d83ac76f1730df7..c14ae8a3711dd1da48acbbbfc7dcf99ef6214589 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -21,10 +21,6 @@ margin-left: 8px; } - .btn-group { - margin-left: 10px; - } - .control { float: left; margin-left: 10px; diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb index 8c24d07675a0348ef49b0d7d7cff28360e711ec4..42c707908e6d15c61a63b3d73ead90b582669239 100644 --- a/app/presenters/project_presenter.rb +++ b/app/presenters/project_presenter.rb @@ -208,7 +208,7 @@ def new_file_anchor_data AnchorData.new(false, statistic_icon + _('New file'), project_new_blob_path(project, default_branch || 'master'), - 'success') + 'missing') end end diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index daedc52f29816a6b1cf06b548c6abdef330419b6..7796db5ba63a3e4f847b36da16e104084088d045 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -49,13 +49,6 @@ = render 'projects/buttons/star' = render 'projects/buttons/fork' - - if can?(current_user, :download_code, @project) - .project-clone-holder.d-inline-flex.d-md-none.btn-block - = render "shared/mobile_clone_panel" - - .project-clone-holder.d-none.d-md-inline-flex - = render "projects/buttons/clone" - - if can?(current_user, :download_code, @project) %nav.project-stats .nav-links.quick-links diff --git a/app/views/projects/buttons/_clone.html.haml b/app/views/projects/buttons/_clone.html.haml index ed22573b23ec9bf126e6e4560d7fc1cb5af6e8c8..7507be52f443031168fe457168891e514e52d727 100644 --- a/app/views/projects/buttons/_clone.html.haml +++ b/app/views/projects/buttons/_clone.html.haml @@ -1,11 +1,12 @@ - project = project || @project +- dropdown_class = local_assigns.fetch(:dropdown_class, '') -.git-clone-holder.js-git-clone-holder.input-group - %a#clone-dropdown.input-group-text.btn.btn-primary.btn-xs.clone-dropdown-btn.qa-clone-dropdown{ href: '#', data: { toggle: 'dropdown' } } +.git-clone-holder.js-git-clone-holder + %a#clone-dropdown.btn.btn-primary.clone-dropdown-btn.qa-clone-dropdown{ href: '#', data: { toggle: 'dropdown' } } %span.append-right-4.js-clone-dropdown-label = _('Clone') = sprite_icon("arrow-down", css_class: "icon") - %ul.p-3.dropdown-menu.dropdown-menu-right.dropdown-menu-large.dropdown-menu-selectable.clone-options-dropdown.qa-clone-options + %ul.p-3.dropdown-menu.dropdown-menu-large.dropdown-menu-selectable.clone-options-dropdown.qa-clone-options{ class: dropdown_class } - if ssh_enabled? %li %label.label-bold diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index a9b6b3979680eb4452adfa9e563f8aae96e68743..9e06358beba913c4b96151211d304bbb5bb006b1 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -11,9 +11,14 @@ - if @project.can_current_user_push_code? %p.append-bottom-0 - = _('You can create files directly in GitLab using one of the following options.') + = _('You can get started by cloning the repository or start adding files to it with one of the following options.') .project-buttons.qa-quick-actions + .project-clone-holder.d-block.d-md-none.mt-2.mr-2 + = render "shared/mobile_clone_panel" + + .project-clone-holder.d-none.d-md-inline-block.mt-2.mr-2.float-left + = render "projects/buttons/clone" = render 'stat_anchor_list', anchors: @project.empty_repo_statistics_buttons - if can?(current_user, :push_code, @project) diff --git a/app/views/projects/tree/_tree_header.html.haml b/app/views/projects/tree/_tree_header.html.haml index 2d987744dfd363f54411d07357685943201f2fe5..52a11642f32ae8f65eada8698722e6bbfd9bc94e 100644 --- a/app/views/projects/tree/_tree_header.html.haml +++ b/app/views/projects/tree/_tree_header.html.haml @@ -101,3 +101,9 @@ = render "projects/buttons/xcode_link" = render 'projects/buttons/download', project: @project, ref: @ref + + .project-clone-holder.d-block.d-md-none.mt-sm-2.mt-md-0> + = render "shared/mobile_clone_panel" + + .project-clone-holder.d-none.d-md-inline-block> + = render "projects/buttons/clone", dropdown_class: 'dropdown-menu-right' diff --git a/app/views/shared/_mobile_clone_panel.html.haml b/app/views/shared/_mobile_clone_panel.html.haml index 2887acf7cd7e7dead57f84f03c987f1dfc8fa73d..df2ed5cfd9775288d67602b12d426b3e4cc7b90d 100644 --- a/app/views/shared/_mobile_clone_panel.html.haml +++ b/app/views/shared/_mobile_clone_panel.html.haml @@ -4,7 +4,7 @@ .btn-group.mobile-git-clone.js-mobile-git-clone.btn-block = clipboard_button(button_text: default_clone_label, text: default_url_to_repo(project), hide_button_icon: true, class: "btn-primary flex-fill bold justify-content-center input-group-text clone-dropdown-btn js-clone-dropdown-label") - %button.btn.btn-primary.dropdown-toggle.js-dropdown-toggle.flex-grow-0.d-flex-center{ type: "button", data: { toggle: "dropdown" } } + %button.btn.btn-primary.dropdown-toggle.js-dropdown-toggle.flex-grow-0.d-flex-center.w-auto.ml-0{ type: "button", data: { toggle: "dropdown" } } = sprite_icon("arrow-down", css_class: "dropdown-btn-icon icon") %ul.dropdown-menu.dropdown-menu-selectable.dropdown-menu-right.clone-options-dropdown{ data: { dropdown: true } } - if ssh_enabled? diff --git a/changelogs/unreleased/gt-move-clone-button-to-the-tree-controls-area.yml b/changelogs/unreleased/gt-move-clone-button-to-the-tree-controls-area.yml new file mode 100644 index 0000000000000000000000000000000000000000..ba6efd070ed597a2105a3aede6d4d7d2a42c3bc3 --- /dev/null +++ b/changelogs/unreleased/gt-move-clone-button-to-the-tree-controls-area.yml @@ -0,0 +1,5 @@ +--- +title: Move the clone button to the tree controls area +merge_request: 17752 +author: Ablay Keldibek +type: changed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index ff10baf413f44a18ecc7a2f481c86860043f1a97..3d303418b9db47c995e67e020c4dad096aa70f28 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -21550,9 +21550,6 @@ msgstr "" msgid "You can create a new one or check them in your Personal Access Tokens settings %{pat_link}" msgstr "" -msgid "You can create files directly in GitLab using one of the following options." -msgstr "" - msgid "You can create new ones at your %{pat_link_start}Personal Access Tokens%{pat_link_end} settings" msgstr "" @@ -21568,6 +21565,9 @@ msgstr "" msgid "You can filter by 'days to merge' by clicking on the columns in the chart." msgstr "" +msgid "You can get started by cloning the repository or start adding files to it with one of the following options." +msgstr "" + msgid "You can invite a new member to %{project_name} or invite another group." msgstr "" diff --git a/spec/presenters/project_presenter_spec.rb b/spec/presenters/project_presenter_spec.rb index 620ef3ff21a558f80f0df8d3dc52b96441b33402..26fa3803651e68e28853e86dfe6ff1d39497e7b4 100644 --- a/spec/presenters/project_presenter_spec.rb +++ b/spec/presenters/project_presenter_spec.rb @@ -297,7 +297,7 @@ is_link: false, label: a_string_including("New file"), link: presenter.project_new_blob_path(project, 'master'), - class_modifier: 'success' + class_modifier: 'missing' ) end