diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee index a19bd1294f..f529ac3255 100644 --- a/app/assets/javascripts/darkswarm/all.js.coffee +++ b/app/assets/javascripts/darkswarm/all.js.coffee @@ -6,11 +6,12 @@ #= require angular #= require angular-cookies #= require angular-sanitize +#= require angular-animate #= require angular-resource #= require lodash.underscore.js #= require angular-scroll.min.js #= require angular-google-maps.min.js -#= require ../shared/mm-foundation-tpls-0.2.0-SNAPSHOT +#= require ../shared/mm-foundation-tpls-0.2.2.min.js #= require ../shared/bindonce.min.js #= require ../shared/ng-infinite-scroll.min.js #= require ../shared/angular-local-storage.js diff --git a/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee index 850f58b33e..4bb856ace4 100644 --- a/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee @@ -2,5 +2,7 @@ Darkswarm.controller "GroupsCtrl", ($scope, Groups, $anchorScroll, $rootScope) - $scope.Groups = Groups $scope.order = 'position' - $rootScope.$on "$locationChangeSuccess", (newRoute, oldRoute) -> - $anchorScroll() + #$rootScope.$on "$locationChangeSuccess", (newRoute, oldRoute) -> + #$anchorScroll() + # + # diff --git a/app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee index 92cf8dedfc..6db73f7af3 100644 --- a/app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee @@ -1,2 +1,3 @@ -Darkswarm.controller "ProducersTabCtrl", ($scope, CurrentHub) -> +Darkswarm.controller "ProducersTabCtrl", ($scope, CurrentHub, Enterprises) -> + # Injecting Enterprises so CurrentHub.producers is dereferenced $scope.CurrentHub = CurrentHub diff --git a/app/assets/javascripts/darkswarm/darkswarm.js.coffee b/app/assets/javascripts/darkswarm/darkswarm.js.coffee index b04487b330..1e58fe7294 100644 --- a/app/assets/javascripts/darkswarm/darkswarm.js.coffee +++ b/app/assets/javascripts/darkswarm/darkswarm.js.coffee @@ -6,9 +6,10 @@ window.Darkswarm = angular.module("Darkswarm", ["ngResource", 'angular-flash.service', 'templates', 'ngSanitize', + 'ngAnimate', 'google-maps', 'duScroll', - 'backstretch']).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider) -> + ]).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider) -> $httpProvider.defaults.headers.post['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content') $httpProvider.defaults.headers.put['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content') $httpProvider.defaults.headers['common']['X-Requested-With'] = 'XMLHttpRequest' diff --git a/app/assets/javascripts/darkswarm/directives/active_table_hub_link.js.coffee b/app/assets/javascripts/darkswarm/directives/active_table_hub_link.js.coffee index ff220d0d5e..4369fced34 100644 --- a/app/assets/javascripts/darkswarm/directives/active_table_hub_link.js.coffee +++ b/app/assets/javascripts/darkswarm/directives/active_table_hub_link.js.coffee @@ -6,7 +6,7 @@ Darkswarm.directive "activeTableHubLink", (CurrentHub, CurrentOrder) -> link: (scope, elm, attr)-> # Swap out the text of the hub link depending on whether it'll change current hub # To be used with ofnEmptiesCart - if CurrentHub.hub.id and CurrentHub.hub.id isnt scope.hub.id + if CurrentHub.hub?.id and CurrentHub.hub.id isnt scope.hub.id scope.action = attr.change else scope.action = attr.shop diff --git a/app/assets/javascripts/darkswarm/directives/empties_cart.js.coffee b/app/assets/javascripts/darkswarm/directives/empties_cart.js.coffee index b71196c40c..75e88f3682 100644 --- a/app/assets/javascripts/darkswarm/directives/empties_cart.js.coffee +++ b/app/assets/javascripts/darkswarm/directives/empties_cart.js.coffee @@ -3,7 +3,7 @@ Darkswarm.directive "ofnEmptiesCart", (CurrentHub, CurrentOrder, Navigation, sto link: (scope, elm, attr)-> hub = scope.$eval(attr.ofnEmptiesCart) # A hub is selected, we're changing to a different hub, and the cart isn't empty - if CurrentHub.hub.id and CurrentHub.hub.id isnt hub.id + if CurrentHub.hub?.id and CurrentHub.hub.id isnt hub.id unless CurrentOrder.empty() elm.bind 'click', (ev)-> ev.preventDefault() diff --git a/app/assets/javascripts/darkswarm/directives/hub_modal.js.coffee b/app/assets/javascripts/darkswarm/directives/hub_modal.js.coffee new file mode 100644 index 0000000000..4810cdbcf0 --- /dev/null +++ b/app/assets/javascripts/darkswarm/directives/hub_modal.js.coffee @@ -0,0 +1,7 @@ +Darkswarm.directive "hubModal", ($modal)-> + restrict: 'E' + replace: true + template: "{{enterprise.name}}" + link: (scope, elem, attrs, ctrl)-> + elem.on "click", => + scope.modalInstance = $modal.open(controller: ctrl, templateUrl: 'hub_modal.html', scope: scope) diff --git a/app/assets/javascripts/darkswarm/directives/offcanvas.js.coffee b/app/assets/javascripts/darkswarm/directives/offcanvas.js.coffee deleted file mode 100644 index 4ff4f300da..0000000000 --- a/app/assets/javascripts/darkswarm/directives/offcanvas.js.coffee +++ /dev/null @@ -1,6 +0,0 @@ -Darkswarm.directive "offcanvas", -> - restrict: "A" - - link: (scope, el, attr) -> - el.find(".left-off-canvas-toggle").bind 'click', -> - el.toggleClass 'move-right' diff --git a/app/assets/javascripts/darkswarm/directives/producer_modal.js.coffee b/app/assets/javascripts/darkswarm/directives/producer_modal.js.coffee new file mode 100644 index 0000000000..d64b2663f7 --- /dev/null +++ b/app/assets/javascripts/darkswarm/directives/producer_modal.js.coffee @@ -0,0 +1,7 @@ +Darkswarm.directive "producerModal", ($modal)-> + restrict: 'E' + replace: true + template: "{{enterprise.name}}" + link: (scope, elem, attrs, ctrl)-> + elem.on "click", => + scope.modalInstance = $modal.open(controller: ctrl, templateUrl: 'producer_modal.html', scope: scope) diff --git a/app/assets/javascripts/darkswarm/services/dereferencer.js.coffee b/app/assets/javascripts/darkswarm/services/dereferencer.js.coffee new file mode 100644 index 0000000000..2061f95ea1 --- /dev/null +++ b/app/assets/javascripts/darkswarm/services/dereferencer.js.coffee @@ -0,0 +1,6 @@ +Darkswarm.factory 'Dereferencer', -> + new class Dereferencer + dereference: (array, data)-> + if array + for object, i in array + array[i] = data[object.id] diff --git a/app/assets/javascripts/darkswarm/services/enterprises.js.coffee b/app/assets/javascripts/darkswarm/services/enterprises.js.coffee index c3721f4896..b442773d31 100644 --- a/app/assets/javascripts/darkswarm/services/enterprises.js.coffee +++ b/app/assets/javascripts/darkswarm/services/enterprises.js.coffee @@ -1,4 +1,4 @@ -Darkswarm.factory 'Enterprises', (enterprises, CurrentHub)-> +Darkswarm.factory 'Enterprises', (enterprises, CurrentHub, Dereferencer)-> new class Enterprises enterprises_by_id: {} # id/object pairs for lookup constructor: -> @@ -10,12 +10,6 @@ Darkswarm.factory 'Enterprises', (enterprises, CurrentHub)-> dereference: -> if CurrentHub.hub?.id CurrentHub.hub = @enterprises_by_id[CurrentHub.hub.id] - for enterprise in @enterprises - if enterprise.hubs - for hub, i in enterprise.hubs - enterprise.hubs[i] = @enterprises_by_id[hub.id] - - if enterprise.producers - for producer, i in enterprise.producers - enterprise.producers[i] = @enterprises_by_id[producer.id] + Dereferencer.dereference enterprise.hubs, @enterprises_by_id + Dereferencer.dereference enterprise.producers, @enterprises_by_id diff --git a/app/assets/javascripts/darkswarm/services/groups.js.coffee b/app/assets/javascripts/darkswarm/services/groups.js.coffee index e5e50615e8..e07d6c2055 100644 --- a/app/assets/javascripts/darkswarm/services/groups.js.coffee +++ b/app/assets/javascripts/darkswarm/services/groups.js.coffee @@ -1,4 +1,14 @@ -Darkswarm.factory 'Groups', (groups) -> +Darkswarm.factory 'Groups', (groups, Enterprises, Dereferencer) -> new class Groups + groups: groups + groups_by_id: {} constructor: -> - @groups = groups + for group in @groups + @groups_by_id[group.id] = group + @dereference() + dereference: -> + for group in @groups + Dereferencer.dereference group.enterprises, Enterprises.enterprises_by_id + for enterprise in Enterprises.enterprises + Dereferencer.dereference enterprise.groups, @groups_by_id + diff --git a/app/assets/javascripts/darkswarm/services/map_modal.js.coffee b/app/assets/javascripts/darkswarm/services/map_modal.js.coffee index 1c9bf13bb3..c9ed30f558 100644 --- a/app/assets/javascripts/darkswarm/services/map_modal.js.coffee +++ b/app/assets/javascripts/darkswarm/services/map_modal.js.coffee @@ -6,7 +6,7 @@ Darkswarm.factory "MapModal", ($modal, $rootScope)-> scope.enterprise = enterprise if enterprise.is_distributor scope.hub = enterprise - $modal.open(templateUrl: "map_modal_hub.html", scope: scope) + $modal.open(templateUrl: "hub_modal.html", scope: scope) else scope.producer = enterprise $modal.open(templateUrl: "map_modal_producer.html", scope: scope) diff --git a/app/assets/javascripts/shared/mm-foundation-tpls-0.2.2.min.js b/app/assets/javascripts/shared/mm-foundation-tpls-0.2.2.min.js new file mode 100644 index 0000000000..be82613518 --- /dev/null +++ b/app/assets/javascripts/shared/mm-foundation-tpls-0.2.2.min.js @@ -0,0 +1,9 @@ +/* + * angular-mm-foundation + * http://madmimi.github.io/angular-foundation/ + + * Version: 0.2.2 - 2014-06-25 + * License: MIT + */ +angular.module("mm.foundation",["mm.foundation.tpls","mm.foundation.accordion","mm.foundation.alert","mm.foundation.bindHtml","mm.foundation.buttons","mm.foundation.position","mm.foundation.dropdownToggle","mm.foundation.transition","mm.foundation.modal","mm.foundation.offcanvas","mm.foundation.pagination","mm.foundation.tooltip","mm.foundation.popover","mm.foundation.progressbar","mm.foundation.rating","mm.foundation.tabs","mm.foundation.tour","mm.foundation.typeahead"]),angular.module("mm.foundation.tpls",["template/accordion/accordion-group.html","template/accordion/accordion.html","template/alert/alert.html","template/modal/backdrop.html","template/modal/window.html","template/pagination/pager.html","template/pagination/pagination.html","template/tooltip/tooltip-html-unsafe-popup.html","template/tooltip/tooltip-popup.html","template/popover/popover.html","template/progressbar/bar.html","template/progressbar/progress.html","template/progressbar/progressbar.html","template/rating/rating.html","template/tabs/tab.html","template/tabs/tabset.html","template/tour/tour.html","template/typeahead/typeahead-match.html","template/typeahead/typeahead-popup.html"]),angular.module("mm.foundation.accordion",[]).constant("accordionConfig",{closeOthers:!0}).controller("AccordionController",["$scope","$attrs","accordionConfig",function(a,b,c){this.groups=[],this.closeOthers=function(d){var e=angular.isDefined(b.closeOthers)?a.$eval(b.closeOthers):c.closeOthers;e&&angular.forEach(this.groups,function(a){a!==d&&(a.isOpen=!1)})},this.addGroup=function(a){var b=this;this.groups.push(a),a.$on("$destroy",function(){b.removeGroup(a)})},this.removeGroup=function(a){var b=this.groups.indexOf(a);-1!==b&&this.groups.splice(this.groups.indexOf(a),1)}}]).directive("accordion",function(){return{restrict:"EA",controller:"AccordionController",transclude:!0,replace:!1,templateUrl:"template/accordion/accordion.html"}}).directive("accordionGroup",["$parse",function(a){return{require:"^accordion",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/accordion/accordion-group.html",scope:{heading:"@"},controller:function(){this.setHeading=function(a){this.heading=a}},link:function(b,c,d,e){var f,g;e.addGroup(b),b.isOpen=!1,d.isOpen&&(f=a(d.isOpen),g=f.assign,b.$parent.$watch(f,function(a){b.isOpen=!!a})),b.$watch("isOpen",function(a){a&&e.closeOthers(b),g&&g(b.$parent,a)})}}}]).directive("accordionHeading",function(){return{restrict:"EA",transclude:!0,template:"",replace:!0,require:"^accordionGroup",compile:function(a,b,c){return function(a,b,d,e){e.setHeading(c(a,function(){}))}}}}).directive("accordionTransclude",function(){return{require:"^accordionGroup",link:function(a,b,c,d){a.$watch(function(){return d[c.accordionTransclude]},function(a){a&&(b.html(""),b.append(a))})}}}),angular.module("mm.foundation.alert",[]).controller("AlertController",["$scope","$attrs",function(a,b){a.closeable="close"in b}]).directive("alert",function(){return{restrict:"EA",controller:"AlertController",templateUrl:"template/alert/alert.html",transclude:!0,replace:!0,scope:{type:"=",close:"&"}}}),angular.module("mm.foundation.bindHtml",[]).directive("bindHtmlUnsafe",function(){return function(a,b,c){b.addClass("ng-binding").data("$binding",c.bindHtmlUnsafe),a.$watch(c.bindHtmlUnsafe,function(a){b.html(a||"")})}}),angular.module("mm.foundation.buttons",[]).constant("buttonConfig",{activeClass:"active",toggleEvent:"click"}).controller("ButtonsController",["buttonConfig",function(a){this.activeClass=a.activeClass,this.toggleEvent=a.toggleEvent}]).directive("btnRadio",function(){return{require:["btnRadio","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){var e=d[0],f=d[1];f.$render=function(){b.toggleClass(e.activeClass,angular.equals(f.$modelValue,a.$eval(c.btnRadio)))},b.bind(e.toggleEvent,function(){b.hasClass(e.activeClass)||a.$apply(function(){f.$setViewValue(a.$eval(c.btnRadio)),f.$render()})})}}}).directive("btnCheckbox",function(){return{require:["btnCheckbox","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){function e(){return g(c.btnCheckboxTrue,!0)}function f(){return g(c.btnCheckboxFalse,!1)}function g(b,c){var d=a.$eval(b);return angular.isDefined(d)?d:c}var h=d[0],i=d[1];i.$render=function(){b.toggleClass(h.activeClass,angular.equals(i.$modelValue,e()))},b.bind(h.toggleEvent,function(){a.$apply(function(){i.$setViewValue(b.hasClass(h.activeClass)?f():e()),i.$render()})})}}}),angular.module("mm.foundation.position",[]).factory("$position",["$document","$window",function(a,b){function c(a,c){return a.currentStyle?a.currentStyle[c]:b.getComputedStyle?b.getComputedStyle(a)[c]:a.style[c]}function d(a){return"static"===(c(a,"position")||"static")}var e=function(b){for(var c=a[0],e=b.offsetParent||c;e&&e!==c&&d(e);)e=e.offsetParent;return e||c};return{position:function(b){var c=this.offset(b),d={top:0,left:0},f=e(b[0]);f!=a[0]&&(d=this.offset(angular.element(f)),d.top+=f.clientTop-f.scrollTop,d.left+=f.clientLeft-f.scrollLeft);var g=b[0].getBoundingClientRect();return{width:g.width||b.prop("offsetWidth"),height:g.height||b.prop("offsetHeight"),top:c.top-d.top,left:c.left-d.left}},offset:function(c){var d=c[0].getBoundingClientRect();return{width:d.width||c.prop("offsetWidth"),height:d.height||c.prop("offsetHeight"),top:d.top+(b.pageYOffset||a[0].body.scrollTop||a[0].documentElement.scrollTop),left:d.left+(b.pageXOffset||a[0].body.scrollLeft||a[0].documentElement.scrollLeft)}}}}]),angular.module("mm.foundation.dropdownToggle",["mm.foundation.position"]).directive("dropdownToggle",["$document","$location","$position",function(a,b,c){var d=null,e=angular.noop;return{restrict:"CA",scope:{dropdownToggle:"@"},link:function(b,f){var g=angular.element(a[0].querySelector(b.dropdownToggle));b.$watch("$location.path",function(){e()}),f.bind("click",function(h){g=angular.element(a[0].querySelector(b.dropdownToggle));var i=f===d;if(h.preventDefault(),h.stopPropagation(),d&&e(),!i&&!f.hasClass("disabled")&&!f.prop("disabled")){g.css("display","block");var j=c.offset(f),k=c.offset(angular.element(g[0].offsetParent));g.css({left:j.left-k.left+"px",top:j.top-k.top+j.height+"px"}),d=f,e=function(){a.unbind("click",e),g.css("display","none"),e=angular.noop,d=null},a.bind("click",e)}}),g&&g.css("display","none")}}}]),angular.module("mm.foundation.transition",[]).factory("$transition",["$q","$timeout","$rootScope",function(a,b,c){function d(a){for(var b in a)if(void 0!==f.style[b])return a[b]}var e=function(d,f,g){g=g||{};var h=a.defer(),i=e[g.animation?"animationEndEventName":"transitionEndEventName"],j=function(){c.$apply(function(){d.unbind(i,j),h.resolve(d)})};return i&&d.bind(i,j),b(function(){angular.isString(f)?d.addClass(f):angular.isFunction(f)?f(d):angular.isObject(f)&&d.css(f),i||h.resolve(d)}),h.promise.cancel=function(){i&&d.unbind(i,j),h.reject("Transition cancelled")},h.promise},f=document.createElement("trans"),g={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",transition:"transitionend"},h={WebkitTransition:"webkitAnimationEnd",MozTransition:"animationend",OTransition:"oAnimationEnd",transition:"animationend"};return e.transitionEndEventName=d(g),e.animationEndEventName=d(h),e}]),angular.module("mm.foundation.modal",["mm.foundation.transition"]).factory("$$stackedMap",function(){return{createNew:function(){var a=[];return{add:function(b,c){a.push({key:b,value:c})},get:function(b){for(var c=0;c0)}function i(){if(k&&-1==g()){var a=l;j(k,l,150,function(){a.$destroy(),a=null}),k=void 0,l=void 0}}function j(c,d,e,f){function g(){g.done||(g.done=!0,c.remove(),f&&f())}d.animate=!1;var h=a.transitionEndEventName;if(h){var i=b(g,e);c.bind(h,function(){b.cancel(i),g(),d.$apply()})}else b(g,0)}var k,l,m="modal-open",n=f.createNew(),o={};return e.$watch(g,function(a){l&&(l.index=a)}),c.bind("keydown",function(a){var b;27===a.which&&(b=n.top(),b&&b.value.keyboard&&e.$apply(function(){o.dismiss(b.key)}))}),o.open=function(a,b){n.add(a,{deferred:b.deferred,modalScope:b.scope,backdrop:b.backdrop,keyboard:b.keyboard});var f=c.find("body").eq(0),h=g();h>=0&&!k&&(l=e.$new(!0),l.index=h,k=d("
")(l),f.append(k));var i=angular.element("
");i.attr("window-class",b.windowClass),i.attr("index",n.length()-1),i.attr("animate","animate"),i.html(b.content);var j=d(i)(b.scope);n.top().value.modalDomEl=j,f.append(j),f.addClass(m)},o.close=function(a,b){var c=n.get(a).value;c&&(c.deferred.resolve(b),h(a))},o.dismiss=function(a,b){var c=n.get(a).value;c&&(c.deferred.reject(b),h(a))},o.dismissAll=function(a){for(var b=this.getTop();b;)this.dismiss(b.key,a),b=this.getTop()},o.getTop=function(){return n.top()},o}]).provider("$modal",function(){var a={options:{backdrop:!0,keyboard:!0},$get:["$injector","$rootScope","$q","$http","$templateCache","$controller","$modalStack",function(b,c,d,e,f,g,h){function i(a){return a.template?d.when(a.template):e.get(a.templateUrl,{cache:f}).then(function(a){return a.data})}function j(a){var c=[];return angular.forEach(a,function(a){(angular.isFunction(a)||angular.isArray(a))&&c.push(d.when(b.invoke(a)))}),c}var k={};return k.open=function(b){var e=d.defer(),f=d.defer(),k={result:e.promise,opened:f.promise,close:function(a){h.close(k,a)},dismiss:function(a){h.dismiss(k,a)}};if(b=angular.extend({},a.options,b),b.resolve=b.resolve||{},!b.template&&!b.templateUrl)throw new Error("One of template or templateUrl options is required.");var l=d.all([i(b)].concat(j(b.resolve)));return l.then(function(a){var d=(b.scope||c).$new();d.$close=k.close,d.$dismiss=k.dismiss;var f,i={},j=1;b.controller&&(i.$scope=d,i.$modalInstance=k,angular.forEach(b.resolve,function(b,c){i[c]=a[j++]}),f=g(b.controller,i)),h.open(k,{scope:d,deferred:e,content:a[0],backdrop:b.backdrop,keyboard:b.keyboard,windowClass:b.windowClass})},function(a){e.reject(a)}),l.then(function(){f.resolve(!0)},function(){f.reject(!1)}),k},k}]};return a}),angular.module("mm.foundation.offcanvas",[]).directive("offCanvasWrap",["$window",function(a){return{scope:{},restrict:"C",link:function(b,c){var d=angular.element(a),e=b.sidebar=c;b.hide=function(){e.removeClass("move-left"),e.removeClass("move-right")},d.bind("resize.body",b.hide),b.$on("$destroy",function(){d.unbind("resize.body",b.hide)})},controller:["$scope",function(a){this.leftToggle=function(){a.sidebar.toggleClass("move-right")},this.rightToggle=function(){a.sidebar.toggleClass("move-left")},this.hide=function(){a.hide()}}]}}]).directive("leftOffCanvasToggle",[function(){return{require:"^offCanvasWrap",restrict:"C",link:function(a,b,c,d){b.on("click",function(){d.leftToggle()})}}}]).directive("rightOffCanvasToggle",[function(){return{require:"^offCanvasWrap",restrict:"C",link:function(a,b,c,d){b.on("click",function(){d.rightToggle()})}}}]).directive("exitOffCanvas",[function(){return{require:"^offCanvasWrap",restrict:"C",link:function(a,b,c,d){b.on("click",function(){d.hide()})}}}]).directive("offCanvasList",[function(){return{require:"^offCanvasWrap",restrict:"C",link:function(a,b,c,d){b.on("click",function(){d.hide()})}}}]),angular.module("mm.foundation.pagination",[]).controller("PaginationController",["$scope","$attrs","$parse","$interpolate",function(a,b,c,d){var e=this,f=b.numPages?c(b.numPages).assign:angular.noop;this.init=function(d){b.itemsPerPage?a.$parent.$watch(c(b.itemsPerPage),function(b){e.itemsPerPage=parseInt(b,10),a.totalPages=e.calculateTotalPages()}):this.itemsPerPage=d},this.noPrevious=function(){return 1===this.page},this.noNext=function(){return this.page===a.totalPages},this.isActive=function(a){return this.page===a},this.calculateTotalPages=function(){var b=this.itemsPerPage<1?1:Math.ceil(a.totalItems/this.itemsPerPage);return Math.max(b||0,1)},this.getAttributeValue=function(b,c,e){return angular.isDefined(b)?e?d(b)(a.$parent):a.$parent.$eval(b):c},this.render=function(){this.page=parseInt(a.page,10)||1,this.page>0&&this.page<=a.totalPages&&(a.pages=this.getPages(this.page,a.totalPages))},a.selectPage=function(b){!e.isActive(b)&&b>0&&b<=a.totalPages&&(a.page=b,a.onSelectPage({page:b}))},a.$watch("page",function(){e.render()}),a.$watch("totalItems",function(){a.totalPages=e.calculateTotalPages()}),a.$watch("totalPages",function(b){f(a.$parent,b),e.page>b?a.selectPage(b):e.render()})}]).constant("paginationConfig",{itemsPerPage:10,boundaryLinks:!1,directionLinks:!0,firstText:"First",previousText:"Previous",nextText:"Next",lastText:"Last",rotate:!0}).directive("pagination",["$parse","paginationConfig",function(a,b){return{restrict:"EA",scope:{page:"=",totalItems:"=",onSelectPage:" &"},controller:"PaginationController",templateUrl:"template/pagination/pagination.html",replace:!0,link:function(c,d,e,f){function g(a,b,c,d){return{number:a,text:b,active:c,disabled:d}}var h,i=f.getAttributeValue(e.boundaryLinks,b.boundaryLinks),j=f.getAttributeValue(e.directionLinks,b.directionLinks),k=f.getAttributeValue(e.firstText,b.firstText,!0),l=f.getAttributeValue(e.previousText,b.previousText,!0),m=f.getAttributeValue(e.nextText,b.nextText,!0),n=f.getAttributeValue(e.lastText,b.lastText,!0),o=f.getAttributeValue(e.rotate,b.rotate);f.init(b.itemsPerPage),e.maxSize&&c.$parent.$watch(a(e.maxSize),function(a){h=parseInt(a,10),f.render()}),f.getPages=function(a,b){var c=[],d=1,e=b,p=angular.isDefined(h)&&b>h;p&&(o?(d=Math.max(a-Math.floor(h/2),1),e=d+h-1,e>b&&(e=b,d=e-h+1)):(d=(Math.ceil(a/h)-1)*h+1,e=Math.min(d+h-1,b)));for(var q=d;e>=q;q++){var r=g(q,q,f.isActive(q),!1);c.push(r)}if(p&&!o){if(d>1){var s=g(d-1,"...",!1,!1);c.unshift(s)}if(b>e){var t=g(e+1,"...",!1,!1);c.push(t)}}if(j){var u=g(a-1,l,!1,f.noPrevious());c.unshift(u);var v=g(a+1,m,!1,f.noNext());c.push(v)}if(i){var w=g(1,k,!1,f.noPrevious());c.unshift(w);var x=g(b,n,!1,f.noNext());c.push(x)}return c}}}}]).constant("pagerConfig",{itemsPerPage:10,previousText:"« Previous",nextText:"Next »",align:!0}).directive("pager",["pagerConfig",function(a){return{restrict:"EA",scope:{page:"=",totalItems:"=",onSelectPage:" &"},controller:"PaginationController",templateUrl:"template/pagination/pager.html",replace:!0,link:function(b,c,d,e){function f(a,b,c,d,e){return{number:a,text:b,disabled:c,previous:i&&d,next:i&&e}}var g=e.getAttributeValue(d.previousText,a.previousText,!0),h=e.getAttributeValue(d.nextText,a.nextText,!0),i=e.getAttributeValue(d.align,a.align);e.init(a.itemsPerPage),e.getPages=function(a){return[f(a-1,g,e.noPrevious(),!0,!1),f(a+1,h,e.noNext(),!1,!0)]}}}}]),angular.module("mm.foundation.tooltip",["mm.foundation.position","mm.foundation.bindHtml"]).provider("$tooltip",function(){function a(a){var b=/[A-Z]/g,c="-";return a.replace(b,function(a,b){return(b?c:"")+a.toLowerCase()})}var b={placement:"top",animation:!0,popupDelay:0},c={mouseenter:"mouseleave",click:"click",focus:"blur"},d={};this.options=function(a){angular.extend(d,a)},this.setTriggers=function(a){angular.extend(c,a)},this.$get=["$window","$compile","$timeout","$parse","$document","$position","$interpolate",function(e,f,g,h,i,j,k){return function(e,l,m){function n(a){var b=a||o.trigger||m,d=c[b]||b;return{show:b,hide:d}}var o=angular.extend({},b,d),p=a(e),q=k.startSymbol(),r=k.endSymbol(),s="
';return{restrict:"EA",scope:!0,compile:function(){var a=f(s);return function(b,c,d){function f(){b.tt_isOpen?m():k()}function k(){(!z||b.$eval(d[l+"Enable"]))&&(b.tt_popupDelay?(v=g(p,b.tt_popupDelay,!1),v.then(function(a){a()})):p()())}function m(){b.$apply(function(){q()})}function p(){return b.tt_content?(r(),u&&g.cancel(u),t.css({top:0,left:0,display:"block"}),w?i.find("body").append(t):c.after(t),A(),b.tt_isOpen=!0,b.$digest(),A):angular.noop}function q(){b.tt_isOpen=!1,g.cancel(v),b.tt_animation?u=g(s,500):s()}function r(){t&&s(),t=a(b,function(){}),b.$digest()}function s(){t&&(t.remove(),t=null)}var t,u,v,w=angular.isDefined(o.appendToBody)?o.appendToBody:!1,x=n(void 0),y=!1,z=angular.isDefined(d[l+"Enable"]),A=function(){var a,d,e,f;switch(a=w?j.offset(c):j.position(c),d=t.prop("offsetWidth"),e=t.prop("offsetHeight"),b.tt_placement){case"right":f={top:a.top+a.height/2-e/2,left:a.left+a.width+10};break;case"bottom":f={top:a.top+a.height+10,left:a.left};break;case"left":f={top:a.top+a.height/2-e/2,left:a.left-d-10};break;default:f={top:a.top-e-10,left:a.left}}f.top+="px",f.left+="px",t.css(f)};b.tt_isOpen=!1,d.$observe(e,function(a){b.tt_content=a,!a&&b.tt_isOpen&&q()}),d.$observe(l+"Title",function(a){b.tt_title=a}),d.$observe(l+"Placement",function(a){b.tt_placement=angular.isDefined(a)?a:o.placement}),d.$observe(l+"PopupDelay",function(a){var c=parseInt(a,10);b.tt_popupDelay=isNaN(c)?o.popupDelay:c});var B=function(){y&&(c.unbind(x.show,k),c.unbind(x.hide,m))},C=function(){};d.$observe(l+"Trigger",function(a){B(),C(),x=n(a),angular.isFunction(x.show)?C=b.$watch(function(){return x.show(b,c,d)},function(a){return g(a?p:q)}):x.show===x.hide?c.bind(x.show,f):(c.bind(x.show,k),c.bind(x.hide,m)),y=!0});var D=b.$eval(d[l+"Animation"]);b.tt_animation=angular.isDefined(D)?!!D:o.animation,d.$observe(l+"AppendToBody",function(a){w=angular.isDefined(a)?h(a)(b):w}),w&&b.$on("$locationChangeSuccess",function(){b.tt_isOpen&&q()}),b.$on("$destroy",function(){g.cancel(u),g.cancel(v),B(),C(),s()})}}}}}]}).directive("tooltipPopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-popup.html"}}).directive("tooltip",["$tooltip",function(a){return a("tooltip","tooltip","mouseenter")}]).directive("tooltipHtmlUnsafePopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-html-unsafe-popup.html"}}).directive("tooltipHtmlUnsafe",["$tooltip",function(a){return a("tooltipHtmlUnsafe","tooltip","mouseenter")}]),angular.module("mm.foundation.popover",["mm.foundation.tooltip"]).directive("popoverPopup",function(){return{restrict:"EA",replace:!0,scope:{title:"@",content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/popover/popover.html"}}).directive("popover",["$tooltip",function(a){return a("popover","popover","click")}]),angular.module("mm.foundation.progressbar",["mm.foundation.transition"]).constant("progressConfig",{animate:!0,max:100}).controller("ProgressController",["$scope","$attrs","progressConfig","$transition",function(a,b,c,d){var e=this,f=[],g=angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max,h=angular.isDefined(b.animate)?a.$parent.$eval(b.animate):c.animate;this.addBar=function(a,b){var c=0,d=a.$parent.$index;angular.isDefined(d)&&f[d]&&(c=f[d].value),f.push(a),this.update(b,a.value,c),a.$watch("value",function(a,c){a!==c&&e.update(b,a,c)}),a.$on("$destroy",function(){e.removeBar(a)})},this.update=function(a,b,c){var e=this.getPercentage(b);h?(a.css("width",this.getPercentage(c)+"%"),d(a,{width:e+"%"})):a.css({transition:"none",width:e+"%"})},this.removeBar=function(a){f.splice(f.indexOf(a),1)},this.getPercentage=function(a){return Math.round(100*a/g)}}]).directive("progress",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",require:"progress",scope:{},template:'
'}}).directive("bar",function(){return{restrict:"EA",replace:!0,transclude:!0,require:"^progress",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/bar.html",link:function(a,b,c,d){d.addBar(a,b)}}}).directive("progressbar",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/progressbar.html",link:function(a,b,c,d){d.addBar(a,angular.element(b.children()[0]))}}}),angular.module("mm.foundation.rating",[]).constant("ratingConfig",{max:5,stateOn:null,stateOff:null}).controller("RatingController",["$scope","$attrs","$parse","ratingConfig",function(a,b,c,d){this.maxRange=angular.isDefined(b.max)?a.$parent.$eval(b.max):d.max,this.stateOn=angular.isDefined(b.stateOn)?a.$parent.$eval(b.stateOn):d.stateOn,this.stateOff=angular.isDefined(b.stateOff)?a.$parent.$eval(b.stateOff):d.stateOff,this.createRateObjects=function(a){for(var b={stateOn:this.stateOn,stateOff:this.stateOff},c=0,d=a.length;d>c;c++)a[c]=angular.extend({index:c},b,a[c]);return a},a.range=this.createRateObjects(angular.isDefined(b.ratingStates)?angular.copy(a.$parent.$eval(b.ratingStates)):new Array(this.maxRange)),a.rate=function(b){a.value===b||a.readonly||(a.value=b)},a.enter=function(b){a.readonly||(a.val=b),a.onHover({value:b})},a.reset=function(){a.val=angular.copy(a.value),a.onLeave()},a.$watch("value",function(b){a.val=b}),a.readonly=!1,b.readonly&&a.$parent.$watch(c(b.readonly),function(b){a.readonly=!!b})}]).directive("rating",function(){return{restrict:"EA",scope:{value:"=",onHover:"&",onLeave:"&"},controller:"RatingController",templateUrl:"template/rating/rating.html",replace:!0}}),angular.module("mm.foundation.tabs",[]).controller("TabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){a.selectExpression(a.$parent)},b.addTab=function(a){c.push(a)},b.removeTab=function(a){var d=c.indexOf(a);if(a.active&&c.length>1){var e=d==c.length-1?d-1:d+1;b.select(c[e])}c.splice(d,1)}}]).directive("tabset",function(){return{restrict:"EA",transclude:!0,replace:!0,scope:{},controller:"TabsetController",templateUrl:"template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1,a.type=angular.isDefined(c.type)?a.$parent.$eval(c.type):"tabs"}}}).directive("tab",["$parse",function(a){return{require:"^tabset",restrict:"EA",replace:!0,templateUrl:"template/tabs/tab.html",transclude:!0,scope:{heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},compile:function(b,c,d){return function(b,c,e,f){var g,h;e.select&&(b.selectExpression=a(e.select)),e.active?(g=a(e.active),h=g.assign,b.$parent.$watch(g,function(a,c){a!==c&&(b.active=!!a)}),b.active=g(b.$parent)):h=g=angular.noop,b.disabled=!1,e.disabled&&b.$parent.$watch(a(e.disabled),function(a){b.disabled=!!a}),b.select=function(){b.disabled||b.selectExpression(b.$parent)},f.addTab(b),b.$on("$destroy",function(){f.removeTab(b)}),b.$transcludeFn=d}}}}]).directive("tabHeadingTransclude",[function(){return{restrict:"A",require:"^tab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}]).directive("tabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("tab-heading")||a.hasAttribute("data-tab-heading")||"tab-heading"===a.tagName.toLowerCase()||"data-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^tabset",link:function(b,c,d){var e=b.$eval(d.tabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("mm.foundation.tour",["mm.foundation.position","mm.foundation.tooltip"]).service("$tour",["$window",function(a){function b(){return parseInt(a.localStorage.getItem("mm.tour.step"),10)}function c(b){d=b,a.localStorage.setItem("mm.tour.step",b)}var d=b(),e={};this.add=function(a,b){e[a]=b},this.has=function(a){return!!e[a]},this.isActive=function(){return d>0},this.current=function(a){return a?void c(d):d},this.start=function(){c(1)},this.next=function(){c(d+1)},this.end=function(){c(0)}}]).directive("stepTextPopup",["$tour",function(a){return{restrict:"EA",replace:!0,scope:{title:"@",content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tour/tour.html",link:function(b,c){b.isLastStep=function(){return!a.has(a.current()+1)},b.endTour=function(){c.remove(),a.end()},b.nextStep=function(){c.remove(),a.next()}}}}]).directive("stepText",["$position","$tooltip","$tour","$window",function(a,b,c,d){function e(a){var b=a[0].getBoundingClientRect();return b.top>=0&&b.left>=0&&b.bottom<=d.innerHeight-80&&b.right<=d.innerWidth}function f(b,f,g){var h=parseInt(g.stepIndex,10);if(c.isActive()&&h&&(c.add(h,g),h===c.current())){if(!e(f)){var i=a.offset(f);d.scrollTo(0,i.top-d.innerHeight/2)}return!0}return!1}return b("stepText","step",f)}]),angular.module("mm.foundation.typeahead",["mm.foundation.position","mm.foundation.bindHtml"]).factory("typeaheadParser",["$parse",function(a){var b=/^\s*(.*?)(?:\s+as\s+(.*?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+(.*)$/;return{parse:function(c){var d=c.match(b);if(!d)throw new Error("Expected typeahead specification in form of '_modelValue_ (as _label_)? for _item_ in _collection_' but got '"+c+"'.");return{itemName:d[3],source:a(d[4]),viewMapper:a(d[2]||d[1]),modelMapper:a(d[1])}}}}]).directive("typeahead",["$compile","$parse","$q","$timeout","$document","$position","typeaheadParser",function(a,b,c,d,e,f,g){var h=[9,13,27,38,40];return{require:"ngModel",link:function(i,j,k,l){var m,n=i.$eval(k.typeaheadMinLength)||1,o=i.$eval(k.typeaheadWaitMs)||0,p=i.$eval(k.typeaheadEditable)!==!1,q=b(k.typeaheadLoading).assign||angular.noop,r=b(k.typeaheadOnSelect),s=k.typeaheadInputFormatter?b(k.typeaheadInputFormatter):void 0,t=k.typeaheadAppendToBody?b(k.typeaheadAppendToBody):!1,u=b(k.ngModel).assign,v=g.parse(k.typeahead),w=angular.element("
");w.attr({matches:"matches",active:"activeIdx",select:"select(activeIdx)",query:"query",position:"position"}),angular.isDefined(k.typeaheadTemplateUrl)&&w.attr("template-url",k.typeaheadTemplateUrl);var x=i.$new();i.$on("$destroy",function(){x.$destroy()});var y=function(){x.matches=[],x.activeIdx=-1},z=function(a){var b={$viewValue:a};q(i,!0),c.when(v.source(i,b)).then(function(c){if(a===l.$viewValue&&m){if(c.length>0){x.activeIdx=0,x.matches.length=0;for(var d=0;d=n?o>0?(A&&d.cancel(A),A=d(function(){z(a)},o)):z(a):(q(i,!1),y()),p?a:a?void l.$setValidity("editable",!1):(l.$setValidity("editable",!0),a)}),l.$formatters.push(function(a){var b,c,d={};return s?(d.$model=a,s(i,d)):(d[v.itemName]=a,b=v.viewMapper(i,d),d[v.itemName]=void 0,c=v.viewMapper(i,d),b!==c?b:a)}),x.select=function(a){var b,c,d={};d[v.itemName]=c=x.matches[a].model,b=v.modelMapper(i,d),u(i,b),l.$setValidity("editable",!0),r(i,{$item:c,$model:b,$label:v.viewMapper(i,d)}),y(),j[0].focus()},j.bind("keydown",function(a){0!==x.matches.length&&-1!==h.indexOf(a.which)&&(a.preventDefault(),40===a.which?(x.activeIdx=(x.activeIdx+1)%x.matches.length,x.$digest()):38===a.which?(x.activeIdx=(x.activeIdx?x.activeIdx:x.matches.length)-1,x.$digest()):13===a.which||9===a.which?x.$apply(function(){x.select(x.activeIdx)}):27===a.which&&(a.stopPropagation(),y(),x.$digest()))}),j.bind("blur",function(){m=!1});var B=function(a){j[0]!==a.target&&(y(),x.$digest())};e.bind("click",B),i.$on("$destroy",function(){e.unbind("click",B)});var C=a(w)(x);t?e.find("body").append(C):j.after(C)}}}]).directive("typeaheadPopup",function(){return{restrict:"EA",scope:{matches:"=",query:"=",active:"=",position:"=",select:"&"},replace:!0,templateUrl:"template/typeahead/typeahead-popup.html",link:function(a,b,c){a.templateUrl=c.templateUrl,a.isOpen=function(){return a.matches.length>0},a.isActive=function(b){return a.active==b},a.selectActive=function(b){a.active=b},a.selectMatch=function(b){a.select({activeIdx:b})}}}}).directive("typeaheadMatch",["$http","$templateCache","$compile","$parse",function(a,b,c,d){return{restrict:"EA",scope:{index:"=",match:"=",query:"="},link:function(e,f,g){var h=d(g.templateUrl)(e.$parent)||"template/typeahead/typeahead-match.html";a.get(h,{cache:b}).success(function(a){f.replaceWith(c(a.trim())(e))})}}}]).filter("typeaheadHighlight",function(){function a(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}return function(b,c){return c?b.replace(new RegExp(a(c),"gi"),"$&"):b}}),angular.module("template/accordion/accordion-group.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion-group.html",'
\n {{heading}}\n
\n
\n')}]),angular.module("template/accordion/accordion.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion.html",'
\n')}]),angular.module("template/alert/alert.html",[]).run(["$templateCache",function(a){a.put("template/alert/alert.html","
\n \n ×\n
\n")}]),angular.module("template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("template/modal/backdrop.html",'
\n')}]),angular.module("template/modal/window.html",[]).run(["$templateCache",function(a){a.put("template/modal/window.html",'
\n
\n
\n')}]),angular.module("template/pagination/pager.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pager.html",'\n')}]),angular.module("template/pagination/pagination.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pagination.html",'\n')}]),angular.module("template/tooltip/tooltip-html-unsafe-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-html-unsafe-popup.html",'\n \n \n\n') +}]),angular.module("template/tooltip/tooltip-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-popup.html",'\n \n \n\n')}]),angular.module("template/popover/popover.html",[]).run(["$templateCache",function(a){a.put("template/popover/popover.html",'
\n \n
\n

\n

\n
\n
\n')}]),angular.module("template/progressbar/bar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/bar.html",'\n')}]),angular.module("template/progressbar/progress.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progress.html",'
\n')}]),angular.module("template/progressbar/progressbar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progressbar.html",'
\n \n
\n')}]),angular.module("template/rating/rating.html",[]).run(["$templateCache",function(a){a.put("template/rating/rating.html",'\n \n\n')}]),angular.module("template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tab.html",'
\n {{heading}}\n
\n')}]),angular.module("template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset.html",'
\n
\n
\n
\n
\n
\n
\n
\n')}]),angular.module("template/tour/tour.html",[]).run(["$templateCache",function(a){a.put("template/tour/tour.html",'
\n \n
\n

\n

\n Next\n End\n ×\n
\n
\n')}]),angular.module("template/typeahead/typeahead-match.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-match.html",'')}]),angular.module("template/typeahead/typeahead-popup.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-popup.html","\n')}]); diff --git a/app/assets/javascripts/templates/hub_modal.html.haml b/app/assets/javascripts/templates/hub_modal.html.haml new file mode 100644 index 0000000000..6b13f6ee78 --- /dev/null +++ b/app/assets/javascripts/templates/hub_modal.html.haml @@ -0,0 +1,4 @@ +%ng-include{src: "'partials/enterprise_header.html'"} +%ng-include{src: "'partials/enterprise_details.html'"} +%ng-include{src: "'partials/hub_details.html'"} +%ng-include{src: "'partials/close.html'"} diff --git a/app/assets/javascripts/templates/map_modal_producer.html.haml b/app/assets/javascripts/templates/map_modal_producer.html.haml index 23ae109b3e..dff26519d3 100644 --- a/app/assets/javascripts/templates/map_modal_producer.html.haml +++ b/app/assets/javascripts/templates/map_modal_producer.html.haml @@ -1,37 +1,4 @@ -.highlight - .highlight-top - %p.right - {{ [enterprise.address.city, enterprise.address.state] | printArray}} - %h3 - %i.ofn-i_036-producers - {{ enterprise.name }} - %img.hero-img{"ng-src" => "{{enterprise.promo_image}}"} - -.row{bindonce: true} - .small-12.large-8.columns - %div{"ng-if" => "enterprise.long_description.length > 0 || enterprise.logo"} - %h5.modal-header About - .about-container - %img.enterprise-logo{"bo-src" => "enterprise.logo", "bo-if" => "enterprise.logo"} - %p.text-small{"ng-bind-html" => "enterprise.long_description"} - .small-12.large-4.columns - %ng-include{src: "'partials/contact.html'"} - %ng-include{src: "'partials/follow.html'"} - -.row.pad-top{bindonce: true, "ng-if" => "enterprise.hubs.length > 0"} - .cta-container.small-12.columns - %h5 - %i.ofn-i_029-shopping-basket - Shop for {{enterprise.name}} products at: - %a.button.hub{"ng-repeat" => "hub in enterprise.hubs", - "bo-href" => "hub.path", - "bo-class" => "{primary: hub.active, secondary: !hub.active}", - "ofn-empties-cart" => "hub"} - %i.ofn-i_033-open-sign{"bo-if" => "hub.active"} - %i.ofn-i_032-closed-sign{"bo-if" => "!hub.active"} - {{hub.name}} - .button-address {{ hub.address.city }} , {{hub.address.state}} - %i.ofn-i_007-caret-right - -%a.close-reveal-modal.outside{"ng-click" => "$close()"} - %i.ofn-i_009-close +%ng-include{src: "'partials/enterprise_header.html'"} +%ng-include{src: "'partials/enterprise_details.html'"} +%ng-include{src: "'partials/hub_actions.html'"} +%ng-include{src: "'partials/close.html'"} diff --git a/app/assets/javascripts/templates/partials/close.html.haml b/app/assets/javascripts/templates/partials/close.html.haml new file mode 100644 index 0000000000..1facd8edeb --- /dev/null +++ b/app/assets/javascripts/templates/partials/close.html.haml @@ -0,0 +1,2 @@ +%a.close-reveal-modal.outside{"ng-click" => "$close()"} + %i.ofn-i_009-close diff --git a/app/assets/javascripts/templates/partials/contact.html.haml b/app/assets/javascripts/templates/partials/contact.html.haml index 3a64615be1..8831a8436e 100644 --- a/app/assets/javascripts/templates/partials/contact.html.haml +++ b/app/assets/javascripts/templates/partials/contact.html.haml @@ -5,8 +5,9 @@ {{ enterprise.phone }} %p{"ng-if" => "enterprise.email"} - %a{"ng-href" => "mailto:{{enterprise.email | stripUrl}}", target: "_blank" } - {{ enterprise.email | stripUrl }} + %a{"ng-href" => "{{enterprise.email | stripUrl}}", target: "_blank", mailto: true} + %span.email + {{ enterprise.email | stripUrl }} %p{"ng-if" => "enterprise.website"} %a{"ng-href" => "http://{{enterprise.website | stripUrl}}", target: "_blank" } diff --git a/app/assets/javascripts/templates/partials/enterprise_details.html.haml b/app/assets/javascripts/templates/partials/enterprise_details.html.haml new file mode 100644 index 0000000000..2f88fe51f3 --- /dev/null +++ b/app/assets/javascripts/templates/partials/enterprise_details.html.haml @@ -0,0 +1,10 @@ +.row{bindonce: true} + .small-12.large-8.columns + %div{"ng-if" => "enterprise.long_description.length > 0 || enterprise.logo"} + %h5.modal-header About + .about-container + %img.enterprise-logo{"bo-src" => "enterprise.logo", "bo-if" => "enterprise.logo"} + %p.text-small{"ng-bind-html" => "enterprise.long_description"} + .small-12.large-4.columns + %ng-include{src: "'partials/contact.html'"} + %ng-include{src: "'partials/follow.html'"} diff --git a/app/assets/javascripts/templates/partials/enterprise_header.html.haml b/app/assets/javascripts/templates/partials/enterprise_header.html.haml new file mode 100644 index 0000000000..698a5c6be6 --- /dev/null +++ b/app/assets/javascripts/templates/partials/enterprise_header.html.haml @@ -0,0 +1,9 @@ +.highlight + .highlight-top + %p.right + {{ [enterprise.address.city, enterprise.address.state] | printArray}} + %h3 + %i.ofn-i_036-producers{"ng-show" => "!enterprise.is_distributor"} + %i.ofn-i_040-hub{"ng-show" => "enterprise.is_distributor"} + {{ enterprise.name }} + %img.hero-img{"ng-src" => "{{enterprise.promo_image}}"} diff --git a/app/assets/javascripts/templates/partials/hub_actions.html.haml b/app/assets/javascripts/templates/partials/hub_actions.html.haml new file mode 100644 index 0000000000..499f4f7ec8 --- /dev/null +++ b/app/assets/javascripts/templates/partials/hub_actions.html.haml @@ -0,0 +1,15 @@ +.row.pad-top{bindonce: true, "ng-if" => "enterprise.hubs.length > 0"} + .cta-container.small-12.columns + %h5 + %i.ofn-i_029-shopping-basket + Shop for {{enterprise.name}} products at: + %a.button.hub{"ng-repeat" => "hub in enterprise.hubs", + "bo-href" => "hub.path", + "bo-class" => "{primary: hub.active, secondary: !hub.active}", + "ofn-empties-cart" => "hub"} + %i.ofn-i_033-open-sign{"bo-if" => "hub.active"} + %i.ofn-i_032-closed-sign{"bo-if" => "!hub.active"} + {{hub.name}} + .button-address {{ hub.address.city }} , {{hub.address.state}} + %i.ofn-i_007-caret-right + diff --git a/app/assets/javascripts/templates/map_modal_hub.html.haml b/app/assets/javascripts/templates/partials/hub_details.html.haml similarity index 56% rename from app/assets/javascripts/templates/map_modal_hub.html.haml rename to app/assets/javascripts/templates/partials/hub_details.html.haml index 79301798c4..b3de842a3f 100644 --- a/app/assets/javascripts/templates/map_modal_hub.html.haml +++ b/app/assets/javascripts/templates/partials/hub_details.html.haml @@ -1,23 +1,3 @@ -.highlight - .highlight-top - %p.right - {{ [enterprise.address.city, enterprise.address.state] | printArray}} - %h3 - %i.ofn-i_040-hub - {{ enterprise.name }} - %img.hero-img{"ng-src" => "{{enterprise.promo_image}}"} - -.row{bindonce: true} - .small-12.large-8.columns - %div{"ng-if" => "enterprise.long_description.length > 0 || enterprise.logo"} - %h5.modal-header About - .about-container - %img.enterprise-logo{"bo-src" => "enterprise.logo", "bo-if" => "enterprise.logo"} - %p.text-small{"ng-bind-html" => "enterprise.long_description"} - .small-12.large-4.columns - %ng-include{src: "'partials/contact.html'"} - %ng-include{src: "'partials/follow.html'"} - .row.pad-top{bindonce: true} .cta-container.small-12.columns .row @@ -26,7 +6,6 @@ %i.ofn-i_029-shopping-basket %span{"active-table-hub-link" => "enterprise", change: "Change hub to", shop: "Shop at"} .small-12.large-6.columns.right - / Needs logic to hide if nothing populated: .right{"bo-if" => "enterprise.pickup || enterprise.delivery"} Delivery options: %span{"bo-if" => "enterprise.pickup"} @@ -45,7 +24,3 @@ {{enterprise.name}} .button-address {{ enterprise.address.city }} , {{enterprise.address.state}} %i.ofn-i_007-caret-right - -%a.close-reveal-modal.outside{"ng-click" => "$close()"} - %i.ofn-i_009-close - diff --git a/app/assets/javascripts/templates/producer_modal.html.haml b/app/assets/javascripts/templates/producer_modal.html.haml new file mode 100644 index 0000000000..db6f927e21 --- /dev/null +++ b/app/assets/javascripts/templates/producer_modal.html.haml @@ -0,0 +1,3 @@ +%ng-include{src: "'partials/enterprise_header.html'"} +%ng-include{src: "'partials/enterprise_details.html'"} +%ng-include{src: "'partials/close.html'"} diff --git a/app/assets/stylesheets/darkswarm/animations.sass b/app/assets/stylesheets/darkswarm/animations.sass new file mode 100644 index 0000000000..fc1db55bb5 --- /dev/null +++ b/app/assets/stylesheets/darkswarm/animations.sass @@ -0,0 +1,30 @@ +.fade + opacity: 0 + -webkit-transition: opacity .15s linear + transition: opacity .15s linear + +.fade.in + opacity: 1 + +.reveal-modal.fade + -webkit-transition: -webkit-transform .3s ease-out + -moz-transition: -moz-transform .3s ease-out + -o-transition: -o-transform .3s ease-out + transition: transform .3s ease-out + -webkit-transform: translate(0, -25%) + -ms-transform: translate(0, -25%) + transform: translate(0, -25%) + +.reveal-modal.in + -webkit-transform: translate(0, 0) + -ms-transform: translate(0, 0) + transform: translate(0, 0) + +.reveal-modal-bg.fade + filter: alpha(opacity = 0) + opacity: 0 + +.reveal-modal-bg.in + filter: alpha(opacity = 50) + opacity: .5 + diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml index 7872bef239..dd37a32b78 100644 --- a/app/views/groups/index.html.haml +++ b/app/views/groups/index.html.haml @@ -1,4 +1,5 @@ = inject_enterprises + :javascript angular.module('Darkswarm').value('groups', #{render partial: "json/groups", object: @groups}) @@ -36,10 +37,11 @@ .small-6.columns %p {{ group.long_description }} .small-6.columns - %h5 Our hubs & producers + %h5 Our hubs & producers %ul.small-block-grid-2 - %li{"ng-repeat" => "enterprise in group.enterprises"} - %a{"bo-href" => "enterprise.path"} {{ enterprise.name }} + %li{"ng-repeat" => "enterprise in group.enterprises", "scroll-after-load" => true} + %hub-modal{"ng-if" => "enterprise.is_distributor"} + %producer-modal{"ng-if" => "!enterprise.is_distributor", "show-hub-actions" => 'true'} .row.group_footer .small-12.columns diff --git a/app/views/home/_fat.html.haml b/app/views/home/_fat.html.haml index f9c0db6810..8de0524ea3 100644 --- a/app/views/home/_fat.html.haml +++ b/app/views/home/_fat.html.haml @@ -28,9 +28,9 @@ Our producers %ul.bullet-list %li{"ng-repeat" => "enterprise in hub.producers"} - = render partial: "modals/producer" + %producer-modal -.row.active_table_row.link{"ng-show" => "open()", "bo-if" => "hub.active"} +.row.active_table_row.link{"ng-show" => "open()"} .cta-container.columns.small-12 .row .columns.small-12 diff --git a/app/views/json/_groups.rabl b/app/views/json/_groups.rabl index 27325bb850..691d36f42f 100644 --- a/app/views/json/_groups.rabl +++ b/app/views/json/_groups.rabl @@ -2,7 +2,7 @@ collection @groups attributes :id, :name, :position, :description, :long_description child enterprises: :enterprises do - extends 'json/enterprises' + attributes :id end node :logo do |group| diff --git a/app/views/json/partials/_hub.rabl b/app/views/json/partials/_hub.rabl index 2df71001cb..ed9520b43e 100644 --- a/app/views/json/partials/_hub.rabl +++ b/app/views/json/partials/_hub.rabl @@ -13,8 +13,10 @@ end node :delivery do |hub| hub.shipping_methods.where(:require_ship_address => true).present? end -node :active do |hub| - @active_distributors.include?(hub) +if @active_distributors + node :active do |hub| + @active_distributors.include?(hub) + end end node :orders_close_at do |hub| OrderCycle.first_closing_for(hub).andand.orders_close_at diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml index 0bc90f9234..257d989cf1 100644 --- a/app/views/layouts/darkswarm.html.haml +++ b/app/views/layouts/darkswarm.html.haml @@ -5,7 +5,7 @@ %title= content_for?(:title) ? yield(:title) : 'Welcome to Open Food Network' = favicon_link_tag "favicon.png" - %link{href: "http://fonts.googleapis.com/css?family=Open+Sans:400,700", rel: "stylesheet", type: "text/css"}/ + %link{href: "https://fonts.googleapis.com/css?family=Open+Sans:400,700", rel: "stylesheet", type: "text/css"}/ = yield :scripts %script{src: "//maps.googleapis.com/maps/api/js?sensor=false"} diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml index 044cf3cdf0..6f8d8951f1 100644 --- a/app/views/modals/_producer.html.haml +++ b/app/views/modals/_producer.html.haml @@ -23,8 +23,9 @@ {{ enterprise.phone }} %p{"bo-if" => "enterprise.email"} - %a{"ng-href" => "mailto:{{enterprise.email | stripUrl}}", target: "_blank" } - {{ enterprise.email | stripUrl }} + %a{"ng-href" => "{{enterprise.email | stripUrl}}", target: "_blank", mailto: true } + %span.email + {{ enterprise.email | stripUrl }} %p{"bo-show" => "enterprise.website"} %a{"ng-href" => "http://{{enterprise.website}}", target: "_blank" } diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml index b7681e2764..eee0e16332 100644 --- a/app/views/shop/products/_form.html.haml +++ b/app/views/shop/products/_form.html.haml @@ -12,7 +12,7 @@ %input.button.primary.right{type: :submit, value: "Add to Cart"} %div{bindonce: true} - %product{"ng-controller" => "ProductNodeCtrl", + %product.animate-repeat{"ng-controller" => "ProductNodeCtrl", "ng-repeat" => "product in Product.products | products:query | orderBy:ordering.order | limitTo: limit track by product.id"} %div = render partial: "shop/products/summary" diff --git a/app/views/shop/products/_master.html.haml b/app/views/shop/products/_master.html.haml index c06acb5cb1..4c00365f71 100644 --- a/app/views/shop/products/_master.html.haml +++ b/app/views/shop/products/_master.html.haml @@ -15,7 +15,7 @@ name: "variants[{{product.master.id}}]", id: "variants_{{product.master.id}}", "ng-model" => "product.quantity"} - %small {{ product.master.unit_to_display }} + %small x {{ product.master.unit_to_display }} -# WITH GROUP BUY .small-2.columns{"bo-if" => "product.group_buy"} @@ -36,7 +36,7 @@ max: "{{product.on_demand && 9999 || product.count_on_hand }}", name: "variant_attributes[{{product.master.id}}][max_quantity]", "ng-model" => "product.max_quantity"} - {{ product.master.unit_to_display }} + %small x {{ product.master.unit_to_display }} .small-2.columns.text-right {{ product.price | currency }} diff --git a/app/views/shop/products/_variants.html.haml b/app/views/shop/products/_variants.html.haml index 9faaa5e8b1..fed7753ff3 100644 --- a/app/views/shop/products/_variants.html.haml +++ b/app/views/shop/products/_variants.html.haml @@ -18,7 +18,7 @@ max: "{{variant.on_demand && 9999 || variant.count_on_hand }}", name: "variants[{{variant.id}}]", id: "variants_{{variant.id}}", "bo-model" => "variant.quantity"} - %small {{ variant.unit_to_display }} + %small x {{ variant.unit_to_display }} -# WITH GROUP BUY .small-2.columns{"bo-if" => "product.group_buy"} @@ -39,7 +39,7 @@ max: "{{variant.on_demand && 9999 || variant.count_on_hand }}", name: "variant_attributes[{{variant.id}}][max_quantity]", "ng-model" => "variant.max_quantity"} - %small {{ variant.unit_to_display }} + %small x {{ variant.unit_to_display }} .small-2.columns.text-right.price {{ variant.price | currency }} diff --git a/app/views/shopping_shared/_contact.html.haml b/app/views/shopping_shared/_contact.html.haml index a5623bbedd..f5dc7c85bd 100644 --- a/app/views/shopping_shared/_contact.html.haml +++ b/app/views/shopping_shared/_contact.html.haml @@ -4,57 +4,57 @@ .panel .row .small-12.large-4.columns - / Will this is the logic - if all the things are blank, don't display - / {"ng-if" => "current_distributor.address.address1 || current_distributor.address.address2 || current_distributor.address.city || current_distributor.address.state || current_distributor.address.zipcode"} - %div.modal-centered - %h5.modal-header=current_distributor.name - %p - = current_distributor.address.address1 - - unless current_distributor.address.address2.blank? + - if current_distributor.address.address1 || current_distributor.address.address2 || current_distributor.address.city || current_distributor.address.state || current_distributor.address.zipcode + %div.modal-centered + %h5.modal-header=current_distributor.name + %p + = current_distributor.address.address1 + - unless current_distributor.address.address2.blank? + %br + = current_distributor.address.address2 %br - = current_distributor.address.address2 - %br - = current_distributor.address.city - = current_distributor.address.state - = current_distributor.address.zipcode + = current_distributor.address.city + = current_distributor.address.state + = current_distributor.address.zipcode .small-12.large-4.columns - / Will this is the logic - if all the things are blank, don't display - / {"ng-if" => "current_distributor.website || current_distributor.email"} - %div.modal-centered - %h5.modal-header Contact - - unless current_distributor.website.blank? - %p - %a{href: "http://#{current_distributor.website}", target: "_blank" } - = current_distributor.website - - unless current_distributor.email.blank? - %p - %a{href: current_distributor.email.reverse, mailto: true} - %span.email - = current_distributor.email.reverse + - if current_distributor.website || current_distributor.email + %div.modal-centered + %h5.modal-header Contact + - unless current_distributor.website.blank? + %p + %a{href: "http://#{current_distributor.website}", target: "_blank" } + = current_distributor.website + - unless current_distributor.email.blank? + %p + %a{href: current_distributor.email.reverse, mailto: true} + %span.email + = current_distributor.email.reverse .small-12.large-4.columns - / Will this is the logic - if all the things are blank, don't display - / {"ng-if" => "current_distributor.twitter || current_distributor.facebook || current_distributor.linkedin || current_distributor.instagram"} - %div.modal-centered - %h5.modal-header Follow - %div.follow-icons - - unless current_distributor.twitter.blank? - %span - %a{href: "http://twitter.com/#{current_distributor.twitter}", target: "_blank" } - %i.ofn-i_041-twitter + - if current_distributor.twitter.present? || current_distributor.facebook.present? || current_distributor.linkedin.present? || current_distributor.instagram.present? + %div.modal-centered + %h5.modal-header Follow + %div.follow-icons + - unless current_distributor.twitter.blank? + %span + %a{href: "http://twitter.com/#{current_distributor.twitter}", target: "_blank" } + %i.ofn-i_041-twitter - - unless current_distributor.facebook.blank? - %span - %a{href: "http://#{current_distributor.facebook}", target: "_blank" } - %i.ofn-i_044-facebook + - unless current_distributor.facebook.blank? + %span + %a{href: "http://#{current_distributor.facebook}", target: "_blank" } + %i.ofn-i_044-facebook + = current_distributor.facebook - - unless current_distributor.linkedin.blank? - %span - %a{href: "http://#{current_distributor.linkedin}", target: "_blank" } - %i.ofn-i_042-linkedin + - unless current_distributor.linkedin.blank? + %span + %a{href: "http://#{current_distributor.linkedin}", target: "_blank" } + %i.ofn-i_042-linkedin + = current_distributor.linkedin - - unless current_distributor.instagram.blank? - %span - %a{href: "http://instagram.com.#{current_distributor.instagram}", target: "_blank" } - %i.ofn-i_043-instagram + - unless current_distributor.instagram.blank? + %span + %a{href: "http://instagram.com.#{current_distributor.instagram}", target: "_blank" } + %i.ofn-i_043-instagram + = current_distributor.instagram diff --git a/app/views/shopping_shared/_groups.html.haml b/app/views/shopping_shared/_groups.html.haml index 138c2da5d8..e20ef64116 100644 --- a/app/views/shopping_shared/_groups.html.haml +++ b/app/views/shopping_shared/_groups.html.haml @@ -1,10 +1,14 @@ .content .row .small-12.columns.panel - %h5 - =current_distributor.name - is part of: - %ul.bullet-list - - for group in current_distributor.groups - %li - %a{href: main_app.groups_path(anchor: "#/#group#{group.id}")}= group.name + - if current_distributor.groups.length > 0 + %h5 + =current_distributor.name + is part of: + %ul.bullet-list + - for group in current_distributor.groups + %li + = group.id + %a{href: main_app.groups_path + "/#/#group#{group.id}"} + = group.name + diff --git a/app/views/shopping_shared/_producers.html.haml b/app/views/shopping_shared/_producers.html.haml index 7ee26d7410..4c34ae917d 100644 --- a/app/views/shopping_shared/_producers.html.haml +++ b/app/views/shopping_shared/_producers.html.haml @@ -2,8 +2,7 @@ .row .small-12.columns.panel %h5 - Our producers: - / = "#{current_distributor.name}'s producers:" + {{CurrentHub.hub.name}}'s producers: %ul.bullet-list %li{"ng-repeat" => "enterprise in CurrentHub.hub.producers"} = render partial: "modals/producer" diff --git a/app/views/spree/orders/edit.html.haml b/app/views/spree/orders/edit.html.haml index 76b22aeb36..4fdeea348b 100644 --- a/app/views/spree/orders/edit.html.haml +++ b/app/views/spree/orders/edit.html.haml @@ -1,4 +1,5 @@ -- @body_id = 'cart' += inject_enterprises + .darkswarm - content_for :order_cycle_form do %strong.avenir diff --git a/app/views/spree/orders/show.html.haml b/app/views/spree/orders/show.html.haml index f0fe766696..1f020f8c1f 100644 --- a/app/views/spree/orders/show.html.haml +++ b/app/views/spree/orders/show.html.haml @@ -1,3 +1,5 @@ += inject_enterprises + .darkswarm - content_for :order_cycle_form do %strong.avenir diff --git a/config/routes.rb b/config/routes.rb index b151e4bae8..d166116086 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,11 +3,7 @@ Openfoodnetwork::Application.routes.draw do get "/#/login", to: "home#index", as: :spree_login - if Rails.env.production? - get "/map", to: "home#index", as: :map - else - get "/map", to: "map#index", as: :map - end + get "/map", to: "map#index", as: :map resource :shop, controller: "shop" do get :products diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index 4005d82a2a..67193cb9a0 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -1,9 +1,17 @@ require 'spec_helper' describe GroupsController do + render_views + let(:enterprise) { create(:distributor_enterprise) } + let!(:group) { create(:enterprise_group, enterprises: [enterprise], on_front_page: true) } it "gets all visible groups" do EnterpriseGroup.stub_chain :on_front_page, :by_position EnterpriseGroup.should_receive :on_front_page get :index end + + it "loads all enterprises for group" do + get :index + response.body.should have_text enterprise.id + end end diff --git a/spec/features/consumer/groups_spec.rb b/spec/features/consumer/groups_spec.rb new file mode 100644 index 0000000000..7baa5a2807 --- /dev/null +++ b/spec/features/consumer/groups_spec.rb @@ -0,0 +1,21 @@ +require 'spec_helper' + +feature 'Groups', js: true do + include AuthenticationWorkflow + include UIComponentHelper + + let(:enterprise) { create(:distributor_enterprise) } + let!(:group) { create(:enterprise_group, enterprises: [enterprise], on_front_page: true) } + + it "renders groups" do + visit groups_path + page.should have_content group.name + end + + it "renders enterprise modals for groups" do + visit groups_path + page.should have_content enterprise.name + open_enterprise_modal enterprise + modal_should_be_open_for enterprise + end +end diff --git a/spec/features/consumer/home_spec.rb b/spec/features/consumer/home_spec.rb index 1b28af1489..c6ac4af2ba 100644 --- a/spec/features/consumer/home_spec.rb +++ b/spec/features/consumer/home_spec.rb @@ -8,6 +8,8 @@ feature 'Home', js: true do let(:d1) { create(:distributor_enterprise) } let(:d2) { create(:distributor_enterprise) } let!(:order_cycle) { create(:order_cycle, distributors: [distributor], coordinator: create(:distributor_enterprise)) } + let!(:producer) { create(:supplier_enterprise) } + let!(:er) { create(:enterprise_relationship, parent: distributor, child: producer) } before do visit "/" @@ -30,4 +32,11 @@ feature 'Home', js: true do follow_active_table_node distributor.name current_path.should == "/shop" end + + it "should show hub producer modals" do + expand_active_table_node distributor.name + page.should have_content producer.name + open_enterprise_modal producer + modal_should_be_open_for producer + end end diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb index e219e970a2..e75f7f6f21 100644 --- a/spec/features/consumer/shopping/shopping_spec.rb +++ b/spec/features/consumer/shopping/shopping_spec.rb @@ -196,7 +196,7 @@ feature "As a consumer I want to shop with a distributor", js: true do context "when no order cycles are available" do it "tells us orders are closed" do visit shop_path - page.should have_content "Orders are currently closed for this hub" + page.should have_content "Orders are closed" end it "shows the last order cycle" do oc1 = create(:simple_order_cycle, distributors: [distributor], orders_close_at: 10.days.ago) diff --git a/spec/javascripts/unit/darkswarm/services/groups_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/groups_spec.js.coffee new file mode 100644 index 0000000000..abd9c5c617 --- /dev/null +++ b/spec/javascripts/unit/darkswarm/services/groups_spec.js.coffee @@ -0,0 +1,33 @@ +describe "Groups service", -> + Groups = null + Enterprises = null + CurrentHubMock = {} + groups = [{ + id: 1 + name: "Test Group" + enterprises: [ + {id: 1}, + {id: 2} + ] + }] + enterprises = [ + {id: 1, name: "Test 1", groups: [{id: 1}]}, + {id: 2, name: "Test 2", groups: [{id: 1}]} + ] + + beforeEach -> + module 'Darkswarm' + angular.module('Darkswarm').value('groups', groups) + angular.module('Darkswarm').value('enterprises', enterprises) + module ($provide)-> + $provide.value "CurrentHub", CurrentHubMock + null + inject (_Groups_, _Enterprises_)-> + Groups = _Groups_ + Enterprises = _Enterprises_ + + it "dereferences group enterprises", -> + expect(Groups.groups[0].enterprises[0]).toBe enterprises[0] + + it "dereferences enterprise groups", -> + expect(Enterprises.enterprises[0].groups[0]).toBe groups[0] diff --git a/spec/support/request/ui_component_helper.rb b/spec/support/request/ui_component_helper.rb index 269f28cca1..ebf95548d6 100644 --- a/spec/support/request/ui_component_helper.rb +++ b/spec/support/request/ui_component_helper.rb @@ -38,6 +38,16 @@ module UIComponentHelper have_selector ".login-modal" end + def open_enterprise_modal(enterprise) + find("a", text: enterprise.name).click + end + + def modal_should_be_open_for(enterprise) + within ".reveal-modal" do + page.should have_content enterprise.name + end + end + def have_reset_password have_content "An email with instructions on resetting your password has been sent!" end