deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge request js/css rewrite

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2011-12-13 10:07:52 +02:00
parent fb72b3c68e
commit e4bd6442a9
5 changed files with 75 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/views/merge_requests/show.html.haml
View file

@ -40,20 +40,24 @@
%br
%br
#gitlab-tabs
%ul
%li= link_to "Notes", "#merge-notes"
%li= link_to "Commits", commits_project_merge_request_path(@project, @merge_request)
%li= link_to "Diff", diffs_project_merge_request_path(@project, @merge_request)
%ul.merge-tabs
= link_to "Notes", "#", :class => "merge-notes-tab"
= link_to "Commits","#", "data-url" => commits_project_merge_request_path(@project, @merge_request), :class => "merge-commits-tab"
= link_to "Diff", diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab"
%img{:src => "/assets/ajax-loader-facebook.gif", :class => "dashboard-loader"}
#merge-notes
.issue_notes= render "notes/notes"
.loading{ :style => "display:none;"}
%center= image_tag "ajax-loader.gif"
.clear
.merge-request-notes
.issue_notes= render "notes/notes"
.loading{ :style => "display:none;"}
%center= image_tag "ajax-loader.gif"
.clear
.merge-request-commits
.merge-request-diffs
:javascript
$(function(){
$("#gitlab-tabs").tabs();
MergeRequest.init();
})