Browse Source

update materio_content_types

removed materio_title_access module dependency

Signed-off-by: bachy <git@g-u-i.net>
bachy 11 years ago
parent
commit
0ccaf2eeeb

+ 209 - 25
materio_content_types/materio_content_types.features.field.inc

@@ -254,7 +254,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
       'entity_types' => array(),
       'field_name' => 'field_materiau_ref',
       'field_permissions' => array(
-        'type' => '0',
+        'type' => '2',
       ),
       'foreign keys' => array(
         'node' => array(
@@ -975,7 +975,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
   $fields['node-breve-field_visuel'] = array(
     'field_config' => array(
       'active' => '1',
-      'cardinality' => '-1',
+      'cardinality' => '1',
       'deleted' => '0',
       'entity_types' => array(),
       'field_name' => 'field_visuel',
@@ -1005,7 +1005,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
         'profile2_private' => FALSE,
         'uri_scheme' => 'public',
       ),
-      'translatable' => '0',
+      'translatable' => '1',
       'type' => 'image',
     ),
     'field_instance' => array(
@@ -1142,15 +1142,15 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
           'data_size' => 'normal',
           'data_type' => 'varchar',
         ),
-        'display_format' => '//dsm($entity);
-$workflow = workflow_get_workflow_type_map_by_type($entity->type);
-$states = workflow_get_workflow_states_by_wid($workflow->wid);
-foreach ($states as $state) {
-  if ($state->sid == $entity->workflow) {
-    $display_output = $state->state;
-    dsm($state, \'state\');
-  }
-}
+        'display_format' => '//dsm($entity);
+$workflow = workflow_get_workflow_type_map_by_type($entity->type);
+$states = workflow_get_workflow_states_by_wid($workflow->wid);
+foreach ($states as $state) {
+  if ($state->sid == $entity->workflow) {
+    $display_output = $state->state;
+    dsm($state, \'state\');
+  }
+}
 ',
         'entity_translation_sync' => FALSE,
         'profile2_private' => FALSE,
@@ -4022,7 +4022,7 @@ foreach ($states as $state) {
       'entity_types' => array(),
       'field_name' => 'field_materiau_ref',
       'field_permissions' => array(
-        'type' => '0',
+        'type' => '2',
       ),
       'foreign keys' => array(
         'node' => array(
@@ -4330,9 +4330,13 @@ foreach ($states as $state) {
         ),
         'print' => array(
           'label' => 'hidden',
-          'module' => 'text',
-          'settings' => array(),
-          'type' => 'text_default',
+          'module' => 'title',
+          'settings' => array(
+            'title_class' => '',
+            'title_link' => '',
+            'title_style' => '',
+          ),
+          'type' => 'title_linked',
           'weight' => '1',
         ),
         'teaser' => array(
@@ -4860,15 +4864,15 @@ foreach ($states as $state) {
           'data_size' => 'normal',
           'data_type' => 'varchar',
         ),
-        'display_format' => '//dsm($entity);
-$workflow = workflow_get_workflow_type_map_by_type($entity->type);
-$states = workflow_get_workflow_states_by_wid($workflow->wid);
-foreach ($states as $state) {
-  if ($state->sid == $entity->workflow) {
-    $display_output = $state->state;
-    dsm($state, \'state\');
-  }
-}
+        'display_format' => '//dsm($entity);
+$workflow = workflow_get_workflow_type_map_by_type($entity->type);
+$states = workflow_get_workflow_states_by_wid($workflow->wid);
+foreach ($states as $state) {
+  if ($state->sid == $entity->workflow) {
+    $display_output = $state->state;
+    dsm($state, \'state\');
+  }
+}
 ',
         'entity_translation_sync' => FALSE,
         'profile2_private' => FALSE,
@@ -5423,6 +5427,119 @@ foreach ($states as $state) {
     ),
   );
 
+  // Exported field: 'node-webform-title_field'.
+  $fields['node-webform-title_field'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'title_field',
+      'field_permissions' => array(
+        'type' => '0',
+      ),
+      'foreign keys' => array(
+        'format' => array(
+          'columns' => array(
+            'format' => 'format',
+          ),
+          'table' => 'filter_format',
+        ),
+      ),
+      'indexes' => array(
+        'format' => array(
+          0 => 'format',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'text',
+      'settings' => array(
+        'entity_translation_sync' => FALSE,
+        'max_length' => 255,
+        'profile2_private' => FALSE,
+      ),
+      'translatable' => '1',
+      'type' => 'text',
+    ),
+    'field_instance' => array(
+      'bundle' => 'webform',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => 'A field replacing node title.',
+      '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',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 1,
+        ),
+        'print' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'title_field',
+      'label' => 'Titre',
+      '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: 'taxonomy_term-company-synonyms_synonym'.
   $fields['taxonomy_term-company-synonyms_synonym'] = array(
     'field_config' => array(
@@ -5641,6 +5758,73 @@ foreach ($states as $state) {
     ),
   );
 
+  // Exported field: 'taxonomy_term-tag_libres-name_field'.
+  $fields['taxonomy_term-tag_libres-name_field'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'name_field',
+      'foreign keys' => array(
+        'format' => array(
+          'columns' => array(
+            'format' => 'format',
+          ),
+          'table' => 'filter_format',
+        ),
+      ),
+      'indexes' => array(
+        'format' => array(
+          0 => 'format',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'text',
+      'settings' => array(
+        'entity_translation_sync' => FALSE,
+        'max_length' => 255,
+      ),
+      'translatable' => '1',
+      'type' => 'text',
+    ),
+    'field_instance' => 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: 'taxonomy_term-tag_libres-synonyms_synonym'.
   $fields['taxonomy_term-tag_libres-synonyms_synonym'] = array(
     'field_config' => array(

+ 80 - 44
materio_content_types/materio_content_types.features.user_permission.inc

@@ -490,11 +490,17 @@ function materio_content_types_user_default_permissions() {
   $permissions['show breve title'] = array(
     'name' => 'show breve title',
     'roles' => array(
-      0 => 'anonymous user',
-      1 => 'authenticated user',
-      2 => 'root',
+      0 => 'Adhérent',
+      1 => 'Contact opérationnel',
+      2 => 'Premium',
+      3 => 'Student',
+      4 => 'Unverified',
+      5 => 'Utilisateur',
+      6 => 'administrator',
+      7 => 'anonymous user',
+      8 => 'root',
     ),
-    'module' => 'materio_title_access',
+    'module' => 'materio_page_title',
   );
 
   // Exported permission: show company title.
@@ -504,10 +510,11 @@ function materio_content_types_user_default_permissions() {
       0 => 'Adhérent',
       1 => 'Contact opérationnel',
       2 => 'Premium',
-      3 => 'administrator',
-      4 => 'root',
+      3 => 'Student',
+      4 => 'administrator',
+      5 => 'root',
     ),
-    'module' => 'materio_title_access',
+    'module' => 'materio_page_title',
   );
 
   // Exported permission: show materiau title.
@@ -517,46 +524,60 @@ function materio_content_types_user_default_permissions() {
       0 => 'Adhérent',
       1 => 'Contact opérationnel',
       2 => 'Premium',
-      3 => 'administrator',
-      4 => 'root',
+      3 => 'Student',
+      4 => 'administrator',
+      5 => 'root',
     ),
-    'module' => 'materio_title_access',
+    'module' => 'materio_page_title',
   );
 
   // Exported permission: show page title.
   $permissions['show page title'] = array(
     'name' => 'show page title',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'anonymous user',
-      2 => 'authenticated user',
-      3 => 'root',
+      0 => 'Adhérent',
+      1 => 'Contact opérationnel',
+      2 => 'Premium',
+      3 => 'Student',
+      4 => 'Unverified',
+      5 => 'Utilisateur',
+      6 => 'administrator',
+      7 => 'anonymous user',
+      8 => 'root',
     ),
-    'module' => 'materio_title_access',
+    'module' => 'materio_page_title',
   );
 
   // Exported permission: show panel title.
   $permissions['show panel title'] = array(
     'name' => 'show panel title',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'anonymous user',
-      2 => 'authenticated user',
-      3 => 'root',
+      0 => 'Adhérent',
+      1 => 'Student',
+      2 => 'Unverified',
+      3 => 'Utilisateur',
+      4 => 'administrator',
+      5 => 'anonymous user',
+      6 => 'root',
     ),
-    'module' => 'materio_title_access',
+    'module' => 'materio_page_title',
   );
 
   // Exported permission: show webform title.
   $permissions['show webform title'] = array(
     'name' => 'show webform title',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'anonymous user',
-      2 => 'authenticated user',
-      3 => 'root',
+      0 => 'Adhérent',
+      1 => 'Contact opérationnel',
+      2 => 'Premium',
+      3 => 'Student',
+      4 => 'Unverified',
+      5 => 'Utilisateur',
+      6 => 'administrator',
+      7 => 'anonymous user',
+      8 => 'root',
     ),
-    'module' => 'materio_title_access',
+    'module' => 'materio_page_title',
   );
 
   // Exported permission: view field_attachments.
@@ -565,8 +586,9 @@ function materio_content_types_user_default_permissions() {
     'roles' => array(
       0 => 'Adhérent',
       1 => 'Premium',
-      2 => 'administrator',
-      3 => 'root',
+      2 => 'Student',
+      3 => 'administrator',
+      4 => 'root',
     ),
     'module' => 'field_permissions',
   );
@@ -587,8 +609,9 @@ function materio_content_types_user_default_permissions() {
     'roles' => array(
       0 => 'Adhérent',
       1 => 'Premium',
-      2 => 'administrator',
-      3 => 'root',
+      2 => 'Student',
+      3 => 'administrator',
+      4 => 'root',
     ),
     'module' => 'field_permissions',
   );
@@ -599,8 +622,9 @@ function materio_content_types_user_default_permissions() {
     'roles' => array(
       0 => 'Adhérent',
       1 => 'Premium',
-      2 => 'administrator',
-      3 => 'root',
+      2 => 'Student',
+      3 => 'administrator',
+      4 => 'root',
     ),
     'module' => 'field_permissions',
   );
@@ -610,9 +634,13 @@ function materio_content_types_user_default_permissions() {
     'name' => 'view field_description',
     'roles' => array(
       0 => 'Adhérent',
-      1 => 'Premium',
-      2 => 'administrator',
-      3 => 'root',
+      1 => 'Contact opérationnel',
+      2 => 'Premium',
+      3 => 'Student',
+      4 => 'Unverified',
+      5 => 'Utilisateur',
+      6 => 'administrator',
+      7 => 'root',
     ),
     'module' => 'field_permissions',
   );
@@ -630,10 +658,15 @@ function materio_content_types_user_default_permissions() {
   $permissions['view field_famille'] = array(
     'name' => 'view field_famille',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'anonymous user',
-      2 => 'authenticated user',
-      3 => 'root',
+      0 => 'Adhérent',
+      1 => 'Contact opérationnel',
+      2 => 'Premium',
+      3 => 'Student',
+      4 => 'Unverified',
+      5 => 'Utilisateur',
+      6 => 'administrator',
+      7 => 'anonymous user',
+      8 => 'root',
     ),
     'module' => 'field_permissions',
   );
@@ -665,8 +698,9 @@ function materio_content_types_user_default_permissions() {
       0 => 'Adhérent',
       1 => 'Contact opérationnel',
       2 => 'Premium',
-      3 => 'administrator',
-      4 => 'root',
+      3 => 'Student',
+      4 => 'administrator',
+      5 => 'root',
     ),
     'module' => 'field_permissions',
   );
@@ -697,8 +731,9 @@ function materio_content_types_user_default_permissions() {
     'roles' => array(
       0 => 'Adhérent',
       1 => 'Premium',
-      2 => 'administrator',
-      3 => 'root',
+      2 => 'Student',
+      3 => 'administrator',
+      4 => 'root',
     ),
     'module' => 'field_permissions',
   );
@@ -710,8 +745,9 @@ function materio_content_types_user_default_permissions() {
       0 => 'Adhérent',
       1 => 'Contact opérationnel',
       2 => 'Premium',
-      3 => 'administrator',
-      4 => 'root',
+      3 => 'Student',
+      4 => 'administrator',
+      5 => 'root',
     ),
     'module' => 'field_permissions',
   );

+ 12 - 1
materio_content_types/materio_content_types.info

@@ -19,11 +19,12 @@ dependencies[] = i18n_taxonomy
 dependencies[] = image
 dependencies[] = link
 dependencies[] = list
-dependencies[] = materio_title_access
+dependencies[] = materio_page_title
 dependencies[] = options
 dependencies[] = strongarm
 dependencies[] = taxonomy
 dependencies[] = term_reference_tree
+dependencies[] = title
 dependencies[] = tode
 dependencies[] = video_filter_field
 dependencies[] = views
@@ -77,9 +78,11 @@ features[field][] = node-materiau-title_field
 features[field][] = node-page-body
 features[field][] = node-page-title_field
 features[field][] = node-webform-body
+features[field][] = node-webform-title_field
 features[field][] = taxonomy_term-company-synonyms_synonym
 features[field][] = taxonomy_term-onthologie-name_field
 features[field][] = taxonomy_term-onthologie-synonyms_synonym
+features[field][] = taxonomy_term-tag_libres-name_field
 features[field][] = taxonomy_term-tag_libres-synonyms_synonym
 features[field_group][] = group_4|node|materiau|cardbig
 features[field_group][] = group_base|node|breve|form
@@ -240,32 +243,40 @@ features[variable][] = i18n_node_extended_breve
 features[variable][] = i18n_node_extended_company
 features[variable][] = i18n_node_extended_materiau
 features[variable][] = i18n_node_extended_page
+features[variable][] = i18n_node_extended_webform
 features[variable][] = i18n_node_options_breve
 features[variable][] = i18n_node_options_company
 features[variable][] = i18n_node_options_materiau
 features[variable][] = i18n_node_options_page
+features[variable][] = i18n_node_options_webform
 features[variable][] = language_content_type_breve
 features[variable][] = language_content_type_company
 features[variable][] = language_content_type_materiau
 features[variable][] = language_content_type_page
+features[variable][] = language_content_type_webform
 features[variable][] = menu_options_breve
 features[variable][] = menu_options_company
 features[variable][] = menu_options_materiau
 features[variable][] = menu_options_page
+features[variable][] = menu_options_webform
 features[variable][] = menu_parent_breve
 features[variable][] = menu_parent_company
 features[variable][] = menu_parent_materiau
 features[variable][] = menu_parent_page
+features[variable][] = menu_parent_webform
 features[variable][] = node_options_breve
 features[variable][] = node_options_company
 features[variable][] = node_options_materiau
 features[variable][] = node_options_page
+features[variable][] = node_options_webform
 features[variable][] = node_preview_breve
 features[variable][] = node_preview_company
 features[variable][] = node_preview_materiau
 features[variable][] = node_preview_page
+features[variable][] = node_preview_webform
 features[variable][] = node_submitted_breve
 features[variable][] = node_submitted_company
 features[variable][] = node_submitted_materiau
 features[variable][] = node_submitted_page
+features[variable][] = node_submitted_webform
 features[views_view][] = entity_reference_materiaux_breves

+ 58 - 0
materio_content_types/materio_content_types.strongarm.inc

@@ -241,6 +241,13 @@ function materio_content_types_strongarm() {
   $strongarm->value = 1;
   $export['i18n_node_extended_page'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'i18n_node_extended_webform';
+  $strongarm->value = '1';
+  $export['i18n_node_extended_webform'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
@@ -269,6 +276,13 @@ function materio_content_types_strongarm() {
   $strongarm->value = array();
   $export['i18n_node_options_page'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'i18n_node_options_webform';
+  $strongarm->value = array();
+  $export['i18n_node_options_webform'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
@@ -297,6 +311,13 @@ function materio_content_types_strongarm() {
   $strongarm->value = '4';
   $export['language_content_type_page'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'language_content_type_webform';
+  $strongarm->value = '4';
+  $export['language_content_type_webform'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
@@ -325,6 +346,13 @@ function materio_content_types_strongarm() {
   $strongarm->value = array();
   $export['menu_options_page'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'menu_options_webform';
+  $strongarm->value = array();
+  $export['menu_options_webform'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
@@ -353,6 +381,13 @@ function materio_content_types_strongarm() {
   $strongarm->value = 'main-menu:0';
   $export['menu_parent_page'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'menu_parent_webform';
+  $strongarm->value = 'main-menu:0';
+  $export['menu_parent_webform'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
@@ -389,6 +424,15 @@ function materio_content_types_strongarm() {
   );
   $export['node_options_page'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'node_options_webform';
+  $strongarm->value = array(
+    0 => 'status',
+  );
+  $export['node_options_webform'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
@@ -417,6 +461,13 @@ function materio_content_types_strongarm() {
   $strongarm->value = '0';
   $export['node_preview_page'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'node_preview_webform';
+  $strongarm->value = '0';
+  $export['node_preview_webform'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
@@ -445,5 +496,12 @@ function materio_content_types_strongarm() {
   $strongarm->value = 0;
   $export['node_submitted_page'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'node_submitted_webform';
+  $strongarm->value = 0;
+  $export['node_submitted_webform'] = $strongarm;
+
   return $export;
 }