caboose-cms 0.9.100 → 0.9.101

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1679adede6e539a9e7e39e9c3c339a6eb536a25c
-  data.tar.gz: 75b38ec8f5e7ae4f8453b0c4e76f3f266c17c36a
+  metadata.gz: 23ad7f7c31b8ca09193936375beee638295eb7ee
+  data.tar.gz: 78ff33fabda4ec92797cb7b87ed1d8b5747e21ac
 SHA512:
-  metadata.gz: d7de69fa6d419f72f8d2611efc426f530eee6dd6817fe74b5ef5e420f1661448689426ddce4f4864524fa75f3e9aeded294a2b893a30d3dc3cdc7e9fd95d8929
-  data.tar.gz: b22afc388a84540611f3c4cf5a9ddde26babb33d51ebb7231c329fa89ea95432128f89039926f09c05b5105d68b3a0d9de720031dd43d48dd4583ced6be29a49
+  metadata.gz: a31de878a90a6839514b8151c89410ed86d0cc806576a2f2a70f9a06ec825c03a82732a00e08e3268dd367e1acb981c19075ac17017404fd49c2012544d55e23
+  data.tar.gz: fc2a0f77cc0d3c5759a8f899ad4d808e20420c33bdf40ef94497cdd17fca5fb4e77fc2a9588956f5ebfd8efe7970dc7ccb584a841a8b1e7cb1bb168378fa023a

data/app/assets/stylesheets/caboose/admin_main.css

@@ -337,14 +337,20 @@ select.fake option {
   width: 20px;
 }
 
+#new_form p input[type="text"] {
+  padding: 2px 4px 0 8px;
+}
+
 #content .note .label_with_checkbox input[type="checkbox"] {
   position: relative;
-  top: 4px;
+  top: 5px;
   margin-right: 5px;
   height: 20px;
 }
 .note .label_with_checkbox label {
-  font-size: 15px;
+  font-weight: 400;
+  font-size: 14px;
+  cursor: pointer;
 }
 
 #content .search_form {
@@ -543,11 +549,12 @@ Page Bar Generator
 #tabs a {
   display: block;
   margin: 0;
-  padding: 16px 12px 12px 12px;
+  padding: 13px 12px 12px 12px;
   text-decoration: none;
   background: #efefef;
   border-bottom: #ccc 1px solid;
   color: #000;
+  font-size: 15px;
 }
 #tabs a:hover {
   background: #666;

data/app/assets/stylesheets/caboose/application.css

@@ -11,7 +11,6 @@
  *= require colorbox-rails 
  *= require caboose/fonts
  *= require caboose/page_bar_generator
- *= require caboose/caboose
  *= require caboose/model_binder  
  */
 

data/app/assets/stylesheets/caboose/caboose.css

@@ -1,6 +1,6 @@
 
 body {
-  font-family: Helvetica, Tahoma, Arial;  
+  font-family: 'Roboto', Tahoma, Arial;  
 }
 
 input[type='text'].placeholder_js {

data/app/assets/stylesheets/caboose/model_binder.css

@@ -1,6 +1,6 @@
 /*    
- *= require caboose/spectrum 
- */
+require caboose/spectrum 
+*/
  
 .mb_container {
   width: 100%;

data/app/assets/stylesheets/caboose/my_account.scss

@@ -1,6 +1,6 @@
-@import url('https://fonts.googleapis.com/css?family=Open+Sans');
+@import url('https://fonts.googleapis.com/css?family=Roboto:400');
 
-$font-card:          	normal 1em "Open Sans", sans-serif;
+$font-card:          	400 15px "Roboto", sans-serif;
 $color-main: 					#5f5f5f;
 $color-light: 				#ececec;
 
@@ -91,13 +91,6 @@ $color-light: 				#ececec;
 							text-decoration: none;
 						}
 					}
-					.mb_placeholder {
-						top: 7px;
-						left: 7px;
-						span {
-							font-size: 16px;
-						}
-					}
 				}
 			}
 			.buttons {
@@ -160,11 +153,12 @@ $color-light: 				#ececec;
 			display: block;
 			width: 100% !important;
 			font: $font-card;
-			line-height: 1em;
-			padding: 6px 6px 6px 6px;
+			line-height: 20px;
+			padding: 7px 6px 6px 6px;
 			border: 1px solid #dadada;
 			border-radius: 3px;
 			color: #2d2d2d;
+			height: 36px;
 			&.placeholder_js {
 				color: #adadad;
 			}

data/app/controllers/caboose/my_account_controller.rb

@@ -19,8 +19,24 @@ module Caboose
         case name
     	  	when "first_name" then user.first_name  = value
     	  	when "last_name"  then user.last_name   = value
-    	  	when "username"   then user.username    = value
-    	  	when "email"      then user.email       = value
+    	  	when "username"
+            uname = value.strip.downcase
+            if uname.length < 3
+              resp.error = "Username must be at least three characters."
+            elsif Caboose::User.where(:username => uname, :site_id => @site.id).where('id != ?',user.id).exists?
+              resp.error = "That username is already taken."
+            else
+              user.username    = uname
+            end
+    	  	when "email"
+            email = value.strip.downcase
+            if !email.include?('@')
+              resp.error = "Invalid email address."
+            elsif Caboose::User.where(:email => email, :site_id => @site.id).where('id != ?',user.id).exists?
+              resp.error = "That email address is already in the system."
+            else
+              user.email    = email
+            end
     	  	when "phone"      then user.phone       = value
     	  	when "password"			  
     	  	  confirm = params[:confirm]

data/app/controllers/caboose/users_controller.rb

@@ -221,8 +221,24 @@ module Caboose
           when 'site_id'              then user.site_id             = value
           when 'first_name'           then user.first_name          = value     
           when 'last_name'            then user.last_name           = value 
-          when 'username'             then user.username            = value 
-          when 'email'                then user.email               = value         
+          when "username"
+            uname = value.strip.downcase
+            if uname.length < 3
+              resp.error = "Username must be at least three characters."
+            elsif Caboose::User.where(:username => uname, :site_id => @site.id).where('id != ?',user.id).exists?
+              resp.error = "That username is already taken."
+            else
+              user.username    = uname
+            end
+          when "email"
+            email = value.strip.downcase
+            if !email.include?('@')
+              resp.error = "Invalid email address."
+            elsif Caboose::User.where(:email => email, :site_id => @site.id).where('id != ?',user.id).exists?
+              resp.error = "That email address is already in the system."
+            else
+              user.email    = email
+            end
           when 'address'              then user.address             = value
           when 'address2'             then user.address2            = value
           when 'city'                 then user.city                = value

data/app/models/caboose/user.rb

@@ -131,7 +131,7 @@ class Caboose::User < ActiveRecord::Base
     if value.to_i > 0 # Add to role                   
       if role_id == 'all'
         Caboose::RoleMembership.where(:user_id => self.id).destroy_all      
-        Caboose::Role.where(:site_id => self.site_id).reorder(:name).all.each{ |r| RoleMembership.create(:user_id => self.id, :role_id => r.id) }                          
+        Caboose::Role.where(:site_id => self.site_id).reorder(:name).all.each{ |r| Caboose::RoleMembership.create(:user_id => self.id, :role_id => r.id) }                          
       else
         if !Caboose::RoleMembership.where(:user_id => self.id, :role_id => role_id.to_i).exists?
           Caboose::RoleMembership.create( :user_id => self.id, :role_id => role_id.to_i)

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

@@ -11,6 +11,7 @@ u = @logged_in_user
         <h4 class="title">Account Information</h4>
         <div class="input-holder"><div id='user_<%= @user.id %>_first_name' ></div></div>
         <div class="input-holder"><div id='user_<%= @user.id %>_last_name'  ></div></div>
+        <div class="input-holder"><div id='user_<%= @user.id %>_username'  ></div></div>
         <div class="input-holder"><div id='user_<%= @user.id %>_email'      ></div></div>
         <div class="input-holder"><div id='user_<%= @user.id %>_phone'      ></div></div>
         <div id='message2'></div>
@@ -87,7 +88,8 @@ $(document).ready(function() {
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
       { 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: 'last_name'  , nice_name: 'Last name'    , type: 'text', value: <%= raw Caboose.json(@user.last_name)  %>, width: 400 },  
+      { name: 'username'  , nice_name: 'Username'    , type: 'text', value: <%= raw Caboose.json(@user.username)  %>, 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 }
     ],

data/app/views/caboose/pages/admin_edit_css.html.erb

@@ -8,6 +8,17 @@
 <p><div id='page_<%= @page.id %>_custom_css'></div></p>
 
 <%= render :partial => 'caboose/pages/admin_footer' %>
+
+<% content_for :caboose_js do %>
+<style>
+  textarea {
+    font-family: monospace;
+    font-size: 14px;
+    line-height: 22px;
+    padding: 5px 15px !important;
+  }
+</style>
+<% end %>
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
 
@@ -30,4 +41,4 @@ $(document).ready(function() {
 });
 
 </script>
-<% end %>
+<% end %>

data/app/views/caboose/pages/admin_edit_js.html.erb

@@ -8,6 +8,18 @@
 <p><div id='page_<%= @page.id %>_custom_js'></div></p>
 
 <%= render :partial => 'caboose/pages/admin_footer' %>
+
+<% content_for :caboose_js do %>
+<style>
+  textarea {
+    font-family: monospace;
+    font-size: 14px;
+    line-height: 22px;
+    padding: 5px 15px !important;
+  }
+</style>
+<% end %>
+
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
 

data/app/views/caboose/pages/admin_edit_seo.html.erb

@@ -26,10 +26,10 @@ $(document).ready(function() {
       { name: 'seo_title'         , nice_name: 'SEO Title'            , type: 'text'      , value: <%= raw Caboose.json(@page.seo_title)        %>, width: 580 },        
       { name: 'meta_robots'       , nice_name: 'Meta Robots'          , type: 'text'      , value: <%= raw Caboose.json(@page.meta_robots)      %>, width: 580 },
       { name: 'canonical_url'     , nice_name: 'Canonical URL'        , type: 'text'      , value: <%= raw Caboose.json(@page.canonical_url)    %>, width: 580 },
-      { name: 'meta_keywords'     , nice_name: 'Meta Keywords'        , type: 'textarea'  , value: <%= raw Caboose.json(@page.meta_keywords)    %>, width: 580, height: 80 },
-      { name: 'meta_description'  , nice_name: 'Meta Description'     , type: 'textarea'  , value: <%= raw Caboose.json(@page.meta_description) %>, width: 580, height: 80 },
-      { name: 'fb_description'    , nice_name: 'Facebook Description' , type: 'textarea'  , value: <%= raw Caboose.json(@page.fb_description)   %>, width: 580, height: 80 },
-      { name: 'gp_description'    , nice_name: 'Google+ Description'  , type: 'textarea'  , value: <%= raw Caboose.json(@page.gp_description)   %>, width: 580, height: 80 }
+      { name: 'meta_keywords'     , nice_name: 'Meta Keywords'        , type: 'textarea'  , value: <%= raw Caboose.json(@page.meta_keywords)    %>, width: 580, height: 150 },
+      { name: 'meta_description'  , nice_name: 'Meta Description'     , type: 'textarea'  , value: <%= raw Caboose.json(@page.meta_description) %>, width: 580, height: 150 },
+      { name: 'fb_description'    , nice_name: 'Facebook Description' , type: 'textarea'  , value: <%= raw Caboose.json(@page.fb_description)   %>, width: 580, height: 150 },
+      { name: 'gp_description'    , nice_name: 'Google+ Description'  , type: 'textarea'  , value: <%= raw Caboose.json(@page.gp_description)   %>, width: 580, height: 150 }
     ],
     on_load: function() {      
       $('#page_<%= @page.id %>_meta_description').keyup(function() {

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

@@ -9,15 +9,16 @@
 <%
 tabs = {                             
   'General'         => "/admin/users/#{@edituser.id}",
-  'Invoices'        => "/admin/users/#{@edituser.id}/invoices",
   'Login Logs'      => "/admin/login-logs?user_id=#{@edituser.id}",
   'Password'        => "/admin/users/#{@edituser.id}/password",
   'Roles'           => "/admin/users/#{@edituser.id}/roles",
   'Delete'          => "/admin/users/#{@edituser.id}/delete"  
 }
-if @site.use_store
+if @site.use_store || @site.is_master
 	arr = tabs.to_a.insert(1, ['Payment Method', "/admin/users/#{@edituser.id}/payment-method"])
 	tabs = Hash[arr]
+  arr = tabs.to_a.insert(2, ['Invoices', "/admin/users/#{@edituser.id}/invoices"])
+  tabs = Hash[arr]
 	arr = tabs.to_a.insert(5, ['Variant Limits', "/admin/users/#{@edituser.id}/variant-limits"])
   tabs = Hash[arr]
 end

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

@@ -5,12 +5,19 @@ pic = "http://gravatar.com/avatar/#{gravatar_id}.png?s=150" #&d=/assets/caboose/
 
 <%= render :partial => 'caboose/users/admin_header' %>
 
-<p id='gravatar'><img src='<%= pic %>' /><a href='http://gravatar.com'>Update on gravatar</a></p>
-<p><div id='user_<%= @edituser.id %>_first_name' ></div></p>
-<p><div id='user_<%= @edituser.id %>_last_name'  ></div></p>
-<p><div id='user_<%= @edituser.id %>_username'   ></div></p>
-<p><div id='user_<%= @edituser.id %>_email'      ></div></p>
-<p><div id='user_<%= @edituser.id %>_locked'     ></div></p>
+<div class="user-details-wrapper clearfix">
+  <div class="gravatar-holder">
+    <p id='gravatar'><img src='<%= pic %>' /><a href='http://gravatar.com'>Update on gravatar</a></p>
+  </div>
+  <div class="mb-holder">
+    <p><div id='user_<%= @edituser.id %>_first_name' ></div></p>
+    <p><div id='user_<%= @edituser.id %>_last_name'  ></div></p>
+    <p><div id='user_<%= @edituser.id %>_username'   ></div></p>
+    <p><div id='user_<%= @edituser.id %>_email'      ></div></p>
+    <p><div id='user_<%= @edituser.id %>_locked'     ></div></p>
+  </div>
+</div>
+
 
 <%= render :partial => 'caboose/users/admin_footer' %>
 
@@ -18,6 +25,18 @@ pic = "http://gravatar.com/avatar/#{gravatar_id}.png?s=150" #&d=/assets/caboose/
 <style type='text/css'>
 #content input[type=checkbox] { position: relative; }
 #roles { height: 200px; overflow-y: scroll; margin-bottom: 20px; }
+.user-details-wrapper .gravatar-holder {
+  width: 25%;
+  float: right;
+}
+.user-details-wrapper .mb-holder {
+  width: 72%;
+  float: left;
+  padding-right: 2%;
+}
+#content2 {
+  max-width: 800px;
+}
 </style>
 <% end %>
 <% content_for :caboose_js do %>
@@ -31,11 +50,11 @@ $(document).ready(function() {
     update_url: '/admin/users/<%= @edituser.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'first_name' , nice_name: 'First name', type: 'text'     , value: <%= raw Caboose.json(@edituser.first_name) %>, width: 280 },
-      { name: 'last_name'  , nice_name: 'Last name' , type: 'text'     , value: <%= raw Caboose.json(@edituser.last_name)  %>, width: 280 },
-      { name: 'username'   , nice_name: 'Username'  , type: 'text'     , value: <%= raw Caboose.json(@edituser.username)   %>, width: 280 },
-      { name: 'email'      , nice_name: 'Email'     , type: 'text'     , value: <%= raw Caboose.json(@edituser.email)      %>, width: 280 },
-      { name: 'locked'     , nice_name: 'Locked'    , type: 'checkbox' , value: <%= @edituser.locked ? 1 : 0               %>, width: 280 }
+      { name: 'first_name' , nice_name: 'First name', type: 'text'     , value: <%= raw Caboose.json(@edituser.first_name) %>, width: 350 },
+      { name: 'last_name'  , nice_name: 'Last name' , type: 'text'     , value: <%= raw Caboose.json(@edituser.last_name)  %>, width: 350 },
+      { name: 'username'   , nice_name: 'Username'  , type: 'text'     , value: <%= raw Caboose.json(@edituser.username)   %>, width: 350 },
+      { name: 'email'      , nice_name: 'Email'     , type: 'text'     , value: <%= raw Caboose.json(@edituser.email)      %>, width: 350 },
+      { name: 'locked'     , nice_name: 'Locked'    , type: 'checkbox' , value: <%= @edituser.locked ? 1 : 0               %>, width: 350 }
     ]    
   });  
 });

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

@@ -40,8 +40,13 @@ $(document).ready(function() {
   });        
 });
 
-function get_role_ids(u)   { return $(u.roles).map(function(i, r) { return r.id   }).get(); }
-function get_role_names(u) { return $(u.roles).map(function(i, r) { return r.name }).get(); }
+function get_role_ids(u)   { console.dir(u.roles); return $(u.roles).map(function(i, r) { return r.id   }).get(); }
+function get_role_names(u) { 
+  seen_roles = [];
+  role_names = [];
+  $(u.roles).map(function(i, r) { if (seen_roles.indexOf(r.id) >= 0) { } else { role_names.push(r.name); seen_roles.push(r.id); } }); 
+  return role_names.join(', ');
+}
 
 </script>
 <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.100'
+  VERSION = '0.9.101'
 end

metadata

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