From 66b88adb3b5f6ac01da4a444281090093c868ca7 Mon Sep 17 00:00:00 2001 From: Michael Stenta Date: Tue, 26 Sep 2017 13:05:02 -0400 Subject: [PATCH] Reorganize all asset and log fields into Easy Responsive Tabs. --- .../farm_crop.features.field_instance.inc | 24 +- .../farm/farm_crop/farm_crop.field_group.inc | 385 ++++++++++++------ modules/farm/farm_crop/farm_crop.info | 10 +- ...farm_equipment.features.field_instance.inc | 12 +- .../farm_equipment.field_group.inc | 252 +++++++----- .../farm/farm_equipment/farm_equipment.info | 6 +- ...farm_livestock.features.field_instance.inc | 18 +- .../farm_livestock.field_group.inc | 253 +++++++----- .../farm/farm_livestock/farm_livestock.info | 5 +- ...livestock_eggs.features.field_instance.inc | 6 +- .../farm_livestock_eggs.field_group.inc | 62 +-- .../farm_livestock_eggs.info | 2 +- ...m_log_activity.features.field_instance.inc | 9 +- .../farm_log_activity.field_group.inc | 180 ++++++-- .../farm_log_activity/farm_log_activity.info | 5 +- ...rm_log_harvest.features.field_instance.inc | 10 +- .../farm_log_harvest.field_group.inc | 210 ++++++++-- .../farm_log_harvest/farm_log_harvest.info | 6 +- ...farm_log_input.features.field_instance.inc | 10 +- .../farm_log_input.field_group.inc | 212 +++++++--- .../farm_log_input/farm_log_input.info | 6 +- ...og_observation.features.field_instance.inc | 16 +- .../farm_log_observation.field_group.inc | 204 ++++++++-- .../farm_log_observation.info | 6 +- .../farm_log_sale.features.field_instance.inc | 4 +- .../farm_log_sale.field_group.inc | 151 +++++-- .../farm_log/farm_log_sale/farm_log_sale.info | 4 +- .../farm_sensor.features.field_instance.inc | 2 +- .../farm_sensor/farm_sensor.field_group.inc | 103 ++--- modules/farm/farm_sensor/farm_sensor.info | 2 +- ...m_soil_compost.features.field_instance.inc | 2 +- .../farm_soil_compost.field_group.inc | 124 +++--- .../farm_soil_compost/farm_soil_compost.info | 3 +- ...farm_soil_test.features.field_instance.inc | 10 +- .../farm_soil_test.field_group.inc | 132 +++--- .../farm_soil_test/farm_soil_test.info | 2 +- ...arm_water_test.features.field_instance.inc | 4 +- .../farm_water_test.field_group.inc | 99 ++--- .../farm_water_test/farm_water_test.info | 2 +- 39 files changed, 1689 insertions(+), 864 deletions(-) diff --git a/modules/farm/farm_crop/farm_crop.features.field_instance.inc b/modules/farm/farm_crop/farm_crop.features.field_instance.inc index 0cc39cfdf..934509787 100644 --- a/modules/farm/farm_crop/farm_crop.features.field_instance.inc +++ b/modules/farm/farm_crop/farm_crop.features.field_instance.inc @@ -40,7 +40,7 @@ function farm_crop_field_default_field_instances() { 'size' => 60, ), 'type' => 'taxonomy_autocomplete', - 'weight' => 2, + 'weight' => -9, ), ); @@ -74,7 +74,7 @@ function farm_crop_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 4, + 'weight' => -7, ), ); @@ -234,7 +234,7 @@ function farm_crop_field_default_field_instances() { 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => 3, + 'weight' => -8, ), ); @@ -275,7 +275,7 @@ function farm_crop_field_default_field_instances() { 'view_mode' => 'full', ), 'type' => 'entityreference_view_widget', - 'weight' => 2, + 'weight' => 5, ), ); @@ -426,7 +426,7 @@ function farm_crop_field_default_field_instances() { 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => 8, + 'weight' => 4, ), ); @@ -459,7 +459,7 @@ function farm_crop_field_default_field_instances() { 'module' => 'field_collection', 'settings' => array(), 'type' => 'field_collection_embed', - 'weight' => 2, + 'weight' => 14, ), ); @@ -493,7 +493,7 @@ function farm_crop_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 3, + 'weight' => 7, ), ); @@ -526,7 +526,7 @@ function farm_crop_field_default_field_instances() { 'module' => 'field_collection', 'settings' => array(), 'type' => 'field_collection_embed', - 'weight' => 1, + 'weight' => 3, ), ); @@ -560,7 +560,7 @@ function farm_crop_field_default_field_instances() { 'size' => 60, ), 'type' => 'text_textfield', - 'weight' => 3, + 'weight' => 6, ), ); @@ -601,7 +601,7 @@ function farm_crop_field_default_field_instances() { 'view_mode' => 'full', ), 'type' => 'entityreference_view_widget', - 'weight' => 2, + 'weight' => -4, ), ); @@ -819,7 +819,7 @@ function farm_crop_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 4, + 'weight' => -3, ), ); @@ -852,7 +852,7 @@ function farm_crop_field_default_field_instances() { 'module' => 'field_collection', 'settings' => array(), 'type' => 'field_collection_embed', - 'weight' => 1, + 'weight' => 4, ), ); diff --git a/modules/farm/farm_crop/farm_crop.field_group.inc b/modules/farm/farm_crop/farm_crop.field_group.inc index a337fde08..f141de346 100644 --- a/modules/farm/farm_crop/farm_crop.field_group.inc +++ b/modules/farm/farm_crop/farm_crop.field_group.inc @@ -18,10 +18,10 @@ function farm_crop_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_seeding'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Assignment', - 'weight' => '5', + 'weight' => '9', 'children' => array( 0 => 'field_farm_log_owner', ), @@ -47,10 +47,10 @@ function farm_crop_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_transplanting'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Assignment', - 'weight' => '5', + 'weight' => '-1', 'children' => array( 0 => 'field_farm_log_owner', ), @@ -76,10 +76,10 @@ function farm_crop_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_seeding'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Category', - 'weight' => '4', + 'weight' => '8', 'children' => array( 0 => 'field_farm_log_category', ), @@ -105,10 +105,10 @@ function farm_crop_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_transplanting'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Category', - 'weight' => '4', + 'weight' => '-2', 'children' => array( 0 => 'field_farm_log_category', ), @@ -126,35 +126,6 @@ function farm_crop_field_group_info() { ); $field_groups['group_farm_category|log|farm_transplanting|form'] = $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_farm_description|farm_asset|planting|form'; - $field_group->group_name = 'group_farm_description'; - $field_group->entity_type = 'farm_asset'; - $field_group->bundle = 'planting'; - $field_group->mode = 'form'; - $field_group->parent_name = ''; - $field_group->data = array( - 'label' => 'Description', - 'weight' => '1', - 'children' => array( - 0 => 'field_farm_description', - ), - 'format_type' => 'fieldset', - 'format_settings' => array( - 'label' => 'Description', - 'instance_settings' => array( - 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-description field-group-fieldset', - 'description' => '', - ), - 'formatter' => 'collapsed', - ), - ); - $field_groups['group_farm_description|farm_asset|planting|form'] = $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; @@ -163,24 +134,22 @@ function farm_crop_field_group_info() { $field_group->entity_type = 'farm_asset'; $field_group->bundle = 'planting'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', + 'label' => 'Files', 'weight' => '3', 'children' => array( - 0 => 'field_farm_images', - 1 => 'field_farm_files', + 0 => 'field_farm_files', + 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', + 'formatter' => '', ), ); $field_groups['group_farm_files|farm_asset|planting|form'] = $field_group; @@ -193,24 +162,22 @@ function farm_crop_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_seeding'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', - 'weight' => '6', + 'label' => 'Files', + 'weight' => '4', 'children' => array( 0 => 'field_farm_files', 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', + 'formatter' => '', ), ); $field_groups['group_farm_files|log|farm_seeding|form'] = $field_group; @@ -223,24 +190,22 @@ function farm_crop_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_transplanting'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', - 'weight' => '6', + 'label' => 'Files', + 'weight' => '4', 'children' => array( 0 => 'field_farm_files', 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', + 'formatter' => '', ), ); $field_groups['group_farm_files|log|farm_transplanting|form'] = $field_group; @@ -253,25 +218,24 @@ function farm_crop_field_group_info() { $field_group->entity_type = 'farm_asset'; $field_group->bundle = 'planting'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( 0 => 'field_farm_crop', - 1 => 'field_farm_season', - 2 => 'name', + 1 => 'field_farm_description', + 2 => 'field_farm_season', + 3 => 'name', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'General information', + 'label' => 'General', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-general field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsible', + 'formatter' => '', ), ); $field_groups['group_farm_general|farm_asset|planting|form'] = $field_group; @@ -284,24 +248,26 @@ function farm_crop_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_seeding'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( 0 => 'field_farm_asset', - 1 => 'field_farm_seed_source', - 2 => 'timestamp', + 1 => 'field_farm_notes', + 2 => 'field_farm_seed_source', + 3 => 'timestamp', + 4 => 'group_farm_assignment', + 5 => 'group_farm_category', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'label' => 'General', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', 'required_fields' => 1, - 'id' => '', + 'classes' => '', ), + 'formatter' => '', ), ); $field_groups['group_farm_general|log|farm_seeding|form'] = $field_group; @@ -314,23 +280,25 @@ function farm_crop_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_transplanting'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( 0 => 'field_farm_asset', - 1 => 'timestamp', + 1 => 'field_farm_notes', + 2 => 'timestamp', + 3 => 'group_farm_assignment', + 4 => 'group_farm_category', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'label' => 'General', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', 'required_fields' => 1, - 'id' => '', + 'classes' => '', ), + 'formatter' => '', ), ); $field_groups['group_farm_general|log|farm_transplanting|form'] = $field_group; @@ -343,23 +311,20 @@ function farm_crop_field_group_info() { $field_group->entity_type = 'farm_asset'; $field_group->bundle = 'planting'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( 'label' => 'Lineage', 'weight' => '2', 'children' => array( 0 => 'field_farm_parent', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'Lineage', + 'formatter' => '', 'instance_settings' => array( + 'classes' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-lineage field-group-fieldset', - 'description' => '', ), - 'formatter' => 'collapsed', ), ); $field_groups['group_farm_lineage|farm_asset|planting|form'] = $field_group; @@ -367,70 +332,230 @@ function farm_crop_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_farm_notes|log|farm_seeding|form'; - $field_group->group_name = 'group_farm_notes'; + $field_group->identifier = 'group_farm_movement|log|farm_seeding|form'; + $field_group->group_name = 'group_farm_movement'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_seeding'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Movement', + 'weight' => '3', + 'children' => array( + 0 => 'field_farm_movement', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-movement field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_movement|log|farm_seeding|form'] = $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_farm_movement|log|farm_transplanting|form'; + $field_group->group_name = 'group_farm_movement'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_transplanting'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Movement', + 'weight' => '3', + 'children' => array( + 0 => 'field_farm_movement', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-movement field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_movement|log|farm_transplanting|form'] = $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_farm_quantity|log|farm_seeding|form'; + $field_group->group_name = 'group_farm_quantity'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_seeding'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Quantity', + 'weight' => '2', + 'children' => array( + 0 => 'field_farm_quantity', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'label' => 'Quantity', + 'instance_settings' => array( + 'required_fields' => 1, + 'classes' => 'group-farm-quantity field-group-field_group_easy_responsive_tabs_nav_item', + ), + ), + ); + $field_groups['group_farm_quantity|log|farm_seeding|form'] = $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_farm_quantity|log|farm_transplanting|form'; + $field_group->group_name = 'group_farm_quantity'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_transplanting'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Quantity', + 'weight' => '2', + 'children' => array( + 0 => 'field_farm_quantity', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-quantity field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_quantity|log|farm_transplanting|form'] = $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_farm_tabs|farm_asset|planting|form'; + $field_group->group_name = 'group_farm_tabs'; + $field_group->entity_type = 'farm_asset'; + $field_group->bundle = 'planting'; + $field_group->mode = 'form'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'Tabs', + 'weight' => '0', + 'children' => array( + 0 => 'group_farm_files', + 1 => 'group_farm_general', + 2 => 'group_farm_lineage', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav', + 'format_settings' => array( + 'label' => 'Tabs', + 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', + 'required_fields' => 1, + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', + ), + ), + ); + $field_groups['group_farm_tabs|farm_asset|planting|form'] = $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_farm_tabs|log|farm_seeding|form'; + $field_group->group_name = 'group_farm_tabs'; $field_group->entity_type = 'log'; $field_group->bundle = 'farm_seeding'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( - 'label' => 'Notes', - 'weight' => '3', + 'label' => 'Tabs', + 'weight' => '0', 'children' => array( - 0 => 'field_farm_notes', + 0 => 'group_farm_files', + 1 => 'group_farm_general', + 2 => 'group_farm_movement', + 3 => 'group_farm_quantity', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav', 'format_settings' => array( - 'label' => 'Notes', + 'label' => 'Tabs', 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-notes field-group-fieldset', - 'description' => '', + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', ), - 'formatter' => 'collapsed', ), ); - $field_groups['group_farm_notes|log|farm_seeding|form'] = $field_group; + $field_groups['group_farm_tabs|log|farm_seeding|form'] = $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_farm_notes|log|farm_transplanting|form'; - $field_group->group_name = 'group_farm_notes'; + $field_group->identifier = 'group_farm_tabs|log|farm_transplanting|form'; + $field_group->group_name = 'group_farm_tabs'; $field_group->entity_type = 'log'; $field_group->bundle = 'farm_transplanting'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( - 'label' => 'Notes', - 'weight' => '3', + 'label' => 'Tabs', + 'weight' => '0', 'children' => array( - 0 => 'field_farm_notes', + 0 => 'group_farm_files', + 1 => 'group_farm_general', + 2 => 'group_farm_movement', + 3 => 'group_farm_quantity', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav', 'format_settings' => array( - 'label' => 'Notes', + 'label' => 'Tabs', 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-notes field-group-fieldset', - 'description' => '', + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', ), - 'formatter' => 'collapsed', ), ); - $field_groups['group_farm_notes|log|farm_transplanting|form'] = $field_group; + $field_groups['group_farm_tabs|log|farm_transplanting|form'] = $field_group; // Translatables // Included for use with string extractors like potx. t('Assignment'); t('Category'); - t('Description'); - t('File attachments'); - t('General information'); + t('Files'); + t('General'); t('Lineage'); - t('Notes'); + t('Movement'); + t('Quantity'); + t('Tabs'); return $field_groups; } diff --git a/modules/farm/farm_crop/farm_crop.info b/modules/farm/farm_crop/farm_crop.info index f224af3c6..f09ee1ff4 100644 --- a/modules/farm/farm_crop/farm_crop.info +++ b/modules/farm/farm_crop/farm_crop.info @@ -54,7 +54,6 @@ features[field_group][] = group_farm_assignment|log|farm_seeding|form features[field_group][] = group_farm_assignment|log|farm_transplanting|form features[field_group][] = group_farm_category|log|farm_seeding|form features[field_group][] = group_farm_category|log|farm_transplanting|form -features[field_group][] = group_farm_description|farm_asset|planting|form features[field_group][] = group_farm_files|farm_asset|planting|form features[field_group][] = group_farm_files|log|farm_seeding|form features[field_group][] = group_farm_files|log|farm_transplanting|form @@ -62,8 +61,13 @@ features[field_group][] = group_farm_general|farm_asset|planting|form features[field_group][] = group_farm_general|log|farm_seeding|form features[field_group][] = group_farm_general|log|farm_transplanting|form features[field_group][] = group_farm_lineage|farm_asset|planting|form -features[field_group][] = group_farm_notes|log|farm_seeding|form -features[field_group][] = group_farm_notes|log|farm_transplanting|form +features[field_group][] = group_farm_movement|log|farm_seeding|form +features[field_group][] = group_farm_movement|log|farm_transplanting|form +features[field_group][] = group_farm_quantity|log|farm_seeding|form +features[field_group][] = group_farm_quantity|log|farm_transplanting|form +features[field_group][] = group_farm_tabs|farm_asset|planting|form +features[field_group][] = group_farm_tabs|log|farm_seeding|form +features[field_group][] = group_farm_tabs|log|farm_transplanting|form features[field_instance][] = farm_asset-planting-field_farm_crop features[field_instance][] = farm_asset-planting-field_farm_description features[field_instance][] = farm_asset-planting-field_farm_files diff --git a/modules/farm/farm_equipment/farm_equipment.features.field_instance.inc b/modules/farm/farm_equipment/farm_equipment.features.field_instance.inc index 1f8ea9bf5..8dbdf751a 100644 --- a/modules/farm/farm_equipment/farm_equipment.features.field_instance.inc +++ b/modules/farm/farm_equipment/farm_equipment.features.field_instance.inc @@ -40,7 +40,7 @@ function farm_equipment_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 7, + 'weight' => -6, ), ); @@ -162,7 +162,7 @@ function farm_equipment_field_default_field_instances() { 'size' => 60, ), 'type' => 'text_textfield', - 'weight' => 4, + 'weight' => -9, ), ); @@ -196,7 +196,7 @@ function farm_equipment_field_default_field_instances() { 'size' => 60, ), 'type' => 'text_textfield', - 'weight' => 5, + 'weight' => -8, ), ); @@ -230,7 +230,7 @@ function farm_equipment_field_default_field_instances() { 'size' => 60, ), 'type' => 'text_textfield', - 'weight' => 6, + 'weight' => -7, ), ); @@ -457,7 +457,7 @@ function farm_equipment_field_default_field_instances() { 'module' => 'field_collection', 'settings' => array(), 'type' => 'field_collection_embed', - 'weight' => 2, + 'weight' => 3, ), ); @@ -491,7 +491,7 @@ function farm_equipment_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 3, + 'weight' => -8, ), ); diff --git a/modules/farm/farm_equipment/farm_equipment.field_group.inc b/modules/farm/farm_equipment/farm_equipment.field_group.inc index 80538d18d..323f750d8 100644 --- a/modules/farm/farm_equipment/farm_equipment.field_group.inc +++ b/modules/farm/farm_equipment/farm_equipment.field_group.inc @@ -18,10 +18,10 @@ function farm_equipment_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_maintenance'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_references'; $field_group->data = array( 'label' => 'Assets', - 'weight' => '1', + 'weight' => '2', 'children' => array( 0 => 'field_farm_asset', ), @@ -34,7 +34,7 @@ function farm_equipment_field_group_info() { 'classes' => 'group-farm-assets field-group-fieldset', 'description' => '', ), - 'formatter' => 'collapsed', + 'formatter' => 'open', ), ); $field_groups['group_farm_assets|log|farm_maintenance|form'] = $field_group; @@ -47,10 +47,10 @@ function farm_equipment_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_maintenance'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Assignment', - 'weight' => '5', + 'weight' => '-6', 'children' => array( 0 => 'field_farm_log_owner', ), @@ -76,10 +76,10 @@ function farm_equipment_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_maintenance'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Category', - 'weight' => '4', + 'weight' => '-7', 'children' => array( 0 => 'field_farm_log_category', ), @@ -97,35 +97,6 @@ function farm_equipment_field_group_info() { ); $field_groups['group_farm_category|log|farm_maintenance|form'] = $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_farm_description|farm_asset|equipment|form'; - $field_group->group_name = 'group_farm_description'; - $field_group->entity_type = 'farm_asset'; - $field_group->bundle = 'equipment'; - $field_group->mode = 'form'; - $field_group->parent_name = ''; - $field_group->data = array( - 'label' => 'Description', - 'weight' => '1', - 'children' => array( - 0 => 'field_farm_description', - ), - 'format_type' => 'fieldset', - 'format_settings' => array( - 'label' => 'Description', - 'instance_settings' => array( - 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-description field-group-fieldset', - 'description' => '', - ), - 'formatter' => 'collapsed', - ), - ); - $field_groups['group_farm_description|farm_asset|equipment|form'] = $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; @@ -134,24 +105,22 @@ function farm_equipment_field_group_info() { $field_group->entity_type = 'farm_asset'; $field_group->bundle = 'equipment'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', + 'label' => 'Files', 'weight' => '2', 'children' => array( - 0 => 'field_farm_images', - 1 => 'field_farm_files', + 0 => 'field_farm_files', + 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', + 'formatter' => '', ), ); $field_groups['group_farm_files|farm_asset|equipment|form'] = $field_group; @@ -164,24 +133,21 @@ function farm_equipment_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_maintenance'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', - 'weight' => '6', + 'label' => 'Files', + 'weight' => '4', 'children' => array( 0 => 'field_farm_files', 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'formatter' => '', 'instance_settings' => array( + 'classes' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', ), - 'formatter' => 'collapsed', ), ); $field_groups['group_farm_files|log|farm_maintenance|form'] = $field_group; @@ -194,25 +160,25 @@ function farm_equipment_field_group_info() { $field_group->entity_type = 'farm_asset'; $field_group->bundle = 'equipment'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( - 0 => 'field_farm_manufacturer', - 1 => 'field_farm_model', - 2 => 'field_farm_serial_number', - 3 => 'name', + 0 => 'field_farm_description', + 1 => 'field_farm_manufacturer', + 2 => 'field_farm_model', + 3 => 'field_farm_serial_number', + 4 => 'name', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'label' => 'General', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', 'required_fields' => 1, - 'id' => '', + 'classes' => '', ), + 'formatter' => '', ), ); $field_groups['group_farm_general|farm_asset|equipment|form'] = $field_group; @@ -225,23 +191,25 @@ function farm_equipment_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_maintenance'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( - 0 => 'name', - 1 => 'timestamp', + 0 => 'field_farm_notes', + 1 => 'name', + 2 => 'timestamp', + 3 => 'group_farm_category', + 4 => 'group_farm_assignment', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'label' => 'General', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', 'required_fields' => 1, - 'id' => '', + 'classes' => '', ), + 'formatter' => '', ), ); $field_groups['group_farm_general|log|farm_maintenance|form'] = $field_group; @@ -249,41 +217,139 @@ function farm_equipment_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_farm_notes|log|farm_maintenance|form'; - $field_group->group_name = 'group_farm_notes'; + $field_group->identifier = 'group_farm_movement|log|farm_maintenance|form'; + $field_group->group_name = 'group_farm_movement'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_maintenance'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Movement', + 'weight' => '3', + 'children' => array( + 0 => 'field_farm_movement', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-movement field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_movement|log|farm_maintenance|form'] = $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_farm_references|log|farm_maintenance|form'; + $field_group->group_name = 'group_farm_references'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_maintenance'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'References', + 'weight' => '2', + 'children' => array( + 0 => 'group_farm_assets', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-references field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_references|log|farm_maintenance|form'] = $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_farm_tabs|farm_asset|equipment|form'; + $field_group->group_name = 'group_farm_tabs'; + $field_group->entity_type = 'farm_asset'; + $field_group->bundle = 'equipment'; + $field_group->mode = 'form'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'Tabs', + 'weight' => '0', + 'children' => array( + 0 => 'group_farm_files', + 1 => 'group_farm_general', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav', + 'format_settings' => array( + 'label' => 'Tabs', + 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', + 'required_fields' => 1, + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', + ), + ), + ); + $field_groups['group_farm_tabs|farm_asset|equipment|form'] = $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_farm_tabs|log|farm_maintenance|form'; + $field_group->group_name = 'group_farm_tabs'; $field_group->entity_type = 'log'; $field_group->bundle = 'farm_maintenance'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( - 'label' => 'Notes', - 'weight' => '3', + 'label' => 'Tabs', + 'weight' => '0', 'children' => array( - 0 => 'field_farm_notes', + 0 => 'group_farm_files', + 1 => 'group_farm_general', + 2 => 'group_farm_references', + 3 => 'group_farm_movement', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav', 'format_settings' => array( - 'label' => 'Notes', + 'label' => 'Tabs', 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-notes field-group-fieldset', - 'description' => '', + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', ), - 'formatter' => 'collapsed', ), ); - $field_groups['group_farm_notes|log|farm_maintenance|form'] = $field_group; + $field_groups['group_farm_tabs|log|farm_maintenance|form'] = $field_group; // Translatables // Included for use with string extractors like potx. t('Assets'); t('Assignment'); t('Category'); - t('Description'); - t('File attachments'); - t('General information'); - t('Notes'); + t('Files'); + t('General'); + t('Movement'); + t('References'); + t('Tabs'); return $field_groups; } diff --git a/modules/farm/farm_equipment/farm_equipment.info b/modules/farm/farm_equipment/farm_equipment.info index 973f60c43..a17c9386a 100644 --- a/modules/farm/farm_equipment/farm_equipment.info +++ b/modules/farm/farm_equipment/farm_equipment.info @@ -38,12 +38,14 @@ features[field_base][] = field_farm_serial_number features[field_group][] = group_farm_assets|log|farm_maintenance|form features[field_group][] = group_farm_assignment|log|farm_maintenance|form features[field_group][] = group_farm_category|log|farm_maintenance|form -features[field_group][] = group_farm_description|farm_asset|equipment|form features[field_group][] = group_farm_files|farm_asset|equipment|form features[field_group][] = group_farm_files|log|farm_maintenance|form features[field_group][] = group_farm_general|farm_asset|equipment|form features[field_group][] = group_farm_general|log|farm_maintenance|form -features[field_group][] = group_farm_notes|log|farm_maintenance|form +features[field_group][] = group_farm_movement|log|farm_maintenance|form +features[field_group][] = group_farm_references|log|farm_maintenance|form +features[field_group][] = group_farm_tabs|farm_asset|equipment|form +features[field_group][] = group_farm_tabs|log|farm_maintenance|form features[field_instance][] = farm_asset-equipment-field_farm_description features[field_instance][] = farm_asset-equipment-field_farm_files features[field_instance][] = farm_asset-equipment-field_farm_images diff --git a/modules/farm/farm_livestock/farm_livestock.features.field_instance.inc b/modules/farm/farm_livestock/farm_livestock.features.field_instance.inc index 7df1aeb54..1409bc6f9 100644 --- a/modules/farm/farm_livestock/farm_livestock.features.field_instance.inc +++ b/modules/farm/farm_livestock/farm_livestock.features.field_instance.inc @@ -43,7 +43,7 @@ function farm_livestock_field_default_field_instances() { 'display_label' => 1, ), 'type' => 'options_onoff', - 'weight' => 7, + 'weight' => -5, ), ); @@ -77,7 +77,7 @@ function farm_livestock_field_default_field_instances() { 'size' => 60, ), 'type' => 'taxonomy_autocomplete', - 'weight' => 5, + 'weight' => -7, ), ); @@ -142,7 +142,7 @@ function farm_livestock_field_default_field_instances() { 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => 6, + 'weight' => -6, ), ); @@ -209,7 +209,7 @@ function farm_livestock_field_default_field_instances() { 'size' => 60, ), 'type' => 'taxonomy_autocomplete', - 'weight' => 4, + 'weight' => -8, ), ); @@ -259,7 +259,7 @@ function farm_livestock_field_default_field_instances() { 'year_range' => '-10:+3', ), 'type' => 'date_select', - 'weight' => 3, + 'weight' => -9, ), ); @@ -293,7 +293,7 @@ function farm_livestock_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 11, + 'weight' => -4, ), ); @@ -566,7 +566,7 @@ function farm_livestock_field_default_field_instances() { 'view_mode' => 'full', ), 'type' => 'entityreference_view_widget', - 'weight' => 3, + 'weight' => -8, ), ); @@ -752,7 +752,7 @@ function farm_livestock_field_default_field_instances() { 'module' => 'field_collection', 'settings' => array(), 'type' => 'field_collection_embed', - 'weight' => 1, + 'weight' => 2, ), ); @@ -786,7 +786,7 @@ function farm_livestock_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 3, + 'weight' => -7, ), ); diff --git a/modules/farm/farm_livestock/farm_livestock.field_group.inc b/modules/farm/farm_livestock/farm_livestock.field_group.inc index 7016c4c2a..2d27ef466 100644 --- a/modules/farm/farm_livestock/farm_livestock.field_group.inc +++ b/modules/farm/farm_livestock/farm_livestock.field_group.inc @@ -18,10 +18,10 @@ function farm_livestock_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_medical'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Assignment', - 'weight' => '4', + 'weight' => '-5', 'children' => array( 0 => 'field_farm_log_owner', ), @@ -47,10 +47,10 @@ function farm_livestock_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_medical'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Category', - 'weight' => '3', + 'weight' => '-6', 'children' => array( 0 => 'field_farm_log_category', ), @@ -68,35 +68,6 @@ function farm_livestock_field_group_info() { ); $field_groups['group_farm_category|log|farm_medical|form'] = $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_farm_description|farm_asset|animal|form'; - $field_group->group_name = 'group_farm_description'; - $field_group->entity_type = 'farm_asset'; - $field_group->bundle = 'animal'; - $field_group->mode = 'form'; - $field_group->parent_name = ''; - $field_group->data = array( - 'label' => 'Description', - 'weight' => '2', - 'children' => array( - 0 => 'field_farm_description', - ), - 'format_type' => 'fieldset', - 'format_settings' => array( - 'label' => 'Description', - 'instance_settings' => array( - 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-description field-group-fieldset', - 'description' => '', - ), - 'formatter' => 'collapsed', - ), - ); - $field_groups['group_farm_description|farm_asset|animal|form'] = $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; @@ -105,24 +76,22 @@ function farm_livestock_field_group_info() { $field_group->entity_type = 'farm_asset'; $field_group->bundle = 'animal'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', - 'weight' => '5', + 'label' => 'Files', + 'weight' => '4', 'children' => array( - 0 => 'field_farm_images', - 1 => 'field_farm_files', + 0 => 'field_farm_files', + 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', + 'formatter' => '', ), ); $field_groups['group_farm_files|farm_asset|animal|form'] = $field_group; @@ -135,24 +104,22 @@ function farm_livestock_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_medical'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', - 'weight' => '5', + 'label' => 'Files', + 'weight' => '3', 'children' => array( 0 => 'field_farm_files', 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', + 'formatter' => '', ), ); $field_groups['group_farm_files|log|farm_medical|form'] = $field_group; @@ -165,27 +132,27 @@ function farm_livestock_field_group_info() { $field_group->entity_type = 'farm_asset'; $field_group->bundle = 'animal'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( - 0 => 'field_farm_animal_sex', - 1 => 'field_farm_animal_type', - 2 => 'field_farm_date', - 3 => 'field_farm_animal_group', - 4 => 'field_farm_animal_castrated', - 5 => 'name', + 0 => 'field_farm_animal_castrated', + 1 => 'field_farm_animal_group', + 2 => 'field_farm_animal_sex', + 3 => 'field_farm_animal_type', + 4 => 'field_farm_date', + 5 => 'field_farm_description', + 6 => 'name', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'label' => 'General', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', 'required_fields' => 1, - 'id' => '', + 'classes' => '', ), + 'formatter' => '', ), ); $field_groups['group_farm_general|farm_asset|animal|form'] = $field_group; @@ -198,24 +165,26 @@ function farm_livestock_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_medical'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( 0 => 'field_farm_asset', - 1 => 'name', - 2 => 'timestamp', + 1 => 'field_farm_notes', + 2 => 'name', + 3 => 'timestamp', + 4 => 'group_farm_assignment', + 5 => 'group_farm_category', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'label' => 'General', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', 'required_fields' => 1, - 'id' => '', + 'classes' => '', ), + 'formatter' => '', ), ); $field_groups['group_farm_general|log|farm_medical|form'] = $field_group; @@ -228,24 +197,21 @@ function farm_livestock_field_group_info() { $field_group->entity_type = 'farm_asset'; $field_group->bundle = 'animal'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( 'label' => 'Identification', - 'weight' => '3', + 'weight' => '2', 'children' => array( 0 => 'field_farm_animal_nicknames', 1 => 'field_farm_animal_tag', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'Identification', + 'formatter' => '', 'instance_settings' => array( + 'classes' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-id field-group-fieldset', - 'description' => '', ), - 'formatter' => 'collapsed', ), ); $field_groups['group_farm_id|farm_asset|animal|form'] = $field_group; @@ -258,23 +224,20 @@ function farm_livestock_field_group_info() { $field_group->entity_type = 'farm_asset'; $field_group->bundle = 'animal'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( 'label' => 'Lineage', - 'weight' => '4', + 'weight' => '3', 'children' => array( 0 => 'field_farm_parent', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'Lineage', + 'formatter' => '', 'instance_settings' => array( + 'classes' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-lineage field-group-fieldset', - 'description' => '', ), - 'formatter' => 'collapsed', ), ); $field_groups['group_farm_lineage|farm_asset|animal|form'] = $field_group; @@ -282,42 +245,114 @@ function farm_livestock_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_farm_notes|log|farm_medical|form'; - $field_group->group_name = 'group_farm_notes'; + $field_group->identifier = 'group_farm_movement|log|farm_medical|form'; + $field_group->group_name = 'group_farm_movement'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_medical'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Movement', + 'weight' => '2', + 'children' => array( + 0 => 'field_farm_movement', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-movement field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_movement|log|farm_medical|form'] = $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_farm_tabs|farm_asset|animal|form'; + $field_group->group_name = 'group_farm_tabs'; + $field_group->entity_type = 'farm_asset'; + $field_group->bundle = 'animal'; + $field_group->mode = 'form'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'Tabs', + 'weight' => '0', + 'children' => array( + 0 => 'group_farm_files', + 1 => 'group_farm_general', + 2 => 'group_farm_id', + 3 => 'group_farm_lineage', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav', + 'format_settings' => array( + 'label' => 'Tabs', + 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', + 'required_fields' => 1, + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', + ), + ), + ); + $field_groups['group_farm_tabs|farm_asset|animal|form'] = $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_farm_tabs|log|farm_medical|form'; + $field_group->group_name = 'group_farm_tabs'; $field_group->entity_type = 'log'; $field_group->bundle = 'farm_medical'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( - 'label' => 'Notes', - 'weight' => '2', + 'label' => 'Tabs', + 'weight' => '0', 'children' => array( - 0 => 'field_farm_notes', + 0 => 'group_farm_files', + 1 => 'group_farm_general', + 2 => 'group_farm_movement', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav', 'format_settings' => array( - 'label' => 'Notes', + 'label' => 'Tabs', 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-notes field-group-fieldset', - 'description' => '', + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', ), - 'formatter' => 'collapsed', ), ); - $field_groups['group_farm_notes|log|farm_medical|form'] = $field_group; + $field_groups['group_farm_tabs|log|farm_medical|form'] = $field_group; // Translatables // Included for use with string extractors like potx. t('Assignment'); t('Category'); - t('Description'); - t('File attachments'); - t('General information'); + t('Files'); + t('General'); t('Identification'); t('Lineage'); - t('Notes'); + t('Movement'); + t('Tabs'); return $field_groups; } diff --git a/modules/farm/farm_livestock/farm_livestock.info b/modules/farm/farm_livestock/farm_livestock.info index fd3af61db..c7df449b6 100644 --- a/modules/farm/farm_livestock/farm_livestock.info +++ b/modules/farm/farm_livestock/farm_livestock.info @@ -48,14 +48,15 @@ features[field_base][] = field_farm_animal_tag_type features[field_base][] = field_farm_animal_type features[field_group][] = group_farm_assignment|log|farm_medical|form features[field_group][] = group_farm_category|log|farm_medical|form -features[field_group][] = group_farm_description|farm_asset|animal|form features[field_group][] = group_farm_files|farm_asset|animal|form features[field_group][] = group_farm_files|log|farm_medical|form features[field_group][] = group_farm_general|farm_asset|animal|form features[field_group][] = group_farm_general|log|farm_medical|form features[field_group][] = group_farm_id|farm_asset|animal|form features[field_group][] = group_farm_lineage|farm_asset|animal|form -features[field_group][] = group_farm_notes|log|farm_medical|form +features[field_group][] = group_farm_movement|log|farm_medical|form +features[field_group][] = group_farm_tabs|farm_asset|animal|form +features[field_group][] = group_farm_tabs|log|farm_medical|form features[field_instance][] = farm_asset-animal-field_farm_animal_castrated features[field_instance][] = farm_asset-animal-field_farm_animal_group features[field_instance][] = farm_asset-animal-field_farm_animal_nicknames diff --git a/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.features.field_instance.inc b/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.features.field_instance.inc index 926198caf..0a3085a30 100644 --- a/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.features.field_instance.inc +++ b/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.features.field_instance.inc @@ -40,7 +40,7 @@ function farm_livestock_eggs_field_default_field_instances() { 'size' => 60, ), 'type' => 'options_buttons', - 'weight' => 3, + 'weight' => -3, ), ); @@ -80,7 +80,7 @@ function farm_livestock_eggs_field_default_field_instances() { 'module' => 'number', 'settings' => array(), 'type' => 'number', - 'weight' => 2, + 'weight' => -4, ), ); @@ -179,7 +179,7 @@ function farm_livestock_eggs_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 3, + 'weight' => -2, ), ); diff --git a/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.field_group.inc b/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.field_group.inc index ddc403afd..0ed991c77 100644 --- a/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.field_group.inc +++ b/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.field_group.inc @@ -18,10 +18,10 @@ function farm_livestock_eggs_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_eggs'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Assignment', - 'weight' => '3', + 'weight' => '0', 'children' => array( 0 => 'field_farm_log_owner', ), @@ -47,10 +47,10 @@ function farm_livestock_eggs_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_eggs'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Category', - 'weight' => '2', + 'weight' => '-1', 'children' => array( 0 => 'field_farm_log_category', ), @@ -76,24 +76,26 @@ function farm_livestock_eggs_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_eggs'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( 0 => 'field_farm_animal_group', 1 => 'field_farm_egg_qty', - 2 => 'timestamp', + 2 => 'field_farm_notes', + 3 => 'timestamp', + 4 => 'group_farm_category', + 5 => 'group_farm_assignment', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'label' => 'General', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', 'required_fields' => 1, - 'id' => '', + 'classes' => '', ), + 'formatter' => '', ), ); $field_groups['group_farm_general|log|farm_eggs|form'] = $field_group; @@ -101,38 +103,44 @@ function farm_livestock_eggs_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_farm_notes|log|farm_eggs|form'; - $field_group->group_name = 'group_farm_notes'; + $field_group->identifier = 'group_farm_tabs|log|farm_eggs|form'; + $field_group->group_name = 'group_farm_tabs'; $field_group->entity_type = 'log'; $field_group->bundle = 'farm_eggs'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( - 'label' => 'Notes', - 'weight' => '1', + 'label' => 'Tabs', + 'weight' => '0', 'children' => array( - 0 => 'field_farm_notes', + 0 => 'group_farm_general', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav', 'format_settings' => array( - 'label' => 'Notes', + 'label' => 'Tabs', 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-notes field-group-fieldset', - 'description' => '', + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', ), - 'formatter' => 'collapsed', ), ); - $field_groups['group_farm_notes|log|farm_eggs|form'] = $field_group; + $field_groups['group_farm_tabs|log|farm_eggs|form'] = $field_group; // Translatables // Included for use with string extractors like potx. t('Assignment'); t('Category'); - t('General information'); - t('Notes'); + t('General'); + t('Tabs'); return $field_groups; } diff --git a/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.info b/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.info index ba9fd7474..522518550 100644 --- a/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.info +++ b/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.info @@ -25,7 +25,7 @@ features[field_base][] = field_farm_egg_qty features[field_group][] = group_farm_assignment|log|farm_eggs|form features[field_group][] = group_farm_category|log|farm_eggs|form features[field_group][] = group_farm_general|log|farm_eggs|form -features[field_group][] = group_farm_notes|log|farm_eggs|form +features[field_group][] = group_farm_tabs|log|farm_eggs|form features[field_instance][] = log-farm_eggs-field_farm_animal_group features[field_instance][] = log-farm_eggs-field_farm_egg_qty features[field_instance][] = log-farm_eggs-field_farm_log_category diff --git a/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc b/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc index a6d0f4511..33f2f27ce 100644 --- a/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc +++ b/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc @@ -79,7 +79,7 @@ function farm_log_activity_field_default_field_instances() { 'view_mode' => 'full', ), 'type' => 'entityreference_view_widget', - 'weight' => 9, + 'weight' => 13, ), ); @@ -162,6 +162,11 @@ function farm_log_activity_field_default_field_instances() { 'handler_settings' => array( 'google' => array( 'all_results' => 0, + 'biasing' => array( + 'bounds' => '', + 'components' => '', + 'region' => '', + ), 'geometry_type' => 'point', 'reject_results' => array( 'APPROXIMATE' => 0, @@ -359,7 +364,7 @@ function farm_log_activity_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 4, + 'weight' => 8, ), ); diff --git a/modules/farm/farm_log/farm_log_activity/farm_log_activity.field_group.inc b/modules/farm/farm_log/farm_log_activity/farm_log_activity.field_group.inc index 80c1a0b9d..1a89d1d9f 100644 --- a/modules/farm/farm_log/farm_log_activity/farm_log_activity.field_group.inc +++ b/modules/farm/farm_log/farm_log_activity/farm_log_activity.field_group.inc @@ -18,10 +18,10 @@ function farm_log_activity_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_activity'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_references'; $field_group->data = array( 'label' => 'Areas', - 'weight' => '2', + 'weight' => '4', 'children' => array( 0 => 'field_farm_area', ), @@ -34,7 +34,7 @@ function farm_log_activity_field_group_info() { 'classes' => 'group-farm-areas field-group-fieldset', 'description' => '', ), - 'formatter' => 'collapsed', + 'formatter' => 'open', ), ); $field_groups['group_farm_areas|log|farm_activity|form'] = $field_group; @@ -47,10 +47,10 @@ function farm_log_activity_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_activity'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_references'; $field_group->data = array( 'label' => 'Assets', - 'weight' => '1', + 'weight' => '2', 'children' => array( 0 => 'field_farm_asset', ), @@ -63,7 +63,7 @@ function farm_log_activity_field_group_info() { 'classes' => 'group-farm-assets field-group-fieldset', 'description' => '', ), - 'formatter' => 'collapsed', + 'formatter' => 'open', ), ); $field_groups['group_farm_assets|log|farm_activity|form'] = $field_group; @@ -76,10 +76,10 @@ function farm_log_activity_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_activity'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Assignment', - 'weight' => '7', + 'weight' => '10', 'children' => array( 0 => 'field_farm_log_owner', ), @@ -105,10 +105,10 @@ function farm_log_activity_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_activity'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Category', - 'weight' => '6', + 'weight' => '9', 'children' => array( 0 => 'field_farm_log_category', ), @@ -134,24 +134,22 @@ function farm_log_activity_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_activity'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', - 'weight' => '8', + 'label' => 'Files', + 'weight' => '5', 'children' => array( 0 => 'field_farm_files', 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', + 'formatter' => '', ), ); $field_groups['group_farm_files|log|farm_activity|form'] = $field_group; @@ -164,23 +162,25 @@ function farm_log_activity_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_activity'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( - 0 => 'name', - 1 => 'timestamp', + 0 => 'field_farm_notes', + 1 => 'name', + 2 => 'timestamp', + 3 => 'group_farm_assignment', + 4 => 'group_farm_category', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'label' => 'General', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', 'required_fields' => 1, - 'id' => '', + 'classes' => '', ), + 'formatter' => '', ), ); $field_groups['group_farm_general|log|farm_activity|form'] = $field_group; @@ -188,31 +188,120 @@ function farm_log_activity_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_farm_notes|log|farm_activity|form'; - $field_group->group_name = 'group_farm_notes'; + $field_group->identifier = 'group_farm_geometry|log|farm_activity|form'; + $field_group->group_name = 'group_farm_geometry'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_activity'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Geometry', + 'weight' => '3', + 'children' => array( + 0 => 'field_farm_geofield', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-geometry field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_geometry|log|farm_activity|form'] = $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_farm_movement|log|farm_activity|form'; + $field_group->group_name = 'group_farm_movement'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_activity'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Movement', + 'weight' => '4', + 'children' => array( + 0 => 'field_farm_movement', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-movement field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_movement|log|farm_activity|form'] = $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_farm_references|log|farm_activity|form'; + $field_group->group_name = 'group_farm_references'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_activity'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'References', + 'weight' => '2', + 'children' => array( + 0 => 'group_farm_areas', + 1 => 'group_farm_assets', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-references field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_references|log|farm_activity|form'] = $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_farm_tabs|log|farm_activity|form'; + $field_group->group_name = 'group_farm_tabs'; $field_group->entity_type = 'log'; $field_group->bundle = 'farm_activity'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( - 'label' => 'Notes', - 'weight' => '5', + 'label' => 'Tabs', + 'weight' => '0', 'children' => array( - 0 => 'field_farm_notes', + 0 => 'group_farm_files', + 1 => 'group_farm_general', + 2 => 'group_farm_references', + 3 => 'group_farm_geometry', + 4 => 'group_farm_movement', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav', 'format_settings' => array( - 'label' => 'Notes', + 'label' => 'Tabs', 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-notes field-group-fieldset', - 'description' => '', + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', ), - 'formatter' => 'collapsed', ), ); - $field_groups['group_farm_notes|log|farm_activity|form'] = $field_group; + $field_groups['group_farm_tabs|log|farm_activity|form'] = $field_group; // Translatables // Included for use with string extractors like potx. @@ -220,9 +309,12 @@ function farm_log_activity_field_group_info() { t('Assets'); t('Assignment'); t('Category'); - t('File attachments'); - t('General information'); - t('Notes'); + t('Files'); + t('General'); + t('Geometry'); + t('Movement'); + t('References'); + t('Tabs'); return $field_groups; } diff --git a/modules/farm/farm_log/farm_log_activity/farm_log_activity.info b/modules/farm/farm_log/farm_log_activity/farm_log_activity.info index 91dcb427a..76fd60f52 100644 --- a/modules/farm/farm_log/farm_log_activity/farm_log_activity.info +++ b/modules/farm/farm_log/farm_log_activity/farm_log_activity.info @@ -40,7 +40,10 @@ features[field_group][] = group_farm_assignment|log|farm_activity|form features[field_group][] = group_farm_category|log|farm_activity|form features[field_group][] = group_farm_files|log|farm_activity|form features[field_group][] = group_farm_general|log|farm_activity|form -features[field_group][] = group_farm_notes|log|farm_activity|form +features[field_group][] = group_farm_geometry|log|farm_activity|form +features[field_group][] = group_farm_movement|log|farm_activity|form +features[field_group][] = group_farm_references|log|farm_activity|form +features[field_group][] = group_farm_tabs|log|farm_activity|form features[field_instance][] = log-farm_activity-field_farm_area features[field_instance][] = log-farm_activity-field_farm_asset features[field_instance][] = log-farm_activity-field_farm_files diff --git a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc index 07d550f32..859eca81b 100644 --- a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc +++ b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc @@ -84,7 +84,7 @@ function farm_log_harvest_field_default_field_instances() { 'view_mode' => 'full', ), 'type' => 'entityreference_view_widget', - 'weight' => 2, + 'weight' => 6, ), ); @@ -193,7 +193,7 @@ function farm_log_harvest_field_default_field_instances() { 'use_geocoder' => 1, ), 'type' => 'openlayers_geofield', - 'weight' => 4, + 'weight' => 5, ), ); @@ -382,7 +382,7 @@ function farm_log_harvest_field_default_field_instances() { 'module' => 'field_collection', 'settings' => array(), 'type' => 'field_collection_embed', - 'weight' => 5, + 'weight' => 19, ), ); @@ -422,7 +422,7 @@ function farm_log_harvest_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 14, + 'weight' => -7, ), ); @@ -461,7 +461,7 @@ function farm_log_harvest_field_default_field_instances() { 'module' => 'field_collection', 'settings' => array(), 'type' => 'field_collection_embed', - 'weight' => 3, + 'weight' => 2, ), ); diff --git a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.field_group.inc b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.field_group.inc index 321f0cd03..2f57bf946 100644 --- a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.field_group.inc +++ b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.field_group.inc @@ -18,10 +18,10 @@ function farm_log_harvest_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_harvest'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_references'; $field_group->data = array( 'label' => 'Areas', - 'weight' => '2', + 'weight' => '3', 'children' => array( 0 => 'field_farm_area', ), @@ -34,7 +34,7 @@ function farm_log_harvest_field_group_info() { 'classes' => 'group-farm-areas field-group-fieldset', 'description' => '', ), - 'formatter' => 'collapsed', + 'formatter' => 'open', ), ); $field_groups['group_farm_areas|log|farm_harvest|form'] = $field_group; @@ -47,10 +47,10 @@ function farm_log_harvest_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_harvest'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_references'; $field_group->data = array( 'label' => 'Assets', - 'weight' => '1', + 'weight' => '2', 'children' => array( 0 => 'field_farm_asset', ), @@ -63,7 +63,7 @@ function farm_log_harvest_field_group_info() { 'classes' => 'group-farm-assets field-group-fieldset', 'description' => '', ), - 'formatter' => 'collapsed', + 'formatter' => 'open', ), ); $field_groups['group_farm_assets|log|farm_harvest|form'] = $field_group; @@ -76,10 +76,10 @@ function farm_log_harvest_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_harvest'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Assignment', - 'weight' => '8', + 'weight' => '-5', 'children' => array( 0 => 'field_farm_log_owner', ), @@ -105,10 +105,10 @@ function farm_log_harvest_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_harvest'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Category', - 'weight' => '7', + 'weight' => '-6', 'children' => array( 0 => 'field_farm_log_category', ), @@ -134,24 +134,22 @@ function farm_log_harvest_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_harvest'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', - 'weight' => '9', + 'label' => 'Files', + 'weight' => '6', 'children' => array( 0 => 'field_farm_files', 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', + 'formatter' => '', ), ); $field_groups['group_farm_files|log|farm_harvest|form'] = $field_group; @@ -164,24 +162,26 @@ function farm_log_harvest_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_harvest'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( - 0 => 'field_farm_lot_number', - 1 => 'name', - 2 => 'timestamp', + 0 => 'field_farm_notes', + 1 => 'field_farm_lot_number', + 2 => 'name', + 3 => 'timestamp', + 4 => 'group_farm_category', + 5 => 'group_farm_assignment', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'label' => 'General', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', 'required_fields' => 1, - 'id' => '', + 'classes' => '', ), + 'formatter' => '', ), ); $field_groups['group_farm_general|log|farm_harvest|form'] = $field_group; @@ -189,31 +189,147 @@ function farm_log_harvest_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_farm_notes|log|farm_harvest|form'; - $field_group->group_name = 'group_farm_notes'; + $field_group->identifier = 'group_farm_geometry|log|farm_harvest|form'; + $field_group->group_name = 'group_farm_geometry'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_harvest'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Geometry', + 'weight' => '4', + 'children' => array( + 0 => 'field_farm_geofield', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-geometry field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_geometry|log|farm_harvest|form'] = $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_farm_movement|log|farm_harvest|form'; + $field_group->group_name = 'group_farm_movement'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_harvest'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Movement', + 'weight' => '5', + 'children' => array( + 0 => 'field_farm_movement', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-movement field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_movement|log|farm_harvest|form'] = $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_farm_quantity|log|farm_harvest|form'; + $field_group->group_name = 'group_farm_quantity'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_harvest'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Quantity', + 'weight' => '3', + 'children' => array( + 0 => 'field_farm_quantity', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-quantity field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_quantity|log|farm_harvest|form'] = $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_farm_references|log|farm_harvest|form'; + $field_group->group_name = 'group_farm_references'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_harvest'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'References', + 'weight' => '2', + 'children' => array( + 0 => 'group_farm_assets', + 1 => 'group_farm_areas', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-references field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_references|log|farm_harvest|form'] = $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_farm_tabs|log|farm_harvest|form'; + $field_group->group_name = 'group_farm_tabs'; $field_group->entity_type = 'log'; $field_group->bundle = 'farm_harvest'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( - 'label' => 'Notes', - 'weight' => '6', + 'label' => 'Tabs', + 'weight' => '0', 'children' => array( - 0 => 'field_farm_notes', + 0 => 'group_farm_files', + 1 => 'group_farm_general', + 2 => 'group_farm_references', + 3 => 'group_farm_geometry', + 4 => 'group_farm_movement', + 5 => 'group_farm_quantity', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav', 'format_settings' => array( - 'label' => 'Notes', + 'label' => 'Tabs', 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-notes field-group-fieldset', - 'description' => '', + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', ), - 'formatter' => 'collapsed', ), ); - $field_groups['group_farm_notes|log|farm_harvest|form'] = $field_group; + $field_groups['group_farm_tabs|log|farm_harvest|form'] = $field_group; // Translatables // Included for use with string extractors like potx. @@ -221,9 +337,13 @@ function farm_log_harvest_field_group_info() { t('Assets'); t('Assignment'); t('Category'); - t('File attachments'); - t('General information'); - t('Notes'); + t('Files'); + t('General'); + t('Geometry'); + t('Movement'); + t('Quantity'); + t('References'); + t('Tabs'); return $field_groups; } diff --git a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.info b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.info index 06d70bfe7..eff353d2f 100644 --- a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.info +++ b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.info @@ -41,7 +41,11 @@ features[field_group][] = group_farm_assignment|log|farm_harvest|form features[field_group][] = group_farm_category|log|farm_harvest|form features[field_group][] = group_farm_files|log|farm_harvest|form features[field_group][] = group_farm_general|log|farm_harvest|form -features[field_group][] = group_farm_notes|log|farm_harvest|form +features[field_group][] = group_farm_geometry|log|farm_harvest|form +features[field_group][] = group_farm_movement|log|farm_harvest|form +features[field_group][] = group_farm_quantity|log|farm_harvest|form +features[field_group][] = group_farm_references|log|farm_harvest|form +features[field_group][] = group_farm_tabs|log|farm_harvest|form features[field_instance][] = log-farm_harvest-field_farm_area features[field_instance][] = log-farm_harvest-field_farm_asset features[field_instance][] = log-farm_harvest-field_farm_files diff --git a/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc b/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc index 7812e2596..9bd442f74 100644 --- a/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc +++ b/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc @@ -248,7 +248,7 @@ function farm_log_input_field_default_field_instances() { 'use_geocoder' => 1, ), 'type' => 'openlayers_geofield', - 'weight' => 4, + 'weight' => 3, ), ); @@ -456,7 +456,7 @@ function farm_log_input_field_default_field_instances() { 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => 8, + 'weight' => 4, ), ); @@ -597,7 +597,7 @@ function farm_log_input_field_default_field_instances() { 'module' => 'field_collection', 'settings' => array(), 'type' => 'field_collection_embed', - 'weight' => 5, + 'weight' => 4, ), ); @@ -637,7 +637,7 @@ function farm_log_input_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 4, + 'weight' => -2, ), ); @@ -676,7 +676,7 @@ function farm_log_input_field_default_field_instances() { 'module' => 'field_collection', 'settings' => array(), 'type' => 'field_collection_embed', - 'weight' => 3, + 'weight' => 1, ), ); diff --git a/modules/farm/farm_log/farm_log_input/farm_log_input.field_group.inc b/modules/farm/farm_log/farm_log_input/farm_log_input.field_group.inc index dce5eb368..23397bb3b 100644 --- a/modules/farm/farm_log/farm_log_input/farm_log_input.field_group.inc +++ b/modules/farm/farm_log/farm_log_input/farm_log_input.field_group.inc @@ -18,10 +18,10 @@ function farm_log_input_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_input'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_references'; $field_group->data = array( 'label' => 'Areas', - 'weight' => '2', + 'weight' => '3', 'children' => array( 0 => 'field_farm_area', ), @@ -34,7 +34,7 @@ function farm_log_input_field_group_info() { 'classes' => 'group-farm-areas field-group-fieldset', 'description' => '', ), - 'formatter' => 'collapsed', + 'formatter' => 'open', ), ); $field_groups['group_farm_areas|log|farm_input|form'] = $field_group; @@ -47,10 +47,10 @@ function farm_log_input_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_input'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_references'; $field_group->data = array( 'label' => 'Assets', - 'weight' => '1', + 'weight' => '2', 'children' => array( 0 => 'field_farm_asset', ), @@ -63,7 +63,7 @@ function farm_log_input_field_group_info() { 'classes' => 'group-farm-assets field-group-fieldset', 'description' => '', ), - 'formatter' => 'collapsed', + 'formatter' => 'open', ), ); $field_groups['group_farm_assets|log|farm_input|form'] = $field_group; @@ -76,10 +76,10 @@ function farm_log_input_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_input'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Assignment', - 'weight' => '8', + 'weight' => '0', 'children' => array( 0 => 'field_farm_log_owner', ), @@ -105,10 +105,10 @@ function farm_log_input_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_input'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Category', - 'weight' => '7', + 'weight' => '-1', 'children' => array( 0 => 'field_farm_log_category', ), @@ -134,24 +134,22 @@ function farm_log_input_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_input'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', - 'weight' => '9', + 'label' => 'Files', + 'weight' => '6', 'children' => array( 0 => 'field_farm_files', 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', + 'formatter' => '', ), ); $field_groups['group_farm_files|log|farm_input|form'] = $field_group; @@ -164,29 +162,31 @@ function farm_log_input_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_input'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( 0 => 'field_farm_input_method', 1 => 'field_farm_input_purpose', 2 => 'field_farm_input_source', 3 => 'field_farm_material', - 4 => 'field_farm_date_purchase', - 5 => 'field_farm_lot_number', - 6 => 'name', - 7 => 'timestamp', + 4 => 'field_farm_notes', + 5 => 'field_farm_date_purchase', + 6 => 'field_farm_lot_number', + 7 => 'name', + 8 => 'timestamp', + 9 => 'group_farm_category', + 10 => 'group_farm_assignment', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'label' => 'General', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', 'required_fields' => 1, - 'id' => '', + 'classes' => '', ), + 'formatter' => '', ), ); $field_groups['group_farm_general|log|farm_input|form'] = $field_group; @@ -194,31 +194,147 @@ function farm_log_input_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_farm_notes|log|farm_input|form'; - $field_group->group_name = 'group_farm_notes'; + $field_group->identifier = 'group_farm_geometry|log|farm_input|form'; + $field_group->group_name = 'group_farm_geometry'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_input'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Geometry', + 'weight' => '4', + 'children' => array( + 0 => 'field_farm_geofield', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-geometry field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_geometry|log|farm_input|form'] = $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_farm_movement|log|farm_input|form'; + $field_group->group_name = 'group_farm_movement'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_input'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Movement', + 'weight' => '5', + 'children' => array( + 0 => 'field_farm_movement', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-movement field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_movement|log|farm_input|form'] = $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_farm_quantity|log|farm_input|form'; + $field_group->group_name = 'group_farm_quantity'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_input'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Quantity', + 'weight' => '3', + 'children' => array( + 0 => 'field_farm_quantity', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-quantity field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_quantity|log|farm_input|form'] = $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_farm_references|log|farm_input|form'; + $field_group->group_name = 'group_farm_references'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_input'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'References', + 'weight' => '2', + 'children' => array( + 0 => 'group_farm_areas', + 1 => 'group_farm_assets', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-references field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_references|log|farm_input|form'] = $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_farm_tabs|log|farm_input|form'; + $field_group->group_name = 'group_farm_tabs'; $field_group->entity_type = 'log'; $field_group->bundle = 'farm_input'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( - 'label' => 'Notes', - 'weight' => '6', + 'label' => 'Tabs', + 'weight' => '0', 'children' => array( - 0 => 'field_farm_notes', + 0 => 'group_farm_files', + 1 => 'group_farm_general', + 2 => 'group_farm_references', + 3 => 'group_farm_geometry', + 4 => 'group_farm_movement', + 5 => 'group_farm_quantity', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav', 'format_settings' => array( - 'label' => 'Notes', + 'label' => 'Tabs', 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-notes field-group-fieldset', - 'description' => '', + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', ), - 'formatter' => 'collapsed', ), ); - $field_groups['group_farm_notes|log|farm_input|form'] = $field_group; + $field_groups['group_farm_tabs|log|farm_input|form'] = $field_group; // Translatables // Included for use with string extractors like potx. @@ -226,9 +342,13 @@ function farm_log_input_field_group_info() { t('Assets'); t('Assignment'); t('Category'); - t('File attachments'); - t('General information'); - t('Notes'); + t('Files'); + t('General'); + t('Geometry'); + t('Movement'); + t('Quantity'); + t('References'); + t('Tabs'); return $field_groups; } diff --git a/modules/farm/farm_log/farm_log_input/farm_log_input.info b/modules/farm/farm_log/farm_log_input/farm_log_input.info index bd7366a44..55f9f2469 100644 --- a/modules/farm/farm_log/farm_log_input/farm_log_input.info +++ b/modules/farm/farm_log/farm_log_input/farm_log_input.info @@ -49,7 +49,11 @@ features[field_group][] = group_farm_assignment|log|farm_input|form features[field_group][] = group_farm_category|log|farm_input|form features[field_group][] = group_farm_files|log|farm_input|form features[field_group][] = group_farm_general|log|farm_input|form -features[field_group][] = group_farm_notes|log|farm_input|form +features[field_group][] = group_farm_geometry|log|farm_input|form +features[field_group][] = group_farm_movement|log|farm_input|form +features[field_group][] = group_farm_quantity|log|farm_input|form +features[field_group][] = group_farm_references|log|farm_input|form +features[field_group][] = group_farm_tabs|log|farm_input|form features[field_instance][] = log-farm_input-field_farm_area features[field_instance][] = log-farm_input-field_farm_asset features[field_instance][] = log-farm_input-field_farm_date_purchase diff --git a/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc b/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc index 6813310cd..91e7e50ec 100644 --- a/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc +++ b/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc @@ -37,7 +37,7 @@ function farm_log_observation_field_default_field_instances() { 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => 3, + 'weight' => 8, ), ); @@ -116,7 +116,7 @@ function farm_log_observation_field_default_field_instances() { 'progress_indicator' => 'bar', ), 'type' => 'file_mfw', - 'weight' => 9, + 'weight' => 10, ), ); @@ -176,7 +176,7 @@ function farm_log_observation_field_default_field_instances() { 'use_geocoder' => 1, ), 'type' => 'openlayers_geofield', - 'weight' => 4, + 'weight' => 10, ), ); @@ -258,7 +258,7 @@ function farm_log_observation_field_default_field_instances() { 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => 9, + 'weight' => 7, ), ); @@ -292,7 +292,7 @@ function farm_log_observation_field_default_field_instances() { 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => 11, + 'weight' => 6, ), ); @@ -325,7 +325,7 @@ function farm_log_observation_field_default_field_instances() { 'module' => 'field_collection', 'settings' => array(), 'type' => 'field_collection_embed', - 'weight' => 5, + 'weight' => 9, ), ); @@ -359,7 +359,7 @@ function farm_log_observation_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 1, + 'weight' => 6, ), ); @@ -392,7 +392,7 @@ function farm_log_observation_field_default_field_instances() { 'module' => 'field_collection', 'settings' => array(), 'type' => 'field_collection_embed', - 'weight' => 3, + 'weight' => 9, ), ); diff --git a/modules/farm/farm_log/farm_log_observation/farm_log_observation.field_group.inc b/modules/farm/farm_log/farm_log_observation/farm_log_observation.field_group.inc index 11ff7ca20..56ebe0790 100644 --- a/modules/farm/farm_log/farm_log_observation/farm_log_observation.field_group.inc +++ b/modules/farm/farm_log/farm_log_observation/farm_log_observation.field_group.inc @@ -18,10 +18,10 @@ function farm_log_observation_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_observation'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_references'; $field_group->data = array( 'label' => 'Areas', - 'weight' => '2', + 'weight' => '7', 'children' => array( 0 => 'field_farm_area', ), @@ -34,7 +34,7 @@ function farm_log_observation_field_group_info() { 'classes' => 'group-farm-areas field-group-fieldset', 'description' => '', ), - 'formatter' => 'collapsed', + 'formatter' => 'open', ), ); $field_groups['group_farm_areas|log|farm_observation|form'] = $field_group; @@ -47,10 +47,10 @@ function farm_log_observation_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_observation'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_references'; $field_group->data = array( 'label' => 'Assets', - 'weight' => '1', + 'weight' => '6', 'children' => array( 0 => 'field_farm_asset', ), @@ -63,7 +63,7 @@ function farm_log_observation_field_group_info() { 'classes' => 'group-farm-assets field-group-fieldset', 'description' => '', ), - 'formatter' => 'collapsed', + 'formatter' => 'open', ), ); $field_groups['group_farm_assets|log|farm_observation|form'] = $field_group; @@ -76,7 +76,7 @@ function farm_log_observation_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_observation'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Assignment', 'weight' => '8', @@ -89,7 +89,7 @@ function farm_log_observation_field_group_info() { 'instance_settings' => array( 'required_fields' => 1, 'id' => '', - 'classes' => 'group-farm-assignment field-group-fieldset', + 'classes' => '', 'description' => '', ), 'formatter' => 'collapsed', @@ -105,7 +105,7 @@ function farm_log_observation_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_observation'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Category', 'weight' => '7', @@ -134,24 +134,21 @@ function farm_log_observation_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_observation'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', - 'weight' => '9', + 'label' => 'Files', + 'weight' => '12', 'children' => array( 0 => 'field_farm_files', 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'formatter' => '', 'instance_settings' => array( + 'classes' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', ), - 'formatter' => 'collapsed', ), ); $field_groups['group_farm_files|log|farm_observation|form'] = $field_group; @@ -164,22 +161,23 @@ function farm_log_observation_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_observation'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '6', 'children' => array( - 0 => 'name', - 1 => 'timestamp', + 0 => 'field_farm_notes', + 1 => 'name', + 2 => 'timestamp', + 3 => 'group_farm_assignment', + 4 => 'group_farm_category', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'formatter' => '', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', + 'classes' => '', 'required_fields' => 1, - 'id' => '', ), ), ); @@ -188,31 +186,147 @@ function farm_log_observation_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_farm_notes|log|farm_observation|form'; - $field_group->group_name = 'group_farm_notes'; + $field_group->identifier = 'group_farm_geometry|log|farm_observation|form'; + $field_group->group_name = 'group_farm_geometry'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_observation'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Geometry', + 'weight' => '9', + 'children' => array( + 0 => 'field_farm_geofield', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => '', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_geometry|log|farm_observation|form'] = $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_farm_movement|log|farm_observation|form'; + $field_group->group_name = 'group_farm_movement'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_observation'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Movement', + 'weight' => '10', + 'children' => array( + 0 => 'field_farm_movement', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => '', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_movement|log|farm_observation|form'] = $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_farm_quantity|log|farm_observation|form'; + $field_group->group_name = 'group_farm_quantity'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_observation'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Quantity', + 'weight' => '8', + 'children' => array( + 0 => 'field_farm_quantity', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => '', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_quantity|log|farm_observation|form'] = $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_farm_references|log|farm_observation|form'; + $field_group->group_name = 'group_farm_references'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_observation'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'References', + 'weight' => '7', + 'children' => array( + 0 => 'group_farm_areas', + 1 => 'group_farm_assets', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => '', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_references|log|farm_observation|form'] = $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_farm_tabs|log|farm_observation|form'; + $field_group->group_name = 'group_farm_tabs'; $field_group->entity_type = 'log'; $field_group->bundle = 'farm_observation'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( - 'label' => 'Notes', - 'weight' => '6', + 'label' => 'Tabs', + 'weight' => '1', 'children' => array( - 0 => 'field_farm_notes', + 0 => 'group_farm_files', + 1 => 'group_farm_general', + 2 => 'group_farm_references', + 3 => 'group_farm_movement', + 4 => 'group_farm_geometry', + 5 => 'group_farm_quantity', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav', 'format_settings' => array( - 'label' => 'Notes', + 'label' => 'Tabs', 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-notes field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', ), ); - $field_groups['group_farm_notes|log|farm_observation|form'] = $field_group; + $field_groups['group_farm_tabs|log|farm_observation|form'] = $field_group; // Translatables // Included for use with string extractors like potx. @@ -220,9 +334,13 @@ function farm_log_observation_field_group_info() { t('Assets'); t('Assignment'); t('Category'); - t('File attachments'); - t('General information'); - t('Notes'); + t('Files'); + t('General'); + t('Geometry'); + t('Movement'); + t('Quantity'); + t('References'); + t('Tabs'); return $field_groups; } diff --git a/modules/farm/farm_log/farm_log_observation/farm_log_observation.info b/modules/farm/farm_log/farm_log_observation/farm_log_observation.info index c640e9d9d..72fb82464 100644 --- a/modules/farm/farm_log/farm_log_observation/farm_log_observation.info +++ b/modules/farm/farm_log/farm_log_observation/farm_log_observation.info @@ -41,7 +41,11 @@ features[field_group][] = group_farm_assignment|log|farm_observation|form features[field_group][] = group_farm_category|log|farm_observation|form features[field_group][] = group_farm_files|log|farm_observation|form features[field_group][] = group_farm_general|log|farm_observation|form -features[field_group][] = group_farm_notes|log|farm_observation|form +features[field_group][] = group_farm_geometry|log|farm_observation|form +features[field_group][] = group_farm_movement|log|farm_observation|form +features[field_group][] = group_farm_quantity|log|farm_observation|form +features[field_group][] = group_farm_references|log|farm_observation|form +features[field_group][] = group_farm_tabs|log|farm_observation|form features[field_instance][] = log-farm_observation-field_farm_area features[field_instance][] = log-farm_observation-field_farm_asset features[field_instance][] = log-farm_observation-field_farm_files diff --git a/modules/farm/farm_log/farm_log_sale/farm_log_sale.features.field_instance.inc b/modules/farm/farm_log/farm_log_sale/farm_log_sale.features.field_instance.inc index 79091ce75..7b6c1efe5 100644 --- a/modules/farm/farm_log/farm_log_sale/farm_log_sale.features.field_instance.inc +++ b/modules/farm/farm_log/farm_log_sale/farm_log_sale.features.field_instance.inc @@ -334,7 +334,7 @@ function farm_log_sale_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 5, + 'weight' => 8, ), ); @@ -367,7 +367,7 @@ function farm_log_sale_field_default_field_instances() { 'module' => 'field_collection', 'settings' => array(), 'type' => 'field_collection_embed', - 'weight' => 1, + 'weight' => 2, ), ); diff --git a/modules/farm/farm_log/farm_log_sale/farm_log_sale.field_group.inc b/modules/farm/farm_log/farm_log_sale/farm_log_sale.field_group.inc index a03d28645..116ad8eb8 100644 --- a/modules/farm/farm_log/farm_log_sale/farm_log_sale.field_group.inc +++ b/modules/farm/farm_log/farm_log_sale/farm_log_sale.field_group.inc @@ -18,10 +18,10 @@ function farm_log_sale_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_sale'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_references'; $field_group->data = array( 'label' => 'Assets', - 'weight' => '2', + 'weight' => '3', 'children' => array( 0 => 'field_farm_asset', ), @@ -34,7 +34,7 @@ function farm_log_sale_field_group_info() { 'classes' => 'group-farm-assets field-group-fieldset', 'description' => '', ), - 'formatter' => 'collapsed', + 'formatter' => 'open', ), ); $field_groups['group_farm_assets|log|farm_sale|form'] = $field_group; @@ -47,10 +47,10 @@ function farm_log_sale_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_sale'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Assignment', - 'weight' => '5', + 'weight' => '10', 'children' => array( 0 => 'field_farm_log_owner', ), @@ -76,24 +76,22 @@ function farm_log_sale_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_sale'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', - 'weight' => '6', + 'label' => 'Files', + 'weight' => '4', 'children' => array( 0 => 'field_farm_files', 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-attachments field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', + 'formatter' => '', ), ); $field_groups['group_farm_attachments|log|farm_sale|form'] = $field_group; @@ -106,10 +104,10 @@ function farm_log_sale_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_sale'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Category', - 'weight' => '4', + 'weight' => '9', 'children' => array( 0 => 'field_farm_log_category', ), @@ -135,27 +133,29 @@ function farm_log_sale_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_sale'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( 0 => 'field_farm_lot_number', - 1 => 'field_farm_unit_price', - 2 => 'field_farm_total_price', - 3 => 'field_farm_customer', - 4 => 'field_farm_invoice_number', - 5 => 'timestamp', + 1 => 'field_farm_notes', + 2 => 'field_farm_unit_price', + 3 => 'field_farm_total_price', + 4 => 'field_farm_customer', + 5 => 'field_farm_invoice_number', + 6 => 'timestamp', + 7 => 'group_farm_category', + 8 => 'group_farm_assignment', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'label' => 'General', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', 'required_fields' => 1, - 'id' => '', + 'classes' => '', ), + 'formatter' => '', ), ); $field_groups['group_farm_general|log|farm_sale|form'] = $field_group; @@ -163,40 +163,103 @@ function farm_log_sale_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_farm_notes|log|farm_sale|form'; - $field_group->group_name = 'group_farm_notes'; + $field_group->identifier = 'group_farm_quantity|log|farm_sale|form'; + $field_group->group_name = 'group_farm_quantity'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_sale'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'Quantity', + 'weight' => '3', + 'children' => array( + 0 => 'field_farm_quantity', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-quantity field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_quantity|log|farm_sale|form'] = $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_farm_references|log|farm_sale|form'; + $field_group->group_name = 'group_farm_references'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_sale'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'References', + 'weight' => '2', + 'children' => array( + 0 => 'group_farm_assets', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'formatter' => '', + 'instance_settings' => array( + 'classes' => 'group-farm-references field-group-field_group_easy_responsive_tabs_nav_item', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_farm_references|log|farm_sale|form'] = $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_farm_tabs|log|farm_sale|form'; + $field_group->group_name = 'group_farm_tabs'; $field_group->entity_type = 'log'; $field_group->bundle = 'farm_sale'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( - 'label' => 'Notes', - 'weight' => '3', + 'label' => 'Tabs', + 'weight' => '0', 'children' => array( - 0 => 'field_farm_notes', + 0 => 'group_farm_general', + 1 => 'group_farm_attachments', + 2 => 'group_farm_references', + 3 => 'group_farm_quantity', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav', 'format_settings' => array( - 'label' => 'Notes', + 'label' => 'Tabs', 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-notes field-group-fieldset', - 'description' => '', + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', ), - 'formatter' => 'collapsed', ), ); - $field_groups['group_farm_notes|log|farm_sale|form'] = $field_group; + $field_groups['group_farm_tabs|log|farm_sale|form'] = $field_group; // Translatables // Included for use with string extractors like potx. t('Assets'); t('Assignment'); t('Category'); - t('File attachments'); - t('General information'); - t('Notes'); + t('Files'); + t('General'); + t('Quantity'); + t('References'); + t('Tabs'); return $field_groups; } diff --git a/modules/farm/farm_log/farm_log_sale/farm_log_sale.info b/modules/farm/farm_log/farm_log_sale/farm_log_sale.info index 1b8642558..a4171efe3 100644 --- a/modules/farm/farm_log/farm_log_sale/farm_log_sale.info +++ b/modules/farm/farm_log/farm_log_sale/farm_log_sale.info @@ -34,7 +34,9 @@ features[field_group][] = group_farm_assignment|log|farm_sale|form features[field_group][] = group_farm_attachments|log|farm_sale|form features[field_group][] = group_farm_category|log|farm_sale|form features[field_group][] = group_farm_general|log|farm_sale|form -features[field_group][] = group_farm_notes|log|farm_sale|form +features[field_group][] = group_farm_quantity|log|farm_sale|form +features[field_group][] = group_farm_references|log|farm_sale|form +features[field_group][] = group_farm_tabs|log|farm_sale|form features[field_instance][] = log-farm_sale-field_farm_asset features[field_instance][] = log-farm_sale-field_farm_customer features[field_instance][] = log-farm_sale-field_farm_files diff --git a/modules/farm/farm_sensor/farm_sensor.features.field_instance.inc b/modules/farm/farm_sensor/farm_sensor.features.field_instance.inc index a50de1a3f..cb60166c3 100644 --- a/modules/farm/farm_sensor/farm_sensor.features.field_instance.inc +++ b/modules/farm/farm_sensor/farm_sensor.features.field_instance.inc @@ -40,7 +40,7 @@ function farm_sensor_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 2, + 'weight' => -9, ), ); diff --git a/modules/farm/farm_sensor/farm_sensor.field_group.inc b/modules/farm/farm_sensor/farm_sensor.field_group.inc index e66d5a3e9..29a3309fc 100644 --- a/modules/farm/farm_sensor/farm_sensor.field_group.inc +++ b/modules/farm/farm_sensor/farm_sensor.field_group.inc @@ -10,35 +10,6 @@ function farm_sensor_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_farm_description|farm_asset|sensor|form'; - $field_group->group_name = 'group_farm_description'; - $field_group->entity_type = 'farm_asset'; - $field_group->bundle = 'sensor'; - $field_group->mode = 'form'; - $field_group->parent_name = ''; - $field_group->data = array( - 'label' => 'Description', - 'weight' => '1', - 'children' => array( - 0 => 'field_farm_description', - ), - 'format_type' => 'fieldset', - 'format_settings' => array( - 'label' => 'Description', - 'instance_settings' => array( - 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-description field-group-fieldset', - 'description' => '', - ), - 'formatter' => 'collapsed', - ), - ); - $field_groups['group_farm_description|farm_asset|sensor|form'] = $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; @@ -47,24 +18,22 @@ function farm_sensor_field_group_info() { $field_group->entity_type = 'farm_asset'; $field_group->bundle = 'sensor'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', + 'label' => 'Files', 'weight' => '2', 'children' => array( 0 => 'field_farm_files', 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', + 'formatter' => '', ), ); $field_groups['group_farm_files|farm_asset|sensor|form'] = $field_group; @@ -77,31 +46,67 @@ function farm_sensor_field_group_info() { $field_group->entity_type = 'farm_asset'; $field_group->bundle = 'sensor'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( - 0 => 'name', + 0 => 'field_farm_description', + 1 => 'name', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'label' => 'General', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', 'required_fields' => 1, - 'id' => '', + 'classes' => '', ), + 'formatter' => '', ), ); $field_groups['group_farm_general|farm_asset|sensor|form'] = $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_farm_tabs|farm_asset|sensor|form'; + $field_group->group_name = 'group_farm_tabs'; + $field_group->entity_type = 'farm_asset'; + $field_group->bundle = 'sensor'; + $field_group->mode = 'form'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'Tabs', + 'weight' => '0', + 'children' => array( + 0 => 'group_farm_files', + 1 => 'group_farm_general', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav', + 'format_settings' => array( + 'label' => 'Tabs', + 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', + 'required_fields' => 1, + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', + ), + ), + ); + $field_groups['group_farm_tabs|farm_asset|sensor|form'] = $field_group; + // Translatables // Included for use with string extractors like potx. - t('Description'); - t('File attachments'); - t('General information'); + t('Files'); + t('General'); + t('Tabs'); return $field_groups; } diff --git a/modules/farm/farm_sensor/farm_sensor.info b/modules/farm/farm_sensor/farm_sensor.info index cb02c4de1..feef01c03 100644 --- a/modules/farm/farm_sensor/farm_sensor.info +++ b/modules/farm/farm_sensor/farm_sensor.info @@ -25,9 +25,9 @@ features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 features[farm_asset_type][] = sensor features[features_api][] = api:2 -features[field_group][] = group_farm_description|farm_asset|sensor|form features[field_group][] = group_farm_files|farm_asset|sensor|form features[field_group][] = group_farm_general|farm_asset|sensor|form +features[field_group][] = group_farm_tabs|farm_asset|sensor|form features[field_instance][] = farm_asset-sensor-field_farm_description features[field_instance][] = farm_asset-sensor-field_farm_files features[field_instance][] = farm_asset-sensor-field_farm_images diff --git a/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.features.field_instance.inc b/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.features.field_instance.inc index 8dfada4b8..860e00971 100644 --- a/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.features.field_instance.inc +++ b/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.features.field_instance.inc @@ -40,7 +40,7 @@ function farm_soil_compost_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 1, + 'weight' => 2, ), ); diff --git a/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.field_group.inc b/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.field_group.inc index 632e548d6..5d3de712c 100644 --- a/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.field_group.inc +++ b/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.field_group.inc @@ -10,35 +10,6 @@ function farm_soil_compost_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_farm_description|farm_asset|compost|form'; - $field_group->group_name = 'group_farm_description'; - $field_group->entity_type = 'farm_asset'; - $field_group->bundle = 'compost'; - $field_group->mode = 'form'; - $field_group->parent_name = ''; - $field_group->data = array( - 'label' => 'Description', - 'weight' => '1', - 'children' => array( - 0 => 'field_farm_description', - ), - 'format_type' => 'fieldset', - 'format_settings' => array( - 'label' => 'Description', - 'instance_settings' => array( - 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-description field-group-fieldset', - 'description' => '', - ), - 'formatter' => 'collapsed', - ), - ); - $field_groups['group_farm_description|farm_asset|compost|form'] = $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; @@ -47,28 +18,54 @@ function farm_soil_compost_field_group_info() { $field_group->entity_type = 'farm_asset'; $field_group->bundle = 'compost'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', + 'label' => 'Files', 'weight' => '3', 'children' => array( 0 => 'field_farm_images', 1 => 'field_farm_files', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', + 'formatter' => '', ), ); $field_groups['group_farm_files|farm_asset|compost|form'] = $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_farm_general|farm_asset|compost|form'; + $field_group->group_name = 'group_farm_general'; + $field_group->entity_type = 'farm_asset'; + $field_group->bundle = 'compost'; + $field_group->mode = 'form'; + $field_group->parent_name = 'group_farm_tabs'; + $field_group->data = array( + 'label' => 'General', + 'weight' => '1', + 'children' => array( + 0 => 'field_farm_description', + 1 => 'name', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', + 'format_settings' => array( + 'label' => 'General', + 'instance_settings' => array( + 'required_fields' => 1, + 'classes' => '', + ), + 'formatter' => '', + ), + ); + $field_groups['group_farm_general|farm_asset|compost|form'] = $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; @@ -77,32 +74,67 @@ function farm_soil_compost_field_group_info() { $field_group->entity_type = 'farm_asset'; $field_group->bundle = 'compost'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( 'label' => 'Lineage', 'weight' => '2', 'children' => array( 0 => 'field_farm_parent', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'Lineage', + 'formatter' => '', 'instance_settings' => array( + 'classes' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-lineage field-group-fieldset', - 'description' => '', ), - 'formatter' => 'collapsed', ), ); $field_groups['group_farm_lineage|farm_asset|compost|form'] = $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_farm_tabs|farm_asset|compost|form'; + $field_group->group_name = 'group_farm_tabs'; + $field_group->entity_type = 'farm_asset'; + $field_group->bundle = 'compost'; + $field_group->mode = 'form'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'Tabs', + 'weight' => '0', + 'children' => array( + 0 => 'group_farm_general', + 1 => 'group_farm_files', + 2 => 'group_farm_lineage', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav', + 'format_settings' => array( + 'label' => 'Tabs', + 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', + 'required_fields' => 1, + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', + ), + ), + ); + $field_groups['group_farm_tabs|farm_asset|compost|form'] = $field_group; + // Translatables // Included for use with string extractors like potx. - t('Description'); - t('File attachments'); + t('Files'); + t('General'); t('Lineage'); + t('Tabs'); return $field_groups; } diff --git a/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.info b/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.info index 981db28aa..09a51dc31 100644 --- a/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.info +++ b/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.info @@ -22,9 +22,10 @@ features[ctools][] = field_group:field_group:1 features[ctools][] = views:views_default:3.0 features[farm_asset_type][] = compost features[features_api][] = api:2 -features[field_group][] = group_farm_description|farm_asset|compost|form features[field_group][] = group_farm_files|farm_asset|compost|form +features[field_group][] = group_farm_general|farm_asset|compost|form features[field_group][] = group_farm_lineage|farm_asset|compost|form +features[field_group][] = group_farm_tabs|farm_asset|compost|form features[field_instance][] = farm_asset-compost-field_farm_description features[field_instance][] = farm_asset-compost-field_farm_files features[field_instance][] = farm_asset-compost-field_farm_images diff --git a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc index 4b948d21e..1391d8cba 100644 --- a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc +++ b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc @@ -37,7 +37,7 @@ function farm_soil_test_field_default_field_instances() { 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => 2, + 'weight' => 6, ), ); @@ -139,7 +139,7 @@ function farm_soil_test_field_default_field_instances() { 'use_geocoder' => 1, ), 'type' => 'openlayers_geofield', - 'weight' => 3, + 'weight' => 7, ), ); @@ -289,7 +289,7 @@ function farm_soil_test_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 6, + 'weight' => -7, ), ); @@ -323,7 +323,7 @@ function farm_soil_test_field_default_field_instances() { 'size' => 60, ), 'type' => 'text_textfield', - 'weight' => 4, + 'weight' => -8, ), ); @@ -357,7 +357,7 @@ function farm_soil_test_field_default_field_instances() { 'size' => 60, ), 'type' => 'taxonomy_autocomplete', - 'weight' => 5, + 'weight' => 8, ), ); diff --git a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.field_group.inc b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.field_group.inc index 3dea2a8c3..6c6c5a5ca 100644 --- a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.field_group.inc +++ b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.field_group.inc @@ -18,10 +18,10 @@ function farm_soil_test_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_soil_test'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Assignment', - 'weight' => '4', + 'weight' => '-5', 'children' => array( 0 => 'field_farm_log_owner', ), @@ -47,10 +47,10 @@ function farm_soil_test_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_soil_test'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Category', - 'weight' => '3', + 'weight' => '-6', 'children' => array( 0 => 'field_farm_log_category', ), @@ -76,24 +76,22 @@ function farm_soil_test_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_soil_test'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', - 'weight' => '5', + 'label' => 'Files', + 'weight' => '4', 'children' => array( 0 => 'field_farm_files', 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', + 'formatter' => '', ), ); $field_groups['group_farm_files|log|farm_soil_test|form'] = $field_group; @@ -106,57 +104,30 @@ function farm_soil_test_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_soil_test'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( - 0 => 'field_farm_soil_lab', - 1 => 'name', - 2 => 'timestamp', + 0 => 'field_farm_notes', + 1 => 'field_farm_soil_lab', + 2 => 'name', + 3 => 'timestamp', + 4 => 'group_farm_category', + 5 => 'group_farm_assignment', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'label' => 'General', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', 'required_fields' => 1, - 'id' => '', + 'classes' => '', ), + 'formatter' => '', ), ); $field_groups['group_farm_general|log|farm_soil_test|form'] = $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_farm_notes|log|farm_soil_test|form'; - $field_group->group_name = 'group_farm_notes'; - $field_group->entity_type = 'log'; - $field_group->bundle = 'farm_soil_test'; - $field_group->mode = 'form'; - $field_group->parent_name = ''; - $field_group->data = array( - 'label' => 'Notes', - 'weight' => '2', - 'children' => array( - 0 => 'field_farm_notes', - ), - 'format_type' => 'fieldset', - 'format_settings' => array( - 'label' => 'Notes', - 'instance_settings' => array( - 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-notes field-group-fieldset', - 'description' => '', - ), - 'formatter' => 'collapsed', - ), - ); - $field_groups['group_farm_notes|log|farm_soil_test|form'] = $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; @@ -165,36 +136,71 @@ function farm_soil_test_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_soil_test'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( 'label' => 'Soil information', - 'weight' => '1', + 'weight' => '2', 'children' => array( 0 => 'field_farm_area', 1 => 'field_farm_soil_names', 2 => 'field_farm_geofield', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'formatter' => '', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-soil field-group-fieldset', + 'classes' => '', 'required_fields' => 1, - 'id' => '', ), ), ); $field_groups['group_farm_soil|log|farm_soil_test|form'] = $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_farm_tabs|log|farm_soil_test|form'; + $field_group->group_name = 'group_farm_tabs'; + $field_group->entity_type = 'log'; + $field_group->bundle = 'farm_soil_test'; + $field_group->mode = 'form'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'Tabs', + 'weight' => '0', + 'children' => array( + 0 => 'group_farm_files', + 1 => 'group_farm_general', + 2 => 'group_farm_soil', + ), + 'format_type' => 'field_group_easy_responsive_tabs_nav', + 'format_settings' => array( + 'label' => 'Tabs', + 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', + 'required_fields' => 1, + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', + ), + ), + ); + $field_groups['group_farm_tabs|log|farm_soil_test|form'] = $field_group; + // Translatables // Included for use with string extractors like potx. t('Assignment'); t('Category'); - t('File attachments'); - t('General information'); - t('Notes'); + t('Files'); + t('General'); t('Soil information'); + t('Tabs'); return $field_groups; } diff --git a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info index 7f73a2d8e..64d3e84b9 100644 --- a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info +++ b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info @@ -33,8 +33,8 @@ features[field_group][] = group_farm_assignment|log|farm_soil_test|form features[field_group][] = group_farm_category|log|farm_soil_test|form features[field_group][] = group_farm_files|log|farm_soil_test|form features[field_group][] = group_farm_general|log|farm_soil_test|form -features[field_group][] = group_farm_notes|log|farm_soil_test|form features[field_group][] = group_farm_soil|log|farm_soil_test|form +features[field_group][] = group_farm_tabs|log|farm_soil_test|form features[field_instance][] = log-farm_soil_test-field_farm_area features[field_instance][] = log-farm_soil_test-field_farm_files features[field_instance][] = log-farm_soil_test-field_farm_geofield diff --git a/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc b/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc index cb320ed6a..ade8ebf21 100644 --- a/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc +++ b/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc @@ -287,7 +287,7 @@ function farm_water_test_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 4, + 'weight' => 17, ), ); @@ -321,7 +321,7 @@ function farm_water_test_field_default_field_instances() { 'size' => 60, ), 'type' => 'text_textfield', - 'weight' => 3, + 'weight' => 16, ), ); diff --git a/modules/farm/farm_water/farm_water_test/farm_water_test.field_group.inc b/modules/farm/farm_water/farm_water_test/farm_water_test.field_group.inc index 2f5e2f013..04314cb6d 100644 --- a/modules/farm/farm_water/farm_water_test/farm_water_test.field_group.inc +++ b/modules/farm/farm_water/farm_water_test/farm_water_test.field_group.inc @@ -18,10 +18,10 @@ function farm_water_test_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_water_test'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Assignment', - 'weight' => '4', + 'weight' => '19', 'children' => array( 0 => 'field_farm_log_owner', ), @@ -47,10 +47,10 @@ function farm_water_test_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_water_test'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_general'; $field_group->data = array( 'label' => 'Category', - 'weight' => '3', + 'weight' => '18', 'children' => array( 0 => 'field_farm_log_category', ), @@ -76,24 +76,22 @@ function farm_water_test_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_water_test'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'File attachments', - 'weight' => '5', + 'label' => 'Files', + 'weight' => '3', 'children' => array( 0 => 'field_farm_files', 1 => 'field_farm_images', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'File attachments', + 'label' => 'Files', 'instance_settings' => array( 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-files field-group-fieldset', - 'description' => '', + 'classes' => '', ), - 'formatter' => 'collapsed', + 'formatter' => '', ), ); $field_groups['group_farm_files|log|farm_water_test|form'] = $field_group; @@ -106,24 +104,26 @@ function farm_water_test_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_water_test'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( - 'label' => 'General information', - 'weight' => '0', + 'label' => 'General', + 'weight' => '1', 'children' => array( - 0 => 'field_farm_water_lab', - 1 => 'name', - 2 => 'timestamp', + 0 => 'field_farm_notes', + 1 => 'field_farm_water_lab', + 2 => 'name', + 3 => 'timestamp', + 4 => 'group_farm_category', + 5 => 'group_farm_assignment', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'formatter' => 'collapsible', + 'label' => 'General', 'instance_settings' => array( - 'description' => '', - 'classes' => 'group-farm-general field-group-fieldset', 'required_fields' => 1, - 'id' => '', + 'classes' => '', ), + 'formatter' => '', ), ); $field_groups['group_farm_general|log|farm_water_test|form'] = $field_group; @@ -131,31 +131,39 @@ function farm_water_test_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_farm_notes|log|farm_water_test|form'; - $field_group->group_name = 'group_farm_notes'; + $field_group->identifier = 'group_farm_tabs|log|farm_water_test|form'; + $field_group->group_name = 'group_farm_tabs'; $field_group->entity_type = 'log'; $field_group->bundle = 'farm_water_test'; $field_group->mode = 'form'; $field_group->parent_name = ''; $field_group->data = array( - 'label' => 'Notes', - 'weight' => '2', + 'label' => 'Tabs', + 'weight' => '0', 'children' => array( - 0 => 'field_farm_notes', + 0 => 'group_farm_files', + 1 => 'group_farm_general', + 2 => 'group_farm_water', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav', 'format_settings' => array( - 'label' => 'Notes', + 'label' => 'Tabs', 'instance_settings' => array( + 'type' => 'vertical', + 'width' => 'auto', + 'fit' => '1', + 'closed' => '0', + 'activetab_bg' => '', + 'inactive_bg' => '', + 'active_border_color' => '', + 'active_content_border_color' => '', + 'tabidentify' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-notes field-group-fieldset', - 'description' => '', + 'classes' => 'group-farm-tabs field-group-field_group_easy_responsive_tabs_nav', ), - 'formatter' => 'collapsed', ), ); - $field_groups['group_farm_notes|log|farm_water_test|form'] = $field_group; + $field_groups['group_farm_tabs|log|farm_water_test|form'] = $field_group; $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ @@ -165,24 +173,21 @@ function farm_water_test_field_group_info() { $field_group->entity_type = 'log'; $field_group->bundle = 'farm_water_test'; $field_group->mode = 'form'; - $field_group->parent_name = ''; + $field_group->parent_name = 'group_farm_tabs'; $field_group->data = array( 'label' => 'Water information', - 'weight' => '1', + 'weight' => '2', 'children' => array( 0 => 'field_farm_area', 1 => 'field_farm_geofield', ), - 'format_type' => 'fieldset', + 'format_type' => 'field_group_easy_responsive_tabs_nav_item', 'format_settings' => array( - 'label' => 'Water information', + 'formatter' => '', 'instance_settings' => array( + 'classes' => '', 'required_fields' => 1, - 'id' => '', - 'classes' => 'group-farm-water field-group-fieldset', - 'description' => '', ), - 'formatter' => 'collapsible', ), ); $field_groups['group_farm_water|log|farm_water_test|form'] = $field_group; @@ -191,9 +196,9 @@ function farm_water_test_field_group_info() { // Included for use with string extractors like potx. t('Assignment'); t('Category'); - t('File attachments'); - t('General information'); - t('Notes'); + t('Files'); + t('General'); + t('Tabs'); t('Water information'); return $field_groups; diff --git a/modules/farm/farm_water/farm_water_test/farm_water_test.info b/modules/farm/farm_water/farm_water_test/farm_water_test.info index 9abeca598..812c0ae92 100644 --- a/modules/farm/farm_water/farm_water_test/farm_water_test.info +++ b/modules/farm/farm_water/farm_water_test/farm_water_test.info @@ -32,7 +32,7 @@ features[field_group][] = group_farm_assignment|log|farm_water_test|form features[field_group][] = group_farm_category|log|farm_water_test|form features[field_group][] = group_farm_files|log|farm_water_test|form features[field_group][] = group_farm_general|log|farm_water_test|form -features[field_group][] = group_farm_notes|log|farm_water_test|form +features[field_group][] = group_farm_tabs|log|farm_water_test|form features[field_group][] = group_farm_water|log|farm_water_test|form features[field_instance][] = log-farm_water_test-field_farm_area features[field_instance][] = log-farm_water_test-field_farm_files