RubyGems - pages_cms - Versions diffs - 2.1.1 → 2.2.1 - Mend

pages_cms 2.1.1 → 2.2.1

Files changed (516) hide show

data/app/models/pages_cms/page.rb CHANGED Viewed

@@ -15,13 +15,21 @@ module PagesCms
     validates :title, presence: true
     validates :slug,  presence: true
-    # validate  :no_other_slug_in_account_space
-    validate  :slug_has_no_spaces
-    validate  :page_parent_of_itself
+    validate  :has_account,            if: :no_errors
+    validate  :unique_slug_create,     if: :no_errors, on: :create
+    validate  :unique_slug_save,       if: :no_errors, on: :update
+    validate  :slug_has_no_spaces,     if: :no_errors
+    validate  :page_parent_of_itself,  if: :no_errors
     before_validation :parameterize_slug
     private
+      def has_account
+        if self.account.nil?
+          errors.add(:base, 'Must be associated with an account')
+        end
+      end
       def parameterize_slug
         self.slug = title.parameterize
       end
@@ -38,11 +46,21 @@ module PagesCms
         end
       end
-      # def no_other_slug_in_account_space
-      #   unless self.account.pages.find_by_slug(self.slug).nil?
-      #     errors.add(:base, 'A page already exists by this name!')
-      #   end
-      # end
+      def unique_slug_save
+        if self.account.pages.where(slug: self.slug).count >= 2
+          errors.add(:base, 'A page already exists by this name!')
+        end
+      end
+      def unique_slug_create
+        if self.account.pages.where(slug: self.slug).present?
+          errors.add(:base, 'A page already exists by this name!')
+        end
+      end
+      def no_errors
+        errors.empty?
+      end
   end
 end

data/app/uploaders/pages_cms/image_uploader.rb CHANGED Viewed

@@ -47,7 +47,7 @@ module PagesCms
     # Override the filename of the uploaded files:
     # Avoid using model.id or version_name here, see uploader/store.rb for details.
     def filename
-      "#{Time.now.to_i}#{original_filename}" if original_filename
+      "#{Time.now.to_i}_#{original_filename}" if original_filename
     end
   end

data/app/views/layouts/pages_cms/_header.html.erb CHANGED Viewed

@@ -14,7 +14,7 @@
 		<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1" >
 			<ul class="nav navbar-nav navbar-right">
 				<% if current_site %>
-				<% current_site.pages.where(navbar_show: true).order(:order).includes(:children).each do |page| %>
+				<% current_site.pages.where('navbar_show = true AND draft != true').order(:order).includes(:children).each do |page| %>
 					<% if page.children.exists? %>
 						<li class="dropdown">
 							<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><%= page.title %><span class="caret"></span></a>

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

@@ -10,6 +10,8 @@
 		<meta name="description" content="<%= yield(:meta_description).present? ? yield(:meta_description) : current_site.meta_description %>">
 		<meta name="keywords" content="<%= yield(:meta_tags).present? ? yield(:meta_tags) : current_site.meta_tags %>">
 	<% end %>
+	<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/highlight.min.js"></script>
+	<script>hljs.initHighlightingOnLoad();</script>
 </head>
 <body>

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

@@ -28,7 +28,7 @@
                   = link_to tag, blog_path(current_site, tag)
             %div.mess
               %small
-                = raw article.content_either
+                = truncate(strip_tags(article.content_either), length: 200)
           %hr
     %div.col-md-8
       - if @article && @new

data/app/views/pages_cms/admin/contacts/index.html.haml CHANGED Viewed

@@ -8,7 +8,7 @@
       %div.page-height-1
         - @contacts.each do |contact|
           %div{ onclick: "setViewer('name#{contact.id}', 'date#{contact.id}', 'email#{contact.id}','mess#{contact.id}')" }
-            %h4.relative
+            %h4.relative{ style: 'cursor:pointer' }
               %span{ id: "name#{contact.id}" }
                 = contact.name
               %span.hard-right
@@ -18,8 +18,8 @@
             |
             %span{ id: "date#{contact.id}" }
               = contact.created_at.strftime("%B %d %Y")
-            %small
-              %div.mess{ id: "mess#{contact.id}" }
+            %div
+              %small.mess{ id: "mess#{contact.id}" }
                 = raw insert_html_breaks(contact.message)
           %hr
     %div.col-md-8
@@ -32,8 +32,8 @@
 :javascript
   function setViewer(name, date, email, viewer) {
-    document.getElementById('name').innerHTML = document.getElementById(name).innerHTML
-    document.getElementById('date').innerHTML = document.getElementById(date).innerHTML
-    document.getElementById('email').innerHTML = document.getElementById(email).innerHTML
+    document.getElementById('name').innerHTML   = document.getElementById(name).innerHTML
+    document.getElementById('date').innerHTML   = document.getElementById(date).innerHTML
+    document.getElementById('email').innerHTML  = document.getElementById(email).innerHTML
     document.getElementById('viewer').innerHTML = document.getElementById(viewer).innerHTML
   };

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

@@ -15,7 +15,7 @@
       %div.col-md-3.col-sm-4.col-xs-6
         %div.thumbnail
           %div{ style: 'height:200px;overflow:hidden;'}
-            = image_tag image.file
+            = image_tag image.file.url
           %p
             = link_to image.name, image.file.url
           = link_to 'delete', admin_image_path(image), method: :delete, class: 'btn btn-xs btn-default'

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

@@ -1,33 +1,40 @@
-%div.back.space
+%div.back.space.sort
   %div.nested-fields
     %div.block
+      %div.right
+        = link_to_remove_association 'Remove', f
       = 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 :text_boxes do |text_box|
-          = render 'text_box_fields', f: text_box
-      %div
-        = f.fields_for :markdown_texts do |markdown|
-          = render 'markdown_text_fields', f: markdown
-      %div
-        = f.fields_for :blog_feeds do |text_box|
-          = render 'blog_feed_fields', f: text_box
-      %div
-        = f.fields_for :contact_fields do |contact|
-          = render 'contact_field_fields', f: contact
-        %div.row
-          = f.fields_for :image_boxes do |text_box|
-            = render 'image_box_fields', f: text_box
-        %div.row
-          = f.fields_for :thumbnails do |thumbnail|
-            = render 'thumbnail_fields', f: thumbnail
-        %hr
-        = link_to_add_association 'Add Text Box',     f, :text_boxes,     class: 'btn btn-default btn-xs'
-        = link_to_add_association 'Add Markdown Box', f, :markdown_texts, class: 'btn btn-default btn-xs'
-        = link_to_add_association 'Add Thumbnail',    f, :thumbnails,     class: 'btn btn-default btn-xs'
-        = link_to_add_association 'Add Blog Feed',    f, :blog_feeds,     class: 'btn btn-default btn-xs'
-        = link_to_add_association 'Add Image Box',    f, :image_boxes,    class: 'btn btn-default btn-xs'
-        = link_to_add_association 'Add Contact Box',  f, :contact_fields, class: 'btn btn-default btn-xs'
-      %div.right
-        = link_to_remove_association 'Remove Block', f
+      %span{ style: 'cursor:pointer;padding:1em;margin-top:0.5em;', type: 'button', data: { toggle: 'collapse', target: "#collapse#{f.object.id}" }, aria: { expanded: 'false', controls: "collapse#{f.object.id}" } }
+        %span.btn.btn-sm.glyphicon.glyphicon-chevron-down
+      %div.collapse{id: "collapse#{f.object.id}"}
+        %div
+          = f.fields_for :text_boxes do |text_box|
+            = render 'text_box_fields', f: text_box
+        %div
+          = f.fields_for :markdown_texts do |markdown|
+            = render 'markdown_text_fields', f: markdown
+        %div
+          = f.fields_for :blog_feeds do |text_box|
+            = render 'blog_feed_fields', f: text_box
+        %div
+          = f.fields_for :contact_fields do |contact|
+            = render 'contact_field_fields', f: contact
+          %div.row
+            = f.fields_for :image_boxes do |text_box|
+              = render 'image_box_fields', f: text_box
+          %div.row
+            = f.fields_for :thumbnails do |thumbnail|
+              = render 'thumbnail_fields', f: thumbnail
+          %hr
+          = link_to_add_association 'Add Text Box',     f, :text_boxes,     class: 'btn btn-default btn-xs'
+          = link_to_add_association 'Add Markdown Box', f, :markdown_texts, class: 'btn btn-default btn-xs'
+          = link_to_add_association 'Add Thumbnail',    f, :thumbnails,     class: 'btn btn-default btn-xs'
+          = link_to_add_association 'Add Blog Feed',    f, :blog_feeds,     class: 'btn btn-default btn-xs'
+          = link_to_add_association 'Add Image Box',    f, :image_boxes,    class: 'btn btn-default btn-xs'
+          = link_to_add_association 'Add Contact Box',  f, :contact_fields, class: 'btn btn-default btn-xs'
+          <br />
+          <br />
+          %span{ style: 'cursor:pointer;padding:2em', type: 'button', data: { toggle: 'collapse', target: "#collapse#{f.object.id}" }, aria: { expanded: 'false', controls: "collapse#{f.object.id}" } }
+            %span.glyphicon.glyphicon-chevron-up

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

@@ -3,92 +3,89 @@
 = javascript_include_tag 'pages_cms/select2.min'
 = stylesheet_link_tag 'pages_cms/select2.min'
-- if params[:sortable] == 'on'
-  %div.container-fluid
-    %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'
-      = f.submit 'Save', class: 'btn btn-primary center-block'
-- else
-  %div.container-fluid
-    %div.row
-      = form_for @page, url: admin_page_path(@page) do |f|
-        %div.col-md-9
-          %h2 Main Content
-          %div.back
-            = link_to 'View', 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.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'
-            = f.select(:parent_id, @page.account.pages.collect {|p| [p.title, p.id] unless p.id == f.object.id }, {include_blank: 'Is a sub-page of'}, class: 'form-control inline-form')
-            = f.submit 'Save', class: 'btn btn-primary inline-form'
+%div.container-fluid
+  %div.row
+    = form_for @page, url: admin_page_path(@page) do |f|
+      %div.col-md-9
+        %h2
+          Main Content |
+          = f.submit 'Save', class: 'btn btn-primary'
+          = link_to 'View', slugged_path(@page), class: 'btn btn-default'
-          %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 'Sort', edit_admin_page_path(@page, sortable: 'on'), class: 'btn btn-default'
-              = link_to_add_association 'Add Block', f, :page_blocks, class: 'btn btn-default'
+        %div.back
+          = 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, @page.account.pages.collect {|p| [p.title, p.id] unless p.id == f.object.id }, {include_blank: 'Is a sub-page of'}, class: 'form-control inline-form')
+          = f.check_box :navbar_show
+          %span Navbar
+          = f.check_box :sidebar_show
+          %span Sidebar
+          = f.check_box :draft
+          %span Draft
+        %div#block-adder
+          %hr
+          = link_to_add_association 'Add Block', f, :page_blocks, class: 'btn btn-default'
+          = f.submit 'Save', class: 'btn btn-primary'
+        %div#pages-block.sortable
+          = f.fields_for :page_blocks, f.object.page_blocks.order(:order) do |page_block|
+            = render 'page_block_fields', f: page_block
+        %hr
+        %div#block-adder
+          = link_to_add_association 'Add Block', f, :page_blocks, class: 'btn btn-default'
+          = f.submit 'Save', class: 'btn btn-primary'
-        %div.col-md-3
-          %h3 Sidebar
-          %div.back
-            = f.fields_for :sidebar, @sidebar do |ss|
-              = render 'editor', f: ss
-              = ss.check_box :show
-              = ss.label 'Show sidebar on this page'
-              <br />
-              = ss.check_box :tw_feed
-              = ss.label 'Show twitter feed.'
-              <br />
-              = ss.check_box :fb_feed
-              = ss.label 'Show facebook feed.'
-              <br />
-              = ss.check_box :all_posts
-              = ss.label 'Show blog posts.'
-              <br />
-              = ss.check_box :all_tags
-              = ss.label 'Show blog tags.'
-              <br />
-              = ss.check_box :all_pages
-              = ss.label 'Show page links.'
-              <br />
-              = ss.label 'Add to page links'
-              = ss.text_area :links, class: 'form-control', placeholder: 'link title, link url (use next line for next link)'
-              <br />
-              = 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')
+      %div.col-md-3
+        %h3 Sidebar
+        %div.back
+          = f.fields_for :sidebar, @sidebar do |ss|
+            = render 'editor', f: ss
+            = ss.check_box :show
+            %span Show sidebar
+            <br />
+            = ss.check_box :tw_feed
+            %span Twitter feed
+            <br />
+            = ss.check_box :fb_feed
+            %span Facebook feed
+            <br />
+            = ss.check_box :all_posts
+            %span Blog posts
+            <br />
+            = ss.check_box :all_tags
+            %span Blog tags
+            <br />
+            = ss.check_box :all_pages
+            %span Links
+            <hr />
+            = ss.label 'Add to page links'
+            = ss.text_area :links, class: 'form-control', placeholder: 'link title, link url (use next line for next link)'
+            <br />
+            = 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')
+        %div.back
+          %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, class: 'btn btn-default'
-        %hr
-        = f.submit 'Save', class: 'btn btn-primary center-block'
+      %hr
+<br />
+<br />
 :javascript
   $( document ).ready(function() {
-    $('.sortable').sortable();
+    $('.sortable').sortable({
+      items: '.sort'
+    });
     $('.sortable').sortable().bind('sortupdate', function() {
       $('.block-order').each(function(i){ $(this).val(i+1) })
     });
+    $("#block-adder a.add_fields").
+      data("association-insertion-method", 'append').
+      data("association-insertion-node", '#pages-block');
   })
   $('.select2').select2({
     tags: true,

data/app/views/pages_cms/admin/pages/index.html.haml CHANGED Viewed

@@ -1,6 +1,7 @@
 <br />
 = render 'pages_cms/admin/shared/tabs', active: 'AdminPanel'
+= javascript_include_tag 'pages_cms/sortable.js'
 %div.container-fluid
   %div.row.back
     %div.col-md-6
@@ -31,9 +32,12 @@
                       %span.glyphicon.glyphicon-menu-right
                     = page.title
                 %div.links
+                  - if page.draft
+                    %span.glyphicon.glyphicon-ban-circle{ title: 'this page is a draft'}
                   = link_to raw('<span class="glyphicon glyphicon-pencil"></span>'), edit_admin_page_path(page)
                   = link_to raw('<span class="glyphicon glyphicon-search"></span>'), slugged_path(page)
                   = link_to raw('<span class="glyphicon glyphicon-remove"></span>'), admin_page_path(page), method: :delete
                 - parent = page
                 - indent = 20
                 - if page.children.exists?
@@ -45,6 +49,8 @@
                             %span.glyphicon.glyphicon-minus{ style: "margin-left: #{indent}px" }
                             = subpage.title
                             %div.links
+                              - if page.draft
+                                %span.glyphicon.glyphicon-ban-circle{ title: 'this page is a draft'}
                               = link_to raw('<span class="glyphicon glyphicon-pencil"></span>'), edit_admin_page_path(subpage)
                               = link_to raw('<span class="glyphicon glyphicon-search"></span>'), slugged_path(subpage)
                               = link_to raw('<span class="glyphicon glyphicon-remove"></span>'), admin_page_path(subpage), method: :delete
@@ -61,9 +67,11 @@
               %td
                 = link_to contact.name, admin_contacts_path
               %td
-                = contact.email
+                %small
+                  = contact.email
               %td
-                = truncate(contact.message, length: 50)
+                %small
+                  = truncate(contact.message, length: 30)
       %div.space-bottom
         %h3 New Articles
         %table.table
@@ -77,7 +85,7 @@
                     = tag
               %td
                 %small
-                  = truncate(strip_tags(article.content_either), length: 50)
+                  = truncate(strip_tags(article.content_either), length: 30)
       %div.space-bottom
         %h3 Accounts
         %table.table
@@ -88,7 +96,7 @@
               %td
                 = account.mount_location
               %td
-                = link_to 'Switch To', admin_accounts_site_path(account: account.id), method: :post
+                = link_to 'Switch To', admin_accounts_site_path(account: account.id), method: :post, class: 'btn btn-xs btn-primary'
 :javascript
@@ -104,6 +112,4 @@
         success: console.log('data: ' + data)
       });
     });
-  });
-= javascript_include_tag 'pages_cms/sortable.js'
+  });

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

@@ -22,7 +22,7 @@
         - block.markdown_texts.each do |box|
           %div.back
-            = raw box.content_rendered
+            = find_and_preserve(raw(box.content_rendered))
         - block.image_boxes.each do |box|
           %div.image-box
@@ -35,11 +35,11 @@
         - block.blog_feeds.each do |feed|
           - @articles.reverse_order.limit(feed.limit).each do |post|
-            %div.post.back{ onclick: "window.location='/articles/#{post.id}';", style: 'cursor: pointer' }
+            %div.post.back
               %div.image-post
-                = image_tag post.image.file if post.image
+                = image_tag post.image.file.url, class: 'img-responsive' if post.image
               %h2
-                = post.title
+                = link_to post.title, article_path(post), style: 'color:black'
               %h5
                 = post.created_at.strftime("%B %d")
               = raw HTML_Truncator.truncate(post.content_either, 50)

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

@@ -2,6 +2,10 @@
 - provide(:meta_tags, @page.meta_tags)
 - provide(:meta_description, @page.meta_description)
+- if current_user_is_admin?
+  %div.float-bottom
+    = link_to 'Edit this page', edit_admin_page_path(@page)
 - if @sliders && @sliders.count == 1
   %div.container-contain.main-background
     = image_tag @sliders.first.image.file.url if @sliders.first.image

data/config/routes.rb CHANGED Viewed

@@ -6,6 +6,7 @@ PagesCms::Engine.routes.draw do
   namespace :admin do
     resources :pages,     except: [:show, :new]
     resources :images,    only:   [:create, :index, :destroy]
+    resources :documents, only:   [:create, :index, :destroy]
     resources :articles,  only:   [:index, :create, :update, :destroy]
     resources :contacts,  only:   [:index, :destroy]
     resources :accounts
@@ -13,7 +14,7 @@ PagesCms::Engine.routes.draw do
     post '/accounts/site' => 'accounts#site'
   end
-  if PagesCms.const_defined?('Account')
+  # if PagesCms.const_defined?('Account')
     PagesCms::Account.where("mount_location != '/'").each do |account|
       get "/#{account.mount_location}/:parent/:slug"  => 'pages#show', account: account.id
       get "/#{account.mount_location}/:slug"          => 'pages#show', account: account.id
@@ -26,6 +27,6 @@ PagesCms::Engine.routes.draw do
       get '/:slug'          => 'pages#show', account: raccount.id, root: true
       get '/'               => 'pages#home', account: raccount.id, root: true, as: :root
     end
-  end
+  # end
 end

data/db/migrate/20150609171657_create_initial_db.rb CHANGED Viewed

@@ -38,6 +38,15 @@ class CreateInitialDb < ActiveRecord::Migration
     end
     add_foreign_key :pages_cms_images, :pages_cms_accounts, column: :account_id
+    create_table :pages_cms_documents do |t|
+      t.integer :account_id, index: true
+      t.string :name
+      t.string :file
+      t.timestamps null: false
+    end
+    add_foreign_key :pages_cms_documents, :pages_cms_accounts, column: :account_id
     create_table :pages_cms_page_blocks do |t|
       t.integer :page_id, index: true
       t.integer :order

data/lib/pages_cms/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module PagesCms
-  VERSION = '2.1.1'
+  VERSION = '2.2.1'
 end

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

@@ -7,7 +7,7 @@ class ApplicationController < ActionController::Base
   def logged_in_admin
     # Do something if admin
     # is not logged in
-    # ie: redirect_to root_path unless current_user.admin
+    # redirect_to '/'
   end
 end