Add cancel button to forms that didn't have one already
This commit is contained in:
parent
ca01690305
commit
ffabf1df50
|
@ -54,4 +54,4 @@
|
|||
.help-block
|
||||
Choose what content you want to see on a project's home page.
|
||||
.panel-footer
|
||||
= f.submit 'Save', class: 'btn btn-save'
|
||||
= f.submit 'Save changes', class: 'btn btn-save'
|
||||
|
|
|
@ -18,6 +18,6 @@
|
|||
= f.text_area :key, class: "form-control thin_area", rows: 5
|
||||
|
||||
.form-actions
|
||||
= f.submit 'Create', class: "btn-create btn"
|
||||
= f.submit 'Create Deploy Key', class: "btn-create btn"
|
||||
= link_to "Cancel", namespace_project_deploy_keys_path(@project.namespace, @project), class: "btn btn-cancel"
|
||||
|
||||
|
|
|
@ -130,9 +130,11 @@
|
|||
The project can be committed to.
|
||||
%br
|
||||
%strong Once active this project shows up in the search and on the dashboard.
|
||||
= link_to 'Unarchive', unarchive_namespace_project_path(@project.namespace, @project),
|
||||
data: { confirm: "Are you sure that you want to unarchive this project?\nWhen this project is unarchived it is active and can be committed to again." },
|
||||
method: :post, class: "btn btn-success"
|
||||
|
||||
.form-actions
|
||||
= link_to 'Unarchive project', unarchive_namespace_project_path(@project.namespace, @project),
|
||||
data: { confirm: "Are you sure that you want to unarchive this project?\nWhen this project is unarchived it is active and can be committed to again." },
|
||||
method: :post, class: "btn btn-success"
|
||||
- else
|
||||
.panel.panel-warning
|
||||
.panel-heading
|
||||
|
@ -144,9 +146,11 @@
|
|||
It is hidden from the dashboard and doesn't show up in searches.
|
||||
%br
|
||||
%strong Archived projects cannot be committed to!
|
||||
= link_to 'Archive', archive_namespace_project_path(@project.namespace, @project),
|
||||
data: { confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to." },
|
||||
method: :post, class: "btn btn-warning"
|
||||
|
||||
.form-actions
|
||||
= link_to 'Archive project', archive_namespace_project_path(@project.namespace, @project),
|
||||
data: { confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to." },
|
||||
method: :post, class: "btn btn-warning"
|
||||
- else
|
||||
.nothing-here-block Only the project owner can archive a project
|
||||
|
||||
|
@ -175,7 +179,7 @@
|
|||
%li Be careful. Renaming a project's repository can have unintended side effects.
|
||||
%li You will need to update your local repositories to point to the new location.
|
||||
.form-actions
|
||||
= f.submit 'Rename', class: "btn btn-warning"
|
||||
= f.submit 'Rename project', class: "btn btn-warning"
|
||||
|
||||
- if can?(current_user, :change_namespace, @project)
|
||||
.panel.panel-default.panel.panel-danger
|
||||
|
@ -194,7 +198,7 @@
|
|||
%li You can only transfer the project to namespaces you manage.
|
||||
%li You will need to update your local repositories to point to the new location.
|
||||
.form-actions
|
||||
= f.submit 'Transfer', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => transfer_project_message(@project) }
|
||||
= f.submit 'Transfer project', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => transfer_project_message(@project) }
|
||||
- else
|
||||
.nothing-here-block Only the project owner can transfer a project
|
||||
|
||||
|
|
|
@ -28,6 +28,8 @@
|
|||
|
||||
|
||||
.form-actions
|
||||
= f.submit 'Save', class: 'btn btn-save js-save-button'
|
||||
- if @label.persisted?
|
||||
= f.submit 'Save changes', class: 'btn btn-save js-save-button'
|
||||
- else
|
||||
= f.submit 'Create Label', class: 'btn btn-create js-save-button'
|
||||
= link_to "Cancel", namespace_project_labels_path(@project.namespace, @project), class: 'btn btn-cancel'
|
||||
|
||||
|
|
|
@ -52,8 +52,8 @@
|
|||
are the same.
|
||||
|
||||
|
||||
%div
|
||||
= f.submit 'Compare branches', class: "btn btn-new mr-compare-btn"
|
||||
.form-actions
|
||||
= f.submit 'Compare branches and continue', class: "btn btn-new mr-compare-btn"
|
||||
|
||||
:javascript
|
||||
var source_branch = $("#merge_request_source_branch")
|
||||
|
|
|
@ -26,4 +26,4 @@
|
|||
= f.text_field :tag_list, value: @runner.tag_list.to_s, class: 'form-control'
|
||||
.help-block You can setup jobs to only use runners with specific tags
|
||||
.form-actions
|
||||
= f.submit 'Save', class: 'btn btn-save'
|
||||
= f.submit 'Save changes', class: 'btn btn-save'
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
= render 'shared/service_settings', form: form
|
||||
|
||||
.form-actions
|
||||
= form.submit 'Save', class: 'btn btn-save'
|
||||
= form.submit 'Save changes', class: 'btn btn-save'
|
||||
|
||||
- if @service.valid? && @service.activated?
|
||||
- disabled = @service.can_test? ? '':'disabled'
|
||||
|
|
|
@ -90,7 +90,7 @@
|
|||
%strong #{link_to 'guidelines for contribution', guide_url}
|
||||
to this repository.
|
||||
- if issuable.new_record?
|
||||
= f.submit "Submit new #{issuable.class.model_name.human.downcase}", class: 'btn btn-create'
|
||||
= f.submit "Submit #{issuable.class.model_name.human.downcase}", class: 'btn btn-create'
|
||||
- else
|
||||
= f.submit 'Save changes', class: 'btn btn-save'
|
||||
- if issuable.new_record?
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
- if @snippet.new_record?
|
||||
= f.submit 'Create snippet', class: "btn-create btn"
|
||||
- else
|
||||
= f.submit 'Save', class: "btn-save btn"
|
||||
= f.submit 'Save changes', class: "btn-save btn"
|
||||
|
||||
- if @snippet.project_id
|
||||
= link_to "Cancel", namespace_project_snippets_path(@project.namespace, @project), class: "btn btn-cancel"
|
||||
|
|
|
@ -39,7 +39,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
|
|||
select "fix", from: "merge_request_source_branch"
|
||||
select "master", from: "merge_request_target_branch"
|
||||
|
||||
click_button "Compare branches"
|
||||
click_button "Compare branches and continue"
|
||||
|
||||
expect(page).to have_content "New Merge Request"
|
||||
fill_in "merge_request_title", with: "Merge Request On Forked Project"
|
||||
|
|
|
@ -72,13 +72,13 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
|
|||
|
||||
step 'I submit new issue "500 error on profile"' do
|
||||
fill_in "issue_title", with: "500 error on profile"
|
||||
click_button "Submit new issue"
|
||||
click_button "Submit issue"
|
||||
end
|
||||
|
||||
step 'I submit new issue "500 error on profile" with label \'bug\'' do
|
||||
fill_in "issue_title", with: "500 error on profile"
|
||||
select 'bug', from: "Labels"
|
||||
click_button "Submit new issue"
|
||||
click_button "Submit issue"
|
||||
end
|
||||
|
||||
step 'I click link "500 error on profile"' do
|
||||
|
|
|
@ -86,7 +86,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
|
|||
select "feature", from: "merge_request_target_branch"
|
||||
click_button "Compare branches"
|
||||
fill_in "merge_request_title", with: "Wiki Feature"
|
||||
click_button "Submit new merge request"
|
||||
click_button "Submit merge request"
|
||||
end
|
||||
|
||||
step 'project "Shop" have "Bug NS-04" open merge request' do
|
||||
|
|
Loading…
Reference in New Issue