caboose-cms 0.0.7 → 0.1.0

data/app/controllers/caboose/station_controller.rb

@@ -0,0 +1,13 @@
+
+module Caboose
+  class StationController < ApplicationController
+      
+    # PUT /admin/station
+    def index
+      session[:caboose_station_state]       = params[:state]
+      session[:caboose_station_open_tabs]   = params[:open_tabs]
+      session[:caboose_station_return_url]  = params[:return_url]
+      render :json => true
+    end
+  end
+end

data/app/controllers/caboose/users_controller.rb

@@ -1,8 +1,13 @@
 
 module Caboose
   class UsersController < ApplicationController
+    layout 'caboose/admin'    
       
-    # GET /users
+    def before_action
+      @page = Page.page_with_uri('/admin')
+    end
+    
+    # GET /admin/users
     def index
       return if !user_is_allowed('users', 'view')
       
@@ -12,32 +17,29 @@ module Caboose
     		  'username'	  => '',
     		  'email' 		  => '',
     		},{
+    		  'model'       => 'Caboose::User',
     	    'sort'			  => 'last_name, first_name',
     		  'desc'			  => false,
-    		  'base_url'		=> '/users'
+    		  'base_url'		=> '/admin/users'
     	})
-    	
-    	if (@gen.options['page'] == 0) 
-    		@gen.options['item_count'] = User.where(@gen.where).count
-    	end
-    	@users = User.where(@gen.where).limit(@gen.limit).offset(@gen.offset).reorder(@gen.reorder).all
+    	@users = @gen.items
     end
     
-    # GET /users/new
+    # GET /admin/users/new
     def new
       return if !user_is_allowed('users', 'add')
-      @user = User.new
+      @newuser = User.new
     end
     
-    # GET /users/1/edit
+    # GET /admin/users/1/edit
     def edit
       return if !user_is_allowed('users', 'edit')
-      @user = User.find(params[:id])    
+      @edituser = User.find(params[:id])    
       @all_roles = Role.tree
-      @roles = Role.roles_with_user(@user.id)
+      @roles = Role.roles_with_user(@edituser.id)
     end
     
-    # POST /users
+    # POST /admin/users
     def create
       return if !user_is_allowed('users', 'add')
       
@@ -53,65 +55,70 @@ module Caboose
         resp.error = "Your username is required."
       elsif      
         user.save
-        resp.redirect = "/users/#{user.id}/edit"
+        resp.redirect = "/admin/users/#{user.id}/edit"
       end
       render json: resp
     end
     
-    # PUT /users/1
+    # PUT /admin/users/1
     def update
       return if !user_is_allowed('users', 'edit')
-      
+
       resp = StdClass.new     
       user = User.find(params[:id])
-      name = params[:name]
-      value = params[:value]
     
       save = true
-      case name
-    		when "first_name", "last_name", "username", "email"
-    		  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
-    		when "roles"
-    		  user.roles = [];
-    		  value.each { |rid| user.roles << Role.find(rid) } unless value.nil?
-    		  resp.attribute = { 'text' => user.roles.collect{ |r| r.name }.join(', ') }    		  
+      params.each do |name,value|
+        case name
+    	  	when "first_name", "last_name", "username", "email"
+    	  	  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
+    	  	when "roles"
+    	  	  user.roles = [];
+    	  	  value.each { |rid| user.roles << Role.find(rid) } unless value.nil?
+    	  	  resp.attribute = { 'text' => user.roles.collect{ |r| r.name }.join(', ') }    		  
+    	  end
     	end
     	
     	resp.success = save && user.save
     	render json: resp
     end
     
+    # POST /admin/users/1/update-pic
     def update_pic
-      @user = User.find(params[:id])
-      @new_value = "Testing"
-    end
-    
-    def update_resume
-      @user = User.find(params[:id])
+      @edituser = User.find(params[:id])
       @new_value = "Testing"
     end
       
-    # DELETE /users/1
+    # DELETE /admin/users/1
     def destroy
       return if !user_is_allowed('users', 'delete')
       user = User.find(params[:id])
       user.destroy
       
       resp = StdClass.new({
-        'redirect' => '/users'
+        'redirect' => '/admin/users'
       })
       render json: resp
     end
+    
+    # GET /admin/users/options
+    def options
+      return if !user_is_allowed('users', 'view')
+      @users = User.reorder('last_name, first_name').all
+      options = @users.collect { |u| { 'value' => u.id, 'text' => "#{u.first_name} #{u.last_name}"}}
+      render json: options
+    end
+    
   end
 end

data/app/models/caboose/caboose_plugin.rb

@@ -1,14 +1,10 @@
 class Caboose::CaboosePlugin
  
-  def self.page_content_hook(str)
+  def self.page_content(str)
     return str    
   end
   
-  def self.admin_nav_hook(arr)
-    return arr
-  end
-  
-  def self.admin_subnav_hook(arr)
+  def self.admin_nav(arr)
     return arr
   end
   

data/app/models/caboose/page.rb

@@ -256,12 +256,12 @@ class Caboose::Page < ActiveRecord::Base
 			parent = self.find_with_fields(page.parent_id, [:title, :menu_title, :custom_sort_children])
 			return block if parent.nil? # If we happen to be at the top page
 			
-			block.title = parent.menu_title.length > 0 ? parent.menu_title : parent.title
+			block.title = !parent.menu_title.nil? && parent.menu_title.length > 0 ? parent.menu_title : parent.title
 			block.title_id = parent.id
 			
-			pages = self.select(
+			pages = self.select([
 			    :id, :title, :menu_title, :alias, :slug, :uri, :redirect_url, :sort_order
-			  ).where(:parent_id => page.parent_id, :hide => 0)
+			  ]).where(:parent_id => page.parent_id, :hide => 0)
 			if (parent.custom_sort_children)
 			  pages.sort! {|x,y| x.sort_order <=> y.sort_order }
 			else

data/app/models/caboose/page_bar_generator.rb

@@ -22,10 +22,11 @@ module Caboose
   		# base_url, page, itemCount, itemsPerPage
   		@params = {}
   		@options = {
+  		  'model'           => '',
   			'sort' 			      => '',
   			'desc' 			      => false,
   			'base_url'		    => '',
-  			'page'			      => 0,
+  			'page'			      => 1,
   			'item_count'		  => 0,
   			'items_per_page'  => 10
   		}      
@@ -33,6 +34,7 @@ module Caboose
   		options.each  { |key, val| @options[key] = val }
   		@params.each  { |key, val| @params[key]  = post_get[key].nil? ? val : post_get[key] }			
   		@options.each { |key, val| @options[key] = post_get[key].nil? ? val : post_get[key] } 
+  		@options['item_count'] = @options['model'].constantize.where(where).count
   		
   	end
   	
@@ -49,6 +51,10 @@ module Caboose
       return false if val == ""
       return true
   	end
+  	
+  	def items
+    	return @options['model'].constantize.where(where).limit(limit).offset(offset).reorder(reorder).all
+  	end
   		
   	def generate
   	    	  
@@ -58,53 +64,56 @@ module Caboose
   		
   		# Set default parameter values if not present
   		@options['items_per_page'] = 10  if @options["items_per_page"].nil?
-  		@options['page']           = 0   if @options["page"].nil?		
+  		@options['page']           = 1   if @options["page"].nil?		
   		
   		# Variables to make the search form work 
   		vars = get_vars()
-  		page = @options["page"]
+  		page = @options["page"].to_i
+  		
+  		Caboose.log(@options)
   				
   		# Max links to show (must be odd) 
-  		total_links = 9
-  		prev_page = page - 1            
+  		total_links = 5
+  		prev_page = page - 1
   		next_page = page + 1
   		total_pages = (@options['item_count'].to_f / @options['items_per_page'].to_f).ceil
   		
   		if (total_pages < total_links)
-  			start = 0
+  			start = 1
   			stop = total_pages			
   		else
   			start = page - (total_links/2).floor			
-  			start = 0 if start < 0
-  			stop = start + total_links
+  			start = 1 if start < 1
+  			stop = start + total_links - 1
   			
   			if (stop > total_pages)
   				stop = total_pages				
   				start = stop - total_links  				
-  				start = 0 if start < 0
+  				start = 1 if start < 1
   			end
   		end
   		
   		base_url = @params['base_url']
   		str = ''
-  		str << "<p>Results Pages: showing page " + (page+1).to_s + " of #{total_pages}</p>\n"
-  		str << "<div class='page_links'>\n"
-  		if (page > 0)
-  		  str << "<a href='#{base_url}?#{vars}&page=#{prev_page}'>Previous</a>"
-  	  end  		
-  		
-  		for i in start..(stop-1)
-  			if (page != i)
-  			  str << "<a href='#{base_url}?#{vars}&page=#{i}'>" + (i+1).to_s + "</a>"
-  			else
-  				str << "<span class='current_page'>" + (i+1).to_s + "</span>"
-  			end
-  		end
+  		str << "<p>Results: showing page #{page} of #{total_pages}</p>\n"
   		
-  		if (page < (total_pages-1))
-  			str << "<a href='#{base_url}?#{vars}&page=#{next_page}'>Next</a>"
-  		end
-  		str << "</div>\n"
+  		if (total_pages > 1)
+  		  str << "<div class='page_links'>\n"
+  		  if (page > 1)
+  		    str << "<a href='#{base_url}?#{vars}&page=#{prev_page}'>Previous</a>"
+  	    end
+  		  for i in start..stop
+  		  	if (page != i)
+  		  	  str << "<a href='#{base_url}?#{vars}&page=#{i}'>#{i}</a>"
+  		  	else
+  		  		str << "<span class='current_page'>#{i}</span>"
+  		  	end
+  		  end
+  		  if (page < total_pages)
+  		  	str << "<a href='#{base_url}?#{vars}&page=#{next_page}'>Next</a>"
+  		  end
+  		  str << "</div>\n"
+      end
       
   		return str
   	end
@@ -140,11 +149,11 @@ module Caboose
     end
     
     def limit
-      return @options['items_per_page']
+      return @options['items_per_page'].to_i
     end
     
     def offset
-      return @options['page'] * @options['items_per_page']
+      return (@options['page'].to_i - 1) * @options['items_per_page'].to_i
     end
     
     def reorder

data/app/models/caboose/page_plugin.rb

@@ -0,0 +1,43 @@
+class Caboose::PagePlugin < Caboose::CaboosePlugin
+
+  def self.admin_nav(nav, user, page)    
+    return nav if user.nil? || !user.is_allowed('pages', 'view')
+    
+    item = {
+      'id' => 'pages', 
+      'text' => 'Pages',
+      'children' => []
+      #'show_children_default' => true
+    }
+      
+    is_admin = user.is_allowed('all', 'all')
+    actions = Caboose::Page.permissible_actions(user.id, page.id)
+    if (actions.include?('edit') || is_admin)
+    	item['children'] << { 'href' => "/pages/#{page.id}/sitemap"       , 'text' => 'Site Map This Page'  }
+    	item['children'] << { 'href' => "/pages/#{page.id}/edit"          , 'text' => 'Edit Page Content'   }
+    	item['children'] << { 'href' => "/pages/#{page.id}/edit-settings" , 'text' => 'Edit Page Settings'  }
+
+    	#uru = session['use_redirect_urls'].nil? ? true : session['use_redirect_urls']
+    	#item['children'] << { 'id' => 'use_redirect_urls', 'href' => '#', 'text' => '' + (uru ? 'Disable' : 'Enable') + ' Redirect Urls' }
+    end
+    if (user.is_allowed('pages', 'add') || is_admin)
+      item['children'] << { 'href' => "/pages/new?parent_id=#{page.id}"  , 'text' => 'New Page' }
+    end    
+    nav << item
+    return nav
+  end
+  
+  def self.admin_js
+    return "
+      $('#use_redirect_urls').click(function() {
+        uru = $('#use_redirect_urls');
+        val = (uru.html() == 'Enable' ? 1 : 0);        
+        $.ajax({
+          url: '/admin/settings/toggle-redirect-urls',
+          data: 'val='+val,
+          succes: function(resp) { uri.html(val == 1 ? 'Disable' : 'Enable'); }
+        });
+      });"
+  end
+  
+end

data/app/models/caboose/permission_plugin.rb

@@ -0,0 +1,27 @@
+class Caboose::PermissionPlugin < Caboose::CaboosePlugin
+
+  def self.admin_nav(nav, user, page)
+    return nav if user.nil? || !user.is_allowed('permissions', 'view')
+        
+    item = {
+      'id' => 'permissions',
+      'text' => 'Permissions',
+      'children' => []
+    }
+    if (user.is_allowed('permissions', 'view'))
+      item['children'] << {
+        'href' => '/admin/permissions', 
+        'text' => 'View All Permissions'
+      }
+    end
+    if (user.is_allowed('permissions', 'add'))
+      item['children'] << {
+        'href' => '/admin/permissions/new', 
+        'text' => 'New Permission'
+      }
+    end
+    nav << item
+    return nav
+  end
+ 
+end

data/app/models/caboose/role.rb

@@ -1,6 +1,7 @@
 
 class Caboose::Role < ActiveRecord::Base
-  self.table_name = "roles"  
+  self.table_name = "roles"
+  belongs_to :parent, :class_name => "Caboose::Role"  
   has_and_belongs_to_many :users
   has_and_belongs_to_many :permissions
   has_many :page_permissions
@@ -46,5 +47,22 @@ class Caboose::Role < ActiveRecord::Base
   def self.tree
     return self.where(:parent_id => -1).reorder("name").all
   end
+  
+  def is_ancestor_of?(role)    
+    if (role.is_a?(Integer) || role.is_a?(String))
+      role_id = role.to_i
+      return false if role_id = -1
+      role = Caboose::Role.find(role)
+    end
+    return false if role.parent_id == -1
+    return false if role.parent.nil?
+    return true  if role.parent.id == id
+    return is_ancestor_of?(role.parent)      
+  end
+  
+  def is_child_of?(role)    
+    role = Role.find(role) if role.is_a?(Integer)
+    return role.is_ancestor_of?(self)      
+  end
 	
 end

data/app/models/caboose/role_plugin.rb

@@ -0,0 +1,27 @@
+class Caboose::RolePlugin < Caboose::CaboosePlugin
+
+  def self.admin_nav(nav, user, page)
+    return nav if user.nil? || !user.is_allowed('roles', 'view')
+       
+    item = {
+      'id' => 'roles',       
+      'text' => 'Roles',
+      'children' => []
+    }
+    if (user.is_allowed('roles', 'view'))
+      item['children'] << {
+        'href' => '/admin/roles', 
+        'text' => 'View All Roles'
+      }
+    end
+    if (user.is_allowed('roles', 'add'))
+      item['children'] << {
+        'href' => '/admin/roles/new', 
+        'text' => 'New Role'
+      }
+    end
+    nav << item
+    return nav
+  end
+  
+end