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

Pretty compare mode

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-19 20:14:05 +03:00
parent 40c6d87175
commit a7aee9d1ee
2 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/sections/commits.scss
View file

@ -303,9 +303,14 @@
.commits-compare-switch{ .commits-compare-switch{
background: url('switch_icon.png'); background: url("switch_icon.png") no-repeat center center;
width: 16px; width: 16px;
height: 18px; height: 18px;
text-indent: -9999px; text-indent: -9999px;
display: inline-block; float: left;
margin-right: 9px;
border: 1px solid #DDD;
@include border-radius(4px);
padding: 4px;
background-color: #EEE;
} }

31
app/views/compare/_form.html.haml
View file

@ -1,25 +1,28 @@
%div %div
%p.slead - unless params[:to]
Fill input field with commit id like %p.slead
%code.label_branch 4eedf23 Fill input field with commit id like
or branch/tag name like %code.label_branch 4eedf23
%code.label_branch master or branch/tag name like
and press compare button for commits list, code diff. %code.label_branch master
and press compare button for commits list, code diff.
%br %br
= form_tag project_compare_index_path(@project), method: :post do = form_tag project_compare_index_path(@project), method: :post do
.clearfix .clearfix
= text_field_tag :from, params[:from], placeholder: "master", class: "xlarge" .pull-left
= "..." - if params[:to] && params[:from]
= text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge" = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'}
- if params[:to] && params[:from] = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge"
= link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'} = "..."
= text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
.pull-left
 
= submit_tag "Compare", class: "btn primary wide commits-compare-btn"
- if @refs_are_same - if @refs_are_same
.alert .alert
%span Refs are the same %span Refs are the same
.actions
= submit_tag "Compare", class: "btn primary wide commits-compare-btn"