pages_cms 2.2.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8502472c2cb23fa77bf31cbe444d5e304408cb64
-  data.tar.gz: 9e86072efcefe8b80134deb4f85db87231b80125
+  metadata.gz: dc4ae61e4002ddd3ae7c8492e4c0a4d25bc93597
+  data.tar.gz: e304723201a95478bc8483b13db8173429376979
 SHA512:
-  metadata.gz: 75766094014f81b8155ed09130afa2b06517b723b2fefb288c3ee825b1b3bfc1d92e630dbf6b34c3688c0dfecf7477a8eb79c7076e1fa21c3fd4ab83fbd06c06
-  data.tar.gz: 3c3a22792a2df511f771c94b15069e826df2bf2ba9a127b17707f7f3110d025b08edfffa0f8e2abdccaed0862f763c07721c9f4802340ff2d1dec8dc800bbbe0
+  metadata.gz: da86e0a66c9e43f1ce2595f9c513a546f4971a48d30c778d254602e443f66c68dd84c12daab532310ec1646e9b344f730b552753cedf33b10d84fc5949f9b639
+  data.tar.gz: 1411957555bedd5bbfad42543d12766c992e3fffed4c4e61cdc1234fc6e19b96b0b00f88d4997d720483350622131d764c3c7e76ed477b9f8ea7143de0cf5017

data/README.md

@@ -1,8 +1,12 @@
-#[PagesCms]()
+#[PagesCms](http://www.colinw.info/projects/pagescms)
 
 Pages CMS uses nested forms and draggable items to allow the user to build a site within the predefined layout from a designer. It incorporates an image management system as well as a page management system. It's like a wordpress page builder on rails.
 
-####Advantages
+Check out http://www.colinw.info/projects/pagescms for screenshots, gifs and to see a site built entirely with PagesCMS!
+
+##   About
+
+#### Advantages
 - Get hacking right away with out of the box support for bootstrap.
 - Easily drag page layouts into the position you want them.
 - Built in blog.
@@ -11,21 +15,26 @@ Pages CMS uses nested forms and draggable items to allow the user to build a sit
 - Lightweight and easy to understand: Built with simple rails techniques everyone can understand.
 - Now with multi-site support!
 
-## How it Works
+#### How it Works
 The page builder is the central feature of PagesCMS. In essence, it allows the user to create divisions on a page, and then add various sorts of content into the div. The content types right now:
-- Text Box
+- Text Box (Markdown or Wysiwyg)
 - Thumbnail
 - Image Box
 - Contact Form
 - Blog Feed
 
-These content types can be interpreted by a designer to create a unique look and feel for every page. In addition, there is a sidebar that is fully customizable. Content editing is done using the great [wysihtml5 editor](https://github.com/Voog/wysihtml).
+These content types can be interpreted by a designer to create a unique look and feel for every page. In addition, there is a sidebar that is fully customizable. Content editing is done using the great [wysihtml5 editor](https://github.com/Voog/wysihtml) AND Markdown with Redcarpet. Just add either a markdown box or a wysiwyg box.
+
+#### GIFs
+![Admin Overview](https://colin-w-info-uploads.s3.amazonaws.com/images/1435258229_admin-overview.gif)
+![Article Edit](https://colin-w-info-uploads.s3.amazonaws.com/images/1435258248_article-edit.gif)
+![Page Sort](https://colin-w-info-uploads.s3.amazonaws.com/images/1435258308_page-sort.gif)
+![Page Edit](https://colin-w-info-uploads.s3.amazonaws.com/images/1435262440_page-edit.gif)
 
 ## Installation
 
-1. 	Add: `gem 'pages_cms', '~> 2.1.1'` to your `Gemfile`
+1. 	Add: `gem 'pages_cms', '~> 2.3.0'` to your `Gemfile`
 2. 	Run: `$ rails generate pages_cms:install`
-3.	Add: `//= require cocoon` to your `application.js` file
 
 This has built everything that PagesCMS needs to work, but to get hacking with some default styling and layout included, follow the next steps:
 
@@ -36,19 +45,26 @@ The base theme is built on bootstrap:
 
 To get hacking the views and stylesheets: `$ rails generate pages_cms:views`
 
+##### Important Note!
+- Links for blog pages require that the page for the account be called 'Blog'
+- You need an account with `mount_location = '/'`, and a page in that account called 'Home'. Otherwise, when the app redirects to `'/'`, you will see a redirect loop.
+
 
 You should now be able to go to `/admin/pages` and start building pages!
 
 #### The generator has added some methods to your App:
 
-| Method							 	 		| Usage																									  |
-| ------------------------- | ------------------------------------------------------- |
-| `logged_in_admin`					| Authorizes controllers in the `PagesCms` engine 				|
-| `current_user_is_admin?`  | Verifies that the current user is an admin in the views |
+| Method					| Usage														|
+| ------------------------- | --------------------------------------------------------- |
+| `logged_in_admin`			| Authorizes controllers in the `PagesCms` engine		  	|
+| `current_user_is_admin?`  | Verifies that the current user is an admin in the views 	|
 
 Make sure to fill these methods out to secure your application.
 
-Note: Let me know if you are having dependency issues, this is one area that is very untested, and we can work to find a solution. The app is only tested with the latest version of rails and notably postgres as well. The blog section uses array tagging so those with sqlite will have problems.
+#### Notes
+Let me know if you are having dependency issues, this is one area that is very untested, and we can work to find a solution. The app is only tested with the latest version of rails and notably postgres as well. The blog section uses array tagging so those with sqlite3 will have problems.
+
+
 
 ## Licence
 MIT, author makes no liability whatsoever.

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

@@ -1,195 +1,121 @@
+@import url(//fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,300,100,700);
 @import "bootstrap-sprockets";
 
-pre, code * {
-  white-space: nowrap;    // this sets all children inside to nowrap
-  background-color: #2E2F30;
-}
-
-pre {
-  overflow: auto;
-  word-wrap: unset !important;
-  white-space: pre;
-}
-
-pre {
-  background-color: #2E2F30 !important;
-  code {background-color: #2E2F30 !important; color: #dddddd !important;  overflow: scroll !important;}
-}
-
-pre, code {
-  white-space: pre;       // forces <code> to respect <pre> formatting
-}
-
 
+// CODE HIGHLIGHTING THEME
+pre, code * { white-space: nowrap; background-color: #2E2F30;  }
+pre {  overflow: auto;  word-wrap: unset !important;  white-space: pre;  }
+pre {  background-color: #2E2F30 !important; code {background-color: #2E2F30 !important; color: #dddddd !important;  overflow: scroll !important;} }
+pre, code {  white-space: pre;}
 
 /* Tomorrow Night Theme */
 /* http://jmblog.github.com/color-themes-for-google-code-highlightjs */
 /* Original theme - https://github.com/chriskempson/tomorrow-theme */
 /* http://jmblog.github.com/color-themes-for-google-code-highlightjs */
-
-/* Tomorrow Comment */
-.hljs-comment {
-  color: #969896;
-}
-
-/* Tomorrow Red */
-.hljs-variable,
-.hljs-attribute,
-.hljs-tag,
-.hljs-regexp,
-.ruby .hljs-constant,
-.xml .hljs-tag .hljs-title,
-.xml .hljs-pi,
-.xml .hljs-doctype,
-.html .hljs-doctype,
-.css .hljs-id,
-.css .hljs-class,
-.css .hljs-pseudo {
-  color: #cc6666;
-}
-
-/* Tomorrow Orange */
-.hljs-number,
-.hljs-preprocessor,
-.hljs-pragma,
-.hljs-built_in,
-.hljs-literal,
-.hljs-params,
-.hljs-constant {
-  color: #de935f;
-}
-
-/* Tomorrow Yellow */
-.ruby .hljs-class .hljs-title,
-.css .hljs-rule .hljs-attribute {
-  color: #f0c674;
-}
-
-/* Tomorrow Green */
-.hljs-string,
-.hljs-value,
-.hljs-inheritance,
-.hljs-header,
-.hljs-name,
-.ruby .hljs-symbol,
-.xml .hljs-cdata {
-  color: #cad374;
-}
-
-/* Tomorrow Aqua */
-.hljs-title,
-.css .hljs-hexcolor {
-  color: #8abeb7;
-}
-
-/* Tomorrow Blue */
-.hljs-function,
-.python .hljs-decorator,
-.python .hljs-title,
-.ruby .hljs-function .hljs-title,
-.ruby .hljs-title .hljs-keyword,
-.perl .hljs-sub,
-.javascript .hljs-title,
-.coffeescript .hljs-title {
-  color: #81a2be;
-}
-
-/* Tomorrow Purple */
-.hljs-keyword,
-.javascript .hljs-function {
-  color: #b294bb;
-}
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  background: #1d1f21;
-  color: #c5c8c6;
-  padding: 0.5em;
-  -webkit-text-size-adjust: none;
-}
-
-.coffeescript .javascript,
-.javascript .xml,
-.tex .hljs-formula,
-.xml .javascript,
-.xml .vbscript,
-.xml .css,
-.xml .hljs-cdata {
-  opacity: 0.5;
-}
-
-
-
-
+.hljs-comment {  color: #969896;  }
+.hljs-variable, .hljs-attribute, .hljs-tag, .hljs-regexp, .ruby .hljs-constant, .xml .hljs-tag .hljs-title, .xml .hljs-pi, .xml .hljs-doctype, .html .hljs-doctype, .css .hljs-id, .css .hljs-class, .css .hljs-pseudo {  color: #cc6666;  }
+.hljs-number, .hljs-preprocessor, .hljs-pragma, .hljs-built_in, .hljs-literal, .hljs-params, .hljs-constant {  color: #de935f;  }
+.ruby .hljs-class .hljs-title, .css .hljs-rule .hljs-attribute {  color: #f0c674;  }
+.hljs-string, .hljs-value, .hljs-inheritance, .hljs-header, .hljs-name, .ruby .hljs-symbol, .xml .hljs-cdata {  color: #cad374;  }
+.hljs-title, .css .hljs-hexcolor {  color: #8abeb7;  }
+.hljs-function, .python .hljs-decorator, .python .hljs-title, .ruby .hljs-function .hljs-title, .ruby .hljs-title .hljs-keyword, .perl .hljs-sub, .javascript .hljs-title, .coffeescript .hljs-title {  color: #81a2be;  }
+.hljs-keyword, .javascript .hljs-function {  color: #b294bb;  }
+.hljs { display: block;  overflow-x: auto;  background: #1d1f21;  color: #c5c8c6;  padding: 0.5em;  -webkit-text-size-adjust: none;  }
+.coffeescript .javascript, .javascript .xml, .tex .hljs-formula, .xml .javascript, .xml .vbscript, .xml .css, .xml .hljs-cdata {  opacity: 0.5;  }
+
+// Navbar
+.navbar-default { margin: 0; a { font-weight: 700 !important; } background-color: #ffffff !important; height: 50px !important; z-index: 9999; .in, .collapsing { background-color: #ffffff; } }
+.navbar { margin: 0 !important; }
+
+// Fonts
+h1, h2, h3, h4, h5, h6 {  font-family: 'Lato', sans-serif;  }
+h1 { font-size: 4em; text-align: center; margin-top: 2em;}
+p, div {  font-family: 'Roboto Slab', serif; font-size: 16px !important; font-weight: 300;  }
+p { margin-bottom: 2em; }
 
 @import "bootstrap";
-@import url(//fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,300,100,700);
 
-h1, h2, h3, h4, h5, h6 {
-  font-family: 'Lato', sans-serif;
-}
-h1 { font-size: 4em; text-align: center; margin-top: 2em;}
-p, div {
-  font-family: 'Roboto Slab', serif; font-size: 16px !important; font-weight: 300;
-}
-p { margin-bottom: 2em; }
 
+
+// MAIN ELEMENTS
 body { background-color: #f5f5f5;}
-.back { background-color: #fff !important; padding: 1em;}
-.inline-form { display: inline-block; max-width: 150px; }
-.indent-1 { margin-left: 2em; }
-.indent-2 { margin-left: 3.5em; }
-.small-text-area { width: 400px; }
-.big { font-size: 3em; height: auto !important; }
-.container-fluid { max-width: 1150px; }
-.navbar { height: 50px; margin: 0; }
-.gallery { height: 300px !important; width: auto; overflow: hidden;}
-.center { text-align: center;}
+.back { background-color: #fff !important; padding: 1.5em;}
 .content { max-width: 700px; margin: auto;}
 .block {  padding: 1em; margin-top: 1em; border-radius: 10px; position: relative; }
-.med { font-size: 2em !important; height: auto !important; }
+.container-fluid { width: 100%; }
+.main-padding { max-width: 1100px !important }
+
+
+// GENERAL FORMATTING
 .right { width: auto; position: absolute; bottom: 1em; right: 1em; }
-.wysihtml5-command-active { background-color: #eee !important; border: thin solid #bbb; }
-.toolbar-wrap { a { padding: 0.5em !important; } }
 .float-left { float: left !important; margin: 1em !important;}
 .float-right { float: right !important; margin: 1em !important; }
-.select2 { min-width: 190px; }
-.select2-select-container { height: 2em;}
-.image-post { overflow: hidden; max-height: 400px; }
-.carousel { width: 100% !important;}
+.indent-1 { margin-left: 2em; }
+.indent-2 { margin-left: 3.5em; }
+.center { text-align: center;}
 .full { width: 100% !important; padding: 0;}
-.container-contain { width: 100%; overflow: hidden;}
-.post { margin-bottom: 4em !important; }
-.contact-mes { max-width: 600px; max-height: 80px !important; overflow: scroll !important }
-.image-box { position: relative; width: 50%; float: left !important; overflow: hidden; transition: all 0.3s; h3 { position: absolute; top: 50%; text-align: center; width: 100%; } }
-.image-box:hover { opacity: 0.5; }
-.admin-list {  background-color: #2E2F30; margin: 0; color: #90d9ff !important; a { color: #ffffff !important; padding: 5px; } a:hover { background-color: #5e5e5e !important; text-decoration: none !important; transition: background-color 0.3s; } }
-.list-table { list-style-type: none; .drop-link { color: inherit; } li {margin: 1.5em; position: relative; padding-top: 0.5em;} .items {position: relative; padding-top: 0.5em;} .links { position: absolute; right: 25% !important; top: 0; }  }
-.form-control { border-left: none !important; border-right: none !important; border-top: none !important; outline: none !important; box-shadow: none !important; border-radius: 0 !important; }
-.sortable-dragging {  border: 1px dashed #CCC;  background: none; height: 2em; }
-.sortable-placeholder {  border: 1px dashed #CCC;  background: none; height: 2em; }
-.mess { max-height: 60px; overflow: hidden; }
-.page-height-1 { height: 70vh !important; overflow: scroll; }
-.page-height-2 { height: 70vh !important; overflow: scroll; }
-.message{ position: fixed; width: 200px; top: 50px; left: 0; right: 0; margin: auto !important; z-index: 6;  }
 .relative { position: relative; }
 .hard-right { position: absolute; right: 0; top: 0; }
-
+.container-contain { width: 100%; overflow: hidden;}
 .space { margin-top: 2em !important; }
 .space-bottom { margin-bottom: 2em !important; }
-
 .td-left { width: 40% }
 .td-right { width: 60% !important }
+.left-border { border-left: thin solid #dddddd; }
+.space-top { margin-top: 200px; }
 
-.main-background { height: 50vh !important; position: relative; .header-text { position: absolute; left: 10%; top: 20%; } }
+// COMPONENTS
+// Image Box
+.image-box { position: relative; width: 50%; float: left !important; overflow: hidden; img { transition: all 0.3s; } h3 { opacity: 0; position: absolute; top: 25%; text-align: center; width: 100%; } p { position: absolute; top: 40%; padding: 1em; text-align: center; width: 100%; opacity: 0; transition: all 0.5s;} }
+.image-box:hover { img { opacity: 0.25; } p, h3 { opacity: 1; } }
 
-.navbar { z-index: 9999; .in, .collapsing { background-color: #ffffff; } }
+// Carousel
+.carousel { width: 100% !important;}
+.slider-caption { padding: 0.5em !important; h1, p { color: white !important; text-align: left; text-shadow: 0 0 5px #888888; } background-color: rgba(0,0,0,0.4); height: auto; width: auto; max-width: 800px; a { color: white !important;} a:hover { text-decoration: none; } }
+.main-background { height: 90vh !important; position: relative; .header-text { position: absolute; left: 10%; top: 20%; } }
 
-.float-bottom { position: fixed; width: 200px; bottom: 0; right: 0; background-color: #3875d7; border-radius: 10px; margin: 0.5em; padding: 0.5em; a { color: white !important; text-align: center !important; } }
+// Wysihtml5
+.wysihtml5-command-active { background-color: #eee !important; border: thin solid #bbb; }
 
+// Blog Posts
+.image-post { overflow: hidden; max-height: 400px; }
+.post { margin-bottom: 4em !important; }
+
+// Thumbnail
+.thumb-box { border: thick solid white; position: relative; width: 33.33333%; float: left !important; overflow: hidden; img { transition: all 0.3s; }
+  h4 { color: white; font-size: 1.5em; text-shadow: 0 0 15px #888888; position: absolute; bottom: -10px; text-align: center; width: 100%; padding: 1em; background-color: rgba(0,0,0,0.4); }
+  h4:hover { background-color: rgba(0,0,0,0.6); transition: all 0.3s; }
+}
+
+
+// ADMIN
+.page-height-1 { height: 70vh !important; overflow: scroll; }
+.page-height-2 { height: 70vh !important; overflow: scroll; }
+.mess { max-height: 60px; overflow: hidden; }
+.message{ position: fixed; width: 300px; top: 50px; left: 0; right: 0; margin: auto !important; z-index: 6;  }
+.float-bottom { z-index: 1000; position: fixed; width: 200px; bottom: 0; right: 0; background-color: #3875d7; border-radius: 10px; margin: 0.5em; padding: 0.5em; a { color: white !important; text-align: center !important; } }
+.pages-list { li { position: relative; } list-style-type: none; }
 
+// Pages Edit
 #pages-block {
   .sortable-dragging {  border: 1px dashed #CCC;  background: none; height: 190px !important; }
   .sortable-placeholder {  border: 1px dashed #CCC;  background: none; height: 190px !important; margin-top: 32px; }
 }
+
+// Sortable
+.sortable-dragging {  border: 1px dashed #CCC;  background: none; height: 2em; }
+.sortable-placeholder {  border: 1px dashed #CCC;  background: none; height: 2em; }
+
+// Contact
+.contact-mes { max-width: 600px; max-height: 80px !important; overflow: scroll !important }
+
+
+// FORMS
+.inline-form { display: inline-block; max-width: 150px; }
+.small-text-area { width: 400px; }
+.big { font-size: 3em; height: auto !important; }
+.med { font-size: 2em !important; height: auto !important; }
+.toolbar-wrap { a { padding: 0.5em !important; } }
+.select2 { min-width: 190px; }
+.select2-select-container { height: 2em;}
+.form-control { border-left: none !important; border-right: none !important; border-top: none !important; outline: none !important; box-shadow: none !important; border-radius: 0 !important; }

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

@@ -4,14 +4,14 @@ module PagesCms
   class Admin::AccountsController < ApplicationController
     before_action :logged_in_admin
 
-    def index
-      @accounts = Account.all
-    end
-
     def new
       @account = Account.new
     end
 
+    def index
+      @accounts = Account.all
+    end
+
     def create
       @account = Account.new(account_params)
       if @account.save

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

@@ -33,6 +33,7 @@ module PagesCms
     def update
       @page = Page.find(params[:id])
       if @page.update(page_params)
+        Rails.application.reload_routes!
         flash[:success] = 'Page updated'
         redirect_to edit_admin_page_path(@page)
       else

data/app/controllers/pages_cms/application_controller.rb

@@ -7,6 +7,7 @@ class PagesCms::ApplicationController < ApplicationController
     end
   end
 
+
   def current_account
     PagesCms::Account.find(session[:current_account])
   end

data/app/controllers/pages_cms/contacts_controller.rb

@@ -8,12 +8,11 @@ module PagesCms
       contact = current_site.contacts.build(contact_params)
       if contact.save
         begin
-          ContactMailer.new_contact(contact).deliver
+          ContactMailer.new_contact(contact).deliver_now
           flash[:success] = 'Successfully contacted us. We will respond shortly!'
         rescue Exception => e
           flash[:success] = 'Successfully contacted us. We will respond shortly.'
         end
-        flash[:success] = 'Successfully contacted us. We will respond shortly!'
         redirect_to :back
       else
         flash[:danger] = "There was a problem: #{contact.errors.full_messages.to_sentence}"

data/app/controllers/pages_cms/pages_controller.rb

@@ -11,7 +11,7 @@ module PagesCms
 
     def home
       @site = current_site
-      page  = @site.pages.find_by_slug('home')
+      page  = @site.pages.find_by(slug: 'home')
       page_setup(page)
     end
 
@@ -42,6 +42,7 @@ module PagesCms
           end
           render template: 'pages_cms/pages/show'
         else
+          logger.debug "Sending on a redirect to root, page: #{page}, params: #{params}"
           flash[:danger] = 'could not find page'
           redirect_to '/'
         end

data/app/helpers/pages_cms/application_helper.rb

@@ -1,15 +1,6 @@
 module PagesCms
   module ApplicationHelper
 
-    def account
-      account = Account.first
-      if account
-        account
-      else
-        false
-      end
-    end
-
     def current_account
       if Account.exists?(session[:current_account])
         Account.find(session[:current_account])
@@ -21,13 +12,13 @@ module PagesCms
     # added by PagesCMS. Use this helper to link to user created pages.
     def slugged_path(page)
       if page.class == String
-        "/#{page}"
+        "/#{page}"                            # if passes a string, just add a slash
       else
         mount = page.account.mount_location
-        if page.parent.nil?
-          "#{'/' unless mount == '/'}#{mount unless mount == '/'}/#{page.slug}"
+        if mount == '/'
+          "/#{page.slug}"                     # don't want the link to look like this '///home'
         else
-          "#{'/' unless mount == '/'}#{mount unless mount == '/'}/#{page.parent.slug}/#{page.slug}"
+          "/#{mount}/#{page.slug}"            # if the mount location is normal. ie. '/site/home'
         end
       end
     end
@@ -62,5 +53,9 @@ module PagesCms
       end
     end
 
+    def pages_cms_auth_exists?
+      defined?(PagesCmsAuth) == 'constant'
+    end
+
   end
 end