Merge branch 'prod' into homeV2

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

@@ -10,26 +10,6 @@
 function materio_administration_menu_default_menu_links() {
   $menu_links = array();
 
-  // Exported menu link: navigation_add-content:node/add
-  $menu_links['navigation_add-content:node/add'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'node/add',
-    'router_path' => 'node/add',
-    'link_title' => 'Add content',
-    'options' => array(
-      'identifier' => 'navigation_add-content:node/add',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 1,
-    'expanded' => 0,
-    'weight' => -46,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_content:admin/content/materiaux',
-  );
   // Exported menu link: navigation_add-user:admin/people/create
   $menu_links['navigation_add-user:admin/people/create'] = array(
     'menu_name' => 'navigation',
@@ -76,72 +56,6 @@ function materio_administration_menu_default_menu_links() {
     '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(
-    'menu_name' => 'navigation',
-    'link_path' => 'http://dev.materio.com/fr/admin/structure/taxonomy/tag_libres/add',
-    'router_path' => '',
-    'link_title' => 'Ajouter un tag libre',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-      'identifier' => 'navigation_ajouter-un-tag-libre:http://dev.materio.com/fr/admin/structure/taxonomy/tag_libres/add',
-    ),
-    'module' => 'menu',
-    'hidden' => 0,
-    'external' => 1,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -50,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres',
-  );
-  // Exported menu link: navigation_breve:node/add/breve
-  $menu_links['navigation_breve:node/add/breve'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'node/add/breve',
-    'router_path' => 'node/add/breve',
-    'link_title' => 'Breve',
-    'options' => array(
-      'identifier' => 'navigation_breve:node/add/breve',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -50,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_ajouter-du-contenu:node/add',
-  );
-  // Exported menu link: navigation_companies:admin/content/companies
-  $menu_links['navigation_companies:admin/content/companies'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'admin/content/companies',
-    'router_path' => 'admin/content/companies',
-    'link_title' => 'Companies',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-      'identifier' => 'navigation_companies:admin/content/companies',
-    ),
-    'module' => 'menu',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -49,
-    'customized' => 0,
-    'language' => 'und',
-    'menu_links_customized' => 0,
-    'parent_identifier' => 'navigation_content:admin/content/materiaux',
-  );
   // Exported menu link: navigation_company:admin/structure/taxonomy_manager/voc/company
   $menu_links['navigation_company:admin/structure/taxonomy_manager/voc/company'] = array(
     'menu_name' => 'navigation',
@@ -165,26 +79,6 @@ function materio_administration_menu_default_menu_links() {
     'menu_links_customized' => 0,
     'parent_identifier' => 'navigation_taxonomy:admin/structure/taxonomy_manager/voc',
   );
-  // Exported menu link: navigation_company:node/add/company
-  $menu_links['navigation_company:node/add/company'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'node/add/company',
-    'router_path' => 'node/add/company',
-    'link_title' => 'Company',
-    'options' => array(
-      'identifier' => 'navigation_company:node/add/company',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -49,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_ajouter-du-contenu:node/add',
-  );
   // Exported menu link: navigation_compose-tips:filter/tips
   $menu_links['navigation_compose-tips:filter/tips'] = array(
     'menu_name' => 'navigation',
@@ -204,29 +98,6 @@ function materio_administration_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_content-types:admin/config/regional/translate/table/nodetype
-  $menu_links['navigation_content-types:admin/config/regional/translate/table/nodetype'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'admin/config/regional/translate/table/nodetype',
-    'router_path' => 'admin/config/regional/translate/table/nodetype',
-    'link_title' => 'Content types',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-      'identifier' => 'navigation_content-types:admin/config/regional/translate/table/nodetype',
-    ),
-    'module' => 'menu',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -48,
-    'customized' => 1,
-    'language' => 'und',
-    '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(
     'menu_name' => 'navigation',
@@ -250,52 +121,6 @@ function materio_administration_menu_default_menu_links() {
     'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_store:http://www.materio.com/fr/admin/store',
   );
-  // Exported menu link: navigation_didactique:node/add/didactique
-  $menu_links['navigation_didactique:node/add/didactique'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'node/add/didactique',
-    'router_path' => 'node/add/didactique',
-    'link_title' => 'Didactique',
-    'options' => array(
-      'attributes' => array(
-        'title' => 'Nœud didacticiel',
-      ),
-      'identifier' => 'navigation_didactique:node/add/didactique',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -48,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_ajouter-du-contenu:node/add',
-  );
-  // Exported menu link: navigation_faq:node/add/faq
-  $menu_links['navigation_faq:node/add/faq'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'node/add/faq',
-    'router_path' => 'node/add/faq',
-    'link_title' => 'FAQ',
-    'options' => array(
-      'attributes' => array(
-        'title' => 'A frequently asked question and its answer.',
-      ),
-      'identifier' => 'navigation_faq:node/add/faq',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -47,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_ajouter-du-contenu:node/add',
-  );
   // Exported menu link: navigation_feedback:admin/reports/feedback
   $menu_links['navigation_feedback:admin/reports/feedback'] = array(
     'menu_name' => 'navigation',
@@ -383,30 +208,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(
-        'title' => '',
-      ),
-      '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_mon-compte:user',
-  );
   // Exported menu link: navigation_mandrill:admin/reports/mandrill
   $menu_links['navigation_mandrill:admin/reports/mandrill'] = array(
     'menu_name' => 'navigation',
@@ -429,49 +230,6 @@ function materio_administration_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_materiau:node/add/materiau
-  $menu_links['navigation_materiau:node/add/materiau'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'node/add/materiau',
-    'router_path' => 'node/add/materiau',
-    'link_title' => 'Materiau',
-    'options' => array(
-      'identifier' => 'navigation_materiau:node/add/materiau',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -45,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_ajouter-du-contenu:node/add',
-  );
-  // Exported menu link: navigation_menus:admin/config/regional/translate/table/menu
-  $menu_links['navigation_menus:admin/config/regional/translate/table/menu'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'admin/config/regional/translate/table/menu',
-    'router_path' => 'admin/config/regional/translate/table/menu',
-    'link_title' => 'Menus',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-      'identifier' => 'navigation_menus:admin/config/regional/translate/table/menu',
-    ),
-    'module' => 'menu',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -47,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_translation:admin/config/regional/translate/table',
-  );
   // Exported menu link: navigation_my-sessions:mysessions
   $menu_links['navigation_my-sessions:mysessions'] = array(
     'menu_name' => 'navigation',
@@ -491,29 +249,6 @@ function materio_administration_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_newletters:admin/content/simplenews
-  $menu_links['navigation_newletters:admin/content/simplenews'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'admin/content/simplenews',
-    'router_path' => 'admin/content/simplenews',
-    'link_title' => 'Newletters',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-      'identifier' => 'navigation_newletters:admin/content/simplenews',
-    ),
-    'module' => 'menu',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -47,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_content:admin/content/materiaux',
-  );
   // Exported menu link: navigation_node-export-import:node/add/node_export
   $menu_links['navigation_node-export-import:node/add/node_export'] = array(
     'menu_name' => 'navigation',
@@ -583,98 +318,6 @@ function materio_administration_menu_default_menu_links() {
     'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_store:http://www.materio.com/fr/admin/store',
   );
-  // Exported menu link: navigation_page:node/add/page
-  $menu_links['navigation_page:node/add/page'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'node/add/page',
-    'router_path' => 'node/add/page',
-    'link_title' => 'Page',
-    'options' => array(
-      'attributes' => array(
-        'title' => 'Use this content type to add static pages like "about" "contact" etc',
-      ),
-      'identifier' => 'navigation_page:node/add/page',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -43,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_ajouter-du-contenu:node/add',
-  );
-  // Exported menu link: navigation_pages--didactique--faq:admin/content/pages
-  $menu_links['navigation_pages--didactique--faq:admin/content/pages'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'admin/content/pages',
-    'router_path' => 'admin/content/pages',
-    'link_title' => 'Pages / didactique / faq',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-      'identifier' => 'navigation_pages--didactique--faq:admin/content/pages',
-    ),
-    'module' => 'menu',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -48,
-    'customized' => 0,
-    'language' => 'und',
-    'menu_links_customized' => 0,
-    'parent_identifier' => 'navigation_content:admin/content/materiaux',
-  );
-  // Exported menu link: navigation_panneau:node/add/panel
-  $menu_links['navigation_panneau:node/add/panel'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'node/add/panel',
-    'router_path' => 'node/add/panel',
-    'link_title' => 'Panneau',
-    'options' => array(
-      'attributes' => array(
-        'title' => 'Une mise en forme de panel divisée en lignes et colonnes.',
-      ),
-      'identifier' => 'navigation_panneau:node/add/panel',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -42,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_ajouter-du-contenu:node/add',
-  );
-  // Exported menu link: navigation_produit:node/add/product
-  $menu_links['navigation_produit:node/add/product'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'node/add/product',
-    'router_path' => 'node/add/product',
-    'link_title' => 'Produit',
-    'options' => array(
-      'attributes' => array(
-        'title' => 'Utiliser les <em>produits</em> pour représenter les articles en vente sur le site web, incluant toute l\'information unique qui peut être attribuée à un numéro de modèle spécifique.',
-      ),
-      'identifier' => 'navigation_produit:node/add/product',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -41,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_ajouter-du-contenu:node/add',
-  );
   // Exported menu link: navigation_reports:admin/store/reports
   $menu_links['navigation_reports:admin/store/reports'] = array(
     'menu_name' => 'navigation',
@@ -720,29 +363,6 @@ function materio_administration_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
-  // Exported menu link: navigation_simplenews-newsletter:node/add/simplenews
-  $menu_links['navigation_simplenews-newsletter:node/add/simplenews'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'node/add/simplenews',
-    'router_path' => 'node/add/simplenews',
-    'link_title' => 'Simplenews newsletter',
-    'options' => array(
-      'attributes' => array(
-        'title' => 'A newsletter issue to be sent to subscribed email addresses.',
-      ),
-      'identifier' => 'navigation_simplenews-newsletter:node/add/simplenews',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 1,
-    'expanded' => 0,
-    'weight' => -40,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_ajouter-du-contenu: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',
@@ -765,29 +385,6 @@ function materio_administration_menu_default_menu_links() {
     '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',
-    'link_path' => 'admin/config/regional/translate/translate',
-    'router_path' => 'admin/config/regional/translate/translate',
-    'link_title' => 'Strings search',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-      'identifier' => 'navigation_strings-search:admin/config/regional/translate/translate',
-    ),
-    'module' => 'menu',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -45,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_translation:admin/config/regional/translate/table',
-  );
   // Exported menu link: navigation_subscriptions-newsletter:admin/people/simplenews
   $menu_links['navigation_subscriptions-newsletter:admin/people/simplenews'] = array(
     'menu_name' => 'navigation',
@@ -834,29 +431,6 @@ function materio_administration_menu_default_menu_links() {
     'menu_links_customized' => 0,
     'parent_identifier' => 'navigation_taxonomy:admin/structure/taxonomy_manager/voc',
   );
-  // Exported menu link: navigation_taxonomy:admin/config/regional/translate/table/taxonomy
-  $menu_links['navigation_taxonomy:admin/config/regional/translate/table/taxonomy'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'admin/config/regional/translate/table/taxonomy',
-    'router_path' => 'admin/config/regional/translate/table/taxonomy',
-    'link_title' => 'Taxonomy',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-      'identifier' => 'navigation_taxonomy:admin/config/regional/translate/table/taxonomy',
-    ),
-    'module' => 'menu',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -46,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_translation:admin/config/regional/translate/table',
-  );
   // Exported menu link: navigation_taxonomy:admin/structure/taxonomy_manager/voc
   $menu_links['navigation_taxonomy:admin/structure/taxonomy_manager/voc'] = array(
     'menu_name' => 'navigation',
@@ -946,70 +520,29 @@ function materio_administration_menu_default_menu_links() {
     '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',
-    'link_path' => 'node/add/webform',
-    'router_path' => 'node/add/webform',
-    'link_title' => 'Webform',
-    'options' => array(
-      'attributes' => array(
-        'title' => 'Create a new form or questionnaire accessible to users. Submission results and statistics are recorded and accessible to privileged users.',
-      ),
-      'identifier' => 'navigation_webform:node/add/webform',
-    ),
-    'module' => 'system',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 0,
-    'expanded' => 0,
-    'weight' => -39,
-    'customized' => 1,
-    'language' => 'und',
-    'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_ajouter-du-contenu:node/add',
-  );
   // Translatables
   // Included for use with string extractors like potx.
-  t('Add content');
   t('Add user');
   t('Adhésions');
-  t('Ajouter un tag libre');
-  t('Breve');
-  t('Companies');
   t('Company');
   t('Compose tips');
-  t('Content types');
-  t('Didactique');
-  t('FAQ');
   t('Feedback');
   t('Formulaires d\'adhésion');
   t('Frequently Asked Questions');
   t('IP address tracking');
-  t('Log out');
   t('Mandrill');
-  t('Materiau');
-  t('Menus');
   t('My sessions');
-  t('Newletters');
   t('Node export: import');
   t('Onthologie');
   t('Orders');
-  t('Page');
-  t('Pages / didactique / faq');
-  t('Panneau');
-  t('Produit');
   t('Reports');
   t('Shopping cart');
-  t('Simplenews newsletter');
   t('Store');
-  t('Strings search');
   t('Subscriptions newsletter');
   t('Tag Libres');
   t('Taxonomy');
   t('User account');
   t('Users');
-  t('Webform');
   t('customers');
 
 

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

@@ -19,49 +19,29 @@ features[ctools][] = strongarm:strongarm:1
 features[ctools][] = views:views_default:3.0
 features[features_api][] = api:2
 features[menu_custom][] = navigation
-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_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_didactique:node/add/didactique
-features[menu_links][] = navigation_faq:node/add/faq
 features[menu_links][] = navigation_feedback:admin/reports/feedback
 features[menu_links][] = navigation_formulaires-dadhsion:http://www.materio.com/fr/node/11186/webform-results
 features[menu_links][] = navigation_frequently-asked-questions:faq-page
 features[menu_links][] = navigation_ip-address-tracking:admin/reports/ip_tracking
-features[menu_links][] = navigation_log-out:user/logout
 features[menu_links][] = navigation_mandrill:admin/reports/mandrill
-features[menu_links][] = navigation_materiau:node/add/materiau
-features[menu_links][] = navigation_menus:admin/config/regional/translate/table/menu
 features[menu_links][] = navigation_my-sessions:mysessions
-features[menu_links][] = navigation_newletters:admin/content/simplenews
 features[menu_links][] = navigation_node-export-import:node/add/node_export
 features[menu_links][] = navigation_onthologie:admin/structure/taxonomy_manager/voc/onthologie
 features[menu_links][] = navigation_orders:admin/store/orders/view
-features[menu_links][] = navigation_page:node/add/page
-features[menu_links][] = navigation_pages--didactique--faq:admin/content/pages
-features[menu_links][] = navigation_panneau:node/add/panel
-features[menu_links][] = navigation_produit:node/add/product
 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:http://www.materio.com/fr/admin/store
-features[menu_links][] = navigation_strings-search:admin/config/regional/translate/translate
 features[menu_links][] = navigation_subscriptions-newsletter:admin/people/simplenews
 features[menu_links][] = navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres
-features[menu_links][] = navigation_taxonomy:admin/config/regional/translate/table/taxonomy
 features[menu_links][] = navigation_taxonomy:admin/structure/taxonomy_manager/voc
 features[menu_links][] = navigation_user-account:user
 features[menu_links][] = navigation_users:admin/people
 features[menu_links][] = navigation_users:admin/users
-features[menu_links][] = navigation_webform:node/add/webform
 features[user_permission][] = access administration menu
 features[user_permission][] = display drupal links
 features[user_permission][] = flush caches

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

@@ -275,9 +275,9 @@ function materio_administration_views_default_views() {
     'field_materiau_image' => 'field_materiau_image',
     'field_visuel' => 'field_materiau_image',
     'type' => 'title_field',
-    'title' => 'title',
     'title_field' => 'title_field',
     'field_reference_materio' => 'title_field',
+    'field_localisation_1' => 'field_reference_materio',
     'edit_node' => 'title_field',
     'field_company_fab' => 'field_company_fab',
     'field_company_distrib' => 'field_company_fab',
@@ -315,21 +315,21 @@ function materio_administration_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'title' => array(
+    'title_field' => array(
       'sortable' => 0,
       'default_sort_order' => 'asc',
       'align' => '',
       'separator' => '<br />',
       'empty_column' => 0,
     ),
-    'title_field' => array(
+    'field_reference_materio' => array(
       'sortable' => 0,
       'default_sort_order' => 'asc',
       'align' => '',
-      'separator' => '<br />',
+      'separator' => '',
       'empty_column' => 0,
     ),
-    'field_reference_materio' => array(
+    'field_localisation_1' => array(
       'sortable' => 0,
       'default_sort_order' => 'asc',
       'align' => '',
@@ -631,6 +631,145 @@ function materio_administration_views_default_views() {
   $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',
+    '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',
+    'field_company_fab' => 'field_company_fab',
+    'field_company_distrib' => 'field_company_fab',
+    'field_onthologie' => 'field_onthologie',
+    'field_tags_libres' => 'field_tags_libres',
+    'field_materiau_ref' => 'field_materiau_ref',
+    'field_breve_ref' => 'field_materiau_ref',
+    'field_memo' => 'field_memo',
+    'field_attachments' => 'field_attachments',
+    'field_localisation' => 'field_localisation',
+    '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,
+    ),
+    'field_materiau_image' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_visuel' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'type' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'title_field' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '<br />',
+      'empty_column' => 0,
+    ),
+    'field_reference_materio' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_localisation_1' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'edit_node' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_company_fab' => array(
+      'align' => '',
+      'separator' => '<br />',
+      'empty_column' => 0,
+    ),
+    'field_company_distrib' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_onthologie' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_tags_libres' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_materiau_ref' => array(
+      'align' => '',
+      'separator' => '<br />',
+      'empty_column' => 0,
+    ),
+    'field_breve_ref' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_memo' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_attachments' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_localisation' => 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']['fields'] = FALSE;
   /* Champ: Opérations en masse : Contenu */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
@@ -813,11 +952,11 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['type']['id'] = 'type';
   $handler->display->display_options['fields']['type']['table'] = 'node';
   $handler->display->display_options['fields']['type']['field'] = 'type';
-  /* Champ: Contenu : Titre */
+  /* Champ: Contenu : Title */
   $handler->display->display_options['fields']['title_field']['id'] = 'title_field';
   $handler->display->display_options['fields']['title_field']['table'] = 'field_data_title_field';
   $handler->display->display_options['fields']['title_field']['field'] = 'title_field';
-  $handler->display->display_options['fields']['title_field']['label'] = 'Title/Name';
+  $handler->display->display_options['fields']['title_field']['label'] = 'Titre';
   $handler->display->display_options['fields']['title_field']['element_type'] = 'strong';
   $handler->display->display_options['fields']['title_field']['link_to_entity'] = 1;
   /* Champ: Contenu : Référence Materio */
@@ -1009,16 +1148,42 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['field_reference_materio_value']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['filters']['field_reference_materio_value']['field'] = 'field_reference_materio_value';
   $handler->display->display_options['filters']['field_reference_materio_value']['operator'] = 'contains';
+  $handler->display->display_options['filters']['field_reference_materio_value']['group'] = 1;
   $handler->display->display_options['filters']['field_reference_materio_value']['exposed'] = TRUE;
   $handler->display->display_options['filters']['field_reference_materio_value']['expose']['operator_id'] = 'field_reference_materio_value_op';
   $handler->display->display_options['filters']['field_reference_materio_value']['expose']['label'] = 'Référence';
   $handler->display->display_options['filters']['field_reference_materio_value']['expose']['operator'] = 'field_reference_materio_value_op';
   $handler->display->display_options['filters']['field_reference_materio_value']['expose']['identifier'] = 'field_reference_materio_value';
+  /* Critère de filtrage: Contenu : Localisation (field_localisation) */
+  $handler->display->display_options['filters']['field_localisation_value']['id'] = 'field_localisation_value';
+  $handler->display->display_options['filters']['field_localisation_value']['table'] = 'field_data_field_localisation';
+  $handler->display->display_options['filters']['field_localisation_value']['field'] = 'field_localisation_value';
+  $handler->display->display_options['filters']['field_localisation_value']['operator'] = 'contains';
+  $handler->display->display_options['filters']['field_localisation_value']['group'] = 1;
+  $handler->display->display_options['filters']['field_localisation_value']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_localisation_value']['expose']['operator_id'] = 'field_localisation_value_op';
+  $handler->display->display_options['filters']['field_localisation_value']['expose']['label'] = 'Localisation';
+  $handler->display->display_options['filters']['field_localisation_value']['expose']['operator'] = 'field_localisation_value_op';
+  $handler->display->display_options['filters']['field_localisation_value']['expose']['identifier'] = 'field_localisation_value';
+  $handler->display->display_options['filters']['field_localisation_value']['expose']['remember_roles'] = array(
+    2 => '2',
+    1 => 0,
+    9 => 0,
+    7 => 0,
+    10 => 0,
+    11 => 0,
+    6 => 0,
+    5 => 0,
+    8 => 0,
+    3 => 0,
+    4 => 0,
+  );
   /* Critère de filtrage: Contenu : Possède un terme de la taxonomie */
   $handler->display->display_options['filters']['tid']['id'] = 'tid';
   $handler->display->display_options['filters']['tid']['table'] = 'taxonomy_index';
   $handler->display->display_options['filters']['tid']['field'] = 'tid';
   $handler->display->display_options['filters']['tid']['value'] = '';
+  $handler->display->display_options['filters']['tid']['group'] = 1;
   $handler->display->display_options['filters']['tid']['exposed'] = TRUE;
   $handler->display->display_options['filters']['tid']['expose']['operator_id'] = 'tid_op';
   $handler->display->display_options['filters']['tid']['expose']['label'] = 'Onto';
@@ -1043,6 +1208,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['tid_1']['table'] = 'taxonomy_index';
   $handler->display->display_options['filters']['tid_1']['field'] = 'tid';
   $handler->display->display_options['filters']['tid_1']['value'] = '';
+  $handler->display->display_options['filters']['tid_1']['group'] = 1;
   $handler->display->display_options['filters']['tid_1']['exposed'] = TRUE;
   $handler->display->display_options['filters']['tid_1']['expose']['operator_id'] = 'tid_1_op';
   $handler->display->display_options['filters']['tid_1']['expose']['label'] = 'Tag libres';
@@ -1063,6 +1229,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['tid_2']['table'] = 'taxonomy_index';
   $handler->display->display_options['filters']['tid_2']['field'] = 'tid';
   $handler->display->display_options['filters']['tid_2']['value'] = '';
+  $handler->display->display_options['filters']['tid_2']['group'] = 1;
   $handler->display->display_options['filters']['tid_2']['exposed'] = TRUE;
   $handler->display->display_options['filters']['tid_2']['expose']['operator_id'] = 'tid_2_op';
   $handler->display->display_options['filters']['tid_2']['expose']['label'] = 'Société';
@@ -1083,6 +1250,7 @@ function materio_administration_views_default_views() {
   $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/materiaux';
   $handler->display->display_options['menu']['type'] = 'tab';
   $handler->display->display_options['menu']['title'] = 'Materiaux/Brèves';
@@ -1410,6 +1578,330 @@ function materio_administration_views_default_views() {
     'webform' => 'webform',
     'looping_embed_video' => 'looping_embed_video',
   );
+  $handler->display->display_options['filters']['type_2']['group'] = 1;
+  /* Critère de filtrage: Contenu : Adresse - Pays */
+  $handler->display->display_options['filters']['field_public_address_country']['id'] = 'field_public_address_country';
+  $handler->display->display_options['filters']['field_public_address_country']['table'] = 'field_data_field_public_address';
+  $handler->display->display_options['filters']['field_public_address_country']['field'] = 'field_public_address_country';
+  $handler->display->display_options['filters']['field_public_address_country']['value'] = array(
+    'AF' => 'AF',
+    'ZA' => 'ZA',
+    'AL' => 'AL',
+    'DZ' => 'DZ',
+    'DE' => 'DE',
+    'AD' => 'AD',
+    'AO' => 'AO',
+    'AI' => 'AI',
+    'AQ' => 'AQ',
+    'AG' => 'AG',
+    'AN' => 'AN',
+    'SA' => 'SA',
+    'AR' => 'AR',
+    'AM' => 'AM',
+    'AW' => 'AW',
+    'AU' => 'AU',
+    'AT' => 'AT',
+    'AZ' => 'AZ',
+    'BS' => 'BS',
+    'BH' => 'BH',
+    'BD' => 'BD',
+    'BB' => 'BB',
+    'BE' => 'BE',
+    'BZ' => 'BZ',
+    'BM' => 'BM',
+    'BT' => 'BT',
+    'MM' => 'MM',
+    'BY' => 'BY',
+    'BO' => 'BO',
+    'BA' => 'BA',
+    'BW' => 'BW',
+    'BN' => 'BN',
+    'BR' => 'BR',
+    'BG' => 'BG',
+    'BF' => 'BF',
+    'BI' => 'BI',
+    'BJ' => 'BJ',
+    'KH' => 'KH',
+    'CM' => 'CM',
+    'CA' => 'CA',
+    'CV' => 'CV',
+    'CL' => 'CL',
+    'CN' => 'CN',
+    'CY' => 'CY',
+    'CO' => 'CO',
+    'KM' => 'KM',
+    'CG' => 'CG',
+    'CD' => 'CD',
+    'KP' => 'KP',
+    'KR' => 'KR',
+    'CR' => 'CR',
+    'HR' => 'HR',
+    'CU' => 'CU',
+    'CW' => 'CW',
+    'CI' => 'CI',
+    'DK' => 'DK',
+    'DJ' => 'DJ',
+    'DM' => 'DM',
+    'ES' => 'ES',
+    'EE' => 'EE',
+    'FJ' => 'FJ',
+    'FI' => 'FI',
+    'FR' => 'FR',
+    'GA' => 'GA',
+    'GM' => 'GM',
+    'GH' => 'GH',
+    'GI' => 'GI',
+    'GD' => 'GD',
+    'GL' => 'GL',
+    'GR' => 'GR',
+    'GP' => 'GP',
+    'GU' => 'GU',
+    'GT' => 'GT',
+    'GG' => 'GG',
+    'GN' => 'GN',
+    'GW' => 'GW',
+    'GQ' => 'GQ',
+    'GY' => 'GY',
+    'GF' => 'GF',
+    'GE' => 'GE',
+    'GS' => 'GS',
+    'HT' => 'HT',
+    'HN' => 'HN',
+    'HK' => 'HK',
+    'HU' => 'HU',
+    'IN' => 'IN',
+    'ID' => 'ID',
+    'IQ' => 'IQ',
+    'IR' => 'IR',
+    'IE' => 'IE',
+    'IS' => 'IS',
+    'IL' => 'IL',
+    'IT' => 'IT',
+    'JM' => 'JM',
+    'JP' => 'JP',
+    'JE' => 'JE',
+    'JO' => 'JO',
+    'KZ' => 'KZ',
+    'KE' => 'KE',
+    'KG' => 'KG',
+    'KI' => 'KI',
+    'KW' => 'KW',
+    'LA' => 'LA',
+    'LS' => 'LS',
+    'LV' => 'LV',
+    'LB' => 'LB',
+    'LR' => 'LR',
+    'LI' => 'LI',
+    'LT' => 'LT',
+    'LU' => 'LU',
+    'LY' => 'LY',
+    'MO' => 'MO',
+    'MK' => 'MK',
+    'MG' => 'MG',
+    'MY' => 'MY',
+    'MW' => 'MW',
+    'MV' => 'MV',
+    'ML' => 'ML',
+    'MT' => 'MT',
+    'MA' => 'MA',
+    'MQ' => 'MQ',
+    'MU' => 'MU',
+    'MR' => 'MR',
+    'YT' => 'YT',
+    'MX' => 'MX',
+    'FM' => 'FM',
+    'MD' => 'MD',
+    'MC' => 'MC',
+    'MN' => 'MN',
+    'MS' => 'MS',
+    'ME' => 'ME',
+    'MZ' => 'MZ',
+    'NA' => 'NA',
+    'NR' => 'NR',
+    'NI' => 'NI',
+    'NE' => 'NE',
+    'NG' => 'NG',
+    'NU' => 'NU',
+    'NO' => 'NO',
+    'NC' => 'NC',
+    'NZ' => 'NZ',
+    'NP' => 'NP',
+    'OM' => 'OM',
+    'UG' => 'UG',
+    'UZ' => 'UZ',
+    'PK' => 'PK',
+    'PW' => 'PW',
+    'PA' => 'PA',
+    'PG' => 'PG',
+    'PY' => 'PY',
+    'NL' => 'NL',
+    'BQ' => 'BQ',
+    'PH' => 'PH',
+    'PN' => 'PN',
+    'PL' => 'PL',
+    'PF' => 'PF',
+    'PR' => 'PR',
+    'PT' => 'PT',
+    'PE' => 'PE',
+    'QA' => 'QA',
+    'RO' => 'RO',
+    'GB' => 'GB',
+    'RU' => 'RU',
+    'RW' => 'RW',
+    'CF' => 'CF',
+    'DO' => 'DO',
+    'CZ' => 'CZ',
+    'RE' => 'RE',
+    'EH' => 'EH',
+    'BL' => 'BL',
+    'KN' => 'KN',
+    'SM' => 'SM',
+    'SX' => 'SX',
+    'MF' => 'MF',
+    'PM' => 'PM',
+    'VC' => 'VC',
+    'SH' => 'SH',
+    'LC' => 'LC',
+    'SV' => 'SV',
+    'WS' => 'WS',
+    'AS' => 'AS',
+    'ST' => 'ST',
+    'RS' => 'RS',
+    'SC' => 'SC',
+    'SL' => 'SL',
+    'SG' => 'SG',
+    'SK' => 'SK',
+    'SI' => 'SI',
+    'SO' => 'SO',
+    'SD' => 'SD',
+    'SS' => 'SS',
+    'LK' => 'LK',
+    'CH' => 'CH',
+    'SR' => 'SR',
+    'SE' => 'SE',
+    'SJ' => 'SJ',
+    'SZ' => 'SZ',
+    'SY' => 'SY',
+    'SN' => 'SN',
+    'TJ' => 'TJ',
+    'TZ' => 'TZ',
+    'TW' => 'TW',
+    'TD' => 'TD',
+    'TF' => 'TF',
+    'IO' => 'IO',
+    'PS' => 'PS',
+    'TH' => 'TH',
+    'TL' => 'TL',
+    'TG' => 'TG',
+    'TK' => 'TK',
+    'TO' => 'TO',
+    'TT' => 'TT',
+    'TN' => 'TN',
+    'TM' => 'TM',
+    'TR' => 'TR',
+    'TV' => 'TV',
+    'UA' => 'UA',
+    'UY' => 'UY',
+    'VU' => 'VU',
+    'VA' => 'VA',
+    'VE' => 'VE',
+    'VN' => 'VN',
+    'WF' => 'WF',
+    'YE' => 'YE',
+    'ZM' => 'ZM',
+    'ZW' => 'ZW',
+    'EG' => 'EG',
+    'AE' => 'AE',
+    'EC' => 'EC',
+    'ER' => 'ER',
+    'US' => 'US',
+    'ET' => 'ET',
+    'BV' => 'BV',
+    'CX' => 'CX',
+    'IM' => 'IM',
+    'NF' => 'NF',
+    'AX' => 'AX',
+    'KY' => 'KY',
+    'CC' => 'CC',
+    'CK' => 'CK',
+    'FO' => 'FO',
+    'HM' => 'HM',
+    'FK' => 'FK',
+    'MP' => 'MP',
+    'MH' => 'MH',
+    'UM' => 'UM',
+    'SB' => 'SB',
+    'TC' => 'TC',
+    'VI' => 'VI',
+    'VG' => 'VG',
+  );
+  $handler->display->display_options['filters']['field_public_address_country']['group'] = 1;
+  $handler->display->display_options['filters']['field_public_address_country']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_public_address_country']['expose']['operator_id'] = 'field_public_address_country_op';
+  $handler->display->display_options['filters']['field_public_address_country']['expose']['label'] = 'Adresse - Pays';
+  $handler->display->display_options['filters']['field_public_address_country']['expose']['use_operator'] = TRUE;
+  $handler->display->display_options['filters']['field_public_address_country']['expose']['operator'] = 'field_public_address_country_op';
+  $handler->display->display_options['filters']['field_public_address_country']['expose']['identifier'] = 'field_public_address_country';
+  $handler->display->display_options['filters']['field_public_address_country']['expose']['multiple'] = TRUE;
+  $handler->display->display_options['filters']['field_public_address_country']['expose']['remember_roles'] = array(
+    2 => '2',
+    1 => 0,
+    9 => 0,
+    7 => 0,
+    10 => 0,
+    11 => 0,
+    6 => 0,
+    5 => 0,
+    8 => 0,
+    3 => 0,
+    4 => 0,
+  );
+  /* Critère de filtrage: Contenu : Adresse - Code postal */
+  $handler->display->display_options['filters']['field_public_address_postal_code']['id'] = 'field_public_address_postal_code';
+  $handler->display->display_options['filters']['field_public_address_postal_code']['table'] = 'field_data_field_public_address';
+  $handler->display->display_options['filters']['field_public_address_postal_code']['field'] = 'field_public_address_postal_code';
+  $handler->display->display_options['filters']['field_public_address_postal_code']['group'] = 1;
+  $handler->display->display_options['filters']['field_public_address_postal_code']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_public_address_postal_code']['expose']['operator_id'] = 'field_public_address_postal_code_op';
+  $handler->display->display_options['filters']['field_public_address_postal_code']['expose']['label'] = 'Adresse - Code postal';
+  $handler->display->display_options['filters']['field_public_address_postal_code']['expose']['operator'] = 'field_public_address_postal_code_op';
+  $handler->display->display_options['filters']['field_public_address_postal_code']['expose']['identifier'] = 'field_public_address_postal_code';
+  $handler->display->display_options['filters']['field_public_address_postal_code']['expose']['remember_roles'] = array(
+    2 => '2',
+    1 => 0,
+    9 => 0,
+    7 => 0,
+    10 => 0,
+    11 => 0,
+    6 => 0,
+    5 => 0,
+    8 => 0,
+    3 => 0,
+    4 => 0,
+  );
+  /* Critère de filtrage: Contenu : Adresse - Localité (c&#039;est-à-dire Ville) */
+  $handler->display->display_options['filters']['field_public_address_locality']['id'] = 'field_public_address_locality';
+  $handler->display->display_options['filters']['field_public_address_locality']['table'] = 'field_data_field_public_address';
+  $handler->display->display_options['filters']['field_public_address_locality']['field'] = 'field_public_address_locality';
+  $handler->display->display_options['filters']['field_public_address_locality']['group'] = 1;
+  $handler->display->display_options['filters']['field_public_address_locality']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_public_address_locality']['expose']['operator_id'] = 'field_public_address_locality_op';
+  $handler->display->display_options['filters']['field_public_address_locality']['expose']['label'] = 'Adresse - Localité (Ville)';
+  $handler->display->display_options['filters']['field_public_address_locality']['expose']['operator'] = 'field_public_address_locality_op';
+  $handler->display->display_options['filters']['field_public_address_locality']['expose']['identifier'] = 'field_public_address_locality';
+  $handler->display->display_options['filters']['field_public_address_locality']['expose']['remember_roles'] = array(
+    2 => '2',
+    1 => 0,
+    9 => 0,
+    7 => 0,
+    10 => 0,
+    11 => 0,
+    6 => 0,
+    5 => 0,
+    8 => 0,
+    3 => 0,
+    4 => 0,
+  );
   $handler->display->display_options['path'] = 'admin/content/companies';
   $handler->display->display_options['menu']['type'] = 'tab';
   $handler->display->display_options['menu']['title'] = 'Companies';
@@ -1791,7 +2283,6 @@ function materio_administration_views_default_views() {
     t('Materiaux/brèves'),
     t('- Choisir une opération -'),
     t('Image'),
-    t('Title/Name'),
     t('Fabricants/Distributeurs'),
     t('Fab :<br/>
 [field_company_fab] '),
@@ -1821,8 +2312,12 @@ function materio_administration_views_default_views() {
     t('Courriel'),
     t('Note'),
     t('Le nom contient'),
+    t('Adresse - Pays'),
+    t('Adresse - Code postal'),
+    t('Adresse - Localité (Ville)'),
     t('Page : pages/faq/didactique'),
     t('pages/didactique/faq'),
+    t('Title/Name'),
   );
   $export['admin_contents'] = $view;
 
@@ -2240,6 +2735,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_organization']['table'] = 'field_data_field_organization';
   $handler->display->display_options['fields']['field_organization']['field'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['relationship'] = 'profile';
+  $handler->display->display_options['fields']['field_organization']['label'] = 'Organisation';
   /* Champ: Profil : service */
   $handler->display->display_options['fields']['field_service']['id'] = 'field_service';
   $handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service';
@@ -2440,7 +2936,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['field_organization_value']['group'] = 1;
   $handler->display->display_options['filters']['field_organization_value']['exposed'] = TRUE;
   $handler->display->display_options['filters']['field_organization_value']['expose']['operator_id'] = 'field_organization_value_op';
-  $handler->display->display_options['filters']['field_organization_value']['expose']['label'] = 'Organization';
+  $handler->display->display_options['filters']['field_organization_value']['expose']['label'] = 'Organisation';
   $handler->display->display_options['filters']['field_organization_value']['expose']['operator'] = 'field_organization_value_op';
   $handler->display->display_options['filters']['field_organization_value']['expose']['identifier'] = 'field_organization_value';
   $handler->display->display_options['filters']['field_organization_value']['expose']['remember_roles'] = array(
@@ -2584,7 +3080,7 @@ print user_pass_reset_url($account);
     t('Rôles'),
     t('Expiration'),
     t('Société'),
-    t('Organization'),
+    t('Organisation'),
     t('service'),
     t('service : [field_service]'),
     t('Qualité'),