refinerycms-core 2.0.4 → 2.0.5

data/app/assets/javascripts/refinery/admin.js.erb

@@ -70,9 +70,9 @@ init_modal_dialogs = function(){
         height = parseInt($(href.match("height=([0-9]*)")).last().get(0), 10)||473,
         title = $anchor.attr('title') || $anchor.attr('name') || $anchor.html() || null;
 
-    href = href.replace(/(\&(amp\;)?)?dialog\=true/, '')
-               .replace(/(\&(amp\;)?)?width\=\d+/, '')
-               .replace(/(\&(amp\;)?)?height\=\d+/, '')
+    href = href.replace(/((\&(amp\;)?)|\?)dialog\=true/, '')
+               .replace(/((\&(amp\;)?)|\?)width\=\d+/, '')
+               .replace(/((\&(amp\;)?)|\?)height\=\d+/, '')
                .replace(/(\?&(amp\;)?)/, '?')
                .replace(/\?$/, '');
 

data/app/assets/javascripts/refinery/nestedsortables.js

@@ -4,7 +4,7 @@
  * http://mjsarfatti.com/sandbox/nestedSortable
  *
  * Depends:
- *	 jquery.ui.sortable.js 1.8+
+ *   jquery.ui.sortable.js 1.8+
  *
  * License CC BY-SA 3.0
  * Copyright 2010-2011, Manuele J Sarfatti
@@ -12,345 +12,345 @@
 
 (function($) {
 
-	$.widget("ui.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
+  $.widget("ui.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
 
-		options: {
-			tabSize: 20,
-			disableNesting: 'ui-nestedSortable-no-nesting',
-			errorClass: 'ui-nestedSortable-error',
-			listType: 'ol',
-			maxLevels: 0,
-			noJumpFix: 0
-		},
-
-		_create: function(){
-			if (this.noJumpFix == false)
-				this.element.height(this.element.height());
-			this.element.data('sortable', this.element.data('nestedSortable'));
-			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
-					&&	!$.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
-					&& (this.options.type == 'semi-dynamic' ? !$.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/ol's
-					this._clearEmpty(itemElement);
-
-					this._trigger("change", event, this._uiHash());
-					break;
-				}
-			}
-
-			var parentItem = (this.placeholder[0].parentNode.parentNode && $(this.placeholder[0].parentNode.parentNode).closest('.ui-sortable').length) ? $(this.placeholder[0].parentNode.parentNode) : null;
-			var level = this._getLevel(this.placeholder);
-			var childLevels = this._getChildLevels(this.helper);
-			var previousItem = this.placeholder[0].previousSibling ? $(this.placeholder[0].previousSibling) : null;
-			if (previousItem != null) {
-				while (previousItem[0].nodeName.toLowerCase() != 'li' || previousItem[0] == this.currentItem[0]) {
-					if (previousItem[0].previousSibling) {
-						previousItem = $(previousItem[0].previousSibling);
-					} else {
-						previousItem = null;
-						break;
-					}
-				}
-			}
-
-			newList = document.createElement(o.listType);
-
-			this.beyondMaxLevels = 0;
-
-			// If the item is moved to the left, send it to its parent level
-			if (parentItem != null && this.positionAbs.left < parentItem.offset().left) {
-				parentItem.after(this.placeholder[0]);
-				this._clearEmpty(parentItem[0]);
-				this._trigger("change", event, this._uiHash());
-			}
-			// If the item is below another one and is moved to the right, make it a children of it
-			else if (previousItem != null && this.positionAbs.left > previousItem.offset().left + o.tabSize) {
-				this._isAllowed(previousItem, level+childLevels+1);
-				if (!previousItem.children(o.listType).length) {
-					previousItem[0].appendChild(newList);
-				}
-				previousItem.children(o.listType)[0].appendChild(this.placeholder[0]);
-				this._trigger("change", event, this._uiHash());
-			}
-			else {
-				this._isAllowed(parentItem, level+childLevels);
-			}
-
-			//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;
-
-		},
-
-		_mouseStop: function(event, noPropagation) {
-
-			// If the item is in a position not allowed, send it back
-			if (this.beyondMaxLevels) {
-				var parent = this.placeholder.parent().closest(this.options.items);
-				
-				for (var i = this.beyondMaxLevels - 1; i > 0; i--) {
-					parent = parent.parent().closest(this.options.items);
-				}
-
-				this.placeholder.removeClass(this.options.errorClass);
-				parent.after(this.placeholder);
-				this._trigger("change", event, this._uiHash());
-			}
-
-			$.ui.sortable.prototype._mouseStop.apply(this, arguments);
-
-		},
-
-		serialize: function(o) {
-
-			var items = this._getItemsAsjQuery(o && o.connected);
-			var str = []; o = o || {};
-
-			$(items).each(function() {
-				var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-				var pid = ($(o.item || this).parent(o.listType).parent('li').attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-				if(res) str.push((o.key || res[1]+'['+(o.key && o.expression ? res[1] : res[2])+']')+'='+(pid ? (o.key && o.expression ? pid[1] : pid[2]) : 'root'));
-			});
-
-			if(!str.length && o.key) {
-				str.push(o.key + '=');
-			}
-
-			return str.join('&');
-
-		},
-
-		toHierarchy: function(o) {
-
-			o = o || {};
-			var sDepth = o.startDepthCount || 0;
-			var ret = [];
-
-			$(this.element).children('li').each(function() {
-				var level = _recursiveItems($(this));
-				ret.push(level);
-			});
-
-			return ret;
-
-			function _recursiveItems(li) {
-				var id = ($(li).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-				if (id != null) {
-					var item = {"id" : id[2]};
-					if ($(li).children(o.listType).children('li').length > 0) {
-						item.children = [];
-						$(li).children(o.listType).children('li').each(function () {
-							var level = _recursiveItems($(this));
-							item.children.push(level);
-						});
-					}
-					return item;
-				}
-			}
+    options: {
+      tabSize: 20,
+      disableNesting: 'ui-nestedSortable-no-nesting',
+      errorClass: 'ui-nestedSortable-error',
+      listType: 'ol',
+      maxLevels: 0,
+      noJumpFix: 0
+    },
+
+    _create: function(){
+      if (this.noJumpFix == false)
+        this.element.height(this.element.height());
+      this.element.data('sortable', this.element.data('nestedSortable'));
+      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
+          &&  !$.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
+          && (this.options.type == 'semi-dynamic' ? !$.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/ol's
+          this._clearEmpty(itemElement);
+
+          this._trigger("change", event, this._uiHash());
+          break;
+        }
+      }
+
+      var parentItem = (this.placeholder[0].parentNode.parentNode && $(this.placeholder[0].parentNode.parentNode).closest('.ui-sortable').length) ? $(this.placeholder[0].parentNode.parentNode) : null;
+      var level = this._getLevel(this.placeholder);
+      var childLevels = this._getChildLevels(this.helper);
+      var previousItem = this.placeholder[0].previousSibling ? $(this.placeholder[0].previousSibling) : null;
+      if (previousItem != null) {
+        while (previousItem[0].nodeName.toLowerCase() != 'li' || previousItem[0] == this.currentItem[0]) {
+          if (previousItem[0].previousSibling) {
+            previousItem = $(previousItem[0].previousSibling);
+          } else {
+            previousItem = null;
+            break;
+          }
+        }
+      }
+
+      newList = document.createElement(o.listType);
+
+      this.beyondMaxLevels = 0;
+
+      // If the item is moved to the left, send it to its parent level
+      if (parentItem != null && this.positionAbs.left < parentItem.offset().left) {
+        parentItem.after(this.placeholder[0]);
+        this._clearEmpty(parentItem[0]);
+        this._trigger("change", event, this._uiHash());
+      }
+      // If the item is below another one and is moved to the right, make it a children of it
+      else if (previousItem != null && this.positionAbs.left > previousItem.offset().left + o.tabSize) {
+        this._isAllowed(previousItem, level+childLevels+1);
+        if (!previousItem.children(o.listType).length) {
+          previousItem[0].appendChild(newList);
+        }
+        previousItem.children(o.listType)[0].appendChild(this.placeholder[0]);
+        this._trigger("change", event, this._uiHash());
+      }
+      else {
+        this._isAllowed(parentItem, level+childLevels);
+      }
+
+      //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;
+
+    },
+
+    _mouseStop: function(event, noPropagation) {
+
+      // If the item is in a position not allowed, send it back
+      if (this.beyondMaxLevels) {
+        var parent = this.placeholder.parent().closest(this.options.items);
+        
+        for (var i = this.beyondMaxLevels - 1; i > 0; i--) {
+          parent = parent.parent().closest(this.options.items);
+        }
+
+        this.placeholder.removeClass(this.options.errorClass);
+        parent.after(this.placeholder);
+        this._trigger("change", event, this._uiHash());
+      }
+
+      $.ui.sortable.prototype._mouseStop.apply(this, arguments);
+
+    },
+
+    serialize: function(o) {
+
+      var items = this._getItemsAsjQuery(o && o.connected);
+      var str = []; o = o || {};
+
+      $(items).each(function() {
+        var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+        var pid = ($(o.item || this).parent(o.listType).parent('li').attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+        if(res) str.push((o.key || res[1]+'['+(o.key && o.expression ? res[1] : res[2])+']')+'='+(pid ? (o.key && o.expression ? pid[1] : pid[2]) : 'root'));
+      });
+
+      if(!str.length && o.key) {
+        str.push(o.key + '=');
+      }
+
+      return str.join('&');
+
+    },
+
+    toHierarchy: function(o) {
+
+      o = o || {};
+      var sDepth = o.startDepthCount || 0;
+      var ret = [];
+
+      $(this.element).children('li').each(function() {
+        var level = _recursiveItems($(this));
+        ret.push(level);
+      });
+
+      return ret;
+
+      function _recursiveItems(li) {
+        var id = ($(li).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+        if (id != null) {
+          var item = {"id" : id[2]};
+          if ($(li).children(o.listType).children('li').length > 0) {
+            item.children = [];
+            $(li).children(o.listType).children('li').each(function () {
+              var level = _recursiveItems($(this));
+              item.children.push(level);
+            });
+          }
+          return item;
+        }
+      }
         },
 
-		toArray: function(o) {
+    toArray: function(o) {
 
-			o = o || {};
-			var sDepth = o.startDepthCount || 0;
-			var ret = [];
-			var left = 2;
+      o = o || {};
+      var sDepth = o.startDepthCount || 0;
+      var ret = [];
+      var left = 2;
 
-			ret.push({"item_id": 'root', "parent_id": 'none', "depth": sDepth, "left": '1', "right": ($('li', this.element).length + 1) * 2});
+      ret.push({"item_id": 'root', "parent_id": 'none', "depth": sDepth, "left": '1', "right": ($('li', this.element).length + 1) * 2});
 
-			$(this.element).children('li').each(function () {
-				left = _recursiveArray(this, sDepth + 1, left);
-			});
+      $(this.element).children('li').each(function () {
+        left = _recursiveArray(this, sDepth + 1, left);
+      });
 
-			function _sortByLeft(a,b) {
-				return a['left'] - b['left'];
-			}
-			ret = ret.sort(_sortByLeft);
+      function _sortByLeft(a,b) {
+        return a['left'] - b['left'];
+      }
+      ret = ret.sort(_sortByLeft);
 
-			return ret;
+      return ret;
 
-			function _recursiveArray(item, depth, left) {
+      function _recursiveArray(item, depth, left) {
 
-				right = left + 1;
+        right = left + 1;
 
-				if ($(item).children(o.listType).children('li').length > 0) {
-					depth ++;
-					$(item).children(o.listType).children('li').each(function () {
-						right = _recursiveArray($(this), depth, right);
-					});
-					depth --;
-				}
+        if ($(item).children(o.listType).children('li').length > 0) {
+          depth ++;
+          $(item).children(o.listType).children('li').each(function () {
+            right = _recursiveArray($(this), depth, right);
+          });
+          depth --;
+        }
 
-				id = ($(item).attr(o.attribute || 'id')).match(o.expression || (/(.+)[-=_](.+)/));
+        id = ($(item).attr(o.attribute || 'id')).match(o.expression || (/(.+)[-=_](.+)/));
 
-				if (depth === sDepth + 1) pid = 'root';
-				else {
-					parentItem = ($(item).parent(o.listType).parent('li').attr('id')).match(o.expression || (/(.+)[-=_](.+)/));
-					pid = parentItem[2];
-				}
+        if (depth === sDepth + 1) pid = 'root';
+        else {
+          parentItem = ($(item).parent(o.listType).parent('li').attr('id')).match(o.expression || (/(.+)[-=_](.+)/));
+          pid = parentItem[2];
+        }
 
-				if (id != null) {
-						ret.push({"item_id": id[2], "parent_id": pid, "depth": depth, "left": left, "right": right});
-				}
+        if (id != null) {
+            ret.push({"item_id": id[2], "parent_id": pid, "depth": depth, "left": left, "right": right});
+        }
 
-				return left = right + 1;
-			}
+        return left = right + 1;
+      }
 
-		},
+    },
 
-		_clear: function(event, noPropagation) {
+    _clear: function(event, noPropagation) {
 
-			$.ui.sortable.prototype._clear.apply(this, arguments);
+      $.ui.sortable.prototype._clear.apply(this, arguments);
 
-			// Clean last empty ul/ol
-			for (var i = this.items.length - 1; i >= 0; i--) {
-				var item = this.items[i].item[0];
-				this._clearEmpty(item);
-			}
-			return true;
+      // Clean last empty ul/ol
+      for (var i = this.items.length - 1; i >= 0; i--) {
+        var item = this.items[i].item[0];
+        this._clearEmpty(item);
+      }
+      return true;
 
-		},
+    },
 
-		_clearEmpty: function(item) {
+    _clearEmpty: function(item) {
 
-			if (item.children[1] && item.children[1].children.length == 0) {
-				item.removeChild(item.children[1]);
-			}
+      if (item.children[1] && item.children[1].children.length == 0) {
+        item.removeChild(item.children[1]);
+      }
 
-		},
+    },
 
-		_getLevel: function(item) {
+    _getLevel: function(item) {
 
-			var level = 1;
+      var level = 1;
 
-			if (this.options.listType) {
-					var list = item.closest(this.options.listType);
-					while (!list.is('.ui-sortable')/* && level < this.options.maxLevels*/) {
-							level++;
-							list = list.parent().closest(this.options.listType);
-					}
-			}
+      if (this.options.listType) {
+          var list = item.closest(this.options.listType);
+          while (!list.is('.ui-sortable')/* && level < this.options.maxLevels*/) {
+              level++;
+              list = list.parent().closest(this.options.listType);
+          }
+      }
 
-			return level;
-		},
+      return level;
+    },
 
-		_getChildLevels: function(parent, depth) {
-			var self = this,
-			    o = this.options,
-			    result = 0;
-			depth = depth || 0;
+    _getChildLevels: function(parent, depth) {
+      var self = this,
+          o = this.options,
+          result = 0;
+      depth = depth || 0;
 
-			$(parent).children(o.listType).children(o.items).each(function (index, child) {
-					result = Math.max(self._getChildLevels(child, depth + 1), result);
-			});
+      $(parent).children(o.listType).children(o.items).each(function (index, child) {
+          result = Math.max(self._getChildLevels(child, depth + 1), result);
+      });
 
-			return depth ? result + 1 : result;
-		},
+      return depth ? result + 1 : result;
+    },
 
-		_isAllowed: function(parentItem, levels) {
-			var o = this.options
-			// Are we trying to nest under a no-nest or are we nesting too deep?
-			if (parentItem == null || !(parentItem.hasClass(o.disableNesting))) {
-				if (o.maxLevels < levels && o.maxLevels != 0) {
-					this.placeholder.addClass(o.errorClass);
-					this.beyondMaxLevels = levels - o.maxLevels;
-				} else {
-					this.placeholder.removeClass(o.errorClass);
-					this.beyondMaxLevels = 0;
-				}
-			} else {
-				this.placeholder.addClass(o.errorClass);
-				if (o.maxLevels < levels && o.maxLevels != 0) {
-					this.beyondMaxLevels = levels - o.maxLevels;
-				} else {
-					this.beyondMaxLevels = 1;
-				}
-			}
-		}
-
-	}));
-
-	$.ui.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.ui.nestedSortable.prototype.options);
-})(jQuery);
+    _isAllowed: function(parentItem, levels) {
+      var o = this.options
+      // Are we trying to nest under a no-nest or are we nesting too deep?
+      if (parentItem == null || !(parentItem.hasClass(o.disableNesting))) {
+        if (o.maxLevels < levels && o.maxLevels != 0) {
+          this.placeholder.addClass(o.errorClass);
+          this.beyondMaxLevels = levels - o.maxLevels;
+        } else {
+          this.placeholder.removeClass(o.errorClass);
+          this.beyondMaxLevels = 0;
+        }
+      } else {
+        this.placeholder.addClass(o.errorClass);
+        if (o.maxLevels < levels && o.maxLevels != 0) {
+          this.beyondMaxLevels = levels - o.maxLevels;
+        } else {
+          this.beyondMaxLevels = 1;
+        }
+      }
+    }
+
+  }));
+
+  $.ui.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.ui.nestedSortable.prototype.options);
+})(jQuery);

data/app/assets/javascripts/wymeditor/lang/ru.js

@@ -31,6 +31,7 @@ WYMeditor.STRINGS['ru'] = {
   Summary:          'Summary',
   Number_Of_Rows:   'Кол-во строк',
   Number_Of_Cols:   'Кол-во столбцов',
+  Insert:           'Вставить',
   Submit:           'Отправить',
   Cancel:           'Отмена',
   Choose:           'Выбор',

data/app/assets/stylesheets/refinery/layout.css.scss

@@ -230,6 +230,9 @@ a:hover {
   padding: 0px;
   a {
     border-bottom: 1px dotted #727272;
+    &.locale {
+      border-bottom: 0;
+    }
   }
   h1 {
     font-size: 18px;
@@ -1565,4 +1568,4 @@ a.information:hover {
 }
 .ie8 .pagination a, .ie8 #content .pagination a, .ie8 .pagination .current, .ie8 .disabled, .ie8 .pagination em {
   padding-bottom: 6px;
-}
+}

data/app/views/layouts/refinery/flash.html.erb

@@ -1,2 +1,2 @@
-<%= render :partial => '/refinery/message' if request.xhr? %>
+<%= render '/refinery/message' if request.xhr? %>
 <%= yield %>

data/app/views/refinery/_content_page.html.erb

@@ -2,4 +2,4 @@
       :hide_sections => local_assigns[:hide_sections],
       :can_use_fallback => !local_assigns[:show_empty_sections] && !local_assigns[:remove_automatic_sections]
     }) %>
-<%= render :partial => '/refinery/draft_page_message' unless @page.nil? or @page.live? -%>
+<%= render '/refinery/draft_page_message' unless @page.nil? or @page.live? -%>

data/app/views/refinery/_head.html.erb

@@ -2,9 +2,9 @@
   <meta charset='<%= Rails.application.config.encoding %>' />
   <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
   <title><%= browser_title(yield(:title)) %></title>
-  <%= raw(%(<meta name="description" content="#{@meta.meta_description}" />)) if @meta.meta_description.present? -%>
-  <%= raw(%(<meta name="keywords" content="#{@meta.meta_keywords}">)) if @meta.meta_keywords.present? -%>
-  <%= raw(%(<link rel="canonical" content="#{@canonical}" />)) if @canonical.present? -%>
+  <%= raw %(<meta name="description" content="#{@meta.meta_description}" />) if @meta.meta_description.present? -%>
+  <%= raw %(<meta name="keywords" content="#{@meta.meta_keywords}">) if @meta.meta_keywords.present? -%>
+  <%= raw %(<link rel="canonical" content="#{@canonical}" />) if @canonical.present? -%>
   <%= csrf_meta_tags if Refinery::Core.authenticity_token_on_frontend -%>
   <%= yield :meta %>
 

data/lib/generators/refinery/engine/engine_generator.rb

@@ -20,6 +20,8 @@ module Refinery
 
       merge_locales!
 
+      copy_or_merge_seeds!
+
       append_extension_to_gemfile!
 
       finalize_extension!

data/lib/generators/refinery/engine/templates/app/models/refinery/namespace/singular_name.rb

@@ -14,13 +14,12 @@ module Refinery
 <% end -%>
 <% if (string_attributes = attributes.select{ |a| a.type.to_s =~ /string|text/ }.uniq).any? -%>
 
-      attr_accessible <%= string_attributes.first.name.to_sym.inspect %>, :position
+      attr_accessible <%= attributes.map { |attr| ":#{attr.name}" }.join(', ') %>, :position
 
       acts_as_indexed :fields => <%= string_attributes.map{|s| s.name.to_sym}.inspect %>
 
       validates <%= string_attributes.first.name.to_sym.inspect %>, :presence => true, :uniqueness => true
 <% else -%>
-
       # def title was created automatically because you didn't specify a string field
       # when you ran the refinery:engine generator. <3 <3 Refinery CMS.
       def title
@@ -34,6 +33,7 @@ module Refinery
 <% attributes.select{|a| a.type.to_s == 'resource'}.uniq.each do |a| -%>
 
       belongs_to :<%= a.name.gsub("_id", "") %>, :class_name => '::Refinery::Resource'
+
 <% end -%>
     end
   end

data/lib/generators/refinery/engine/templates/app/views/refinery/namespace/plural_name/index.html.erb

@@ -1,4 +1,4 @@
-<%% content_for :body_content_left do %>
+<%% content_for :body do %>
   <ul id="<%= plural_name %>">
     <%% @<%= "all_" if plural_name == singular_name%><%= plural_name %>.each do |<%= singular_name %>| %>
       <li>

data/lib/generators/refinery/engine/templates/app/views/refinery/namespace/plural_name/show.html.erb

@@ -2,7 +2,7 @@
   <%%= @<%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>.<%= title.name %><% else %>.title<% end %> %>
 <%% end %>
 
-<%% content_for :body_content_left do %>
+<%% content_for :body do %>
 <% attributes.each do |attribute| -%>
   <section>
     <h1><%= attribute.name.titleize %></h1>
@@ -23,7 +23,7 @@
 <% end -%>
 <%% end %>
 
-<%% content_for :body_content_right do %>
+<%% content_for :side_body do %>
   <aside>
     <h2><%%= t('.other') %></h2>
     <ul id="<%= plural_name %>">

data/lib/generators/refinery/engine/templates/db/seeds.rb

@@ -1,23 +1,27 @@
-if defined?(::Refinery::User)
-  ::Refinery::User.all.each do |user|
-    if user.plugins.where(:name => 'refinerycms-<%= namespacing.underscore %>').blank?
-      user.plugins.create(:name => 'refinerycms-<%= namespacing.underscore %>',
-                          :position => (user.plugins.maximum(:position) || -1) +1)
+(Refinery.i18n_enabled? ? Refinery::I18n.frontend_locales : [:en]).each do |lang|
+  I18n.locale = lang
+  
+  if defined?(Refinery::User)
+    Refinery::User.all.each do |user|
+      if user.plugins.where(:name => 'refinerycms-<%= namespacing.underscore %>').blank?
+        user.plugins.create(:name => 'refinerycms-<%= namespacing.underscore %>',
+                            :position => (user.plugins.maximum(:position) || -1) +1)
+      end
     end
   end
-end
 
-<% unless skip_frontend? %>
-url = "/<%= [(namespacing.underscore if namespacing.underscore != plural_name), plural_name].compact.join('/') %>"
-if defined?(::Refinery::Page) && ::Refinery::Page.where(:link_url => url).empty?
-  page = ::Refinery::Page.create(
-    :title => '<%= class_name.pluralize.underscore.titleize %>',
-    :link_url => url,
-    :deletable => false,
-    :menu_match => "^#{url}(\/|\/.+?|)$"
-  )
-  Refinery::Pages.default_parts.each_with_index do |default_page_part, index|
-    page.parts.create(:title => default_page_part, :body => nil, :position => index)
+<% unless skip_frontend? -%>
+  url = "/<%= [(namespacing.underscore if namespacing.underscore != plural_name), plural_name].compact.join('/') %>"
+  if defined?(Refinery::Page) && Refinery::Page.where(:link_url => url).empty?
+    page = Refinery::Page.create(
+      :title => '<%= class_name.pluralize.underscore.titleize %>',
+      :link_url => url,
+      :deletable => false,
+      :menu_match => "^#{url}(\/|\/.+?|)$"
+    )
+    Refinery::Pages.default_parts.each_with_index do |default_page_part, index|
+      page.parts.create(:title => default_page_part, :body => nil, :position => index)
+    end
   end
+<% end -%>
 end
-<% end %>

data/lib/generators/refinery/engine/templates/spec/spec_helper.rb

@@ -2,13 +2,13 @@ def setup_environment
   # Configure Rails Environment
   ENV["RAILS_ENV"] ||= 'test'
 
-  if File.exist?(dummy_path = File.expand_path('../spec/dummy/config/environment.rb', __FILE__))
+  if File.exist?(dummy_path = File.expand_path('../dummy/config/environment.rb', __FILE__))
     require dummy_path
   elsif File.dirname(__FILE__) =~ %r{vendor/extensions}
     # Require the path to the refinerycms application this is vendored inside.
     require File.expand_path('../../../../../config/environment', __FILE__)
   else
-    raise "Could not find a config/environment.rb file to require. Please specify this in spec/spec_helper.rb"
+    raise "Could not find a config/environment.rb file to require. Please specify this in #{File.expand_path(__FILE__)}"
   end
 
   require 'rspec/rails'

data/lib/generators/refinery/form/form_generator.rb

@@ -22,6 +22,8 @@ module Refinery
 
       merge_locales!
 
+      copy_or_merge_seeds!
+
       append_extension_to_gemfile!
 
       finalize_extension!

data/lib/generators/refinery/form/templates/app/models/refinery/namespace/singular_name.rb

@@ -3,11 +3,13 @@ module Refinery
     class <%= class_name %> < Refinery::Core::BaseModel
 <% if table_name == namespacing.underscore.pluralize -%>
       self.table_name = 'refinery_<%= plural_name %>'
-<% end -%>
-<% if (text_or_string_fields = attributes.map{ |a| a.name if a.type.to_s =~ /string|text/ }.compact.uniq).any? %>
+<% end %>
+      attr_accessible <%= attributes.map { |attr| ":#{attr.name}" }.join(', ') %>, :position
+
+<% if (text_or_string_fields = attributes.map{ |a| a.name if a.type.to_s =~ /string|text/ }.compact.uniq).any? -%>
       acts_as_indexed :fields => [:<%= text_or_string_fields.join(", :") %>]
 <% end -%>
-<% if (text_fields = attributes.map {|a| a.name if a.type.to_s == 'text'}.compact.uniq).any? && text_fields.detect{|a| a.to_s == 'message'}.nil? %>
+<% if (text_fields = attributes.map {|a| a.name if a.type.to_s == 'text'}.compact.uniq).any? && text_fields.detect{|a| a.to_s == 'message'}.nil? -%>
       alias_attribute :message, :<%= text_fields.first %>
 <% elsif text_fields.empty? %>
       # def message was created automatically because you didn't specify a text field

data/lib/generators/refinery/form/templates/app/views/refinery/namespace/plural_name/new.html.erb

@@ -1,4 +1,4 @@
-<%% content_for :body_content_left do %>
+<%% content_for :body do %>
   <div class='<%= plural_name %>'>
     <%%=raw @page.content_for(Refinery::Pages.default_parts.first.to_sym) %>
 

data/lib/generators/refinery/form/templates/db/seeds.rb

@@ -1,27 +1,31 @@
-if defined?(::Refinery::User)
-  ::Refinery::User.all.each do |user|
-    if user.plugins.find_by_name('<%= plural_name %>').nil?
-      user.plugins.create(:name => "<%= plural_name %>",
-                          :position => (user.plugins.maximum(:position) || -1) +1)
+(Refinery.i18n_enabled? ? Refinery::I18n.frontend_locales : [:en]).each do |lang|
+  I18n.locale = lang
+  
+  if defined?(Refinery::User)
+    Refinery::User.all.each do |user|
+      if user.plugins.find_by_name('<%= plural_name %>').nil?
+        user.plugins.create(:name => "<%= plural_name %>",
+                            :position => (user.plugins.maximum(:position) || -1) +1)
+      end
     end
   end
-end
 
-if defined?(::Refinery::Page)
-  page = ::Refinery::Page.create(
-    :title => "<%= class_name.pluralize.underscore.titleize %>",
-    :link_url => "/<%= plural_name %>/new",
-    :deletable => false,
-    :menu_match => "^/<%= plural_name %>(\/|\/.+?|)$"
-  )
-  thank_you_page = page.children.create(
-    :title => "Thank You",
-    :link_url => "/<%= plural_name %>/thank_you",
-    :deletable => false,
-    :show_in_menu => false
-  )
-  Refinery::Pages.default_parts.each do |default_page_part|
-    page.parts.create(:title => default_page_part, :body => nil)
-    thank_you_page.parts.create(:title => default_page_part, :body => nil)
+  if defined?(Refinery::Page)
+    page = Refinery::Page.create(
+      :title => "<%= class_name.pluralize.underscore.titleize %>",
+      :link_url => "/<%= plural_name %>/new",
+      :deletable => false,
+      :menu_match => "^/<%= plural_name %>(\/|\/.+?|)$"
+    )
+    thank_you_page = page.children.create(
+      :title => "Thank You",
+      :link_url => "/<%= plural_name %>/thank_you",
+      :deletable => false,
+      :show_in_menu => false
+    )
+    Refinery::Pages.default_parts.each do |default_page_part|
+      page.parts.create(:title => default_page_part, :body => nil)
+      thank_you_page.parts.create(:title => default_page_part, :body => nil)
+    end
   end
 end

data/lib/refinery/activity.rb

@@ -9,6 +9,7 @@ module Refinery
     # Total number of activies to show for a given class of activity
     attr_accessor :limit
 
+    # Other objects, like parents, to include in the nesting structure
     attr_accessor :nested_with
 
     # SQL order by string to specify how to order the activities in the activity feed for
@@ -21,6 +22,10 @@ module Refinery
     # Image asset to use to represent updated instance of the class thisa activity represents
     attr_accessor :updated_image
 
+    # Boolean; whether or not to use the record itself when constructing the nesting
+    # Default true
+    attr_accessor :use_record_in_nesting
+
     # Creates a new instance of Activity for a registered Refinery Plugin. An optional
     # hash of options can be specified to customize the values of each attribute
     # accessor defined on this class. Each key specified in the options hash should be a
@@ -31,7 +36,8 @@ module Refinery
     #   Activity.new(:limit => 10, :title => "Newest Activity!")
     #
     # Warning:
-    #  for the nested_with option, pass in the reverse order of ancestry e.g. [parent.parent_of_parent, parent]
+    #  for the nested_with option, pass in the reverse order of ancestry
+    #  e.g. [parent.parent_of_parent, parent]
     def initialize(options = {})
       {
         :class_name => nil,
@@ -43,7 +49,8 @@ module Refinery
         :title => "title",
         :updated_image => "edit.png",
         :url => nil,
-        :url_prefix => "edit"
+        :url_prefix => "edit",
+        :use_record_in_nesting => true
       }.merge(options).each { |key, value| self.send(:"#{key}=", value) }
     end
 
@@ -80,11 +87,15 @@ module Refinery
     end
 
     # to use in a URL like edit_refinery_admin_group_individuals_path(record.group, record)
-    # which will help you if you're using nested routed.
+    # which will help you if you're using nested routes.
     def nesting(record_string = "record")
-      self.nested_with.inject("") { |nest_chain, nesting|
-        nest_chain << "#{record_string}.#{nesting},"
-      }
+      @nesting ||= begin
+        chain = self.nested_with.inject([]) { |nest_chain, nesting|
+          nest_chain << "#{record_string}.#{nesting}"
+        }
+        chain << record_string if self.use_record_in_nesting
+        chain.join(',')
+      end
     end
 
     attr_writer :url_prefix

data/lib/refinery/cli.rb

@@ -67,7 +67,7 @@ module Refinery
           puts "Couldn't match any model files in any extensions like #{model}"
         end
       elsif (javascripts = env["javascript"]).present?
-        pattern = "#{javascripts.split("/").join(File::SEPARATOR)}*.js"
+        pattern = "#{javascripts.split("/").join(File::SEPARATOR)}*.js{,.*}"
         looking_for = ::Refinery::Plugins.registered.pathnames.map{|p| p.join("app", "assets", "javascripts", pattern).to_s}
 
         # copy in the matches

data/lib/refinery/extension_generation.rb

@@ -139,6 +139,7 @@ module Refinery
             reject_template?(f)
           }.sort.each do |path|
             if (template_path = extension_path_for(path, extension_name)).present?
+              next if path.to_s =~ /seeds.rb/
               template path, template_path
             end
           end
@@ -209,6 +210,27 @@ module Refinery
           end
         end
 
+        def copy_or_merge_seeds!
+          source_seed_file      = source_pathname.join("db/seeds.rb")
+          destination_seed_file = destination_pathname.join(extension_path_for(source_seed_file, extension_name))
+
+          if existing_extension?
+            # create temp seeds file
+            temp_seed_file = destination_pathname.join(extension_path_for("tmp/seeds.rb", extension_name))
+
+            # copy/evaluate seeds template to temp file
+            template source_seed_file, temp_seed_file, :verbose => false
+
+            # append temp seeds file content to extension seeds file
+            destination_seed_file.open('a+') { |file| file.puts temp_seed_file.read.to_s }
+
+            # remove temp file
+            FileUtils.rm_rf temp_seed_file
+          else
+            template source_seed_file, destination_seed_file
+          end
+        end
+
         def puts_instructions!
           unless Rails.env.test?
             puts "------------------------"

data/lib/refinery/version.rb

@@ -2,7 +2,7 @@ module Refinery
   class Version
     @major = 2
     @minor = 0
-    @tiny  = 4
+    @tiny  = 5
     @build = nil
 
     class << self

data/spec/lib/generators/refinery/engine/engine_generator_spec.rb

@@ -80,5 +80,20 @@ module Refinery
         end
       }
     end
+
+    context "when generating extension inside existing extensions dir" do
+      before do
+        Refinery::EngineGenerator.any_instance.stub(:merge_locales!).and_return(true)
+        Refinery::EngineGenerator.any_instance.stub(:existing_extension?).and_return(true)
+        
+        run_generator %w{ rspec_item_test title:string --extension rspec_product_tests --skip }
+      end
+
+      it "appends existing seeds file" do
+        File.open("#{destination_root}/vendor/extensions/rspec_product_tests/db/seeds.rb") do |file|
+          file.grep(%r{/rspec_product_tests|/rspec_item_tests}).count.should eq(2)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-core
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_indexed
@@ -698,7 +698,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1126553336485468710
+      hash: 753990109908748551
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -707,7 +707,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1126553336485468710
+      hash: 753990109908748551
 requirements: []
 rubyforge_project: refinerycms
 rubygems_version: 1.8.22