imagine_cms 3.0.0.beta6 → 3.0.0.beta7

data/app/models/cms_content_sweeper.rb

@@ -0,0 +1,21 @@
+class CmsContentSweeper < ActionController::Caching::Sweeper
+  observe CmsPage, CmsTemplate, CmsSnippet
+  
+  def after_save(record)
+    delete_all_cached_pages
+  end
+  
+  def after_destroy(record)
+    delete_all_cached_pages
+  end
+  
+  def delete_all_cached_pages
+    CmsPage.find(:all).each do |page|
+      expire_page :controller => 'cms/content', :action => 'show', :content_path => page.path.split('/')
+    end
+    
+    # also delete RSS feed caches
+    expire_fragment %r{rss/\d+/}
+  end
+  
+end

data/app/models/cms_page.rb

@@ -0,0 +1,126 @@
+class CmsPage < ActiveRecord::Base
+  include ActsAsTree
+  
+  attr_accessible :cms_template_id, :cms_template_version, :parent_id, :name, :title, :path, :article_date, :article_end_date, :summary, :thumbnail_path, :position, :comment_count, :version, :published_version, :published_date, :expiration_date, :expires, :search_index, :updated_by, :updated_by_username
+  
+  acts_as_versioned
+  acts_as_tree :order => 'path'
+  
+  belongs_to :template, :class_name => 'CmsTemplate', :foreign_key => 'cms_template_id'
+  has_many :objects, :class_name => 'CmsPageObject', :dependent => :destroy
+  has_many :tags, :class_name => 'CmsPageTag', :dependent => :destroy
+  has_many :versions, :class_name => 'CmsPageVersion', :dependent => :destroy
+  
+  validates_format_of :name, :with => /\A[-\w\d%]+\Z/
+  validates_uniqueness_of :path, :message => 'conflicts with an existing page'
+  
+  before_validation :compute_and_store_path, :set_versions
+  
+  def compute_and_store_path
+    if self.parent
+      if self.parent.path != ''
+        self.path = "#{self.parent.path}/#{self.name}"
+      else
+        self.path = self.name
+      end
+    else
+      self.path = ''
+    end
+  end
+  
+  def set_versions
+    if self.template
+      self.cms_template_version ||= self.template.version
+    end
+    
+    self.published_version ||= -1
+    self.published_date ||= self.created_on || Time.now
+  end
+  
+  def sub_pages(options = {})
+    # not using options just yet, but you can override if you like
+    conditions = [ 'published_version >= 0' ]
+    self.children.find(:all, :conditions => conditions, :order => 'position')
+  end
+  
+  def tags_as_css_classes
+    self.tags.map { |t| t.name.downcase.gsub(/[^\w]+/, '-') }.join(' ')
+  end
+  
+  def self.index_all
+    CmsPage.find(:all, :conditions => [ 'search_index is null' ]).each { |pg| pg.update_index ; pg.save_without_revision }
+    true
+  end
+  
+  def self.reindex_all
+    CmsPage.find(:all).each { |pg| pg.update_index ; pg.save_without_revision }
+    true
+  end
+  
+  def name=(value)
+    if value && value.is_a?(String)
+      # filter suspicious content... go overboard for now, fine-tune later perhaps
+      value.gsub!(/<(%.*?(exec|system)\s?\(.*?\s*%)>/, '&lt;\1&gt;')
+      value.gsub!(/<(%.*?\%x\s?\[.*?\s*%)>/, '&lt;\1&gt;')
+      value.gsub!(/<(%.*?`.*?\s*%)>/, '&lt;\1&gt;')
+    end
+    super(value)
+  end
+  
+  def html_head=(value)
+    if value && value.is_a?(String)
+      # filter suspicious content... go overboard for now, fine-tune later perhaps
+      value.gsub!(/<(%.*?(exec|system)\s?\(.*?\s*%)>/, '&lt;\1&gt;')
+      value.gsub!(/<(%.*?\%x\s?\[.*?\s*%)>/, '&lt;\1&gt;')
+      value.gsub!(/<(%.*?`.*?\s*%)>/, '&lt;\1&gt;')
+    end
+    super(value)
+  end
+  
+  def update_index
+    content = ''
+    
+    if self.published_version.to_i >= 0
+      idx_version = self.published_version.to_i == 0 ? self.version : self.published_version
+      self.objects.find(:all, :conditions => [ "cms_page_version = ? and (obj_type = 'text' or obj_type = 'string')", idx_version ]).each do |obj|
+        content << obj.content << "\n"
+      end
+    end
+    
+    self.search_index = sanitize_index(content)
+  end
+  
+  def set_parent_id!(new_id)
+    self.parent_id = new_id
+    self.save_without_revision
+  end
+  
+  
+  def article_date_month ; article_date.strftime("%B")      ; end
+  def article_date_mon   ; article_date.strftime("%b")      ; end
+  def article_date_day   ; article_date.strftime("%d").to_i ; end
+  def article_date_year  ; article_date.strftime("%Y").to_i ; end
+  def article_date_yr    ; article_date.strftime("%y").to_i ; end
+  
+  
+  private
+  
+  def sanitize_index(html)
+    return html if html.blank?
+    if html.index("<")
+      text = ""
+      tokenizer = HTML::Tokenizer.new(html)
+      
+      while token = tokenizer.next
+        node = HTML::Node.parse(nil, 0, 0, token, false)
+        # result is only the content of any Text nodes
+        text << node.to_s if node.class == HTML::Text  
+      end
+      # strip any comments, and if they have a newline at the end (ie. line with
+      # only a comment) strip that too, as well as any erb stuff
+      text.gsub(/<!--(.*?)-->[\n]?/m, "").gsub(/\<%.*?%\>/m, '').gsub(/&\w+;/, '')
+    else
+      html # already plain text
+    end 
+  end
+end

data/app/models/cms_page_object.rb

@@ -0,0 +1,23 @@
+class CmsPageObject < ActiveRecord::Base
+  attr_accessible :name, :obj_type
+  
+  belongs_to :page, :class_name => 'CmsPage', :foreign_key => 'cms_page_id'
+  
+  before_create :set_page_version
+  
+  
+  def set_page_version
+    self.cms_page_version ||= page.version
+  end
+  
+  def content=(value)
+    if value && value.is_a?(String)
+      # filter suspicious content... go overboard for now, fine-tune later perhaps
+      value.gsub!(/<(%.*?(exec|system)\s?\(.*?\s*%)>/, '&lt;\1&gt;')
+      value.gsub!(/<(%.*?\%x\s?\[.*?\s*%)>/, '&lt;\1&gt;')
+      value.gsub!(/<(%.*?`.*?\s*%)>/, '&lt;\1&gt;')
+    end
+    super(value)
+  end
+  
+end

data/app/models/cms_page_tag.rb

@@ -0,0 +1,5 @@
+class CmsPageTag < ActiveRecord::Base
+  belongs_to :page, :class_name => 'CmsPage', :foreign_key => 'cms_page_id'
+  
+  validates_uniqueness_of :name, :scope => 'cms_page_id'
+end

data/app/models/cms_page_version.rb

@@ -0,0 +1,3 @@
+class CmsPageVersion < ActiveRecord::Base
+  belongs_to :cms_page
+end

data/app/models/cms_snippet.rb

@@ -0,0 +1,16 @@
+class CmsSnippet < ActiveRecord::Base
+  acts_as_versioned
+  
+  attr_accessible :name, :content
+  
+  def content=(value)
+    if value && value.is_a?(String)
+      # filter suspicious content... go overboard for now, fine-tune later perhaps
+      value.gsub!(/<(%.*?(exec|system)\s?\(.*?\s*%)>/, '&lt;\1&gt;')
+      value.gsub!(/<(%.*?\%x\s?\[.*?\s*%)>/, '&lt;\1&gt;')
+      value.gsub!(/<(%.*?`.*?\s*%)>/, '&lt;\1&gt;')
+    end
+    super(value)
+  end
+  
+end

data/app/models/cms_template.rb

@@ -0,0 +1,29 @@
+class CmsTemplate < ActiveRecord::Base
+  acts_as_versioned
+  
+  attr_accessible :name, :content
+  attr_accessor :options
+  
+  has_many :pages, :class_name => 'CmsPage'
+  
+  def after_find
+    require 'yaml'
+    @options = YAML.load(self.options_yaml) if self.options_yaml
+  end
+  
+  def content=(value)
+    if value && value.is_a?(String)
+      # filter suspicious content... go overboard for now, fine-tune later perhaps
+      value.gsub!(/<(%.*?(exec|system)\s?\(.*?\s*%)>/, '&lt;\1&gt;')
+      value.gsub!(/<(%.*?\%x\s?\[.*?\s*%)>/, '&lt;\1&gt;')
+      value.gsub!(/<(%.*?`.*?\s*%)>/, '&lt;\1&gt;')
+    end
+    super(value)
+  end
+  
+  def before_save
+    require 'yaml'
+    self.options_yaml = YAML.dump(@options)
+  end
+  
+end

data/app/models/user.rb

@@ -2,6 +2,7 @@ class User < ActiveRecord::Base # :nodoc:
   require 'dynamic_methods'
   include DynamicMethods
   
+  attr_accessible :first_name, :last_name
   attr_reader :password # :nodoc:
   
   has_and_belongs_to_many :groups, :class_name => 'UserGroup', :join_table => 'user_group_memberships'
@@ -11,9 +12,11 @@ class User < ActiveRecord::Base # :nodoc:
   validates_uniqueness_of :username, :message => 'already in use'
   validates_confirmation_of :password
   
-  def name ; [self.first_name, self.last_name].compact.join(" ") ; end
+  before_validation :fake_password_confirmation, :on => :update
   
-  SaltLength = 16 # :nodoc:
+  def name ; [ first_name, last_name ].compact.join(' ') ; end
+  
+  SaltLength = 16 unless defined?(SaltLength) # :nodoc:
   
   def password=(val) # :nodoc:
     @password = val
@@ -38,7 +41,7 @@ class User < ActiveRecord::Base # :nodoc:
     salt << digest.hexdigest
   end
   
-  def before_validation_on_update # :nodoc:
+  def fake_password_confirmation # :nodoc:
     # if password is blank, user is not trying to change it.
     # just appease the validator by setting something valid
     if ((@password ||= "") == "")

data/app/views/management/cms/_complete_gallery.html.erb

@@ -0,0 +1,5 @@
+<script type="text/javascript">
+    var editor = dojo.widget.Editor2Manager.getCurrentInstance();
+    editor.execCommand('inserthtml', '<' + '%= insert_object(\'<%= params[:dirname] %>\', :photo_gallery) %' + '>');
+    cancelInsertImage();
+</script>

data/app/views/management/cms/_create_file_link.html.erb

@@ -0,0 +1,21 @@
+<%-
+	ext = File.extname(@filename)
+	ext = (ext.blank? ? 'generic' : ext.gsub(/\./, ''))
+-%>
+<%= javascript_tag <<-EOF
+var curInst = dojo.widget.Editor2Manager.getCurrentInstance();
+linkNode = dojo.withGlobal(curInst.window, "getAncestorElement", dojo.html.selection, ['a']);
+
+curInst.restoreSelection();
+
+if (!linkNode) {
+    var html = dojo.withGlobal(curInst.window, 'getSelectedHtml', dojo.html.selection);
+} else {
+    var html = linkNode.innerHTML;
+    dojo.withGlobal(curInst.window, 'selectElement', dojo.html.selection, [linkNode]);
+}
+
+curInst.execCommand('inserthtml', '<a href=\"/#{@filename}\" class=\"file-#{ext}\" target=\"_blank\">'+html+'</a>');
+cancelInsertFile();
+EOF
+%>

data/app/views/management/cms/_crop_feature_image.html.erb

@@ -0,0 +1,188 @@
+<script type="text/javascript">
+    var resize_ratio = 1.0;
+    var aspect_ratio = <%= @width %>.0 / <%= @height %>;
+    var imageSizeLocked = false;
+    
+    try {
+        if (cropper) cropper.remove();
+    } catch (e) {}
+    
+    onEndCrop = function (coords, dimensions) {
+        if (dimensions.width > 0 && dimensions.height > 0) {
+            var size_changed = false;
+            
+            $('image_x1').value = coords.x1;
+            $('image_y1').value = coords.y1;
+            $('image_x2').value = coords.x2;
+            $('image_y2').value = coords.y2;
+            
+            if (dimensions.width != $('image_width').value) {
+                $('image_width').value = dimensions.width;
+                size_changed = true;
+            }
+            if (dimensions.height != $('image_height').value) {
+                $('image_height').value = dimensions.height;
+                size_changed = true;
+            }
+            
+            if (size_changed) {
+                setResizeRatio();
+                aspect_ratio = 1.0 * dimensions.width / dimensions.height;
+                
+                $('selection_x2').value = dimensions.width;
+                $('selection_y2').value = dimensions.height;
+                
+                if (!imageSizeLocked) {
+                    if (resize_ratio) {
+                        $('image_max_width').value = Math.round(dimensions.width * resize_ratio);
+                        $('image_max_height').value = Math.round(dimensions.height * resize_ratio);
+                    } else {
+                        $('image_max_width').value = dimensions.width;
+                        $('image_max_height').value = dimensions.height;
+                    }
+                }
+                
+                $('aspect_ratio').innerHTML = setPrecision(dimensions.width/dimensions.height, 3);
+            }
+        }
+    }
+    
+    resizeCropper = function () {
+        width = $('selection_x2').value;
+        height = $('selection_y2').value;
+        end_x = parseInt(width) + parseInt(cropper.areaCoords.x1);
+        end_y = parseInt(height) + parseInt(cropper.areaCoords.y1);
+        cropper.setAreaCoords(cropper.cloneCoords({ x1:parseInt(cropper.areaCoords.x1),
+                                                    y1:parseInt(cropper.areaCoords.y1),
+                                                    x2:end_x,
+                                                    y2:end_y }), false, false, 1);
+        cropper.selArea.show();
+        cropper.drawArea();
+        cropper.endCrop();
+        
+        setResizeRatio();
+    }
+    
+    resizeCropperScaled = function () {
+        if (imageSizeLocked) {
+            width = parseInt($('image_max_width').value);
+            height = parseInt($('image_max_height').value);
+            if (width > 10 && height > 10) {
+                cropper.options.ratioDim = { x: width, y: height };
+                reloadCropper();
+            }
+        } else {
+            $('selection_x2').value = Math.round($('image_max_width').value / resize_ratio);
+            $('selection_y2').value = Math.round($('image_max_height').value / resize_ratio);
+            resizeCropper();
+        }
+    }
+    
+    setResizeRatio = function () {
+        crop_width = parseInt($('image_max_width').value);
+        selection_width = parseInt($('selection_x2').value); // this is correct... x2 is the sel width
+        
+        if (crop_width > 10 && selection_width > 10) {
+            resize_ratio = 1.0 * $('image_max_width').value / $('selection_x2').value;
+        } else {
+            resize_ratio = 1.0;
+        }
+    }
+    
+    lockImageSize = function () {
+        imageSizeLocked = true;
+        cropper.options.ratioDim = { x: parseInt($('image_max_width').value),
+                                     y: parseInt($('image_max_height').value) };
+        reloadCropper();
+        
+        $('icon_unlocked').hide();
+        $('icon_locked').show();
+    }
+    
+    unlockImageSize = function () {
+        imageSizeLocked = false;
+        cropper.options.ratioDim = { x: 0, y: 0 };
+        reloadCropper();
+        
+        $('icon_locked').hide();
+        $('icon_unlocked').show();
+    }
+    
+    reloadCropper = function () {
+        oldOptions = cropper.options;
+        oldOptions.displayOnInit = 1;
+        if (($('image_x1').value == $('image_x2').value) && ($('image_y1').value == $('image_y2').value)) {
+            $('image_x1').value = '0';
+            $('image_x2').value = $('image_max_width').value;
+            $('image_y1').value = '0';
+            $('image_y2').value = $('image_max_height').value;
+        }
+        oldOptions.onloadCoords = { x1: $('image_x1').value, y1: $('image_y1').value,
+                                    x2: $('image_x2').value, y2: $('image_y2').value };
+        cropper.remove();
+        cropper = new Cropper.Img('testImage', oldOptions);
+    }
+    
+    recalculateWidth = function () {
+        if (imageSizeLocked) {
+            $('image_max_width').value = Math.round(parseInt($('image_max_height').value) / aspect_ratio);
+        }
+    }
+    
+    recalculateHeight = function () {
+        if (imageSizeLocked) {
+            $('image_max_height').value = Math.round(parseInt($('image_max_width').value) / aspect_ratio);
+        }
+    }
+</script>
+
+<h3>Crop Feature Image</h3>
+
+Crop the image by clicking and dragging the mouse over the image.<br/>
+Pressing "Save Feature Image" will crop the image and set it as the new feature image for this page.
+<br/>
+
+<center>
+  <%= cropper_image_tag({ :url => File.join('content', @pg.path, @image_file) }) %><br/>
+</center>
+<br/>
+
+<center>
+  <%= form_remote_tag :update => 'select_thumbnail_dialog_content',
+                      :url => { :action => "save_crop_feature_image", :id => @pg, :filename => @image_file } do -%>
+    <table cellpadding="10">
+      <tr>
+        <td>
+          <fieldset style="padding: 10px 15px; text-align: center; display: none;">
+            <legend>Adjust Crop:</legend>
+            <%= text_field :selection, :x2, :size => 3, :onkeyup => "resizeCropper();" %> x <%= text_field :selection, :y2, :size => 3, :onkeyup => "resizeCropper();" %>
+          </fieldset>
+          
+          <fieldset style="padding: 10px 15px; text-align: center;">
+            <legend>Final Image Dimensions:</legend>
+            <%= text_field :image, :max_width, :size => 3, :value => @width, :onchange => "recalculateHeight();" %>
+             x <%= text_field :image, :max_height, :size => 3, :value => @height, :onchange => "recalculateWidth();" %>
+            <%= javascript_tag "$('image_max_width').onkeydown = disableEnterKey; $('image_max_height').onkeydown = disableEnterKey;" %>
+            
+            <%= image_tag('/assets/management/icon_unlocked.png', :id => 'icon_unlocked', :onclick => "lockImageSize();") %>
+            <%= image_tag('/assets/management/icon_locked.png', :id => 'icon_locked', :onclick => "unlockImageSize();", :style => 'display: none;') %>
+            
+            <%= link_to_function "Apply", "resizeCropperScaled();" %> |
+            <%= link_to_function "Reset", "cropper.reset(); resize_ratio = 1.0;" %>
+            
+            <span id="aspect_ratio" style="display: none;"><%= sprintf("%.3f", @aspect_ratio) %></span><br/>
+            <%= text_field :image, :x1, :style => "display: none" %>
+            <%= text_field :image, :y1, :style => "display: none"  %>
+            <%= text_field :image, :x2, :style => "display: none"  %>
+            <%= text_field :image, :y2, :style => "display: none"  %>
+            <%= text_field :image, :width, :style => "display: none"  %>
+            <%= text_field :image, :height, :style => "display: none"  %>
+          </fieldset>
+        </td>
+      </tr>
+    </table>
+    
+    <%= submit_tag 'Save Feature Image', :class => 'form_button', :style => 'width: 90px;', :onclick => 'cropper.remove(); this.disabled = true; this.value = "Saving...";' %>
+    <%= link_to_function "Cancel", "cancelSelectThumbnail()" %>
+  <%- end -%>
+</center>

data/app/views/management/cms/_crop_image.html.erb

@@ -0,0 +1,188 @@
+<script type="text/javascript">
+    var resize_ratio = 1.0;
+    var aspect_ratio = <%= @width %>.0 / <%= @height %>;
+    var imageSizeLocked = false;
+    
+    try {
+        if (cropper) cropper.remove();
+    } catch (e) {}
+    
+    onEndCrop = function (coords, dimensions) {
+        if (dimensions.width > 0 && dimensions.height > 0) {
+            var size_changed = false;
+            
+            $('image_x1').value = coords.x1;
+            $('image_y1').value = coords.y1;
+            $('image_x2').value = coords.x2;
+            $('image_y2').value = coords.y2;
+            
+            if (dimensions.width != $('image_width').value) {
+                $('image_width').value = dimensions.width;
+                size_changed = true;
+            }
+            if (dimensions.height != $('image_height').value) {
+                $('image_height').value = dimensions.height;
+                size_changed = true;
+            }
+            
+            if (size_changed) {
+                setResizeRatio();
+                aspect_ratio = 1.0 * dimensions.width / dimensions.height;
+                
+                $('selection_x2').value = dimensions.width;
+                $('selection_y2').value = dimensions.height;
+                
+                if (!imageSizeLocked) {
+                    if (resize_ratio) {
+                        $('image_max_width').value = Math.round(dimensions.width * resize_ratio);
+                        $('image_max_height').value = Math.round(dimensions.height * resize_ratio);
+                    } else {
+                        $('image_max_width').value = dimensions.width;
+                        $('image_max_height').value = dimensions.height;
+                    }
+                }
+                
+                $('aspect_ratio').innerHTML = setPrecision(dimensions.width/dimensions.height, 3);
+            }
+        }
+    }
+    
+    resizeCropper = function () {
+        width = $('selection_x2').value;
+        height = $('selection_y2').value;
+        end_x = parseInt(width) + parseInt(cropper.areaCoords.x1);
+        end_y = parseInt(height) + parseInt(cropper.areaCoords.y1);
+        cropper.setAreaCoords(cropper.cloneCoords({ x1:parseInt(cropper.areaCoords.x1),
+                                                    y1:parseInt(cropper.areaCoords.y1),
+                                                    x2:end_x,
+                                                    y2:end_y }), false, false, 1);
+        cropper.selArea.show();
+        cropper.drawArea();
+        cropper.endCrop();
+        
+        setResizeRatio();
+    }
+    
+    resizeCropperScaled = function () {
+        if (imageSizeLocked) {
+            width = parseInt($('image_max_width').value);
+            height = parseInt($('image_max_height').value);
+            if (width > 10 && height > 10) {
+                cropper.options.ratioDim = { x: width, y: height };
+                reloadCropper();
+            }
+        } else {
+            $('selection_x2').value = Math.round($('image_max_width').value / resize_ratio);
+            $('selection_y2').value = Math.round($('image_max_height').value / resize_ratio);
+            resizeCropper();
+        }
+    }
+    
+    setResizeRatio = function () {
+        crop_width = parseInt($('image_max_width').value);
+        selection_width = parseInt($('selection_x2').value); // this is correct... x2 is the sel width
+        
+        if (crop_width > 10 && selection_width > 10) {
+            resize_ratio = 1.0 * $('image_max_width').value / $('selection_x2').value;
+        } else {
+            resize_ratio = 1.0;
+        }
+    }
+    
+    lockImageSize = function () {
+        imageSizeLocked = true;
+        cropper.options.ratioDim = { x: parseInt($('image_max_width').value),
+                                     y: parseInt($('image_max_height').value) };
+        reloadCropper();
+        
+        $('icon_unlocked').hide();
+        $('icon_locked').show();
+    }
+    
+    unlockImageSize = function () {
+        imageSizeLocked = false;
+        cropper.options.ratioDim = { x: 0, y: 0 };
+        reloadCropper();
+        
+        $('icon_locked').hide();
+        $('icon_unlocked').show();
+    }
+    
+    reloadCropper = function () {
+        oldOptions = cropper.options;
+        oldOptions.displayOnInit = 1;
+        if (($('image_x1').value == $('image_x2').value) && ($('image_y1').value == $('image_y2').value)) {
+            $('image_x1').value = '0';
+            $('image_x2').value = $('image_max_width').value;
+            $('image_y1').value = '0';
+            $('image_y2').value = $('image_max_height').value;
+        }
+        oldOptions.onloadCoords = { x1: $('image_x1').value, y1: $('image_y1').value,
+                                    x2: $('image_x2').value, y2: $('image_y2').value };
+        cropper.remove();
+        cropper = new Cropper.Img('testImage', oldOptions);
+    }
+    
+    recalculateWidth = function () {
+        if (imageSizeLocked) {
+            $('image_max_width').value = Math.round(parseInt($('image_max_height').value) / aspect_ratio);
+        }
+    }
+    
+    recalculateHeight = function () {
+        if (imageSizeLocked) {
+            $('image_max_height').value = Math.round(parseInt($('image_max_width').value) / aspect_ratio);
+        }
+    }
+</script>
+
+<h3>Crop Image</h3>
+
+Crop the image by clicking and dragging the mouse over the image.<br/>
+Pressing "Save Image" will crop the image and insert it into the page.
+<br/>
+
+<center>
+  <%= cropper_image_tag({ :url => File.join('content', @pg.path, @image_file) }) %><br/>
+</center>
+<br/>
+
+<center>
+  <%= form_remote_tag :update => 'insert_image_dialog_content',
+                      :url => { :action => "save_crop", :id => @pg, :filename => @image_file } do -%>
+    <table cellpadding="10">
+      <tr>
+        <td>
+          <fieldset style="padding: 10px 15px; text-align: center; display: none;">
+            <legend>Adjust Crop:</legend>
+            <%= text_field :selection, :x2, :size => 3, :onkeyup => "resizeCropper();" %> x <%= text_field :selection, :y2, :size => 3, :onkeyup => "resizeCropper();" %>
+          </fieldset>
+          
+          <fieldset style="padding: 10px 15px; text-align: center;">
+            <legend>Final Image Dimensions:</legend>
+            <%= text_field :image, :max_width, :size => 3, :value => @width, :onchange => "recalculateHeight();" %>
+             x <%= text_field :image, :max_height, :size => 3, :value => @height, :onchange => "recalculateWidth();" %>
+            <%= javascript_tag "$('image_max_width').onkeydown = disableEnterKey; $('image_max_height').onkeydown = disableEnterKey;" %>
+            
+            <%= image_tag('/assets/management/icon_unlocked.png', :id => 'icon_unlocked', :onclick => "lockImageSize();") %>
+            <%= image_tag('/assets/management/icon_locked.png', :id => 'icon_locked', :onclick => "unlockImageSize();", :style => 'display: none;') %>
+            
+            <%= link_to_function "Apply", "resizeCropperScaled();" %> |
+            <%= link_to_function "Reset", "cropper.reset(); resize_ratio = 1.0;" %>
+            
+            <span id="aspect_ratio" style="display: none;"><%= sprintf("%.3f", @aspect_ratio) %></span><br/>
+            <%= text_field :image, :x1, :style => "display: none" %>
+            <%= text_field :image, :y1, :style => "display: none"  %>
+            <%= text_field :image, :x2, :style => "display: none"  %>
+            <%= text_field :image, :y2, :style => "display: none"  %>
+            <%= text_field :image, :width, :style => "display: none"  %>
+            <%= text_field :image, :height, :style => "display: none"  %>
+          </fieldset>
+        </td>
+      </tr>
+    </table>
+    
+    <%= submit_tag 'Save Image', :class => 'form_button', :style => 'width: 90px;', :onclick => 'cropper.remove(); this.disabled = true; this.value = "Saving...";' %>
+    <%= link_to_function "Cancel", "cancelInsertImage();" %>
+  <%- end -%>
+</center>

data/app/views/management/cms/_crop_results.html.erb

@@ -0,0 +1 @@
+<%= javascript_tag "var editor = dojo.widget.Editor2Manager.getCurrentInstance(); editor.execCommand('inserthtml', '#{page_image_tag(@pg, @image_file)}'); cancelInsertImage();" %>

data/app/views/management/cms/_crop_results_feature_image.html.erb

@@ -0,0 +1 @@
+<%= javascript_tag "$('pg_feature_image_path').value = '/#{File.join('images', 'content', @pg.path, File.basename(@image_file))}'; $('feature_image_preview').innerHTML = '#{page_image_tag(@pg, @image_file)}'; cancelSelectThumbnail();" %>