Procházet zdrojové kódy

commited features for showroom release

Bachir Soussi Chiadmi před 7 roky
rodič
revize
138b68ac98
36 změnil soubory, kde provedl 2670 přidání a 945 odebrání
  1. 141 0
      sites/all/modules/features/materio_administration/materio_administration.features.inc
  2. 125 188
      sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc
  3. 280 0
      sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
  4. 26 0
      sites/all/modules/features/materio_administration/materio_administration.features.user_role.inc
  5. 366 0
      sites/all/modules/features/materio_administration/materio_administration.features.workflow_access.inc
  6. 50 19
      sites/all/modules/features/materio_administration/materio_administration.info
  7. 55 0
      sites/all/modules/features/materio_administration/materio_administration.strongarm.inc
  8. 376 23
      sites/all/modules/features/materio_administration/materio_administration.views_default.inc
  9. 11 40
      sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc
  10. 17 18
      sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc
  11. 681 2
      sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc
  12. 35 4
      sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc
  13. 83 2
      sites/all/modules/features/materio_content_types/materio_content_types.info
  14. 108 34
      sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc
  15. 6 5
      sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc
  16. 1 0
      sites/all/modules/features/materio_home_v2/materio_home_v2.info
  17. 24 22
      sites/all/modules/features/materio_home_v2/materio_home_v2.views_default.inc
  18. 2 2
      sites/all/modules/features/materio_publications/materio_publications.features.field_base.inc
  19. 3 3
      sites/all/modules/features/materio_publications/materio_publications.features.field_instance.inc
  20. 0 141
      sites/all/modules/features/materio_publications/materio_publications.features.inc
  21. 3 15
      sites/all/modules/features/materio_publications/materio_publications.features.user_role.inc
  22. 8 8
      sites/all/modules/features/materio_publications/materio_publications.info
  23. 0 9
      sites/all/modules/features/materio_publications/materio_publications.strongarm.inc
  24. 1 1
      sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.user_role.inc
  25. 10 96
      sites/all/modules/features/showroom/showroom.features.field_base.inc
  26. 70 80
      sites/all/modules/features/showroom/showroom.features.field_instance.inc
  27. 4 3
      sites/all/modules/features/showroom/showroom.features.menu_links.inc
  28. 50 74
      sites/all/modules/features/showroom/showroom.features.user_permission.inc
  29. 4 4
      sites/all/modules/features/showroom/showroom.features.user_role.inc
  30. 1 34
      sites/all/modules/features/showroom/showroom.field_group.inc
  31. 48 23
      sites/all/modules/features/showroom/showroom.info
  32. 51 24
      sites/all/modules/features/showroom/showroom.strongarm.inc
  33. 0 26
      sites/all/modules/features/translations/translations.features.language.inc
  34. 20 0
      sites/all/modules/features/translations/translations.features.user_role.inc
  35. 5 40
      sites/all/modules/features/translations/translations.info
  36. 5 5
      sites/all/modules/features/translations/translations.strongarm.inc

+ 141 - 0
sites/all/modules/features/materio_administration/materio_administration.features.inc

@@ -22,3 +22,144 @@ function materio_administration_ctools_plugin_api($module = NULL, $api = NULL) {
 function materio_administration_views_api($module = NULL, $api = NULL) {
   return array("api" => "3.0");
 }
+
+/**
+ * Implements hook_workflow_default_workflows().
+ */
+function materio_administration_workflow_default_workflows() {
+  $workflows = array();
+
+  // Exported workflow: Publication
+  $workflows['Publication'] = array(
+    'name' => 'Publication',
+    'tab_roles' => '',
+    'options' => 'a:4:{s:16:"comment_log_node";i:0;s:15:"comment_log_tab";i:0;s:13:"name_as_title";i:0;s:12:"watchdog_log";i:1;}',
+    'states' => array(
+      0 => array(
+        'state' => '(creation)',
+        'weight' => -50,
+        'sysid' => 1,
+        'status' => 1,
+        'name' => 'Publication',
+      ),
+      1 => array(
+        'state' => 'Importé',
+        'weight' => 0,
+        'sysid' => 0,
+        'status' => 1,
+        'name' => 'Publication',
+      ),
+      2 => array(
+        'state' => 'Édité',
+        'weight' => 1,
+        'sysid' => 0,
+        'status' => 1,
+        'name' => 'Publication',
+      ),
+      3 => array(
+        'state' => 'Masqué',
+        'weight' => 2,
+        'sysid' => 0,
+        'status' => 1,
+        'name' => 'Publication',
+      ),
+      4 => array(
+        'state' => 'Publié',
+        'weight' => 3,
+        'sysid' => 0,
+        'status' => 1,
+        'name' => 'Publication',
+      ),
+    ),
+    'transitions' => array(
+      0 => array(
+        'roles' => 'workflow_features_author_name,administrator,root',
+        'state' => '(creation)',
+        'target_state' => 'Masqué',
+      ),
+      1 => array(
+        'roles' => 'workflow_features_author_name,administrator,root',
+        'state' => '(creation)',
+        'target_state' => 'Publié',
+      ),
+      2 => array(
+        'roles' => 'root',
+        'state' => '(creation)',
+        'target_state' => 'Importé',
+      ),
+      3 => array(
+        'roles' => 'administrator,root',
+        'state' => 'Importé',
+        'target_state' => 'Édité',
+      ),
+      4 => array(
+        'roles' => 'workflow_features_author_name,administrator,root',
+        'state' => 'Importé',
+        'target_state' => 'Masqué',
+      ),
+      5 => array(
+        'roles' => 'workflow_features_author_name,administrator,root',
+        'state' => 'Importé',
+        'target_state' => 'Publié',
+      ),
+      6 => array(
+        'roles' => 'root',
+        'state' => 'Édité',
+        'target_state' => 'Importé',
+      ),
+      7 => array(
+        'roles' => 'workflow_features_author_name,administrator,root',
+        'state' => 'Édité',
+        'target_state' => 'Masqué',
+      ),
+      8 => array(
+        'roles' => 'workflow_features_author_name,administrator,root',
+        'state' => 'Édité',
+        'target_state' => 'Publié',
+      ),
+      9 => array(
+        'roles' => 'workflow_features_author_name,administrator,root',
+        'state' => 'Masqué',
+        'target_state' => 'Publié',
+      ),
+      10 => array(
+        'roles' => 'root',
+        'state' => 'Masqué',
+        'target_state' => 'Importé',
+      ),
+      11 => array(
+        'roles' => 'workflow_features_author_name,administrator,root',
+        'state' => 'Masqué',
+        'target_state' => 'Édité',
+      ),
+      12 => array(
+        'roles' => 'workflow_features_author_name,administrator,root',
+        'state' => 'Publié',
+        'target_state' => 'Masqué',
+      ),
+      13 => array(
+        'roles' => 'root',
+        'state' => 'Publié',
+        'target_state' => 'Importé',
+      ),
+      14 => array(
+        'roles' => 'workflow_features_author_name,administrator,root',
+        'state' => 'Publié',
+        'target_state' => 'Édité',
+      ),
+    ),
+    'node_types' => array(
+      0 => 'breve',
+      1 => 'company',
+      2 => 'didactique',
+      3 => 'faq',
+      4 => 'looping_embed_video',
+      5 => 'materiau',
+      6 => 'page',
+      7 => 'publication',
+      8 => 'simplenews',
+    ),
+  );
+
+  return $workflows;
+}

+ 125 - 188
sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc

@@ -24,30 +24,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -37,
+    'weight' => -34,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_:print/print.
-  $menu_links['navigation_:print/print'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'print/print',
-    'router_path' => 'print/print',
-    'link_title' => '',
-    'options' => array(
-      'identifier' => 'navigation_:print/print',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => 0,
-    'customized' => 0,
-    'language' => 'und',
-    'menu_links_customized' => 0,
-  );
   // Exported menu link: navigation_add-content:node/add.
   $menu_links['navigation_add-content:node/add'] = array(
     'menu_name' => 'navigation',
@@ -62,7 +43,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 1,
     'expanded' => 0,
-    'weight' => -46,
+    'weight' => -45,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -83,11 +64,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -44,
+    'weight' => -50,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
+    'parent_identifier' => 'navigation_users:admin/users',
   );
   // Exported menu link: navigation_adhsions:node/11186/webform-results.
   $menu_links['navigation_adhsions:node/11186/webform-results'] = array(
@@ -104,25 +85,30 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -43,
+    'weight' => -48,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
+    'parent_identifier' => 'navigation_users:admin/users',
   );
-  // Exported menu link: navigation_ajouter-un-tag-libre:http://dev.materio.com/fr/admin/structure/taxonomy/tag_libres/add.
-  $menu_links['navigation_ajouter-un-tag-libre:http://dev.materio.com/fr/admin/structure/taxonomy/tag_libres/add'] = array(
+  // Exported menu link: navigation_ajouter-un-tag-libre:admin/structure/taxonomy/tag_libres/add.
+  $menu_links['navigation_ajouter-un-tag-libre:admin/structure/taxonomy/tag_libres/add'] = array(
     'menu_name' => 'navigation',
-    'link_path' => 'http://dev.materio.com/fr/admin/structure/taxonomy/tag_libres/add',
-    'router_path' => '',
+    'link_path' => 'admin/structure/taxonomy/tag_libres/add',
+    'router_path' => 'admin/structure/taxonomy/%/add',
     'link_title' => 'Ajouter un tag libre',
     'options' => array(
+      'identifier' => 'navigation_ajouter-un-tag-libre:admin/structure/taxonomy/tag_libres/add',
       'attributes' => array(),
-      'identifier' => 'navigation_ajouter-un-tag-libre:http://dev.materio.com/fr/admin/structure/taxonomy/tag_libres/add',
+      'item_attributes' => array(
+        'id' => '',
+        'class' => '',
+        'style' => '',
+      ),
     ),
     'module' => 'menu',
     'hidden' => 1,
-    'external' => 1,
+    'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
     'weight' => -50,
@@ -166,10 +152,10 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -49,
-    'customized' => 0,
+    'weight' => -48,
+    'customized' => 1,
     'language' => 'und',
-    'menu_links_customized' => 0,
+    'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_content:admin/content/materiaux',
   );
   // Exported menu link: navigation_company:admin/structure/taxonomy_manager/voc/company.
@@ -227,7 +213,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 1,
     'expanded' => 0,
-    'weight' => -44,
+    'weight' => -42,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -253,26 +239,31 @@ function materio_administration_menu_default_menu_links() {
     'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_translation:admin/config/regional/translate/table',
   );
-  // Exported menu link: navigation_customers:http://www.materio.com/fr/admin/store/customers.
-  $menu_links['navigation_customers:http://www.materio.com/fr/admin/store/customers'] = array(
+  // Exported menu link: navigation_customers:admin/store/customers.
+  $menu_links['navigation_customers:admin/store/customers'] = array(
     'menu_name' => 'navigation',
-    'link_path' => 'http://www.materio.com/fr/admin/store/customers',
-    'router_path' => '',
+    'link_path' => 'admin/store/customers',
+    'router_path' => 'admin/store/customers',
     'link_title' => 'customers',
     'options' => array(
+      'identifier' => 'navigation_customers:admin/store/customers',
       'attributes' => array(),
-      'identifier' => 'navigation_customers:http://www.materio.com/fr/admin/store/customers',
+      'item_attributes' => array(
+        'id' => '',
+        'class' => '',
+        'style' => '',
+      ),
     ),
     'module' => 'menu',
     'hidden' => 0,
-    'external' => 1,
+    'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => 1,
+    'weight' => -49,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_store:http://www.materio.com/fr/admin/store',
+    'parent_identifier' => 'navigation_store:admin/store',
   );
   // Exported menu link: navigation_didactique:node/add/didactique.
   $menu_links['navigation_didactique:node/add/didactique'] = array(
@@ -291,7 +282,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -44,
+    'weight' => -43,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -317,11 +308,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -39,
+    'weight' => -45,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
+    'parent_identifier' => 'navigation_users:admin/users',
   );
   // Exported menu link: navigation_duplicates:admin/config/content/remove_duplicates.
   $menu_links['navigation_duplicates:admin/config/content/remove_duplicates'] = array(
@@ -343,7 +334,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => 0,
+    'weight' => -44,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -366,7 +357,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -43,
+    'weight' => -42,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -392,11 +383,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -40,
+    'weight' => -46,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
+    'parent_identifier' => 'navigation_users:admin/users',
   );
   // Exported menu link: navigation_formulaires-dadhsion:http://www.materio.com/fr/node/11186/webform-results.
   $menu_links['navigation_formulaires-dadhsion:http://www.materio.com/fr/node/11186/webform-results'] = array(
@@ -413,11 +404,10 @@ function materio_administration_menu_default_menu_links() {
     'external' => 1,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -42,
+    'weight' => -40,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
   );
   // Exported menu link: navigation_frequently-asked-questions:faq-page.
   $menu_links['navigation_frequently-asked-questions:faq-page'] = array(
@@ -433,7 +423,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -41,
+    'weight' => -37,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -452,11 +442,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -47,
+    'weight' => -41,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
+    'parent_identifier' => 'navigation_users:admin/users',
   );
   // Exported menu link: navigation_industriels:admin/industriels.
   $menu_links['navigation_industriels:admin/industriels'] = array(
@@ -472,11 +462,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -45,
+    'weight' => -39,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
+    'parent_identifier' => 'navigation_users:admin/users',
   );
   // Exported menu link: navigation_industriels:admin/users/industriels.
   $menu_links['navigation_industriels:admin/users/industriels'] = array(
@@ -492,11 +482,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -48,
+    'weight' => -49,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
+    'parent_identifier' => 'navigation_users:admin/users',
   );
   // Exported menu link: navigation_ip-address-tracking:admin/reports/ip_tracking.
   $menu_links['navigation_ip-address-tracking:admin/reports/ip_tracking'] = array(
@@ -515,32 +505,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -40,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-  );
-  // Exported menu link: navigation_log-out:user/logout.
-  $menu_links['navigation_log-out:user/logout'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'user/logout',
-    'router_path' => 'user/logout',
-    'link_title' => 'Log out',
-    'options' => array(
-      'alter' => TRUE,
-      'attributes' => array(),
-      'identifier' => 'navigation_log-out:user/logout',
-    ),
-    'module' => 'system',
-    'hidden' => 1,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => 10,
+    'weight' => -44,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_my-account:user',
+    'parent_identifier' => 'navigation_users:admin/users',
   );
   // Exported menu link: navigation_looping-embed-video:node/add/looping-embed-video.
   $menu_links['navigation_looping-embed-video:node/add/looping-embed-video'] = array(
@@ -556,7 +525,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -38,
+    'weight' => -41,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -577,7 +546,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -39,
+    'weight' => -35,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -602,26 +571,6 @@ function materio_administration_menu_default_menu_links() {
     'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_add-content:node/add',
   );
-  // Exported menu link: navigation_materio-newsletter:node/add/simplenews/6274.
-  $menu_links['navigation_materio-newsletter:node/add/simplenews/6274'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'node/add/simplenews/6274',
-    'router_path' => 'node/add/simplenews/6274',
-    'link_title' => 'materiO’ newsletter',
-    'options' => array(
-      'identifier' => 'navigation_materio-newsletter:node/add/simplenews/6274',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => 0,
-    'customized' => 0,
-    'language' => 'und',
-    'menu_links_customized' => 0,
-    'parent_identifier' => 'navigation_simplenews-newsletter:node/add/simplenews',
-  );
   // Exported menu link: navigation_members:admin/users/members.
   $menu_links['navigation_members:admin/users/members'] = array(
     'menu_name' => 'navigation',
@@ -636,11 +585,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -50,
+    'weight' => -43,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
+    'parent_identifier' => 'navigation_users:admin/users',
   );
   // Exported menu link: navigation_menus:admin/config/regional/translate/table/menu.
   $menu_links['navigation_menus:admin/config/regional/translate/table/menu'] = array(
@@ -703,7 +652,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -43,
+    'weight' => -41,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -723,7 +672,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -47,
+    'weight' => -46,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -746,11 +695,10 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -42,
+    'weight' => -39,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_onthologie:admin/structure/taxonomy/onthologie.
   $menu_links['navigation_onthologie:admin/structure/taxonomy/onthologie'] = array(
@@ -814,11 +762,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => 0,
+    'weight' => -50,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_store:http://www.materio.com/fr/admin/store',
+    'parent_identifier' => 'navigation_store:admin/store',
   );
   // Exported menu link: navigation_page:node/add/page.
   $menu_links['navigation_page:node/add/page'] = array(
@@ -858,10 +806,10 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -48,
-    'customized' => 0,
+    'weight' => -47,
+    'customized' => 1,
     'language' => 'und',
-    'menu_links_customized' => 0,
+    'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_content:admin/content/materiaux',
   );
   // Exported menu link: navigation_panneau:node/add/panel.
@@ -881,11 +829,10 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -41,
+    'weight' => -36,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_produit:node/add/product.
   $menu_links['navigation_produit:node/add/product'] = array(
@@ -904,7 +851,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -40,
+    'weight' => -39,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -945,11 +892,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => 2,
+    'weight' => -48,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_store:http://www.materio.com/fr/admin/store',
+    'parent_identifier' => 'navigation_store:admin/store',
   );
   // Exported menu link: navigation_shopping-cart:cart.
   $menu_links['navigation_shopping-cart:cart'] = array(
@@ -968,10 +915,36 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -42,
+    'weight' => -38,
+    'customized' => 1,
+    'language' => 'und',
+    'menu_links_customized' => 1,
+  );
+  // Exported menu link: navigation_showrooms:admin/content/showrooms.
+  $menu_links['navigation_showrooms:admin/content/showrooms'] = array(
+    'menu_name' => 'navigation',
+    'link_path' => 'admin/content/showrooms',
+    'router_path' => 'admin/content/showrooms',
+    'link_title' => 'Showrooms',
+    'options' => array(
+      'attributes' => array(),
+      'item_attributes' => array(
+        'id' => '',
+        'class' => '',
+        'style' => '',
+      ),
+      'identifier' => 'navigation_showrooms:admin/content/showrooms',
+    ),
+    'module' => 'menu',
+    'hidden' => 0,
+    'external' => 0,
+    'has_children' => 0,
+    'expanded' => 1,
+    'weight' => -49,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
+    'parent_identifier' => 'navigation_content:admin/content/materiaux',
   );
   // Exported menu link: navigation_simplenews-newsletter:node/add/simplenews.
   $menu_links['navigation_simplenews-newsletter:node/add/simplenews'] = array(
@@ -996,22 +969,27 @@ function materio_administration_menu_default_menu_links() {
     'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_add-content:node/add',
   );
-  // Exported menu link: navigation_store:http://www.materio.com/fr/admin/store.
-  $menu_links['navigation_store:http://www.materio.com/fr/admin/store'] = array(
+  // Exported menu link: navigation_store:admin/store.
+  $menu_links['navigation_store:admin/store'] = array(
     'menu_name' => 'navigation',
-    'link_path' => 'http://www.materio.com/fr/admin/store',
-    'router_path' => '',
+    'link_path' => 'admin/store',
+    'router_path' => 'admin/store',
     'link_title' => 'Store',
     'options' => array(
+      'identifier' => 'navigation_store:admin/store',
       'attributes' => array(),
-      'identifier' => 'navigation_store:http://www.materio.com/fr/admin/store',
+      'item_attributes' => array(
+        'id' => '',
+        'class' => '',
+        'style' => '',
+      ),
     ),
     'module' => 'menu',
     'hidden' => 0,
-    'external' => 1,
+    'external' => 0,
     'has_children' => 1,
     'expanded' => 0,
-    'weight' => -38,
+    'weight' => -43,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -1051,11 +1029,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -46,
+    'weight' => -40,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
+    'parent_identifier' => 'navigation_users:admin/users',
   );
   // Exported menu link: navigation_students:admin/users/students.
   $menu_links['navigation_students:admin/users/students'] = array(
@@ -1071,11 +1049,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -49,
+    'weight' => -42,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
+    'parent_identifier' => 'navigation_users:admin/users',
   );
   // Exported menu link: navigation_subscriptions-newsletter:admin/people/simplenews.
   $menu_links['navigation_subscriptions-newsletter:admin/people/simplenews'] = array(
@@ -1092,11 +1070,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -41,
+    'weight' => -47,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
+    'parent_identifier' => 'navigation_users:admin/users',
   );
   // Exported menu link: navigation_tag-libres:admin/structure/taxonomy/tag_libres.
   $menu_links['navigation_tag-libres:admin/structure/taxonomy/tag_libres'] = array(
@@ -1165,10 +1143,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -48,
+    'weight' => -47,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
+    'parent_identifier' => 'navigation_taxonomy:admin/structure/taxonomie/admin-taxo',
   );
   // Exported menu link: navigation_taxonomy:admin/config/regional/translate/table/taxonomy.
   $menu_links['navigation_taxonomy:admin/config/regional/translate/table/taxonomy'] = array(
@@ -1211,31 +1190,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 1,
     'expanded' => 1,
-    'weight' => -47,
+    'weight' => -48,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_test:node/add/simplenews/6585.
-  $menu_links['navigation_test:node/add/simplenews/6585'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'node/add/simplenews/6585',
-    'router_path' => 'node/add/simplenews/6585',
-    'link_title' => 'test',
-    'options' => array(
-      'identifier' => 'navigation_test:node/add/simplenews/6585',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => 0,
-    'customized' => 0,
-    'language' => 'und',
-    'menu_links_customized' => 0,
-    'parent_identifier' => 'navigation_simplenews-newsletter:node/add/simplenews',
-  );
   // Exported menu link: navigation_user-account:user.
   $menu_links['navigation_user-account:user'] = array(
     'menu_name' => 'navigation',
@@ -1257,27 +1216,27 @@ function materio_administration_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_users:https://materio.com/en/admin/users?rid=6.
-  $menu_links['navigation_users:https://materio.com/en/admin/users?rid=6'] = array(
+  // Exported menu link: navigation_users:admin/users.
+  $menu_links['navigation_users:admin/users'] = array(
     'menu_name' => 'navigation',
-    'link_path' => 'https://materio.com/en/admin/users?rid=6',
-    'router_path' => '',
+    'link_path' => 'admin/users',
+    'router_path' => 'admin/users',
     'link_title' => 'Users',
     'options' => array(
+      'identifier' => 'navigation_users:admin/users',
       'attributes' => array(),
       'item_attributes' => array(
         'id' => '',
         'class' => '',
         'style' => '',
       ),
-      'identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6',
     ),
     'module' => 'menu',
     'hidden' => 0,
-    'external' => 1,
+    'external' => 0,
     'has_children' => 1,
     'expanded' => 1,
-    'weight' => -45,
+    'weight' => -44,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -1299,32 +1258,12 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -39,
+    'weight' => -40,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_add-content:node/add',
   );
-  // Exported menu link: navigation_ze-daily-materio039:node/add/simplenews/6374.
-  $menu_links['navigation_ze-daily-materio039:node/add/simplenews/6374'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'node/add/simplenews/6374',
-    'router_path' => 'node/add/simplenews/6374',
-    'link_title' => 'Ze Daily materiO'',
-    'options' => array(
-      'identifier' => 'navigation_ze-daily-materio039:node/add/simplenews/6374',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => 0,
-    'customized' => 0,
-    'language' => 'und',
-    'menu_links_customized' => 0,
-    'parent_identifier' => 'navigation_simplenews-newsletter:node/add/simplenews',
-  );
 
   // Translatables
   // Included for use with string extractors like potx.
@@ -1347,7 +1286,6 @@ function materio_administration_menu_default_menu_links() {
   t('Gratuits');
   t('IP address tracking');
   t('Industriels');
-  t('Log out');
   t('Mandrill');
   t('Materiau');
   t('Members');
@@ -1365,6 +1303,8 @@ function materio_administration_menu_default_menu_links() {
   t('Publication');
   t('Reports');
   t('Shopping cart');
+  t('Showroom');
+  t('Showrooms');
   t('Simplenews newsletter');
   t('Store');
   t('Strings search');
@@ -1377,11 +1317,8 @@ function materio_administration_menu_default_menu_links() {
   t('User account');
   t('Users');
   t('Webform');
-  t('Ze Daily materiO'');
   t('customers');
   t('looping embed video');
-  t('materiO’ newsletter');
-  t('test');
 
   return $menu_links;
 }

+ 280 - 0
sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc

@@ -14,6 +14,8 @@ function materio_administration_user_default_permissions() {
   $permissions['access admin theme'] = array(
     'name' => 'access admin theme',
     'roles' => array(
+      'Admin showroom' => 'Admin showroom',
+      'Translator' => 'Translator',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -24,12 +26,44 @@ function materio_administration_user_default_permissions() {
   $permissions['access administration menu'] = array(
     'name' => 'access administration menu',
     'roles' => array(
+      'Admin showroom' => 'Admin showroom',
+      'Translator' => 'Translator',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'admin_menu',
   );
 
+  // Exported permission: 'access content'.
+  $permissions['access content'] = array(
+    'name' => 'access content',
+    'roles' => array(
+      'Adhérent' => 'Adhérent',
+      'Admin showroom' => 'Admin showroom',
+      'Contact opérationnel' => 'Contact opérationnel',
+      'Premium' => 'Premium',
+      'Student' => 'Student',
+      'Translator' => 'Translator',
+      'Unverified' => 'Unverified',
+      'Utilisateur' => 'Utilisateur',
+      'administrator' => 'administrator',
+      'anonymous user' => 'anonymous user',
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'access content overview'.
+  $permissions['access content overview'] = array(
+    'name' => 'access content overview',
+    'roles' => array(
+      'Translator' => 'Translator',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
   // Exported permission: 'access workflow summary views'.
   $permissions['access workflow summary views'] = array(
     'name' => 'access workflow summary views',
@@ -87,6 +121,15 @@ function materio_administration_user_default_permissions() {
     'module' => 'translate_perms',
   );
 
+  // Exported permission: 'administer content types'.
+  $permissions['administer content types'] = array(
+    'name' => 'administer content types',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
   // Exported permission: 'administer entity translation'.
   $permissions['administer entity translation'] = array(
     'name' => 'administer entity translation',
@@ -96,6 +139,24 @@ function materio_administration_user_default_permissions() {
     'module' => 'entity_translation',
   );
 
+  // Exported permission: 'administer login destination settings'.
+  $permissions['administer login destination settings'] = array(
+    'name' => 'administer login destination settings',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'login_destination',
+  );
+
+  // Exported permission: 'administer nodes'.
+  $permissions['administer nodes'] = array(
+    'name' => 'administer nodes',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
   // Exported permission: 'administer remove_duplicates'.
   $permissions['administer remove_duplicates'] = array(
     'name' => 'administer remove_duplicates',
@@ -106,6 +167,15 @@ function materio_administration_user_default_permissions() {
     'module' => 'remove_duplicates',
   );
 
+  // Exported permission: 'administer themes'.
+  $permissions['administer themes'] = array(
+    'name' => 'administer themes',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'system',
+  );
+
   // Exported permission: 'administer workflow'.
   $permissions['administer workflow'] = array(
     'name' => 'administer workflow',
@@ -204,6 +274,108 @@ function materio_administration_user_default_permissions() {
     'module' => 'role_delegation',
   );
 
+  // Exported permission: 'bypass node access'.
+  $permissions['bypass node access'] = array(
+    'name' => 'bypass node access',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'create breve content'.
+  $permissions['create breve content'] = array(
+    'name' => 'create breve content',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'create looping_embed_video content'.
+  $permissions['create looping_embed_video content'] = array(
+    'name' => 'create looping_embed_video content',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'create materiau content'.
+  $permissions['create materiau content'] = array(
+    'name' => 'create materiau content',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'delete any breve content'.
+  $permissions['delete any breve content'] = array(
+    'name' => 'delete any breve content',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'delete any looping_embed_video content'.
+  $permissions['delete any looping_embed_video content'] = array(
+    'name' => 'delete any looping_embed_video content',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'delete any materiau content'.
+  $permissions['delete any materiau content'] = array(
+    'name' => 'delete any materiau content',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'delete own breve content'.
+  $permissions['delete own breve content'] = array(
+    'name' => 'delete own breve content',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'delete own looping_embed_video content'.
+  $permissions['delete own looping_embed_video content'] = array(
+    'name' => 'delete own looping_embed_video content',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'delete own materiau content'.
+  $permissions['delete own materiau content'] = array(
+    'name' => 'delete own materiau content',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'delete revisions'.
+  $permissions['delete revisions'] = array(
+    'name' => 'delete revisions',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
   // Exported permission: 'display drupal links'.
   $permissions['display drupal links'] = array(
     'name' => 'display drupal links',
@@ -213,6 +385,36 @@ function materio_administration_user_default_permissions() {
     'module' => 'admin_menu',
   );
 
+  // Exported permission: 'edit any breve content'.
+  $permissions['edit any breve content'] = array(
+    'name' => 'edit any breve content',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'edit any looping_embed_video content'.
+  $permissions['edit any looping_embed_video content'] = array(
+    'name' => 'edit any looping_embed_video content',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'edit any materiau content'.
+  $permissions['edit any materiau content'] = array(
+    'name' => 'edit any materiau content',
+    'roles' => array(
+      'Admin showroom' => 'Admin showroom',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
   // Exported permission: 'edit node original values'.
   $permissions['edit node original values'] = array(
     'name' => 'edit node original values',
@@ -227,6 +429,8 @@ function materio_administration_user_default_permissions() {
   $permissions['edit node translation shared fields'] = array(
     'name' => 'edit node translation shared fields',
     'roles' => array(
+      'Admin showroom' => 'Admin showroom',
+      'Translator' => 'Translator',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -237,12 +441,42 @@ function materio_administration_user_default_permissions() {
   $permissions['edit original values'] = array(
     'name' => 'edit original values',
     'roles' => array(
+      'Admin showroom' => 'Admin showroom',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'entity_translation',
   );
 
+  // Exported permission: 'edit own breve content'.
+  $permissions['edit own breve content'] = array(
+    'name' => 'edit own breve content',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'edit own looping_embed_video content'.
+  $permissions['edit own looping_embed_video content'] = array(
+    'name' => 'edit own looping_embed_video content',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'edit own materiau content'.
+  $permissions['edit own materiau content'] = array(
+    'name' => 'edit own materiau content',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
   // Exported permission: 'edit taxonomy_term original values'.
   $permissions['edit taxonomy_term original values'] = array(
     'name' => 'edit taxonomy_term original values',
@@ -267,6 +501,8 @@ function materio_administration_user_default_permissions() {
   $permissions['edit translation shared fields'] = array(
     'name' => 'edit translation shared fields',
     'roles' => array(
+      'Admin showroom' => 'Admin showroom',
+      'Translator' => 'Translator',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -305,9 +541,11 @@ function materio_administration_user_default_permissions() {
     'name' => 'participate in workflow',
     'roles' => array(
       'Adhérent' => 'Adhérent',
+      'Admin showroom' => 'Admin showroom',
       'Contact opérationnel' => 'Contact opérationnel',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Translator' => 'Translator',
       'Unverified' => 'Unverified',
       'Utilisateur' => 'Utilisateur',
       'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester',
@@ -328,6 +566,16 @@ function materio_administration_user_default_permissions() {
     'module' => 'translate_perms',
   );
 
+  // Exported permission: 'revert revisions'.
+  $permissions['revert revisions'] = array(
+    'name' => 'revert revisions',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
   // Exported permission: 'schedule workflow transitions'.
   $permissions['schedule workflow transitions'] = array(
     'name' => 'schedule workflow transitions',
@@ -434,6 +682,7 @@ function materio_administration_user_default_permissions() {
   $permissions['translate node entities'] = array(
     'name' => 'translate node entities',
     'roles' => array(
+      'Translator' => 'Translator',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -479,5 +728,36 @@ function materio_administration_user_default_permissions() {
     'module' => 'translate_perms',
   );
 
+  // Exported permission: 'view own unpublished content'.
+  $permissions['view own unpublished content'] = array(
+    'name' => 'view own unpublished content',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'view revisions'.
+  $permissions['view revisions'] = array(
+    'name' => 'view revisions',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'node',
+  );
+
+  // Exported permission: 'view the administration theme'.
+  $permissions['view the administration theme'] = array(
+    'name' => 'view the administration theme',
+    'roles' => array(
+      'Admin showroom' => 'Admin showroom',
+      'Translator' => 'Translator',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'system',
+  );
+
   return $permissions;
 }

+ 26 - 0
sites/all/modules/features/materio_administration/materio_administration.features.user_role.inc

@@ -0,0 +1,26 @@
+<?php
+/**
+ * @file
+ * materio_administration.features.user_role.inc
+ */
+
+/**
+ * Implements hook_user_default_roles().
+ */
+function materio_administration_user_default_roles() {
+  $roles = array();
+
+  // Exported role: utilisateur anonyme.
+  $roles['utilisateur anonyme'] = array(
+    'name' => 'utilisateur anonyme',
+    'weight' => 0,
+  );
+
+  // Exported role: utilisateur authentifié.
+  $roles['utilisateur authentifié'] = array(
+    'name' => 'utilisateur authentifié',
+    'weight' => 1,
+  );
+
+  return $roles;
+}

+ 366 - 0
sites/all/modules/features/materio_administration/materio_administration.features.workflow_access.inc

@@ -0,0 +1,366 @@
+<?php
+/**
+ * @file
+ * materio_administration.features.workflow_access.inc
+ */
+
+/**
+ * Implements hook_workflow_access_features_default_settings().
+ */
+function materio_administration_workflow_access_features_default_settings() {
+  $workflows = array();
+
+  $workflows['Publication'] = array();
+  $workflows['Publication']['(creation)'] = array();
+  $workflows['Publication']['(creation)']['administrator'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['(creation)']['root'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['(creation)']['workflow_features_author_name'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['(creation)']['utilisateur anonyme'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['(creation)']['utilisateur authentifié'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['(creation)']['Unverified'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['(creation)']['Utilisateur'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['(creation)']['Student'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['(creation)']['Utilisateur Alpha Tester'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['(creation)']['Adhérent'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['(creation)']['Contact opérationnel'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['(creation)']['Premium'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['(creation)']['Translator'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Importé'] = array();
+  $workflows['Publication']['Importé']['Admin showroom'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Importé']['administrator'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['Importé']['root'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['Importé']['workflow_features_author_name'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['Importé']['utilisateur anonyme'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Importé']['utilisateur authentifié'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Importé']['Unverified'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Importé']['Utilisateur'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Importé']['Student'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Importé']['Utilisateur Alpha Tester'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Importé']['Adhérent'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Importé']['Contact opérationnel'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Importé']['Premium'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Importé']['Translator'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Édité'] = array();
+  $workflows['Publication']['Édité']['Student'] = array(
+    'grant_view' => 1,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Édité']['Adhérent'] = array(
+    'grant_view' => 1,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Édité']['Premium'] = array(
+    'grant_view' => 1,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Édité']['Admin showroom'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Édité']['administrator'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['Édité']['root'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['Édité']['workflow_features_author_name'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['Édité']['utilisateur anonyme'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Édité']['utilisateur authentifié'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Édité']['Unverified'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Édité']['Utilisateur'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Édité']['Utilisateur Alpha Tester'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Édité']['Contact opérationnel'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Édité']['Translator'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Masqué'] = array();
+  $workflows['Publication']['Masqué']['Utilisateur Alpha Tester'] = array(
+    'grant_view' => 1,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Masqué']['Admin showroom'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Masqué']['administrator'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['Masqué']['root'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['Masqué']['workflow_features_author_name'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['Masqué']['utilisateur anonyme'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Masqué']['utilisateur authentifié'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Masqué']['Unverified'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Masqué']['Utilisateur'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Masqué']['Student'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Masqué']['Adhérent'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Masqué']['Contact opérationnel'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Masqué']['Premium'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Masqué']['Translator'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié'] = array();
+  $workflows['Publication']['Publié']['utilisateur anonyme'] = array(
+    'grant_view' => 1,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié']['utilisateur authentifié'] = array(
+    'grant_view' => 1,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié']['Unverified'] = array(
+    'grant_view' => 1,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié']['Utilisateur'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié']['Student'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié']['Utilisateur Alpha Tester'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié']['Adhérent'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié']['Contact opérationnel'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié']['Premium'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié']['Translator'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié']['Admin showroom'] = array(
+    'grant_view' => 0,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié']['administrator'] = array(
+    'grant_view' => 0,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['Publié']['root'] = array(
+    'grant_view' => 0,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['Publié']['workflow_features_author_name'] = array(
+    'grant_view' => 0,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+
+  return $workflows;
+}

+ 50 - 19
sites/all/modules/features/materio_administration/materio_administration.info

@@ -2,34 +2,24 @@ name = Materio Administration
 core = 7.x
 package = Materio
 dependencies[] = admin
-dependencies[] = admin_menu
 dependencies[] = admin_menu_source
 dependencies[] = admin_menu_toolbar
 dependencies[] = admin_theme
-dependencies[] = ctools
 dependencies[] = elysia_cron
-dependencies[] = entity_translation
 dependencies[] = entity_translation_actions
 dependencies[] = entity_translation_export_import
 dependencies[] = features
 dependencies[] = i18n_string
 dependencies[] = login_destination
-dependencies[] = logintoboggan
 dependencies[] = logintoboggan_rules
 dependencies[] = logintoboggan_variable
 dependencies[] = materio_user
-dependencies[] = menu
 dependencies[] = remove_duplicates
-dependencies[] = role_delegation
 dependencies[] = simplenews
-dependencies[] = strongarm
 dependencies[] = taxonomy_csv
 dependencies[] = taxonomy_wrangler
-dependencies[] = title
 dependencies[] = translate_perms
 dependencies[] = translation
-dependencies[] = views
-dependencies[] = views_bulk_operations
 dependencies[] = views_data_export
 dependencies[] = workflow
 dependencies[] = workflow_access
@@ -43,18 +33,17 @@ features[elysia_cron][] = workflow_cron
 features[features_api][] = api:2
 features[menu_custom][] = navigation
 features[menu_links][] = navigation_:materio_search_api_ajax/actuality
-features[menu_links][] = navigation_:print/print
 features[menu_links][] = navigation_add-content:node/add
 features[menu_links][] = navigation_add-user:admin/people/create
 features[menu_links][] = navigation_adhsions:node/11186/webform-results
-features[menu_links][] = navigation_ajouter-un-tag-libre:http://dev.materio.com/fr/admin/structure/taxonomy/tag_libres/add
+features[menu_links][] = navigation_ajouter-un-tag-libre:admin/structure/taxonomy/tag_libres/add
 features[menu_links][] = navigation_breve:node/add/breve
 features[menu_links][] = navigation_companies:admin/content/companies
 features[menu_links][] = navigation_company:admin/structure/taxonomy_manager/voc/company
 features[menu_links][] = navigation_company:node/add/company
 features[menu_links][] = navigation_compose-tips:filter/tips
 features[menu_links][] = navigation_content-types:admin/config/regional/translate/table/nodetype
-features[menu_links][] = navigation_customers:http://www.materio.com/fr/admin/store/customers
+features[menu_links][] = navigation_customers:admin/store/customers
 features[menu_links][] = navigation_didactique:node/add/didactique
 features[menu_links][] = navigation_duplicate-mails:admin/users/duplicatemails
 features[menu_links][] = navigation_duplicates:admin/config/content/remove_duplicates
@@ -66,11 +55,9 @@ features[menu_links][] = navigation_gratuits:admin/users/gratuits
 features[menu_links][] = navigation_industriels:admin/industriels
 features[menu_links][] = navigation_industriels:admin/users/industriels
 features[menu_links][] = navigation_ip-address-tracking:admin/reports/ip_tracking
-features[menu_links][] = navigation_log-out:user/logout
 features[menu_links][] = navigation_looping-embed-video:node/add/looping-embed-video
 features[menu_links][] = navigation_mandrill:admin/reports/mandrill
 features[menu_links][] = navigation_materiau:node/add/materiau
-features[menu_links][] = navigation_materio-newsletter:node/add/simplenews/6274
 features[menu_links][] = navigation_members:admin/users/members
 features[menu_links][] = navigation_menus:admin/config/regional/translate/table/menu
 features[menu_links][] = navigation_merge-duplicates:admin/structure/taxonomy/tag_libres/merge/duplicates
@@ -87,8 +74,9 @@ features[menu_links][] = navigation_produit:node/add/product
 features[menu_links][] = navigation_publication:node/add/publication
 features[menu_links][] = navigation_reports:admin/store/reports
 features[menu_links][] = navigation_shopping-cart:cart
+features[menu_links][] = navigation_showrooms:admin/content/showrooms
 features[menu_links][] = navigation_simplenews-newsletter:node/add/simplenews
-features[menu_links][] = navigation_store:http://www.materio.com/fr/admin/store
+features[menu_links][] = navigation_store:admin/store
 features[menu_links][] = navigation_strings-search:admin/config/regional/translate/translate
 features[menu_links][] = navigation_students:admin/students
 features[menu_links][] = navigation_students:admin/users/students
@@ -98,21 +86,25 @@ features[menu_links][] = navigation_tag-libres:admin/structure/taxonomy_manager/
 features[menu_links][] = navigation_taxonomy-manager:admin/structure/taxonomy_manager/voc
 features[menu_links][] = navigation_taxonomy:admin/config/regional/translate/table/taxonomy
 features[menu_links][] = navigation_taxonomy:admin/structure/taxonomie/admin-taxo
-features[menu_links][] = navigation_test:node/add/simplenews/6585
 features[menu_links][] = navigation_user-account:user
-features[menu_links][] = navigation_users:https://materio.com/en/admin/users?rid=6
+features[menu_links][] = navigation_users:admin/users
 features[menu_links][] = navigation_webform:node/add/webform
-features[menu_links][] = navigation_ze-daily-materio039:node/add/simplenews/6374
 features[user_permission][] = access admin theme
 features[user_permission][] = access administration menu
+features[user_permission][] = access content
+features[user_permission][] = access content overview
 features[user_permission][] = access workflow summary views
 features[user_permission][] = access_translation_table_content_type
 features[user_permission][] = access_translation_table_fields
 features[user_permission][] = access_translation_table_menu
 features[user_permission][] = access_translation_table_taxonomy
 features[user_permission][] = access_translations_overview
+features[user_permission][] = administer content types
 features[user_permission][] = administer entity translation
+features[user_permission][] = administer login destination settings
+features[user_permission][] = administer nodes
 features[user_permission][] = administer remove_duplicates
+features[user_permission][] = administer themes
 features[user_permission][] = administer workflow
 features[user_permission][] = assign Adhérent role
 features[user_permission][] = assign Contact opérationnel role
@@ -123,10 +115,27 @@ features[user_permission][] = assign Utilisateur Alpha Tester role
 features[user_permission][] = assign Utilisateur role
 features[user_permission][] = assign administrator role
 features[user_permission][] = assign all roles
+features[user_permission][] = bypass node access
+features[user_permission][] = create breve content
+features[user_permission][] = create looping_embed_video content
+features[user_permission][] = create materiau content
+features[user_permission][] = delete any breve content
+features[user_permission][] = delete any looping_embed_video content
+features[user_permission][] = delete any materiau content
+features[user_permission][] = delete own breve content
+features[user_permission][] = delete own looping_embed_video content
+features[user_permission][] = delete own materiau content
+features[user_permission][] = delete revisions
 features[user_permission][] = display drupal links
+features[user_permission][] = edit any breve content
+features[user_permission][] = edit any looping_embed_video content
+features[user_permission][] = edit any materiau content
 features[user_permission][] = edit node original values
 features[user_permission][] = edit node translation shared fields
 features[user_permission][] = edit original values
+features[user_permission][] = edit own breve content
+features[user_permission][] = edit own looping_embed_video content
+features[user_permission][] = edit own materiau content
 features[user_permission][] = edit taxonomy_term original values
 features[user_permission][] = edit taxonomy_term translation shared fields
 features[user_permission][] = edit translation shared fields
@@ -135,6 +144,7 @@ features[user_permission][] = flush caches
 features[user_permission][] = import_translations
 features[user_permission][] = participate in workflow
 features[user_permission][] = refresh_strings
+features[user_permission][] = revert revisions
 features[user_permission][] = schedule workflow transitions
 features[user_permission][] = select different theme
 features[user_permission][] = send newsletter
@@ -150,6 +160,11 @@ features[user_permission][] = translate taxonomy_term entities
 features[user_permission][] = translate user-defined strings
 features[user_permission][] = translate_strings
 features[user_permission][] = update_modules_translations
+features[user_permission][] = view own unpublished content
+features[user_permission][] = view revisions
+features[user_permission][] = view the administration theme
+features[user_role][] = utilisateur anonyme
+features[user_role][] = utilisateur authentifié
 features[variable][] = admin_menu_cache_client
 features[variable][] = admin_menu_devel_modules_enabled
 features[variable][] = admin_menu_devel_modules_skip
@@ -157,9 +172,11 @@ features[variable][] = admin_menu_display
 features[variable][] = admin_menu_margin_top
 features[variable][] = admin_menu_position_fixed
 features[variable][] = admin_menu_show_all
+features[variable][] = admin_menu_source_settings
 features[variable][] = admin_menu_tweak_modules
 features[variable][] = admin_menu_tweak_permissions
 features[variable][] = admin_menu_tweak_tabs
+features[variable][] = admin_theme
 features[variable][] = content_type_extras_title_hide_breve
 features[variable][] = content_type_extras_title_hide_company
 features[variable][] = content_type_extras_title_hide_didactique
@@ -239,4 +256,18 @@ features[views_view][] = admin_contents
 features[views_view][] = admin_peoples
 features[views_view][] = admin_taxo
 features[views_view][] = taxonomy_companies_manager
+features[workflow][] = Publication
+features[workflow_access][] = Publication
+features_exclude[dependencies][materio_publications] = materio_publications
+features_exclude[dependencies][materio_subscriptions] = materio_subscriptions
+features_exclude[dependencies][admin_menu] = admin_menu
+features_exclude[dependencies][ctools] = ctools
+features_exclude[dependencies][entity_translation] = entity_translation
+features_exclude[dependencies][menu] = menu
+features_exclude[dependencies][role_delegation] = role_delegation
+features_exclude[dependencies][strongarm] = strongarm
+features_exclude[dependencies][translations] = translations
+features_exclude[dependencies][showroom] = showroom
+features_exclude[user_role][Translator] = Translator
+features_exclude[user_role][Admin showroom] = Admin showroom
 project path = sites/all/modules/features

+ 55 - 0
sites/all/modules/features/materio_administration/materio_administration.strongarm.inc

@@ -71,6 +71,53 @@ function materio_administration_strongarm() {
   $strongarm->value = 0;
   $export['admin_menu_show_all'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'admin_menu_source_settings';
+  $strongarm->value = array(
+    1 => array(
+      'source' => '',
+    ),
+    2 => array(
+      'source' => '',
+    ),
+    9 => array(
+      'source' => '',
+    ),
+    7 => array(
+      'source' => '',
+    ),
+    10 => array(
+      'source' => '',
+    ),
+    11 => array(
+      'source' => '',
+    ),
+    6 => array(
+      'source' => '',
+    ),
+    5 => array(
+      'source' => '',
+    ),
+    8 => array(
+      'source' => '',
+    ),
+    12 => array(
+      'source' => 'navigation',
+    ),
+    3 => array(
+      'source' => 'navigation',
+    ),
+    4 => array(
+      'source' => '',
+    ),
+    13 => array(
+      'source' => 'navigation',
+    ),
+  );
+  $export['admin_menu_source_settings'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
@@ -92,6 +139,13 @@ function materio_administration_strongarm() {
   $strongarm->value = 0;
   $export['admin_menu_tweak_tabs'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'admin_theme';
+  $strongarm->value = 'guibik';
+  $export['admin_theme'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
@@ -127,6 +181,7 @@ function materio_administration_strongarm() {
   $strongarm->value = array(
     'node' => 'node',
     'taxonomy_term' => 'taxonomy_term',
+    'field_collection_item' => 0,
     'user' => 0,
   );
   $export['entity_translation_entity_types'] = $strongarm;

+ 376 - 23
sites/all/modules/features/materio_administration/materio_administration.views_default.inc

@@ -620,6 +620,13 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Materiaux/brèves';
   $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
+  $handler->display->display_options['defaults']['access'] = FALSE;
+  $handler->display->display_options['access']['type'] = 'role';
+  $handler->display->display_options['access']['role'] = array(
+    3 => '3',
+    4 => '4',
+    13 => '13',
+  );
   $handler->display->display_options['defaults']['pager'] = FALSE;
   $handler->display->display_options['pager']['type'] = 'full';
   $handler->display->display_options['pager']['options']['items_per_page'] = '50';
@@ -637,13 +644,14 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['style_plugin'] = 'table';
   $handler->display->display_options['style_options']['columns'] = array(
     'views_bulk_operations' => 'views_bulk_operations',
+    'nid' => 'nid',
     'field_materiau_image' => 'field_materiau_image',
     'field_visuel' => 'field_materiau_image',
     'type' => 'title_field',
     'title_field' => 'title_field',
     'field_reference_materio' => 'title_field',
-    'field_localisation_1' => 'field_reference_materio',
     'edit_node' => 'title_field',
+    'nothing' => 'title_field',
     'field_company_fab' => 'field_company_fab',
     'field_company_distrib' => 'field_company_fab',
     'field_onthologie' => 'field_onthologie',
@@ -663,6 +671,13 @@ function materio_administration_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
+    'nid' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
     'field_materiau_image' => array(
       'align' => '',
       'separator' => '',
@@ -694,16 +709,14 @@ function materio_administration_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'field_localisation_1' => array(
-      'sortable' => 0,
-      'default_sort_order' => 'asc',
+    'edit_node' => array(
       'align' => '',
       'separator' => '',
       'empty_column' => 0,
     ),
-    'edit_node' => array(
+    'nothing' => array(
       'align' => '',
-      'separator' => '',
+      'separator' => '<br />',
       'empty_column' => 0,
     ),
     'field_company_fab' => array(
@@ -772,6 +785,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['defaults']['style_options'] = FALSE;
   $handler->display->display_options['defaults']['row_plugin'] = FALSE;
   $handler->display->display_options['defaults']['row_options'] = FALSE;
+  $handler->display->display_options['defaults']['relationships'] = FALSE;
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Bulk operations: Content */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
@@ -792,6 +806,13 @@ function materio_administration_views_default_views() {
       'postpone_processing' => 0,
     ),
   );
+  /* Field: Content: Nid */
+  $handler->display->display_options['fields']['nid']['id'] = 'nid';
+  $handler->display->display_options['fields']['nid']['table'] = 'node';
+  $handler->display->display_options['fields']['nid']['field'] = 'nid';
+  $handler->display->display_options['fields']['nid']['label'] = '';
+  $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
   /* Field: Content: Image */
   $handler->display->display_options['fields']['field_materiau_image']['id'] = 'field_materiau_image';
   $handler->display->display_options['fields']['field_materiau_image']['table'] = 'field_data_field_materiau_image';
@@ -834,6 +855,12 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
+  /* Field: Global: Custom text */
+  $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
+  $handler->display->display_options['fields']['nothing']['table'] = 'views';
+  $handler->display->display_options['fields']['nothing']['field'] = 'nothing';
+  $handler->display->display_options['fields']['nothing']['label'] = 'Translation';
+  $handler->display->display_options['fields']['nothing']['alter']['text'] = '<span class="node-edit"><a href="/node/[nid]/translate">translate</a></span>';
   /* Field: Content: Manufacturer */
   $handler->display->display_options['fields']['field_company_fab']['id'] = 'field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['table'] = 'field_data_field_company_fab';
@@ -906,6 +933,13 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_localisation']['id'] = 'field_localisation';
   $handler->display->display_options['fields']['field_localisation']['table'] = 'field_data_field_localisation';
   $handler->display->display_options['fields']['field_localisation']['field'] = 'field_localisation';
+  /* Field: Content: Location */
+  $handler->display->display_options['fields']['field_location']['id'] = 'field_location';
+  $handler->display->display_options['fields']['field_location']['table'] = 'field_data_field_location';
+  $handler->display->display_options['fields']['field_location']['field'] = 'field_location';
+  $handler->display->display_options['fields']['field_location']['click_sort_column'] = 'showroom_tid';
+  $handler->display->display_options['fields']['field_location']['delta_offset'] = '0';
+  $handler->display->display_options['fields']['field_location']['multi_type'] = 'ul';
   /* Field: Workflow: Current state */
   $handler->display->display_options['fields']['sid']['id'] = 'sid';
   $handler->display->display_options['fields']['sid']['table'] = 'workflow_node';
@@ -924,13 +958,14 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['type_1']['field'] = 'type';
   $handler->display->display_options['filters']['type_1']['operator'] = 'not in';
   $handler->display->display_options['filters']['type_1']['value'] = array(
-    'company' => 'company',
     'didactique' => 'didactique',
     'faq' => 'faq',
+    'simplenews' => 'simplenews',
     'page' => 'page',
     'panel' => 'panel',
     'product' => 'product',
-    'simplenews' => 'simplenews',
+    'showroom' => 'showroom',
+    'company' => 'company',
     'webform' => 'webform',
     'looping_embed_video' => 'looping_embed_video',
   );
@@ -1552,6 +1587,273 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['tab_options']['type'] = 'normal';
   $handler->display->display_options['tab_options']['title'] = 'dashboard';
   $handler->display->display_options['tab_options']['weight'] = '0';
+
+  /* Display: Page : showrooms */
+  $handler = $view->new_display('page', 'Page : showrooms', 'page_4');
+  $handler->display->display_options['defaults']['title'] = FALSE;
+  $handler->display->display_options['title'] = 'Materiaux/brèves';
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
+  $handler->display->display_options['defaults']['pager'] = FALSE;
+  $handler->display->display_options['pager']['type'] = 'full';
+  $handler->display->display_options['pager']['options']['items_per_page'] = '50';
+  $handler->display->display_options['pager']['options']['offset'] = '0';
+  $handler->display->display_options['pager']['options']['id'] = '0';
+  $handler->display->display_options['pager']['options']['quantity'] = '9';
+  $handler->display->display_options['pager']['options']['expose']['items_per_page_label'] = 'Éléments par page';
+  $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all_label'] = '- Tout -';
+  $handler->display->display_options['pager']['options']['expose']['offset_label'] = 'Décalage';
+  $handler->display->display_options['pager']['options']['tags']['first'] = '« premier';
+  $handler->display->display_options['pager']['options']['tags']['previous'] = '‹ précédent';
+  $handler->display->display_options['pager']['options']['tags']['next'] = 'suivant ›';
+  $handler->display->display_options['pager']['options']['tags']['last'] = 'dernier »';
+  $handler->display->display_options['defaults']['style_plugin'] = FALSE;
+  $handler->display->display_options['style_plugin'] = 'table';
+  $handler->display->display_options['style_options']['columns'] = array(
+    'views_bulk_operations' => 'views_bulk_operations',
+    'nid' => 'nid',
+    'field_tode_showroom' => 'field_tode_showroom',
+    'edit_node' => 'field_tode_showroom',
+    'nothing' => 'field_tode_showroom',
+    'field_public_email' => 'field_public_email',
+    'field_public_phone' => 'field_public_phone',
+    'field_public_address' => 'field_public_address',
+    'body' => 'body',
+    'field_memo' => 'field_memo',
+    'sid' => 'sid',
+    'delete_node' => 'sid',
+  );
+  $handler->display->display_options['style_options']['default'] = '-1';
+  $handler->display->display_options['style_options']['info'] = array(
+    'views_bulk_operations' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'nid' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_tode_showroom' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '<br />',
+      'empty_column' => 0,
+    ),
+    'edit_node' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'nothing' => array(
+      'align' => '',
+      'separator' => '<br />',
+      'empty_column' => 0,
+    ),
+    'field_public_email' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_public_phone' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_public_address' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'body' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_memo' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'sid' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '<br />',
+      'empty_column' => 0,
+    ),
+    'delete_node' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+  );
+  $handler->display->display_options['style_options']['override'] = FALSE;
+  $handler->display->display_options['defaults']['style_options'] = FALSE;
+  $handler->display->display_options['defaults']['row_plugin'] = FALSE;
+  $handler->display->display_options['defaults']['row_options'] = FALSE;
+  $handler->display->display_options['defaults']['relationships'] = FALSE;
+  $handler->display->display_options['defaults']['fields'] = FALSE;
+  /* Field: Bulk operations: Content */
+  $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
+  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'node';
+  $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
+  $handler->display->display_options['fields']['views_bulk_operations']['label'] = '';
+  $handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['enable_select_all_pages'] = 1;
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['entity_load_capacity'] = '10';
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo_operations'] = array(
+    'action::workflow_select_given_state_action' => array(
+      'selected' => 1,
+      'skip_confirmation' => 0,
+      'override_label' => 0,
+      'label' => '',
+      'postpone_processing' => 0,
+    ),
+  );
+  /* Field: Content: Nid */
+  $handler->display->display_options['fields']['nid']['id'] = 'nid';
+  $handler->display->display_options['fields']['nid']['table'] = 'node';
+  $handler->display->display_options['fields']['nid']['field'] = 'nid';
+  $handler->display->display_options['fields']['nid']['label'] = '';
+  $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
+  /* Field: Content: Showroom */
+  $handler->display->display_options['fields']['field_tode_showroom']['id'] = 'field_tode_showroom';
+  $handler->display->display_options['fields']['field_tode_showroom']['table'] = 'field_data_field_tode_showroom';
+  $handler->display->display_options['fields']['field_tode_showroom']['field'] = 'field_tode_showroom';
+  /* Field: Content: Edit link */
+  $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
+  $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
+  $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
+  $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
+  $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
+  /* Field: Global: Custom text */
+  $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
+  $handler->display->display_options['fields']['nothing']['table'] = 'views';
+  $handler->display->display_options['fields']['nothing']['field'] = 'nothing';
+  $handler->display->display_options['fields']['nothing']['label'] = 'Translation';
+  $handler->display->display_options['fields']['nothing']['alter']['text'] = '<span class="node-edit"><a href="/node/[nid]/translate">translate</a></span>';
+  /* Field: Content: Email */
+  $handler->display->display_options['fields']['field_public_email']['id'] = 'field_public_email';
+  $handler->display->display_options['fields']['field_public_email']['table'] = 'field_data_field_public_email';
+  $handler->display->display_options['fields']['field_public_email']['field'] = 'field_public_email';
+  $handler->display->display_options['fields']['field_public_email']['label'] = 'Courriel';
+  /* Field: Content: Phone */
+  $handler->display->display_options['fields']['field_public_phone']['id'] = 'field_public_phone';
+  $handler->display->display_options['fields']['field_public_phone']['table'] = 'field_data_field_public_phone';
+  $handler->display->display_options['fields']['field_public_phone']['field'] = 'field_public_phone';
+  /* Field: Content: Adresse */
+  $handler->display->display_options['fields']['field_public_address']['id'] = 'field_public_address';
+  $handler->display->display_options['fields']['field_public_address']['table'] = 'field_data_field_public_address';
+  $handler->display->display_options['fields']['field_public_address']['field'] = 'field_public_address';
+  $handler->display->display_options['fields']['field_public_address']['click_sort_column'] = 'country';
+  $handler->display->display_options['fields']['field_public_address']['settings'] = array(
+    'use_widget_handlers' => 1,
+    'format_handlers' => array(
+      'address' => 'address',
+    ),
+  );
+  /* Field: Content: Body */
+  $handler->display->display_options['fields']['body']['id'] = 'body';
+  $handler->display->display_options['fields']['body']['table'] = 'field_data_body';
+  $handler->display->display_options['fields']['body']['field'] = 'body';
+  $handler->display->display_options['fields']['body']['label'] = 'Corps';
+  $handler->display->display_options['fields']['body']['type'] = 'text_summary_or_trimmed';
+  $handler->display->display_options['fields']['body']['settings'] = array(
+    'trim_length' => '200',
+  );
+  /* Field: Field: Mémo */
+  $handler->display->display_options['fields']['field_memo']['id'] = 'field_memo';
+  $handler->display->display_options['fields']['field_memo']['table'] = 'field_data_field_memo';
+  $handler->display->display_options['fields']['field_memo']['field'] = 'field_memo';
+  $handler->display->display_options['fields']['field_memo']['alter']['nl2br'] = TRUE;
+  $handler->display->display_options['fields']['field_memo']['alter']['max_length'] = '300';
+  $handler->display->display_options['fields']['field_memo']['alter']['strip_tags'] = TRUE;
+  $handler->display->display_options['fields']['field_memo']['alter']['trim'] = TRUE;
+  /* Field: Workflow: Current state */
+  $handler->display->display_options['fields']['sid']['id'] = 'sid';
+  $handler->display->display_options['fields']['sid']['table'] = 'workflow_node';
+  $handler->display->display_options['fields']['sid']['field'] = 'sid';
+  /* Field: Content: Delete link */
+  $handler->display->display_options['fields']['delete_node']['id'] = 'delete_node';
+  $handler->display->display_options['fields']['delete_node']['table'] = 'views_entity_node';
+  $handler->display->display_options['fields']['delete_node']['field'] = 'delete_node';
+  $handler->display->display_options['fields']['delete_node']['alter']['alter_text'] = TRUE;
+  $handler->display->display_options['fields']['delete_node']['alter']['text'] = '<span class="node-delete">[delete_node]</span>';
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
+  $handler->display->display_options['defaults']['filters'] = FALSE;
+  /* Filter criterion: Content: Type */
+  $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
+  $handler->display->display_options['filters']['type_1']['table'] = 'node';
+  $handler->display->display_options['filters']['type_1']['field'] = 'type';
+  $handler->display->display_options['filters']['type_1']['value'] = array(
+    'showroom' => 'showroom',
+  );
+  $handler->display->display_options['filters']['type_1']['group'] = 1;
+  /* Filter criterion: Content: Title */
+  $handler->display->display_options['filters']['title']['id'] = 'title';
+  $handler->display->display_options['filters']['title']['table'] = 'node';
+  $handler->display->display_options['filters']['title']['field'] = 'title';
+  $handler->display->display_options['filters']['title']['operator'] = 'contains';
+  $handler->display->display_options['filters']['title']['group'] = 1;
+  $handler->display->display_options['filters']['title']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['title']['expose']['operator_id'] = 'title_op';
+  $handler->display->display_options['filters']['title']['expose']['label'] = 'Title / Name contains';
+  $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
+  $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
+  $handler->display->display_options['filters']['title']['expose']['remember'] = TRUE;
+  /* Filter criterion: Field: Mémo (field_memo) */
+  $handler->display->display_options['filters']['field_memo_value']['id'] = 'field_memo_value';
+  $handler->display->display_options['filters']['field_memo_value']['table'] = 'field_data_field_memo';
+  $handler->display->display_options['filters']['field_memo_value']['field'] = 'field_memo_value';
+  $handler->display->display_options['filters']['field_memo_value']['operator'] = 'contains';
+  $handler->display->display_options['filters']['field_memo_value']['group'] = 1;
+  $handler->display->display_options['filters']['field_memo_value']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_memo_value']['expose']['operator_id'] = 'field_memo_value_op';
+  $handler->display->display_options['filters']['field_memo_value']['expose']['label'] = 'Mémo contient';
+  $handler->display->display_options['filters']['field_memo_value']['expose']['operator'] = 'field_memo_value_op';
+  $handler->display->display_options['filters']['field_memo_value']['expose']['identifier'] = 'field_memo_value';
+  /* Filter criterion: Workflow: Current state */
+  $handler->display->display_options['filters']['sid']['id'] = 'sid';
+  $handler->display->display_options['filters']['sid']['table'] = 'workflow_node';
+  $handler->display->display_options['filters']['sid']['field'] = 'sid';
+  $handler->display->display_options['filters']['sid']['group'] = 1;
+  $handler->display->display_options['filters']['sid']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['sid']['expose']['operator_id'] = 'sid_op';
+  $handler->display->display_options['filters']['sid']['expose']['label'] = 'Processus';
+  $handler->display->display_options['filters']['sid']['expose']['operator'] = 'sid_op';
+  $handler->display->display_options['filters']['sid']['expose']['identifier'] = 'sid';
+  $handler->display->display_options['filters']['sid']['expose']['remember'] = TRUE;
+  /* Filter criterion: Content: Published */
+  $handler->display->display_options['filters']['status']['id'] = 'status';
+  $handler->display->display_options['filters']['status']['table'] = 'node';
+  $handler->display->display_options['filters']['status']['field'] = 'status';
+  $handler->display->display_options['filters']['status']['value'] = '1';
+  $handler->display->display_options['filters']['status']['group'] = 1;
+  $handler->display->display_options['path'] = 'admin/content/showrooms';
+  $handler->display->display_options['menu']['type'] = 'tab';
+  $handler->display->display_options['menu']['title'] = 'Showrooms';
+  $handler->display->display_options['menu']['description'] = 'showrooms';
+  $handler->display->display_options['menu']['weight'] = '-100';
+  $handler->display->display_options['menu']['context'] = 0;
+  $handler->display->display_options['menu']['context_only_inline'] = 0;
+  $handler->display->display_options['tab_options']['type'] = 'normal';
+  $handler->display->display_options['tab_options']['title'] = 'dashboard';
+  $handler->display->display_options['tab_options']['weight'] = '0';
   $translatables['admin_contents'] = array(
     t('Master'),
     t('Contenu'),
@@ -1603,6 +1905,8 @@ function materio_administration_views_default_views() {
     t('- Choose an operation -'),
     t('Image'),
     t('Titre'),
+    t('Translation'),
+    t('<span class="node-edit"><a href="/node/[nid]/translate">translate</a></span>'),
     t('Fabricants/Distributeurs'),
     t('Fab :<br/>
 [field_company_fab] '),
@@ -1617,6 +1921,7 @@ function materio_administration_views_default_views() {
     t('Brèves :<br />[field_breve_ref]'),
     t('Fichiers joints'),
     t('Localisation'),
+    t('Location'),
     t('Title / Name contains'),
     t('Famille'),
     t('Référence'),
@@ -1638,6 +1943,10 @@ function materio_administration_views_default_views() {
     t('Page : page/publicationfaq/didactique'),
     t('page/publication/didactique/faq'),
     t('Title/Name'),
+    t('Page : showrooms'),
+    t('Showroom'),
+    t('Phone'),
+    t('Corps'),
   );
   $export['admin_contents'] = $view;
 
@@ -2139,14 +2448,13 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'users';
   $handler->display->display_options['filters']['status']['field'] = 'status';
-  $handler->display->display_options['filters']['status']['value'] = '1';
+  $handler->display->display_options['filters']['status']['value'] = '0';
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['exposed'] = TRUE;
   $handler->display->display_options['filters']['status']['expose']['operator_id'] = '';
   $handler->display->display_options['filters']['status']['expose']['label'] = 'Actif';
   $handler->display->display_options['filters']['status']['expose']['operator'] = 'status_op';
   $handler->display->display_options['filters']['status']['expose']['identifier'] = 'status';
-  $handler->display->display_options['filters']['status']['expose']['required'] = TRUE;
   $handler->display->display_options['filters']['status']['expose']['remember_roles'] = array(
     2 => '2',
     1 => 0,
@@ -2157,8 +2465,10 @@ print user_pass_reset_url($account);
     6 => 0,
     5 => 0,
     8 => 0,
+    12 => 0,
     3 => 0,
     4 => 0,
+    13 => 0,
   );
   /* Filter criterion: User: Roles */
   $handler->display->display_options['filters']['rid']['id'] = 'rid';
@@ -2168,8 +2478,11 @@ print user_pass_reset_url($account);
     9 => '9',
     7 => '7',
     10 => '10',
+    11 => '11',
     6 => '6',
+    5 => '5',
     8 => '8',
+    12 => '12',
     3 => '3',
   );
   $handler->display->display_options['filters']['rid']['group'] = 1;
@@ -2178,7 +2491,6 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['rid']['expose']['label'] = 'Rôles';
   $handler->display->display_options['filters']['rid']['expose']['operator'] = 'rid_op';
   $handler->display->display_options['filters']['rid']['expose']['identifier'] = 'rid';
-  $handler->display->display_options['filters']['rid']['expose']['remember'] = TRUE;
   $handler->display->display_options['filters']['rid']['expose']['remember_roles'] = array(
     2 => 0,
     9 => '9',
@@ -2189,8 +2501,10 @@ print user_pass_reset_url($account);
     5 => '5',
     1 => 0,
     8 => 0,
+    12 => 0,
     3 => 0,
     4 => 0,
+    13 => 0,
   );
   $handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
   /* Filter criterion: User: Company (field_company) */
@@ -2250,16 +2564,6 @@ print user_pass_reset_url($account);
     3 => 0,
     4 => 0,
   );
-  /* Filter criterion: User: Roles */
-  $handler->display->display_options['filters']['rid_1']['id'] = 'rid_1';
-  $handler->display->display_options['filters']['rid_1']['table'] = 'users_roles';
-  $handler->display->display_options['filters']['rid_1']['field'] = 'rid';
-  $handler->display->display_options['filters']['rid_1']['operator'] = 'not';
-  $handler->display->display_options['filters']['rid_1']['value'] = array(
-    5 => '5',
-    4 => '4',
-  );
-  $handler->display->display_options['filters']['rid_1']['group'] = 1;
   /* Filter criterion: User: E-mail */
   $handler->display->display_options['filters']['mail']['id'] = 'mail';
   $handler->display->display_options['filters']['mail']['table'] = 'users';
@@ -2287,6 +2591,8 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['language']['value'] = array(
     'en' => 'en',
     'fr' => 'fr',
+    'zh-hans' => 'zh-hans',
+    'cs' => 'cs',
   );
   $handler->display->display_options['filters']['language']['group'] = 1;
   $handler->display->display_options['filters']['language']['exposed'] = TRUE;
@@ -2297,12 +2603,17 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['language']['expose']['remember_roles'] = array(
     2 => '2',
     1 => 0,
+    9 => 0,
     7 => 0,
+    10 => 0,
+    11 => 0,
     6 => 0,
-    8 => 0,
     5 => 0,
+    8 => 0,
+    12 => 0,
     3 => 0,
     4 => 0,
+    13 => 0,
   );
   $handler->display->display_options['filters']['language']['expose']['reduce'] = TRUE;
   /* Filter criterion: User: E-mail */
@@ -2316,6 +2627,13 @@ print user_pass_reset_url($account);
   /* Display: Page : all */
   $handler = $view->new_display('page', 'Page : all', 'page');
   $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
+  $handler->display->display_options['defaults']['exposed_form'] = FALSE;
+  $handler->display->display_options['exposed_form']['type'] = 'input_required';
+  $handler->display->display_options['exposed_form']['options']['submit_button'] = 'Appliquer';
+  $handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Réinitialiser';
+  $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Trier par';
+  $handler->display->display_options['exposed_form']['options']['text_input_required'] = 'Sélectionnez n\'importe quel filtre et cliquez sur Appliquer pour voir les résultats';
+  $handler->display->display_options['exposed_form']['options']['text_input_required_format'] = 'filtred_html';
   $handler->display->display_options['path'] = 'admin/users';
   $handler->display->display_options['menu']['type'] = 'tab';
   $handler->display->display_options['menu']['title'] = 'Peoples';
@@ -2885,6 +3203,36 @@ print user_pass_reset_url($account);
     4 => 0,
   );
   $handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
+  /* Filter criterion: User: Roles */
+  $handler->display->display_options['filters']['rid_1']['id'] = 'rid_1';
+  $handler->display->display_options['filters']['rid_1']['table'] = 'users_roles';
+  $handler->display->display_options['filters']['rid_1']['field'] = 'rid';
+  $handler->display->display_options['filters']['rid_1']['value'] = array(
+    7 => '7',
+    6 => '6',
+  );
+  $handler->display->display_options['filters']['rid_1']['group'] = 1;
+  $handler->display->display_options['filters']['rid_1']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['rid_1']['expose']['operator_id'] = 'rid_1_op';
+  $handler->display->display_options['filters']['rid_1']['expose']['label'] = 'Rôles';
+  $handler->display->display_options['filters']['rid_1']['expose']['operator'] = 'rid_1_op';
+  $handler->display->display_options['filters']['rid_1']['expose']['identifier'] = 'rid_1';
+  $handler->display->display_options['filters']['rid_1']['expose']['remember_roles'] = array(
+    2 => '2',
+    1 => 0,
+    9 => 0,
+    7 => 0,
+    10 => 0,
+    11 => 0,
+    6 => 0,
+    5 => 0,
+    8 => 0,
+    12 => 0,
+    3 => 0,
+    4 => 0,
+    13 => 0,
+  );
+  $handler->display->display_options['filters']['rid_1']['expose']['reduce'] = TRUE;
   /* Filter criterion: User: Company (field_company) */
   $handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
@@ -3817,6 +4165,7 @@ print user_pass_reset_url($account);
     t('Langue'),
     t('Page : all'),
     t('more'),
+    t('Sélectionnez n\'importe quel filtre et cliquez sur Appliquer pour voir les résultats'),
     t('Data export'),
     t('Page : members'),
     t('Admin Members'),
@@ -3843,7 +4192,11 @@ print user_pass_reset_url($account);
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'Admin Taxo';
   $handler->display->display_options['use_more_always'] = FALSE;
-  $handler->display->display_options['access']['type'] = 'perm';
+  $handler->display->display_options['access']['type'] = 'role';
+  $handler->display->display_options['access']['role'] = array(
+    3 => '3',
+    4 => '4',
+  );
   $handler->display->display_options['cache']['type'] = 'none';
   $handler->display->display_options['query']['type'] = 'views_query';
   $handler->display->display_options['query']['options']['distinct'] = TRUE;

+ 11 - 40
sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc

@@ -112,7 +112,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'entity_types' => array(),
     'field_name' => 'field_breve_ref',
     'field_permissions' => array(
-      'type' => 0,
+      'type' => 2,
     ),
     'indexes' => array(
       'target_id' => array(
@@ -131,9 +131,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
           ),
         ),
         'sort' => array(
-          'direction' => 'ASC',
-          'field' => 'body:value',
-          'property' => 'nid',
           'type' => 'none',
         ),
         'target_bundles' => array(
@@ -418,7 +415,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
   // Exported field_base: 'field_localisation'.
   $field_bases['field_localisation'] = array(
     'active' => 1,
-    'cardinality' => 1,
+    'cardinality' => -1,
     'deleted' => 0,
     'entity_types' => array(),
     'field_name' => 'field_localisation',
@@ -449,7 +446,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'entity_types' => array(),
     'field_name' => 'field_materiau_image',
     'field_permissions' => array(
-      'type' => 0,
+      'type' => 2,
     ),
     'indexes' => array(
       'fid' => array(
@@ -517,6 +514,9 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'deleted' => 0,
     'entity_types' => array(),
     'field_name' => 'field_nature_titre',
+    'field_permissions' => array(
+      'type' => 2,
+    ),
     'indexes' => array(
       'format' => array(
         0 => 'format',
@@ -527,6 +527,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'settings' => array(
       'entity_translation_sync' => FALSE,
       'max_length' => 255,
+      'profile2_private' => FALSE,
     ),
     'translatable' => 1,
     'type' => 'text',
@@ -574,7 +575,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'entity_types' => array(),
     'field_name' => 'field_onthologie',
     'field_permissions' => array(
-      'type' => 0,
+      'type' => 2,
     ),
     'indexes' => array(
       'tid' => array(
@@ -743,7 +744,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'entity_types' => array(),
     'field_name' => 'field_tags_libres',
     'field_permissions' => array(
-      'type' => 0,
+      'type' => 2,
     ),
     'indexes' => array(
       'tid' => array(
@@ -808,36 +809,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'type' => 'taxonomy_term_reference',
   );
 
-  // Exported field_base: 'field_used_on_advanced_search'.
-  $field_bases['field_used_on_advanced_search'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_used_on_advanced_search',
-    'field_permissions' => array(
-      'type' => 2,
-    ),
-    'indexes' => array(
-      'value' => array(
-        0 => 'value',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'list',
-    'settings' => array(
-      'allowed_values' => array(
-        0 => 0,
-        1 => 1,
-      ),
-      'allowed_values_function' => '',
-      'entity_translation_sync' => FALSE,
-      'profile2_private' => FALSE,
-    ),
-    'translatable' => 0,
-    'type' => 'list_boolean',
-  );
-
   // Exported field_base: 'field_video_filter'.
   $field_bases['field_video_filter'] = array(
     'active' => 1,
@@ -846,7 +817,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'entity_types' => array(),
     'field_name' => 'field_video_filter',
     'field_permissions' => array(
-      'type' => 0,
+      'type' => 2,
     ),
     'indexes' => array(
       'height' => array(
@@ -1036,7 +1007,7 @@ foreach ($states as $state) {
     'entity_types' => array(),
     'field_name' => 'title_field',
     'field_permissions' => array(
-      'type' => 0,
+      'type' => 2,
     ),
     'indexes' => array(
       'format' => array(

+ 17 - 18
sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc

@@ -182,7 +182,7 @@ function materio_content_types_field_default_field_instances() {
         'formatter_settings' => array(),
       ),
       'type' => 'field_extrawidgets_read_only',
-      'weight' => 21,
+      'weight' => 7,
     ),
   );
 
@@ -356,7 +356,7 @@ function materio_content_types_field_default_field_instances() {
         'rows' => 10,
       ),
       'type' => 'text_textarea',
-      'weight' => 4,
+      'weight' => 5,
     ),
   );
 
@@ -928,7 +928,7 @@ function materio_content_types_field_default_field_instances() {
         'formatter_settings' => array(),
       ),
       'type' => 'field_extrawidgets_read_only',
-      'weight' => 23,
+      'weight' => 8,
     ),
   );
 
@@ -2394,7 +2394,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'hidden',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 13,
+        'weight' => 16,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -2447,7 +2447,7 @@ function materio_content_types_field_default_field_instances() {
         'size' => 60,
       ),
       'type' => 'entityreference_autocomplete',
-      'weight' => 28,
+      'weight' => 10,
     ),
   );
 
@@ -2730,7 +2730,7 @@ function materio_content_types_field_default_field_instances() {
         'summary_rows' => 5,
       ),
       'type' => 'text_textarea_with_summary',
-      'weight' => -3,
+      'weight' => -2,
     ),
   );
 
@@ -2763,7 +2763,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 6,
+        'weight' => 11,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -2844,7 +2844,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 7,
+        'weight' => 12,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -2891,7 +2891,7 @@ function materio_content_types_field_default_field_instances() {
       'module' => 'computed_field',
       'settings' => array(),
       'type' => 'computed',
-      'weight' => 2,
+      'weight' => 3,
     ),
   );
 
@@ -2979,7 +2979,7 @@ function materio_content_types_field_default_field_instances() {
         'size' => 60,
       ),
       'type' => 'text_textfield',
-      'weight' => 4,
+      'weight' => -3,
     ),
   );
 
@@ -3191,7 +3191,7 @@ function materio_content_types_field_default_field_instances() {
         'size' => 60,
       ),
       'type' => 'entityreference_autocomplete',
-      'weight' => 27,
+      'weight' => 9,
     ),
   );
 
@@ -3224,7 +3224,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 9,
+        'weight' => 14,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -3400,7 +3400,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 8,
+        'weight' => 13,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -3545,7 +3545,7 @@ function materio_content_types_field_default_field_instances() {
       'module' => 'computed_field',
       'settings' => array(),
       'type' => 'computed',
-      'weight' => 3,
+      'weight' => 4,
     ),
   );
 
@@ -3579,7 +3579,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 11,
+        'weight' => 15,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -3626,7 +3626,6 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
       'module' => 'synonyms',
       'settings' => array(
         'auto_creation' => 0,
-        'autocomplete_path' => 'synonyms/autocomplete',
         'size' => 60,
         'suggest_only_unique' => 0,
         'suggestion_size' => 10,
@@ -3749,7 +3748,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 0,
+        'weight' => 8,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -3799,7 +3798,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
         'formatter_settings' => array(),
       ),
       'type' => 'field_extrawidgets_read_only',
-      'weight' => 29,
+      'weight' => 11,
     ),
   );
 

+ 681 - 2
sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc

@@ -15,6 +15,7 @@ function materio_content_types_user_default_permissions() {
     'name' => 'access print',
     'roles' => array(
       'Adhérent' => 'Adhérent',
+      'Admin showroom' => 'Admin showroom',
       'Premium' => 'Premium',
       'administrator' => 'administrator',
       'root' => 'root',
@@ -59,6 +60,16 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'create field_breve_ref'.
+  $permissions['create field_breve_ref'] = array(
+    'name' => 'create field_breve_ref',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'create field_company'.
   $permissions['create field_company'] = array(
     'name' => 'create field_company',
@@ -89,6 +100,15 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'create field_department'.
+  $permissions['create field_department'] = array(
+    'name' => 'create field_department',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'create field_description'.
   $permissions['create field_description'] = array(
     'name' => 'create field_description',
@@ -150,6 +170,26 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'create field_materiau_image'.
+  $permissions['create field_materiau_image'] = array(
+    'name' => 'create field_materiau_image',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'create field_materiau_ref'.
+  $permissions['create field_materiau_ref'] = array(
+    'name' => 'create field_materiau_ref',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'create field_memo'.
   $permissions['create field_memo'] = array(
     'name' => 'create field_memo',
@@ -160,6 +200,16 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'create field_nature_titre'.
+  $permissions['create field_nature_titre'] = array(
+    'name' => 'create field_nature_titre',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'create field_note'.
   $permissions['create field_note'] = array(
     'name' => 'create field_note',
@@ -170,6 +220,46 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'create field_onthologie'.
+  $permissions['create field_onthologie'] = array(
+    'name' => 'create field_onthologie',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'create field_public_address'.
+  $permissions['create field_public_address'] = array(
+    'name' => 'create field_public_address',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'create field_public_email'.
+  $permissions['create field_public_email'] = array(
+    'name' => 'create field_public_email',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'create field_public_phone'.
+  $permissions['create field_public_phone'] = array(
+    'name' => 'create field_public_phone',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'create field_reference_materio'.
   $permissions['create field_reference_materio'] = array(
     'name' => 'create field_reference_materio',
@@ -180,6 +270,16 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'create field_tags_libres'.
+  $permissions['create field_tags_libres'] = array(
+    'name' => 'create field_tags_libres',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'create field_tode_company'.
   $permissions['create field_tode_company'] = array(
     'name' => 'create field_tode_company',
@@ -190,6 +290,26 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'create field_video_filter'.
+  $permissions['create field_video_filter'] = array(
+    'name' => 'create field_video_filter',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'create field_website'.
+  $permissions['create field_website'] = array(
+    'name' => 'create field_website',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'create field_weight'.
   $permissions['create field_weight'] = array(
     'name' => 'create field_weight',
@@ -209,6 +329,15 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'create title_field'.
+  $permissions['create title_field'] = array(
+    'name' => 'create title_field',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit field_attachments'.
   $permissions['edit field_attachments'] = array(
     'name' => 'edit field_attachments',
@@ -219,6 +348,16 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit field_breve_ref'.
+  $permissions['edit field_breve_ref'] = array(
+    'name' => 'edit field_breve_ref',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit field_company'.
   $permissions['edit field_company'] = array(
     'name' => 'edit field_company',
@@ -249,6 +388,16 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit field_department'.
+  $permissions['edit field_department'] = array(
+    'name' => 'edit field_department',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit field_description'.
   $permissions['edit field_description'] = array(
     'name' => 'edit field_description',
@@ -309,6 +458,26 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit field_materiau_image'.
+  $permissions['edit field_materiau_image'] = array(
+    'name' => 'edit field_materiau_image',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit field_materiau_ref'.
+  $permissions['edit field_materiau_ref'] = array(
+    'name' => 'edit field_materiau_ref',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit field_memo'.
   $permissions['edit field_memo'] = array(
     'name' => 'edit field_memo',
@@ -319,6 +488,16 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit field_nature_titre'.
+  $permissions['edit field_nature_titre'] = array(
+    'name' => 'edit field_nature_titre',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit field_note'.
   $permissions['edit field_note'] = array(
     'name' => 'edit field_note',
@@ -329,6 +508,46 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit field_onthologie'.
+  $permissions['edit field_onthologie'] = array(
+    'name' => 'edit field_onthologie',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit field_public_address'.
+  $permissions['edit field_public_address'] = array(
+    'name' => 'edit field_public_address',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit field_public_email'.
+  $permissions['edit field_public_email'] = array(
+    'name' => 'edit field_public_email',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit field_public_phone'.
+  $permissions['edit field_public_phone'] = array(
+    'name' => 'edit field_public_phone',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit field_reference_materio'.
   $permissions['edit field_reference_materio'] = array(
     'name' => 'edit field_reference_materio',
@@ -339,6 +558,16 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit field_tags_libres'.
+  $permissions['edit field_tags_libres'] = array(
+    'name' => 'edit field_tags_libres',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit field_tode_company'.
   $permissions['edit field_tode_company'] = array(
     'name' => 'edit field_tode_company',
@@ -349,6 +578,26 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit field_video_filter'.
+  $permissions['edit field_video_filter'] = array(
+    'name' => 'edit field_video_filter',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit field_website'.
+  $permissions['edit field_website'] = array(
+    'name' => 'edit field_website',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit field_weight'.
   $permissions['edit field_weight'] = array(
     'name' => 'edit field_weight',
@@ -377,6 +626,16 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit own field_breve_ref'.
+  $permissions['edit own field_breve_ref'] = array(
+    'name' => 'edit own field_breve_ref',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit own field_company'.
   $permissions['edit own field_company'] = array(
     'name' => 'edit own field_company',
@@ -406,6 +665,16 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit own field_department'.
+  $permissions['edit own field_department'] = array(
+    'name' => 'edit own field_department',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit own field_description'.
   $permissions['edit own field_description'] = array(
     'name' => 'edit own field_description',
@@ -459,6 +728,27 @@ function materio_content_types_user_default_permissions() {
   $permissions['edit own field_localisation'] = array(
     'name' => 'edit own field_localisation',
     'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit own field_materiau_image'.
+  $permissions['edit own field_materiau_image'] = array(
+    'name' => 'edit own field_materiau_image',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit own field_materiau_ref'.
+  $permissions['edit own field_materiau_ref'] = array(
+    'name' => 'edit own field_materiau_ref',
+    'roles' => array(
+      'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
@@ -468,6 +758,17 @@ function materio_content_types_user_default_permissions() {
   $permissions['edit own field_memo'] = array(
     'name' => 'edit own field_memo',
     'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit own field_nature_titre'.
+  $permissions['edit own field_nature_titre'] = array(
+    'name' => 'edit own field_nature_titre',
+    'roles' => array(
+      'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
@@ -482,6 +783,46 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit own field_onthologie'.
+  $permissions['edit own field_onthologie'] = array(
+    'name' => 'edit own field_onthologie',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit own field_public_address'.
+  $permissions['edit own field_public_address'] = array(
+    'name' => 'edit own field_public_address',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit own field_public_email'.
+  $permissions['edit own field_public_email'] = array(
+    'name' => 'edit own field_public_email',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit own field_public_phone'.
+  $permissions['edit own field_public_phone'] = array(
+    'name' => 'edit own field_public_phone',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit own field_reference_materio'.
   $permissions['edit own field_reference_materio'] = array(
     'name' => 'edit own field_reference_materio',
@@ -491,6 +832,16 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit own field_tags_libres'.
+  $permissions['edit own field_tags_libres'] = array(
+    'name' => 'edit own field_tags_libres',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit own field_tode_company'.
   $permissions['edit own field_tode_company'] = array(
     'name' => 'edit own field_tode_company',
@@ -500,6 +851,26 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit own field_video_filter'.
+  $permissions['edit own field_video_filter'] = array(
+    'name' => 'edit own field_video_filter',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit own field_website'.
+  $permissions['edit own field_website'] = array(
+    'name' => 'edit own field_website',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit own field_weight'.
   $permissions['edit own field_weight'] = array(
     'name' => 'edit own field_weight',
@@ -519,6 +890,24 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit own title_field'.
+  $permissions['edit own title_field'] = array(
+    'name' => 'edit own title_field',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit title_field'.
+  $permissions['edit title_field'] = array(
+    'name' => 'edit title_field',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'node-specific print configuration'.
   $permissions['node-specific print configuration'] = array(
     'name' => 'node-specific print configuration',
@@ -533,6 +922,7 @@ function materio_content_types_user_default_permissions() {
     'name' => 'show breve title',
     'roles' => array(
       'Adhérent' => 'Adhérent',
+      'Admin showroom' => 'Admin showroom',
       'Contact opérationnel' => 'Contact opérationnel',
       'Premium' => 'Premium',
       'Student' => 'Student',
@@ -565,6 +955,7 @@ function materio_content_types_user_default_permissions() {
     'name' => 'show materiau title',
     'roles' => array(
       'Adhérent' => 'Adhérent',
+      'Admin showroom' => 'Admin showroom',
       'Contact opérationnel' => 'Contact opérationnel',
       'Premium' => 'Premium',
       'Student' => 'Student',
@@ -579,6 +970,7 @@ function materio_content_types_user_default_permissions() {
     'name' => 'show page title',
     'roles' => array(
       'Adhérent' => 'Adhérent',
+      'Admin showroom' => 'Admin showroom',
       'Contact opérationnel' => 'Contact opérationnel',
       'Premium' => 'Premium',
       'Student' => 'Student',
@@ -597,6 +989,7 @@ function materio_content_types_user_default_permissions() {
     'name' => 'show webform title',
     'roles' => array(
       'Adhérent' => 'Adhérent',
+      'Admin showroom' => 'Admin showroom',
       'Contact opérationnel' => 'Contact opérationnel',
       'Premium' => 'Premium',
       'Student' => 'Student',
@@ -623,6 +1016,18 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view field_breve_ref'.
+  $permissions['view field_breve_ref'] = array(
+    'name' => 'view field_breve_ref',
+    'roles' => array(
+      'Admin showroom' => 'Admin showroom',
+      'Translator' => 'Translator',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view field_company'.
   $permissions['view field_company'] = array(
     'name' => 'view field_company',
@@ -659,6 +1064,19 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view field_department'.
+  $permissions['view field_department'] = array(
+    'name' => 'view field_department',
+    'roles' => array(
+      'Adhérent' => 'Adhérent',
+      'Premium' => 'Premium',
+      'Student' => 'Student',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view field_description'.
   $permissions['view field_description'] = array(
     'name' => 'view field_description',
@@ -726,10 +1144,32 @@ function materio_content_types_user_default_permissions() {
   // Exported permission: 'view field_localisation'.
   $permissions['view field_localisation'] = array(
     'name' => 'view field_localisation',
+    'roles' => array(
+      'Admin showroom' => 'Admin showroom',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view field_materiau_image'.
+  $permissions['view field_materiau_image'] = array(
+    'name' => 'view field_materiau_image',
+    'roles' => array(
+      'authenticated user' => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view field_materiau_ref'.
+  $permissions['view field_materiau_ref'] = array(
+    'name' => 'view field_materiau_ref',
     'roles' => array(
       'Adhérent' => 'Adhérent',
+      'Admin showroom' => 'Admin showroom',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Translator' => 'Translator',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -746,6 +1186,18 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view field_nature_titre'.
+  $permissions['view field_nature_titre'] = array(
+    'name' => 'view field_nature_titre',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view field_note'.
   $permissions['view field_note'] = array(
     'name' => 'view field_note',
@@ -756,19 +1208,79 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view field_onthologie'.
+  $permissions['view field_onthologie'] = array(
+    'name' => 'view field_onthologie',
+    'roles' => array(
+      'Admin showroom' => 'Admin showroom',
+      'Translator' => 'Translator',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view field_public_address'.
+  $permissions['view field_public_address'] = array(
+    'name' => 'view field_public_address',
+    'roles' => array(
+      'Adhérent' => 'Adhérent',
+      'Premium' => 'Premium',
+      'Student' => 'Student',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view field_public_email'.
+  $permissions['view field_public_email'] = array(
+    'name' => 'view field_public_email',
+    'roles' => array(
+      'Adhérent' => 'Adhérent',
+      'Premium' => 'Premium',
+      'Student' => 'Student',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view field_public_phone'.
+  $permissions['view field_public_phone'] = array(
+    'name' => 'view field_public_phone',
+    'roles' => array(
+      'Adhérent' => 'Adhérent',
+      'Premium' => 'Premium',
+      'Student' => 'Student',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view field_reference_materio'.
   $permissions['view field_reference_materio'] = array(
     'name' => 'view field_reference_materio',
     'roles' => array(
       'Adhérent' => 'Adhérent',
+      'Admin showroom' => 'Admin showroom',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Translator' => 'Translator',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view field_tags_libres'.
+  $permissions['view field_tags_libres'] = array(
+    'name' => 'view field_tags_libres',
+    'roles' => array(),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view field_tode_company'.
   $permissions['view field_tode_company'] = array(
     'name' => 'view field_tode_company',
@@ -782,6 +1294,26 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view field_video_filter'.
+  $permissions['view field_video_filter'] = array(
+    'name' => 'view field_video_filter',
+    'roles' => array(),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view field_website'.
+  $permissions['view field_website'] = array(
+    'name' => 'view field_website',
+    'roles' => array(
+      'Adhérent' => 'Adhérent',
+      'Premium' => 'Premium',
+      'Student' => 'Student',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view field_weight'.
   $permissions['view field_weight'] = array(
     'name' => 'view field_weight',
@@ -810,6 +1342,16 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view own field_breve_ref'.
+  $permissions['view own field_breve_ref'] = array(
+    'name' => 'view own field_breve_ref',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view own field_company'.
   $permissions['view own field_company'] = array(
     'name' => 'view own field_company',
@@ -822,7 +1364,12 @@ function materio_content_types_user_default_permissions() {
   // Exported permission: 'view own field_company_distrib'.
   $permissions['view own field_company_distrib'] = array(
     'name' => 'view own field_company_distrib',
-    'roles' => array(),
+    'roles' => array(
+      'Admin showroom' => 'Admin showroom',
+      'Translator' => 'Translator',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
     'module' => 'field_permissions',
   );
 
@@ -833,6 +1380,16 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view own field_department'.
+  $permissions['view own field_department'] = array(
+    'name' => 'view own field_department',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view own field_description'.
   $permissions['view own field_description'] = array(
     'name' => 'view own field_description',
@@ -854,7 +1411,12 @@ function materio_content_types_user_default_permissions() {
   // Exported permission: 'view own field_famille'.
   $permissions['view own field_famille'] = array(
     'name' => 'view own field_famille',
-    'roles' => array(),
+    'roles' => array(
+      'Admin showroom' => 'Admin showroom',
+      'Translator' => 'Translator',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
     'module' => 'field_permissions',
   );
 
@@ -881,6 +1443,23 @@ function materio_content_types_user_default_permissions() {
   // Exported permission: 'view own field_localisation'.
   $permissions['view own field_localisation'] = array(
     'name' => 'view own field_localisation',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view own field_materiau_image'.
+  $permissions['view own field_materiau_image'] = array(
+    'name' => 'view own field_materiau_image',
+    'roles' => array(),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view own field_materiau_ref'.
+  $permissions['view own field_materiau_ref'] = array(
+    'name' => 'view own field_materiau_ref',
     'roles' => array(
       'root' => 'root',
     ),
@@ -891,6 +1470,17 @@ function materio_content_types_user_default_permissions() {
   $permissions['view own field_memo'] = array(
     'name' => 'view own field_memo',
     'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view own field_nature_titre'.
+  $permissions['view own field_nature_titre'] = array(
+    'name' => 'view own field_nature_titre',
+    'roles' => array(
+      'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
@@ -905,6 +1495,46 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view own field_onthologie'.
+  $permissions['view own field_onthologie'] = array(
+    'name' => 'view own field_onthologie',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view own field_public_address'.
+  $permissions['view own field_public_address'] = array(
+    'name' => 'view own field_public_address',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view own field_public_email'.
+  $permissions['view own field_public_email'] = array(
+    'name' => 'view own field_public_email',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view own field_public_phone'.
+  $permissions['view own field_public_phone'] = array(
+    'name' => 'view own field_public_phone',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view own field_reference_materio'.
   $permissions['view own field_reference_materio'] = array(
     'name' => 'view own field_reference_materio',
@@ -914,6 +1544,16 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view own field_tags_libres'.
+  $permissions['view own field_tags_libres'] = array(
+    'name' => 'view own field_tags_libres',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view own field_tode_company'.
   $permissions['view own field_tode_company'] = array(
     'name' => 'view own field_tode_company',
@@ -923,6 +1563,26 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view own field_video_filter'.
+  $permissions['view own field_video_filter'] = array(
+    'name' => 'view own field_video_filter',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view own field_website'.
+  $permissions['view own field_website'] = array(
+    'name' => 'view own field_website',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view own field_weight'.
   $permissions['view own field_weight'] = array(
     'name' => 'view own field_weight',
@@ -941,5 +1601,24 @@ function materio_content_types_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view own title_field'.
+  $permissions['view own title_field'] = array(
+    'name' => 'view own title_field',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view title_field'.
+  $permissions['view title_field'] = array(
+    'name' => 'view title_field',
+    'roles' => array(
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
+  );
+
   return $permissions;
 }

+ 35 - 4
sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc

@@ -537,7 +537,7 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'header',
-    'weight' => '0',
+    'weight' => '1',
     'children' => array(
       0 => 'field_nature_titre',
       1 => 'title_field',
@@ -641,6 +641,8 @@ function materio_content_types_field_group_info() {
       2 => 'group_fichiers',
       3 => 'group_media',
       4 => 'group_referencement',
+      5 => 'group_showroom',
+      6 => 'group_liens',
     ),
     'format_type' => 'htabs',
     'format_settings' => array(
@@ -972,6 +974,34 @@ function materio_content_types_field_group_info() {
   );
   $field_groups['group_images|node|materiau|cardsmall'] = $field_group;
 
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_liens|node|materiau|form';
+  $field_group->group_name = 'group_liens';
+  $field_group->entity_type = 'node';
+  $field_group->bundle = 'materiau';
+  $field_group->mode = 'form';
+  $field_group->parent_name = 'group_htabs';
+  $field_group->data = array(
+    'label' => 'Liens',
+    'weight' => '16',
+    'children' => array(
+      0 => 'field_materiau_ref',
+      1 => 'field_breve_ref',
+    ),
+    'format_type' => 'htab',
+    'format_settings' => array(
+      'formatter' => 'closed',
+      'instance_settings' => array(
+        'description' => '',
+        'classes' => 'group-liens field-group-htab',
+        'required_fields' => 1,
+      ),
+    ),
+  );
+  $field_groups['group_liens|node|materiau|form'] = $field_group;
+
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -1166,7 +1196,7 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'side 1',
-    'weight' => '1',
+    'weight' => '2',
     'children' => array(
       0 => 'group_images',
     ),
@@ -1294,7 +1324,7 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'side 2',
-    'weight' => '2',
+    'weight' => '3',
     'children' => array(
       0 => 'field_description',
     ),
@@ -1419,7 +1449,7 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'side 3',
-    'weight' => '3',
+    'weight' => '10',
     'children' => array(
       0 => 'field_video_filter',
     ),
@@ -1841,6 +1871,7 @@ function materio_content_types_field_group_info() {
   t('Contenus');
   t('Fichiers');
   t('Header');
+  t('Liens');
   t('Médias');
   t('Référencement');
   t('Side left');

+ 83 - 2
sites/all/modules/features/materio_content_types/materio_content_types.info

@@ -20,7 +20,6 @@ dependencies[] = list
 dependencies[] = materio_page_title
 dependencies[] = materio_subscriptions
 dependencies[] = materio_user_profiles
-dependencies[] = node
 dependencies[] = options
 dependencies[] = print
 dependencies[] = print_ui
@@ -65,7 +64,6 @@ features[field_base][] = field_reference_materio
 features[field_base][] = field_source
 features[field_base][] = field_tags_libres
 features[field_base][] = field_tode_company
-features[field_base][] = field_used_on_advanced_search
 features[field_base][] = field_video_filter
 features[field_base][] = field_visible_sur_la_home
 features[field_base][] = field_visuel
@@ -103,6 +101,7 @@ features[field_group][] = group_images|node|materiau|cardbig
 features[field_group][] = group_images|node|materiau|cardfull
 features[field_group][] = group_images|node|materiau|cardmedium
 features[field_group][] = group_images|node|materiau|cardsmall
+features[field_group][] = group_liens|node|materiau|form
 features[field_group][] = group_media|node|materiau|form
 features[field_group][] = group_referencement|node|breve|form
 features[field_group][] = group_referencement|node|materiau|form
@@ -200,53 +199,92 @@ features[user_permission][] = access private fields
 features[user_permission][] = administer field permissions
 features[user_permission][] = administer print
 features[user_permission][] = create field_attachments
+features[user_permission][] = create field_breve_ref
 features[user_permission][] = create field_company
 features[user_permission][] = create field_company_distrib
 features[user_permission][] = create field_company_fab
+features[user_permission][] = create field_department
 features[user_permission][] = create field_description
 features[user_permission][] = create field_displayed_in_home
 features[user_permission][] = create field_famille
 features[user_permission][] = create field_identifiant
 features[user_permission][] = create field_infos_from_company
 features[user_permission][] = create field_localisation
+features[user_permission][] = create field_materiau_image
+features[user_permission][] = create field_materiau_ref
 features[user_permission][] = create field_memo
+features[user_permission][] = create field_nature_titre
 features[user_permission][] = create field_note
+features[user_permission][] = create field_onthologie
+features[user_permission][] = create field_public_address
+features[user_permission][] = create field_public_email
+features[user_permission][] = create field_public_phone
 features[user_permission][] = create field_reference_materio
+features[user_permission][] = create field_tags_libres
 features[user_permission][] = create field_tode_company
+features[user_permission][] = create field_video_filter
+features[user_permission][] = create field_website
 features[user_permission][] = create field_weight
 features[user_permission][] = create field_workflow_state
+features[user_permission][] = create title_field
 features[user_permission][] = edit field_attachments
+features[user_permission][] = edit field_breve_ref
 features[user_permission][] = edit field_company
 features[user_permission][] = edit field_company_distrib
 features[user_permission][] = edit field_company_fab
+features[user_permission][] = edit field_department
 features[user_permission][] = edit field_description
 features[user_permission][] = edit field_displayed_in_home
 features[user_permission][] = edit field_famille
 features[user_permission][] = edit field_identifiant
 features[user_permission][] = edit field_infos_from_company
 features[user_permission][] = edit field_localisation
+features[user_permission][] = edit field_materiau_image
+features[user_permission][] = edit field_materiau_ref
 features[user_permission][] = edit field_memo
+features[user_permission][] = edit field_nature_titre
 features[user_permission][] = edit field_note
+features[user_permission][] = edit field_onthologie
+features[user_permission][] = edit field_public_address
+features[user_permission][] = edit field_public_email
+features[user_permission][] = edit field_public_phone
 features[user_permission][] = edit field_reference_materio
+features[user_permission][] = edit field_tags_libres
 features[user_permission][] = edit field_tode_company
+features[user_permission][] = edit field_video_filter
+features[user_permission][] = edit field_website
 features[user_permission][] = edit field_weight
 features[user_permission][] = edit field_workflow_state
 features[user_permission][] = edit own field_attachments
+features[user_permission][] = edit own field_breve_ref
 features[user_permission][] = edit own field_company
 features[user_permission][] = edit own field_company_distrib
 features[user_permission][] = edit own field_company_fab
+features[user_permission][] = edit own field_department
 features[user_permission][] = edit own field_description
 features[user_permission][] = edit own field_displayed_in_home
 features[user_permission][] = edit own field_famille
 features[user_permission][] = edit own field_identifiant
 features[user_permission][] = edit own field_infos_from_company
 features[user_permission][] = edit own field_localisation
+features[user_permission][] = edit own field_materiau_image
+features[user_permission][] = edit own field_materiau_ref
 features[user_permission][] = edit own field_memo
+features[user_permission][] = edit own field_nature_titre
 features[user_permission][] = edit own field_note
+features[user_permission][] = edit own field_onthologie
+features[user_permission][] = edit own field_public_address
+features[user_permission][] = edit own field_public_email
+features[user_permission][] = edit own field_public_phone
 features[user_permission][] = edit own field_reference_materio
+features[user_permission][] = edit own field_tags_libres
 features[user_permission][] = edit own field_tode_company
+features[user_permission][] = edit own field_video_filter
+features[user_permission][] = edit own field_website
 features[user_permission][] = edit own field_weight
 features[user_permission][] = edit own field_workflow_state
+features[user_permission][] = edit own title_field
+features[user_permission][] = edit title_field
 features[user_permission][] = node-specific print configuration
 features[user_permission][] = show breve title
 features[user_permission][] = show company title
@@ -254,37 +292,63 @@ features[user_permission][] = show materiau title
 features[user_permission][] = show page title
 features[user_permission][] = show webform title
 features[user_permission][] = view field_attachments
+features[user_permission][] = view field_breve_ref
 features[user_permission][] = view field_company
 features[user_permission][] = view field_company_distrib
 features[user_permission][] = view field_company_fab
+features[user_permission][] = view field_department
 features[user_permission][] = view field_description
 features[user_permission][] = view field_displayed_in_home
 features[user_permission][] = view field_famille
 features[user_permission][] = view field_identifiant
 features[user_permission][] = view field_infos_from_company
 features[user_permission][] = view field_localisation
+features[user_permission][] = view field_materiau_image
+features[user_permission][] = view field_materiau_ref
 features[user_permission][] = view field_memo
+features[user_permission][] = view field_nature_titre
 features[user_permission][] = view field_note
+features[user_permission][] = view field_onthologie
+features[user_permission][] = view field_public_address
+features[user_permission][] = view field_public_email
+features[user_permission][] = view field_public_phone
 features[user_permission][] = view field_reference_materio
+features[user_permission][] = view field_tags_libres
 features[user_permission][] = view field_tode_company
+features[user_permission][] = view field_video_filter
+features[user_permission][] = view field_website
 features[user_permission][] = view field_weight
 features[user_permission][] = view field_workflow_state
 features[user_permission][] = view own field_attachments
+features[user_permission][] = view own field_breve_ref
 features[user_permission][] = view own field_company
 features[user_permission][] = view own field_company_distrib
 features[user_permission][] = view own field_company_fab
+features[user_permission][] = view own field_department
 features[user_permission][] = view own field_description
 features[user_permission][] = view own field_displayed_in_home
 features[user_permission][] = view own field_famille
 features[user_permission][] = view own field_identifiant
 features[user_permission][] = view own field_infos_from_company
 features[user_permission][] = view own field_localisation
+features[user_permission][] = view own field_materiau_image
+features[user_permission][] = view own field_materiau_ref
 features[user_permission][] = view own field_memo
+features[user_permission][] = view own field_nature_titre
 features[user_permission][] = view own field_note
+features[user_permission][] = view own field_onthologie
+features[user_permission][] = view own field_public_address
+features[user_permission][] = view own field_public_email
+features[user_permission][] = view own field_public_phone
 features[user_permission][] = view own field_reference_materio
+features[user_permission][] = view own field_tags_libres
 features[user_permission][] = view own field_tode_company
+features[user_permission][] = view own field_video_filter
+features[user_permission][] = view own field_website
 features[user_permission][] = view own field_weight
 features[user_permission][] = view own field_workflow_state
+features[user_permission][] = view own title_field
+features[user_permission][] = view title_field
 features[variable][] = field_bundle_settings_node__breve
 features[variable][] = field_bundle_settings_node__company
 features[variable][] = field_bundle_settings_node__materiau
@@ -471,4 +535,21 @@ features[variable][] = print_urls
 features[variable][] = print_urls_anchors
 features[views_view][] = entity_reference_materiaux_breves
 features_exclude[dependencies][i18n_taxonomy] = i18n_taxonomy
+features_exclude[dependencies][showroom] = showroom
+features_exclude[dependencies][materio_showroom] = materio_showroom
+features_exclude[field_base][field_showroom] = field_showroom
+features_exclude[field_base][field_location] = field_location
+features_exclude[field_base][field_used_on_advanced_search] = field_used_on_advanced_search
+features_exclude[field_instance][node-breve-field_showroom] = node-breve-field_showroom
+features_exclude[field_instance][node-materiau-field_location] = node-materiau-field_location
+features_exclude[user_permission][create field_showroom] = create field_showroom
+features_exclude[user_permission][edit own field_showroom] = edit own field_showroom
+features_exclude[user_permission][edit field_showroom] = edit field_showroom
+features_exclude[user_permission][view own field_showroom] = view own field_showroom
+features_exclude[user_permission][view field_showroom] = view field_showroom
+features_exclude[user_permission][create field_location] = create field_location
+features_exclude[user_permission][edit own field_location] = edit own field_location
+features_exclude[user_permission][edit field_location] = edit field_location
+features_exclude[user_permission][view own field_location] = view own field_location
+features_exclude[user_permission][view field_location] = view field_location
 project path = sites/all/modules/features

+ 108 - 34
sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc

@@ -44,7 +44,7 @@ function materio_content_types_strongarm() {
           'weight' => '9',
         ),
         'path' => array(
-          'weight' => '5',
+          'weight' => '6',
         ),
         'workflow' => array(
           'weight' => '3',
@@ -52,6 +52,12 @@ function materio_content_types_strongarm() {
         'language' => array(
           'weight' => '2',
         ),
+        'metatags' => array(
+          'weight' => '10',
+        ),
+        'redirect' => array(
+          'weight' => '9',
+        ),
       ),
       'display' => array(
         'language' => array(
@@ -340,10 +346,10 @@ function materio_content_types_strongarm() {
           'weight' => '5',
         ),
         'metatags' => array(
-          'weight' => '40',
+          'weight' => '13',
         ),
         'redirect' => array(
-          'weight' => '30',
+          'weight' => '12',
         ),
       ),
       'display' => array(
@@ -375,7 +381,7 @@ function materio_content_types_strongarm() {
         ),
         'workflow_current_state' => array(
           'cardmedium' => array(
-            'weight' => '-99',
+            'weight' => '0',
             'visible' => TRUE,
           ),
           'cardbig' => array(
@@ -401,7 +407,7 @@ function materio_content_types_strongarm() {
         ),
         'workflow' => array(
           'cardmedium' => array(
-            'weight' => '99',
+            'weight' => '7',
             'visible' => TRUE,
           ),
           'cardbig' => array(
@@ -724,21 +730,21 @@ function materio_content_types_strongarm() {
       'region' => 'main',
       'weight' => '5',
       'has_required' => FALSE,
-      'title' => 'Vertical tabs',
+      'title' => 'Onglets verticaux',
       'hidden' => 0,
     ),
     'actions' => array(
       'region' => 'right',
-      'weight' => '4',
+      'weight' => '5',
       'has_required' => FALSE,
-      'title' => 'Save',
+      'title' => 'Enregistrer',
       'hidden' => 0,
     ),
     'language' => array(
       'region' => 'right',
-      'weight' => '1',
+      'weight' => '2',
       'has_required' => FALSE,
-      'title' => 'Language',
+      'title' => 'Langue',
       'hidden' => 0,
     ),
     'body' => array(
@@ -764,7 +770,7 @@ function materio_content_types_strongarm() {
     ),
     'field_memo' => array(
       'region' => 'right',
-      'weight' => '2',
+      'weight' => '3',
       'has_required' => FALSE,
       'title' => 'Mémo',
       'hidden' => 0,
@@ -819,10 +825,23 @@ function materio_content_types_strongarm() {
     ),
     'workflow' => array(
       'region' => 'right',
-      'weight' => '3',
+      'weight' => '4',
       'has_required' => FALSE,
-      'title' => 'Publication',
-      'collapsed' => 0,
+      'title' => 'Importé',
+      'hidden' => 0,
+    ),
+    'entity_translation_entity_form_language_update' => array(
+      'region' => 'main',
+      'weight' => '0',
+      'has_required' => FALSE,
+      'title' => NULL,
+      'hidden' => 0,
+    ),
+    'field_showroom' => array(
+      'region' => 'right',
+      'weight' => '1',
+      'has_required' => FALSE,
+      'title' => 'Showroom',
       'hidden' => 0,
     ),
   );
@@ -1037,13 +1056,13 @@ function materio_content_types_strongarm() {
   $strongarm->value = array(
     'title' => array(
       'region' => 'main',
-      'weight' => '0',
+      'weight' => '3',
       'has_required' => TRUE,
       'title' => 'Nom',
     ),
     'additional_settings' => array(
       'region' => 'main',
-      'weight' => '9',
+      'weight' => '6',
       'has_required' => FALSE,
       'title' => 'Onglets verticaux',
       'hidden' => 0,
@@ -1057,21 +1076,21 @@ function materio_content_types_strongarm() {
     ),
     'language' => array(
       'region' => 'right',
-      'weight' => '5',
+      'weight' => '7',
       'has_required' => FALSE,
       'title' => 'Langue',
       'hidden' => 0,
     ),
     'field_memo' => array(
       'region' => 'right',
-      'weight' => '7',
+      'weight' => '9',
       'has_required' => FALSE,
       'title' => 'Mémo',
       'hidden' => 0,
     ),
     'field_localisation' => array(
-      'region' => 'right',
-      'weight' => '2',
+      'region' => 'main',
+      'weight' => '14',
       'has_required' => FALSE,
       'title' => 'Localisation',
       'hidden' => 0,
@@ -1090,66 +1109,121 @@ function materio_content_types_strongarm() {
       'hidden' => 0,
     ),
     'field_reference_materio' => array(
-      'region' => 'main',
-      'weight' => '4',
+      'region' => 'right',
+      'weight' => '2',
       'has_required' => FALSE,
       'title' => 'Référence Materio',
       'hidden' => 0,
     ),
     'field_materiau_ref' => array(
       'region' => 'right',
-      'weight' => '3',
+      'weight' => '5',
       'has_required' => FALSE,
       'title' => 'Materiau(x) lié(s)',
       'hidden' => 0,
     ),
     'field_breve_ref' => array(
       'region' => 'right',
-      'weight' => '4',
+      'weight' => '6',
       'has_required' => FALSE,
       'title' => 'Brève(s) liée(s)',
       'hidden' => 0,
     ),
     'field_workflow_state' => array(
       'region' => 'main',
-      'weight' => '13',
+      'weight' => '9',
       'has_required' => FALSE,
       'title' => 'Workflow State',
       'hidden' => 0,
     ),
     'workflow' => array(
       'region' => 'right',
-      'weight' => '6',
+      'weight' => '8',
       'has_required' => FALSE,
       'title' => 'Importé',
       'hidden' => 0,
     ),
     'entity_translation_entity_form_language_update' => array(
       'region' => 'main',
-      'weight' => '0',
+      'weight' => '4',
       'has_required' => FALSE,
       'title' => NULL,
       'hidden' => 0,
     ),
-    'group_htabs' => array(
+    'field_attachments' => array(
+      'region' => 'main',
+      'weight' => '5',
+      'has_required' => FALSE,
+      'title' => 'Fichiers joints',
+      'hidden' => 0,
+    ),
+    'field_description' => array(
+      'region' => 'main',
+      'weight' => '2',
+      'has_required' => FALSE,
+      'title' => 'Description',
+      'hidden' => 0,
+    ),
+    'field_nature_titre' => array(
+      'region' => 'main',
+      'weight' => '1',
+      'has_required' => FALSE,
+      'title' => 'Nature Titre',
+      'hidden' => 0,
+    ),
+    'field_materiau_image' => array(
+      'region' => 'main',
+      'weight' => '7',
+      'has_required' => FALSE,
+      'title' => 'Image',
+      'hidden' => 0,
+    ),
+    'field_video_filter' => array(
+      'region' => 'main',
+      'weight' => '8',
+      'has_required' => FALSE,
+      'title' => 'video',
+      'hidden' => 0,
+    ),
+    'title_field' => array(
       'region' => 'main',
       'weight' => '0',
+      'has_required' => TRUE,
+      'title' => 'Nom',
+    ),
+    'field_tags_libres' => array(
+      'region' => 'main',
+      'weight' => '11',
       'has_required' => FALSE,
-      'title' => 'htabs (Field group)',
+      'title' => 'Tags libres',
       'hidden' => 0,
     ),
-    'group_media' => array(
+    'field_onthologie' => array(
       'region' => 'main',
-      'weight' => '13',
+      'weight' => '10',
       'has_required' => FALSE,
-      'title' => 'Médias (Field group)',
+      'title' => 'Onthologie',
       'hidden' => 0,
     ),
-    'group_referencement' => array(
+    'field_company_fab' => array(
       'region' => 'main',
       'weight' => '12',
       'has_required' => FALSE,
-      'title' => 'Référencement (Field group)',
+      'title' => 'Fabricant',
+      'hidden' => 0,
+    ),
+    'field_company_distrib' => array(
+      'region' => 'main',
+      'weight' => '13',
+      'has_required' => FALSE,
+      'title' => 'Distributeur',
+      'hidden' => 0,
+    ),
+    'field_showroom_localisation' => array(
+      'region' => 'main',
+      'weight' => '15',
+      'has_required' => FALSE,
+      'title' => 'showroom_localisation',
       'hidden' => 0,
     ),
   );

+ 6 - 5
sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc

@@ -50,7 +50,7 @@ function materio_content_types_views_default_views() {
     'title' => 'title',
   );
   $handler->display->display_options['row_options']['hide_empty'] = TRUE;
-  /* Champ: Contenu : Référence Materio */
+  /* Field: Content: Référence Materio */
   $handler->display->display_options['fields']['field_reference_materio']['id'] = 'field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['field'] = 'field_reference_materio';
@@ -58,7 +58,7 @@ function materio_content_types_views_default_views() {
   $handler->display->display_options['fields']['field_reference_materio']['alter']['text'] = '[field_reference_materio] ';
   $handler->display->display_options['fields']['field_reference_materio']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['field_reference_materio']['hide_empty'] = TRUE;
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
@@ -68,19 +68,19 @@ function materio_content_types_views_default_views() {
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['title']['link_to_node'] = FALSE;
-  /* Critère de tri: Contenu : Date de publication */
+  /* Sort criterion: Content: Post date */
   $handler->display->display_options['sorts']['created']['id'] = 'created';
   $handler->display->display_options['sorts']['created']['table'] = 'node';
   $handler->display->display_options['sorts']['created']['field'] = 'created';
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
@@ -130,6 +130,7 @@ function materio_content_types_views_default_views() {
     t('[field_reference_materio] '),
     t('[field_reference_materio][title]'),
     t('Entity Reference'),
+    t('more'),
   );
   $export['entity_reference_materiaux_breves'] = $view;
 

+ 1 - 0
sites/all/modules/features/materio_home_v2/materio_home_v2.info

@@ -5,6 +5,7 @@ dependencies[] = ctools
 dependencies[] = entity
 dependencies[] = features
 dependencies[] = image
+dependencies[] = materio_content_types
 dependencies[] = materio_publications
 dependencies[] = menu
 dependencies[] = menu_attributes

+ 24 - 22
sites/all/modules/features/materio_home_v2/materio_home_v2.views_default.inc

@@ -38,33 +38,33 @@ function materio_home_v2_views_default_views() {
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['row_plugin'] = 'entity';
   $handler->display->display_options['row_options']['view_mode'] = 'cardbig';
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
   $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
-  /* Critère de tri: Contenu : Date de publication */
+  /* Sort criterion: Content: Post date */
   $handler->display->display_options['sorts']['created']['id'] = 'created';
   $handler->display->display_options['sorts']['created']['table'] = 'node';
   $handler->display->display_options['sorts']['created']['field'] = 'created';
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
     'breve' => 'breve',
   );
-  /* Critère de filtrage: Processus : État actuel */
+  /* Filter criterion: Workflow: Current state */
   $handler->display->display_options['filters']['sid']['id'] = 'sid';
   $handler->display->display_options['filters']['sid']['table'] = 'workflow_node';
   $handler->display->display_options['filters']['sid']['field'] = 'sid';
@@ -104,28 +104,28 @@ function materio_home_v2_views_default_views() {
   $handler->display->display_options['defaults']['row_options'] = FALSE;
   $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
     'simplenews' => 'simplenews',
   );
-  /* Critère de filtrage: Processus : État actuel */
+  /* Filter criterion: Workflow: Current state */
   $handler->display->display_options['filters']['sid']['id'] = 'sid';
   $handler->display->display_options['filters']['sid']['table'] = 'workflow_node';
   $handler->display->display_options['filters']['sid']['field'] = 'sid';
   $handler->display->display_options['filters']['sid']['value'] = array(
     3 => '3',
   );
-  /* Critère de filtrage: Contenu : Newsletter category (field_simplenews_term) */
+  /* Filter criterion: Content: Newsletter category (field_simplenews_term) */
   $handler->display->display_options['filters']['field_simplenews_term_tid']['id'] = 'field_simplenews_term_tid';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['table'] = 'field_data_field_simplenews_term';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['field'] = 'field_simplenews_term_tid';
@@ -134,7 +134,7 @@ function materio_home_v2_views_default_views() {
   );
   $handler->display->display_options['filters']['field_simplenews_term_tid']['type'] = 'select';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['vocabulary'] = 'newsletter';
-  /* Critère de filtrage: Parution de lettre d'information : État des envois */
+  /* Filter criterion: Simplenews issue: Sent status */
   $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
   $handler->display->display_options['filters']['status_1']['table'] = 'simplenews_newsletter';
   $handler->display->display_options['filters']['status_1']['field'] = 'status';
@@ -170,28 +170,28 @@ function materio_home_v2_views_default_views() {
   $handler->display->display_options['defaults']['row_options'] = FALSE;
   $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
     'simplenews' => 'simplenews',
   );
-  /* Critère de filtrage: Processus : État actuel */
+  /* Filter criterion: Workflow: Current state */
   $handler->display->display_options['filters']['sid']['id'] = 'sid';
   $handler->display->display_options['filters']['sid']['table'] = 'workflow_node';
   $handler->display->display_options['filters']['sid']['field'] = 'sid';
   $handler->display->display_options['filters']['sid']['value'] = array(
     3 => '3',
   );
-  /* Critère de filtrage: Contenu : Newsletter category (field_simplenews_term) */
+  /* Filter criterion: Content: Newsletter category (field_simplenews_term) */
   $handler->display->display_options['filters']['field_simplenews_term_tid']['id'] = 'field_simplenews_term_tid';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['table'] = 'field_data_field_simplenews_term';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['field'] = 'field_simplenews_term_tid';
@@ -200,14 +200,14 @@ function materio_home_v2_views_default_views() {
   );
   $handler->display->display_options['filters']['field_simplenews_term_tid']['type'] = 'select';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['vocabulary'] = 'newsletter';
-  /* Critère de filtrage: Parution de lettre d'information : État des envois */
+  /* Filter criterion: Simplenews issue: Sent status */
   $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
   $handler->display->display_options['filters']['status_1']['table'] = 'simplenews_newsletter';
   $handler->display->display_options['filters']['status_1']['field'] = 'status';
   $handler->display->display_options['filters']['status_1']['value'] = array(
     2 => '2',
   );
-  /* Critère de filtrage: Contenu : Visible sur la home (field_visible_sur_la_home) */
+  /* Filter criterion: Content: Visible sur la home (field_visible_sur_la_home) */
   $handler->display->display_options['filters']['field_visible_sur_la_home_value']['id'] = 'field_visible_sur_la_home_value';
   $handler->display->display_options['filters']['field_visible_sur_la_home_value']['table'] = 'field_data_field_visible_sur_la_home';
   $handler->display->display_options['filters']['field_visible_sur_la_home_value']['field'] = 'field_visible_sur_la_home_value';
@@ -235,6 +235,7 @@ function materio_home_v2_views_default_views() {
     t('Asc'),
     t('Desc'),
     t('News'),
+    t('more'),
     t('home v2'),
     t('daily'),
     t('Daily materiO\''),
@@ -271,37 +272,37 @@ function materio_home_v2_views_default_views() {
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['row_plugin'] = 'entity';
   $handler->display->display_options['row_options']['view_mode'] = 'homeblock';
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
   $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
-  /* Critère de tri: Contenu : weight (field_weight) */
+  /* Sort criterion: Content: weight (field_weight) */
   $handler->display->display_options['sorts']['field_weight_value']['id'] = 'field_weight_value';
   $handler->display->display_options['sorts']['field_weight_value']['table'] = 'field_data_field_weight';
   $handler->display->display_options['sorts']['field_weight_value']['field'] = 'field_weight_value';
-  /* Critère de tri: Contenu : Date de publication */
+  /* Sort criterion: Content: Post date */
   $handler->display->display_options['sorts']['created']['id'] = 'created';
   $handler->display->display_options['sorts']['created']['table'] = 'node';
   $handler->display->display_options['sorts']['created']['field'] = 'created';
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
     'publication' => 'publication',
   );
-  /* Critère de filtrage: Processus : État actuel */
+  /* Filter criterion: Workflow: Current state */
   $handler->display->display_options['filters']['sid']['id'] = 'sid';
   $handler->display->display_options['filters']['sid']['table'] = 'workflow_node';
   $handler->display->display_options['filters']['sid']['field'] = 'sid';
@@ -323,6 +324,7 @@ function materio_home_v2_views_default_views() {
     t('Trier par'),
     t('Asc'),
     t('Desc'),
+    t('more'),
     t('Home v2'),
   );
   $export['publication_home_v2'] = $view;

+ 2 - 2
sites/all/modules/features/materio_publications/materio_publications.features.field_base.inc

@@ -10,7 +10,7 @@
 function materio_publications_field_default_field_bases() {
   $field_bases = array();
 
-  // Exported field_base: 'field_couverture'
+  // Exported field_base: 'field_couverture'.
   $field_bases['field_couverture'] = array(
     'active' => 1,
     'cardinality' => 1,
@@ -39,7 +39,7 @@ function materio_publications_field_default_field_bases() {
     'type' => 'image',
   );
 
-  // Exported field_base: 'field_weight'
+  // Exported field_base: 'field_weight'.
   $field_bases['field_weight'] = array(
     'active' => 1,
     'cardinality' => 1,

+ 3 - 3
sites/all/modules/features/materio_publications/materio_publications.features.field_instance.inc

@@ -10,7 +10,7 @@
 function materio_publications_field_default_field_instances() {
   $field_instances = array();
 
-  // Exported field_instance: 'node-publication-body'
+  // Exported field_instance: 'node-publication-body'.
   $field_instances['node-publication-body'] = array(
     'bundle' => 'publication',
     'default_value' => NULL,
@@ -91,7 +91,7 @@ function materio_publications_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-publication-field_couverture'
+  // Exported field_instance: 'node-publication-field_couverture'.
   $field_instances['node-publication-field_couverture'] = array(
     'bundle' => 'publication',
     'deleted' => 0,
@@ -182,7 +182,7 @@ function materio_publications_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-publication-field_weight'
+  // Exported field_instance: 'node-publication-field_weight'.
   $field_instances['node-publication-field_weight'] = array(
     'bundle' => 'publication',
     'default_value' => NULL,

+ 0 - 141
sites/all/modules/features/materio_publications/materio_publications.features.inc

@@ -55,144 +55,3 @@ function materio_publications_node_info() {
   drupal_alter('node_info', $items);
   return $items;
 }
-
-/**
- * Implements hook_workflow_default_workflows().
- */
-function materio_publications_workflow_default_workflows() {
-  $workflows = array();
-
-  // Exported workflow: Publication
-  $workflows['Publication'] = array(
-    'name' => 'Publication',
-    'tab_roles' => '',
-    'options' => 'a:4:{s:16:"comment_log_node";i:0;s:15:"comment_log_tab";i:0;s:13:"name_as_title";i:0;s:12:"watchdog_log";i:1;}',
-    'states' => array(
-      0 => array(
-        'state' => '(creation)',
-        'weight' => -50,
-        'sysid' => 1,
-        'status' => 1,
-        'name' => 'Publication',
-      ),
-      1 => array(
-        'state' => 'Importé',
-        'weight' => 0,
-        'sysid' => 0,
-        'status' => 1,
-        'name' => 'Publication',
-      ),
-      2 => array(
-        'state' => 'Édité',
-        'weight' => 1,
-        'sysid' => 0,
-        'status' => 1,
-        'name' => 'Publication',
-      ),
-      3 => array(
-        'state' => 'Masqué',
-        'weight' => 2,
-        'sysid' => 0,
-        'status' => 1,
-        'name' => 'Publication',
-      ),
-      4 => array(
-        'state' => 'Publié',
-        'weight' => 3,
-        'sysid' => 0,
-        'status' => 1,
-        'name' => 'Publication',
-      ),
-    ),
-    'transitions' => array(
-      0 => array(
-        'roles' => 'workflow_features_author_name,administrator,root',
-        'state' => '(creation)',
-        'target_state' => 'Masqué',
-      ),
-      1 => array(
-        'roles' => 'workflow_features_author_name,administrator,root',
-        'state' => '(creation)',
-        'target_state' => 'Publié',
-      ),
-      2 => array(
-        'roles' => 'root',
-        'state' => '(creation)',
-        'target_state' => 'Importé',
-      ),
-      3 => array(
-        'roles' => 'administrator,root',
-        'state' => 'Importé',
-        'target_state' => 'Édité',
-      ),
-      4 => array(
-        'roles' => 'workflow_features_author_name,administrator,root',
-        'state' => 'Importé',
-        'target_state' => 'Masqué',
-      ),
-      5 => array(
-        'roles' => 'workflow_features_author_name,administrator,root',
-        'state' => 'Importé',
-        'target_state' => 'Publié',
-      ),
-      6 => array(
-        'roles' => 'root',
-        'state' => 'Édité',
-        'target_state' => 'Importé',
-      ),
-      7 => array(
-        'roles' => 'workflow_features_author_name,administrator,root',
-        'state' => 'Édité',
-        'target_state' => 'Masqué',
-      ),
-      8 => array(
-        'roles' => 'workflow_features_author_name,administrator,root',
-        'state' => 'Édité',
-        'target_state' => 'Publié',
-      ),
-      9 => array(
-        'roles' => 'workflow_features_author_name,administrator,root',
-        'state' => 'Masqué',
-        'target_state' => 'Publié',
-      ),
-      10 => array(
-        'roles' => 'root',
-        'state' => 'Masqué',
-        'target_state' => 'Importé',
-      ),
-      11 => array(
-        'roles' => 'workflow_features_author_name,administrator,root',
-        'state' => 'Masqué',
-        'target_state' => 'Édité',
-      ),
-      12 => array(
-        'roles' => 'workflow_features_author_name,administrator,root',
-        'state' => 'Publié',
-        'target_state' => 'Masqué',
-      ),
-      13 => array(
-        'roles' => 'root',
-        'state' => 'Publié',
-        'target_state' => 'Importé',
-      ),
-      14 => array(
-        'roles' => 'workflow_features_author_name,administrator,root',
-        'state' => 'Publié',
-        'target_state' => 'Édité',
-      ),
-    ),
-    'node_types' => array(
-      0 => 'breve',
-      1 => 'company',
-      2 => 'didactique',
-      3 => 'faq',
-      4 => 'looping_embed_video',
-      5 => 'materiau',
-      6 => 'page',
-      7 => 'publication',
-      8 => 'simplenews',
-    ),
-  );
-
-  return $workflows;
-}

+ 3 - 15
sites/all/modules/features/materio_publications/materio_publications.features.user_role.inc

@@ -31,31 +31,19 @@ function materio_publications_user_default_roles() {
   // Exported role: Utilisateur Alpha Tester.
   $roles['Utilisateur Alpha Tester'] = array(
     'name' => 'Utilisateur Alpha Tester',
-    'weight' => 4,
+    'weight' => 5,
   );
 
   // Exported role: administrator.
   $roles['administrator'] = array(
     'name' => 'administrator',
-    'weight' => 8,
+    'weight' => 11,
   );
 
   // Exported role: root.
   $roles['root'] = array(
     'name' => 'root',
-    'weight' => 9,
-  );
-
-  // Exported role: utilisateur anonyme.
-  $roles['utilisateur anonyme'] = array(
-    'name' => 'utilisateur anonyme',
-    'weight' => 0,
-  );
-
-  // Exported role: utilisateur authentifié.
-  $roles['utilisateur authentifié'] = array(
-    'name' => 'utilisateur authentifié',
-    'weight' => 1,
+    'weight' => 12,
   );
 
   return $roles;

+ 8 - 8
sites/all/modules/features/materio_publications/materio_publications.info

@@ -1,10 +1,7 @@
 name = Materio publications
 core = 7.x
 package = Materio
-dependencies[] = ctools
 dependencies[] = features
-dependencies[] = image
-dependencies[] = list
 dependencies[] = materio_content_types
 dependencies[] = metatag
 dependencies[] = node
@@ -32,8 +29,6 @@ features[user_role][] = Unverified
 features[user_role][] = Utilisateur Alpha Tester
 features[user_role][] = administrator
 features[user_role][] = root
-features[user_role][] = utilisateur anonyme
-features[user_role][] = utilisateur authentifié
 features[variable][] = additional_settings__active_tab_publication
 features[variable][] = ant_pattern_publication
 features[variable][] = ant_php_publication
@@ -63,10 +58,15 @@ features[variable][] = unique_field_comp_publication
 features[variable][] = unique_field_fields_publication
 features[variable][] = unique_field_scope_publication
 features[variable][] = unique_field_show_matches_publication
-features[variable][] = workflow_publication
-features[workflow][] = Publication
-features[workflow_access][] = Publication
 features_exclude[dependencies][materio_subscriptions] = materio_subscriptions
 features_exclude[dependencies][options] = options
 features_exclude[dependencies][materio_page_title] = materio_page_title
+features_exclude[dependencies][field_permissions] = field_permissions
+features_exclude[dependencies][image] = image
+features_exclude[dependencies][list] = list
+features_exclude[user_permission][create field_weight] = create field_weight
+features_exclude[user_permission][edit own field_weight] = edit own field_weight
+features_exclude[user_permission][edit field_weight] = edit field_weight
+features_exclude[user_permission][view own field_weight] = view own field_weight
+features_exclude[user_permission][view field_weight] = view field_weight
 project path = sites/all/modules/features

+ 0 - 9
sites/all/modules/features/materio_publications/materio_publications.strongarm.inc

@@ -370,14 +370,5 @@ function materio_publications_strongarm() {
   $strongarm->value = array();
   $export['unique_field_show_matches_publication'] = $strongarm;
 
-  $strongarm = new stdClass();
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'workflow_publication';
-  $strongarm->value = array(
-    0 => 'node',
-  );
-  $export['workflow_publication'] = $strongarm;
-
   return $export;
 }

+ 1 - 1
sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.user_role.inc

@@ -19,7 +19,7 @@ function materio_subscriptions_user_default_roles() {
   // Exported role: Premium.
   $roles['Premium'] = array(
     'name' => 'Premium',
-    'weight' => 7,
+    'weight' => 8,
   );
 
   // Exported role: Utilisateur.

+ 10 - 96
sites/all/modules/features/showroom/showroom.features.field_base.inc

@@ -10,124 +10,38 @@
 function showroom_field_default_field_bases() {
   $field_bases = array();
 
-  // Exported field_base: 'description_field'.
-  $field_bases['description_field'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'description_field',
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(
-      'entity_translation_sync' => FALSE,
-    ),
-    'translatable' => 1,
-    'type' => 'text_with_summary',
-  );
-
-  // Exported field_base: 'field_showroom'.
-  $field_bases['field_showroom'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_showroom',
-    'field_permissions' => array(
-      'type' => 2,
-    ),
-    'indexes' => array(
-      'tid' => array(
-        0 => 'tid',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'taxonomy',
-    'settings' => array(
-      'allowed_values' => array(
-        0 => array(
-          'vocabulary' => 'showroom',
-          'parent' => 0,
-          'depth' => '',
-        ),
-      ),
-      'entity_translation_sync' => FALSE,
-      'options_list_callback' => 'content_taxonomy_allowed_values',
-      'profile2_private' => FALSE,
-    ),
-    'translatable' => 0,
-    'type' => 'taxonomy_term_reference',
-  );
-
-  // Exported field_base: 'field_showroom_localisation'.
-  $field_bases['field_showroom_localisation'] = array(
+  // Exported field_base: 'field_location'.
+  $field_bases['field_location'] = array(
     'active' => 1,
     'cardinality' => -1,
     'deleted' => 0,
     'entity_types' => array(),
-    'field_name' => 'field_showroom_localisation',
-    'field_permissions' => array(
-      'type' => 2,
-    ),
-    'indexes' => array(
-      'revision_id' => array(
-        0 => 'revision_id',
-      ),
-      'value' => array(
-        0 => 'value',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'field_collection',
-    'settings' => array(
-      'entity_translation_sync' => FALSE,
-      'hide_blank_items' => 1,
-      'hide_initial_item' => 0,
-      'path' => '',
-      'profile2_private' => FALSE,
-    ),
-    'translatable' => 0,
-    'type' => 'field_collection',
-  );
-
-  // Exported field_base: 'field_showroom_localisation_loca'.
-  $field_bases['field_showroom_localisation_loca'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_showroom_localisation_loca',
+    'field_name' => 'field_location',
     'field_permissions' => array(
       'type' => 2,
     ),
     'indexes' => array(
-      'format' => array(
-        0 => 'format',
+      'location' => array(
+        0 => 'location',
       ),
     ),
     'locked' => 0,
-    'module' => 'text',
+    'module' => 'materio_showroom',
     'settings' => array(
       'entity_translation_sync' => FALSE,
-      'max_length' => 255,
       'profile2_private' => FALSE,
     ),
     'translatable' => 0,
-    'type' => 'text',
+    'type' => 'field_materio_showroom_location',
   );
 
-  // Exported field_base: 'field_showroom_localisation_show'.
-  $field_bases['field_showroom_localisation_show'] = array(
+  // Exported field_base: 'field_showroom'.
+  $field_bases['field_showroom'] = array(
     'active' => 1,
     'cardinality' => 1,
     'deleted' => 0,
     'entity_types' => array(),
-    'field_name' => 'field_showroom_localisation_show',
+    'field_name' => 'field_showroom',
     'field_permissions' => array(
       'type' => 2,
     ),

+ 70 - 80
sites/all/modules/features/showroom/showroom.features.field_instance.inc

@@ -10,60 +10,65 @@
 function showroom_field_default_field_instances() {
   $field_instances = array();
 
-  // Exported field_instance:
-  // 'field_collection_item-field_showroom_localisation-field_showroom_localisation_loca'.
-  $field_instances['field_collection_item-field_showroom_localisation-field_showroom_localisation_loca'] = array(
-    'bundle' => 'field_showroom_localisation',
+  // Exported field_instance: 'node-breve-field_showroom'.
+  $field_instances['node-breve-field_showroom'] = array(
+    'bundle' => 'breve',
     'default_value' => NULL,
     'deleted' => 0,
     'description' => '',
     'display' => array(
-      'default' => array(
-        'label' => 'hidden',
-        'module' => 'text',
+      'bookmark' => array(
+        'label' => 'above',
         'settings' => array(),
-        'type' => 'text_default',
-        'weight' => 1,
+        'type' => 'hidden',
+        'weight' => 0,
       ),
-    ),
-    'entity_type' => 'field_collection_item',
-    'field_name' => 'field_showroom_localisation_loca',
-    'label' => 'Localisation',
-    'required' => 0,
-    'settings' => array(
-      'entity_translation_sync' => FALSE,
-      'text_processing' => 0,
-      'user_register_form' => FALSE,
-    ),
-    'widget' => array(
-      'active' => 1,
-      'module' => 'text',
-      'settings' => array(
-        'size' => 60,
+      'cardbig' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'cardfull' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'cardmedium' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'cardsmall' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
       ),
-      'type' => 'text_textfield',
-      'weight' => 32,
-    ),
-  );
-
-  // Exported field_instance:
-  // 'field_collection_item-field_showroom_localisation-field_showroom_localisation_show'.
-  $field_instances['field_collection_item-field_showroom_localisation-field_showroom_localisation_show'] = array(
-    'bundle' => 'field_showroom_localisation',
-    'default_value' => NULL,
-    'deleted' => 0,
-    'description' => '[current-user:field-showroom:tid]',
-    'display' => array(
       'default' => array(
-        'label' => 'hidden',
+        'label' => 'above',
         'module' => 'taxonomy',
         'settings' => array(),
-        'type' => 'taxonomy_term_reference_plain',
+        'type' => 'taxonomy_term_reference_link',
+        'weight' => 12,
+      ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
         'weight' => 0,
       ),
     ),
-    'entity_type' => 'field_collection_item',
-    'field_name' => 'field_showroom_localisation_show',
+    'entity_type' => 'node',
+    'field_name' => 'field_showroom',
     'label' => 'Showroom',
     'required' => 0,
     'settings' => array(
@@ -72,22 +77,20 @@ function showroom_field_default_field_instances() {
     ),
     'widget' => array(
       'active' => 1,
-      'module' => 'taxonomy',
+      'module' => 'field_extrawidgets',
       'settings' => array(
-        'autocomplete_path' => 'taxonomy/autocomplete',
-        'content_taxonomy_autocomplete_new_terms' => 'allow',
-        'display_empty' => 1,
-        'formatter' => 'taxonomy_term_reference_link',
+        'content_taxonomy_opt_groups' => 0,
+        'display_empty' => 0,
+        'formatter' => '',
         'formatter_settings' => array(),
-        'size' => 60,
       ),
-      'type' => 'taxonomy_autocomplete',
-      'weight' => 31,
+      'type' => 'field_extrawidgets_read_only',
+      'weight' => 4,
     ),
   );
 
-  // Exported field_instance: 'node-materiau-field_showroom_localisation'.
-  $field_instances['node-materiau-field_showroom_localisation'] = array(
+  // Exported field_instance: 'node-materiau-field_location'.
+  $field_instances['node-materiau-field_location'] = array(
     'bundle' => 'materiau',
     'default_value' => NULL,
     'deleted' => 0,
@@ -113,16 +116,9 @@ function showroom_field_default_field_instances() {
       ),
       'cardmedium' => array(
         'label' => 'above',
-        'module' => 'field_collection',
-        'settings' => array(
-          'add' => '',
-          'delete' => '',
-          'description' => 1,
-          'edit' => '',
-          'view_mode' => 'full',
-        ),
-        'type' => 'field_collection_view',
-        'weight' => 9,
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -132,15 +128,9 @@ function showroom_field_default_field_instances() {
       ),
       'default' => array(
         'label' => 'above',
-        'module' => 'field_collection',
-        'settings' => array(
-          'add' => 'Ajouter',
-          'delete' => 'Supprimer',
-          'description' => TRUE,
-          'edit' => 'Modifier',
-          'view_mode' => 'full',
-        ),
-        'type' => 'field_collection_view',
+        'module' => 'materio_showroom',
+        'settings' => array(),
+        'type' => 'materio_showroom_location_simple_text',
         'weight' => 25,
       ),
       'homeblock' => array(
@@ -163,19 +153,21 @@ function showroom_field_default_field_instances() {
       ),
     ),
     'entity_type' => 'node',
-    'field_name' => 'field_showroom_localisation',
-    'label' => 'showroom_localisation',
+    'field_name' => 'field_location',
+    'label' => 'Location',
     'required' => 0,
     'settings' => array(
       'entity_translation_sync' => FALSE,
       'user_register_form' => FALSE,
     ),
     'widget' => array(
-      'active' => 0,
-      'module' => 'field_collection',
-      'settings' => array(),
-      'type' => 'field_collection_embed',
-      'weight' => 5,
+      'active' => 1,
+      'module' => 'materio_showroom',
+      'settings' => array(
+        'vocabulary' => 19,
+      ),
+      'type' => 'materio_showroom_location_text',
+      'weight' => -2,
     ),
   );
 
@@ -1269,13 +1261,11 @@ function showroom_field_default_field_instances() {
   t('Body');
   t('Description');
   t('Email');
-  t('Localisation');
+  t('Location');
   t('Mémo');
   t('Nom');
   t('Phone');
   t('Showroom');
-  t('[current-user:field-showroom:tid]');
-  t('showroom_localisation');
 
   return $field_instances;
 }

+ 4 - 3
sites/all/modules/features/showroom/showroom.features.menu_links.inc

@@ -24,10 +24,11 @@ function showroom_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => 0,
-    'customized' => 0,
+    'weight' => -44,
+    'customized' => 1,
     'language' => 'und',
-    'menu_links_customized' => 0,
+    'menu_links_customized' => 1,
+    'parent_identifier' => 'navigation_add-content:node/add',
   );
 
   // Translatables

+ 50 - 74
sites/all/modules/features/showroom/showroom.features.user_permission.inc

@@ -10,9 +10,9 @@
 function showroom_user_default_permissions() {
   $permissions = array();
 
-  // Exported permission: 'assign Showroom role'.
-  $permissions['assign Showroom role'] = array(
-    'name' => 'assign Showroom role',
+  // Exported permission: 'assign Admin showroom role'.
+  $permissions['assign Admin showroom role'] = array(
+    'name' => 'assign Admin showroom role',
     'roles' => array(
       'administrator' => 'administrator',
       'root' => 'root',
@@ -20,34 +20,27 @@ function showroom_user_default_permissions() {
     'module' => 'role_delegation',
   );
 
-  // Exported permission: 'create field_showroom'.
-  $permissions['create field_showroom'] = array(
-    'name' => 'create field_showroom',
+  // Exported permission: 'create field_location'.
+  $permissions['create field_location'] = array(
+    'name' => 'create field_location',
     'roles' => array(
+      'Admin showroom' => 'Admin showroom',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
   );
 
-  // Exported permission: 'create field_showroom_localisation'.
-  $permissions['create field_showroom_localisation'] = array(
-    'name' => 'create field_showroom_localisation',
+  // Exported permission: 'create field_showroom'.
+  $permissions['create field_showroom'] = array(
+    'name' => 'create field_showroom',
     'roles' => array(
-      'Showroom' => 'Showroom',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
   );
 
-  // Exported permission: 'create field_showroom_localisation_show'.
-  $permissions['create field_showroom_localisation_show'] = array(
-    'name' => 'create field_showroom_localisation_show',
-    'roles' => array(),
-    'module' => 'field_permissions',
-  );
-
   // Exported permission: 'create field_tode_showroom'.
   $permissions['create field_tode_showroom'] = array(
     'name' => 'create field_tode_showroom',
@@ -117,19 +110,20 @@ function showroom_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: 'edit field_showroom'.
-  $permissions['edit field_showroom'] = array(
-    'name' => 'edit field_showroom',
+  // Exported permission: 'edit field_location'.
+  $permissions['edit field_location'] = array(
+    'name' => 'edit field_location',
     'roles' => array(
+      'Admin showroom' => 'Admin showroom',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
   );
 
-  // Exported permission: 'edit field_showroom_localisation'.
-  $permissions['edit field_showroom_localisation'] = array(
-    'name' => 'edit field_showroom_localisation',
+  // Exported permission: 'edit field_showroom'.
+  $permissions['edit field_showroom'] = array(
+    'name' => 'edit field_showroom',
     'roles' => array(
       'administrator' => 'administrator',
       'root' => 'root',
@@ -137,13 +131,6 @@ function showroom_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
-  // Exported permission: 'edit field_showroom_localisation_show'.
-  $permissions['edit field_showroom_localisation_show'] = array(
-    'name' => 'edit field_showroom_localisation_show',
-    'roles' => array(),
-    'module' => 'field_permissions',
-  );
-
   // Exported permission: 'edit field_tode_showroom'.
   $permissions['edit field_tode_showroom'] = array(
     'name' => 'edit field_tode_showroom',
@@ -154,19 +141,20 @@ function showroom_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
-  // Exported permission: 'edit own field_showroom'.
-  $permissions['edit own field_showroom'] = array(
-    'name' => 'edit own field_showroom',
+  // Exported permission: 'edit own field_location'.
+  $permissions['edit own field_location'] = array(
+    'name' => 'edit own field_location',
     'roles' => array(
+      'Admin showroom' => 'Admin showroom',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
   );
 
-  // Exported permission: 'edit own field_showroom_localisation'.
-  $permissions['edit own field_showroom_localisation'] = array(
-    'name' => 'edit own field_showroom_localisation',
+  // Exported permission: 'edit own field_showroom'.
+  $permissions['edit own field_showroom'] = array(
+    'name' => 'edit own field_showroom',
     'roles' => array(
       'administrator' => 'administrator',
       'root' => 'root',
@@ -174,13 +162,6 @@ function showroom_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
-  // Exported permission: 'edit own field_showroom_localisation_show'.
-  $permissions['edit own field_showroom_localisation_show'] = array(
-    'name' => 'edit own field_showroom_localisation_show',
-    'roles' => array(),
-    'module' => 'field_permissions',
-  );
-
   // Exported permission: 'edit own field_tode_showroom'.
   $permissions['edit own field_tode_showroom'] = array(
     'name' => 'edit own field_tode_showroom',
@@ -229,6 +210,13 @@ function showroom_user_default_permissions() {
     'module' => 'override_node_options',
   );
 
+  // Exported permission: 'materio showroom migrate fields'.
+  $permissions['materio showroom migrate fields'] = array(
+    'name' => 'materio showroom migrate fields',
+    'roles' => array(),
+    'module' => 'materio_showroom',
+  );
+
   // Exported permission: 'merge showroom terms'.
   $permissions['merge showroom terms'] = array(
     'name' => 'merge showroom terms',
@@ -296,26 +284,31 @@ function showroom_user_default_permissions() {
   $permissions['show showroom title'] = array(
     'name' => 'show showroom title',
     'roles' => array(
-      'Showroom' => 'Showroom',
+      'Admin showroom' => 'Admin showroom',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'materio_page_title',
   );
 
-  // Exported permission: 'view field_showroom'.
-  $permissions['view field_showroom'] = array(
-    'name' => 'view field_showroom',
+  // Exported permission: 'view field_location'.
+  $permissions['view field_location'] = array(
+    'name' => 'view field_location',
     'roles' => array(
+      'Adhérent' => 'Adhérent',
+      'Admin showroom' => 'Admin showroom',
+      'Premium' => 'Premium',
+      'Student' => 'Student',
+      'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
   );
 
-  // Exported permission: 'view field_showroom_localisation'.
-  $permissions['view field_showroom_localisation'] = array(
-    'name' => 'view field_showroom_localisation',
+  // Exported permission: 'view field_showroom'.
+  $permissions['view field_showroom'] = array(
+    'name' => 'view field_showroom',
     'roles' => array(
       'administrator' => 'administrator',
       'root' => 'root',
@@ -323,16 +316,6 @@ function showroom_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
-  // Exported permission: 'view field_showroom_localisation_show'.
-  $permissions['view field_showroom_localisation_show'] = array(
-    'name' => 'view field_showroom_localisation_show',
-    'roles' => array(
-      'anonymous user' => 'anonymous user',
-      'authenticated user' => 'authenticated user',
-    ),
-    'module' => 'field_permissions',
-  );
-
   // Exported permission: 'view field_tode_showroom'.
   $permissions['view field_tode_showroom'] = array(
     'name' => 'view field_tode_showroom',
@@ -343,34 +326,27 @@ function showroom_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
-  // Exported permission: 'view own field_showroom'.
-  $permissions['view own field_showroom'] = array(
-    'name' => 'view own field_showroom',
+  // Exported permission: 'view own field_location'.
+  $permissions['view own field_location'] = array(
+    'name' => 'view own field_location',
     'roles' => array(
+      'Admin showroom' => 'Admin showroom',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
   );
 
-  // Exported permission: 'view own field_showroom_localisation'.
-  $permissions['view own field_showroom_localisation'] = array(
-    'name' => 'view own field_showroom_localisation',
+  // Exported permission: 'view own field_showroom'.
+  $permissions['view own field_showroom'] = array(
+    'name' => 'view own field_showroom',
     'roles' => array(
-      'Showroom' => 'Showroom',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
   );
 
-  // Exported permission: 'view own field_showroom_localisation_show'.
-  $permissions['view own field_showroom_localisation_show'] = array(
-    'name' => 'view own field_showroom_localisation_show',
-    'roles' => array(),
-    'module' => 'field_permissions',
-  );
-
   // Exported permission: 'view own field_tode_showroom'.
   $permissions['view own field_tode_showroom'] = array(
     'name' => 'view own field_tode_showroom',

+ 4 - 4
sites/all/modules/features/showroom/showroom.features.user_role.inc

@@ -10,10 +10,10 @@
 function showroom_user_default_roles() {
   $roles = array();
 
-  // Exported role: Showroom.
-  $roles['Showroom'] = array(
-    'name' => 'Showroom',
-    'weight' => 13,
+  // Exported role: Admin showroom.
+  $roles['Admin showroom'] = array(
+    'name' => 'Admin showroom',
+    'weight' => 10,
   );
 
   return $roles;

+ 1 - 34
sites/all/modules/features/showroom/showroom.field_group.inc

@@ -24,7 +24,7 @@ function showroom_field_group_info() {
     'weight' => '17',
     'children' => array(
       0 => 'field_localisation',
-      1 => 'field_showroom_localisation',
+      1 => 'field_location',
     ),
     'format_type' => 'htab',
     'format_settings' => array(
@@ -38,42 +38,9 @@ function showroom_field_group_info() {
   );
   $field_groups['group_showroom|node|materiau|form'] = $field_group;
 
-  $field_group = new stdClass();
-  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
-  $field_group->api_version = 1;
-  $field_group->identifier = 'group_side6|node|materiau|cardmedium';
-  $field_group->group_name = 'group_side6';
-  $field_group->entity_type = 'node';
-  $field_group->bundle = 'materiau';
-  $field_group->mode = 'cardmedium';
-  $field_group->parent_name = '';
-  $field_group->data = array(
-    'label' => 'side 6',
-    'weight' => '6',
-    'children' => array(
-      0 => 'field_showroom_localisation',
-    ),
-    'format_type' => 'div',
-    'format_settings' => array(
-      'label' => 'side 6',
-      'instance_settings' => array(
-        'id' => '',
-        'classes' => 'side group-side6 field-group-div',
-        'description' => '',
-        'show_label' => '0',
-        'label_element' => 'h3',
-        'effect' => 'none',
-        'speed' => 'fast',
-      ),
-      'formatter' => 'open',
-    ),
-  );
-  $field_groups['group_side6|node|materiau|cardmedium'] = $field_group;
-
   // Translatables
   // Included for use with string extractors like potx.
   t('Showroom');
-  t('side 6');
 
   return $field_groups;
 }

+ 48 - 23
sites/all/modules/features/showroom/showroom.info

@@ -6,15 +6,16 @@ dependencies[] = administerusersbyrole
 dependencies[] = cck_phone
 dependencies[] = ctools
 dependencies[] = email
+dependencies[] = entity
 dependencies[] = features
-dependencies[] = field_collection
+dependencies[] = features_translations
+dependencies[] = field_extrawidgets
 dependencies[] = field_group
 dependencies[] = field_permissions
 dependencies[] = materio_content_types
 dependencies[] = materio_page_title
 dependencies[] = materio_showroom
 dependencies[] = materio_subscriptions
-dependencies[] = materio_user_profiles
 dependencies[] = menu
 dependencies[] = metatag
 dependencies[] = node
@@ -30,17 +31,12 @@ dependencies[] = tode
 features[ctools][] = field_group:field_group:1
 features[ctools][] = strongarm:strongarm:1
 features[features_api][] = api:2
-features[field_base][] = description_field
+features[field_base][] = field_location
 features[field_base][] = field_showroom
-features[field_base][] = field_showroom_localisation
-features[field_base][] = field_showroom_localisation_loca
-features[field_base][] = field_showroom_localisation_show
 features[field_base][] = field_tode_showroom
 features[field_group][] = group_showroom|node|materiau|form
-features[field_group][] = group_side6|node|materiau|cardmedium
-features[field_instance][] = field_collection_item-field_showroom_localisation-field_showroom_localisation_loca
-features[field_instance][] = field_collection_item-field_showroom_localisation-field_showroom_localisation_show
-features[field_instance][] = node-materiau-field_showroom_localisation
+features[field_instance][] = node-breve-field_showroom
+features[field_instance][] = node-materiau-field_location
 features[field_instance][] = node-showroom-body
 features[field_instance][] = node-showroom-field_memo
 features[field_instance][] = node-showroom-field_public_address
@@ -54,10 +50,9 @@ features[menu_links][] = navigation_showroom:node/add/showroom
 features[node][] = showroom
 features[rules_config][] = rules_auto_tag_news_with_showroom
 features[taxonomy][] = showroom
-features[user_permission][] = assign Showroom role
+features[user_permission][] = assign Admin showroom role
+features[user_permission][] = create field_location
 features[user_permission][] = create field_showroom
-features[user_permission][] = create field_showroom_localisation
-features[user_permission][] = create field_showroom_localisation_show
 features[user_permission][] = create field_tode_showroom
 features[user_permission][] = create showroom content
 features[user_permission][] = delete any showroom content
@@ -65,18 +60,17 @@ features[user_permission][] = delete own showroom content
 features[user_permission][] = delete terms in showroom
 features[user_permission][] = delete users with role 13
 features[user_permission][] = edit any showroom content
+features[user_permission][] = edit field_location
 features[user_permission][] = edit field_showroom
-features[user_permission][] = edit field_showroom_localisation
-features[user_permission][] = edit field_showroom_localisation_show
 features[user_permission][] = edit field_tode_showroom
+features[user_permission][] = edit own field_location
 features[user_permission][] = edit own field_showroom
-features[user_permission][] = edit own field_showroom_localisation
-features[user_permission][] = edit own field_showroom_localisation_show
 features[user_permission][] = edit own field_tode_showroom
 features[user_permission][] = edit own showroom content
 features[user_permission][] = edit terms in showroom
 features[user_permission][] = edit users with role 13
 features[user_permission][] = enter showroom revision log entry
+features[user_permission][] = materio showroom migrate fields
 features[user_permission][] = merge showroom terms
 features[user_permission][] = override showroom authored by option
 features[user_permission][] = override showroom authored on option
@@ -85,15 +79,13 @@ features[user_permission][] = override showroom published option
 features[user_permission][] = override showroom revision option
 features[user_permission][] = override showroom sticky option
 features[user_permission][] = show showroom title
+features[user_permission][] = view field_location
 features[user_permission][] = view field_showroom
-features[user_permission][] = view field_showroom_localisation
-features[user_permission][] = view field_showroom_localisation_show
 features[user_permission][] = view field_tode_showroom
+features[user_permission][] = view own field_location
 features[user_permission][] = view own field_showroom
-features[user_permission][] = view own field_showroom_localisation
-features[user_permission][] = view own field_showroom_localisation_show
 features[user_permission][] = view own field_tode_showroom
-features[user_role][] = Showroom
+features[user_role][] = Admin showroom
 features[variable][] = additional_settings__active_tab_showroom
 features[variable][] = ant_pattern_showroom
 features[variable][] = ant_php_showroom
@@ -106,11 +98,16 @@ features[variable][] = diff_show_preview_changes_node_showroom
 features[variable][] = diff_view_mode_preview_node_showroom
 features[variable][] = entity_translation_hide_translation_links_showroom
 features[variable][] = entity_translation_node_metadata_showroom
-features[variable][] = field_bundle_settings_field_collection_item__field_showroom_localisation
+features[variable][] = entity_translation_settings_node__showroom
 features[variable][] = field_bundle_settings_node__showroom
 features[variable][] = i18n_node_extended_showroom
 features[variable][] = i18n_node_options_showroom
 features[variable][] = language_content_type_showroom
+features[variable][] = materio_showroom_migrate_default_term
+features[variable][] = materio_showroom_migrate_node_type
+features[variable][] = materio_showroom_migrate_source_field
+features[variable][] = materio_showroom_migrate_target_field
+features[variable][] = materio_showroom_migrate_vocabulary
 features[variable][] = menu_options_showroom
 features[variable][] = menu_parent_showroom
 features[variable][] = metatag_enable_node__showroom
@@ -128,4 +125,32 @@ features[variable][] = unique_field_comp_showroom
 features[variable][] = unique_field_fields_showroom
 features[variable][] = unique_field_scope_showroom
 features[variable][] = unique_field_show_matches_showroom
+features[variable][] = workflow_showroom
+features_exclude[field_base][field_memo] = field_memo
+features_exclude[field_base][field_public_phone] = field_public_phone
+features_exclude[field_base][field_public_address] = field_public_address
+features_exclude[field_base][field_public_email] = field_public_email
+features_exclude[field_base][name_field] = name_field
+features_exclude[field_base][description_field] = description_field
+features_exclude[user_permission][create field_memo] = create field_memo
+features_exclude[user_permission][edit own field_memo] = edit own field_memo
+features_exclude[user_permission][edit field_memo] = edit field_memo
+features_exclude[user_permission][view own field_memo] = view own field_memo
+features_exclude[user_permission][view field_memo] = view field_memo
+features_exclude[user_permission][create field_public_phone] = create field_public_phone
+features_exclude[user_permission][edit own field_public_phone] = edit own field_public_phone
+features_exclude[user_permission][edit field_public_phone] = edit field_public_phone
+features_exclude[user_permission][view own field_public_phone] = view own field_public_phone
+features_exclude[user_permission][view field_public_phone] = view field_public_phone
+features_exclude[user_permission][create field_public_address] = create field_public_address
+features_exclude[user_permission][edit own field_public_address] = edit own field_public_address
+features_exclude[user_permission][edit field_public_address] = edit field_public_address
+features_exclude[user_permission][view own field_public_address] = view own field_public_address
+features_exclude[user_permission][view field_public_address] = view field_public_address
+features_exclude[user_permission][create field_public_email] = create field_public_email
+features_exclude[user_permission][edit own field_public_email] = edit own field_public_email
+features_exclude[user_permission][edit field_public_email] = edit field_public_email
+features_exclude[user_permission][view own field_public_email] = view own field_public_email
+features_exclude[user_permission][view field_public_email] = view field_public_email
+features_exclude[field_group][group_htabs|node|materiau|form] = group_htabs|node|materiau|form
 project path = sites/all/modules/features

+ 51 - 24
sites/all/modules/features/showroom/showroom.strongarm.inc

@@ -101,32 +101,15 @@ return t($items[0][\'name\']);
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
-  $strongarm->name = 'field_bundle_settings_field_collection_item__field_showroom_localisation';
+  $strongarm->name = 'entity_translation_settings_node__showroom';
   $strongarm->value = array(
-    'view_modes' => array(
-      'full' => array(
-        'custom_settings' => FALSE,
-      ),
-      'diff_standard' => array(
-        'custom_settings' => FALSE,
-      ),
-      'print' => array(
-        'custom_settings' => FALSE,
-      ),
-      'token' => array(
-        'custom_settings' => FALSE,
-      ),
-    ),
-    'extra_fields' => array(
-      'form' => array(
-        'redirect' => array(
-          'weight' => '30',
-        ),
-      ),
-      'display' => array(),
-    ),
+    'default_language' => 'und',
+    'hide_language_selector' => 0,
+    'exclude_language_none' => 0,
+    'lock_language' => 0,
+    'shared_fields_original_only' => 0,
   );
-  $export['field_bundle_settings_field_collection_item__field_showroom_localisation'] = $strongarm;
+  $export['entity_translation_settings_node__showroom'] = $strongarm;
 
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
@@ -224,6 +207,41 @@ return t($items[0][\'name\']);
   $strongarm->value = '4';
   $export['language_content_type_showroom'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'materio_showroom_migrate_default_term';
+  $strongarm->value = '7557';
+  $export['materio_showroom_migrate_default_term'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'materio_showroom_migrate_node_type';
+  $strongarm->value = 'materiau';
+  $export['materio_showroom_migrate_node_type'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'materio_showroom_migrate_source_field';
+  $strongarm->value = 'field_localisation';
+  $export['materio_showroom_migrate_source_field'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'materio_showroom_migrate_target_field';
+  $strongarm->value = 'field_location';
+  $export['materio_showroom_migrate_target_field'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'materio_showroom_migrate_vocabulary';
+  $strongarm->value = '19';
+  $export['materio_showroom_migrate_vocabulary'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
@@ -417,5 +435,14 @@ return t($items[0][\'name\']);
   $strongarm->value = array();
   $export['unique_field_show_matches_showroom'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'workflow_showroom';
+  $strongarm->value = array(
+    0 => 'node',
+  );
+  $export['workflow_showroom'] = $strongarm;
+
   return $export;
 }

+ 0 - 26
sites/all/modules/features/translations/translations.features.language.inc

@@ -10,19 +10,6 @@
 function translations_locale_default_languages() {
   $languages = array();
 
-  // Exported language: cs.
-  $languages['cs'] = array(
-    'language' => 'cs',
-    'name' => 'Czech',
-    'native' => 'Čeština',
-    'direction' => 0,
-    'enabled' => 1,
-    'plurals' => 3,
-    'formula' => '(((($n%10)==1)&&(($n%100)!=11))?(0):((((($n%10)>=2)&&(($n%10)<=4))&&((($n%100)<10)||(($n%100)>=20)))?(1):2))',
-    'domain' => '',
-    'prefix' => 'cs',
-    'weight' => 0,
-  );
   // Exported language: en.
   $languages['en'] = array(
     'language' => 'en',
@@ -49,18 +36,5 @@ function translations_locale_default_languages() {
     'prefix' => 'fr',
     'weight' => -9,
   );
-  // Exported language: zh-hans.
-  $languages['zh-hans'] = array(
-    'language' => 'zh-hans',
-    'name' => 'Chinese, Simplified',
-    'native' => '简体中文',
-    'direction' => 0,
-    'enabled' => 1,
-    'plurals' => 2,
-    'formula' => '($n!=1)',
-    'domain' => '',
-    'prefix' => 'zh-hans',
-    'weight' => 0,
-  );
   return $languages;
 }

+ 20 - 0
sites/all/modules/features/translations/translations.features.user_role.inc

@@ -0,0 +1,20 @@
+<?php
+/**
+ * @file
+ * translations.features.user_role.inc
+ */
+
+/**
+ * Implements hook_user_default_roles().
+ */
+function translations_user_default_roles() {
+  $roles = array();
+
+  // Exported role: Translator.
+  $roles['Translator'] = array(
+    'name' => 'Translator',
+    'weight' => 9,
+  );
+
+  return $roles;
+}

+ 5 - 40
sites/all/modules/features/translations/translations.info

@@ -2,55 +2,20 @@ name = Translations
 core = 7.x
 package = Materio
 version = 7.x-1.0-beta
-dependencies[] = ctools
-dependencies[] = features
-dependencies[] = features_translations
-dependencies[] = locale
-dependencies[] = strongarm
 features[ctools][] = strongarm:strongarm:1
 features[features_api][] = api:2
-features[language][] = cs
 features[language][] = en
 features[language][] = fr
-features[language][] = zh-hans
-features[translations_cs][] = cs:blocks
-features[translations_cs][] = cs:default
-features[translations_cs][] = cs:field
-features[translations_cs][] = cs:menu
-features[translations_cs][] = cs:metatag
-features[translations_cs][] = cs:node
-features[translations_cs][] = cs:profile2
-features[translations_cs][] = cs:rules
-features[translations_cs][] = cs:uc_attribute
-features[translations_cs][] = cs:uc_order_status
-features[translations_cs][] = cs:webform
-features[translations_fr][] = fr:blocks
-features[translations_fr][] = fr:default
-features[translations_fr][] = fr:field
-features[translations_fr][] = fr:menu
-features[translations_fr][] = fr:metatag
-features[translations_fr][] = fr:node
-features[translations_fr][] = fr:profile2
-features[translations_fr][] = fr:rules
-features[translations_fr][] = fr:uc_attribute
-features[translations_fr][] = fr:uc_order_status
-features[translations_fr][] = fr:webform
-features[translations_zh_hans][] = zh_hans:blocks
-features[translations_zh_hans][] = zh_hans:default
-features[translations_zh_hans][] = zh_hans:field
-features[translations_zh_hans][] = zh_hans:menu
-features[translations_zh_hans][] = zh_hans:metatag
-features[translations_zh_hans][] = zh_hans:node
-features[translations_zh_hans][] = zh_hans:profile2
-features[translations_zh_hans][] = zh_hans:rules
-features[translations_zh_hans][] = zh_hans:uc_attribute
-features[translations_zh_hans][] = zh_hans:uc_order_status
-features[translations_zh_hans][] = zh_hans:webform
 features[user_permission][] = administer languages
 features[user_permission][] = translate interface
+features[user_role][] = Translator
 features[variable][] = i18n_node_translation_switch
 features[variable][] = locale_field_language_fallback
 features[variable][] = locale_language_negotiation_url_part
 features[variable][] = locale_language_providers_weight_language
 features[variable][] = taxonomy_csv_locale_custom
+features_exclude[dependencies][ctools] = ctools
+features_exclude[dependencies][features] = features
+features_exclude[dependencies][locale] = locale
+features_exclude[dependencies][strongarm] = strongarm
 project path = sites/all/modules/features

+ 5 - 5
sites/all/modules/features/translations/translations.strongarm.inc

@@ -36,11 +36,11 @@ function translations_strongarm() {
   $strongarm->api_version = 1;
   $strongarm->name = 'locale_language_providers_weight_language';
   $strongarm->value = array(
-    'locale-url' => '-8',
-    'locale-session' => '-6',
-    'locale-user' => '-4',
-    'locale-browser' => '-2',
-    'language-default' => '10',
+    'locale-user' => '-9',
+    'locale-url' => '-10',
+    'locale-session' => '-8',
+    'locale-browser' => '-7',
+    'language-default' => '-6',
   );
   $export['locale_language_providers_weight_language'] = $strongarm;