diff options
| author | erdgeist <erdgeist@erdgeist.org> | 2026-07-10 03:40:48 +0200 |
|---|---|---|
| committer | erdgeist <erdgeist@erdgeist.org> | 2026-07-10 03:40:48 +0200 |
| commit | cf730b751b590ca80695492f5d62c4fb43efb4d3 (patch) | |
| tree | 61d1172b925f4a55d072b01a0d41c2db5f14f74f /app | |
| parent | 80e23e2629a37d8ccaa6798a8b5e29b49a3a7268 (diff) | |
Ensure that comparison view toggle is there for all diff modes
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/revisions/diff.html.erb | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb index 490cf17..d70503c 100644 --- a/app/views/revisions/diff.html.erb +++ b/app/views/revisions/diff.html.erb | |||
| @@ -9,13 +9,28 @@ | |||
| 9 | against <strong><%= describe_page_reference(params[:end_revision]) %></strong> | 9 | against <strong><%= describe_page_reference(params[:end_revision]) %></strong> |
| 10 | </p> | 10 | </p> |
| 11 | 11 | ||
| 12 | <p class="diff_view_toggle"> | ||
| 13 | View: | ||
| 14 | <% if @diff_view == :inline %> | ||
| 15 | <strong>Inline</strong> | ||
| 16 | <% else %> | ||
| 17 | <%= link_to 'Inline', diff_node_revisions_path(@node, start_revision: params[:start_revision], end_revision: params[:end_revision], view: 'inline') %> | ||
| 18 | <% end %> | ||
| 19 | · | ||
| 20 | <% if @diff_view == :side_by_side %> | ||
| 21 | <strong>Side by side</strong> | ||
| 22 | <% else %> | ||
| 23 | <%= link_to 'Side by side', diff_node_revisions_path(@node, start_revision: params[:start_revision], end_revision: params[:end_revision], view: 'side_by_side') %> | ||
| 24 | <% end %> | ||
| 25 | </p> | ||
| 26 | |||
| 12 | <% numeric_comparison = params[:start_revision].to_s =~ /\A\d+\z/ && params[:end_revision].to_s =~ /\A\d+\z/ %> | 27 | <% numeric_comparison = params[:start_revision].to_s =~ /\A\d+\z/ && params[:end_revision].to_s =~ /\A\d+\z/ %> |
| 13 | 28 | ||
| 14 | <% if numeric_comparison %> | 29 | <% if numeric_comparison %> |
| 15 | <%= form_tag diff_node_revisions_path do %> | 30 | <%= form_tag diff_node_revisions_path do %> |
| 16 | <%= select_tag :start_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:start_revision].to_i) %> | 31 | <%= select_tag :start_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:start_revision].to_i) %> |
| 17 | <%= select_tag :end_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:end_revision].to_i) %> | 32 | <%= select_tag :end_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:end_revision].to_i) %> |
| 18 | <%= select_tag :view, options_for_select([['Inline', 'inline'], ['Side by side', 'side_by_side']], @diff_view) %> | 33 | <%= hidden_field_tag :view, @diff_view %> |
| 19 | <%= submit_tag 'Diff' %> | 34 | <%= submit_tag 'Diff' %> |
| 20 | <% end %> | 35 | <% end %> |
| 21 | <% else %> | 36 | <% else %> |
