caboose-cms 0.2.89 → 0.2.90

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YThmMzlhZTFiOWJiZWUxM2E4MDg3ZGQ5NzdhZjZjZWQ1ZjI3YTE3MA==
+    YzQ4ZjEzOGFlZmM3OWUzYjI0MDZkY2Q2ODIxYTdlOTNjMjQ2NDE4OQ==
   data.tar.gz: !binary |-
-    ODIxMDVmNDQ4OGRkZTEwZDUyZjVhNjVkMTk3NjYzOTZkMmI1ZWFiZg==
+    YWMwODQ0OTZmMjgxMDkwMTc0M2VmYzJiMzg0MDBiNThkNDJmODBkYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmQwYjJiNzE1ZGNhOTAwNWFkOGYxYmIyNWVjYzljZGY3N2ZhM2Q2N2ZhMWU2
-    YWE5ZTY2ZTI4ZDFiNGM2MmM5NDJjNDgzODdiZjA3MmIzNDM0YzIzOGQyOTRk
-    MWE0ZDJmNDQxZjZiY2E1ZDNkMmE3ZmNlZTUxNDBhMzg5MjlkNmM=
+    ZDQ5ZDBkZGZmNTA1Njk4Y2Y2N2RkZDNjYjcyYmU1MjE5ODA4MDRmYTJlNGMy
+    ZDkzNGZhMTM5Yjc5ODk5YzE0ODY5YmUzOWUxOTcyZjVlMTkyODg5ODFjZWY0
+    NzJhMjlmZjdlYzhjN2YzNzRjNTM4NzM4OTI3NTRhYTBhYTBlOGQ=
   data.tar.gz: !binary |-
-    NGZlZmJhYzFlZWJiOTk2MGU4OGU1OTE5MDdkNTAxMTRhM2RmYTMxNzhjNTE1
-    YmM5N2YzYjI3MGZkNDcxYTk0ODhiN2Q4ZTA0ZjlhZDlhNGUzYTRhYWYxMWFi
-    MDdmNDcyZDEzZGYxZmJkZjNkN2IwYzNmMWY3MWU1YzdjOGJhMzU=
+    ZDAzODYzZjBlNzQ2OWQwNWZiMTA2OTk4NWFlMThjOGJkZjUxMDVlMWE2Y2Q5
+    NjIyNjI3Mjg2MmJiMTBhODY1MGM0ZmFmNzUyMjI5OTZlNmY5OWQ3ZjE5OTRh
+    OGNlMzc5YzEwODczZjBiZDdkZDllZmY2Mzk2NDdhNDAwODJmZTI=

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

@@ -66,6 +66,21 @@ function caboose_modal(el)
   });  
 }
 
+function caboose_modal_url(url)
+{
+  $.colorbox({
+    href: url,
+    iframe: true,
+    innerWidth: 200,
+    innerHeight:  50,
+    scrolling: false,
+    transition: 'fade',
+    closeButton: false,
+    onComplete: caboose_fix_colorbox,
+    opacity: 0.50       
+  });
+}
+
 function caboose_fix_colorbox() {
   var padding = 21; // 21 is default
   $("#cboxTopLeft"      ).css('background', '#111');

data/app/controllers/caboose/application_controller.rb

@@ -69,7 +69,7 @@ module Caboose
     def user_is_allowed(resource, action)
       if (!logged_in?)
         redirect_to "/login?return_url=" + URI.encode(request.fullpath)
-        return
+        return false
       end
       
       @user = logged_in_user
@@ -82,6 +82,15 @@ module Caboose
       return true    
     end
     
+    # Redirects to login if not logged in.
+    def verify_logged_in
+      if (!logged_in?)
+        redirect_to "/login?return_url=" + URI.encode(request.fullpath)
+        return false
+      end      
+      return true    
+    end
+    
     # Removes a given parameter from a URL querystring
     def reject_param(url, param)
       arr = url.split('?')

data/app/models/caboose/core_plugin.rb

@@ -2,15 +2,18 @@ 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
+        
+    nav << { 'id' => 'logout'       , 'text' => 'Logout'     , 'href' => '/logout'     , 'modal' => false }    
+    nav << { 'id' => 'my-account'   , 'text' => 'My Account' , 'href' => '/my-account' , 'modal' => true }
+        
+    #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',

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

@@ -1,19 +1,46 @@
 
 <%= render :partial => 'caboose/pages/admin_header' %>
 
-<p>URI: /<span id='uri'><%= @page.uri %></span></p>
-<p><div id='page_<%= @page.id %>_title'                 ></div></p>
-<p><div id='page_<%= @page.id %>_menu_title'            ></div></p>
-<p><div id='page_<%= @page.id %>_parent_id'             ></div></p>     
-<p><div id='page_<%= @page.id %>_slug'                  ></div></p>                              
-<p><div id='page_<%= @page.id %>_alias'                 ></div></p> 
-<p><div id='page_<%= @page.id %>_redirect_url'          ></div></p>
-<p><div id='page_<%= @page.id %>_hide'                  ></div></p>  
-<p><div id='page_<%= @page.id %>_layout'                ></div></p>
-<p><div id='page_<%= @page.id %>_custom_sort_children'  ></div></p>
-<p><div id='page_<%= @page.id %>_content_format'        ></div></p>
+<p class='uri'>URI: /<span id='uri'><%= @page.uri %></span></p>
+<div class='field_with_explanation'><div id='page_<%= @page.id %>_title'                 ></div><span class='explanation'>The title of the page.</span></div>
+<div class='field_with_explanation'><div id='page_<%= @page.id %>_menu_title'            ></div><span class='explanation'>The menu title is an abbreviated form of the title that is used in navigation menus and crumb trails.</span></div>
+<div class='field_with_explanation'><div id='page_<%= @page.id %>_parent_id'             ></div><span class='explanation'>This page's parent page.</span></div>
+<div class='field_with_explanation'><div id='page_<%= @page.id %>_slug'                  ></div><span class='explanation'>The portion of the URL that this page represents.</span></div>
+<div class='field_with_explanation'><div id='page_<%= @page.id %>_alias'                 ></div><span class='explanation'>Starts the URL over at the domain root.</span></div>
+<div class='field_with_explanation'><div id='page_<%= @page.id %>_redirect_url'          ></div><span class='explanation'>If the redirect URL field is set, then this page will simply redirect to that URL instead of showing the page itself.</span></div>
+<div class='field_with_explanation'><div id='page_<%= @page.id %>_hide'                  ></div><span class='explanation'>Whether or not this page is displayed in the menu.</span></div>
+<div class='field_with_explanation'><div id='page_<%= @page.id %>_layout'                ></div><span class='explanation'>Specify a specific layout file for this page.</span></div>
+<div class='field_with_explanation'><div id='page_<%= @page.id %>_custom_sort_children'  ></div><span class='explanation'>Sort child pages alphabetically or custom.</span></div>
+<div class='field_with_explanation'><div id='page_<%= @page.id %>_content_format'        ></div><span class='explanation'>Specify whether or not you want to embed ruby code in your page.</span></div>
 
 <%= render :partial => 'caboose/pages/admin_footer' %>
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+
+p.uri {
+  background: #efefef;
+  border: #999 1px solid;
+  padding: 10px;
+  position: absolute;
+  top: 67px;
+  left: 0;
+  height: 16px;
+}
+
+div.field_with_explanation {
+  width: 420px;
+  background: #efefef;
+  margin-bottom: 12px;
+}
+
+span.explanation {
+  display: block;
+  padding: 8px;    
+}
+
+</style>
+<% end %>
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.89'
+  VERSION = '0.2.90'
 end

metadata

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