caboose-cms 0.2.31 → 0.2.32

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGE1YzI5MzU3NDQxMmYxMmQxYjMwY2ZlODEzMTI2NmVhNTEzOTEzNw==
+    MWE5MzA0NDI3YzU4NTk3ZjIyMGFmYWU1MzNjMDBhMGFkNzhiMmE3NA==
   data.tar.gz: !binary |-
-    YmNkMDcyZGIzNDE3MDAxMDc4N2U5NmMzZTI0OTA5OGE4YmJhZWJiZA==
+    OWU5YWUyN2YyZjE1ZWU1MzUyOWFmZGRkMGYxZWZlZGE5ZDAwOWJhZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmY1ZWY1YmNjZmE3MjYxMzVkMzczMmNhZDFkNjMyYjNkNTQwZjcxYjJiNjA5
-    OGNlNGY4YmEzYTM1MjZlYThkMWQzZTUwODQxMzE1NDczYTAyMGUyNTcyNzlh
-    YmUzZTRlYTA3MTYxOTIxOTBmNzMyNGRjZTkyZGMyYmJmOTczMzE=
+    ZjcxOGJkOWI1ZDY3YjQ5MWQ2YTE3YTNmOGMzYTJjNmViMzQ3MzcwYjQwNjBi
+    ZDQ3OWVjNTliZGNlM2IxOWZkYzU3MTg2ZTAwMDIyNDRkOTk2YjExOGE2ZTBi
+    OWZlY2Q3NDA3MTUwNjY0YjFmOGIxOTk1YjliODBmYTQ4ZTEzMmY=
   data.tar.gz: !binary |-
-    YmM0NDcxM2NiOTMwZTgwZTZmZmM1MThjMGEwMDBiNTQ0NGVjZTIzOWM0MzUx
-    YmVmNzE4ZGZjNzBkNzQ5OWU2M2E0ZjZmMDM2NmVjNWRiN2MwMDI1MDkwYmYw
-    M2ExYTFlOGU1OTA5ZDg2OWQzMTNkZDU3MGZiODk5YjViN2VmZjE=
+    MWRiMzQxYjE5OTIzYzg4ZjZjZTQ3ODE1OGEzNTJjYzUyZmJmZDdjMGJmZTlm
+    MGEyNjJiOGRiNWZiZDBhMDBjMzJmYWQ1YzZjMzI3YzVlMTIzNzFlODliZGMx
+    YmM0NGM5Njc3Mzg4YTU3N2MyYWU0NzdmOWFiYTU3NDliYTk1NGY=

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

@@ -12,6 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require colorbox-rails
 
 var CabooseModal = function(w, h) {  
   if (!h)
@@ -32,21 +33,25 @@ CabooseModal.prototype = {
   resize: function(w, h) { this.width = w; this.height = h; this.colorbox(); },
   
   // Resizes the height of the modal based on the content height
-  autosize: function(msg) {
-    if (msg)
-      $('#message').html(msg);
+  autosize: function(msg, msg_container) {
+    if (msg)      
+      $('#' + (msg_container ? msg_container : 'message')).empty().append(msg);
     this.height = $('#modal_content').outerHeight(true);
     this.colorbox();
   },
   
-  colorbox: function() { 
-    parent.$.fn.colorbox.resize({ 
-      innerWidth:  '' + this.width + 'px', 
-      innerHeight: '' + this.height + 'px' 
-    }); 
+  colorbox: function() {
+    if (parent && parent.$.fn.colorbox)
+    {
+      parent.$.fn.colorbox.resize({ 
+        innerWidth:  '' + this.width + 'px', 
+        innerHeight: '' + this.height + 'px' 
+      });
+    }
   },
   
   close: function() {
-    parent.$.fn.colorbox.close();
+    if (parent && parent.$.fn.colorbox)
+      parent.$.fn.colorbox.close();      
   }
 };

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

@@ -4,7 +4,9 @@
 //= require caboose/model/model_binder
 //= require caboose/model/bound_control
 //= require caboose/model/bound_checkbox
+//= require caboose/model/bound_checkbox_multiple
 //= require caboose/model/bound_image
 //= require caboose/model/bound_select
 //= require caboose/model/bound_text
 //= require caboose/model/bound_textarea
+//= require caboose/model/bound_richtext

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

@@ -13,6 +13,8 @@ Attribute.prototype = {
   value_clean: false,
   text: false,
   empty_text: 'empty',
+  fixed_placeholder: true,
+  align: 'left',
   
   update_url: false,
   options_url: false,
@@ -23,7 +25,7 @@ Attribute.prototype = {
     $.ajax({
       url: this.update_url,
       type: 'put',
-      data: this.name + '=' + this.value,
+      data: this.name + '=' + encodeURIComponent(this.value),
 			success: function(resp) {			  
 				if (resp.success)
 				{

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

@@ -24,24 +24,35 @@ BoundCheckbox = BoundControl.extend({
       .css('position', 'relative')
     );
     $('#'+this.el+'_container').empty();
-    $('#'+this.el+'_container').append($('<div/>')
-      .attr('id', this.placeholder)
-      .addClass('placeholder')
-      .append($('<span/>').html(this.attribute.nice_name + ': '))
-    );
-    $('#'+this.el+'_container').append($('<input/>')
+    if (this.attribute.fixed_placeholder)
+    {
+      $('#'+this.el+'_container').append($('<div/>')
+        .attr('id', this.placeholder)
+        .addClass('placeholder')
+        .append($('<span/>').html(this.attribute.nice_name + ': '))
+      );
+    }
+    var cb = $('<input/>')
       .attr('id', this.el)
-      .attr('type', 'checkbox')
-      .css('left', $('#'+this.placeholder).outerWidth() + 10)
+      .attr('type', 'checkbox')      
       .attr('checked', this.attribute.value)
       .on('change', function() {        
         this2.save(); 
-      })
-    );
+      });
+    if (this.attribute.align == 'right')
+      cb.css('left', this.attribute.width - 10)
+    else if (this.attribute.align == 'center')
+      cb.css('left', Math.floor($('#'+this.el+'_container').outerWidth()/2))
+    else // left
+      cb.css('left', $('#'+this.placeholder).outerWidth() + 10)
+    $('#'+this.el+'_container').append(cb);
+    
     $('#'+this.el+'_container').append($('<input/>')
+      .attr('type', 'text')
       .attr('id', this.el + '_background')
       .attr('disabled', true)
-      .css('background', '#fff')
+      //.css('background', '#fff')
+      .addClass('checkbox_background')
     );
     if (this.attribute.width)
       $('#'+this.el+'_background').css('width' , this.attribute.width);

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

@@ -1,5 +1,5 @@
 
-BoundCheckbox = BoundControl.extend({
+BoundCheckboxMultiple = BoundControl.extend({
 
   //el: false,
   //model: false,
@@ -40,17 +40,19 @@ BoundCheckbox = BoundControl.extend({
     
     var this2 = this;
     this.attribute.populate_options(function() {
+
       var tbody = $('<tbody/>');
-      $.each(this2.options, function(i, option) {
+      $.each(this2.attribute.options, function(i, option) {
+
         tbody.append($('<tr/>')
           .append($('<td/>')
             .attr('id', this2.el + '_' + i)
             .attr('type', 'checkbox')
-            .attr('checked', this2.attribute.value)
+            .attr('checked', this2.attribute.value[option.value])
             .on('change', function() {
-              //this2.binder.cancel_active();
-              //this2.binder.active_control = this;
-              //this2.save(); 
+              // this2.binder.cancel_active();
+              // this2.binder.active_control = this;
+              // this2.save(); 
             })
           )
           .append($('<label/>')
@@ -62,7 +64,7 @@ BoundCheckbox = BoundControl.extend({
       $('#'+this.el+'_container').append(
         $('<table/>').append(tbody)
       );
-    );
+    });
   },
   
   view: function() {

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

@@ -0,0 +1,137 @@
+
+BoundRichText = BoundControl.extend({
+
+  //el: false,
+  //model: false,
+  //attribute: false,
+  //binder: false,
+  
+  width: 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.el).wrap($('<div/>').attr('id', this.el + '_container').css('position', 'relative'));
+    $('#'+this.el+'_container').empty();
+    $('#'+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);
+    if (this.attribute.height) $('#'+this.el).css('height' , this.attribute.height);
+    var h = $('#'+this.el+'_placeholder').outerHeight();
+    $('#'+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.show_controls();
+        $('#'+this2.el).addClass('dirty');
+      }
+      else
+        $('#'+this2.el).removeClass('dirty');
+    });                             
+    $('#'+this.el).on('blur', function() { this2.save(); });
+  },
+  
+  show_controls: function() {
+    if ($('#'+this.el+'_controls').length)
+      return;    
+    var w = $('#'+this.el).outerWidth();
+    var this2 = this;
+    $('#'+this.el+'_container').prepend($('<div/>')
+      .attr('id', this.el + '_controls')
+      .addClass('bound_textarea_controls')
+      .css('position', 'absolute')
+      .css('top', 0)
+      .css('left', w - 148)
+      .css('width', 148)
+      .css('overflow', 'hidden')
+      .append($('<div/>')
+        .css('width', 148)
+        .css('margin-left', 148)
+        .append($('<a/>').html('Save'   ).addClass('save'   ).css('width', 60).attr('href', '#').click(function(event) { event.preventDefault(); this2.save();   }))
+        .append($('<a/>').html('Discard').addClass('discard').css('width', 80).attr('href', '#').click(function(event) { event.preventDefault(); this2.cancel(); }))
+      )
+    );  
+    $('#'+this.el+'_controls div').animate({ 'margin-left': 0 }, 300); 
+  },
+    
+  hide_controls: function() {
+    if (!$('#'+this.el+'_controls').length)
+      return;
+    var this2 = this;
+    $('#'+this.el+'_controls div').animate({ 'margin-left': 100 }, 300, function() { 
+      $('#'+this2.el+'_controls').remove(); 
+    });
+  },
+  
+  save: function() {
+
+    tinymce.triggerSave();
+
+    this.attribute.value = $('#'+this.el).val();    
+    if (this.attribute.value == this.attribute.value_clean)
+      return;
+
+    this.hide_controls();
+    this.show_loader();        
+    var this2 = this;
+    this.model.save(this.attribute, function(resp) {
+      if (resp.error)
+      {
+        this2.hide_loader();
+        this2.error(resp.error);
+      }
+      else
+      {
+        this2.show_check(500);
+        $('#'+this2.el).val(this2.attribute.value);
+        $('#'+this2.el).removeClass('dirty');
+
+        if (this2.binder.success)
+          this2.binder.success(this2);
+      }
+    });
+  },
+  
+  cancel: function() {
+    
+    if ($('#'+this.el).val() != this.attribute.value_clean)
+    {
+      if (confirm('This box has unsaved changes.  Hit OK to save changes, Cancel to discard.'))
+      { 
+        this.attribute.value       = $('#'+this.el).val();
+        this.attribute.value_clean = $('#'+this.el).val();
+        this.save();
+      }
+    }    
+    this.attribute.value = this.attribute.value_clean;
+    $('#'+this.el).val(this.attribute.value);
+    $('#'+this.el).removeClass('dirty');
+    
+    if ($('#'+this.el+'_check').length)
+      this.hide_check();
+  },
+    
+  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_text.js

@@ -13,15 +13,25 @@ BoundText = BoundControl.extend({
     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 = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;    
     $('#'+this.el).wrap($('<div/>').attr('id', this.el + '_container').css('position', 'relative'));
     $('#'+this.el+'_container').empty();
-    $('#'+this.el+'_container').append($('<input/>').attr('id', this.el).attr('type', 'text').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 + ': ')));
+    $('#'+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('placeholder').append($('<span/>').html(this.attribute.nice_name + ': ')));
     if (this.attribute.width)  $('#'+this.el).css('width' , this.attribute.width);
-    var w = $('#'+this.el+'_placeholder').outerWidth();
-    $('#'+this.el).attr('placeholder', 'empty').css('padding-left', '+=' + w).css('width', '-=' + w);
+    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) {

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

@@ -72,10 +72,11 @@ BoundTextarea = BoundControl.extend({
   },
   
   save: function() {
+
     this.attribute.value = $('#'+this.el).val();    
     if (this.attribute.value == this.attribute.value_clean)
       return;
-    
+
     this.hide_controls();
     this.show_loader();        
     var this2 = this;

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

@@ -31,13 +31,15 @@ ModelBinder.prototype = {
         model: this2.model,
         attribute: attrib,
         binder: this2
-      };    
+      };
       var control = false;
-      if (attrib.type == 'text')          control = new BoundText(opts);
-      else if (attrib.type == 'select')   control = new BoundSelect(opts);
-      else if (attrib.type == 'checkbox') control = new BoundCheckbox(opts);
-      else if (attrib.type == 'textarea') control = new BoundTextarea(opts);
-      else if (attrib.type == 'image')    control = new BoundImage(opts);
+      if (attrib.type == 'text')                   control = new BoundText(opts);
+      else if (attrib.type == 'select')            control = new BoundSelect(opts);
+      else if (attrib.type == 'checkbox')          control = new BoundCheckbox(opts);
+      else if (attrib.type == 'checkbox-multiple') control = new BoundCheckboxMultiple(opts);
+      else if (attrib.type == 'textarea')          control = new BoundTextarea(opts);
+      else if (attrib.type == 'richtext')          control = new BoundRichText(opts);
+      else if (attrib.type == 'image')             control = new BoundImage(opts);
 
       this2.controls.push();    
     });

data/app/controllers/caboose/pages_controller.rb

@@ -9,21 +9,6 @@ module Caboose
     # GET /pages
     def index      
     end
-    
-    def view_formatted_resources(page)
-      resources = { js: [], css: [] }
-      return resources if page.linked_resources.nil?
-      page.linked_resources.each_line do |r|
-        r.chomp!
-        case r
-        when /\.js$/
-          resources[:js] += [r]
-        when /\.css$/
-          resources[:css] += [r]
-        end
-      end
-      return resources
-    end
 
     # GET /pages/:id
     def show
@@ -60,8 +45,6 @@ module Caboose
       @subnav = Caboose::Page.subnav(@page, session['use_redirect_urls'], @user)
 
       #@subnav.links = @tasks.collect {|href, task| {'href' => href, 'text' => task, 'is_current' => uri == href}}
-
-      @resources = view_formatted_resources(@page)
   
     end
     
@@ -125,7 +108,6 @@ module Caboose
     def edit
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
-      @resources = view_formatted_resources(@page)
     end
     
     # GET /pages/1/edit-title
@@ -268,38 +250,20 @@ module Caboose
           page[name.to_sym] = value
 
         when 'linked_resources'
-          result = ''
+          result = []
           value.each_line do |line|
-
+            line.chomp!
             line.strip!
             next if line.empty?
 
-            comps = line.split('.')
-            if comps.length < 2
-              resp.error = "Resource '#{line}' has an unspecified file type.  (e.g. given 'myScript.js', '.js' would specify a javascript file type.)"
-              save = false
-              next
-            end
-
-            case comps.last
-            when 'js', 'css'
-              if value =~ URI::regexp()
-                uri = URI.parse(value)
-                if !(uri =~ URI::HTTP || uri =~ URI::HTTPS)
-                  resp.error = "Resource '#{line}' is an unrecognized URI format."
-                  save = false
-                end
-              end
-            else
+            if !(line.ends_with('.js') || line.ends_with('.css'))
               resp.error = "Resource '#{line}' has an unsupported file type ('#{comps.last}')."
               save = false
-              next
             end
 
-            result += "\n" unless result.empty?
-            result += line
+            result << line
           end
-          page.linked_resources = result
+          page.linked_resources = result.join("\n")
           
         when 'content_format'
           page.content_format = value

data/app/controllers/caboose/roles_controller.rb

@@ -1,6 +1,6 @@
 module Caboose
   class RolesController < ApplicationController
-    layout 'caboose/admin'
+    layout 'caboose/modal'
     
     def before_action
       @page = Page.page_with_uri('/admin')
@@ -61,15 +61,15 @@ module Caboose
     	  	  role.description = value
     	  	when "parent_id"
     	  	  value = value.to_i
-    	  	  if (role.id == value)
+    	  	  if role.id == value
     	  	    resp.error = "You can't set the parent to be this role."
     	  	    save = false
-    	  		elsif (role.is_ancestor_of?(value))
+    	  		elsif role.is_ancestor_of?(value)
     	  		  resp.error = "You can't set the parent to be one of the child roles."
     	  		  save = false
     	  		else
     	  		  role.parent_id = value
-    	  		  if (value == -1)
+    	  		  if value == -1
     	  		    resp.attributes = { 'parent_id' => { 'text' => '[No parent]' }}
     	  		  else
     	  		    p = Role.find(value)

data/app/models/caboose/page.rb

@@ -327,4 +327,19 @@ class Caboose::Page < ActiveRecord::Base
 		return self.is_child(parent_id, pid)
 	end
 
+	def linked_resources_map
+    resources = { js: [], css: [] }
+    return resources if self.linked_resources.nil?
+    self.linked_resources.each_line do |r|
+      r.chomp!
+      case r
+      when /\.js$/
+        resources[:js] << r
+      when /\.css$/
+        resources[:css] << r
+      end
+    end
+    return resources
+	end
+
 end

data/app/models/caboose/role_plugin.rb

@@ -11,7 +11,8 @@ class Caboose::RolePlugin < Caboose::CaboosePlugin
     if (user.is_allowed('roles', 'view'))
       item['children'] << {
         'href' => '/admin/roles', 
-        'text' => 'View All Roles'
+        'text' => 'View All Roles',
+        'modal' => true
       }
     end
     if (user.is_allowed('roles', 'add'))

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

@@ -2,7 +2,7 @@
 <div id='editmode_content_container' ><%= @page.content == nil || @page.content.length == 0 ? 'No content.' : (raw @page.content) %></div>
 
 <% content_for :caboose_css do %>
-  <% @resources[:css].each do |r| %>
+  <% @page.linked_resources_map[:css].each do |r| %>
     <!--link type='text/css' rel='stylesheet' href="<%= r %>" /-->
     <%= stylesheet_link_tag r %>
   <% end %>
@@ -12,7 +12,7 @@
 
 <% content_for :caboose_js do %>
 
-  <% @resources[:js].each do |r| %>
+  <% @page.linked_resources_map[:js].each do |r| %>
     <!--script type='text/javascript' src="<%= r %>" ></script-->
     <%= javascript_include_tag r %>
   <% end %>

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

@@ -10,7 +10,6 @@
 <% content_for :caboose_js do %>
 
   <%= javascript_include_tag "caboose/model/all" %>
-  <%= tinymce_assets %>
 
   <script type="text/javascript">
 

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

@@ -18,8 +18,7 @@
 				'last_name, first_name'	=> 'Last Name',
 				'username' => 'Username',
 				'email'	=> 'Email'
-			})
-		%>
+			}) %>
   </tr>
 <% @users.each do |user| %>
   <tr onclick="window.location='/users/<%= user.id %>/edit';">

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

@@ -1,13 +1,13 @@
 
 <% content_for :caboose_css do %>
-  <% @resources[:css].each do |r| %>
+  <% @page.linked_resources_map[:css].each do |r| %>
     <!--link type='text/css' rel='stylesheet' href="<%= r %>" /-->
     <%= stylesheet_link_tag r %>
   <% end %>
 <% end %>
 
 <% content_for :caboose_js do %>
-  <% @resources[:js].each do |r| %>
+  <% @page.linked_resources_map[:js].each do |r| %>
     <!--script type='text/javascript' src="<%= r %>" ></script-->
     <%= javascript_include_tag r %>
   <% end %>

data/app/views/caboose/roles/edit.html.erb

@@ -1,11 +1,21 @@
 
-<h1>Edit Role</h1>
-<div id='role_<%= @role.id %>_container'></div>
+<h1>Editing Role</h1>
+<div id="role_<%= @role.id %>_name"></div>
+<div id="role_<%= @role.id %>_parent_id"></div>
+<div id="role_<%= @role.id %>_description"></div>
+<div id="role_<%= @role.id %>_members"></div>
+<div id="role_<%= @role.id %>_permissions"></div>
+<div id="message"></div>
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">
 
+var modal = false;
+$(window).load(function() {  
+  modal = new CabooseModal(600, 600);
+});
+
 $(document).ready(function() {
   new ModelBinder({
     name: 'Role',
@@ -23,29 +33,37 @@ $(document).ready(function() {
         text: "<%= @role.parent.nil? ? '[No parent]' : @role.parent.name %>",
         show_controls: true,
         loading_message: 'Getting roles...',
-        options_url: '/admin/roles/options' 
+        options_url: '/admin/roles/options',
+        width: 590,
+        message: 'message'
       },    
-      { name: 'name'        , nice_name: 'Name'        , type: 'text' , value: "<%= @role.name %>" },
-      { name: 'description' , nice_name: 'Description' , type: 'text' , value: "<%= @role.description %>" },
+      { name: 'name'        , nice_name: 'Name'        , type: 'text' , value: "<%= @role.name %>"        , width: 590 , message: 'message' },
+      { name: 'description' , nice_name: 'Description' , type: 'text' , value: "<%= @role.description %>" , width: 590 , message: 'message' },
       { 
         name: 'members',
+        nice_name: 'Members',
         type: 'checkbox-multiple',
         value: <%= @role.users.collect{|u| u.id}.to_json %>,
         text: "<%= raw @role.users.order('last_name, first_name').collect{|u| "#{u.first_name} #{u.last_name}"}.join('<br />') %>",
         loading_message: 'Getting users...',
         options_url: '/admin/users/options',
+        width: 590,
+        message: 'message'
       },
       { 
         name: 'permissions',
+        nice_name: 'Permissions',
         type: 'checkbox-multiple',
         value: <%= @role.permissions.collect{|p| p.id}.to_json %>,
         text: "<%= raw @role.permissions.order('resource, action').collect{|p| "#{p.resource}_#{p.action}"}.join('<br />') %>",
         loading_message: 'Getting permissions...',
         options_url: '/admin/permissions/options',
+        width: 590,
+        message: 'message'
       }
     ],
     on_load: function() { modal.autosize(); }
-  });  
+  });
 
   /*var user = new Model({
     name: 'Role',

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.31'
+  VERSION = '0.2.32'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.31
+  version: 0.2.32
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -148,6 +148,7 @@ files:
 - app/assets/javascripts/caboose/model/bound_checkbox_multiple.js
 - app/assets/javascripts/caboose/model/bound_control.js
 - app/assets/javascripts/caboose/model/bound_image.js
+- app/assets/javascripts/caboose/model/bound_richtext.js
 - app/assets/javascripts/caboose/model/bound_select.js
 - app/assets/javascripts/caboose/model/bound_text.js
 - app/assets/javascripts/caboose/model/bound_textarea.js