diff --git a/app/views/content_viewer/article_versions.rhtml b/app/views/content_viewer/article_versions.rhtml index 055b439..7298b1e 100644 --- a/app/views/content_viewer/article_versions.rhtml +++ b/app/views/content_viewer/article_versions.rhtml @@ -1,3 +1,7 @@ +<% button_bar do %> + <%= button(:back, _('Back to the post'), {:action => 'view_page'}) %> +<% end %> + <%= article_title(@page, :no_link => true) %>

<%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.

diff --git a/app/views/content_viewer/versioned_article.rhtml b/app/views/content_viewer/versioned_article.rhtml index 130d09b..c4efc0a 100644 --- a/app/views/content_viewer/versioned_article.rhtml +++ b/app/views/content_viewer/versioned_article.rhtml @@ -1,3 +1,11 @@ +<% button_bar do %> + <%= button(:back, _('Back to the versions'), {:action => 'article_versions'}) %> +<% end %> + +<% button_bar do %> + <%= button(:back, _('Go to current version'), {:action => 'view_page'}) %> +<% end %> +
@@ -15,6 +23,8 @@ <%= _("Version %{version} - %{author} on %{date}") % {:version => @version, :author => @page.author_name(@version), :date => show_time(@versioned_article.updated_at) } %>
+<%= _('This is not the current version.') %>. + <% if @page.version_license(@version).present? %>
<% if @page.version_license(@version).present? %> diff --git a/app/views/content_viewer/versions_diff.html.erb b/app/views/content_viewer/versions_diff.html.erb index 9d0c7f0..869df23 100644 --- a/app/views/content_viewer/versions_diff.html.erb +++ b/app/views/content_viewer/versions_diff.html.erb @@ -1,4 +1,14 @@ +<% button_bar do %> + <%= button(:back, _('Back to the versions'), {:action => 'article_versions'}) %> +<% end %> +

<%= _('Changes on "%s"') % @page.title %>

<%= _('Changes from %s → %s') % [show_time(@v1.updated_at), show_time(@v2.updated_at)] %>

-<%= Diffy::Diff.new(@v1.body, @v2.body, :context => 1).to_s(:html) %> + +<% temp = Diffy::Diff.new(@v1.body, @v2.body, :context => 1).to_s(:text).blank? %> +<% if temp %> + <%= _('These versions are equals!')%> +<% else %> + <%= Diffy::Diff.new(@v1.body, @v2.body, :context => 1).to_s(:html) %> +<% end %> -- libgit2 0.21.2