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" %} {% include "visiosoft.module.advs::list/partials/ads" %}
{% endblock %} {% endblock %}
</div> </div>
<div class="d-flex justify-content-center"> {% include "visiosoft.module.advs::list/partials/pagination" %}
{{ advs.appends(request_query()).links()|raw }}
</div>
{# <div class="category-tabs"></div>#} {# <div class="category-tabs"></div>#}
</div> </div>
</div> </div>

View File

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

View File

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

View File

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