caboose-cms 0.4.124 → 0.4.125

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTQzMWJkNGEzY2NkYWI4NTFhZmRiZjFmNTdlMGFjNDAzZjY5OWZlMw==
+    NzY3YzUzMzFlMjA4YjNkM2VjMmU4NjY1ZmY4YmE1ZjYyZGI1NjAyNw==
   data.tar.gz: !binary |-
-    ZmM5MDQxMjNmMWFiMTE1MGIzMGMwMzRiYTI3MmEwOTU2NTkwYzM0Yg==
+    YjQ2ODg1Njk5YjExMTIxYzBmNzE5NjQ3ZTFmZTM4OGJjOWQ2NGRmZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzVkYzE5MzY5YmZhNzdhZmZmMDAzZjFkNDE0MDc1MjgxNzFjYzRmYzJlOTRk
-    ZWVmNjc4NDQzNTRhOTZiOTM0Zjk1NjhmYWM4MjllZjNlMDJkNDE4MGI0ZDlh
-    NmE0YjVkMzgxNTNmMDc1YmMxMmMyMzUyYjQzOTFkMWQ3OWI1YWI=
+    NWUxNTkyYmM1NGQ1MjNmYjM1MWU5MmFmY2M5MWNlZDJlYjk4YzI1ZDdiZjQ5
+    MGYwNGZlNDRkMWNmNjY3NTZjNDY4ZTBiNjI3NmUyZTBmNzEzYmIwMWIzNzAy
+    OGI2ODdiMDQxODEyMmE1NmM5YmJiNmRhMjZjNzk2Mjc4YzdlMGI=
   data.tar.gz: !binary |-
-    ZTJlOGRmOGEwMWFhZDk0OTM5ZGE5ZTQ3ODdhOTBlZjBmYzZlZGRhNTM2ZGVk
-    ZTIwOTA2NWFhZjM4MGRlZTdmNThhZjU5MWZmY2Y0OTUyN2ZiNmZlNTc3ZjUx
-    YmRlZTcwM2I5Zjc3NTUyZDdhNjUwOTNjMWRjODkwZTcxOTg2MTU=
+    MDE1ZmQ5NmRmNWMzNTA3NDRiNzZlNzMyNTM4YTQwNTk0YzNhYmFhZDgyZTA5
+    ODU2NjY2NjIyM2MxZWYzNzNjOWM4MDg3NTVhNzVjODAyYmEyMWY5MzAxNDEw
+    N2Y3MTBhN2VhOWYzOTdkOTYzYWU2YzI1ZmQyNWQwNzNiZGQwMTk=

data/app/controllers/caboose/domains_controller.rb

@@ -0,0 +1,64 @@
+require 'csv'
+
+module Caboose
+  class DomainsController < ApplicationController
+    layout 'caboose/admin'
+      
+    def before_action
+      @page = Page.page_with_uri(request.host_with_port, '/admin')
+    end
+    
+    # POST /admin/sites/:site_id/domains
+    def admin_add
+      return if !user_is_allowed('domains', 'edit')
+      
+      resp = Caboose::StdClass.new      
+      d = Domain.where(:domain => params[:domain]).first
+            
+      if d && d.site_id != params[:site_id]
+        resp.error = "That domain is already associated with another site."
+      elsif d && d.site_id == params[:site_id]
+        resp.refresh = true
+      elsif d.nil?
+        primary = Domain.where(:site_id => params[:site_id]).count == 0        
+        d = Domain.create(:site_id => params[:site_id], :domain => params[:domain], :primary => primary)
+        resp.refresh = true
+      end
+      render :json => resp
+    end
+    
+    # PUT /admin/sites/:site_id/domains/:id
+    def admin_update
+      return if !user_is_allowed('domains', 'edit')
+
+      resp = StdClass.new     
+      d = Domain.find(params[:id])
+    
+      save = true
+      params.each do |name,value|
+        case name
+          when 'site_id'            then d.site_id            = value
+          when 'domain'             then d.domain             = value
+          when 'under_construction' then d.under_construction = value
+          when 'primary'            then
+            d.primary = value
+            Domain.where(:site_id => params[:site_id]).all.each do |d2|
+              d2.primary = d2.id == d.id ? true : false
+              d2.save
+            end
+    	  end
+    	end
+    	
+    	resp.success = save && d.save
+    	render :json => resp
+    end        
+      
+    # DELETE /admin/sites/:site_id/domains/:id
+    def admin_delete
+      return if !user_is_allowed('sites', 'delete')
+      Domain.find(params[:id]).destroy
+      render :json => { 'redirect' => "/admin/sites/#{params[:site_id]}" }
+    end
+            
+  end
+end

data/app/controllers/caboose/pages_controller.rb

@@ -13,8 +13,20 @@ module Caboose
       
       # Find the page with an exact URI match 
       page = Page.page_with_uri(request.host_with_port, request.fullpath, false)
-
+      
       if (!page)
+        
+        # Make sure we're not under construction
+        d = Caboose::Domain.where(:domain => request.host_with_port).first
+        if d.under_construction == true
+          if d.site.under_construction_html && d.site.under_construction_html.strip.length > 0 
+            render :text => d.site.under_construction_html
+          else 
+            render :file => 'caboose/application/under_construction', :layout => false
+          end
+          return
+        end
+        
         asset
         return
       end

data/app/controllers/caboose/sites_controller.rb

@@ -64,8 +64,9 @@ module Caboose
       save = true
       params.each do |name,value|
         case name
-          when 'name'         then site.name          = value
-          when 'description'  then site.description   = value               		  
+          when 'name'                     then site.name                    = value
+          when 'description'              then site.description             = value
+          when 'under_construction_html'  then site.under_construction_html = value
     	  end
     	end
     	
@@ -103,47 +104,47 @@ module Caboose
     end
     
     # POST /admin/sites/:id/domains
-    def admin_add_domain
-      return if !user_is_allowed('sites', 'edit')
-      
-      resp = Caboose::StdClass.new      
-      d = Domain.where(:domain => params[:domain]).first
-            
-      if d && d.site_id != params[:id]
-        resp.error = "That domain is already associated with another site."
-      elsif d && d.site_id == params[:id]
-        resp.refresh = true
-      elsif d.nil?
-        primary = Domain.where(:site_id => params[:id]).count == 0        
-        d = Domain.create(:site_id => params[:id], :domain => params[:domain], :primary => primary)
-        resp.refresh = true
-      end
-      render :json => resp
-    end
+    #def admin_add_domain
+    #  return if !user_is_allowed('sites', 'edit')
+    #  
+    #  resp = Caboose::StdClass.new      
+    #  d = Domain.where(:domain => params[:domain]).first
+    #        
+    #  if d && d.site_id != params[:id]
+    #    resp.error = "That domain is already associated with another site."
+    #  elsif d && d.site_id == params[:id]
+    #    resp.refresh = true
+    #  elsif d.nil?
+    #    primary = Domain.where(:site_id => params[:id]).count == 0        
+    #    d = Domain.create(:site_id => params[:id], :domain => params[:domain], :primary => primary)
+    #    resp.refresh = true
+    #  end
+    #  render :json => resp
+    #end
     
     # PUT /admin/sites/:id/domains/:domain_id/set-primary
-    def admin_set_primary_domain
-      return if !user_is_allowed('sites', 'edit')
-      
-      domain_id = params[:domain_id].to_i
-      Domain.where(:site_id => params[:id]).all.each do |d|
-        d.primary = d.id == domain_id ? true : false
-        d.save
-      end       
-      render :json => true
-    end
+    #def admin_set_primary_domain
+    #  return if !user_is_allowed('sites', 'edit')
+    #  
+    #  domain_id = params[:domain_id].to_i
+    #  Domain.where(:site_id => params[:id]).all.each do |d|
+    #    d.primary = d.id == domain_id ? true : false
+    #    d.save
+    #  end       
+    #  render :json => true
+    #end
     
     # DELETE /admin/sites/:id/domains/:domain_id
-    def admin_remove_domain
-      return if !user_is_allowed('sites', 'edit')
-      Domain.find(params[:domain_id]).destroy
-      if Domain.where(:site_id => params[:id]).count == 1
-        d = Domain.where(:site_id => params[:id]).first
-        d.primary = true
-        d.save
-      end
-      render :json => { 'refresh' => true }
-    end        
+    #def admin_remove_domain
+    #  return if !user_is_allowed('sites', 'edit')
+    #  Domain.find(params[:domain_id]).destroy
+    #  if Domain.where(:site_id => params[:id]).count == 1
+    #    d = Domain.where(:site_id => params[:id]).first
+    #    d.primary = true
+    #    d.save
+    #  end
+    #  render :json => { 'refresh' => true }
+    #end        
     
     # GET /admin/sites/options
     def options

data/app/models/caboose/domain.rb

@@ -3,6 +3,6 @@ class Caboose::Domain < ActiveRecord::Base
   self.table_name = "domains"
        
   belongs_to :site, :class_name => 'Caboose::Site'        
-  attr_accessible :id, :site_id, :domain, :primary
+  attr_accessible :id, :site_id, :domain, :primary, :under_construction
       
 end

data/app/models/caboose/page.rb

@@ -67,7 +67,7 @@ class Caboose::Page < ActiveRecord::Base
   def self.page_with_uri(host_with_port, uri, get_closest_parent = true)
 
     d = Caboose::Domain.where(:domain => host_with_port).first
-    return false if d.nil?
+    return false if d.nil? || d.under_construction == true
     site_id = d.site_id    
     
     uri = uri.to_s.gsub(/^(.*?)\?.*?$/, '\1')

data/app/models/caboose/schema.rb

@@ -181,9 +181,10 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :updated_at  , :datetime , :null => true  ]
       ],
       Caboose::Domain => [
-        [ :site_id     , :integer ],
-        [ :domain      , :string  ],
-        [ :primary     , :boolean, { :default => false }]
+        [ :site_id            , :integer ],
+        [ :domain             , :string  ],
+        [ :primary            , :boolean, { :default => false }],
+        [ :under_construction , :boolean, { :default => false }]
       ],
       Caboose::MediaCategory => [
         [ :parent_id         , :integer ],
@@ -280,8 +281,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :value , :text   ]
       ],
       Caboose::Site => [
-        [ :name        , :string ],
-        [ :description , :text   ]
+        [ :name                     , :string ],
+        [ :description              , :text   ],
+        [ :under_construction_html  , :text   ]
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],

data/app/models/caboose/site.rb

@@ -5,7 +5,7 @@ class Caboose::Site < ActiveRecord::Base
   has_many :site_memberships, :class_name => 'Caboose::SiteMembership', :dependent => :delete_all
   has_many :domains, :class_name => 'Caboose::Domain', :dependent => :delete_all
   has_many :post_categories, :class_name => 'Caboose::PostCategory'
-  attr_accessible :id, :name, :description
+  attr_accessible :id, :name, :description, :under_construction_html
   
   def smtp_config
     c = Caboose::SmtpConfig.where(:site_id => self.id).first

data/app/views/caboose/application/under_construction.html.erb

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Under Construction</title>               
+<style type='text/css'>
+body { margin: 0; padding: 0; text-align: center; }
+#container { font-size: 24pt; }
+</style>
+</head>  
+<body>
+  <div class="container">      
+    <p>We apologize for the inconvenience, but we're in the process of upgrading our site.  We'll be finished very soon!</p>                  
+  </div>
+</body>
+</html>

data/app/views/caboose/blocks/admin_edit.html.erb

@@ -123,9 +123,9 @@ $(document).ready(function() {
 });    
 
 </script>
-<% if @block.block_type.field_type == 'richtext' %>
+<% if @block.block_type.field_type == 'richtext' %>  
   <script src="//tinymce.cachefly.net/4.0/tinymce.min.js"></script>    
-  <%= tinymce :caboose, :width => '800px', :height => '300px' %>
+  <%= raw caboose_tinymce %>
 <% end %>
 
 <% end %>

data/app/views/caboose/blocks/{admin_edit_richtext.html.erb → admin_edit_richtextold.html.erb}

@@ -30,6 +30,6 @@ $(document).ready(function() {
 });
 
 </script>
-<%= tinymce_assets %>
-<%= tinymce :caboose, width: '800px', height:'300px' %>
+<script src="//tinymce.cachefly.net/4.0/tinymce.min.js"></script>    
+<%= raw caboose_tinymce %>
 <% end %>

data/app/views/caboose/posts/admin_edit_content.html.erb

@@ -27,6 +27,6 @@ $(window).load(function() {
 });
 
 </script>
-<%= tinymce_assets %>
-<%= tinymce :caboose, 'width' => '575px', 'height' => '240px' %>
+<script src="//tinymce.cachefly.net/4.0/tinymce.min.js"></script>
+<%= tinymce :caboose, 'width' => '575px', 'height' => '240px' %>      
 <% end %>

data/app/views/caboose/sites/admin_edit.html.erb

@@ -9,6 +9,7 @@ user_ids = [] if user_ids.nil?
 
 <p><div id='site_<%= @site.id %>_name'        ></div></p>
 <p><div id='site_<%= @site.id %>_description' ></div></p>
+<p><div id='site_<%= @site.id %>_under_construction_html' ></div></p>
 
 <h2>Domains</h2>
 <p><a href='#' onclick="add_domain(<%= @site.id %>);">New Domain</a></p>
@@ -18,13 +19,15 @@ user_ids = [] if user_ids.nil?
   <tr>
     <th>Domain</th>
     <th>Primary</th>
+    <th>Under Construction</th>
     <th>Delete</th>
   </tr>
   <% @site.domains.all.each do |d| %>
   <tr>
     <td><%= d.domain %></td>
-    <td align='center'><input type='radio' name='primary_domain' <%= d.primary? ? "checked='true'" : '' %> onclick="set_primary_domain(<%= s.id %>, <%= d.id %>);" /></td>
-    <td align='center'><input type='button' value='Delete' onclick="delete_domain(<%= @site.id %>, <%= d.id %>);" /></td>    
+    <td align='center'><input type='radio'    name='primary_domain' <%= d.primary? ? "checked='true'" : '' %> onclick="set_primary_domain(<%= s.id %>, <%= d.id %>);" /></td>
+    <td align='center'><input type='checkbox' name='under_construction_<%= d.id %>' <%= d.under_construction ? "checked='true'" : '' %> onclick="set_under_construction(<%= s.id %>, <%= d.id %>, $(this).prop('checked'));" /></td>
+    <td align='center'><input type='button'   value='Delete' onclick="delete_domain(<%= @site.id %>, <%= d.id %>);" /></td>    
   </tr>
   <% end %>
   </table>
@@ -71,8 +74,9 @@ $(document).ready(function() {
     update_url: '/admin/sites/<%= @site.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'name'        , nice_name: 'Name'        , type: 'text'     , value: <%= raw Caboose.json(@site.name)        %>, width: 400 },
-      { name: 'description' , nice_name: 'Description' , type: 'textarea' , value: <%= raw Caboose.json(@site.description) %>, width: 600, height: 75 }      
+      { name: 'name'                    , nice_name: 'Name'                     , type: 'text'     , value: <%= raw Caboose.json(@site.name)                    %>, width: 400 },
+      { name: 'description'             , nice_name: 'Description'              , type: 'textarea' , value: <%= raw Caboose.json(@site.description)             %>, width: 600, height: 75 },
+      { name: 'under_construction_html' , nice_name: 'Under Construction HTML'  , type: 'textarea' , value: <%= raw Caboose.json(@site.under_construction_html) %>, width: 600, height: 75 }      
     ]    
   });  
 });
@@ -99,6 +103,15 @@ function delete_site(site_id, confirm)
   });
 }
 
+function set_under_construction(site_id, domain_id, checked)
+{
+  $.ajax({
+    url: '/admin/sites/' + site_id + '/domains/' + domain_id,
+    type: 'put',
+    data: { under_construction: checked ? 1 : 0 }
+  });
+}
+
 function add_site_membership(site_id, user_id, role)
 {
   $.ajax({

data/config/routes.rb

@@ -23,10 +23,10 @@ Caboose::Engine.routes.draw do
   
   post    "admin/sites/:id/members"            => "sites#admin_add_member"
   delete  "admin/sites/:id/members/:user_id"   => "sites#admin_remove_member"
-  
-  post    "admin/sites/:id/domains"                        => "sites#admin_add_domain"
-  put     "admin/sites/:id/domains/:domain_id/set-primary" => "sites#admin_set_primary_domain"
-  delete  "admin/sites/:id/domains/:domain_id"             => "sites#admin_remove_domain"
+   
+  post    "admin/sites/:site_id/domains"     => "domains#admin_add"
+  put     "admin/sites/:site_id/domains/:id" => "domains#admin_update"
+  delete  "admin/sites/:site_id/domains/:id" => "domains#admin_delete"
                                                                                                                                      
   get     "admin/sites/options"              => "sites#options"
   get     "admin/sites"                      => "sites#admin_index"    

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.124'
+  VERSION = '0.4.125'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.124
+  version: 0.4.125
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -271,6 +271,7 @@ files:
 - app/controllers/caboose/block_types_controller.rb
 - app/controllers/caboose/blocks_controller.rb
 - app/controllers/caboose/calendars_controller.rb
+- app/controllers/caboose/domains_controller.rb
 - app/controllers/caboose/event_groups_controller.rb
 - app/controllers/caboose/events_controller.rb
 - app/controllers/caboose/images_controller.rb
@@ -349,6 +350,7 @@ files:
 - app/views/caboose/ab_variants/admin_new.html.erb
 - app/views/caboose/admin/index.html.erb
 - app/views/caboose/application/show.html.erb
+- app/views/caboose/application/under_construction.html.erb
 - app/views/caboose/block_type_sources/admin_edit.html.erb
 - app/views/caboose/block_type_sources/admin_index.html.erb
 - app/views/caboose/block_type_sources/admin_new.html.erb
@@ -393,7 +395,7 @@ files:
 - app/views/caboose/blocks/admin_edit_h5.html.erb
 - app/views/caboose/blocks/admin_edit_h6.html.erb
 - app/views/caboose/blocks/admin_edit_heading.html
-- app/views/caboose/blocks/admin_edit_richtext.html.erb
+- app/views/caboose/blocks/admin_edit_richtextold.html.erb
 - app/views/caboose/blocks/admin_new.html.erb
 - app/views/caboose/blocks/admin_render_second_level.json.erb
 - app/views/caboose/calendars/admin_edit.html.erb