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

Impoved merge requests show page. Minor style improvements across project

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-16 01:45:46 +02:00
parent e2b3951700
commit 2ec12c9bb8
13 changed files with 101 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/merge_requests/_how_to_merge.html.haml
View file

@ -15,7 +15,7 @@
:javascript
$(function(){
var modal = $('#modal_merge_info').modal({modal: true});
$('.info_link').bind("click", function(){
$('.how_to_merge_link').bind("click", function(){
modal.show();
});
$('.modal-header .close').bind("click", function(){

2
app/views/merge_requests/_merge_request.html.haml
View file

@ -6,7 +6,7 @@
= time_ago_in_words(merge_request.created_at)
ago
- if merge_request.notes.any?
%span.label= pluralize merge_request.notes.count, 'note'
%span.pretty_label= pluralize merge_request.notes.count, 'note'
- if merge_request.upvotes > 0
%span.label.success= "+#{merge_request.upvotes}"
.right

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

@ -26,23 +26,23 @@
%hr
- if @merge_request.closed
.alert-message.error Closed
- if @merge_request.merged
- event = @merge_request.merge_event
%div
%p
%strong #{event.author_name}
merged this request
%span.cgray
= time_ago_in_words(event.created_at)
ago.
%br
- else
.alert-message.success
= link_to "#", :class => "info_link", :title => "How To Merge" do
= image_tag "Info-UI.PNG"
Open
.merge_request_status_holder
- if @merge_request.closed
%h5
.alert-message.error.status_info Closed
- if @merge_request.merged?
%span
Merged by #{@merge_request.merge_event.author_name}
%small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
- elsif @merge_request.closed_event
%span
Closed by #{@merge_request.closed_event.author_name}
%small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
%br
- else
%h5
.alert-message.success.status_info Open
= link_to "How to merge", "#", :class => "vlink how_to_merge_link", :title => "How To Merge"
= render "merge_requests/how_to_merge"