updated amdin content-types showroom features

sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc

@@ -29,25 +29,6 @@ function materio_administration_menu_default_menu_links() {
     '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',
@@ -83,7 +64,7 @@ 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,
@@ -104,25 +85,30 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -43,
+    'weight' => -47,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
     '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,
@@ -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_boutique:admin/store',
+    'parent_identifier' => 'navigation_store:admin/store',
   );
   // Exported menu link: navigation_didactique:node/add/didactique.
   $menu_links['navigation_didactique:node/add/didactique'] = array(
@@ -317,11 +308,11 @@ 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_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(
@@ -392,7 +383,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -40,
+    'weight' => -41,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -417,7 +408,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_users:admin/users',
   );
   // Exported menu link: navigation_frequently-asked-questions:faq-page.
   $menu_links['navigation_frequently-asked-questions:faq-page'] = array(
@@ -452,11 +442,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -47,
+    'weight' => -44,
     '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' => -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_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' => -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_ip-address-tracking:admin/reports/ip_tracking.
   $menu_links['navigation_ip-address-tracking:admin/reports/ip_tracking'] = array(
@@ -520,28 +510,6 @@ function materio_administration_menu_default_menu_links() {
     '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,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_my-account:user',
-  );
   // Exported menu link: navigation_looping-embed-video:node/add/looping-embed-video.
   $menu_links['navigation_looping-embed-video:node/add/looping-embed-video'] = array(
     'menu_name' => 'navigation',
@@ -560,11 +528,7 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-<<<<<<< HEAD
-    'parent_identifier' => 'navigation_boutique:admin/store',
-=======
     'parent_identifier' => 'navigation_add-content:node/add',
->>>>>>> translators
   );
   // Exported menu link: navigation_mandrill:admin/reports/mandrill.
   $menu_links['navigation_mandrill:admin/reports/mandrill'] = array(
@@ -606,26 +570,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',
@@ -640,11 +584,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -50,
+    '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_menus:admin/config/regional/translate/table/menu.
   $menu_links['navigation_menus:admin/config/regional/translate/table/menu'] = array(
@@ -818,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(
@@ -949,11 +893,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_boutique:admin/store',
+    'parent_identifier' => 'navigation_store:admin/store',
   );
   // Exported menu link: navigation_shopping-cart:cart.
   $menu_links['navigation_shopping-cart:cart'] = array(
@@ -977,8 +921,6 @@ function materio_administration_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-<<<<<<< HEAD
-=======
   // Exported menu link: navigation_simplenews-newsletter:node/add/simplenews.
   $menu_links['navigation_simplenews-newsletter:node/add/simplenews'] = array(
     'menu_name' => 'navigation',
@@ -1002,26 +944,6 @@ 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(
-    'menu_name' => 'navigation',
-    'link_path' => 'http://www.materio.com/fr/admin/store',
-    'router_path' => '',
-    'link_title' => 'Store',
-    'options' => array(
-      'attributes' => array(),
-      'identifier' => 'navigation_store:http://www.materio.com/fr/admin/store',
-    ),
-    'module' => 'menu',
-    'hidden' => 0,
-    'external' => 1,
-    'has_children' => 1,
-    'expanded' => 0,
-    'weight' => -38,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-  );
   // Exported menu link: navigation_strings-search:admin/config/regional/translate/translate.
   $menu_links['navigation_strings-search:admin/config/regional/translate/translate'] = array(
     'menu_name' => 'navigation',
@@ -1057,11 +979,11 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -46,
+    '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_students:admin/users/students.
   $menu_links['navigation_students:admin/users/students'] = array(
@@ -1077,13 +999,12 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -49,
+    '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',
   );
->>>>>>> translators
   // Exported menu link: navigation_subscriptions-newsletter:admin/people/simplenews.
   $menu_links['navigation_subscriptions-newsletter:admin/people/simplenews'] = array(
     'menu_name' => 'navigation',
@@ -1099,7 +1020,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -41,
+    'weight' => -46,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -1223,26 +1144,6 @@ function materio_administration_menu_default_menu_links() {
     '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',
@@ -1264,31 +1165,6 @@ 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(
-    'menu_name' => 'navigation',
-    'link_path' => 'https://materio.com/en/admin/users?rid=6',
-    'router_path' => '',
-    'link_title' => 'Users',
-    'options' => array(
-      '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,
-    'has_children' => 1,
-    'expanded' => 1,
-    'weight' => -45,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-  );
   // Exported menu link: navigation_webform:node/add/webform.
   $menu_links['navigation_webform:node/add/webform'] = array(
     'menu_name' => 'navigation',
@@ -1312,26 +1188,6 @@ function materio_administration_menu_default_menu_links() {
     '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&#039;',
-    '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.
@@ -1354,7 +1210,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');
@@ -1373,7 +1228,6 @@ function materio_administration_menu_default_menu_links() {
   t('Reports');
   t('Shopping cart');
   t('Simplenews newsletter');
-  t('Store');
   t('Strings search');
   t('Students');
   t('Subscriptions newsletter');
@@ -1382,13 +1236,9 @@ function materio_administration_menu_default_menu_links() {
   t('Taxonomy');
   t('Taxonomy (manager)');
   t('User account');
-  t('Users');
   t('Webform');
-  t('Ze Daily materiO&#039;');
   t('customers');
   t('looping embed video');
-  t('materiO’ newsletter');
-  t('test');
 
   return $menu_links;
 }

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(
+      'Showroom' => 'Showroom',
+      'Translator' => 'Translator',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -24,6 +26,8 @@ function materio_administration_user_default_permissions() {
   $permissions['access administration menu'] = array(
     'name' => 'access administration menu',
     'roles' => array(
+      'Showroom' => 'Showroom',
+      'Translator' => 'Translator',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -227,6 +231,7 @@ function materio_administration_user_default_permissions() {
   $permissions['edit node translation shared fields'] = array(
     'name' => 'edit node translation shared fields',
     'roles' => array(
+      'Translator' => 'Translator',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -267,6 +272,7 @@ function materio_administration_user_default_permissions() {
   $permissions['edit translation shared fields'] = array(
     'name' => 'edit translation shared fields',
     'roles' => array(
+      'Translator' => 'Translator',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -309,6 +315,7 @@ function materio_administration_user_default_permissions() {
       'Premium' => 'Premium',
       'Showroom' => 'Showroom',
       'Student' => 'Student',
+      'Translator' => 'Translator',
       'Unverified' => 'Unverified',
       'Utilisateur' => 'Utilisateur',
       'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester',
@@ -392,28 +399,6 @@ function materio_administration_user_default_permissions() {
     'module' => 'materio_user',
   );
 
-  // Exported permission: 'subscribe to simplenews category 6374'.
-  $permissions['subscribe to simplenews category 6374'] = array(
-    'name' => 'subscribe to simplenews category 6374',
-    'roles' => array(
-      'Adhérent' => 'Adhérent',
-      'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester',
-      'administrator' => 'administrator',
-      'root' => 'root',
-    ),
-    'module' => 'materio_user',
-  );
-
-  // Exported permission: 'subscribe to simplenews category 6585'.
-  $permissions['subscribe to simplenews category 6585'] = array(
-    'name' => 'subscribe to simplenews category 6585',
-    'roles' => array(
-      'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester',
-      'administrator' => 'administrator',
-      'root' => 'root',
-    ),
-    'module' => 'materio_user',
-  );
   // Exported permission: 'toggle field translatability'.
   $permissions['toggle field translatability'] = array(
     'name' => 'toggle field translatability',
@@ -457,6 +442,7 @@ function materio_administration_user_default_permissions() {
   $permissions['translate node entities'] = array(
     'name' => 'translate node entities',
     'roles' => array(
+      'Translator' => 'Translator',
       'administrator' => 'administrator',
       'root' => 'root',
     ),

sites/all/modules/features/materio_administration/materio_administration.info

@@ -17,10 +17,12 @@ dependencies[] = login_destination
 dependencies[] = logintoboggan
 dependencies[] = logintoboggan_rules
 dependencies[] = logintoboggan_variable
+dependencies[] = materio_content_types
 dependencies[] = materio_user
 dependencies[] = menu
 dependencies[] = remove_duplicates
 dependencies[] = role_delegation
+dependencies[] = showroom
 dependencies[] = simplenews
 dependencies[] = strongarm
 dependencies[] = taxonomy_csv
@@ -43,18 +45,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 +67,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
@@ -88,7 +87,6 @@ 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_simplenews-newsletter:node/add/simplenews
-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,11 +96,8 @@ 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:/admin/users?rid=6
 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 workflow summary views

sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc

@@ -472,6 +472,7 @@ 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',
@@ -900,6 +901,7 @@ 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',

sites/all/modules/features/materio_content_types/materio_content_types.info

@@ -24,7 +24,6 @@ dependencies[] = node
 dependencies[] = options
 dependencies[] = print
 dependencies[] = print_ui
-dependencies[] = showroom
 dependencies[] = strongarm
 dependencies[] = synonyms
 dependencies[] = taxonomy
@@ -473,4 +472,5 @@ 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
 project path = sites/all/modules/features

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;
 

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,

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,

sites/all/modules/features/materio_publications/materio_publications.features.user_role.inc

@@ -10,42 +10,6 @@
 function materio_publications_user_default_roles() {
   $roles = array();
 
-  // Exported role: Contact opérationnel.
-  $roles['Contact opérationnel'] = array(
-    'name' => 'Contact opérationnel',
-    'weight' => 7,
-  );
-
-  // Exported role: Student.
-  $roles['Student'] = array(
-    'name' => 'Student',
-    'weight' => 4,
-  );
-
-  // Exported role: Unverified.
-  $roles['Unverified'] = array(
-    'name' => 'Unverified',
-    'weight' => 2,
-  );
-
-  // Exported role: Utilisateur Alpha Tester.
-  $roles['Utilisateur Alpha Tester'] = array(
-    'name' => 'Utilisateur Alpha Tester',
-    'weight' => 4,
-  );
-
-  // Exported role: administrator.
-  $roles['administrator'] = array(
-    'name' => 'administrator',
-    'weight' => 8,
-  );
-
-  // Exported role: root.
-  $roles['root'] = array(
-    'name' => 'root',
-    'weight' => 9,
-  );
-
   // Exported role: utilisateur anonyme.
   $roles['utilisateur anonyme'] = array(
     'name' => 'utilisateur anonyme',

sites/all/modules/features/materio_publications/materio_publications.info

@@ -4,10 +4,11 @@ package = Materio
 dependencies[] = ctools
 dependencies[] = features
 dependencies[] = image
-dependencies[] = list
 dependencies[] = materio_content_types
+dependencies[] = materio_page_title
 dependencies[] = metatag
 dependencies[] = node
+dependencies[] = options
 dependencies[] = strongarm
 dependencies[] = text
 dependencies[] = workflow_access
@@ -26,12 +27,6 @@ features[user_permission][] = delete own publication content
 features[user_permission][] = edit any publication content
 features[user_permission][] = edit own publication content
 features[user_permission][] = show publication title
-features[user_role][] = Contact opérationnel
-features[user_role][] = Student
-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
@@ -67,6 +62,10 @@ 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[user_role][Unverified] = Unverified
+features_exclude[user_role][Student] = Student
+features_exclude[user_role][Utilisateur Alpha Tester] = Utilisateur Alpha Tester
+features_exclude[user_role][Contact opérationnel] = Contact opérationnel
+features_exclude[user_role][administrator] = administrator
+features_exclude[user_role][root] = root
 project path = sites/all/modules/features

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.

sites/all/modules/features/showroom/showroom.features.field_instance.inc

@@ -91,6 +91,83 @@ function showroom_field_default_field_instances() {
     ),
   );
 
+  // Exported field_instance: 'node-showroom-field_memo'.
+  $field_instances['node-showroom-field_memo'] = array(
+    'bundle' => 'showroom',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'bookmark' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      '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,
+      ),
+      'default' => array(
+        'label' => 'above',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 5,
+      ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+    ),
+    'entity_type' => 'node',
+    'field_name' => 'field_memo',
+    'label' => 'Mémo',
+    'required' => 0,
+    'settings' => array(
+      'entity_translation_sync' => FALSE,
+      'text_processing' => 0,
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'text',
+      'settings' => array(
+        'rows' => 5,
+      ),
+      'type' => 'text_textarea',
+      'weight' => 10,
+    ),
+  );
+
   // Exported field_instance: 'node-showroom-field_public_address'.
   $field_instances['node-showroom-field_public_address'] = array(
     'bundle' => 'showroom',
@@ -430,7 +507,7 @@ function showroom_field_default_field_instances() {
         ),
       ),
       'type' => 'addressfield_standard',
-      'weight' => 8,
+      'weight' => 7,
     ),
   );
 
@@ -506,7 +583,7 @@ function showroom_field_default_field_instances() {
         'size' => 60,
       ),
       'type' => 'email_textfield',
-      'weight' => 10,
+      'weight' => 8,
     ),
   );
 
@@ -823,7 +900,7 @@ function showroom_field_default_field_instances() {
         'size' => 15,
       ),
       'type' => 'phone_number',
-      'weight' => 12,
+      'weight' => 9,
     ),
   );
 
@@ -1023,6 +1100,7 @@ function showroom_field_default_field_instances() {
   t('Body');
   t('Description');
   t('Email');
+  t('Mémo');
   t('Nom');
   t('Phone');
   t('Showroom');

sites/all/modules/features/showroom/showroom.features.inc

@@ -23,7 +23,7 @@ function showroom_node_info() {
       'base' => 'node_content',
       'description' => '',
       'has_title' => '1',
-      'title_label' => t('Name'),
+      'title_label' => t('Nom'),
       'help' => '',
     ),
   );

sites/all/modules/features/showroom/showroom.features.user_permission.inc

@@ -80,16 +80,6 @@ function showroom_user_default_permissions() {
     'module' => 'taxonomy',
   );
 
-  // Exported permission: 'delete users with role 15'.
-  $permissions['delete users with role 15'] = array(
-    'name' => 'delete users with role 15',
-    'roles' => array(
-      'administrator' => 'administrator',
-      'root' => 'root',
-    ),
-    'module' => 'administerusersbyrole',
-  );
-
   // Exported permission: 'edit any showroom content'.
   $permissions['edit any showroom content'] = array(
     'name' => 'edit any showroom content',
@@ -160,16 +150,6 @@ function showroom_user_default_permissions() {
     'module' => 'taxonomy',
   );
 
-  // Exported permission: 'edit users with role 15'.
-  $permissions['edit users with role 15'] = array(
-    'name' => 'edit users with role 15',
-    'roles' => array(
-      'administrator' => 'administrator',
-      'root' => 'root',
-    ),
-    'module' => 'administerusersbyrole',
-  );
-
   // Exported permission: 'enter showroom revision log entry'.
   $permissions['enter showroom revision log entry'] = array(
     'name' => 'enter showroom revision log entry',

sites/all/modules/features/showroom/showroom.info

@@ -28,6 +28,7 @@ features[field_base][] = description_field
 features[field_base][] = field_showroom
 features[field_base][] = field_tode_showroom
 features[field_instance][] = node-showroom-body
+features[field_instance][] = node-showroom-field_memo
 features[field_instance][] = node-showroom-field_public_address
 features[field_instance][] = node-showroom-field_public_email
 features[field_instance][] = node-showroom-field_public_phone
@@ -45,7 +46,6 @@ features[user_permission][] = create showroom content
 features[user_permission][] = delete any showroom content
 features[user_permission][] = delete own showroom content
 features[user_permission][] = delete terms in showroom
-features[user_permission][] = delete users with role 15
 features[user_permission][] = edit any showroom content
 features[user_permission][] = edit field_showroom
 features[user_permission][] = edit field_tode_showroom
@@ -53,7 +53,6 @@ features[user_permission][] = edit own field_showroom
 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 15
 features[user_permission][] = enter showroom revision log entry
 features[user_permission][] = merge showroom terms
 features[user_permission][] = override showroom authored by option

sites/all/modules/features/showroom/showroom.strongarm.inc

@@ -22,17 +22,17 @@ function showroom_strongarm() {
   $strongarm->api_version = 1;
   $strongarm->name = 'ant_pattern_showroom';
   $strongarm->value = '<?php 
+//[node:field-tode-showroom:name]
 $items = field_get_items(\'node\', $node, \'field_tode_showroom\');
 return t($items[0][\'name\']);
-?>
-';
+?>';
   $export['ant_pattern_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 = 'ant_php_showroom';
-  $strongarm->value = 1;
+  $strongarm->value = 0;
   $export['ant_php_showroom'] = $strongarm;
 
   $strongarm = new stdClass();
@@ -228,7 +228,7 @@ return t($items[0][\'name\']);
   $strongarm->name = 'nodeformscols_field_placements_showroom_default';
   $strongarm->value = array(
     'additional_settings' => array(
-      'region' => 'main',
+      'region' => 'footer',
       'weight' => '5',
       'has_required' => FALSE,
       'title' => 'Onglets verticaux',
@@ -236,7 +236,7 @@ return t($items[0][\'name\']);
     ),
     'actions' => array(
       'region' => 'right',
-      'weight' => '2',
+      'weight' => '3',
       'has_required' => FALSE,
       'title' => 'Enregistrer',
       'hidden' => 0,
@@ -257,7 +257,7 @@ return t($items[0][\'name\']);
     ),
     'body' => array(
       'region' => 'main',
-      'weight' => '1',
+      'weight' => '4',
       'has_required' => FALSE,
       'title' => 'Body',
       'hidden' => 0,
@@ -271,24 +271,31 @@ return t($items[0][\'name\']);
     ),
     'field_public_address' => array(
       'region' => 'main',
-      'weight' => '4',
+      'weight' => '3',
       'has_required' => TRUE,
       'title' => 'Adresse',
     ),
     'field_public_email' => array(
       'region' => 'main',
-      'weight' => '2',
+      'weight' => '1',
       'has_required' => FALSE,
       'title' => 'Email',
       'hidden' => 0,
     ),
     'field_public_phone' => array(
       'region' => 'main',
-      'weight' => '3',
+      'weight' => '2',
       'has_required' => FALSE,
       'title' => 'Phone',
       'hidden' => 0,
     ),
+    'field_memo' => array(
+      'region' => 'right',
+      'weight' => '2',
+      'has_required' => FALSE,
+      'title' => 'Mémo',
+      'hidden' => 0,
+    ),
   );
   $export['nodeformscols_field_placements_showroom_default'] = $strongarm;