diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc b/sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc index cabb6742..d29ea946 100644 --- a/sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc +++ b/sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc @@ -36,6 +36,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardbig_group_4', ), 'formatter' => 'open', ), @@ -183,6 +184,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_bookmark_group_header', ), 'formatter' => 'open', ), @@ -215,6 +217,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardbig_group_header', ), 'formatter' => 'open', ), @@ -247,6 +250,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardfull_group_header', ), 'formatter' => 'open', ), @@ -279,6 +283,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardmedium_group_header', ), 'formatter' => 'open', ), @@ -311,6 +316,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardsmall_group_header', ), 'formatter' => 'open', ), @@ -344,6 +350,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_bookmark_group_header', ), 'formatter' => 'open', ), @@ -378,6 +385,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardbig_group_header', ), 'formatter' => 'open', ), @@ -412,6 +420,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardfull_group_header', ), 'formatter' => 'open', ), @@ -446,6 +455,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardmedium_group_header', ), 'formatter' => 'open', ), @@ -480,6 +490,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardsmall_group_header', ), 'formatter' => 'open', ), @@ -567,6 +578,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_bookmark_group_images', ), 'formatter' => 'open', ), @@ -598,6 +610,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardbig_group_images', ), 'formatter' => 'open', ), @@ -629,6 +642,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardfull_group_images', ), 'formatter' => 'open', ), @@ -660,6 +674,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardmedium_group_images', ), 'formatter' => 'open', ), @@ -691,6 +706,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardsmall_group_images', ), 'formatter' => 'open', ), @@ -722,6 +738,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_bookmark_group_images', ), 'formatter' => 'open', ), @@ -753,6 +770,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardbig_group_images', ), 'formatter' => 'open', ), @@ -784,6 +802,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardfull_group_images', ), 'formatter' => 'open', ), @@ -815,6 +834,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardmedium_group_images', ), 'formatter' => 'open', ), @@ -846,6 +866,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardsmall_group_images', ), 'formatter' => 'open', ), @@ -963,6 +984,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardbig_group_side1', ), 'formatter' => 'open', ), @@ -994,6 +1016,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardmedium_group_side1', ), 'formatter' => 'open', ), @@ -1026,6 +1049,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardbig_group_side1', ), 'formatter' => 'open', ), @@ -1057,6 +1081,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardmedium_group_side1', ), 'formatter' => 'open', ), @@ -1088,6 +1113,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardbig_group_side2', ), 'formatter' => 'open', ), @@ -1119,6 +1145,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardmedium_group_side2', ), 'formatter' => 'open', ), @@ -1150,6 +1177,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardbig_group_side2', ), 'formatter' => 'open', ), @@ -1181,6 +1209,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardmedium_group_side2', ), 'formatter' => 'open', ), @@ -1337,6 +1366,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardbig_group_side4', ), 'formatter' => 'open', ), @@ -1369,6 +1399,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardmedium_group_side4', ), 'formatter' => 'open', ), @@ -1401,6 +1432,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardmedium_group_side_4', ), 'formatter' => 'open', ), @@ -1433,6 +1465,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardbig_group_side_5', ), 'formatter' => 'open', ), @@ -1465,6 +1498,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardmedium_group_side_5', ), 'formatter' => 'open', ), @@ -1496,6 +1530,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardfull_group_side_left', ), 'formatter' => 'open', ), @@ -1527,6 +1562,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardfull_group_side_left', ), 'formatter' => 'open', ), @@ -1561,6 +1597,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_breve_cardfull_group_side_right', ), 'formatter' => 'open', ), @@ -1597,6 +1634,7 @@ function materio_content_types_field_group_info() { 'label_element' => 'h3', 'effect' => 'none', 'speed' => 'fast', + 'id' => 'node_materiau_cardfull_group_side_right', ), 'formatter' => 'open', ), 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 1441df7f..6ef05d0a 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 @@ -21,6 +21,7 @@ dependencies[] = list dependencies[] = materio_page_title dependencies[] = materio_subscriptions dependencies[] = materio_user_profiles +dependencies[] = node dependencies[] = options dependencies[] = print dependencies[] = print_ui 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 9047aa1e..e204d250 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 @@ -594,7 +594,7 @@ function materio_content_types_strongarm() { $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'print_css'; - $strongarm->value = ''; + $strongarm->value = '%t/css/styles.css'; $export['print_css'] = $strongarm; $strongarm = new stdClass(); @@ -615,7 +615,7 @@ function materio_content_types_strongarm() { $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'print_html_book_link'; - $strongarm->value = '1'; + $strongarm->value = '0'; $export['print_html_book_link'] = $strongarm; $strongarm = new stdClass(); @@ -848,9 +848,9 @@ function materio_content_types_strongarm() { $strongarm->name = 'print_html_link_pos'; $strongarm->value = array( 'link' => 'link', - 'corner' => 0, 'block' => 'block', 'help' => 'help', + 'corner' => 0, ); $export['print_html_link_pos'] = $strongarm; @@ -865,7 +865,7 @@ function materio_content_types_strongarm() { $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'print_html_link_use_alias'; - $strongarm->value = 0; + $strongarm->value = 1; $export['print_html_link_use_alias'] = $strongarm; $strongarm = new stdClass(); diff --git a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.info b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.info index 04ed312d..84b83a67 100644 --- a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.info +++ b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.info @@ -16,7 +16,6 @@ dependencies[] = text dependencies[] = uc_attribute dependencies[] = uc_cart_links dependencies[] = uc_cmcic -dependencies[] = uc_credit dependencies[] = uc_order dependencies[] = uc_payment dependencies[] = uc_payment_pack @@ -266,4 +265,5 @@ features[variable][] = uc_weight_format_lb features[variable][] = uc_weight_format_oz features[variable][] = uc_weight_unit features_exclude[dependencies][uc_coupon] = uc_coupon +features_exclude[dependencies][uc_credit] = uc_credit project path = sites/all/modules/features