caboose-cms 0.2.82 → 0.2.83

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWM0ZmFmZGFhOTliYTE5OWU0YmVmZjJjZmExODYwNGZlMTQwNDRjZQ==
+    MWIxMDY1OTNjNWQ5NDIxMjRkMDRhYmE4ZWY3NzQwYTJjOTZjYWJlNw==
   data.tar.gz: !binary |-
-    NTFhOTk1MDgyODE2NTM0MzgwODNmOTA4YjBiN2NjYWY0OWRmMDgwMQ==
+    MzExZGNkNTU4NmE1ZDAzNDBiZWNkMTFmZjU2NzUwY2I2NWUwZjA3Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDA5YTE1Nzc3MTFkMWViOTU5M2YzZDkyZTNlOWZhOWFkZTE2ZjBhYTllM2M3
-    NWY1NjQ3NTNkNGVkOWIyMWZmN2IxMjdmMjMwM2FlNjg0YjcxMjhlOTBmZTMx
-    ZWU1MDc5ZDE5MGNiMWY2MDcyNjMwMDNmOWVmZmNmYzgyNzE4YmE=
+    NTIyYTI3NGExMDZjMjc2NWJjNmY1YTNmMTA3YWQzMDFiN2VlY2Q1MGU5OWMw
+    YzZhYTI1MzE1NzExZWRjMWY2MWMwZjExYjU3OWQzMTEyNTU0NTg0NTA2MmIy
+    MzUzNmY2NTUwMDhhMmMxNWM5NjJlNjk3NTQ4Nzc5ODVjNzZkMGE=
   data.tar.gz: !binary |-
-    MzdhZjdjYjFhMWU2YTM3ZGQzYjI3NjMxYmVhM2Y5MGY0ZjU2NjIxNDI3OTcz
-    MGZlZGNhNTM1MmYxMTgwZDQ3MjYxNGEwNGVlZmViMTQ1ODVlZjM0ZDAzYjc3
-    Y2FlNDBkYWIxNGY5MjJlMjg4YmQyYjEyMzMxOWYwNDQxNDM0ODc=
+    MzUyYTM2OGNiNDdkMTdlNDUyYTE2NzhjNzQ0YTg0MTk2ZWY5YmIzYTJlZWQ1
+    NGQ4OWQ3YWRhMjc3YTI0MWU3ODY0NWUxNzhlYmMwZDM3NGQ4ZDhkZjNjOGFk
+    MTdiZjQxYzM5Y2I0NDgxMWY3YzJiMTVkNjdkMWYwMGY4ZDFiYmE=

data/app/controllers/caboose/users_controller.rb

@@ -7,6 +7,50 @@ module Caboose
       @page = Page.page_with_uri('/admin')
     end
     
+    #===========================================================================
+    # Non-admin actions
+    #===========================================================================
+    
+    # GET /my-account
+    def my_account
+      return if !logged_in?
+      @user = logged_in_user
+    end
+    
+    # PUT /my-account
+    def update_my_account  
+      return if !logged_in?
+      
+      resp = StdClass.new     
+      user = logged_in_user
+    
+      save = true
+      params.each do |name,value|
+        case name
+    	  	when "first_name", "last_name", "username", "email", "phone"
+    	  	  user[name.to_sym] = value
+    	  	when "password"			  
+    	  	  confirm = params[:confirm]
+    	  		if (value != confirm)			
+    	  		  resp.error = "Passwords do not match.";
+    	  		  save = false
+    	  		elsif (value.length < 8)
+    	  		  resp.error = "Passwords must be at least 8 characters.";
+    	  		  save = false
+    	  		else
+    	  		  user.password = Digest::SHA1.hexdigest(Caboose::salt + value)
+    	  		end    	  	    		  
+    	  end
+    	end
+    	
+    	resp.success = save && user.save
+    	render json: resp
+    end
+  
+    #===========================================================================
+    # Admin actions
+    #===========================================================================
+    
     # GET /admin/users
     def index
       return if !user_is_allowed('users', 'view')

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

@@ -0,0 +1,38 @@
+
+<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' />
+<div id='message'></div>
+<p><input type='button' id='btn_cancel'   value='Close' onclick="parent.$.fn.colorbox.close();" /></p>
+
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {  
+  modal = new CabooseModal(500);
+});
+
+$(document).ready(function() {
+  new ModelBinder({
+    name: 'User',
+    id: <%= @user.id %>,
+    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 }
+    ],
+    on_load: function() { modal.autosize(); }
+  });  
+});
+
+</script>
+<% end %>
+<%= content_for :caboose_css do %>
+<%= stylesheet_link_tag "caboose/my-account", :media => "all" %>
+<% end %>

data/config/routes.rb

@@ -11,6 +11,9 @@ Caboose::Engine.routes.draw do
   get     "register"              => "register#index"
   post    "register"              => "register#register"
 
+  get     "my-account"                      => "users#my_account"
+  put     "my-account"                      => "users#update_my_account"
+  
   get     "admin/users"                     => "users#index"
   get     "admin/users/options"             => "users#options"
   get     "admin/users/new"                 => "users#new"

data/lib/caboose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.82
+  version: 0.2.83
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -239,6 +239,7 @@ files:
 - app/views/caboose/users/edit.html.erb
 - app/views/caboose/users/edit_password.html.erb
 - app/views/caboose/users/index.html.erb
+- app/views/caboose/users/my_account.html.erb
 - app/views/caboose/users/new.html.erb
 - app/views/caboose/users/update_pic.html.erb
 - app/views/layouts/caboose/_content.html.erb