Merge pull request #240 from openclassify/vedat

Vedat
This commit is contained in:
Fatih Alp 2020-01-18 12:31:52 +03:00 committed by GitHub
commit 02f1306d5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 42 additions and 47 deletions

View File

@ -34,9 +34,8 @@
{% include "visiosoft.module.advs::list/partials/ads" %}
{% endblock %}
</div>
<div class="d-flex justify-content-center">
{{ advs.appends(request_query()).links()|raw }}
</div>
{% include "visiosoft.module.advs::list/partials/pagination" %}
{# <div class="category-tabs"></div>#}
</div>
</div>

View File

@ -32,4 +32,3 @@
</a>
</div>
{% endfor %}
{{ advs.links()|raw }}

View File

@ -0,0 +1,3 @@
<div class="d-flex justify-content-center">
{{ advs.appends(request_query()).links()|raw }}
</div>

View File

@ -4,23 +4,22 @@
<table class="table classified-list-table">
<thead>
<tr>
<th scope="col" colspan="2"
class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.name') }}</th>
<th scope="col"
class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.price') }}</th>
<th scope="col"
class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }}</th>
{% if setting_value('visiosoft.module.location::list_page_location') %}
<tr>
<th scope="col" colspan="2"
class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.name') }}</th>
<th scope="col"
class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }}
/ {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_country') }}</th>
{% endif %}
{{ addBlock('ads-list/table-column',{'seenList':seenList})|raw }}
</tr>
class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.price') }}</th>
<th scope="col"
class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }}</th>
{% if setting_value('visiosoft.module.location::list_page_location') %}
<th scope="col"
class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }}
/ {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_country') }}</th>
{% endif %}
{{ addBlock('ads-list/table-column',{'seenList':seenList})|raw }}
</tr>
</thead>
<tbody>
{% for adv in advs %}
<tr class="text-center clickable-row" data-href='{{ adv.detail_url }}'>
<td class="justify-content-center align-middle text-center td-image">
@ -49,15 +48,10 @@
{{ addBlock('ads-list/table-row',{'seenList':seenList,'adv':adv})|raw }}
</tr>
{% endfor %}
<!--Table Rows-->
</tbody>
</table>
</div>
{{ advs.links()|raw }}
{% endblock %}
{% block customjs %}

View File

@ -114,7 +114,7 @@
var default_city = "{{ setting_value('visiosoft.module.advs::default_city') }}";
var default_district = "{{ setting_value('visiosoft.module.advs::default_district') }}";
var default_neighborhood = "{{ setting_value('visiosoft.module.advs::default_neighborhood') }}";
var default_currency = "{{ setting_value('visiosoft.module.advs::default_currency') }}";
var default_currency = "{{ setting_value('streams::currency') }}";
var default_GET = "{{ setting_value('visiosoft.module.advs::default_GET') }}";
var adv_id = "{{ id }}";
</script>

View File

@ -49,7 +49,7 @@ return [
],
'TRY' => [
'name' => 'Türk Lirası',
'direction' => 'ltr',
'direction' => 'rtl',
'symbol' => 'TL',
'separator' => ',',
'point' => '.',
@ -105,7 +105,7 @@ return [
],
'AUD' => [
'name' => 'Australian Dollar',
'direction' => 'rtr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
@ -137,7 +137,7 @@ return [
],
'BBD' => [
'name' => 'Barbados Dollar',
'direction' => 'rtr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
@ -177,7 +177,7 @@ return [
],
'BMD' => [
'name' => 'Bermudian Dollar',
'direction' => 'rtr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
@ -185,7 +185,7 @@ return [
],
'BND' => [
'name' => 'Brunei Dollar',
'direction' => 'rtr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
@ -209,7 +209,7 @@ return [
],
'BSD' => [
'name' => 'Bahamian Dollar',
'direction' => 'rtr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
@ -241,7 +241,7 @@ return [
],
'BZD' => [
'name' => 'Belize Dollar',
'direction' => 'rtr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
@ -249,7 +249,7 @@ return [
],
'CAD' => [
'name' => 'Canadian Dollar',
'direction' => 'rtr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
@ -273,7 +273,7 @@ return [
],
'CLP' => [
'name' => 'Chilean Peso',
'direction' => 'rtr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
@ -289,7 +289,7 @@ return [
],
'COP' => [
'name' => 'Colombian Peso',
'direction' => 'rtr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
@ -305,7 +305,7 @@ return [
],
'CUP' => [
'name' => 'Cuban Peso',
'direction' => 'rtr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
@ -313,7 +313,7 @@ return [
],
'CVE' => [
'name' => 'Cape Verde Escudo',
'direction' => 'rtr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
@ -345,7 +345,7 @@ return [
],
'DOP' => [
'name' => 'Dominican Peso',
'direction' => 'rtr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
@ -361,11 +361,11 @@ return [
],
'EGP' => [
'name' => 'Egyptian Pound',
'direction' => 'ltr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
'symbol' => '£',
'symbol' => 'EGP',
],
'ERN' => [
'name' => 'Nakfa',
@ -401,11 +401,11 @@ return [
],
'FKP' => [
'name' => 'Falkland Islands Pound',
'direction' => 'ltr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
'symbol' => '£',
'symbol' => 'FKP',
],
'GBP' => [
'name' => 'Pound Sterling',
@ -433,11 +433,11 @@ return [
],
'GIP' => [
'name' => 'Gibraltar Pound',
'direction' => 'ltr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
'symbol' => '£',
'symbol' => 'GIP',
],
'GMD' => [
'name' => 'Dalasi',
@ -985,11 +985,11 @@ return [
],
'SDG' => [
'name' => 'Sudanese Pound',
'direction' => 'ltr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
'symbol' => '£',
'symbol' => 'SDG',
],
'SEK' => [
'name' => 'Swedish Krona',
@ -1009,11 +1009,11 @@ return [
],
'SHP' => [
'name' => 'Saint Helena Pound',
'direction' => 'ltr',
'direction' => 'rtl',
'separator' => ',',
'point' => '.',
'decimals' => 2,
'symbol' => '£',
'symbol' => 'SHP',
],
'SLL' => [
'name' => 'Leone',