From 9c3e7ac22ea595cfea812eebbc9c1da4d83de662 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 12 Apr 2017 15:24:53 -0400
Subject: [PATCH] changing column sizes for the detail and list view files

---
 models/front/fields/detail.php |  4 +++-
 models/front/fields/list.php   |  2 +-
 views/front/fields/detail.html | 23 +++++++----------------
 views/front/fields/list.html   |  8 ++++----
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/models/front/fields/detail.php b/models/front/fields/detail.php
index f808426..e89a23d 100644
--- a/models/front/fields/detail.php
+++ b/models/front/fields/detail.php
@@ -69,6 +69,8 @@ class GlmMembersFront_fields_detail extends GlmDataFieldsCustomFields
             $sql            = "SELECT mt.name FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "member_type mt, " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "members m WHERE m.id = $member_id AND mt.id = m.member_type";
             $member_type    = $wpdb->get_var($sql);
 
+            
+            
             foreach($field_values as $key=>$value){
                 $field_id       = $value['field_id'];
                 $field_value    = $value['field_data'];
@@ -79,7 +81,7 @@ class GlmMembersFront_fields_detail extends GlmDataFieldsCustomFields
                 $slug           = sanitize_title($field_name);
 
                 if( $field_value ){
-                    if( $slug === 'msrp-sale' && $field_value === 'Yes'){
+                    if( $slug === 'msrp-sale' && $field_value === 'Yes' || $slug === 'sale-price' && $field_value !== ''){
                         $fields[$slug] = array('nice' => $field_name,'data' => $field_value, 'type' => $member_type, 'slash' => true);
                     } else {
                         $fields[$slug] = array('nice' => $field_name,'data' => $field_value, 'type' => $member_type, 'slash' => false);
diff --git a/models/front/fields/list.php b/models/front/fields/list.php
index db4310d..18a208b 100644
--- a/models/front/fields/list.php
+++ b/models/front/fields/list.php
@@ -80,7 +80,7 @@ class GlmMembersFront_fields_list extends GlmDataFieldsCustomFields
                     $slug           = sanitize_title($field_name);
 
                     if( $field_value ){
-                        if( $slug === 'msrp-sale' && $field_value === 'Yes'){
+                        if( $slug === 'msrp-sale' && $field_value === 'Yes' || $slug === 'sale-price' && $field_value !== ''){
                             $fields[$slug] = array('nice' => $field_name,'data' => $field_value, 'type' => $member_type, 'slash' => true);
                         } else {
                             $fields[$slug] = array('nice' => $field_name,'data' => $field_value, 'type' => $member_type, 'slash' => false);
diff --git a/views/front/fields/detail.html b/views/front/fields/detail.html
index 1ee592e..3f6049e 100644
--- a/views/front/fields/detail.html
+++ b/views/front/fields/detail.html
@@ -1,25 +1,16 @@
 <div class="glm-member-custom-fields-container">
     <h5>Specifications</h5>
     {foreach $field_values as $key=>$value}
-        {if $value.slash === true}    
+        {if $value.slash === true }
             <div class="glm-row field-container slash-price">
-                <div class="glm-small-6 glm-columns field-name">{$value.nice}</div>
-                <div class="glm-small-6 glm-columns field-value {$key}">{$value.data}</div>
-            </div>
-        {elseif $value.data !== 'Yes' && $value.data !== 'No'}
+        {else}
             <div class="glm-row field-container">
-                <div class="glm-small-6 glm-columns field-name">{$value.nice}</div>
-                <div class="glm-small-6 glm-columns field-value {$key}">{$value.data}</div>
-            </div>
         {/if}
+        {if $value.data !== 'Yes' && $value.data !== 'No'}
+            <div class="glm-small-6 glm-medium-12 glm-large-6 glm-columns field-name detail-{$key}-key">{$value.nice}</div>
+            <div class="glm-small-6 glm-medium-12 glm-large-6 glm-columns field-value detail-{$key}-value">{$value.data}</div>
+        {/if}
+        </div>
     {/foreach}
 </div>
 
-<script>
-    jQuery(document).ready(function($){
-        
-        $('.slash-price').prev().children('.msrp').addClass('sale');
-        $('.slash-price').remove();
-        
-    });
-</script>
\ No newline at end of file
diff --git a/views/front/fields/list.html b/views/front/fields/list.html
index 083107b..bcc33e3 100644
--- a/views/front/fields/list.html
+++ b/views/front/fields/list.html
@@ -5,11 +5,11 @@
         <div class="glm-row field-container {if $key === 'red-hot-deal' && $value.data === 'Yes'} red-hot {/if}">
     {/if}
         {if $value.type !== 'RV Used' && $value.type !== 'RV New'}
-            <div class="glm-small-12 glm-medium-5 glm-large-4 glm-columns field-name home {$key}-key">{$value.nice}</div>
-            <div class="glm-small-12 glm-medium-7 glm-large-8 glm-columns field-value home {$key}-value">{$value.data}</div>
+            <div class="glm-small-3 glm-large-4 glm-columns list-field-name home {$key}-key">{$value.nice}</div>
+            <div class="glm-small-9 glm-large-8 glm-columns list-field-value home {$key}-value">{$value.data}</div>
         {else}
-            <div class="glm-small-12 glm-medium-5 glm-large-4 glm-columns field-name {$key}-key">{$value.nice}</div>
-            <div class="glm-small-12 glm-medium-7 glm-large-8 glm-columns field-value {$key}-value">{$value.data}</div>
+            <div class="glm-small-3 glm-large-4 glm-columns list-field-name {$key}-key">{$value.nice}</div>
+            <div class="glm-small-9 glm-large-8 glm-columns list-field-value {$key}-value">{$value.data}</div>
         {/if}
            {if $key === 'red-hot-deal' && $value.data === 'Yes'}
             <div class="glm-small-12 glm-columns field-value {$key}-logo-container">
-- 
2.17.1