luca 0.9.1 → 0.9.2

data/vendor/assets/javascripts/luca-ui.js

@@ -18,7 +18,7 @@
   };
 
   _.extend(Luca, {
-    VERSION: "0.9.1",
+    VERSION: "0.9.2",
     core: {},
     containers: {},
     components: {},
@@ -30,6 +30,8 @@
 
   _.extend(Luca, Backbone.Events);
 
+  Luca.autoRegister = true;
+
   Luca.developmentMode = false;
 
   Luca.enableGlobalObserver = false;
@@ -64,6 +66,10 @@
     return Luca.isBackboneModel(obj) || Luca.isBackboneView(obj) || Luca.isBackboneCollection(obj);
   };
 
+  Luca.isComponentPrototype = function(obj) {
+    return Luca.isViewPrototype(obj) || Luca.isModelPrototype(obj) || Luca.isCollectionPrototype(obj);
+  };
+
   Luca.isBackboneModel = function(obj) {
     return _.isFunction(obj != null ? obj.set : void 0) && _.isFunction(obj != null ? obj.get : void 0) && _.isObject(obj != null ? obj.attributes : void 0);
   };
@@ -76,6 +82,52 @@
     return _.isFunction(obj != null ? obj.fetch : void 0) && _.isFunction(obj != null ? obj.reset : void 0);
   };
 
+  Luca.isViewPrototype = function(obj) {
+    return (obj != null) && (obj.prototype != null) && (obj.prototype.make != null) && (obj.prototype.$ != null) && (obj.prototype.render != null);
+  };
+
+  Luca.isModelPrototype = function(obj) {
+    return (obj != null) && (typeof obj.prototype === "function" ? obj.prototype((obj.prototype.save != null) && (obj.prototype.changedAttributes != null)) : void 0);
+  };
+
+  Luca.isCollectionPrototype = function(obj) {
+    return (obj != null) && (obj.prototype != null) && !Luca.isModelPrototype(obj) && (obj.prototype.reset != null) && (obj.prototype.select != null) && (obj.prototype.reject != null);
+  };
+
+  Luca.inheritanceChain = function(obj) {
+    return _(Luca.parentClasses(obj)).map(function(className) {
+      return Luca.util.resolve(className);
+    });
+  };
+
+  Luca.parentClasses = function(obj) {
+    var classes, list, _ref;
+    list = [];
+    if (_.isString(obj)) obj = Luca.util.resolve(obj);
+    list.push(obj.displayName || ((_ref = obj.prototype) != null ? _ref.displayName : void 0) || Luca.parentClass(obj));
+    classes = (function() {
+      var _results;
+      _results = [];
+      while (!!(Luca.parentClass(obj) != null)) {
+        _results.push(obj = Luca.parentClass(obj));
+      }
+      return _results;
+    })();
+    list = list.concat(classes);
+    return _.uniq(list);
+  };
+
+  Luca.parentClass = function(obj) {
+    var list, _base, _ref;
+    list = [];
+    if (_.isString(obj)) obj = Luca.util.resolve(obj);
+    if (Luca.isComponent(obj)) {
+      return obj.displayName;
+    } else if (Luca.isComponentPrototype(obj)) {
+      return typeof (_base = obj.prototype)._superClass === "function" ? (_ref = _base._superClass()) != null ? _ref.displayName : void 0 : void 0;
+    }
+  };
+
   Luca.template = function(template_name, variables) {
     var jst, luca, needle, template, _ref;
     window.JST || (window.JST = {});
@@ -252,6 +304,30 @@
     return document.body.appendChild(script);
   };
 
+  Luca.util.make = Backbone.View.prototype.make;
+
+  Luca.util.label = function(contents, type, baseClass) {
+    var cssClass;
+    if (contents == null) contents = "";
+    if (baseClass == null) baseClass = "label";
+    cssClass = baseClass;
+    if (type != null) cssClass += " " + baseClass + "-" + type;
+    return Luca.util.make("span", {
+      "class": cssClass
+    }, contents);
+  };
+
+  Luca.util.badge = function(contents, type, baseClass) {
+    var cssClass;
+    if (contents == null) contents = "";
+    if (baseClass == null) baseClass = "badge";
+    cssClass = baseClass;
+    if (type != null) cssClass += " " + baseClass + "-" + type;
+    return Luca.util.make("span", {
+      "class": cssClass
+    }, contents);
+  };
+
 }).call(this);
 (function() {
   var DeferredBindingProxy, DefineProxy;
@@ -303,14 +379,21 @@
     };
 
     DefineProxy.prototype["with"] = function(properties) {
-      var at;
+      var at, componentType;
       at = this.namespaced ? Luca.util.resolve(this.namespace, window || global) : window || global;
       if (this.namespaced && !(at != null)) {
         eval("(window||global)." + this.namespace + " = {}");
         at = Luca.util.resolve(this.namespace, window || global);
       }
       at[this.componentId] = Luca.extend(this.superClassName, this.componentName, properties);
-      Luca.register(_.string.underscored(this.componentId), this.componentName);
+      if (Luca.autoRegister === true) {
+        if (Luca.isViewPrototype(at[this.componentId])) componentType = "view";
+        if (Luca.isCollectionPrototype(at[this.componentId])) {
+          componentType = "collection";
+        }
+        if (Luca.isModelPrototype(at[this.componentId])) componentType = "model";
+        Luca.register(_.string.underscored(this.componentId), this.componentName, componentType);
+      }
       return at[this.componentId];
     };
 
@@ -448,6 +531,8 @@
 
   registry = {
     classes: {},
+    model_classes: {},
+    collection_classes: {},
     namespaces: ['Luca.containers', 'Luca.components']
   };
 
@@ -458,9 +543,17 @@
 
   Luca.defaultComponentType = 'view';
 
-  Luca.register = function(component, prototypeName) {
+  Luca.register = function(component, prototypeName, componentType) {
+    if (componentType == null) componentType = "view";
     Luca.trigger("component:registered", component, prototypeName);
-    return registry.classes[component] = prototypeName;
+    switch (componentType) {
+      case "model":
+        return registry.model_classes[component] = prototypeName;
+      case "collection":
+        return registry.model_classes[component] = prototypeName;
+      default:
+        return registry.classes[component] = prototypeName;
+    }
   };
 
   Luca.development_mode_register = function(component, prototypeName) {
@@ -599,7 +692,7 @@
       return this.delegateEvents();
     },
     $wrap: function(wrapper) {
-      if (!wrapper.match(/[<>]/)) {
+      if (_.isString(wrapper) && !wrapper.match(/[<>]/)) {
         wrapper = this.make("div", {
           "class": wrapper
         });
@@ -639,8 +732,8 @@
       });
     },
     getCollectionManager: function() {
-      var _ref;
-      return this.collectionManager || ((_ref = Luca.CollectionManager.get) != null ? _ref.call() : void 0);
+      var _base;
+      return this.collectionManager || (typeof (_base = Luca.CollectionManager).get === "function" ? _base.get() : void 0);
     },
     registerCollectionEvents: function() {
       var manager,
@@ -722,7 +815,7 @@
     _base = definition.render;
     _base || (_base = Luca.View.prototype.$attach);
     definition.render = function() {
-      var autoTrigger, fn, target, trigger, view,
+      var autoTrigger, deferred, fn, target, trigger, view,
         _this = this;
       view = this;
       if (this.deferrable) {
@@ -732,10 +825,11 @@
         }
         target || (target = this.deferrable);
         trigger = this.deferrable_event ? this.deferrable_event : "reset";
-        view.defer(function() {
+        deferred = function() {
           _base.call(view);
           return view.trigger("after:render", view);
-        }).until(target, trigger);
+        };
+        view.defer(deferred).until(target, trigger);
         view.trigger("before:render", this);
         autoTrigger = this.deferrable_trigger || this.deferUntil;
         if (!(autoTrigger != null)) {
@@ -809,72 +903,7 @@
 
   _.def("Luca.Collection")["extends"](source)["with"]({
     cachedMethods: [],
-    restoreMethodCache: function() {
-      var config, name, _ref, _results;
-      _ref = this._methodCache;
-      _results = [];
-      for (name in _ref) {
-        config = _ref[name];
-        if (config.original != null) {
-          config.args = void 0;
-          _results.push(this[name] = config.original);
-        } else {
-          _results.push(void 0);
-        }
-      }
-      return _results;
-    },
-    clearMethodCache: function(method) {
-      return this._methodCache[method].value = void 0;
-    },
-    clearAllMethodsCache: function() {
-      var config, name, _ref, _results;
-      _ref = this._methodCache;
-      _results = [];
-      for (name in _ref) {
-        config = _ref[name];
-        _results.push(this.clearMethodCache(name));
-      }
-      return _results;
-    },
-    setupMethodCaching: function() {
-      var cache, collection, membershipEvents;
-      collection = this;
-      membershipEvents = ["reset", "add", "remove"];
-      cache = this._methodCache = {};
-      return _(this.cachedMethods).each(function(method) {
-        var dependencies, dependency, membershipEvent, _i, _j, _len, _len2, _ref, _results;
-        cache[method] = {
-          name: method,
-          original: collection[method],
-          value: void 0
-        };
-        collection[method] = function() {
-          var _base;
-          return (_base = cache[method]).value || (_base.value = cache[method].original.apply(collection, arguments));
-        };
-        for (_i = 0, _len = membershipEvents.length; _i < _len; _i++) {
-          membershipEvent = membershipEvents[_i];
-          collection.bind(membershipEvent, function() {
-            return collection.clearAllMethodsCache();
-          });
-        }
-        dependencies = method.split(':')[1];
-        if (dependencies) {
-          _ref = dependencies.split(",");
-          _results = [];
-          for (_j = 0, _len2 = _ref.length; _j < _len2; _j++) {
-            dependency = _ref[_j];
-            _results.push(collection.bind("change:" + dependency, function() {
-              return collection.clearMethodCache({
-                method: method
-              });
-            }));
-          }
-          return _results;
-        }
-      });
-    },
+    remoteFilter: false,
     initialize: function(models, options) {
       var table,
         _this = this;
@@ -894,6 +923,7 @@
       }
       this.name || (this.name = this.registerAs);
       this.manager || (this.manager = this.registerWith);
+      this.manager = _.isFunction(this.manager) ? this.manager() : this.manager;
       if (this.name && !this.manager) this.manager = Luca.CollectionManager.get();
       if (this.manager) {
         this.name || (this.name = this.cache_key());
@@ -957,14 +987,13 @@
       return _.uniq(parts).join("&");
     },
     resetFilter: function() {
-      this.base_params = Luca.Collection.baseParams();
+      this.base_params = _(Luca.Collection.baseParams()).clone();
       return this;
     },
-    remoteFilter: true,
     applyFilter: function(filter, options) {
       if (filter == null) filter = {};
       if (options == null) options = {};
-      if ((options.remote != null) === true) {
+      if ((options.remote != null) === true || this.remoteFilter === true) {
         this.applyParams(filter);
         return this.fetch(_.extend(options, {
           refresh: true
@@ -974,8 +1003,9 @@
       }
     },
     applyParams: function(params) {
-      this.base_params || (this.base_params = _(Luca.Collection.baseParams()).clone());
-      return _.extend(this.base_params, params);
+      this.base_params = _(Luca.Collection.baseParams()).clone();
+      _.extend(this.base_params, params);
+      return this;
     },
     register: function(collectionManager, key, collection) {
       if (collectionManager == null) {
@@ -1059,7 +1089,7 @@
       scope = options.scope || this;
       if (this.length > 0 && !this.fetching) fn.apply(scope, [this]);
       this.bind("reset", function(collection) {
-        return fn.apply(scope, [collection]);
+        return fn.call(scope, collection);
       });
       if (!(this.fetching === true || !options.autoFetch || this.length > 0)) {
         return this.fetch();
@@ -1074,6 +1104,81 @@
         Luca.Collection.cache(this.bootstrap_cache_key, models);
       }
       return models;
+    },
+    restoreMethodCache: function() {
+      var config, name, _ref, _results;
+      _ref = this._methodCache;
+      _results = [];
+      for (name in _ref) {
+        config = _ref[name];
+        if (config.original != null) {
+          config.args = void 0;
+          _results.push(this[name] = config.original);
+        } else {
+          _results.push(void 0);
+        }
+      }
+      return _results;
+    },
+    clearMethodCache: function(method) {
+      return this._methodCache[method].value = void 0;
+    },
+    clearAllMethodsCache: function() {
+      var config, name, _ref, _results;
+      _ref = this._methodCache;
+      _results = [];
+      for (name in _ref) {
+        config = _ref[name];
+        _results.push(this.clearMethodCache(name));
+      }
+      return _results;
+    },
+    setupMethodCaching: function() {
+      var cache, collection, membershipEvents;
+      collection = this;
+      membershipEvents = ["reset", "add", "remove"];
+      cache = this._methodCache = {};
+      return _(this.cachedMethods).each(function(method) {
+        var dependencies, dependency, membershipEvent, _i, _j, _len, _len2, _ref, _results;
+        cache[method] = {
+          name: method,
+          original: collection[method],
+          value: void 0
+        };
+        collection[method] = function() {
+          var _base;
+          return (_base = cache[method]).value || (_base.value = cache[method].original.apply(collection, arguments));
+        };
+        for (_i = 0, _len = membershipEvents.length; _i < _len; _i++) {
+          membershipEvent = membershipEvents[_i];
+          collection.bind(membershipEvent, function() {
+            return collection.clearAllMethodsCache();
+          });
+        }
+        dependencies = method.split(':')[1];
+        if (dependencies) {
+          _ref = dependencies.split(",");
+          _results = [];
+          for (_j = 0, _len2 = _ref.length; _j < _len2; _j++) {
+            dependency = _ref[_j];
+            _results.push(collection.bind("change:" + dependency, function() {
+              return collection.clearMethodCache({
+                method: method
+              });
+            }));
+          }
+          return _results;
+        }
+      });
+    },
+    query: function(filter, options) {
+      if (filter == null) filter = {};
+      if (options == null) options = {};
+      if (Backbone.QueryCollection != null) {
+        return Backbone.QueryCollection.prototype.query.apply(this, arguments);
+      } else {
+        return this.models;
+      }
     }
   });
 
@@ -1092,7 +1197,7 @@
   Luca.Collection.baseParams = function(obj) {
     if (obj) return Luca.Collection._baseParams = obj;
     if (_.isFunction(Luca.Collection._baseParams)) {
-      return Luca.Collection._baseParams.call();
+      return Luca.Collection._baseParams();
     }
     if (_.isObject(Luca.Collection._baseParams)) {
       return Luca.Collection._baseParams;
@@ -1114,7 +1219,7 @@
 (function() {
   var attachToolbar;
 
-  attachToolbar = function(config) {
+  attachToolbar = function(config, targetEl) {
     var action, container, hasBody, id, toolbar;
     if (config == null) config = {};
     config.orientation || (config.orientation = "top");
@@ -1145,7 +1250,7 @@
           }
       }
     })();
-    return this.$bodyEl()[action](container);
+    return (targetEl || this.$bodyEl())[action](container);
   };
 
   _.def("Luca.components.Panel")["extends"]("Luca.View")["with"]({
@@ -1153,10 +1258,12 @@
     bottomToolbar: void 0,
     loadMask: false,
     loadMaskTemplate: ["components/load_mask"],
+    loadMaskTimeout: 3000,
     initialize: function(options) {
       var _this = this;
       this.options = options != null ? options : {};
       Luca.View.prototype.initialize.apply(this, arguments);
+      _.bindAll(this, "applyLoadMask", "disableLoadMask");
       if (this.loadMask === true) {
         this.defer(function() {
           _this.$el.addClass('with-mask');
@@ -1176,25 +1283,35 @@
         return this.$bodyEl();
       }
     },
-    applyLoadMask: function() {
+    disableLoadMask: function() {
+      this.$('.load-mask .bar').css("width", "100%");
+      this.$('.load-mask').hide();
+      return clearInterval(this.loadMaskInterval);
+    },
+    enableLoadMask: function() {
       var maxWidth,
         _this = this;
+      this.$('.load-mask').show().find('.bar').css("width", "0%");
+      maxWidth = this.$('.load-mask .progress').width();
+      if (maxWidth < 20 && (maxWidth = this.$el.width()) < 20) {
+        maxWidth = this.$el.parent().width();
+      }
+      this.loadMaskInterval = setInterval(function() {
+        var currentWidth, newWidth;
+        currentWidth = _this.$('.load-mask .bar').width();
+        newWidth = currentWidth + 12;
+        return _this.$('.load-mask .bar').css('width', newWidth);
+      }, 200);
+      if (this.loadMaskTimeout == null) return;
+      return _.delay(function() {
+        return _this.disableLoadMask();
+      }, this.loadMaskTimeout);
+    },
+    applyLoadMask: function() {
       if (this.$('.load-mask').is(":visible")) {
-        this.$('.load-mask .bar').css("width", "100%");
-        this.$('.load-mask').hide();
-        return clearInterval(this.loadMaskInterval);
+        return this.disableLoadMask();
       } else {
-        this.$('.load-mask').show().find('.bar').css("width", "0%");
-        maxWidth = this.$('.load-mask .progress').width();
-        if (maxWidth < 20 && (maxWidth = this.$el.width()) < 20) {
-          maxWidth = this.$el.parent().width();
-        }
-        return this.loadMaskInterval = setInterval(function() {
-          var currentWidth, newWidth;
-          currentWidth = _this.$('.load-mask .bar').width();
-          newWidth = currentWidth + 12;
-          return _this.$('.load-mask .bar').css('width', newWidth);
-        }, 200);
+        return this.enableLoadMask();
       }
     },
     applyStyles: function(styles, body) {
@@ -1235,7 +1352,7 @@
       return $(this.el);
     },
     $wrap: function(wrapper) {
-      if (!wrapper.match(/[<>]/)) {
+      if (_.isString(wrapper) && !wrapper.match(/[<>]/)) {
         wrapper = this.make("div", {
           "class": wrapper
         });
@@ -1266,7 +1383,7 @@
       if (config == null) config = {};
       config.parent = this;
       config.orientation = orientation;
-      return attachToolbar.call(this, config);
+      return attachToolbar.call(this, config, config.targetEl);
     }
   });
 
@@ -1383,7 +1500,7 @@
 }).call(this);
 (function() {
   Luca.templates || (Luca.templates = {});
-  Luca.templates["components/form_view"] = function(obj){var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('<div class=\'form-view-panel\'>\n  <ul class=\'form-view-flash-container\'></ul>\n  <div class=\'form-view-body\'></div>\n</div>\n');}return __p.join('');};
+  Luca.templates["components/form_alert"] = function(obj){var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('<div class=\'', className ,'\'>\n  <a class=\'close\' data-dismiss=\'alert\' href=\'#\'>x</a>\n  ', message ,'\n</div>\n');}return __p.join('');};
 }).call(this);
 (function() {
   Luca.templates || (Luca.templates = {});
@@ -1411,7 +1528,7 @@
 }).call(this);
 (function() {
   Luca.templates || (Luca.templates = {});
-  Luca.templates["containers/tab_view"] = function(obj){var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('<ul class=\'nav nav-tabs\' id=\'', cid ,'-tabs-selector\'></ul>\n<div class=\'tab-content\' id=\'', cid ,'-tab-view-content\'></div>\n');}return __p.join('');};
+  Luca.templates["containers/tab_view"] = function(obj){var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('<ul class=\'nav ', navClass ,'\' id=\'', cid ,'-tabs-selector\'></ul>\n<div class=\'tab-content\' id=\'', cid ,'-tab-view-content\'></div>\n');}return __p.join('');};
 }).call(this);
 (function() {
   Luca.templates || (Luca.templates = {});
@@ -1816,20 +1933,30 @@
 
 }).call(this);
 (function() {
-  var instances;
-
-  instances = [];
 
   Luca.CollectionManager = (function() {
 
+    CollectionManager.prototype.name = "primary";
+
     CollectionManager.prototype.__collections = {};
 
     function CollectionManager(options) {
+      var existing, manager, _base, _base2;
       this.options = options != null ? options : {};
       _.extend(this, this.options);
+      manager = this;
+      if (existing = typeof (_base = Luca.CollectionManager).get === "function" ? _base.get(this.name) : void 0) {
+        throw 'Attempt to create a collection manager with a name which already exists';
+      }
+      (_base2 = Luca.CollectionManager).instances || (_base2.instances = {});
       _.extend(this, Backbone.Events);
-      instances.push(this);
-      this.state = new Backbone.Model;
+      _.extend(this, Luca.Events);
+      Luca.CollectionManager.instances[this.name] = manager;
+      Luca.CollectionManager.get = function(name) {
+        if (name == null) return manager;
+        return Luca.CollectionManager.instances[name];
+      };
+      this.state = new Luca.Model();
       if (this.initialCollections) {
         this.state.set({
           loaded_collections_count: 0,
@@ -1947,15 +2074,7 @@
   })();
 
   Luca.CollectionManager.destroyAll = function() {
-    return instances = [];
-  };
-
-  Luca.CollectionManager.instances = function() {
-    return instances;
-  };
-
-  Luca.CollectionManager.get = function() {
-    return _(instances).last();
+    return Luca.CollectionManager.instances = {};
   };
 
 }).call(this);
@@ -2371,10 +2490,12 @@
     className: 'luca-ui-tab-view tabbable',
     tab_position: 'top',
     tabVerticalOffset: '50px',
+    navClass: "nav-tabs",
     bodyTemplate: "containers/tab_view",
     bodyEl: "div.tab-content",
     initialize: function(options) {
       this.options = options != null ? options : {};
+      if (this.navStyle === "list") this.navClass = "nav-list";
       Luca.containers.CardView.prototype.initialize.apply(this, arguments);
       _.bindAll(this, "select", "highlightSelectedTab");
       this.setupHooks(this.hooks);
@@ -2405,12 +2526,21 @@
       var tabView;
       tabView = this;
       return this.each(function(component, index) {
-        var selector;
+        var icon, link, selector, _ref;
+        if (component.tabIcon) icon = "<i class='icon-" + component.tabIcon;
+        link = "<a href='#'>" + (icon || '') + " " + component.title + "</a>";
         selector = tabView.make("li", {
           "class": "tab-selector",
           "data-target": index
-        }, "<a>" + component.title + "</a>");
-        return tabView.tabContainer().append(selector);
+        }, link);
+        tabView.tabContainer().append(selector);
+        if ((component.navHeading != null) && !((_ref = tabView.navHeadings) != null ? _ref[component.navHeading] : void 0)) {
+          $(selector).before(tabView.make('li', {
+            "class": "nav-header"
+          }, component.navHeading));
+          tabView.navHeadings || (tabView.navHeadings = {});
+          return tabView.navHeadings[component.navHeading] = true;
+        }
       });
     },
     highlightSelectedTab: function() {
@@ -2419,6 +2549,7 @@
     },
     select: function(e) {
       var me, my;
+      e.preventDefault();
       me = my = $(e.target);
       this.trigger("before:select", this);
       this.activate(my.parent().data('target'));
@@ -2434,7 +2565,7 @@
       return $("#" + this.cid + "-tabs-selector");
     },
     tabContainer: function() {
-      return this.$('ul.nav-tabs', this.tabContainerWrapper());
+      return this.$("ul." + this.navClass, this.tabContainerWrapper());
     },
     tabSelectors: function() {
       return this.$('li.tab-selector', this.tabContainer());
@@ -2452,11 +2583,12 @@
     wrapperClass: 'row',
     initialize: function(options) {
       this.options = options != null ? options : {};
-      Luca.core.Container.prototype.initialize.apply(this, arguments);
+      _.extend(this, this.options);
       if (Luca.enableBootstrap === true) {
         if (this.fluid === true) this.wrapperClass = "row-fluid";
-        this.$el.wrap("<div class='" + this.wrapperClass + "' />").addClass('span12');
+        this.$wrap(this.wrapperClass);
       }
+      Luca.core.Container.prototype.initialize.apply(this, arguments);
       if (this.fullscreen) return $('html,body').addClass('luca-ui-fullscreen');
     },
     beforeRender: function() {
@@ -2464,12 +2596,18 @@
       if ((_ref = Luca.containers.CardView.prototype.beforeRender) != null) {
         _ref.apply(this, arguments);
       }
-      if (Luca.enableBootstrap && this.topNav && this.fullscreen) {
-        $('body').css('padding', '40px');
-      }
       if (this.topNav != null) this.renderTopNavigation();
       if (this.bottomNav != null) return this.renderBottomNavigation();
     },
+    afterRender: function() {
+      var _ref;
+      if ((_ref = Luca.containers.CardView.prototype.after) != null) {
+        _ref.apply(this, arguments);
+      }
+      if (Luca.enableBootstrap === true) {
+        return this.$el.children().wrap('<div class="container" />');
+      }
+    },
     renderTopNavigation: function() {
       var _base;
       if (this.topNav == null) return;
@@ -2510,6 +2648,7 @@
   _.def('Luca.Application')["extends"]('Luca.containers.Viewport')["with"]({
     autoStartHistory: true,
     useCollectionManager: true,
+    collectionManagerClass: "Luca.CollectionManager",
     plugin: false,
     useController: true,
     components: [
@@ -2534,13 +2673,16 @@
         }
       ];
       if (this.useCollectionManager === true) {
+        if (_.isString(this.collectionManagerClass)) {
+          this.collectionManagerClass = Luca.util.resolve(this.collectionManagerClass);
+        }
         this.collectionManager || (this.collectionManager = typeof (_base = Luca.CollectionManager).get === "function" ? _base.get() : void 0);
-        this.collectionManager || (this.collectionManager = new Luca.CollectionManager(this.collectionManagerOptions || (this.collectionManagerOptions = {})));
+        this.collectionManager || (this.collectionManager = new this.collectionManagerClass(this.collectionManagerOptions || (this.collectionManagerOptions = {})));
       }
-      this.state = new Backbone.Model(this.defaultState);
-      this.bind("ready", function() {
+      this.state = new Luca.Model(this.defaultState);
+      this.defer(function() {
         return _this.render();
-      });
+      }).until("ready");
       if (this.useKeyRouter === true && (this.keyEvents != null)) {
         this.setupKeyRouter();
       }
@@ -2733,13 +2875,16 @@
       this.options = options != null ? options : {};
       _.extend(this, this.options);
       _.bindAll(this, "refresh");
-      if (this.collection == null) {
+      if (!((this.collection != null) || this.options.collection)) {
         throw "Collection Views must specify a collection";
       }
       if (!((this.itemTemplate != null) || (this.itemRenderer != null) || (this.itemProperty != null))) {
         throw "Collection Views must specify an item template or item renderer function";
       }
       Luca.components.Panel.prototype.initialize.apply(this, arguments);
+      if (_.isString(this.collection) && Luca.CollectionManager.get()) {
+        this.collection = Luca.CollectionManager.get().get(this.collection);
+      }
       if (Luca.isBackboneCollection(this.collection)) {
         this.collection.bind("reset", this.refresh);
         this.collection.bind("add", this.refresh);
@@ -2762,8 +2907,10 @@
         content = this.itemRenderer.call(this, item);
       }
       if (this.itemProperty) {
-        return content = _.isFunction(this.itemProperty) ? this.itemProperty() : item.model.get(this.itemProperty) || item.model[this.itemProperty];
+        content = item.model.get(this.itemProperty) || item.model[this.itemProperty];
+        if (_.isFunction(content)) content = content();
       }
+      return content;
     },
     makeItem: function(model, index) {
       var item;
@@ -2896,6 +3043,7 @@
   _.def('Luca.fields.CheckboxArray')["extends"]('Luca.core.Field')["with"]({
     version: 2,
     template: "fields/checkbox_array",
+    className: "luca-ui-checkbox-array",
     events: {
       "click input": "clickHandler"
     },
@@ -2952,6 +3100,7 @@
         input_id = _.uniqueId("" + _this.cid + "_checkbox");
         inputElement = make("input", {
           type: "checkbox",
+          "class": "array-checkbox",
           name: _this.input_name,
           value: value,
           id: input_id
@@ -3333,6 +3482,27 @@
 
 }).call(this);
 (function() {
+  var defaultToolbar;
+
+  defaultToolbar = {
+    buttons: [
+      {
+        icon: "remove-sign",
+        label: "Reset",
+        eventId: "click:reset",
+        className: "reset-button",
+        align: 'right'
+      }, {
+        icon: "ok-sign",
+        white: true,
+        label: "Save Changes",
+        eventId: "click:submit",
+        color: "success",
+        className: 'submit-button',
+        align: 'right'
+      }
+    ]
+  };
 
   _.def("Luca.components.FormView")["extends"]('Luca.core.Container')["with"]({
     tagName: 'form',
@@ -3345,7 +3515,6 @@
     toolbar: true,
     legend: "",
     bodyClassName: "form-view-body",
-    bodyTemplate: ["components/form_view"],
     initialize: function(options) {
       this.options = options != null ? options : {};
       if (this.loadMask == null) this.loadMask = Luca.enableBootstrap;
@@ -3354,28 +3523,18 @@
       this.state || (this.state = new Backbone.Model);
       this.setupHooks(this.hooks);
       this.applyStyleClasses();
-      if (this.toolbar === true && !((this.bottomToolbar != null) || (this.topToolbar != null))) {
-        return this.bottomToolbar = {
-          buttons: [
-            {
-              icon: "remove-sign",
-              label: "Reset",
-              eventId: "click:reset",
-              className: "reset-button",
-              align: 'right'
-            }, {
-              icon: "ok-sign",
-              white: true,
-              label: "Save Changes",
-              eventId: "click:submit",
-              color: "success",
-              className: 'submit-button',
-              align: 'right'
-            }
-          ]
-        };
+      if (this.toolbar !== false && (!this.topToolbar && !this.bottomToolbar)) {
+        if (this.toolbar === "both" || this.toolbar === "top") {
+          this.topToolbar = this.getDefaultToolbar();
+        }
+        if (this.toolbar !== "top") {
+          return this.bottomToolbar = this.getDefaultToolbar();
+        }
       }
     },
+    getDefaultToolbar: function() {
+      return defaultToolbar;
+    },
     applyStyleClasses: function() {
       if (Luca.enableBootstrap) this.applyBootstrapStyleClasses();
       if (this.labelAlign) this.$el.addClass("label-align-" + this.labelAlign);
@@ -3390,14 +3549,14 @@
     },
     resetHandler: function(e) {
       var me, my;
-      me = my = $(e.currentTarget);
+      me = my = $(e != null ? e.target : void 0);
       this.trigger("before:reset", this);
       this.reset();
       return this.trigger("after:reset", this);
     },
     submitHandler: function(e) {
       var me, my;
-      me = my = $(e.currentTarget);
+      me = my = $(e != null ? e.target : void 0);
       this.trigger("before:submit", this);
       if (this.loadMask === true) this.trigger("enable:loadmask", this);
       if (this.hasModel()) return this.submit();
@@ -3544,6 +3703,32 @@
     setLegend: function(legend) {
       this.legend = legend;
       return $('fieldset legend', this.el).first().html(this.legend);
+    },
+    flash: function(message) {
+      if (this.$('.toolbar-container.top').length > 0) {
+        return this.$('.toolbar-container.top').after(message);
+      } else {
+        return this.$bodyEl().prepend(message);
+      }
+    },
+    successFlashDelay: 1500,
+    successMessage: function(message) {
+      var _this = this;
+      this.$('.alert.alert-success').remove();
+      this.flash(Luca.template("components/form_alert", {
+        className: "alert alert-success",
+        message: message
+      }));
+      return _.delay(function() {
+        return _this.$('.alert.alert-success').fadeOut();
+      }, this.successFlashDelay || 0);
+    },
+    errorMessage: function(message) {
+      this.$('.alert.alert-error').remove();
+      return this.flash(Luca.template("components/form_alert", {
+        className: "alert alert-error",
+        message: message
+      }));
     }
   });
 
@@ -3581,12 +3766,10 @@
       Luca.components.Panel.prototype.initialize.apply(this, arguments);
       this.configure_collection(true);
       this.collection.bind("before:fetch", function() {
-        console.log("Triggering Enable Load Mask");
         if (_this.loadMask === true) return _this.trigger("enable:loadmask");
       });
       this.collection.bind("reset", function(collection) {
         _this.refresh();
-        console.log("Triggering Disable LoadMask");
         if (_this.loadMask === true) _this.trigger("disable:loadmask");
         return _this.trigger("after:collection:load", collection);
       });
@@ -3598,9 +3781,9 @@
           cells = _this.render_row(model, _this.collection.indexOf(model), {
             cellsOnly: true
           });
-          return $(rowEl).html(cells);
+          return $(rowEl).html(cells.join(" "));
         } catch (error) {
-          return console.log("Error in change handler for GridView.collection", error, _this, model, rowEl, cells);
+          return console.log("Error in change handler for GridView.collection", error, _this, model);
         }
       });
     },
@@ -3806,17 +3989,16 @@
     fixed: true,
     position: 'top',
     className: 'navbar',
-    initialize: function(options) {
-      this.options = options != null ? options : {};
-      return Luca.View.prototype.initialize.apply(this, arguments);
-    },
     brand: "Luca.js",
     bodyTemplate: 'nav_bar',
     bodyClassName: 'luca-ui-navbar-body',
     beforeRender: function() {
       if (this.fixed) this.$el.addClass("navbar-fixed-" + this.position);
       if (this.brand != null) {
-        return this.content().append("<a class='brand' href='#'>" + this.brand + "</a>");
+        this.content().append("<a class='brand' href='#'>" + this.brand + "</a>");
+      }
+      if (this.template) {
+        return this.content().append(Luca.template(this.template, this));
       }
     },
     render: function() {