Fix MR modal

Dmitriy Zaporozhets
1 parent 08bcf639
Showing 6 changed files with 11 additions and 11 deletions Show diff stats
app/assets/javascripts/merge_requests.js.coffee
app/assets/stylesheets/sections/commits.scss
app/views/projects/commits/show.html.haml
app/views/projects/merge_requests/edit.html.haml
app/views/projects/merge_requests/show/_how_to_merge.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -22,12 +22,7 @@ class MergeRequest
     this.$('.show-all-commits').on 'click', =>
       this.showAllCommits()
-    modal = $('#modal_merge_info').modal modal: true, show:false
-
-    $('.how_to_merge_link').bind "click", ->
-      modal.show()
-    $('.modal-header .close').bind "click", ->
-      modal.hide()
+    modal = $('#modal_merge_info').modal(show: false)
   # Local jQuery finder
   $: (selector) ->
@@ -471,3 +471,7 @@ li.commit {
     }
   }
 }
+
+.commit-breadcrumb {
+  padding: 0;
+}
 = render "head"
 - if @path.present?
-  %ul.breadcrumb
+  %ul.breadcrumb.commit-breadcrumb
     %li.light
       History for
     = commits_breadcrumbs
 %h3.page-title
-  = "Edit merge request #{@merge_request.id}"
+  = "Edit merge request ##{@merge_request.id}"
 %hr
 = render 'form'
 %div#modal_merge_info.modal.hide
   .modal-header
-    %a.close{href: "#"} ×
+    %a.close{href: "#", "data-dismiss" => "modal"} ×
     %h3 How To Merge
   .modal-body
     %p
@@ -11,7 +11,8 @@
           %p
             You can accept this request automatically.
             If you still want to do it manually -
-            %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
+            %strong
+              = link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
             for instructions
           .accept_group
             = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
@@ -31,7 +32,7 @@
   .automerge_widget.cannot_be_merged{style: "display:none"}
     .alert.alert-disabled
       %span
-        = link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge"
+        = link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn btn-small padded", title: "How To Merge", "data-toggle" => "modal"
         &nbsp;
         %strong This request can't be merged with GitLab. You should do it manually
	@@ -471,3 +471,7 @@ li.commit {		@@ -471,3 +471,7 @@ li.commit {
471	}	471	}
472	}	472	}
473	}	473	}
		474	+
		475	+.commit-breadcrumb {
		476	+ padding: 0;
		477	+}
1	= render "head"	1	= render "head"
2		2
3	- if @path.present?	3	- if @path.present?
4	- %ul.breadcrumb	4	+ %ul.breadcrumb.commit-breadcrumb
5	%li.light	5	%li.light
6	History for	6	History for
7	= commits_breadcrumbs	7	= commits_breadcrumbs
1	%h3.page-title	1	%h3.page-title
2	- = "Edit merge request #{@merge_request.id}"	2	+ = "Edit merge request ##{@merge_request.id}"
3	%hr	3	%hr
4	= render 'form'	4	= render 'form'
1	%div#modal_merge_info.modal.hide	1	%div#modal_merge_info.modal.hide
2	.modal-header	2	.modal-header
3	- %a.close{href: "#"} ×	3	+ %a.close{href: "#", "data-dismiss" => "modal"} ×
4	%h3 How To Merge	4	%h3 How To Merge
5	.modal-body	5	.modal-body
6	%p	6	%p