ideyabox 0.1.3 → 0.1.4

data/app/assets/javascripts/default.js

@@ -7,8 +7,8 @@
 //= require swfobject.js
 //= require jquery.uploadify.min
 //= require jquery-ui.min.js
-//= require jquery.ui.nestedSortable
 //= require chosen.jquery.js
+//= require jquery.mjs.nestedSortable.js
 
 //
 $(document).ready(function(){
@@ -80,5 +80,5 @@ $(document).ready(function(){
     $(".cropable").removeAttr('id');
     $('.crop_params input').val('');
   });
-  
+
 });

data/app/assets/javascripts/{jquery.ui.nestedSortable.js → jquery.mjs.nestedSortable.js}

@@ -1,29 +1,39 @@
 /*
  * jQuery UI Nested Sortable
- * v 1.3.4 / 28 apr 2011f
- * http://mjsarfatti.com/sandbox/nestedSortable
+ * v 1.3.5 / 21 jun 2012
+ * http://mjsarfatti.com/code/nestedSortable
  *
- * Depends:
+ * Depends on:
  *	 jquery.ui.sortable.js 1.8+
  *
- * License CC BY-SA 3.0
- * Copyright 2010-2011, Manuele J Sarfatti
+ * Copyright (c) 2010-2012 Manuele J Sarfatti
+ * Licensed under the MIT License
+ * http://www.opensource.org/licenses/mit-license.php
  */
 
 (function($) {
 
-	$.widget("ui.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
+	$.widget("mjs.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
 
 		options: {
 			tabSize: 20,
-			disableNesting: 'ui-nestedSortable-no-nesting',
-			errorClass: 'ui-nestedSortable-error',
+			disableNesting: 'mjs-nestedSortable-no-nesting',
+			errorClass: 'mjs-nestedSortable-error',
+			doNotClear: false,
 			listType: 'ol',
-			maxLevels: 0
+			maxLevels: 0,
+			protectRoot: false,
+			rootID: null,
+			rtl: false,
+			isAllowed: function(item, parent) { return true; }
 		},
 
 		_create: function() {
 			this.element.data('sortable', this.element.data('nestedSortable'));
+
+			if (!this.element.is(this.options.listType))
+				throw new Error('nestedSortable: Please check the listType option is set to your actual list type');
+
 			return $.ui.sortable.prototype._create.apply(this, arguments);
 		},
 
@@ -44,9 +54,11 @@
 				this.lastPositionAbs = this.positionAbs;
 			}
 
+			var o = this.options;
+
 			//Do scrolling
 			if(this.options.scroll) {
-				var o = this.options, scrolled = false;
+				var scrolled = false;
 				if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
 
 					if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
@@ -80,6 +92,9 @@
 			//Regenerate the absolute position used for position checks
 			this.positionAbs = this._convertPositionTo("absolute");
 
+      // Find the top offset before rearrangement,
+      var previousTopOffset = this.placeholder.offset().top;
+
 			//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';
@@ -117,16 +132,17 @@
 				}
 			}
 
-			var parentItem = (this.placeholder[0].parentNode.parentNode
-				       && $(this.placeholder[0].parentNode.parentNode).closest('.ui-sortable').length)
-				       ? $(this.placeholder[0].parentNode.parentNode)
-				       : null,
+			var parentItem = (this.placeholder[0].parentNode.parentNode &&
+							 $(this.placeholder[0].parentNode.parentNode).closest('.ui-sortable').length)
+				       			? $(this.placeholder[0].parentNode.parentNode)
+				       			: null,
 			    level = this._getLevel(this.placeholder),
-			    childLevels = this._getChildLevels(this.helper),
-			    previousItem = this.placeholder[0].previousSibling ? $(this.placeholder[0].previousSibling) : null;
+			    childLevels = this._getChildLevels(this.helper);
 
+      // To find the previous sibling in the list, keep backtracking until we hit a valid list item.
+			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]) {
+				while (previousItem[0].nodeName.toLowerCase() != 'li' || previousItem[0] == this.currentItem[0] || previousItem[0] == this.helper[0]) {
 					if (previousItem[0].previousSibling) {
 						previousItem = $(previousItem[0].previousSibling);
 					} else {
@@ -136,27 +152,51 @@
 				}
 			}
 
-			newList = document.createElement(o.listType);
+      // To find the next sibling in the list, keep stepping forward until we hit a valid list item.
+      var nextItem = this.placeholder[0].nextSibling ? $(this.placeholder[0].nextSibling) : null;
+      if (nextItem != null) {
+        while (nextItem[0].nodeName.toLowerCase() != 'li' || nextItem[0] == this.currentItem[0] || nextItem[0] == this.helper[0]) {
+          if (nextItem[0].nextSibling) {
+            nextItem = $(nextItem[0].nextSibling);
+          } else {
+            nextItem = null;
+            break;
+          }
+        }
+      }
+
+			var 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) {
+			
+			// If the item is moved to the left, send it to its parent's level unless there are siblings below it.
+			if (parentItem != null && nextItem == null &&
+					(o.rtl && (this.positionAbs.left + this.helper.outerWidth() > parentItem.offset().left + parentItem.outerWidth()) ||
+					!o.rtl && (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 the item is below a sibling and is moved to the right, make it a child of that sibling.
+			else if (previousItem != null &&
+						(o.rtl && (this.positionAbs.left + this.helper.outerWidth() < previousItem.offset().left + previousItem.outerWidth() - o.tabSize) ||
+						!o.rtl && (this.positionAbs.left > previousItem.offset().left + o.tabSize))) {
+				this._isAllowed(previousItem, level, level+childLevels+1);
 				if (!previousItem.children(o.listType).length) {
 					previousItem[0].appendChild(newList);
 				}
-				previousItem.children(o.listType)[0].appendChild(this.placeholder[0]);
+        // If this item is being moved from the top, add it to the top of the list.
+        if (previousTopOffset && (previousTopOffset <= previousItem.offset().top)) {
+          previousItem.children(o.listType).prepend(this.placeholder);
+        }
+        // Otherwise, add it to the bottom of the list.
+        else {
+				  previousItem.children(o.listType)[0].appendChild(this.placeholder[0]);
+        }
 				this._trigger("change", event, this._uiHash());
 			}
 			else {
-				this._isAllowed(parentItem, level+childLevels);
+				this._isAllowed(parentItem, level, level+childLevels);
 			}
 
 			//Post events to containers
@@ -180,24 +220,14 @@
 
 				this.placeholder.removeClass(this.options.errorClass);
 
-				if (this.options.revertOnError) {
-					if (this.domPosition.prev) {
-						$(this.domPosition.prev).after(this.placeholder);
-					} else {
-						$(this.domPosition.parent).prepend(this.placeholder);
-					}
-					this._trigger("revert", event, this._uiHash());
+				if (this.domPosition.prev) {
+					$(this.domPosition.prev).after(this.placeholder);
 				} else {
-					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);
-					}
-
-					parent.after(this.placeholder);
-					this._trigger("change", event, this._uiHash());
+					$(this.domPosition.parent).prepend(this.placeholder);
 				}
 
+				this._trigger("revert", event, this._uiHash());
+
 			}
 
 			// Clean last empty ul/ol
@@ -210,23 +240,24 @@
 
 		},
 
-		serialize: function(o) {
+		serialize: function(options) {
 
-			var items = this._getItemsAsjQuery(o && o.connected),
-			    str = []; o = o || {};
+			var o = $.extend({}, this.options, options),
+				items = this._getItemsAsjQuery(o && o.connected),
+			    str = [];
 
 			$(items).each(function() {
 				var res = ($(o.item || this).attr(o.attribute || 'id') || '')
 						.match(o.expression || (/(.+)[-=_](.+)/)),
 				    pid = ($(o.item || this).parent(o.listType)
-						.parent('li')
+						.parent(o.items)
 						.attr(o.attribute || 'id') || '')
 						.match(o.expression || (/(.+)[-=_](.+)/));
 
 				if (res) {
-					str.push((o.key || res[1] + '[' + (o.key && o.expression ? res[1] : res[2]) + ']')
+					str.push(((o.key || res[1]) + '[' + (o.key && o.expression ? res[1] : res[2]) + ']')
 						+ '='
-						+ (pid ? (o.key && o.expression ? pid[1] : pid[2]) : 'root'));
+						+ (pid ? (o.key && o.expression ? pid[1] : pid[2]) : o.rootID));
 				}
 			});
 
@@ -238,51 +269,51 @@
 
 		},
 
-		toHierarchy: function(o) {
+		toHierarchy: function(options) {
 
-			o = o || {};
-			var sDepth = o.startDepthCount || 0,
+			var o = $.extend({}, this.options, options),
+				sDepth = o.startDepthCount || 0,
 			    ret = [];
 
-			$(this.element).children('li').each(function () {
-				var level = _recursiveItems($(this));
+			$(this.element).children(o.items).each(function () {
+				var level = _recursiveItems(this);
 				ret.push(level);
 			});
 
 			return ret;
 
-			function _recursiveItems(li) {
-				var id = ($(li).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+			function _recursiveItems(item) {
+				var id = ($(item).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
 				if (id) {
-					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);
+					var currentItem = {"id" : id[2]};
+					if ($(item).children(o.listType).children(o.items).length > 0) {
+						currentItem.children = [];
+						$(item).children(o.listType).children(o.items).each(function() {
+							var level = _recursiveItems(this);
+							currentItem.children.push(level);
 						});
 					}
-					return item;
+					return currentItem;
 				}
 			}
 		},
 
-		toArray: function(o) {
+		toArray: function(options) {
 
-			o = o || {};
-			var sDepth = o.startDepthCount || 0,
+			var o = $.extend({}, this.options, options),
+				sDepth = o.startDepthCount || 0,
 			    ret = [],
 			    left = 2;
 
 			ret.push({
-				"item_id": 'root',
+				"item_id": o.rootID,
 				"parent_id": 'none',
 				"depth": sDepth,
 				"left": '1',
-				"right": ($('li', this.element).length + 1) * 2
+				"right": ($(o.items, this.element).length + 1) * 2
 			});
 
-			$(this.element).children('li').each(function () {
+			$(this.element).children(o.items).each(function () {
 				left = _recursiveArray(this, sDepth + 1, left);
 			});
 
@@ -296,9 +327,9 @@
 				    id,
 				    pid;
 
-				if ($(item).children(o.listType).children('li').length > 0) {
+				if ($(item).children(o.listType).children(o.items).length > 0) {
 					depth ++;
-					$(item).children(o.listType).children('li').each(function () {
+					$(item).children(o.listType).children(o.items).each(function () {
 						right = _recursiveArray($(this), depth, right);
 					});
 					depth --;
@@ -307,12 +338,12 @@
 				id = ($(item).attr(o.attribute || 'id')).match(o.expression || (/(.+)[-=_](.+)/));
 
 				if (depth === sDepth + 1) {
-					pid = 'root';
+					pid = o.rootID;
 				} else {
 					var parentItem = ($(item).parent(o.listType)
-						.parent('li')
-						.attr(o.attribute || 'id'))
-						.match(o.expression || (/(.+)[-=_](.+)/));
+											 .parent(o.items)
+											 .attr(o.attribute || 'id'))
+											 .match(o.expression || (/(.+)[-=_](.+)/));
 					pid = parentItem[2];
 				}
 
@@ -329,7 +360,7 @@
 		_clearEmpty: function(item) {
 
 			var emptyList = $(item).children(this.options.listType);
-			if (emptyList.length && !emptyList.children().length) {
+			if (emptyList.length && !emptyList.children().length && !this.options.doNotClear) {
 				emptyList.remove();
 			}
 
@@ -341,7 +372,8 @@
 
 			if (this.options.listType) {
 				var list = item.closest(this.options.listType);
-				while (!list.is('.ui-sortable')) {
+				while (list && list.length > 0 && 
+                    	!list.is('.ui-sortable')) {
 					level++;
 					list = list.parent().closest(this.options.listType);
 				}
@@ -363,28 +395,35 @@
 			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) {
+		_isAllowed: function(parentItem, level, levels) {
+			var o = this.options,
+				isRoot = $(this.domPosition.parent).hasClass('ui-sortable') ? true : false,
+				maxLevels = this.placeholder.closest('.ui-sortable').nestedSortable('option', 'maxLevels'); // this takes into account the maxLevels set to the recipient list
+
+			// Is the root protected?
+			// Are we trying to nest under a no-nest?
+			// Are we nesting too deep?
+			if (!o.isAllowed(this.currentItem, parentItem) ||
+				parentItem && parentItem.hasClass(o.disableNesting) ||
+				o.protectRoot && (parentItem == null && !isRoot || isRoot && level > 1)) {
 					this.placeholder.addClass(o.errorClass);
-					this.beyondMaxLevels = levels - o.maxLevels;
+					if (maxLevels < levels && maxLevels != 0) {
+						this.beyondMaxLevels = levels - maxLevels;
+					} else {
+						this.beyondMaxLevels = 1;
+					}
+			} else {
+				if (maxLevels < levels && maxLevels != 0) {
+					this.placeholder.addClass(o.errorClass);
+					this.beyondMaxLevels = levels - 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);
+	$.mjs.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.mjs.nestedSortable.prototype.options);
+})(jQuery);

data/app/assets/stylesheets/default.scss.erb

@@ -172,6 +172,32 @@ img {
 .clear {
   clear:both;
 }
+
+
+html.login {
+  #content input{font-size:1em;}
+  #content input[type=submit]{padding: 0.3em 0.5em;}
+  &, body { width:100%; height:100%;}
+  #main {min-height:0; width:370px; margin:0 auto; 
+  margin-bottom:100px;
+  background:white;
+  padding:0 2em;
+  -webkit-box-shadow: 0 0 5px #CCC;
+  -moz-box-shadow: 0 0 5px #CCC;
+  box-shadow: 0 0 5px #CCC;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  border: 1px solid #CCC;
+  }
+
+  table.login {border-collapse:collapse; width:100%; height:100%;}
+  td.login {vertical-align:middle;}
+  .fields {
+    margin:0 0 5px 0;
+    input {width:100%}
+  }
+}
 #launchbar {
   background: $deepgreen;overflow: hidden;position: relative;text-align: left;z-index: 9999;padding: 0 3%;
   -webkit-box-shadow: 0 0 5px $shadows;
@@ -278,17 +304,25 @@ td #imp_redactor_box_slider_item_body {width:100% !important;}
 .date_params {display:none;&.show {display:table-row;}}
 
 body .redactor_toolbar li a.redactor_btn_hiconix_cut{background: url(<%= asset_path 'admin/hiconix_cut.png' %>) no-repeat;}
-ul.photos {
-  list-style: none;
-  li {
-    display:inline-block;
-    position:relative;
-    a.del {text-indent:-9999px;position:absolute;right:0;bottom:0;}
-  }
-}
+
 #index_wr {
   margin-top:10px;
 }
+
+@mixin gradient($top, $bottom) {
+  background: $top;
+  background: -moz-linear-gradient(top, $top 0%, $bottom 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$top), color-stop(100%,$bottom)); 
+  background: -webkit-linear-gradient(top, $top 0%,$bottom 100%); 
+  background: -o-linear-gradient(top, $top 0%,$bottom 100%); 
+  background: -ms-linear-gradient(top, $top 0%,$bottom 100%);
+  background: linear-gradient(to bottom, $top 0%,$bottom 100%); 
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#5eb6ff', endColorstr='#006ed6',GradientType=0 );
+}
+
+
+// buttons
+
 @mixin black_button  {
   font:1em Helvetica, Arial, sans-serif;
   margin-bottom:10px;
@@ -364,6 +398,10 @@ input[type=submit] {
   }
 }
 
+
+
+// flash messages 
+
 .notice, .alert {
   padding:7px 15px;
   margin:10px 30px;
@@ -395,40 +433,20 @@ input[type=submit] {
 
 #error_explanation {background:#fbe3e4;padding:1em;border-radius:4px; border:1px dashed red;ul{list-style-type:none;}}
 
-html.login {
-  #content input{font-size:1em;}
-  #content input[type=submit]{padding: 0.3em 0.5em;}
-  &, body { width:100%; height:100%;}
-  #main {min-height:0; width:370px; margin:0 auto; 
-  margin-bottom:100px;
-  background:white;
-  padding:0 2em;
-  -webkit-box-shadow: 0 0 5px #CCC;
-  -moz-box-shadow: 0 0 5px #CCC;
-  box-shadow: 0 0 5px #CCC;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  border: 1px solid #CCC;
-  }
 
-  table.login {border-collapse:collapse; width:100%; height:100%;}
-  td.login {vertical-align:middle;}
-  .fields {
-    margin:0 0 5px 0;
-    input {width:100%}
+
+
+// images uploading
+
+ul.photos {
+  list-style: none;
+  li {
+    display:inline-block;
+    position:relative;
+    a.del {text-indent:-9999px;position:absolute;right:0;bottom:0;}
   }
 }
-@mixin gradient($top, $bottom) {
-  background: $top;
-  background: -moz-linear-gradient(top, $top 0%, $bottom 100%);
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$top), color-stop(100%,$bottom)); 
-  background: -webkit-linear-gradient(top, $top 0%,$bottom 100%); 
-  background: -o-linear-gradient(top, $top 0%,$bottom 100%); 
-  background: -ms-linear-gradient(top, $top 0%,$bottom 100%);
-  background: linear-gradient(to bottom, $top 0%,$bottom 100%); 
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#5eb6ff', endColorstr='#006ed6',GradientType=0 );
-}
+
 .image-list li{
   display:inline-block;
   width:47%;
@@ -481,8 +499,38 @@ html.login {
   @include gradient(#53B75F, #1B7726);
   height: 10px;
 }
+
+// crop
 .preview_crop {display:none;overflow:hidden;img{max-width:none;}}
 .crop_panel {
   margin:1em 0;
   #unhook {display:none;}
-}
+}
+
+// trees
+ol.sortable {
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  li {
+    width:100%;
+    margin: 12px 0;
+    vertical-align: middle;
+    padding: 0;
+  }
+  ol {margin: 0 0 0 30px;padding: 0;}
+  div {
+    cursor: move;
+    background-color: #F8F8F8;
+    width:100%;
+    vertical-align: middle;
+    padding: 10px 0;
+    a {margin-left: 10px;}
+    .del {float: right;min-width:30px;}
+    &:hover {background-color:#C4FFCB;outline:1px dashed green;}
+  }
+}
+.ui-nestedSortable-error {background:#fbe3e4; outline:1px dashed red;}
+.placeholder {background-color: #C4FFCB; outline:1px dashed green;}
+.ui-sortable-placeholder {background-color: #C4FFCB !important;height:2.6em;visibility:visible !important;}
+

data/app/helpers/admin_helper.rb

@@ -5,6 +5,8 @@ module AdminHelper
       <script type="text/javascript">
         $(document).ready(function() {
           $('#sort-list tbody').sortable( {
+            placeholder: 'ui-sortable-placeholder',
+            forcePlaceholderSize: true,
             dropOnEmpty: false,
             cursor: 'crosshair',
             opacity: 0.75,
@@ -25,7 +27,45 @@ module AdminHelper
     }.gsub(/[\n ]+/, ' ').strip.html_safe
   end
   
+  def cropable(image_name, x,y,w,h)
+    %Q{
+      <script type="text/javascript">
+        function jcropInit() {
+
+          $('.preview_crop').width(#{w}).height(#{h});
+          
+          $("#cropbox").Jcrop({
+            aspectRatio: #{w}/#{h},
+            onSelect: showCoords,
+            onChange: showCoords,
+            minSize: [30,30],
+            bgColor: '#fff',
+            bgOpacity:   .4,
+          });
 
+          function showCoords(c) {
+            $("##{image_name}_crop_x").val(c.x);
+            $("##{image_name}_crop_y").val(c.y);
+            $("##{image_name}_crop_w").val(c.w);
+            $("##{image_name}_crop_h").val(c.h);
+            updatePreview(c);
+          };
+
+          function updatePreview(c) {
+            $("#preview").css(
+              {'width': Math.round(#{w}/c.w * $("#cropbox").width()) + 'px',
+              'height': Math.round(#{h}/c.wh * $("#cropbox").height()) + 'px',
+              "margin-left": "-" + Math.round(#{w}/c.w * c.x) + 'px',
+              "margin-top": "-" + Math.round(#{h}/c.h * c.y) + 'px'}
+              );
+          }; 
+
+          $("#cropbox").parents("body").css("min-width","600px");
+
+        };
+      </script>
+    }.gsub(/[\n ]+/, ' ').strip.html_safe
+  end
 
   def sortable_columns(column, title = nil)
     title ||= column.titleize
@@ -90,6 +130,74 @@ module AdminHelper
     return raw html
   end
 
+  def show_tree(items)
+    html = ""
+    html << "<ol#{" class='sortable'"}>"
+
+    items.where(:ancestry => nil).order(:position).each do |i|
+      html << children(i)
+    end
+
+    html << "</ol>"
+    
+    return raw(html)
+  end
+
 
+  def children(i)
+      html = ""
+      html << "
+      <li id=\"list_#{i.id}\">
+      <div>#{link_to i.title, [:edit, :admin, i]}
+      " 
+      html << delete_button(i)  
+      html << "</div>"
+      
+
+      unless i.children.empty?
+        html << "<ol>"
+        i.children.order('position').each do |child|
+          html << children(child)
+        end
+        html << "</ol>"
+      end
+      html << "</li>"
+      return html
+  end
+
+  def delete_button(object)
+    link_to [:admin, object], :class => :del, :confirm => 'Точно удалить?', :method => :delete do
+        raw("<span> Удалить </span>")
+        raw("<i class='icon-trash icon-large'> </i>")
+    end
+  end
+
+  def sort_tree(url, maxlevels)
+    %Q{
+      <script type="text/javascript">
+        $(document).ready(function(){
+
+          $('ol.sortable').nestedSortable({
+            disableNesting: 'no-nest',
+            forcePlaceholderSize: true,
+            handle: 'div',
+            helper: 'clone',
+            items: 'li',
+            maxLevels: #{maxlevels},
+            opacity: .6,
+            placeholder: 'placeholder',
+            revert: 250,
+            tabSize: 25,
+            tolerance: 'pointer',
+            toleranceElement: '> div',
+            update: function(){
+              var serialized = $('ol.sortable').nestedSortable('serialize');
+              $.ajax({url: '#{url}', data: serialized});
+            }
+          });
+        });
+      </script>
+    }.gsub(/[\n ]+/, ' ').strip.html_safe
+  end
 
 end

data/lib/generators/ideyabox/admin/admin_generator.rb

@@ -24,6 +24,7 @@ module Ideyabox
         gem 'russian'
         gem 'redactor-rails'
         gem 'haml'
+        gem 'ancestry'
         gem 'carrierwave'
         gem 'mini_magick'
         gem 'squeel'

data/lib/generators/ideyabox/tree/templates/controllers/controller.rb

@@ -0,0 +1,65 @@
+#coding: utf-8
+class Admin::<%= @model_name.demodulize.pluralize -%>Controller < Admin::ApplicationController
+  helper_method :sort_column, :sort_direction
+<%- if column_names.include?("visible") -%>
+  def toggleshow
+    @<%= plural_resource_name %> = <%= @model_name.demodulize -%>.find(params[:id])
+    @<%= plural_resource_name %>.toggle(:visible)
+    @<%= plural_resource_name %>.save
+    render :nothing => true
+  end
+<%- end -%><%- if column_names.include?("position") -%>
+  def sort
+
+    <%= @model_name.demodulize %>.sort(params[:list])
+
+    render :nothing => true
+  end
+  <%- end -%>
+  def index
+    @<%= plural_resource_name %> = <%= @model_name.demodulize -%>.order(sort_column + " " + sort_direction)
+  end
+  
+  def new
+    @<%= resource_name %> = <%= @model_name.demodulize -%>.new
+    render 'edit'
+  end
+  
+  def edit
+    @<%= resource_name %> = <%= @model_name.demodulize -%>.find(params[:id])
+  end
+  
+  def create
+    @<%= resource_name %> = <%= @model_name.demodulize -%>.new(params[:<%= resource_name %>])
+    if @<%= resource_name %>.save
+      redirect_to admin_<%= plural_resource_name %>_path, :notice => "#{<%= @model_name.demodulize %>.model_name.human} #{t 'flash.notice.was_added'}"
+    else
+      render 'edit'
+    end
+  end
+
+  def update
+    @<%= resource_name %> = <%= @model_name.demodulize -%>.find(params[:id])
+    if @<%= resource_name %>.update_attributes(params[:<%= resource_name %>])
+      redirect_to admin_<%= plural_resource_name %>_path, :notice => "#{<%= @model_name.demodulize %>.model_name.human} #{t 'flash.notice.was_updated'}"
+    else
+      render 'edit'
+    end
+  end
+  
+  def destroy
+    @<%= resource_name %> = <%= @model_name.demodulize -%>.find(params[:id])
+    @<%= resource_name %>.destroy
+    redirect_to admin_<%= plural_resource_name %>_path, :alert => "#{<%= @model_name.demodulize %>.model_name.human} #{t 'flash.notice.was_deleted'}"
+  end
+
+  private
+
+  def sort_column
+    <%= @model_name.demodulize -%>.column_names.include?(params[:sort]) ? params[:sort] : <%= column_names.include?("position") ? "\'position\'" : "\'created_at\'" %>
+  end
+  
+  def sort_direction
+    %w[asc desc].include?(params[:direction]) ? params[:direction] : "asc"
+  end  
+end

data/lib/generators/ideyabox/tree/templates/edit.html.haml

@@ -0,0 +1,38 @@
+- content_for :page_header do
+  %p= link_to t('back'), admin_<%= controller_routing_path %>_path, :class => "bright_link"
+  %h1
+    - if @<%= resource_name %>.new_record?
+      = "#{t 'add'} #{<%= @model_name.demodulize %>.model_name.human}"
+    - else
+      = "#{t 'edit'} #{<%= @model_name.demodulize %>.model_name.human}"
+
+= form_for [:admin, @<%= resource_name %>] do |f|
+  - if @<%= resource_name %>.errors.any?
+    #error_explanation
+      %h2= "#{t 'save_errors'}: #{@<%= resource_name %>.errors.count}"
+      %ul
+        - @<%= resource_name %>.errors.full_messages.each do |msg|
+          %li= msg
+  %table
+    <%- columns.each do |column| -%>
+    <%- unless column.name == "position" || column.name == "ancestry" %>
+    <%- if column.field_type.to_s == "text_area" -%>
+    %tr
+      %td{colspan: 2}
+        = f.label :<%= column.name %>
+        %br
+        = f.<%= column.field_type -%> :<%= column.name %>
+    <%- elsif column.field_type.to_s == "check_box" -%>
+    %tr
+      %th{colspan: 2}
+        = f.<%= column.field_type -%> :<%= column.name %>
+        = f.label :<%= column.name %>
+    <%- else -%>
+    %tr
+      %th= f.label :<%= column.name %>
+      %td= f.<%= column.field_type -%> :<%= column.name %>    
+    <%- end -%>
+    <%- end -%>  
+    <%- end -%>
+  .actions
+    = f.submit t('save')

data/lib/generators/ideyabox/tree/templates/index.html.haml

@@ -0,0 +1,6 @@
+- content_for(:page_header) do
+  %p= link_to "#{t 'add'}  #{<%= @model_name.demodulize %>.model_name.human}", new_admin_<%= singular_controller_routing_path %>_path, :class => "bright_link"
+  %h1= link_to '<%= plural_resource_name %>', admin_<%= plural_resource_name %>_path
+#index_wr
+  = show_tree(@<%= plural_resource_name %>)
+  = sort_tree(sort_admin_<%= plural_resource_name %>_path, '0')

data/lib/generators/ideyabox/tree/tree_generator.rb

@@ -0,0 +1,207 @@
+require 'rails/generators'
+require 'rails/generators/generated_attribute'
+
+module Ideyabox
+  module Generators
+    class TreeGenerator < ::Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+      argument :controller_path,    :type => :string
+      argument :model_name,         :type => :string, :required => false
+      argument :layout,             :type => :string, :default => "application",
+                                    :banner => "Specify application layout"
+
+      def initialize(args, *options)
+        super(args, *options)
+        initialize_views_variables
+      end
+
+      def copy_views
+        generate_views
+      end
+
+      def add_locale_templates
+        add_to_locales
+      end
+
+      def add_resources_and_root
+        add_resource_route
+      end
+
+      def updated_admin_layout
+        add_to_launchbar_items
+        add_to_topbar_items
+      end
+
+      def updating_models
+        inject_into_file "app/models/#{resource_name}.rb", "\n
+  has_ancestry :orphan_strategy => :rootify
+
+
+  def self.sort(list)
+ 
+    temp = {}
+    list.each do |key, value|
+      if temp[value]
+        temp[value] << key
+      else
+        temp[value] = [key]
+      end
+    end
+
+    temp.each do |parent, cats|
+      i = 1
+      if parent == 'root' || parent == 'null'
+        p = ''
+      else
+        p = #{@model_name.demodulize}.find(parent).id
+      end
+      cats.each do |cat|
+        c = #{@model_name.demodulize}.find(cat)
+        c.parent_id = p
+        c.position = i
+        c.save
+        i += 1
+      end
+    end
+  end
+
+        ", :after => "class #{@model_name.demodulize} < ActiveRecord::Base"   
+
+      end
+
+      protected
+
+      def initialize_views_variables
+        @base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(controller_path)
+        @controller_routing_path = @controller_file_path.gsub(/\//, '_')
+        @model_name = @controller_class_nesting + "::#{@base_name.singularize.camelize}" unless @model_name
+        @model_name = @model_name.camelize
+      end
+
+      def controller_routing_path
+        @controller_routing_path
+      end
+
+      def singular_controller_routing_path
+        @controller_routing_path.singularize
+      end
+
+      def model_name
+        @model_name
+      end
+
+      def plural_model_name
+        @model_name.pluralize
+      end
+
+      def resource_name
+        @model_name.demodulize.underscore
+      end
+
+      def plural_resource_name
+        resource_name.pluralize
+      end
+
+      def sort_priority(column_name)
+        case column_name
+        when "position" then 1
+        when "visible" then 2
+        when "name" then 3
+        when "title" then 3
+        else 5
+        end
+      end
+
+      def columns
+        begin
+          excluded_column_names = %w[id created_at updated_at]
+          @model_name.constantize.columns.reject{|c| excluded_column_names.include?(c.name) || c.name.index("_id") }.sort{|a, b| sort_priority(a.name) <=> sort_priority(b.name)}.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type)}
+        rescue NoMethodError
+          @model_name.constantize.fields.collect{|c| c[1]}.reject{|c| excluded_column_names.include?(c.name) || c.name.index("_id") }.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type.to_s)}
+        end
+      end
+      
+      def column_names
+        @model_name.constantize.column_names
+      end
+
+      def extract_modules(name)
+        modules = name.include?('/') ? name.split('/') : name.split('::')
+        name    = modules.pop
+        path    = modules.map { |m| m.underscore }
+        file_path = (path + [name.underscore]).join('/')
+        nesting = modules.map { |m| m.camelize }.join('::')
+        [name, path, file_path, nesting, modules.size]
+      end
+
+      def generate_views
+        views = {
+          "index.html.#{ext}"           => "app/views/admin/#{@controller_file_path}/index.html.#{ext}",
+          "edit.html.#{ext}"            => "app/views/admin/#{@controller_file_path}/edit.html.#{ext}"
+        }
+
+        selected_views = views
+        options.engine == generate_erb(selected_views)
+      end
+
+      def generate_erb(views)
+        views.each do |template_name, output_path|
+          template template_name, output_path
+        end
+        generate_controller
+      end
+
+      def ext
+        :haml
+      end
+
+      def generate_controller
+        template "controllers/controller.rb", "app/controllers/admin/#{plural_resource_name}_controller.rb"
+      end
+
+      def add_resource_route
+        resources_string = "\n    resources :#{plural_resource_name} do\n"
+        sort_string = "      get \"sort\", :on => :collection\n"
+        toggleshow_string = "      get \"toggleshow\", :on => :member\n"
+        
+        if column_names.include?("visible") && column_names.include?("position")
+          final_string = "#{resources_string}#{sort_string}#{toggleshow_string}    end\n"
+        elsif column_names.include?("visible")
+          final_string = "#{resources_string}#{toggleshow_string}    end\n"
+        elsif column_names.include?("position")
+          final_string = "#{resources_string}#{sort_string}    end\n"
+        else
+          final_string = "\n    resources :#{plural_resource_name}\n"
+        end
+
+        inject_into_file "config/routes.rb", final_string, :after => "\n  namespace :admin do\n"
+      end
+
+      def add_to_launchbar_items
+        final_string = "#{plural_resource_name} "
+
+        inject_into_file "app/views/admin/shared/_launchbar.html.haml", final_string, :after => "- @active = :section if %w{"
+      end
+
+      def add_to_topbar_items
+        final_string = "\n    %li{:class => \"\#\{\'active\' if c == \'#{plural_resource_name}\'}\"\}= link_to \'#{plural_resource_name}\', admin_#{plural_resource_name}_path"
+
+        inject_into_file "app/views/admin/shared/_topbar.html.haml", final_string, :after => "-when :section"
+      end
+
+      def add_to_locales
+        locales = [:ru, :en]
+        
+        attributes = column_names.collect {|column| "        #{column}: \"#{column}\"\n"}
+
+        attributes_string = "      #{resource_name}:\n#{attributes.join}"
+
+        locales.each do |locale|
+          inject_into_file "config/locales/#{locale}.yml", "      #{resource_name}: \"#{resource_name}\"\n", :after => "models:\n"
+          inject_into_file "config/locales/#{locale}.yml", attributes_string, :after => "attributes:\n"
+        end
+      end
+
+    end
+  end
+end

data/lib/ideyabox/version.rb

@@ -1,3 +1,3 @@
 module Ideyabox
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ideyabox
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -45,7 +45,7 @@ files:
 - app/assets/javascripts/default.js
 - app/assets/javascripts/jquery.Jcrop.min.js
 - app/assets/javascripts/jquery.color.js
-- app/assets/javascripts/jquery.ui.nestedSortable.js
+- app/assets/javascripts/jquery.mjs.nestedSortable.js
 - app/assets/javascripts/jquery.uploadify.min.js
 - app/assets/javascripts/modernizr.js
 - app/assets/javascripts/swfobject.js
@@ -109,6 +109,10 @@ files:
 - lib/generators/ideyabox/scaffold/templates/edit.html.haml
 - lib/generators/ideyabox/scaffold/templates/index.html.haml
 - lib/generators/ideyabox/scaffold/templates/index.js.haml
+- lib/generators/ideyabox/tree/templates/controllers/controller.rb
+- lib/generators/ideyabox/tree/templates/edit.html.haml
+- lib/generators/ideyabox/tree/templates/index.html.haml
+- lib/generators/ideyabox/tree/tree_generator.rb
 - lib/ideyabox.rb
 - lib/ideyabox/engine.rb
 - lib/ideyabox/version.rb