Merge remote-tracking branch 'origin/master'

This commit is contained in:
alp 2020-02-04 17:22:58 +03:00
commit b03a57ef77
5 changed files with 72 additions and 9 deletions

View File

@ -257,5 +257,6 @@ return [
'name' => 'Yes' 'name' => 'Yes'
], ],
"no_location" => "No location is selected.", "no_location" => "No location is selected.",
"continue" => 'Continue' "continue" => 'Continue',
"gallery" => 'Gallery',
]; ];

View File

@ -256,5 +256,6 @@ return [
'name' => 'Evet' 'name' => 'Evet'
], ],
"no_location" => "Lokasyon eklenmemiş.", "no_location" => "Lokasyon eklenmemiş.",
"continue" => 'Devam Et' "continue" => 'Devam Et',
"gallery" => 'Galeri',
]; ];

View File

@ -0,0 +1,53 @@
{% extends "visiosoft.module.advs::list/list" %}
{% block listContent %}
{{ addBlock('ad-list/partials/gallery',{'featured_advs':featured_advs})|raw }}
{% for adv in advs %}
<div class="col-sm-6 col-md-4 col-lg-4 d-flex align-items-stretch">
<div class="card mb-4 box-shadow {% if adv.doping != null %} doping_type4 {% endif %}">
<div class="row p-2" style="min-height: 150px;">
<a href="{{ adv.detail_url }}">
<div class="col-md-12 justify-content-center align-self-center">
<img class="card-img-top img-fluid img-thumbnail"
src="{{ adv.cover_photo }}"
style="height: 150px">
</div>
</a>
</div>
<div class="card-body">
{% if setting_value('visiosoft.theme.base::price_fields') %}
<div class="d-flex justify-content-between align-items-center">
<b>{{ adv.price }} {{ adv.currency }}</b>
</div>
{% endif %}
<div class="d-flex justify-content-between align-items-center text-truncate">
<a href="{{ adv.detail_url }}">
<p class="card-title d-inline-block">{{ adv.name }}</p>
</a>
</div>
{% if setting_value('visiosoft.module.location::home_page_location') %}
<div class="d-flex justify-content-between align-items-center">
<small>
<i class="fas fa-location-arrow text-primary"></i>
{{ adv.city_name }}, {{ adv.country_name }}
</small>
</div>
{% endif %}
{% if setting_value('visiosoft.theme.base::date_fields') %}
<div class="d-flex justify-content-between align-items-center">
<small>
<i class="far fa-clock text-dark"></i>
{{ adv.created_at|date('d/m/Y') }}
</small>
</div>
{% endif %}
</div>
</div>
</div>
{% endfor %}
{% endblock %}
{% block customjs %}
{{ asset_add("scripts.js", "visiosoft.module.advs::js/list-table.js") }}
{% include "theme::scroll-modal" %}
{% endblock %}

View File

@ -1,22 +1,28 @@
<div class="row text-center"> <div class="row text-center">
<div class="col-4"> <div class="col-3">
{% if setting_value('visiosoft.module.location::list_page_location') %} {% if setting_value('visiosoft.module.location::list_page_location') %}
<a href="{{ url_route('visiosoft.module.advs::view_type',['map']) }}" class="text-dark"> <a href="{{ url_route('visiosoft.module.advs::view_type',['map']) }}" class="text-dark">
<i class="fas fa-location-arrow text-primary"></i> <i class="fas fa-location-arrow text-primary"></i>
{{ trans("visiosoft.module.advs::field.show_display_mode.map") }} <small>{{ trans("visiosoft.module.advs::field.show_display_mode.map") }}</small>
</a> </a>
{% endif %} {% endif %}
</div> </div>
<div class="col-4"> <div class="col-3">
<a href="{{ url_route('visiosoft.module.advs::view_type',['list']) }}" class="text-dark"> <a href="{{ url_route('visiosoft.module.advs::view_type',['list']) }}" class="text-dark">
<i class="fa fa-list-ul"></i> <i class="fa fa-list-ul"></i>
{{ trans('visiosoft.module.advs::field.show_list_view.name') }} <small>{{ trans('visiosoft.module.advs::field.show_list_view.name') }}</small>
</a> </a>
</div> </div>
<div class="col-4"> <div class="col-3">
<a href="{{ url_route('visiosoft.module.advs::view_type',['table']) }}" class="text-dark"> <a href="{{ url_route('visiosoft.module.advs::view_type',['table']) }}" class="text-dark">
<i class="fa fa-table"></i> <i class="fa fa-table"></i>
{{ trans('visiosoft.module.advs::field.show_table_view.name') }} <small>{{ trans('visiosoft.module.advs::field.show_table_view.name') }}</small>
</a>
</div>
<div class="col-3">
<a href="{{ url_route('visiosoft.module.advs::view_type',['gallery']) }}" class="text-dark">
<i class="fas fa-boxes"></i>
<small> {{ trans('visiosoft.module.advs::field.gallery') }}</small>
</a> </a>
</div> </div>
</div> </div>

View File

@ -227,6 +227,8 @@ class AdvsController extends PublicController
return $this->view->make('visiosoft.module.advs::list/table', $compact); return $this->view->make('visiosoft.module.advs::list/table', $compact);
elseif (isset($viewType) and $viewType == 'map') elseif (isset($viewType) and $viewType == 'map')
return $this->view->make('visiosoft.module.advs::list/map', $compact); return $this->view->make('visiosoft.module.advs::list/map', $compact);
elseif (isset($viewType) and $viewType == 'gallery')
return $this->view->make('visiosoft.module.advs::list/gallery', $compact);
return $this->view->make('visiosoft.module.advs::list/list', $compact); return $this->view->make('visiosoft.module.advs::list/list', $compact);
} }
@ -678,7 +680,7 @@ class AdvsController extends PublicController
$categories = $this->adv_repository->getCategoriesWithAdID($id); $categories = $this->adv_repository->getCategoriesWithAdID($id);
return $this->view->make('visiosoft.module.advs::new-ad/edit-cat', compact('id', 'adv','categories')); return $this->view->make('visiosoft.module.advs::new-ad/edit-cat', compact('id', 'adv', 'categories'));
} }