Rohan Mitchell
02d68c662b
Add titles to all darkswarm pages
2015-06-16 15:31:35 +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
704955a185
Load active distributors where they're needed rather than in most controllers
2015-05-27 15:44:01 +10:00
summerscope
1090328a3c
Adding padding class and apply to templates to have required padding for new footer.
2015-05-02 20:12:33 +10:00
Maikel Linke
548e3576b9
textAngular editor for group description
2015-04-15 17:13:10 +10:00
Maikel Linke
201bcb133a
show profiles checkbox on groups hubs page
2015-04-15 16:15:21 +10:00
Maikel Linke
2fd25f6cc4
Injecting all enterprises into group page
...
The enterprises have related producers and hubs that need to be
dereferenced. Therefore, we need a bigger set of enterprises to be
loaded. Injecting all enterprises is simple and doesn't require changes
if the set of needed enterprise data is growing in future.
2015-04-10 17:42:54 +10:00
Maikel Linke
1e168afd71
giving the enterprise serializer the active_distributors
2015-04-10 12:55:20 +10:00
summerscope
985887334f
Tweak the padding between header and tabs.
2015-02-20 16:43:03 +11:00
summerscope
3aa06ee1e4
Tabs styling for groups page - making it pretty.
2015-02-20 16:14:50 +11:00
Maikel Linke
6b5a1255f8
fixing a bunch of tests
2015-02-12 16:36:18 +11:00
Maikel Linke
2293623d2c
Display default group logo if no logo was uploaded
2015-02-07 19:24:36 +11:00
summerscope
90ba1d2198
Updating the groups header to behave better with a square thumbnail logo image.
...
Intention is for a square image constrained by PaperClip as per enterprise logos (later down the track)
2015-02-06 17:15:40 +11:00
summerscope
9547f91f46
Groups page rejig the layout to make contact column skinnier in most use cases. Obscure email and website with CTA words for fixed width on content. Styling for anchor fix global issue
2015-02-06 13:31:33 +11:00
Maikel Linke
30601b9203
tidy up group contact with helpers
2015-02-05 20:20:28 +11:00
Maikel Linke
b641de6ec9
Merge branch 'group-pages' of github.com:openfoodfoundation/openfoodnetwork into group-pages
...
Conflicts:
app/views/groups/show.html.haml
2015-02-05 15:52:00 +11:00
Maikel Linke
313843d798
moving contact partial and giving example code
2015-02-05 15:50:33 +11:00
summerscope
f2e3d298fa
More styling for responsive sizes groups header
2015-02-05 15:17:50 +11:00
summerscope
e19aaf6be8
Styling tabs for responsive design, improving groups page layout
2015-02-05 14:53:09 +11:00
summerscope
28b2dd40dd
Kill the pad top for Producers tab content too
2015-02-05 12:31:38 +11:00
summerscope
c9bbe80738
Remove padding class to producers tab content
2015-02-05 12:28:24 +11:00
Maikel Linke
0f7b880409
restoring groups hubs tab
2015-02-05 12:23:08 +11:00
summerscope
b1b1aa5b1e
Groups page WIP with mikael and rob
2015-02-05 12:07:11 +11:00
summerscope
5ea3733c8a
Groups page styling WIP
2015-01-30 14:07:38 +11:00
summerscope
d99a54accf
WIP groups individual page template markup - still needs alot of love.
2015-01-29 17:43:36 +11:00
summerscope
8e42f29bde
WIP groups page styling and markup updates
2015-01-29 15:52:20 +11:00
Maikel Linke
0d9a0919e5
show contact a group's contact footer
2015-01-21 16:39:41 +11:00
Maikel Linke
c1aa2f9b33
Display contact information in the front end
2015-01-21 16:12:28 +11:00
Maikel Linke
02a276b9c9
Producer and hub lists with search
...
Fixing map display as well.
2015-01-14 15:18:46 +11:00
Maikel Linke
3b9657eb17
show map of a group's enterprises
2015-01-07 12:00:55 +11:00
Maikel Linke
9310bc902a
first draft of group page, a lot of TODOs
2015-01-06 22:39:15 +11:00
