caboose-cms 0.2.62 → 0.2.64

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWFjMWM1MDg5OWE2NzQ2OGUwNGE2OTdiZTg5OTE2Y2ZhMDJlNTJkZg==
+    MzgwMDA5N2FjZjllMDg4YTU3NjNkYjQ0NGZhNTI3MmRlNmU2MGZhNQ==
   data.tar.gz: !binary |-
-    MDAwNTZkZDY4ODk1NjlmMWMxNGJkZjI4NDhlMGI3OGI5YTYxNDcxMA==
+    MTE0OWFlNmQwMGRkM2FkZmYxODNlYzRmZDFhOWNjYzY0MWViMDViZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Yjk4YmI4YmRjNWVkNjBkMTExYTVmZmQ0ZWRkNmFkYjJiYWNmMGI4MDE5ZjBh
-    NjhiMmFhNjQ5ODk1MjNhOTkzOTEwMTM2Y2VkZTkwNWRmYzI2ZTEzMjM4NmJk
-    YzYxZGIwZTdmNjcxYzlmYjA5YjljZWIyYmZlMzY2N2RhY2RiZjg=
+    Y2I2NzcwM2UzOWQ3OWUyZTNhZGFkY2ViYmNkYmQwNWI3ZGIyZGRlYjllZGU1
+    OTc2ZjBlMzg0MGE4MzUzZDE1ZGYwMDZjYTAzZTRhODkzM2U5NjNkNDc1Yjg1
+    NTUwODNiNjU1OGZiNjFjNzY1ZmQ4Njg3ODBlZDhmMGZlNjA5OTM=
   data.tar.gz: !binary |-
-    YTcwYjA2YzRmMzQ2OGU2N2RlZGRkN2ZmZTgzMmE5NzcwMjc5NGM3OGQ3NDhm
-    NjRlNWFmMTUwZTA2ODMxM2FkOTBjMTFjYTc0MzEzMjgwMGNhMzY0YmE3NTkw
-    NTFjMzZkNTM0NTY5ZjY3ZTg3ODI0MDY0MmEzNWNjNWMxNzJiY2M=
+    NjY2NzQ2Y2EwYjMzMDBlOWQyZDNlMjcyY2JlODY1MjBlNWVhZTMzYjVkNGFj
+    ODljNjlkNjNkOWM3ZDNjZjk2NzczMjJhNTA4ODMzNDBlZDUyYTJhOTY5OWMz
+    YmExNjcxMTBiYzdjZDEwOGUyNjVlMWRiNThkYmNlMWFkNDY4OWQ=

data/app/assets/javascripts/caboose/model/bound_richtext.js

@@ -39,7 +39,15 @@ BoundRichText = BoundControl.extend({
     
     setTimeout(function() { 
       var ed = tinymce.EditorManager.get(this2.el);
-      ed.on('blur', function(e) { this2.save(); }); 
+      ed.on('blur', function(e) { this2.save(); });
+      ed.on('keyup', function(e) {
+        tinymce.triggerSave();        
+        if (e.keyCode == 27) this2.cancel(); // Escape              
+        if ($('#'+this2.el).val() != this2.attribute.value_clean)
+          ed.getBody().style.backgroundColor = "#fff799";
+        else
+          ed.getBody().style.backgroundColor = "#fff";
+      });
     }, 1500);    
   },
   
@@ -97,6 +105,8 @@ BoundRichText = BoundControl.extend({
         this2.show_check(500);
         $('#'+this2.el).val(this2.attribute.value);
         $('#'+this2.el).removeClass('dirty');
+        var ed = tinymce.EditorManager.get(this2.el);
+        ed.getBody().style.backgroundColor = "#fff";
 
         if (this2.binder.success)
           this2.binder.success(this2);

data/app/assets/javascripts/caboose/model/bound_select.js

@@ -22,7 +22,7 @@ BoundSelect = BoundControl.extend({
       .css('position', 'relative')
     );
     $('#'+this.el+'_container').empty();
-    if (this.attribute.fixe_placeholder)
+    if (this.attribute.fixed_placeholder)
     {
       $('#'+this.el+'_container').append($('<div/>')
         .attr('id', this.placeholder)

data/app/assets/stylesheets/caboose/tinymce.css

@@ -23,3 +23,7 @@ h3 { font-size: inherit; }
 h4 { font-size: inherit; }
 h5 { font-size: inherit; }
 h6 { font-size: inherit; }
+
+body.dirty {
+  background: #fff799;  
+}

data/app/controllers/caboose/pages_controller.rb

@@ -309,23 +309,15 @@ module Caboose
       render json: resp
     end
     
-    def sitemap
-      parent_id = params[:parent_id]
-      top_page = Page.index_page
-      p = !parent_id.nil? ? Page.find(parent_id) : top_page
-      options = []
-      sitemap_helper2(top_page, options)		 	
-      @options = options
-    end
-
-    def sitemap_helper2(page, options, prefix = '')
-      options << { 'value' => page.id, 'text' => prefix + page.title }
-      page.children.each do |kid|
-        sitemap_helper(kid, options, prefix + ' - ')
-      end
+    # GET /admin/pages/1/sitemap
+    def admin_sitemap
+      return unless user_is_allowed('pages', 'delete')
+      @page = Page.find(params[:id])
+      render :layout => 'caboose/admin'
     end
 
-    def sitemap_options
+    # GET /admin/pages/sitemap-options
+    def admin_sitemap_options
       parent_id = params[:parent_id]
       top_page = Page.index_page
       p = !parent_id.nil? ? Page.find(parent_id) : top_page
@@ -342,7 +334,8 @@ module Caboose
       end
     end
 
-    def robots_options
+    # GET /admin/pages/robots-options
+    def admin_robots_options
       options = [
         { 'value' => 'index'      , 'text' => 'index'     },
         { 'value' => 'noindex'    , 'text' => 'noindex'   },
@@ -355,7 +348,8 @@ module Caboose
       render json: options 		
     end
 
-    def content_format_options
+    # GET /admin/pages/format-options
+    def admin_content_format_options
       options = [
         { 'value' => 'html', 'text' => 'html' },
         { 'value' => 'text', 'text' => 'text' },

data/app/models/caboose/page_bar_generator.rb

@@ -34,7 +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] }
-  		fix_desc  		  		
+  		fix_desc
   		@options['item_count'] = @options['model'].constantize.where(where).count  		  		
   	end
   	
@@ -149,35 +149,44 @@ module Caboose
     
     def where
       sql = []
-      values = []
+      values = []      
   	  @params.each do |k,v|
         next if v.nil? || v.length == 0
+        
+        sql2 = ""
         if k.ends_with?('_gte')
-          sql << "#{k[0..-5]} >= ?"
+          sql2 = "#{k[0..-5]} >= ?"
         elsif k.ends_with?('_gt')
-          sql << "#{k[0..-4]} > ?"
+          sql2 = "#{k[0..-4]} > ?"
         elsif k.ends_with?('_lte')
-          sql << "#{k[0..-5]} <= ?"
+          sql2 = "#{k[0..-5]} <= ?"
         elsif k.ends_with?('_lt')
-          sql << "#{k[0..-4]} < ?"
+          sql2 = "#{k[0..-4]} < ?"
         elsif k.ends_with?('_bw')
-          sql << "upper(#{k[0..-4]}) like ?"
-          v = "#{v}%".upcase
+          sql2 = "upper(#{k[0..-4]}) like ?"
+          v = v.kind_of?(Array) ? v.collect{ |v2| "#{v2}%".upcase } : "#{v}%".upcase          
         elsif k.ends_with?('_ew')
-          sql << "upper(#{k[0..-4]}) like ?"
-          v = "%#{v}".upcase
+          sql2 = "upper(#{k[0..-4]}) like ?"
+          v = v.kind_of?(Array) ? v.collect{ |v2| "%#{v2}".upcase } : "%#{v}".upcase
         elsif k.ends_with?('_like')
-          sql << "upper(#{k[0..-6]}) like ?"
-          v = "%#{v}%".upcase
-        else
-          sql << "#{k} = ?"
+          sql2 = "upper(#{k[0..-6]}) like ?"
+          v = v.kind_of?(Array) ? v.collect{ |v2| "%#{v2}%".upcase } : "%#{v}%".upcase
+        else          
+          sql2 = "#{k} = ?"
         end
-        values << v
+        
+        if v.kind_of?(Array)
+          sql2 = "(" + v.collect{ |v2| "#{sql2}" }.join(" or ") + ")"
+          v.each { |v2| values << v2 }
+        else              
+          values << v
+        end
+        sql << sql2                          
   	  end
   	  sql_str = sql.join(' and ')
   	  sql = [sql_str]  	   	  
-  	  values.each { |v| sql << v }  	  
-  	  return sql
+  	  values.each { |v| sql << v }        	  
+  	  return sql        	  
     end
     
     def limit

data/app/models/caboose/pager.rb

@@ -70,7 +70,7 @@ module Caboose
   		vars = get_vars()
   		page = @options["page"].to_i
   		
-  		Caboose.log(@options)
+  		#Caboose.log(@options)
   				
   		# Max links to show (must be odd) 
   		total_links = 5

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

@@ -1,9 +1,7 @@
 <% content_for :caboose_css do %>
-<%= stylesheet_link_tag "caboose/pages" %>
 <% end %>
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
-<%= javascript_include_tag "caboose/pages" %>
 <% end %>
 
 <h1>Edit Page</h1>
@@ -16,7 +14,7 @@ tabs = {
   "/admin/pages/#{@page.id}/js"          => 'Custom JS',
   "/admin/pages/#{@page.id}/seo"         => 'SEO',
   "/admin/pages/#{@page.id}/sitemap"     => 'Sitemap',
-  "/admin/pages/#{@page.id}/delete"      => 'Delete Product'
+  "/admin/pages/#{@page.id}/delete"      => 'Delete Page'
 }
 
 %>

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

@@ -0,0 +1,30 @@
+
+<%= render :partial => 'caboose/pages/admin_header' %>
+
+<div id='message'>
+<p class='note warning'>Are you sure you want to delet the page?  This can't be undone.<br /><br />
+<input type='button' onclick='delete_page(<%= @page.id %>, true);' />
+<input type='button' onclick="window.location='/admin/pages/<%= @page.id %>/edit';" />
+</p>
+</div>
+
+<%= render :partial => 'caboose/pages/admin_footer' %>
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+function delete_page(page_id, confirm)
+{
+  $('#message').html("<p class='loading'>Deleting page...</p>");
+  $.ajax({
+    url: '/admin/pages/' + page_id + '/delete',
+    type: 'delete',
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect
+    }
+  });
+}
+
+</script>
+<% end %>

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

@@ -1,6 +1,6 @@
 
-<style type='text/css'>
-#content li.hidden a { color: #990000; }
-</style>
+<%= render :partial => 'caboose/pages/admin_header' %>
 
-<%= raw pages_list(@page) %>
+<p><%= raw pages_list(@page) %></p>
+
+<%= render :partial => 'caboose/pages/admin_footer' %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.62'
+  VERSION = '0.2.64'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.62
+  version: 0.2.64
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -217,6 +217,7 @@ files:
 - app/views/caboose/login/index.html.erb
 - app/views/caboose/pages/_admin_footer.html.erb
 - app/views/caboose/pages/_admin_header.html.erb
+- app/views/caboose/pages/admin_delete.html.erb
 - app/views/caboose/pages/admin_edit_content.html.erb
 - app/views/caboose/pages/admin_edit_css.html.erb
 - app/views/caboose/pages/admin_edit_general.html.erb