diff options
Diffstat (limited to 'app/views/revisions')
| -rw-r--r-- | app/views/revisions/diff.html.erb | 8 | ||||
| -rw-r--r-- | app/views/revisions/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/revisions/show.html.erb | 18 |
3 files changed, 22 insertions, 6 deletions
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb index 25f5ad04..17146615 100644 --- a/app/views/revisions/diff.html.erb +++ b/app/views/revisions/diff.html.erb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <h1><%= t(".title") %></h1> | 1 | <h1><%= t(".title") %></h1> |
| 2 | 2 | ||
| 3 | <p class="node_action_bar standalone_action_bar"> | 3 | <p class="node_action_bar"> |
| 4 | <%= link_to t(".revisions_link"), node_revisions_path(@node) %> | 4 | <%= link_to t(".revisions_link"), node_revisions_path(@node) %> |
| 5 | </p> | 5 | </p> |
| 6 | 6 | ||
| @@ -23,7 +23,7 @@ | |||
| 23 | <%= t(".comparing_html", :start => start_control, :end => end_control, | 23 | <%= t(".comparing_html", :start => start_control, :end => end_control, |
| 24 | :lang => locale_control, :view => view_control) %> | 24 | :lang => locale_control, :view => view_control) %> |
| 25 | </p> | 25 | </p> |
| 26 | <p class="node_action_bar standalone_action_bar diff_step_bar"> | 26 | <p class="node_action_bar diff_step_bar"> |
| 27 | <% if earlier %> | 27 | <% if earlier %> |
| 28 | <%= link_to t(".pair_link", :from => earlier.first, :to => earlier.last), diff_node_revisions_path(@node, | 28 | <%= link_to t(".pair_link", :from => earlier.first, :to => earlier.last), diff_node_revisions_path(@node, |
| 29 | start_revision: earlier.first, end_revision: earlier.last, | 29 | start_revision: earlier.first, end_revision: earlier.last, |
| @@ -43,13 +43,13 @@ | |||
| 43 | <% end %> | 43 | <% end %> |
| 44 | 44 | ||
| 45 | <% unless numeric_comparison %> | 45 | <% unless numeric_comparison %> |
| 46 | <p class="node_action_bar standalone_action_bar"> | 46 | <p class="node_action_bar"> |
| 47 | <%= link_to t(".compare_numbered"), node_revisions_path(@node) %> | 47 | <%= link_to t(".compare_numbered"), node_revisions_path(@node) %> |
| 48 | </p> | 48 | </p> |
| 49 | <% end %> | 49 | <% end %> |
| 50 | 50 | ||
| 51 | <% if @available_layer_pairs.present? %> | 51 | <% if @available_layer_pairs.present? %> |
| 52 | <div class="node_action_bar standalone_action_bar"> | 52 | <div class="node_action_bar"> |
| 53 | <% @available_layer_pairs.each do |pair| %> | 53 | <% @available_layer_pairs.each do |pair| %> |
| 54 | <% next if [params[:start_revision].to_s, params[:end_revision].to_s].sort == pair.map(&:to_s).sort %> | 54 | <% next if [params[:start_revision].to_s, params[:end_revision].to_s].sort == pair.map(&:to_s).sort %> |
| 55 | <%= button_to t("nodes.show.diff_layers", :from => t("nodes.show.layer_#{pair.first}"), :to => t("nodes.show.layer_#{pair.last}")), | 55 | <%= button_to t("nodes.show.diff_layers", :from => t("nodes.show.layer_#{pair.first}"), :to => t("nodes.show.layer_#{pair.last}")), |
diff --git a/app/views/revisions/index.html.erb b/app/views/revisions/index.html.erb index 09eac565..c913b2a9 100644 --- a/app/views/revisions/index.html.erb +++ b/app/views/revisions/index.html.erb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <h2><%= t(".title", :path => @node.unique_name) %></h2> | 1 | <h2><%= t(".title", :path => @node.unique_name) %></h2> |
| 2 | 2 | ||
| 3 | <p class="node_action_bar standalone_action_bar"> | 3 | <p class="node_action_bar"> |
| 4 | <%= link_to t(".back_to_node"), node_path(@node) %> | 4 | <%= link_to t(".back_to_node"), node_path(@node) %> |
| 5 | </p> | 5 | </p> |
| 6 | 6 | ||
diff --git a/app/views/revisions/show.html.erb b/app/views/revisions/show.html.erb index 1456a051..a898b7e6 100644 --- a/app/views/revisions/show.html.erb +++ b/app/views/revisions/show.html.erb | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | <div id="admin_layout" class="show_node"> | 2 | <div id="admin_layout" class="show_node"> |
| 3 | <h1><%= t(".title", :rev => @page.revision) %>: <%= translation&.title %> <small>(<%= @translation_locale.to_s.upcase %>)</small></h1> | 3 | <h1><%= t(".title", :rev => @page.revision) %>: <%= translation&.title %> <small>(<%= @translation_locale.to_s.upcase %>)</small></h1> |
| 4 | 4 | ||
| 5 | <div id="content"> | 5 | <div class="layout_row"> |
| 6 | <div class="layout_row_label"><%= t("admin.columns.actions") %></div> | 6 | <div class="layout_row_label"><%= t("admin.columns.actions") %></div> |
| 7 | <div class="layout_row_content info_group"> | 7 | <div class="layout_row_content info_group"> |
| 8 | <div class="info_group_items"> | 8 | <div class="info_group_items"> |
| @@ -11,28 +11,44 @@ | |||
| 11 | </div> | 11 | </div> |
| 12 | </div> | 12 | </div> |
| 13 | </div> | 13 | </div> |
| 14 | </div> | ||
| 14 | 15 | ||
| 16 | <div class="layout_row"> | ||
| 15 | <div class="layout_row_label"><%= t("admin.columns.path") %></div> | 17 | <div class="layout_row_label"><%= t("admin.columns.path") %></div> |
| 16 | <div class="layout_row_content"><%= @page.public_link %></div> | 18 | <div class="layout_row_content"><%= @page.public_link %></div> |
| 19 | </div> | ||
| 17 | 20 | ||
| 21 | <div class="layout_row"> | ||
| 18 | <div class="layout_row_label"><%= t("admin.columns.author") %></div> | 22 | <div class="layout_row_label"><%= t("admin.columns.author") %></div> |
| 19 | <div class="layout_row_content"><%= @page.user.try(:login) %></div> | 23 | <div class="layout_row_content"><%= @page.user.try(:login) %></div> |
| 24 | </div> | ||
| 20 | 25 | ||
| 26 | <div class="layout_row"> | ||
| 21 | <div class="layout_row_label"><%= t("admin.columns.editor") %></div> | 27 | <div class="layout_row_label"><%= t("admin.columns.editor") %></div> |
| 22 | <div class="layout_row_content"><%= @page.editor.try(:login) %></div> | 28 | <div class="layout_row_content"><%= @page.editor.try(:login) %></div> |
| 29 | </div> | ||
| 23 | 30 | ||
| 31 | <div class="layout_row"> | ||
| 24 | <div class="layout_row_label"><%= t("nodes.show.last_updated") %></div> | 32 | <div class="layout_row_label"><%= t("nodes.show.last_updated") %></div> |
| 25 | <div class="layout_row_content"><%= admin_datetime(@page.updated_at) %></div> | 33 | <div class="layout_row_content"><%= admin_datetime(@page.updated_at) %></div> |
| 34 | </div> | ||
| 26 | 35 | ||
| 36 | <div class="layout_row"> | ||
| 27 | <div class="layout_row_label"><%= t("nodes.show.published_at") %></div> | 37 | <div class="layout_row_label"><%= t("nodes.show.published_at") %></div> |
| 28 | <div class="layout_row_content"><%= admin_datetime(@page.published_at) %></div> | 38 | <div class="layout_row_content"><%= admin_datetime(@page.published_at) %></div> |
| 39 | </div> | ||
| 29 | 40 | ||
| 41 | <div class="layout_row"> | ||
| 30 | <div class="layout_row_label"><%= Page.human_attribute_name(:title) %></div> | 42 | <div class="layout_row_label"><%= Page.human_attribute_name(:title) %></div> |
| 31 | <div class="layout_row_content"><%= translation&.title %></div> | 43 | <div class="layout_row_content"><%= translation&.title %></div> |
| 44 | </div> | ||
| 32 | 45 | ||
| 46 | <div class="layout_row"> | ||
| 33 | <div class="layout_row_label"><%= Page.human_attribute_name(:abstract) %></div> | 47 | <div class="layout_row_label"><%= Page.human_attribute_name(:abstract) %></div> |
| 34 | <div class="layout_row_content"><%= translation&.abstract %></div> | 48 | <div class="layout_row_content"><%= translation&.abstract %></div> |
| 49 | </div> | ||
| 35 | 50 | ||
| 51 | <div class="layout_row"> | ||
| 36 | <div class="layout_row_label"><%= Page.human_attribute_name(:body) %></div> | 52 | <div class="layout_row_label"><%= Page.human_attribute_name(:body) %></div> |
| 37 | <div class="layout_row_content"><%= raw translation&.body %></div> | 53 | <div class="layout_row_content"><%= raw translation&.body %></div> |
| 38 | </div> | 54 | </div> |
