hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-11 18:01:10 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1030 from openclassify/dia

Browse Source 
fix category text title
This commit is contained in:
Fatih Alp 2021-04-14 11:01:41 +03:00 committed by GitHub
commit c2913e40d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -136,7 +136,7 @@ Emek Sancar @emeksancar
Ozcan Durak @ozcandurak
Dia @Diatrex
Dia @diashalabi
## Thanks to

34
addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig
View File

@ -1,22 +1,26 @@
<div id="mobileListingPage" class="d-sm-none mb-5">
{% include "visiosoft.module.advs::list/partials/mobile-breadcrumb" %}
{% if not hideBreadcrump %}
{% include "visiosoft.module.advs::list/partials/mobile-breadcrumb" %}
{% endif %}
{% if not hideActions %}
<div id="mobileListNav" class="d-flex p-2 align-items-center mb-1">
<div id="filter_modal_btn" class="d-flex flex-column align-items-center mobile-list-nav-item">
{{ img('visiosoft.module.advs::images/listing/mobile-filter.svg').data|raw }}
<p class="mt-1">{{ trans('visiosoft.module.advs::field.filter') }}</p>
</div>
<div class="divider"></div>
<div id="sort_modal_btn" class="d-flex flex-column align-items-center mobile-list-nav-item">
{{ img('visiosoft.module.advs::images/listing/mobile-sort.svg').data|raw }}
<p class="mt-1">{{ trans('visiosoft.module.advs::field.sort') }}</p>
</div>
<div class="divider"></div>
{{ addBlock('ads-list/mobile/action-bar')|raw }}
<div id="mobileListNav" class="d-flex p-2 align-items-center mb-1">
<div id="filter_modal_btn" class="d-flex flex-column align-items-center mobile-list-nav-item">
{{ img('visiosoft.module.advs::images/listing/mobile-filter.svg').data|raw }}
<p class="mt-1">{{ trans('visiosoft.module.advs::field.filter') }}</p>
</div>
<div class="divider"></div>
<div id="sort_modal_btn" class="d-flex flex-column align-items-center mobile-list-nav-item">
{{ img('visiosoft.module.advs::images/listing/mobile-sort.svg').data|raw }}
<p class="mt-1">{{ trans('visiosoft.module.advs::field.sort') }}</p>
</div>
<div class="divider"></div>
{{ addBlock('ads-list/mobile/action-bar')|raw }}
</div>
{% endif %}
<div id="mobileListing">
{% for adv in advs %}

4
addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
View File

@ -409,12 +409,12 @@ class AdvsController extends PublicController
if ($city) {
$catText = "$city->name $catText";
} elseif (count($mainCats) == 1 || count($mainCats) == 2) {
$catText = end($mainCats)['val'];
$catText = end($mainCats)->name;
} elseif (count($mainCats) > 2) {
$catArray = array_slice($mainCats, 2);
$loop = 0;
foreach ($catArray as $cat) {
$catText = !$loop ? $catText . $cat['val'] : $catText . ' ' . $cat['val'];
$catText = !$loop ? $catText . $cat->name : $catText . ' ' . $cat->name;
$loop++;
}
}

1
addons/default/visiosoft/location-module/resources/lang/en/message.php
View File

@ -3,4 +3,5 @@
return [
'placeholder' => 'Type here to search',
'null_msg' => 'Not Found',
'choose_country' => 'Choose a Country',
];

10
addons/default/visiosoft/location-module/resources/views/admin/fields/choose.twig
View File

@ -2,7 +2,7 @@
<button class="close" data-dismiss="modal">
<span>&times;</span>
</button>
<h4 class="modal-title">{{ trans('visiosoft.module.advs::message.choose_field_type') }}</h4>
<h4 class="modal-title">{{ trans('visiosoft.module.location::message.choose_country') }}</h4>
</div>
<div class="modal-body">
@ -10,12 +10,10 @@
{% include "streams::modals/filter" %}
<ul class="nav nav-pills nav-stacked">
{% for field_type in field_types %}
{% for country in countries %}
<li class="nav-item">
<a href="{{ url_to('admin/advs/fields/create?field_type=' ~ field_type.namespace) }}" class="nav-link">
<strong>{{ trans(field_type.getTitle()) }}</strong>
<br>
<small>{{ trans(field_type.getDescription()) }}</small>
<a href="{{ url_to('admin/location/cities/create?cities=' ~ country.id) }}" class="nav-link">
<strong>{{ country.name }}</strong>
</a>
</li>
{% endfor %}

8
addons/default/visiosoft/location-module/src/Http/Controller/Admin/CitiesController.php
View File

@ -5,6 +5,7 @@ use Visiosoft\LocationModule\City\CityModel;
use Visiosoft\LocationModule\City\Form\CityFormBuilder;
use Visiosoft\LocationModule\City\Table\CityTableBuilder;
use Anomaly\Streams\Platform\Http\Controller\AdminController;
use Visiosoft\LocationModule\Country\Contract\CountryRepositoryInterface;
use Visiosoft\LocationModule\District\DistrictModel;
class CitiesController extends AdminController
@ -32,6 +33,13 @@ class CitiesController extends AdminController
return $table->render();
}
public function choose(CountryRepositoryInterface $countryRepository)
{
$countries = $countryRepository->all();
return $this->view->make('visiosoft.module.location::admin/fields/choose', ['countries' => $countries]);
}
public function create(CityFormBuilder $form)
{
$form->setCountry($this->request->get('cities'));

10
addons/default/visiosoft/location-module/src/LocationModule.php
View File

@ -14,7 +14,15 @@ class LocationModule extends Module
'new_country',
],
],
'cities',
'cities' => [
'buttons' => [
'new_city' => [
'data-toggle' => 'modal',
'data-target' => '#modal',
'href' => 'admin/location/cities/choose',
],
],
],
'districts',
'neighborhoods',
'village',