Procházet zdrojové kódy

recreated features

Bachir Soussi Chiadmi před 8 roky
rodič
revize
82bf36a5eb
26 změnil soubory, kde provedl 537 přidání a 992 odebrání
  1. 21 7
      sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.features.user_permission.inc
  2. 1 0
      sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.info
  3. 7 0
      sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.strongarm.inc
  4. 18 39
      sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc
  5. 3 1
      sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
  6. 2 1
      sites/all/modules/features/materio_administration/materio_administration.info
  7. 97 367
      sites/all/modules/features/materio_administration/materio_administration.views_default.inc
  8. 1 21
      sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc
  9. 16 82
      sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc
  10. 2 2
      sites/all/modules/features/materio_content_types/materio_content_types.features.taxonomy.inc
  11. 8 2
      sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc
  12. 24 3
      sites/all/modules/features/materio_content_types/materio_content_types.info
  13. 161 0
      sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc
  14. 6 5
      sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc
  15. 1 1
      sites/all/modules/features/materio_home_v2/materio_home_v2.features.menu_links.inc
  16. 24 22
      sites/all/modules/features/materio_home_v2/materio_home_v2.views_default.inc
  17. 1 1
      sites/all/modules/features/materio_publications/materio_publications.features.inc
  18. 6 2
      sites/all/modules/features/materio_publications/materio_publications.features.user_permission.inc
  19. 2 1
      sites/all/modules/features/materio_publications/materio_publications.info
  20. 10 3
      sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.user_permission.inc
  21. 1 0
      sites/all/modules/features/materio_subscriptions/materio_subscriptions.info
  22. 7 0
      sites/all/modules/features/materio_subscriptions/materio_subscriptions.strongarm.inc
  23. 3 1
      sites/all/modules/features/materio_user_import/materio_user_import.features.user_permission.inc
  24. 0 1
      sites/all/modules/gui/materiobasemod/assets/taglibres_en2fr.csv
  25. 0 1
      sites/all/modules/gui/materiobasemod/assets/taglibres_fr2en.csv
  26. 115 429
      sites/all/modules/gui/tode/tode.module

+ 21 - 7
sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.features.user_permission.inc

@@ -81,49 +81,63 @@ function frequently_asked_questions_user_default_permissions() {
   // Exported permission: 'enter faq revision log entry'.
   $permissions['enter faq revision log entry'] = array(
     'name' => 'enter faq revision log entry',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'override_node_options',
   );
 
   // Exported permission: 'override faq authored by option'.
   $permissions['override faq authored by option'] = array(
     'name' => 'override faq authored by option',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'override_node_options',
   );
 
   // Exported permission: 'override faq authored on option'.
   $permissions['override faq authored on option'] = array(
     'name' => 'override faq authored on option',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'override_node_options',
   );
 
   // Exported permission: 'override faq promote to front page option'.
   $permissions['override faq promote to front page option'] = array(
     'name' => 'override faq promote to front page option',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'override_node_options',
   );
 
   // Exported permission: 'override faq published option'.
   $permissions['override faq published option'] = array(
     'name' => 'override faq published option',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'override_node_options',
   );
 
   // Exported permission: 'override faq revision option'.
   $permissions['override faq revision option'] = array(
     'name' => 'override faq revision option',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'override_node_options',
   );
 
   // Exported permission: 'override faq sticky option'.
   $permissions['override faq sticky option'] = array(
     'name' => 'override faq sticky option',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'override_node_options',
   );
 

+ 1 - 0
sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.info

@@ -54,4 +54,5 @@ features[variable][] = faq_title
 features[variable][] = faq_use_categories
 features[variable][] = faq_use_teaser
 features[variable][] = nodeformscols_field_placements_faq_default
+features[variable][] = pathauto_taxonomy_term_faq_categories_pattern
 project path = sites/all/modules/features

+ 7 - 0
sites/all/modules/features/frequently_asked_questions/frequently_asked_questions.strongarm.inc

@@ -266,5 +266,12 @@ function frequently_asked_questions_strongarm() {
   );
   $export['nodeformscols_field_placements_faq_default'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_taxonomy_term_faq_categories_pattern';
+  $strongarm->value = '';
+  $export['pathauto_taxonomy_term_faq_categories_pattern'] = $strongarm;
+
   return $export;
 }

+ 18 - 39
sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc

@@ -56,22 +56,22 @@ function materio_administration_menu_default_menu_links() {
   $menu_links['navigation_company:admin/structure/taxonomy_manager/voc/company'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/structure/taxonomy_manager/voc/company',
-    'router_path' => 'admin/structure/taxonomy_manager/voc/%',
+    'router_path' => 'admin/structure',
     'link_title' => 'Company',
     'options' => array(
       'attributes' => array(),
       'identifier' => 'navigation_company:admin/structure/taxonomy_manager/voc/company',
     ),
     'module' => 'menu',
-    'hidden' => 0,
+    'hidden' => 1,
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
     'weight' => 9,
-    'customized' => 0,
+    'customized' => 1,
     'language' => 'und',
-    'menu_links_customized' => 0,
-    'parent_identifier' => 'navigation_taxonomy:admin/structure/taxonomy_manager/voc',
+    'menu_links_customized' => 1,
+    'parent_identifier' => 'navigation_taxonomy-manager:admin/structure/taxonomy_manager/voc',
   );
   // Exported menu link: navigation_compose-tips:filter/tips
   $menu_links['navigation_compose-tips:filter/tips'] = array(
@@ -211,7 +211,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => 0,
+    'weight' => -37,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -256,28 +256,28 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_ajouter-du-contenu:node/add',
+    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_onthologie:admin/structure/taxonomy_manager/voc/onthologie
   $menu_links['navigation_onthologie:admin/structure/taxonomy_manager/voc/onthologie'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/structure/taxonomy_manager/voc/onthologie',
-    'router_path' => 'admin/structure/taxonomy_manager/voc/%',
+    'router_path' => 'admin/structure',
     'link_title' => 'Onthologie',
     'options' => array(
       'attributes' => array(),
       'identifier' => 'navigation_onthologie:admin/structure/taxonomy_manager/voc/onthologie',
     ),
     'module' => 'menu',
-    'hidden' => 0,
+    'hidden' => 1,
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
     'weight' => 0,
-    'customized' => 0,
+    'customized' => 1,
     'language' => 'und',
-    'menu_links_customized' => 0,
-    'parent_identifier' => 'navigation_taxonomy:admin/structure/taxonomy_manager/voc',
+    'menu_links_customized' => 1,
+    'parent_identifier' => 'navigation_taxonomy-manager:admin/structure/taxonomy_manager/voc',
   );
   // Exported menu link: navigation_orders:admin/store/orders/view
   $menu_links['navigation_orders:admin/store/orders/view'] = array(
@@ -358,7 +358,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 1,
     'has_children' => 1,
     'expanded' => 0,
-    'weight' => 0,
+    'weight' => -36,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -388,42 +388,22 @@ function materio_administration_menu_default_menu_links() {
   $menu_links['navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/structure/taxonomy_manager/voc/tag_libres',
-    'router_path' => 'admin/structure/taxonomy_manager/voc/%',
+    'router_path' => 'admin/structure',
     'link_title' => 'Tag Libres',
     'options' => array(
       'attributes' => array(),
       'identifier' => 'navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres',
     ),
     'module' => 'menu',
-    'hidden' => 0,
+    'hidden' => 1,
     'external' => 0,
-    'has_children' => 1,
+    'has_children' => 0,
     'expanded' => 0,
     'weight' => 8,
-    'customized' => 0,
-    'language' => 'und',
-    'menu_links_customized' => 0,
-    'parent_identifier' => 'navigation_taxonomy:admin/structure/taxonomy_manager/voc',
-  );
-  // Exported menu link: navigation_taxonomy:admin/structure/taxonomy_manager/voc
-  $menu_links['navigation_taxonomy:admin/structure/taxonomy_manager/voc'] = array(
-    'menu_name' => 'navigation',
-    'link_path' => 'admin/structure/taxonomy_manager/voc',
-    'router_path' => 'admin/structure/taxonomy_manager/voc',
-    'link_title' => 'Taxonomy',
-    'options' => array(
-      'attributes' => array(),
-      'identifier' => 'navigation_taxonomy:admin/structure/taxonomy_manager/voc',
-    ),
-    'module' => 'menu',
-    'hidden' => 0,
-    'external' => 0,
-    'has_children' => 1,
-    'expanded' => 0,
-    'weight' => -47,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
+    'parent_identifier' => 'navigation_taxonomy-manager:admin/structure/taxonomy_manager/voc',
   );
   // Exported menu link: navigation_user-account:user
   $menu_links['navigation_user-account:user'] = array(
@@ -486,6 +466,7 @@ function materio_administration_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
+
   // Translatables
   // Included for use with string extractors like potx.
   t('Add user');
@@ -506,11 +487,9 @@ function materio_administration_menu_default_menu_links() {
   t('Store');
   t('Subscriptions newsletter');
   t('Tag Libres');
-  t('Taxonomy');
   t('User account');
   t('Users');
   t('customers');
 
-
   return $menu_links;
 }

+ 3 - 1
sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc

@@ -186,7 +186,9 @@ function materio_administration_user_default_permissions() {
   // Exported permission: 'show workflow state form'.
   $permissions['show workflow state form'] = array(
     'name' => 'show workflow state form',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'workflow',
   );
 

+ 2 - 1
sites/all/modules/features/materio_administration/materio_administration.info

@@ -17,6 +17,8 @@ dependencies[] = menu
 dependencies[] = role_delegation
 dependencies[] = simplenews
 dependencies[] = strongarm
+dependencies[] = taxonomy_csv
+dependencies[] = taxonomy_wrangler
 dependencies[] = title
 dependencies[] = views
 dependencies[] = views_bulk_operations
@@ -51,7 +53,6 @@ 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_taxonomy:admin/structure/taxonomy_manager/voc
 features[menu_links][] = navigation_user-account:user
 features[menu_links][] = navigation_users:admin/people
 features[menu_links][] = navigation_users:admin/users

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 97 - 367
sites/all/modules/features/materio_administration/materio_administration.views_default.inc


+ 1 - 21
sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc

@@ -10,27 +10,6 @@
 function materio_content_types_field_default_field_bases() {
   $field_bases = array();
 
-  // Exported field_base: 'description_field'
-  $field_bases['description_field'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'description_field',
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(
-      'entity_translation_sync' => FALSE,
-    ),
-    'translatable' => 1,
-    'type' => 'text_with_summary',
-  );
-
   // Exported field_base: 'field_attachments'
   $field_bases['field_attachments'] = array(
     'active' => 1,
@@ -778,6 +757,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
         0 => array(
           'vocabulary' => 'tag_libres',
           'parent' => 0,
+          'depth' => '',
         ),
       ),
       'entity_translation_sync' => FALSE,

+ 16 - 82
sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc

@@ -628,8 +628,13 @@ function materio_content_types_field_default_field_instances() {
       'module' => 'autocomplete_deluxe',
       'settings' => array(
         'autocomplete_deluxe_path' => 'autocomplete_deluxe/taxonomy',
-        'content_taxonomy_autocomplete_new_terms' => 'allow',
+        'content_taxonomy_autocomplete_new_terms' => 'deny',
+        'delimiter' => '',
+        'limit' => 10,
+        'min_length' => 0,
+        'not_found_message' => 'The term \'@term\' will be added.',
         'size' => 60,
+        'use_synonyms' => 0,
       ),
       'type' => 'autocomplete_deluxe_taxonomy',
       'weight' => 20,
@@ -3542,7 +3547,8 @@ function materio_content_types_field_default_field_instances() {
     'bundle' => 'materiau',
     'default_value' => NULL,
     'deleted' => 0,
-    'description' => '',
+    'description' => '<b>/!\\ Attention</b> VOus ne pouvez pas ajouter de nouveaux tag ici.<br/>
+Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/taxonomy/tag_libres/add"><b>ici</b></a>',
     'display' => array(
       'bookmark' => array(
         'label' => 'above',
@@ -3610,13 +3616,15 @@ function materio_content_types_field_default_field_instances() {
     ),
     'widget' => array(
       'active' => 1,
-      'module' => 'autocomplete_deluxe',
+      'module' => 'synonyms',
       'settings' => array(
-        'autocomplete_deluxe_path' => 'autocomplete_deluxe/taxonomy',
-        'content_taxonomy_autocomplete_new_terms' => 'allow',
+        'auto_creation' => 0,
+        'autocomplete_path' => 'synonyms/autocomplete',
         'size' => 60,
+        'suggest_only_unique' => 0,
+        'suggestion_size' => 10,
       ),
-      'type' => 'autocomplete_deluxe_taxonomy',
+      'type' => 'synonyms_autocomplete',
       'weight' => 23,
     ),
   );
@@ -4676,82 +4684,6 @@ function materio_content_types_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'taxonomy_term-tag_libres-description_field'
-  $field_instances['taxonomy_term-tag_libres-description_field'] = array(
-    'bundle' => 'tag_libres',
-    'default_value' => NULL,
-    'deleted' => 0,
-    'description' => '',
-    'display' => array(
-      'default' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 2,
-      ),
-    ),
-    'entity_type' => 'taxonomy_term',
-    'field_name' => 'description_field',
-    'label' => 'Description',
-    'required' => FALSE,
-    'settings' => array(
-      'display_summary' => 0,
-      'entity_translation_sync' => FALSE,
-      'hide_label' => array(
-        'entity' => FALSE,
-        'page' => FALSE,
-      ),
-      'text_processing' => 1,
-      'user_register_form' => FALSE,
-    ),
-    'widget' => array(
-      'module' => 'text',
-      'settings' => array(
-        'rows' => 20,
-        'summary_rows' => 5,
-      ),
-      'type' => 'text_textarea_with_summary',
-      'weight' => 1,
-    ),
-  );
-
-  // Exported field_instance: 'taxonomy_term-tag_libres-name_field'
-  $field_instances['taxonomy_term-tag_libres-name_field'] = array(
-    'bundle' => 'tag_libres',
-    'default_value' => NULL,
-    'deleted' => 0,
-    'description' => '',
-    'display' => array(
-      'default' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 1,
-      ),
-    ),
-    'entity_type' => 'taxonomy_term',
-    'field_name' => 'name_field',
-    'label' => 'Nom',
-    'required' => TRUE,
-    'settings' => array(
-      'entity_translation_sync' => FALSE,
-      'hide_label' => array(
-        'entity' => FALSE,
-        'page' => FALSE,
-      ),
-      'text_processing' => 0,
-      'user_register_form' => FALSE,
-    ),
-    'widget' => array(
-      'module' => 'text',
-      'settings' => array(
-        'size' => 60,
-      ),
-      'type' => 'text_textfield',
-      'weight' => -5,
-    ),
-  );
-
   // Exported field_instance: 'taxonomy_term-tag_libres-synonyms_synonym'
   $field_instances['taxonomy_term-tag_libres-synonyms_synonym'] = array(
     'bundle' => 'tag_libres',
@@ -4789,6 +4721,8 @@ function materio_content_types_field_default_field_instances() {
   // Translatables
   // Included for use with string extractors like potx.
   t('"http://" will be added automaticly.');
+  t('<b>/!\\ Attention</b> VOus ne pouvez pas ajouter de nouveaux tag ici.<br/>
+Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/taxonomy/tag_libres/add"><b>ici</b></a>');
   t('A field replacing node title.');
   t('A field replacing taxonomy term name.');
   t('Adresse');

+ 2 - 2
sites/all/modules/features/materio_content_types/materio_content_types.features.taxonomy.inc

@@ -23,7 +23,7 @@ function materio_content_types_taxonomy_default_vocabularies() {
       'name' => 'Ontologie',
       'machine_name' => 'onthologie',
       'description' => '',
-      'hierarchy' => 1,
+      'hierarchy' => 0,
       'module' => 'taxonomy',
       'weight' => -10,
       'language' => 'und',
@@ -32,7 +32,7 @@ function materio_content_types_taxonomy_default_vocabularies() {
     'tag_libres' => array(
       'name' => 'Tag libres',
       'machine_name' => 'tag_libres',
-      'description' => '',
+      'description' => 'First create the english tag, then translate it.',
       'hierarchy' => 0,
       'module' => 'taxonomy',
       'weight' => -9,

+ 8 - 2
sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc

@@ -272,7 +272,10 @@ function materio_content_types_user_default_permissions() {
   // Exported permission: 'edit field_famille'.
   $permissions['edit field_famille'] = array(
     'name' => 'edit field_famille',
-    'roles' => array(),
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
     'module' => 'field_permissions',
   );
 
@@ -425,7 +428,10 @@ function materio_content_types_user_default_permissions() {
   // Exported permission: 'edit own field_famille'.
   $permissions['edit own field_famille'] = array(
     'name' => 'edit own field_famille',
-    'roles' => array(),
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
     'module' => 'field_permissions',
   );
 

+ 24 - 3
sites/all/modules/features/materio_content_types/materio_content_types.info

@@ -26,6 +26,7 @@ dependencies[] = options
 dependencies[] = print
 dependencies[] = print_ui
 dependencies[] = strongarm
+dependencies[] = synonyms
 dependencies[] = taxonomy
 dependencies[] = term_reference_tree
 dependencies[] = text
@@ -39,7 +40,6 @@ features[ctools][] = field_group:field_group:1
 features[ctools][] = strongarm:strongarm:1
 features[ctools][] = views:views_default:3.0
 features[features_api][] = api:2
-features[field_base][] = description_field
 features[field_base][] = field_attachments
 features[field_base][] = field_authored_on
 features[field_base][] = field_bandeau
@@ -182,8 +182,6 @@ features[field_instance][] = taxonomy_term-company-synonyms_synonym
 features[field_instance][] = taxonomy_term-onthologie-field_used_on_advanced_search
 features[field_instance][] = taxonomy_term-onthologie-name_field
 features[field_instance][] = taxonomy_term-onthologie-synonyms_synonym
-features[field_instance][] = taxonomy_term-tag_libres-description_field
-features[field_instance][] = taxonomy_term-tag_libres-name_field
 features[field_instance][] = taxonomy_term-tag_libres-synonyms_synonym
 features[image][] = card-big
 features[image][] = card-full
@@ -338,6 +336,29 @@ features[variable][] = nodeformscols_field_placements_materiau_default
 features[variable][] = nodeformscols_field_placements_page_default
 features[variable][] = nodeformscols_field_placements_simplenews_default
 features[variable][] = nodeformscols_field_placements_webform_default
+features[variable][] = pathauto_node_breve_en_pattern
+features[variable][] = pathauto_node_breve_fr_pattern
+features[variable][] = pathauto_node_breve_pattern
+features[variable][] = pathauto_node_breve_und_pattern
+features[variable][] = pathauto_node_company_en_pattern
+features[variable][] = pathauto_node_company_fr_pattern
+features[variable][] = pathauto_node_company_pattern
+features[variable][] = pathauto_node_company_und_pattern
+features[variable][] = pathauto_node_materiau_en_pattern
+features[variable][] = pathauto_node_materiau_fr_pattern
+features[variable][] = pathauto_node_materiau_pattern
+features[variable][] = pathauto_node_materiau_und_pattern
+features[variable][] = pathauto_node_page_en_pattern
+features[variable][] = pathauto_node_page_fr_pattern
+features[variable][] = pathauto_node_page_pattern
+features[variable][] = pathauto_node_page_und_pattern
+features[variable][] = pathauto_node_webform_en_pattern
+features[variable][] = pathauto_node_webform_fr_pattern
+features[variable][] = pathauto_node_webform_pattern
+features[variable][] = pathauto_node_webform_und_pattern
+features[variable][] = pathauto_taxonomy_term_company_pattern
+features[variable][] = pathauto_taxonomy_term_onthologie_pattern
+features[variable][] = pathauto_taxonomy_term_tag_libres_pattern
 features[variable][] = print_comments
 features[variable][] = print_css
 features[variable][] = print_footer_options

+ 161 - 0
sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc

@@ -1481,6 +1481,167 @@ function materio_content_types_strongarm() {
   $strongarm->value = 0;
   $export['node_submitted_webform'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_breve_en_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_breve_en_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_breve_fr_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_breve_fr_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_breve_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_breve_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_breve_und_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_breve_und_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_company_en_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_company_en_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_company_fr_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_company_fr_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_company_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_company_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_company_und_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_company_und_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_materiau_en_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_materiau_en_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_materiau_fr_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_materiau_fr_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_materiau_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_materiau_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_materiau_und_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_materiau_und_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_page_en_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_page_en_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_page_fr_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_page_fr_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_page_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_page_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_page_und_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_page_und_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_webform_en_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_webform_en_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_webform_fr_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_webform_fr_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_webform_pattern';
+  $strongarm->value = 'form/[node:title]';
+  $export['pathauto_node_webform_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_node_webform_und_pattern';
+  $strongarm->value = '';
+  $export['pathauto_node_webform_und_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_taxonomy_term_company_pattern';
+  $strongarm->value = '';
+  $export['pathauto_taxonomy_term_company_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_taxonomy_term_onthologie_pattern';
+  $strongarm->value = '';
+  $export['pathauto_taxonomy_term_onthologie_pattern'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_taxonomy_term_tag_libres_pattern';
+  $strongarm->value = '';
+  $export['pathauto_taxonomy_term_tag_libres_pattern'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;

+ 6 - 5
sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc

@@ -50,7 +50,7 @@ function materio_content_types_views_default_views() {
     'title' => 'title',
   );
   $handler->display->display_options['row_options']['hide_empty'] = TRUE;
-  /* Champ: Contenu : Référence Materio */
+  /* Field: Content: Référence Materio */
   $handler->display->display_options['fields']['field_reference_materio']['id'] = 'field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['field'] = 'field_reference_materio';
@@ -58,7 +58,7 @@ function materio_content_types_views_default_views() {
   $handler->display->display_options['fields']['field_reference_materio']['alter']['text'] = '[field_reference_materio] ';
   $handler->display->display_options['fields']['field_reference_materio']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['field_reference_materio']['hide_empty'] = TRUE;
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
@@ -68,19 +68,19 @@ function materio_content_types_views_default_views() {
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['title']['link_to_node'] = FALSE;
-  /* Critère de tri: Contenu : Date de publication */
+  /* Sort criterion: Content: Post date */
   $handler->display->display_options['sorts']['created']['id'] = 'created';
   $handler->display->display_options['sorts']['created']['table'] = 'node';
   $handler->display->display_options['sorts']['created']['field'] = 'created';
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
@@ -130,6 +130,7 @@ function materio_content_types_views_default_views() {
     t('[field_reference_materio] '),
     t('[field_reference_materio][title]'),
     t('Entity Reference'),
+    t('more'),
   );
   $export['entity_reference_materiaux_breves'] = $view;
 

+ 1 - 1
sites/all/modules/features/materio_home_v2/materio_home_v2.features.menu_links.inc

@@ -186,6 +186,7 @@ function materio_home_v2_menu_default_menu_links() {
     'language' => 'und',
     'menu_links_customized' => 1,
   );
+
   // Translatables
   // Included for use with string extractors like potx.
   t('Access to the online database');
@@ -194,6 +195,5 @@ function materio_home_v2_menu_default_menu_links() {
   t('Les formations');
   t('Les services sur mesure');
 
-
   return $menu_links;
 }

+ 24 - 22
sites/all/modules/features/materio_home_v2/materio_home_v2.views_default.inc

@@ -38,33 +38,33 @@ function materio_home_v2_views_default_views() {
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['row_plugin'] = 'entity';
   $handler->display->display_options['row_options']['view_mode'] = 'cardbig';
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
   $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
-  /* Critère de tri: Contenu : Date de publication */
+  /* Sort criterion: Content: Post date */
   $handler->display->display_options['sorts']['created']['id'] = 'created';
   $handler->display->display_options['sorts']['created']['table'] = 'node';
   $handler->display->display_options['sorts']['created']['field'] = 'created';
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
     'breve' => 'breve',
   );
-  /* Critère de filtrage: Processus : État actuel */
+  /* 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';
@@ -104,28 +104,28 @@ function materio_home_v2_views_default_views() {
   $handler->display->display_options['defaults']['row_options'] = FALSE;
   $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
     'simplenews' => 'simplenews',
   );
-  /* Critère de filtrage: Processus : État actuel */
+  /* 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']['value'] = array(
     3 => '3',
   );
-  /* Critère de filtrage: Contenu : Newsletter category (field_simplenews_term) */
+  /* Filter criterion: Content: Newsletter category (field_simplenews_term) */
   $handler->display->display_options['filters']['field_simplenews_term_tid']['id'] = 'field_simplenews_term_tid';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['table'] = 'field_data_field_simplenews_term';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['field'] = 'field_simplenews_term_tid';
@@ -134,7 +134,7 @@ function materio_home_v2_views_default_views() {
   );
   $handler->display->display_options['filters']['field_simplenews_term_tid']['type'] = 'select';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['vocabulary'] = 'newsletter';
-  /* Critère de filtrage: Parution de lettre d'information : État des envois */
+  /* Filter criterion: Simplenews issue: Sent status */
   $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
   $handler->display->display_options['filters']['status_1']['table'] = 'simplenews_newsletter';
   $handler->display->display_options['filters']['status_1']['field'] = 'status';
@@ -170,28 +170,28 @@ function materio_home_v2_views_default_views() {
   $handler->display->display_options['defaults']['row_options'] = FALSE;
   $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
     'simplenews' => 'simplenews',
   );
-  /* Critère de filtrage: Processus : État actuel */
+  /* 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']['value'] = array(
     3 => '3',
   );
-  /* Critère de filtrage: Contenu : Newsletter category (field_simplenews_term) */
+  /* Filter criterion: Content: Newsletter category (field_simplenews_term) */
   $handler->display->display_options['filters']['field_simplenews_term_tid']['id'] = 'field_simplenews_term_tid';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['table'] = 'field_data_field_simplenews_term';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['field'] = 'field_simplenews_term_tid';
@@ -200,14 +200,14 @@ function materio_home_v2_views_default_views() {
   );
   $handler->display->display_options['filters']['field_simplenews_term_tid']['type'] = 'select';
   $handler->display->display_options['filters']['field_simplenews_term_tid']['vocabulary'] = 'newsletter';
-  /* Critère de filtrage: Parution de lettre d'information : État des envois */
+  /* Filter criterion: Simplenews issue: Sent status */
   $handler->display->display_options['filters']['status_1']['id'] = 'status_1';
   $handler->display->display_options['filters']['status_1']['table'] = 'simplenews_newsletter';
   $handler->display->display_options['filters']['status_1']['field'] = 'status';
   $handler->display->display_options['filters']['status_1']['value'] = array(
     2 => '2',
   );
-  /* Critère de filtrage: Contenu : Visible sur la home (field_visible_sur_la_home) */
+  /* Filter criterion: Content: Visible sur la home (field_visible_sur_la_home) */
   $handler->display->display_options['filters']['field_visible_sur_la_home_value']['id'] = 'field_visible_sur_la_home_value';
   $handler->display->display_options['filters']['field_visible_sur_la_home_value']['table'] = 'field_data_field_visible_sur_la_home';
   $handler->display->display_options['filters']['field_visible_sur_la_home_value']['field'] = 'field_visible_sur_la_home_value';
@@ -234,6 +234,7 @@ function materio_home_v2_views_default_views() {
     t('Trier par'),
     t('Asc'),
     t('Desc'),
+    t('more'),
     t('home v2'),
     t('daily'),
     t('Daily materiO\''),
@@ -270,37 +271,37 @@ function materio_home_v2_views_default_views() {
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['row_plugin'] = 'entity';
   $handler->display->display_options['row_options']['view_mode'] = 'homeblock';
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
   $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
-  /* Critère de tri: Contenu : weight (field_weight) */
+  /* Sort criterion: Content: weight (field_weight) */
   $handler->display->display_options['sorts']['field_weight_value']['id'] = 'field_weight_value';
   $handler->display->display_options['sorts']['field_weight_value']['table'] = 'field_data_field_weight';
   $handler->display->display_options['sorts']['field_weight_value']['field'] = 'field_weight_value';
-  /* Critère de tri: Contenu : Date de publication */
+  /* Sort criterion: Content: Post date */
   $handler->display->display_options['sorts']['created']['id'] = 'created';
   $handler->display->display_options['sorts']['created']['table'] = 'node';
   $handler->display->display_options['sorts']['created']['field'] = 'created';
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
-  /* Critère de filtrage: Contenu : Publié */
+  /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
     'publication' => 'publication',
   );
-  /* Critère de filtrage: Processus : État actuel */
+  /* 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';
@@ -322,6 +323,7 @@ function materio_home_v2_views_default_views() {
     t('Trier par'),
     t('Asc'),
     t('Desc'),
+    t('more'),
     t('Home v2'),
   );
   $export['publication_home_v2'] = $view;

+ 1 - 1
sites/all/modules/features/materio_publications/materio_publications.features.inc

@@ -23,7 +23,7 @@ function materio_publications_image_default_styles() {
   $styles['publication-couv'] = array(
     'label' => 'publication-couv',
     'effects' => array(
-      16 => array(
+      15 => array(
         'name' => 'image_scale',
         'data' => array(
           'width' => 480,

+ 6 - 2
sites/all/modules/features/materio_publications/materio_publications.features.user_permission.inc

@@ -32,7 +32,9 @@ function materio_publications_user_default_permissions() {
   // Exported permission: 'delete own publication content'.
   $permissions['delete own publication content'] = array(
     'name' => 'delete own publication content',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'node',
   );
 
@@ -49,7 +51,9 @@ function materio_publications_user_default_permissions() {
   // Exported permission: 'edit own publication content'.
   $permissions['edit own publication content'] = array(
     'name' => 'edit own publication content',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'node',
   );
 

+ 2 - 1
sites/all/modules/features/materio_publications/materio_publications.info

@@ -4,8 +4,8 @@ package = Materio
 dependencies[] = ctools
 dependencies[] = features
 dependencies[] = image
+dependencies[] = list
 dependencies[] = materio_content_types
-dependencies[] = materio_page_title
 dependencies[] = metatag
 dependencies[] = node
 dependencies[] = strongarm
@@ -68,4 +68,5 @@ features[workflow][] = Publication
 features[workflow_access][] = Publication
 features_exclude[dependencies][materio_subscriptions] = materio_subscriptions
 features_exclude[dependencies][options] = options
+features_exclude[dependencies][materio_page_title] = materio_page_title
 project path = sites/all/modules/features

+ 10 - 3
sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.user_permission.inc

@@ -185,7 +185,9 @@ function materio_subscriptions_user_default_permissions() {
   // Exported permission: 'delete payments'.
   $permissions['delete payments'] = array(
     'name' => 'delete payments',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'uc_payment',
   );
 
@@ -219,7 +221,9 @@ function materio_subscriptions_user_default_permissions() {
   // Exported permission: 'manual payments'.
   $permissions['manual payments'] = array(
     'name' => 'manual payments',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'uc_payment',
   );
 
@@ -280,7 +284,10 @@ function materio_subscriptions_user_default_permissions() {
   // Exported permission: 'view payments'.
   $permissions['view payments'] = array(
     'name' => 'view payments',
-    'roles' => array(),
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
     'module' => 'uc_payment',
   );
 

+ 1 - 0
sites/all/modules/features/materio_subscriptions/materio_subscriptions.info

@@ -73,6 +73,7 @@ features[user_role][] = Adhérent
 features[user_role][] = Premium
 features[user_role][] = Utilisateur
 features[variable][] = date_format_uc_store
+features[variable][] = pathauto_taxonomy_term_catalog_pattern
 features[variable][] = uc_add_item_redirect
 features[variable][] = uc_address_fields
 features[variable][] = uc_address_fields_required

+ 7 - 0
sites/all/modules/features/materio_subscriptions/materio_subscriptions.strongarm.inc

@@ -17,6 +17,13 @@ function materio_subscriptions_strongarm() {
   $strongarm->value = 'm/d/Y';
   $export['date_format_uc_store'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathauto_taxonomy_term_catalog_pattern';
+  $strongarm->value = '';
+  $export['pathauto_taxonomy_term_catalog_pattern'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;

+ 3 - 1
sites/all/modules/features/materio_user_import/materio_user_import.features.user_permission.inc

@@ -13,7 +13,9 @@ function materio_user_import_user_default_permissions() {
   // Exported permission: 'import users'.
   $permissions['import users'] = array(
     'name' => 'import users',
-    'roles' => array(),
+    'roles' => array(
+      'root' => 'root',
+    ),
     'module' => 'user_import',
   );
 

+ 0 - 1
sites/all/modules/gui/materiobasemod/assets/taglibres_en2fr.csv

@@ -1140,5 +1140,4 @@ gonflé,gonflé
 boeing,boeing
 crayon,crayon
 fruhstuck7,fruhstuck7
-fruhstuck7,
 fruhstuck8,fruhstuck8

+ 0 - 1
sites/all/modules/gui/materiobasemod/assets/taglibres_fr2en.csv

@@ -1140,5 +1140,4 @@ gonflé,gonflé
 boeing,boeing
 crayon,crayon
 fruhstuck7,fruhstuck7
-,fruhstuck7
 fruhstuck8,fruhstuck8

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 115 - 429
sites/all/modules/gui/tode/tode.module


Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů