From adb1437a4462a895696c36e985db666bd1c98ab0 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Sat, 10 Dec 2016 11:10:49 +0100 Subject: [PATCH] reseted old features as in prod --- ...rio_administration.features.menu_links.inc | 255 ++++++++++--- ...dministration.features.user_permission.inc | 8 - .../materio_administration.info | 13 +- .../materio_administration.views_default.inc | 347 +----------------- ...erio_content_types.features.field_base.inc | 6 +- ..._content_types.features.field_instance.inc | 110 +----- ...content_types.features.user_permission.inc | 19 +- .../materio_content_types.field_group.inc | 39 +- .../materio_content_types.info | 4 - .../materio_content_types.strongarm.inc | 142 ++----- .../materio_content_types.views_default.inc | 11 +- ...terio_publications.features.field_base.inc | 4 +- ...o_publications.features.field_instance.inc | 6 +- ...aterio_publications.features.user_role.inc | 36 +- ..._publications.features.workflow_access.inc | 50 --- .../materio_publications.info | 18 +- ...terio_subscriptions.features.user_role.inc | 2 +- .../gui/materiobasemod/koala-config.json | 29 -- 18 files changed, 338 insertions(+), 761 deletions(-) delete mode 100644 sites/all/modules/gui/materiobasemod/koala-config.json 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 f3e7322d..636d463b 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,6 +29,25 @@ 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', @@ -41,7 +60,7 @@ function materio_administration_menu_default_menu_links() { 'module' => 'system', 'hidden' => 0, 'external' => 0, - 'has_children' => 0, + 'has_children' => 1, 'expanded' => 0, 'weight' => -46, 'customized' => 1, @@ -64,11 +83,11 @@ function materio_administration_menu_default_menu_links() { 'external' => 0, 'has_children' => 0, 'expanded' => 0, - 'weight' => -50, + 'weight' => -44, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_users:admin/users', + 'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6', ); // Exported menu link: navigation_adhsions:node/11186/webform-results. $menu_links['navigation_adhsions:node/11186/webform-results'] = array( @@ -85,30 +104,25 @@ function materio_administration_menu_default_menu_links() { 'external' => 0, 'has_children' => 0, 'expanded' => 0, - 'weight' => -47, + 'weight' => -43, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_users:admin/users', + 'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6', ); - // 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( + // Exported menu link: navigation_ajouter-un-tag-libre:http://dev.materio.com/fr/admin/structure/taxonomy/tag_libres/add. + $menu_links['navigation_ajouter-un-tag-libre:http://dev.materio.com/fr/admin/structure/taxonomy/tag_libres/add'] = array( 'menu_name' => 'navigation', - 'link_path' => 'admin/structure/taxonomy/tag_libres/add', - 'router_path' => 'admin/structure/taxonomy/%/add', + 'link_path' => 'http://dev.materio.com/fr/admin/structure/taxonomy/tag_libres/add', + 'router_path' => '', 'link_title' => 'Ajouter un tag libre', 'options' => array( - 'identifier' => 'navigation_ajouter-un-tag-libre:admin/structure/taxonomy/tag_libres/add', 'attributes' => array(), - 'item_attributes' => array( - 'id' => '', - 'class' => '', - 'style' => '', - ), + 'identifier' => 'navigation_ajouter-un-tag-libre:http://dev.materio.com/fr/admin/structure/taxonomy/tag_libres/add', ), 'module' => 'menu', 'hidden' => 1, - 'external' => 0, + 'external' => 1, 'has_children' => 0, 'expanded' => 0, 'weight' => -50, @@ -135,6 +149,7 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_add-content:node/add', ); // Exported menu link: navigation_companies:admin/content/companies. $menu_links['navigation_companies:admin/content/companies'] = array( @@ -196,6 +211,7 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_add-content:node/add', ); // Exported menu link: navigation_compose-tips:filter/tips. $menu_links['navigation_compose-tips:filter/tips'] = array( @@ -237,30 +253,26 @@ 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:admin/store/customers. - $menu_links['navigation_customers:admin/store/customers'] = array( + // Exported menu link: navigation_customers:http://www.materio.com/fr/admin/store/customers. + $menu_links['navigation_customers:http://www.materio.com/fr/admin/store/customers'] = array( 'menu_name' => 'navigation', - 'link_path' => 'admin/store/customers', - 'router_path' => 'admin/store/customers', + 'link_path' => 'http://www.materio.com/fr/admin/store/customers', + 'router_path' => '', 'link_title' => 'customers', 'options' => array( - 'identifier' => 'navigation_customers:admin/store/customers', 'attributes' => array(), - 'item_attributes' => array( - 'id' => '', - 'class' => '', - 'style' => '', - ), + 'identifier' => 'navigation_customers:http://www.materio.com/fr/admin/store/customers', ), 'module' => 'menu', 'hidden' => 0, - 'external' => 0, + 'external' => 1, 'has_children' => 0, 'expanded' => 0, - 'weight' => -49, + 'weight' => 1, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_store:http://www.materio.com/fr/admin/store', ); // Exported menu link: navigation_didactique:node/add/didactique. $menu_links['navigation_didactique:node/add/didactique'] = array( @@ -283,6 +295,7 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_add-content:node/add', ); // Exported menu link: navigation_duplicate-mails:admin/users/duplicatemails. $menu_links['navigation_duplicate-mails:admin/users/duplicatemails'] = array( @@ -304,11 +317,11 @@ function materio_administration_menu_default_menu_links() { 'external' => 0, 'has_children' => 0, 'expanded' => 0, - 'weight' => -40, + 'weight' => -39, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_users:admin/users', + 'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6', ); // Exported menu link: navigation_duplicates:admin/config/content/remove_duplicates. $menu_links['navigation_duplicates:admin/config/content/remove_duplicates'] = array( @@ -357,6 +370,7 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_add-content:node/add', ); // Exported menu link: navigation_feedback:admin/reports/feedback. $menu_links['navigation_feedback:admin/reports/feedback'] = array( @@ -378,11 +392,11 @@ function materio_administration_menu_default_menu_links() { 'external' => 0, 'has_children' => 0, 'expanded' => 0, - 'weight' => -41, + 'weight' => -40, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_users:admin/users', + 'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6', ); // Exported menu link: navigation_formulaires-dadhsion:http://www.materio.com/fr/node/11186/webform-results. $menu_links['navigation_formulaires-dadhsion:http://www.materio.com/fr/node/11186/webform-results'] = array( @@ -403,6 +417,7 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6', ); // Exported menu link: navigation_frequently-asked-questions:faq-page. $menu_links['navigation_frequently-asked-questions:faq-page'] = array( @@ -437,11 +452,11 @@ function materio_administration_menu_default_menu_links() { 'external' => 0, 'has_children' => 0, 'expanded' => 0, - 'weight' => -44, + 'weight' => -47, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_users:admin/users', + 'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6', ); // Exported menu link: navigation_industriels:admin/industriels. $menu_links['navigation_industriels:admin/industriels'] = array( @@ -457,11 +472,11 @@ function materio_administration_menu_default_menu_links() { 'external' => 0, 'has_children' => 0, 'expanded' => 0, - 'weight' => -42, + 'weight' => -45, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_users:admin/users', + 'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6', ); // Exported menu link: navigation_industriels:admin/users/industriels. $menu_links['navigation_industriels:admin/users/industriels'] = array( @@ -477,11 +492,11 @@ function materio_administration_menu_default_menu_links() { 'external' => 0, 'has_children' => 0, 'expanded' => 0, - 'weight' => -45, + 'weight' => -48, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_users:admin/users', + 'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6', ); // Exported menu link: navigation_ip-address-tracking:admin/reports/ip_tracking. $menu_links['navigation_ip-address-tracking:admin/reports/ip_tracking'] = array( @@ -505,6 +520,28 @@ 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', @@ -523,6 +560,7 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_add-content:node/add', ); // Exported menu link: navigation_mandrill:admin/reports/mandrill. $menu_links['navigation_mandrill:admin/reports/mandrill'] = array( @@ -562,6 +600,27 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', '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( @@ -577,11 +636,11 @@ function materio_administration_menu_default_menu_links() { 'external' => 0, 'has_children' => 0, 'expanded' => 0, - 'weight' => -49, + 'weight' => -50, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_users:admin/users', + 'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6', ); // Exported menu link: navigation_menus:admin/config/regional/translate/table/menu. $menu_links['navigation_menus:admin/config/regional/translate/table/menu'] = array( @@ -691,6 +750,7 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_add-content:node/add', ); // Exported menu link: navigation_onthologie:admin/structure/taxonomy/onthologie. $menu_links['navigation_onthologie:admin/structure/taxonomy/onthologie'] = array( @@ -754,10 +814,11 @@ function materio_administration_menu_default_menu_links() { 'external' => 0, 'has_children' => 0, 'expanded' => 0, - 'weight' => -50, + 'weight' => 0, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_store:http://www.materio.com/fr/admin/store', ); // Exported menu link: navigation_page:node/add/page. $menu_links['navigation_page:node/add/page'] = array( @@ -780,6 +841,7 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_add-content:node/add', ); // Exported menu link: navigation_pages--didactique--faq:admin/content/pages. $menu_links['navigation_pages--didactique--faq:admin/content/pages'] = array( @@ -823,6 +885,7 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_add-content:node/add', ); // Exported menu link: navigation_produit:node/add/product. $menu_links['navigation_produit:node/add/product'] = array( @@ -845,6 +908,7 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_add-content:node/add', ); // Exported menu link: navigation_publication:node/add/publication. $menu_links['navigation_publication:node/add/publication'] = array( @@ -864,6 +928,7 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_add-content:node/add', ); // Exported menu link: navigation_reports:admin/store/reports. $menu_links['navigation_reports:admin/store/reports'] = array( @@ -880,10 +945,11 @@ function materio_administration_menu_default_menu_links() { 'external' => 0, 'has_children' => 0, 'expanded' => 0, - 'weight' => -48, + 'weight' => 2, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_store:http://www.materio.com/fr/admin/store', ); // Exported menu link: navigation_shopping-cart:cart. $menu_links['navigation_shopping-cart:cart'] = array( @@ -928,6 +994,27 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', '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( @@ -964,11 +1051,11 @@ function materio_administration_menu_default_menu_links() { 'external' => 0, 'has_children' => 0, 'expanded' => 0, - 'weight' => -43, + 'weight' => -46, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_users:admin/users', + 'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6', ); // Exported menu link: navigation_students:admin/users/students. $menu_links['navigation_students:admin/users/students'] = array( @@ -984,11 +1071,11 @@ function materio_administration_menu_default_menu_links() { 'external' => 0, 'has_children' => 0, 'expanded' => 0, - 'weight' => -48, + 'weight' => -49, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_users:admin/users', + 'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6', ); // Exported menu link: navigation_subscriptions-newsletter:admin/people/simplenews. $menu_links['navigation_subscriptions-newsletter:admin/people/simplenews'] = array( @@ -1005,11 +1092,11 @@ function materio_administration_menu_default_menu_links() { 'external' => 0, 'has_children' => 0, 'expanded' => 0, - 'weight' => -46, + 'weight' => -41, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_users:admin/users', + 'parent_identifier' => 'navigation_users:https://materio.com/en/admin/users?rid=6', ); // Exported menu link: navigation_tag-libres:admin/structure/taxonomy/tag_libres. $menu_links['navigation_tag-libres:admin/structure/taxonomy/tag_libres'] = array( @@ -1129,6 +1216,26 @@ 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', @@ -1150,6 +1257,31 @@ 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', @@ -1171,6 +1303,27 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, + 'parent_identifier' => 'navigation_add-content:node/add', + ); + // Exported menu link: navigation_ze-daily-materio039:node/add/simplenews/6374. + $menu_links['navigation_ze-daily-materio039:node/add/simplenews/6374'] = array( + 'menu_name' => 'navigation', + 'link_path' => 'node/add/simplenews/6374', + 'router_path' => 'node/add/simplenews/6374', + 'link_title' => 'Ze Daily materiO'', + 'options' => array( + 'identifier' => 'navigation_ze-daily-materio039:node/add/simplenews/6374', + ), + 'module' => 'system', + 'hidden' => 0, + 'external' => 0, + 'has_children' => 0, + 'expanded' => 0, + 'weight' => 0, + 'customized' => 0, + 'language' => 'und', + 'menu_links_customized' => 0, + 'parent_identifier' => 'navigation_simplenews-newsletter:node/add/simplenews', ); // Translatables @@ -1194,6 +1347,7 @@ function materio_administration_menu_default_menu_links() { t('Gratuits'); t('IP address tracking'); t('Industriels'); + t('Log out'); t('Mandrill'); t('Materiau'); t('Members'); @@ -1212,6 +1366,7 @@ 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'); @@ -1220,9 +1375,13 @@ 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 7b9f2dfc..06101dcc 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,8 +14,6 @@ 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', ), @@ -26,8 +24,6 @@ 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', ), @@ -231,7 +227,6 @@ 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', ), @@ -272,7 +267,6 @@ 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', ), @@ -314,7 +308,6 @@ function materio_administration_user_default_permissions() { 'Contact opérationnel' => 'Contact opérationnel', 'Premium' => 'Premium', 'Student' => 'Student', - 'Translator' => 'Translator', 'Unverified' => 'Unverified', 'Utilisateur' => 'Utilisateur', 'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester', @@ -441,7 +434,6 @@ 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 c0cacae7..3e4426f1 100644 --- a/sites/all/modules/features/materio_administration/materio_administration.info +++ b/sites/all/modules/features/materio_administration/materio_administration.info @@ -17,12 +17,10 @@ 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 @@ -45,17 +43,18 @@ 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:admin/structure/taxonomy/tag_libres/add +features[menu_links][] = navigation_ajouter-un-tag-libre:http://dev.materio.com/fr/admin/structure/taxonomy/tag_libres/add features[menu_links][] = navigation_breve:node/add/breve features[menu_links][] = navigation_companies:admin/content/companies features[menu_links][] = navigation_company:admin/structure/taxonomy_manager/voc/company features[menu_links][] = navigation_company:node/add/company features[menu_links][] = navigation_compose-tips:filter/tips features[menu_links][] = navigation_content-types:admin/config/regional/translate/table/nodetype -features[menu_links][] = navigation_customers:admin/store/customers +features[menu_links][] = navigation_customers:http://www.materio.com/fr/admin/store/customers features[menu_links][] = navigation_didactique:node/add/didactique features[menu_links][] = navigation_duplicate-mails:admin/users/duplicatemails features[menu_links][] = navigation_duplicates:admin/config/content/remove_duplicates @@ -67,9 +66,11 @@ features[menu_links][] = navigation_gratuits:admin/users/gratuits features[menu_links][] = navigation_industriels:admin/industriels features[menu_links][] = navigation_industriels:admin/users/industriels features[menu_links][] = navigation_ip-address-tracking:admin/reports/ip_tracking +features[menu_links][] = navigation_log-out:user/logout features[menu_links][] = navigation_looping-embed-video:node/add/looping-embed-video features[menu_links][] = navigation_mandrill:admin/reports/mandrill features[menu_links][] = navigation_materiau:node/add/materiau +features[menu_links][] = navigation_materio-newsletter:node/add/simplenews/6274 features[menu_links][] = navigation_members:admin/users/members features[menu_links][] = navigation_menus:admin/config/regional/translate/table/menu features[menu_links][] = navigation_merge-duplicates:admin/structure/taxonomy/tag_libres/merge/duplicates @@ -87,6 +88,7 @@ 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:http://www.materio.com/fr/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 @@ -96,8 +98,11 @@ features[menu_links][] = navigation_tag-libres:admin/structure/taxonomy_manager/ features[menu_links][] = navigation_taxonomy-manager:admin/structure/taxonomy_manager/voc features[menu_links][] = navigation_taxonomy:admin/config/regional/translate/table/taxonomy features[menu_links][] = navigation_taxonomy:admin/structure/taxonomie/admin-taxo +features[menu_links][] = navigation_test:node/add/simplenews/6585 features[menu_links][] = navigation_user-account:user +features[menu_links][] = navigation_users:https://materio.com/en/admin/users?rid=6 features[menu_links][] = navigation_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 47b212aa..afd0e55a 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 @@ -620,13 +620,6 @@ function materio_administration_views_default_views() { $handler->display->display_options['defaults']['title'] = FALSE; $handler->display->display_options['title'] = 'Materiaux/brèves'; $handler->display->display_options['defaults']['hide_admin_links'] = FALSE; - $handler->display->display_options['defaults']['access'] = FALSE; - $handler->display->display_options['access']['type'] = 'role'; - $handler->display->display_options['access']['role'] = array( - 3 => '3', - 4 => '4', - 13 => '13', - ); $handler->display->display_options['defaults']['pager'] = FALSE; $handler->display->display_options['pager']['type'] = 'full'; $handler->display->display_options['pager']['options']['items_per_page'] = '50'; @@ -644,14 +637,13 @@ function materio_administration_views_default_views() { $handler->display->display_options['style_plugin'] = 'table'; $handler->display->display_options['style_options']['columns'] = array( 'views_bulk_operations' => 'views_bulk_operations', - 'nid' => 'nid', 'field_materiau_image' => 'field_materiau_image', 'field_visuel' => 'field_materiau_image', 'type' => 'title_field', 'title_field' => 'title_field', 'field_reference_materio' => 'title_field', + 'field_localisation_1' => 'field_reference_materio', 'edit_node' => 'title_field', - 'nothing' => 'title_field', 'field_company_fab' => 'field_company_fab', 'field_company_distrib' => 'field_company_fab', 'field_onthologie' => 'field_onthologie', @@ -671,13 +663,6 @@ function materio_administration_views_default_views() { 'separator' => '', 'empty_column' => 0, ), - 'nid' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), 'field_materiau_image' => array( 'align' => '', 'separator' => '', @@ -709,14 +694,16 @@ function materio_administration_views_default_views() { 'separator' => '', 'empty_column' => 0, ), - 'edit_node' => array( + 'field_localisation_1' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), - 'nothing' => array( + 'edit_node' => array( 'align' => '', - 'separator' => '
', + 'separator' => '', 'empty_column' => 0, ), 'field_company_fab' => array( @@ -785,7 +772,6 @@ function materio_administration_views_default_views() { $handler->display->display_options['defaults']['style_options'] = FALSE; $handler->display->display_options['defaults']['row_plugin'] = FALSE; $handler->display->display_options['defaults']['row_options'] = FALSE; - $handler->display->display_options['defaults']['relationships'] = FALSE; $handler->display->display_options['defaults']['fields'] = FALSE; /* Field: Bulk operations: Content */ $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations'; @@ -806,13 +792,6 @@ function materio_administration_views_default_views() { 'postpone_processing' => 0, ), ); - /* Field: Content: Nid */ - $handler->display->display_options['fields']['nid']['id'] = 'nid'; - $handler->display->display_options['fields']['nid']['table'] = 'node'; - $handler->display->display_options['fields']['nid']['field'] = 'nid'; - $handler->display->display_options['fields']['nid']['label'] = ''; - $handler->display->display_options['fields']['nid']['exclude'] = TRUE; - $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE; /* Field: Content: Image */ $handler->display->display_options['fields']['field_materiau_image']['id'] = 'field_materiau_image'; $handler->display->display_options['fields']['field_materiau_image']['table'] = 'field_data_field_materiau_image'; @@ -855,12 +834,6 @@ 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: 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: Content: Manufacturer */ $handler->display->display_options['fields']['field_company_fab']['id'] = 'field_company_fab'; $handler->display->display_options['fields']['field_company_fab']['table'] = 'field_data_field_company_fab'; @@ -951,14 +924,13 @@ function materio_administration_views_default_views() { $handler->display->display_options['filters']['type_1']['field'] = 'type'; $handler->display->display_options['filters']['type_1']['operator'] = 'not in'; $handler->display->display_options['filters']['type_1']['value'] = array( + 'company' => 'company', 'didactique' => 'didactique', 'faq' => 'faq', - 'simplenews' => 'simplenews', 'page' => 'page', 'panel' => 'panel', 'product' => 'product', - 'showroom' => 'showroom', - 'company' => 'company', + 'simplenews' => 'simplenews', 'webform' => 'webform', 'looping_embed_video' => 'looping_embed_video', ); @@ -1580,273 +1552,6 @@ function materio_administration_views_default_views() { $handler->display->display_options['tab_options']['type'] = 'normal'; $handler->display->display_options['tab_options']['title'] = 'dashboard'; $handler->display->display_options['tab_options']['weight'] = '0'; - - /* Display: Page : showrooms */ - $handler = $view->new_display('page', 'Page : showrooms', 'page_4'); - $handler->display->display_options['defaults']['title'] = FALSE; - $handler->display->display_options['title'] = 'Materiaux/brèves'; - $handler->display->display_options['defaults']['hide_admin_links'] = FALSE; - $handler->display->display_options['defaults']['pager'] = FALSE; - $handler->display->display_options['pager']['type'] = 'full'; - $handler->display->display_options['pager']['options']['items_per_page'] = '50'; - $handler->display->display_options['pager']['options']['offset'] = '0'; - $handler->display->display_options['pager']['options']['id'] = '0'; - $handler->display->display_options['pager']['options']['quantity'] = '9'; - $handler->display->display_options['pager']['options']['expose']['items_per_page_label'] = 'Éléments par page'; - $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all_label'] = '- Tout -'; - $handler->display->display_options['pager']['options']['expose']['offset_label'] = 'Décalage'; - $handler->display->display_options['pager']['options']['tags']['first'] = '« premier'; - $handler->display->display_options['pager']['options']['tags']['previous'] = '‹ précédent'; - $handler->display->display_options['pager']['options']['tags']['next'] = 'suivant ›'; - $handler->display->display_options['pager']['options']['tags']['last'] = 'dernier »'; - $handler->display->display_options['defaults']['style_plugin'] = FALSE; - $handler->display->display_options['style_plugin'] = 'table'; - $handler->display->display_options['style_options']['columns'] = array( - 'views_bulk_operations' => 'views_bulk_operations', - 'nid' => 'nid', - 'field_tode_showroom' => 'field_tode_showroom', - 'edit_node' => 'field_tode_showroom', - 'nothing' => 'field_tode_showroom', - 'field_public_email' => 'field_public_email', - 'field_public_phone' => 'field_public_phone', - 'field_public_address' => 'field_public_address', - 'body' => 'body', - 'field_memo' => 'field_memo', - 'sid' => 'sid', - 'delete_node' => 'sid', - ); - $handler->display->display_options['style_options']['default'] = '-1'; - $handler->display->display_options['style_options']['info'] = array( - 'views_bulk_operations' => array( - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'nid' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'field_tode_showroom' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '
', - '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; - /* Field: Bulk operations: Content */ - $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations'; - $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'node'; - $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations'; - $handler->display->display_options['fields']['views_bulk_operations']['label'] = ''; - $handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0'; - $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['enable_select_all_pages'] = 1; - $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0; - $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['entity_load_capacity'] = '10'; - $handler->display->display_options['fields']['views_bulk_operations']['vbo_operations'] = array( - 'action::workflow_select_given_state_action' => array( - 'selected' => 1, - 'skip_confirmation' => 0, - 'override_label' => 0, - 'label' => '', - 'postpone_processing' => 0, - ), - ); - /* Field: Content: Nid */ - $handler->display->display_options['fields']['nid']['id'] = 'nid'; - $handler->display->display_options['fields']['nid']['table'] = 'node'; - $handler->display->display_options['fields']['nid']['field'] = 'nid'; - $handler->display->display_options['fields']['nid']['label'] = ''; - $handler->display->display_options['fields']['nid']['exclude'] = TRUE; - $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE; - /* Field: Content: Showroom */ - $handler->display->display_options['fields']['field_tode_showroom']['id'] = 'field_tode_showroom'; - $handler->display->display_options['fields']['field_tode_showroom']['table'] = 'field_data_field_tode_showroom'; - $handler->display->display_options['fields']['field_tode_showroom']['field'] = 'field_tode_showroom'; - /* Field: Content: Edit link */ - $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node'; - $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node'; - $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node'; - $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE; - $handler->display->display_options['fields']['edit_node']['alter']['text'] = '[edit_node]'; - /* 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: Content: Email */ - $handler->display->display_options['fields']['field_public_email']['id'] = 'field_public_email'; - $handler->display->display_options['fields']['field_public_email']['table'] = 'field_data_field_public_email'; - $handler->display->display_options['fields']['field_public_email']['field'] = 'field_public_email'; - $handler->display->display_options['fields']['field_public_email']['label'] = 'Courriel'; - /* Field: Content: Phone */ - $handler->display->display_options['fields']['field_public_phone']['id'] = 'field_public_phone'; - $handler->display->display_options['fields']['field_public_phone']['table'] = 'field_data_field_public_phone'; - $handler->display->display_options['fields']['field_public_phone']['field'] = 'field_public_phone'; - /* Field: Content: Adresse */ - $handler->display->display_options['fields']['field_public_address']['id'] = 'field_public_address'; - $handler->display->display_options['fields']['field_public_address']['table'] = 'field_data_field_public_address'; - $handler->display->display_options['fields']['field_public_address']['field'] = 'field_public_address'; - $handler->display->display_options['fields']['field_public_address']['click_sort_column'] = 'country'; - $handler->display->display_options['fields']['field_public_address']['settings'] = array( - 'use_widget_handlers' => 1, - 'format_handlers' => array( - 'address' => 'address', - ), - ); - /* Field: Content: Body */ - $handler->display->display_options['fields']['body']['id'] = 'body'; - $handler->display->display_options['fields']['body']['table'] = 'field_data_body'; - $handler->display->display_options['fields']['body']['field'] = 'body'; - $handler->display->display_options['fields']['body']['label'] = 'Corps'; - $handler->display->display_options['fields']['body']['type'] = 'text_summary_or_trimmed'; - $handler->display->display_options['fields']['body']['settings'] = array( - 'trim_length' => '200', - ); - /* Field: Field: Mémo */ - $handler->display->display_options['fields']['field_memo']['id'] = 'field_memo'; - $handler->display->display_options['fields']['field_memo']['table'] = 'field_data_field_memo'; - $handler->display->display_options['fields']['field_memo']['field'] = 'field_memo'; - $handler->display->display_options['fields']['field_memo']['alter']['nl2br'] = TRUE; - $handler->display->display_options['fields']['field_memo']['alter']['max_length'] = '300'; - $handler->display->display_options['fields']['field_memo']['alter']['strip_tags'] = TRUE; - $handler->display->display_options['fields']['field_memo']['alter']['trim'] = TRUE; - /* Field: Workflow: Current state */ - $handler->display->display_options['fields']['sid']['id'] = 'sid'; - $handler->display->display_options['fields']['sid']['table'] = 'workflow_node'; - $handler->display->display_options['fields']['sid']['field'] = 'sid'; - /* Field: Content: Delete link */ - $handler->display->display_options['fields']['delete_node']['id'] = 'delete_node'; - $handler->display->display_options['fields']['delete_node']['table'] = 'views_entity_node'; - $handler->display->display_options['fields']['delete_node']['field'] = 'delete_node'; - $handler->display->display_options['fields']['delete_node']['alter']['alter_text'] = TRUE; - $handler->display->display_options['fields']['delete_node']['alter']['text'] = '[delete_node]'; - $handler->display->display_options['defaults']['filter_groups'] = FALSE; - $handler->display->display_options['defaults']['filters'] = FALSE; - /* Filter criterion: Content: Type */ - $handler->display->display_options['filters']['type_1']['id'] = 'type_1'; - $handler->display->display_options['filters']['type_1']['table'] = 'node'; - $handler->display->display_options['filters']['type_1']['field'] = 'type'; - $handler->display->display_options['filters']['type_1']['value'] = array( - 'showroom' => 'showroom', - ); - $handler->display->display_options['filters']['type_1']['group'] = 1; - /* Filter criterion: Content: Title */ - $handler->display->display_options['filters']['title']['id'] = 'title'; - $handler->display->display_options['filters']['title']['table'] = 'node'; - $handler->display->display_options['filters']['title']['field'] = 'title'; - $handler->display->display_options['filters']['title']['operator'] = 'contains'; - $handler->display->display_options['filters']['title']['group'] = 1; - $handler->display->display_options['filters']['title']['exposed'] = TRUE; - $handler->display->display_options['filters']['title']['expose']['operator_id'] = 'title_op'; - $handler->display->display_options['filters']['title']['expose']['label'] = 'Title / Name contains'; - $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op'; - $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title'; - $handler->display->display_options['filters']['title']['expose']['remember'] = TRUE; - /* Filter criterion: Field: Mémo (field_memo) */ - $handler->display->display_options['filters']['field_memo_value']['id'] = 'field_memo_value'; - $handler->display->display_options['filters']['field_memo_value']['table'] = 'field_data_field_memo'; - $handler->display->display_options['filters']['field_memo_value']['field'] = 'field_memo_value'; - $handler->display->display_options['filters']['field_memo_value']['operator'] = 'contains'; - $handler->display->display_options['filters']['field_memo_value']['group'] = 1; - $handler->display->display_options['filters']['field_memo_value']['exposed'] = TRUE; - $handler->display->display_options['filters']['field_memo_value']['expose']['operator_id'] = 'field_memo_value_op'; - $handler->display->display_options['filters']['field_memo_value']['expose']['label'] = 'Mémo contient'; - $handler->display->display_options['filters']['field_memo_value']['expose']['operator'] = 'field_memo_value_op'; - $handler->display->display_options['filters']['field_memo_value']['expose']['identifier'] = 'field_memo_value'; - /* Filter criterion: Workflow: Current state */ - $handler->display->display_options['filters']['sid']['id'] = 'sid'; - $handler->display->display_options['filters']['sid']['table'] = 'workflow_node'; - $handler->display->display_options['filters']['sid']['field'] = 'sid'; - $handler->display->display_options['filters']['sid']['group'] = 1; - $handler->display->display_options['filters']['sid']['exposed'] = TRUE; - $handler->display->display_options['filters']['sid']['expose']['operator_id'] = 'sid_op'; - $handler->display->display_options['filters']['sid']['expose']['label'] = 'Processus'; - $handler->display->display_options['filters']['sid']['expose']['operator'] = 'sid_op'; - $handler->display->display_options['filters']['sid']['expose']['identifier'] = 'sid'; - $handler->display->display_options['filters']['sid']['expose']['remember'] = TRUE; - /* Filter criterion: Content: Published */ - $handler->display->display_options['filters']['status']['id'] = 'status'; - $handler->display->display_options['filters']['status']['table'] = 'node'; - $handler->display->display_options['filters']['status']['field'] = 'status'; - $handler->display->display_options['filters']['status']['value'] = '1'; - $handler->display->display_options['filters']['status']['group'] = 1; - $handler->display->display_options['path'] = 'admin/content/showrooms'; - $handler->display->display_options['menu']['type'] = 'tab'; - $handler->display->display_options['menu']['title'] = 'Showrooms'; - $handler->display->display_options['menu']['description'] = 'showrooms'; - $handler->display->display_options['menu']['weight'] = '-100'; - $handler->display->display_options['menu']['context'] = 0; - $handler->display->display_options['menu']['context_only_inline'] = 0; - $handler->display->display_options['tab_options']['type'] = 'normal'; - $handler->display->display_options['tab_options']['title'] = 'dashboard'; - $handler->display->display_options['tab_options']['weight'] = '0'; $translatables['admin_contents'] = array( t('Master'), t('Contenu'), @@ -1898,8 +1603,6 @@ function materio_administration_views_default_views() { t('- Choose an operation -'), t('Image'), t('Titre'), - t('Translation'), - t('translate'), t('Fabricants/Distributeurs'), t('Fab :
[field_company_fab] '), @@ -1935,10 +1638,6 @@ function materio_administration_views_default_views() { t('Page : page/publicationfaq/didactique'), t('page/publication/didactique/faq'), t('Title/Name'), - t('Page : showrooms'), - t('Showroom'), - t('Phone'), - t('Corps'), ); $export['admin_contents'] = $view; @@ -3186,36 +2885,6 @@ print user_pass_reset_url($account); 4 => 0, ); $handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE; - /* Filter criterion: User: Roles */ - $handler->display->display_options['filters']['rid_1']['id'] = 'rid_1'; - $handler->display->display_options['filters']['rid_1']['table'] = 'users_roles'; - $handler->display->display_options['filters']['rid_1']['field'] = 'rid'; - $handler->display->display_options['filters']['rid_1']['value'] = array( - 7 => '7', - 6 => '6', - ); - $handler->display->display_options['filters']['rid_1']['group'] = 1; - $handler->display->display_options['filters']['rid_1']['exposed'] = TRUE; - $handler->display->display_options['filters']['rid_1']['expose']['operator_id'] = 'rid_1_op'; - $handler->display->display_options['filters']['rid_1']['expose']['label'] = 'Rôles'; - $handler->display->display_options['filters']['rid_1']['expose']['operator'] = 'rid_1_op'; - $handler->display->display_options['filters']['rid_1']['expose']['identifier'] = 'rid_1'; - $handler->display->display_options['filters']['rid_1']['expose']['remember_roles'] = array( - 2 => '2', - 1 => 0, - 9 => 0, - 7 => 0, - 10 => 0, - 11 => 0, - 6 => 0, - 5 => 0, - 8 => 0, - 12 => 0, - 3 => 0, - 4 => 0, - 13 => 0, - ); - $handler->display->display_options['filters']['rid_1']['expose']['reduce'] = TRUE; /* Filter criterion: User: Company (field_company) */ $handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid'; $handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company'; diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc index d1c60a42..916935bc 100644 --- a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc +++ b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc @@ -517,9 +517,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_nature_titre', - 'field_permissions' => array( - 'type' => 2, - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -530,7 +527,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'settings' => array( 'entity_translation_sync' => FALSE, 'max_length' => 255, - 'profile2_private' => FALSE, ), 'translatable' => 1, 'type' => 'text', @@ -1040,7 +1036,7 @@ foreach ($states as $state) { 'entity_types' => array(), 'field_name' => 'title_field', 'field_permissions' => array( - 'type' => 2, + 'type' => 0, ), 'indexes' => array( 'format' => array( diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc index f58c0c41..33d39050 100644 --- a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc +++ b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc @@ -182,7 +182,7 @@ function materio_content_types_field_default_field_instances() { 'formatter_settings' => array(), ), 'type' => 'field_extrawidgets_read_only', - 'weight' => 7, + 'weight' => 21, ), ); @@ -356,7 +356,7 @@ function materio_content_types_field_default_field_instances() { 'rows' => 10, ), 'type' => 'text_textarea', - 'weight' => 5, + 'weight' => 4, ), ); @@ -451,85 +451,6 @@ function materio_content_types_field_default_field_instances() { ), ); - // Exported field_instance: 'node-breve-field_showroom'. - $field_instances['node-breve-field_showroom'] = array( - 'bundle' => 'breve', - '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' => 'taxonomy', - 'settings' => array(), - 'type' => 'taxonomy_term_reference_link', - 'weight' => 12, - ), - 'homeblock' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - 'teaser' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - ), - 'entity_type' => 'node', - 'field_name' => 'field_showroom', - 'label' => 'Showroom', - 'required' => 0, - 'settings' => array( - 'entity_translation_sync' => FALSE, - 'user_register_form' => FALSE, - ), - 'widget' => array( - 'active' => 1, - 'module' => 'field_extrawidgets', - 'settings' => array( - 'content_taxonomy_opt_groups' => 0, - 'display_empty' => 0, - 'formatter' => '', - 'formatter_settings' => array(), - ), - 'type' => 'field_extrawidgets_read_only', - 'weight' => 4, - ), - ); - // Exported field_instance: 'node-breve-field_source'. $field_instances['node-breve-field_source'] = array( 'bundle' => 'breve', @@ -1007,7 +928,7 @@ function materio_content_types_field_default_field_instances() { 'formatter_settings' => array(), ), 'type' => 'field_extrawidgets_read_only', - 'weight' => 8, + 'weight' => 23, ), ); @@ -2473,7 +2394,7 @@ function materio_content_types_field_default_field_instances() { 'label' => 'hidden', 'settings' => array(), 'type' => 'hidden', - 'weight' => 16, + 'weight' => 13, ), 'cardsmall' => array( 'label' => 'above', @@ -2526,7 +2447,7 @@ function materio_content_types_field_default_field_instances() { 'size' => 60, ), 'type' => 'entityreference_autocomplete', - 'weight' => 10, + 'weight' => 28, ), ); @@ -2842,7 +2763,7 @@ function materio_content_types_field_default_field_instances() { 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => 11, + 'weight' => 6, ), 'cardsmall' => array( 'label' => 'above', @@ -2923,7 +2844,7 @@ function materio_content_types_field_default_field_instances() { 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => 12, + 'weight' => 7, ), 'cardsmall' => array( 'label' => 'above', @@ -2970,7 +2891,7 @@ function materio_content_types_field_default_field_instances() { 'module' => 'computed_field', 'settings' => array(), 'type' => 'computed', - 'weight' => 3, + 'weight' => 2, ), ); @@ -3270,7 +3191,7 @@ function materio_content_types_field_default_field_instances() { 'size' => 60, ), 'type' => 'entityreference_autocomplete', - 'weight' => 9, + 'weight' => 27, ), ); @@ -3303,7 +3224,7 @@ function materio_content_types_field_default_field_instances() { 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => 14, + 'weight' => 9, ), 'cardsmall' => array( 'label' => 'above', @@ -3479,7 +3400,7 @@ function materio_content_types_field_default_field_instances() { 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => 13, + 'weight' => 8, ), 'cardsmall' => array( 'label' => 'above', @@ -3624,7 +3545,7 @@ function materio_content_types_field_default_field_instances() { 'module' => 'computed_field', 'settings' => array(), 'type' => 'computed', - 'weight' => 4, + 'weight' => 3, ), ); @@ -3658,7 +3579,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => 8, + 'weight' => 0, ), 'cardsmall' => array( 'label' => 'above', @@ -3878,7 +3799,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer array( 'Adhérent' => 'Adhérent', 'Premium' => 'Premium', - 'Showroom' => 'Showroom', 'administrator' => 'administrator', 'root' => 'root', ), @@ -146,6 +145,7 @@ function materio_content_types_user_default_permissions() { 'name' => 'create field_localisation', 'roles' => array( 'administrator' => 'administrator', + 'root' => 'root', ), 'module' => 'field_permissions', ); @@ -303,8 +303,8 @@ function materio_content_types_user_default_permissions() { $permissions['edit field_localisation'] = array( 'name' => 'edit field_localisation', 'roles' => array( - 'Showroom' => 'Showroom', 'administrator' => 'administrator', + 'root' => 'root', ), 'module' => 'field_permissions', ); @@ -459,7 +459,7 @@ function materio_content_types_user_default_permissions() { $permissions['edit own field_localisation'] = array( 'name' => 'edit own field_localisation', 'roles' => array( - 'administrator' => 'administrator', + 'root' => 'root', ), 'module' => 'field_permissions', ); @@ -468,7 +468,6 @@ 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', @@ -536,7 +535,6 @@ function materio_content_types_user_default_permissions() { 'Adhérent' => 'Adhérent', 'Contact opérationnel' => 'Contact opérationnel', 'Premium' => 'Premium', - 'Showroom' => 'Showroom', 'Student' => 'Student', 'Unverified' => 'Unverified', 'Utilisateur' => 'Utilisateur', @@ -569,7 +567,6 @@ function materio_content_types_user_default_permissions() { 'Adhérent' => 'Adhérent', 'Contact opérationnel' => 'Contact opérationnel', 'Premium' => 'Premium', - 'Showroom' => 'Showroom', 'Student' => 'Student', 'administrator' => 'administrator', 'root' => 'root', @@ -584,7 +581,6 @@ function materio_content_types_user_default_permissions() { 'Adhérent' => 'Adhérent', 'Contact opérationnel' => 'Contact opérationnel', 'Premium' => 'Premium', - 'Showroom' => 'Showroom', 'Student' => 'Student', 'Unverified' => 'Unverified', 'Utilisateur' => 'Utilisateur', @@ -603,7 +599,6 @@ function materio_content_types_user_default_permissions() { 'Adhérent' => 'Adhérent', 'Contact opérationnel' => 'Contact opérationnel', 'Premium' => 'Premium', - 'Showroom' => 'Showroom', 'Student' => 'Student', 'Unverified' => 'Unverified', 'Utilisateur' => 'Utilisateur', @@ -732,8 +727,11 @@ function materio_content_types_user_default_permissions() { $permissions['view field_localisation'] = array( 'name' => 'view field_localisation', 'roles' => array( - 'Showroom' => 'Showroom', + 'Adhérent' => 'Adhérent', + 'Premium' => 'Premium', + 'Student' => 'Student', 'administrator' => 'administrator', + 'root' => 'root', ), 'module' => 'field_permissions', ); @@ -884,7 +882,7 @@ function materio_content_types_user_default_permissions() { $permissions['view own field_localisation'] = array( 'name' => 'view own field_localisation', 'roles' => array( - 'administrator' => 'administrator', + 'root' => 'root', ), 'module' => 'field_permissions', ); @@ -893,7 +891,6 @@ 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.field_group.inc b/sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc index 6c824ee6..8dc29343 100644 --- a/sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc +++ b/sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc @@ -537,7 +537,7 @@ function materio_content_types_field_group_info() { $field_group->parent_name = ''; $field_group->data = array( 'label' => 'header', - 'weight' => '1', + 'weight' => '0', 'children' => array( 0 => 'field_nature_titre', 1 => 'title_field', @@ -641,8 +641,6 @@ function materio_content_types_field_group_info() { 2 => 'group_fichiers', 3 => 'group_media', 4 => 'group_referencement', - 5 => 'group_showroom', - 6 => 'group_liens', ), 'format_type' => 'htabs', 'format_settings' => array( @@ -974,34 +972,6 @@ function materio_content_types_field_group_info() { ); $field_groups['group_images|node|materiau|cardsmall'] = $field_group; - $field_group = new stdClass(); - $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ - $field_group->api_version = 1; - $field_group->identifier = 'group_liens|node|materiau|form'; - $field_group->group_name = 'group_liens'; - $field_group->entity_type = 'node'; - $field_group->bundle = 'materiau'; - $field_group->mode = 'form'; - $field_group->parent_name = 'group_htabs'; - $field_group->data = array( - 'label' => 'Liens', - 'weight' => '16', - 'children' => array( - 0 => 'field_materiau_ref', - 1 => 'field_breve_ref', - ), - 'format_type' => 'htab', - 'format_settings' => array( - 'formatter' => 'closed', - 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-liens field-group-htab', - 'required_fields' => 1, - ), - ), - ); - $field_groups['group_liens|node|materiau|form'] = $field_group; - $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; @@ -1196,7 +1166,7 @@ function materio_content_types_field_group_info() { $field_group->parent_name = ''; $field_group->data = array( 'label' => 'side 1', - 'weight' => '2', + 'weight' => '1', 'children' => array( 0 => 'group_images', ), @@ -1324,7 +1294,7 @@ function materio_content_types_field_group_info() { $field_group->parent_name = ''; $field_group->data = array( 'label' => 'side 2', - 'weight' => '3', + 'weight' => '2', 'children' => array( 0 => 'field_description', ), @@ -1449,7 +1419,7 @@ function materio_content_types_field_group_info() { $field_group->parent_name = ''; $field_group->data = array( 'label' => 'side 3', - 'weight' => '10', + 'weight' => '3', 'children' => array( 0 => 'field_video_filter', ), @@ -1871,7 +1841,6 @@ function materio_content_types_field_group_info() { t('Contenus'); t('Fichiers'); t('Header'); - t('Liens'); t('Médias'); t('Référencement'); t('Side left'); 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 4bdac944..61e040e8 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 @@ -104,7 +103,6 @@ features[field_group][] = group_images|node|materiau|cardbig features[field_group][] = group_images|node|materiau|cardfull features[field_group][] = group_images|node|materiau|cardmedium features[field_group][] = group_images|node|materiau|cardsmall -features[field_group][] = group_liens|node|materiau|form features[field_group][] = group_media|node|materiau|form features[field_group][] = group_referencement|node|breve|form features[field_group][] = group_referencement|node|materiau|form @@ -137,7 +135,6 @@ features[field_instance][] = node-breve-field_authored_on features[field_instance][] = node-breve-field_materiau_ref features[field_instance][] = node-breve-field_memo features[field_instance][] = node-breve-field_onthologie -features[field_instance][] = node-breve-field_showroom features[field_instance][] = node-breve-field_source features[field_instance][] = node-breve-field_tags_libres features[field_instance][] = node-breve-field_video_filter @@ -474,5 +471,4 @@ 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.strongarm.inc b/sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc index a716cfa3..081d7f1d 100644 --- a/sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc +++ b/sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc @@ -44,7 +44,7 @@ function materio_content_types_strongarm() { 'weight' => '9', ), 'path' => array( - 'weight' => '6', + 'weight' => '5', ), 'workflow' => array( 'weight' => '3', @@ -52,12 +52,6 @@ function materio_content_types_strongarm() { 'language' => array( 'weight' => '2', ), - 'metatags' => array( - 'weight' => '10', - ), - 'redirect' => array( - 'weight' => '9', - ), ), 'display' => array( 'language' => array( @@ -346,10 +340,10 @@ function materio_content_types_strongarm() { 'weight' => '5', ), 'metatags' => array( - 'weight' => '13', + 'weight' => '40', ), 'redirect' => array( - 'weight' => '12', + 'weight' => '30', ), ), 'display' => array( @@ -381,7 +375,7 @@ function materio_content_types_strongarm() { ), 'workflow_current_state' => array( 'cardmedium' => array( - 'weight' => '0', + 'weight' => '-99', 'visible' => TRUE, ), 'cardbig' => array( @@ -407,7 +401,7 @@ function materio_content_types_strongarm() { ), 'workflow' => array( 'cardmedium' => array( - 'weight' => '7', + 'weight' => '99', 'visible' => TRUE, ), 'cardbig' => array( @@ -730,21 +724,21 @@ function materio_content_types_strongarm() { 'region' => 'main', 'weight' => '5', 'has_required' => FALSE, - 'title' => 'Onglets verticaux', + 'title' => 'Vertical tabs', 'hidden' => 0, ), 'actions' => array( 'region' => 'right', - 'weight' => '5', + 'weight' => '4', 'has_required' => FALSE, - 'title' => 'Enregistrer', + 'title' => 'Save', 'hidden' => 0, ), 'language' => array( 'region' => 'right', - 'weight' => '2', + 'weight' => '1', 'has_required' => FALSE, - 'title' => 'Langue', + 'title' => 'Language', 'hidden' => 0, ), 'body' => array( @@ -770,7 +764,7 @@ function materio_content_types_strongarm() { ), 'field_memo' => array( 'region' => 'right', - 'weight' => '3', + 'weight' => '2', 'has_required' => FALSE, 'title' => 'Mémo', 'hidden' => 0, @@ -825,23 +819,10 @@ function materio_content_types_strongarm() { ), 'workflow' => array( 'region' => 'right', - 'weight' => '4', + 'weight' => '3', 'has_required' => FALSE, - 'title' => 'Importé', - 'hidden' => 0, - ), - 'entity_translation_entity_form_language_update' => array( - 'region' => 'main', - 'weight' => '0', - 'has_required' => FALSE, - 'title' => NULL, - 'hidden' => 0, - ), - 'field_showroom' => array( - 'region' => 'right', - 'weight' => '1', - 'has_required' => FALSE, - 'title' => 'Showroom', + 'title' => 'Publication', + 'collapsed' => 0, 'hidden' => 0, ), ); @@ -1056,13 +1037,13 @@ function materio_content_types_strongarm() { $strongarm->value = array( 'title' => array( 'region' => 'main', - 'weight' => '3', + 'weight' => '0', 'has_required' => TRUE, 'title' => 'Nom', ), 'additional_settings' => array( 'region' => 'main', - 'weight' => '6', + 'weight' => '9', 'has_required' => FALSE, 'title' => 'Onglets verticaux', 'hidden' => 0, @@ -1076,21 +1057,21 @@ function materio_content_types_strongarm() { ), 'language' => array( 'region' => 'right', - 'weight' => '7', + 'weight' => '5', 'has_required' => FALSE, 'title' => 'Langue', 'hidden' => 0, ), 'field_memo' => array( 'region' => 'right', - 'weight' => '9', + 'weight' => '7', 'has_required' => FALSE, 'title' => 'Mémo', 'hidden' => 0, ), 'field_localisation' => array( - 'region' => 'main', - 'weight' => '14', + 'region' => 'right', + 'weight' => '2', 'has_required' => FALSE, 'title' => 'Localisation', 'hidden' => 0, @@ -1109,121 +1090,66 @@ function materio_content_types_strongarm() { 'hidden' => 0, ), 'field_reference_materio' => array( - 'region' => 'right', - 'weight' => '2', + 'region' => 'main', + 'weight' => '4', 'has_required' => FALSE, 'title' => 'Référence Materio', 'hidden' => 0, ), 'field_materiau_ref' => array( 'region' => 'right', - 'weight' => '5', + 'weight' => '3', 'has_required' => FALSE, 'title' => 'Materiau(x) lié(s)', 'hidden' => 0, ), 'field_breve_ref' => array( 'region' => 'right', - 'weight' => '6', + 'weight' => '4', 'has_required' => FALSE, 'title' => 'Brève(s) liée(s)', 'hidden' => 0, ), 'field_workflow_state' => array( 'region' => 'main', - 'weight' => '9', + 'weight' => '13', 'has_required' => FALSE, 'title' => 'Workflow State', 'hidden' => 0, ), 'workflow' => array( 'region' => 'right', - 'weight' => '8', + 'weight' => '6', 'has_required' => FALSE, 'title' => 'Importé', 'hidden' => 0, ), 'entity_translation_entity_form_language_update' => array( 'region' => 'main', - 'weight' => '4', + 'weight' => '0', 'has_required' => FALSE, 'title' => NULL, 'hidden' => 0, ), - 'field_attachments' => array( - 'region' => 'main', - 'weight' => '5', - 'has_required' => FALSE, - 'title' => 'Fichiers joints', - 'hidden' => 0, - ), - 'field_description' => array( - 'region' => 'main', - 'weight' => '2', - 'has_required' => FALSE, - 'title' => 'Description', - 'hidden' => 0, - ), - 'field_nature_titre' => array( - 'region' => 'main', - 'weight' => '1', - 'has_required' => FALSE, - 'title' => 'Nature Titre', - 'hidden' => 0, - ), - 'field_materiau_image' => array( - 'region' => 'main', - 'weight' => '7', - 'has_required' => FALSE, - 'title' => 'Image', - 'hidden' => 0, - ), - 'field_video_filter' => array( - 'region' => 'main', - 'weight' => '8', - 'has_required' => FALSE, - 'title' => 'video', - 'hidden' => 0, - ), - 'title_field' => array( + 'group_htabs' => array( 'region' => 'main', 'weight' => '0', - 'has_required' => TRUE, - 'title' => 'Nom', - ), - 'field_tags_libres' => array( - 'region' => 'main', - 'weight' => '11', 'has_required' => FALSE, - 'title' => 'Tags libres', + 'title' => 'htabs (Field group)', 'hidden' => 0, ), - 'field_onthologie' => array( - 'region' => 'main', - 'weight' => '10', - 'has_required' => FALSE, - 'title' => 'Onthologie', - 'hidden' => 0, - ), - 'field_company_fab' => array( - 'region' => 'main', - 'weight' => '12', - 'has_required' => FALSE, - 'title' => 'Fabricant', - 'hidden' => 0, - ), - 'field_company_distrib' => array( + 'group_media' => array( 'region' => 'main', 'weight' => '13', 'has_required' => FALSE, - 'title' => 'Distributeur', + 'title' => 'Médias (Field group)', 'hidden' => 0, ), - 'field_showroom_localisation' => array( + 'group_referencement' => array( 'region' => 'main', - 'weight' => '15', + 'weight' => '12', 'has_required' => FALSE, - 'title' => 'showroom_localisation', + 'title' => 'Référencement (Field group)', 'hidden' => 0, ), ); 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 b0846478..c8dc66db 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; - /* Field: Nœud: Référence Materio */ + /* Champ: Contenu : 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; - /* Field: Content: Title */ + /* 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'; @@ -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; - /* Sort criterion: Content: Post date */ + /* Critère de tri: Contenu : Date de publication */ $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'; - /* Filter criterion: Content: Published */ + /* Critère de filtrage: Contenu : Publié */ $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; - /* Filter criterion: Content: Type */ + /* Critère de filtrage: Contenu : 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,7 +130,6 @@ 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 c0333811..b1321265 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 2ba3cfeb..1ee19b13 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 f61d884d..e5d3ec21 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,9 +10,39 @@ function materio_publications_user_default_roles() { $roles = array(); - // Exported role: Translator. - $roles['Translator'] = array( - 'name' => 'Translator', + // 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, ); diff --git a/sites/all/modules/features/materio_publications/materio_publications.features.workflow_access.inc b/sites/all/modules/features/materio_publications/materio_publications.features.workflow_access.inc index 06b83fb3..a20c6eab 100644 --- a/sites/all/modules/features/materio_publications/materio_publications.features.workflow_access.inc +++ b/sites/all/modules/features/materio_publications/materio_publications.features.workflow_access.inc @@ -22,11 +22,6 @@ function materio_publications_workflow_access_features_default_settings() { 'grant_update' => 1, 'grant_delete' => 1, ); - $workflows['Publication']['(creation)']['Showroom'] = array( - 'grant_view' => 1, - 'grant_update' => 1, - 'grant_delete' => 0, - ); $workflows['Publication']['(creation)']['workflow_features_author_name'] = array( 'grant_view' => 1, 'grant_update' => 1, @@ -77,11 +72,6 @@ function materio_publications_workflow_access_features_default_settings() { 'grant_update' => 0, 'grant_delete' => 0, ); - $workflows['Publication']['(creation)']['Translator'] = array( - 'grant_view' => 0, - 'grant_update' => 0, - 'grant_delete' => 0, - ); $workflows['Publication']['Importé'] = array(); $workflows['Publication']['Importé']['administrator'] = array( 'grant_view' => 1, @@ -93,11 +83,6 @@ function materio_publications_workflow_access_features_default_settings() { 'grant_update' => 1, 'grant_delete' => 1, ); - $workflows['Publication']['Importé']['Showroom'] = array( - 'grant_view' => 1, - 'grant_update' => 1, - 'grant_delete' => 0, - ); $workflows['Publication']['Importé']['workflow_features_author_name'] = array( 'grant_view' => 1, 'grant_update' => 1, @@ -148,11 +133,6 @@ function materio_publications_workflow_access_features_default_settings() { 'grant_update' => 0, 'grant_delete' => 0, ); - $workflows['Publication']['Importé']['Translator'] = array( - 'grant_view' => 0, - 'grant_update' => 0, - 'grant_delete' => 0, - ); $workflows['Publication']['Édité'] = array(); $workflows['Publication']['Édité']['Student'] = array( 'grant_view' => 1, @@ -179,11 +159,6 @@ function materio_publications_workflow_access_features_default_settings() { 'grant_update' => 1, 'grant_delete' => 1, ); - $workflows['Publication']['Édité']['Showroom'] = array( - 'grant_view' => 1, - 'grant_update' => 1, - 'grant_delete' => 0, - ); $workflows['Publication']['Édité']['workflow_features_author_name'] = array( 'grant_view' => 1, 'grant_update' => 1, @@ -219,11 +194,6 @@ function materio_publications_workflow_access_features_default_settings() { 'grant_update' => 0, 'grant_delete' => 0, ); - $workflows['Publication']['Édité']['Translator'] = array( - 'grant_view' => 0, - 'grant_update' => 0, - 'grant_delete' => 0, - ); $workflows['Publication']['Masqué'] = array(); $workflows['Publication']['Masqué']['Utilisateur Alpha Tester'] = array( 'grant_view' => 1, @@ -240,11 +210,6 @@ function materio_publications_workflow_access_features_default_settings() { 'grant_update' => 1, 'grant_delete' => 1, ); - $workflows['Publication']['Masqué']['Showroom'] = array( - 'grant_view' => 1, - 'grant_update' => 1, - 'grant_delete' => 0, - ); $workflows['Publication']['Masqué']['workflow_features_author_name'] = array( 'grant_view' => 1, 'grant_update' => 1, @@ -290,11 +255,6 @@ function materio_publications_workflow_access_features_default_settings() { 'grant_update' => 0, 'grant_delete' => 0, ); - $workflows['Publication']['Masqué']['Translator'] = array( - 'grant_view' => 0, - 'grant_update' => 0, - 'grant_delete' => 0, - ); $workflows['Publication']['Publié'] = array(); $workflows['Publication']['Publié']['utilisateur anonyme'] = array( 'grant_view' => 1, @@ -341,11 +301,6 @@ function materio_publications_workflow_access_features_default_settings() { 'grant_update' => 0, 'grant_delete' => 0, ); - $workflows['Publication']['Publié']['Translator'] = array( - 'grant_view' => 0, - 'grant_update' => 0, - 'grant_delete' => 0, - ); $workflows['Publication']['Publié']['administrator'] = array( 'grant_view' => 0, 'grant_update' => 1, @@ -356,11 +311,6 @@ function materio_publications_workflow_access_features_default_settings() { 'grant_update' => 1, 'grant_delete' => 1, ); - $workflows['Publication']['Publié']['Showroom'] = array( - 'grant_view' => 0, - 'grant_update' => 1, - 'grant_delete' => 0, - ); $workflows['Publication']['Publié']['workflow_features_author_name'] = array( 'grant_view' => 0, 'grant_update' => 1, diff --git a/sites/all/modules/features/materio_publications/materio_publications.info b/sites/all/modules/features/materio_publications/materio_publications.info index 3ec6a5dc..85f36c96 100644 --- a/sites/all/modules/features/materio_publications/materio_publications.info +++ b/sites/all/modules/features/materio_publications/materio_publications.info @@ -6,11 +6,8 @@ dependencies[] = features dependencies[] = image dependencies[] = list dependencies[] = materio_content_types -dependencies[] = materio_page_title dependencies[] = metatag dependencies[] = node -dependencies[] = options -dependencies[] = showroom dependencies[] = strongarm dependencies[] = text dependencies[] = workflow_access @@ -29,7 +26,12 @@ 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][] = Translator +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 @@ -65,10 +67,6 @@ features[variable][] = workflow_publication features[workflow][] = Publication features[workflow_access][] = Publication features_exclude[dependencies][materio_subscriptions] = materio_subscriptions -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 +features_exclude[dependencies][options] = options +features_exclude[dependencies][materio_page_title] = materio_page_title 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 c3b34c3e..e990df90 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' => 8, + 'weight' => 7, ); // Exported role: Utilisateur. diff --git a/sites/all/modules/gui/materiobasemod/koala-config.json b/sites/all/modules/gui/materiobasemod/koala-config.json deleted file mode 100644 index f92ff9b9..00000000 --- a/sites/all/modules/gui/materiobasemod/koala-config.json +++ /dev/null @@ -1,29 +0,0 @@ -// Dust project settings, you can edit it and set custom settings. -{ - // The mappings of source directory and output directory - "mappings": [ - // { - // "src": "path/to/source", - // "dest": "path/to/output" - // } - ], - - // Add the ignore rules that Koala will not search them. - // e.g. ["*.json", "*.txt", "test", "path/libs"] - "ignores": [], - - // Options of Compilers. - "options": { - // "key": "val", - // "key2": "val2" - // ... - }, - - // Other compile options. - // e.g, ["--strict-imports", ... ,"--rootpath=URL"]. - // Run the command 'lessc -h' to see more options. - "custom_options": [], - - // An array of filesystem paths or importers which should be searched for LESS templates imported with the @import directive. - "include_paths": ["/home/bachir/Developer/codekitframeworks/gui_ck_fw", "/home/bachir/Developer/codekitframeworks/bootstrap/less"] -} \ No newline at end of file