caboose-cms 0.9.214 → 0.9.215

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 223b2b4fe9f09ec1f50c1151e3a7a6e48406132cc545f50d4c38c24c04d21b7f
-  data.tar.gz: f68f881b804455bd210d91d904499cc1869a14bbefb0a66d93831992631aeb8c
+  metadata.gz: e78cdfe6661eb28b6f2def6670fb647f04b3203f5b4b24d55a3f6438a02114a1
+  data.tar.gz: 514ec0cd029cfd0dc08e550c2cd33c7a52013972cce05caa91319943667cdffc
 SHA512:
-  metadata.gz: b4e2cfaff52eb8fb2edbcdd9459b9b81676be7fcbd6b15ee856be17b91b7d0e70a6324bc6f17202016f2e10b678f12fc3600ce43c8e366e24b1bcfcdc1142416
-  data.tar.gz: ab2f6a75f12a88cd8720baf7b45ef6a8fa210854cdc807c39cc64fd15d3adf34fe97a6e035ee1e463498e27bdaf0d0077a3f89249aff64fef59874bbadc7433e
+  metadata.gz: 0470d3d8278c51474f46dc0a7173ad5d7b2d162fd99d1bfc0d5758d608d81d209bb635e896e8ae91622d43efed021133d044c6f4fc067ac0ac92e593cd9954b8
+  data.tar.gz: b023cd761cee7067d36fe2f9a5399a312a75a2cafb2c5898ba9fd7d5d61c243a88aaea7bc49e39be35db38decc39ab4fc90175c0788da47a33ea198c09843bb9

data/app/controllers/caboose/sites_controller.rb

@@ -90,36 +90,26 @@ module Caboose
     # @route GET /admin/sites/:id/block-types
     def admin_edit_block_types
       return if !user_is_allowed('sites', 'edit')
-      if (@site.id.to_s != params[:id] && !@site.is_master)
+      if (!logged_in_user.is_super_admin?)
         @error = "You are not allowed to edit this site."
         render :file => 'caboose/extras/error' and return
       end
       @site = Site.find(params[:id])      
     end
             
-    # @route GET /admin/sites/:id/css
+    # @route GET /admin/custom-css
     def admin_edit_css
-      return if !user_is_allowed('sites', 'edit')
-      if (@site.id.to_s != params[:id] && !@site.is_master)
-        @error = "You are not allowed to edit this site."
-        render :file => 'caboose/extras/error' and return
-      end    
-      @site = Site.find(params[:id])      
+      return if !user_is_allowed('code', 'edit')
     end
             
-    # @route GET /admin/sites/:id/js
+    # @route GET /admin/custom-js
     def admin_edit_js
-      return if !user_is_allowed('sites', 'edit')
-      if (@site.id.to_s != params[:id] && !@site.is_master)
-        @error = "You are not allowed to edit this site."
-        render :file => 'caboose/extras/error' and return
-      end   
-      @site = Site.find(params[:id])      
+      return if !user_is_allowed('code', 'edit')
     end
 
     # @route GET /admin/sites/:id/contact
     def admin_edit_contact
-      return if !user_is_allowed('sites', 'edit')
+      return if !user_is_allowed('contactinfo', 'edit')
       if (@site.id.to_s != params[:id] && !@site.is_master)
         @error = "You are not allowed to edit this site."
         render :file => 'caboose/extras/error' and return
@@ -127,20 +117,20 @@ module Caboose
       @site = Site.find(params[:id])      
     end
 
-    # @route GET /admin/sites/:id/codes
-    def admin_edit_codes
-      return if !user_is_allowed('sites', 'edit')
-      if (@site.id.to_s != params[:id] && !@site.is_master)
-        @error = "You are not allowed to edit this site."
-        render :file => 'caboose/extras/error' and return
-      end   
-      @site = Site.find(params[:id])      
-    end
+    # # @route GET /admin/sites/:id/codes
+    # def admin_edit_codes
+    #   return if !user_is_allowed('sites', 'edit')
+    #   if (@site.id.to_s != params[:id] && !@site.is_master)
+    #     @error = "You are not allowed to edit this site."
+    #     render :file => 'caboose/extras/error' and return
+    #   end   
+    #   @site = Site.find(params[:id])      
+    # end
             
     # @route GET /admin/sites/:id/delete
     def admin_delete_form
-      return if !user_is_allowed('sites', 'edit')
-      if (@site.id.to_s != params[:id] && !@site.is_master)
+      return if !user_is_allowed('sites', 'delete')
+      if (!logged_in_user.is_super_admin?)
         @error = "You are not allowed to edit this site."
         render :file => 'caboose/extras/error' and return
       end
@@ -150,12 +140,17 @@ module Caboose
     # @route GET /admin/sites/:id
     def admin_edit
       return if !user_is_allowed('sites', 'edit')
-      if (@site.id.to_s != params[:id] && !@site.is_master)
+      if (!logged_in_user.is_super_admin?)
         @error = "You are not allowed to edit this site."
         render :file => 'caboose/extras/error' and return
       end
       @site = Site.find(params[:id])            
     end
+
+    # @route GET /admin/code
+    def admin_edit_code
+      return if !user_is_allowed('code', 'edit')
+    end
         
     # @route POST /admin/sites
     def admin_add

data/app/models/caboose/core_plugin.rb

@@ -29,6 +29,8 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
     item['children'] << { 'id' => 'smtp'              , 'text' => 'SMTP (Mail)'         , 'href' => '/admin/smtp'               , 'modal' => false } if user.is_allowed('smtp'              , 'view')
     item['children'] << { 'id' => 'social'            , 'text' => 'Social Media'        , 'href' => '/admin/social'             , 'modal' => false } if user.is_allowed('social'            , 'view')
     item['children'] << { 'id' => 'users'             , 'text' => 'Users'               , 'href' => '/admin/users'              , 'modal' => false } if user.is_allowed('users'             , 'view')
+    item['children'] << { 'id' => 'code'              , 'icon' => 'stack', 'text' => 'Custom Code'         , 'href' => '/admin/code'               , 'modal' => false } if user.is_allowed('code'              , 'edit')
+    item['children'] << { 'id' => 'contactinfo'      , 'icon' => 'plane', 'text' => 'Contact Information'         , 'href' => "/admin/sites/#{site.id}/contact"            , 'modal' => false } if user.is_allowed('contactinfo'              , 'edit')
     item['children'] << { 'id' => 'theme'      , 'icon' => 'sites',        'text' => 'Theme'               , 'href' => '/admin/theme'              , 'modal' => false } if user.is_allowed('theme'             , 'view') if !site.theme.nil? && user.is_super_admin?
    # item['children'] << { 'id' => 'variables'         , 'text' => 'Variables'           , 'href' => '/admin/settings'           , 'modal' => false } if user.is_allowed('settings'          , 'view')   
     item['children'] << { 'id' => 'my-account'             , 'text' => 'My Account'               , 'href' => '/my-account'              , 'modal' => false } 

data/app/models/caboose/site.rb

@@ -171,7 +171,6 @@ class Caboose::Site < ActiveRecord::Base
   def custom_js
     resp = HTTParty.get('https:' + self.custom_js_url)
     if resp.nil? || resp.code.to_i == 403
-      self.custom_js = ""
       return ""            
     end
     return resp.body    
@@ -180,7 +179,6 @@ class Caboose::Site < ActiveRecord::Base
   def custom_css    
     resp = HTTParty.get('https:' + self.custom_css_url)
     if resp.nil? || resp.code.to_i == 403
-      self.custom_css = ""
       return ""            
     end
     return resp.body    

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

@@ -24,12 +24,8 @@
 <ul id='tabs'>
 <%
 tabs = {
-  'General'           => "/admin/sites/#{@site.id}",  
-  'Contact Info'      => "/admin/sites/#{@site.id}/contact",  
+  'General'           => "/admin/sites/#{@site.id}",
   'Block Types'       => "/admin/sites/#{@site.id}/block-types",
-  'Custom CSS'        => "/admin/sites/#{@site.id}/css",
-  'Custom JS'         => "/admin/sites/#{@site.id}/js",
-  'Embedded HTML'     => "/admin/sites/#{@site.id}/codes",
   'Delete Site'       => "/admin/sites/#{@site.id}/delete" 
 }
 
@@ -43,4 +39,4 @@ tabs = {
 <li class="back"><input type="button" onclick="window.location='/admin';" value="< Back" />
 <% end %>
 </ul>
-<div id='content2'>
+<div id='content2'>

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

@@ -1,5 +1,6 @@
 <%
 s = @site
+seen_btids = [0]
 %>
 <%= render :partial => 'caboose/sites/admin_header' %>
 
@@ -7,23 +8,36 @@ s = @site
 <div id='block_types'>
 <table class='data'>
 <tr><th>&nbsp;</th><th>Name</th><th>Description</th><th></th></tr>
-<% bt_ids = @site.block_type_site_memberships.collect{ |bt| bt.block_type_id } %>
-<% Caboose::BlockType.where("parent_id is null").reorder('name').all.each do |bt| %>
-  <tr id="bt_<%= bt.id %>">
-    <td align='center'><input type='checkbox' name='block_type_id_<%= bt.id %>' <%= bt_ids.include?(bt.id) ? "checked='true'" : '' %> onclick="toggle_block_type_site_membership(<%= @site.id %>, <%= bt.id %>, $(this).prop('checked'));" /></td>
+<%# bt_ids = @site.block_type_site_memberships.collect{ |bt| bt.block_type_id } %>
+
+<% Caboose::BlockType.joins(:sites).where(:parent_id => nil).where("sites.id = ?", @site.id).order(:name).all.each do |bt| %>
+   <tr id="bt_<%= bt.id %>">
+    <td align='center'><input type='checkbox' name='block_type_id_<%= bt.id %>' checked='true' onclick="toggle_block_type_site_membership(<%= @site.id %>, <%= bt.id %>, $(this).prop('checked'));" /></td>
     <td><%= bt.name %></td>
     <td><%= bt.description %></td>
     <td>
-      <% if bt_ids.include?(bt.id) %>
+
         <% btsm = @site.block_type_site_memberships.where(:block_type_id => bt.id).first %>
         <a style="margin-right:5px;" href="/admin/block-type-site-memberships/<%= btsm.id %>/html" class="caboose-btn">Custom Render Function</a>
         <% if @site.theme %>
           <a href="/admin/block-type-site-memberships/<%= btsm.id %>/css" class="caboose-btn">Custom SCSS</a>
         <% end %>
-      <% end %>
+ 
     </td>
   </tr>
+  <% seen_btids << bt.id %>
+<% end %>
+
+<% Caboose::BlockType.where(:parent_id => nil).where("id not in (?)", seen_btids).order(:name).all.each do |bt| %>
+  <tr id="bt_<%= bt.id %>">
+    <td align='center'><input type='checkbox' name='block_type_id_<%= bt.id %>' onclick="toggle_block_type_site_membership(<%= @site.id %>, <%= bt.id %>, $(this).prop('checked'));" /></td>
+    <td><%= bt.name %></td>
+    <td><%= bt.description %></td>
+    <td>&nbsp;</td>
+  </tr>
 <% end %>
+
+
 </table><br/>
 </div>
       

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

@@ -0,0 +1,64 @@
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<% end %>
+
+<h1 id='page_title'>Edit Code</h1>
+<ul id='tabs'>
+<%
+tabs = {
+  'Custom CSS'        => "/admin/custom-css",
+  'Custom JS'         => "/admin/custom-js",
+  'Embedded HTML'     => "/admin/code"
+}
+
+%>
+<% tabs.each do |text, href| %>
+<li<%= raw request.fullpath == href ? " class='selected'" : '' %>><a href='<%= href %>'><%= raw text %></a></li>
+<% end %>
+<% if @site.is_master %>
+<li class="back"><input type="button" onclick="window.location='/admin/sites';" value="< Back" />
+<% else %>
+<li class="back"><input type="button" onclick="window.location='/admin';" value="< Back" />
+<% end %>
+</ul>
+<div id='content2'>
+
+
+
+<h5 style="margin:0;font-size:18px;">Embedded HTML</h5>
+
+<p><div id='site_<%= @site.id %>_head_code'></div></p>
+<p><div id='site_<%= @site.id %>_body_open_code'></div></p>
+<p><div id='site_<%= @site.id %>_body_close_code'></div></p>
+
+<br style='clear: left; line-height: 0;' />
+</div>
+
+<% content_for :caboose_css do %>
+<style>
+  textarea {
+    font-family: monospace;
+    font-size: 13px;
+    line-height: 18px;
+  }
+</style>
+<% end %>
+
+<% content_for :caboose_js do %>
+<script type="text/javascript">
+
+$(document).ready(function() {
+  new ModelBinder({
+    name: 'Site',
+    id: <%= @site.id %>,
+    update_url: '/admin/sites/<%= @site.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'head_code', nice_name: 'Code for &lt;head&gt;', type: 'textarea', value: <%== Caboose.json(@site.head_code.blank? ? '' : @site.head_code.gsub('</script>','<end/script>')) %>, width: 600, height: 300 },
+      { name: 'body_open_code', nice_name: 'Code for after &lt;body&gt;', type: 'textarea', value: <%== Caboose.json(@site.body_open_code.blank? ? '' : @site.body_open_code.gsub('</script>','<end/script>')) %>, width: 600, height: 300 },
+      { name: 'body_close_code', nice_name: 'Code for before &lt;/body&gt;', type: 'textarea', value: <%== Caboose.json(@site.body_close_code.blank? ? '' : @site.body_close_code.gsub('</script>','<end/script>')) %>, width: 600, height: 300 }
+    ]    
+  });       
+});
+</script>
+<% end %>

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

@@ -1,6 +1,6 @@
-<%= render :partial => 'caboose/sites/admin_header' %>
 
-<h5 style="margin:0;font-size:18px;">Contact Info</h5>
+
+<h1>Contact Information</h1>
 
 <p><div id='site_<%= @site.id %>_main_phone'></div></p>
 <p><div id='site_<%= @site.id %>_alt_phone'></div></p>
@@ -12,10 +12,11 @@
 <p><div id='site_<%= @site.id %>_fax'></div></p>
 <p><div id='site_<%= @site.id %>_contact_email'></div></p>
 
-<%= render :partial => 'caboose/sites/admin_footer' %>
+<a href="/admin" class="caboose-btn">Back</a>
 
 
 <% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">
 
 $(document).ready(function() {

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

@@ -1,10 +1,33 @@
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<% end %>
+
+<h1 id='page_title'>Edit Code</h1>
+<ul id='tabs'>
+<%
+tabs = {
+  'Custom CSS'        => "/admin/custom-css",
+  'Custom JS'         => "/admin/custom-js",
+  'Embedded HTML'     => "/admin/code"
+}
 
-<%= render :partial => 'caboose/sites/admin_header' %>
+%>
+<% tabs.each do |text, href| %>
+<li<%= raw request.fullpath == href ? " class='selected'" : '' %>><a href='<%= href %>'><%= raw text %></a></li>
+<% end %> 
+<% if @site.is_master %>
+<li class="back"><input type="button" onclick="window.location='/admin/sites';" value="< Back" />
+<% else %>
+<li class="back"><input type="button" onclick="window.location='/admin';" value="< Back" />
+<% end %>
+</ul>
+<div id='content2'>
 
 <div class="editor-wrapper">
 
   <div class="holder">
     <div class="clearfix buttons">
+      <p class="warning">WARNING: This code will apply to the entire website. Edit with caution.</p>
       <a href="#" onclick="save();return false;" class="caboose-btn green">Save</a>
       <span id="modified">Modified</span>
       <div id="message"></div>
@@ -19,6 +42,12 @@
 
 <% content_for :caboose_css do %>
 <style>
+p.warning {
+  color: #d43030;
+  font-size: 14px;
+  font-weight: bold;
+  margin: 0 0 8px 0;
+}
 p#tips {
   display: inline-block;
   float: right;
@@ -118,4 +147,5 @@ span#modified {
 <% end %>
 
 
-<%= render :partial => 'caboose/sites/admin_footer' %>
+<br style='clear: left; line-height: 0;' />
+</div><!-- modal_content2 -->

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

@@ -1,10 +1,33 @@
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<% end %>
 
-<%= render :partial => 'caboose/sites/admin_header' %>
+<h1 id='page_title'>Edit Code</h1>
+<ul id='tabs'>
+<%
+tabs = {
+  'Custom CSS'        => "/admin/custom-css",
+  'Custom JS'         => "/admin/custom-js",
+  'Embedded HTML'     => "/admin/code"
+}
 
+%>
+<% tabs.each do |text, href| %>
+<li<%= raw request.fullpath == href ? " class='selected'" : '' %>><a href='<%= href %>'><%= raw text %></a></li>
+<% end %>
+<% if @site.is_master %>
+<li class="back"><input type="button" onclick="window.location='/admin/sites';" value="< Back" />
+<% else %>
+<li class="back"><input type="button" onclick="window.location='/admin';" value="< Back" />
+<% end %>
+</ul>
+<div id='content2'>
+ 
 <div class="editor-wrapper">
 
   <div class="holder">
     <div class="clearfix buttons">
+      <p class="warning">WARNING: This code will apply to the entire website. Edit with caution.</p>
       <a href="#" onclick="save();return false;" class="caboose-btn green">Save</a>
       <span id="modified">Modified</span>
       <div id="message"></div>
@@ -19,6 +42,12 @@
 
 <% content_for :caboose_css do %>
 <style>
+p.warning {
+  color: #d43030;
+  font-size: 14px;
+  font-weight: bold;
+  margin: 0 0 8px 0;
+}
 p#tips {
   display: inline-block;
   float: right;
@@ -117,6 +146,6 @@ span#modified {
 </script>
 <% end %>
 
-
-<%= render :partial => 'caboose/sites/admin_footer' %>
+<br style='clear: left; line-height: 0;' />
+</div><!-- modal_content2 -->
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.214'
+  VERSION = '0.9.215'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.214
+  version: 0.9.215
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-06 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -1169,6 +1169,7 @@ files:
 - app/views/caboose/sites/admin_delete_form.html.erb
 - app/views/caboose/sites/admin_edit.html.erb
 - app/views/caboose/sites/admin_edit_block_types.html.erb
+- app/views/caboose/sites/admin_edit_code.html.erb
 - app/views/caboose/sites/admin_edit_codes.html.erb
 - app/views/caboose/sites/admin_edit_contact.html.erb
 - app/views/caboose/sites/admin_edit_css.html.erb