caboose-cms 0.4.73 → 0.4.74

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTFiY2E2NjIxOWExYzgxMTEwY2FmNDFmNzMxNzFkN2JiMTUwOGU1Nw==
+    NzAyZTljYjY2NzA2MmMzYTkxMzZhZGZhYjhmMmFhMzM2MTc0YWI1ZA==
   data.tar.gz: !binary |-
-    ZjUwZjlkZWEzOWQyNGU2Y2I2OWI5ZGY3NjQ5ZjM0ZTk5YjZmYTg4ZQ==
+    MjgzYWQ0ZTViN2VhMzk5YWQ1ZTA5YWQwYTVhNzI2NGRhOTA2MzNmOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjhkZGQ4MzY5OTdjZTRiM2MxZjVjOGI2Y2I3NTNkNzQzOTE1OTBhZTg1MjRl
-    NmFiMmE1YzY5Nzg0ZGMxMzZiYTAxMzMxOTI2ZWU0NzUyNzQxOTZjYWQwMWNj
-    YmQzMmE4MDg3MDY4NjI5ZmJiNzUxMGU4OGIwOTdmY2IwNjUyYzI=
+    MDQwYTg3MDY2MTI0ZTk2NmZlZDZmZTAzOWYwNmVlNDZkMmEzMDBhMmViNGFm
+    NzMwODljM2YyNTZhNTU2YzM1MTU4MjAyNDJmZGY2MzFjNzI1NmM0YzUyYTY1
+    YzM4ZThmYTUyYzg4YjllMmQ3OTE2NWRkNjlmMzMxYWJkN2FkYjY=
   data.tar.gz: !binary |-
-    ZmJiYzZhYjE2MGVjYzgwOTNjZjkwZjIxNmMzY2VjMzllMjU5MjFjMjc3YTIw
-    MDYyMTg1NzA2NjM4MWYxMDc0NTkyNTlhZjFmODc0MTdhMGY4YjI4NmUwYzEz
-    OWEyMzUxMWVkOTkyMmFjNjZmMWE0YTE3NWQ0NjZkMWJjZjk3ZTQ=
+    Y2Y5OTIzNDc5NjUwYTkzYzQxOTA2MmQzZGVmODgwZTA4OThiNDkxM2I0MzZk
+    MWJlZjRlZGU3M2M1YzNlZDQzMWNkZDE4MTZhZjE1MGU1Mzc4MDYyOTY1ZTBk
+    OTg5N2JiYjE1MGVhYzQ4YWU4YWEyZDk4OTIzZDBjYjRhZjY3OGI=

data/app/controllers/caboose/login_controller.rb

@@ -39,7 +39,7 @@ module Caboose
             login_user(login_resp.user, remember)            
             resp.redirect = return_url
             resp.modal = false
-            Caboose.plugin_hook('login_success', user_id)            
+            Caboose.plugin_hook('login_success', login_resp.user.id)            
           end
         end
       end

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

@@ -2,7 +2,7 @@
 <% if !@page.nil? && @page.title != 'Access Denied' %>
 <% content_for :js do %>
 <%= javascript_include_tag "caboose/application" %>
-<%= javascript_include_tag @site.name == 'application' ? 'application' : "@site.name/application" %>
+<%= javascript_include_tag @site.name == 'application' ? 'application' : "#{@site.name}/js/application" %>
 <script>window.loggedIn = <%= logged_in?.to_json %></script>
 <% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
 <% @page.linked_resources_map[:js].each do |r| %><%= javascript_include_tag r %><% end %>
@@ -10,7 +10,7 @@
 <% end %>  
 <% content_for :css do %>
 <%= stylesheet_link_tag 'caboose/application' %>
-<%= stylesheet_link_tag @site.name == 'application' ? 'application' : "@site.name/application" %>
+<%= stylesheet_link_tag @site.name == 'application' ? 'application' : "#{@site.name}/css/application" %>
 <% Caboose::stylesheets.each do |css| %><%= stylesheet_link_tag(css) %><% end %>
 <% @page.linked_resources_map[:css].each do |r| %><%= stylesheet_link_tag r %><% end %>
 <%= yield :caboose_css %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.73'
+  VERSION = '0.4.74'
 end

metadata

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