diff --git a/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc b/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc
index 2af9f543..d35da7ea 100644
--- a/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc
+++ b/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'',
- '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'');
t('customers');
t('looping embed video');
- t('materiO’ newsletter');
- t('test');
return $menu_links;
}
diff --git a/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc b/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
index c9904e4b..884f1580 100644
--- a/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
+++ b/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',
),
diff --git a/sites/all/modules/features/materio_administration/materio_administration.info b/sites/all/modules/features/materio_administration/materio_administration.info
index b3b0c8cf..c0cacae7 100644
--- a/sites/all/modules/features/materio_administration/materio_administration.info
+++ b/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
diff --git a/sites/all/modules/features/materio_administration/materio_administration.views_default.inc b/sites/all/modules/features/materio_administration/materio_administration.views_default.inc
index 5bef1834..1ffccb3a 100644
--- a/sites/all/modules/features/materio_administration/materio_administration.views_default.inc
+++ b/sites/all/modules/features/materio_administration/materio_administration.views_default.inc
@@ -424,7 +424,7 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
$handler->display->display_options['fields']['title']['element_type'] = 'strong';
$handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
- /* Field: Content: Référence Materio */
+ /* Field: Nœud: 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';
@@ -434,13 +434,13 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
$handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
$handler->display->display_options['fields']['edit_node']['alter']['text'] = '[edit_node]';
- /* Field: Content: Manufacturer */
+ /* Field: Nœud: Manufacturer */
$handler->display->display_options['fields']['field_company_fab']['id'] = 'field_company_fab';
$handler->display->display_options['fields']['field_company_fab']['table'] = 'field_data_field_company_fab';
$handler->display->display_options['fields']['field_company_fab']['field'] = 'field_company_fab';
$handler->display->display_options['fields']['field_company_fab']['label'] = 'Fabricants / Distributeurs';
$handler->display->display_options['fields']['field_company_fab']['delta_offset'] = '0';
- /* Field: Content: Distributor */
+ /* Field: Nœud: Distributor */
$handler->display->display_options['fields']['field_company_distrib']['id'] = 'field_company_distrib';
$handler->display->display_options['fields']['field_company_distrib']['table'] = 'field_data_field_company_distrib';
$handler->display->display_options['fields']['field_company_distrib']['field'] = 'field_company_distrib';
@@ -625,7 +625,7 @@ function materio_administration_views_default_views() {
$handler->display->display_options['access']['role'] = array(
3 => '3',
4 => '4',
- 15 => '15',
+ 13 => '13',
);
$handler->display->display_options['defaults']['pager'] = FALSE;
$handler->display->display_options['pager']['type'] = 'full';
@@ -650,7 +650,6 @@ function materio_administration_views_default_views() {
'type' => 'title_field',
'title_field' => 'title_field',
'field_reference_materio' => 'title_field',
- 'field_showroom' => 'title_field',
'edit_node' => 'title_field',
'nothing' => 'title_field',
'field_company_fab' => 'field_company_fab',
@@ -710,13 +709,6 @@ function materio_administration_views_default_views() {
'separator' => '',
'empty_column' => 0,
),
- 'field_showroom' => array(
- 'sortable' => 0,
- 'default_sort_order' => 'asc',
- 'align' => '',
- 'separator' => '',
- 'empty_column' => 0,
- ),
'edit_node' => array(
'align' => '',
'separator' => '',
@@ -821,7 +813,7 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['nid']['label'] = '';
$handler->display->display_options['fields']['nid']['exclude'] = TRUE;
$handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
- /* Field: Content: Image */
+ /* Field: Nœud: Image */
$handler->display->display_options['fields']['field_materiau_image']['id'] = 'field_materiau_image';
$handler->display->display_options['fields']['field_materiau_image']['table'] = 'field_data_field_materiau_image';
$handler->display->display_options['fields']['field_materiau_image']['field'] = 'field_materiau_image';
@@ -832,7 +824,7 @@ function materio_administration_views_default_views() {
);
$handler->display->display_options['fields']['field_materiau_image']['delta_limit'] = '1';
$handler->display->display_options['fields']['field_materiau_image']['delta_offset'] = '0';
- /* Field: Content: Image */
+ /* Field: Nœud: Image */
$handler->display->display_options['fields']['field_visuel']['id'] = 'field_visuel';
$handler->display->display_options['fields']['field_visuel']['table'] = 'field_data_field_visuel';
$handler->display->display_options['fields']['field_visuel']['field'] = 'field_visuel';
@@ -847,24 +839,16 @@ 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';
-
- /* Field: Content: Titre */
+ /* Field: Nœud: Titre */
$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']['element_type'] = 'strong';
$handler->display->display_options['fields']['title_field']['link_to_entity'] = 1;
- /* Field: Content: Référence Materio */
+ /* Field: Nœud: 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';
- /* Champ: Champ : Showroom */
- $handler->display->display_options['fields']['field_showroom']['id'] = 'field_showroom';
- $handler->display->display_options['fields']['field_showroom']['table'] = 'field_data_field_showroom';
- $handler->display->display_options['fields']['field_showroom']['field'] = 'field_showroom';
- $handler->display->display_options['fields']['field_showroom']['label'] = '';
- $handler->display->display_options['fields']['field_showroom']['element_label_colon'] = FALSE;
- $handler->display->display_options['fields']['field_showroom']['type'] = 'taxonomy_term_reference_plain';
/* Field: Content: Edit link */
$handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
$handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
@@ -877,7 +861,7 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['nothing']['field'] = 'nothing';
$handler->display->display_options['fields']['nothing']['label'] = 'Translation';
$handler->display->display_options['fields']['nothing']['alter']['text'] = 'translate';
- /* Field: Content: Manufacturer */
+ /* Field: Nœud: Manufacturer */
$handler->display->display_options['fields']['field_company_fab']['id'] = 'field_company_fab';
$handler->display->display_options['fields']['field_company_fab']['table'] = 'field_data_field_company_fab';
$handler->display->display_options['fields']['field_company_fab']['field'] = 'field_company_fab';
@@ -886,7 +870,7 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['field_company_fab']['alter']['text'] = 'Fab :
[field_company_fab] ';
$handler->display->display_options['fields']['field_company_fab']['delta_offset'] = '0';
- /* Field: Content: Distributor */
+ /* Field: Nœud: Distributor */
$handler->display->display_options['fields']['field_company_distrib']['id'] = 'field_company_distrib';
$handler->display->display_options['fields']['field_company_distrib']['table'] = 'field_data_field_company_distrib';
$handler->display->display_options['fields']['field_company_distrib']['field'] = 'field_company_distrib';
@@ -894,7 +878,7 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['field_company_distrib']['alter']['text'] = 'Distrib :
[field_company_distrib]';
$handler->display->display_options['fields']['field_company_distrib']['delta_offset'] = '0';
- /* Field: Content: Onthologie */
+ /* Field: Nœud: Onthologie */
$handler->display->display_options['fields']['field_onthologie']['id'] = 'field_onthologie';
$handler->display->display_options['fields']['field_onthologie']['table'] = 'field_data_field_onthologie';
$handler->display->display_options['fields']['field_onthologie']['field'] = 'field_onthologie';
@@ -902,7 +886,7 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['field_onthologie']['delta_limit'] = '5';
$handler->display->display_options['fields']['field_onthologie']['delta_offset'] = '0';
$handler->display->display_options['fields']['field_onthologie']['multi_type'] = 'ol';
- /* Field: Content: Tags libres */
+ /* Field: Nœud: Tags libres */
$handler->display->display_options['fields']['field_tags_libres']['id'] = 'field_tags_libres';
$handler->display->display_options['fields']['field_tags_libres']['table'] = 'field_data_field_tags_libres';
$handler->display->display_options['fields']['field_tags_libres']['field'] = 'field_tags_libres';
@@ -910,7 +894,7 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['field_tags_libres']['delta_limit'] = '4';
$handler->display->display_options['fields']['field_tags_libres']['delta_offset'] = '0';
$handler->display->display_options['fields']['field_tags_libres']['multi_type'] = 'ul';
- /* Field: Content: Materiau(x) lié(s) */
+ /* Field: Nœud: Materiau(x) lié(s) */
$handler->display->display_options['fields']['field_materiau_ref']['id'] = 'field_materiau_ref';
$handler->display->display_options['fields']['field_materiau_ref']['table'] = 'field_data_field_materiau_ref';
$handler->display->display_options['fields']['field_materiau_ref']['field'] = 'field_materiau_ref';
@@ -921,7 +905,7 @@ function materio_administration_views_default_views() {
'link' => 1,
);
$handler->display->display_options['fields']['field_materiau_ref']['delta_offset'] = '0';
- /* Field: Content: Brève(s) liée(s) */
+ /* Field: Nœud: Brève(s) liée(s) */
$handler->display->display_options['fields']['field_breve_ref']['id'] = 'field_breve_ref';
$handler->display->display_options['fields']['field_breve_ref']['table'] = 'field_data_field_breve_ref';
$handler->display->display_options['fields']['field_breve_ref']['field'] = 'field_breve_ref';
@@ -939,13 +923,13 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['field_memo']['alter']['max_length'] = '300';
$handler->display->display_options['fields']['field_memo']['alter']['strip_tags'] = TRUE;
$handler->display->display_options['fields']['field_memo']['alter']['trim'] = TRUE;
- /* Field: Content: Fichiers joints */
+ /* Field: Nœud: Fichiers joints */
$handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments';
$handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments';
$handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments';
$handler->display->display_options['fields']['field_attachments']['click_sort_column'] = 'fid';
$handler->display->display_options['fields']['field_attachments']['delta_offset'] = '0';
- /* Field: Content: Localisation */
+ /* Field: Nœud: Localisation */
$handler->display->display_options['fields']['field_localisation']['id'] = 'field_localisation';
$handler->display->display_options['fields']['field_localisation']['table'] = 'field_data_field_localisation';
$handler->display->display_options['fields']['field_localisation']['field'] = 'field_localisation';
@@ -1041,7 +1025,7 @@ function materio_administration_views_default_views() {
4 => 0,
);
$handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE;
- /* Filter criterion: Content: Famille (field_famille) */
+ /* Filter criterion: Nœud: Famille (field_famille) */
$handler->display->display_options['filters']['field_famille_value']['id'] = 'field_famille_value';
$handler->display->display_options['filters']['field_famille_value']['table'] = 'field_data_field_famille';
$handler->display->display_options['filters']['field_famille_value']['field'] = 'field_famille_value';
@@ -1052,7 +1036,7 @@ function materio_administration_views_default_views() {
$handler->display->display_options['filters']['field_famille_value']['expose']['operator'] = 'field_famille_value_op';
$handler->display->display_options['filters']['field_famille_value']['expose']['identifier'] = 'field_famille_value';
$handler->display->display_options['filters']['field_famille_value']['expose']['remember'] = TRUE;
- /* Filter criterion: Content: Référence Materio (field_reference_materio) */
+ /* Filter criterion: Nœud: Référence Materio (field_reference_materio) */
$handler->display->display_options['filters']['field_reference_materio_value']['id'] = 'field_reference_materio_value';
$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';
@@ -1063,7 +1047,7 @@ function materio_administration_views_default_views() {
$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';
- /* Filter criterion: Content: Localisation (field_localisation) */
+ /* Filter criterion: Nœud: 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';
@@ -1230,7 +1214,7 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
$handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
$handler->display->display_options['fields']['edit_node']['alter']['text'] = '[edit_node]';
- /* Field: Content: Adresse */
+ /* Field: Nœud: Adresse */
$handler->display->display_options['fields']['field_public_address']['id'] = 'field_public_address';
$handler->display->display_options['fields']['field_public_address']['table'] = 'field_data_field_public_address';
$handler->display->display_options['fields']['field_public_address']['field'] = 'field_public_address';
@@ -1241,7 +1225,7 @@ function materio_administration_views_default_views() {
'address' => 'address',
),
);
- /* Field: Content: Phone */
+ /* Field: Nœud: Phone */
$handler->display->display_options['fields']['field_public_phone']['id'] = 'field_public_phone';
$handler->display->display_options['fields']['field_public_phone']['table'] = 'field_data_field_public_phone';
$handler->display->display_options['fields']['field_public_phone']['field'] = 'field_public_phone';
@@ -1263,21 +1247,21 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['translate']['field'] = 'translate';
$handler->display->display_options['fields']['translate']['exclude'] = TRUE;
$handler->display->display_options['fields']['translate']['not'] = 0;
- /* Field: Content: website */
+ /* Field: Nœud: website */
$handler->display->display_options['fields']['field_website']['id'] = 'field_website';
$handler->display->display_options['fields']['field_website']['table'] = 'field_data_field_website';
$handler->display->display_options['fields']['field_website']['field'] = 'field_website';
$handler->display->display_options['fields']['field_website']['click_sort_column'] = 'url';
- /* Field: Content: Email */
+ /* Field: Nœud: Email */
$handler->display->display_options['fields']['field_public_email']['id'] = 'field_public_email';
$handler->display->display_options['fields']['field_public_email']['table'] = 'field_data_field_public_email';
$handler->display->display_options['fields']['field_public_email']['field'] = 'field_public_email';
$handler->display->display_options['fields']['field_public_email']['label'] = 'Courriel';
- /* Field: Content: Note */
+ /* Field: Nœud: Note */
$handler->display->display_options['fields']['field_note']['id'] = 'field_note';
$handler->display->display_options['fields']['field_note']['table'] = 'field_data_field_note';
$handler->display->display_options['fields']['field_note']['field'] = 'field_note';
- /* Field: Content: Fichiers joints */
+ /* Field: Nœud: Fichiers joints */
$handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments';
$handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments';
$handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments';
@@ -1352,7 +1336,7 @@ function materio_administration_views_default_views() {
'looping_embed_video' => 'looping_embed_video',
);
$handler->display->display_options['filters']['type_2']['group'] = 1;
- /* Filter criterion: Content: Adresse - Postal code */
+ /* Filter criterion: Nœud: Adresse - Postal code */
$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';
@@ -1375,7 +1359,7 @@ function materio_administration_views_default_views() {
3 => 0,
4 => 0,
);
- /* Filter criterion: Content: Adresse - Locality (i.e. City) */
+ /* Filter criterion: Nœud: Adresse - Locality (i.e. City) */
$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';
@@ -1473,13 +1457,13 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['field_memo']['alter']['max_length'] = '300';
$handler->display->display_options['fields']['field_memo']['alter']['strip_tags'] = TRUE;
$handler->display->display_options['fields']['field_memo']['alter']['trim'] = TRUE;
- /* Field: Content: Fichiers joints */
+ /* Field: Nœud: Fichiers joints */
$handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments';
$handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments';
$handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments';
$handler->display->display_options['fields']['field_attachments']['click_sort_column'] = 'fid';
$handler->display->display_options['fields']['field_attachments']['delta_offset'] = '0';
- /* Field: Content: Localisation */
+ /* Field: Nœud: Localisation */
$handler->display->display_options['fields']['field_localisation']['id'] = 'field_localisation';
$handler->display->display_options['fields']['field_localisation']['table'] = 'field_data_field_localisation';
$handler->display->display_options['fields']['field_localisation']['field'] = 'field_localisation';
@@ -1575,7 +1559,7 @@ function materio_administration_views_default_views() {
4 => 0,
);
$handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE;
- /* Filter criterion: Content: Référence Materio (field_reference_materio) */
+ /* Filter criterion: Nœud: Référence Materio (field_reference_materio) */
$handler->display->display_options['filters']['field_reference_materio_value']['id'] = 'field_reference_materio_value';
$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';
@@ -1597,15 +1581,14 @@ function materio_administration_views_default_views() {
$handler->display->display_options['tab_options']['title'] = 'dashboard';
$handler->display->display_options['tab_options']['weight'] = '0';
- /* Display: Page : showroom */
- $handler = $view->new_display('page', 'Page : showroom', 'page_4');
+ /* Display: Page : showrooms */
+ $handler = $view->new_display('page', 'Page : showrooms', 'page_4');
$handler->display->display_options['defaults']['title'] = FALSE;
- $handler->display->display_options['title'] = 'Showroom';
+ $handler->display->display_options['title'] = 'Materiaux/brèves';
$handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
- $handler->display->display_options['defaults']['group_by'] = FALSE;
$handler->display->display_options['defaults']['pager'] = FALSE;
$handler->display->display_options['pager']['type'] = 'full';
- $handler->display->display_options['pager']['options']['items_per_page'] = '25';
+ $handler->display->display_options['pager']['options']['items_per_page'] = '50';
$handler->display->display_options['pager']['options']['offset'] = '0';
$handler->display->display_options['pager']['options']['id'] = '0';
$handler->display->display_options['pager']['options']['quantity'] = '9';
@@ -1616,12 +1599,111 @@ 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',
+ 'nid' => 'nid',
+ 'field_tode_showroom' => 'field_tode_showroom',
+ 'edit_node' => 'field_tode_showroom',
+ 'nothing' => 'field_tode_showroom',
+ 'field_public_email' => 'field_public_email',
+ 'field_public_phone' => 'field_public_phone',
+ 'field_public_address' => 'field_public_address',
+ 'body' => 'body',
+ 'field_memo' => 'field_memo',
+ 'sid' => 'sid',
+ 'delete_node' => 'sid',
+ );
+ $handler->display->display_options['style_options']['default'] = '-1';
+ $handler->display->display_options['style_options']['info'] = array(
+ 'views_bulk_operations' => array(
+ 'align' => '',
+ 'separator' => '',
+ 'empty_column' => 0,
+ ),
+ 'nid' => array(
+ 'sortable' => 0,
+ 'default_sort_order' => 'asc',
+ 'align' => '',
+ 'separator' => '',
+ 'empty_column' => 0,
+ ),
+ 'field_tode_showroom' => array(
+ 'sortable' => 0,
+ 'default_sort_order' => 'asc',
+ 'align' => '',
+ 'separator' => '
',
+ 'empty_column' => 0,
+ ),
+ 'edit_node' => array(
+ 'align' => '',
+ 'separator' => '',
+ 'empty_column' => 0,
+ ),
+ 'nothing' => array(
+ 'align' => '',
+ 'separator' => '
',
+ 'empty_column' => 0,
+ ),
+ 'field_public_email' => array(
+ 'sortable' => 0,
+ 'default_sort_order' => 'asc',
+ 'align' => '',
+ 'separator' => '',
+ 'empty_column' => 0,
+ ),
+ 'field_public_phone' => array(
+ 'align' => '',
+ 'separator' => '',
+ 'empty_column' => 0,
+ ),
+ 'field_public_address' => array(
+ 'sortable' => 0,
+ 'default_sort_order' => 'asc',
+ 'align' => '',
+ 'separator' => '',
+ 'empty_column' => 0,
+ ),
+ 'body' => array(
+ 'sortable' => 0,
+ 'default_sort_order' => 'asc',
+ 'align' => '',
+ 'separator' => '',
+ 'empty_column' => 0,
+ ),
+ 'field_memo' => array(
+ 'sortable' => 0,
+ 'default_sort_order' => 'asc',
+ 'align' => '',
+ 'separator' => '',
+ 'empty_column' => 0,
+ ),
+ 'sid' => array(
+ 'sortable' => 0,
+ 'default_sort_order' => 'asc',
+ 'align' => '',
+ 'separator' => '
',
+ 'empty_column' => 0,
+ ),
+ 'delete_node' => array(
+ 'align' => '',
+ 'separator' => '',
+ 'empty_column' => 0,
+ ),
+ );
+ $handler->display->display_options['style_options']['override'] = FALSE;
+ $handler->display->display_options['defaults']['style_options'] = FALSE;
+ $handler->display->display_options['defaults']['row_plugin'] = FALSE;
+ $handler->display->display_options['defaults']['row_options'] = FALSE;
$handler->display->display_options['defaults']['relationships'] = FALSE;
$handler->display->display_options['defaults']['fields'] = FALSE;
- /* Champ: Opérations en masse : Contenu */
+ /* Field: Bulk operations: Content */
$handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
$handler->display->display_options['fields']['views_bulk_operations']['table'] = 'node';
$handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
+ $handler->display->display_options['fields']['views_bulk_operations']['label'] = '';
+ $handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['enable_select_all_pages'] = 1;
$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0;
@@ -1635,28 +1717,39 @@ function materio_administration_views_default_views() {
'postpone_processing' => 0,
),
);
- /* Champ: Contenu : Titre */
- $handler->display->display_options['fields']['title']['id'] = 'title';
- $handler->display->display_options['fields']['title']['table'] = 'node';
- $handler->display->display_options['fields']['title']['field'] = 'title';
- $handler->display->display_options['fields']['title']['label'] = 'Title / Name';
- $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
- $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
- $handler->display->display_options['fields']['title']['element_type'] = 'strong';
- $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
- /* Champ: Contenu : Date de publication */
- $handler->display->display_options['fields']['created']['id'] = 'created';
- $handler->display->display_options['fields']['created']['table'] = 'node';
- $handler->display->display_options['fields']['created']['field'] = 'created';
- $handler->display->display_options['fields']['created']['date_format'] = 'custom';
- $handler->display->display_options['fields']['created']['custom_date_format'] = 'Y/m/d';
- /* Champ: Contenu : Lien de modification */
+ /* Field: Content: Nid */
+ $handler->display->display_options['fields']['nid']['id'] = 'nid';
+ $handler->display->display_options['fields']['nid']['table'] = 'node';
+ $handler->display->display_options['fields']['nid']['field'] = 'nid';
+ $handler->display->display_options['fields']['nid']['label'] = '';
+ $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
+ $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
+ /* Field: Nœud: Showroom */
+ $handler->display->display_options['fields']['field_tode_showroom']['id'] = 'field_tode_showroom';
+ $handler->display->display_options['fields']['field_tode_showroom']['table'] = 'field_data_field_tode_showroom';
+ $handler->display->display_options['fields']['field_tode_showroom']['field'] = 'field_tode_showroom';
+ /* Field: Content: Edit link */
$handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
$handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
$handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
$handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
$handler->display->display_options['fields']['edit_node']['alter']['text'] = '[edit_node]';
- /* Champ: Contenu : Adresse */
+ /* Field: Global: Custom text */
+ $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
+ $handler->display->display_options['fields']['nothing']['table'] = 'views';
+ $handler->display->display_options['fields']['nothing']['field'] = 'nothing';
+ $handler->display->display_options['fields']['nothing']['label'] = 'Translation';
+ $handler->display->display_options['fields']['nothing']['alter']['text'] = 'translate';
+ /* Field: Nœud: Email */
+ $handler->display->display_options['fields']['field_public_email']['id'] = 'field_public_email';
+ $handler->display->display_options['fields']['field_public_email']['table'] = 'field_data_field_public_email';
+ $handler->display->display_options['fields']['field_public_email']['field'] = 'field_public_email';
+ $handler->display->display_options['fields']['field_public_email']['label'] = 'Courriel';
+ /* Field: Nœud: Phone */
+ $handler->display->display_options['fields']['field_public_phone']['id'] = 'field_public_phone';
+ $handler->display->display_options['fields']['field_public_phone']['table'] = 'field_data_field_public_phone';
+ $handler->display->display_options['fields']['field_public_phone']['field'] = 'field_public_phone';
+ /* Field: Nœud: Adresse */
$handler->display->display_options['fields']['field_public_address']['id'] = 'field_public_address';
$handler->display->display_options['fields']['field_public_address']['table'] = 'field_data_field_public_address';
$handler->display->display_options['fields']['field_public_address']['field'] = 'field_public_address';
@@ -1667,41 +1760,44 @@ function materio_administration_views_default_views() {
'address' => 'address',
),
);
- /* Champ: Contenu : Phone */
- $handler->display->display_options['fields']['field_public_phone']['id'] = 'field_public_phone';
- $handler->display->display_options['fields']['field_public_phone']['table'] = 'field_data_field_public_phone';
- $handler->display->display_options['fields']['field_public_phone']['field'] = 'field_public_phone';
- $handler->display->display_options['fields']['field_public_phone']['label'] = 'Téléphone';
- $handler->display->display_options['fields']['field_public_phone']['click_sort_column'] = 'number';
- $handler->display->display_options['fields']['field_public_phone']['delta_offset'] = '0';
- /* Champ: Traduction du contenu : Lien de traduction */
- $handler->display->display_options['fields']['translate_node']['id'] = 'translate_node';
- $handler->display->display_options['fields']['translate_node']['table'] = 'node';
- $handler->display->display_options['fields']['translate_node']['field'] = 'translate_node';
- $handler->display->display_options['fields']['translate_node']['alter']['text'] = '[translate_node]';
- /* Champ: Traduction du contenu : Statut de la traduction */
- $handler->display->display_options['fields']['translate']['id'] = 'translate';
- $handler->display->display_options['fields']['translate']['table'] = 'node';
- $handler->display->display_options['fields']['translate']['field'] = 'translate';
- $handler->display->display_options['fields']['translate']['exclude'] = TRUE;
- $handler->display->display_options['fields']['translate']['not'] = 0;
- /* Champ: Contenu : Email */
- $handler->display->display_options['fields']['field_public_email']['id'] = 'field_public_email';
- $handler->display->display_options['fields']['field_public_email']['table'] = 'field_data_field_public_email';
- $handler->display->display_options['fields']['field_public_email']['field'] = 'field_public_email';
- $handler->display->display_options['fields']['field_public_email']['label'] = 'Courriel';
- /* Champ: Champ : Mémo */
+ /* Field: Nœud: Body */
+ $handler->display->display_options['fields']['body']['id'] = 'body';
+ $handler->display->display_options['fields']['body']['table'] = 'field_data_body';
+ $handler->display->display_options['fields']['body']['field'] = 'body';
+ $handler->display->display_options['fields']['body']['label'] = 'Corps';
+ $handler->display->display_options['fields']['body']['type'] = 'text_summary_or_trimmed';
+ $handler->display->display_options['fields']['body']['settings'] = array(
+ 'trim_length' => '200',
+ );
+ /* Field: Field: Mémo */
$handler->display->display_options['fields']['field_memo']['id'] = 'field_memo';
$handler->display->display_options['fields']['field_memo']['table'] = 'field_data_field_memo';
$handler->display->display_options['fields']['field_memo']['field'] = 'field_memo';
$handler->display->display_options['fields']['field_memo']['alter']['nl2br'] = TRUE;
- /* Champ: Processus : État actuel */
+ $handler->display->display_options['fields']['field_memo']['alter']['max_length'] = '300';
+ $handler->display->display_options['fields']['field_memo']['alter']['strip_tags'] = TRUE;
+ $handler->display->display_options['fields']['field_memo']['alter']['trim'] = TRUE;
+ /* Field: Workflow: Current state */
$handler->display->display_options['fields']['sid']['id'] = 'sid';
$handler->display->display_options['fields']['sid']['table'] = 'workflow_node';
$handler->display->display_options['fields']['sid']['field'] = 'sid';
+ /* Field: Content: Delete link */
+ $handler->display->display_options['fields']['delete_node']['id'] = 'delete_node';
+ $handler->display->display_options['fields']['delete_node']['table'] = 'views_entity_node';
+ $handler->display->display_options['fields']['delete_node']['field'] = 'delete_node';
+ $handler->display->display_options['fields']['delete_node']['alter']['alter_text'] = TRUE;
+ $handler->display->display_options['fields']['delete_node']['alter']['text'] = '[delete_node]';
$handler->display->display_options['defaults']['filter_groups'] = FALSE;
$handler->display->display_options['defaults']['filters'] = FALSE;
- /* Critère de filtrage: Contenu : Titre */
+ /* Filter criterion: Content: Type */
+ $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
+ $handler->display->display_options['filters']['type_1']['table'] = 'node';
+ $handler->display->display_options['filters']['type_1']['field'] = 'type';
+ $handler->display->display_options['filters']['type_1']['value'] = array(
+ 'showroom' => 'showroom',
+ );
+ $handler->display->display_options['filters']['type_1']['group'] = 1;
+ /* Filter criterion: Content: Title */
$handler->display->display_options['filters']['title']['id'] = 'title';
$handler->display->display_options['filters']['title']['table'] = 'node';
$handler->display->display_options['filters']['title']['field'] = 'title';
@@ -1709,11 +1805,11 @@ function materio_administration_views_default_views() {
$handler->display->display_options['filters']['title']['group'] = 1;
$handler->display->display_options['filters']['title']['exposed'] = TRUE;
$handler->display->display_options['filters']['title']['expose']['operator_id'] = 'title_op';
- $handler->display->display_options['filters']['title']['expose']['label'] = 'Le nom contient';
+ $handler->display->display_options['filters']['title']['expose']['label'] = 'Title / Name contains';
$handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
$handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
$handler->display->display_options['filters']['title']['expose']['remember'] = TRUE;
- /* Critère de filtrage: Champ : Mémo (field_memo) */
+ /* Filter criterion: Field: Mémo (field_memo) */
$handler->display->display_options['filters']['field_memo_value']['id'] = 'field_memo_value';
$handler->display->display_options['filters']['field_memo_value']['table'] = 'field_data_field_memo';
$handler->display->display_options['filters']['field_memo_value']['field'] = 'field_memo_value';
@@ -1724,77 +1820,28 @@ function materio_administration_views_default_views() {
$handler->display->display_options['filters']['field_memo_value']['expose']['label'] = 'Mémo contient';
$handler->display->display_options['filters']['field_memo_value']['expose']['operator'] = 'field_memo_value_op';
$handler->display->display_options['filters']['field_memo_value']['expose']['identifier'] = 'field_memo_value';
- /* Critère de filtrage: Contenu : Type */
- $handler->display->display_options['filters']['type_2']['id'] = 'type_2';
- $handler->display->display_options['filters']['type_2']['table'] = 'node';
- $handler->display->display_options['filters']['type_2']['field'] = 'type';
- $handler->display->display_options['filters']['type_2']['operator'] = 'not in';
- $handler->display->display_options['filters']['type_2']['value'] = array(
- 'breve' => 'breve',
- 'didactique' => 'didactique',
- 'faq' => 'faq',
- 'simplenews' => 'simplenews',
- 'materiau' => 'materiau',
- 'page' => 'page',
- 'panel' => 'panel',
- 'product' => 'product',
- 'publication' => 'publication',
- 'company' => 'company',
- 'webform' => 'webform',
- 'looping_embed_video' => 'looping_embed_video',
- );
- $handler->display->display_options['filters']['type_2']['group'] = 1;
- /* 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'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,
- );
+ /* Filter criterion: Workflow: Current state */
+ $handler->display->display_options['filters']['sid']['id'] = 'sid';
+ $handler->display->display_options['filters']['sid']['table'] = 'workflow_node';
+ $handler->display->display_options['filters']['sid']['field'] = 'sid';
+ $handler->display->display_options['filters']['sid']['group'] = 1;
+ $handler->display->display_options['filters']['sid']['exposed'] = TRUE;
+ $handler->display->display_options['filters']['sid']['expose']['operator_id'] = 'sid_op';
+ $handler->display->display_options['filters']['sid']['expose']['label'] = 'Processus';
+ $handler->display->display_options['filters']['sid']['expose']['operator'] = 'sid_op';
+ $handler->display->display_options['filters']['sid']['expose']['identifier'] = 'sid';
+ $handler->display->display_options['filters']['sid']['expose']['remember'] = TRUE;
+ /* Filter criterion: Content: Published */
+ $handler->display->display_options['filters']['status']['id'] = 'status';
+ $handler->display->display_options['filters']['status']['table'] = 'node';
+ $handler->display->display_options['filters']['status']['field'] = 'status';
+ $handler->display->display_options['filters']['status']['value'] = '1';
+ $handler->display->display_options['filters']['status']['group'] = 1;
$handler->display->display_options['path'] = 'admin/content/showrooms';
$handler->display->display_options['menu']['type'] = 'tab';
$handler->display->display_options['menu']['title'] = 'Showrooms';
$handler->display->display_options['menu']['description'] = 'showrooms';
- $handler->display->display_options['menu']['weight'] = '-99';
+ $handler->display->display_options['menu']['weight'] = '-100';
$handler->display->display_options['menu']['context'] = 0;
$handler->display->display_options['menu']['context_only_inline'] = 0;
$handler->display->display_options['tab_options']['type'] = 'normal';
@@ -1888,8 +1935,10 @@ function materio_administration_views_default_views() {
t('Page : page/publicationfaq/didactique'),
t('page/publication/didactique/faq'),
t('Title/Name'),
- t('Page : showroom'),
+ t('Page : showrooms'),
t('Showroom'),
+ t('Phone'),
+ t('Corps'),
);
$export['admin_contents'] = $view;
@@ -2145,7 +2194,7 @@ function materio_administration_views_default_views() {
$handler->display->display_options['header']['result']['table'] = 'views';
$handler->display->display_options['header']['result']['field'] = 'result';
$handler->display->display_options['header']['result']['label'] = 'Résumé';
- /* Relationship: User: Profile */
+ /* Relationship: User: Profil */
$handler->display->display_options['relationships']['profile']['id'] = 'profile';
$handler->display->display_options['relationships']['profile']['table'] = 'users';
$handler->display->display_options['relationships']['profile']['field'] = 'profile';
@@ -2199,19 +2248,19 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['uid']['exclude'] = TRUE;
$handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['uid']['link_to_user'] = FALSE;
- /* Field: Profile: Title */
+ /* Field: Profil: Title */
$handler->display->display_options['fields']['field_private_name_title']['id'] = 'field_private_name_title';
$handler->display->display_options['fields']['field_private_name_title']['table'] = 'field_data_field_private_name_title';
$handler->display->display_options['fields']['field_private_name_title']['field'] = 'field_private_name_title';
$handler->display->display_options['fields']['field_private_name_title']['relationship'] = 'profile';
- /* Field: Profile: First name */
+ /* Field: Profil: First name */
$handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
$handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
$handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
$handler->display->display_options['fields']['field_first_name']['relationship'] = 'profile';
$handler->display->display_options['fields']['field_first_name']['label'] = 'Prénom';
$handler->display->display_options['fields']['field_first_name']['exclude'] = TRUE;
- /* Field: Profile: Name */
+ /* Field: Profil: Name */
$handler->display->display_options['fields']['field_name']['id'] = 'field_name';
$handler->display->display_options['fields']['field_name']['table'] = 'field_data_field_name';
$handler->display->display_options['fields']['field_name']['field'] = 'field_name';
@@ -2241,18 +2290,18 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['expiration']['date_format'] = 'custom';
$handler->display->display_options['fields']['expiration']['custom_date_format'] = 'Y-m-d';
$handler->display->display_options['fields']['expiration']['second_date_format'] = 'long';
- /* Field: User: Company */
+ /* Field: Utilisateur: Company */
$handler->display->display_options['fields']['field_company']['id'] = 'field_company';
$handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
$handler->display->display_options['fields']['field_company']['field'] = 'field_company';
$handler->display->display_options['fields']['field_company']['label'] = 'Société';
- /* Field: Profile: Organization */
+ /* Field: Profil: Organization */
$handler->display->display_options['fields']['field_organization']['id'] = 'field_organization';
$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';
- /* Field: Profile: service */
+ /* Field: Profil: service */
$handler->display->display_options['fields']['field_service']['id'] = 'field_service';
$handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service';
$handler->display->display_options['fields']['field_service']['field'] = 'field_service';
@@ -2261,7 +2310,7 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['field_service']['alter']['text'] = 'service : [field_service]';
$handler->display->display_options['fields']['field_service']['hide_empty'] = TRUE;
$handler->display->display_options['fields']['field_service']['empty_zero'] = TRUE;
- /* Field: Profile: Quality */
+ /* Field: Profil: Quality */
$handler->display->display_options['fields']['field_private_quality']['id'] = 'field_private_quality';
$handler->display->display_options['fields']['field_private_quality']['table'] = 'field_data_field_private_quality';
$handler->display->display_options['fields']['field_private_quality']['field'] = 'field_private_quality';
@@ -2270,7 +2319,7 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['field_private_quality']['alter']['text'] = 'quality : [field_private_quality]';
$handler->display->display_options['fields']['field_private_quality']['hide_empty'] = TRUE;
$handler->display->display_options['fields']['field_private_quality']['empty_zero'] = TRUE;
- /* Field: Profile: SIRET */
+ /* Field: Profil: SIRET */
$handler->display->display_options['fields']['field_siret']['id'] = 'field_siret';
$handler->display->display_options['fields']['field_siret']['table'] = 'field_data_field_siret';
$handler->display->display_options['fields']['field_siret']['field'] = 'field_siret';
@@ -2278,7 +2327,7 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['field_siret']['alter']['alter_text'] = TRUE;
$handler->display->display_options['fields']['field_siret']['alter']['text'] = 'siret : [field_siret]';
$handler->display->display_options['fields']['field_siret']['hide_empty'] = TRUE;
- /* Field: Profile: Employee */
+ /* Field: Profil: Employee */
$handler->display->display_options['fields']['field_employee']['id'] = 'field_employee';
$handler->display->display_options['fields']['field_employee']['table'] = 'field_data_field_employee';
$handler->display->display_options['fields']['field_employee']['field'] = 'field_employee';
@@ -2292,14 +2341,14 @@ function materio_administration_views_default_views() {
'thousand_separator' => ' ',
'prefix_suffix' => 1,
);
- /* Field: Profile: Website */
+ /* Field: Profil: Website */
$handler->display->display_options['fields']['field_user_website']['id'] = 'field_user_website';
$handler->display->display_options['fields']['field_user_website']['table'] = 'field_data_field_user_website';
$handler->display->display_options['fields']['field_user_website']['field'] = 'field_user_website';
$handler->display->display_options['fields']['field_user_website']['relationship'] = 'profile';
$handler->display->display_options['fields']['field_user_website']['label'] = 'Site internet';
$handler->display->display_options['fields']['field_user_website']['click_sort_column'] = 'url';
- /* Field: Profile: Adresse */
+ /* Field: Profil: Adresse */
$handler->display->display_options['fields']['field_adresse']['id'] = 'field_adresse';
$handler->display->display_options['fields']['field_adresse']['table'] = 'field_data_field_adresse';
$handler->display->display_options['fields']['field_adresse']['field'] = 'field_adresse';
@@ -2311,7 +2360,7 @@ function materio_administration_views_default_views() {
'address' => 'address',
),
);
- /* Field: Profile: Phone */
+ /* Field: Profil: Phone */
$handler->display->display_options['fields']['field_private_phone']['id'] = 'field_private_phone';
$handler->display->display_options['fields']['field_private_phone']['table'] = 'field_data_field_private_phone';
$handler->display->display_options['fields']['field_private_phone']['field'] = 'field_private_phone';
@@ -2328,8 +2377,8 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['php_2']['php_value'] = '$subscriber = simplenews_subscriber_load_by_uid($row->uid);
//dsm($subscriber);
foreach($subscriber->tids as $tid){
- $new = simplenews_category_load($tid);
- $news[] = $new->name;
+ $new = simplenews_category_load($tid);
+ $news[] = $new->name;
}
return $news;';
$handler->display->display_options['fields']['php_2']['php_output'] = '\');
$handler->display->display_options['fields']['php_1']['label'] = 'One time login';
$handler->display->display_options['fields']['php_1']['exclude'] = TRUE;
$handler->display->display_options['fields']['php_1']['use_php_setup'] = 0;
- $handler->display->display_options['fields']['php_1']['php_output'] = 'display->display_options['fields']['php_1']['php_output'] = 'uid);
-print user_pass_reset_url($account);
+print user_pass_reset_url($account);
?>';
$handler->display->display_options['fields']['php_1']['use_php_click_sortable'] = '0';
$handler->display->display_options['fields']['php_1']['php_click_sortable'] = '';
@@ -2423,7 +2472,6 @@ print user_pass_reset_url($account);
6 => '6',
8 => '8',
3 => '3',
- 15 => '15',
);
$handler->display->display_options['filters']['rid']['group'] = 1;
$handler->display->display_options['filters']['rid']['exposed'] = TRUE;
@@ -2444,13 +2492,9 @@ print user_pass_reset_url($account);
8 => 0,
3 => 0,
4 => 0,
- 13 => 0,
- 14 => 0,
- 12 => 0,
- 15 => 0,
);
$handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
- /* Filter criterion: User: Company (field_company) */
+ /* Filter criterion: Utilisateur: Company (field_company) */
$handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
$handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
$handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -2462,7 +2506,7 @@ print user_pass_reset_url($account);
$handler->display->display_options['filters']['field_company_tid']['expose']['operator'] = 'field_company_tid_op';
$handler->display->display_options['filters']['field_company_tid']['expose']['identifier'] = 'field_company_tid';
$handler->display->display_options['filters']['field_company_tid']['vocabulary'] = 'company';
- /* Filter criterion: Profile: Organization (field_organization) */
+ /* Filter criterion: Profil: Organization (field_organization) */
$handler->display->display_options['filters']['field_organization_value']['id'] = 'field_organization_value';
$handler->display->display_options['filters']['field_organization_value']['table'] = 'field_data_field_organization';
$handler->display->display_options['filters']['field_organization_value']['field'] = 'field_organization_value';
@@ -2639,19 +2683,19 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['uid']['exclude'] = TRUE;
$handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['uid']['link_to_user'] = FALSE;
- /* Field: Profile: Title */
+ /* Field: Profil: Title */
$handler->display->display_options['fields']['field_private_name_title']['id'] = 'field_private_name_title';
$handler->display->display_options['fields']['field_private_name_title']['table'] = 'field_data_field_private_name_title';
$handler->display->display_options['fields']['field_private_name_title']['field'] = 'field_private_name_title';
$handler->display->display_options['fields']['field_private_name_title']['relationship'] = 'profile';
- /* Field: Profile: First name */
+ /* Field: Profil: First name */
$handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
$handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
$handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
$handler->display->display_options['fields']['field_first_name']['relationship'] = 'profile';
$handler->display->display_options['fields']['field_first_name']['label'] = 'Prénom';
$handler->display->display_options['fields']['field_first_name']['exclude'] = TRUE;
- /* Field: Profile: Name */
+ /* Field: Profil: Name */
$handler->display->display_options['fields']['field_name']['id'] = 'field_name';
$handler->display->display_options['fields']['field_name']['table'] = 'field_data_field_name';
$handler->display->display_options['fields']['field_name']['field'] = 'field_name';
@@ -2677,18 +2721,18 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['expiration']['date_format'] = 'custom';
$handler->display->display_options['fields']['expiration']['custom_date_format'] = 'Y-m-d';
$handler->display->display_options['fields']['expiration']['second_date_format'] = 'long';
- /* Field: User: Company */
+ /* Field: Utilisateur: Company */
$handler->display->display_options['fields']['field_company']['id'] = 'field_company';
$handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
$handler->display->display_options['fields']['field_company']['field'] = 'field_company';
$handler->display->display_options['fields']['field_company']['label'] = 'Société';
- /* Field: Profile: Organization */
+ /* Field: Profil: Organization */
$handler->display->display_options['fields']['field_organization']['id'] = 'field_organization';
$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';
- /* Field: Profile: service */
+ /* Field: Profil: service */
$handler->display->display_options['fields']['field_service']['id'] = 'field_service';
$handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service';
$handler->display->display_options['fields']['field_service']['field'] = 'field_service';
@@ -2697,7 +2741,7 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['field_service']['alter']['text'] = 'service : [field_service]';
$handler->display->display_options['fields']['field_service']['hide_empty'] = TRUE;
$handler->display->display_options['fields']['field_service']['empty_zero'] = TRUE;
- /* Field: Profile: Quality */
+ /* Field: Profil: Quality */
$handler->display->display_options['fields']['field_private_quality']['id'] = 'field_private_quality';
$handler->display->display_options['fields']['field_private_quality']['table'] = 'field_data_field_private_quality';
$handler->display->display_options['fields']['field_private_quality']['field'] = 'field_private_quality';
@@ -2706,7 +2750,7 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['field_private_quality']['alter']['text'] = 'quality : [field_private_quality]';
$handler->display->display_options['fields']['field_private_quality']['hide_empty'] = TRUE;
$handler->display->display_options['fields']['field_private_quality']['empty_zero'] = TRUE;
- /* Field: Profile: SIRET */
+ /* Field: Profil: SIRET */
$handler->display->display_options['fields']['field_siret']['id'] = 'field_siret';
$handler->display->display_options['fields']['field_siret']['table'] = 'field_data_field_siret';
$handler->display->display_options['fields']['field_siret']['field'] = 'field_siret';
@@ -2714,7 +2758,7 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['field_siret']['alter']['alter_text'] = TRUE;
$handler->display->display_options['fields']['field_siret']['alter']['text'] = 'siret : [field_siret]';
$handler->display->display_options['fields']['field_siret']['hide_empty'] = TRUE;
- /* Field: Profile: Employee */
+ /* Field: Profil: Employee */
$handler->display->display_options['fields']['field_employee']['id'] = 'field_employee';
$handler->display->display_options['fields']['field_employee']['table'] = 'field_data_field_employee';
$handler->display->display_options['fields']['field_employee']['field'] = 'field_employee';
@@ -2728,14 +2772,14 @@ print user_pass_reset_url($account);
'thousand_separator' => ' ',
'prefix_suffix' => 1,
);
- /* Field: Profile: Website */
+ /* Field: Profil: Website */
$handler->display->display_options['fields']['field_user_website']['id'] = 'field_user_website';
$handler->display->display_options['fields']['field_user_website']['table'] = 'field_data_field_user_website';
$handler->display->display_options['fields']['field_user_website']['field'] = 'field_user_website';
$handler->display->display_options['fields']['field_user_website']['relationship'] = 'profile';
$handler->display->display_options['fields']['field_user_website']['label'] = 'Site internet';
$handler->display->display_options['fields']['field_user_website']['click_sort_column'] = 'url';
- /* Field: Profile: Adresse */
+ /* Field: Profil: Adresse */
$handler->display->display_options['fields']['field_adresse']['id'] = 'field_adresse';
$handler->display->display_options['fields']['field_adresse']['table'] = 'field_data_field_adresse';
$handler->display->display_options['fields']['field_adresse']['field'] = 'field_adresse';
@@ -2747,7 +2791,7 @@ print user_pass_reset_url($account);
'address' => 'address',
),
);
- /* Field: Profile: Phone */
+ /* Field: Profil: Phone */
$handler->display->display_options['fields']['field_private_phone']['id'] = 'field_private_phone';
$handler->display->display_options['fields']['field_private_phone']['table'] = 'field_data_field_private_phone';
$handler->display->display_options['fields']['field_private_phone']['field'] = 'field_private_phone';
@@ -2764,8 +2808,8 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['php_2']['php_value'] = '$subscriber = simplenews_subscriber_load_by_uid($row->uid);
//dsm($subscriber);
foreach($subscriber->tids as $tid){
- $new = simplenews_category_load($tid);
- $news[] = $new->name;
+ $new = simplenews_category_load($tid);
+ $news[] = $new->name;
}
return $news;';
$handler->display->display_options['fields']['php_2']['php_output'] = '\');
$handler->display->display_options['fields']['php_1']['label'] = 'One time login';
$handler->display->display_options['fields']['php_1']['exclude'] = TRUE;
$handler->display->display_options['fields']['php_1']['use_php_setup'] = 0;
- $handler->display->display_options['fields']['php_1']['php_output'] = 'display->display_options['fields']['php_1']['php_output'] = 'uid);
-print user_pass_reset_url($account);
+print user_pass_reset_url($account);
?>';
$handler->display->display_options['fields']['php_1']['use_php_click_sortable'] = '0';
$handler->display->display_options['fields']['php_1']['php_click_sortable'] = '';
@@ -2858,7 +2902,7 @@ print user_pass_reset_url($account);
4 => 0,
);
$handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
- /* Filter criterion: User: Company (field_company) */
+ /* Filter criterion: Utilisateur: Company (field_company) */
$handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
$handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
$handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -2870,7 +2914,7 @@ print user_pass_reset_url($account);
$handler->display->display_options['filters']['field_company_tid']['expose']['operator'] = 'field_company_tid_op';
$handler->display->display_options['filters']['field_company_tid']['expose']['identifier'] = 'field_company_tid';
$handler->display->display_options['filters']['field_company_tid']['vocabulary'] = 'company';
- /* Filter criterion: Profile: Organization (field_organization) */
+ /* Filter criterion: Profil: Organization (field_organization) */
$handler->display->display_options['filters']['field_organization_value']['id'] = 'field_organization_value';
$handler->display->display_options['filters']['field_organization_value']['table'] = 'field_data_field_organization';
$handler->display->display_options['filters']['field_organization_value']['field'] = 'field_organization_value';
@@ -3037,7 +3081,7 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
$handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
$handler->display->display_options['fields']['edit_node']['alter']['text'] = '[edit_node]';
- /* Field: User: Company */
+ /* Field: Utilisateur: Company */
$handler->display->display_options['fields']['field_company']['id'] = 'field_company';
$handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
$handler->display->display_options['fields']['field_company']['field'] = 'field_company';
@@ -3082,9 +3126,9 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['php_1']['label'] = 'One time login';
$handler->display->display_options['fields']['php_1']['exclude'] = TRUE;
$handler->display->display_options['fields']['php_1']['use_php_setup'] = 0;
- $handler->display->display_options['fields']['php_1']['php_output'] = 'display->display_options['fields']['php_1']['php_output'] = 'uid);
-print user_pass_reset_url($account);
+print user_pass_reset_url($account);
?>';
$handler->display->display_options['fields']['php_1']['use_php_click_sortable'] = '0';
$handler->display->display_options['fields']['php_1']['php_click_sortable'] = '';
@@ -3142,7 +3186,37 @@ print user_pass_reset_url($account);
4 => 0,
);
$handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
- /* Filter criterion: User: Company (field_company) */
+ /* Filter criterion: User: Roles */
+ $handler->display->display_options['filters']['rid_1']['id'] = 'rid_1';
+ $handler->display->display_options['filters']['rid_1']['table'] = 'users_roles';
+ $handler->display->display_options['filters']['rid_1']['field'] = 'rid';
+ $handler->display->display_options['filters']['rid_1']['value'] = array(
+ 7 => '7',
+ 6 => '6',
+ );
+ $handler->display->display_options['filters']['rid_1']['group'] = 1;
+ $handler->display->display_options['filters']['rid_1']['exposed'] = TRUE;
+ $handler->display->display_options['filters']['rid_1']['expose']['operator_id'] = 'rid_1_op';
+ $handler->display->display_options['filters']['rid_1']['expose']['label'] = 'Rôles';
+ $handler->display->display_options['filters']['rid_1']['expose']['operator'] = 'rid_1_op';
+ $handler->display->display_options['filters']['rid_1']['expose']['identifier'] = 'rid_1';
+ $handler->display->display_options['filters']['rid_1']['expose']['remember_roles'] = array(
+ 2 => '2',
+ 1 => 0,
+ 9 => 0,
+ 7 => 0,
+ 10 => 0,
+ 11 => 0,
+ 6 => 0,
+ 5 => 0,
+ 8 => 0,
+ 12 => 0,
+ 3 => 0,
+ 4 => 0,
+ 13 => 0,
+ );
+ $handler->display->display_options['filters']['rid_1']['expose']['reduce'] = TRUE;
+ /* Filter criterion: Utilisateur: Company (field_company) */
$handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
$handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
$handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -3288,19 +3362,19 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['uid']['exclude'] = TRUE;
$handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['uid']['link_to_user'] = FALSE;
- /* Field: Profile: Title */
+ /* Field: Profil: Title */
$handler->display->display_options['fields']['field_private_name_title']['id'] = 'field_private_name_title';
$handler->display->display_options['fields']['field_private_name_title']['table'] = 'field_data_field_private_name_title';
$handler->display->display_options['fields']['field_private_name_title']['field'] = 'field_private_name_title';
$handler->display->display_options['fields']['field_private_name_title']['relationship'] = 'profile';
- /* Field: Profile: First name */
+ /* Field: Profil: First name */
$handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
$handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
$handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
$handler->display->display_options['fields']['field_first_name']['relationship'] = 'profile';
$handler->display->display_options['fields']['field_first_name']['label'] = 'Prénom';
$handler->display->display_options['fields']['field_first_name']['exclude'] = TRUE;
- /* Field: Profile: Name */
+ /* Field: Profil: Name */
$handler->display->display_options['fields']['field_name']['id'] = 'field_name';
$handler->display->display_options['fields']['field_name']['table'] = 'field_data_field_name';
$handler->display->display_options['fields']['field_name']['field'] = 'field_name';
@@ -3326,18 +3400,18 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['expiration']['date_format'] = 'custom';
$handler->display->display_options['fields']['expiration']['custom_date_format'] = 'Y-m-d';
$handler->display->display_options['fields']['expiration']['second_date_format'] = 'long';
- /* Field: User: Company */
+ /* Field: Utilisateur: Company */
$handler->display->display_options['fields']['field_company']['id'] = 'field_company';
$handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
$handler->display->display_options['fields']['field_company']['field'] = 'field_company';
$handler->display->display_options['fields']['field_company']['label'] = 'Société';
- /* Field: Profile: Organization */
+ /* Field: Profil: Organization */
$handler->display->display_options['fields']['field_organization']['id'] = 'field_organization';
$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';
- /* Field: Profile: service */
+ /* Field: Profil: service */
$handler->display->display_options['fields']['field_service']['id'] = 'field_service';
$handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service';
$handler->display->display_options['fields']['field_service']['field'] = 'field_service';
@@ -3346,7 +3420,7 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['field_service']['alter']['text'] = 'service : [field_service]';
$handler->display->display_options['fields']['field_service']['hide_empty'] = TRUE;
$handler->display->display_options['fields']['field_service']['empty_zero'] = TRUE;
- /* Field: Profile: Quality */
+ /* Field: Profil: Quality */
$handler->display->display_options['fields']['field_private_quality']['id'] = 'field_private_quality';
$handler->display->display_options['fields']['field_private_quality']['table'] = 'field_data_field_private_quality';
$handler->display->display_options['fields']['field_private_quality']['field'] = 'field_private_quality';
@@ -3355,7 +3429,7 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['field_private_quality']['alter']['text'] = 'quality : [field_private_quality]';
$handler->display->display_options['fields']['field_private_quality']['hide_empty'] = TRUE;
$handler->display->display_options['fields']['field_private_quality']['empty_zero'] = TRUE;
- /* Field: Profile: SIRET */
+ /* Field: Profil: SIRET */
$handler->display->display_options['fields']['field_siret']['id'] = 'field_siret';
$handler->display->display_options['fields']['field_siret']['table'] = 'field_data_field_siret';
$handler->display->display_options['fields']['field_siret']['field'] = 'field_siret';
@@ -3363,7 +3437,7 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['field_siret']['alter']['alter_text'] = TRUE;
$handler->display->display_options['fields']['field_siret']['alter']['text'] = 'siret : [field_siret]';
$handler->display->display_options['fields']['field_siret']['hide_empty'] = TRUE;
- /* Field: Profile: Employee */
+ /* Field: Profil: Employee */
$handler->display->display_options['fields']['field_employee']['id'] = 'field_employee';
$handler->display->display_options['fields']['field_employee']['table'] = 'field_data_field_employee';
$handler->display->display_options['fields']['field_employee']['field'] = 'field_employee';
@@ -3377,14 +3451,14 @@ print user_pass_reset_url($account);
'thousand_separator' => ' ',
'prefix_suffix' => 1,
);
- /* Field: Profile: Website */
+ /* Field: Profil: Website */
$handler->display->display_options['fields']['field_user_website']['id'] = 'field_user_website';
$handler->display->display_options['fields']['field_user_website']['table'] = 'field_data_field_user_website';
$handler->display->display_options['fields']['field_user_website']['field'] = 'field_user_website';
$handler->display->display_options['fields']['field_user_website']['relationship'] = 'profile';
$handler->display->display_options['fields']['field_user_website']['label'] = 'Site internet';
$handler->display->display_options['fields']['field_user_website']['click_sort_column'] = 'url';
- /* Field: Profile: Adresse */
+ /* Field: Profil: Adresse */
$handler->display->display_options['fields']['field_adresse']['id'] = 'field_adresse';
$handler->display->display_options['fields']['field_adresse']['table'] = 'field_data_field_adresse';
$handler->display->display_options['fields']['field_adresse']['field'] = 'field_adresse';
@@ -3396,7 +3470,7 @@ print user_pass_reset_url($account);
'address' => 'address',
),
);
- /* Field: Profile: Phone */
+ /* Field: Profil: Phone */
$handler->display->display_options['fields']['field_private_phone']['id'] = 'field_private_phone';
$handler->display->display_options['fields']['field_private_phone']['table'] = 'field_data_field_private_phone';
$handler->display->display_options['fields']['field_private_phone']['field'] = 'field_private_phone';
@@ -3413,8 +3487,8 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['php_2']['php_value'] = '$subscriber = simplenews_subscriber_load_by_uid($row->uid);
//dsm($subscriber);
foreach($subscriber->tids as $tid){
- $new = simplenews_category_load($tid);
- $news[] = $new->name;
+ $new = simplenews_category_load($tid);
+ $news[] = $new->name;
}
return $news;';
$handler->display->display_options['fields']['php_2']['php_output'] = '\');
$handler->display->display_options['fields']['php_1']['label'] = 'One time login';
$handler->display->display_options['fields']['php_1']['exclude'] = TRUE;
$handler->display->display_options['fields']['php_1']['use_php_setup'] = 0;
- $handler->display->display_options['fields']['php_1']['php_output'] = 'display->display_options['fields']['php_1']['php_output'] = 'uid);
-print user_pass_reset_url($account);
+print user_pass_reset_url($account);
?>';
$handler->display->display_options['fields']['php_1']['use_php_click_sortable'] = '0';
$handler->display->display_options['fields']['php_1']['php_click_sortable'] = '';
@@ -3507,7 +3581,7 @@ print user_pass_reset_url($account);
4 => 0,
);
$handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
- /* Filter criterion: User: Company (field_company) */
+ /* Filter criterion: Utilisateur: Company (field_company) */
$handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
$handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
$handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -3519,7 +3593,7 @@ print user_pass_reset_url($account);
$handler->display->display_options['filters']['field_company_tid']['expose']['operator'] = 'field_company_tid_op';
$handler->display->display_options['filters']['field_company_tid']['expose']['identifier'] = 'field_company_tid';
$handler->display->display_options['filters']['field_company_tid']['vocabulary'] = 'company';
- /* Filter criterion: Profile: Organization (field_organization) */
+ /* Filter criterion: Profil: Organization (field_organization) */
$handler->display->display_options['filters']['field_organization_value']['id'] = 'field_organization_value';
$handler->display->display_options['filters']['field_organization_value']['table'] = 'field_data_field_organization';
$handler->display->display_options['filters']['field_organization_value']['field'] = 'field_organization_value';
@@ -3675,19 +3749,19 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['uid']['exclude'] = TRUE;
$handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['uid']['link_to_user'] = FALSE;
- /* Field: Profile: Title */
+ /* Field: Profil: Title */
$handler->display->display_options['fields']['field_private_name_title']['id'] = 'field_private_name_title';
$handler->display->display_options['fields']['field_private_name_title']['table'] = 'field_data_field_private_name_title';
$handler->display->display_options['fields']['field_private_name_title']['field'] = 'field_private_name_title';
$handler->display->display_options['fields']['field_private_name_title']['relationship'] = 'profile';
- /* Field: Profile: First name */
+ /* Field: Profil: First name */
$handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
$handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
$handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
$handler->display->display_options['fields']['field_first_name']['relationship'] = 'profile';
$handler->display->display_options['fields']['field_first_name']['label'] = 'Prénom';
$handler->display->display_options['fields']['field_first_name']['exclude'] = TRUE;
- /* Field: Profile: Name */
+ /* Field: Profil: Name */
$handler->display->display_options['fields']['field_name']['id'] = 'field_name';
$handler->display->display_options['fields']['field_name']['table'] = 'field_data_field_name';
$handler->display->display_options['fields']['field_name']['field'] = 'field_name';
@@ -3713,18 +3787,18 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['expiration']['date_format'] = 'custom';
$handler->display->display_options['fields']['expiration']['custom_date_format'] = 'Y-m-d';
$handler->display->display_options['fields']['expiration']['second_date_format'] = 'long';
- /* Field: User: Company */
+ /* Field: Utilisateur: Company */
$handler->display->display_options['fields']['field_company']['id'] = 'field_company';
$handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
$handler->display->display_options['fields']['field_company']['field'] = 'field_company';
$handler->display->display_options['fields']['field_company']['label'] = 'Société';
- /* Field: Profile: Organization */
+ /* Field: Profil: Organization */
$handler->display->display_options['fields']['field_organization']['id'] = 'field_organization';
$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';
- /* Field: Profile: service */
+ /* Field: Profil: service */
$handler->display->display_options['fields']['field_service']['id'] = 'field_service';
$handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service';
$handler->display->display_options['fields']['field_service']['field'] = 'field_service';
@@ -3733,7 +3807,7 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['field_service']['alter']['text'] = 'service : [field_service]';
$handler->display->display_options['fields']['field_service']['hide_empty'] = TRUE;
$handler->display->display_options['fields']['field_service']['empty_zero'] = TRUE;
- /* Field: Profile: Quality */
+ /* Field: Profil: Quality */
$handler->display->display_options['fields']['field_private_quality']['id'] = 'field_private_quality';
$handler->display->display_options['fields']['field_private_quality']['table'] = 'field_data_field_private_quality';
$handler->display->display_options['fields']['field_private_quality']['field'] = 'field_private_quality';
@@ -3742,7 +3816,7 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['field_private_quality']['alter']['text'] = 'quality : [field_private_quality]';
$handler->display->display_options['fields']['field_private_quality']['hide_empty'] = TRUE;
$handler->display->display_options['fields']['field_private_quality']['empty_zero'] = TRUE;
- /* Field: Profile: SIRET */
+ /* Field: Profil: SIRET */
$handler->display->display_options['fields']['field_siret']['id'] = 'field_siret';
$handler->display->display_options['fields']['field_siret']['table'] = 'field_data_field_siret';
$handler->display->display_options['fields']['field_siret']['field'] = 'field_siret';
@@ -3750,7 +3824,7 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['field_siret']['alter']['alter_text'] = TRUE;
$handler->display->display_options['fields']['field_siret']['alter']['text'] = 'siret : [field_siret]';
$handler->display->display_options['fields']['field_siret']['hide_empty'] = TRUE;
- /* Field: Profile: Employee */
+ /* Field: Profil: Employee */
$handler->display->display_options['fields']['field_employee']['id'] = 'field_employee';
$handler->display->display_options['fields']['field_employee']['table'] = 'field_data_field_employee';
$handler->display->display_options['fields']['field_employee']['field'] = 'field_employee';
@@ -3764,14 +3838,14 @@ print user_pass_reset_url($account);
'thousand_separator' => ' ',
'prefix_suffix' => 1,
);
- /* Field: Profile: Website */
+ /* Field: Profil: Website */
$handler->display->display_options['fields']['field_user_website']['id'] = 'field_user_website';
$handler->display->display_options['fields']['field_user_website']['table'] = 'field_data_field_user_website';
$handler->display->display_options['fields']['field_user_website']['field'] = 'field_user_website';
$handler->display->display_options['fields']['field_user_website']['relationship'] = 'profile';
$handler->display->display_options['fields']['field_user_website']['label'] = 'Site internet';
$handler->display->display_options['fields']['field_user_website']['click_sort_column'] = 'url';
- /* Field: Profile: Adresse */
+ /* Field: Profil: Adresse */
$handler->display->display_options['fields']['field_adresse']['id'] = 'field_adresse';
$handler->display->display_options['fields']['field_adresse']['table'] = 'field_data_field_adresse';
$handler->display->display_options['fields']['field_adresse']['field'] = 'field_adresse';
@@ -3783,7 +3857,7 @@ print user_pass_reset_url($account);
'address' => 'address',
),
);
- /* Field: Profile: Phone */
+ /* Field: Profil: Phone */
$handler->display->display_options['fields']['field_private_phone']['id'] = 'field_private_phone';
$handler->display->display_options['fields']['field_private_phone']['table'] = 'field_data_field_private_phone';
$handler->display->display_options['fields']['field_private_phone']['field'] = 'field_private_phone';
@@ -3800,8 +3874,8 @@ print user_pass_reset_url($account);
$handler->display->display_options['fields']['php_2']['php_value'] = '$subscriber = simplenews_subscriber_load_by_uid($row->uid);
//dsm($subscriber);
foreach($subscriber->tids as $tid){
- $new = simplenews_category_load($tid);
- $news[] = $new->name;
+ $new = simplenews_category_load($tid);
+ $news[] = $new->name;
}
return $news;';
$handler->display->display_options['fields']['php_2']['php_output'] = '\');
$handler->display->display_options['fields']['php_1']['label'] = 'One time login';
$handler->display->display_options['fields']['php_1']['exclude'] = TRUE;
$handler->display->display_options['fields']['php_1']['use_php_setup'] = 0;
- $handler->display->display_options['fields']['php_1']['php_output'] = 'display->display_options['fields']['php_1']['php_output'] = 'uid);
-print user_pass_reset_url($account);
+print user_pass_reset_url($account);
?>';
$handler->display->display_options['fields']['php_1']['use_php_click_sortable'] = '0';
$handler->display->display_options['fields']['php_1']['php_click_sortable'] = '';
@@ -3885,7 +3959,7 @@ print user_pass_reset_url($account);
);
$handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
$handler->display->display_options['filters']['rid']['reduce_duplicates'] = TRUE;
- /* Filter criterion: User: Company (field_company) */
+ /* Filter criterion: Utilisateur: Company (field_company) */
$handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
$handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
$handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -3897,7 +3971,7 @@ print user_pass_reset_url($account);
$handler->display->display_options['filters']['field_company_tid']['expose']['operator'] = 'field_company_tid_op';
$handler->display->display_options['filters']['field_company_tid']['expose']['identifier'] = 'field_company_tid';
$handler->display->display_options['filters']['field_company_tid']['vocabulary'] = 'company';
- /* Filter criterion: Profile: Organization (field_organization) */
+ /* Filter criterion: Profil: Organization (field_organization) */
$handler->display->display_options['filters']['field_organization_value']['id'] = 'field_organization_value';
$handler->display->display_options['filters']['field_organization_value']['table'] = 'field_data_field_organization';
$handler->display->display_options['filters']['field_organization_value']['field'] = 'field_organization_value';
@@ -4031,7 +4105,7 @@ print user_pass_reset_url($account);
t('dernier »'),
t('Résumé'),
t('Displaying @start - @end of @total'),
- t('Profile'),
+ t('Profil'),
t('Utilisateur'),
t('- Choose an operation -'),
t('Title'),
@@ -4100,12 +4174,7 @@ print user_pass_reset_url($account);
$handler = $view->new_display('default', 'Master', 'default');
$handler->display->display_options['title'] = 'Admin Taxo';
$handler->display->display_options['use_more_always'] = FALSE;
- $handler->display->display_options['use_more_text'] = 'plus';
- $handler->display->display_options['access']['type'] = 'role';
- $handler->display->display_options['access']['role'] = array(
- 3 => '3',
- 4 => '4',
- );
+ $handler->display->display_options['access']['type'] = 'perm';
$handler->display->display_options['cache']['type'] = 'none';
$handler->display->display_options['query']['type'] = 'views_query';
$handler->display->display_options['query']['options']['distinct'] = TRUE;
@@ -4318,7 +4387,7 @@ print user_pass_reset_url($account);
3 => 0,
4 => 0,
);
- /* Filter criterion: Taxonomy term: Nom (name_field) */
+ /* Filter criterion: Terme de taxonomie: Nom (name_field) */
$handler->display->display_options['filters']['name_field_value']['id'] = 'name_field_value';
$handler->display->display_options['filters']['name_field_value']['table'] = 'field_data_name_field';
$handler->display->display_options['filters']['name_field_value']['field'] = 'name_field_value';
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc b/sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc
index 8da97b82..dd8e7f8f 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc
+++ b/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',
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.info b/sites/all/modules/features/materio_content_types/materio_content_types.info
index 2855eedd..c619583d 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.info
+++ b/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
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc b/sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc
index c8dc66db..52546d18 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc
+++ b/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;
diff --git a/sites/all/modules/features/materio_publications/materio_publications.features.field_base.inc b/sites/all/modules/features/materio_publications/materio_publications.features.field_base.inc
index b1321265..c0333811 100644
--- a/sites/all/modules/features/materio_publications/materio_publications.features.field_base.inc
+++ b/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,
diff --git a/sites/all/modules/features/materio_publications/materio_publications.features.field_instance.inc b/sites/all/modules/features/materio_publications/materio_publications.features.field_instance.inc
index 1ee19b13..2ba3cfeb 100644
--- a/sites/all/modules/features/materio_publications/materio_publications.features.field_instance.inc
+++ b/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,
diff --git a/sites/all/modules/features/materio_publications/materio_publications.features.user_role.inc b/sites/all/modules/features/materio_publications/materio_publications.features.user_role.inc
index e5d3ec21..ffcdb602 100644
--- a/sites/all/modules/features/materio_publications/materio_publications.features.user_role.inc
+++ b/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',
diff --git a/sites/all/modules/features/materio_publications/materio_publications.info b/sites/all/modules/features/materio_publications/materio_publications.info
index 85f36c96..d5ed86aa 100644
--- a/sites/all/modules/features/materio_publications/materio_publications.info
+++ b/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
diff --git a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.user_role.inc b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.user_role.inc
index e990df90..c3b34c3e 100644
--- a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.user_role.inc
+++ b/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.
diff --git a/sites/all/modules/features/showroom/showroom.features.field_instance.inc b/sites/all/modules/features/showroom/showroom.features.field_instance.inc
index a2df1ac7..e5e98518 100644
--- a/sites/all/modules/features/showroom/showroom.features.field_instance.inc
+++ b/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');
diff --git a/sites/all/modules/features/showroom/showroom.features.inc b/sites/all/modules/features/showroom/showroom.features.inc
index 24b184fe..1b328eca 100644
--- a/sites/all/modules/features/showroom/showroom.features.inc
+++ b/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' => '',
),
);
diff --git a/sites/all/modules/features/showroom/showroom.features.user_permission.inc b/sites/all/modules/features/showroom/showroom.features.user_permission.inc
index 4328d97f..b3f5818b 100644
--- a/sites/all/modules/features/showroom/showroom.features.user_permission.inc
+++ b/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',
diff --git a/sites/all/modules/features/showroom/showroom.info b/sites/all/modules/features/showroom/showroom.info
index 1cda6468..34e5ba2b 100644
--- a/sites/all/modules/features/showroom/showroom.info
+++ b/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
diff --git a/sites/all/modules/features/showroom/showroom.strongarm.inc b/sites/all/modules/features/showroom/showroom.strongarm.inc
index 960b6e6d..9d4654e1 100644
--- a/sites/all/modules/features/showroom/showroom.strongarm.inc
+++ b/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 = '
-';
+?>';
$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;