RubyGems - refinerycms - Versions diffs - 0.9.8 → 0.9.8.1 - Mend

refinerycms 0.9.8 → 0.9.8.1

Files changed (134) hide show

data/vendor/refinerycms/core/lib/refinery/helpers/script_helper.rb ADDED

@@ -0,0 +1,36 @@
+module Refinery
+  module Helpers
+    module ScriptHelper
+      # This function helps when including both the jquery and jqueryui libraries.
+      # If you use this function then whenever we update or relocate the version of jquery or jquery ui in use
+      # we will update the reference here and your existing application starts to use it.
+      # Use <%= jquery_include_tags %> to include it in your <head> section.
+      def jquery_include_tags(options={})
+        # Merge in options
+        options = {
+          :caching => RefinerySetting.find_or_set(:use_resource_caching, Rails.root.writable?),
+          :google => RefinerySetting.find_or_set(:use_google_ajax_libraries, false),
+          :jquery_ui => true
+        }.merge(options)
+        # render the tags normally unless
+        unless options[:google] and !local_request?
+          if options[:jquery_ui]
+            javascript_include_tag  "jquery#{"-min" if Rails.env.production?}", "jquery-ui-custom-min",
+                                    :cache => (options[:caching] ? "cache/jquery" : nil)
+          else
+            javascript_include_tag "jquery#{"-min" if Rails.env.production?}"
+          end
+        else
+          "#{javascript_include_tag("http://www.google.com/jsapi").gsub(".js", "")}
+          <script type='text/javascript'>
+            google.load('jquery', '1.4');
+            #{"google.load('jqueryui', '1.8');" if options[:jquery_ui]}
+          </script>".html_safe
+        end
+      end
+    end
+  end
+end

data/vendor/refinerycms/core/lib/refinery/helpers/site_bar_helper.rb ADDED

@@ -0,0 +1,26 @@
+module Refinery
+  module Helpers
+    module SiteBarHelper
+      # Generates the link to determine where the site bar switch button returns to.
+      def site_bar_switch_link
+        link_to_if(admin?, t('.switch_to_your_website'),
+                  (if session.keys.include?(:website_return_to) and session[:website_return_to].present?
+                    session[:website_return_to]
+                   else
+                    root_url(:only_path => true)
+                   end)) do
+          link_to t('.switch_to_your_website_editor'),
+                  (if session.keys.include?(:refinery_return_to) and session[:refinery_return_to].present?
+                    session[:refinery_return_to]
+                   elsif defined?(@page) and @page.present? and !@page.home?
+                     edit_admin_page_url(@page, :only_path => true)
+                   else
+                     (request.fullpath.to_s == '/') ? admin_root_url(:only_path => true) : "/admin#{request.request_uri}/edit"
+                   end rescue admin_root_url(:only_path => true))
+        end
+      end
+    end
+  end
+end

data/vendor/refinerycms/core/lib/refinery/helpers/tag_helper.rb ADDED

@@ -0,0 +1,19 @@
+module Refinery
+  module Helpers
+    module TagHelper
+      # Returns <span class='help' title='Your Input'>(help)</span>
+      # Remember to wrap your block with <span class='label_with_help'></span> if you're using a label next to the help tag.
+      def refinery_help_tag(title='')
+        "<span class='help' title='#{title}'>(#{t('shared.admin.help')})</span>".html_safe
+      end
+      # This is just a quick wrapper to render an image tag that lives inside refinery/icons.
+      # They are all 16x16 so this is the default but is able to be overriden with supplied options.
+      def refinery_icon_tag(filename, options = {})
+        image_tag "refinery/icons/#{filename}", {:width => 16, :height => 16}.merge(options)
+      end
+    end
+  end
+end

data/vendor/refinerycms/core/lib/refinery/helpers/translation_helper.rb ADDED

@@ -0,0 +1,17 @@
+module Refinery
+  module Helpers
+    module TranslationHelper
+      # Overrides Rails' core I18n.t() function to produce a more helpful error message.
+      # The default one wreaks havoc with CSS and makes it hard to understand the problem.
+      def t(key, options = {})
+        if (val = super) =~ /class.+?translation_missing/
+          val = val.to_s.gsub(/<span[^>]*>/, 'i18n: ').gsub('</span>', '').gsub(', ', '.')
+        end
+        val
+      end
+    end
+  end
+end

data/vendor/refinerycms/core/lib/refinery/plugin.rb CHANGED

@@ -96,11 +96,11 @@ module Refinery
       return @url if defined?(@url)
       if self.controller.present?
-        @url = {:controller => "admin/#{self.controller}"}
+        @url = {:controller => "/admin/#{self.controller}"}
       elsif self.directory.present?
-        @url = {:controller => "admin/#{self.directory.split('/').pop}"}
+        @url = {:controller => "/admin/#{self.directory.split('/').pop}"}
       else
-        @url = {:controller => "admin/#{self.name}"}
+        @url = {:controller => "/admin/#{self.name}"}
       end
     end

data/vendor/refinerycms/core/lib/tasks/refinery.rake CHANGED

@@ -118,11 +118,12 @@ end
 desc 'Removes trailing whitespace across the entire application.'
 task :whitespace do
-  if RUBY_PLATFORM =~ /linux/
+  require 'rbconfig'
+  if Config::CONFIG['host_os'] =~ /linux/
     sh %{find . -name '*.*rb' -exec sed -i 's/\t/  /g' {} \\; -exec sed -i 's/ *$//g' {} \\; }
-  elsif RUBY_PLATFORM =~ /darwin/
+  elsif Config::CONFIG['host_os'] =~ /darwin/
     sh %{find . -name '*.*rb' -exec sed -i '' 's/\t/  /g' {} \\; -exec sed -i '' 's/ *$//g' {} \\; }
   else
-    puts "This doesn't work on systems other than OSX or Linux. Please use a custom whitespace tool for your platform '#{RUBY_PLATFORM}'."
+    puts "This doesn't work on systems other than OSX or Linux. Please use a custom whitespace tool for your platform '#{Config::CONFIG["host_os"]}'."
   end
 end

data/vendor/refinerycms/core/public/javascripts/refinery/admin.js CHANGED

@@ -53,9 +53,6 @@ init_interface = function() {
     }
   });
-  // focus first field in an admin form.
-  $('form input[type=text]:first').focus();
   // ensure that the menu isn't wider than the page_container or else it looks silly to round that corner.
   if (($menu = $('#menu')).length > 0) {
     $menu.jcarousel({
@@ -344,9 +341,6 @@ var link_dialog = {
       if((resource_selected = $('#existing_resource_area_content ul li.linked a')).length > 0) {
         resourceUrl = parseURL(resource_selected.attr('href'));
         relevant_href = resourceUrl.pathname;
-        if (resourceUrl.protocol == "" && resourceUrl.hostname == "assets") {
-          relevant_href = "/assets" + relevant_href;
-        }
         // Add any alternate resource stores that need a absolute URL in the regex below
         if(resourceUrl.hostname.match(/s3.amazonaws.com/)) {
@@ -674,26 +668,34 @@ var image_dialog = {
       var imageThumbnailSize = $('#existing_image_size_area li.selected a').attr('data-size');
       var resize = $("#wants_to_resize_image").is(':checked');
+      var url = '/refinery/images/'+imageId+'/url';
       if (resize) {
-        var url = '/refinery/images/'+imageId+'/url?size='+imageThumbnailSize;
-      } else {
-        var url = '/refinery/images/'+imageId+'/url'
+        url += '?size='+imageThumbnailSize;
       }
       var data;
-      $.ajax({ async: false,
-               url: url,
-               success: function (result, status, xhr) {
-                 if (result.error) {
-                   alert("Something went wrong with the image insertion!");
-                 } else {
-                   data = result;
-                 }
-               },
-               error: function(xhr, txt, status) {
-                 alert("Something went wrong with the image insertion!");
-               }
-             });
+      $.ajax({
+        async: false,
+        url: url,
+        success: function (result, status, xhr) {
+          if (result.error) {
+            if (console && console.log) {
+               console.log("Something went wrong with the image insertion!");
+               console.log(result);
+             }
+           } else {
+             data = result;
+           }
+         },
+         error: function(xhr, txt, status) {
+           if (console && console.log) {
+             console.log("Something went wrong with the image insertion!");
+             console.log(xhr);
+             console.log(txt);
+             console.log(status);
+           }
+         }
+       });
       if (parent) {
         if ((wym_src = parent.document.getElementById('wym_src')) != null) {
@@ -706,7 +708,7 @@ var image_dialog = {
           wym_alt.value = $(img).attr('alt');
         }
         if ((wym_size = parent.document.getElementById('wym_size')) != null) {
-          wym_size.value = imageThumbnailSize;
+          wym_size.value = imageThumbnailSize.replace(/[<>=]/g, '');
         }
       }
     }
@@ -757,101 +759,68 @@ var list_reorder = {
   init: function() {
     $('#reorder_action').click(list_reorder.enable_reordering);
     $('#reorder_action_done').click(list_reorder.disable_reordering);
+    list_reorder.sortable_list.nestedSortable({
+      disableNesting: 'no-nest',
+      forcePlaceholderSize: true,
+      handle: 'div',
+      items: 'li',
+      opacity: .6,
+      placeholder: 'placeholder',
+      tabSize: 25,
+      tolerance: 'pointer',
+      toleranceElement: '> div',
+      disabled: true,
+      start: function () {
+      },
+      change: function () {
+        list_reorder.reset_branch_classes(this);
+      },
+      stop: function () {
+        list_reorder.reset_branch_classes(this);
+      }
+    });
+    list_reorder.reset_branch_classes(list_reorder.sortable_list);
   }
-  , enable_reordering: function(e) {
-    if(e) { e.preventDefault(); }
+  ,reset_branch_classes: function (ul) {
+    $("li.ui-sortable-helper", this).removeClass("record").removeClass("branch_start").removeClass("branch_end");
+    $("li", ul).removeClass("branch_start").removeClass("branch_end");
-    sortable_options = {
-      'tolerance': 'pointer'
-      , 'placeholder': 'placeholder'
-      , 'cursor': 'drag'
-      , 'items': 'li'
-      , 'axis': 'y'
-      , 'connectWith' : '.nested'
-    };
-    $(list_reorder.sortable_list).find('li').each(function(index, li) {
-      if ($('ul', li).length) { return; }
-      $("<ul></ul>").appendTo(li);
-    });
+    $("> li:first", ul).addClass("branch_start")
+    $("> li:last", ul).addClass("branch_end")
-    if (list_reorder.tree && !$.browser.msie) {
-      $(list_reorder.sortable_list).parent().nestedSortable($.extend(sortable_options, {
-        'maxDepth': 2
-        , 'placeholderElement': 'li'
-      }));
-      $(list_reorder.sortable_list).addClass('ui-sortable');
-    } else {
-      $(list_reorder.sortable_list).sortable(sortable_options);
-    }
+    var nested_ul = $("ul", ul);
+    $("> li:last", nested_ul).addClass("branch_end");
+  }
-    $('#site_bar, header > *:not(script)').fadeTo(500, 0.3);
+  ,enable_reordering: function(e) {
+    if(e) { e.preventDefault(); }
+    $('#sortable_list').addClass("reordering");
+    $('#sortable_list .actions, #site_bar, header > *:not(script)').fadeTo(500, 0.3);
     $('#actions *:not("#reorder_action_done, #reorder_action")').not($('#reorder_action_done').parents('li, ul')).fadeTo(500, 0.55);
+    list_reorder.sortable_list.nestedSortable("enable");
     $('#reorder_action').hide();
     $('#reorder_action_done').show();
   }
-  , parse_branch: function(indexes, li) {
-    branch = "&sortable_list";
-    $.each(indexes, function(i, index) {
-      branch += "[" + index + "]";
-    });
-    branch += "[id]=" + $($(li).attr('id').split('_')).last().get(0);
-    // parse any children branches too.
-    $(li).find('> li[id], > ul li[id]').each(function(i, child) {
-      current_indexes = $.merge($.merge([], indexes), [i]);
-      branch += list_reorder.parse_branch(current_indexes, child);
-    });
-    return branch;
-  }
   , disable_reordering: function(e) {
     if($('#reorder_action_done').hasClass('loading')){
       return false;
     }
     if(e) { e.preventDefault(); }
     $('#reorder_action_done').addClass('loading');
+    list_reorder.sortable_list.nestedSortable("disable");
+    $('#sortable_list').removeClass("reordering");
     if (list_reorder.update_url != null) {
-      serialized = "";
-      list_reorder.sortable_list.find('> li[id]').each(function(index, li) {
-        if (list_reorder.tree) {
-          serialized += list_reorder.parse_branch([index], li);
-        }
-        else {
-          serialized += "&sortable_list[]=" + $($(li).attr('id').split('_')).last().get(0);
-        }
-      });
-      serialized += "&tree=" + list_reorder.tree;
-      serialized += "&authenticity_token=" + encodeURIComponent($('#reorder_authenticity_token').val());
-      serialized += "&continue_reordering=false";
-      $.post(list_reorder.update_url, serialized, function(data) {
-        // handle the case where we get the whole list back including the <ul> or whatever.
-        if ((matches = data.match(new RegExp("^<" + list_reorder.sortable_list.get(0).tagName.toLowerCase()
-                                             + "[^>]+" + list_reorder.sortable_list.attr('id') + "[^>]>"))) != null)
-        {
-          // replace reorder authenticity token's value.
-          $('#reorder_authenticity_token').val(
-            $($(data.split('reorder_authenticity_token')).last().get(0).split('value=\''))
-              .last().get(0).split('\'')[0]);
-          // replace actual list content.
-          $(list_reorder.sortable_list).html($(data).html());
-        } else {
-          $(list_reorder.sortable_list).html(data);
-        }
+      var serialized = list_reorder.sortable_list.serializelist();
-        // if we get passed a script tag, re-enable reordering.
-        matches = data.replace('"', "'")
-                      .match(/<script\ type='text\/javascript'>([^<]*)<\/script>/im);
-        if (matches != null && matches.length > 1) {
-          list_reorder.enable_reordering();
-        } else {
-          list_reorder.restore_controls(e);
-        }
+      $.post(list_reorder.update_url, serialized, function(data) {
+        list_reorder.restore_controls(e);
       });
     } else {
       list_reorder.restore_controls(e);
@@ -866,7 +835,7 @@ var list_reorder = {
     }
     $(list_reorder.sortable_list).removeClass('reordering, ui-sortable');
-    $('#site_bar, header > *:not(script)').fadeTo(250, 1);
+    $('#sortable_list .actions, #site_bar, header > *:not(script)').fadeTo(250, 1);
     $('#actions *:not("#reorder_action_done, #reorder_action")').not($('#reorder_action_done').parents('li, ul')).fadeTo(250, 1, function() {
       $('#reorder_action_done').hide().removeClass('loading');
       $('#reorder_action').show();
@@ -913,7 +882,28 @@ var image_picker = {
   , changed: function(image) {
     $(this.options.field).val(image.id.replace("image_", ""));
-    image.src = image.src.replace('_dialog_thumb', '_' + this.options.thumbnail).replace(/\?\d*/, '');
+    $.ajax({
+      async: false,
+      url: '/refinery/images/'+$(image).attr('data-id')+'/url?size='+this.options.thumbnail,
+      success: function (result, status, xhr) {
+        if (result.error) {
+          if (console && console.log) {
+             console.log("Something went wrong with the image insertion!");
+             console.log(result);
+           }
+         } else {
+           image.src = result.url;
+         }
+       },
+       error: function(xhr, txt, status) {
+         if (console && console.log) {
+           console.log("Something went wrong with the image insertion!");
+           console.log(xhr);
+           console.log(txt);
+           console.log(status);
+         }
+       }
+    });
     current_image = $(this.options.image_display);
     current_image.replaceWith($("<img src='"+image.src+"?"+Math.floor(Math.random() * 1000000000)+"' id='"+current_image.attr('id')+"' class='brown_border' />"));
@@ -969,7 +959,9 @@ parseURL = function(url)
   //splice and join the remainder to get the pathname
   parts.splice(0, 2);
-  loc.pathname = '/' + parts.join('/');
+  // ensure we don't destroy absolute urls like /system/images/whatever.jpg
+  loc.pathname = (loc.href[0] == '/' ? ("/" + loc.host) : '');
+  loc.pathname += '/' + parts.join('/');
   //extract any hash and remove from the pathname
   loc.pathname = loc.pathname.split('#');

data/vendor/refinerycms/core/public/javascripts/refinery/core.js CHANGED

@@ -1,4 +1,7 @@
 $(document).ready(function(){
+  // focus first field in an admin form.
+  $('form input[type=text]:first').focus();
   init_flash_messages();
 });

data/vendor/refinerycms/core/public/javascripts/refinery/nestedsortables.js ADDED

@@ -0,0 +1,164 @@
+/*
+ * jQuery UI Nested Sortable 1.0.1
+ *
+ * Copyright 2010, Manuele J Sarfatti
+ *
+ * http://mjsarfatti.com/sandbox/nestedSortable
+ *
+ * Depends:
+ *	 jquery.ui.core.js 1.8+
+ *	 jquery.ui.widget.js 1.8+
+ *	 jquery.ui.sortable.js 1.8+
+ */
+(function($) {
+	$.widget("ui.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
+		options: {
+			tabSize: 20,
+			disableNesting: 'ui-nestedSortable-no-nesting',
+			errorClass: 'ui-nestedSortable-error'
+		},
+		_create: function(){
+			this.element.data('sortable', this.element.data('sortableTree'));
+			return $.ui.sortable.prototype._create.apply(this, arguments);
+		},
+		_mouseDrag: function(event) {
+			//Compute the helpers position
+			this.position = this._generatePosition(event);
+			this.positionAbs = this._convertPositionTo("absolute");
+			if (!this.lastPositionAbs) {
+				this.lastPositionAbs = this.positionAbs;
+			}
+			//Do scrolling
+			if(this.options.scroll) {
+				var o = this.options, scrolled = false;
+				if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
+					if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
+						this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
+					else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity)
+						this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
+					if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
+						this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
+					else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity)
+						this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+				} else {
+					if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
+						scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+					else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
+						scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+					if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
+						scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+					else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
+						scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+				}
+				if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
+					$.ui.ddmanager.prepareOffsets(this, event);
+			}
+			//Regenerate the absolute position used for position checks
+			this.positionAbs = this._convertPositionTo("absolute");
+			//Set the helper position
+			if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
+			if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
+			//Rearrange
+			for (var i = this.items.length - 1; i >= 0; i--) {
+				//Cache variables and intersection, continue if no intersection
+				var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
+				if (!intersection) continue;
+				if(itemElement != this.currentItem[0] //cannot intersect with itself
+					&&	this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
+					&&	!$.ui.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
+					&& (this.options.type == 'semi-dynamic' ? !$.ui.contains(this.element[0], itemElement) : true)
+					//&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
+				) {
+					this.direction = intersection == 1 ? "down" : "up";
+					if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
+						this._rearrange(event, item);
+					} else {
+						break;
+					}
+					// Clear emtpy ul's
+					this._clearUls(itemElement);
+					this._trigger("change", event, this._uiHash());
+					break;
+				}
+			}
+			// Get the real previous item
+			itemBefore = this.placeholder[0].previousSibling;
+			while (itemBefore != null) {
+				if (itemBefore.nodeType == 1 && itemBefore != this.currentItem[0]) {
+					break;
+				} else {
+					itemBefore = itemBefore.previousSibling;
+				}
+			}
+			parentItem = this.placeholder[0].parentNode.parentNode;
+			newUl = document.createElement('ul');
+			// Make/delete nested ul's
+			if (parentItem != null && parentItem.nodeName == 'LI' && this.positionAbs.left < parentItem.offsetLeft) {
+				$(parentItem).after(this.placeholder[0]);
+				this._clearUls(parentItem);
+			} else if (itemBefore != null && itemBefore.nodeName == 'LI' && this.position.left > itemBefore.offsetLeft + this.options.tabSize) {
+				if (!($(itemBefore).hasClass(this.options.disableNesting))) {
+					if ($(this.placeholder[0]).hasClass(this.options.errorClass)) {
+						$(this.placeholder[0]).css('marginLeft', 0).removeClass(this.options.errorClass);
+					}
+					if (itemBefore.children[1] == null) {
+						itemBefore.appendChild(newUl);
+					}
+					itemBefore.children[1].appendChild(this.placeholder[0]);
+				} else {
+					$(this.placeholder[0]).addClass(this.options.errorClass).css('marginLeft', this.options.tabSize);
+				}
+			} else if (itemBefore != null) {
+				if ($(this.placeholder[0]).hasClass(this.options.errorClass)) {
+					$(this.placeholder[0]).css('marginLeft', 0).removeClass(this.options.errorClass);
+				}
+				$(itemBefore).after(this.placeholder[0]);
+			}
+			//Post events to containers
+			this._contactContainers(event);
+			//Interconnect with droppables
+			if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
+			//Call callbacks
+			this._trigger('sort', event, this._uiHash());
+			this.lastPositionAbs = this.positionAbs;
+			return false;
+		},
+		_clear: function(event, noPropagation) {
+			$.ui.sortable.prototype._clear.apply(this, arguments);
+			// Clean last empty ul
+			for (var i = this.items.length - 1; i >= 0; i--) {
+				var item = this.items[i].item[0];
+				this._clearUls(item);
+			}
+			return true;
+		},
+		_clearUls: function(item) {
+			if (item.children[1] && item.children[1].children.length == 0) {
+				item.removeChild(item.children[1]);
+			}
+		}
+	}));
+	$.ui.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.ui.nestedSortable.prototype.options);
+})(jQuery);