caboose-cms 0.2.66 → 0.2.67

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWE0ODhjNDY0ODZlNzQzNGY5ZGU2MGQ3MjEwMmVkMDgyNDUzYjdhNQ==
+    YmE4OWQ0Yjg0YjBjMGU3MmJmYzA2YTBlMWE2MGQzZTc1YTE3ZjVmMg==
   data.tar.gz: !binary |-
-    NjNiNjE2NTk5ZmM0OTk2OGE3ZjM4MTQ0ZWYxYTQ3NGUzZDk0Yjc2MA==
+    NjljYTk5ODI0MjhiMjhkMGEyZjdiMGZkYzg1OThiMmY1NTZhNDc1MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2I2OTIwMDQ0ZTQ4YjQ1MmEwZjc4NDBhOTZiODYyY2M5NWNhN2M1MjNlMGYy
-    MmI2MmI4ZTRhYjZlNDRhODg0ZTg1YmZkOGJhOTNjYjMwMmNiMGQ5OWQyMWQ0
-    NDFmMmI4M2RjZjg0NDA5NzYyZGZmOTFiNzg3ZjQ4NTUxNGE2NWE=
+    ZWVhMTI4ZmU3OWYyYmZkYTQ5MzE1MWUxYjQ5NTQzN2JmNjczNjAxNDBlNmRh
+    NWIyNGUxYWRlNDU1OTZmOWYxNzUyYjYyMjkwNzMzOTUyNDNlNDZjMWE4ZWZh
+    NjMyYzA5MGYxMjc3NDJlOTQzY2ZhY2VmNGI0ZmRiNTMxYmU2YTY=
   data.tar.gz: !binary |-
-    ZTNjNTBmZGIwYjljMDNkY2JiM2ZlOWE4NWE0NWM5YTZjMDE3YmM0Y2EzMzUz
-    Nzk0NDJmOGYzNWZlMWE0NGM4NDEzNzM2YWVhYzNiNmZiYmQ5ODRmNzkzYjA0
-    YzM4MjFjMzBkYzc1YzU3MjdmN2E0MzBmOTc5ZTdkYzg3ZTdkM2I=
+    ZTM5ZTFkNmE3NDViYTgyNDkyYjgzZjY2ZTg0Mzk0YzA2MWRiYjEzN2YxZGFm
+    ZDgxMzExOTM4ZTA4NmI5OGQ2OWQzOTJiZWFlODdkYWEwYjgzM2U1NmFiZTNj
+    OWI0YjVhZTYxZjY4NjhkZjhhZjk3ZmJmOWVlMDI3OTNiNGE4ZTY=

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

@@ -40,7 +40,7 @@ CabooseStation.prototype = {
   
   subnav: function(id, href)
   {
-    this.modal.set_width(400);
+    //this.modal.set_width(400);
     
     $('#station > ul > li').each(function(i, li) {
       id2 = $(li).attr('id').replace('nav_item_', '');
@@ -54,7 +54,11 @@ CabooseStation.prototype = {
     $('#station ul li#nav_item_' + id + ' ul').show();
     
     // Set the height of the selected subnav
-    var height = $('#station > ul').height();
-    $('#station ul li#nav_item_' + id + ' ul').height(height);
+    var h = $('#station ul li.selected ul').outerHeight(true);
+    var h2 = $('#station').outerHeight(true);
+    if (h2 > h) h = h2    
+    $('#station ul li#nav_item_' + id + ' ul').height(h);
+        
+    this.modal.resize(400, h);        
   }  
 };

data/app/controllers/caboose/roles_controller.rb

@@ -1,6 +1,6 @@
 module Caboose
   class RolesController < ApplicationController
-    layout 'caboose/modal'
+    layout 'caboose/admin'
     
     def before_action
       @page = Page.page_with_uri('/admin')

data/app/controllers/caboose/users_controller.rb

@@ -1,7 +1,7 @@
 
 module Caboose
   class UsersController < ApplicationController
-    layout 'caboose/modal'
+    layout 'caboose/admin'
       
     def before_action
       @page = Page.page_with_uri('/admin')

data/app/models/caboose/core_plugin.rb

@@ -0,0 +1,54 @@
+class Caboose::CorePlugin < Caboose::CaboosePlugin
+
+  def self.admin_nav(nav, user, page)    
+    return nav if user.nil?
+    
+    item = {
+      'id' => 'profile',
+      'text' => 'Profile',
+      'children' => []
+    }    
+    item['children'] << { 'id' => 'my-account'   , 'text' => 'Edit Profile' , 'href' => '/my-account' , 'modal' => false }
+    item['children'] << { 'id' => 'logout'       , 'text' => 'Logout'       , 'href' => '/logout'     , 'modal' => false }        
+    nav << item
+    
+    item = {
+      'id' => 'core',
+      'text' => 'Settings',
+      'children' => []
+    }
+    
+    item['children'] << { 'id' => 'users'        , 'text' => 'Users'       , 'href' => '/admin/users'        , 'modal' => false } if user.is_allowed('users'       , 'view')
+    item['children'] << { 'id' => 'roles'        , 'text' => 'Roles'       , 'href' => '/admin/roles'        , 'modal' => false } if user.is_allowed('roles'       , 'view')
+    item['children'] << { 'id' => 'permissions'  , 'text' => 'Permissions' , 'href' => '/admin/permissions'  , 'modal' => false } if user.is_allowed('permissions' , 'view')
+    item['children'] << { 'id' => 'variables'    , 'text' => 'Variables'   , 'href' => '/admin/settings'     , 'modal' => false } if user.is_allowed('settings'    , 'view')
+        
+    nav << item if item['children'].count > 0
+    
+    item = {
+      'id' => 'content',
+      'text' => 'Content',
+      'children' => []
+    }
+    
+    item['children'] << { 'id' => 'pages'        , 'text' => 'Pages'       , 'href' => '/admin/pages'        , 'modal' => false } if user.is_allowed('pages'       , 'view')
+    item['children'] << { 'id' => 'posts'        , 'text' => 'Posts'       , 'href' => '/admin/posts'        , 'modal' => false } if user.is_allowed('posts'       , 'view')
+    
+    nav << item if item['children'].count > 0    
+    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/views/caboose/station/index.html.erb

@@ -24,8 +24,10 @@ $(document).ready(function() {
 
 <div id='station'>
   <ul>
+    <!--
     <li id='nav_item_logout'><a href='/logout'><span class='icon'></span><span class='text'>Logout</span></a>
     <li id='nav_item_myaccount'><a href='/my-account'><span class='icon'></span><span class='text'>My Account</span></a>
+    -->
     <% i = 0 %>
     <% @nav.each do |item| %>
       <% id = item['id'].nil? ? i.to_s : item['id'] %>

data/lib/caboose.rb

@@ -9,7 +9,7 @@ module Caboose
   @@assets_path = "assets"
   
   mattr_accessor :plugins
-  @@plugins = ['Caboose::UserPlugin', 'Caboose::RolePlugin', 'Caboose::PermissionPlugin', 'Caboose::PagePlugin', 'Caboose::SettingsPlugin']
+  @@plugins = ['Caboose::CorePlugin']
 
   # Any paths to modeljs javascript files  
   mattr_accessor :modeljs_js_files

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.66'
+  VERSION = '0.2.67'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.66
+  version: 0.2.67
 platform: ruby
 authors:
 - William Barry
@@ -193,23 +193,18 @@ files:
 - app/models/caboose/asset.rb
 - app/models/caboose/authenticator.rb
 - app/models/caboose/caboose_plugin.rb
+- app/models/caboose/core_plugin.rb
 - app/models/caboose/menu_block.rb
 - app/models/caboose/page.rb
 - app/models/caboose/page_bar_generator.rb
 - app/models/caboose/page_permission.rb
-- app/models/caboose/page_plugin.rb
 - app/models/caboose/pager.rb
 - app/models/caboose/permission.rb
-- app/models/caboose/permission_plugin.rb
 - app/models/caboose/post.rb
-- app/models/caboose/post_plugin.rb
 - app/models/caboose/role.rb
-- app/models/caboose/role_plugin.rb
 - app/models/caboose/setting.rb
-- app/models/caboose/settings_plugin.rb
 - app/models/caboose/std_class.rb
 - app/models/caboose/user.rb
-- app/models/caboose/user_plugin.rb
 - app/views/caboose/admin/index.html.erb
 - app/views/caboose/application/show.html.erb
 - app/views/caboose/extras/error.html.erb

data/app/models/caboose/page_plugin.rb

@@ -1,45 +0,0 @@
-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' => [],
-      'href' => '/admin/pages',
-      'modal' => false
-      #'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', 'modal' => false }
-    #
-    #	#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', 'modal' => true }
-    #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

@@ -1,27 +0,0 @@
-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/post_plugin.rb

@@ -1,28 +0,0 @@
-class Caboose::PostPlugin < Caboose::CaboosePlugin
-
-  def self.admin_nav(nav, user, page)    
-    return nav if user.nil? || !user.is_allowed('pages', 'view')
-    
-    item = {
-      'id' => 'posts', 
-      'text' => 'Posts',
-      'children' => []      
-      #'show_children_default' => true
-    }
-    item['children'] << { 
-      'href' => "/admin/posts",
-      'text' => 'New Post',
-      'modal' => true 
-    }
-    if (user.is_allowed('posts', 'add'))
-      item['children'] << { 
-        'href' => "/admin/posts/new",
-        'text' => 'New Post',
-        'modal' => true 
-      }
-    end    
-    nav << item
-    return nav
-  end
-  
-end

data/app/models/caboose/role_plugin.rb

@@ -1,28 +0,0 @@
-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',
-        'modal' => true
-      }
-    end
-    if (user.is_allowed('roles', 'add'))
-      item['children'] << {
-        'href' => '/admin/roles/new', 
-        'text' => 'New Role'
-      }
-    end
-    nav << item
-    return nav
-  end
-  
-end

data/app/models/caboose/settings_plugin.rb

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

data/app/models/caboose/user_plugin.rb

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