3
0
Fork 0
mirror of https://github.com/farmOS/farmOS.git synced 2024-02-23 11:37:38 +01:00

Move areas, movement, and inventory field displays relative to assets, and other field display consistency fixes.

This commit is contained in:
Michael Stenta 2017-10-31 12:07:02 -04:00
parent 59f706dd27
commit b0f8ceb439
10 changed files with 97 additions and 97 deletions

View file

@ -290,7 +290,7 @@ function farm_crop_field_default_field_instances() {
'module' => 'file',
'settings' => array(),
'type' => 'file_table',
'weight' => 6,
'weight' => 8,
),
),
'entity_type' => 'log',
@ -335,7 +335,7 @@ function farm_crop_field_default_field_instances() {
'colorbox_node_style_first' => 'large',
),
'type' => 'colorbox',
'weight' => 5,
'weight' => 7,
),
),
'entity_type' => 'log',
@ -379,7 +379,7 @@ function farm_crop_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 9,
'weight' => 4,
),
),
'entity_type' => 'log',
@ -410,7 +410,7 @@ function farm_crop_field_default_field_instances() {
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_link',
'weight' => 8,
'weight' => 9,
),
),
'entity_type' => 'log',
@ -444,7 +444,7 @@ function farm_crop_field_default_field_instances() {
'link' => FALSE,
),
'type' => 'entityreference_label',
'weight' => 4,
'weight' => 6,
),
),
'entity_type' => 'log',
@ -477,7 +477,7 @@ function farm_crop_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 7,
'weight' => 1,
),
),
'entity_type' => 'log',
@ -508,7 +508,7 @@ function farm_crop_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 3,
'weight' => 5,
),
),
'entity_type' => 'log',
@ -544,7 +544,7 @@ function farm_crop_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 1,
'weight' => 2,
),
),
'entity_type' => 'log',
@ -575,7 +575,7 @@ function farm_crop_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 2,
'weight' => 3,
),
),
'entity_type' => 'log',
@ -649,7 +649,7 @@ function farm_crop_field_default_field_instances() {
'module' => 'file',
'settings' => array(),
'type' => 'file_table',
'weight' => 5,
'weight' => 7,
),
),
'entity_type' => 'log',
@ -694,7 +694,7 @@ function farm_crop_field_default_field_instances() {
'colorbox_node_style_first' => 'large',
),
'type' => 'colorbox',
'weight' => 4,
'weight' => 6,
),
),
'entity_type' => 'log',
@ -738,7 +738,7 @@ function farm_crop_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 8,
'weight' => 3,
),
),
'entity_type' => 'log',
@ -769,7 +769,7 @@ function farm_crop_field_default_field_instances() {
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_link',
'weight' => 7,
'weight' => 8,
),
),
'entity_type' => 'log',
@ -803,7 +803,7 @@ function farm_crop_field_default_field_instances() {
'link' => FALSE,
),
'type' => 'entityreference_label',
'weight' => 3,
'weight' => 5,
),
),
'entity_type' => 'log',
@ -836,7 +836,7 @@ function farm_crop_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 6,
'weight' => 1,
),
),
'entity_type' => 'log',
@ -867,7 +867,7 @@ function farm_crop_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 2,
'weight' => 4,
),
),
'entity_type' => 'log',
@ -903,7 +903,7 @@ function farm_crop_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 1,
'weight' => 2,
),
),
'entity_type' => 'log',

View file

@ -287,7 +287,7 @@ function farm_equipment_field_default_field_instances() {
'module' => 'file',
'settings' => array(),
'type' => 'file_table',
'weight' => 4,
'weight' => 7,
),
),
'entity_type' => 'log',
@ -333,7 +333,7 @@ function farm_equipment_field_default_field_instances() {
'colorbox_node_style_first' => 'large',
),
'type' => 'colorbox',
'weight' => 3,
'weight' => 6,
),
),
'entity_type' => 'log',
@ -377,7 +377,7 @@ function farm_equipment_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 7,
'weight' => 2,
),
),
'entity_type' => 'log',
@ -404,11 +404,11 @@ function farm_equipment_field_default_field_instances() {
'description' => 'Use this to organize your logs into categories for easier searching and filtering later.',
'display' => array(
'default' => array(
'label' => 'above',
'label' => 'inline',
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_link',
'weight' => 6,
'weight' => 4,
),
),
'entity_type' => 'log',
@ -442,7 +442,7 @@ function farm_equipment_field_default_field_instances() {
'link' => FALSE,
),
'type' => 'entityreference_label',
'weight' => 2,
'weight' => 5,
),
),
'entity_type' => 'log',
@ -475,7 +475,7 @@ function farm_equipment_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 5,
'weight' => 1,
),
),
'entity_type' => 'log',
@ -506,7 +506,7 @@ function farm_equipment_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 1,
'weight' => 3,
),
),
'entity_type' => 'log',

View file

@ -582,7 +582,7 @@ function farm_livestock_field_default_field_instances() {
'module' => 'file',
'settings' => array(),
'type' => 'file_table',
'weight' => 4,
'weight' => 6,
),
),
'entity_type' => 'log',
@ -628,7 +628,7 @@ function farm_livestock_field_default_field_instances() {
'colorbox_node_style_first' => 'large',
),
'type' => 'colorbox',
'weight' => 3,
'weight' => 5,
),
),
'entity_type' => 'log',
@ -672,7 +672,7 @@ function farm_livestock_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 7,
'weight' => 2,
),
),
'entity_type' => 'log',
@ -703,7 +703,7 @@ function farm_livestock_field_default_field_instances() {
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_link',
'weight' => 6,
'weight' => 7,
),
),
'entity_type' => 'log',
@ -737,7 +737,7 @@ function farm_livestock_field_default_field_instances() {
'link' => FALSE,
),
'type' => 'entityreference_label',
'weight' => 2,
'weight' => 4,
),
),
'entity_type' => 'log',
@ -770,7 +770,7 @@ function farm_livestock_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 5,
'weight' => 1,
),
),
'entity_type' => 'log',
@ -801,7 +801,7 @@ function farm_livestock_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 1,
'weight' => 3,
),
),
'entity_type' => 'log',

View file

@ -22,7 +22,7 @@ function farm_log_activity_field_default_field_instances() {
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_link',
'weight' => 2,
'weight' => 0,
),
),
'entity_type' => 'log',
@ -56,7 +56,7 @@ function farm_log_activity_field_default_field_instances() {
'link' => 1,
),
'type' => 'entityreference_label',
'weight' => 0,
'weight' => 1,
),
),
'entity_type' => 'log',
@ -95,7 +95,7 @@ function farm_log_activity_field_default_field_instances() {
'module' => 'file',
'settings' => array(),
'type' => 'file_table',
'weight' => 7,
'weight' => 9,
),
),
'entity_type' => 'log',
@ -135,7 +135,7 @@ function farm_log_activity_field_default_field_instances() {
'map_layer_preset' => 'farm_map_geofield_formatter:openlayers_geofield_layer_formatter',
),
'type' => 'openlayers_geofield',
'weight' => 8,
'weight' => 10,
),
),
'entity_type' => 'log',
@ -199,7 +199,7 @@ function farm_log_activity_field_default_field_instances() {
'link' => 1,
),
'type' => 'entityreference_label',
'weight' => 1,
'weight' => 2,
),
),
'entity_type' => 'log',
@ -247,7 +247,7 @@ function farm_log_activity_field_default_field_instances() {
'colorbox_node_style_first' => 'large',
),
'type' => 'colorbox',
'weight' => 6,
'weight' => 8,
),
),
'entity_type' => 'log',
@ -291,7 +291,7 @@ function farm_log_activity_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 10,
'weight' => 4,
),
),
'entity_type' => 'log',
@ -322,7 +322,7 @@ function farm_log_activity_field_default_field_instances() {
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_plain',
'weight' => 4,
'weight' => 6,
),
),
'entity_type' => 'log',
@ -356,7 +356,7 @@ function farm_log_activity_field_default_field_instances() {
'link' => FALSE,
),
'type' => 'entityreference_label',
'weight' => 5,
'weight' => 7,
),
),
'entity_type' => 'log',
@ -389,7 +389,7 @@ function farm_log_activity_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 9,
'weight' => 3,
),
),
'entity_type' => 'log',
@ -420,7 +420,7 @@ function farm_log_activity_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 3,
'weight' => 5,
),
),
'entity_type' => 'log',

View file

@ -22,7 +22,7 @@ function farm_log_harvest_field_default_field_instances() {
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_link',
'weight' => 2,
'weight' => 1,
),
),
'entity_type' => 'log',
@ -55,7 +55,7 @@ function farm_log_harvest_field_default_field_instances() {
'link' => 1,
),
'type' => 'entityreference_label',
'weight' => 1,
'weight' => 2,
),
'token' => array(
'label' => 'above',
@ -100,7 +100,7 @@ function farm_log_harvest_field_default_field_instances() {
'module' => 'file',
'settings' => array(),
'type' => 'file_table',
'weight' => 8,
'weight' => 10,
),
'token' => array(
'label' => 'above',
@ -146,7 +146,7 @@ function farm_log_harvest_field_default_field_instances() {
'map_layer_preset' => 'farm_map_geofield_formatter:openlayers_geofield_layer_formatter',
),
'type' => 'openlayers_geofield',
'weight' => 9,
'weight' => 11,
),
'token' => array(
'label' => 'above',
@ -218,7 +218,7 @@ function farm_log_harvest_field_default_field_instances() {
'colorbox_node_style_first' => 'large',
),
'type' => 'colorbox',
'weight' => 7,
'weight' => 9,
),
'token' => array(
'label' => 'above',
@ -268,7 +268,7 @@ function farm_log_harvest_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 11,
'weight' => 4,
),
),
'entity_type' => 'log',
@ -299,7 +299,7 @@ function farm_log_harvest_field_default_field_instances() {
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_plain',
'weight' => 5,
'weight' => 7,
),
),
'entity_type' => 'log',
@ -333,7 +333,7 @@ function farm_log_harvest_field_default_field_instances() {
'link' => FALSE,
),
'type' => 'entityreference_label',
'weight' => 6,
'weight' => 8,
),
),
'entity_type' => 'log',
@ -400,7 +400,7 @@ function farm_log_harvest_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 10,
'weight' => 3,
),
),
'entity_type' => 'log',
@ -431,7 +431,7 @@ function farm_log_harvest_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 4,
'weight' => 6,
),
'token' => array(
'label' => 'above',
@ -473,7 +473,7 @@ function farm_log_harvest_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 3,
'weight' => 5,
),
'token' => array(
'label' => 'above',

View file

@ -22,7 +22,7 @@ function farm_log_input_field_default_field_instances() {
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_link',
'weight' => 3,
'weight' => 2,
),
'token' => array(
'label' => 'above',
@ -61,7 +61,7 @@ function farm_log_input_field_default_field_instances() {
'link' => 1,
),
'type' => 'entityreference_label',
'weight' => 2,
'weight' => 3,
),
'token' => array(
'label' => 'above',
@ -112,7 +112,7 @@ function farm_log_input_field_default_field_instances() {
'show_remaining_days' => 0,
),
'type' => 'date_default',
'weight' => 8,
'weight' => 9,
),
),
'entity_type' => 'log',
@ -155,7 +155,7 @@ function farm_log_input_field_default_field_instances() {
'module' => 'file',
'settings' => array(),
'type' => 'file_table',
'weight' => 13,
'weight' => 15,
),
'token' => array(
'label' => 'above',
@ -201,7 +201,7 @@ function farm_log_input_field_default_field_instances() {
'map_layer_preset' => 'farm_map_geofield_formatter:openlayers_geofield_layer_formatter',
),
'type' => 'openlayers_geofield',
'weight' => 14,
'weight' => 16,
),
'token' => array(
'label' => 'above',
@ -273,7 +273,7 @@ function farm_log_input_field_default_field_instances() {
'colorbox_node_style_first' => 'large',
),
'type' => 'colorbox',
'weight' => 12,
'weight' => 14,
),
'token' => array(
'label' => 'above',
@ -321,7 +321,7 @@ function farm_log_input_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 5,
'weight' => 6,
),
'token' => array(
'label' => 'above',
@ -361,7 +361,7 @@ function farm_log_input_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 4,
'weight' => 5,
),
'token' => array(
'label' => 'above',
@ -401,7 +401,7 @@ function farm_log_input_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 6,
'weight' => 7,
),
'token' => array(
'label' => 'above',
@ -443,7 +443,7 @@ function farm_log_input_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 16,
'weight' => 10,
),
),
'entity_type' => 'log',
@ -474,7 +474,7 @@ function farm_log_input_field_default_field_instances() {
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_plain',
'weight' => 10,
'weight' => 12,
),
),
'entity_type' => 'log',
@ -508,7 +508,7 @@ function farm_log_input_field_default_field_instances() {
'link' => FALSE,
),
'type' => 'entityreference_label',
'weight' => 11,
'weight' => 13,
),
),
'entity_type' => 'log',
@ -539,7 +539,7 @@ function farm_log_input_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 7,
'weight' => 8,
),
),
'entity_type' => 'log',
@ -615,7 +615,7 @@ function farm_log_input_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 15,
'weight' => 4,
),
),
'entity_type' => 'log',
@ -646,7 +646,7 @@ function farm_log_input_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 9,
'weight' => 11,
),
'token' => array(
'label' => 'above',

View file

@ -22,7 +22,7 @@ function farm_log_observation_field_default_field_instances() {
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_link',
'weight' => 2,
'weight' => 0,
),
),
'entity_type' => 'log',
@ -56,7 +56,7 @@ function farm_log_observation_field_default_field_instances() {
'link' => 1,
),
'type' => 'entityreference_label',
'weight' => 0,
'weight' => 1,
),
),
'entity_type' => 'log',
@ -95,7 +95,7 @@ function farm_log_observation_field_default_field_instances() {
'module' => 'file',
'settings' => array(),
'type' => 'file_table',
'weight' => 8,
'weight' => 10,
),
),
'entity_type' => 'log',
@ -135,7 +135,7 @@ function farm_log_observation_field_default_field_instances() {
'map_layer_preset' => 'farm_map_geofield_formatter:openlayers_geofield_layer_formatter',
),
'type' => 'openlayers_geofield',
'weight' => 9,
'weight' => 11,
),
),
'entity_type' => 'log',
@ -194,7 +194,7 @@ function farm_log_observation_field_default_field_instances() {
'link' => 1,
),
'type' => 'entityreference_label',
'weight' => 1,
'weight' => 3,
),
),
'entity_type' => 'log',
@ -242,7 +242,7 @@ function farm_log_observation_field_default_field_instances() {
'colorbox_node_style_first' => 'large',
),
'type' => 'colorbox',
'weight' => 7,
'weight' => 9,
),
),
'entity_type' => 'log',
@ -286,7 +286,7 @@ function farm_log_observation_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 11,
'weight' => 5,
),
),
'entity_type' => 'log',
@ -317,7 +317,7 @@ function farm_log_observation_field_default_field_instances() {
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_plain',
'weight' => 5,
'weight' => 7,
),
),
'entity_type' => 'log',
@ -351,7 +351,7 @@ function farm_log_observation_field_default_field_instances() {
'link' => FALSE,
),
'type' => 'entityreference_label',
'weight' => 6,
'weight' => 8,
),
),
'entity_type' => 'log',
@ -384,7 +384,7 @@ function farm_log_observation_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 10,
'weight' => 2,
),
),
'entity_type' => 'log',
@ -415,7 +415,7 @@ function farm_log_observation_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 4,
'weight' => 6,
),
),
'entity_type' => 'log',
@ -451,7 +451,7 @@ function farm_log_observation_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 3,
'weight' => 4,
),
),
'entity_type' => 'log',

View file

@ -96,7 +96,7 @@ function farm_log_sale_field_default_field_instances() {
'module' => 'file',
'settings' => array(),
'type' => 'file_table',
'weight' => 12,
'weight' => 13,
),
),
'entity_type' => 'log',
@ -141,7 +141,7 @@ function farm_log_sale_field_default_field_instances() {
'colorbox_node_style_first' => 'large',
),
'type' => 'colorbox',
'weight' => 11,
'weight' => 12,
),
),
'entity_type' => 'log',
@ -185,7 +185,7 @@ function farm_log_sale_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 13,
'weight' => 8,
),
),
'entity_type' => 'log',
@ -250,7 +250,7 @@ function farm_log_sale_field_default_field_instances() {
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_plain',
'weight' => 9,
'weight' => 10,
),
),
'entity_type' => 'log',
@ -284,7 +284,7 @@ function farm_log_sale_field_default_field_instances() {
'link' => FALSE,
),
'type' => 'entityreference_label',
'weight' => 10,
'weight' => 11,
),
),
'entity_type' => 'log',
@ -349,7 +349,7 @@ function farm_log_sale_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 8,
'weight' => 9,
),
),
'entity_type' => 'log',

View file

@ -53,7 +53,7 @@ function farm_soil_test_field_default_field_instances() {
'module' => 'file',
'settings' => array(),
'type' => 'file_table',
'weight' => 7,
'weight' => 8,
),
),
'entity_type' => 'log',
@ -164,7 +164,7 @@ function farm_soil_test_field_default_field_instances() {
'colorbox_node_style_first' => 'large',
),
'type' => 'colorbox',
'weight' => 6,
'weight' => 7,
),
),
'entity_type' => 'log',
@ -202,11 +202,11 @@ function farm_soil_test_field_default_field_instances() {
'description' => 'Use this to organize your logs into categories for easier searching and filtering later.',
'display' => array(
'default' => array(
'label' => 'above',
'label' => 'inline',
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_link',
'weight' => 8,
'weight' => 5,
),
),
'entity_type' => 'log',
@ -240,7 +240,7 @@ function farm_soil_test_field_default_field_instances() {
'link' => FALSE,
),
'type' => 'entityreference_label',
'weight' => 5,
'weight' => 6,
),
),
'entity_type' => 'log',

View file

@ -52,7 +52,7 @@ function farm_water_test_field_default_field_instances() {
'module' => 'file',
'settings' => array(),
'type' => 'file_table',
'weight' => 6,
'weight' => 7,
),
),
'entity_type' => 'log',
@ -162,7 +162,7 @@ function farm_water_test_field_default_field_instances() {
'colorbox_node_style_first' => 'large',
),
'type' => 'colorbox',
'weight' => 5,
'weight' => 6,
),
),
'entity_type' => 'log',
@ -200,11 +200,11 @@ function farm_water_test_field_default_field_instances() {
'description' => 'Use this to organize your logs into categories for easier searching and filtering later.',
'display' => array(
'default' => array(
'label' => 'above',
'label' => 'inline',
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_link',
'weight' => 7,
'weight' => 4,
),
),
'entity_type' => 'log',
@ -238,7 +238,7 @@ function farm_water_test_field_default_field_instances() {
'link' => FALSE,
),
'type' => 'entityreference_label',
'weight' => 4,
'weight' => 5,
),
),
'entity_type' => 'log',