Commit d81f0b78 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Bootstrap: Merge Request -> Show

parent 0a4222fb
...@@ -27,7 +27,7 @@ class Commit ...@@ -27,7 +27,7 @@ class Commit
@head = head @head = head
end end
def safe_message def safe_message()
message message
end end
......
...@@ -13,5 +13,7 @@ ...@@ -13,5 +13,7 @@
Issues Issues
= link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
Wall Wall
- if @project.common_notes.today.count > 0
%span.label= @project.common_notes.today.count
= link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
Requests Requests
= form_for [@project, @merge_request] do |f| = form_for [@project, @merge_request] do |f|
%div -if @merge_request.errors.any?
%span.entity-info .alert-message.block-message.error
- if @merge_request.new_record? %ul
= link_to project_merge_requests_path(@project) do - @merge_request.errors.full_messages.each do |msg|
.entity-button %li= msg
Merge Requests
%i
- else
= link_to project_merge_request_path(@project, @merge_request) do
.entity-button
Show Merge Request
%i
%h2= @merge_request.new_record? ? "New Merge Request" : "Edit Merge Request ##{@merge_request.id}" .clearfix
= f.label :source_branch, "From"
.input= f.select(:source_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
.clearfix
= f.label :target_branch, "To"
.input= f.select(:target_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
.clearfix
= f.label :assignee_id, "Assign to"
.input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, :style => "width:250px")
%hr .clearfix
%table.no-borders = f.label :title
-if @merge_request.errors.any? .input= f.text_area :title, :class => "xlarge", :maxlength => 255, :rows => 5
%tr .actions
%td{:colspan => 2} = f.submit 'Save', :class => "primary btn"
#error_explanation - if @merge_request.new_record?
- @merge_request.errors.full_messages.each do |msg| = link_to project_merge_requests_path(@project), :class => "btn" do
%span= msg Cancel
%br - else
%tr = link_to project_merge_request_path(@project, @merge_request), :class => "btn" do
%td= f.label :source_branch, "From" Cancel
%td= f.select(:source_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
%tr
%td= f.label :target_branch, "To"
%td= f.select(:target_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
%tr
%td= f.label :assignee_id, "Assign to"
%td= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, :style => "width:250px")
= f.text_area :title, :style => "width:718px; height:100px", :maxlength => 255
%br
%br
.merge-tabs
= f.submit 'Save', :class => "positive-button"
   
- unless @merge_request.new_record? - unless @merge_request.new_record?
.right .right
= link_to 'Remove', [@project, @merge_request], :confirm => 'Are you sure?', :method => :delete, :class => "red-button" = link_to 'Remove', [@project, @merge_request], :confirm => 'Are you sure?', :method => :delete, :class => "btn danger"
......
%h3
= "Edit merge request #{@merge_request.id}"
%hr
= render 'form' = render 'form'
%h3 New Merge Request
%hr
= render 'form' = render 'form'
...@@ -6,28 +6,40 @@ ...@@ -6,28 +6,40 @@
%span.label= @merge_request.target_branch %span.label= @merge_request.target_branch
%span.right %span.right
- if can?(current_user, :admin_project, @project) || @merge_request.author == current_user
- if @merge_request.closed
= link_to 'Reopen', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => false }, :status_only => true), :method => :put, :class => "btn"
- else
= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close merge request"
- if can?(current_user, :admin_project, @project) || @merge_request.author == current_user - if can?(current_user, :admin_project, @project) || @merge_request.author == current_user
= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small" do = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small" do
Edit Merge Request Edit
%hr
%div
%span.entity-info
= image_tag gravatar_icon(@merge_request.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
%span.commit-title
%strong
%span.commit-author
%strong
= link_to project_team_member_path(@project, @project.team_member_by_id(@merge_request.author.id)) do
%span.author= @merge_request.author_name
→
= link_to project_team_member_path(@project, @project.team_member_by_id(@merge_request.assignee.id)) do
%span.author= @merge_request.assignee_name
%br
= @merge_request.created_at.stamp("Aug 21, 2011 9:23pm")
%hr %hr
.clearfix - if @merge_request.closed
%div.well= simple_format @merge_request.title .alert-message.error Closed
- else
.alert-message.success Open
%div.well
%div
%span.entity-info
= image_tag gravatar_icon(@merge_request.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
%span.commit-title
%strong
%span.commit-author
%strong
= link_to project_team_member_path(@project, @project.team_member_by_id(@merge_request.author.id)) do
%span.author= @merge_request.author_name
→
= link_to project_team_member_path(@project, @project.team_member_by_id(@merge_request.assignee.id)) do
%span.author= @merge_request.assignee_name
%br
.cgray= @merge_request.created_at.stamp("Aug 21, 2011 9:23pm")
%div= simple_format @merge_request.title
.tabs .tabs
...@@ -41,12 +53,6 @@ ...@@ -41,12 +53,6 @@
= link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do = link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do
Diff Diff
- if can?(current_user, :admin_project, @project) || @merge_request.author == current_user
.right
- if @merge_request.closed
= link_to 'Reopen', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => false }, :status_only => true), :method => :put, :class => "btn"
- else
= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close merge request"
%img{:src => "/assets/ajax-loader-facebook.gif", :class => "dashboard-loader"} %img{:src => "/assets/ajax-loader-facebook.gif", :class => "dashboard-loader"}
.merge-request-notes .merge-request-notes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment