caboose-cms 0.9.133 → 0.9.134

data/app/models/caboose/schema.rb

@@ -170,7 +170,12 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :file                  , :attachment ],
         [ :file_upload_name      , :string     ],
         [ :image                 , :attachment ],
-        [ :image_upload_name     , :string     ]
+        [ :image_upload_name     , :string     ],
+        [ :status,            :string ],
+        [ :new_parent_id, :integer ],
+        [ :new_sort_order, :integer ],
+        [ :new_value, :text ],
+        [ :new_media_id              , :integer    ]
       ],
       Caboose::BlockType => [        
         [ :parent_id                       , :integer ],
@@ -520,7 +525,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :meta_robots           , :string  , { :default => 'index, follow'  }],
         [ :canonical_url         , :string  ],
         [ :fb_description        , :string  , { :limit => 300 }],
-        [ :gp_description        , :string  , { :limit => 300 }]
+        [ :gp_description        , :string  , { :limit => 300 }],
+        [ :status,                :string  ]
       ],
       Caboose::PageCache => [
         [ :page_id               , :integer ],
@@ -579,7 +585,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :updated_at           , :datetime   ],
         [ :image                , :attachment ],
         [ :slug                 , :string     ],        
-        [ :uri                  , :string     ]
+        [ :uri                  , :string     ],
+        [ :status               , :string     ]
       ],      
       Caboose::PostCategory => [
         [ :site_id  , :integer ],

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

@@ -2,7 +2,6 @@
 @nav = Caboose.plugin_hook('admin_nav', [], @logged_in_user, @page, @site)
 return_url = session[:caboose_station_return_url].nil? ? '/' : session[:caboose_station_return_url]
 return_url = '/' if return_url.starts_with?('/admin/') || return_url == '/admin'
-
 width = 200
 @nav.each {|item| width = 400 if item['id'] == @tab } if @tab
 %>

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

@@ -9,7 +9,6 @@
 <%= stylesheet_link_tag "caboose/modal_inline" %>
 <%= stylesheet_link_tag "caboose/icomoon_fonts" %>
 <% end %>
-
 <% content_for :caboose_js do %>
 <%= javascript_include_tag 'jquery-ui' %>
 <%= javascript_include_tag 'caboose/model/all' %>
@@ -20,12 +19,19 @@
 <% if @site && @site.use_dragdrop %>
 <%= javascript_include_tag 'caboose/block_content_controller_dragdrop' %>
 <%= javascript_include_tag "caboose/block_modal_controllers/block_dd_modal_controller" %>
+<script>window.CKEDITOR_BASEPATH = '//d9hjv462jiw15.cloudfront.net/ckeditor/';</script>
+<%= javascript_include_tag "//d9hjv462jiw15.cloudfront.net/ckeditor/ckeditor.js" %>
 <% else %>
 <%= javascript_include_tag 'caboose/block_content_controller' %>
 <%= javascript_include_tag "caboose/block_modal_controllers/block_modal_controller" %>
 <% end %>
 <script type='text/javascript'>
 
+function hide_caboose_notice() {
+  $("#caboose-notice").hide();
+  document.cookie = "caboose_page_publish=true; expires=Thu, 18 Dec 2030 12:00:00 UTC; path=/";
+}
+
 var controller = false;
 $(document).ready(function() {
   controller = new BlockContentController({
@@ -39,13 +45,24 @@ $(document).ready(function() {
   });
 
   $('body').append($('<div/>')        
-    .attr('id', 'tiny_header')
+    .attr('id', 'tiny_header')<% if @page.is_published %>.addClass('published')<% else %>.addClass('unpublished')<% end %>
+    .append("<span id='m-pub'>published</span>")
+    .append("<span id='m-unpub'>unpublished changes</span>")
     .append($('<a/>').attr('href', '/admin/pages').html("< Back"))
+    .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/revert').html("Revert"))
+    .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/preview').attr('target','_blank').html("Preview"))
+    .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/publish').html("Publish"))
+  <% if @page.page_custom_field_values.count > 0 %>
     .append($('<a/>').attr('href', '#').html('Custom Fields').click(function(e) { e.preventDefault(); caboose_modal_url('/admin/pages/<%= @page.id %>/custom-fields'); }))
+  <% end %>
     .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>').html("Page Settings"))
     .append($('<a/>').attr('href', '/<%= @page.uri %>').attr('target','_blank').text("View Page"))  
   );
 
+  <% if cookies[:caboose_page_publish].blank? %>
+  $('body').append($('<div/>').attr('id','caboose-notice').html("<a href='#' onclick='hide_caboose_notice();return false;'>x</a><p>NEW: Changes aren't saved until you click Publish. Click Preview to preview the edited page, or Revert to discard your changes.</p>"));
+<% end %>
+
 <% if @site && @site.use_dragdrop %>
   var html = "<%== (render :partial => 'caboose/pages/new_block_header').gsub( / *\n+/, '' ) %> ";
   $('body').append($('<div/>')

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

@@ -0,0 +1 @@
+ 

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

@@ -9,7 +9,6 @@
 <%= stylesheet_link_tag "caboose/modal_inline" %>
 <%= stylesheet_link_tag "caboose/icomoon_fonts" %>
 <% end %>
-
 <% content_for :caboose_js do %>
 <%= javascript_include_tag 'jquery-ui' %>
 <%= javascript_include_tag 'caboose/model/all' %>
@@ -20,12 +19,19 @@
 <% if @site && @site.use_dragdrop %>
 <%= javascript_include_tag 'caboose/block_content_controller_dragdrop' %>
 <%= javascript_include_tag "caboose/block_modal_controllers/block_dd_modal_controller" %>
+<script>window.CKEDITOR_BASEPATH = '//d9hjv462jiw15.cloudfront.net/ckeditor/';</script>
+<%= javascript_include_tag "//d9hjv462jiw15.cloudfront.net/ckeditor/ckeditor.js" %>
 <% else %>
 <%= javascript_include_tag 'caboose/block_content_controller' %>
 <%= javascript_include_tag "caboose/block_modal_controllers/block_modal_controller" %>
 <% end %>
 <script type='text/javascript'>
 
+function hide_caboose_notice() {
+  $("#caboose-notice").hide();
+  document.cookie = "caboose_post_publish=true; expires=Thu, 18 Dec 2030 12:00:00 UTC; path=/";
+}
+
 var controller = false;
 $(document).ready(function() {  
   controller = new BlockContentController({
@@ -39,12 +45,21 @@ $(document).ready(function() {
   });
 
   $('body').append($('<div/>')        
-    .attr('id', 'tiny_header')
+    .attr('id', 'tiny_header')<% if @post.is_published %>.addClass('published')<% else %>.addClass('unpublished')<% end %>
+    .append("<span id='m-pub'>published</span>")
+    .append("<span id='m-unpub'>unpublished changes</span>")
     .append($('<a/>').attr('href', '/admin/posts').html("< Back"))
+    .append($('<a/>').attr('href', '/admin/posts/<%= @post.id %>/revert').html("Revert"))
+    .append($('<a/>').attr('href', '/admin/posts/<%= @post.id %>/preview-post').attr('target','_blank').html("Preview"))
+    .append($('<a/>').attr('href', '/admin/posts/<%= @post.id %>/publish').html("Publish"))
     .append($('<a/>').attr('href', '/admin/posts/<%= @post.id %>').html("Post Settings"))
-    .append($('<a/>').attr('href', '<%= @post.uri %>').attr('target','_blank').html("View Post"))     
+    .append($('<a/>').attr('href', '<%= @post.uri %>').attr('target','_blank').text("View Post"))  
   );
 
+<% if cookies[:caboose_post_publish].blank? %>
+  $('body').append($('<div/>').attr('id','caboose-notice').html("<a href='#' onclick='hide_caboose_notice();return false;'>x</a><p>NEW: Changes aren't saved until you click Publish. Click Preview to preview the edited post, or Revert to discard your changes.</p>"));
+<% end %>
+
 <% if @site && @site.use_dragdrop %>
   var html = "<%== (render :partial => 'caboose/pages/new_block_header').gsub( / *\n+/, '' ) %> ";
   $('body').append($('<div/>')

data/app/views/caboose/posts/admin_preview_post.html.erb

@@ -0,0 +1 @@
+ 

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

@@ -38,7 +38,7 @@ if protocol == 'https://'
   js.gsub!("<script src=\"http://", "<script src=\"https://")
   js.gsub!("<script src='http://" , "<script src='https://")
 end
-
+@nav = Caboose.plugin_hook('admin_nav', [], @logged_in_user, @page, @site)
 %><!DOCTYPE html> 
 <html class="no-js" lang="en">
 <head>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.133'
+  VERSION = '0.9.134'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.133
+  version: 0.9.134
 platform: ruby
 authors:
 - William Barry
@@ -1072,6 +1072,7 @@ files:
 - app/views/caboose/pages/admin_edit_seo.html.erb
 - app/views/caboose/pages/admin_index.html.erb
 - app/views/caboose/pages/admin_new.html.erb
+- app/views/caboose/pages/admin_preview.html.erb
 - app/views/caboose/pages/admin_sitemap.html.erb
 - app/views/caboose/pages/show.html.erb
 - app/views/caboose/pages/test.html.erb
@@ -1096,6 +1097,7 @@ files:
 - app/views/caboose/posts/admin_edit_preview.html.erb
 - app/views/caboose/posts/admin_index.html.erb
 - app/views/caboose/posts/admin_new.html.erb
+- app/views/caboose/posts/admin_preview_post.html.erb
 - app/views/caboose/posts/detail.html.erb
 - app/views/caboose/posts/index.html.erb
 - app/views/caboose/posts/show.html.erb