fixed showroom location formatter and contentype display

remains css

sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc

@@ -2301,14 +2301,14 @@ function materio_content_types_field_default_field_instances() {
         'module' => 'file',
         'settings' => array(),
         'type' => 'file_default',
-        'weight' => 17,
+        'weight' => 18,
       ),
       'cardmedium' => array(
         'label' => 'hidden',
         'module' => 'file',
         'settings' => array(),
         'type' => 'file_default',
-        'weight' => 12,
+        'weight' => 23,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -2382,7 +2382,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'hidden',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 9,
+        'weight' => 12,
       ),
       'cardfull' => array(
         'label' => 'above',
@@ -2394,7 +2394,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'hidden',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 16,
+        'weight' => 15,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -2480,7 +2480,7 @@ function materio_content_types_field_default_field_instances() {
           'viewmode' => 'cardfull',
         ),
         'type' => 'tode',
-        'weight' => 19,
+        'weight' => 20,
       ),
       'cardmedium' => array(
         'label' => 'above',
@@ -2577,7 +2577,7 @@ function materio_content_types_field_default_field_instances() {
           'viewmode' => 'cardfull',
         ),
         'type' => 'tode',
-        'weight' => 18,
+        'weight' => 19,
       ),
       'cardmedium' => array(
         'label' => 'above',
@@ -2751,7 +2751,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 8,
+        'weight' => 11,
       ),
       'cardfull' => array(
         'label' => 'above',
@@ -2763,7 +2763,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 11,
+        'weight' => 10,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -2832,7 +2832,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 7,
+        'weight' => 10,
       ),
       'cardfull' => array(
         'label' => 'above',
@@ -2844,7 +2844,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 12,
+        'weight' => 11,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -2910,31 +2910,27 @@ function materio_content_types_field_default_field_instances() {
       ),
       'cardbig' => array(
         'label' => 'hidden',
-        'module' => 'text',
         'settings' => array(),
-        'type' => 'text_default',
+        'type' => 'hidden',
         'weight' => 8,
       ),
       'cardfull' => array(
         'label' => 'hidden',
-        'module' => 'text',
         'settings' => array(),
-        'type' => 'text_default',
+        'type' => 'hidden',
         'weight' => 19,
       ),
       'cardmedium' => array(
         'label' => 'hidden',
-        'module' => 'text',
         'settings' => array(),
-        'type' => 'text_default',
-        'weight' => 21,
+        'type' => 'hidden',
+        'weight' => 16,
       ),
       'cardsmall' => array(
         'label' => 'hidden',
-        'module' => 'text',
         'settings' => array(),
-        'type' => 'text_plain',
-        'weight' => 8,
+        'type' => 'hidden',
+        'weight' => 9,
       ),
       'default' => array(
         'label' => 'hidden',
@@ -3129,7 +3125,7 @@ function materio_content_types_field_default_field_instances() {
           'link' => 1,
         ),
         'type' => 'entityreference_label',
-        'weight' => 20,
+        'weight' => 21,
       ),
       'cardmedium' => array(
         'label' => 'above',
@@ -3138,7 +3134,7 @@ function materio_content_types_field_default_field_instances() {
           'link' => 1,
         ),
         'type' => 'entityreference_label',
-        'weight' => 13,
+        'weight' => 24,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -3212,7 +3208,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 11,
+        'weight' => 14,
       ),
       'cardfull' => array(
         'label' => 'above',
@@ -3224,7 +3220,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 14,
+        'weight' => 13,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -3388,7 +3384,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 10,
+        'weight' => 13,
       ),
       'cardfull' => array(
         'label' => 'above',
@@ -3400,7 +3396,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 13,
+        'weight' => 12,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -3567,7 +3563,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
         'label' => 'hidden',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 5,
+        'weight' => 9,
       ),
       'cardfull' => array(
         'label' => 'above',
@@ -3579,7 +3575,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 15,
+        'weight' => 14,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -3653,7 +3649,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 3,
+        'weight' => 8,
       ),
       'cardfull' => array(
         'label' => 'above',
@@ -3736,7 +3732,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 0,
+        'weight' => 6,
       ),
       'cardfull' => array(
         'label' => 'above',
@@ -3748,7 +3744,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 8,
+        'weight' => 9,
       ),
       'cardsmall' => array(
         'label' => 'above',

sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc

@@ -164,7 +164,6 @@ function materio_content_types_user_default_permissions() {
   $permissions['create field_localisation'] = array(
     'name' => 'create field_localisation',
     'roles' => array(
-      'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
@@ -452,7 +451,6 @@ function materio_content_types_user_default_permissions() {
   $permissions['edit field_localisation'] = array(
     'name' => 'edit field_localisation',
     'roles' => array(
-      'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
@@ -728,7 +726,6 @@ function materio_content_types_user_default_permissions() {
   $permissions['edit own field_localisation'] = array(
     'name' => 'edit own field_localisation',
     'roles' => array(
-      'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
@@ -1145,8 +1142,6 @@ function materio_content_types_user_default_permissions() {
   $permissions['view field_localisation'] = array(
     'name' => 'view field_localisation',
     'roles' => array(
-      'Admin showroom' => 'Admin showroom',
-      'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
@@ -1444,7 +1439,6 @@ function materio_content_types_user_default_permissions() {
   $permissions['view own field_localisation'] = array(
     'name' => 'view own field_localisation',
     'roles' => array(
-      'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',

sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc

@@ -21,7 +21,7 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'side 4',
-    'weight' => '3',
+    'weight' => '4',
     'children' => array(
       0 => 'field_company_fab',
       1 => 'field_company_distrib',
@@ -471,8 +471,7 @@ function materio_content_types_field_group_info() {
     'children' => array(
       0 => 'field_nature_titre',
       1 => 'title_field',
-      2 => 'field_localisation',
-      3 => 'field_reference_materio',
+      2 => 'field_reference_materio',
     ),
     'format_type' => 'div',
     'format_settings' => array(
@@ -506,8 +505,7 @@ function materio_content_types_field_group_info() {
     'children' => array(
       0 => 'field_nature_titre',
       1 => 'title_field',
-      2 => 'field_localisation',
-      3 => 'field_reference_materio',
+      2 => 'field_reference_materio',
     ),
     'format_type' => 'div',
     'format_settings' => array(
@@ -541,8 +539,7 @@ function materio_content_types_field_group_info() {
     'children' => array(
       0 => 'field_nature_titre',
       1 => 'title_field',
-      2 => 'field_localisation',
-      3 => 'field_reference_materio',
+      2 => 'field_reference_materio',
     ),
     'format_type' => 'div',
     'format_settings' => array(
@@ -576,8 +573,8 @@ function materio_content_types_field_group_info() {
     'children' => array(
       0 => 'field_nature_titre',
       1 => 'title_field',
-      2 => 'field_localisation',
-      3 => 'field_reference_materio',
+      2 => 'field_reference_materio',
+      3 => 'field_location',
     ),
     'format_type' => 'div',
     'format_settings' => array(
@@ -1163,7 +1160,7 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'side 1',
-    'weight' => '0',
+    'weight' => '1',
     'children' => array(
       0 => 'group_header',
       1 => 'group_images',
@@ -1292,7 +1289,7 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'side 2',
-    'weight' => '1',
+    'weight' => '2',
     'children' => array(
       0 => 'field_description',
     ),
@@ -1418,15 +1415,16 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'side 3',
-    'weight' => '2',
+    'weight' => '3',
     'children' => array(
-      0 => 'field_video_filter',
+      0 => 'field_location',
     ),
-    'format_type' => 'hidden',
+    'format_type' => 'div',
     'format_settings' => array(
       'label' => 'side 3',
       'instance_settings' => array(
-        'classes' => 'side group-side3 field-group-hidden',
+        'id' => 'node_materiau_cardbig_group_side2',
+        'classes' => 'side group-side2 field-group-div',
         'description' => '',
         'show_label' => '0',
         'label_element' => 'h3',
@@ -1449,15 +1447,16 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'side 3',
-    'weight' => '10',
+    'weight' => '4',
     'children' => array(
-      0 => 'field_video_filter',
+      0 => 'field_location',
     ),
-    'format_type' => 'hidden',
+    'format_type' => 'div',
     'format_settings' => array(
       'label' => 'side 3',
       'instance_settings' => array(
-        'classes' => 'side group-side3 field-group-hidden',
+        'id' => 'node_materiau_cardmedium_group_side_3',
+        'classes' => 'side group-side2 field-group-div',
         'description' => '',
         'show_label' => '0',
         'label_element' => 'h3',
@@ -1546,7 +1545,7 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'side 4',
-    'weight' => '4',
+    'weight' => '5',
     'children' => array(
       0 => 'field_company_fab',
       1 => 'field_company_distrib',
@@ -1579,7 +1578,7 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'side 5',
-    'weight' => '4',
+    'weight' => '5',
     'children' => array(
       0 => 'field_attachments',
       1 => 'field_materiau_ref',
@@ -1612,7 +1611,7 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'side 5',
-    'weight' => '5',
+    'weight' => '6',
     'children' => array(
       0 => 'field_attachments',
       1 => 'field_materiau_ref',
@@ -1785,7 +1784,8 @@ function materio_content_types_field_group_info() {
       2 => 'field_company_fab',
       3 => 'field_company_distrib',
       4 => 'field_materiau_ref',
-      5 => 'group_header',
+      5 => 'field_location',
+      6 => 'group_header',
     ),
     'format_type' => 'div',
     'format_settings' => array(

sites/all/modules/features/materio_content_types/materio_content_types.info

@@ -23,6 +23,7 @@ dependencies[] = materio_user_profiles
 dependencies[] = options
 dependencies[] = print
 dependencies[] = print_ui
+dependencies[] = showroom
 dependencies[] = strongarm
 dependencies[] = synonyms
 dependencies[] = taxonomy

sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc

@@ -385,7 +385,7 @@ function materio_content_types_strongarm() {
             'visible' => TRUE,
           ),
           'cardbig' => array(
-            'weight' => '-99',
+            'weight' => '0',
             'visible' => TRUE,
           ),
           'cardfull' => array(
@@ -404,14 +404,18 @@ function materio_content_types_strongarm() {
             'weight' => '0',
             'visible' => FALSE,
           ),
+          'cardsmall' => array(
+            'weight' => '-99',
+            'visible' => TRUE,
+          ),
         ),
         'workflow' => array(
           'cardmedium' => array(
-            'weight' => '7',
+            'weight' => '8',
             'visible' => TRUE,
           ),
           'cardbig' => array(
-            'weight' => '99',
+            'weight' => '15',
             'visible' => FALSE,
           ),
           'cardfull' => array(
@@ -430,6 +434,10 @@ function materio_content_types_strongarm() {
             'weight' => '8',
             'visible' => FALSE,
           ),
+          'cardsmall' => array(
+            'weight' => '99',
+            'visible' => TRUE,
+          ),
         ),
       ),
     ),

sites/all/modules/features/showroom/showroom.features.field_instance.inc

@@ -104,27 +104,31 @@ function showroom_field_default_field_instances() {
       ),
       'cardbig' => array(
         'label' => 'above',
+        'module' => 'materio_showroom',
         'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 0,
+        'type' => 'materio_showroom_location_simple_text',
+        'weight' => 7,
       ),
       'cardfull' => array(
         'label' => 'above',
+        'module' => 'materio_showroom',
         'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 0,
+        'type' => 'materio_showroom_location_simple_text',
+        'weight' => 17,
       ),
       'cardmedium' => array(
         'label' => 'above',
+        'module' => 'materio_showroom',
         'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 0,
+        'type' => 'materio_showroom_location_simple_text',
+        'weight' => 22,
       ),
       'cardsmall' => array(
         'label' => 'above',
+        'module' => 'materio_showroom',
         'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 0,
+        'type' => 'materio_showroom_location_simple_text',
+        'weight' => 8,
       ),
       'default' => array(
         'label' => 'above',

sites/all/modules/features/showroom/showroom.info

@@ -132,6 +132,7 @@ features_exclude[field_base][field_public_address] = field_public_address
 features_exclude[field_base][field_public_email] = field_public_email
 features_exclude[field_base][name_field] = name_field
 features_exclude[field_base][description_field] = description_field
+features_exclude[field_group][group_htabs|node|materiau|form] = group_htabs|node|materiau|form
 features_exclude[user_permission][create field_memo] = create field_memo
 features_exclude[user_permission][edit own field_memo] = edit own field_memo
 features_exclude[user_permission][edit field_memo] = edit field_memo
@@ -152,5 +153,4 @@ features_exclude[user_permission][edit own field_public_email] = edit own field_
 features_exclude[user_permission][edit field_public_email] = edit field_public_email
 features_exclude[user_permission][view own field_public_email] = view own field_public_email
 features_exclude[user_permission][view field_public_email] = view field_public_email
-features_exclude[field_group][group_htabs|node|materiau|form] = group_htabs|node|materiau|form
 project path = sites/all/modules/features

sites/all/modules/gui/materiobasemod/materio_showroom.module

@@ -86,7 +86,7 @@ function materio_showroom_field_formatter_info() {
     // This formatter just displays the hex value in the color indicated.
     'materio_showroom_location_simple_text' => array(
       'label' => t('Simple text-based formatter'),
-      'field types' => array('field_example_rgb'),
+      'field types' => array('field_materio_showroom_location'),
     ),
     // This formatter changes the background color of the content region.
     // 'field_example_color_background' => array(
@@ -112,7 +112,7 @@ function materio_showroom_field_formatter_view($entity_type, $entity, $field, $i
   $element = array();
 
   switch ($display['type']) {
-    // This formatter simply outputs the field as text and with a color.
+    // This formatter simply outputs the field as text.
     case 'materio_showroom_location_simple_text':
       foreach ($items as $delta => $item) {
         $term = taxonomy_term_load($item['showroom_tid']);