Matt-Yorkley
265a8ed573
Move messages and products form outside of row and columns to enable full-width
2020-05-12 18:24:10 +02:00
Luis Ramos
3c7970f72f
Add select oc message when there are multiple OCs
2020-05-07 12:18:40 +01:00
Luis Ramos
098ad6f250
Merge partial messages back to home partial where it is only used
2020-05-07 12:17:43 +01:00
Luis Ramos
319657d2c5
Move closed shop partial to /messages
2020-05-07 12:17:43 +01:00
Luis Ramos
84c00fe215
Remove duplicate conditionals already present in ShopHelper#shop_tabs, when these partials are rendered, these conditions will always be true
...
In the shops partial, by adding the else, we avoid rendering empty space with an empty
products list in case the shop is closed
2020-05-07 12:17:43 +01:00
Luis Ramos
b34fb79d69
Move content div to messages partial so that it's not used in the closed shop message (no margin according to design)
2020-05-07 12:17:43 +01:00
Luis Ramos
b86081090f
Extract closed shop message to a partial
2020-05-07 12:17:43 +01:00
Luis Ramos
dbdbe01d6a
Add new style to closed shop message
2020-05-07 12:17:43 +01:00
Luis Ramos
5f70ef6e75
Improve style of closed shop message and remove border from message
2020-05-07 12:17:43 +01:00
Luis Ramos
89cb447387
Hide OC selector if shop requires login/customer
2020-05-02 17:56:49 +01:00
Matt-Yorkley
91e88bd028
Allow conditional use of order cycle sidebar
...
We need to re-use the "shopping_shared/header" partial in multiple places, but we don't always want the (nested) order cycle sidebar inside it.
2020-03-25 23:07:39 +01:00
Matt-Yorkley
f5e254a105
Remove quick fix for hiding oc selector
2020-03-25 23:07:39 +01:00
Matt-Yorkley
62a00b17a2
Merge pull request #5026 from Matt-Yorkley/checkout_display
...
Temporarily hide OC selector in checkout page
2020-03-20 18:33:47 +01:00
Matt-Yorkley
e8692fec4c
Temporarily hide OC selector in checkout page
2020-03-20 12:08:58 +01:00
Maikel Linke
1d42ce885b
Stay on shop page when opening login modal
...
The login modal changes the URL to `#/login` which interfers with our
shop pages. In order to show the right shop page, we need to know which
pages are valid and where we have been before we clicked on Login.
2020-03-19 15:38:00 +11:00
Maikel Linke
17751c448f
Rename PageSelectionCtrl for clarity
2020-03-19 15:37:13 +11:00
Maikel Linke
a21ef19529
Render only shop tabs within shop
...
The include directive was listening to all $location paths including
`#login` which is unrelated to the shop tabs. Angular tried to load the
template `shop/login.html` which doesn't exist.
We now whitelist the templates that can be included by having an include
tag for each shop tab/page.
2020-03-19 15:37:13 +11:00
Maikel Linke
ea80ae3832
Enable page navigation via URL fragment
...
The broadcasting of notifications didn't update properly and I couldn't
find a way to listen to $location updates. I replaced the three
intertwined directives with one controller and a bit more HTML code. Now
we have only one scope that listens to $location and all browser actions
like the back button is reflected in the page.
As nice side-effect, the menu links have now the right destination so
that you can copy the link and paste it into another browser window.
40 lines less code.
2020-03-19 15:37:13 +11:00
Maikel Linke
42ca7888c0
Simplify by reducing unused options
2020-03-19 15:36:23 +11:00
Maikel Linke
8aa892136e
Duplicate shop tab code for rewrite
...
The old code is still used on the user page.
2020-03-19 15:36:23 +11:00
Matt-Yorkley
a89d4266d5
Update ordercycleselector to show message in red and remove powertip.
2020-03-17 20:32:18 +01:00
Matt-Yorkley
97d7e27786
Update social icon colours
2020-03-17 20:32:18 +01:00
Matt-Yorkley
efd314e3b1
Restyle contact tab
2020-03-17 20:23:45 +01:00
Matt-Yorkley
bd7549c57f
Update layout for producers and groups tabs
2020-03-17 20:23:45 +01:00
Matt-Yorkley
15360740b1
Add ng-cloak to ordercycle box to improve appearance whilst page loads
2020-03-17 20:23:45 +01:00
Matt-Yorkley
390d80f0eb
Update order cycle selector positioning
2020-03-17 20:23:45 +01:00
Matt-Yorkley
2e616a9e31
Fix conditional display of order cycle selection element
2020-03-17 20:23:45 +01:00
Matt-Yorkley
1927e2883e
Move brackets inside conditionals for rendering last closed / next open message
2020-03-17 20:23:45 +01:00
Matt-Yorkley
de4402457a
Improve layout and positioning on mobile and tablet
2020-03-17 20:23:45 +01:00
Matt-Yorkley
4b0e1610ec
Update order cycle selection box
2020-03-17 20:23:45 +01:00
Matt-Yorkley
444747c8b2
Split shopping_shared/details partial into header and tabs partials and only include tabs in shop page (not cart and checkout).
2020-01-22 11:30:43 +01:00
Matt-Yorkley
94afc70ea7
Refactor conditionals in contact tab view
2020-01-13 17:14:22 +01:00
Matt-Yorkley
d14d6fe865
Refactor open order cycle checks
2020-01-13 17:11:27 +01:00
Matt-Yorkley
0546acd6f9
Refactor #shop_tabs use and remove #first_visible_tab
2020-01-13 17:05:28 +01:00
Matt-Yorkley
aedaec8365
Improve layout of orders closed message
2020-01-13 17:05:28 +01:00
Matt-Yorkley
43eef0c8c6
Adjust layout for fullwidth enterprise image
2020-01-13 17:05:28 +01:00
Matt-Yorkley
e7d88f0df9
Move "orders closed" message to "shop" tab and adjust "home" tab message display logic
2020-01-13 17:05:28 +01:00
Matt-Yorkley
56223bb960
Improve about tab mobile and tablet display
2020-01-13 17:05:28 +01:00
Matt-Yorkley
17cf099f99
Always keep one shop tab open (don't toggle closed)
2020-01-13 17:05:28 +01:00
Matt-Yorkley
49aacf879f
Change row nesting to fix product list layout display issues
2020-01-13 17:05:28 +01:00
Matt-Yorkley
219f6ad78e
Select first visible tab on page load if none are specified in the URL
2020-01-13 17:05:27 +01:00
Matt-Yorkley
48f329a716
Rework layout and CSS
2020-01-13 17:05:26 +01:00
Matt-Yorkley
14bcba081d
Adapt shopfront_helper to show/hide panels and display new tabs
2020-01-08 14:50:27 +01:00
Matt-Yorkley
fa0b365b28
Move "shop messages" and product list from main view into new "Home" and "Shop" tabs
2020-01-08 13:26:21 +01:00
Matt-Yorkley
673c587c3b
Move tab templates to their own directory for clarity
2020-01-08 13:26:21 +01:00
luisramos0
ca5a5bf301
Convert oc.rabl to oc serializer and use it in both haml file and controller
2019-07-29 18:13:29 +01:00
Matt-Yorkley
6219b3f0c3
Revert "Revert "Fix JS render-blocking in Darkswarm""
...
This reverts commit ffeca41e
2019-07-10 17:14:08 +01:00
Maikel
ffeca41ef4
Revert "Fix JS render-blocking in Darkswarm"
2019-07-10 10:24:25 +10:00
Matt-Yorkley
fbb97c3db8
Fix JS render-blocking in Darkswarm
2019-07-02 13:43:20 +01:00
Matt-Yorkley
785595a951
Reduce initial queries on shop page by ~95%
2019-06-12 09:47:01 +01:00
