Merge pull request #255 from openclassify/dia

#582 Module upgrades 2. Step [comparisons module]
This commit is contained in:
Fatih Alp 2020-01-28 10:46:20 +03:00 committed by GitHub
commit bbb285ec4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 9 deletions

View File

@ -26,7 +26,7 @@
</div>
<!-- Content With Block -->
{{ addBlock('ad-detail/content',{'features':features,'adv':adv})|raw }}
{{ addBlock('ad-detail/content',{'features':features,'adv':adv, 'profile': profile})|raw }}
<!-- Content With Block -->
</div>
</div>

View File

@ -36,6 +36,7 @@
<!-- Detail With Block -->
{{ addBlock('ad-detail/details',{'adv':adv})|raw }}
{{ addBlock('ad-detail/widget-details',{'adv':adv})|raw }}
<!-- Detail With Block -->
{% if adv.isCorporate == 2 %}

View File

@ -1,8 +1,8 @@
{{ addBlock('ad-list/partials/ads',{'featured_advs':featured_advs})|raw }}
{% for adv in advs %}
<div class="col-md-12 mb-2 list-classified">
<div class="col-md-12 mb-2 list-classified bg-light">
<a href="{{ adv.detail_url }}" class="text-dark">
<div class="row bg-light{% if adv.doping != null %} doping_type4 {% endif %}">
<div class="row{% if adv.doping != null %} doping_type4 {% endif %}">
<div class="col-md-2 justify-content-center align-self-center text-center border-right border-white">
<img class="img-thumbnail" src="{{ adv.cover_photo }}" alt="{{ adv.name }}"
style="max-height:80px;">
@ -10,7 +10,7 @@
<div class="col-md-7 justify-content-center align-self-center border-right border-white">
<div class="row">
<div class="col-md-12">
<p>{{ adv.name }}</p>
<p class="mb-0">{{ adv.name }}</p>
</div>
<div class="col-md-12 text-truncate">
<small class="text-muted">{{ adv.cat1_name }}, {{ adv.cat2_name }}</small>
@ -31,5 +31,11 @@
</div>
</div>
</a>
<div class="row mb-2">
<div class="col-md-2"></div>
<div class="col-md-7 justify-content-center align-self-center border-right border-white">
{{ addBlock('list/extra-actions', {'ad': adv})|raw }}
</div>
</div>
</div>
{% endfor %}

View File

@ -301,11 +301,6 @@ class AdvsController extends PublicController
}
$this->event->dispatch(new viewAd($adv));//view ad
$isActiveqrContact = $this->adv_model->is_enabled('qrcontact');
if ($isActiveqrContact) {
$qrModel = new QrModel();
$qrSRC = $qrModel->source($adv);
}
$this->template->set('meta_keywords', implode(',', explode(' ', $adv->name)));
$this->template->set('meta_description', strip_tags($adv->advs_desc, ''));
$this->template->set('meta_title', $adv->name . "|" . end($categories)['name']);