diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
index c08bff367c..552e45fd48 100644
--- a/app/views/groups/index.html.haml
+++ b/app/views/groups/index.html.haml
@@ -12,8 +12,14 @@
"ng-debounce" => "150",
"ofn-disable-enter" => true}
- .row{bindonce: true}
+ .row.group_table{bindonce: true}
.small.12.columns
- .group_table
- .group{"ng-repeat" => "group in Groups.groups | filter:query | orderBy:order"}
- {{ group.name }}
+ .group{"ng-repeat" => "group in Groups.groups | filter:query | orderBy:order"}
+ %h2 {{ group.name }}
+ %p {{ group.description }}
+ %p {{ group.long_description }}
+ %img{"bo-src" => "group.logo"}
+
+ %ul
+ %li{"ng-repeat" => "enterprise in group.enterprises"}
+ %a{"bo-href" => "enterprise.path"} {{ enterprise.name }}
diff --git a/app/views/json/_enterprises.rabl b/app/views/json/_enterprises.rabl
index 97e040eca9..2f2f82c944 100644
--- a/app/views/json/_enterprises.rabl
+++ b/app/views/json/_enterprises.rabl
@@ -4,3 +4,11 @@ attributes :name, :id, :description
child :address do
extends "json/partials/address"
end
+
+node :path do |enterprise|
+ shop_enterprise_path(enterprise)
+end
+
+node :hash do |enterprise|
+ enterprise.to_param
+end
diff --git a/app/views/json/_groups.rabl b/app/views/json/_groups.rabl
index 3029006c76..9475b425c4 100644
--- a/app/views/json/_groups.rabl
+++ b/app/views/json/_groups.rabl
@@ -1,2 +1,10 @@
collection @groups
-attributes :id, :name, :position
+attributes :id, :name, :position, :description, :long_description
+
+child enterprises: :enterprises do
+ extends 'json/enterprises'
+end
+
+node :logo do |group|
+ group.logo(:original)
+end
diff --git a/app/views/json/_hubs.rabl b/app/views/json/_hubs.rabl
index ca57a73aea..dc589b878b 100644
--- a/app/views/json/_hubs.rabl
+++ b/app/views/json/_hubs.rabl
@@ -21,14 +21,6 @@ node :delivery do |hub|
not hub.shipping_methods.where(:require_ship_address => true).empty?
end
-node :path do |hub|
- shop_enterprise_path(hub)
-end
-
-node :hash do |hub|
- hub.to_param
-end
-
node :active do |hub|
@active_distributors.include?(hub)
end
diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml
index 328d46ca85..a5c6180150 100644
--- a/app/views/shared/menu/_large_menu.html.haml
+++ b/app/views/shared/menu/_large_menu.html.haml
@@ -21,7 +21,7 @@
%span.nav-primary Producers
%li.divider
%li
- %a{href: ""}
+ %a{href: groups_path}
%span.nav-primary Groups
%li.divider
- if spree_current_user.andand.has_spree_role? 'admin'
diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml
index a33cb85c11..43096c34b6 100644
--- a/app/views/shared/menu/_mobile_menu.html.haml
+++ b/app/views/shared/menu/_mobile_menu.html.haml
@@ -36,17 +36,14 @@
%li
%a{href: root_path + "#/#hubs"}
%span.nav-primary Hubs
-
%li
%a{href: ""}
%span.nav-primary Map
-
%li
%a{href: main_app.producers_path}
%span.nav-primary Producers
-
%li
- %a{href: ""}
+ %a{href: groups_path}
%span.nav-primary Groups