fixed card print css display

remains css

sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc

@@ -1303,7 +1303,6 @@ function materio_administration_menu_default_menu_links() {
   t('Publication');
   t('Reports');
   t('Shopping cart');
-  t('Showroom');
   t('Showrooms');
   t('Simplenews newsletter');
   t('Store');

sites/all/modules/features/materio_administration/materio_administration.views_default.inc

@@ -933,10 +933,11 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_localisation']['id'] = 'field_localisation';
   $handler->display->display_options['fields']['field_localisation']['table'] = 'field_data_field_localisation';
   $handler->display->display_options['fields']['field_localisation']['field'] = 'field_localisation';
-  /* Field: Content: Location */
+  /* Field: Content: Samples */
   $handler->display->display_options['fields']['field_location']['id'] = 'field_location';
   $handler->display->display_options['fields']['field_location']['table'] = 'field_data_field_location';
   $handler->display->display_options['fields']['field_location']['field'] = 'field_location';
+  $handler->display->display_options['fields']['field_location']['label'] = 'Location';
   $handler->display->display_options['fields']['field_location']['click_sort_column'] = 'showroom_tid';
   $handler->display->display_options['fields']['field_location']['delta_offset'] = '0';
   $handler->display->display_options['fields']['field_location']['multi_type'] = 'ul';

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',
@@ -2517,7 +2517,7 @@ function materio_content_types_field_default_field_instances() {
           'viewmode' => 'print',
         ),
         'type' => 'tode',
-        'weight' => 8,
+        'weight' => 9,
       ),
       'teaser' => 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',
@@ -2614,7 +2614,7 @@ function materio_content_types_field_default_field_instances() {
           'viewmode' => 'print',
         ),
         'type' => 'tode',
-        'weight' => 7,
+        'weight' => 8,
       ),
       'teaser' => 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',
+        'type' => 'hidden',
-        'weight' => 21,
+        'weight' => 16,
       ),
       'cardsmall' => array(
         'label' => 'hidden',
-        'module' => 'text',
         'settings' => array(),
-        'type' => 'text_plain',
+        'type' => 'hidden',
-        'weight' => 8,
+        'weight' => 9,
       ),
       'default' => array(
         'label' => 'hidden',
@@ -2951,9 +2947,8 @@ function materio_content_types_field_default_field_instances() {
       ),
       'print' => array(
         'label' => 'hidden',
-        'module' => 'text',
         'settings' => array(),
-        'type' => 'text_plain',
+        'type' => 'hidden',
         'weight' => 5,
       ),
       'teaser' => array(
@@ -3129,7 +3124,7 @@ function materio_content_types_field_default_field_instances() {
           'link' => 1,
         ),
         'type' => 'entityreference_label',
-        'weight' => 20,
+        'weight' => 21,
       ),
       'cardmedium' => array(
         'label' => 'above',
@@ -3138,7 +3133,7 @@ function materio_content_types_field_default_field_instances() {
           'link' => 1,
         ),
         'type' => 'entityreference_label',
-        'weight' => 13,
+        'weight' => 24,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -3212,7 +3207,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 +3219,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 +3383,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 +3395,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 +3562,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 +3574,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 +3648,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 +3731,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 +3743,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',
@@ -238,8 +238,7 @@ function materio_content_types_field_group_info() {
     'label' => 'head right',
     'weight' => '3',
     'children' => array(
-      0 => 'field_localisation',
+      0 => 'field_reference_materio',
-      1 => 'field_reference_materio',
     ),
     'format_type' => 'div',
     'format_settings' => array(
@@ -471,8 +470,7 @@ function materio_content_types_field_group_info() {
     'children' => array(
       0 => 'field_nature_titre',
       1 => 'title_field',
-      2 => 'field_localisation',
+      2 => 'field_reference_materio',
-      3 => 'field_reference_materio',
     ),
     'format_type' => 'div',
     'format_settings' => array(
@@ -506,8 +504,7 @@ function materio_content_types_field_group_info() {
     'children' => array(
       0 => 'field_nature_titre',
       1 => 'title_field',
-      2 => 'field_localisation',
+      2 => 'field_reference_materio',
-      3 => 'field_reference_materio',
     ),
     'format_type' => 'div',
     'format_settings' => array(
@@ -541,8 +538,7 @@ function materio_content_types_field_group_info() {
     'children' => array(
       0 => 'field_nature_titre',
       1 => 'title_field',
-      2 => 'field_localisation',
+      2 => 'field_reference_materio',
-      3 => 'field_reference_materio',
     ),
     'format_type' => 'div',
     'format_settings' => array(
@@ -576,8 +572,8 @@ function materio_content_types_field_group_info() {
     'children' => array(
       0 => 'field_nature_titre',
       1 => 'title_field',
-      2 => 'field_localisation',
+      2 => 'field_reference_materio',
-      3 => 'field_reference_materio',
+      3 => 'field_location',
     ),
     'format_type' => 'div',
     'format_settings' => array(
@@ -1163,7 +1159,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 +1288,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 +1414,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 +1446,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 +1544,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 +1577,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 +1610,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',
@@ -1714,6 +1712,7 @@ function materio_content_types_field_group_info() {
       0 => 'field_description',
       1 => 'field_company_fab',
       2 => 'field_company_distrib',
+      3 => 'field_location',
     ),
     'format_type' => 'div',
     'format_settings' => array(
@@ -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',
+        'type' => 'materio_showroom_location_simple_text',
-        'weight' => 0,
+        'weight' => 7,
       ),
       'cardfull' => array(
         'label' => 'above',
+        'module' => 'materio_showroom',
         'settings' => array(),
-        'type' => 'hidden',
+        'type' => 'materio_showroom_location_simple_text',
-        'weight' => 0,
+        'weight' => 17,
       ),
       'cardmedium' => array(
         'label' => 'above',
+        'module' => 'materio_showroom',
         'settings' => array(),
-        'type' => 'hidden',
+        'type' => 'materio_showroom_location_simple_text',
-        'weight' => 0,
+        'weight' => 22,
       ),
       'cardsmall' => array(
         'label' => 'above',
+        'module' => 'materio_showroom',
         'settings' => array(),
-        'type' => 'hidden',
+        'type' => 'materio_showroom_location_simple_text',
-        'weight' => 0,
+        'weight' => 8,
       ),
       'default' => array(
         'label' => 'above',
@@ -141,9 +145,10 @@ function showroom_field_default_field_instances() {
       ),
       'print' => array(
         'label' => 'above',
+        'module' => 'materio_showroom',
         'settings' => array(),
-        'type' => 'hidden',
+        'type' => 'materio_showroom_location_simple_text',
-        'weight' => 0,
+        'weight' => 7,
       ),
       'teaser' => array(
         'label' => 'above',
@@ -154,7 +159,7 @@ function showroom_field_default_field_instances() {
     ),
     'entity_type' => 'node',
     'field_name' => 'field_location',
-    'label' => 'Location',
+    'label' => 'Samples',
     'required' => 0,
     'settings' => array(
       'entity_translation_sync' => FALSE,
@@ -1261,10 +1266,10 @@ function showroom_field_default_field_instances() {
   t('Body');
   t('Description');
   t('Email');
-  t('Location');
   t('Mémo');
   t('Nom');
   t('Phone');
+  t('Samples');
   t('Showroom');
 
   return $field_instances;

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

@@ -20,7 +20,7 @@ function showroom_field_group_info() {
   $field_group->mode = 'form';
   $field_group->parent_name = 'group_htabs';
   $field_group->data = array(
-    'label' => 'Showroom',
+    'label' => 'Showroom Samples',
     'weight' => '17',
     'children' => array(
       0 => 'field_localisation',
@@ -28,19 +28,20 @@ function showroom_field_group_info() {
     ),
     'format_type' => 'htab',
     'format_settings' => array(
-      'formatter' => 'closed',
+      'label' => 'Showroom Samples',
       'instance_settings' => array(
-        'description' => '',
-        'classes' => 'group-showroom field-group-htab',
         'required_fields' => 1,
+        'classes' => 'group-showroom field-group-htab',
+        'description' => '',
       ),
+      'formatter' => 'closed',
     ),
   );
   $field_groups['group_showroom|node|materiau|form'] = $field_group;
 
   // Translatables
   // Included for use with string extractors like potx.
-  t('Showroom');
+  t('Showroom Samples');
 
   return $field_groups;
 }

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

@@ -16,6 +16,7 @@ dependencies[] = materio_content_types
 dependencies[] = materio_page_title
 dependencies[] = materio_showroom
 dependencies[] = materio_subscriptions
+dependencies[] = materio_user_profiles
 dependencies[] = menu
 dependencies[] = metatag
 dependencies[] = node
@@ -132,6 +133,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 +154,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

@@ -63,7 +63,7 @@ function materio_showroom_field_info() {
 function materio_showroom_field_is_empty($item, $field) {
   // dsm($item,'item');
   // dsm($field,'field');
-  return empty($item['location']) && empty($item['showroom_tid']);
+  return empty($item['location']); //  && empty($item['showroom_tid'])
 }
 
 //     ______                           __
@@ -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,15 +112,17 @@ 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']);
+        if(!empty($item['location'])){
-        $element[$delta] = array(
+          $term = taxonomy_term_load($item['showroom_tid']);
-          '#type' => 'html_tag',
+          $element[$delta] = array(
-          '#tag' => 'p',
+            '#type' => 'html_tag',
-          '#value' => t('%showroom : @loc', array('%showroom' => $term->name, '@loc' => $item['location'])),
+            '#tag' => 'p',
-        );
+            '#value' => t('%showroom : @loc', array('%showroom' => $term->name, '@loc' => $item['location'])),
+          );
+        }
       }
       break;
   }

sites/all/themes/gui/materiobasetheme/css/styles.css

@@ -4037,12 +4037,11 @@ article.search-performance.view-mode-cardfull {
     padding: 1em 212px; }
 
 /*
-
+   ______               __   ____              __                        __
- _____ _____ _____ ____     _____ _____ _____ _____ _____ _____ _____ _____ _____
+  / ____/___ __________/ /  / __ )____  ____  / /______ ___  ____ ______/ /_______
-|     |  _  | __  |    \   | __  |     |     |  |  |     |  _  | __  |  |  |   __|
+ / /   / __ `/ ___/ __  /  / __  / __ \/ __ \/ //_/ __ `__ \/ __ `/ ___/ //_/ ___/
-|   --|     |    -|  |  |  | __ -|  |  |  |  |    -| | | |     |    -|    -|__   |
+/ /___/ /_/ / /  / /_/ /  / /_/ / /_/ / /_/ / ,< / / / / / / /_/ / /  / ,< (__  )
-|_____|__|__|__|__|____/   |_____|_____|_____|__|__|_|_|_|__|__|__|__|__|__|_____|
+\____/\__,_/_/   \__,_/  /_____/\____/\____/_/|_/_/ /_/ /_/\__,_/_/  /_/|_/____/
-
 */
 article.node-materiau.vm-bookmark, article.node-breve.vm-bookmark {
   width: 50px;
@@ -4241,12 +4240,11 @@ article.node-materiau.vm-bookmark, article.node-breve.vm-bookmark {
     display: none; }
 
 /*
-
+   ______               __   _____                 ____
- _____ _____ _____ ____     _____ _____ _____ __    __
+  / ____/___ __________/ /  / ___/____ ___  ____ _/ / /
-|     |  _  | __  |    \   |   __|     |  _  |  |  |  |
+ / /   / __ `/ ___/ __  /   \__ \/ __ `__ \/ __ `/ / /
-|   --|     |    -|  |  |  |__   | | | |     |  |__|  |__
+/ /___/ /_/ / /  / /_/ /   ___/ / / / / / / /_/ / / /
-|_____|__|__|__|__|____/   |_____|_|_|_|__|__|_____|_____|
+\____/\__,_/_/   \__,_/   /____/_/ /_/ /_/\__,_/_/_/
-
 */
 article.node-materiau.vm-cardsmall, article.node-breve.vm-cardsmall {
   width: 100px;
@@ -4484,11 +4482,12 @@ article.node-materiau.vm-cardsmall, article.node-breve.vm-cardsmall {
         transition: margin-top 0s 0.3s; }
 
 /*
-
+  ______            ____  _                               ____                       __
- _____ _____ _____ __  _____ _____ _____    _____ _____ _____ __    __       _____ _____ _____ ____
+ /_  __/___  ____  / / /_(_)___     _________ ___  ____ _/ / /  _________ __________/ /
-|_   _|     |     |  ||_   _|     |  _  |  |   __|     |  _  |  |  |  |     |     |  _  | __  |      | | |  |  |  |  |  |__| | |-   -|   __|  |__   | | | |     |  |__|  |__   |   --|     |    -|  |  |
+  / / / __ \/ __ \/ / __/ / __ \   / ___/ __ `__ \/ __ `/ / /  / ___/ __ `/ ___/ __  /
-  |_| |_____|_____|_____|_| |_____|__|     |_____|_|_|_|__|__|_____|_____|  |_____|__|__|__|__|____/
+ / / / /_/ / /_/ / / /_/ / /_/ /  (__  ) / / / / / /_/ / / /  / /__/ /_/ / /  / /_/ /
-
+/_/  \____/\____/_/\__/_/ .___/  /____/_/ /_/ /_/\__,_/_/_/   \___/\__,_/_/   \__,_/
+                       /_/
 */
 #tooltip .group-header.smallcard {
   font-size: 14px;
@@ -4506,12 +4505,10 @@ article.node-materiau.vm-cardsmall, article.node-breve.vm-cardsmall {
     float: right; }
 
 /*
-
+   ______               __   __  ___         ___
- _____ _____ _____ ____     _____ _____ ____  _____ _____ _____
+  / ____/___ __________/ /  /  |/  /__  ____/ (_)_  ______ ___
-|     |  _  | __  |    \   |     |   __|    \|     |  |  |     |
+ / /   / __ `/ ___/ __  /  / /|_/ / _ \/ __  / / / / / __ `__ / /___/ /_/ / /  / /_/ /  / /  / /  __/ /_/ / / /_/ / / / / / /
-|   --|     |    -|  |  |  | | | |   __|  |  |-   -|  |  | | | |
+\____/\__,_/_/   \__,_/  /_/  /_/\___/\__,_/_/\__,_/_/ /_/ /_/
-|_____|__|__|__|__|____/   |_|_|_|_____|____/|_____|_____|_|_|_|
-
 */
 article.node-materiau.vm-cardmedium, article.node-breve.vm-cardmedium {
   width: 210px;
@@ -4790,6 +4787,14 @@ article.node-materiau.vm-cardmedium, article.node-breve.vm-cardmedium {
           cursor: e-resize; }
     article.node-materiau.vm-cardmedium .field-name-field-description .column > *, article.node-materiau.vm-cardmedium .field-name-body .column > *, article.node-breve.vm-cardmedium .field-name-field-description .column > *, article.node-breve.vm-cardmedium .field-name-body .column > * {
       padding-right: 25px; }
+  article.node-materiau.vm-cardmedium .field-name-field-location, article.node-breve.vm-cardmedium .field-name-field-location {
+    font-size: 12px;
+    padding: 5px;
+    font-weight: 300; }
+    article.node-materiau.vm-cardmedium .field-name-field-location .field-label, article.node-breve.vm-cardmedium .field-name-field-location .field-label {
+      font-size: 10px;
+      text-transform: lowercase;
+      margin: 0; }
   article.node-materiau.vm-cardmedium .column-wrapper, article.node-breve.vm-cardmedium .column-wrapper {
     padding: 5px; }
     article.node-materiau.vm-cardmedium .column-wrapper.columnized, article.node-breve.vm-cardmedium .column-wrapper.columnized {
@@ -4854,11 +4859,12 @@ article.node-materiau.vm-cardmedium, article.node-breve.vm-cardmedium {
     background: #FFF; }
 
 /*
- _____ _____ _____ ____     _____ _____ _____
+   ______               __   ____  _
-|     |  _  | __  |    \   | __  |     |   __|
+  / ____/___ __________/ /  / __ )(_)___ _
-|   --|     |    -|  |  |  | __ -|-   -|  |  |
+ / /   / __ `/ ___/ __  /  / __  / / __ `/
-|_____|__|__|__|__|____/   |_____|_____|_____|
+/ /___/ /_/ / /  / /_/ /  / /_/ / / /_/ /
-
+\____/\__,_/_/   \__,_/  /_____/_/\__, /
+                                 /____/
 */
 article.node-materiau.vm-cardbig, article.node-breve.vm-cardbig {
   width: 425px;
@@ -5139,6 +5145,14 @@ article.node-materiau.vm-cardbig, article.node-breve.vm-cardbig {
           cursor: w-resize; }
         article.node-materiau.vm-cardbig .field-name-field-description.columnized .column-switcher.next-column, article.node-materiau.vm-cardbig .field-name-body.columnized .column-switcher.next-column, article.node-breve.vm-cardbig .field-name-field-description.columnized .column-switcher.next-column, article.node-breve.vm-cardbig .field-name-body.columnized .column-switcher.next-column {
           cursor: e-resize; }
+  article.node-materiau.vm-cardbig .field-name-field-location, article.node-breve.vm-cardbig .field-name-field-location {
+    font-size: 12px;
+    padding: 10px;
+    font-weight: 300; }
+    article.node-materiau.vm-cardbig .field-name-field-location .field-label, article.node-breve.vm-cardbig .field-name-field-location .field-label {
+      font-size: 10px;
+      text-transform: lowercase;
+      float: none; }
   article.node-materiau.vm-cardbig .column-wrapper, article.node-breve.vm-cardbig .column-wrapper {
     padding: 10px; }
     article.node-materiau.vm-cardbig .column-wrapper.columnized, article.node-breve.vm-cardbig .column-wrapper.columnized {
@@ -5196,10 +5210,11 @@ article.node-materiau.vm-cardbig, article.node-breve.vm-cardbig {
     background-color: #69CDCF; }
 
 /*
- _____ _____ _____ ____     _____ _____ __    __
+   ______               __   ______      ____
-|     |  _  | __  |    \   |   __|  |  |  |  |  |
+  / ____/___ __________/ /  / ____/_  __/ / /
-|   --|     |    -|  |  |  |   __|  |  |  |__|  |__
+ / /   / __ `/ ___/ __  /  / /_  / / / / / /
-|_____|__|__|__|__|____/   |__|  |_____|_____|_____|
+/ /___/ /_/ / /  / /_/ /  / __/ / /_/ / / /
+\____/\__,_/_/   \__,_/  /_/    \__,_/_/_/
 
 */
 article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull {
@@ -5438,6 +5453,14 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull {
   article.node-materiau.vm-cardfull .field-name-field-attachments, article.node-breve.vm-cardfull .field-name-field-attachments {
     padding: 10px;
     font-size: 12px; }
+  article.node-materiau.vm-cardfull .field-name-field-location, article.node-breve.vm-cardfull .field-name-field-location {
+    font-size: 12px;
+    padding: 10px;
+    font-weight: 300; }
+    article.node-materiau.vm-cardfull .field-name-field-location .field-label, article.node-breve.vm-cardfull .field-name-field-location .field-label {
+      font-size: 10px;
+      text-transform: lowercase;
+      float: none; }
   article.node-materiau.vm-cardfull .field-name-field-company-fab, article.node-materiau.vm-cardfull .field-name-field-company-distrib, article.node-breve.vm-cardfull .field-name-field-company-fab, article.node-breve.vm-cardfull .field-name-field-company-distrib {
     font-size: 12px;
     padding: 10px;
@@ -5482,11 +5505,11 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull {
     background-color: #69CDCF; }
 
 /*
-               _            _     _
+                       __   ____       _       __
- ___ ___ ___ _| |   ___ ___|_|___| |_
+  _________ __________/ /  / __ \_____(_)___  / /_
-|  _| .'|  _| . |  | . |  _| |   |  _|
+ / ___/ __ `/ ___/ __  /  / /_/ / ___/ / __ \/ __/
-|___|__,|_| |___|  |  _|_| |_|_|_|_|
+/ /__/ /_/ / /  / /_/ /  / ____/ /  / / / / / /_
-                   |_|
+\___/\__,_/_/   \__,_/  /_/   /_/  /_/_/ /_/\__/
 */
 .print-node-materiau {
   margin: 0 auto; }
@@ -5698,6 +5721,8 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull {
     position: absolute; }
     .print-content .node-materiau.vm-print .side.group-side-left .field-name-field-description {
       font-size: 0.8em; }
+    .print-content .node-materiau.vm-print .side.group-side-left .field-name-field-location {
+      font-size: 0.7em; }
     .print-content .node-materiau.vm-print .side.group-side-left > .field-type-taxonomy-term-reference {
       display: inline-block;
       vertical-align: top;
@@ -7807,7 +7832,6 @@ body.home-v2 #center {
             margin-top: 0.5em; }
     #home-v2 > .panel-panel > div > .panel-pane.showroom:after {
       content: url("../img/bulle.png");
-      -webkit-transform: scale(0.8);
       transform: scale(0.8);
       position: absolute;
       bottom: -120px;
@@ -7871,7 +7895,6 @@ body.home-v2 #center {
         background-color: rgba(230, 230, 230, 0.8); }
     #home-v2 > .panel-panel > div > .panel-pane.bdd:after {
       content: url("../img/boule.png");
-      -webkit-transform: scale(0.8);
       transform: scale(0.8);
       position: absolute;
       bottom: -50px;

sites/all/themes/gui/materiobasetheme/scss/styles.scss

@@ -1379,12 +1379,11 @@ article.search-performance{
 }
 
 /*
-
+   ______               __   ____              __                        __
- _____ _____ _____ ____     _____ _____ _____ _____ _____ _____ _____ _____ _____
+  / ____/___ __________/ /  / __ )____  ____  / /______ ___  ____ ______/ /_______
-|     |  _  | __  |    \   | __  |     |     |  |  |     |  _  | __  |  |  |   __|
+ / /   / __ `/ ___/ __  /  / __  / __ \/ __ \/ //_/ __ `__ \/ __ `/ ___/ //_/ ___/
-|   --|     |    -|  |  |  | __ -|  |  |  |  |    -| | | |     |    -|    -|__   |
+/ /___/ /_/ / /  / /_/ /  / /_/ / /_/ / /_/ / ,< / / / / / / /_/ / /  / ,< (__  )
-|_____|__|__|__|__|____/   |_____|_____|_____|__|__|_|_|_|__|__|__|__|__|__|_____|
+\____/\__,_/_/   \__,_/  /_____/\____/\____/_/|_/_/ /_/ /_/\__,_/_/  /_/|_/____/
-
 */
 article.node-materiau.vm-bookmark, article.node-breve.vm-bookmark{
   @include card($cardbookmark_w, $cardbookmark_h);
@@ -1399,13 +1398,13 @@ article.node-materiau.vm-bookmark, article.node-breve.vm-bookmark{
 }
 
 /*
-
+   ______               __   _____                 ____
- _____ _____ _____ ____     _____ _____ _____ __    __
+  / ____/___ __________/ /  / ___/____ ___  ____ _/ / /
-|     |  _  | __  |    \   |   __|     |  _  |  |  |  |
+ / /   / __ `/ ___/ __  /   \__ \/ __ `__ \/ __ `/ / /
-|   --|     |    -|  |  |  |__   | | | |     |  |__|  |__
+/ /___/ /_/ / /  / /_/ /   ___/ / / / / / / /_/ / / /
-|_____|__|__|__|__|____/   |_____|_|_|_|__|__|_____|_____|
+\____/\__,_/_/   \__,_/   /____/_/ /_/ /_/\__,_/_/_/
-
 */
+
 article.node-materiau.vm-cardsmall, article.node-breve.vm-cardsmall{
   @include card($cardsmall_w, $cardsmall_h); //width:100px; height:140px;
   .group-header{
@@ -1430,12 +1429,12 @@ article.node-materiau.vm-cardsmall, article.node-breve.vm-cardsmall{
 }
 
 /*
-
+  ______            ____  _                               ____                       __
- _____ _____ _____ __  _____ _____ _____    _____ _____ _____ __    __       _____ _____ _____ ____
+ /_  __/___  ____  / / /_(_)___     _________ ___  ____ _/ / /  _________ __________/ /
-|_   _|     |     |  ||_   _|     |  _  |  |   __|     |  _  |  |  |  |     |     |  _  | __  |    \
+  / / / __ \/ __ \/ / __/ / __ \   / ___/ __ `__ \/ __ `/ / /  / ___/ __ `/ ___/ __  /
-  | | |  |  |  |  |  |__| | |-   -|   __|  |__   | | | |     |  |__|  |__   |   --|     |    -|  |  |
+ / / / /_/ / /_/ / / /_/ / /_/ /  (__  ) / / / / / /_/ / / /  / /__/ /_/ / /  / /_/ /
-  |_| |_____|_____|_____|_| |_____|__|     |_____|_|_|_|__|__|_____|_____|  |_____|__|__|__|__|____/
+/_/  \____/\____/_/\__/_/ .___/  /____/_/ /_/ /_/\__,_/_/_/   \___/\__,_/_/   \__,_/
-
+                       /_/
 */
 #tooltip{
   .group-header.smallcard{
@@ -1447,13 +1446,13 @@ article.node-materiau.vm-cardsmall, article.node-breve.vm-cardsmall{
 }
 
 /*
-
+   ______               __   __  ___         ___
- _____ _____ _____ ____     _____ _____ ____  _____ _____ _____
+  / ____/___ __________/ /  /  |/  /__  ____/ (_)_  ______ ___
-|     |  _  | __  |    \   |     |   __|    \|     |  |  |     |
+ / /   / __ `/ ___/ __  /  / /|_/ / _ \/ __  / / / / / __ `__ \
-|   --|     |    -|  |  |  | | | |   __|  |  |-   -|  |  | | | |
+/ /___/ /_/ / /  / /_/ /  / /  / /  __/ /_/ / / /_/ / / / / / /
-|_____|__|__|__|__|____/   |_|_|_|_____|____/|_____|_____|_|_|_|
+\____/\__,_/_/   \__,_/  /_/  /_/\___/\__,_/_/\__,_/_/ /_/ /_/
-
 */
+
 article.node-materiau.vm-cardmedium, article.node-breve.vm-cardmedium{
   @include card($cardmedium_w, $cardmedium_h); //width:210px; height:295px;
 
@@ -1491,13 +1490,19 @@ article.node-materiau.vm-cardmedium, article.node-breve.vm-cardmedium{
 
   .group-images{ @include horihoverswitch(); }
 
-  // side 2
+  // side 2 : description
   .field-name-field-description, .field-name-body{
     @include fs12; @include fs300; overflow: hidden; z-index:-1; @include columnized(5px);
     .column>*{padding-right:25px;}
   }
 
-  // side 3
+  // side 3 : samples
+  .field-name-field-location{
+    @include fs12; padding:5px; @include fs300;
+    .field-label{ @include fs10; text-transform: lowercase; margin:0;}
+  }
+
+  // side 4 : companies
   .column-wrapper{
     @include columnized(5px);
   }
@@ -1522,11 +1527,12 @@ article.node-materiau.vm-cardmedium, article.node-breve.vm-cardmedium{
 }
 
 /*
- _____ _____ _____ ____     _____ _____ _____
+   ______               __   ____  _
-|     |  _  | __  |    \   | __  |     |   __|
+  / ____/___ __________/ /  / __ )(_)___ _
-|   --|     |    -|  |  |  | __ -|-   -|  |  |
+ / /   / __ `/ ___/ __  /  / __  / / __ `/
-|_____|__|__|__|__|____/   |_____|_____|_____|
+/ /___/ /_/ / /  / /_/ /  / /_/ / / /_/ /
-
+\____/\__,_/_/   \__,_/  /_____/_/\__, /
+                                 /____/
 */
 article.node-materiau.vm-cardbig, article.node-breve.vm-cardbig{
   @include card($cardbig_w, $cardbig_h); //width:425px; height:610px;
@@ -1563,10 +1569,17 @@ article.node-materiau.vm-cardbig, article.node-breve.vm-cardbig{
   .field-name-field-description, .field-name-body{
     @include fs12; @include fs300; @include columnized(10px);
   }
-  // side 3
+  // side 3 : samples
+  .field-name-field-location{
+    @include fs12; padding:10px; @include fs300;
+    .field-label{ @include fs10; text-transform: lowercase; float: none; }
+  }
+
+  // ?????
   .column-wrapper{
     @include columnized(10px);
   }
+
   // side 4
   .field-name-field-company-fab, .field-name-field-company-distrib{
     @include fs12; padding:10px; @include fs300;
@@ -1601,12 +1614,14 @@ article.node-materiau.vm-cardbig, article.node-breve.vm-cardbig{
 }
 
 /*
- _____ _____ _____ ____     _____ _____ __    __
+   ______               __   ______      ____
-|     |  _  | __  |    \   |   __|  |  |  |  |  |
+  / ____/___ __________/ /  / ____/_  __/ / /
-|   --|     |    -|  |  |  |   __|  |  |  |__|  |__
+ / /   / __ `/ ___/ __  /  / /_  / / / / / /
-|_____|__|__|__|__|____/   |__|  |_____|_____|_____|
+/ /___/ /_/ / /  / /_/ /  / __/ / /_/ / / /
+\____/\__,_/_/   \__,_/  /_/    \__,_/_/_/
 
 */
+
 article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull{
   @include card($cardfull_w, $cardfull_h); //width:875px; height:610px;
   nav.nav{top:0;}
@@ -1649,7 +1664,13 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull{
     @include fs12;
   }
 
-  // side 4
+  // side 3 : Sample
+  .field-name-field-location{
+    @include fs12; padding:10px; @include fs300;
+    .field-label{ @include fs10; text-transform: lowercase; float: none; }
+  }
+
+  // side 4 : companies
   .field-name-field-company-fab, .field-name-field-company-distrib{
     @include fs12; padding:10px; @include fs300;
     @include inlineblock(); width:40%;
@@ -1685,11 +1706,11 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull{
 }
 
 /*
-               _            _     _
+                       __   ____       _       __
- ___ ___ ___ _| |   ___ ___|_|___| |_
+  _________ __________/ /  / __ \_____(_)___  / /_
-|  _| .'|  _| . |  | . |  _| |   |  _|
+ / ___/ __ `/ ___/ __  /  / /_/ / ___/ / __ \/ __/
-|___|__,|_| |___|  |  _|_| |_|_|_|_|
+/ /__/ /_/ / /  / /_/ /  / ____/ /  / / / / / /_
-                   |_|
+\___/\__,_/_/   \__,_/  /_/   /_/  /_/_/ /_/\__/
 */
 body.print-body-materiau{
   // >*{font-size:0.8em;}
@@ -1728,6 +1749,11 @@ body.print-body-materiau{
       width:45%;
       position:absolute;
       .field-name-field-description{font-size:0.8em;}
+      // samples
+      .field-name-field-location{
+        font-size:0.7em;
+      }
+      // companies
       >.field-type-taxonomy-term-reference{
         display:inline-block; vertical-align: top; width: 45%;
         margin:0.5em 1em 0 0;