pages_cms 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f09dfc205207caa481e74ad978dd5fc3445c7b28
-  data.tar.gz: fecdf51507f456bdd23c987c645ddbe50f1df313
+  metadata.gz: afaa806c4acfe54bce3812663ea38147bca75837
+  data.tar.gz: bd8e7195348eac42e39c8d65f65228f0c70f1501
 SHA512:
-  metadata.gz: fbfec04222863f22574d785e4c978936389e774c6247946fa997829887c19234e6d65f4dc2a6cea9b523163c7bfd9a2ade0b455a7534dd35793c9df079c9f316
-  data.tar.gz: 76b9eff2b9cf31820bceae4b470f1026a0b45bb4fa79018ea424d78822cce76aee6820ad714c49ebdc7424dc758aa3e86d5ea528ec93f474154b98c06280b3dd
+  metadata.gz: c1bde884e5c30f9306bc1eaf04a2f2ea97d3d3ea0bc3b8d16cb624cb21e529e2d93313ba16cf5fc615da34cc35a337563ecca3289cab7a2f1e5771e442850394
+  data.tar.gz: 83e100d21797a9fa053f676cc5f234d6c752b16f82b55b6038ffe4c24da73180aaad42438cdc35a850fbf643ca68322bef56ef7cc1b24140c46bb755540c33a7

data/README.md

@@ -14,7 +14,7 @@ Pages CMS uses nested forms and draggable items to allow the user to build a sit
 
 ## Installation
 
-1. 	Add: `gem 'pages_cms', '~> 1.0.2'` to your `Gemfile`
+1. 	Add: `gem 'pages_cms', '~> 1.0.3'` to your `Gemfile`
 2. 	Run: `$ rails generate pages_cms:install`
 3.	Add: `//= require cocoon` to your `application.js` file
 

data/app/assets/stylesheets/pages_cms/pages_cms.scss

@@ -18,5 +18,9 @@
 .toolbar-wrap { a { padding: 0.5em !important; } }
 .float-left { float: left !important; margin: 1em !important;}
 .float-right { float: right !important; margin: 1em !important; }
-.select2 { width: 170px; }
-.select2-select-container { height: 2em;}
+.select2 { min-width: 190px; }
+.select2-select-container { height: 2em;}
+.image-post { overflow: hidden; }
+.carousel { width: 100% !important;}
+.full { width: 100% !important; padding: 0;}
+//.form-control { border: none !important; outline: none !important; box-shadow: none !important }

data/app/controllers/pages_cms/admin/articles_controller.rb

@@ -50,7 +50,7 @@ module PagesCms
     private
       def article_params
         params.require(:article).permit(
-          :title, :tags, :content, :image_id, :draft, :archive
+          :title, :tags, :content, :image_id, :draft, :archived
         )
       end
 

data/app/controllers/pages_cms/admin/images_controller.rb

@@ -10,32 +10,43 @@ module PagesCms
     end
 
     def create
-      validate_image = Image.new(image_params)
-      if validate_image.validate_file_type(params[:image][:file])
-        user_named = params[:image][:name]
-        uploaded_io = params[:image][:file]
-        extension = uploaded_io.original_filename.split('.')[1]
-        name = "#{Time.now.to_i}_#{user_named}.#{extension}"
-        @image = Image.new(file: "/images/#{name}", name: user_named)
-        if @image.save
-          File.open(Rails.root.join('public', 'images', name), 'wb') do |file|
-            file.write(uploaded_io.read)
-          end
-          if File.exists?(Rails.root.join('public', 'images', name))
-            flash[:success] = 'Successfully uploaded file.'
-            redirect_to admin_images_path
+      if params[:image][:is_url]
+        image = Image.new(image_params)
+        if image.save
+          flash[:success] = 'Successfully uploaded file.'
+          redirect_to admin_images_path
+        else
+          flash[:danger] = 'Failed to create file'
+          redirect_to admin_images_path
+        end
+      else
+        validate_image = Image.new(image_params)
+        if validate_image.validate_file_type(params[:image][:file])
+          user_named = params[:image][:name]
+          uploaded_io = params[:image][:file]
+          extension = uploaded_io.original_filename.split('.')[1]
+          name = "#{Time.now.to_i}_#{user_named}.#{extension}"
+          @image = Image.new(file: "/images/#{name}", name: user_named)
+          if @image.save
+            File.open(Rails.root.join('public', 'images', name), 'wb') do |file|
+              file.write(uploaded_io.read)
+            end
+            if File.exists?(Rails.root.join('public', 'images', name))
+              flash[:success] = 'Successfully uploaded file.'
+              redirect_to admin_images_path
+            else
+              @image.destroy
+              flash[:danger] = 'Failed to create file'
+              redirect_to admin_images_path
+            end
           else
-            @image.destroy
-            flash[:danger] = 'Failed to create file'
+            flash[:danger] = "Error: #{@image.errors.full_messages.to_sentence}"
             redirect_to admin_images_path
           end
         else
-          flash[:danger] = "Error: #{@image.errors.full_messages.to_sentence}"
+          flash[:danger] = "Error #{validate_image.errors.full_messages.to_sentence}"
           redirect_to admin_images_path
         end
-      else
-        flash[:danger] = "Error #{validate_image.errors.full_messages.to_sentence}"
-        redirect_to admin_images_path
       end
     end
 

data/app/controllers/pages_cms/articles_controller.rb

@@ -4,7 +4,7 @@ module PagesCms
   class ArticlesController < ApplicationController
 
     def index
-      @articles = Article.all
+      @articles = Article.published
       filter_params(params).each do |search, result|
         @articles = @articles.public_send(search, result) if result.present?
       end

data/app/helpers/pages_cms/application_helper.rb

@@ -0,0 +1,5 @@
+module PagesCms
+  module ApplicationHelper
+
+  end
+end

data/app/models/pages_cms/article.rb

@@ -12,6 +12,22 @@ module PagesCms
       write_attribute(:tags, val.split(',') )
     end
 
+    def published
+      self.where('archived != true AND draft != true')
+    end
+
+    def article_status
+      if self.draft && !self.archived
+        'Draft'
+      elsif self.archived && !self.draft
+        'Archived'
+      elsif !self.draft && !self.archived
+        'Published'
+      elsif self.draft && self.archived
+        'Archived'
+      end
+    end
+
     scope :search, -> (search)  { where('content ILIKE ? OR tags @> ? OR title ILIKE ? ',"#{search}",'{' + search + '}',"#{search}") }
     scope :status, -> (status) do
       case status
@@ -20,7 +36,7 @@ module PagesCms
         when 'Drafts'
           where(draft: true)
         when 'Published'
-          where('draft = ? AND archived = ?', false, false)
+          where('archived != true AND draft != true')
         else
           all
       end

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

@@ -14,11 +14,7 @@
 	<div class="message alert alert-<%= message_type %>" ><%= message %></div>
 <% end %>
 
-<div class="message alert" ></div>
-
-<div class="container-fluid" >
-	<%= yield %>
-</div>
+<%= yield %>
 
 
 <% if current_user_is_admin? %>

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

@@ -1,7 +1,13 @@
+= 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'
+
 = form_for article, url: url, method: method do |f|
   = 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_field :tags, value: f.object.tags.join(','), placeholder: 'tags, comma separated', class: 'form-control'
+  <br />
   = render 'pages_cms/admin/pages/editor', f: f
   = f.label :draft
   = f.check_box :draft, value: false

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

@@ -1,8 +1 @@
-= 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'
-
-%h1 Edit Article
-
 = render partial: '/pages_cms/admin/articles/form', locals: { article: @article, method: :patch, url: admin_article_path(@article) }

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

@@ -20,6 +20,8 @@
         Tags
       %th
         Created At
+      %th
+        Status
       %th
         Actions
   - @articles.each do |article|
@@ -30,9 +32,11 @@
         - article.tags.each do |tag|
           = link_to tag, articles_path(search: tag)
       %td
-        = article.created_at.strftime("%B %d")
+        = article.created_at.strftime("%B %d %Y")
+      %td
+        = article.article_status
       %td
         = article.draft ? link_to( 'Publish',admin_article_path(article, article: { draft: false }), method: :put, class: 'btn btn-xs btn-default') : link_to( 'Make Draft',admin_article_path(article, article: { draft: true }), method: :put, class: 'btn btn-xs btn-default')
-        = link_to 'Archive', admin_article_path(article, article: { archived: false } ), method: :put, class: 'btn btn-xs btn-default'
+        = article.archived ? link_to( 'Publish',admin_article_path(article, article: { draft: false }), method: :put, class: 'btn btn-xs btn-default')  : link_to('Archive', admin_article_path(article, article: { archived: false } ), method: :put, class: 'btn btn-xs btn-default')
         = link_to 'Delete', admin_article_path(article), method: :delete, class: 'btn btn-xs btn-default'
         = link_to 'Edit', edit_admin_article_path(article), class: 'btn btn-xs btn-default'

data/app/views/pages_cms/admin/images/index.html.haml

@@ -1,8 +1,20 @@
 %h1 Images
-= form_for @image, url: admin_images_path, method: :post, multipart: true do |f|
-  = f.text_field :name, placeholder: 'give your image a title'
-  = f.file_field :file
-  = f.submit 'Upload', class: 'btn btn-primary'
+%div.row
+  %div.col-md-6
+    %h4 Upload Image
+    = form_for @image, url: admin_images_path, method: :post, multipart: true do |f|
+      = f.text_field :name, placeholder: 'give your image a title', class: 'form-control'
+      = f.file_field :file, class: 'form-control'
+      <br />
+      = f.submit 'Upload', class: 'btn btn-primary'
+  %div.col-md-6
+    %h4 Image Url
+    = form_for @image, url: admin_images_path, method: :post do |f|
+      = f.hidden_field :is_url, value: true
+      = f.text_field :name, placeholder: 'give your image a title', class: 'form-control'
+      = f.text_field :file, placeholder: 'give me an image url', class: 'form-control'
+      <br />
+      = f.submit 'Insert', class: 'btn btn-primary'
 
 <hr>
 
@@ -11,5 +23,5 @@
     %div.col-md-3.col-sm-4.col-xs-6.thumbnail
       = image_tag image.file
       %p
-        = link_to image.file, image.file
+        = link_to image.name, image.file
       = link_to 'delete', admin_image_path(image), method: :delete, class: 'btn btn-xs btn-default'

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

@@ -2,19 +2,22 @@
   %h5
     Content Slider
     = link_to_remove_association 'remove', f
-  = f.select(:image_id, PagesCms::Image.all.collect {|p| [p.name, p.id] }, {include_blank: 'Choose a picture'}, class: 'form-control select2')
-  = f.select(:link, PagesCms::Page.all.collect {|p| [p.title, p.slug] }, {include_blank: 'Choose a link'}, class: 'form-control select2')
+  = f.select(:link, PagesCms::Page.all.collect {|p| [p.title, p.slug] } << f.object.link, {include_blank: 'Choose a link'}, class: 'form-control select2')
+  = f.select(:image_id, PagesCms::Image.all.collect {|p| [p.name, p.id] }, {}, class: 'form-control')
   = f.text_field :header, placeholder: 'overlayed header', class: 'form-control'
   = f.number_field :order, placeholder: 'display order', class: 'form-control'
 
 :javascript
-  $('.select2').select2({
-    tags: true,
-    createTag: function (params) {
-      return {
-        id: params.term,
-        text: params.term,
-        newOption: true
+  //$(document).ready(function() {
+  //  $('.select2base').select2()
+    $('.select2').select2({
+      tags: true,
+      createTag: function (params) {
+        return {
+          id: params.term,
+          text: params.term,
+          newOption: true
+        }
       }
-    }
-  });
+    });
+  //});

data/app/views/pages_cms/articles/index.html.erb

@@ -13,7 +13,7 @@
 		<div style="cursor: pointer;" onclick="window.location='/articles/<%= post.id.to_s %>';">
 			<h2 class="center"><%= post.title %></h2>
 			<h6>Posted <%= post.created_at.strftime("%B %d") %></h6>
-			<p><%= truncate(post.content, length: 200) %></p>
+			<p><%=raw HTML_Truncator.truncate(post.content, 50) %></p>
 		</div>
 		<div><%= link_to 'Read More', article_path(post) %></div>
 		<div class="tags">

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

@@ -1,38 +1,50 @@
-<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>
+<div class="container-full">
+	<div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
+		<!-- Indicators -->
+		<ol class="carousel-indicators">
+			<% set = false %>
+			<% cou = 0 %>
+			<% slider_elements.each do |element| %>
+				<% if set %>
+					<% active = '' %>
+				<% else %>
+					<% active = 'active' %>
+					<% set = true %>
+				<% end %>
+				<li data-target="#carousel-example-generic" data-slide-to="<%= cou %>" class="<%= active %>"></li>
+				<% cou += 1 %>
+			<% end %>
+		</ol>
 
-	<!-- Wrapper for slides -->
-	<div class="carousel-inner" role="listbox">
+		<!-- 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>
+			<% set = false %>
+			<% slider_elements.each do |element| %>
+				<% if set %>
+					<% active = '' %>
+				<% else %>
+					<% active = 'active' %>
+					<% set = true %>
+				<% end %>
+				<div class="item <%= active %>">
+					<%= image_tag element.image.file %>
+					<div class="carousel-caption">
+						<h1><%= link_to element.header, element.link %></h1>
+					</div>
 				</div>
-			</div>
-		<% end %>
+			<% end %>
 
-	</div>
+		</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>
+		<!-- 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>
 </div>

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

@@ -2,20 +2,20 @@
 - meta_description = @page.meta_description
 
 - if @sliders
-  = render 'slider', slider_elements: @page.sliders
+  = render 'slider', slider_elements: @sliders
+%div.container-fluid
+  %h1
+    = @page.title
+  - if @sidebar
+    %div.row
+      %div.col-md-9
+        = render partial: 'pages_cms/pages/main', locals: { page: @page }
+      %div.col-md-3
+        = raw @sidebar.content
+        %ul.nav.nav-pills.nav-stacked
+          - PagesCms::Page.where(sidebar_show: true).each do |link|
+            %li
+              = link_to link.title, slugged_path(link)
 
-%h1
-  = @page.title
-- if @sidebar
-  %div.row
-    %div.col-md-8
-      = render partial: 'pages_cms/pages/main', locals: { page: @page }
-    %div.col-md-4
-      = raw @sidebar.content
-      %ul.nav.nav-pills.nav-stacked
-        - PagesCms::Page.where(sidebar_show: true).each do |link|
-          %li
-            = link_to link.title, slugged_path(link)
-
-- else
-  = render partial: 'pages_cms/pages/main', locals: { page: @page }
+  - else
+    = render partial: 'pages_cms/pages/main', locals: { page: @page }

data/db/migrate/20150609171657_create_initial_db.rb

@@ -104,8 +104,8 @@ class CreateInitialDb < ActiveRecord::Migration
       t.integer :image_id, index: true
       t.text    :content
       t.string  :title
-      t.boolean :draft
-      t.boolean :archived
+      t.boolean :draft,     default: false
+      t.boolean :archived,  default: false
       t.text    :tags, array: true, default: []
 
       t.timestamps null: false

data/lib/pages_cms/engine.rb

@@ -2,6 +2,7 @@ require 'pg'
 require 'haml-rails'
 require 'jquery-rails'
 require 'cocoon'
+require 'html_truncator'
 
 module PagesCms
   class Engine < ::Rails::Engine

data/lib/pages_cms/version.rb

@@ -1,3 +1,3 @@
 module PagesCms
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end