cardboard_cms 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75333a699fb1dccadb5e0e997b8c7a500ba5b9dd
-  data.tar.gz: 055466fb6267926f0b78c134a82598d7aa5b6364
+  metadata.gz: e0c9ba046a708dba52e5848d89dd284ee9bcec1e
+  data.tar.gz: 5171f5d82832e70ff0ed47c8200a2539837561bd
 SHA512:
-  metadata.gz: 1e4f0901db574ea6abdfc3a8c3390690741a06e0c4d4aedb3d2c29594267f3e3c031b2942b649d9103bd8ce62f3d91e09fb48040047680bc6345329214ad7bc1
-  data.tar.gz: 6fe7a9005e459619530949535a6bdaf23c021299e4c97b654e83192e5529198db8ba2ad61f93468019702562a730619c4cafb920ec5a141ad47bf708890b5855
+  metadata.gz: 7e37d4374060af4c6cddc1ac86988f8bd6822b57213ae7cdbf46e7911ad2fe445fc0842f57c6a1e4f316ba42aaaacaba226fbdc2c2c646a32508151304a44e07
+  data.tar.gz: f368b5dbcc53f777e18498b3c792336bb259b1447c98b4229290a018355cbd693211cacb68c9cbea421b8c1cedf1124550cba3bfd4b6db801fc9927c9c4e67ec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cardboard_cms (0.2.1)
+    cardboard_cms (0.2.2)
       bootstrap-datepicker-rails
       bootstrap-sass (~> 2.2)
       bootstrap-wysihtml5-rails

data/README.md

@@ -25,7 +25,7 @@ Cardboard is a simple CMS Engine for your Rails 4 applications.
 Add the gem to the `Gemfile`
 
 ```ruby
-gem "cardboard_cms", github: "smashingboxes/cardboard"
+gem "cardboard_cms"
 ```
 
 And run `bundle install`.
@@ -104,7 +104,13 @@ pages:
             type: image
             required: true
             default: CrashTest.jpg
-            position: 0
+pages:
+  two_column:
+    parts:
+      main:
+        fields:
+          body:
+            type: rich_text
 ```
 
 pages, parts and fields take identifiers (home_page, slideshow and image1) used to reference the data form the views. Choose these names carefully!

data/app/assets/javascripts/cardboard/admin.js

@@ -31,8 +31,12 @@ $(document).on('click', '.nav-tabs a', function(e){
 
 $(document).on("page:load ready cocoon:after-insert", function(e){
 
+  $('select[data-search-select]').each(function() {
+    var options = $(this).data("select2-options")
+    $(this).select2($.extend({allowClear: true, width: "resolve"}, options));
+  });
   $('select:not([data-search-select])').selectpicker();
-  $('select[data-search-select]').select2({allowClear: true, width: "resolve"});
+  
 
   $('.nav-tabs a:first').tab('show');
 

data/app/assets/javascripts/cardboard/rich_text.js

@@ -49,10 +49,11 @@ var page_links_template = {
 }
 
 var rich_text_editor_defaults = {
-  image: false, 
-  customTemplates:  page_links_template, 
-  parserRules: wysihtml5ParserRules, 
-  useLineBreaks: false
+  "image": false, 
+  "customTemplates":  page_links_template, 
+  "parserRules": wysihtml5ParserRules, 
+  "useLineBreaks": false,
+  "font-styles": false
 }
 
 $(document).on("ready page:load", function(e){

data/app/assets/stylesheets/cardboard/_content.css.scss

@@ -30,6 +30,7 @@
 }
 
 #main_content{
+  min-width: $site_min_width;
   background: $content_background;
 }
 

data/app/assets/stylesheets/cardboard/_main_topbar.css.scss

@@ -17,7 +17,7 @@ $main_topbar_zindex: 100;
     @include border-radius(0px);
     border: none;
     padding: 0px 10px;
-    min-width: 760px;
+    min-width: $site_min_width;
     a{color: $main_topbar_color;}
     text-shadow: $main_topbar_color_text_shadow;
     

data/app/assets/stylesheets/cardboard/_variables.scss

@@ -8,6 +8,7 @@ $content_sidebar_width: 280px !default;
 $content_background: #f4f7f9 !default;
 $brand_color: #f9334a !default;
 $table_head: #E1E1E1 !default;
+$site_min_width: 780px !default;
 
 // Overwrite as needed
 // //

data/app/controllers/cardboard/resource_controller.rb

@@ -7,6 +7,11 @@ class Cardboard::ResourceController <  Cardboard::ApplicationController
 
   before_filter :check_ability
 
+  def self.singular?
+    name = controller_name
+    name == name.singularize and name != name.pluralize
+  end
+
   def collection
     @q ||= end_of_association_chain.search(params[:q])
 

data/app/controllers/pages_controller.rb

@@ -23,8 +23,13 @@ private
   # helper_method :edit_link
 
   def current_page
-    @page ||= Cardboard::Page.find_by_url(params[:id]) || Cardboard::Page.root 
-    # || raise(ActionController::RoutingError.new("No root page, make sure to run `rake cardboard:seed`"))
+    return @page unless @page.nil?
+    @page = if params[:id].nil?
+      Cardboard::Page.root
+    else
+      Cardboard::Page.find_by_url(params[:id])
+    end
+    @page || raise(ActionController::RoutingError.new("Page not found"))
   end
 
 end

data/app/models/cardboard/field/rich_text.rb

@@ -17,5 +17,9 @@ module Cardboard
       return nil unless value_changed?
       self.value = ActionController::Base.helpers.sanitize(self.value, :tags => %w(strong b i u em br p div span ul ol li a pre code blockquote h1 h2 h3), :attributes => %w(class style href src width height alt))
     end
+
+    def is_required
+      errors.add(:value, "is required") if required_field? && ActionController::Base.helpers.strip_tags(value_uid).blank?
+    end
   end
 end

data/app/views/cardboard/pages/_part_fields.html.slim

@@ -7,11 +7,12 @@
   - part_hash[:fields].each do |field_identifier, field|
        
     - fields = part.fields.find{|ob|  ob.identifier ==  field_identifier}
-
+    - fields = part.fields.build(type: "Cardboard::Field::#{field[:type].camelize}", identifier: field_identifier, default: field[:default] ) if fields.blank?
+   
     = f.simple_fields_for :fields,  fields do |w|
-      = w.hidden_field :type, :value => "Cardboard::Field::#{field[:type].camelize}"
-      = w.hidden_field :identifier, :value => field_identifier
-     
+      = w.hidden_field :type
+      = w.hidden_field :identifier
+
       - begin
         = render "cardboard/fields/#{field[:type]}", f: w, field: field, identifier: field_identifier
       - rescue ActionView::MissingTemplate => e

data/app/views/cardboard/pages/_sidebar.html.slim

@@ -1,8 +1,9 @@
 form class="form-inline"
-  => link_to pages_new_path, class:"btn btn-primary" do
-    i.icon-plus
+  - if Cardboard.used_with_templates?
+    => link_to pages_new_path, class:"btn btn-primary" do
+      i.icon-plus
 
-  .input-append style="width: 160px"
+  .input-append style=(Cardboard.used_with_templates?? "width: 160px" : nil)
     input id="sidebar_page_search" type="text" placeholder="Search Pages"
     button type="submit" class="btn"
       i.icon-search

data/app/views/cardboard/rich_editor/_links_modal.html.slim

@@ -6,20 +6,22 @@ li
 
     .modal-body
       ul class="nav nav-pills"
-        li
-          a href="#link_pane_1" data-toggle="pill" Pages
+        - if Cardboard.used_with_pages?
+          li
+            a href="#link_pane_1" data-toggle="pill" Pages
         li
           a href="#link_pane_2" data-toggle="pill" URL
         li
           a href="#link_pane_3" data-toggle="pill" Email
 
       div class="tab-content"    
-        div.tab-pane class="link_pages" id="link_pane_1" 
-          ul
-            = nested_pages do |page, subpages|
-              li
-                = link_to page.title, "#", "data-url" => page.url
-                = content_tag(:ul, subpages) if subpages
+        - if Cardboard.used_with_pages?
+          div.tab-pane class="link_pages" id="link_pane_1" 
+            ul
+              = nested_pages do |page, subpages|
+                li
+                  = link_to page.title, "#", "data-url" => page.url
+                  = content_tag(:ul, subpages) if subpages
 
         div.tab-pane id="link_pane_2" 
           input placeholder='http://website.com' class='input-xlarge' value='http://'

data/app/views/layouts/cardboard/_head.html.slim

@@ -4,13 +4,13 @@ title
   | Cardboard CMS
 
 = stylesheet_link_tag "cardboard"
-= stylesheet_link_tag "http://fonts.googleapis.com/css?family=Roboto:300,400,500,700,900"
+= stylesheet_link_tag "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700,900"
 / = stylesheet_link_tag "http://fonts.googleapis.com/css?family=Montserrat:400,700"
 
 = csrf_meta_tags
 
 /[if lt IE 9] 
-  script src="http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js"
+  script src="https://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js"
 
 = javascript_include_tag 'cardboard'
 = include_gon

data/app/views/layouts/cardboard/_main_sidebar.html.slim

@@ -5,8 +5,4 @@
 
   - Cardboard.resource_controllers.reject{|x|x.menu == false}.sort! { |a,b| a.menu[:priority] <=> b.menu[:priority] }.each do |controller|
     - if cardboard_user_can_manage?(controller.controller_name.to_sym)
-      = main_sidebar_nav_link controller.menu[:label], {controller: controller.controller_name, action: :index}, class: "nav_resource_link"
-
-  
-
-
+      = main_sidebar_nav_link controller.menu[:label], {controller: controller.controller_name, action: controller.singular? ? :show : :index}, class: "nav_resource_link"

data/app/views/layouts/cardboard/_main_topbar.html.slim

@@ -3,7 +3,7 @@
   #cardboard_logo CB
   
   = link_to main_app.root_path, id: "brand" do
-    = Cardboard::Setting.company_name
+    = Cardboard::Setting.company_name || Cardboard.application.site_title
 
   ul.nav.pull-right
 
@@ -11,17 +11,18 @@
       = link_to dashboard_path do
         i.icon-dashboard
         ' Dashboard
-    - if cardboard_user_can_manage?(:settings)
+    - if cardboard_user_can_manage?(:settings) && Cardboard.used_with_settings?
       li
         = link_to settings_path do 
           i.icon-cogs 
           | Settings
+    
 
     li.divider
 
     li.dropdown.third
       a.dropdown-toggle data-toggle="dropdown" href="#"
-        img alt="Avatar" src="http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(cardboard_user.email.downcase)}" width="23" height="23" style="width:23px !important;"
+        img alt="Avatar" src="https://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(cardboard_user.email.downcase)}" width="23" height="23" style="width:23px !important;"
         span.user-name.hidden-phone
           = cardboard_user.email
         b class="caret"

data/config/routes.rb

@@ -21,11 +21,14 @@ Cardboard::Engine.routes.draw do
   
   scope as: 'cardboard' do
     #generate routes for custom cardboard resources controllers
-    Cardboard.resource_controllers.map{|x|x.controller_name}.each do |controller|
-      if controller.singularize == controller && controller.pluralize != controller
-        resource controller #singular controller
+    Cardboard.resource_controllers.each do |controller|
+      if controller.singular?
+        # Singular controller names are non-standard in rails.  We must specify the
+        # controller explicitly here to keep the name from 
+        # being pluralized in the route.
+        resource controller.controller_name, controller: controller.controller_name
       else
-        resources controller
+        resources controller.controller_name
       end
     end
   end
@@ -52,4 +55,4 @@ Rails.application.routes.named_routes.module.module_eval do
     return nil unless url = page_path(identifier, options)
     root_url + url[1..-1]
   end
-end
+end

data/lib/cardboard/helpers/seed.rb

@@ -74,7 +74,6 @@ module Cardboard
         db_settings.update_attributes!(template: settings)
         self.populate_fields(settings, db_settings)
       end
-      Cardboard::Setting.add("company_name", type: "string", default:  Cardboard.application.site_title, seeding: true)
     end
     
   end

data/lib/cardboard/version.rb

@@ -1,3 +1,3 @@
 module Cardboard
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/cardboard_cms.rb

@@ -25,6 +25,21 @@ module Cardboard
       @used_as_cms
     end
 
+    def used_with_pages?
+      @used_with_pages = Cardboard::Template.where("is_page = ?", true).count > 0 if @used_with_pages.nil? #handle false
+      @used_with_pages
+    end
+
+    def used_with_templates?
+      @used_with_templates = Cardboard::Template.where("is_page = ? OR is_page IS NULL", false).count > 0 if @used_with_templates.nil? #handle false
+      @used_with_templates
+    end
+
+    def used_with_settings?
+      @used_with_settings = Cardboard::Setting.count > 0 if @used_with_settings.nil? #handle false
+      @used_with_settings
+    end
+
     def set_resource_controllers
       # might not be needed in production
       Dir[Rails.root.join('app/controllers/cardboard/*_controller.rb')].map.each do |controller|

data/lib/generators/cardboard/install/templates/cardboard.yml

@@ -1,5 +1,5 @@
-# # Page and Settings admin forms
-# # Example
+# # Pages, Templates and Settings
+
 # pages:
 #   home:
 #     title: Welcome
@@ -13,16 +13,23 @@
 #           show_slideshow:
 #             type: boolean
 #       slideshow:
-#         repeatable: true
+#         repeatable: Slide
 #         fields:
-#           image1:
+#           image:
 #             type: image
-#             position: 0
 #           description:
 #             hint: This will be visible on mouse over
 #             type: string
 #             required: false
-#             position: 1
+# templates:
+#   two_column:
+#     parts:
+#       main:
+#         fields:
+#           body:
+#             type: rich_text
+#           sidebar:
+#             type: rich_text
 # settings:
 #   more_fun:
 #     type: boolean

data/test/dummy/config/initializers/cardboard.rb

@@ -48,6 +48,6 @@ Cardboard.setup do |config|
   # link. For example :get, :delete, :put, etc..
   #
   # Default:
-  # config.logout_link_method = :get
+  # config.logout_link_method = :delete
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cardboard_cms
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Michael Elfassy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails