caboose-cms 0.4.69 → 0.4.70

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmJhNDdjYTY3OGQyMDgxZGE0NjE1ZGNjOGMxNzNkNTlkYzE1ZDQ5OA==
+    MWNmYmU1YjA5ZTM3NmQxM2NlYTdkNzY3ZGU3MWE5NzVlMzFmNGQ5NA==
   data.tar.gz: !binary |-
-    YmFlY2YzMjRjMGY5ZDE2MzQzNzU1MWYxOThmMzQ3ZmE3NWQ2OWRmNg==
+    NWFkODM1YzM4ZGM3ZmVkZjdjNmYzZTAxMTFiM2NkOWM3NmM2N2NlNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjQxY2JiNTM5N2FhZWQ5NDY3NWE5YWYzZjMwZGE2YWJiNDBhMTBjZDk1YTY4
-    MDJmZDRmNDY1ZGFlMTRjZWNkNTA3OTY2ZmE2OTUwMGExMTdiYTQyZTEyYjBi
-    MTkwOWQ5ZTQyOTI1YWVkZDhkZDI4NzhiYjMwYTg2OWJhZDc5YmE=
+    OWYzN2I1MTk3NmIwNzZkZjkzNDJhMWEwNDUyNGI5OWU5NDEzYmRhMjcyZGRh
+    YjMxYTBjZWRiNWY2ZDY1MGQ5Y2MwZDVlMTUzZjI4ZDFlMWExNzdiNGUwMzE5
+    OTI3ZGIxYzA3N2E3OGVlNTNiMWYwYjIyMWQ1MDk2NDU2NjA2NTQ=
   data.tar.gz: !binary |-
-    Y2Q3YTc4NWUxNmM1MDQyM2FiNTdiZmQ3YTYzZTgwZTNmYWNhNGM1OGI5NjQx
-    NjU3Y2MxY2U0MDAzMmE1MTA0ZmJlOGE2OGMzOTM5MDcwNDk0MmIwNTk1Mzdk
-    Yzg3Yzg1NTY5MzdiMzQ1NTdlMGQ4NDdjNDdjYTE2YmQxNzFhMTI=
+    OWRhZDkyZDY4OTRhMzk0YzY2ZGUzNjcxMjU3NmEyMTczNTBjY2Y2ODQ1OGFm
+    YjJiMWU4ZGIwOWNlYTBjNTQzYzNlNzQ1YTIyNDViZGQ1NTUzZDE1ZTliNmFk
+    MGZlMmI1YjY4MjI1YTBiYTg1MzA1NzJjYzI0NWMwYTQ4YmZhMjQ=

data/app/controllers/caboose/application_controller.rb

@@ -12,6 +12,10 @@ module Caboose
       # Modify the built-in params array with URL params if necessary
       parse_url_params if Caboose.use_url_params
       
+      # Get the site we're working with      
+      domain = Domain.where(request.host_with_port).first
+      @site = domain ? domain.site : nil
+        
       # Make sure someone is logged in
       if !logged_in?      
         elo = User.find(User::LOGGED_OUT_USER_ID)        
@@ -21,7 +25,7 @@ module Caboose
       session['use_redirect_urls'] = true if session['use_redirect_urls'].nil?
       
       # Initialize AB Testing
-      AbTesting.init(request.session_options[:id]) if Caboose.use_ab_testing      
+      AbTesting.init(request.session_options[:id]) if Caboose.use_ab_testing            
       
       # Try to find the page 
       @page = Page.new

data/lib/caboose/engine.rb

@@ -172,6 +172,7 @@ module Caboose
         'caboose/fonts/big_noodle_titling_oblique.ttf',
         'caboose/fonts/big_noodle_titling.ttf',
         'caboose/fonts.css',
+        'caboose/icomoon_fonts.css',
         'caboose/login.css',
         'caboose/modal.css',
         'caboose/page_bar_generator.css',

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.69'
+  VERSION = '0.4.70'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.69
+  version: 0.4.70
 platform: ruby
 authors:
 - William Barry