Location -> samples, fixed cs display, fixed empty field

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/showroom/showroom.features.field_instance.inc

@@ -158,7 +158,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,
@@ -1265,10 +1265,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

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'])
 }
 
 //     ______                           __
@@ -115,12 +115,14 @@ function materio_showroom_field_formatter_view($entity_type, $entity, $field, $i
     // 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']);
-        $element[$delta] = array(
-          '#type' => 'html_tag',
-          '#tag' => 'p',
-          '#value' => t('%showroom : @loc', array('%showroom' => $term->name, '@loc' => $item['location'])),
-        );
+        if(!empty($item['location'])){
+          $term = taxonomy_term_load($item['showroom_tid']);
+          $element[$delta] = array(
+            '#type' => 'html_tag',
+            '#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;
@@ -7807,7 +7830,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 +7893,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,6 +1664,10 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull{
     @include fs12;
   }
 
+  .field-name-field-location{
+    @include fs12; padding:10px; @include fs300;
+    .field-label{ @include fs10; text-transform: lowercase; float: none; }
+  }
   // side 4
   .field-name-field-company-fab, .field-name-field-company-distrib{
     @include fs12; padding:10px; @include fs300;