diff --git a/sites/all/modules/features/materio_administration/materio_administration.default_elysia_cron_rules.inc b/sites/all/modules/features/materio_administration/materio_administration.default_elysia_cron_rules.inc index 2c5882fc..0f6b675b 100644 --- a/sites/all/modules/features/materio_administration/materio_administration.default_elysia_cron_rules.inc +++ b/sites/all/modules/features/materio_administration/materio_administration.default_elysia_cron_rules.inc @@ -18,7 +18,7 @@ function materio_administration_default_elysia_cron_rules() { $cron_rule->rule = NULL; $cron_rule->weight = NULL; $cron_rule->context = NULL; - $cron_rules[''] = $cron_rule; + $cron_rules['workflow_cron'] = $cron_rule; return $cron_rules; 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 de79c7e7..225654b6 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,7 +29,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', + 'parent_identifier' => 'navigation_users:admin/users', ); // Exported menu link: navigation_adhsions:node/11186/webform-results. $menu_links['navigation_adhsions:node/11186/webform-results'] = array( @@ -50,7 +50,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', + 'parent_identifier' => 'navigation_users:admin/users', ); // Exported menu link: navigation_company:admin/structure/taxonomy_manager/voc/company. $menu_links['navigation_company:admin/structure/taxonomy_manager/voc/company'] = array( @@ -111,7 +111,7 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_store:http://www.materio.com/fr/admin/store', + 'parent_identifier' => 'navigation_boutique:admin/store', ); // Exported menu link: navigation_feedback:admin/reports/feedback. $menu_links['navigation_feedback:admin/reports/feedback'] = array( @@ -137,7 +137,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', + 'parent_identifier' => 'navigation_users:admin/users', ); // Exported menu link: navigation_formulaires-dadhsion:http://www.materio.com/fr/node/11186/webform-results. $menu_links['navigation_formulaires-dadhsion:http://www.materio.com/fr/node/11186/webform-results'] = array( @@ -158,7 +158,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', + 'parent_identifier' => 'navigation_users:admin/users', ); // Exported menu link: navigation_frequently-asked-questions:faq-page. $menu_links['navigation_frequently-asked-questions:faq-page'] = array( @@ -303,7 +303,7 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_store:http://www.materio.com/fr/admin/store', + 'parent_identifier' => 'navigation_boutique:admin/store', ); // Exported menu link: navigation_reports:admin/store/reports. $menu_links['navigation_reports:admin/store/reports'] = array( @@ -324,7 +324,7 @@ function materio_administration_menu_default_menu_links() { 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_store:http://www.materio.com/fr/admin/store', + 'parent_identifier' => 'navigation_boutique:admin/store', ); // Exported menu link: navigation_shopping-cart:cart. $menu_links['navigation_shopping-cart:cart'] = array( @@ -348,26 +348,6 @@ function materio_administration_menu_default_menu_links() { 'language' => 'und', 'menu_links_customized' => 1, ); - // 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_subscriptions-newsletter:admin/people/simplenews. $menu_links['navigation_subscriptions-newsletter:admin/people/simplenews'] = array( 'menu_name' => 'navigation', @@ -387,7 +367,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', + 'parent_identifier' => 'navigation_users:admin/users', ); // Exported menu link: navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres. $menu_links['navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres'] = array( @@ -449,7 +429,6 @@ function materio_administration_menu_default_menu_links() { t('Orders'); t('Reports'); t('Shopping cart'); - t('Store'); t('Subscriptions newsletter'); t('Tag Libres'); t('User account'); diff --git a/sites/all/modules/features/materio_administration/materio_administration.info b/sites/all/modules/features/materio_administration/materio_administration.info index f145c8eb..7c40e202 100644 --- a/sites/all/modules/features/materio_administration/materio_administration.info +++ b/sites/all/modules/features/materio_administration/materio_administration.info @@ -58,7 +58,6 @@ features[menu_links][] = navigation_onthologie:admin/structure/taxonomy_manager/ features[menu_links][] = navigation_orders:admin/store/orders/view features[menu_links][] = navigation_reports:admin/store/reports features[menu_links][] = navigation_shopping-cart:cart -features[menu_links][] = navigation_store:http://www.materio.com/fr/admin/store features[menu_links][] = navigation_subscriptions-newsletter:admin/people/simplenews features[menu_links][] = navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres features[menu_links][] = navigation_user-account:user 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 18d0329c..61c2b012 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 @@ -249,7 +249,6 @@ function materio_administration_views_default_views() { $handler->display->display_options['access']['role'] = array( 3 => '3', 4 => '4', - 15 => '15', ); $handler->display->display_options['cache']['type'] = 'none'; $handler->display->display_options['query']['type'] = 'views_query'; @@ -619,6 +618,13 @@ function materio_administration_views_default_views() { $handler->display->display_options['defaults']['title'] = FALSE; $handler->display->display_options['title'] = 'Materiaux/brèves'; $handler->display->display_options['defaults']['hide_admin_links'] = FALSE; + $handler->display->display_options['defaults']['access'] = FALSE; + $handler->display->display_options['access']['type'] = 'role'; + $handler->display->display_options['access']['role'] = array( + 3 => '3', + 4 => '4', + 15 => '15', + ); $handler->display->display_options['defaults']['pager'] = FALSE; $handler->display->display_options['pager']['type'] = 'full'; $handler->display->display_options['pager']['options']['items_per_page'] = '50'; @@ -641,7 +647,7 @@ function materio_administration_views_default_views() { 'type' => 'title_field', 'title_field' => 'title_field', 'field_reference_materio' => 'title_field', - 'field_localisation_1' => 'field_reference_materio', + 'field_showroom' => 'title_field', 'edit_node' => 'title_field', 'field_company_fab' => 'field_company_fab', 'field_company_distrib' => 'field_company_fab', @@ -693,7 +699,7 @@ function materio_administration_views_default_views() { 'separator' => '', 'empty_column' => 0, ), - 'field_localisation_1' => array( + 'field_showroom' => array( 'sortable' => 0, 'default_sort_order' => 'asc', 'align' => '', @@ -827,6 +833,13 @@ function materio_administration_views_default_views() { $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'; /* Champ: Contenu : Lien de modification */ $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node'; $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node'; @@ -923,13 +936,14 @@ function materio_administration_views_default_views() { $handler->display->display_options['filters']['type_1']['field'] = 'type'; $handler->display->display_options['filters']['type_1']['operator'] = 'not in'; $handler->display->display_options['filters']['type_1']['value'] = array( - 'company' => 'company', 'didactique' => 'didactique', 'faq' => 'faq', + 'simplenews' => 'simplenews', 'page' => 'page', 'panel' => 'panel', 'product' => 'product', - 'simplenews' => 'simplenews', + 'showroom' => 'showroom', + 'company' => 'company', 'webform' => 'webform', 'looping_embed_video' => 'looping_embed_video', ); @@ -1551,6 +1565,210 @@ 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 : showroom */ + $handler = $view->new_display('page', 'Page : showroom', 'page_4'); + $handler->display->display_options['defaults']['title'] = FALSE; + $handler->display->display_options['title'] = 'Showroom'; + $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']['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']['relationships'] = FALSE; + $handler->display->display_options['defaults']['fields'] = FALSE; + /* Champ: Opérations en masse : Contenu */ + $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations'; + $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']['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, + ), + ); + /* 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 */ + $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 */ + $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', + ), + ); + /* 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 */ + $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']['sid']['id'] = 'sid'; + $handler->display->display_options['fields']['sid']['table'] = 'workflow_node'; + $handler->display->display_options['fields']['sid']['field'] = 'sid'; + $handler->display->display_options['defaults']['filter_groups'] = FALSE; + $handler->display->display_options['defaults']['filters'] = FALSE; + /* Critère de filtrage: Contenu : Titre */ + $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'] = 'Le nom contient'; + $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) */ + $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'; + /* 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, + ); + $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']['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'), @@ -1634,6 +1852,8 @@ function materio_administration_views_default_views() { t('Page : page/publicationfaq/didactique'), t('page/publication/didactique/faq'), t('Title/Name'), + t('Page : showroom'), + t('Showroom'), ); $export['admin_contents'] = $view; @@ -3969,7 +4189,11 @@ print user_pass_reset_url($account); $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'] = 'perm'; + $handler->display->display_options['access']['type'] = 'role'; + $handler->display->display_options['access']['role'] = array( + 3 => '3', + 4 => '4', + ); $handler->display->display_options['cache']['type'] = 'none'; $handler->display->display_options['query']['type'] = 'views_query'; $handler->display->display_options['query']['options']['distinct'] = TRUE; 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 8a2342c5..60eea862 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' => 21, + 'weight' => 7, ), ); @@ -356,7 +356,7 @@ function materio_content_types_field_default_field_instances() { 'rows' => 10, ), 'type' => 'text_textarea', - 'weight' => 4, + 'weight' => 5, ), ); @@ -451,6 +451,85 @@ 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', @@ -928,7 +1007,7 @@ function materio_content_types_field_default_field_instances() { 'formatter_settings' => array(), ), 'type' => 'field_extrawidgets_read_only', - 'weight' => 23, + 'weight' => 8, ), ); @@ -3630,8 +3709,9 @@ Vous devez avant d\'utiliser un nouveau tag le créer array( 'Adhérent' => 'Adhérent', 'Premium' => 'Premium', + 'Showroom' => 'Showroom', 'administrator' => 'administrator', 'root' => 'root', ), @@ -103,6 +104,7 @@ function materio_content_types_user_default_permissions() { $permissions['create field_displayed_in_home'] = array( 'name' => 'create field_displayed_in_home', 'roles' => array( + 'Showroom' => 'Showroom', 'administrator' => 'administrator', 'root' => 'root', ), @@ -263,6 +265,7 @@ function materio_content_types_user_default_permissions() { $permissions['edit field_displayed_in_home'] = array( 'name' => 'edit field_displayed_in_home', 'roles' => array( + 'Showroom' => 'Showroom', 'administrator' => 'administrator', 'root' => 'root', ), @@ -419,6 +422,7 @@ function materio_content_types_user_default_permissions() { $permissions['edit own field_displayed_in_home'] = array( 'name' => 'edit own field_displayed_in_home', 'roles' => array( + 'Showroom' => 'Showroom', 'administrator' => 'administrator', 'root' => 'root', ), @@ -535,6 +539,7 @@ 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', @@ -553,6 +558,7 @@ 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', @@ -567,6 +573,7 @@ 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', @@ -581,6 +588,7 @@ 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', @@ -599,6 +607,7 @@ 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', 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 61e040e8..2855eedd 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,6 +24,7 @@ dependencies[] = node dependencies[] = options dependencies[] = print dependencies[] = print_ui +dependencies[] = showroom dependencies[] = strongarm dependencies[] = synonyms dependencies[] = taxonomy @@ -135,6 +136,7 @@ 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 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 ecc0c227..bb8e08df 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' => '5', + 'weight' => '6', ), 'workflow' => array( 'weight' => '3', @@ -52,6 +52,12 @@ function materio_content_types_strongarm() { 'language' => array( 'weight' => '2', ), + 'metatags' => array( + 'weight' => '10', + ), + 'redirect' => array( + 'weight' => '9', + ), ), 'display' => array( 'language' => array( @@ -724,21 +730,21 @@ function materio_content_types_strongarm() { 'region' => 'main', 'weight' => '5', 'has_required' => FALSE, - 'title' => 'Vertical tabs', + 'title' => 'Onglets verticaux', 'hidden' => 0, ), 'actions' => array( 'region' => 'right', - 'weight' => '4', + 'weight' => '5', 'has_required' => FALSE, - 'title' => 'Save', + 'title' => 'Enregistrer', 'hidden' => 0, ), 'language' => array( 'region' => 'right', - 'weight' => '1', + 'weight' => '2', 'has_required' => FALSE, - 'title' => 'Language', + 'title' => 'Langue', 'hidden' => 0, ), 'body' => array( @@ -764,7 +770,7 @@ function materio_content_types_strongarm() { ), 'field_memo' => array( 'region' => 'right', - 'weight' => '2', + 'weight' => '3', 'has_required' => FALSE, 'title' => 'Mémo', 'hidden' => 0, @@ -819,10 +825,23 @@ function materio_content_types_strongarm() { ), 'workflow' => array( 'region' => 'right', - 'weight' => '3', + 'weight' => '4', 'has_required' => FALSE, - 'title' => 'Publication', - 'collapsed' => 0, + 'title' => 'Importé', + 'hidden' => 0, + ), + 'entity_translation_entity_form_language_update' => array( + 'region' => 'main', + 'weight' => '0', + 'has_required' => FALSE, + 'title' => NULL, + 'hidden' => 0, + ), + 'field_showroom' => array( + 'region' => 'right', + 'weight' => '1', + 'has_required' => FALSE, + 'title' => 'Showroom', 'hidden' => 0, ), ); 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 e17eed59..a2df1ac7 100644 --- a/sites/all/modules/features/showroom/showroom.features.field_instance.inc +++ b/sites/all/modules/features/showroom/showroom.features.field_instance.inc @@ -52,7 +52,7 @@ function showroom_field_default_field_instances() { 'module' => 'text', 'settings' => array(), 'type' => 'text_default', - 'weight' => 0, + 'weight' => 3, ), 'homeblock' => array( 'label' => 'above', @@ -129,7 +129,7 @@ function showroom_field_default_field_instances() { 'weight' => 0, ), 'default' => array( - 'label' => 'above', + 'label' => 'hidden', 'module' => 'addressfield', 'settings' => array( 'format_handlers' => array( @@ -138,7 +138,7 @@ function showroom_field_default_field_instances() { 'use_widget_handlers' => 1, ), 'type' => 'addressfield_default', - 'weight' => 2, + 'weight' => 0, ), 'homeblock' => array( 'label' => 'above', @@ -472,11 +472,11 @@ function showroom_field_default_field_instances() { 'weight' => 0, ), 'default' => array( - 'label' => 'above', + 'label' => 'hidden', 'module' => 'email', 'settings' => array(), 'type' => 'email_default', - 'weight' => 3, + 'weight' => 1, ), 'homeblock' => array( 'label' => 'above', @@ -547,11 +547,11 @@ function showroom_field_default_field_instances() { 'weight' => 0, ), 'default' => array( - 'label' => 'above', + 'label' => 'hidden', 'module' => 'cck_phone', 'settings' => array(), 'type' => 'global_phone_number', - 'weight' => 4, + 'weight' => 2, ), 'homeblock' => array( 'label' => 'above', @@ -864,11 +864,10 @@ function showroom_field_default_field_instances() { 'weight' => 0, ), 'default' => array( - 'label' => 'above', - 'module' => 'taxonomy', + 'label' => 'hidden', 'settings' => array(), - 'type' => 'taxonomy_term_reference_link', - 'weight' => 1, + 'type' => 'hidden', + 'weight' => 4, ), 'homeblock' => array( 'label' => 'above', @@ -916,7 +915,7 @@ function showroom_field_default_field_instances() { 'description' => '', 'display' => array( 'default' => array( - 'label' => 'above', + 'label' => 'hidden', 'settings' => array(), 'type' => 'hidden', 'weight' => 1, @@ -955,7 +954,7 @@ function showroom_field_default_field_instances() { 'description' => '', 'display' => array( 'default' => array( - 'label' => 'above', + 'label' => 'hidden', 'settings' => array(), 'type' => 'hidden', 'weight' => 0, 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 52c88311..4328d97f 100644 --- a/sites/all/modules/features/showroom/showroom.features.user_permission.inc +++ b/sites/all/modules/features/showroom/showroom.features.user_permission.inc @@ -45,6 +45,7 @@ function showroom_user_default_permissions() { 'name' => 'create showroom content', 'roles' => array( 'administrator' => 'administrator', + 'root' => 'root', ), 'module' => 'node', ); @@ -54,6 +55,7 @@ function showroom_user_default_permissions() { 'name' => 'delete any showroom content', 'roles' => array( 'administrator' => 'administrator', + 'root' => 'root', ), 'module' => 'node', ); @@ -63,6 +65,7 @@ function showroom_user_default_permissions() { 'name' => 'delete own showroom content', 'roles' => array( 'administrator' => 'administrator', + 'root' => 'root', ), 'module' => 'node', ); @@ -72,6 +75,7 @@ function showroom_user_default_permissions() { 'name' => 'delete terms in showroom', 'roles' => array( 'administrator' => 'administrator', + 'root' => 'root', ), 'module' => 'taxonomy', ); @@ -91,6 +95,7 @@ function showroom_user_default_permissions() { 'name' => 'edit any showroom content', 'roles' => array( 'administrator' => 'administrator', + 'root' => 'root', ), 'module' => 'node', ); @@ -140,6 +145,7 @@ function showroom_user_default_permissions() { 'name' => 'edit own showroom content', 'roles' => array( 'administrator' => 'administrator', + 'root' => 'root', ), 'module' => 'node', ); @@ -149,6 +155,7 @@ function showroom_user_default_permissions() { 'name' => 'edit terms in showroom', 'roles' => array( 'administrator' => 'administrator', + 'root' => 'root', ), 'module' => 'taxonomy', ); @@ -166,63 +173,83 @@ function showroom_user_default_permissions() { // Exported permission: 'enter showroom revision log entry'. $permissions['enter showroom revision log entry'] = array( 'name' => 'enter showroom revision log entry', - 'roles' => array(), + 'roles' => array( + 'root' => 'root', + ), 'module' => 'override_node_options', ); // Exported permission: 'merge showroom terms'. $permissions['merge showroom terms'] = array( 'name' => 'merge showroom terms', - 'roles' => array(), + 'roles' => array( + 'root' => 'root', + ), 'module' => 'term_merge', ); // Exported permission: 'override showroom authored by option'. $permissions['override showroom authored by option'] = array( 'name' => 'override showroom authored by option', - 'roles' => array(), + 'roles' => array( + 'root' => 'root', + ), 'module' => 'override_node_options', ); // Exported permission: 'override showroom authored on option'. $permissions['override showroom authored on option'] = array( 'name' => 'override showroom authored on option', - 'roles' => array(), + 'roles' => array( + 'root' => 'root', + ), 'module' => 'override_node_options', ); // Exported permission: 'override showroom promote to front page option'. $permissions['override showroom promote to front page option'] = array( 'name' => 'override showroom promote to front page option', - 'roles' => array(), + 'roles' => array( + 'root' => 'root', + ), 'module' => 'override_node_options', ); // Exported permission: 'override showroom published option'. $permissions['override showroom published option'] = array( 'name' => 'override showroom published option', - 'roles' => array(), + 'roles' => array( + 'root' => 'root', + ), 'module' => 'override_node_options', ); // Exported permission: 'override showroom revision option'. $permissions['override showroom revision option'] = array( 'name' => 'override showroom revision option', - 'roles' => array(), + 'roles' => array( + 'root' => 'root', + ), 'module' => 'override_node_options', ); // Exported permission: 'override showroom sticky option'. $permissions['override showroom sticky option'] = array( 'name' => 'override showroom sticky option', - 'roles' => array(), + 'roles' => array( + 'root' => 'root', + ), 'module' => 'override_node_options', ); // Exported permission: 'show showroom title'. $permissions['show showroom title'] = array( 'name' => 'show showroom title', - 'roles' => array(), + 'roles' => array( + 'Showroom' => 'Showroom', + 'administrator' => 'administrator', + 'root' => 'root', + ), 'module' => 'materio_page_title', ); diff --git a/sites/all/modules/features/showroom/showroom.strongarm.inc b/sites/all/modules/features/showroom/showroom.strongarm.inc index f82895a4..960b6e6d 100644 --- a/sites/all/modules/features/showroom/showroom.strongarm.inc +++ b/sites/all/modules/features/showroom/showroom.strongarm.inc @@ -32,7 +32,7 @@ return t($items[0][\'name\']); $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 = 0; + $strongarm->value = 1; $export['ant_php_showroom'] = $strongarm; $strongarm = new stdClass(); @@ -103,7 +103,53 @@ return t($items[0][\'name\']); $strongarm->api_version = 1; $strongarm->name = 'field_bundle_settings_node__showroom'; $strongarm->value = array( - 'view_modes' => array(), + 'view_modes' => array( + 'teaser' => array( + 'custom_settings' => TRUE, + ), + 'homeblock' => array( + 'custom_settings' => TRUE, + ), + 'bookmark' => array( + 'custom_settings' => TRUE, + ), + 'cardsmall' => array( + 'custom_settings' => TRUE, + ), + 'cardmedium' => array( + 'custom_settings' => TRUE, + ), + 'cardbig' => array( + 'custom_settings' => TRUE, + ), + 'cardfull' => array( + 'custom_settings' => TRUE, + ), + 'full' => array( + 'custom_settings' => FALSE, + ), + 'rss' => array( + 'custom_settings' => FALSE, + ), + 'diff_standard' => array( + 'custom_settings' => FALSE, + ), + 'print' => array( + 'custom_settings' => FALSE, + ), + 'email_plain' => array( + 'custom_settings' => FALSE, + ), + 'email_html' => array( + 'custom_settings' => FALSE, + ), + 'email_textalt' => array( + 'custom_settings' => FALSE, + ), + 'token' => array( + 'custom_settings' => FALSE, + ), + ), 'extra_fields' => array( 'form' => array( 'metatags' => array( @@ -315,7 +361,9 @@ return t($items[0][\'name\']); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'unique_field_fields_showroom'; - $strongarm->value = array(); + $strongarm->value = array( + 0 => 'field_tode_showroom', + ); $export['unique_field_fields_showroom'] = $strongarm; $strongarm = new stdClass();