storytime 2.0.0 → 2.1.0

data/README.md

@@ -1,20 +1,20 @@
 ![Storytime](https://flyoverworks-com.s3.amazonaws.com/uploads/storytime/media/file/125/final-st-logo-02_thumb.png) 
 
-[![Circle CI](https://circleci.com/gh/FlyoverWorks/storytime/tree/master.svg?style=svg)](https://circleci.com/gh/FlyoverWorks/storytime/tree/master)
+[![Circle CI](https://circleci.com/gh/CultivateLabs/storytime/tree/master.svg?style=svg)](https://circleci.com/gh/CultivateLabs/storytime/tree/master)
 
-Storytime is a Rails 4+ CMS and blogging engine, with a core focus on content. It is built and maintained by [FlyoverWorks](http://www.flyoverworks.com) / [@flyoverworks](http://twitter.com/flyoverworks)
+Storytime is a Rails 4+ CMS and blogging engine, with a core focus on content. It is built and maintained by [CultivateLabs](https://www.cultivatelabs.com/?utm_source=github&utm_medium=readme&utm_campaign=github) / [@cultivatelabs](http://twitter.com/cultivatelabs)
 
 ## Features
 
-* [Simple integration with Rails 4+ apps](https://github.com/FlyoverWorks/storytime/wiki/Setup) - Quickly get set up using a guided, automated, or manual setup experience, whatever suits your fancy.
-* [Quick access dashboard](https://github.com/FlyoverWorks/storytime/wiki/Using-the-Quick-Access-Menu) - Access Storytime's dashboard from anywhere on your site with our quick access menu.
-* [Multi-site support](https://github.com/FlyoverWorks/storytime/wiki/Multi-site-Support) - Manage multiple sites with one Storytime deployment.
-* [Inline text snippet editing](https://github.com/FlyoverWorks/storytime/wiki/Text-Snippets) - Create and edit snippets of content that can be re-used throughout your Storytime site.
-* [Admin of other Rails models](https://github.com/FlyoverWorks/storytime/wiki/Admin-of-Rails-Models) - Manage your models from the Storytime dashboard.
-* [Custom Post Types](https://github.com/FlyoverWorks/storytime/wiki/Using-Custom-Post-Types) - Add custom post types to alter functionality or appearance of posts.
-* [Email list building](https://github.com/FlyoverWorks/storytime/wiki/Email-Subscriptions) - Collect and manage emails using a simple view helper.
-* [New post notifications](https://github.com/FlyoverWorks/storytime/wiki/Working-with-New-Post-Notifications) - Send notifications to your site's subscribers whenever you publish a post.
-* [Built-in search](https://github.com/FlyoverWorks/storytime/wiki/Using-Storytime%27s-Post-Search) - Easily search through Storytime's posts using built-in search adapters or request parameters.
+* [Simple integration with Rails 4+ apps](https://github.com/CultivateLabs/storytime/wiki/Setup) - Quickly get set up using a guided, automated, or manual setup experience, whatever suits your fancy.
+* [Quick access dashboard](https://github.com/CultivateLabs/storytime/wiki/Using-the-Quick-Access-Menu) - Access Storytime's dashboard from anywhere on your site with our quick access menu.
+* [Multi-site support](https://github.com/CultivateLabs/storytime/wiki/Multi-site-Support) - Manage multiple sites with one Storytime deployment.
+* [Inline text snippet editing](https://github.com/CultivateLabs/storytime/wiki/Text-Snippets) - Create and edit snippets of content that can be re-used throughout your Storytime site.
+* [Admin of other Rails models](https://github.com/CultivateLabs/storytime/wiki/Admin-of-Rails-Models) - Manage your models from the Storytime dashboard.
+* [Custom Post Types](https://github.com/CultivateLabs/storytime/wiki/Using-Custom-Post-Types) - Add custom post types to alter functionality or appearance of posts.
+* [Email list building](https://github.com/CultivateLabs/storytime/wiki/Email-Subscriptions) - Collect and manage emails using a simple view helper.
+* [New post notifications](https://github.com/CultivateLabs/storytime/wiki/Working-with-New-Post-Notifications) - Send notifications to your site's subscribers whenever you publish a post.
+* [Built-in search](https://github.com/CultivateLabs/storytime/wiki/Using-Storytime%27s-Post-Search) - Easily search through Storytime's posts using built-in search adapters or request parameters.
 
 ## Separation of Concerns
 
@@ -39,7 +39,7 @@ This separation is intended to provide several benefits and/or solve several pro
 
 ## Sample App
 
-[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/flyoverworks/storytime-example)
+[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/CultivateLabs/storytime-example/blob/master)
 
 ## Installation
 
@@ -131,30 +131,30 @@ $ rails generate storytime:views
 
 ## Getting Started
 
-See the [Storytime Wiki](https://github.com/FlyoverWorks/storytime/wiki) for more documentation and information on using Storytime's various features.
+See the [Storytime Wiki](https://github.com/CultivateLabs/storytime/wiki) for more documentation and information on using Storytime's various features.
 
 ## Screen Shots
 
 Page List:
-![Page List](https://raw.githubusercontent.com/FlyoverWorks/storytime/master/screenshots/page-list.png "Page List")
+![Page List](https://raw.githubusercontent.com/CultivateLabs/storytime/master/screenshots/page-list.png "Page List")
 
 Post Editor:
-![Post Editor](https://raw.githubusercontent.com/FlyoverWorks/storytime/master/screenshots/post-editor.png "Post Editor")
+![Post Editor](https://raw.githubusercontent.com/CultivateLabs/storytime/master/screenshots/post-editor.png "Post Editor")
 
 Admin of Custom Rails Models:
-![Admin of Custom Rails Models](https://raw.githubusercontent.com/FlyoverWorks/storytime/master/screenshots/admin.png "Admin of Custom Rails Models")
+![Admin of Custom Rails Models](https://raw.githubusercontent.com/CultivateLabs/storytime/master/screenshots/admin.png "Admin of Custom Rails Models")
 
 Text Snippets:
-![Text Snippets](https://raw.githubusercontent.com/FlyoverWorks/storytime/master/screenshots/text-snippets.png "Text Snippets")
+![Text Snippets](https://raw.githubusercontent.com/CultivateLabs/storytime/master/screenshots/text-snippets.png "Text Snippets")
 
 User Management:
-![User Management](https://raw.githubusercontent.com/FlyoverWorks/storytime/master/screenshots/user-management.png "User Management")
+![User Management](https://raw.githubusercontent.com/CultivateLabs/storytime/master/screenshots/user-management.png "User Management")
 
 Site Settings:
-![Site Settings](https://raw.githubusercontent.com/FlyoverWorks/storytime/master/screenshots/site-settings.png "Site Settings")
+![Site Settings](https://raw.githubusercontent.com/CultivateLabs/storytime/master/screenshots/site-settings.png "Site Settings")
 
 Media Uploads:
-![Media Uploads](https://raw.githubusercontent.com/FlyoverWorks/storytime/master/screenshots/media.png "Media Uploads")
+![Media Uploads](https://raw.githubusercontent.com/CultivateLabs/storytime/master/screenshots/media.png "Media Uploads")
 
 ## Copyright
-Copyright © 2014-2015 FlyoverWorks Inc. Storytime is released under the [MIT-LICENSE](MIT-LICENSE).
+Copyright © 2014-2015 CultivateLabs Inc. Storytime is released under the [MIT-LICENSE](MIT-LICENSE).

data/app/assets/javascripts/storytime/application.js

@@ -13,13 +13,15 @@
 //= require_self
 //= require jquery
 //= require jquery_ujs
-//= require bootstrap
+//= require bootstrap-sprockets
 //= require leather
+//= require cocoon
 //= require jquery-ui/core
 //= require jquery-ui/datepicker
 //= require jquery-ui/position
 //= require jquery-ui/widget
 //= require jquery-ui/resizable
+//= require jquery-ui/sortable
 //= require jquery.ui.timepicker
 //= require jquery.iframe-transport.js
 //= require jquery.fileupload.js
@@ -30,10 +32,10 @@
 //= require codemirror/addons/fold/xml-fold
 //= require codemirror/addons/edit/closetag
 //= require codemirror/addons/edit/closebrackets
-//= require tidy
 //= require chosen.jquery
 //= require medium-editor.min
+//= require storytime_admin
 //= require_tree .
 
 window.Storytime || (window.Storytime = {})
-window.Storytime.Dashboard = {}
+window.Storytime.Dashboard = {}

data/app/assets/javascripts/storytime/base.js.coffee

@@ -9,7 +9,7 @@ initJS = (controller, action) ->
 $ ()->
   initJS($("body").data("controller"), $("body").data("action"))
 
-  $(".flash").delay(4000).fadeOut() unless window.Storytime.test_env
+  $(".flash").delay(4000).fadeOut() unless window.Storytime.test_env || window.Storytime.persistent_flash_message
 
   $(".chosen").chosen()
 
@@ -22,9 +22,10 @@ $ ()->
     alert("There was an error deleting your #{$(@).data('resource-type')}")
   )
 
-  $(".table-row-link").click ->
-    url = $(this).data('url')
-    document.location.href = url
+  $(".table-row-link").on "click", (e) ->
+    unless $(e.target).data("confirm")? || $(e.target).parent("a[data-confirm]").length > 0
+      url = $(@).data('url')
+      document.location.href = url
 
   $(document).on "click", ".storytime-menu-toggle", (e) ->
     e.preventDefault()

data/app/assets/javascripts/storytime/media.js.coffee

@@ -62,12 +62,17 @@ class Storytime.Dashboard.Media
         $("#insertMediaModal").modal("hide")
         return
       else
-        image_tag = "<img src='#{$(@).data("image-url")}' class='img-responsive' />"
+        image_tag = "
+          <div class='storytime-image text-center'>
+            <img src='#{$(@).data("image-url")}' />
+            <div class='storytime-image-caption text-center' style='margin-left:auto; margin-right: auto;'></div>
+          </div>
+        "
         if self.elementContainsSelection($("#medium-editor-post")[0])
           self.pasteHtmlAtCaret(image_tag, false)
         else
           $("#medium-editor-post").append(image_tag)
-          
+
         input = $($("#medium-editor-post").data("input"))
         html = $("#medium-editor-post").html()
         input.val(html)

data/app/assets/javascripts/storytime/{users.js.coffee → memberships.js.coffee}

@@ -1,10 +1,9 @@
-class Storytime.Dashboard.Users
+class Storytime.Dashboard.Memberships
   initIndex: () ->
     $(".chosen").chosen
-      width: '100%'
+      width: "100%"
 
     $(document).on "ajax:success", ".new_membership", (e, data, status, xhr) ->
-      console.log data.html
       $("#storytime-modal .modal-content").html(data.html)
       $(".chosen").chosen
-        width: '100%'
+        width: "100%"

data/app/assets/javascripts/storytime/navigations.js.coffee

@@ -0,0 +1,7 @@
+class Storytime.Dashboard.Navigations
+  initIndex: ()->
+    $('.sortable').sortable
+      axis: 'y'
+      handle: '.fa-bars'
+      update: ->
+        $.post($(this).data('update-url'), $(this).sortable('serialize'))

data/app/assets/javascripts/storytime/wysiwyg.js.coffee

@@ -3,6 +3,7 @@ class Storytime.Dashboard.Wysiwyg
     buttons: ['bold', 'italic', 'underline', 'anchor', 'header1', 'header2', 'quote', 'unorderedlist', 'orderedlist', 'pre']
     toolbarAlign: 'center'
     buttonLabels: 'fontawesome'
+    checkLinkFormat: true
 
   codeMirrorOptions = 
     mode: 'htmlmixed'
@@ -52,6 +53,12 @@ class Storytime.Dashboard.Wysiwyg
         self.closeImageControls()
         mediumEditor.activate()
 
+    $('body').on "keyup", "#medium-image-caption", () ->
+      caption = $(".medium-active-image").parent(".storytime-image").find(".storytime-image-caption")
+      caption.css("width", $(".medium-active-image").width())
+      caption.text($(this).val())
+
+
     $("body").on 'click', '.medium-editor img', (e) ->
       active = $(this).hasClass("medium-active-image")
       unless active
@@ -59,19 +66,24 @@ class Storytime.Dashboard.Wysiwyg
         $(this).addClass "medium-active-image"
         $("#medium-image-width").val($(this)[0].style.width)
         $("#medium-image-height").val($(this)[0].style.height)
+        $("#medium-image-caption").val($(this).parent(".storytime-image").find(".storytime-image-caption").text())
         $("#medium-image-button").hide()
         $(".medium-image-controls").show()
         mediumEditor.deactivate()
 
     $('body').on "keyup", "#medium-image-width", () ->
+      $img = $(".medium-active-image")
       if $(this).val() == "" || $(this).val() == "auto"
-        $(".medium-active-image").css("width", "")
+        $img.css("width", "")
         $("#medium-image-height").val("")
         $("#medium-image-width").val("")
       else
-        $(".medium-active-image").css("width", $(this).val())
-        $(".medium-active-image").css("height", "")
-        $("#medium-image-height").val($(".medium-active-image").css("height"))
+        $img.css("width", $(this).val())
+        $img.css("height", "")
+        $("#medium-image-height").val($img.css("height"))
+
+      $caption = $img.parent(".storytime-image").find(".storytime-image-caption")
+      $caption.css("width", $img.css("width"))
 
     $('body').on "keyup", "#medium-image-height", () ->
       # set the height, then find the new width and set that and remove the height so image remains responsive
@@ -84,21 +96,20 @@ class Storytime.Dashboard.Wysiwyg
 
     $('body').on "click", ".medium-image-float", () ->
       direction = $(this).data("float")
-      image = $(".medium-active-image")
+      container = $(".medium-active-image").parent(".storytime-image")
       switch direction
-        when "left" then image.removeClass("pull-right pull-left").addClass("pull-left")
-        when "right" then image.removeClass("pull-right pull-left").addClass("pull-right")
-        when "none" then image.removeClass("pull-right pull-left")
+        when "left" then container.removeClass("pull-right pull-left").addClass("pull-left")
+        when "right" then container.removeClass("pull-right pull-left").addClass("pull-right")
+        when "none" then container.removeClass("pull-right pull-left").addClass("text-center")
 
     $('body').on "click", ".medium-image-delete", () ->
-      image = $(".medium-active-image")
+      image = $(".medium-active-image").parent(".storytime-image")
       image.remove()
       self.updateFromMediumEditor()
       self.closeImageControls()
       mediumEditor.activate()
 
   openImageControls: (image) ->
-    console.log image
     image.addClass("medium-active-image")
     $("#medium-image-width").val(image[0].style.width)
     $("#medium-image-height").val(image[0].style.height)
@@ -153,7 +164,8 @@ class Storytime.Dashboard.Wysiwyg
         editor.toggle()
         code.toggle()
 
-        html = tidy_html5 wysiwyg.find('.medium-editor').html(), tidyOptions
+        html = wysiwyg.find('.medium-editor').html()
+        html = tidy_html5 html, tidyOptions unless window.Storytime.test_env
         codemirror.setValue(html)
 
         codemirror.refresh()

data/app/assets/stylesheets/storytime/application.scss

@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Merriweather:400,300,700,900|Open+Sans:400,300,600);
+@import url("//fonts.googleapis.com/css?family=Merriweather:400,300,700,900|Open+Sans:400,300,600");
 @import "storytime/icons";
 
 $st-brand-primary: #4B71C3;
@@ -68,6 +68,7 @@ $st-headings-font-weight: 700;
   @import "storytime/versions";
   @import "storytime/navigation";
   @import "storytime/scroll-panels";
+  @import "storytime/dashboard_overrides";
 }
 
 @import "storytime/snippets";

data/app/assets/stylesheets/storytime/dashboard_overrides.scss

@@ -0,0 +1,4 @@
+/*
+* Add app/assets/stylesheets/storytime/dashboard_overrides.scss to your host
+* app and include any necessary css/sass needed to override dashboard styles.
+*/

data/app/assets/stylesheets/storytime/media.scss

@@ -4,6 +4,8 @@
 
     img {
       cursor: pointer;
+      &.pull-left{ margin-right: 20px; }
+      &.pull-right{ margin-left: 20px; }
     }
   }
 

data/app/assets/stylesheets/storytime/navigation.scss

@@ -119,6 +119,13 @@
     right: 6px;
   }
 
+  .dropdown-menu.left:after, .dropdown-menu.left:before {
+    left: 15px;
+  }
+  .dropdown-menu.left:before {
+    left: 15px;
+  }
+
   .dropdown-menu > li > a {
     padding: 6px 20px;
     text-transform: uppercase;

data/app/assets/stylesheets/storytime/posts.scss

@@ -1,76 +1,85 @@
-  .CodeMirror {
-    height: auto;
-    position: absolute;
-    bottom: 0;
-    top: 0;
-    left: 0;
-    right: 0;
-    display: none;
-  }
+.CodeMirror {
+  height: auto;
+  position: absolute;
+  bottom: 0;
+  top: 0;
+  left: 0;
+  right: 0;
+  display: none;
+}
 
 
-  .contenteditable {
-    cursor: text;
-  }
+.contenteditable {
+  cursor: text;
+}
 
-  .contenteditable:empty:before {
-    content: attr(placeholder);
-    color: #ccc;
-  }
+.contenteditable:empty:before {
+  content: attr(placeholder);
+  color: #ccc;
+}
 
-  .row.page-admin {
-    padding: 10px;
-    &:hover {
-      background: #f1f1f1;
-    }
+.row.page-admin {
+  padding: 10px;
+  &:hover {
+    background: #f1f1f1;
   }
+}
 
-  #tag_cloud {
-    width: 400px;
-    line-height: 1.6em;
-    .s { font-size: 0.8em; }
-    .m { font-size: 1.2em; }
-    .l { font-size: 1.8em; }
-  }
+#tag_cloud {
+  width: 400px;
+  line-height: 1.6em;
+  .s { font-size: 0.8em; }
+  .m { font-size: 1.2em; }
+  .l { font-size: 1.8em; }
+}
 
-  .muted { color: lighten(#333, 50%); }
-  .label {
-    a, a:hover {
-      color: #fff;
-    }
+.muted { color: lighten(#333, 50%); }
+.label {
+  a, a:hover {
+    color: #fff;
   }
+}
 
-  .post_field {
-    margin: 15px 0px;
-  }
+.post_field {
+  margin: 15px 0px;
+}
 
-  .notify_subscribers_checkbox {
-    margin-right: 30px;
-    margin-top: -3px;
-  }
+.notify_subscribers_checkbox {
+  margin-right: 30px;
+  margin-top: -3px;
+}
 
-  .post-action-panel {
-    background: #fff;
-    border-bottom: 1px solid #f1f1f1;
-    margin: -20px -20px 20px -20px;
-  }
+.post-action-panel {
+  background: #fff;
+  border-bottom: 1px solid #f1f1f1;
+  margin: -20px -20px 20px -20px;
+}
 
-  #title_character_limit {
-    position: relative;
-    top: 21px;
-    left: -29px;
-  }
+#title_character_limit {
+  position: relative;
+  top: 21px;
+  left: -29px;
+}
 
-  .note-editable:empty:before {
-    content: "Write here...";
-    color: #ccc;
-  }
+.note-editable:empty:before {
+  content: "Write here...";
+  color: #ccc;
+}
 
-  #published_at_date, #published_at_time {
-    cursor: pointer;
-    background: #fff;
-  }
+#published_at_date, #published_at_time {
+  cursor: pointer;
+  background: #fff;
+}
 
-  #draft_last_saved_at{
-    margin-left: 25px;
-  }
+#draft_last_saved_at{
+  margin-left: 25px;
+}
+
+.storytime-image{
+  &.pull-left{ margin-right: 15px; }
+  &.pull-right{ margin-left: 15px; }
+}
+
+.blog_post_tags{
+  label{ display: block; }
+}

data/app/controllers/storytime/application_controller.rb

@@ -1,4 +1,4 @@
-class Storytime::ApplicationController < ApplicationController
+class Storytime::ApplicationController < Storytime.application_controller_superclass
   layout :set_layout
 
   before_action :ensure_site_exists
@@ -7,15 +7,15 @@ class Storytime::ApplicationController < ApplicationController
   include Storytime::Concerns::ControllerContentFor
   include Storytime::Concerns::CurrentSite
   helper_method :current_storytime_site
-  
+
   include Pundit
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
-  
+
   helper :all
 
   helper_method :dashboard_controller
 
-  if Storytime.user_class_symbol != :user
+  if Storytime.user_class_symbol != :user && !respond_to(:current_user)
     helper_method :authenticate_user!
     helper_method :current_user
     helper_method :user_signed_in?
@@ -35,9 +35,9 @@ class Storytime::ApplicationController < ApplicationController
 
   def setup
     url = if Storytime.user_class.count == 0
-      main_app.new_user_registration_url
+      Storytime.registration_path
     elsif current_user.nil?
-      main_app.new_user_session_url
+      Storytime.login_path
     elsif Storytime::Site.count == 0
       new_dashboard_site_url
     else
@@ -48,6 +48,7 @@ class Storytime::ApplicationController < ApplicationController
   end
 
 private
+
   def ensure_site_exists
     setup if Storytime::Site.count == 0
   end
@@ -66,7 +67,7 @@ private
   ensure
     Storytime::Site.current_id = nil
   end
-  
+
   def user_not_authorized
     flash[:error] = "You are not authorized to perform this action."
     redirect_to(request.referrer || "/")

data/app/controllers/storytime/blogs_controller.rb

@@ -5,20 +5,21 @@ module Storytime
     before_action :load_page
 
     def show
-      if params[:preview].nil? && ((params[:id] != @page.slug) && (request.path != "/"))
+      if params[:preview].nil? && params[:id].present? && params[:id] != @page.slug
         return redirect_to @page, :status => :moved_permanently
       end
-      
+
       @posts = @page.posts
       @posts = Storytime.search_adapter.search(params[:search], get_search_type) if (params[:search] && params[:search].length > 0)
       @posts = @posts.tagged_with(params[:tag]) if params[:tag]
-      @posts = @posts.published.order(published_at: :desc).page(params[:page])
+      @posts = @posts.published.order(published_at: :desc).page(params[:page_number])
 
       #allow overriding in the host app
       render "storytime/#{@current_storytime_site.custom_view_path}/blogs/#{@page.slug}" if lookup_context.template_exists?("storytime/#{@current_storytime_site.custom_view_path}/blogs/#{@page.slug}")
     end
 
   private
+
     def load_page
       @page = if params[:preview]
         page = Post.find_preview(params[:id])
@@ -28,9 +29,13 @@ module Storytime
       else
         Post.published.friendly.find(params[:id])
       end
-      redirect_to "/", status: :moved_permanently if @page == @current_storytime_site.homepage
+
+      if @page == @current_storytime_site.homepage
+        opts = params[:tag] ? { tag: params[:tag] } : {}
+        redirect_to storytime.root_path(opts), status: :moved_permanently
+      end
     end
-    
+
     def get_search_type
       if params[:type]
         legal_search_types(params[:type])

data/app/controllers/storytime/dashboard/blogs_controller.rb

@@ -32,7 +32,6 @@ module Storytime
       def create
         @blog = current_post_type.new(post_params)
         @blog.user = current_user
-        @blog.draft_content = "test"
         @blog.draft_user_id = current_user.id
         @blog.published_at = Time.now.utc
         authorize @blog

data/app/controllers/storytime/dashboard/custom_posts_controller.rb

@@ -33,7 +33,7 @@ module Storytime
       
     private
       def current_post_type
-        @current_post_type ||= request.path.split("/")[4].classify.constantize
+        @current_post_type ||= params[:post_type].classify.constantize
       end
       helper_method :current_post_type
 

data/app/controllers/storytime/dashboard/links_controller.rb

@@ -0,0 +1,16 @@
+require_dependency "storytime/dashboard/posts_controller"
+
+module Storytime
+  module Dashboard
+    class LinksController < DashboardController
+      def sort
+        authorize current_storytime_site, :manage?
+        @navigation = Navigation.find(params[:navigation_id])
+        params[:link].each_with_index do |id, index|
+          @navigation.links.where(id: id).update_all({position: index+1})
+        end
+        render nothing: true
+      end
+    end
+  end
+end