diff --git a/css/profile_freelist.css b/css/profile_freelist.css --- a/css/profile_freelist.css +++ b/css/profile_freelist.css @@ -1,38 +1,38 @@ .typ-profile-sidebar{ width: 310px; } .profile_share img{ width: 90px; height: 28px; } .nav-tabs > li.active > a, .nav-tabs > li.active > a:focus, .nav-tabs > li.active > a:hover{ background-color: #FFDE00 !important; color: #000000 !important; } .nav-tabs>li>a{ border: 1px solid #DDDDDD !important; - color: #898787 !important; + color: #000000 !important; } .profile_share{ border: 1px solid #DDDDDD; padding: 15px; } .profile_share_title_promotion{ background-color: #4e4e4e; margin-bottom: 2px; color: #f5cc22 !important; padding: 10px; } .profile_share_title_promotion > a > span{ margin-left: 8px; color: #f5cc22 !important; } .profile_share_title_promotion:hover{ background-color: rgba(78,78,78,0.8); } .profile_share_title{ margin-top: 12px; background-color: #f5cc22; color: #000 !important; padding: 10px; } \ No newline at end of file diff --git a/src/Plugin/Block/TYPProfileShareBlock.php b/src/Plugin/Block/TYPProfileShareBlock.php --- a/src/Plugin/Block/TYPProfileShareBlock.php +++ b/src/Plugin/Block/TYPProfileShareBlock.php @@ -1,1 +1,1 @@ -getRequestUri(); $language = \Drupal::languageManager()->getCurrentLanguage()->getId(); $s = explode("/",$url); $bid = end($s); $this->data = \Drupal::service("typ.search")->getProfile($bid ,AUTO); $this->result = \Drupal::service('typ.unvservice')->loadListing($this->data['customerid'],NULL); $type = $this->result['address'][$this->data['headingcode']][$this->data['addressid']]['customertype']; $telno = '';$fax = '';$workinghours = ''; if (!empty($this->data['telno'])) { foreach ($this->data['telno'] as $t) { $telno .= TYPProfileController::FormatPhoneNumber($t); } } if (!empty($this->data['fax'])) { foreach ($this->data['fax'] as $t) { $fax .= TYPProfileController::FormatPhoneNumber($t); } } if (!empty($this->data['workinghours'])) { $workinghours .= $this->formatWorkingHour($this->data['workinghours']); } $body_email = format_string('
'.t('Address').' '.$this->data['fulladdr'].'
'.t('Tel').' '.$telno.'
'.t('Fax').' '.$fax.'
'.t('Email').' '.$this->data['email'].'
'.t('Website').' '.$this->data['website'].'
'.t('Work-Time').' '.$workinghours.'
'.t('Link').' '.$fullurl.'
'); switch ($type){ case "FL": $email = $body_email; $facebook = 'https://www.facebook.com/sharer/sharer.php?u='.format_string($this->data['proddesc']).$fullurl; $twitter = format_string($this->data['proddesc']).$fullurl; $gplus = 'https://plus.google.com/share?url='.$fullurl; break; default: $email = $body_email; $facebook = 'https://www.facebook.com/sharer/sharer.php?u='.format_string($this->data['proddesc']).$fullurl; $twitter = format_string($this->data['proddesc']).$fullurl; $gplus = 'https://plus.google.com/share?url='.$fullurl; } $base_url_images = '/themes/bootstrap/typ/images/icon-service-profilepage/'.$language; $email = base64_encode($email); header('Content-Type: text/html; charset=UTF-8'); $build = array(); $build[] = array( '#markup' => format_string('
'.t('If you own this business contact here').'
'.t('Total Promotion').'
'.t('Share this business here').'
'), ); $build['#attached']['library'] = array( 'typ_profile/profile_share' ); return $build; } } ?> \ No newline at end of file +getRequestUri(); $language = \Drupal::languageManager()->getCurrentLanguage()->getId(); $s = explode("/",$url); $bid = end($s); $this->data = \Drupal::service("typ.search")->getProfile($bid ,AUTO); $this->result = \Drupal::service('typ.unvservice')->loadListing($this->data['customerid'],NULL); $type = $this->result['address'][$this->data['headingcode']][$this->data['addressid']]['customertype']; $telno = '';$fax = '';$workinghours = ''; if (!empty($this->data['telno'])) { foreach ($this->data['telno'] as $t) { $telno .= TYPProfileController::FormatPhoneNumber($t); } } if (!empty($this->data['fax'])) { foreach ($this->data['fax'] as $t) { $fax .= TYPProfileController::FormatPhoneNumber($t); } } if (!empty($this->data['workinghours'])) { $workinghours .= $this->formatWorkingHour($this->data['workinghours']); } $body_email = format_string('
'.t('Address').' '.$this->data['fulladdr'].'
'.t('Tel').' '.$telno.'
'.t('Fax').' '.$fax.'
'.t('Email').' '.$this->data['email'].'
'.t('Website').' '.$this->data['website'].'
'.t('Work-Time').' '.$workinghours.'
'.t('Link').' '.$fullurl.'
'); switch ($type){ case "FL": $email = $body_email; $facebook = 'https://www.facebook.com/sharer/sharer.php?u='.format_string($this->data['proddesc']).$fullurl; $twitter = format_string($this->data['proddesc']).$fullurl; $gplus = 'https://plus.google.com/share?url='.$fullurl; break; default: $email = $body_email; $facebook = 'https://www.facebook.com/sharer/sharer.php?u='.format_string($this->data['proddesc']).$fullurl; $twitter = format_string($this->data['proddesc']).$fullurl; $gplus = 'https://plus.google.com/share?url='.$fullurl; } $base_url_images = '/themes/bootstrap/typ/images/icon-service-profilepage/'.$language; $email = base64_encode($email); header('Content-Type: text/html; charset=UTF-8'); $build = array(); $build[] = array( '#markup' => format_string('
'.t('If you own this business contact here').'
'.t('Total Promotion').'
'.t('Share this business here').'
'), ); $build['#attached']['library'] = array( 'typ_profile/profile_share' ); return $build; } } ?> \ No newline at end of file diff --git a/templates/typ-profile.html.twig b/templates/typ-profile.html.twig --- a/templates/typ-profile.html.twig +++ b/templates/typ-profile.html.twig @@ -1,449 +1,449 @@ {% set base_images = 'http://media.yellowpages.co.th/yellowpages' %} {% set base_promotion = 'http://promotion.yellowpages.co.th/media/promotion/' %}
{#{% if profile.logo %}#} {#
#} {##} {#
#} {#{% else %}#} {#
#} {##} {#
#} {#{% endif %}#}

{{ profile.humanname|raw }}

{% trans %}Category{% endtrans %} : {{ profile.headingname|raw }}

{% if type != 'FL' %} {% endif %}
{% if type != 'FL' %} {{ profile.profile|raw}} {% else %} {{ profile.profile|raw|slice(0, 100)}}{% if profile.profile|length > 100 %}{{ '...

' }}{% endif %} {% endif %} -
+

{#{% if not profile.addr %}{% else %}#} {#{% trans %} Address {% endtrans %}#} {#{{ [profile.addr,profile.soi,profile.road,profile.subdistrictname,#} {#profile.districtname,profile.cityname,profile.postcode]|join(' ') }}#} {#{% endif %}#} {#{% if profile.location.lat %}#} {#
#} {#{% else %}#} {#
#} {#{% endif %}#}
{% if not profile.addr %}{% else %} {% endif %} {% if not profile.telno %}{% else %} {% endif %} {% if not profile.fax %}{% else %} {% endif %} {% if not profile.email %}{% else %} {% endif %} {% if not profile.website %}{% else %} {% endif %} {% if not profile.workinghours %}{% else %} {% endif %}
{% trans %} Address {% endtrans %}: {{ [profile.addr,profile.soi,profile.road,profile.subdistrictname,profile.districtname,profile.cityname,profile.postcode]|join(' ') }}
{% trans %} Tel {% endtrans %}: {% if not profile.telno %} {% else %} {% if type == 'FL' %} {{ profile._format.telno.0 }}
{% else %} {% for key, tel in profile._format.telno %} {% if loop.last != key+1 %}{{ tel }}{{ " ," }} {% else %}{{ tel }}{% endif %} {% endfor %}
{% endif %} {% endif %}
{% trans %} Fax {% endtrans %}: {% if not profile.fax %} {% else %} {% if type == 'FL' %} {{ profile._format.fax.0 }}
{% else %} {% for key, fax in profile._format.fax %} {% if loop.last != key+1 %}{{ fax }}{{ " ," }} {% else %}{{ fax }}{% endif %} {% endfor %}
{% endif %} {% endif %}
{% trans %} Email {% endtrans %}: {% if not profile.email %} {% else %} {% if type == 'FL' %} {% set email = profile.email|split(',') %} {% for key , mail in email %} {% if loop.last != key+1 %}{{ mail }} ,
{% else %}{{ mail }}
{% endif %} {% endfor %} {% else %} {% set email = profile.email|split(',') %} {% for key , mail in email %} {% if loop.last != key+1 %}{{ mail }} ,
{% else %}{{ mail }}
{% endif %} {% endfor %} {% endif %} {% endif %}
{% trans %} Website {% endtrans %}: {% if not profile.website %} {% else %} {% set website = profile.website|split(',') %} {% for key , web in website %} {% if loop.last != key+1 %}{{ web }} ,
{% else %}{{ web }}
{% endif %} {% endfor %} {% endif %}
{% trans %} Work-Time {% endtrans %}: {% if not profile.workinghours %} {% else %} {{ profile._format.workinghours }}
{% endif %}
{% if type != 'FL' %} {% if not prodescription or prodescription is empty %} {% else %}
{% trans %} Product And Service {% endtrans %} {{ prodescription|raw }}
{% endif %} {% if not profile.brandname %} - {% else %}
{% trans %} Banner {% endtrans %}
{{ profile.brandname|replace({"

":" ","

":" "}) }} + {% else %}{% trans %} Banner {% endtrans %}
{{ profile.brandname|replace({"

":" ","

":" "}) }} {% endif %} {% endif %}

{# TAB #} {% if type == 'FL' %}
{% if promotion.promotionid %} {% endif %} {% if profile.location.lat %} {% endif %}
{% else %}
{% endif %} {#


#} {#{% if not profile.custname %}#} {#{% else %}#} {#{{ profile.custname|raw }} : แสดงความคิดเห็น#} {#{% endif %}#} {#

#} {# TAB #} {#
#} {##} {#
#} {##} {##} {#{##}#} {#
#} {#
#} {# END TAB #}