diff --git a/modules/radar/radar_contenttype_event/radar_contenttype_event.field_group.inc b/modules/radar/radar_contenttype_event/radar_contenttype_event.field_group.inc index 61724f1a304b7dc5bdca27be4c9476f7702b99df..1a7dd2c9b914ad17e32a550fcd20974517b09e1d 100644 --- a/modules/radar/radar_contenttype_event/radar_contenttype_event.field_group.inc +++ b/modules/radar/radar_contenttype_event/radar_contenttype_event.field_group.inc @@ -39,6 +39,97 @@ function radar_contenttype_event_field_group_info() { ); $field_groups[''] = $field_group; + $field_group = new stdClass(); + $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ + $field_group->api_version = 1; + $field_group->identifier = 'group_info|node|event|form'; + $field_group->group_name = 'group_info'; + $field_group->entity_type = 'node'; + $field_group->bundle = 'event'; + $field_group->mode = 'form'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'Info', + 'weight' => '8', + 'children' => array( + 0 => 'field_email', + 1 => 'field_link', + 2 => 'field_phone', + ), + 'format_type' => 'fieldset', + 'format_settings' => array( + 'label' => 'Info', + 'instance_settings' => array( + 'required_fields' => 1, + 'id' => '', + 'classes' => 'group-info field-group-fieldset', + 'description' => '', + ), + 'formatter' => 'open', + ), + ); + $field_groups[''] = $field_group; + + $field_group = new stdClass(); + $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ + $field_group->api_version = 1; + $field_group->identifier = 'group_price|node|event|form'; + $field_group->group_name = 'group_price'; + $field_group->entity_type = 'node'; + $field_group->bundle = 'event'; + $field_group->mode = 'form'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'Price', + 'weight' => '7', + 'children' => array( + 0 => 'field_price', + 1 => 'field_price_category', + ), + 'format_type' => 'fieldset', + 'format_settings' => array( + 'label' => 'Price', + 'instance_settings' => array( + 'required_fields' => 1, + 'id' => '', + 'classes' => 'group-price field-group-fieldset', + 'description' => '', + ), + 'formatter' => 'open', + ), + ); + $field_groups[''] = $field_group; + + $field_group = new stdClass(); + $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ + $field_group->api_version = 1; + $field_group->identifier = 'group_tags|node|event|form'; + $field_group->group_name = 'group_tags'; + $field_group->entity_type = 'node'; + $field_group->bundle = 'event'; + $field_group->mode = 'form'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'Categories and tags', + 'weight' => '6', + 'children' => array( + 0 => 'field_category', + 1 => 'field_topic', + ), + 'format_type' => 'fieldset', + 'format_settings' => array( + 'label' => 'Categories and tags', + 'instance_settings' => array( + 'required_fields' => 1, + 'id' => '', + 'classes' => 'group-tags field-group-fieldset', + 'description' => '', + ), + 'formatter' => 'open', + ), + ); + $field_groups[''] = $field_group; + $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; @@ -68,7 +159,10 @@ function radar_contenttype_event_field_group_info() { // Translatables // Included for use with string extractors like potx. + t('Categories and tags'); t('Files'); + t('Info'); + t('Price'); t('Short url'); return $field_groups; diff --git a/modules/radar/radar_contenttype_event/radar_contenttype_event.info b/modules/radar/radar_contenttype_event/radar_contenttype_event.info index 3cdd7ac3335c38cf035591b024e5e14d0bb0c4ee..82da3f3c5b3e20ade8cd81d03423748d46287608 100644 --- a/modules/radar/radar_contenttype_event/radar_contenttype_event.info +++ b/modules/radar/radar_contenttype_event/radar_contenttype_event.info @@ -37,6 +37,11 @@ features[field_base][] = date_repeat_entity_clone_state features[field_base][] = date_repeat_entity_master_uuid features[field_base][] = field_date_time features[field_base][] = field_event_status +features[field_group][] = group_files|node|event|form +features[field_group][] = group_info|node|event|form +features[field_group][] = group_price|node|event|form +features[field_group][] = group_tags|node|event|form +features[field_group][] = group_url|node|event|form features[field_instance][] = node-event-body features[field_instance][] = node-event-date_repeat_entity_clone_state features[field_instance][] = node-event-date_repeat_entity_master_uuid diff --git a/modules/radar/radar_event/radar_event.field_group.inc b/modules/radar/radar_event/radar_event.field_group.inc index 82065f6cb365ca762ad81e3fa315c394a69556f8..cacea5a27e05128c6c2d0734897edc4f6b9afbbf 100644 --- a/modules/radar/radar_event/radar_event.field_group.inc +++ b/modules/radar/radar_event/radar_event.field_group.inc @@ -39,6 +39,36 @@ function radar_event_field_group_info() { ); $field_groups[''] = $field_group; + $field_group = new stdClass(); + $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ + $field_group->api_version = 1; + $field_group->identifier = 'group_groups|node|event|form'; + $field_group->group_name = 'group_groups'; + $field_group->entity_type = 'node'; + $field_group->bundle = 'event'; + $field_group->mode = 'form'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'Groups & Locations', + 'weight' => '9', + 'children' => array( + 0 => 'og_group_ref', + 1 => 'og_group_request', + 2 => 'field_offline', + ), + 'format_type' => 'tab', + 'format_settings' => array( + 'label' => 'Groups & Locations', + 'instance_settings' => array( + 'required_fields' => 1, + 'classes' => 'group-groups field-group-tab', + 'description' => '', + ), + 'formatter' => 'open', + ), + ); + $field_groups[''] = $field_group; + $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; @@ -161,6 +191,7 @@ function radar_event_field_group_info() { // Included for use with string extractors like potx. t('Categories and tags'); t('Files'); + t('Groups & Locations'); t('Info'); t('Price'); t('Short url'); diff --git a/modules/radar/radar_event/radar_event.info b/modules/radar/radar_event/radar_event.info index 55bee1343a49f9bb9c2ed14b886d3d303aadf676..807c07bf816896d5368d79c170ba055b86933dc2 100644 --- a/modules/radar/radar_event/radar_event.info +++ b/modules/radar/radar_event/radar_event.info @@ -29,6 +29,7 @@ dependencies[] = options dependencies[] = page_manager dependencies[] = radar_bits dependencies[] = radar_date_repeat +dependencies[] = radar_location dependencies[] = radar_og dependencies[] = radar_topics dependencies[] = rules @@ -47,6 +48,7 @@ features[ctools][] = views:views_default:3.0 features[ds_layout_settings][] = node|event|form features[features_api][] = api:2 features[field_group][] = group_files|node|event|form +features[field_group][] = group_groups|node|event|form features[field_group][] = group_info|node|event|form features[field_group][] = group_price|node|event|form features[field_group][] = group_tags|node|event|form diff --git a/modules/radar/radar_event/radar_event.views_default.inc b/modules/radar/radar_event/radar_event.views_default.inc index e1274a2c44ea2640503be7983bbf5c858f226855..b99ce5d957354d10b5003dca377c456419d2bd56 100644 --- a/modules/radar/radar_event/radar_event.views_default.inc +++ b/modules/radar/radar_event/radar_event.views_default.inc @@ -218,7 +218,7 @@ function radar_event_views_default_views() { $handler->display->display_options['fields']['field_topic']['label'] = 'tags'; $handler->display->display_options['fields']['field_topic']['type'] = 'taxonomy_term_reference_plain'; $handler->display->display_options['fields']['field_topic']['delta_offset'] = '0'; - /* Field: Content: Location */ + /* Field: Content: Locations */ $handler->display->display_options['fields']['field_offline']['id'] = 'field_offline'; $handler->display->display_options['fields']['field_offline']['table'] = 'field_data_field_offline'; $handler->display->display_options['fields']['field_offline']['field'] = 'field_offline'; @@ -287,7 +287,7 @@ function radar_event_views_default_views() { 8 => 0, 7 => 0, ); - /* Filter criterion: Content: Location (field_offline:target_id) */ + /* Filter criterion: Content: Locations (field_offline:target_id) */ $handler->display->display_options['filters']['field_offline_target_id']['id'] = 'field_offline_target_id'; $handler->display->display_options['filters']['field_offline_target_id']['table'] = 'field_data_field_offline'; $handler->display->display_options['filters']['field_offline_target_id']['field'] = 'field_offline_target_id'; @@ -475,7 +475,7 @@ function radar_event_views_default_views() { $handler->display->display_options['fields']['field_topic']['label'] = 'tags'; $handler->display->display_options['fields']['field_topic']['type'] = 'taxonomy_term_reference_plain'; $handler->display->display_options['fields']['field_topic']['delta_offset'] = '0'; - /* Field: Content: Location */ + /* Field: Content: Locations */ $handler->display->display_options['fields']['field_offline']['id'] = 'field_offline'; $handler->display->display_options['fields']['field_offline']['table'] = 'field_data_field_offline'; $handler->display->display_options['fields']['field_offline']['field'] = 'field_offline'; @@ -536,7 +536,7 @@ function radar_event_views_default_views() { 8 => 0, 7 => 0, ); - /* Filter criterion: Content: Location (field_offline:target_id) */ + /* Filter criterion: Content: Locations (field_offline:target_id) */ $handler->display->display_options['filters']['field_offline_target_id']['id'] = 'field_offline_target_id'; $handler->display->display_options['filters']['field_offline_target_id']['table'] = 'field_data_field_offline'; $handler->display->display_options['filters']['field_offline_target_id']['field'] = 'field_offline_target_id'; @@ -1182,7 +1182,7 @@ function radar_event_views_default_views() { 'image_style' => 'large', 'image_link' => '', ); - /* Field: Content: Location */ + /* Field: Content: Locations */ $handler->display->display_options['fields']['field_offline']['id'] = 'field_offline'; $handler->display->display_options['fields']['field_offline']['table'] = 'field_data_field_offline'; $handler->display->display_options['fields']['field_offline']['field'] = 'field_offline'; @@ -1228,7 +1228,7 @@ function radar_event_views_default_views() { $handler = $view->new_display('panel_pane', 'Full event pane', 'panel_pane_1'); $handler->display->display_options['display_description'] = 'Event pane with all the info of an event'; $handler->display->display_options['defaults']['fields'] = FALSE; - /* Field: Content: Location */ + /* Field: Content: Locations */ $handler->display->display_options['fields']['field_offline']['id'] = 'field_offline'; $handler->display->display_options['fields']['field_offline']['table'] = 'field_data_field_offline'; $handler->display->display_options['fields']['field_offline']['field'] = 'field_offline'; diff --git a/modules/radar/radar_event_ical/radar_event_ical.info b/modules/radar/radar_event_ical/radar_event_ical.info index b3ebfbc61a0f53f585b078fe667319c62916934d..5f2d840dafd469331a39153e2fd4123492564174 100644 --- a/modules/radar/radar_event_ical/radar_event_ical.info +++ b/modules/radar/radar_event_ical/radar_event_ical.info @@ -5,9 +5,15 @@ package = Radar version = 7.x-1.0 project = radar_event_ical dependencies[] = date_ical +dependencies[] = features dependencies[] = feeds +dependencies[] = inline_entity_form dependencies[] = og_context +dependencies[] = og_ui +dependencies[] = page_manager dependencies[] = radar_group +dependencies[] = radar_location +dependencies[] = strongarm dependencies[] = views dependencies[] = views_load_more features[ctools][] = feeds:feeds_importer_default:1 diff --git a/modules/radar/radar_event_ical/radar_event_ical.pages_default.inc b/modules/radar/radar_event_ical/radar_event_ical.pages_default.inc index 095ea53470a9db25310c58f920c0ac92efd2e957..71073cb95646caf35471c634863d314e5fa2c1d9 100644 --- a/modules/radar/radar_event_ical/radar_event_ical.pages_default.inc +++ b/modules/radar/radar_event_ical/radar_event_ical.pages_default.inc @@ -31,6 +31,8 @@ function radar_event_ical_default_page_manager_pages() { 'not' => FALSE, ), ), + 'type' => 'none', + 'settings' => NULL, ); $page->menu = array( 'type' => 'tab', diff --git a/modules/radar/radar_group/radar_group.field_group.inc b/modules/radar/radar_group/radar_group.field_group.inc index 37e977acdcac466f02f3586adc07d02c77475884..e18ef6390a678526f3e8b03878a06a78f0992829 100644 --- a/modules/radar/radar_group/radar_group.field_group.inc +++ b/modules/radar/radar_group/radar_group.field_group.inc @@ -13,27 +13,28 @@ function radar_group_field_group_info() { $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; - $field_group->identifier = 'group_image|node|group|form'; - $field_group->group_name = 'group_image'; + $field_group->identifier = 'group_contact|node|group|form'; + $field_group->group_name = 'group_contact'; $field_group->entity_type = 'node'; $field_group->bundle = 'group'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( - 'label' => 'Files', - 'weight' => '6', + 'label' => 'Contact', + 'weight' => '8', 'children' => array( - 0 => 'field_group_logo', - 1 => 'field_image', - 2 => 'field_flyer', + 0 => 'field_email', + 1 => 'field_link', + 2 => 'field_phone', + 3 => 'field_notifications', ), 'format_type' => 'fieldset', 'format_settings' => array( - 'label' => 'Files', + 'label' => 'Contact', 'instance_settings' => array( 'required_fields' => 1, 'id' => '', - 'classes' => 'group-image field-group-fieldset', + 'classes' => 'group-contact field-group-fieldset', 'description' => '', ), 'formatter' => 'open', @@ -44,28 +45,27 @@ function radar_group_field_group_info() { $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; - $field_group->identifier = 'group_info|node|group|form'; - $field_group->group_name = 'group_info'; + $field_group->identifier = 'group_image|node|group|form'; + $field_group->group_name = 'group_image'; $field_group->entity_type = 'node'; $field_group->bundle = 'group'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( - 'label' => 'Contact', - 'weight' => '8', + 'label' => 'Files', + 'weight' => '6', 'children' => array( - 0 => 'field_email', - 1 => 'field_link', - 2 => 'field_phone', - 3 => 'field_notifications', + 0 => 'field_group_logo', + 1 => 'field_image', + 2 => 'field_flyer', ), 'format_type' => 'fieldset', 'format_settings' => array( - 'label' => 'Contact', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, 'id' => '', - 'classes' => 'group-info field-group-fieldset', + 'classes' => 'group-image field-group-fieldset', 'description' => '', ), 'formatter' => 'open', @@ -124,7 +124,7 @@ function radar_group_field_group_info() { 'formatter' => 'closed', 'instance_settings' => array( 'description' => '', - 'classes' => 'group-status field-group-tab', + 'classes' => '', 'required_fields' => 1, ), ), diff --git a/modules/radar/radar_group/radar_group.info b/modules/radar/radar_group/radar_group.info index 88301282984cd869ff04710ad47cf4b4a9cb00cd..57eaa5eba15841ec51d9de8cbfab9b9815e4d307 100644 --- a/modules/radar/radar_group/radar_group.info +++ b/modules/radar/radar_group/radar_group.info @@ -53,8 +53,8 @@ features[ds_layout_settings][] = node|group|teaser features[features_api][] = api:2 features[field_base][] = field_active features[field_base][] = field_type +features[field_group][] = group_contact|node|group|form features[field_group][] = group_image|node|group|form -features[field_group][] = group_info|node|group|form features[field_group][] = group_location|node|group|form features[field_group][] = group_status|node|group|form features[field_group][] = group_tags|node|group|form diff --git a/modules/radar/radar_group/radar_group.views_default.inc b/modules/radar/radar_group/radar_group.views_default.inc index c4c7b5ffe14cade7c57e28408c73a37be62deacc..36d11695b901393fd62429c0c4dc742e87d86721 100644 --- a/modules/radar/radar_group/radar_group.views_default.inc +++ b/modules/radar/radar_group/radar_group.views_default.inc @@ -150,7 +150,7 @@ Events can already be created, but they will not be visible until the group has $handler->display->display_options['fields']['field_phone']['element_wrapper_type'] = 'div'; $handler->display->display_options['fields']['field_phone']['element_wrapper_class'] = 'info'; $handler->display->display_options['fields']['field_phone']['element_default_classes'] = FALSE; - /* Field: Content: Location */ + /* Field: Content: Locations */ $handler->display->display_options['fields']['field_offline']['id'] = 'field_offline'; $handler->display->display_options['fields']['field_offline']['table'] = 'field_data_field_offline'; $handler->display->display_options['fields']['field_offline']['field'] = 'field_offline'; @@ -620,7 +620,7 @@ Once they are approved - or if they have been posted in a group where they don\' $handler->display->display_options['fields']['body']['settings'] = array( 'trim_length' => '600', ); - /* Field: Content: Groups audience */ + /* Field: Content: Groups */ $handler->display->display_options['fields']['og_group_ref']['id'] = 'og_group_ref'; $handler->display->display_options['fields']['og_group_ref']['table'] = 'og_membership'; $handler->display->display_options['fields']['og_group_ref']['field'] = 'og_group_ref'; @@ -773,7 +773,7 @@ Once they are approved - or if they have been posted in a group where they don\' $handler->display->display_options['fields']['field_category']['label'] = 'Categories'; $handler->display->display_options['fields']['field_category']['type'] = 'taxonomy_term_reference_plain'; $handler->display->display_options['fields']['field_category']['delta_offset'] = '0'; - /* Field: Content: Groups audience */ + /* Field: Content: Groups */ $handler->display->display_options['fields']['og_group_ref']['id'] = 'og_group_ref'; $handler->display->display_options['fields']['og_group_ref']['table'] = 'og_membership'; $handler->display->display_options['fields']['og_group_ref']['field'] = 'og_group_ref'; diff --git a/modules/radar/radar_languages/radar_languages.info b/modules/radar/radar_languages/radar_languages.info index d6cbb7fa4d0adcd814f70e74b7739d3cae92a685..edc1e5a57e4743c67547505060a293aeac15ee51 100644 --- a/modules/radar/radar_languages/radar_languages.info +++ b/modules/radar/radar_languages/radar_languages.info @@ -12,7 +12,6 @@ dependencies[] = i18n_string dependencies[] = i18n_variable dependencies[] = lang_dropdown dependencies[] = locale -dependencies[] = radar_languages dependencies[] = rules dependencies[] = strongarm dependencies[] = translate_set diff --git a/modules/radar/radar_languages/radar_languages.strongarm.inc b/modules/radar/radar_languages/radar_languages.strongarm.inc index 2c1d399c941765d27995d39b0b60069866e60912..964d3072464dd99bd5d89798a9dea815e10a7a30 100644 --- a/modules/radar/radar_languages/radar_languages.strongarm.inc +++ b/modules/radar/radar_languages/radar_languages.strongarm.inc @@ -109,13 +109,13 @@ function radar_languages_strongarm() { 'language' => 'en', 'name' => 'English', 'native' => 'English', - 'direction' => '0', + 'direction' => 0, 'enabled' => 1, - 'plurals' => '0', + 'plurals' => 0, 'formula' => '', 'domain' => '', 'prefix' => 'en', - 'weight' => '-10', + 'weight' => -10, 'javascript' => '', ); $export['language_default'] = $strongarm; @@ -222,9 +222,9 @@ function radar_languages_strongarm() { $strongarm->value = array( 'showall' => 1, 'tohome' => 0, - 'width' => 165, - 'display' => 1, - 'widget' => 0, + 'width' => '165', + 'display' => '1', + 'widget' => '0', 'msdropdown' => array( 'visible_rows' => 5, 'rounded' => 1, diff --git a/modules/radar/radar_listings_group/radar_listings_group.views_default.inc b/modules/radar/radar_listings_group/radar_listings_group.views_default.inc index 36aacb11ec45e7dfb6b2860734abbb52800c6752..54f39d000296f302e50f249763cbd997bd5085b5 100644 --- a/modules/radar/radar_listings_group/radar_listings_group.views_default.inc +++ b/modules/radar/radar_listings_group/radar_listings_group.views_default.inc @@ -393,7 +393,6 @@ function radar_listings_group_views_default_views() { $handler->display->display_options['fields']['field_short_url']['label'] = ''; $handler->display->display_options['fields']['field_short_url']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['field_short_url']['element_default_classes'] = FALSE; - $handler->display->display_options['fields']['field_short_url']['field_api_classes'] = TRUE; /* Field: Content: Logo */ $handler->display->display_options['fields']['field_group_logo']['id'] = 'field_group_logo'; $handler->display->display_options['fields']['field_group_logo']['table'] = 'field_data_field_group_logo'; diff --git a/modules/radar/radar_location/radar_location.features.user_permission.inc b/modules/radar/radar_location/radar_location.features.user_permission.inc index e7daa4e03290c88589264d417be2447afbb337ed..a46d981bb14de02233c895e34c7a4809d976c039 100644 --- a/modules/radar/radar_location/radar_location.features.user_permission.inc +++ b/modules/radar/radar_location/radar_location.features.user_permission.inc @@ -135,9 +135,7 @@ function radar_location_user_default_permissions() { // Exported permission: 'edit own field_user_location'. $permissions['edit own field_user_location'] = array( 'name' => 'edit own field_user_location', - 'roles' => array( - 'regional administrator' => 'regional administrator', - ), + 'roles' => array(), 'module' => 'field_permissions', ); @@ -248,9 +246,7 @@ function radar_location_user_default_permissions() { // Exported permission: 'view own field_user_location'. $permissions['view own field_user_location'] = array( 'name' => 'view own field_user_location', - 'roles' => array( - 'regional administrator' => 'regional administrator', - ), + 'roles' => array(), 'module' => 'field_permissions', ); diff --git a/modules/radar/radar_og/radar_og.features.field_instance.inc b/modules/radar/radar_og/radar_og.features.field_instance.inc index caa43dc29226a287712df7f5ee8deae55120750c..3e12bac3270e8515aaee01862ddb386fd1f5e8b4 100644 --- a/modules/radar/radar_og/radar_og.features.field_instance.inc +++ b/modules/radar/radar_og/radar_og.features.field_instance.inc @@ -145,7 +145,7 @@ function radar_og_field_default_field_instances() { 'module' => 'og', 'settings' => array(), 'type' => 'og_complex', - 'weight' => 6, + 'weight' => 10, ), ); @@ -228,7 +228,7 @@ The managers of these groups will be notified, and can then approve it for them. 'module' => 'og', 'settings' => array(), 'type' => 'og_complex', - 'weight' => 7, + 'weight' => 11, ), ); @@ -342,7 +342,7 @@ The managers of these groups will be notified, and can then approve it for them. 'module' => 'options', 'settings' => array(), 'type' => 'options_buttons', - 'weight' => 41, + 'weight' => 18, ), ); @@ -571,7 +571,7 @@ The managers of these groups will be notified, and can then approve it for them. 'module' => 'options', 'settings' => array(), 'type' => 'options_buttons', - 'weight' => 41, + 'weight' => 13, ), ); @@ -636,7 +636,7 @@ The managers of these groups will be notified, and can then approve it for them. 'og_hide' => TRUE, ), 'type' => 'options_onoff', - 'weight' => 0, + 'weight' => 1, ), ); @@ -695,7 +695,7 @@ The managers of these groups will be notified, and can then approve it for them. 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => 1, + 'weight' => 2, ), ); diff --git a/modules/radar/radar_og/radar_og.field_group.inc b/modules/radar/radar_og/radar_og.field_group.inc index 6fc0fe178e7225b15f44fe5ad0286e8228fb8894..12a1852e98e5123a13a13cd73e096f7cfe880b4d 100644 --- a/modules/radar/radar_og/radar_og.field_group.inc +++ b/modules/radar/radar_og/radar_og.field_group.inc @@ -33,8 +33,7 @@ function radar_og_field_group_info() { 'instance_settings' => array( 'required_fields' => 1, 'classes' => 'group-groups field-group-tab', - 'description' => 'Groups that this event is posted to, or requested to be posted in. -Separate multiple groups with commas.', + 'description' => '', ), 'formatter' => 'open', ), @@ -44,26 +43,30 @@ Separate multiple groups with commas.', $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; - $field_group->identifier = 'group_og_settings|node|group|form'; - $field_group->group_name = 'group_og_settings'; + $field_group->identifier = 'group_image|node|group|form'; + $field_group->group_name = 'group_image'; $field_group->entity_type = 'node'; $field_group->bundle = 'group'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( - 'label' => 'Group access settings', - 'weight' => '10', + 'label' => 'Files', + 'weight' => '6', 'children' => array( - 0 => 'field_og_subscribe_settings', + 0 => 'field_group_logo', + 1 => 'field_image', + 2 => 'field_flyer', ), - 'format_type' => 'tab', + 'format_type' => 'fieldset', 'format_settings' => array( - 'formatter' => 'closed', + 'label' => 'Files', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-og-settings field-group-tab', 'required_fields' => 1, + 'id' => '', + 'classes' => 'group-image field-group-fieldset', + 'description' => '', ), + 'formatter' => 'open', ), ); $field_groups[''] = $field_group; @@ -71,33 +74,33 @@ Separate multiple groups with commas.', $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; - $field_group->identifier = 'group_og_settings|node|touring_group|form'; + $field_group->identifier = 'group_og_settings|node|group|form'; $field_group->group_name = 'group_og_settings'; $field_group->entity_type = 'node'; - $field_group->bundle = 'touring_group'; + $field_group->bundle = 'group'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( 'label' => 'Group access settings', - 'weight' => '8', + 'weight' => '10', 'children' => array( 0 => 'field_og_subscribe_settings', ), 'format_type' => 'tab', 'format_settings' => array( - 'label' => 'Group access settings', + 'formatter' => 'closed', 'instance_settings' => array( - 'required_fields' => 1, - 'classes' => 'group-og-settings field-group-tab', 'description' => '', + 'classes' => 'group-og-settings field-group-tab', + 'required_fields' => 1, ), - 'formatter' => 'open', ), ); $field_groups[''] = $field_group; // Translatables // Included for use with string extractors like potx. + t('Files'); t('Group access settings'); t('Groups & Locations'); diff --git a/modules/radar/radar_og/radar_og.info b/modules/radar/radar_og/radar_og.info index 08a3f67082749bd7806f687d64352970a36ff883..4b00029e1d9c58581b24be25593a2fe1157babc2 100644 --- a/modules/radar/radar_og/radar_og.info +++ b/modules/radar/radar_og/radar_og.info @@ -19,7 +19,6 @@ dependencies[] = og dependencies[] = og_ui dependencies[] = options dependencies[] = radar_body -dependencies[] = radar_og dependencies[] = radar_topics dependencies[] = radioactivity dependencies[] = strongarm @@ -44,8 +43,8 @@ features[field_base][] = og_group_request features[field_base][] = og_membership_request features[field_base][] = og_roles_permissions features[field_group][] = group_groups|node|event|form +features[field_group][] = group_image|node|group|form features[field_group][] = group_og_settings|node|group|form -features[field_group][] = group_og_settings|node|touring_group|form features[field_instance][] = node-event-group_content_access features[field_instance][] = node-event-og_group_ref features[field_instance][] = node-event-og_group_request diff --git a/modules/radar/radar_og/radar_og.module b/modules/radar/radar_og/radar_og.module index 1cc7036ed95133bcc053c9605800530405cdfcde..e578c6b82f2cb7a7710aa5ddc1c465371b5bd019 100644 --- a/modules/radar/radar_og/radar_og.module +++ b/modules/radar/radar_og/radar_og.module @@ -156,7 +156,7 @@ function radar_og_node_presave($node) { * The OG role object of which the permissions are being changed. * @param $permissions * The anonymous user permissions of the group. - * + */ function _radar_og_update_group_permissions($role, $permissions) { $updated_roles = &drupal_static(__FUNCTION__); if (!empty($updated_roles[$role->rid])) { @@ -305,35 +305,6 @@ function radar_og_block_view() { return $block; } -/** - * Implements hook_features_pipe_alter(). - */ -function radar_og_features_pipe_alter(&$pipe, $data, $export) { - // Prevent Radar Groups related fields from being piped in features - // when a content type includes those fields. - if (!empty($pipe['field_instance'])) { - foreach ($pipe['field_instance'] as $delta => $value) { - $args = explode('-', $value); - $field_name = $args[2]; - $excluded_fields = array('og_group_ref', 'og_group_request', 'field_og_access_default_value', - 'field_og_subscribe_settings', 'og_roles_permissions', 'group_access', 'field_group_logo', 'group_group'); -// @todo Think about this. These are special groups handling. -// Then there is standard group handling. Does this want to be -// included here, or somehow properly excluded. - if ($export['module_name'] != 'rader_event_ical' && in_array($field_name, $excluded_fields)) { - unset($pipe['field_instance'][$delta]); - } - } - } - if (!empty($pipe['field_base'])) { - foreach ($pipe['field_base'] as $delta => $value) { - if ($delta == 'og_group_ref' || $delta == 'og_group_request') { - unset($pipe['field_base'][$delta]); - } - } - } -} - /** * Implements hook_radar_entity_integration(). */ @@ -460,61 +431,6 @@ function radar_og_node_in_group_submit(&$form, &$form_state) { } } -/** - * Implements hook_system_info_alter(). - */ -function radar_og_system_info_alter(&$info, $file, $type) { - // Radar Groups dynamically adds the og_group_ref field to - // content types that request it by altering the - // radar_og_entity_types variable. - // We must add a corresponding line for each field instance - // to radar_og.info so that Features is aware of the instance - // and can successfully revert the field_instance component back - // to its default state. - if ($file->name == 'radar_og') { - $group_bundles = og_get_all_group_bundle(); - if (!empty($group_bundles['node'])) { - foreach ($group_bundles['node'] as $bundle => $name) { - // These field instances should be added to groups regardless of - // whether og_access.module is enabled. - $info['features']['field_instance'][] = "node-$bundle-field_og_access_default_value"; - $info['features']['field_instance'][] = "node-$bundle-field_og_subscribe_settings"; - $info['features']['field_instance'][] = "node-$bundle-og_roles_permissions"; - $info['features']['field_instance'][] = "node-$bundle-group_group"; - - // These fields are only necessary when og_access.module is enabled. - $info['features']['field_instance'][] = "node-$bundle-group_access"; - $info['features']['field_instance'][] = "node-$bundle-field_group_logo"; - - // Add default strongarm settings. - $info['features']['variable'][] = "field_bundle_settings_node__$bundle"; - } - } - $group_content_entity_types = radar_og_get_group_content_entity_types(); - if (!empty($group_content_entity_types)) { - foreach ($group_content_entity_types as $entity_type => $bundles) { - foreach (array_keys($bundles) as $bundle) { - $info['features']['field_group'][] = "group_groups|$entity_type|$bundle|form"; - $info['features']['field_instance'][] = "$entity_type-$bundle-og_group_ref"; - $info['features']['field_instance'][] = "$entity_type-$bundle-og_group_request"; - $info['features']['field_instance'][] = "$entity_type-$bundle-group_content_access"; - } - } - } - - // Radar specific group variables. - $radar_og = radar_og_get_group_types(); - if (isset($radar_og['node'])) { - foreach ($radar_og['node'] as $bundle => $group_info) { - $info['features']['variable'][] = "node_options_$bundle"; - $info['features']['variable'][] = "node_preview_$bundle"; - $info['features']['variable'][] = "node_submitted_$bundle"; - $info['features']['variable'][] = "og_group_manager_default_rids_node_$bundle"; - } - } - } -} - /** * Implements hook_default_message_type_alter(). */ diff --git a/modules/radar/radar_og/radar_og.strongarm.inc b/modules/radar/radar_og/radar_og.strongarm.inc index 3d5fbda1674baa4f73d720e841f41bf2a23be99d..a0ef79c2df20aca9c9e6e3097063f2373b9ad66f 100644 --- a/modules/radar/radar_og/radar_og.strongarm.inc +++ b/modules/radar/radar_og/radar_og.strongarm.inc @@ -105,7 +105,19 @@ function radar_og_strongarm() { 'extra_fields' => array( 'form' => array( 'title' => array( - 'weight' => '-5', + 'weight' => '0', + ), + 'metatags' => array( + 'weight' => '12', + ), + 'path' => array( + 'weight' => '10', + ), + 'redirect' => array( + 'weight' => '11', + ), + 'language' => array( + 'weight' => '4', ), ), 'display' => array(), diff --git a/modules/radar/radar_search/radar_search.info b/modules/radar/radar_search/radar_search.info index 81bb50deb0c81a275db40e468f537e38080b268d..ee86c45c7ef24249805fc8288e8156a0f5838d5f 100755 --- a/modules/radar/radar_search/radar_search.info +++ b/modules/radar/radar_search/radar_search.info @@ -5,13 +5,17 @@ package = Radar version = 7.x-1.7 project = radar_search dependencies[] = better_exposed_filters +dependencies[] = ds dependencies[] = facetapi_pretty_paths +dependencies[] = features +dependencies[] = page_manager dependencies[] = radar_group dependencies[] = search_api_facetapi dependencies[] = search_api_location_map dependencies[] = search_api_location_views dependencies[] = search_api_solr dependencies[] = search_api_sorts +dependencies[] = strongarm dependencies[] = views_load_more features[ctools][] = ds:ds:1 features[ctools][] = facetapi:facetapi_defaults:1 diff --git a/modules/radar/radar_search/radar_search.strongarm.inc b/modules/radar/radar_search/radar_search.strongarm.inc index 46ecfbdf9000068459f20c7714075dc9126b87de..8466bebbd7382f759091fc37d187ac3e7133ceb3 100755 --- a/modules/radar/radar_search/radar_search.strongarm.inc +++ b/modules/radar/radar_search/radar_search.strongarm.inc @@ -21,7 +21,7 @@ function radar_search_strongarm() { $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'facetapi:block_cache:search_api@events'; - $strongarm->value = -1; + $strongarm->value = '-1'; $export['facetapi:block_cache:search_api@events'] = $strongarm; $strongarm = new stdClass(); diff --git a/modules/radar/radar_topics/radar_topics.info b/modules/radar/radar_topics/radar_topics.info index d41c1eb19eec8e2016728ed014a66ab3a8793778..fbc88cbb044b452c19af4cb00491df1689b323c9 100644 --- a/modules/radar/radar_topics/radar_topics.info +++ b/modules/radar/radar_topics/radar_topics.info @@ -20,4 +20,3 @@ features[user_permission][] = edit terms in topic features[variable][] = entity_translation_settings_taxonomy_term__category features[variable][] = entity_translation_settings_taxonomy_term__topic features[variable][] = pathauto_taxonomy_term_pattern -mtime = 1419769102 diff --git a/modules/radar/radar_touring_group/radar_touring_group.field_group.inc b/modules/radar/radar_touring_group/radar_touring_group.field_group.inc index 77595ee380085eab0e60066466c5d2b1a2b59195..667f0c3e98dec13eba0012790178b1919a987242 100644 --- a/modules/radar/radar_touring_group/radar_touring_group.field_group.inc +++ b/modules/radar/radar_touring_group/radar_touring_group.field_group.inc @@ -10,124 +10,6 @@ function radar_touring_group_field_group_info() { $field_groups = array(); - $field_group = new stdClass(); - $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ - $field_group->api_version = 1; - $field_group->identifier = 'group_contact|node|touring_group|form'; - $field_group->group_name = 'group_contact'; - $field_group->entity_type = 'node'; - $field_group->bundle = 'touring_group'; - $field_group->mode = 'form'; - $field_group->parent_name = ''; - $field_group->data = array( - 'label' => 'Contact', - 'weight' => '6', - 'children' => array( - 0 => 'field_email', - 1 => 'field_link', - 2 => 'field_notifications', - 3 => 'field_phone', - ), - 'format_type' => 'fieldset', - 'format_settings' => array( - 'formatter' => 'collapsible', - 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-contact field-group-fieldset', - 'required_fields' => 1, - 'id' => '', - ), - ), - ); - $field_groups[''] = $field_group; - - $field_group = new stdClass(); - $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ - $field_group->api_version = 1; - $field_group->identifier = 'group_image|node|touring_group|form'; - $field_group->group_name = 'group_image'; - $field_group->entity_type = 'node'; - $field_group->bundle = 'touring_group'; - $field_group->mode = 'form'; - $field_group->parent_name = ''; - $field_group->data = array( - 'label' => 'Image', - 'weight' => '5', - 'children' => array( - 0 => 'field_group_logo', - 1 => 'field_image', - 2 => 'field_flyer', - ), - 'format_type' => 'fieldset', - 'format_settings' => array( - 'formatter' => 'collapsible', - 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-image field-group-fieldset', - 'required_fields' => 1, - 'id' => '', - ), - ), - ); - $field_groups[''] = $field_group; - - $field_group = new stdClass(); - $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ - $field_group->api_version = 1; - $field_group->identifier = 'group_status|node|touring_group|form'; - $field_group->group_name = 'group_status'; - $field_group->entity_type = 'node'; - $field_group->bundle = 'touring_group'; - $field_group->mode = 'form'; - $field_group->parent_name = ''; - $field_group->data = array( - 'label' => 'Status', - 'weight' => '10', - 'children' => array( - 0 => 'field_active', - 1 => 'field_rejected', - ), - 'format_type' => 'tab', - 'format_settings' => array( - 'formatter' => 'closed', - 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-status field-group-tab', - 'required_fields' => 1, - ), - ), - ); - $field_groups[''] = $field_group; - - $field_group = new stdClass(); - $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ - $field_group->api_version = 1; - $field_group->identifier = 'group_tags|node|touring_group|form'; - $field_group->group_name = 'group_tags'; - $field_group->entity_type = 'node'; - $field_group->bundle = 'touring_group'; - $field_group->mode = 'form'; - $field_group->parent_name = ''; - $field_group->data = array( - 'label' => 'Categories and tags', - 'weight' => '7', - 'children' => array( - 0 => 'field_category', - 1 => 'field_topic', - ), - 'format_type' => 'fieldset', - 'format_settings' => array( - 'formatter' => 'collapsible', - 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-tags field-group-fieldset', - 'required_fields' => 1, - 'id' => '', - ), - ), - ); - $field_groups[''] = $field_group; - $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; @@ -158,11 +40,7 @@ function radar_touring_group_field_group_info() { // Translatables // Included for use with string extractors like potx. - t('Categories and tags'); - t('Contact'); - t('Image'); t('Short url'); - t('Status'); return $field_groups; } diff --git a/modules/radar/radar_touring_group/radar_touring_group.info b/modules/radar/radar_touring_group/radar_touring_group.info index dafd73cfff1638fb19bd5626c2bcf1132e06e787..5db374c1711500b259504998b6e5d7097fe60063 100644 --- a/modules/radar/radar_touring_group/radar_touring_group.info +++ b/modules/radar/radar_touring_group/radar_touring_group.info @@ -38,10 +38,6 @@ features[ctools][] = strongarm:strongarm:1 features[ds_field_settings][] = node|touring_group|teaser features[ds_layout_settings][] = node|touring_group|teaser features[features_api][] = api:2 -features[field_group][] = group_contact|node|touring_group|form -features[field_group][] = group_image|node|touring_group|form -features[field_group][] = group_status|node|touring_group|form -features[field_group][] = group_tags|node|touring_group|form features[field_group][] = group_url|node|touring_group|form features[field_instance][] = node-touring_group-body features[field_instance][] = node-touring_group-field_active diff --git a/modules/radar/radar_vocabularies/radar_vocabularies.features.taxonomy.inc b/modules/radar/radar_vocabularies/radar_vocabularies.features.taxonomy.inc index fce535a7647be9d8771a46ff7e9cec44e7a53492..7c056762c3dd4dec8ca0290c9c15c1bcb21103b8 100644 --- a/modules/radar/radar_vocabularies/radar_vocabularies.features.taxonomy.inc +++ b/modules/radar/radar_vocabularies/radar_vocabularies.features.taxonomy.inc @@ -18,6 +18,8 @@ function radar_vocabularies_taxonomy_default_vocabularies() { 'weight' => 0, 'language' => 'und', 'i18n_mode' => 1, + 'base_i18n_mode' => 1, + 'base_language' => 'und', 'rdf_mapping' => array( 'rdftype' => array( 0 => 'skos:ConceptScheme', @@ -43,6 +45,8 @@ function radar_vocabularies_taxonomy_default_vocabularies() { 'weight' => 0, 'language' => 'und', 'i18n_mode' => 1, + 'base_i18n_mode' => 1, + 'base_language' => 'und', 'rdf_mapping' => array( 'rdftype' => array( 0 => 'skos:ConceptScheme', @@ -68,6 +72,8 @@ function radar_vocabularies_taxonomy_default_vocabularies() { 'weight' => 0, 'language' => 'und', 'i18n_mode' => 1, + 'base_i18n_mode' => 1, + 'base_language' => 'und', 'rdf_mapping' => array( 'rdftype' => array( 0 => 'skos:ConceptScheme',