9 files changed, 41 insertions, 47 deletions

diff --git a/app/controllers/page_translations_controller.rb b/app/controllers/page_translations_controller.rb
index 9446cd2..38a7c4f 100644
--- a/app/controllers/page_translations_controller.rb
+++ b/app/controllers/page_translations_controller.rb
@@ -5,11 +5,6 @@ class PageTranslationsController < ApplicationController
   before_action :find_node
   before_action :find_locale, :only => [:show, :edit, :update, :autosave, :destroy]
 
-  def index
-    page = @node.draft || @node.head
-    @translations = page ? page.translation_summary : []
-  end
-
   def show
     @page = @node.draft || @node.head
     @translation         = @page.translations.find_by(:locale => @locale)
diff --git a/app/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb
index 0aed243..c5932a4 100644
--- a/app/controllers/revisions_controller.rb
+++ b/app/controllers/revisions_controller.rb
@@ -5,10 +5,11 @@ class RevisionsController < ApplicationController
   before_action :login_required
   
   layout 'admin'
-  
+
   def index
-    @node = Node.find(params[:node_id])
-    @pages = @node.pages.all
+    @node   = Node.find(params[:node_id])
+    @pages  = @node.pages.all
+    @locale = resolve_locale(params[:locale])
   end
 
   def diff
@@ -43,6 +44,7 @@ class RevisionsController < ApplicationController
   def show
     @node     = Node.find(params[:node_id])
     @page     = @node.pages.find(params[:id])
+    @locale   = resolve_locale(params[:locale])
   end
 
   def restore
@@ -51,4 +53,12 @@ class RevisionsController < ApplicationController
     flash[:notice] = "Revision #{page.revision} restored"
     redirect_to node_path(page.node)
   end
+
+  private
+
+    def resolve_locale(requested)
+      candidate = requested.presence&.to_sym
+      allowed   = [I18n.default_locale] + Page.non_default_locales
+      allowed.include?(candidate) ? candidate : I18n.default_locale
+    end
 end
diff --git a/app/views/page_translations/edit.html.erb b/app/views/page_translations/edit.html.erb
index 89b594e..981fb74 100644
--- a/app/views/page_translations/edit.html.erb
+++ b/app/views/page_translations/edit.html.erb
@@ -2,6 +2,8 @@
   Editing the <strong><%= @locale.to_s.upcase %></strong> translation of <strong><%= title_for_node(@node) %></strong>.
 </div>
 
+<p class="node_action_bar standalone_action_bar"><%= link_to 'View revision history', node_revisions_path(@node, :locale => @locale) %></p>
+
 <p class="field_hint">
   Metadata such as images, tags, template, and author belong to the page
   as a whole, not to a single translation — change those from the
diff --git a/app/views/page_translations/index.html.erb b/app/views/page_translations/index.html.erb
deleted file mode 100644
index a8c4f5d..0000000
--- a/app/views/page_translations/index.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<h1>Translations — <%= title_for_node(@node) %></h1>
-
-<div class="node_content node_info_group">
-  <div class="node_info_group_items">
-    <% @translations.each do |t| %>
-      <div class="node_info_item">
-        <span class="node_info_label"><%= t[:locale].to_s.upcase %></span>
-        <% if t[:exists] %>
-          <%= t[:title] %> — updated <%= t[:updated_at] %>
-          <% if t[:outdated] %><span class="warning">may be outdated</span><% end %>
-          <%= link_to 'Edit', edit_node_translation_path(@node, t[:locale]) %>
-        <% else %>
-          <span class="field_hint">Not yet translated.</span>
-          <%= link_to 'Add', edit_node_translation_path(@node, t[:locale]) %>
-        <% end %>
-      </div>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/page_translations/show.html.erb b/app/views/page_translations/show.html.erb
index c5bd151..60eb7cf 100644
--- a/app/views/page_translations/show.html.erb
+++ b/app/views/page_translations/show.html.erb
@@ -1,5 +1,7 @@
 <h1>Compare — <%= title_for_node(@node) %></h1>
 
+<p class="node_action_bar standalone_action_bar"><%= link_to 'View revision history', node_revisions_path(@node, :locale => @locale) %></p>
+
 <div class="translation_compare">
   <div class="translation_compare_column">
     <h2><%= @locale.to_s.upcase %></h2>
diff --git a/app/views/revisions/index.html.erb b/app/views/revisions/index.html.erb
index 4680ae2..7ea74a6 100644
--- a/app/views/revisions/index.html.erb
+++ b/app/views/revisions/index.html.erb
@@ -4,6 +4,20 @@
   <%= link_to 'Back to node', node_path(@node) %>
 </p>
 
+<% if Page.non_default_locales.any? %>
+  <p class="diff_locale_toggle">
+    Locale:
+    <% ([I18n.default_locale] + Page.non_default_locales).each_with_index do |locale, i| %>
+      <%= " &middot; ".html_safe if i > 0 %>
+      <% if locale == @locale %>
+        <strong><%= locale.to_s.upcase %></strong>
+      <% else %>
+        <%= link_to locale.to_s.upcase, node_revisions_path(@node, :locale => locale) %>
+      <% end %>
+    <% end %>
+  </p>
+<% end %>
+
 <table id="revisions" class="revisions_table">
   <thead>
     <tr class="header">
@@ -20,6 +34,7 @@
       <td colspan="8">
         <%= button_to 'Diff revisions', diff_node_revisions_path(@node),
               method: :post,
+              params: { locale: @locale },
               form: { id: 'diff_form', class: 'button_to computation' },
               disabled: true %>
         <span id="diff_selection_label"></span>
@@ -35,10 +50,10 @@
       <td><%= radio_button_tag :start_revision, page.revision, index == 1 %></td>
       <td><%= radio_button_tag :end_revision, page.revision, index == 0 %></td>
       <td class="revision"><%= page.revision %></td>
-      <td class="title"><%= page.title %></td>
+      <td class="title"><%= page.translations.find_by(:locale => @locale)&.title || "—" %></td>
       <td class="user"><%= page.editor.try(:login) %></td>
       <td class="date"><%= page.updated_at %></td>
-      <td><%= link_to 'show', node_revision_path(@node, page) %></td>
+      <td><%= link_to 'show', node_revision_path(@node, page, :locale => @locale) %></td>
       <td>
         <%= button_to 'restore', restore_node_revision_path(@node, page),
               method: :put,
diff --git a/app/views/revisions/show.html.erb b/app/views/revisions/show.html.erb
index 92d959b..74fb51f 100644
--- a/app/views/revisions/show.html.erb
+++ b/app/views/revisions/show.html.erb
@@ -1,12 +1,13 @@
+<% translation = @page.translations.find_by(:locale => @locale) %>
 <div id="page_editor" class="show_node">
-  <h1>Revision <%= @page.revision %>: <%= @page.title %></h1>
+  <h1>Revision <%= @page.revision %>: <%= translation&.title %> <small>(<%= @locale.to_s.upcase %>)</small></h1>
 
   <div id="content">
     <div class="node_description">Actions</div>
     <div class="node_content node_info_group">
       <div class="node_info_group_items">
         <div class="node_info_item">
-          <%= link_to 'Show all revisions', node_revisions_path(@node) %>
+          <%= link_to 'Show all revisions', node_revisions_path(@node, :locale => @locale) %>
         </div>
       </div>
     </div>
@@ -27,12 +28,12 @@
     <div class="node_content"><%= @page.published_at %></div>
 
     <div class="node_description">Title</div>
-    <div class="node_content"><%= @page.title %></div>
+    <div class="node_content"><%= translation&.title %></div>
 
     <div class="node_description">Abstract</div>
-    <div class="node_content"><%= @page.abstract %></div>
+    <div class="node_content"><%= translation&.abstract %></div>
 
     <div class="node_description">Body</div>
-    <div class="node_content"><%= raw @page.body %></div>
+    <div class="node_content"><%= raw translation&.body %></div>
   </div>
 </div>
diff --git a/config/routes.rb b/config/routes.rb
index 826bb18..8e5ff23 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -58,7 +58,7 @@ Cccms::Application.routes.draw do
         resources :translations, controller: 'page_translations',
           param: :translation_locale,
           constraints: { translation_locale: /en/ },
-          only: [:index, :show, :edit, :update, :destroy] do
+          only: [:show, :edit, :update, :destroy] do
           member do
             put :autosave
           end
diff --git a/test/controllers/page_translations_controller_test.rb b/test/controllers/page_translations_controller_test.rb
index 8c899fd..8fa732f 100644
--- a/test/controllers/page_translations_controller_test.rb
+++ b/test/controllers/page_translations_controller_test.rb
@@ -1,18 +1,6 @@
 require 'test_helper'
 
 class PageTranslationsControllerTest < ActionController::TestCase
-  test "index lists the default locale's existing translation and flags a missing one" do
-    login_as :quentin
-    node = Node.root.children.create!(:slug => "translations_index_test")
-    node.publish_draft!
-
-    get :index, params: { :node_id => node.id }
-
-    assert_response :success
-    assert_equal [:en], assigns(:translations).map { |t| t[:locale] }
-    assert_equal false, assigns(:translations).first[:exists]
-  end
-
   test "update creates a first-time translation on a fresh draft, leaving head untouched" do
     login_as :quentin
     node = Node.root.children.create!(:slug => "translations_create_test")