storytime 2.0.0 → 2.1.0

data/app/views/storytime/dashboard/{users → memberships}/_edit.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for @user.becomes(Storytime.user_class), :url => dashboard_user_path, remote: true, html: { class: "storytime-modal-form", data: { redirect: "index" } } do |f| %>
+<%= simple_form_for @membership, :url => dashboard_membership_path, remote: true, html: { class: "storytime-modal-form", data: { redirect: "index" } } do |f| %>
   <div class="scroll-panel">
     <div class="scroll-panel-header">
       <%= link_to icon("angle-left"), [:dashboard, :memberships], class: "btn btn-sm btn-default pull-left storytime-modal-trigger", remote: true %>
@@ -14,13 +14,12 @@
       <input type="hidden" value="<%= params[:controller].camelize %>" id="storytime-modal-controller">
       <input type="hidden" value="<%= params[:action].camelize %>" id="storytime-modal-action">
       
-      <%= f.input :storytime_name %>
-      <%= f.input :email %>
-
-      <%= f.simple_fields_for :storytime_memberships do |mf| %>
-        <%= mf.association :storytime_role, include_blank: false, label_method: :label, input_html: { disabled: @user == @current_storytime_site.creator } %>
-        <%= mf.input :_destroy, as: :boolean, label: "Delete membership" unless @user == @current_storytime_site.creator %>
+      <%= f.simple_fields_for :user do |uf| %>
+        <%= uf.input :storytime_name %>
+        <%= uf.input :email %>
       <% end %>
+
+      <%= f.association :storytime_role, include_blank: false, label_method: :label, input_html: { disabled: @user == @current_storytime_site.creator } %>
     </div>
   </div>
 <% end %>

data/app/views/storytime/dashboard/memberships/_index.html.erb

@@ -1,7 +1,7 @@
 <div class="scroll-panel">
   <div class="scroll-panel-header">
     <button type="button" class="close pull-left" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-    <%= link_to t('dashboard.users.create_new_user'), new_dashboard_user_path, class: "btn btn-sm btn-primary btn-outline pull-right storytime-modal-trigger", remote: true, id: "new-user-link" %>
+    <%= link_to t('dashboard.users.create_new_user'), new_dashboard_membership_path, class: "btn btn-sm btn-primary btn-outline pull-right storytime-modal-trigger", remote: true, id: "new-user-link" %>
     <h3 class="scroll-panel-title">
       <%= t('dashboard.users.users_header') %>
     </h3>

data/app/views/storytime/dashboard/memberships/_membership.html.erb

@@ -1,5 +1,5 @@
 <li class="list-group-item" id="membership_<%= membership.id %>">
-  <%= link_to url_for(:controller => 'dashboard/users', :action => 'edit', :id => membership.user_id), class: "list-group-link storytime-modal-trigger", remote: true do %>
+  <%= link_to url_for(:controller => 'dashboard/memberships', :action => 'edit', :id => membership.id), class: "list-group-link storytime-modal-trigger", remote: true do %>
     
     <%= membership.storytime_name %>
     <% if membership.storytime_role %>

data/app/views/storytime/dashboard/{users → memberships}/_new.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for @user, :url => dashboard_users_path, method: :post, remote: true, html: { class: "storytime-modal-form", data: { redirect: "index" } } do |f| %>
+<%= simple_form_for @user, :url => dashboard_memberships_path, method: :post, remote: true, html: { class: "storytime-modal-form", data: { redirect: "index" } } do |f| %>
   <div class="scroll-panel">
     <div class="scroll-panel-header">
       <%= link_to icon("angle-left"), [:dashboard, :memberships], class: "btn btn-sm btn-default pull-left storytime-modal-trigger", remote: true %>
@@ -10,7 +10,7 @@
     <div class="scroll-panel-body">
 
       <%= render 'storytime/dashboard/settings_tabs.html.erb' %>
-      
+
       <%= f.input :storytime_name %>
       <%= f.input :email %>
 
@@ -19,7 +19,7 @@
       <% end %>
       
       <%= f.input :password %>
-      <%= f.input :password_confirmation %>
+      <%= f.input :password_confirmation %> 
     </div>
   </div>
 <% end %>

data/app/views/storytime/dashboard/memberships/edit.json.jbuilder

@@ -0,0 +1,2 @@
+json.(@membership)
+json.html(render partial: "edit.html.erb")

data/app/views/storytime/dashboard/memberships/new.json.jbuilder

@@ -0,0 +1,2 @@
+json.(@membership)
+json.html(render partial: "new.html.erb")

data/app/views/storytime/dashboard/memberships/save.json.jbuilder

@@ -1 +1 @@
-json.html(render partial: "storytime/dashboard/users/index.html.erb")
+json.html(render partial: "storytime/dashboard/memberships/index.html.erb")

data/app/views/storytime/dashboard/navigations/_blog_link_fields.html.erb

@@ -0,0 +1,8 @@
+<tr class="nested-fields">
+  <td><%= f.input :text, placeholder: "Link text", label: false, wrapper_html: { class: "no-margin" }, input_html: { class: "input-sm" } %></td>
+  <td>
+    <%= f.input :linkable_type, as: :hidden, input_html: { value: "Storytime::Blog" } %>
+    <%= f.association :linkable, label: false, wrapper_html: { class: "no-margin" }, input_html: { class: "input-sm" }, collection: Storytime::Post.where(type: "Storytime::Blog").all, prompt: "Select a Blog" %>
+  </td>
+  <td><%= link_to_remove_association icon("trash"), f, class: "btn btn-default btn-sm pull-right" %></td>
+</tr>

data/app/views/storytime/dashboard/navigations/_external_link_fields.html.erb

@@ -0,0 +1,7 @@
+<tr class="nested-fields">
+  <td><%= f.input :text, placeholder: "Link text", label: false, input_html: { class: "input-sm" }, wrapper_html: { class: "no-margin" } %></td>
+  <td>
+    <%= f.input :url, placeholder: "URL", label: false, input_html: { class: "input-sm" }, wrapper_html: { class: "no-margin" } %>
+  </td>
+  <td><%= link_to_remove_association icon("trash"), f, class: "btn btn-default btn-sm pull-right" %></td>
+</tr>

data/app/views/storytime/dashboard/navigations/_form.html.erb

@@ -0,0 +1,58 @@
+<div id="main">
+  <div class="scroll-panel">
+    <%= simple_form_for [storytime, :dashboard, @navigation] do |f| %>
+      <div class="scroll-panel-header">
+        <%= link_to "#", class: "btn btn-default btn-icon pull-left visible-xs visible-sm", data: { toggle: "off-canvas",  target: "#dashboard-nav" } do %>
+          <i class="icon-st-icons-st-logo"></i>
+        <% end %>
+        <div class="pull-right">
+          <%= link_to "Cancel", [storytime, :dashboard, Storytime::Navigation], class: "btn btn-primary btn-sm btn-outline" %>
+          <%= f.submit "Save", class: "btn btn-sm btn-primary btn-outline" %>
+        </div>
+        <h3 class="scroll-panel-title"><%= header %></h3>
+      </div>
+      <div class="scroll-panel-body">
+        <div class="row">
+          <div class="col-sm-6">
+            <%= f.input :name %>
+          </div>
+          <div class="col-sm-6">
+            <%= f.input :handle, disabled: @navigation.persisted? %>
+          </div>
+        </div>
+
+        <div>
+          <table class="table">
+            <thead>
+              <tr>
+                <th style="width: 40%;">Link Text</th>
+                <th style="width: 40%;">Link</th>
+                <th></th>
+              </tr>
+            </thead>
+            <tbody id="links">
+              <%= f.simple_fields_for :links do |link| %>
+                <% if link.object.url.present? || link.object.errors[:url].present? %>
+                  <%= render "external_link_fields", f: link %>
+                <% else %>
+                  <%= render "#{link.object.linkable.type.split("::").last.downcase}_link_fields", f: link %>
+                <% end %>
+              <% end %>
+            </tbody>
+          </table>
+          <div class="btn-group">
+            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+              Add a Link <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu left" role="menu">
+              <li><%= link_to_add_association "Page Link", f, :links, partial: "page_link_fields", :"data-association-insertion-node" => "#links", :"data-association-insertion-method" => "append" %></li>
+              <li><%= link_to_add_association "Blog Link", f, :links, partial: "blog_link_fields", :"data-association-insertion-node" => "#links", :"data-association-insertion-method" => "append" %></li>
+              <li><%= link_to_add_association "External Link", f, :links, partial: "external_link_fields", :"data-association-insertion-node" => "#links", :"data-association-insertion-method" => "append" %></li>
+            </ul>
+          </div>
+          
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/storytime/dashboard/navigations/_navigation.html.erb

@@ -0,0 +1,25 @@
+<div class="panel panel-default" id="navigation_<%= navigation.id %>">
+  <div class="panel-heading">
+    <div class="row">
+      <div class="col-xs-8">
+        <h3 class="panel-title">
+          <%= navigation.name %>
+        </h3>
+      </div>
+      <div class="col-xs-4 text-right">
+        <%= link_to "Edit", [storytime, :edit, :dashboard, navigation], class: "btn btn-default btn-xs" %>
+        <%= delete_resource_link navigation, dashboard_navigation_url(navigation) %>
+      </div>
+    </div>
+  </div>
+  <div class="panel-body">
+    <ul class="list-group sortable no-margin" data-update-url="<%= sort_dashboard_navigation_links_url(navigation) %>">
+      <% navigation.links.each do |link| %>
+        <%= content_tag_for :li, link, class: "list-group-item" do %>
+          <%= icon "bars", style: "cursor: move; margin-right: 10px;" %>
+          <%= link.text %>
+        <% end %>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/app/views/storytime/dashboard/navigations/_page_link_fields.html.erb

@@ -0,0 +1,8 @@
+<tr class="nested-fields">
+  <td><%= f.input :text, label: false, placeholder: "Link text", wrapper_html: { class: "no-margin" }, input_html: { class: "input-sm" } %></td>
+  <td>
+    <%= f.input :linkable_type, as: :hidden, input_html: { value: "Storytime::Page" } %>
+    <%= f.association :linkable, label: false, wrapper_html: { class: "no-margin" }, input_html: { class: "input-sm" }, collection: Storytime::Post.where(type: "Storytime::Page").all, prompt: "Select a Page" %>
+  </td>
+  <td><%= link_to_remove_association icon("trash"), f, class: "btn btn-default btn-sm pull-right" %></td>
+</tr>

data/app/views/storytime/dashboard/navigations/edit.html.erb

@@ -0,0 +1 @@
+<%= render "form", header: t('.header') %>

data/app/views/storytime/dashboard/navigations/index.html.erb

@@ -0,0 +1,15 @@
+<div id="main">
+  <div class="scroll-panel">
+    <div class="scroll-panel-header">
+
+      <%= link_to "#", class: "btn btn-default btn-icon pull-left visible-xs visible-sm", data: { toggle: "off-canvas",  target: "#dashboard-nav" } do %>
+        <i class="icon-st-icons-st-logo"></i>
+      <% end %>
+      <%= link_to "New Navigation List", [storytime, :new, :dashboard, :navigation], class: "btn btn-sm btn-primary btn-outline pull-right" %>
+      <h3 class="scroll-panel-title"><%= t('.header') %></h3>
+    </div>
+    <div class="scroll-panel-body">
+      <%= render partial: "storytime/dashboard/navigations/navigation", collection: @navigations, as: :navigation %>
+    </div>
+  </div>
+</div>

data/app/views/storytime/dashboard/navigations/new.html.erb

@@ -0,0 +1 @@
+<%= render "form", header: t('.header') %>

data/app/views/storytime/dashboard/pages/edit.html.erb

@@ -41,7 +41,7 @@
         <%= link_to (@post.published? ? "Update" : "Save / Publish"), "#", class: 'btn btn-primary btn-sm btn-outline', data: { toggle: 'collapse', target: '#post-advanced-settings' }, id: "advanced-settings-panel-toggle" %>
       </div>
     </div>
-    <%= render 'image_toolbar' %>
+    <%= render 'storytime/dashboard/posts/image_toolbar' %>
     <div class="scroll-panel-body" style="top: 130px;" data-top="130px">
       <%= render 'form' %>
     </div>

data/app/views/storytime/dashboard/pages/new.html.erb

@@ -20,7 +20,7 @@
         <%= link_to "Save / Publish", "#", class: 'btn btn-primary btn-sm btn-outline', data: { toggle: 'collapse', target: '#post-advanced-settings' } %>
       </div>
     </div>
-    <%= render 'image_toolbar' %>
+    <%= render 'storytime/dashboard/posts/image_toolbar' %>
     <div class="scroll-panel-body" style="top: 130px;" data-top="130px">
       <%= render "form" %>
     </div>

data/app/views/storytime/dashboard/posts/_image_toolbar.html.erb

@@ -9,13 +9,16 @@
           </div>
           <div class='medium-image-controls'>
             <div class='row'>
+              <div class='col-xs-3'>
+                <input type='text' id='medium-image-caption' placeholder='Caption' class='form-control input-sm' />
+              </div>
               <div class='col-xs-3'>
                 <input type='text' id='medium-image-width' placeholder='Width' class='form-control input-sm' />
               </div>
               <div class='col-xs-3'>
                 <input type='text' id='medium-image-height' placeholder='Height' class='form-control input-sm' />
               </div>
-              <div class='col-xs-6'>
+              <div class='col-xs-3'>
                 <div class='btn-group btn-group-sm'>
                   <a href='#' class='btn btn-default medium-image-float' data-float='left'><i class='fa fa-align-left'></i></a>
                   <a href='#' class='btn btn-default medium-image-float' data-float='none'><i class='fa fa-align-justify'></i></a>

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

@@ -1,6 +1,6 @@
-<div class="list-group">
-  <% @posts.each do |post| %>
-    <%= link_to [:edit, :dashboard, post], id: "#{post.class.to_s.downcase.split("::").last}_#{post.id}", class: "list-group-item" do %>
+<% @posts.each do |post| %>
+  <li class="list-group-item" id="<%= post.class.to_s.downcase.split("::").last %>_<%= post.id %>">
+    <%= link_to [:edit, :dashboard, post], id: "", class: "list-group-link" do %>
       <div class="row">
         <div class="col-md-8">
            <h4><%= post.title %></h4>
@@ -11,14 +11,16 @@
         <% if post.published? && post.published_at <= Time.now %>
           Published <%= time_ago_in_words post.published_at %> ago
         <% elsif post.published? %>
+          <span class="label label-warning">Draft</span>
           Scheduled to publish on <%= post.published_at.strftime("%B %e at %l:%M %p") %>
         <% else %>
+          <span class="label label-warning">Draft</span>
           Last edited <%= time_ago_in_words post.updated_at %> ago
         <% end %>
       </p>
     <% end %>
-  <% end %>
-</div>
-<div class="pagination-wrapper">
-  <%= paginate @posts, param_name: "page_number" %>
-</div>
+    <div class="list-group-actions">
+      <%= delete_resource_link post, [:dashboard, post] %>
+    </div>
+  </li>
+<% end %>

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

@@ -53,7 +53,7 @@
         <%= link_to (@post.published? ? "Update" : "Save / Publish"), "#", class: 'btn btn-primary btn-sm btn-outline', data: { toggle: 'collapse', target: '#post-advanced-settings' }, id: "advanced-settings-panel-toggle" %>
       </div>
     </div>
-    <%= render 'image_toolbar' %>
+    <%= render 'storytime/dashboard/posts/image_toolbar' %>
     <div class="scroll-panel-body" style="top: 130px;">
       <%= render 'form' %>
     </div>

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

@@ -40,11 +40,18 @@
     </div>
     <div class="scroll-panel-body">
       <ul class="nav nav-tabs">
-        <li role="presentation" class="<%= 'active' unless params[:published] == 'true' %>">
+        <li role="presentation" class="<%= 'active' unless (params[:published] == 'true' || params[:draft] == 'true') %>">
           <% if @blog %>
-            <%= link_to "Drafts", [:dashboard, @blog, :blog_page_post_index, published: nil] %>
+            <%= link_to "All", [:dashboard, @blog, :blog_page_post_index, published: nil, draft: nil] %>
           <% else %>
-            <%= link_to "Drafts", [:dashboard, current_post_type] %>
+            <%= link_to "All", [:dashboard, current_post_type, published: nil, draft: nil] %>
+          <% end %>
+        </li>
+        <li role="presentation" class="<%= 'active' if params[:draft] == 'true' %>">
+          <% if @blog %>
+            <%= link_to "Drafts", [:dashboard, @blog, :blog_page_post_index, published: nil, draft: true] %>
+          <% else %>
+            <%= link_to "Drafts", [:dashboard, current_post_type, draft: true] %>
           <% end %>
         </li>
         <li role="presentation" class="<%= 'active' if params[:published] == 'true' %>">
@@ -53,10 +60,14 @@
           <% else %>
             <%= link_to "Published", [:dashboard, current_post_type, published: 'true'] %>
           <% end %>
-          
         </li>
       </ul>
-      <%= render 'list' %>
+      <ul class="list-group list-group-button-links">
+        <%= render 'list' %>
+      </ul>
+      <div class="pagination-wrapper">
+        <%= paginate @posts, param_name: "page_number" %>
+      </div>
     </div>
   </div>
 </div>

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

@@ -25,7 +25,7 @@
         <%= link_to "Save / Publish", "#", class: 'btn btn-primary btn-sm btn-outline', data: { toggle: 'collapse', target: '#post-advanced-settings' } %>
       </div>
     </div>
-    <%= render 'image_toolbar' %>
+    <%= render 'storytime/dashboard/posts/image_toolbar' %>
     <div class="scroll-panel-body" style="top: 130px;" data-top="130px">
       <%= render "form" %>
     </div>

data/app/views/storytime/navigations/_navigation.html.erb

@@ -0,0 +1,3 @@
+<% navigation.links.each do |link| %>
+  <li><%= link_to link.text, (link.url.present? ? link.url : storytime.page_path(link.linkable)) %></li>
+<% end %>

data/app/views/storytime/posts/_post.html.erb

@@ -1,6 +1,6 @@
 <div id="blog_post_<%= post.id %>" class="blog-post">
   <h2><%= link_to post.title, storytime.post_path(post) %></h2>
-  <p class='muted'><%= post.created_at.strftime("%b %d, %Y") %></p>
+  <p class='muted'><%= post.published_at.strftime("%b %d, %Y") %></p>
   <p><%= post.excerpt %></p>
   <p><%= link_to "Continue reading →", storytime.post_path(post) %></p>
   <p><%= render 'storytime/posts/tags', post: post %></p>

data/app/views/storytime/posts/_tags.html.erb

@@ -1,3 +1,3 @@
 <% post.tags.each do |t| %>
-  <span class='label label-primary'><%= link_to t.name, storytime.tag_path(t.name) %></span>
+  <span class='label label-primary'><%= link_to t.name, storytime.blog_path(post.blog, tag: t.name) %></span>
 <% end %>

data/app/views/storytime/sites/_google_analytics_code.html.erb

@@ -5,8 +5,9 @@
     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-    ga('create', '<%= @current_storytime_site.ga_tracking_id %>', 'auto');
-    ga('send', 'pageview');
+    ga('create', '<%= @current_storytime_site.ga_tracking_id %>', {'allowAnchor': true});
+
+    ga('send', 'pageview', { 'page': location.pathname + location.search + location.hash});
 
   </script>
-<% end %>
+<% end %>

data/app/views/storytime/snippets/_snippet.html.erb

@@ -1,5 +1,5 @@
 <%= content_tag :span, class: "storytime-snippet storytime-snippet-#{snippet.id}" do %>
-  <% if logged_in_storytime_user? && Pundit.policy(current_user, Storytime::Snippet).manage? %>
+  <% if logged_in_storytime_user? && Pundit.policy(current_user, snippet).manage? %>
     <%= link_to [storytime, :edit, :dashboard, snippet], class: "storytime-modal-trigger", remote: true do %>
       <span class='snippet-content'><%= raw snippet.content %></span>
     <% end %>

data/config/initializers/assets.rb

@@ -1 +1 @@
-Rails.application.config.assets.precompile += %w( chosen-sprite.png chosen-sprite@2x.png )
+Rails.application.config.assets.precompile += %w( chosen-sprite.png chosen-sprite@2x.png tidy.js )

data/config/initializers/storytime_admin.rb

@@ -1,3 +1,5 @@
 StorytimeAdmin.configure do |config|
   config.base_controller = "Storytime::DashboardController"
+  config.ensure_admin_method = "storytime_admin?"
+  config.ensure_admin_scope = "current_storytime_site"
 end

data/config/initializers/url_for_patch.rb

@@ -2,15 +2,15 @@ module ActionDispatch
   module Routing
     class RouteSet
 
-      if Rails::VERSION::MINOR >= 2
-        def url_for_with_storytime(options, route_name = nil, url_strategy = UNKNOWN)
+      if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR == 2
+        def url_for_with_storytime(options = {})
           Storytime::PostUrlHandler.handle_url(options)
-          url_for_without_storytime(options, route_name, url_strategy)
+          url_for_without_storytime(options)
         end
       else
-        def url_for_with_storytime(options = {})
+        def url_for_with_storytime(options, route_name = nil, url_strategy = UNKNOWN)
           Storytime::PostUrlHandler.handle_url(options)
-          url_for_without_storytime(options)
+          url_for_without_storytime(options, route_name, url_strategy)
         end
       end
 
@@ -18,4 +18,4 @@ module ActionDispatch
 
     end
   end
-end
+end

data/config/locales/en.yml

@@ -56,6 +56,9 @@ en:
     roles:
       update:
         success: "Permissions successfully updated."
+    navigations:
+      destroy:
+        success: "Navigation list successfully deleted."
 
   simple_form:
     labels:
@@ -111,6 +114,11 @@ en:
       remove_image: "Remove Image"
       new:
         header: "New %{resource}"
+    navigations:
+      create:
+        success: "Your navigation list was created successfully."
+      update:
+        success: "Your navigation list was updated successfully."
 
   layout:
     title: "Storytime"
@@ -122,3 +130,13 @@ en:
     previous: "<i class='fa fa-caret-left'></i>"
     next: "<i class='fa fa-caret-right'></i>"
     last: "<i class='fa fa-caret-right'></i><i class='fa fa-caret-right'></i>"
+
+  storytime:
+    dashboard:
+      navigations:
+        index:
+          header: "Navigation Lists"
+        new: 
+          header: "New Navigation List"
+        edit:
+          header: "Edit Navigation List"

data/config/routes.rb

@@ -22,21 +22,25 @@ Storytime::Engine.routes.draw do
 
       resources :blog_posts, shallow: true, except: :show, concerns: :autosavable
       Storytime.post_types.reject{|type| %w[Storytime::Page Storytime::Blog Storytime::BlogPost].include?(type) }.each do |post_type|
-        resources post_type.tableize.to_sym, controller: "custom_posts", only: [:new, :create]
+        resources post_type.tableize.to_sym, controller: "custom_posts", only: [:new, :create], defaults: { post_type: post_type }
       end
     end
-    
+
     # Create / Update / Delete pages, blog_posts, custom_post_types
     Storytime.post_types.reject{|type| %w[Storytime::Page Storytime::Blog Storytime::BlogPost].include?(type) }.each do |post_type|
-      resources post_type.tableize.to_sym, controller: "custom_posts", only: [:edit, :update, :destroy], concerns: :autosavable
+      resources post_type.tableize.to_sym, controller: "custom_posts", only: [:edit, :update, :destroy], concerns: :autosavable, defaults: { post_type: post_type }
     end
 
+    resources :navigations, except: :show do
+      resources :links, only: [] do
+        collection { post :sort }
+      end
+    end
     resources :snippets, except: [:show]
     resources :media, except: [:show, :edit, :update]
     resources :imports, only: [:new, :create]
     resources :subscriptions
-    resources :users, path: Storytime.user_class_underscore.pluralize, only: [:new, :create, :edit, :update]
-    resources :memberships, only: [:index, :create, :destroy]
+    resources :memberships
     resources :roles do
       collection do
         get :edit_multiple
@@ -47,16 +51,13 @@ Storytime::Engine.routes.draw do
 
   mount StorytimeAdmin::Engine => Storytime.dashboard_namespace_path
 
-  # TODO: HOW DO WE DEAL WITH THIS WHEN THERE ARE MULTIPLE BLOG PAGES?
-  get 'tags/:tag', to: 'posts#index', as: :tag
-
   get "/", to: "blog_homepage#show", constraints: Storytime::Constraints::BlogHomepageConstraint.new
   get "/", to: "homepage#show", constraints: Storytime::Constraints::PageHomepageConstraint.new
 
   resources :blogs, only: :show, path: "/", constraints: Storytime::Constraints::BlogConstraint.new
-  resources :pages, only: :show, path: "/", constraints: Storytime::Constraints::PageConstraint.new
+  get '/*id', to: 'pages#show', constraints: Storytime::Constraints::PageConstraint.new
   resources :posts, only: [], concerns: :commentable
-  
+
   Storytime.post_types.each do |post_type|
     constraints ->(request){ request.params[:component_1] != "assets" } do
       resources post_type.split("::").last.tableize, path: "(/:component_1(/:component_2(/:component_3)))/", only: :show, controller: "posts"

data/db/migrate/20141021073356_create_storytime_snippets.rb

@@ -9,7 +9,7 @@ class CreateStorytimeSnippets < ActiveRecord::Migration
 
     Storytime::Role.seed
     Storytime::Action.seed
-
+    
     manage_snippets = Storytime::Action.find_by(guid: "5qg25i")
     Storytime::Permission.find_or_create_by(role: Storytime::Role.find_by(name: "editor"), action: manage_snippets)
     Storytime::Permission.find_or_create_by(role: Storytime::Role.find_by(name: "admin"), action: manage_snippets)

data/db/migrate/20150520181115_create_storytime_navigations.rb

@@ -0,0 +1,12 @@
+class CreateStorytimeNavigations < ActiveRecord::Migration
+  def change
+    create_table :storytime_navigations do |t|
+      t.string :name
+      t.string :handle
+      t.integer :site_id
+
+      t.timestamps null: false
+    end
+    add_index :storytime_navigations, :site_id
+  end
+end

data/db/migrate/20150520185227_create_storytime_links.rb

@@ -0,0 +1,11 @@
+class CreateStorytimeLinks < ActiveRecord::Migration
+  def change
+    create_table :storytime_links do |t|
+      t.string :text
+      t.belongs_to :storytime_navigation, index: true, foreign_key: true
+      t.references :linkable, polymorphic: true, index: true
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20150520190700_add_position_to_storytime_links.rb

@@ -0,0 +1,6 @@
+class AddPositionToStorytimeLinks < ActiveRecord::Migration
+  def change
+    add_column :storytime_links, :position, :integer
+    add_index :storytime_links, :position
+  end
+end

data/db/migrate/20150529192058_add_url_to_storytime_links.rb

@@ -0,0 +1,5 @@
+class AddUrlToStorytimeLinks < ActiveRecord::Migration
+  def change
+    add_column :storytime_links, :url, :string
+  end
+end

data/lib/generators/storytime/views_generator.rb

@@ -9,7 +9,7 @@ module Storytime
         argument :scope, :required => false, :default => nil,
                          :desc => "The scope to copy views to"
 
-        class_option :views, aliases: "-v", type: :array, desc: "Select specific view directories to generate (application, blog_posts, blogs, comments, dashboard, pages, posts, sites, snippets, subscription_mailer, subscriptions)"
+        class_option :views, aliases: "-v", type: :array, desc: "Select specific view directories to generate (application, blogs, comments, dashboard, pages, posts, sites, snippets, subscription_mailer, subscriptions)"
 
         public_task :copy_views
       end
@@ -27,7 +27,6 @@ module Storytime
           end
         else
           view_directory :application
-          view_directory :blog_posts
           view_directory :blogs
           view_directory :comments
           view_directory :pages
@@ -62,4 +61,4 @@ module Storytime
                        :desc => "The scope to copy views to"
     end
   end
-end
+end