RubyGems - storytime - Versions diffs - 0.0.4 → 1.0.0 - Mend

storytime 0.0.4 → 1.0.0

Files changed (746) hide show

data/app/policies/storytime/post_policy.rb CHANGED Viewed

@@ -30,6 +30,14 @@ module Storytime
       create?
     end
+    def show?
+      if @post.preview
+        manage?
+      else
+        true
+      end
+    end
     def update?
       manage?
     end
@@ -47,7 +55,12 @@ module Storytime
         true
       else
         action = Storytime::Action.find_by(guid: "d8a1b1")
-        @user.storytime_role.allowed_actions.include?(action)
+        if @user.nil?
+          false
+        else
+          @user.storytime_role.allowed_actions.include?(action)
+        end
       end
     end
@@ -57,11 +70,16 @@ module Storytime
       else
         Storytime::Action.find_by(guid: "d8a1b1")
       end
-      @user.storytime_role.allowed_actions.include?(action)
+      if @user.nil?
+        false
+      else
+        @user.storytime_role.allowed_actions.include?(action)
+      end
     end
     def permitted_attributes
-      attrs = [:title, :draft_content, :draft_version_id, :excerpt, :tag_list, :featured_media_id]
+      attrs = [:title, :draft_content, :draft_version_id, :excerpt, :featured_media_id, :secondary_media_id, :slug, :published_at_date, :published_at_time, {:tag_list => []}]
       attrs << :published if publish?
       attrs
     end

data/app/policies/storytime/snippet_policy.rb ADDED Viewed

@@ -0,0 +1,43 @@
+module Storytime
+  class SnippetPolicy
+    attr_reader :user, :record
+    def initialize(user, record)
+      @user = user
+      @post = record
+    end
+    def index?
+      manage?
+    end
+    def create?
+      manage?
+    end
+    def new?
+      manage?
+    end
+    def update?
+      manage?
+    end
+    def edit?
+      manage?
+    end
+    def destroy?
+      manage?
+    end
+    def manage?
+      action = Storytime::Action.find_by(guid: "5qg25i")
+      user.storytime_role.allowed_actions.include?(action)
+    end
+    def permitted_attributes
+      [:name, :content]
+    end
+  end
+end

data/app/uploaders/storytime/media_uploader.rb CHANGED Viewed

@@ -9,6 +9,10 @@ module Storytime
     end
     version :thumb do
+      process resize_to_fit: [250, 150]
+    end
+    version :tiny do
       process resize_to_fit: [50, 50]
     end

data/app/views/layouts/storytime/application.html.erb CHANGED Viewed

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Storytime</title>
+    <title><%= t('layout.title') %></title>
     <%= stylesheet_link_tag    "storytime/application", media: "all" %>
     <%= javascript_include_tag "storytime/application" %>
@@ -15,13 +15,13 @@
   </head>
   <body class="<%= params[:controller].split('/').join(' ') %> <%= params[:action] %> <%= params[:controller].parameterize %>-controller <%=params[:action]%>-action" data-controller="<%=params[:controller].camelize%>" data-action="<%=params[:action].camelize%>">
     <%= render "storytime/application/storytime/navigation" %>
     <%= render "storytime/application/storytime/flash" %>
-    <%= render 'storytime/application/storytime/header' unless devise_controller? %>
+    <%= render "storytime/application/storytime/header" %>
     <%= yield %>
-    <%= render 'storytime/application/storytime/footer' unless devise_controller? %>
-    <%= render 'storytime/sites/google_analytics_code' %>
+    <%= render "storytime/application/storytime/footer" %>
+    <%= render "storytime/sites/google_analytics_code" %>
   </body>
 </html>

data/app/views/storytime/application/storytime/_footer.html.erb CHANGED Viewed

@@ -1,3 +1,7 @@
-<% if @site && @site.footer.present? %>
-  <%= raw @site.footer %>
-<% end %>
+<footer class="footer">
+  <div class="container">
+    <p class="text-muted center">
+      <%= t('footer.attribute').html_safe %>
+    </p>
+  </div>
+</footer>

data/app/views/storytime/application/storytime/_header.html.erb CHANGED Viewed

@@ -1,6 +1,4 @@
-<% if @site && @site.header.present? %>
-  <%= raw @site.header %>
-<% else %>
+<header>
   <div class="navbar navbar-default navbar-static-top" role="navigation">
     <div class="container">
       <div class="navbar-header">
@@ -17,14 +15,14 @@
           <% Storytime::Page.published.each do |page| %>
             <li><%= link_to page.title, storytime.url_for(controller: "pages", action: "show", id: page.slug) %></li>
           <% end %>
-          <li><%= link_to "Blog", storytime.url_for(Storytime::BlogPost) %></li>
+          <li><%= link_to "Blog", storytime.url_for(Storytime::BlogPost.type_name.pluralize) %></li>
         </ul>
         <ul class="nav navbar-nav navbar-right">
           <% unless user_signed_in? %>
             <li><%= link_to "Sign In", main_app.new_user_session_path %></li>
           <% end %>
         </ul>
-      </div><!--/.nav-collapse -->
+      </div>
     </div>
   </div>
-<% end %>
+</header>

data/app/views/storytime/comments/_comments.html.erb CHANGED Viewed

@@ -6,4 +6,3 @@
     </div>
   </div>
 </div>

data/app/views/storytime/comments/_disqus.html.erb ADDED Viewed

@@ -0,0 +1,23 @@
+<div class="row">
+  <div class="col-md-12">
+    <div class="comments">
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+        var disqus_shortname = '<%= Storytime.disqus_forum_shortname %>'; // required: replace example with your forum shortname
+        // var disqus_identifier = 'a unique identifier for each page where Disqus is present';
+        // var disqus_title = 'a unique title for each page where Disqus is present';
+        // var disqus_url = 'a unique URL for each page where Disqus is present';
+        /* * * DON'T EDIT BELOW THIS LINE * * */
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+      <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+      <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+    </div>
+  </div>
+</div>

data/app/views/storytime/dashboard/_navigation.html.erb CHANGED Viewed

@@ -17,8 +17,14 @@
           <li <%= active_nav_item_class(post_type.type_name.pluralize) %>><%= link_to post_type.human_name.pluralize, storytime.url_for([:dashboard, Storytime::Post, type: post_type.type_name]) %></li>
         <% end %>
       <% end %>
+      <% if Pundit.policy(current_user, Storytime::Snippet).manage? %>
+        <li <%= active_nav_item_class("snippets") %>><%= link_to "Text Snippets", storytime.url_for([:dashboard, Storytime::Snippet]) %></li>
+      <% end %>
-      <li <%= active_nav_item_class("media") %>><%= link_to "Media", storytime.url_for([:dashboard, Storytime::Media]) %></li>
+      <% if Storytime.enable_file_upload %>
+        <li <%= active_nav_item_class("media") %>><%= link_to "Media", storytime.url_for([:dashboard, Storytime::Media]) %></li>
+      <% end %>
       <% if Pundit.policy(current_user, Storytime.user_class).index? %>
         <li <%= active_nav_item_class("users") %>><%= link_to "Users", storytime.url_for([:dashboard, Storytime.user_class]) %></li>
@@ -32,7 +38,7 @@
     <ul class="nav navbar-nav navbar-right" style="margin-right: 15px;">
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-          <%= current_user.email %>
+          <%= current_user.storytime_name.blank? ? current_user.email : current_user.storytime_name %>
           <b class="caret"></b>
         </a>
         <ul class="dropdown-menu">

data/app/views/storytime/dashboard/autosaves/_autosave_info.html.erb ADDED Viewed

@@ -0,0 +1,8 @@
+<% if autosavable.autosave && !params[:autosave].present? %>
+  <div id="autosaves" class="autosave_available" <% if autosavable.autosave.nil? %>style="display:none"<% end %>>
+    <div id="autosaves-toggle" data-toggle="collapse" data-target="#autosaves-panel">
+      <%= t('dashboard.posts.autosaves.available', resource: autosavable.human_name) %>
+      <%= link_to t('dashboard.posts.autosaves.view_autosave'), storytime.edit_dashboard_post_path(autosavable, autosave: autosavable.autosave.id) %>
+    </div>
+  </div>
+<% end %>

data/app/views/storytime/dashboard/media/_gallery.html CHANGED Viewed

@@ -1,6 +1,12 @@
 <div id="media_gallery">
   <div class="clearfix">
-    <%= render partial: "storytime/dashboard/media/media", collection: @media %>
+    <div class="media_container">
+      <%= render partial: "storytime/dashboard/media/media", collection: @media %>
+    </div>
   </div>
-  <%= paginate @media, remote: true, params: { controller: "dashboard/media", action: "index", id: nil } %>
+  <%= paginate @media, remote: true, params: { controller: "dashboard/media",
+                                               action: "index",
+                                               id: nil,
+                                               large_gallery: @large_gallery.nil? ? true : @large_gallery } %>
 </div>

data/app/views/storytime/dashboard/media/_media.html.erb CHANGED Viewed

@@ -1,14 +1,20 @@
-<div class="media-file" id="media_<%= media.id %>">
-  <div class="media-thumb">
-    <%= link_to media.file_url, target: "_blank" do %>
-      <%= image_tag media.file_url(:thumb) %>
-    <% end %>
-  </div>
+<div class="<%= gallery_type %>">
+  <div class="media-file" id="media_<%= media.id %>">
+    <div class="media-thumb">
+      <%= link_to media.file_url, target: "_blank" do %>
+        <% if show_large_gallery? %>
+          <%= image_tag media.file_url(:thumb) %>
+        <% else %>
+          <%= image_tag media.file_url(:tiny) %>
+        <% end %>
+      <% end %>
+    </div>
-  <div class="action-buttons">
-    <%= delete_resource_link media, dashboard_media_path(media) %>
-    <% if show_media_insert_button? %>
-      <button class="btn btn-info btn-xs insert-image-button" data-media-id="<%= media.id %>" data-image-url="<%= full_media_file_url media %>" data-thumb-url="<%= full_media_file_url media, :thumb %>">Select</button>
-    <% end %>
+    <div class="action-buttons">
+      <%= delete_resource_link media, dashboard_media_path(media) %>
+      <% if show_media_insert_button? %>
+        <button class="btn btn-info btn-xs insert-image-button" data-media-id="<%= media.id %>" data-image-url="<%= full_media_file_url media %>" data-thumb-url="<%= full_media_file_url media, :thumb %>" data-tiny-url="<%= full_media_file_url media, :tiny %>">Select</button>
+      <% end %>
+    </div>
   </div>
 </div>

data/app/views/storytime/dashboard/media/_modal.html.erb CHANGED Viewed

@@ -3,14 +3,14 @@
     <div class='modal-content'>
       <div class='modal-header'>
         <a class='close' data-dismiss='modal'>&times;</a>
-        <h4>Select Media</h4>
+        <h4><%= t('dashboard.media.select_media') %></h4>
       </div>
       <div class='modal-body'>
         <div class="clearfix hide">
-          <label for="mediaByURL">By URL:</label>
+          <label for="mediaByURL"><%= t('dashboard.media.select_media_by_url') %></label>
           <input id="mediaByURL" value='http://' class='form-control'>
           <div class="pull-right">
-            <button id="mediaByUrlSelectButton" class='btn btn-primary' data-dismiss='modal'>Select</button>
+            <button id="mediaByUrlSelectButton" class='btn btn-primary' data-dismiss='modal'><%= t('dashboard.media.select_media_from_file') %></button>
           </div>
         </div>

data/app/views/storytime/dashboard/media/index.html.erb CHANGED Viewed

@@ -1,4 +1,6 @@
 <div class="container">
+  <h2><%= t('dashboard.media.media_header') %></h2>
   <%= render "form" %>
   <%= render "gallery" %>
 </div>

data/app/views/storytime/dashboard/posts/_form.html.erb CHANGED Viewed

@@ -1,28 +1,149 @@
 <%= simple_form_for [:dashboard, @post] do |f| %>
   <%= f.error_notification %>
-  <%= f.input :title, autofocus: true %>
   <%= hidden_field_tag :type, @post.type_name %>
+  <%= hidden_field_tag 'post[published]', @post.published_at.nil? ? 0 : 1 if Pundit.policy(current_user, @post).publish? %>
+  <div class="post_field post_title">
+    <small>
+      <div class="pull-right" id="title_character_limit" data-limit="<%= Storytime.post_title_character_limit %>"></div>
+    </small>
+    <%= f.input :title, autofocus: true %>
+  </div>
-  <% if lookup_context.template_exists?("storytime/dashboard/posts/_#{@post.type_name}_fields") %>
-    <%= render("storytime/dashboard/posts/#{@post.type_name}_fields", f: f)  %>
-  <% end %>
-  <%= f.input :excerpt %>
-  <%= f.input :draft_content, as: :text, input_html: { rows: 20, class: "wysiwyg" }, label: "Content" %>
+  <div class="post_field post_excerpt">
+    <small>
+      <div class="pull-right" id="excerpt_character_limit" data-limit="<%= Storytime.post_excerpt_character_limit %>"></div>
+    </small>
+    <%= f.input :excerpt, required: false %>
+  </div>
-  <%= f.input :featured_media_id, as: :hidden, input_html: { id: "featured_media_id" } %>
-  <%= link_to "Select Featured Image", "#", class: "btn btn-default", id: "featured_media_button" %>
-  <div id="featured_media_container">
-    <%= image_tag @post.featured_media.file_url(:thumb), id: "featured_media_image" if @post.featured_media %>
+  <div class="post_field post_content">
+    <%= f.input :draft_content, as: :text, input_html: { rows: 20, class: "summernote" }, label: "Content" %>
   </div>
-  <%= f.input :tag_list %>
-  <%= f.input :published, as: :boolean, label: false, inline_label: true if Pundit.policy(current_user, @post).publish? %>
+  <div class="post_field post_tags">
+    <%= f.association :tags, input_html: { :name => 'post[tag_list][]', class: 'chosen-select', multiple: true } %>
+  </div>
+  <div class="panel-group" id="accordion">
+    <% if Storytime.enable_file_upload %>
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <h4 class="panel-title">
+            <span class="glyphicon glyphicon-picture"></span>
+            <a data-toggle="collapse" href="#post_featured_images">
+              <%= t('dashboard.posts.featured_images') %>
+            </a>
+          </h4>
+        </div>
+        <div id="post_featured_images" class="panel-collapse collapse">
+          <div class="panel-body">
+            <div class="col-md-6">
+              <%= f.input :featured_media_id, as: :hidden, input_html: { id: "featured_media_id" } %>
+              <div class="featured_image_block center-block">
+                <span class="glyphicon glyphicon-picture select_featured_image" style="<% if @post.featured_media %>display: none<% end %>"></span>
+                <div id="featured_media_container" class="image_container">
+                  <%= image_tag @post.featured_media.file_url(:thumb), id: "featured_media_image" if @post.featured_media %>
+                </div>
+                <div class="select_featured_image" <% if @post.featured_media %>style="display: none"<% end %>>
+                  <%= link_to "Select Featured Image", "#", class: "btn btn-primary", id: "featured_media_button" %>
+                </div>
+              </div>
+              <button type="button" class="btn btn-danger remove_featured_image center-block" <% unless @post.featured_media %>style="display: none"<% end %>>
+                <%= t('dashboard.posts.remove_image') %>
+              </button>
+            </div>
+            <div class="col-md-6">
+              <%= f.input :secondary_media_id, as: :hidden, input_html: { id: "secondary_media_id" } %>
+              <div class="featured_image_block center-block">
+                <span class="glyphicon glyphicon-picture select_featured_image" style="<% if @post.secondary_media %>display: none<% end %>"></span>
+                <div id="secondary_media_container" class="image_container">
+                  <%= image_tag @post.secondary_media.file_url(:thumb), id: "secondary_media_image" if @post.secondary_media %>
+                </div>
+                <div class="select_featured_image" <% if @post.secondary_media %>style="display: none"<% end %>>
+                  <%= link_to "Select Secondary Image", "#", class: "btn btn-primary", id: "secondary_media_button" %>
+                </div>
+              </div>
+              <button type="button" class="btn btn-danger remove_featured_image center-block" <% unless @post.secondary_media %>style="display: none"<% end %>>
+                <%= t('dashboard.posts.remove_image') %>
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    <% end %>
+    <% if lookup_context.template_exists?("storytime/dashboard/posts/_#{@post.type_name}_fields") %>
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <h4 class="panel-title">
+          <span class="glyphicon glyphicon-th-list"></span>
+          <a data-toggle="collapse" href="#post_additional_fields">
+            <%= t('dashboard.posts.additional_fields') %>
+          </a>
+        </div>
+        <div id="post_additional_fields" class="panel-collapse collapse in">
+          <div class="panel-body">
+              <%= render("storytime/dashboard/posts/#{@post.type_name}_fields", f: f)  %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h4 class="panel-title">
+          <span class="glyphicon glyphicon-cog"></span>
+          <a data-toggle="collapse" href="#post_advanced_settings">
+            <%= t('dashboard.posts.advanced_settings') %>
+          </a>
+        </h4>
+      </div>
+      <div id="post_advanced_settings" class="panel-collapse collapse">
+        <div class="panel-body">
+          <%= f.input :slug %>
+          <%= f.input :published_at, as: :date_time_picker, input_html: { style: "display: inline" } if @post.published? %>
+        </div>
+      </div>
+    </div>
+  </div>
-  <div class="actions">
-    <%= f.submit (@post.new_record? ? "Create #{@post.human_name}" : "Update #{@post.human_name}"), class: "btn btn-primary" %>
+  <hr>
+  <div class="post_actions">
+    <% if @post.persisted? %>
+      <%= link_to 'Delete',  url_for([:dashboard, @post]),  method: :delete, data: { confirm: t('common.are_you_sure_you_want_to_delete', resource_name: @post.human_name) }, class: "btn btn-danger" %>
+      <%= link_to "Preview", post_path(@post, preview: true), class: "btn btn-info", id: "preview_post", target: "_blank" %>
+    <% else %>
+      <button id="preview_post" class="btn btn-info">Preview</button>
+    <% end %>
+    <%= f.submit "Save Draft", class: "btn btn-default save" unless @post.published? %>
+    <div class="pull-right">
+      <%= f.submit "Publish", class: "btn btn-primary publish", publish: true unless @post.published? %>
+      <%= f.submit "Update", class: "btn btn-default save" if @post.published? %>
+    </div>
   </div>
 <% end %>
-<%= render "storytime/dashboard/media/modal" %>
+<%= render "storytime/dashboard/media/modal" if Storytime.enable_file_upload %>

data/app/views/storytime/dashboard/posts/_list.html.erb CHANGED Viewed

@@ -4,19 +4,27 @@
     <%= new_post_button(current_post_type) %>
   </h3>
   <div class="scroll-y">
-    <ul>
+    <ul class="dashboard-list">
       <% @posts.each do |post| %>
         <li id="<%= post.class.to_s.downcase.split("::").last %>_<%= post.id %>" class="<%= 'active' if current_page?(url_for([:edit, :dashboard, post])) %>">
-          <%= link_to post.title, url_for([:edit, :dashboard, post, page: params[:page]]) %>
-          <span class="pull-right">
-            <% unless post.published? %>
-              <span class="label label-warning">Draft</span>
-            <% end %>
-            <%= delete_resource_link post, url_for([:dashboard, post]), !current_page?(url_for([:edit, :dashboard, post])) %>
-          </span>
+          <div class="row">
+            <div class="col-md-8">
+              <%= link_to post.title, url_for([:edit, :dashboard, post, page_number: params[:page_number]]) %>
+            </div>
+            <div class="col-md-4">
+              <span class="pull-right">
+                <% unless post.published? %>
+                  <span class="label label-warning">Draft</span>
+                <% end %>
+                <%= delete_resource_link post, url_for([:dashboard, post]), !current_page?(url_for([:edit, :dashboard, post])) %>
+              </span>
+            </div>
+          </div>
         </li>
       <% end %>
     </ul>
-    <%= paginate @posts, param_name: "page_number" %>
+    <div class="pagination-wrapper">
+      <%= paginate @posts, param_name: "page_number" %>
+    </div>
   </div>
 </div>

data/app/views/storytime/dashboard/posts/edit.html.erb CHANGED Viewed

@@ -1,14 +1,16 @@
 <%= render 'list' %>
-<div id="main" class="pane">
-<h3 class="heading">
-  Edit <%= @post.human_name %>
-  <span class="pull-right">
-    <%= link_to "View Post", @post, class: "btn btn-default", target: "_blank" if @post.published? %>
-  </span>
-</h3>
-  <div class="scroll-y">
+<div id="main" class="pane" data-post-id="<%= @post.slug || @post.id %>" data-dashboard-namespace="<%= Storytime.dashboard_namespace_path %>" data-preview="<%= params[:preview] %>">
+  <h3 class="heading">
+    Edit <%= @post.human_name %>
+    <span class="pull-right">
+      <span id="draft_last_saved_at" class="draft_saved"></span>
+    </span>
+  </h3>
+  <div class="scroll-y edit_form">
     <div class="padding">
+      <%= autosave_info @post %>
       <%= versions_info @post %>
       <%= render 'form' %>
     </div>

data/app/views/storytime/dashboard/posts/index.html.erb CHANGED Viewed

@@ -3,8 +3,11 @@
 <div id="main" class="pane">
   <div class="scroll-y">
     <div class="padding no-content center">
-      <h3>Select a Post to Edit</h3>
-      <%= link_to "or Create One", url_for([:new, :dashboard, :post]), class: 'btn btn-info' %>
+      <h3><%= t('dashboard.posts.select_or_create', resource: current_post_type.type_name.titleize) %></h3>
+      <h4 style="margin-top: 10px;">- OR - </h4>
+      <%= link_to t('dashboard.posts.create_post'), url_for([:new, :dashboard, :post, type: current_post_type.type_name]), class: "btn btn-info", style: "margin-top: 0" %>
     </div>
   </div>
 </div>

data/app/views/storytime/dashboard/posts/new.html.erb CHANGED Viewed

@@ -2,9 +2,9 @@
 <div id="main" class="pane">
   <h3 class="heading">
-    New <%= @post.human_name %>
+    <%= t('dashboard.posts.new.header', resource: @post.human_name) %>
   </h3>
-  <div class="scroll-y">
+  <div class="scroll-y edit_form">
     <div class="padding">
       <%= render 'form' %>
     </div>

data/app/views/storytime/dashboard/sites/_form.html.erb CHANGED Viewed

@@ -1,18 +1,23 @@
-<%= simple_form_for [:dashboard, @site] do |f| %>
-  <%= f.error_notification %>
-  <%= f.input :title %>
-  <%= f.input :post_slug_style, collection: post_slug_style_options %>
-  <%= f.input :root_page_content, collection: root_page_content_options, include_blank: false %>
-  <%= f.input :root_post_id, collection: @site.root_post_options, wrapper_html: { class: (@site.root_page_content == "page" ?  "" : "hide") } %>
-  <%= f.input :ga_tracking_id %>
+<div class="row">
+  <div class="col-md-12">
+    <%= simple_form_for [:dashboard, @site] do |f| %>
+      <%= f.error_notification %>
+      <%= f.input :title %>
+      <%= f.input :post_slug_style, collection: post_slug_style_options %>
-  <!-- Header and Footer only get rendered in the storytime applicaiton layout, not the main app -->
-  <% unless Storytime.layout.present? %>
-    <%= f.input :header %>
-    <%= f.input :footer %>
-  <% end %>
+      <% unless params[:action] == "new" %>
+        <%= f.input :root_page_content, collection: root_page_content_options, include_blank: false, hint: t('dashboard.sites.root_page_content_hint') %>
+        <%= f.input :root_post_id, collection: @site.root_post_options, wrapper_html: { class: (@site.root_page_content == "page" ?  "" : "hide") }, label: t('dashboard.sites.root_post_id_label'), hint: t('dashboard.sites.root_post_id_hint') %>
+        <%= f.input :ga_tracking_id %>
+      <% end %>
-  <div class="actions">
-    <%= f.submit class: "btn btn-primary" %>
+      <div class="pull-right">
+        <div class="actions">
+          <%= f.submit class: "btn btn-primary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>