Merge branch 'new_shop'

app/assets/javascripts/shared/mm-foundation-tpls-0.2.0-SNAPSHOT.js

@@ -2477,7 +2477,7 @@ angular.module("template/modal/window.html", []).run(["$templateCache", function
   $templateCache.put("template/modal/window.html",
     "<div tabindex=\"-1\" class=\"reveal-modal fade {{ windowClass }}\"\n" +
     "  ng-class=\"{in: animate}\" ng-click=\"close($event)\"\n" +
-    "  style=\"display: block; position: fixed; visibility: visible\">\n" +
+    "  style=\"display: block; visibility: visible\">\n" +
     "  <div ng-transclude></div>\n" +
     "</div>\n" +
     "");

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

@@ -26,7 +26,7 @@ a
     text-decoration: none
     color: $clr-brick-bright
 
-small
+small, .small
   font-size: 0.75rem
 
 @mixin avenir
@@ -56,6 +56,9 @@ ul.ofn-list
 .pad-top
   padding-top: 1em
 
+.not-bold
+  font-weight: normal
+
 strong.avenir
   font-weight: normal // Avenir is basically bold anyway
 

app/views/admin/enterprises/_form.html.haml

@@ -116,12 +116,21 @@
           = f.label :website
         .omega.eight.columns
           = f.text_field :website, { placeholder: "eg. www.truffles.com"}
-      -# TODO: Facebook model field
-      -#.row
-      -#  .alpha.two.columns
-      -#    = f.label :facebook, 'Facebook'
-      -#  .omega.four.columns
-      -#    = f.text_field :facebook
+      .row
+        .alpha.two.columns
+          = f.label :facebook, 'Facebook'
+        .omega.four.columns
+          = f.text_field :facebook
+      .row
+        .alpha.two.columns
+          = f.label :instagram, 'Instagram'
+        .omega.four.columns
+          = f.text_field :instagram
+      .row
+        .alpha.two.columns
+          = f.label :linkedin, 'LinkedIn'
+        .omega.four.columns
+          = f.text_field :linkedin
       .row
         .alpha.three.columns
           = f.label :twitter

app/views/shop/products.rabl

@@ -22,7 +22,8 @@ child :master => :master do
   child :images => :images do
     attributes :id, :alt
     node do |img|
-      {:small_url => img.attachment.url(:small, false)}
+      {:small_url => img.attachment.url(:small, false),
+      :large_url => img.attachment.url(:large, false)}
     end
   end
 end

app/views/spree/orders/_form.html.haml

@@ -36,10 +36,9 @@
           = t(:update)
       %td
         %h5.order-total.grand-total= @order.display_total
-      %td#empty-cart
-        / This needs help from Will - would like a link not button
+      %td#empty-cart.text-center
         %span#clear_cart_link{"data-hook" => ""}
-          = link_to "Empty cart", empty_cart_path, method: :put
+          = link_to "Empty cart", empty_cart_path, method: :put, :class => 'not-bold small'
           -#= form_tag empty_cart_path, :method => :put do
             -#= submit_tag t(:empty_cart), :class => 'button alert expand small'
 

db/migrate/20140522015012_add_social_media_to_enterprises.rb

@@ -0,0 +1,7 @@
+class AddSocialMediaToEnterprises < ActiveRecord::Migration
+  def change
+    add_column :enterprises, :facebook, :string
+    add_column :enterprises, :instagram, :string
+    add_column :enterprises, :linkedin, :string
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140516045323) do
+ActiveRecord::Schema.define(:version => 20140522015012) do
 
   create_table "adjustment_metadata", :force => true do |t|
     t.integer "adjustment_id"
@@ -250,6 +250,9 @@ ActiveRecord::Schema.define(:version => 20140516045323) do
     t.integer  "promo_image_file_size"
     t.datetime "promo_image_updated_at"
     t.boolean  "visible",                  :default => true
+    t.string   "facebook"
+    t.string   "instagram"
+    t.string   "linkedin"
   end
 
   add_index "enterprises", ["address_id"], :name => "index_enterprises_on_address_id"

spec/features/admin/enterprises_spec.rb

@@ -76,6 +76,8 @@ feature %q{
     fill_in 'enterprise_email', :with => 'info@eaterprises.com.au'
     fill_in 'enterprise_website', :with => 'http://eaterprises.com.au'
     fill_in 'enterprise_twitter', :with => '@eaterprises'
+    fill_in 'enterprise_facebook', :with => 'facebook.com/eaterprises'
+    fill_in 'enterprise_instagram', :with => 'eaterprises'
     fill_in 'enterprise_abn', :with => '09812309823'
     fill_in 'enterprise_acn', :with => ''
 

spec/support/request/authentication_workflow.rb

@@ -33,7 +33,8 @@ module AuthenticationWorkflow
       :login => 'admin@ofn.org')
 
     admin_user.spree_roles << admin_role
-    login_to_admin_as admin_user
+    quick_login_as admin_user
+    visit spree.admin_path
   end
 
   def create_enterprise_user(enterprises = [])
@@ -47,10 +48,12 @@ module AuthenticationWorkflow
   end
 
   def login_to_admin_as user
+    quick_login_as user
     visit spree.admin_path
-    fill_in 'spree_user_email', :with => user.email
-    fill_in 'spree_user_password', :with => user.password
-    click_button 'Login'
+    #visit spree.admin_path
+    #fill_in 'spree_user_email', :with => user.email
+    #fill_in 'spree_user_password', :with => user.password
+    #click_button 'Login'
   end
 
   def login_to_consumer_section