Commit Graph

88 Commits

Author SHA1 Message Date
Maikel Linke
cd7721a127 Using date and time of current timezone
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
2015-12-10 11:38:41 +11:00
Maikel Linke
6c1619ba60 i18n more content 2015-10-22 11:03:35 +11: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
bd83dde89d Content manage group signup page 2015-07-17 16:06:49 +10:00
Rohan Mitchell
918889a572 Make subject more friendly for groups enquiry email 2015-06-26 15:54:26 +10:00
Rohan Mitchell
ce46cb0956 Add subject to group enquiries 2015-06-26 15:54:25 +10:00
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
22230294ab Merge branch 'master' into optimise-shopfront 2015-06-03 10:07:42 +10:00
Rohan Mitchell
6f513fee77 Merge branch 'master' into redesign 2015-05-29 15:20:21 +10:00
Rohan Mitchell
c75e14b383 Small edits 2015-05-29 09:55:40 +10:00
Rohan Mitchell
32b140ac88 Revert "Update group signup header copy"
This reverts commit 0a8bfdb872.
2015-05-29 09:54:09 +10:00
Rohan Mitchell
1cf62e01e9 Edit case study text 2015-05-28 14:27:36 +10:00
Rohan Mitchell
0a8bfdb872 Update group signup header copy 2015-05-28 14:08:58 +10:00
Rohan Mitchell
92d67327dd Add groups case studies 2015-05-28 14:07:17 +10:00
Maikel Linke
ff2eed7760 Using permalink in URLs pointing to groups 2015-05-28 11:27:40 +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
Rohan Mitchell
76e41e6c1e Basic consistency styling for groups signup page [skip ci] 2015-05-13 12:51:34 +10:00
Rohan Mitchell
eac22df200 Merge branch 'master' into redesign
Conflicts:
	app/assets/javascripts/templates/product_modal.html.haml
2015-05-13 09:53:20 +10:00
summerscope
924efec49c Add animation class to make consistent with Hubs and Producers.
Remove class .animate-repeat
2015-05-04 22:59:48 +10:00
summerscope
9082da6d5e Remove animation from search field, add to group nodes 2015-05-04 22:57:07 +10:00
summerscope
2736421460 First cut at Groups landing page for sign up. 2015-05-04 22:42:14 +10:00
summerscope
938358007a > More styling for landing pages for signup
> Add signup page for groups / food systems partners
> Change link in footer
2015-05-04 13:44:35 +10:00
Rick Giner
8fb11defdb bind-once in groups home page 2015-05-03 14:41:34 +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
Maikel Linke
69fd3f0b60 Fix link to group pages if someone enters "/groups/" instead of "/group" 2015-02-26 16:41:51 +11:00
summerscope
122cf6c065 Groups index page styling for responsive use cases. 2015-02-25 10:22:33 +11:00
summerscope
9daf7e3955 Removing spans on follow icons as these show up as blank spaces when no data to fill. 2015-02-25 09:38:07 +11:00
Maikel Linke
eade689070 linkToService directive to generate external links 2015-02-22 16:15:04 +11:00
summerscope
e05d64a0b4 WIP on groups index page. Needs work from Maikel or Rohan. 2015-02-20 16:43:36 +11: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
summerscope
60b7a571c5 Tweak styling and markup for contact info in right column. 2015-02-20 15:35:07 +11:00
Maikel Linke
d5c2abdd7e stripping "undefined" in after_find and after_save callbacks instead of overriding getters 2015-02-19 16:33:43 +11:00
Maikel Linke
08afcac1e5 exposing more group attributes to angular 2015-02-18 14:55:42 +11:00
Maikel Linke
6b5a1255f8 fixing a bunch of tests 2015-02-12 16:36:18 +11:00
Maikel Linke
773a5480e9 Activate search input for groups again 2015-02-12 10:44:20 +11:00
Maikel Linke
211e9c33a7 Fixing link to group website 2015-02-07 19:31:16 +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
78877f591b Fix template so website links work to push to external pages 2015-02-06 13:58:04 +11:00
summerscope
755adf4287 Index page stop-gap improvements until we get more variables to display in this list. Commented out search field not working 2015-02-06 13:41:58 +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
504a053693 link_to_ext helper for group pages 2015-02-05 17:21:41 +11:00
summerscope
148333467f Groups styling and markup - finishing up contact info partial etc 2015-02-05 17:14:56 +11:00