Move update mirror button to other buttons.

This commit is contained in:
Douwe Maan
2015-11-12 12:46:33 +01:00
parent c85f4c548c
commit 293c4fdf7f
4 changed files with 15 additions and 4 deletions
@@ -205,6 +205,10 @@
.dropdown-toggle {
margin: -5px;
}
.update-mirror-button {
margin-right: -1px;
}
}
#notification-form {
+1 -1
View File
@@ -19,7 +19,6 @@
Mirrored from #{link_to import_url, import_url}.
= render "shared/mirror_status"
= render "shared/mirror_update_button", size: "sm"
.project-repo-buttons
@@ -30,6 +29,7 @@
= render "shared/clone_panel"
.split-repo-buttons
= render "projects/buttons/update_mirror"
= render "projects/buttons/download"
= render 'projects/buttons/dropdown'
@@ -0,0 +1,8 @@
- if @project.mirror? && can?(current_user, :push_code, @project)
- size = nil unless defined?(size) && size
- if @project.updating_mirror?
%span.btn.disabled.update-mirror-button.has_tooltip{title: "Updating from mirror..."}
= icon('refresh')
- else
= link_to update_now_namespace_project_mirror_path(@project.namespace, @project), method: :post, class: "btn update-mirror-button has_tooltip", title: "Update from mirror" do
= icon('refresh')
@@ -1,10 +1,9 @@
- if @project.mirror? && can?(current_user, :push_code, @project)
- size = nil unless defined?(size) && size
- if @project.updating_mirror?
%span.btn.disabled{class: ("btn-#{size}" if size)}
%span.btn.disabled
= icon('refresh')
Updating…
- else
= link_to update_now_namespace_project_mirror_path(@project.namespace, @project), method: :post, class: "btn #{"btn-#{size}" if size}" do
= link_to update_now_namespace_project_mirror_path(@project.namespace, @project), method: :post, class: "btn" do
= icon('refresh')
Update Now