caboose-cms 0.7.62 → 0.7.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c272bf371f2238c10f223ed9646be6b720abc489
-  data.tar.gz: fc2f1856b64f891dd3276a518bc40e3ce657605e
+  metadata.gz: be2e150242b80d282f05be0a3e8c1905cf47ee9e
+  data.tar.gz: e255ca6c97cb05fe1ee2d1e90726ef52dbf85cec
 SHA512:
-  metadata.gz: de227bf0058a89347d1cfa7a500f0f418097087d60517e751f25b16da3865c3c707ad3ebe284d8472e0adea868e37082458a6271189b41b20db65bbaa1f80635
-  data.tar.gz: 2008b41b44cf266719f907e071402b4b10f42f5ffe6679b34af3081f74408e1d096425bb6d9879b47ac770e62ec3c1e72d85c77b39a3012b449cf5a3aae03155
+  metadata.gz: ffde0cf22e24ae832fdb9d1b0a245df0f2ba9b1f31038a06d0704fbca7636cdb139accfeb331abce2ec8a377462d8f42dc34d433893643cd8e558db90a4cd76d
+  data.tar.gz: 830f370a0f3c92b32c585168e323126842538336271e7e36549256f48ac27bc29eda5a61f45f8dbd892f0a7e5934b6f4d659757cdae4febfc8e45bd971f74a25

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

@@ -63,7 +63,7 @@ MediaController.prototype = {
 		    	key: that.cat_id + '_${filename}', // use filename as a key
 		    	Filename: that.cat_id + '_${filename}', // adding this to keep consistency across the runtimes
 		    	acl: 'public-read',
-		    	//'Content-Type': 'image/jpeg',
+          'Content-Type': '',
 		    	AWSAccessKeyId: that.aws_access_key_id,		
 		    	policy: that.policy,
 		    	signature: that.signature
@@ -77,6 +77,7 @@ MediaController.prototype = {
 		    silverlight_xap_url: '../../js/Moxie.xap', // Silverlight settings
         init: {
           BeforeUpload: function(up, file) {        
+            up.settings.multipart_params["Content-Type"] = file.type;
             $.ajax({
               url: '/admin/media/pre-upload',
               type: 'post',

data/app/assets/javascripts/caboose/model/bound_checkbox_multiple.js

@@ -126,8 +126,7 @@ BoundCheckboxMultiple = BoundControl.extend({
 
     var data = {};
     data[this.attribute.name] = [value,(checked ? 1 : 0)];
-    
-    
+        
     $.ajax({
       url: this.attribute.update_url,
       type: 'put',
@@ -139,10 +138,10 @@ BoundCheckboxMultiple = BoundControl.extend({
 				    for (var thing in resp.attributes[that.attribute.name])
 				      that.attribute[thing] = resp.attributes[that.attribute.name][thing];				  
 				  that.attribute.value_clean = that.attribute.value;
-				  
-				  b.active_control = that;
-				  if (this2.binder.success)
-				    this2.binder.success(that);				  
+				  				  
+				  that.binder.active_control = that;
+				  if (that.binder.success)
+				    that.binder.success(that);				  
 				}								
 				else if (resp.error)
 				  that.error(resp.error);    				

data/app/controllers/caboose/login_controller.rb

@@ -69,12 +69,11 @@ module Caboose
 		  	return
 		  end
 		  
-		  bob = nil
-		  bob = Caboose::User.where(:username => username).first if Caboose::User.where(:username => username).exists?
-		  bob = Caboose::User.where(:email => username).first if bob.nil? && bob = Caboose::User.where(:email => username)
+		  bob = Caboose::User.where(:site_id => @site.id, :username => username).first
+		  bob = Caboose::User.where(:site_id => @site.id, :email    => username).first if bob.nil?		  
 		  
 		  if bob.nil?		
-			  resp.error = "The given username is not in our system."
+			  resp.error = "The given email or username is not in our system."
 			  render :json => resp
 			  return
 			end

data/app/controllers/caboose/media_controller.rb

@@ -24,7 +24,7 @@ module Caboose
           { "bucket" => bucket },          
           { "acl" => "public-read" },
           [ "starts-with", "$key", '' ],
-          #[ "starts-with", "$Content-Type", 'image/' ],          
+          [ "starts-with", "$Content-Type", "" ],
           [ 'starts-with', '$name', '' ], 	
           [ 'starts-with', '$Filename', '' ],          
         ]

data/app/controllers/caboose/register_controller.rb

@@ -16,8 +16,10 @@ module Caboose
       resp = StdClass.new('error' => '', 'redirect' => '')
       return_url = params[:return_url].nil? ? "/" : params[:return_url];
       
-      if (logged_in?)
+      if logged_in?
         resp.error = "Already logged in"
+      elsif !@site.allow_self_registration
+        resp.error = "This site doesn't allow self registration."
       else
         
         first_name  = params[:first_name]

data/app/controllers/caboose/sites_controller.rb

@@ -135,6 +135,7 @@ module Caboose
           when 'custom_css'               then site.custom_css              = value            
           when 'custom_js'                then site.custom_js               = value
           when 'default_layout_id'        then site.default_layout_id       = value
+          when 'allow_self_registration'  then site.allow_self_registration = value
     	  end
     	end
     	

data/app/controllers/caboose/users_controller.rb

@@ -19,10 +19,15 @@ module Caboose
     #===========================================================================
     
     # GET /admin/users
-    def index
+    def admin_index
+      return if !user_is_allowed('users', 'view')            
+    end
+    
+    # GET /admin/users/json
+    def admin_json
       return if !user_is_allowed('users', 'view')
       
-      @gen = PageBarGenerator.new(params, {
+      pager = PageBarGenerator.new(params, {
           'site_id'         => @site.id,
     		  'first_name_like' => '',
     		  'last_name_like'	=> '',
@@ -34,32 +39,42 @@ module Caboose
     		  'desc'			     => false,
     		  'base_url'		   => '/admin/users',
     		  'use_url_params' => false
-    	})
-    	@users = @gen.items
+    	})    	    	      
+    	render :json => {
+    	  :pages => pager,
+    	  :models => pager.items.as_json(:include => :roles)    	  
+    	}
+    end
+        
+    # GET /admin/users/:id/json
+    def admin_json_single
+      return if !user_is_allowed('users', 'view')    
+      u = User.find(params[:id])      
+      render :json => u.as_json(:include => :roles)
     end
     
     # GET /admin/users/new
-    def new
+    def admin_new
       return if !user_is_allowed('users', 'add')
       @newuser = User.new
     end
     
-    # GET /admin/users/1/edit
-    def edit
+    # GET /admin/users/:id
+    def admin_edit
       return if !user_is_allowed('users', 'edit')
       @edituser = User.find(params[:id])    
       @all_roles = Role.tree(@site.id)
       @roles = Role.roles_with_user(@edituser.id)
     end
     
-    # GET /admin/users/1/edit-password
-    def edit_password
+    # GET /admin/users/:id/edit-password
+    def admin_edit_password
       return if !user_is_allowed('users', 'edit')
       @edituser = User.find(params[:id])
     end
     
     # GET /admin/users/import
-    def import_form
+    def admin_import_form
       return if !user_is_allowed('users', 'edit')      
     end
     
@@ -69,7 +84,7 @@ module Caboose
     end
           
     # POST /admin/users/import
-    def import
+    def admin_import
       return if !user_is_allowed('users', 'add')
       
       resp = StdClass.new
@@ -133,7 +148,7 @@ module Caboose
     end
     
     # POST /admin/users
-    def create
+    def admin_add
       return if !user_is_allowed('users', 'add')
       
       resp = StdClass.new({
@@ -147,8 +162,8 @@ module Caboose
       
       if user.email.length == 0
         resp.error = "Please enter a valid email address."
-      elsif User.where(:email => user.email).exists?
-        resp.error = "That email is already in the system."
+      elsif User.where(:site_id => @site.id, :email => user.email).exists?
+        resp.error = "That email is already in the system for this site."
       else
         user.save
         resp.redirect = "/admin/users/#{user.id}"
@@ -157,8 +172,8 @@ module Caboose
       render :json => resp
     end
     
-    # PUT /admin/users/1
-    def update
+    # PUT /admin/users/:id
+    def admin_update
       return if !user_is_allowed('users', 'edit')
 
       resp = StdClass.new     
@@ -192,6 +207,7 @@ module Caboose
     	  		else
     	  		  user.password = Digest::SHA1.hexdigest(Caboose::salt + value)
     	  		end
+    	    when 'role_ids'             then user.toggle_roles(value[0], value[1])
     	  	when "roles"
     	  	  user.roles = [];
     	  	  value.each { |rid| user.roles << Role.find(rid) } unless value.nil?
@@ -203,14 +219,14 @@ module Caboose
     	render json: resp
     end
     
-    # POST /admin/users/1/update-pic
-    def update_pic
+    # POST /admin/users/:id/update-pic
+    def admin_update_pic
       @edituser = User.find(params[:id])
       @new_value = "Testing"
     end
       
-    # DELETE /admin/users/1
-    def destroy
+    # DELETE /admin/users/:id
+    def admin_delete
       return if !user_is_allowed('users', 'delete')
       user = User.find(params[:id])
       user.destroy
@@ -222,7 +238,7 @@ module Caboose
     end
     
     # POST /admin/users/:id/roles/:role_id
-    def add_to_role
+    def admin_add_to_role
       return if !user_is_allowed('users', 'edit')
       if !RoleMembership.where(:user_id => params[:id], :role_id => params[:role_id]).exists?
         RoleMembership.create(:user_id => params[:id], :role_id => params[:role_id])
@@ -231,14 +247,14 @@ module Caboose
     end
     
     # DELETE /admin/users/:id/roles/:role_id
-    def remove_from_role
+    def admin_remove_from_role
       return if !user_is_allowed('users', 'edit')
       RoleMembership.where(:user_id => params[:id], :role_id => params[:role_id]).destroy_all        
       render :json => true
     end
     
     # GET /admin/users/options
-    def options
+    def admin_options
       return if !user_is_allowed('users', 'view')
       @users = User.where(:site_id => @site.id).reorder('last_name, first_name').all
       options = @users.collect { |u| { 'value' => u.id, 'text' => "#{u.first_name} #{u.last_name} (#{u.email})"}}

data/app/mailers/caboose/login_mailer.rb

@@ -3,12 +3,12 @@ module Caboose
 
     def forgot_password_email(user)
       @user = user
-      mail(:to => user.email, :subject => "#{Caboose::website_name} Forgot Password")
+      mail(:to => user.email, :subject => "#{user.site.name.capitalize} Forgot Password")
     end
 
     def locked_account(user)
       @user = user
-      mail(:to => user.email, :subject => "#{Caboose::website_name} Locked Account")
+      mail(:to => user.email, :subject => "#{user.site.name.capitalize} Locked Account")
     end    
 
   end

data/app/models/caboose/page.rb

@@ -337,6 +337,10 @@ class Caboose::Page < ActiveRecord::Base
     return true if pid == parent_id
     return self.is_child(parent_id, pid)
   end
+  
+  def is_child_of?(parent_id)
+    return Caboose::Page.is_child(parent_id, self.id)
+  end
 
   def linked_resources_map
     resources = { js: [], css: [] }
@@ -431,7 +435,7 @@ class Caboose::Page < ActiveRecord::Base
 
     self.block.duplicate_page_block(site_id, p.id, block_type_id)
         
-    if duplicate_children
+    if duplicate_children && !p.is_child_of?(self.id)
       self.children.each do |p2|
         p2.duplicate(site_id, p.id, duplicate_children, child_block_type_id, child_block_type_id)
       end

data/app/models/caboose/schema.rb

@@ -681,6 +681,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :use_fonts               , :boolean     , { :default => true  }],
         [ :logo                    , :attachment ],        
         [ :is_master               , :boolean     , { :default => false }],
+        [ :allow_self_registration , :boolean     , { :default => false }],
         [ :analytics_id            , :string     ],        
         [ :use_retargeting         , :boolean     , { :default => false }],
         [ :date_js_updated         , :datetime   ],

data/app/models/caboose/user.rb

@@ -99,5 +99,24 @@ class Caboose::User < ActiveRecord::Base
     end
     return nil
   end
+  
+  def toggle_roles(role_id, value)            
+    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) }                          
+      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)
+        end      
+      end
+    else # Remove from role    
+      if role_id == 'all'
+        Caboose::RoleMembership.where(:user_id => self.id).destroy_all                          
+      else
+        Caboose::RoleMembership.where(:user_id => self.id, :role_id => role_id.to_i).destroy_all      
+      end
+    end
+  end
 
 end

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

@@ -18,7 +18,7 @@
 	</label>
 	
 	<ul id="login-options">
-		<li><a href="/register?return_url=<%= @return_url %>" class='register'>Need to register?</a></li>
+	  <% if @site.allow_self_registration %><li><a href="/register?return_url=<%= @return_url %>" class='register'>Need to register?</a></li><% end %>
 		<li><a href="/login/forgot-password?return_url=<%= @return_url %>" class='forgot'>Forgot your password?</a></li>
 	</ul>	
 	<div style='clear: both;' id="message"></div>	

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

@@ -1,9 +1,10 @@
 
+<h1>Register</h1>
+
 <form action='/register' method='post' id='register_form'>
 <p class='other_options'>
 <a href='/login?return_url=<%= @return_url %>'>Already a member?</a>
 </p>
-<h1>Register</h1>
 <input type='hidden'    name='return_url' value='<%= @return_url %>' />
 <input type='text'      name='first_name' id='first_name' placeholder='First name' />
 <input type='text'      name='last_name'  id='last_name'  placeholder='Last name' />

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

@@ -13,6 +13,7 @@ user_ids = [] if user_ids.nil?
 <p><div id='site_<%= @site.id %>_under_construction_html' ></div></p>
 <p><div id='site_<%= @site.id %>_use_store'               ></div></p>
 <p><div id='site_<%= @site.id %>_use_fonts'               ></div></p>
+<p><div id='site_<%= @site.id %>_allow_self_registration' ></div></p>
 <p><div id='site_<%= @site.id %>_default_layout_id'       ></div></p>
 
 <h2>Domains</h2>
@@ -71,13 +72,14 @@ $(document).ready(function() {
     update_url: '/admin/sites/<%= @site.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'logo'                    , nice_name: 'Logo'                     , type: 'image'    , value: <%= raw Caboose.json(@site.logo ? @site.logo.url(:thumb) : '') %>, width: 400, update_url: '/admin/sites/<%= @site.id %>/logo' },
-      { name: 'name'                    , nice_name: 'Name'                     , type: 'text'     , value: <%= raw Caboose.json(@site.name)                     %>, width: 400 },
-      { name: 'description'             , nice_name: 'Description'              , type: 'textarea' , value: <%= raw Caboose.json(@site.description)              %>, width: 600, height: 75 },
-      { name: 'under_construction_html' , nice_name: 'Under Construction HTML'  , type: 'textarea' , value: <%= raw Caboose.json(@site.under_construction_html)  %>, width: 600, height: 75 },
-      { name: 'use_store'               , nice_name: 'Enable Store'             , type: 'checkbox' , value: <%= raw Caboose.json(@site.use_store ? true : false) %>, width: 400 },
-      { name: 'use_fonts'               , nice_name: 'Enable Fonts'             , type: 'checkbox' , value: <%= raw Caboose.json(@site.use_fonts ? true : false) %>, width: 400 },
-      { name: 'default_layout_id'       , nice_name: 'Default Layout'           , type: 'select'   , value: <%= raw Caboose.json(@site.default_layout_id)        %>, width: 600, options_url: "/admin/sites/<%= @site.id %>/default-layout-options" }      
+      { name: 'logo'                    , nice_name: 'Logo'                     , type: 'image'    , value: <%= raw Caboose.json(@site.logo ? @site.logo.url(:thumb) : '')     %>, width: 400, update_url: '/admin/sites/<%= @site.id %>/logo' },
+      { name: 'name'                    , nice_name: 'Name'                     , type: 'text'     , value: <%= raw Caboose.json(@site.name)                                   %>, width: 400 },
+      { name: 'description'             , nice_name: 'Description'              , type: 'textarea' , value: <%= raw Caboose.json(@site.description)                            %>, width: 600, height: 75 },
+      { name: 'under_construction_html' , nice_name: 'Under Construction HTML'  , type: 'textarea' , value: <%= raw Caboose.json(@site.under_construction_html)                %>, width: 600, height: 75 },
+      { name: 'use_store'               , nice_name: 'Enable Store'             , type: 'checkbox' , value: <%= raw Caboose.json(@site.use_store               ? true : false) %>, width: 400 },
+      { name: 'use_fonts'               , nice_name: 'Enable Fonts'             , type: 'checkbox' , value: <%= raw Caboose.json(@site.use_fonts               ? true : false) %>, width: 400 },
+      { name: 'allow_self_registration' , nice_name: 'Allow Self Registration'  , type: 'checkbox' , value: <%= raw Caboose.json(@site.allow_self_registration ? true : false) %>, width: 400 },
+      { name: 'default_layout_id'       , nice_name: 'Default Layout'           , type: 'select'   , value: <%= raw Caboose.json(@site.default_layout_id)                      %>, width: 600, options_url: "/admin/sites/<%= @site.id %>/default-layout-options" }      
     ]    
   });       
 });

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

@@ -0,0 +1,41 @@
+
+<h1>Users</h1>
+<div id='users'></div>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/model/all' %>
+<script type='text/javascript'>
+
+$(document).ready(function() {  
+  var that = this;
+  var table = new IndexTable({    
+    form_authenticity_token: '<%= form_authenticity_token %>',
+    container: 'users',
+    base_url: '/admin/users',
+    allow_bulk_edit: true,
+    allow_bulk_delete: true,
+    allow_duplicate: false,
+    allow_advanced_edit: true,
+    fields: [      
+      { show: true  , bulk_edit: true  , name: 'first_name'         , nice_name: 'First name' , sort: 'first_name' , type: 'text'              , value: function(u) { return u.first_name    }, width: 100 },
+      { show: true  , bulk_edit: true  , name: 'last_name'          , nice_name: 'Last name'  , sort: 'last_name'  , type: 'text'              , value: function(u) { return u.last_name     }, width: 100 },
+      { show: true  , bulk_edit: true  , name: 'username'           , nice_name: 'Username'   , sort: 'username'   , type: 'text'              , value: function(u) { return u.username      }, width: 100 },
+      { show: true  , bulk_edit: true  , name: 'email'              , nice_name: 'Email'      , sort: 'email'      , type: 'text'              , value: function(u) { return u.email         }, width: 100 },
+      { show: true  , bulk_edit: true  , name: 'locked'             , nice_name: 'Locked'     , sort: 'locked'     , type: 'checkbox'          , value: function(u) { return u.locked        }, width: 30  },      
+      { show: true  , bulk_edit: true  , name: 'role_ids'           , nice_name: 'Roles'      , sort: 'email'      , type: 'checkbox-multiple' , value: function(u) { return get_role_ids(u) }, text: function(u) { return get_role_names(u); }, width: 250, options_url: '/admin/roles/options' }                  
+    ],
+    new_model_text: 'New User',
+    no_models_text: 'There are no users right now.',
+    new_model_fields: [
+      { name: 'email', nice_name: 'Email', type: 'text', width: 400 }      
+    ],
+    bulk_import_fields: ['email'],
+    bulk_import_url: '/admin/users/bulk'
+  });        
+});
+
+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(); }
+
+</script>
+<% end %>

data/app/views/caboose/users/{new.html.erb → admin_new.html.erb}

@@ -5,7 +5,10 @@
 <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' /> 
 <p><input type='text' name='email' id='email' placeholder='Email' value='' style='width: 400px;' /></p>
 <div id='message'></div>
-<p><input type='submit' value='Add User' /></p>
+<p>
+  <input type='button' value='< Back' onclick="window.location='/admin/users';" />
+  <input type='submit' value='Add User' />
+</p>
 </form>
 
 <% content_for :caboose_js do %>

data/config/routes.rb

@@ -174,21 +174,23 @@ Caboose::Engine.routes.draw do
   # Users
   #=============================================================================
   
-  get     "/admin/users"                     => "users#index"  
-  get     "/admin/users/options"             => "users#options"
-  get     "/admin/users/new"                 => "users#new"
-  get     "/admin/users/import"              => "users#import_form"
-  post    "/admin/users/import"              => "users#import"  
+  get     "/admin/users"                     => "users#admin_index"
+  get     "/admin/users/json"                => "users#admin_json"        
+  get     "/admin/users/options"             => "users#admin_options"
+  get     "/admin/users/new"                 => "users#admin_new"
+  get     "/admin/users/import"              => "users#admin_import_form"
+  post    "/admin/users/import"              => "users#admin_import"
+  get     "/admin/users/:id/json"            => "users#admin_json_single"
   get     "/admin/users/:id/su/:token"       => "users#admin_su_token"
   get     "/admin/users/:id/su"              => "users#admin_su"
-  get     "/admin/users/:id/edit-password"   => "users#edit_password"
-  get     "/admin/users/:id"                 => "users#edit"  
-  put     "/admin/users/:id"                 => "users#update"
-  post    "/admin/users"                     => "users#create"
-  delete  "/admin/users/:id"                 => "users#destroy"
-  
-  post    "/admin/users/:id/roles/:role_id"  => "users#add_to_role"  
-  delete  "/admin/users/:id/roles/:role_id"  => "users#remove_from_role"
+  get     "/admin/users/:id/edit-password"   => "users#admin_edit_password"
+  get     "/admin/users/:id"                 => "users#admin_edit"  
+  put     "/admin/users/:id"                 => "users#admin_update"
+  post    "/admin/users"                     => "users#admin_add"
+  delete  "/admin/users/:id"                 => "users#admin_delete"
+  
+  post    "/admin/users/:id/roles/:role_id"  => "users#admin_add_to_role"  
+  delete  "/admin/users/:id/roles/:role_id"  => "users#admin_remove_from_role"
   
   #=============================================================================
   # Roles

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.62'
+  VERSION = '0.7.63'
 end

data/lib/tasks/caboose.rake

@@ -2,7 +2,17 @@ require "caboose/version"
 require 'aws-sdk'
 
 namespace :caboose do
-        
+  
+  desc "Update super admin password"
+  task :update_superadmin_password => :environment do
+    sa = Caboose::User.where(:username => 'superadmin').first        
+    print "Enter a new password: "
+    sa.password = STDIN.noecho(&:gets).chomp
+    puts "\n\nThe password has been updated.\n\n"    
+    sa.password = Digest::SHA1.hexdigest(Caboose::salt + sa.password)
+    sa.save    
+  end
+          
   desc "Show all comment routes in controllers"  
   task :routes, [:arg1] => :environment do |t, args|    
     puts Caboose::CommentRoutes.controller_routes(args ? args.first : nil)        

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.62
+  version: 0.7.63
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -346,6 +346,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1126,12 +1140,12 @@ files:
 - app/views/caboose/store/admin_edit_tax.html.erb
 - app/views/caboose/users/_admin_footer.html.erb
 - app/views/caboose/users/_admin_header.html.erb
-- app/views/caboose/users/edit.html.erb
-- app/views/caboose/users/edit_password.html.erb
-- app/views/caboose/users/import_form.html.erb
-- app/views/caboose/users/index.html.erb
-- app/views/caboose/users/new.html.erb
-- app/views/caboose/users/update_pic.html.erb
+- app/views/caboose/users/admin_edit.html.erb
+- app/views/caboose/users/admin_edit_password.html.erb
+- app/views/caboose/users/admin_import_form.html.erb
+- app/views/caboose/users/admin_index.html.erb
+- app/views/caboose/users/admin_new.html.erb
+- app/views/caboose/users/admin_update_pic.html.erb
 - app/views/caboose/variants/admin_edit.html.erb
 - app/views/caboose/variants/admin_edit_option1_media.html.erb
 - app/views/caboose/variants/admin_edit_option2_media.html.erb

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

@@ -1,41 +0,0 @@
-<h1>Users</h1>
-
-<form action='/admin/users' method='get' class='search_form'>
-<input type='text' name='first_name_like' value="<%= @gen.params['first_name_like'] %>" placeholder='First name' />
-<input type='text' name='last_name_like'  value="<%= @gen.params['last_name_like']  %>" placeholder='Last name' />
-<input type='text' name='email_like'      value="<%= @gen.params['email_like']      %>" placeholder='Email' />
-<input type='submit' value='Search' />
-</form>
-
-<p>
-<a href='/admin/users/new'>New User</a> |
-<a href='/admin/users/import'>Import CSV</a>
-</p>
-
-<table class='data' id='users_table'>
-  <tr>
-    <%= raw @gen.sortable_table_headings({
-				'first_name' => 'First Name',
-				'last_name, first_name'	=> 'Last Name',
-				'username' => 'Username',
-				'email'	=> 'Email'
-			})
-		%>
-  </tr>
-<% @users.each do |user| %>
-  <tr onclick="window.location='/admin/users/<%= user.id %>';">
-    <td><%= user.first_name %></td>
-    <td><%= user.last_name %></td>
-    <td><%= user.username %></td>
-    <td><%= user.email %></td>
-  </tr>
-<% end %>
-</table>
-
-<p><%= raw @gen.generate %></p>
-
-<% content_for :caboose_js do %>
-<script type='text/javascript'>
-
-</script>
-<% end %>