caboose-cms 0.5.213 → 0.5.214

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTE3ZmMyZTkzMDU4NTMzOTRiZjc5ZDhmZDg0ZTBkYWEwYjIyZmMwMg==
+    YzFiYmRlZWU5Zjg3YTViMjZmNzZjZmEyMmFhZDQ3Zjc2MWI4Nzk3ZA==
   data.tar.gz: !binary |-
-    ODhkMmI0NzA4YjM0MjQ2NDQyYmQ2MDM3YmUzODYyMWFiZGExNmIwMA==
+    MDQ1MzI3NTM2OTRmNzUxNzg0YjEyMWVhMjUzNzcyMzkxZDI1NWQ0Zg==
 SHA512:
   metadata.gz: !binary |-
-    NDcwMjI0MGU3NGQ2YTE5OTExZmJlNWE4MWRlMDM2OTlkYzFiNjU3NGNlZGJi
-    MWY0MzkwODIzZDk3Mjk0NTIxNWYxMWRlMjM1MGMxMGMzOTk3OTM3NTk0NTFj
-    YWU5NzUwYTZhMDNmMTU5ZTljMDk5ZGI5ZGUxMWRmMDA2NWNjMjg=
+    ZWY2Y2NkYjE1YjQ3YmY2ZjhjZWEyZTBkOWI0NjM5MDczOTVkYWU2MmE0YjVh
+    MTUxMzc0NmVhNGZhOTZhMzU3NzI4Zjc2Nzc3Mjc1ZjRiOTE2YjgzYjZkNWYz
+    OGFkMGNhYTdmMmQ5M2FmYTMzZTI2NzA3MGQzZmUzYWIxMzk4MGU=
   data.tar.gz: !binary |-
-    NzUzMTI0MDA0ZjQ1YmUzMzFhYzc1MmU1YzMxMjRjYzdiODliYTU3OWMwMzUz
-    MGQ0NTNkYmYzZjI2MmZjOTA3OGQ2MDFhMTExNzY4ZDZmYjU5OGE0NDAxZTlk
-    MDdkZmY0YTUyNWY0NzRhNWViMzAwZDg4Zjg1ZjIxMWQwMDcwZTE=
+    MWJiM2MxZGFiNGNhMmFjMjM0OTc0Y2Y5OTA5NjgxYjM1OWY0MTMyYmYxODlk
+    ZDBiZTVhZmNiNjcxZGMyZWYzYmEzMjNkNjZhZjE4MjJjM2I5MzBiNjdiN2Y1
+    Nzg1ZTU5N2FiYjU3NTg4MzMwZjcyZDlkMzhhZTE4ZjNiYWViM2E=

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

@@ -14,6 +14,8 @@
 //= require jquery
 //= require jquery_ujs
 //= require colorbox-rails
+//= require caboose/jquery.datetimepicker
 //= require caboose/jquery.placeholder
 //= require caboose/jquery.detect
 //= require caboose/modal_integration
+//= require caboose/admin_main

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

@@ -1,388 +1,11 @@
 /*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
+ * /app/assets/stylesheets/caboose/modal.css
  *
+ *= require jquery-ui
+ *= require caboose/jquery.datetimepicker
  *= require colorbox-rails
  *= require caboose/fonts
  *= require caboose/caboose
  *= require caboose/model_binder
+ *= require caboose/modal_main
  */
-
-html { width: 100%; }
-
-@font-face {
-  font-family: 'Avenir';
-  src: url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.eot');
-  src: url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.eot') format('embedded-opentype'),
-       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.woff')       format('woff'),
-       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.ttf')        format('truetype'),
-       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.svg')        format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-
-body {
-  background: #111111;
-  margin: 0;
-  padding: 0;
-  color: #fff;
-  width: 100%;  
-  font-family: "Avenir", Arial;
-}
-
-#modal_wrapper {
-  width: 100%;
-  position: relative;
-}
-
-#modal_content {
-  width: 100%;
-	max-width: 100%;
-  padding: 0;
-}
-
-#modal_content h1 {
-  margin: 0 0 12px 0;
-  padding: 0;
-  font-weight: normal;
-  background: #111111;   
-}
-
-#modal_content a {
-  color: #ccc;
-  text-decoration: none;
-  border-bottom: #999 1px dotted;  
-}
-
-#modal_content p.loading {
-  background-image: url('/assets/caboose/loading_white_on_black.gif');
-  background-position: 0 center;
-  background-repeat: no-repeat;
-  color: #ccc;  
-  font-weight: normal;
-  font-size: 16pt;
-  padding: 10px 10px 10px 40px;
-}
-
-#modal_content div.yesnobox {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 22;
-  background-color: rgba(0, 0, 0, 0.9);
-  font-size: 20px;
-  text-align: center;
-}
-
-#modal_content div.yesnobox div {
-  padding: 20px;
-}
-  
-#modal_content div.yesnobox input {
-  width: auto;  
-}
-
-div.model_attribute_text {
-  color: #000;
-}
-
-#modal_content div.top_right_controls {
-  position: absolute;
-  top: 0;
-  right: 0;
-}
-
-#modal_content div.top_right_controls a {
-  display: inline-block;
-  margin: 0;
-  padding: 4px 8px;
-}
-
-input, select, textarea {
-  font-family: "Avenir", Arial;
-  border: 2px solid #ccc;
-  background: #000;
-  color: #fff;
-  /*
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  border-radius: 2px; */
-  padding: 4px 8px;
-  height: 34px;
-  font-size: 20px;
-  z-index: 20;
-}
-
-input.dirty,
-textarea.dirty {
-  background: #fff799;
-  color: #000;  
-}
-
-select {
-  padding: 0;
-  height: 44px;
-}
-
-option {
-  
-}
-
-select.fake {
-  background: transparent;
-  position: absolute;
-  top: 0;
-  left: 0;
-  color: transparent;
-}
-
-select.fake option {
-  background: #fff;
-  color: #000;
-}
-
-#modal_content .bound_input_check a,
-#modal_content .bound_input_cancel a {
-  border: 1px solid #ccc;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  border-radius: 2px;
-  
-  font-size: 28px;
-  text-align: center;
-  background: #00cc00;
-  color: #fff;
-  
-  display: block;
-  padding: 4px 0;
-  height: 34px;
-}
-
-#modal_content .bound_input_check a.loading {
-  background-image: url(/assets/caboose/loading_green.gif);
-  background-color: #00cc00;
-  background-repeat: no-repeat;
-  background-position: 6px 5px;
-  color: rgba(255, 255, 255, 0.0);
-}
-
-#modal_content .bound_textarea_controls a {
-  display: inline-block;
-  margin: 3px 0 0 1px;
-  padding: 8px 0 6px 0;
-  background: #ccc;
-  color: #000;
-  text-align: center;
-  border: #666 1px solid;
-}
-
-#modal_content .bound_textarea_controls a.save    { width: 60px; }
-#modal_content .bound_textarea_controls a.discard { width: 80px; }
-  
-#modal_content .note,
-#modal_content .error {
-  margin: 0;
-}
-
-#modal_content .placeholder {
-  display: block;
-  margin: 0;
-  padding: 0 5px 0 0;
-  height: 34px;
-  
-  position: absolute;
-  top: 12px;
-  left: 10px;
-  z-index: 19;
-}
-
-#modal_content .placeholder span {
-  display: block;
-  font-size: 20px;
-  color: #757575;
-}
-
-#modal_content input[type='checkbox'] {
-  /*position: absolute;*/
-  top: 4px;
-  left: 0;
-  z-index: 19;
-  
-  margin: 0;
-  padding: 0;
-  width: 20px;
-}
-
-#modal_content .search_form {
-  position: absolute;
-  top: 0;
-  right: 0;  
-}
-
-#modal_content table.data {
-  border-collapse: collapse;
-}
-  
-#modal_content table.data th {
-  background: #000;
-  border: #333 1px solid;  
-  color: #efefef;
-  margin: 0;
-  padding: 0;
-}
-
-#modal_content table.data th a {
-  display: block;
-  text-decoration: none;
-  border: none;
-  color: #fff;
-  padding: 8px 12px;
-}
-
-#modal_content table.data th a:hover {
-  color: #fff;
-  background: #333;
-}
-
-#modal_content table.data td {
-  background: #111111;
-  border: #333 1px solid;
-  color: #fff;
-  margin: 0;
-  padding: 8px 12px;
-}
-
-#modal_content table.data tr:nth-child(even) td {
-  background-color: #000;
-}
-
-
-#modal_content table.data tr:nth-child(odd) td {
-  background-color: transparent;
-}
-
-#modal_content table.data tr:hover td,
-#modal_content table.data tr:nth-child(even):hover td,
-#modal_content table.data tr:nth-child(odd):hover td {
-  background: #333;
-  color: #fff;
-}
-
-/*******************************************************************************
-Modeljs
-*******************************************************************************/
-
-#modal_content div.model_attribute_text {
-    color: #fff;
-}
-
-#modal_content .model_attribute {
-    background: none repeat scroll 0 0 transparent;
-    display: block;
-    padding: 2px 4px;
-    text-decoration: none;
-}
-
-#modal_content .clear {
-  clear: both;
-  line-height: 0;  
-}
-
-/*******************************************************************************
-Message boxes
-*******************************************************************************/
-
-#modal_content .note {
-	padding: 20px;
-	background: #fef49c;
-	color: #000000;
-	font-weight: bold;
-	font-size: 1.4em;	
-}
-
-#modal_content .note_small {
-  display: block;
-	padding: 4px 10px;
-	background: #fef49c;
-	color: #000000;
-	font-size: 1em;	
-}
-
-#modal_content .error {
-	background: #9c171b;
-	color: #ffffff;
-}
-
-#modal_content .error a {
-	color: #fff;	
-}
-
-#modal_content .error a:hover {
-	color: #000;	
-}
-
-#modal_content .success {
-	background: #009900;
-	color: #ffffff;
-}
-
-#modal_content .success a {
-	color: #ffffff;	
-}
-
-#cboxTopLeft,
-#cboxTopRight,
-#cboxBottomLeft,
-#cboxBottomRight,
-#cboxMiddleLeft,
-#cboxMiddleRight,
-#cboxTopCenter,
-#cboxBottomCenter,
-#cboxClose { background: #111 !important; }
-
-/*******************************************************************************
-Page Bar Generator
-*******************************************************************************/
-
-.page_links {
-  
-}
-
-.page_links a {
-  display: inline-block;
-  margin: 0 2px;
-  padding: 5px 8px 3px 8px;
-  
-  border: #505050 1px solid;
-  background: #000;
-  color: #505050;
-  text-decoration: none;
-}
-
-.page_links a:hover {
-  background: #505050;
-  color: #fff;
-}
-
-.page_links .middle_links a {
-  
-}
-
-.page_links span.current_page {
-  display: inline-block;
-  padding: 5px 8px 3px 8px;
-  
-  border: #ccc 1px solid;
-  background: #ccc;
-  color: #000;
-  text-decoration: none;
-}
-
-#search_form input[type='text']   { height: 20px; padding: 6px 12px; }
-#search_form input[type='submit'] { height: 35px; padding: 0 12px; }

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

@@ -1,3 +1,7 @@
+/*
+ * /app/assets/stylesheets/caboose/modal_main.css
+ */
+ 
 html { width: 100%; }
 
 @font-face {

data/app/controllers/caboose/checkout_controller.rb

@@ -153,6 +153,9 @@ module Caboose
       # Save the order
       @order.save
       
+      # Decrement quantities of variants
+      @order.decrement_quantities
+      
       # Clear the cart and re-initialize                    
       session[:cart_id] = nil
       init_cart
@@ -363,15 +366,19 @@ module Caboose
       
       # Go ahead and capture funds if the order only contained downloadable items
       @order = Order.find(params[:order_id])
-      if !@order.has_shippable_items?
-        capture_resp = @order.capture_funds
-        if capture_resp.error
-          @resp.success = false
-          @resp.error = capture_resp.error
-        end        
-      end
       
-      if @resp.success        
+      if @resp.success
+        if !@order.has_shippable_items?
+          capture_resp = @order.capture_funds
+          if capture_resp.error
+            @resp.success = false
+            @resp.error = capture_resp.error
+          end        
+        end
+        
+        # Decrement quantities of variants
+        @order.decrement_quantities
+    
         session[:cart_id] = nil
         init_cart
       end

data/app/controllers/caboose/roles_controller.rb

@@ -9,7 +9,7 @@ module Caboose
     # GET /admin/roles
     def index
       return unless user_is_allowed('roles', 'view')
-      top_roles = Role.tree
+      top_roles = Role.tree(@site.id)
       arr = []
       top_roles.each { |r| arr += add_role_options(r, 0) }
       @roles = arr        
@@ -36,12 +36,18 @@ module Caboose
           'redirect' => nil
       })
       
-      role = Role.new()
-      role.parent_id = params[:parent_id]
-      role.name = params[:name]    
-      role.save
-      
-      resp.redirect = "/admin/roles/#{role.id}/edit"
+      parent = Role.where(:id => params[:parent_id]).first
+      if parent.nil?
+        resp.error = "Parent role must be part of this site."
+      else              
+        role = Role.new()
+        role.site_id = @site.id
+        role.parent_id = params[:parent_id]
+        role.name = params[:name]    
+        role.save
+        resp.redirect = "/admin/roles/#{role.id}"
+      end
+            
       render json: resp
     end
     
@@ -61,8 +67,12 @@ module Caboose
     	  	  role.description = value
     	  	when "parent_id"
     	  	  value = value.to_i
+    	  	  p = Role.where(:id => value).first
     	  	  if role.id == value
     	  	    resp.error = "You can't set the parent to be this role."
+    	  	    save = false
+    	  	  elsif value != -1 && (p.nil? || p.site_id != role.site_id)
+    	  	    resp.error = "Invalid parent."
     	  	    save = false
     	  		elsif role.is_ancestor_of?(value)
     	  		  resp.error = "You can't set the parent to be one of the child roles."
@@ -71,8 +81,7 @@ module Caboose
     	  		  role.parent_id = value
     	  		  if value == -1
     	  		    resp.attributes = { 'parent_id' => { 'text' => '[No parent]' }}
-    	  		  else
-    	  		    p = Role.find(value)
+    	  		  else    	  		    
     	  		    resp.attributes = { 'parent_id' => { 'text' => p.name }}
     	  		  end
     	  		end    	  		
@@ -114,7 +123,7 @@ module Caboose
     # GET /admin/roles/options
     def options
       return unless user_is_allowed('roles', 'view')
-      @top_roles = Role.tree
+      @top_roles = Role.tree(@site.id)
       arr = [{ 
         "value" => -1, 
         "text" => 'Top Level'

data/app/controllers/caboose/sites_controller.rb

@@ -47,17 +47,9 @@ module Caboose
         render :file => 'caboose/extras/error' and return
       end
       
-      @site = Site.find(params[:id])      
-      
-      # Create an admin user for the account
-      if !User.where(:username => 'admin', :site_id => @site.id).exists?
-        admin_user = User.create(:username => 'admin', :email => 'admin@nine.is', :site_id => @site.id, :password => Digest::SHA1.hexdigest(Caboose::salt + 'caboose'))        
-        admin_role = Role.where(:name => 'Admin').first        
-        if admin_user && admin_role                      
-          RoleMembership.create(:user_id => admin_user.id, :role_id => admin_role.id)          
-        end
-      end
-      
+      @site = Site.find(params[:id])            
+      @site.init_users_and_roles
+            
     end
     
     # GET /admin/sites/:id/block-types
@@ -117,17 +109,8 @@ module Caboose
         StoreConfig.create(:site_id => site.id)
         SmtpConfig.create( :site_id => site.id)
         resp.redirect = "/admin/sites/#{site.id}"
-      end
-      
-      # Create an admin user for the account
-      if !User.where(:username => 'admin', :site_id => site.id).exists?        
-        admin_user = User.create(:username => 'admin', :email => 'admin@nine.is', :site_id => site.id, :password => Digest::SHA1.hexdigest(Caboose::salt + 'caboose'))
-        admin_role = Role.where(:name => 'Admin').first
-        if admin_role
-          RoleMembership.create(:user_id => admin_user.id, :role_id => admin_role.id)        
-        end
-      end
-      
+      end      
+      site.init_users_and_roles            
       render :json => resp
     end
     

data/app/controllers/caboose/users_controller.rb

@@ -48,7 +48,7 @@ module Caboose
     def edit
       return if !user_is_allowed('users', 'edit')
       @edituser = User.find(params[:id])    
-      @all_roles = Role.tree
+      @all_roles = Role.tree(@site.id)
       @roles = Role.roles_with_user(@edituser.id)
     end
     

data/app/models/caboose/role.rb

@@ -1,19 +1,16 @@
 
 class Caboose::Role < ActiveRecord::Base
   self.table_name = "roles"
-  belongs_to :parent, :class_name => "Caboose::Role"
-
-  #has_and_belongs_to_many :users
+  
+  belongs_to :site, :class_name => 'Caboose::Site'
+  belongs_to :parent, :class_name => "Caboose::Role"  
   has_many :role_memberships
-  has_many :users, :through => :role_memberships
-    
-  #has_and_belongs_to_many :permissions
+  has_many :users, :through => :role_memberships      
   has_many :role_permissions
-  has_many :permissions, :through => :role_permissions  
-  
+  has_many :permissions, :through => :role_permissions    
   has_many :page_permissions
 
-  attr_accessible :name, :description, :parent_id
+  attr_accessible :name, :description, :parent_id, :site_id
   attr_accessor :children
      
   def self.admin_role
@@ -71,13 +68,13 @@ class Caboose::Role < ActiveRecord::Base
     return self.where("users.id" => user_id).all(:include => :users)
   end
   
-  def self.tree
-    return self.where(:parent_id => -1).reorder("name").all
+  def self.tree(site_id)
+    return self.where(:parent_id => -1, :site_id => site_id).reorder("name").all
   end
   
-  def self.flat_tree(prefix = '-')
+  def self.flat_tree(site_id, prefix = '-')
     arr = []
-    self.tree.each do |r|
+    self.tree(site_id).each do |r|
       arr += self.flat_tree_helper(r, prefix, '')
     end
     return arr

data/app/models/caboose/schema.rb

@@ -556,6 +556,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :rating                , :decimal   ] 
       ],
       Caboose::Role => [
+        [ :site_id              , :integer  ],
         [ :parent_id            , :integer  ],
         [ :name                 , :string   ],
         [ :description          , :string   ]

data/app/models/caboose/site.rb

@@ -106,4 +106,29 @@ class Caboose::Site < ActiveRecord::Base
     self.save
   end
   
+  def init_users_and_roles
+        
+    admin_user = Caboose::User.where(:username => 'admin', :site_id => self.id).first    
+    admin_user = Caboose::User.create(:username => 'admin', :email => 'admin@nine.is', :site_id => self.id, :password => Digest::SHA1.hexdigest(Caboose::salt + 'caboose')) if admin_user.nil?
+                          
+    admin_role = Caboose::Role.where(:site_id => self.id, :name => 'Admin').first    
+    admin_role = Caboose::Role.create(:site_id => self.id, :parent_id => -1, :name => 'Admin') if admin_role.nil?
+    
+    elo_role = Caboose::Role.where(:site_id => self.id, :name => 'Everyone Logged Out').first
+    elo_role = Caboose::Role.create(:site_id => self.id, :parent_id => -1, :name => 'Everyone Logged Out') if elo_role.nil?
+    
+    eli_role = Caboose::Role.where(:site_id => self.id, :name => 'Everyone Logged In').first
+    eli_role = Caboose::Role.create(:site_id => self.id, :parent_id => elo_role.id, :name => 'Everyone Logged In') if eli_role.nil?
+    
+    # Make sure the admin role has the admin "all" permission
+    admin_perm = Caboose::Permission.where(:resource => 'all', :action => 'all').first
+    rp = Caboose::RolePermission.where(:role_id => admin_role.id, :permission_id => admin_perm.id).first
+    rp = Caboose::RolePermission.create(:role_id => admin_role.id, :permission_id => admin_perm.id) if rp.nil?
+    
+    # Make sure the admin user is a member of the admin role
+    rm = Caboose::RoleMembership.where(:role_id => admin_role.id, :user_id => admin_user.id).first
+    rm = Caboose::RoleMembership.create(:role_id => admin_role.id, :user_id => admin_user.id) if rm.nil?
+        
+  end
+  
 end

data/app/models/caboose/user.rb

@@ -1,6 +1,7 @@
 class Caboose::User < ActiveRecord::Base
-  self.table_name = "users"  
-  #has_and_belongs_to_many :roles
+  self.table_name = "users"
+
+  belongs_to :site, :class_name => 'Caboose::Site'    
   has_many :role_memberships
   has_many :roles, :through => :role_memberships
   has_attached_file :image, 

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

@@ -5,7 +5,7 @@
 
 <table class='data' id='viewers'>
 <tr><th>Role</th><th>View</th><th>Edit</th></tr>
-<% Caboose::Role.flat_tree(' - ').each do |r| %>
+<% Caboose::Role.flat_tree(@site.id, ' - ').each do |r| %>
   <% next if r.id == 1 %>
   <% may_view = Caboose::PagePermission.where(:role_id => r.id, :page_id => @page.id, :action => 'view').exists? %>
   <% may_edit = Caboose::PagePermission.where(:role_id => r.id, :page_id => @page.id, :action => 'edit').exists? %>

data/app/views/caboose/roles/edit.html.erb

@@ -1,20 +1,30 @@
 
 <h1>Editing Role</h1>
+
+<p><input type='button' value='< Back' onclick="window.location='/admin/roles';" /></p>
+
 <div id="role_<%= @role.id %>_name"></div>
 <div id="role_<%= @role.id %>_parent_id"></div>
 <div id="role_<%= @role.id %>_description"></div>
+
 <h3>Members</h3>
-<div id='members'>
-  <table class='data'>
-    <% Caboose::User.reorder("last_name, first_name").all.each do |u| %>
-      <% is_member = Caboose::RoleMembership.where(:role_id => @role.id, :user_id => u.id).exists? %>
-      <tr>
-        <td><input type='checkbox' name='user<%= u.id %>' <%= raw is_member ? "checked='true'" : '' %> onclick="toggle_role(<%= u.id %>, <%= @role.id %>, $(this).prop('checked'));" /></td>
-        <td><%= u.first_name %> <%= u.last_name %> (<%= u.email %>)</td>
-      </tr>
-    <% end %>
-  </table>
-</div>
+<% users = Caboose::User.where(:site_id => @site.id).reorder("last_name, first_name").all %>
+<% if users && users.count > 0 %>
+  <div id='members'>
+    <table class='data'>
+      <% users.each do |u| %>
+        <% is_member = Caboose::RoleMembership.where(:role_id => @role.id, :user_id => u.id).exists? %>
+        <tr>
+          <td><input type='checkbox' name='user<%= u.id %>' <%= raw is_member ? "checked='true'" : '' %> onclick="toggle_role(<%= u.id %>, <%= @role.id %>, $(this).prop('checked'));" /></td>
+          <td><%= u.first_name %> <%= u.last_name %> (<%= u.email %>)</td>
+        </tr>
+      <% end %>
+    </table>
+  </div>
+<% else %>
+  <p>There are no users for this site.</p>
+<% end %>
+
 <h3>Permissions</h3>
 <div id='permissions'>
   <table class='data'>
@@ -27,6 +37,7 @@
     <% end %>
   </table>
 </div>
+
 <div id="role_<%= @role.id %>_members"></div>
 <div id="role_<%= @role.id %>_permissions"></div>
 <div id="message"></div>
@@ -42,11 +53,6 @@
 <%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">
 
-var modal = false;
-$(window).load(function() {  
-  modal = new CabooseModal(600, 600);
-});
-
 $(document).ready(function() {
   new ModelBinder({
     name: 'Role',
@@ -59,8 +65,7 @@ $(document).ready(function() {
       { name: 'parent_id'   , nice_name: 'Parent'      , type: 'select', value: <%= @role.parent_id %>, text: "<%= @role.parent.nil? ? '[No parent]' : @role.parent.name %>", show_controls: true, loading_message: 'Getting roles...', options_url: '/admin/roles/options', width: 590, message: 'message' },    
       { name: 'name'        , nice_name: 'Name'        , type: 'text' , value: "<%= @role.name %>"        , width: 590 , message: 'message' },
       { name: 'description' , nice_name: 'Description' , type: 'text' , value: "<%= @role.description %>" , width: 590 , message: 'message' }      
-    ],
-    on_load: function() { modal.autosize(); }
+    ]    
   });  
 });
 

data/app/views/caboose/roles/new.html.erb

@@ -5,7 +5,7 @@
 <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' /> 
 <p><select name='parent_id'>
   <option value=''>-- Select a parent role --</option>
-  <% Caboose::Role.flat_tree(' - ').each do |r| %>
+  <% Caboose::Role.flat_tree(@site.id, ' - ').each do |r| %>
     <option value='<%= r.id %>'><%= r.name %></option>
   <% end %>
 </select></p>

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

@@ -10,7 +10,7 @@ pic = "http://gravatar.com/avatar/#{gravatar_id}.png?s=150" #&d=/assets/caboose/
 <p><div id='user_<%= @edituser.id %>_email'      ></div></p>
 <div id='roles'>
 <table class='data'>
-<% Caboose::Role.flat_tree.each do |r| %>
+<% Caboose::Role.flat_tree(@site.id).each do |r| %>
 <% is_member = Caboose::RoleMembership.where(:role_id => r.id, :user_id => @edituser.id).exists? %>
 <tr><td><input type='checkbox' name='role<%= r.id %>' <%= is_member ? "checked='true'" : '' %> onclick="toggle_role(<%= @edituser.id %>, <%= r.id %>, $(this).prop('checked'));" /></td><td><%= r.name %></td></tr>
 <% end %>
@@ -32,10 +32,6 @@ pic = "http://gravatar.com/avatar/#{gravatar_id}.png?s=150" #&d=/assets/caboose/
 <% 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);
-});
 
 $(document).ready(function() {
   new ModelBinder({
@@ -48,8 +44,7 @@ $(document).ready(function() {
       { 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 }
-    ],
-    on_load: function() { modal.autosize(); }
+    ]    
   });  
 });
 

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

@@ -23,7 +23,7 @@
 		%>
   </tr>
 <% @users.each do |user| %>
-  <tr onclick="window.location='/admin/users/<%= user.id %>/edit';">
+  <tr onclick="window.location='/admin/users/<%= user.id %>';">
     <td><%= user.first_name %></td>
     <td><%= user.last_name %></td>
     <td><%= user.username %></td>
@@ -36,8 +36,6 @@
 
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
-$(document).ready(function() { 
-  var modal = new CabooseModal(500);
-});
+
 </script>
 <% end %>

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

@@ -0,0 +1 @@
+<%= yield %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.213'
+  VERSION = '0.5.214'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.213
+  version: 0.5.214
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -939,6 +939,7 @@ files:
 - app/views/layouts/caboose/empty.html.erb
 - app/views/layouts/caboose/error404.html.erb
 - app/views/layouts/caboose/modal.html.erb
+- app/views/layouts/caboose/no_layout.html.erb
 - app/views/layouts/caboose/store/_banner.html.erb
 - app/views/layouts/caboose/store/_banner2.html.erb
 - app/views/layouts/caboose/store/_footer.html.erb