georgia 0.7.8 → 0.8.0

data/app/views/georgia/dashboard/show.html.erb

@@ -6,13 +6,19 @@
       <h2>Georgia CMS <small><%= Georgia::VERSION %></small></h2>
       <p>Compatibility & Extensibility</p>
       <p>
-        Georgia is <%= link_to "Motion Eleven", "http://www.motioneleven.com/" %>'s CMS engine for Ruby on Rails applications. Key features include user authentication, widgets, slideshows, publishing system, revisioning and more.
+        Georgia is a CMS engine for Ruby on Rails applications. Key features include user authentication, widgets, slideshows, publishing system, revisioning and more.
       </p>
       <p><%= link_to 'Get started', search_pages_path, class: 'btn btn-primary btn-lg' %></p>
     </div>
   <% end -%>
   <div class="row">
-    <%= render 'georgia/dashboard/panels/messages' if @messages %>
-    <%= render 'georgia/dashboard/panels/reviews' if @awaiting_revisions %>
+    <div class="col-md-7">
+      <%= render_activities @activities, fallback: 'default' %>
+      <%= paginate @activities %>
+    </div>
+    <div class="col-md-5">
+      <%= render 'georgia/dashboard/panels/reviews' if @awaiting_revisions %>
+      <%= render 'georgia/dashboard/panels/messages' if @messages %>
+    </div>
   </div>
 </div>

data/app/views/georgia/header/_media.html.erb

@@ -1,3 +1,3 @@
-<% if can? :index, Ckeditor::Asset %>
-  <%= sidebar_navigation_link 'Media', georgia.media_index_url, controller: 'media', icon: 'picture-o' %>
+<% if Georgia::MediaPolicy.new(current_user, Ckeditor::Asset).search? %>
+  <%= sidebar_navigation_link 'Media', georgia.media_index_path, controller: 'media', icon: 'picture-o' %>
 <% end -%>

data/app/views/georgia/header/_navigation.html.erb

@@ -1,3 +1,3 @@
-<% if can? :index, Georgia::Menu %>
-  <%= sidebar_navigation_link 'Navigation', georgia.menus_url, controller: 'menus', icon: 'align-justify' %>
-<% end -%>
+<% if Georgia::NavigationPolicy.new(current_user, Georgia::Menu).index? %>
+  <%= sidebar_navigation_link 'Navigation', georgia.menus_path, controller: 'menus', icon: 'align-justify' %>
+<% end -%>

data/app/views/georgia/header/_pages.html.erb

@@ -1,3 +1,3 @@
-<% if can? :index, Georgia::Page %>
-  <%= sidebar_navigation_link 'Pages', georgia.search_pages_url, controller: 'pages', icon: 'file' %>
-<% end -%>
+<% if Georgia::PagePolicy.new(current_user, Georgia::Page).search? %>
+  <%= sidebar_navigation_link 'Pages', georgia.search_pages_path, icon: 'file', active: (controller_name == 'pages' or (controller_name == 'revisions' and @revision.try(:revisionable_type) == 'Georgia::Page')) %>
+<% end -%>

data/app/views/georgia/header/_users.html.erb

@@ -1,3 +1,3 @@
-<% if can? :index, Georgia::User %>
-  <%= sidebar_navigation_link 'Users', georgia.users_url, controller: 'users', icon: 'user' %>
+<% if Georgia::UserPolicy.new(current_user, Georgia::User).index? %>
+  <%= sidebar_navigation_link 'Users', georgia.users_path, controller: 'users', icon: 'user' %>
 <% end -%>

data/app/views/georgia/header/_widgets.html.erb

@@ -1,3 +1,3 @@
-<% if can? :index, Georgia::Widget %>
+<% if Georgia::WidgetPolicy.new(current_user, Georgia::Widget).index? %>
   <%= sidebar_navigation_link 'Widgets', georgia.widgets_path, controller: 'widgets', icon: 'wrench' %>
 <% end -%>

data/app/views/georgia/media/_header.html.erb

@@ -1,6 +1,8 @@
 <header class='header-main'>
-  <div class="header-title">
+  <div class="header-gutter">
     <%= link_to_back search_media_index_path if action_name == 'edit' %>
+  </div>
+  <div class="header-title">
     <%= form_for :search, url: search_media_index_path, method: :get, html: {role: 'search'} do |f| %>
       <%= facets_inputs([:tg]) %>
       <%= hidden_field_tag :e, params[:e] if params[:e] %>
@@ -8,7 +10,7 @@
         <div class="input-group-btn">
           <button class="btn btn-default"><%= icon_tag('search') %></button>
         </div>
-        <%= text_field_tag :query, params[:query], class: 'form-control input-search', placeholder: 'Search' %>
+        <%= text_field_tag :query, params[:query], class: 'form-control input-search', placeholder: 'Search', autofocus: true %>
       </div>
     <% end -%>
   </div>

data/app/views/georgia/media/create.js.erb

@@ -1,5 +1,6 @@
 <% if @assets and @assets.any? %>
   $('table.assets tbody').prepend("<%= j render(@assets) %>");
+  $('tr.no-assets').remove();
 <% end %>
 <% flash.each do |name, msg| %>
   new Flash('<%= msg %>', '<%= name %>')

data/app/views/georgia/media/destroy.js.erb

@@ -0,0 +1,3 @@
+<% if @status_message and @status %>
+  new Flash('<%= @status_message %>', '<%= @status %>')
+<% end %>

data/app/views/georgia/media/edit.html.erb

@@ -7,25 +7,11 @@
   <div class="row">
     <div class="col-md-9">
 
-      <h2>
-        <%= link_to @asset.filename, @asset.url %>
-        <% unless @asset.is_a?(Ckeditor::Picture) %>
-          <%= link_to icon_tag('link'), @asset.url, title: @asset.url, target: '_blank', class: 'btn btn-default' %>
-        <% end -%>
-      </h2>
+      <h2><%= @asset.filename %></h2>
 
-      <% if @asset.is_a?(Ckeditor::Picture) %>
-        <div class="media-editable js-media-editable">
-          <div class="media-actions" style='display:none;'>
-            <%= link_to icon_tag('link'), @asset.url, class: 'btn btn-default btn--square', target: '_blank' %>
-            <%= simple_form_for @asset, as: :asset, url: media_path(@asset), html: {class: 'form-asset-replace'} do |f| %>
-              <span class="btn btn-primary btn-file-upload btn--square">
-                <span class='btn-file-upload-text'><%= icon_tag 'refresh' %> Replace</span>
-                <%= f.input_field :data, as: :file, class: 'input-file-upload js-replace-asset' %>
-              </span>
-            <% end -%>
-          </div>
-          <%= image_tag @asset.url(:content), title: @asset.filename, class: 'media-image--inline' %>
+      <% if @asset.image? %>
+        <div class="media-editable">
+          <%= image_tag @asset.url, title: @asset.filename, class: 'media-image--inline' %>
         </div>
       <% end -%>
     </div>
@@ -46,27 +32,46 @@
             <b>Last updated: </b> <em><%= @asset.updated_at.strftime('%F') %></em>
           </p>
           <p>
-            <%= simple_form_for @asset, as: :asset, url: media_path(@asset) do |f| %>
-              <%= f.input :tag_list, input_html: {class: 'js-token-input'} %>
-              <%= button_to_save if can?(:update, @asset) %>
-              <%= link_to_delete media_path(@asset) if can? :destroy, @asset %>
-            <% end -%>
+            <%= link_to "#{icon_tag('link')} Link to original file".html_safe, @asset.url, title: @asset.url, target: '_blank', class: 'btn btn-default' %>
           </p>
+          <% if @asset.is_a?(Ckeditor::Picture) and policy(@asset).update? %>
+            <div class="media-editable js-media-editable">
+              <%= simple_form_for @asset, as: :asset, url: media_path(@asset), html: {class: 'form-asset-replace'} do |f| %>
+                <span class="btn btn-primary btn-file-upload">
+                  <span class='btn-file-upload-text'><%= icon_tag 'refresh' %> Replace File</span>
+                  <%= f.input_field :data, as: :file, class: 'input-file-upload js-replace-asset' %>
+                </span>
+              <% end -%>
+            </div>
+          <% end -%>
         </div>
       </div>
-      <% if @asset.is_a?(Ckeditor::Picture) %>
+      <%= simple_form_for @asset, as: :asset, url: media_path(@asset) do |f| %>
+
         <div class="panel panel-default">
           <div class="panel-heading">
-            <h3 class="panel-title">Featured in <%= pluralize(@asset.pages.length, 'page') %></h3>
+            <h3 class="panel-title">Tags</h3>
           </div>
           <div class="panel-body">
-            <ul>
-              <% @asset.pages.each do |page| %>
-                <li><%= link_to page.title, [:edit, page] %></li>
-              <% end -%>
-            </ul>
+            <%= f.input :tag_list, as: :text, label: false, input_html: {class: 'js-taggable', rows: 1} %>
           </div>
         </div>
+        <% if @asset.is_a?(Ckeditor::Picture) %>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h3 class="panel-title">Featured in <%= pluralize(@asset.pages.length, 'page') %></h3>
+            </div>
+            <div class="panel-body">
+              <ul>
+                <% @asset.pages.each do |page| %>
+                  <li><%= link_to page.title, [:edit, page] %></li>
+                <% end -%>
+              </ul>
+            </div>
+          </div>
+        <% end -%>
+        <%= button_to_save if policy(@asset).update? %>
+        <%= link_to_delete media_path(@asset) if policy(@asset).destroy? %>
       <% end -%>
     </div>
   </div>

data/app/views/georgia/media/search.html.erb

@@ -14,7 +14,7 @@
           <%= hidden_field_tag "ids", nil, class: 'downloadable-ids' %>
           <%= content_tag :button, "#{icon_tag('download')} Download".html_safe, type: "submit", class: "btn btn-default btn-xs js-download disabled" %>
         <% end -%>
-        <%= link_to "#{icon_tag('trash-o')} Delete".html_safe, '#', method: :delete, data: {confirm: "Are you sure?"}, remote: true, class: 'btn btn-xs btn-default js-delete disabled' if can? :destroy, Ckeditor::Asset %>
+        <%= link_to "#{icon_tag('trash-o')} Delete".html_safe, '#', method: :delete, data: {confirm: "Are you sure?"}, remote: true, class: 'btn btn-xs btn-default js-delete disabled' if policy(Ckeditor::Asset).destroy? %>
       </th>
       <th colspan='3'>
         <%= pagination_tag(@search) %>
@@ -24,7 +24,7 @@
       <% if @assets and @assets.any? %>
         <%= render @assets %>
       <% else %>
-        <tr>
+        <tr class='no-assets'>
           <td colspan="6">
             There are currently no assets.
           </td>

data/app/views/georgia/menus/index.html.erb

@@ -23,7 +23,7 @@
       <% if @menus and @menus.any? %>
         <%= render @menus %>
       <% else %>
-        <p>There are currently no navigation menus. <%= link_to 'Create a new one', new_menu_url, data: {toggle: 'modal', target:
+        <p>There are currently no navigation menus. <%= link_to 'Create a new one', new_menu_path, data: {toggle: 'modal', target:
       '#menu_form'} %></p>
       <% end %>
     </div>

data/app/views/georgia/pages/_header.html.erb

@@ -1,6 +1,6 @@
 <header class='header-main'>
   <div class="header-title">
-    <%= form_for :search, url: georgia.search_pages_url, method: :get, html: {role: 'search'} do |f| %>
+    <%= form_for :search, url: georgia.search_pages_path, method: :get, html: {role: 'search'} do |f| %>
       <%= facets_inputs([:tg]) %>
       <%= hidden_field_tag :s, params[:s] if params[:s] %>
       <%= hidden_field_tag :t, params[:t] if params[:t] %>
@@ -8,15 +8,15 @@
         <div class="input-group-btn">
           <button class="btn btn-default"><%= icon_tag('search') %></button>
         </div>
-        <%= text_field_tag :query, params[:query], class: 'form-control input-search', placeholder: 'Search' %>
+        <%= text_field_tag :query, params[:query], class: 'form-control input-search', placeholder: 'Search', autofocus: true %>
       </div>
     <% end -%>
   </div>
   <div class="header-actions">
-    <%= link_to "#{icon_tag('plus')} Add new".html_safe, '#', class: 'btn btn-primary', data: {toggle: 'modal', target: '#page_form'} if can?(:create, model) %>
+    <%= link_to "#{icon_tag('plus')} Add new".html_safe, '#', class: 'btn btn-primary', data: {toggle: 'modal', target: '#page_form'} if policy(Georgia::Page).create? %>
   </div>
 </header>
 
 <%= content_for :footer do %>
-  <%= render 'georgia/shared/modals/page' if can?(:create, model) %>
+  <%= render 'georgia/shared/modals/page' if policy(Georgia::Page).create? %>
 <% end -%>

data/app/views/georgia/pages/_page.html.erb

@@ -4,7 +4,7 @@
   </td>
   <td>
     <%= icon_tag 'pencil hide pull-right muted' %>
-    <%= link_to page.title, edit_page_revision_path(page_id: page.id, id: page.revision_id), class: 'page-title js-toggle-icon' %>
+    <%= link_to page.title, [:edit, page], class: 'page-title js-toggle-icon' %>
   </td>
   <td>
     <%= facet_list_tag(page.tag_list, :tg) %>

data/app/views/georgia/pages/search.html.erb

@@ -11,10 +11,9 @@
           <%= checkboxable_all_tag :pages %>
         </th>
         <th>
-          <%= link_to "#{icon_tag('bolt')} Flush Cache".html_safe, '#', class: 'btn btn-default btn-xs disabled js-flush-cache', role: 'button' if can?(:flush_cache, model) %>
-          <%= link_to "#{icon_tag('thumbs-up')} Publish".html_safe, '#', class: 'btn btn-default btn-xs disabled js-publish', role: 'button' if can?(:publish, model) %>
-          <%= link_to "#{icon_tag('thumbs-down')} Unpublish".html_safe, '#', class: 'btn btn-default btn-xs disabled js-unpublish', role: 'button' if can?(:unpublish, model) %>
-          <%= link_to "#{icon_tag('trash-o')} Delete".html_safe, '#', class: 'btn btn-default btn-xs disabled js-delete', role: 'button' if can?(:destroy, model) %>
+          <%= link_to("#{icon_tag('thumbs-up')} Publish".html_safe, '#', class: 'btn btn-default btn-xs disabled js-publish', role: 'button') if policy(Georgia::Page).publish? %>
+          <%= link_to("#{icon_tag('thumbs-down')} Unpublish".html_safe, '#', class: 'btn btn-default btn-xs disabled js-unpublish', role: 'button') if policy(Georgia::Page).unpublish? %>
+          <%= link_to("#{icon_tag('trash-o')} Delete".html_safe, '#', class: 'btn btn-default btn-xs disabled js-delete', role: 'button') if policy(Georgia::Page).destroy? %>
         </th>
         <th colspan='3'>
           <%= pagination_tag(@search) %>
@@ -25,7 +24,7 @@
       </tbody>
     </table>
   <% else -%>
-    <h2>Yikes! There are <%= pluralize(0, instance_name.humanize.downcase) %>.</h2>
+    <h2>Yikes! You don't have any <%= instance_name.try(:humanize).try(:downcase).try(:pluralize) %> yet.</h2>
     <%= link_to "Get Started", '#', class: 'btn btn-primary btn--jumbo', data: {toggle: 'modal', target: '#page_form'} %>
   <% end -%>
 

data/app/views/georgia/pages/settings.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for @page, as: :page, url: url_for( controller: controller_name, action: :update, id: @page.id), html: {class: 'form-vertical form-with-helpers js-spin-and-roll', data: {'page-id' => @page.id}, defaults: { input_html: { class: "form-control" }}} do |f| %>
+<%= simple_form_for @page, as: :page, url: url_for(controller: controller_name, action: :update, id: @page.id), html: {class: 'form-vertical form-with-helpers js-spin-and-roll', data: {'page-id' => @page.id}, defaults: { input_html: { class: "form-control" }}} do |f| %>
   <header class='header-main'>
     <div class="header-gutter">
       <%= link_to_back search_pages_path %>
@@ -7,73 +7,84 @@
       <h1 class='title-truncated'><%= @page.title %></h1>
     </div>
     <div class="header-actions">
-      <%= page_actions_tag(@page) %>
-      <%= button_to_save if can? :update, @page %>
+      <%= button_to_edit if policy(@page).edit? %>
+      <%= link_to "#{icon_tag('copy')} Copy".html_safe, [:copy, @page], class: 'btn btn-default' if policy(@page).copy? %>
+      <%= button_to_save if policy(@page).update? %>
     </div>
   </header>
-  <div class='body-main'>
-    <h2><%= icon_tag 'cog' %> <%= instance_name.titleize %> Settings</h2>
+  <section class="body-main">
+    <div class="row">
+      <div class="col-md-9">
+        <h2 class='body-title'><%= icon_tag 'cog' %> <%= instance_name.titleize %> Settings</h2>
 
-    <% if extra_fields? %>
-      <%= render partial: extra_fields_path, locals: {f: f, page: @page}  %>
-    <% end -%>
+        <% if extra_fields? %>
+          <%= render partial: extra_fields_path, locals: {f: f, page: @page}  %>
+        <% end -%>
 
-    <fieldset>
-      <div class="fieldset-help">
-        <legend>
-          URL & Handle
-          <%= tooltip_tag(icon_tag('info-circle'), "The URL is automatically generated from the #{instance_name}'s hierarchy and title in the default language.") %>
-        </legend>
-      </div>
-      <div class="fieldset-fields">
-        <div class="input-group">
-          <div class="input-group-btn">
-            <a class='btn btn-default disabled'><%= page_url_minus_slug %></a>
+        <fieldset>
+          <div class="fieldset-help">
+            <legend>
+              URL & Handle
+              <%= tooltip_tag(icon_tag('info-circle'), "The URL is automatically generated from the #{instance_name}'s hierarchy and title in the default language.") %>
+            </legend>
           </div>
-          <%= f.input_field :slug, data: {slug: @page.slug}, class: 'form-control' %>
-        </div>
-      </div>
-    </fieldset>
+          <div class="fieldset-fields">
+            <div class="input-group">
+              <div class="input-group-btn">
+                <a class='btn btn-default disabled'><%= page_url_minus_slug %></a>
+              </div>
+              <%= f.input_field :slug, pattern: '[a-zA-Z0-9]+', data: {slug: @page.slug}, class: 'form-control' %>
+            </div>
+          </div>
+        </fieldset>
 
-    <fieldset>
-      <div class="fieldset-help">
-        <legend>
-          Tags
-          <%= tooltip_tag(icon_tag('info-circle'), "Tags can later be used to show similar pages or pages sharing the same tags.") %>
-        </legend>
-        <p class="hint">
-          Use tags to help Georgia understand what this page is about.
-        </p>
-      </div>
-      <div class="fieldset-fields">
-        <%= f.input :tag_list, label: false, input_html: {class: 'js-token-input'} %>
-      </div>
-    </fieldset>
+        <fieldset>
+          <div class="fieldset-help">
+            <legend>
+              Tags
+              <%= tooltip_tag(icon_tag('info-circle'), "Tags can later be used to show similar pages or pages sharing the same tags.") %>
+            </legend>
+            <p class="hint">
+              Use tags to help Georgia understand what this page is about.
+            </p>
+          </div>
+          <div class="fieldset-fields">
+            <%= f.input :tag_list, as: :text, label: false, input_html: {class: 'js-taggable', rows: 1} %>
+          </div>
+        </fieldset>
 
-    <fieldset>
-      <div class="fieldset-help">
-        <legend>Hierarchy</legend>
-        <p class='hint'>
-          Move the <%= instance_name.pluralize %> around to change their display position.
-        </p>
+        <fieldset>
+          <div class="fieldset-help">
+            <legend>Hierarchy</legend>
+            <p class='hint'>
+              Move the <%= instance_name.pluralize %> around to change their display position.
+            </p>
+          </div>
+          <div class="fieldset-fields">
+            <%= f.input :parent_id, collection: parent_page_collection, label: 'Parent', hint: "Select <em>None</em> if the #{instance_name.humanize.downcase} doesn't belong to any section.".html_safe, include_blank: "None", input_html: {class: 'js-select2'} %>
+            <div class="control-group">
+              <%= label_tag :subpages %>
+              <% if @page.persisted? and @page.has_children? %>
+                <ul class="nav nav-stacked subpages js-position-sort">
+                  <%= render partial: 'georgia/pages/subpage', collection: @page.children.ordered %>
+                </ul>
+              <% else -%>
+                <p class='help-block'>There are no subpages for this <%= instance_name.humanize.downcase %>.</p>
+              <% end -%>
+            </div>
+          </div>
+        </fieldset>
+        <footer>
+          <hr />
+          <%= button_to_save if policy(@page).update? %>
+        </footer>
       </div>
-      <div class="fieldset-fields">
-        <%= f.input :parent_id, collection: parent_page_collection, label: 'Parent', hint: "Select <em>None</em> if the #{instance_name.humanize.downcase} doesn't belong to any section.".html_safe, include_blank: "None", input_html: {class: 'js-select2'} %>
-        <div class="control-group">
-          <%= label_tag :subpages %>
-          <% if @page.persisted? and @page.has_children? %>
-            <ul class="nav nav-stacked subpages js-position-sort">
-              <%= render partial: 'georgia/pages/subpage', collection: @page.children.ordered %>
-            </ul>
-          <% else -%>
-            <p class='help-block'>There are no subpages for this <%= instance_name.humanize.downcase %>.</p>
-          <% end -%>
-        </div>
+      <div class="col-md-3 body-sidebar">
+        <%= render 'georgia/revisions/panels/actions' %>
+        <%= render 'georgia/revisions/panels/info' %>
+        <%= render 'georgia/revisions/panels/drafts' %>
+        <%= render 'georgia/revisions/panels/activities' %>
       </div>
-    </fieldset>
-    <footer>
-      <hr />
-      <%= link_to_delete @page if can? :destroy, @page %>
-    </footer>
-  </div>
+    </div>
+  </section>
 <% end %>

data/app/views/georgia/revisions/_revision.html.erb

@@ -1,11 +1,16 @@
-<div class="revision">
-  <span class='badge badge-default'>id:<%= revision.id %></span>
-  <span class='label label-<%= revision.review? ? 'warning' : 'default' %>'><%= revision.state %></span>
-  <%= link_to revision.created_at.strftime('%F %H:%M'), [@page, revision] %>
-  <small class="muted">updated <%= time_ago_in_words(revision.updated_at) %> ago</small>
+<div class="revision media">
+  <%= icon_tag('star pull-left', size: 'lg', title: 'Current Revision') if @page.current_revision == revision %>
+  <%= image_tag avatar_url(revision.user.try(:email)), alt: '', class: 'media-object pull-left' %>
   <div class="pull-right">
     <%= link_to "#{icon_tag('pencil')} Edit".html_safe, [@page, revision], class: 'btn btn-info' %>
-    <%= link_to "#{icon_tag('undo')} Restore".html_safe, [:restore, @page, revision] , class: 'btn btn-warning' if can? :restore, @revision %>
-    <%= link_to_delete [@page, revision] if can? :destroy, @revision %>
+    <%= link_to "#{icon_tag('undo')} Restore".html_safe, [:restore, @page, revision] , class: 'btn btn-warning', disabled: (@page.current_revision == revision) if policy(revision).restore? %>
+    <%= link_to_delete [@page, revision], disabled: (@page.current_revision == revision) if policy(revision).destroy? %>
+  </div>
+  <div class="media-body">
+    <h4 class="media-heading">
+      <small class='badge badge-default'>id:<%= revision.id %></small>
+      <small class='label label-<%= revision.status %>'><%= revision.status %></small>
+      <small class="muted">updated <%= time_ago_in_words(revision.updated_at) %> ago</small>
+    </h4>
   </div>
 </div>

data/app/views/georgia/revisions/edit.html.erb

@@ -10,23 +10,29 @@
           <%= link_to @content.title_or_none, '#', class: 'title-truncated' %>
           <%= icon_tag 'pencil' %>
         </h1>
-        <%= c.input_field :title, class: 'input-lg form-control', placeholder: 'Title' %>
+        <%= c.input_field :title, class: 'input-md form-control', placeholder: 'Title' %>
       </div>
       <div class="header-actions">
         <%= button_to_settings %>
-        <%= page_actions_tag(@page, @revision) %>
-        <%= button_to_save %>
+        <%= button_to_save if policy(@revision).update? %>
       </div>
     </header>
     <section class="body-main">
-      <%= render partial: 'georgia/revisions/fields/content', locals: {f: c} %>
-      <%= render partial: 'georgia/revisions/fields/template', locals: {f: f} %>
-      <%= render partial: 'georgia/revisions/fields/slides', locals: {f: f} %>
-      <%= render partial: 'georgia/revisions/fields/widgets', locals: {f: f} %>
-      <footer>
-        <hr />
-        <%= link_to_delete @page if can?(:destroy, @page) %>
-      </footer>
+      <div class="row">
+        <div class="col-md-9">
+          <%= render partial: 'georgia/revisions/fields/message' %>
+          <%= render partial: 'georgia/revisions/fields/content',  locals: {f: c} %>
+          <%= render partial: 'georgia/revisions/fields/template', locals: {f: f} %>
+          <%= render partial: 'georgia/revisions/fields/slides',   locals: {f: f} %>
+          <%= render partial: 'georgia/revisions/fields/widgets',  locals: {f: f} %>
+        </div>
+        <div class="col-md-3 body-sidebar">
+          <%= render 'georgia/revisions/panels/actions' %>
+          <%= render 'georgia/revisions/panels/info' %>
+          <%= render 'georgia/revisions/panels/drafts' %>
+          <%= render 'georgia/revisions/panels/activities' %>
+        </div>
+      </div>
     </section>
   <% end -%>
 <% end %>