pages_cms 0.2.3 → 1.0.0

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

@@ -1,3 +1,8 @@
+= javascript_include_tag 'pages_cms/wysihtml5x-toolbar'
+= javascript_include_tag 'pages_cms/advanced_and_extended'
+= javascript_include_tag 'pages_cms/select2.min'
+= stylesheet_link_tag 'pages_cms/select2.min'
+
 - if params[:sortable] == 'on'
   %h1 Sort Your Page Blocks
   %p
@@ -21,12 +26,14 @@
           %h2
             Edit
             = @page.title
-            = link_to 'Preview', slugged_path(@page), class: 'btn btn-default btn-xs'
+            = link_to 'View', 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.label 'Is a draft  '
+          = f.check_box :draft
         = 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'
@@ -39,13 +46,21 @@
             = link_to_add_association 'Add Block', f, :page_blocks
 
       %div.col-md-3
-        %h4 Sidebar
+        %h3 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', id: 'select_sid')
-
+          = ss.label 'Use a different sidebar:'
+          = ss.select(:use_instead, PagesCms::Page.all.includes(:sidebar).collect {|p| [p.title, p.sidebar.id] unless p.sidebar.nil? }, {include_blank: true}, class: 'form-control', id: 'select_sid')
+        %hr
+        %h3 Content Sliders
+        %div
+          = f.fields_for :sliders do |slider|
+            = render 'slider_fields', f: slider
+          %hr
+          = link_to_add_association 'Add Slider', f, :sliders
+    %hr
     = f.submit 'Save', class: 'btn btn-primary center-block'
 
 :javascript
@@ -55,12 +70,18 @@
       $('.block-order').each(function(i){ $(this).val(i+1) })
     });
   })
-
-  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);
-  }
+  $('.select2').select2({
+    tags: true,
+    createTag: function (params) {
+      return {
+        id: params.term,
+        text: params.term,
+        newOption: true
+      }
+    }
+  });
+  window.setInterval(function(){
+    $('.block-order').each(function(i){ $(this).val(i+1) })
+  }, 500);
 
 = javascript_include_tag 'pages_cms/sortable.js'

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

@@ -1,23 +1,39 @@
 - page.page_blocks.order(:order).each do |block|
-  %div.page_block{ id: block.div_id }
-    %h2
-      = block.name unless block.name.blank?
+  %div.row.page_block{ id: block.div_id }
+    - if block.name
+      %h2
+        = block.name
     - 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'
+          = image_tag '/images/default.jpg'
         %h4
           = link_to raw(thumb.content), thumb.link
 
-    - 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
+        = raw box.content
+
+    - block.image_boxes.each do |box|
+      %div.col-md-6{ style: 'overflow: hidden'}
+        - if box.image
+          = image_tag box.image.file
+        - else
+          = image_tag '/images/default.jpg'
+        %h3
+          = box.heading
+        %p
+          = box.content
+
+    - block.blog_feeds.each do |feed|
+      - PagesCms::Article.all.limit(feed.limit).each do |post|
+        %h4
+          = post.title
+        %p
+          = raw truncate(post.content, length: 200)
+        %div
+          = link_to 'read more', article_path(post)
+          - post.tags.each do |tag|
+            = link_to tag, articles_path(search: tag), class: 'btn btn-default btn-xs'

data/app/views/pages_cms/pages/_slider.html.erb

@@ -0,0 +1,38 @@
+<div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
+	<!-- Indicators -->
+	<ol class="carousel-indicators">
+		<li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
+		<li data-target="#carousel-example-generic" data-slide-to="1"></li>
+		<li data-target="#carousel-example-generic" data-slide-to="2"></li>
+	</ol>
+
+	<!-- Wrapper for slides -->
+	<div class="carousel-inner" role="listbox">
+
+		<% set = false %>
+		<% slider_elements.each do |element| %>
+			<% if set %>
+			<div class="item">
+			<% else %>
+			<div class="item active">
+			<% set = true %>
+			<% end %>
+				<%= image_tag element.image.file %>
+				<div class="carousel-caption">
+					<h1><%= link_to element.header, element.link %></h1>
+				</div>
+			</div>
+		<% end %>
+
+	</div>
+
+	<!-- Controls -->
+	<a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
+		<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+		<span class="sr-only">Previous</span>
+	</a>
+	<a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
+		<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+		<span class="sr-only">Next</span>
+	</a>
+</div>

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

@@ -1,3 +1,9 @@
+- meta_tags = @page.meta_tags
+- meta_description = @page.meta_description
+
+- if @sliders
+  = render 'slider', slider_elements: @page.sliders
+
 %h1
   = @page.title
 - if @sidebar

data/db/migrate/20150609171657_create_initial_db.rb

@@ -44,36 +44,62 @@ class CreateInitialDb < ActiveRecord::Migration
     add_foreign_key :pages_cms_thumbnails, :pages_cms_page_blocks, column: :page_block_id
     add_foreign_key :pages_cms_thumbnails, :pages_cms_images, column: :image_id
 
-    create_table :pages_cms_jumbotrons do |t|
+    create_table :pages_cms_text_boxes do |t|
       t.integer     :page_block_id, index: true
       t.text        :content
-      t.string      :link
       t.integer     :order
+      t.string      :css_class
 
       t.timestamps null: false
     end
-    add_foreign_key :pages_cms_jumbotrons, :pages_cms_page_blocks, column: :page_block_id
+    add_foreign_key :pages_cms_text_boxes, :pages_cms_page_blocks, column: :page_block_id
 
-    create_table :pages_cms_text_boxes do |t|
+    create_table :pages_cms_image_boxes do |t|
       t.integer     :page_block_id, index: true
+      t.integer     :image_id, index: true
+      t.string      :heading
       t.text        :content
-      t.integer      :order
+      t.integer     :order
 
       t.timestamps null: false
     end
-    add_foreign_key :pages_cms_text_boxes, :pages_cms_page_blocks, column: :page_block_id
+    add_foreign_key :pages_cms_image_boxes, :pages_cms_page_blocks, column: :page_block_id
+    add_foreign_key :pages_cms_image_boxes, :pages_cms_images, column: :image_id
+
+    create_table :pages_cms_blog_feeds do |t|
+      t.integer     :page_block_id, index: true
+      t.integer     :limit
+
+      t.timestamps null: false
+    end
+    add_foreign_key :pages_cms_blog_feeds, :pages_cms_page_blocks, column: :page_block_id
 
     create_table :pages_cms_sidebars do |t|
       t.integer   :page_id, index: true
-      t.text      :content
-      t.text      :add_links
-      t.boolean   :show, default: true
       t.integer   :use_instead
+      t.text      :content
+      t.text      :links
+      t.boolean   :show,    default: true
+      t.boolean   :fb_feed, default: false
+      t.boolean   :tw_feed, default: false
 
       t.timestamps null: false
     end
     add_foreign_key :pages_cms_sidebars, :pages_cms_pages, column: :page_id
 
+    create_table :pages_cms_sliders do |t|
+      t.integer   :page_id,   index: true
+      t.integer   :image_id,  index: true
+      t.string    :header
+      t.string    :link
+      t.integer   :order
+      t.boolean   :show
+
+      t.timestamps null: false
+    end
+    add_foreign_key :pages_cms_sliders, :pages_cms_pages,  column: :page_id
+    add_foreign_key :pages_cms_sliders, :pages_cms_images, column: :image_id
+
     create_table :pages_cms_articles do |t|
       t.integer :image_id, index: true
       t.text    :content

data/lib/pages_cms/engine.rb

@@ -11,7 +11,14 @@ 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 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 )
+    config.assets.precompile += %w(
+          pages_cms/pages_cms.scss
+          pages_cms/sortable.js
+          pages_cms/advanced_and_extended.js
+          pages_cms/wysihtml5x-toolbar.js
+          pages_cms/select2.min.js
+          pages_cms/select2.min.css
+        )
 
   end
 end

data/lib/pages_cms/version.rb

@@ -1,3 +1,3 @@
 module PagesCms
-  VERSION = "0.2.3"
+  VERSION = "1.0.0"
 end

data/test/dummy/db/migrate/20150609171657_create_initial_db.rb

@@ -44,36 +44,62 @@ class CreateInitialDb < ActiveRecord::Migration
     add_foreign_key :pages_cms_thumbnails, :pages_cms_page_blocks, column: :page_block_id
     add_foreign_key :pages_cms_thumbnails, :pages_cms_images, column: :image_id
 
-    create_table :pages_cms_jumbotrons do |t|
+    create_table :pages_cms_text_boxes do |t|
       t.integer     :page_block_id, index: true
       t.text        :content
-      t.string      :link
       t.integer     :order
+      t.string      :css_class
 
       t.timestamps null: false
     end
-    add_foreign_key :pages_cms_jumbotrons, :pages_cms_page_blocks, column: :page_block_id
+    add_foreign_key :pages_cms_text_boxes, :pages_cms_page_blocks, column: :page_block_id
 
-    create_table :pages_cms_text_boxes do |t|
+    create_table :pages_cms_image_boxes do |t|
       t.integer     :page_block_id, index: true
+      t.integer     :image_id, index: true
+      t.string      :heading
       t.text        :content
-      t.integer      :order
+      t.integer     :order
 
       t.timestamps null: false
     end
-    add_foreign_key :pages_cms_text_boxes, :pages_cms_page_blocks, column: :page_block_id
+    add_foreign_key :pages_cms_image_boxes, :pages_cms_page_blocks, column: :page_block_id
+    add_foreign_key :pages_cms_image_boxes, :pages_cms_images, column: :image_id
+
+    create_table :pages_cms_blog_feeds do |t|
+      t.integer     :page_block_id, index: true
+      t.integer     :limit
+
+      t.timestamps null: false
+    end
+    add_foreign_key :pages_cms_blog_feeds, :pages_cms_page_blocks, column: :page_block_id
 
     create_table :pages_cms_sidebars do |t|
       t.integer   :page_id, index: true
-      t.text      :content
-      t.text      :add_links
-      t.boolean   :show, default: true
       t.integer   :use_instead
+      t.text      :content
+      t.text      :links
+      t.boolean   :show,    default: true
+      t.boolean   :fb_feed, default: false
+      t.boolean   :tw_feed, default: false
 
       t.timestamps null: false
     end
     add_foreign_key :pages_cms_sidebars, :pages_cms_pages, column: :page_id
 
+    create_table :pages_cms_sliders do |t|
+      t.integer   :page_id,   index: true
+      t.integer   :image_id,  index: true
+      t.string    :header
+      t.string    :link
+      t.integer   :order
+      t.boolean   :show
+
+      t.timestamps null: false
+    end
+    add_foreign_key :pages_cms_sliders, :pages_cms_pages,  column: :page_id
+    add_foreign_key :pages_cms_sliders, :pages_cms_images, column: :image_id
+
     create_table :pages_cms_articles do |t|
       t.integer :image_id, index: true
       t.text    :content

data/test/dummy/db/schema.rb

@@ -29,23 +29,34 @@ ActiveRecord::Schema.define(version: 20150609171657) do
 
   add_index "pages_cms_articles", ["image_id"], name: "index_pages_cms_articles_on_image_id", using: :btree
 
-  create_table "pages_cms_images", force: :cascade do |t|
-    t.string   "name"
-    t.string   "file"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  create_table "pages_cms_blog_feeds", force: :cascade do |t|
+    t.integer  "page_block_id"
+    t.integer  "limit"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
   end
 
-  create_table "pages_cms_jumbotrons", force: :cascade do |t|
+  add_index "pages_cms_blog_feeds", ["page_block_id"], name: "index_pages_cms_blog_feeds_on_page_block_id", using: :btree
+
+  create_table "pages_cms_image_boxes", force: :cascade do |t|
     t.integer  "page_block_id"
+    t.integer  "image_id"
+    t.string   "heading"
     t.text     "content"
-    t.string   "link"
     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
+  add_index "pages_cms_image_boxes", ["image_id"], name: "index_pages_cms_image_boxes_on_image_id", using: :btree
+  add_index "pages_cms_image_boxes", ["page_block_id"], name: "index_pages_cms_image_boxes_on_page_block_id", using: :btree
+
+  create_table "pages_cms_images", force: :cascade do |t|
+    t.string   "name"
+    t.string   "file"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
 
   create_table "pages_cms_page_blocks", force: :cascade do |t|
     t.integer  "page_id"
@@ -76,20 +87,37 @@ ActiveRecord::Schema.define(version: 20150609171657) do
 
   create_table "pages_cms_sidebars", force: :cascade do |t|
     t.integer  "page_id"
+    t.integer  "use_instead"
     t.text     "content"
-    t.text     "add_links"
+    t.text     "links"
     t.boolean  "show",        default: true
-    t.integer  "use_instead"
-    t.datetime "created_at",                 null: false
-    t.datetime "updated_at",                 null: false
+    t.boolean  "fb_feed",     default: false
+    t.boolean  "tw_feed",     default: 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
 
+  create_table "pages_cms_sliders", force: :cascade do |t|
+    t.integer  "page_id"
+    t.integer  "image_id"
+    t.string   "header"
+    t.string   "link"
+    t.integer  "order"
+    t.boolean  "show"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "pages_cms_sliders", ["image_id"], name: "index_pages_cms_sliders_on_image_id", using: :btree
+  add_index "pages_cms_sliders", ["page_id"], name: "index_pages_cms_sliders_on_page_id", using: :btree
+
   create_table "pages_cms_text_boxes", force: :cascade do |t|
     t.integer  "page_block_id"
     t.text     "content"
     t.integer  "order"
+    t.string   "css_class"
     t.datetime "created_at",    null: false
     t.datetime "updated_at",    null: false
   end
@@ -110,9 +138,13 @@ ActiveRecord::Schema.define(version: 20150609171657) do
   add_index "pages_cms_thumbnails", ["page_block_id"], name: "index_pages_cms_thumbnails_on_page_block_id", using: :btree
 
   add_foreign_key "pages_cms_articles", "pages_cms_images", column: "image_id"
-  add_foreign_key "pages_cms_jumbotrons", "pages_cms_page_blocks", column: "page_block_id"
+  add_foreign_key "pages_cms_blog_feeds", "pages_cms_page_blocks", column: "page_block_id"
+  add_foreign_key "pages_cms_image_boxes", "pages_cms_images", column: "image_id"
+  add_foreign_key "pages_cms_image_boxes", "pages_cms_page_blocks", column: "page_block_id"
   add_foreign_key "pages_cms_page_blocks", "pages_cms_pages", column: "page_id"
   add_foreign_key "pages_cms_sidebars", "pages_cms_pages", column: "page_id"
+  add_foreign_key "pages_cms_sliders", "pages_cms_images", column: "image_id"
+  add_foreign_key "pages_cms_sliders", "pages_cms_pages", column: "page_id"
   add_foreign_key "pages_cms_text_boxes", "pages_cms_page_blocks", column: "page_block_id"
   add_foreign_key "pages_cms_thumbnails", "pages_cms_images", column: "image_id"
   add_foreign_key "pages_cms_thumbnails", "pages_cms_page_blocks", column: "page_block_id"