caboose-cms 0.3.25 → 0.3.26

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmIzZmU0ZTNhYTRhNmQ5ODljZTc0ODk1NTk0MmQ0NTQ3MGRkNzdhYw==
+    MDNkYTYwNmRiNjA3ZWUwZTcwMjI2NGIxMzk1MjYyMzYwZTk2YjcwMw==
   data.tar.gz: !binary |-
-    ZDNmYjZlNGIwNzdkNjJiOWQ1MDc0MWE3MTJiZTM5NTFhM2QzZGE5OA==
+    MjQ4NGYxOGUxZTRlMGNhODU0NDZiYTY5NDY0MzUyNzYzZWU3NDdkMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Zjg0ODIyNjAxNzFmZGZmY2E4YTg0YTJiMmQxMWNhZWYxMTdkOTNhNTkyY2Zh
-    NDA5N2FhOTRmMDA4ZmJmNjZjZDM5YzE3M2U1YTk0MGRlNDEyMDI5Yjg0OWNi
-    YzFlMGQ1OGQ0Mjc2OTRmNGM1Yjc3Mjg5NmNkN2Q2NWM5MWM4OWU=
+    ZTZlYTU4YTM0MmI2YjFhMTNjZmJkYWYzNDE5MWI5MGVmYjViNWI0OGNmNWZh
+    OGI2MGFjMzQ4NjlhOThiODVjNGM4ZjJlZGZkMjc0ZjA4YzE1OTc3YzcyZDQz
+    NTNkNjY1NmViMTY0MTUxNjkwZmUzYjI0MTQ4YmQzYzFlYWVmMmM=
   data.tar.gz: !binary |-
-    MTgwMjUzZWZhYWM5NGZlMzljZGQwNDQzNjBkNTNjZGNmYjc1MDFjYmIzMGQ5
-    YzRmMDQwNzIxMjM0MjUwZmEyZWE3MWZhMzY4NGFiMzA5ZTU3YWE4NGIxNjYx
-    MzAwYTNiN2FmMzE5Y2E0ZDFhNGMzYzZjZDA2NGY0MGRhYTgxZGE=
+    OTA0ZmM4Nzc0OGE0ZjJkNmQxNjY1NTVjNGVhNjc2OTY0NDVjNTE2Y2U0YWFh
+    ZTA2ODA2Y2FmZmVhNDc0ZTM1ZmUwMDI5MTZjNmM1OTM0YjUzMmM5NzZkYmE4
+    MGM4ZWUwYjgwNjVhMjk5NzgyZDgwYTRkOGJlMmJjYmZjNjRmNzc=

data/app/assets/javascripts/caboose/modal_integration.js

@@ -42,18 +42,15 @@ CabooseModal.prototype = {
 };
 
 $(document).ready(function() {
-  caboose_modal('caboose_login');
-  caboose_modal('caboose_register');
-  caboose_modal('caboose_station');  
-  //$('#caboose_login'    ).colorbox({ iframe: true, initialWidth: 400, initialHeight: 200, innerWidth: 400, innerHeight: 200, scrolling: false, transition: 'fade', closeButton: false, onComplete: fix_colorbox, opacity: 0.50 });
-  //$('#caboose_register' ).colorbox({ iframe: true, initialWidth: 400, initialHeight: 324, innerWidth: 400, innerHeight: 324, scrolling: false, transition: 'fade', closeButton: false, onComplete: fix_colorbox, opacity: 0.50 });
-  //$('#caboose_station'  ).colorbox({ iframe: true, initialWidth: 200, initialHeight: 50,  innerWidth: 200, innerHeight:  50, scrolling: false, transition: 'fade', closeButton: false, onComplete: fix_colorbox, opacity: 0.50 });
-  $('a.caboose_modal').each(function(i, a) { caboose_modal(a); });  
+  //caboose_modal('caboose_login');
+  //caboose_modal('caboose_register');
+  //caboose_modal('caboose_station');    
+  $('a.caboose_modal').each(function(i, a) { caboose_modal($(a)); });  
 });
 
 function caboose_modal(el)
 {
-  $(typeof(el) == 'String' ? '#'+el : el).colorbox({ 
+  var options = { 
     iframe: true, 
     initialWidth: 400, 
     initialHeight: 200, 
@@ -64,7 +61,11 @@ function caboose_modal(el)
     closeButton: false, 
     onComplete: caboose_fix_colorbox, 
     opacity: 0.50 
-  });  
+  };  
+  if (typeof(el) == 'string')
+    $('#'+el).colorbox(options);
+  else
+    el.colorbox(options);  
 }
 
 function caboose_modal_url(url)

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

@@ -1,7 +1,7 @@
 <%
 if (@user.nil? || @user == Caboose::User.logged_out_user)
-%><a href='/login?return_url=<%= request.fullpath %>' id='caboose_login'><span>Login</span></a><%
+%><a href='/login?return_url=<%= request.fullpath %>' id='caboose_login' class='caboose_modal'><span>Login</span></a><%
 else
-%><a href='/station?page_id=<%= @page.id %>' id='caboose_station'><span>Control Panel</span></a><%
+%><a href='/station?page_id=<%= @page.id %>' id='caboose_station' class='caboose_modal'><span>Control Panel</span></a><%
 end 
 %>

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

@@ -16,7 +16,7 @@
     <div class='caboose_logo'></div>
     <ul>
       <li class='back'    ><a href='/'><span><< Back to Site</span></a></li>
-      <li class='cpanel'  ><a href='/station' id='caboose_station'><span>Menu</span></a></li>
+      <li class='cpanel'  ><a href='/station' id='caboose_station' class='caboose_modal'><span>Menu</span></a></li>
     </ul>
   </div>
 </div>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.25'
+  VERSION = '0.3.26'
 end

metadata

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