Commit dc3e1d63921f4209f3823981d698fe29a6ce624e
1 parent
9a00bbda
Exists in
master
and in
4 other branches
People like Karen and myself are confused by the placeholder, it seems like you …
…don't have to change the master value. Also the to and from should be more prominent.
Showing
1 changed file
with
4 additions
and
3 deletions
Show diff stats
app/views/projects/compare/_form.html.haml
@@ -5,7 +5,8 @@ | @@ -5,7 +5,8 @@ | ||
5 | %code.label-branch 4eedf23 | 5 | %code.label-branch 4eedf23 |
6 | or branch/tag name like | 6 | or branch/tag name like |
7 | %code.label-branch master | 7 | %code.label-branch master |
8 | - and press compare button for commits list, code diff. | 8 | + and press compare button for the commits list and a code diff. |
9 | + Changes are shown <b>from</b> the version in the first field <b>to</b> the version in the second field. | ||
9 | 10 | ||
10 | %br | 11 | %br |
11 | 12 | ||
@@ -14,9 +15,9 @@ | @@ -14,9 +15,9 @@ | ||
14 | .pull-left | 15 | .pull-left |
15 | - if params[:to] && params[:from] | 16 | - if params[:to] && params[:from] |
16 | = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'} | 17 | = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'} |
17 | - = text_field_tag :from, params[:from], placeholder: "master", class: "input-xlarge input-xpadding" | 18 | + = text_field_tag :from, params[:from], class: "input-xlarge input-xpadding" |
18 | = "..." | 19 | = "..." |
19 | - = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "input-xlarge input-xpadding" | 20 | + = text_field_tag :to, params[:to], class: "input-xlarge input-xpadding" |
20 | .pull-left | 21 | .pull-left |
21 | | 22 | |
22 | = submit_tag "Compare", class: "btn btn-create commits-compare-btn" | 23 | = submit_tag "Compare", class: "btn btn-create commits-compare-btn" |