caboose-cms 0.4.31 → 0.4.32

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODVhZTZhODgyYWQ1NTVhNTdkODkxMmUzMTQ4OWRkMzQ1ZjBkMGNmZQ==
+    MDdmYzgxOTllZTExZDEyYTFhMDE1ZmM5OTExNGE0NTg3MTQzNzJlMg==
   data.tar.gz: !binary |-
-    ZDYwN2Q2Mjg3MTEzOGIwMDBlZTY1ZjBkMzQxOTZlYjk3YzNkMzFjOA==
+    Mjc1ZGJjNDQyYzQ3MTNiNDNkOGZjMjdkOTEyYzRkOTkwYWRkOTRkYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGYyYWEyNTlmZjNjM2Q5YWU1NzMxOWJkMDJmNjRiZTFmMjAwZjQwZjBkMGZk
-    NTY1Njc0MmQ5ZTQ1NWNjMTBiNmU1OTFlZTA4NTZhYjVmMjRlZmUzM2Y3Mjcw
-    MDJmOTQ1NDAwYTAwZjQ5NzhlMWZmNzczZTQ4YTk2Y2JmYjA5M2E=
+    NWQ3NDFkZWY5NDNlMWY5OTBhYTgyZTkzZTQzMmRhNGQ2MmYwOGU2ZjJkYTYx
+    MDg3ZmM2Y2Y0MmI1N2Q3NTdmNGM1MWEwZmYyNDIyNzk4NjA1ODVmMjQzYmI1
+    MWI4YWFhMmRjNTUyMThkMWQ1NzVmOGEzOTZlYTdhNzc1MTg1ODg=
   data.tar.gz: !binary |-
-    NDMzMDVhNTAyN2I0OWZiZGQyZTQ3OWM5NzYyODVmOTMzMzBjMWQzZmFlMzJk
-    YmQxOTVmMTlhMjdlOGE0NmZmODI1MDIyZjg4NWM5NmZkZDU0MGZkNDkxM2Ji
-    ODM1ZDc1ZDIwMjUzMjViNTU0NmRmOGE2OGEyMjUzZjUxOTIwZmI=
+    OWIwOWI4MzJlOGJhODIxYWFmM2YzNTc2YmZhZmE4ZTc2YWY2N2JlNmVjN2Uz
+    NGM4NzRlNDhiMmJkNzg5YTY1MDEwNmY1YzliYTZkNjU2MjA4NDMxMGIyNmJm
+    NzRiOGNjNjlkZGFhYjc4YjE3NDhiYjk2MDQyY2FkMDAyZDkyYTg=

data/app/controllers/caboose/admin_controller.rb

@@ -4,7 +4,10 @@ module Caboose
       
     # GET /admin
     def index
-      redirect_to '/admin/pages' if logged_in?
+      if logged_in?
+        redirect_to '/admin/pages'
+        return
+      end      
       @return_url = params[:return_url].nil? ? '/station' : params[:return_url]
     end
     

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

@@ -24,10 +24,6 @@
 <% end %>
 
 <% content_for :caboose_js do %>
-<%
-#= javascript_include_tag "jquery.ui.all" 
-#= javascript_include_tag "caboose/model/all" 
-%>
 <%= javascript_include_tag 'caboose/admin_page_edit_content' %>
 <script type='text/javascript'>
 
@@ -36,9 +32,10 @@ $(document).ready(function() {
   controller = new PageContentController(<%= @page.id %>);
 
   $('body').append($('<div/>')        
-    .attr('id', 'tiny_header')    
-    .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/edit').html("< Back"))    
-    .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/layout').html("Layout"))    
+    .attr('id', 'tiny_header')
+    .append($('<a/>').attr('href', '/admin/pages').html("< Back"))
+    .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/layout').html("Page Layout"))
+    .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/edit').html("Page Settings"))        
   );    
 });
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.31'
+  VERSION = '0.4.32'
 end

metadata

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