hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-03-10 10:15:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/openclassify/openclassify

Browse Source 
 Conflicts:
	addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig
This commit is contained in:
Diatrex 2019-12-26 17:44:24 +03:00
commit e6e49cbec7
8 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/default/visiosoft/advs-module/resources/css/list.css
View File

@ -6,16 +6,16 @@
height: 500px;
}
.table-ads .img-thumbnail {
.table-classified .img-thumbnail {
max-height: 70px;
}
.table-ads .td-image {
.table-classified .td-image {
max-width: 200px;
max-height: 100px;
}
.list-ads .bg-light {
.list-classified .bg-light {
height: 100px;
}

2
addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig
View File

@ -47,6 +47,8 @@
{{ blocks('ad-item-content-block-area') }}
{% endif %}
{{ addBlock('ad-detail/widget', {'price': adv.price, 'id': adv.id})|raw }}
</div>
</section>

2
addons/default/visiosoft/advs-module/resources/views/list/list.twig
View File

@ -16,7 +16,7 @@
{% include "visiosoft.module.advs::list/partials/list-filter" %}
</div>
<div class="col-md-9">
<div class="section recommended-ads">
<div class="section recommended-classified">
<div class="row breadcrumb list-header">

2
addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig
View File

@ -1,6 +1,6 @@
{{ addBlock('ad-list/partials/ads',{'featured_advs':featured_advs})|raw }}
{% for adv in advs %}
<div class="col-md-12 mb-2 list-ads">
<div class="col-md-12 mb-2 list-classified">
<a href="{{ adv.detail_url }}" class="text-dark">
<div class="row bg-light">
<div class="col-md-2 justify-content-center align-self-center border-right border-white">

4
addons/default/visiosoft/advs-module/resources/views/list/table.twig
View File

@ -1,8 +1,8 @@
{% extends "visiosoft.module.advs::list/list" %}
{% block listContent %}
<div class="table-responsive table-ads">
<div class="table-responsive table-classified">
<table class="table ads-list-table">
<table class="table classified-list-table">
<thead>
<tr>
<th scope="col" colspan="2"

1
addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
View File

@ -207,6 +207,7 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
'as' => 'ajax::getAds',
'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@getMyAds'
],
];
/**

6
addons/default/visiosoft/advs-module/src/Http/Controller/AjaxController.php
View File

@ -1,6 +1,7 @@
<?php namespace Visiosoft\AdvsModule\Http\Controller;
use Anomaly\Streams\Platform\Http\Controller\PublicController;
use Anomaly\UsersModule\User\UserModel;
use Visiosoft\AdvsModule\Adv\AdvModel;
use Illuminate\Http\Request;
use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface;
@ -9,14 +10,17 @@ use Visiosoft\LocationModule\District\DistrictModel;
use Visiosoft\LocationModule\Neighborhood\NeighborhoodModel;
use Visiosoft\LocationModule\Village\VillageModel;
use Visiosoft\CatsModule\Category\CategoryModel;
use Visiosoft\NotificationsModule\Notify\Notification\SendLoanApplicationMail;
class AjaxController extends PublicController
{
private $adv_model;
private $userModel;
public function __construct(AdvModel $advModel)
public function __construct(AdvModel $advModel, UserModel $userModel)
{
$this->adv_model = $advModel;
$this->userModel = $userModel;
parent::__construct();
}

6
addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
View File

@ -22,6 +22,12 @@
{% endfor %}
</script>
<script type="text/javascript">
{% for script in asset_inlines("customjs.js") %}
{{ script|raw }}
{% endfor %}
</script>
{# Include Styles Loaded From Outside #}
<style type="text/css">
{% for style in asset_inlines("styles.css", ["min"]) %}