summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-09-18 10:32:43 +0000
committerGo MAEDA <maeda@farend.jp>2018-09-18 10:32:43 +0000
commitdc8079fa22e5044641ca28ddde52ac8eebf00eff (patch)
treed01ade6a7a4c51d8a6540415fdecec5996770cbd
parentda64eb5aca722fdf4f97105af20d7138c21a80fc (diff)
downloadredmine-dc8079fa22e5044641ca28ddde52ac8eebf00eff.tar.gz
redmine-dc8079fa22e5044641ca28ddde52ac8eebf00eff.zip
Add "View Differences" button above wiki and repository revisions table (#12221).
Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@17492 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/repositories/_revisions.html.erb3
-rw-r--r--app/views/wiki/history.html.erb3
2 files changed, 4 insertions, 2 deletions
diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb
index 72f97c06b..914999b34 100644
--- a/app/views/repositories/_revisions.html.erb
+++ b/app/views/repositories/_revisions.html.erb
@@ -20,6 +20,8 @@ end %>
:repository_id => @repository.identifier_param, :path => to_path_param(path)},
:method => :get
) do %>
+<% show_diff = revisions.size > 1 %>
+<%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %>
<table class="list changesets">
<thead><tr>
<th>#</th>
@@ -30,7 +32,6 @@ end %>
<th><%= l(:field_comments) %></th>
</tr></thead>
<tbody>
-<% show_diff = revisions.size > 1 %>
<% line_num = 1 %>
<% revisions.each do |changeset| %>
<tr class="changeset">
diff --git a/app/views/wiki/history.html.erb b/app/views/wiki/history.html.erb
index e5e72b102..052eb3395 100644
--- a/app/views/wiki/history.html.erb
+++ b/app/views/wiki/history.html.erb
@@ -5,6 +5,8 @@
<%= form_tag({:controller => 'wiki', :action => 'diff',
:project_id => @page.project, :id => @page.title},
:method => :get) do %>
+<% show_diff = @versions.size > 1 %>
+<%= submit_tag l(:label_view_diff), :class => 'small' if show_diff %>
<table class="list wiki-page-versions">
<thead><tr>
<th>#</th>
@@ -16,7 +18,6 @@
<th></th>
</tr></thead>
<tbody>
-<% show_diff = @versions.size > 1 %>
<% line_num = 1 %>
<% @versions.each do |ver| %>
<tr class="wiki-page-version">