cardboard_cms 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79f74648f48e899a4cc6e823888f15ed437fe408
-  data.tar.gz: c42474efb3ca96d02db0e23896e26530d9b2b287
+  metadata.gz: fe8f9938ba535b8fed9271fb66606e70e78e4a5b
+  data.tar.gz: 4eef9fe937568db71e1cd7af25b5f62f89add959
 SHA512:
-  metadata.gz: 321b542f56a6083e0ab9961b45d776c3d564b306ca33cd87086248a54cd832316b9f1f13b1bb63b7262d26e3e069f36982c3d3da9f95cd91672479ed49083966
-  data.tar.gz: 8d74c9ae9ded58328e7536f53d81ae69fe39dfb24a88bf5cb4d54181be48eaa0620d115ae25b594e8cbbeb7a37cc9d02b3bf862aecd07de8ef60f3ef88a5becb
+  metadata.gz: 680fb7e71e94677f7930ab992999e43484db299760dbc490a754a60290cb095c0b5f5fc206ecb8c3daf65f5bf7507458d52b02b51016a3a82da3ac2ca7db942e
+  data.tar.gz: 15a04806e88a768d83a769af68f8bacdfc8b13757517538013452c333b6b091eb7197ece71e97d97c83659e673825715819eaf7c93789e6c829947992fbc6b5d

data/Gemfile

@@ -16,14 +16,8 @@ gemspec
 # Gems used by the dummy application
 gem "sqlite3"
 gem "jquery-rails"
-
-
-# should be dependencies
-
 gem 'devise', '>= 3.0.0'
 
-
-
 gem "thin"
 # gem 'rack-mini-profiler'
 gem 'letter_opener'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cardboard_cms (0.1.6)
+    cardboard_cms (0.1.8)
       bootstrap-datepicker-rails
       bootstrap-sass (~> 2.2)
       bootstrap-wysihtml5-rails
@@ -65,7 +65,7 @@ GEM
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-datepicker-rails (1.1.1.9)
+    bootstrap-datepicker-rails (1.3.0.1)
       railties (>= 3.0)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
@@ -79,7 +79,7 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     chronic (0.10.2)
-    cocoon (1.2.3)
+    cocoon (1.2.5)
     coderay (1.0.9)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -87,7 +87,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.0)
     columnize (0.3.6)
     daemons (1.1.9)
     database_cleaner (1.0.1)
@@ -105,7 +105,7 @@ GEM
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
       warden (~> 1.2.3)
-    dragonfly (1.0)
+    dragonfly (1.0.3)
       multi_json (~> 1.0)
       rack
     erubis (2.7.0)
@@ -124,7 +124,7 @@ GEM
       railties (>= 3.1.1)
       sass-rails (>= 3.1.1)
     formatador (0.2.4)
-    gon (4.1.1)
+    gon (5.0.1)
       actionpack (>= 2.3.0)
       json
     guard (1.8.2)
@@ -147,10 +147,10 @@ GEM
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.1.0)
+    jquery-ui-rails (4.1.1)
       railties (>= 3.1.0)
     json (1.8.0)
-    kaminari (0.14.1)
+    kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kaminari-bootstrap (0.1.3)
@@ -241,7 +241,7 @@ GEM
       json (~> 1.4)
     responders (1.0.0)
       railties (>= 3.2, < 5)
-    sass (3.2.12)
+    sass (3.2.14)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
@@ -251,7 +251,7 @@ GEM
       rdoc (~> 3.10)
     select2-rails (3.5.2)
       thor (~> 0.14)
-    simple_form (3.0.0)
+    simple_form (3.0.1)
       actionpack (>= 4.0.0, < 4.1)
       activemodel (>= 4.0.0, < 4.1)
     simplecov (0.7.1)
@@ -272,7 +272,7 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     sqlite3 (1.3.7)
-    stringex (2.1.2)
+    stringex (2.2.0)
     temple (0.6.7)
     thin (1.5.1)
       daemons (>= 1.0.9)

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

@@ -36,11 +36,11 @@ $(document).on('click', '.nav-tabs a', function(e){
   $(this).tab('show');
 });
 
-$(document).on("pjax:end ready cocoon:after-insert", function(e){
+$(document).on("pjax:success ready cocoon:after-insert", function(e){
+
   $('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/main_sidebar.js

@@ -2,6 +2,12 @@ $(function(){
   $("a#nav_dashboard_link").click(function(e){
     e.preventDefault();
     $("#content_sidebar").toggleClass('toggle');
+
+    // Expand #main_content down to fit the exposed sidebar
+    $("#main_content").css('height',
+      $('#content_sidebar').height() + $('#main_topbar').height()
+    );
+
     $('#content').toggleClass('toggle');
     // $(this).toggleClass('active');
   });
@@ -29,4 +35,4 @@ $(function(){
       results.show();
     });
   });
-});
+});

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

@@ -15,7 +15,9 @@
   display: none;
 
   &.toggle {
-    display: block;
+    position: absolute;
+    left: $main_sidebar_width;
+    display: inline;
     // left: $main_sidebar_width;
     // -webkit-transition: left $page_nav_slide_speed ease;
     // -moz-transition: left $page_nav_slide_speed ease;
@@ -93,4 +95,4 @@
     }
   }
   
-}
+}

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

@@ -24,15 +24,17 @@ body{
   overflow-x: hidden;
 }
 
-#main_content{
-  min-height:100%;
-  overflow: hidden;
+#main_content {
   width: 100%;
+  position: relative;
+  min-height: 100%;
 }
+
 #main_sidebar, #content_sidebar{
-  margin-bottom: -9999px; 
-  padding-bottom: 9999px;
-  float:left;
+  top: 0;
+  left: 0;
+  min-height: 100%;
+  position: absolute;
 }
 
 .center{

data/app/controllers/cardboard/super_user_controller.rb

@@ -1,5 +1,6 @@
 require_dependency "cardboard/application_controller"
 
+#yoda
 module Cardboard
   class SuperUserController < ApplicationController
     def index

data/app/helpers/cardboard/public_helper.rb

@@ -1,6 +1,23 @@
 module Cardboard
   module PublicHelper
 
+    def dragonfly_image_tag(image, options = {})
+      return nil unless image
+      size = options.delete(:size) || '125x125'
+      image_tag image.thumb(size).url, options
+    end
+
+    def link_to_file(text, file, options = {})
+      return link_to(text, nil, options) unless file && file.url
+
+      html = ""
+      if [:doc, :docx, :xls, :xlsx, :pdf, :zip, :txt].include?(file.format)
+        html += image_tag("cardboard/icons/#{file.format}.png")
+      end
+      html += link_to(text, file.url, options)
+      html.html_safe
+    end
+
     # Example: 
     #  link_to_page 123, class: "btn" do |page|
     #    "hello #{page.title}"
@@ -41,7 +58,7 @@ module Cardboard
       inner_nested_pages(Cardboard::Page.arrange(page), &block).try(:html_safe)
     end
 
-    private
+  private
 
     def inner_nested_pages(pages, &block)
       return unless pages

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

@@ -1,9 +1,14 @@
 module Cardboard
   class Field::Boolean < Field
-    before_validation :convert_to_boolean
-
     validate :is_boolean
-    
+
+    def value
+      to_boolean(value_uid) 
+    end
+
+    def value=(val)
+      self.value_uid = to_boolean(val) #saved as a consistent string 't'
+    end
 
     def default
       [true, false].sample
@@ -12,12 +17,7 @@ module Cardboard
     private
 
     def is_boolean
-      errors.add(:value, "is not a valid boolean") if self.value.nil?
-    end
-
-    def convert_to_boolean
-      self.value = to_boolean(self.value_uid)
-      true # don't return a validation error on false
+      errors.add(:value, "is not a valid boolean") if self.value_uid.nil?
     end
 
     def to_boolean(val)

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

@@ -1,5 +1,5 @@
 #menu
-  - if cardboard_user_can_manage?(:pages)
+  - if Cardboard.used_as_cms? && cardboard_user_can_manage?(:pages)
     = main_sidebar_nav_link "Pages", pages_path, id: "nav_dashboard_link", "data-skip-pjax" => true
 
 

data/cardboard.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.license     = "GPLv3"
   s.version     = Cardboard::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Michael Elfassy", "Smashing Boxes"]
+  s.authors     = ["Michael Elfassy", "SmashingBoxes"]
   s.email       = ["michael@smashingboxes.com"]
   s.homepage    = "http://smashingboxes.com"
   s.summary     = "Rails CMS made simple"

data/lib/cardboard/helpers/seed.rb

@@ -29,7 +29,7 @@ module Cardboard
       page_parts.each do |id, part|
         db_part = db_page.parts.where(identifier: id.to_s).first_or_initialize
         db_part.part_position_position = part[:position] || :last
-        db_part.update_attributes!(part.slice(:repeatable))
+        db_part.update_attributes!(:repeatable => part[:repeatable])
         
         db_part.subparts.first_or_create! 
 

data/lib/cardboard/version.rb

@@ -1,3 +1,3 @@
 module Cardboard
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/lib/cardboard_cms.rb

@@ -16,6 +16,11 @@ module Cardboard
       @user_class ||= application.user_class.to_s.camelize.constantize
     end
 
+    def used_as_cms?
+      @used_as_cms = Cardboard::Page.count > 0 if @used_as_cms.nil? #handle false
+      @used_as_cms
+    end
+
     def set_resource_controllers
       Dir[Rails.root.join('app/controllers/cardboard/*_controller.rb')].map.each do |controller|
         require_dependency controller

data/vendor/assets/javascripts/cardboard/jquery.pjax.js

@@ -1,6 +1,7 @@
 // jquery.pjax.js
 // copyright chris wanstrath
 // https://github.com/defunkt/jquery-pjax
+// version: 1.8.0
 
 (function($){
 
@@ -85,8 +86,7 @@ function handleClick(event, container, options) {
   var defaults = {
     url: link.href,
     container: $(link).attr('data-pjax'),
-    target: link,
-    fragment: null
+    target: link
   }
 
   var opts = $.extend({}, defaults, options)
@@ -96,6 +96,7 @@ function handleClick(event, container, options) {
   if (!clickEvent.isDefaultPrevented()) {
     pjax(opts)
     event.preventDefault()
+    $(link).trigger('pjax:clicked', [opts])
   }
 }
 
@@ -127,8 +128,7 @@ function handleSubmit(event, container, options) {
     url: form.action,
     data: $(form).serializeArray(),
     container: $(form).attr('data-pjax'),
-    target: form,
-    fragment: null
+    target: form
   }
 
   pjax($.extend({}, defaults, options))
@@ -263,8 +263,22 @@ function pjax(options) {
       window.history.replaceState(pjax.state, container.title, container.url)
     }
 
+    // Clear out any focused controls before inserting new page contents.
+    document.activeElement.blur()
+
     if (container.title) document.title = container.title
     context.html(container.contents)
+
+    // FF bug: Won't autofocus fields that are inserted via JS.
+    // This behavior is incorrect. So if theres no current focus, autofocus
+    // the last field.
+    //
+    // http://www.w3.org/html/wg/drafts/html/master/forms.html
+    var autofocusEl = context.find('input[autofocus], textarea[autofocus]').last()[0]
+    if (autofocusEl && document.activeElement !== autofocusEl) {
+      autofocusEl.focus();
+    }
+
     executeScriptTags(container.scripts)
 
     // Scroll to top by default
@@ -384,11 +398,15 @@ function onPjaxPopstate(event) {
   var state = event.state
 
   if (state && state.container) {
-    // When coming forward from a seperate history session, will get an
+    // When coming forward from a separate history session, will get an
     // initial pop with a state we are already at. Skip reloading the current
     // page.
     if (initialPop && initialURL == state.url) return
 
+    // If popping back to the same state, just skip.
+    // Could be clicking back from hashchange rather than a pushState.
+    if (pjax.state.id === state.id) return
+
     var container = $(state.container)
     if (container.length) {
       var direction, contents = cacheMapping[state.id]
@@ -648,7 +666,7 @@ function extractContainer(data, xhr, options) {
     // Remove any parent title elements
     obj.contents = obj.contents.not(function() { return $(this).is('title') })
 
-    // Then scrub any titles from their descendents
+    // Then scrub any titles from their descendants
     obj.contents.find('title').remove()
 
     // Gather all script[src] elements
@@ -811,7 +829,7 @@ function disable() {
 if ( $.inArray('state', $.event.props) < 0 )
   $.event.props.push('state')
 
- // Is pjax supported by this browser?
+// Is pjax supported by this browser?
 $.support.pjax =
   window.history && window.history.pushState && window.history.replaceState &&
   // pushState isn't reliable on iOS until 5.

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cardboard_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Michael Elfassy
-- Smashing Boxes
+- SmashingBoxes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -491,6 +491,13 @@ files:
 - app/assets/images/cardboard/.gitkeep
 - app/assets/images/cardboard/bg.png
 - app/assets/images/cardboard/calendar.png
+- app/assets/images/cardboard/icons/doc.png
+- app/assets/images/cardboard/icons/docx.png
+- app/assets/images/cardboard/icons/pdf.png
+- app/assets/images/cardboard/icons/txt.png
+- app/assets/images/cardboard/icons/xls.png
+- app/assets/images/cardboard/icons/xlsx.png
+- app/assets/images/cardboard/icons/zip.png
 - app/assets/images/cardboard/lorem-ipsum-coffe-mug.jpg
 - app/assets/javascripts/cardboard.js
 - app/assets/javascripts/cardboard/admin.js