Updating address section

remove labels and put contact info stuff in top and not combine the
other fields.

diff --git a/glm-member-db-contacts/views/front/contacts/list.html b/glm-member-db-contacts/views/front/contacts/list.html
index a3743ae..5de1efb 100644 (file)
--- a/glm-member-db-contacts/views/front/contacts/list.html
+++ b/glm-member-db-contacts/views/front/contacts/list.html
@@ -88,6 +88,11 @@ and open the template in the editor.
 
                                 <h4 class="glm-member-title">
                                     {$contact.lname}, {$contact.fname}
+                                    {$cgsc = apply_filters( 'glm_custom_fields', 'CGCS', $contact.id )}
+                                    {if $cgsc == 'Yes'}
+                                    , CGSC
+                                    {/if}
+
                                 </h4>
                                 <div class="row glm-contact-info">
                                     {$contact_fname=""}
@@ -134,6 +139,33 @@ and open the template in the editor.
                                         {$contact_org=$contact.org}
                                         {$contact_title=$contact.title}
                                     {/if}
+                                    {if $contact.business_publish.value == true && $contact.contact_publish.value != true}
+                                    <div class="small-12 columns">
+                                        {if $contact.org}
+                                        <div class="glm-contact-info-org">
+                                            <span class="field-value">{$contact.org}</span>
+                                        </div>
+                                        {/if}
+                                        {if $contact_title}
+                                        <div class="glm-contact-info-descr">
+                                            <span class="field-value">{$contact_title}</span>
+                                        </div>
+                                        {/if}
+                                    </div>
+                                    {else if $contact.contact_publish.value == true}
+                                    <div class="small-12 columns">
+                                        {if $contact.mailing_address_type}
+                                        <div class="glm-contact-info-org">
+                                            <span class="field-value">{$contact.mailing_address_type}</span>
+                                        </div>
+                                        {/if}
+                                        {if $contact.mailto_label}
+                                        <div class="glm-contact-info-descr">
+                                            <span class="field-value">{$contact.mailto_label}</span>
+                                        </div>
+                                        {/if}
+                                    </div>
+                                    {/if}
                                     <div class="small-12 medium-6 columns">
                                         {if $contact.primary_contact.value == true}
 
@@ -143,7 +175,14 @@ and open the template in the editor.
                                                     <!-- and whether it has subs -->
                                                     {if $contact_with_subs["id"] == $contact.id && "subs"|array_key_exists:$contact_with_subs}
                                                         {foreach $contact_with_subs["subs"] as $contact_sub}
-                                                            <div><span>{$contact_sub["title"]}{$contact_sub["fname"]} {$contact_sub["lname"]}</span></div>
+                                                            <div>
+                                                                <span>
+                                                                    {$contact_sub["title"]}{$contact_sub["fname"]} {$contact_sub["lname"]}
+                                                                    {$cgcs = apply_filters( 'glm_custom_fields', 'CGCS', $contact.id )}
+                                                                    {$contact.id}
+                                                                    {$cgcs|var_dump}
+                                                                </span>
+                                                            </div>
                                                         {/foreach}
                                                     {/if}
                                                 {/foreach}
@@ -179,7 +218,7 @@ and open the template in the editor.
                                             <span class="field-vaklue"><a href="mailto:{$contact.business_email}" target="_top">{$contact_email}</a></span>
                                         </div>
                                         {/if}
-                                        
+
                                         {if $contact_url}
                                         <div class="glm-contact-info-url">
                                             <span class="field-title">Website </span>
@@ -189,20 +228,6 @@ and open the template in the editor.
                                         </div>
                                         {/if}
                                     </div>
-                                    <div class="small-12 columns">
-                                        {if $contact.org}
-                                        <div class="glm-contact-info-org">
-                                            <span class="field-title">Company Name </span>
-                                            <span class="field-value">{$contact_org}</span>
-                                        </div>
-                                        {/if}
-                                        {if $contact_title}
-                                        <div class="glm-contact-info-descr">
-                                            <span class="field-title">Company Position </span>
-                                            <span class="field-value">{$contact_title}</span>
-                                        </div>
-                                        {/if}
-                                    </div>
                                 </div>
                             </div>
                             {if $contact.image}
@@ -215,9 +240,9 @@ and open the template in the editor.
                             <div class="toggle-contact-full-profile">
                                 See full profile
                             </div>
-                        
-                        
-                            <div class="contact-full-profile">
+
+
+                        <div class="contact-full-profile">
 
                             {if $contact.business_publish.value == true && $contact.contact_publish.value == true}
                                     <div class="organization-info section-container">
@@ -225,29 +250,21 @@ and open the template in the editor.
                                         <div class="section-data">
                                             {if $contact.business_fname}
                                             <div class="section-field">
-                                                <span class="field-title">
-                                                    First Name
-                                                </span>
                                                 <span class="field-value">
-                                                    {$contact.business_fname}
+                                                    {$contact.business_lname}
+                                                    {if $contact.business_lname}, {$contact.business_fname} {/if}
                                                 </span>
                                             </div>
                                             {/if}
-                                            {if $contact.business_lname}
+                                            {if $contact.org}
                                             <div class="section-field">
-                                                <span class="field-title">
-                                                    Last Name
-                                                </span>
                                                 <span class="field-value">
-                                                    {$contact.business_lname}
+                                                    {$contact.org}
                                                 </span>
                                             </div>
                                             {/if}
                                             {if $contact.title}
                                             <div class="section-field">
-                                                <span class="field-title">
-                                                    Title
-                                                </span>
                                                 <span class="field-value">
                                                     {$contact.title}
                                                 </span>
@@ -297,7 +314,7 @@ and open the template in the editor.
                                         </div>
                                     </div>
                             {/if}
-                            
+
                             {if $customFieldGroups}
                                     <div class="custom-info section-container">
                                         <h3 class="section-title">