caboose-cms 0.9.217 → 0.9.218

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 197067f684fafa4a905e5738704c16a1737670a0da44bda413d215c22597366d
-  data.tar.gz: 36f29a42035a8aed6eba7e52511116b4f4113809bad65f896e1ffe3d14fb6971
+  metadata.gz: 98e776416b884130973c4e3d3e27c168c8d988f088dc2408c1bd2d7a59416cd3
+  data.tar.gz: 8eb670f4400d4c486568314c821cccbbf2903e88378774bf035a5dbfd89caf7e
 SHA512:
-  metadata.gz: 19db87f6b3d0f0323f52f2d80c25710ffe7e0737801aa718ead684244df976e2ff5a09394e5555a3f9ad8cda4725faa7ef2b8c888fdcf710b23ab9c26f429650
-  data.tar.gz: 6ca692a22a0e6cb0ad2046e06f6a7d3257d719b9af205413e865958b05ae9cb5aa16bc2bfe46ab1a362ebf7222d48692ba28ca68d483af3f8bd245a34bf30262
+  metadata.gz: b66093d9edf3896601560e83b72004f673e027394c5ed775735eec732f95b56d706a91645b407534affa0243c0a67284dc3acdd9bf90cc4cd690d79b81de3cab
+  data.tar.gz: e6e42f0c414dc0d81854abb26d846e209b024fd44f9bcb05a1ff8191a79ca1778ec29e11da19388c19323dcd8c667be60e7ae90761103ad361ec7f34c51fdb4c

data/app/assets/stylesheets/caboose/login.scss

@@ -48,17 +48,22 @@
           color: #282828;
         }
         &.cb {
-          margin-top: 15px;
+          margin: 15px 0 10px 0;
           text-align: right;
+          padding: 0;
           label {
             display: inline-block;
             font-size: 14px;
             margin: 0 5px 0 0;
+            width: auto;
+            float: none;
+            padding: 0;
           }
           input[type="checkbox"] {
             width: auto;
             display: inline-block;
             margin: 0;
+            float: none;
           }
         }
       }

data/app/models/caboose/schema.rb

@@ -903,7 +903,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :head_code, :text ],
         [ :body_open_code, :text ],
         [ :body_close_code, :text ],
-        [ :recaptcha_threshold, :float, { :default => 0.5 } ]
+        [ :recaptcha_threshold, :float, { :default => 0.05 } ]
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],
@@ -1010,6 +1010,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :custom_invoice_pdf                , :string  ]
       ],  
       Caboose::Subscription => [      
+        [ :site_id                           , :integer ], 
         [ :variant_id  , :integer ],
         [ :user_id          , :integer ],
         [ :date_started     , :date    ],

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

@@ -15,11 +15,7 @@ tabs = {
 <% 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'>
 

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

@@ -15,11 +15,7 @@ tabs = {
 <% 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'>
 

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

@@ -15,11 +15,7 @@ tabs = {
 <% 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'>
  

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.217'
+  VERSION = '0.9.218'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.217
+  version: 0.9.218
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg