pages_cms 0.1.1 → 0.2.0

data/app/views/layouts/pages_cms/application.html.erb

@@ -11,14 +11,15 @@
 <%= render 'layouts/pages_cms/header' %>
 
 <% flash.each do |message_type, message| %>
-	<div class="message alert alert-<%= message_type %>"><%= message %></div>
+	<div class="message alert alert-<%= message_type %>" ><%= message %></div>
 <% end %>
 
-<div class="container-fluid">
+<div class="message alert" ></div>
+
+<div class="container-fluid" >
 	<%= yield %>
 </div>
 
-<hr>
 
 <% if current_user_is_admin? %>
 	<footer>

data/app/views/pages_cms/admin/articles/_form.html.haml

@@ -2,7 +2,7 @@
   = f.text_field :title, placeholder: 'article title', class: 'form-control big'
   = f.select(:image_id, PagesCms::Image.all.collect {|p| [p.name, p.id] }, {include_blank: 'Choose a picture'}, class: 'form-control inline-form')
   = f.text_field :tags, placeholder: 'tags comma separated', class: 'form-control'
-  = f.text_area :content, placeholder: 'the content', class: 'form-control', rows: 20
+  = render 'pages_cms/admin/pages/editor', f: f
   = f.label :draft
   = f.check_box :draft, value: false
   = f.label :archived

data/app/views/pages_cms/admin/pages/_editor.html.haml

@@ -0,0 +1,73 @@
+= javascript_include_tag 'pages_cms/wysihtml5x-toolbar'
+= javascript_include_tag 'pages_cms/advanced_and_extended'
+
+%div#toolbar.toolbar-wrap
+  %a{ data: { 'wysihtml5-command' => 'bold' } }
+    %span.glyphicon.glyphicon-bold
+  %a{ data: { 'wysihtml5-command' => 'italic' } }
+    %span.glyphicon.glyphicon-italic
+  %a{ data: { 'wysihtml5-command' => 'alignLeftStyle' } }
+    %span.glyphicon.glyphicon-align-left
+  %a{ data: { 'wysihtml5-command' => 'alignCenterStyle' } }
+    %span.glyphicon.glyphicon-align-center
+  %a{ data: { 'wysihtml5-command' => 'alignRightStyle' } }
+    %span.glyphicon.glyphicon-align-right
+  %a{ data: { 'wysihtml5-command' => 'insertBlockQuote' } }
+    %span.glyphicon.glyphicon-indent-left
+
+  %a{ data: { 'wysihtml5-command' => 'formatBlock', 'wysihtml5-command-value' => 'h1'  } } H1
+  %a{ data: { 'wysihtml5-command' => 'formatBlock', 'wysihtml5-command-value' => 'h2'  } } H2
+  %a{ data: { 'wysihtml5-command' => 'formatBlock', 'wysihtml5-command-value' => 'h3'  } } H3
+  %a{ data: { 'wysihtml5-command' => 'formatBlock', 'wysihtml5-command-value' => 'h4'  } } H4
+  %a{ data: { 'wysihtml5-command' => 'formatBlock', 'wysihtml5-command-value' => 'p'  } }  P
+
+  %a{ href: 'javascript:;', data: { 'wysihtml5-command' => 'createLink'}, class: ''} Link
+  %a{ href: 'javascript:;', data: { 'wysihtml5-command' => 'insertImage'}, class: ''} Image
+
+
+  %div{ data: { 'wysihtml5-dialog' => 'createLink' }, style: 'display: none' }
+    %hr
+    %label Link
+    <br />
+    %input.form-control.inline-form{ id: 'add' }
+    %a{ href: '#', onclick: 'addOption("select", "add")' } Add
+    = select_tag '#', options_for_select(PagesCms::Page.all.collect {|p| [p.title, slugged_path(p.slug)] }), 'data-wysihtml5-dialog-field' => 'href', include_blank: true, id: 'select', class: 'form-control inline-form'
+    %input.form-control.inline-form{ data: {'wysihtml5-dialog-field' => 'text'}, 'value' => 'link name'}
+    %a{ data: { 'wysihtml5-dialog-action' => 'save' } } OK
+    %a{ data: { 'wysihtml5-dialog-action' => 'cancel' } } Cancel
+
+  %div{ data: { 'wysihtml5-dialog' => 'insertImage' }, style: 'display: none' }
+    %hr
+    %label Image
+    <br />
+    %input.form-control.inline-form{ id: 'add_img', placeholder: 'add outside link' }
+    %a{ href: '#', onclick: 'addOption("select_img", "add_img")' } Add
+    = select_tag '#', options_from_collection_for_select(PagesCms::Image.all, :file, :name), 'data-wysihtml5-dialog-field' => 'src', include_blank: true, id: 'select_img', class: 'form-control inline-form'
+    %select{ data: {'wysihtml5-dialog-field' => 'className'}, class: 'form-control inline-form' }
+      %option{ value: '' } Default
+      %option{ value: 'float-left'} Left
+      %option{ value: 'float-left'} Right
+    %a{ data: { 'wysihtml5-dialog-action' => 'save' } } OK
+    %a{ data: { 'wysihtml5-dialog-action' => 'cancel' } } Cancel
+
+= f.text_area :content, 'data-placeholder' => 'content', class: 'form-control', rows: 20, id: 'editor'
+
+:javascript
+  var random = Math.floor((Math.random() * 10000) + 1);
+  document.getElementById('editor').id = 'editor' + random
+  document.getElementById('toolbar').id = 'toolbar' + random
+  document.getElementById('select').id = 'select' + random
+  document.getElementById('select_img').id = 'select_img' + random
+  document.getElementById('add').id = 'add' + random
+  document.getElementById('add_img').id = 'add_img' + random
+
+  var editor = new wysihtml5.Editor('editor' + random, {
+      toolbar: 'toolbar' + random,
+      parserRules:  wysihtml5ParserRules
+  });
+  function addOption(id,target) {
+      var x = document.getElementById(id + random);
+      var option = document.createElement("option");
+      option.text = document.getElementById(target + random).value;
+      x.add(option);
+  }

data/app/views/pages_cms/admin/pages/_jumbotron_fields.html.haml

@@ -4,6 +4,6 @@
   %h5
     Jumbotron
     = link_to_remove_association 'remove', f
-  = f.text_area :content, placeholder: 'content', class: 'form-control', rows: 8
+  = render 'editor', f: f
   = f.label :link
   = f.select(:link, PagesCms::Page.all.collect {|p| [p.title, p.slug] }, {include_blank: 'None'}, class: 'form-control inline-form')

data/app/views/pages_cms/admin/pages/_page_block_fields.html.haml

@@ -1,7 +1,7 @@
 .nested-fields
   %div.block
-    <span style="cursor: crosshair">Reorder</span>
     = f.text_field :name, placeholder: 'page block title (leave blank for no title)', class: 'form-control med'
+    = f.text_field :div_id, placeholder: 'division identifier (always fill out)', class: 'form-control'
     = f.hidden_field :order, class: 'block-order'
     %div
       = f.fields_for :jumbotrons do |jumbotron|

data/app/views/pages_cms/admin/pages/_text_box_fields.html.haml

@@ -4,4 +4,4 @@
   %h5
     Text Box
     = link_to_remove_association 'remove', f
-  = f.text_area :content, placeholder: 'content', class: 'form-control', rows: 8
+  = render 'editor', f: f

data/app/views/pages_cms/admin/pages/edit.html.haml

@@ -1,45 +1,59 @@
-= form_for @page, url: admin_page_path(@page), class: 'inline-form form-horizontal' do |f|
-  %div.row
-    %div.col-md-8
-      %span
-        %h2
-          Edit
-          = @page.title
-          = link_to 'Preview', slugged_path(@page), class: 'btn btn-default btn-xs'
-        = f.label 'Show in top navbar '
-        = f.check_box :navbar_show
-        = f.label 'Show in sidebar  '
-        = f.check_box :sidebar_show
-      = f.text_field :title, placeholder: 'page title', class: 'form-control big'
-      = f.text_field :meta_tags, placeholder: 'meta tags', class: 'form-control inline-form'
-      = f.text_field :meta_description, placeholder: 'meta description', class: 'form-control inline-form'
-      = f.select(:parent_id, PagesCms::Page.where(parent_id: nil).collect {|p| [p.title, p.id] }, {include_blank: 'Is a sub-page of'}, class: 'form-control inline-form')
-      = f.submit 'Save', class: 'btn btn-primary inline-form'
-      %div.sortable
-        = f.fields_for :page_blocks, f.object.page_blocks.order(:order) do |page_block|
-          = render 'page_block_fields', f: page_block
-        %hr
-          = link_to_add_association 'Add Block', f, :page_blocks
+- if params[:sortable] == 'on'
+  %h1 Sort Your Page Blocks
+  %p
+    tip: give your page blocks a name to more easily sort them.
+  = form_for @page, url: admin_page_path(@page) do |f|
+    %ul.sortable.list-unstyled
+      = f.fields_for :page_blocks, f.object.page_blocks.order(:order) do |ff|
+        %li
+          %h4
+            %span.glyphicon.glyphicon-menu-hamburger
+            = ff.object.div_id
+          = ff.hidden_field :order, class: 'block-order'
 
-    %div.col-md-3
-      %h4 Sidebar
-      = f.fields_for :sidebar, @sidebar do |ss|
-        = ss.text_area :content, placeholder: 'content', class: 'form-control', rows: '20'
-        = ss.label 'Show sidebar on this page  '
-        = ss.check_box :show
-        = ss.select(:use_instead, PagesCms::Page.all.includes(:sidebar).collect {|p| [p.title, p.sidebar.id] unless p.sidebar.nil? }, {include_blank: 'Use this sidebar instead'}, class: 'form-control inline-form')
+    = f.submit 'Save', class: 'btn btn-primary center-block'
+
+- else
+  = form_for @page, url: admin_page_path(@page) do |f|
+    %div.row
+      %div.col-md-8
+        %span
+          %h2
+            Edit
+            = @page.title
+            = link_to 'Preview', slugged_path(@page), class: 'btn btn-default btn-xs'
+            = link_to 'Sort', edit_admin_page_path(@page, sortable: 'on'), class: 'btn btn-default btn-xs'
+          = f.label 'Show in top navbar '
+          = f.check_box :navbar_show
+          = f.label 'Show in sidebar  '
+          = f.check_box :sidebar_show
+        = f.text_field :title, placeholder: 'page title', class: 'form-control big'
+        = f.text_field :meta_tags, placeholder: 'meta tags', class: 'form-control inline-form'
+        = f.text_field :meta_description, placeholder: 'meta description', class: 'form-control inline-form'
+        = f.select(:parent_id, PagesCms::Page.where(parent_id: nil).collect {|p| [p.title, p.id] }, {include_blank: 'Is a sub-page of'}, class: 'form-control inline-form')
+        = f.submit 'Save', class: 'btn btn-primary inline-form'
+        %div
+          = f.fields_for :page_blocks, f.object.page_blocks.order(:order) do |page_block|
+            = render 'page_block_fields', f: page_block
+          %hr
+            = link_to_add_association 'Add Block', f, :page_blocks
+
+      %div.col-md-3
+        %h4 Sidebar
+        = f.fields_for :sidebar, @sidebar do |ss|
+          = render 'editor', f: ss
+          = ss.label 'Show sidebar on this page'
+          = ss.check_box :show
+          = ss.select(:use_instead, PagesCms::Page.all.includes(:sidebar).collect {|p| [p.title, p.sidebar.id] unless p.sidebar.nil? }, {include_blank: 'Use this sidebar instead'}, class: 'form-control inline-form')
 
-  %div.row
     = f.submit 'Save', class: 'btn btn-primary center-block'
 
 :javascript
   $( document ).ready(function() {
-    $('.sortable').sortable({items: '.nested-fields', handle: 'span'});
-  });
-  window.setInterval(function(){
-    $('.block-order').each(function(i){
-      $(this).val(i+1);
-    })
-  }, 500);
+    $('.sortable').sortable();
+    $('.sortable').sortable().bind('sortupdate', function() {
+      $('.block-order').each(function(i){ $(this).val(i+1) })
+    });
+  })
 
 = javascript_include_tag 'pages_cms/sortable.js'

data/app/views/pages_cms/articles/show.html.haml

@@ -7,4 +7,4 @@
 
 <hr>
 %div.content
-  = raw @article.content_rendered
+  = raw @article.content

data/app/views/pages_cms/pages/_main.html.haml

@@ -1,22 +1,23 @@
 - page.page_blocks.order(:order).each do |block|
-  %h2
-    = block.name unless block.name.blank?
-  - block.thumbnails.each do |thumb|
-    %div.thumbnail.col-md-4.col-sm-6
-      - if thumb.image
-        = image_tag thumb.image.file
-      - else
-        = image_tag '/images/1434315758_my_name.jpg'
-      %h4
-        = link_to raw(thumb.content_rendered), thumb.link
+  %div.page_block{ id: block.div_id }
+    %h2
+      = block.name unless block.name.blank?
+    - block.thumbnails.each do |thumb|
+      %div.thumbnail.col-md-4.col-sm-6
+        - if thumb.image
+          = image_tag thumb.image.file
+        - else
+          = image_tag '/images/1434315758_my_name.jpg'
+        %h4
+          = link_to raw(thumb.content), thumb.link
 
-  - block.jumbotrons.each do |jumbo|
-    %div.jumbotron
-      %p
-        = raw jumbo.content_rendered
-        - unless jumbo.link.nil?
-          = link_to(PagesCms::Page.find_by_slug(jumbo.link).title, slugged_path(jumbo.link), class: 'btn btn-primary')
+    - block.jumbotrons.each do |jumbo|
+      %div.jumbotron
+        %p
+          = raw jumbo.content
+          - unless jumbo.link.nil?
+            = link_to(PagesCms::Page.find_by_slug(jumbo.link).title, slugged_path(jumbo.link), class: 'btn btn-primary')
 
-  - block.text_boxes.each do |box|
-    %p
-      = raw box.content_rendered
+    - block.text_boxes.each do |box|
+      %p
+        = raw box.content

data/app/views/pages_cms/pages/show.html.haml

@@ -5,7 +5,7 @@
     %div.col-md-8
       = render partial: 'pages_cms/pages/main', locals: { page: @page }
     %div.col-md-4
-      = raw @sidebar.content_rendered
+      = raw @sidebar.content
       %ul.nav.nav-pills.nav-stacked
         - PagesCms::Page.where(sidebar_show: true).each do |link|
           %li

data/lib/generators/pages_cms/Install_generator.rb

@@ -49,7 +49,11 @@ module PagesCms
   end
   # added by PagesCMS. Use this helper to link to user created pages.
   def slugged_path(page)
-    "/#{page.slug}"
+    if page.class == String
+      "/#{page}"
+    else
+      "/#{page.slug}"
+    end
   end
           RUBY
         end

data/lib/pages_cms/engine.rb

@@ -11,7 +11,7 @@ module PagesCms
 
     config.assets.paths << File.expand_path("../../assets/stylesheets", __FILE__)
     config.assets.paths << File.expand_path("../../assets/javascripts", __FILE__)
-    config.assets.precompile += %w( pages_cms/pages_cms.scss pages_cms/sortable.js )
+    config.assets.precompile += %w( pages_cms/pages_cms.scss pages_cms/sortable.js pages_cms/wysihtml5x.min.js pages_cms/wysihtml5x-toolbar.min.js pages_cms/advanced.js pages_cms/advanced_and_extended.js pages_cms/wysihtml5x-toolbar.js )
 
   end
 end

data/lib/pages_cms/version.rb

@@ -1,3 +1,3 @@
 module PagesCms
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/test/dummy/app/assets/javascripts/application.js

@@ -12,6 +12,7 @@
 //
 //
 //= require jquery
+ //= require cocoon
 //= require cocoon
 //= require jquery_ujs
 //= require bootstrap

data/test/dummy/app/controllers/application_controller.rb

@@ -1,4 +1,10 @@
 class ApplicationController < ActionController::Base
+  # added by PagesCMS. Fill out this helper to protect your controllers.
+  def logged_in_admin
+    # Do something if admin
+    # is not logged in
+    # ie: redirect_to root_path unless current_user.admin
+  end
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception

data/test/dummy/app/helpers/application_helper.rb

@@ -3,6 +3,14 @@ module ApplicationHelper
   def current_user_is_admin?
     true
   end
+  # added by PagesCMS. Use this helper to link to user created pages.
+  def slugged_path(page)
+    if page.class == String
+      "/#{page}"
+    else
+      "/#{page.slug}"
+    end
+  end
 
 
 end

data/test/dummy/config/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-
+  mount PagesCms::Engine => '/'
 end

data/{db → test/dummy/db}/migrate/20150609171657_create_initial_db.rb

@@ -8,7 +8,7 @@ class CreateInitialDb < ActiveRecord::Migration
       t.string  :meta_description
       t.boolean :draft
       t.integer :parent_id, index: true
-      t.string  :order
+      t.integer :order
       t.boolean :navbar_show, default: true
       t.boolean :sidebar_show, default: true
 
@@ -26,7 +26,7 @@ class CreateInitialDb < ActiveRecord::Migration
       t.integer :page_id, index: true
       t.integer :order
       t.string  :name
-      t.string  :order
+      t.string  :div_id
 
       t.timestamps null: false
     end
@@ -36,9 +36,8 @@ class CreateInitialDb < ActiveRecord::Migration
       t.integer     :page_block_id, index: true
       t.integer     :image_id, index: true
       t.text        :content
-      t.text        :content_rendered
       t.string      :link
-      t.string      :order
+      t.integer     :order
 
       t.timestamps null: false
     end
@@ -48,9 +47,8 @@ class CreateInitialDb < ActiveRecord::Migration
     create_table :pages_cms_jumbotrons do |t|
       t.integer     :page_block_id, index: true
       t.text        :content
-      t.text        :content_rendered
       t.string      :link
-      t.string      :order
+      t.integer     :order
 
       t.timestamps null: false
     end
@@ -59,8 +57,7 @@ class CreateInitialDb < ActiveRecord::Migration
     create_table :pages_cms_text_boxes do |t|
       t.integer     :page_block_id, index: true
       t.text        :content
-      t.text        :content_rendered
-      t.string      :order
+      t.integer      :order
 
       t.timestamps null: false
     end
@@ -69,7 +66,7 @@ class CreateInitialDb < ActiveRecord::Migration
     create_table :pages_cms_sidebars do |t|
       t.integer   :page_id, index: true
       t.text      :content
-      t.text      :content_rendered
+      t.text      :add_links
       t.boolean   :show, default: true
       t.integer   :use_instead
 
@@ -80,7 +77,6 @@ class CreateInitialDb < ActiveRecord::Migration
     create_table :pages_cms_articles do |t|
       t.integer :image_id, index: true
       t.text    :content
-      t.text    :content_rendered
       t.string  :title
       t.boolean :draft
       t.boolean :archived

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150616171349) do
+ActiveRecord::Schema.define(version: 20150609171657) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -19,13 +19,12 @@ ActiveRecord::Schema.define(version: 20150616171349) do
   create_table "pages_cms_articles", force: :cascade do |t|
     t.integer  "image_id"
     t.text     "content"
-    t.text     "content_rendered"
     t.string   "title"
     t.boolean  "draft"
     t.boolean  "archived"
-    t.text     "tags",             default: [],              array: true
-    t.datetime "created_at",                    null: false
-    t.datetime "updated_at",                    null: false
+    t.text     "tags",       default: [],              array: true
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
   end
 
   add_index "pages_cms_articles", ["image_id"], name: "index_pages_cms_articles_on_image_id", using: :btree
@@ -40,19 +39,19 @@ ActiveRecord::Schema.define(version: 20150616171349) do
   create_table "pages_cms_jumbotrons", force: :cascade do |t|
     t.integer  "page_block_id"
     t.text     "content"
-    t.text     "content_rendered"
     t.string   "link"
-    t.string   "order"
-    t.datetime "created_at",       null: false
-    t.datetime "updated_at",       null: false
+    t.integer  "order"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
   end
 
   add_index "pages_cms_jumbotrons", ["page_block_id"], name: "index_pages_cms_jumbotrons_on_page_block_id", using: :btree
 
   create_table "pages_cms_page_blocks", force: :cascade do |t|
     t.integer  "page_id"
-    t.string   "order"
+    t.integer  "order"
     t.string   "name"
+    t.string   "div_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
@@ -66,7 +65,7 @@ ActiveRecord::Schema.define(version: 20150616171349) do
     t.string   "meta_description"
     t.boolean  "draft"
     t.integer  "parent_id"
-    t.string   "order"
+    t.integer  "order"
     t.boolean  "navbar_show",      default: true
     t.boolean  "sidebar_show",     default: true
     t.datetime "created_at",                      null: false
@@ -78,11 +77,11 @@ ActiveRecord::Schema.define(version: 20150616171349) do
   create_table "pages_cms_sidebars", force: :cascade do |t|
     t.integer  "page_id"
     t.text     "content"
-    t.text     "content_rendered"
-    t.boolean  "show",             default: true
+    t.text     "add_links"
+    t.boolean  "show",        default: true
     t.integer  "use_instead"
-    t.datetime "created_at",                      null: false
-    t.datetime "updated_at",                      null: false
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
   end
 
   add_index "pages_cms_sidebars", ["page_id"], name: "index_pages_cms_sidebars_on_page_id", using: :btree
@@ -90,10 +89,9 @@ ActiveRecord::Schema.define(version: 20150616171349) do
   create_table "pages_cms_text_boxes", force: :cascade do |t|
     t.integer  "page_block_id"
     t.text     "content"
-    t.text     "content_rendered"
-    t.string   "order"
-    t.datetime "created_at",       null: false
-    t.datetime "updated_at",       null: false
+    t.integer  "order"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
   end
 
   add_index "pages_cms_text_boxes", ["page_block_id"], name: "index_pages_cms_text_boxes_on_page_block_id", using: :btree
@@ -102,11 +100,10 @@ ActiveRecord::Schema.define(version: 20150616171349) do
     t.integer  "page_block_id"
     t.integer  "image_id"
     t.text     "content"
-    t.text     "content_rendered"
     t.string   "link"
-    t.string   "order"
-    t.datetime "created_at",       null: false
-    t.datetime "updated_at",       null: false
+    t.integer  "order"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
   end
 
   add_index "pages_cms_thumbnails", ["image_id"], name: "index_pages_cms_thumbnails_on_image_id", using: :btree