From f1c4ee67440cf18a1e12850f05067001e121d810 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 19 Jun 2014 12:49:28 +1000
Subject: [PATCH] Fixing up hub modal

---
 .../templates/map_modal_hub.html.haml         | 73 ++++++++-----------
 .../templates/map_modal_producer.html.haml    |  2 +-
 db/schema.rb                                  |  2 +-
 3 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/app/assets/javascripts/templates/map_modal_hub.html.haml b/app/assets/javascripts/templates/map_modal_hub.html.haml
index 546f83d9b2..80089a4f8e 100644
--- a/app/assets/javascripts/templates/map_modal_hub.html.haml
+++ b/app/assets/javascripts/templates/map_modal_hub.html.haml
@@ -1,49 +1,34 @@
-.row
-  .small-12.columns.producer-hero
-    %h3.producer-name 
-      %i.ofn-i_040-hub
+.highlight
+  .highlight-row 
+    %p.right
+      {{ enterprise.address.city }} , {{enterprise.address.state}}
+    %h3
+      %i.ofn-i_036-producers
       {{ enterprise.name }}
-      {{ enterprise.id }}
-    %img.producer-hero-img{"ng-src" => "{{enterprise.promo_image}}"} 
     
-.row  
+  %img.producer-hero-img{"ng-src" => "{{enterprise.promo_image}}"} 
+    
+.row.pad-top{bindonce: true} 
   .small-12.large-6.columns
+    %img.producer-logo{"bo-src" => "enterprise.logo", "bo-if" => "enterprise.logo"} 
+    %h5.modal-header About
     %p{"ng-bind-html" => "enterprise.long_description"}
-  .small-12.large-6.columns
-    %img.producer-logo{"ng-src" => "{{enterprise.logo}}", "ng-if" => "enterprise.logo"} 
-    %h5 Stay in touch with {{ enterprise.name }}
-    
-    %ul.small-block-grid-1{bindonce: true}
-      
-      %li{"ng-if" => "enterprise.website"}
-        %a{"ng-href" => "http://{{enterprise.website | stripUrl}}", target: "_blank" }
-          %i.ofn-i_049-web
-          {{ enterprise.website | stripUrl }}
-      
-      %li{"ng-if" => "enterprise.email"}
-        %a{"ng-href" => "mailto:{{enterprise.email | stripUrl}}", target: "_blank" }
-          %i.ofn-i_050-mail-circle
-          {{ enterprise.email | stripUrl }}
-      
-      %li{"ng-if" => "enterprise.twitter"} 
-        %a{"ng-href" => "http://twitter.com/{{enterprise.twitter}}", target: "_blank"}
-          %i.ofn-i_041-twitter
-          {{ enterprise.twitter }}
-      
-      %li{"ng-if" => "enterprise.facebook"}
-        %a{"ng-href" => "http://{{enterprise.facebook | stripUrl}}", target: "_blank"}
-          %i.ofn-i_044-facebook
-          {{ enterprise.facebook | stripUrl }}
-      
-      %li{"ng-if" => "enterprise.linkedin"}
-        %a{"ng-href" => "http://{{enterprise.linkedin | stripUrl}}", target: "_blank"}
-          %i.ofn-i_042-linkedin
-          {{ enterprise.linkedin | stripUrl }}
-      
-      %li{"ng-if" => "enterprise.instagram"}
-        %a{"ng-href" => "http://instagram.com/{{enterprise.instagram}}", target: "_blank"}  
-          %i.ofn-i_043-instagram
-          {{ enterprise.instagram }}
 
-  %a.close-reveal-modal.outside{"ng-click" => "$close()"}
-    %i.ofn-i_009-close
+  .small-12.large-6.columns
+    %ng-include{src: "'partials/contact.html'"}
+    %ng-include{src: "'partials/follow.html'"}
+
+.row{bindonce: true}
+  .modal-hubs
+    %h5 Shop at:
+    %a.button.hub{"bo-href" => "enterprise.path", 
+    "bo-class" => "{primary: enterprise.active, grey: !enterprise.active}",
+    "ofn-empties-cart" => "enterprise"}
+      %i.ofn-i_033-open-sign{"bo-if" => "enterprise.active"}
+      %i.ofn-i_032-closed-sign{"bo-if" => "!enterprise.active"}
+      {{enterprise.name}}
+      ( {{ enterprise.address.city }} , {{enterprise.address.state}} )
+
+%a.close-reveal-modal.outside{"ng-click" => "$close()"}
+  %i.ofn-i_009-close
+
diff --git a/app/assets/javascripts/templates/map_modal_producer.html.haml b/app/assets/javascripts/templates/map_modal_producer.html.haml
index 1cbe0345f1..72f68a379d 100644
--- a/app/assets/javascripts/templates/map_modal_producer.html.haml
+++ b/app/assets/javascripts/templates/map_modal_producer.html.haml
@@ -23,7 +23,7 @@
     %h5 Shop for {{enterprise.name}} products at:
     %a.button.primary.hub{"ng-repeat" => "hub in enterprise.hubs", 
     "bo-href" => "hub.path", 
-    "bo-class" => "{active: hub.active, inactive: !hub.active}",
+    "bo-class" => "{primary: hub.active, grey: !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"}
diff --git a/db/schema.rb b/db/schema.rb
index de2bf56368..a40a1414e1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140604051248) do
+ActiveRecord::Schema.define(:version => 20140612020206) do
 
   create_table "adjustment_metadata", :force => true do |t|
     t.integer "adjustment_id"