fuelux-rails 2.3.2 → 2.4.0.rc1

data/vendor/assets/javascripts/fuelux/util.js

@@ -8,6 +8,8 @@
 
 !function ($) {
 
+
+
 	// custom case-insensitive match expression
 	function fuelTextExactCI(elem, text) {
 		return (elem.textContent || elem.innerText || $(elem).text() || '').toLowerCase() === (text || '').toLowerCase();
@@ -23,4 +25,4 @@
 			return fuelTextExactCI(elem, match[3]);
 		};
 
-}(window.jQuery);    
+}(window.jQuery);

data/vendor/assets/javascripts/fuelux/wizard.js

@@ -8,6 +8,9 @@
 
 !function ($) {
 
+
+
+
 	// WIZARD CONSTRUCTOR AND PROTOTYPE
 
 	var Wizard = function (element, options) {
@@ -15,8 +18,8 @@
 
 		this.$element = $(element);
 		this.options = $.extend({}, $.fn.wizard.defaults, options);
-		this.currentStep = 1;
-		this.numSteps = this.$element.find('li').length;
+		this.currentStep = this.options.selectedItem.step;
+		this.numSteps = this.$element.find('.steps li').length;
 		this.$prevBtn = this.$element.find('button.btn-prev');
 		this.$nextBtn = this.$element.find('button.btn-next');
 
@@ -28,6 +31,10 @@
 		this.$prevBtn.on('click', $.proxy(this.previous, this));
 		this.$nextBtn.on('click', $.proxy(this.next, this));
 		this.$element.on('click', 'li.complete', $.proxy(this.stepclicked, this));
+		
+		if(this.currentStep > 1) {
+            this.selectedItem(this.options.selectedItem);
+		}
 	};
 
 	Wizard.prototype = {
@@ -55,34 +62,66 @@
 			}
 
 			// reset classes for all steps
-			var $steps = this.$element.find('li');
+			var $steps = this.$element.find('.steps li');
 			$steps.removeClass('active').removeClass('complete');
 			$steps.find('span.badge').removeClass('badge-info').removeClass('badge-success');
 
 			// set class for all previous steps
-			var prevSelector = 'li:lt(' + (this.currentStep - 1) + ')';
+			var prevSelector = '.steps li:lt(' + (this.currentStep - 1) + ')';
 			var $prevSteps = this.$element.find(prevSelector);
 			$prevSteps.addClass('complete');
 			$prevSteps.find('span.badge').addClass('badge-success');
 
 			// set class for current step
-			var currentSelector = 'li:eq(' + (this.currentStep - 1) + ')';
+			var currentSelector = '.steps li:eq(' + (this.currentStep - 1) + ')';
 			var $currentStep = this.$element.find(currentSelector);
 			$currentStep.addClass('active');
 			$currentStep.find('span.badge').addClass('badge-info');
 
 			// set display of target element
 			var target = $currentStep.data().target;
-			$('.step-pane').removeClass('active');
+			this.$element.find('.step-pane').removeClass('active');
 			$(target).addClass('active');
 
+			// reset the wizard position to the left
+			$('.wizard .steps').attr('style','margin-left: 0');
+
+			// check if the steps are wider than the container div
+			var totalWidth = 0;
+			$('.wizard .steps > li').each(function () {
+				totalWidth += $(this).outerWidth();
+			});
+			var containerWidth = 0;
+			if ($('.wizard .actions').length) {
+				containerWidth = $('.wizard').width() - $('.wizard .actions').outerWidth();
+			} else {
+				containerWidth = $('.wizard').width();
+			}
+			if (totalWidth > containerWidth) {
+			
+				// set the position so that the last step is on the right
+				var newMargin = totalWidth - containerWidth;
+				$('.wizard .steps').attr('style','margin-left: -' + newMargin + 'px');
+				
+				// set the position so that the active step is in a good
+				// position if it has been moved out of view
+				if ($('.wizard li.active').position().left < 200) {
+					newMargin += $('.wizard li.active').position().left - 200;
+					if (newMargin < 1) {
+						$('.wizard .steps').attr('style','margin-left: 0');
+					} else {
+						$('.wizard .steps').attr('style','margin-left: -' + newMargin + 'px');
+					}
+				}
+			}
+
 			this.$element.trigger('changed');
 		},
 
 		stepclicked: function (e) {
 			var li = $(e.currentTarget);
 
-			var index = $('.steps li').index(li);
+			var index = this.$element.find('.steps li').index(li);
 
 			var evt = $.Event('stepclick');
 			this.$element.trigger(evt, {step: index + 1});
@@ -122,10 +161,25 @@
 			}
 		},
 
-		selectedItem: function (val) {
-			return {
-				step: this.currentStep
-			};
+		selectedItem: function (selectedItem) {
+			var retVal, step;
+
+			if(selectedItem) {
+
+				step = selectedItem.step || -1;
+
+				if(step >= 1 && step <= this.numSteps) {
+					this.currentStep = step;
+					this.setState();    
+				}
+
+				retVal = this;	
+			}
+			else {
+				retVal = { step: this.currentStep };
+			}
+
+			return retVal;
 		}
 	};
 
@@ -147,7 +201,9 @@
 		return (methodReturn === undefined) ? $set : methodReturn;
 	};
 
-	$.fn.wizard.defaults = {};
+	$.fn.wizard.defaults = {
+        selectedItem: {step:1}
+	};
 
 	$.fn.wizard.Constructor = Wizard;
 
@@ -162,4 +218,4 @@
 		});
 	});
 
-}(window.jQuery);  
+}(window.jQuery);

data/vendor/toolkit/fuelux.less

@@ -1,13 +1,15 @@
-// Fuel UX controls
+// Tree
+// --------------------------------------------------
+@treeBackgroundHover: #DFEEF5;
+@treeBackgroundSelect: #B9DFF1;
 @import "fuelux/checkbox.less";
 @import "fuelux/combobox.less";
 @import "fuelux/datagrid.less";
+@import "fuelux/intelligent-dropdown.less";
 @import "fuelux/pillbox.less";
 @import "fuelux/radio.less";
-@import "fuelux/spinner.less";
 @import "fuelux/search.less";
 @import "fuelux/select.less";
-@treeBackgroundHover: #DFEEF5;
-@treeBackgroundSelect: #B9DFF1;
+@import "fuelux/spinner.less";
 @import "fuelux/tree.less";
 @import "fuelux/wizard.less";

data/vendor/toolkit/fuelux/checkbox.less

@@ -1,10 +1,22 @@
+.form-inline {
+	.checkbox-custom {
+		padding-left: 20px;
+	}
+
+	.checkbox-custom .checkbox {
+		padding-left: 16px;
+	}
+}
+
 .checkbox-custom {
 	input[type=checkbox] {
-		display: none;
+	/* IE cannot fire events if display none or visibility hidden */
+	position: relative;
+	top: -99999px;
 	}
 
 	i {
-		background-image: image-url('form.png');
+		background-image: url(../img/form.png);
 		background-position: 0 1px;
 		background-repeat: no-repeat;
 		margin-left: -20px;

data/vendor/toolkit/fuelux/combobox.less

@@ -8,4 +8,4 @@
     button.btn {
         border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
     }
-}
+}

data/vendor/toolkit/fuelux/datagrid.less

@@ -34,12 +34,17 @@
 			}
 		}
 
+		// When changing this section verify stretchHeight column sizes when sorting
+		// and update SORTED_HEADER_OFFSET in datagrid.js as needed
 		.sorted {
 			.gradientBar(@tableBackgroundAccent, @tableBackgroundAccentDark, @textColor, 'none');
 
+			padding-right: 30px;
+
 			i {
 				float: right;
 				margin-top: 2px;
+				margin-right: -22px;
 			}
 		}
 

data/vendor/toolkit/fuelux/intelligent-dropdown.less

@@ -0,0 +1,5 @@
+.dropUp {
+	-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+	-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+	box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+}

data/vendor/toolkit/fuelux/pillbox.less

@@ -71,4 +71,4 @@
 
 	}
 
-}
+}

data/vendor/toolkit/fuelux/radio.less

@@ -1,10 +1,12 @@
 .radio-custom {
 	input[type=radio] {
-		display: none;
+	/* IE cannot fire events if display none or visibility hidden */
+	position: relative;
+	top: -99999px;
 	}
 
 	i {
-		background-image: image-url('form.png');
+		background-image: url(../img/form.png);
 		background-position: 0 -15px;
 		background-repeat: no-repeat;
 		margin-left: -20px;

data/vendor/toolkit/fuelux/search.less

@@ -1,3 +1,3 @@
 .search {
     display: inline-block;
-}
+}

data/vendor/toolkit/fuelux/select.less

@@ -7,11 +7,11 @@
         font-weight: normal;
         color: #333;
     }
-}
 
-#selectTextSize {
-    display: inline-block;
-    position: absolute;
-    visibility: hidden;
-    top: 0;
-}
+    &-sizer {
+        display: inline-block;
+        position: absolute;
+        visibility: hidden;
+        top: 0;
+    }
+}

data/vendor/toolkit/fuelux/spinner.less

@@ -48,4 +48,4 @@
 			top: -5px;
 		}
 	}
-}
+}

data/vendor/toolkit/fuelux/tree.less

@@ -34,8 +34,10 @@
 			}
 
 			.tree-folder-name {
-				position: absolute;
-				left: 29px;
+				padding-left: 29px;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
 			}
 
 		}
@@ -94,4 +96,4 @@
 			background-color: @treeBackgroundSelect;
 		}
 	}
-}
+}

data/vendor/toolkit/fuelux/wizard.less

@@ -6,12 +6,15 @@
 	.border-radius(@baseBorderRadius);
 	.box-shadow(0 1px 4px rgba(0,0,0,.065));
 	background-color: @tableBackgroundAccent;
+	position: relative;
+	overflow: hidden;
 
 	ul {
 		list-style: none outside none;
 		padding: 0;
 		margin: 0;
-
+		width: 4000px;
+		
 		li {
 			float: left;
 			margin: 0;
@@ -32,6 +35,7 @@
 				position: absolute;
 				right: -14px;
 				top: 0;
+                z-index: 1;
 			}
 
 			.chevron:before {
@@ -75,46 +79,23 @@
 			}
 		}
 
-		/* set z-index on steps for chevron overlap */
-		li:nth-child(1) {
+		li:first-child {
 			border-radius: 4px 0 0 4px;
 			padding-left: 20px;
-			z-index: 10;
-		}
-		li:nth-child(2) {
-			z-index: 9;
-		}
-		li:nth-child(3) {
-			z-index: 8;
-		}
-		li:nth-child(4) {
-			z-index: 7;
-		}
-		li:nth-child(5) {
-			z-index: 6;
-		}
-		li:nth-child(6) {
-			z-index: 5;
-		}
-		li:nth-child(7) {
-			z-index: 4;
-		}
-		li:nth-child(8) {
-			z-index: 3;
-		}
-		li:nth-child(9) {
-			z-index: 2;
-		}
-		li:nth-child(10) {
-			z-index: 1;
 		}
 	}
 
 	.actions {
-		line-height: 44px;
+		z-index: 1000;
+		position: absolute;
+		right: 0;
+		line-height: 46px;
 		float: right;
-		padding-right: 15px;
+		padding-left: 15px;
+		padding-right: 15px;		
 		vertical-align: middle;
+		background-color: #e5e5e5;
+		border-left: 1px solid @navbarBorder;
 
 		a {
 			line-height: 45px;
@@ -143,5 +124,11 @@
 
 	.active {
 		display: block;
+		
+		.btn-group {
+			.active {
+				display: inline-block;
+			}
+		}
 	}
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuelux-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0.rc1
 platform: ruby
 authors:
 - Stephen Baldwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -66,34 +66,48 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: twitter-bootstrap-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 description: fuelux-rails project integrates Fuel UX Bootstrap extensions for Rails
   3.1 Asset Pipeline
 email:
@@ -112,6 +126,7 @@ files:
 - vendor/assets/javascripts/fuelux/checkbox.js
 - vendor/assets/javascripts/fuelux/combobox.js
 - vendor/assets/javascripts/fuelux/datagrid.js
+- vendor/assets/javascripts/fuelux/intelligent-dropdown.js
 - vendor/assets/javascripts/fuelux/loader.js
 - vendor/assets/javascripts/fuelux/pillbox.js
 - vendor/assets/javascripts/fuelux/radio.js
@@ -125,6 +140,7 @@ files:
 - vendor/toolkit/fuelux/checkbox.less
 - vendor/toolkit/fuelux/combobox.less
 - vendor/toolkit/fuelux/datagrid.less
+- vendor/toolkit/fuelux/intelligent-dropdown.less
 - vendor/toolkit/fuelux/pillbox.less
 - vendor/toolkit/fuelux/radio.less
 - vendor/toolkit/fuelux/search.less
@@ -185,12 +201,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: fuelux-rails
-rubygems_version: 2.0.0
+rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
 summary: Fuel UX for Rails 3.1 Asset Pipeline