Maikel Linke
97bcbb81b9
Change text of register call in the dropdown
...
Unified code for the dropdown and the footer.
Both contain the register call and are both pointing to the register
path now. The footer still pointed to the global site before.
2016-04-01 14:39:43 +11:00
Maikel Linke
229070a76b
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n
2015-11-13 15:20:58 +11:00
Rohan Mitchell
bb6fb2f5e8
Merge branch 'sell-food-link' into combined/add-to-cart-speed_and_sell-food-link
2015-11-13 14:03:32 +11:00
Rohan Mitchell
6de44877c8
Update link for uber-style sell food dropdown
2015-11-13 14:03:14 +11:00
Rohan Mitchell
888e4d80ef
Add reliable way to check if cart is dirty. Previous way returned true when cart empty.
2015-11-13 14:03:07 +11:00
Maikel Linke
0b4a43d77a
Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views
...
Conflicts:
app/views/shared/menu/_cart.html.haml
app/views/spree/order_mailer/confirm_email_for_shop.html.haml
2015-09-16 16:32:16 +10:00
Maikel Linke
e25805aa78
Restoring all changes of the last combined branch
...
This reverts commit 1e55e8a907
2015-09-10 15:03:13 +10:00
Maikel Linke
1e55e8a907
Reverting all changes of the last combined branch
...
The production server hangs on certain requests. To rule out a code bug,
we revert to the last deployed version.
2015-09-10 12:50:40 +10:00
Maikel Linke
2e3ff8f5c6
doubling cart buttons
2015-09-03 15:52:54 +10:00
Maikel Linke
85c99102dd
i18n: Replacing all language strings in app/view/
...
Languages strings were moved to config/locale/en.yml. All views contain
according calls to t() now.
2015-08-28 16:59:23 +10:00
Rohan Mitchell
74f90dada3
Allow overriding mobile logo (raster and SVG) and home hero image
2015-07-17 16:06:50 +10:00
Rohan Mitchell
1d67e3b2b8
Fix image update, display logo on frontend
2015-07-17 16:06:50 +10:00
Rohan Mitchell
4887871474
Remove SVG TODOs - we'll ask admins to upload double-sized images for retina instead
2015-07-17 16:06:49 +10:00
Rohan Mitchell
eef302635b
Fix alert overflow on mobile
2015-06-26 15:54:26 +10:00
Rohan Mitchell
c97ed026d0
Make room in menu for shopping@ text
2015-06-26 15:54:25 +10:00
Rohan Mitchell
4da367a94b
Put OFN logo in top bar of mobile site
2015-06-26 15:54:25 +10:00
Rohan Mitchell
846f4bb4b1
Tweak menu responsiveness: Fix items covering country name, fix ul.right dropping down to next line
2015-06-16 13:02:43 +10:00
Rohan Mitchell
662330b222
Alert appears at top of page. It slides in on page load and slides out on close.
2015-06-11 12:10:50 +10:00
Rohan Mitchell
f4e0baa56a
Basic click-to-close for sell-food alert
2015-06-10 19:03:40 +10:00
Rohan Mitchell
610a4c03fe
Merge branch 'master' into redesign
...
Conflicts:
app/controllers/home_controller.rb
app/views/producers/index.html.haml
app/views/shared/menu/_mobile_menu.html.haml
app/views/shop/products/_form.html.haml
config/routes.rb
spec/controllers/shops_controller_spec.rb
2015-06-10 18:27:50 +10:00
Rohan Mitchell
50ae331d94
ng-cloak mobile menu
2015-05-29 16:03:16 +10:00
Rohan Mitchell
7da403808c
Style mobile menu [skip ci]
2015-05-13 16:56:49 +10:00
Rohan Mitchell
b2d8d9fdfd
Make nav menu centered, logo a little larger
2015-05-11 17:32:02 +10:00
Rohan Mitchell
14afe932c1
Resize menu logo, make it always fully opaque
2015-05-11 14:39:53 +10:00
Rohan Mitchell
8cb8aacefe
Switch logo for white menu
2015-05-08 16:07:59 +10:00
Rohan Mitchell
bf435a8f3d
Make home page what's happening text and about URL configurable
2015-05-06 15:17:28 +10:00
summerscope
e7d09f1b55
Change copy as supplied by Jay
2015-05-05 15:32:04 +10:00
summerscope
af4fe27f31
Adding comments for CMS implementation stuff with Rohan
2015-05-05 14:53:25 +10:00
summerscope
4da6bef639
Removing unused assets. Adding some todo notes. Optimising PNG assets to reduce file size.
2015-05-05 13:35:51 +10:00
summerscope
53e2bc823d
WIP styling and content for homepage
...
> footer
> alert @ top
> call to action buttons
2015-05-01 18:19:51 +10:00
summerscope
427f535026
Redesign big chunk of work:
...
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
2015-04-30 18:20:17 +10:00
Rob Harrington
f13b52411d
Merge branch master into properties
2015-04-17 13:23:33 +10:00
Rohan Mitchell
efbf2c7ffa
Display extended variant name in quick cart
2015-03-13 12:58:53 +11:00
summerscope
75b0b290ae
More WIP trying to work on the cart template logic with Rohan
2015-03-10 14:12:43 +11:00
summerscope
c7cf9695bc
WIP on cart menu trying to add the master name back in where a product has variante
2015-03-10 11:35:35 +11:00
Rob Harrington
0a300d1802
Rewriting small cart, so that it doesn't break all of the dropdowns on the page (can't use .row within li elements it seems...)
2015-03-06 19:03:46 +11:00
Rob Harrington
1d80bee595
Cart item total reflects total number of items in the cart
2015-01-16 16:06:51 +11:00
Rob Harrington
2c307f09c3
Changing edit cart button to link
2015-01-16 15:47:56 +11:00
summerscope
3bd77c74a5
Improve logic on shopping cart button to add meaningful labels for various states
2015-01-16 14:57:09 +11:00
summerscope
51687b5c2c
Tweak language and styling for the CTA buttons taking users to shopping cart and checkout pages
2015-01-16 13:27:16 +11:00
Rob Harrington
b3e67fa164
Take two on disabled logic
2015-01-15 17:34:04 +11:00
Rohan Mitchell
b0f5d0170c
Spec that overridden price with fees appears in quick cart
2014-12-18 13:32:28 +11:00
summerscope
799c894bd3
Tweak logo embedding to use new version, and use srcset with src as a fallback
2014-10-30 17:03:08 +11:00
Rafael Schouten
01c98bf6e4
refactor and bugfix for tests
2014-09-17 01:07:34 +10:00
Rafael Schouten
0fa4540cec
Merge branch 'master' into currency
2014-09-11 12:09:18 +10:00
Rafael Schouten
44e9cf5ade
add currency spec file and update some class names
2014-09-10 18:22:33 +10:00
Rohan Mitchell
b49eb8fe03
Hide angular templates on page load
2014-09-10 11:50:30 +10:00
Rafael Schouten
991d0029dd
add currency localisation
2014-09-08 00:06:53 +10:00
summerscope
7d7bf7b1f2
Tweak layout for cart to make it more robust for content and allow for longer product labels
2014-08-07 12:07:35 +10:00
summerscope
1ca9c60c84
Tweak label to make a distinction between go straight to checkout and just go to shopping cart review
2014-08-06 13:18:58 +10:00
