Merge branch 'ginerr_bugfixes' into combined/ginerr_bugfixes_fix-duplicate-fees

app/assets/javascripts/darkswarm/services/map_configuration.js.coffee

@@ -7,5 +7,5 @@ Darkswarm.factory "MapConfiguration", ->
       zoom: 12
       additional_options: {}
         #mapTypeId: 'satellite' 
-      styles: [{"featureType":"landscape","stylers":[{"saturation":-100},{"lightness":65},{"visibility":"on"}]},{"featureType":"poi","stylers":[{"saturation":-100},{"lightness":51},{"visibility":"simplified"}]},{"featureType":"road.highway","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"road.arterial","stylers":[{"saturation":-100},{"lightness":30},{"visibility":"on"}]},{"featureType":"road.local","stylers":[{"saturation":-100},{"lightness":40},{"visibility":"on"}]},{"featureType":"transit","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"administrative.province","stylers":[{"visibility":"off"}]},{"featureType":"water","elementType":"labels","stylers":[{"visibility":"on"},{"lightness":-25},{"saturation":-100}]},{"featureType":"water","elementType":"geometry","stylers":[{"hue":"#ffff00"},{"lightness":-25},{"saturation":-97}]}]
+      styles: [{"featureType":"landscape","stylers":[{"saturation":-100},{"lightness":65},{"visibility":"on"}]},{"featureType":"poi","stylers":[{"saturation":-100},{"lightness":51},{"visibility":"simplified"}]},{"featureType":"road.highway","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"road.arterial","stylers":[{"saturation":-100},{"lightness":30},{"visibility":"on"}]},{"featureType":"road.local","stylers":[{"saturation":-100},{"lightness":40},{"visibility":"on"}]},{"featureType":"transit","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"administrative.province","stylers":[{"visibility":"off"}]},{"featureType":"water","elementType":"labels","stylers":[{"visibility":"on"},{"lightness":-25},{"saturation":-100}]},{"featureType":"water","elementType":"geometry","stylers":[{"hue":"#ffff00"},{"lightness":-25},{"saturation":-97}]},{"featureType":"road","elementType": "labels.icon","stylers":[{"visibility":"off"}]}]
 

app/assets/stylesheets/darkswarm/hub_node.css.sass

@@ -30,9 +30,18 @@
         float: right
         margin-left: 0.5rem
 
+    //Hub Link
+    @media all and (max-width: 640px) 
+      a.hub
+        display: block
+
     //Hub Name
     span.hub-name-listing
       font-weight: 700
+      &:after
+        content: ">>"
+        display: inline-block
+        margin-left: 5px
 
     //CLOSED row
     &.closed

app/views/home/_skinny.html.haml

@@ -1,7 +1,7 @@
 .row.active_table_row{"ng-if" => "hub.is_distributor", "ng-click" => "toggle($event)", "ng-class" => "{'closed' : !open(), 'is_distributor' : producer.is_distributor}", bindonce: true}
 
-  .columns.small-12.medium-6.large-5.skinny-head
-    %a.hub{"bo-href" => "hub.path", "ng-class" => "{primary: hub.active, secondary: !hub.active}", "ofn-empties-cart" => "hub"}
+  .columns.small-12.medium-5.large-5.skinny-head
+    %a.hub{"bo-href" => "hub.path", "ng-class" => "{primary: hub.active, secondary: !hub.active}", "ofn-empties-cart" => "hub", "data-is-link" => "true"}
       %i{bo: {class: "hub.icon_font"}}
       %span.margin-top.hub-name-listing{"bo-bind" => "hub.name | truncate:40"}
 
@@ -10,7 +10,7 @@
   .columns.small-2.medium-1.large-1
     %span.margin-top{"bo-bind" => "hub.address.state_name | uppercase"}
 
-  .columns.small-6.medium-3.large-4.text-right{"bo-if" => "hub.active"}
+  .columns.small-4.medium-3.large-3.text-right{"bo-if" => "hub.active"}
     %a.hub.open_closed{"bo-href" => "hub.path", "ng-class" => "{primary: hub.active, secondary: !hub.active}", "ofn-empties-cart" => "hub"}
       %i.ofn-i_033-open-sign
       %span.margin-top{ bo: { if: "current()" } }
@@ -18,13 +18,17 @@
       %span.margin-top{ bo: { if: "!current()" } }
         %span{"bo-bind" => "hub.orders_close_at | sensible_timeframe"}
 
-  .columns.small-6.medium-3.large-4.text-right{"bo-if" => "!hub.active"}
+  .columns.small-4.medium-3.large-3.text-right{"bo-if" => "!hub.active"}
     %a.hub.open_closed{"bo-href" => "hub.path", "ng-class" => "{primary: hub.active, secondary: !hub.active}", "ofn-empties-cart" => "hub"}
       %i.ofn-i_032-closed-sign
       %span.margin-top{ bo: { if: "current()" } }
         %em Shopping here
       %span.margin-top{ bo: { if: "!current()" } } Orders closed
 
+  .columns.small-2.medium-1.large-1.text-right
+    %span.margin-top 
+      %i{"ng-class" => "{'ofn-i_005-caret-down' : !open(), 'ofn-i_006-caret-up' : open()}"}
+
 .row.active_table_row{"ng-if" => "!hub.is_distributor", "ng-class" => "closed"}
   .columns.small-12.medium-6.large-5.skinny-head
     %a.hub{"ng-click" => "openModal(hub)", "ng-class" => "{primary: hub.active, secondary: !hub.active}"}
@@ -39,3 +43,4 @@
   .columns.small-6.medium-3.large-4.text-right
     %span.margin-top{ bo: { if: "!current()" } }
       %em Profile only
+

spec/factories.rb

@@ -212,7 +212,7 @@ FactoryGirl.define do
   factory :customer, :class => Customer do
     email { Faker::Internet.email }
     enterprise
-    code { Faker::Lorem.word }
+    code { SecureRandom.base64(150) }
     user
   end
 end