caboose-cms 0.4.92 → 0.4.93

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjViNTc2NTVlNTk0MjE5NjJhY2ZiM2QwOGY5YWEzYjkwZDA4YzBkMw==
+    OGRlMzYwYTY4ZjJmNzc1YWU4NzYwNWQ1YmUyMGUyNDUzNTlkMTBlMg==
   data.tar.gz: !binary |-
-    NmI5NTUzY2VjNzY0OWMzZDYwNWY3Nzk3MDM1ZjE0MGQyZjJiMTkyOA==
+    OTRiZDg5MWY4ZGYyYTY5MjkzZTExNTljYjE3MTBmNTAxMGYyNjczMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWEzZDY3NWJkZWI5MDkxN2E5ODZjNTJhMjFhMmJjNDMwNmI0OTIwMmNlNmQx
-    ZWVjZTMwOTYyZDhmZTAyMDFmN2M1NzQxOGU3NTNlNTYwZGFmODZkMTkzYWUy
-    ZjAzM2ZmMmNhZDE1NWI3ZjE0MDlhMTk1MDcxMDQ4N2UxNTliOTY=
+    MDNkZjJiMmZlNTNjODRiNTdkMmUzNzA3ZjZhNzA5MGRmYmIwYWRjY2Y0ZGNj
+    NzMxNTYxN2M0ZmY0ZGFjNTliOGE4ZGM0YTRlZjhkOWE2NzYxODIzNmZmMGI1
+    NDA0NTZjMWQ0NmFjYWI1ZDUxOWI1ODBlNzg3Mzk3YzRlMzM1ZjU=
   data.tar.gz: !binary |-
-    OTE1OTQ0ZTczYTA5ZDI4MTFkYWEyZTQ1ZWVjMmNkOGQ1NjFkNzkwYTcxOThk
-    MmRiOWM5Y2EzYWQ5OGY1NmZiZjYyZGQ4NDIzMTFjYzI3NDRkNzA1MGI1Mjcx
-    N2Y3NDcyYjViZTYxNGQ3MGZlYWZlNzY0YzUwNGZlZmZmYmNlZDk=
+    Yjg5NjgxYjVmODkyNTA4NzhlYTVlZmJiY2E1NjgxOGRhMmRkYjhkMDQzNGQy
+    MDI4ZmE0Y2VlNjc1MDU3YWZmNmYxYWU2YmRjYTM0N2NmOTkzZDk5ODFkMTNm
+    MDJhZWQ5YjRjZTI1ZDM4OTBiZGQwMGMzZmI5NGQ0ODEzMzhmODk=

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

@@ -6,6 +6,8 @@
 //= require caboose/model/bound_control
 //= require caboose/model/bound_checkbox
 //= require caboose/model/bound_checkbox_multiple
+//= require caboose/model/bound_date
+//= require caboose/model/bound_time
 //= require caboose/model/bound_image
 //= require caboose/model/bound_s3_image
 //= require caboose/model/bound_file

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

@@ -25,6 +25,8 @@ Attribute.prototype = {
   download_text: false,
   upload_text: false,
   image_refresh_delay: false,
+  minute_increment: 15,
+  hour_increment: 1,  
   
   update_url: false,
   options_url: false,

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

@@ -0,0 +1,119 @@
+
+BoundDate = BoundControl.extend({
+
+  //el: false,
+  //model: false,
+  //attribute: false,
+  //binder: false,
+  
+  width: false,
+  save_attempts: 0,
+ 
+  init: function(params) {
+    for (var thing in params)
+      this[thing] = params[thing];
+    
+    this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;    
+    $('#'+this.el).wrap($('<div/>')
+      .attr('id', this.el + '_container')
+      .addClass('mb_container')
+      .css('position', 'relative')
+    );
+    $('#'+this.el+'_container').empty();
+    $('#'+this.el+'_container').append($('<input/>')
+      .attr('id', this.el)
+      .attr('type', 'text')
+      .attr('placeholder', this.attribute.fixed_placeholder ? 'empty' : this.attribute.nice_name)
+      .css('text-align', this.attribute.align)
+      .val(this.attribute.value)
+    );
+    
+    if (this.attribute.fixed_placeholder)      
+      $('#'+this.el+'_container').append($('<div/>').attr('id', this.el + '_placeholder').addClass('mb_placeholder').append($('<span/>').html(this.attribute.nice_name + ': ')));    
+    if (this.attribute.width)  $('#'+this.el).css('width' , this.attribute.width);
+    if (this.attribute.fixed_placeholder)
+    {
+      var w = $('#'+this.el+'_placeholder').outerWidth();
+      $('#'+this.el).attr('placeholder', 'empty').css('padding-left', '+=' + w).css('width', '-=' + w);
+    }
+    
+    var this2 = this;
+    $('#'+this.el).on('keyup', function(e) {
+      if (e.keyCode == 27) this2.cancel(); // Escape 
+      if (e.keyCode == 13) this2.save();   // Enter
+      
+      if ($('#'+this2.el).val() != this2.attribute.value_clean)
+        $('#'+this2.el).addClass('mb_dirty');
+      else
+        $('#'+this2.el).removeClass('mb_dirty');
+    });                             
+    $('#'+this.el).on('blur', function() {
+      if (this2.save_attempts < 1)
+      {
+        this2.save_attempts++;
+        this2.save();
+      }      
+    });
+    $('#'+this.el).css('z-index', 21);
+    $('#'+this.el).css('position', 'relative');
+    $('#'+this.el).css('background', 'transparent');
+    $('#'+this.el).datepicker({
+      onSelect: function() { this2.save(); }      
+    });    
+  },
+  
+  save: function() {
+    this.attribute.value = $('#'+this.el).val();
+    if (this.attribute.value == this.attribute.value_clean)
+      return;
+    
+    this.show_loader();        
+    var this2 = this;
+    
+    this.model.save(this.attribute, function(resp) {
+      this2.save_attempts = 0;
+      if (resp.error)
+      {
+        this2.hide_loader();
+        this2.error(resp.error);
+      }
+      else
+      {
+        this2.show_check(500);
+        $('#'+this2.el).val(this2.attribute.value);
+        $('#'+this2.el).removeClass('mb_dirty');
+
+        if (this2.binder.success)
+          this2.binder.success(this2);
+      }
+    });
+  },
+  
+  cancel: function() {
+    if (this.attribute.before_cancel) this.attribute.before_cancel();    
+    this.attribute.value = this.attribute.value_clean;
+    $('#'+this.el).val(this.attribute.value);
+    $('#'+this.el).removeClass('mb_dirty');
+    
+    if ($('#'+this.el+'_check').length)
+      this.hide_check();
+    
+    if (this.attribute.after_cancel) this.attribute.after_cancel();
+  },
+    
+  error: function(str) {
+    if (!$('#'+this.el+'_message').length)
+    {
+      $('#'+this.el+'_container').append($('<div/>')
+        .attr('id', this.el + '_message')
+        .css('width', $('#'+this.el).outerWidth())
+      );
+    }
+    $('#'+this.el+'_message').hide();
+    $('#'+this.el+'_message').html("<p class='note error'>" + str + "</p>");
+    $('#'+this.el+'_message').slideDown();
+    var this2 = this;
+    setTimeout(function() { $('#'+this2.el+'_message').slideUp(function() { $(this).empty(); }); }, 3000);
+  }
+  
+});

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

@@ -20,6 +20,7 @@ BoundRichText = BoundControl.extend({
       .css('position', 'relative')
     );
     $('#'+this.el+'_container').empty();
+    $('#'+this.el+'_container').append($('<div/>').attr('id', this.el + '_message'));
     $('#'+this.el+'_container').append($('<textarea/>').attr('id', this.el).attr('class', 'tinymce').attr('placeholder', 'empty').val(this.attribute.value));
     //$('#'+this.el+'_container').append($('<div/>').attr('id', this.el + '_placeholder').addClass('placeholder').append($('<span/>').html(this.attribute.nice_name + ': ')));
     if (this.attribute.width)  $('#'+this.el).css('width'  , this.attribute.width);
@@ -28,67 +29,49 @@ BoundRichText = BoundControl.extend({
     $('#'+this.el).attr('placeholder', 'empty').css('padding-top', '+=' + h).css('height', '-=' + h);
     
     var this2 = this;
-    //$('#'+this.el).on('keyup', function(e) {
-    //  if (e.keyCode == 27) this2.cancel(); // Escape 
-    //  //if (e.keyCode == 13) this2.save();   // Enter
-    //  
-    //  if ($('#'+this2.el).val() != this2.attribute.value_clean)
-    //    $('#'+this2.el).addClass('dirty');
-    //  else
-    //    $('#'+this2.el).removeClass('dirty');
-    //});
     
     setTimeout(function() {      
-      tinymce.execCommand("mceAddEditor", false, this2.el);
+      //tinymce.execCommand("mceAddEditor", false, this2.el);
       var ed = tinymce.EditorManager.createEditor(this2.el);            
-      
-      //var ed = tinymce.EditorManager.get(this2.el);
-      //if (!ed)
-      //{        
-      //  tinymce.execCommand("mceAddEditor", false, this2.el);
-      //  ed = tinymce.EditorManager.createEditor(this2.el);
-      //}
-      
-      //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";
-      //});
+      //var ed = new tinymce.Editor(this2.el, {
+      //    setup: function (editor) {
+      //      editor.on('init', function (e) { alert('Test'); });  
+      //    }
+      //  }, tinymce.Editormanager);
+      //editor.on('init', function (e) { alert('Test'); });                    
+      //ed.on('NodeChange', this2.tinymce_change);            
+      //ed.on('click', function(e) { alert('tinymce was clicked'); });
+      //ed.render();
     }, 100);    
   },
   
+  tinymce_change: function(ed) {    
+    if (ed.getContent() == this.attribute.value_clean)      
+      ed.getBody().style.backgroundColor = "#fff";
+    else
+      ed.getBody().style.backgroundColor = "#fff799";
+  },
+  
   save: function() {
     var ed = tinymce.activeEditor;
-    el = ed.getElement();
-    $(el).val(ed.getContent());
-    
-    //ed.remove();      
-    //tinymce.triggerSave();
+    $('#'+this.el).val(ed.getContent());
                    
     this.attribute.value = $('#'+this.el).val();    
     if (this.attribute.value == this.attribute.value_clean)
-      return;
-            
+      return;    
+    
     var this2 = this;
-    this.model.save(this.attribute, function(resp) {
+    this.model.save(this.attribute, function(resp) {        
       if (resp.error)
-      {
-        this2.hide_loader();
-        this2.error(resp.error);
+      {        
+        alert(resp.error);        
       }
       else
-      {
-        tinymce.activeEditor.remove();
-        this2.show_check(500);
+      {                
         $('#'+this2.el).val(this2.attribute.value);
-        $('#'+this2.el).removeClass('mb_dirty');
-        //var ed = tinymce.EditorManager.get(this2.el);
-        //ed.getBody().style.backgroundColor = "#fff";
-
+        ed.setContent(this2.attribute.value);                        
+        ed.getBody().style.backgroundColor = "#fff";
+                      
         if (this2.binder.success)
           this2.binder.success(this2);
       }
@@ -96,16 +79,15 @@ BoundRichText = BoundControl.extend({
   },
   
   cancel: function() {    
-    if (this.attribute.before_cancel) this.attribute.before_cancel();
+    if (this.attribute.before_cancel)
+      this.attribute.before_cancel();
+    
     this.attribute.value = this.attribute.value_clean;
     $('#'+this.el).val(this.attribute.value);
-    $('#'+this.el).removeClass('mb_dirty');
-    
-    if ($('#'+this.el+'_check').length)
-      this.hide_check();
-
-    tinymce.activeEditor.remove();        
-    if (this.attribute.after_cancel) this.attribute.after_cancel();
+            
+    var ed = tinymce.activeEditor;
+    ed.setContent(this.attribute.value);        
+    ed.getBody().style.backgroundColor = "#fff";
   },
     
   error: function(str) {

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

@@ -0,0 +1,177 @@
+
+BoundTime = BoundControl.extend({
+
+  //el: false,
+  //model: false,
+  //attribute: false,
+  //binder: false,
+  
+  message: false,
+  placeholder: false,
+ 
+  init: function(params) {    
+    for (var thing in params)
+      this[thing] = params[thing];
+    
+    this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;
+    this.message = this.el + '_message';
+    this.placeholder = this.el + '_placeholder';
+         
+    $('#'+this.el).wrap($('<div/>')
+      .attr('id', this.el + '_container')
+      .addClass('mb_container')
+      .css('position', 'relative')
+    );
+    $('#'+this.el+'_container').empty();
+    if (this.attribute.fixed_placeholder == true)
+    {
+      $('#'+this.el+'_container').append($('<div/>')
+        .attr('id', this.placeholder)
+        .addClass('mb_placeholder')
+        .append($('<span/>')
+          .html(this.attribute.nice_name + ': ')
+        )
+      );
+    }
+    var this2 = this;
+    $('#'+this.el+'_container').append($('<input/>')
+      .attr('type', 'text')
+      .attr('id', this.el)
+      .addClass('mb_fake_option')
+      .attr('placeholder', this.attribute.empty_text)
+      .click(function() { this2.edit(); })
+      .val(this.attribute.text && this.attribute.text.length > 0 ? this.attribute.text : this.attribute.empty_text)
+    );
+    if (this.attribute.width)
+      $('#'+this.el).css('width', this.attribute.width);
+    
+    if (this.attribute.fixed_placeholder)
+    {
+      var w = $('#'+this.placeholder).outerWidth();
+      $('#'+this.el)
+        .css('padding-left', '+=' + w)
+        .css('width', '-=' + w);
+    }
+       
+    // Populate options manually      
+    this.attribute.options = []
+    $.each(['am', 'pm'], function(i, ampm) {
+      for (var hour = 0; hour < 12; hour += this2.attribute.hour_increment) {       
+        for (var min = 0; min < 60; min += this2.attribute.minute_increment) {          
+          h = hour == 0 ? '12' : (hour < 10 ? '0' + hour : '' + hour);
+          m = min < 10 ? '0' + min : '' + min;
+          t = '' + h + ':' + m + ' ' + ampm;
+          this2.attribute.options.push({ value: t, text: t });          
+        }
+      }
+    });
+    
+    var select = $('<select/>')
+      .attr('id', this2.el + '_select')
+      .addClass('mb_fake')
+      .css('width', $('#'+this2.el).outerWidth())        
+      .on('change', function() {
+        $('#'+this2.el).val($('#'+this2.el+'_select').val());
+        this2.save();                     
+      });        
+    // Make sure the existing value is in the list of options
+    var exists = false;
+    $.each(this2.attribute.options, function(i, option) {
+      if (option.value == this2.attribute.value)
+      {
+        exists = true;
+        return false;
+      }
+    });
+    if (!exists)
+      this2.attribute.options.unshift({ 
+        value: this2.attribute.value,
+        text: this2.attribute.text
+      });
+    
+    $.each(this2.attribute.options, function(i, option) {
+      var opt = $('<option/>')
+        .val(option.value)
+        .html(option.text);
+      if (option.value == this2.attribute.value)
+      {
+        this2.attribute.text = option.text;
+        $('#'+this2.el).val(this2.attribute.text);
+        opt.attr('selected', 'true');
+      }
+      select.append(opt);
+    });      
+    $('#'+this2.el+'_container').append(select);
+    $('#'+this2.el+'_select').css('width', $('#'+this2.el).outerWidth());
+  },
+             
+  //update_options: function() {    
+  //  var that = this;
+  //  this.attribute.populate_options(function() {          
+  //    var select = $('<select/>')
+  //      .attr('id', that.el + '_select')
+  //      .addClass('fake')
+  //      .css('width', $('#'+that.el).outerWidth())
+  //      .on('change', function() {
+  //        $('#'+that.el).val($('#'+that.el+'_select').val());
+  //        that.save();                     
+  //      });
+  //          
+  //    $.each(that.attribute.options, function(i, option) {      
+  //      var opt = $('<option/>')
+  //        .val(option.value)
+  //        .html(option.text);
+  //      if (option.value == that.attribute.value)
+  //        opt.attr('selected', 'true');
+  //      select.append(opt);
+  //    });
+  //    
+  //    if ($('#' + that.el + '_select').length) 
+  //      $('#' + that.el + '_select').remove();
+  //    
+  //    $('#'+that.el+'_container').append(select);    
+  //    $('#'+that.el+'_select').css('width', $('#'+that.el).outerWidth());
+  //  });
+  //},
+  
+  view: function() {
+    
+  },
+    
+  edit: function() {        
+  },
+  
+  save: function() {
+    this.attribute.value = $('#'+this.el).val();
+    var this2 = this;
+    this.model.save(this.attribute, function(resp) {      
+      $(this2.attribute.options).each(function(i,opt) {
+        if (opt.value == this2.attribute.value)
+          this2.attribute.text = opt.text;        
+      });
+      if (this2.attribute.text)
+        $('#'+this2.el).val(this2.attribute.text);        
+      $('#'+this2.el+'_check a').removeClass('loading');
+      if (resp.error) this2.error(resp.error);
+      else
+      {
+        if (this2.binder.success)
+          this2.binder.success(this2);
+        this2.view();
+      }
+    });
+  },
+  
+  cancel: function() {
+    this.attribute.value = this.attribute.value_clean;
+    $('#'+this.el).val(this.attribute.value);
+    this.view();
+  },
+
+  error: function(str) {
+    if (!$('#'+this.message).length)
+      $('#'+this.el+'_container').prepend($('<div/>').attr('id', this.message));
+    $('#'+this.message).html("<p class='note error'>" + str + "</p>");
+  }
+
+});

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

@@ -5,6 +5,10 @@ var ModelBinder = function(params) {
   all_model_binders[all_model_binders.length] = this;
 };
 
+ModelBinder.tinymce_init = function() {
+  alert('ModelBinder.tinymce_init');
+};
+
 ModelBinder.remove_from_all_model_binders = function(model_name, id) {
   var arr = [];
   $.each(all_model_binders, function(i, mb) {
@@ -14,8 +18,7 @@ ModelBinder.remove_from_all_model_binders = function(model_name, id) {
   all_model_binders = arr;  
 };
 
-ModelBinder.tinymce_current_control = function() {
-  var id = tinymce.activeEditor.id.toLowerCase();
+ModelBinder.tinymce_control = function(id) {  
   var control = false;
   $.each(all_model_binders, function(i, mb) {
     $.each(mb.controls, function(i, c) {        
@@ -26,6 +29,11 @@ ModelBinder.tinymce_current_control = function() {
   return control;
 };
 
+ModelBinder.tinymce_current_control = function() {
+  var id = tinymce.activeEditor.id.toLowerCase();
+  return ModelBinder.tinymce_control(id);    
+};
+
 ModelBinder.prototype = {
   model: false,
   controls: [],
@@ -43,6 +51,7 @@ ModelBinder.prototype = {
     if (params['update_url'])         this.model.update_url = params['update_url'];
     if (params['success'])            this.success = params['success'];
     if (params['authenticity_token']) this.authenticity_token = params['authenticity_token'];
+    if (params['on_load'])            this.on_load = params['on_load'];
       
     var m = this.model;
     $.each(params['attributes'], function(i, attrib) {
@@ -76,7 +85,7 @@ ModelBinder.prototype = {
       
       this2.controls.push(control);    
     });
-    
+            
     if (this.on_load)
       this.on_load();
   },

data/app/controllers/caboose/application_controller.rb

@@ -29,7 +29,7 @@ module Caboose
       
       # Try to find the page 
       @page = Page.new
-      @crumb_trail  = []
+      @crumbtrail = Crumbtrail.new      
       @subnav       = {}
       @actions      = {}
       @tasks        = {}

data/app/helpers/caboose/application_helper.rb

@@ -1,4 +1,26 @@
 module Caboose
   module ApplicationHelper
+    def caboose_tinymce
+      return "
+<script src='//tinymce.cachefly.net/4.0/tinymce.min.js'></script>
+<script type='text/javascript'>
+//<![CDATA[
+tinyMCE.init({
+  selector: 'textarea.tinymce',
+  width: '800px',
+  height: '300px',
+  convert_urls: false,
+  plugins: 'advlist autolink lists link image charmap print preview hr anchor pagebreak searchreplace wordcount visualblocks visualchars code fullscreen insertdatetime media nonbreaking table contextmenu directionality emoticons template paste textcolor caboose',
+  toolbar1: 'caboose_save caboose_cancel | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image',
+  image_advtab: true,
+  external_plugins: { 'caboose': '/assets/tinymce/plugins/caboose/plugin.js' },
+  setup: function(editor) {
+    var control = ModelBinder.tinymce_control(editor.id);     
+    editor.on('keyup', function(e) { control.tinymce_change(editor); });
+  }
+});
+//]]>
+</script>\n"
+    end
   end
 end

data/app/models/caboose/crumbtrail.rb

@@ -1,10 +1,10 @@
 module Caboose
   class Crumbtrail
 
-    @_crumbtrail = []
+    @_crumbtrail = nil
     
-    def self.add(url, text = nil)
-      #@_crumbtrail = []
+    def add(url, text = nil)
+      @_crumbtrail = [] if @_crumbtrail.nil?
       if url.is_a?(Hash)
         url.each do |url2, text2|
           @_crumbtrail << [url2, text2]
@@ -14,7 +14,7 @@ module Caboose
       end
     end
     
-    def self.print(url = nil, text = nil)
+    def print(url = nil, text = nil)
       if url
         self.add(url, text)
       end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.92'
+  VERSION = '0.4.93'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.92
+  version: 0.4.93
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -213,6 +213,7 @@ files:
 - app/assets/javascripts/caboose/model/bound_checkbox_multiple.js
 - app/assets/javascripts/caboose/model/bound_code.js
 - app/assets/javascripts/caboose/model/bound_control.js
+- app/assets/javascripts/caboose/model/bound_date.js
 - app/assets/javascripts/caboose/model/bound_file.js
 - app/assets/javascripts/caboose/model/bound_image.js
 - app/assets/javascripts/caboose/model/bound_richtext.js
@@ -220,6 +221,7 @@ files:
 - app/assets/javascripts/caboose/model/bound_select.js
 - app/assets/javascripts/caboose/model/bound_text.js
 - app/assets/javascripts/caboose/model/bound_textarea.js
+- app/assets/javascripts/caboose/model/bound_time.js
 - app/assets/javascripts/caboose/model/class.js
 - app/assets/javascripts/caboose/model/model.js
 - app/assets/javascripts/caboose/model/model_binder.js