caboose-cms 0.2.83 → 0.2.84

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWIxMDY1OTNjNWQ5NDIxMjRkMDRhYmE4ZWY3NzQwYTJjOTZjYWJlNw==
+    NTZiMjFhZjc3NmE2NmRhMjQ4NTMxZDJiNzM5MDdiZDg5MzZkOTU5Mg==
   data.tar.gz: !binary |-
-    MzExZGNkNTU4NmE1ZDAzNDBiZWNkMTFmZjU2NzUwY2I2NWUwZjA3Yg==
+    YmFiMGViZmU4M2I4Y2Y4MTlkNjFjMWViYmU0NzY4MTdjZjBlMzc1Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTIyYTI3NGExMDZjMjc2NWJjNmY1YTNmMTA3YWQzMDFiN2VlY2Q1MGU5OWMw
-    YzZhYTI1MzE1NzExZWRjMWY2MWMwZjExYjU3OWQzMTEyNTU0NTg0NTA2MmIy
-    MzUzNmY2NTUwMDhhMmMxNWM5NjJlNjk3NTQ4Nzc5ODVjNzZkMGE=
+    MDg1ODFkZTFkZTRmNTYxYWQ2YWU2Y2YwYjE4NjJkMmY5NDU5NjE2ZDc1Njcw
+    MjFjNWE5ZmI5M2M0ZjlhNDNlYTcyNmRkODk1MzM2ZDRlYTJhNDllNzY2YmZi
+    ZDg3OWY3NjU3ZWFlN2I0YmIzY2RhMTI3Y2U3NzlmNjRjZTAzZTI=
   data.tar.gz: !binary |-
-    MzUyYTM2OGNiNDdkMTdlNDUyYTE2NzhjNzQ0YTg0MTk2ZWY5YmIzYTJlZWQ1
-    NGQ4OWQ3YWRhMjc3YTI0MWU3ODY0NWUxNzhlYmMwZDM3NGQ4ZDhkZjNjOGFk
-    MTdiZjQxYzM5Y2I0NDgxMWY3YzJiMTVkNjdkMWYwMGY4ZDFiYmE=
+    MjhhYzZkYTVkNDRlNmJhN2U1MWQ4ODdlMGY2YjBhNmVmZGFmOTJmMWFkNzI3
+    M2VmYjdlN2RhZWM1MDQwZGZhM2I5MTQ2ZTExNjQ4YzM4ZWJkM2M5ZTgwOTY2
+    NDk5NWM1MDEzNjZiNzI1OGU2YzlmMmQyNWZmYWJiMTRlY2ZlNjI=

data/app/controllers/caboose/users_controller.rb

@@ -15,6 +15,7 @@ module Caboose
     def my_account
       return if !logged_in?
       @user = logged_in_user
+      render :layout => 'caboose/modal'
     end
     
     # PUT /my-account

data/app/views/caboose/users/my_account.html.erb

@@ -1,18 +1,19 @@
 
 <h1>My Account</h1>
-<div id='first_name' id='first_name' placeholder='First name' />
-<div id='last_name'  id='last_name'  placeholder='Last name' />
-<div id='email'      id='email'      placeholder='Email address' />
-<div id='phone'      id='phone'      placeholder='Phone number' />
+<p><div id='user_<%= @user.id %>_first_name' ></div></p>
+<p><div id='user_<%= @user.id %>_last_name'  ></div></p>
+<p><div id='user_<%= @user.id %>_email'      ></div></p>
+<p><div id='user_<%= @user.id %>_phone'      ></div></p>
 <div id='message'></div>
 <p><input type='button' id='btn_cancel'   value='Close' onclick="parent.$.fn.colorbox.close();" /></p>
 
 <% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
 <script type='text/javascript'>
 
 var modal = false;
 $(window).load(function() {  
-  modal = new CabooseModal(500);
+  modal = new CabooseModal(450);
 });
 
 $(document).ready(function() {
@@ -22,10 +23,10 @@ $(document).ready(function() {
     update_url: '/my-account',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'first_name' , nice_name: 'First name'   , type: 'text', value: <%= raw Caboose.json(@user.first_name) %>, width: 280 },
-      { name: 'last_name'  , nice_name: 'Last name'    , type: 'text', value: <%= raw Caboose.json(@user.last_name)  %>, width: 280 },      
-      { name: 'email'      , nice_name: 'Email'        , type: 'text', value: <%= raw Caboose.json(@user.email)      %>, width: 280 },
-      { name: 'phone'      , nice_name: 'Phone Number' , type: 'text', value: <%= raw Caboose.json(@user.phone)      %>, width: 280 }
+      { name: 'first_name' , nice_name: 'First name'   , type: 'text', value: <%= raw Caboose.json(@user.first_name) %>, width: 400 },
+      { name: 'last_name'  , nice_name: 'Last name'    , type: 'text', value: <%= raw Caboose.json(@user.last_name)  %>, width: 400 },      
+      { name: 'email'      , nice_name: 'Email'        , type: 'text', value: <%= raw Caboose.json(@user.email)      %>, width: 400 },
+      { name: 'phone'      , nice_name: 'Phone Number' , type: 'text', value: <%= raw Caboose.json(@user.phone)      %>, width: 400 }
     ],
     on_load: function() { modal.autosize(); }
   });  

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.83'
+  VERSION = '0.2.84'
 end

metadata

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