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

Merge pull request #66 from openclassify/vedat

Browse Source 
#382
This commit is contained in:
Fatih Alp 2019-08-15 19:05:52 +03:00 committed by GitHub
commit d76a2d3aec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 270 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@
<!-- recommended-ads --> <!-- recommended-ads -->
<div class="col-sm-8 col-md-9"> <div class="col-sm-8 col-md-9">
<div class="section recommended-ads"> <div class="section recommended-ads table-recommended-section">
<!-- featured-top --> <!-- featured-top -->
{% include "visiosoft.module.advs::advs/partials/display_mode" %} {% include "visiosoft.module.advs::advs/partials/display_mode" %}
<div class="featured-top"> <div class="featured-top">
@ -86,6 +86,7 @@
<div class="category-tabs"> <div class="category-tabs">
</div> </div>
<div class="table-responsive">
<table class="table ads-list-table"> <table class="table ads-list-table">
<thead> <thead>
@ -103,6 +104,7 @@
{% include "visiosoft.module.advs::advs/partials/table-row" %} {% include "visiosoft.module.advs::advs/partials/table-row" %}
</tbody> </tbody>
</table> </table>
</div>
<!-- pagination --> <!-- pagination -->
<div class="text-center"> <div class="text-center">
<div class="tool-pagination"> <div class="tool-pagination">
@ -163,4 +165,5 @@
</div> </div>
{{ asset_add("scripts.js", "visiosoft.module.advs::js/admin-list.js") }} {{ asset_add("scripts.js", "visiosoft.module.advs::js/admin-list.js") }}
{{ asset_add("scripts.js", "visiosoft.module.advs::js/list-table.js") }} {{ asset_add("scripts.js", "visiosoft.module.advs::js/list-table.js") }}
{% include "theme::scroll-modal" %}
{% endblock %} {% endblock %}

349
addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig
View File

@ -10,17 +10,18 @@
<div class="panel-heading"> <div class="panel-heading">
<a data-toggle="collapse" data-parent="#accordion" href="#accordion-one"> <a data-toggle="collapse" data-parent="#accordion" href="#accordion-one">
<h4 class="panel-title">{{ trans("visiosoft.module.advs::field.categories") }}<span <h4 class="panel-title">{{ trans("visiosoft.module.advs::field.categories") }}<span
class="pull-right"><i class="fa fa-minus"></i></span></h4> class="pull-right"><i class="fa fa-plus"></i></span></h4>
</a> </a>
</div><!-- panel-heading --> </div><!-- panel-heading -->
<div id="accordion-one" class="panel-collapse collapse in"> <div id="accordion-one" class="panel-collapse collapse">
<!-- panel-body --> <!-- panel-body -->
<div class="panel-body"> <div class="panel-body">
{% for maincat in mainCats %} {% for maincat in mainCats %}
<a class="main-cat-item" <a class="main-cat-item"
href="{% if(type == "list") %}{{ url_route('visiosoft.module.advs::list') }}{% else %}{{ url_route('advs_map_list') }}{% endif %}?cat={{ maincat.id }}"> {% if maincat.files[0].path != "" %} href="{% if(type == "list") %}{{ url_route('visiosoft.module.advs::list') }}{% else %}{{ url_route('advs_map_list') }}{% endif %}?cat={{ maincat.id }}"> {% if maincat.files[0].path != "" %}
<img class="catIcon" src="{{ url('files/' ~ maincat.files[0].path) }}" <img class="catIcon" src="{{ url('files/' ~ maincat.files[0].path) }}"
alt="">{% else %}<img class="catIcon" src="{{ img('theme::images/plus-categories.png').url }}" alt="">{% else %}<img class="catIcon"
src="{{ img('theme::images/plus-categories.png').url }}"
alt="">{% endif %}{{ maincat.name }}</a> alt="">{% endif %}{{ maincat.name }}</a>
{% for subcat in subCats %} {% for subcat in subCats %}
<ul> <ul>
@ -36,198 +37,216 @@
</div> </div>
</div><!-- panel --> </div><!-- panel -->
<div class="panel-default panel-faq">
<!-- panel-heading -->
<div class="panel-heading active-faq">
<a data-toggle="collapse" data-parent="#accordion" href="#accordion-location">
<h4 class="panel-title">{{ trans("visiosoft.module.advs::field.location") }}<span
class="pull-right"><i class="fa fa-plus"></i></span></h4>
</a>
</div><!-- panel-heading -->
<div id="accordion-location" class="panel-collapse collapse">
<!-- panel-body -->
<div class="panel-body">
<ul id="list-items" class="filter-list-items">
<li>
<label class="label-filter-location">{{ trans("visiosoft.module.location::field.country.name") }}</label>
<select class="form-control" name="country" id="countries">
{% for country in countries %}
<option value="{{ country.id }}">{{ country.name }}</option>
{% endfor %}
</select>
</li>
<li>
<label class="label-filter-location">{{ trans("visiosoft.module.location::field.city.name") }}</label>
<select class="form-control" name="city[]" id="cities" multiple>
{% for city in cities %}
<option value="{{ city.id }}">{{ city.name }}</option>
{% endfor %}
</select>
</li>
<li>
<label class="label-filter-location">{{ trans("visiosoft.module.location::field.district.name") }}</label>
<select class="form-control" name="district" id="districts">
{% for district in districts %}
<option value="{{ district.id }}">{{ district.name }}</option>
{% endfor %}
</select>
</li>
<li>
<label class="label-filter-location">{{ trans("visiosoft.module.location::field.neighborhood.name") }}</label>
<select class="form-control" name="neighborhood" id="neighborhoods">
{% for neighborhood in neighborhoods %}
<option value="{{ neighborhood.id }}">{{ neighborhood.name }}</option>
{% endfor %}
</select>
</li>
<li>
<label class="label-filter-location">{{ trans("visiosoft.module.location::field.village.name") }}</label>
<select class="form-control" name="village" id="village">
{% for village in villages %}
<option value="{{ village.id }}">{{ village.name }}</option>
{% endfor %}
</select>
</li>
</ul>
</div><!-- panel-body -->
</div>
</div><!-- panel -->
{% for key,value in checkboxes %}
<!-- panel -->
<div class="panel-default panel-faq"> <div class="panel-default panel-faq">
<!-- panel-heading --> <!-- panel-heading -->
<div class="panel-heading active-faq"> <div class="panel-heading">
<a data-toggle="collapse" data-parent="#accordion" href="#accordion-location"> <a data-toggle="collapse" data-parent="#accordion" href="#accordion-{{ loop.index }}">
<h4 class="panel-title">{{ trans("visiosoft.module.advs::field.location") }}<span class="pull-right"><i class="fa fa-plus"></i></span></h4> <h4 class="panel-title">{{ value.name }}<span class="pull-right"><i class="fa fa-plus"></i></span>
</h4>
</a> </a>
</div><!-- panel-heading --> </div><!-- panel-heading -->
<div id="accordion-location" class="panel-collapse collapse collapse in"> <div id="accordion-{{ loop.index }}" class="panel-collapse">
<!-- panel-body --> <!-- panel-body -->
<div class="panel-body"> <div class="panel-body">
<ul id="list-items" class="filter-list-items"> {% for key, val in value %}
<li> <div class="input-outer">
<label class="label-filter-location">{{ trans("visiosoft.module.location::field.country.name") }}</label> <ul>
<select class="form-control" name="country" id="countries"> {% for key1, value1 in val %}
{% for country in countries %} <li class="cf-li-item">
<option value="{{ country.id }}">{{ country.name }}</option> <input value="{{ key1 }}" type="checkbox" name="cf_{{ value.id }}[]"
{% endfor %} id=""
</select>
</li>
<li>
<label class="label-filter-location">{{ trans("visiosoft.module.location::field.city.name") }}</label>
<select class="form-control" name="city[]" id="cities" multiple>
{% for city in cities %}
<option value="{{ city.id }}">{{ city.name }}</option>
{% endfor %}
</select>
</li>
<li>
<label class="label-filter-location">{{ trans("visiosoft.module.location::field.district.name") }}</label>
<select class="form-control" name="district" id="districts">
{% for district in districts %}
<option value="{{ district.id }}">{{ district.name }}</option>
{% endfor %}
</select>
</li>
<li>
<label class="label-filter-location">{{ trans("visiosoft.module.location::field.neighborhood.name") }}</label>
<select class="form-control" name="neighborhood" id="neighborhoods">
{% for neighborhood in neighborhoods %}
<option value="{{ neighborhood.id }}">{{ neighborhood.name }}</option>
{% endfor %}
</select>
</li>
<li>
<label class="label-filter-location">{{ trans("visiosoft.module.location::field.village.name") }}</label>
<select class="form-control" name="village" id="village">
{% for village in villages %}
<option value="{{ village.id }}">{{ village.name }}</option>
{% endfor %}
</select>
</li>
</ul>
</div><!-- panel-body -->
</div>
</div><!-- panel -->
{% for key,value in checkboxes %}
<!-- panel -->
<div class="panel-default panel-faq">
<!-- panel-heading -->
<div class="panel-heading">
<a data-toggle="collapse" data-parent="#accordion" href="#accordion-{{ loop.index }}">
<h4 class="panel-title">{{ value.name }}<span class="pull-right"><i class="fa fa-plus"></i></span></h4>
</a>
</div><!-- panel-heading -->
<div id="accordion-{{ loop.index }}" class="panel-collapse">
<!-- panel-body -->
<div class="panel-body">
{% for key, val in value %}
<div class="input-outer">
<ul>
{% for key1, value1 in val %}
<li class="cf-li-item">
<input value="{{ key1 }}" type="checkbox" name="cf_{{ value.id }}[]" id=""
{% if key1 in app.request.get('cf_'~ value.id) %} {% if key1 in app.request.get('cf_'~ value.id) %}
checked checked
{% endif %} {% endif %}
> <span class="span{{ key1 }}">{{ value1 }}</span> > <span class="span{{ key1 }}">{{ value1 }}</span>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
{% endfor %} {% endfor %}
</div><!-- panel-body --> </div><!-- panel-body -->
</div> </div>
</div><!-- panel --> </div><!-- panel -->
{% endfor %} {% endfor %}
{% for key,value in textfields %} {% for key,value in textfields %}
<!-- panel --> <!-- panel -->
<div class="panel-default panel-faq"> <div class="panel-default panel-faq">
<!-- panel-heading --> <!-- panel-heading -->
<div class="panel-heading"> <div class="panel-heading">
<a data-toggle="collapse" data-parent="#accordion" href="#accordion-{{ loop.index }}"> <a data-toggle="collapse" data-parent="#accordion" href="#accordion-{{ loop.index }}">
<h4 class="panel-title">{{ key }}<span class="pull-right"><i class="fa fa-plus"></i></span></h4> <h4 class="panel-title">{{ key }}<span class="pull-right"><i class="fa fa-plus"></i></span>
</a> </h4>
</div><!-- panel-heading --> </a>
</div><!-- panel-heading -->
<div id="accordion-{{ loop.index }}" class="panel-collapse collapse"> <div id="accordion-{{ loop.index }}" class="panel-collapse collapse">
<!-- panel-body --> <!-- panel-body -->
<div class="panel-body"> <div class="panel-body">
<input name="{{ key }}" type="text" class="form-control" value=""> <input name="{{ key }}" type="text" class="form-control" value="">
</div><!-- panel-body --> </div><!-- panel-body -->
</div> </div>
</div><!-- panel --> </div><!-- panel -->
{% endfor %} {% endfor %}
{% for key,value in ranges %} {% for key,value in ranges %}
<!-- panel -->
<div class="panel-default panel-faq">
<!-- panel-heading -->
<div class="panel-heading">
<a data-toggle="collapse" data-parent="#accordion" href="#accordion-range{{ value.id }}">
<h4 class="panel-title">{{ value.name }}<span class="pull-right"><i class="fa fa-minus"></i></span></h4>
</a>
</div><!-- panel-heading -->
<div id="accordion-range{{ value.id }}" class="panel-collapse collapse in">
<!-- panel-body -->
<div class="panel-body">
<input type="number" class="price-input" value="{{ app.request.get('min_cf_'~ value.id) }}" name="min_cf_{{ value.id }}" min="0" placeholder="Min"> - <input class="price-input" type="number" value="{{ app.request.get('max_cf_'~ value.id) }}" name="max_cf_{{ value.id }}" placeholder="Max">
</div><!-- panel-body -->
</div>
</div><!-- panel -->
{% endfor %}
<!-- panel --> <!-- panel -->
<div class="panel-default panel-faq"> <div class="panel-default panel-faq">
<!-- panel-heading --> <!-- panel-heading -->
<div class="panel-heading"> <div class="panel-heading">
<a data-toggle="collapse" data-parent="#accordion" href="#accordion-three"> <a data-toggle="collapse" data-parent="#accordion" href="#accordion-range{{ value.id }}">
<h4 class="panel-title">{{ value.name }}<span class="pull-right"><i class="fa fa-plus"></i></span>
</h4>
</a>
</div><!-- panel-heading -->
<div id="accordion-range{{ value.id }}" class="panel-collapse collapse">
<!-- panel-body -->
<div class="panel-body">
<input type="number" class="price-input" value="{{ app.request.get('min_cf_'~ value.id) }}"
name="min_cf_{{ value.id }}" min="0" placeholder="Min"> - <input class="price-input"
type="number"
value="{{ app.request.get('max_cf_'~ value.id) }}"
name="max_cf_{{ value.id }}"
placeholder="Max">
</div><!-- panel-body -->
</div>
</div><!-- panel -->
{% endfor %}
<!-- panel -->
<div class="panel-default panel-faq">
<!-- panel-heading -->
<div class="panel-heading">
<a data-toggle="collapse" data-parent="#accordion" href="#accordion-three">
<h4 class="panel-title">
Price
<span class="pull-right"><i class="fa fa-plus"></i></span>
</h4>
</a>
</div><!-- panel-heading -->
<div id="accordion-three" class="panel-collapse collapse" aria-expanded="true" style="">
<!-- panel-body -->
<div class="panel-body">
<div class="price-range"><!--price-range-->
<div class="price">
{% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %}
<input type="number" class="price-input" value="{{ request.min_price }}"
name="min_price" min="0" placeholder="Min"> - <input class="price-input"
type="number"
value="{{ request.max_price }}"
name="max_price"
placeholder="Max">
<select name="currency" id="currency">
{% for currency in active_currencies %}
<option value="{{ currency }}">{{ currency }}</option>
{% endfor %}
</select>
</div>
</div><!--/price-range-->
</div><!-- panel-body -->
</div>
</div>
<div class="panel-default panel-faq">
{% if entries('advs').isEnabled('searchbydistance') %}
<div class="panel-heading">
<a data-toggle="collapse" data-parent="#accordion" href="#accordion-four">
<h4 class="panel-title"> <h4 class="panel-title">
Price {{ trans("visiosoft.module.searchbydistance::field.searchbydistance") }}
<span class="pull-right"><i class="fa fa-plus"></i></span> <span class="pull-right"><i class="fa fa-plus"></i></span>
</h4> </h4>
</a> </a>
</div><!-- panel-heading --> </div><!-- panel-heading -->
<div id="accordion-three" class="panel-collapse collapse in" aria-expanded="true" style=""> <div id="accordion-four" class="panel-collapse collapse" aria-expanded="true" style="">
<!-- panel-body --> <!-- panel-body -->
<div class="panel-body"> <div class="panel-body">
<div class="price-range"><!--price-range--> <div class="price-range"><!--price-range-->
<div class="price">
{% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %} <select name="distance" id="distance" class="form-control">
<input type="number" class="price-input" value="{{ request.min_price }}" name="min_price" min="0" placeholder="Min"> - <input class="price-input" type="number" value="{{ request.max_price }}" name="max_price" placeholder="Max"> <option value="10" {{ request.distance==10 ? 'selected' : '' }}>10</option>
<select name="currency" id="currency"> <option value="20" {{ request.distance==20 ? 'selected' : '' }}>20</option>
{% for currency in active_currencies %} <option value="50" {{ request.distance==50 ? 'selected' : '' }}>50</option>
<option value="{{ currency }}">{{ currency }}</option> </select>
{% endfor %}
</select> <input type="hidden" name="dlong" id="distlong">
</div> <input type="hidden" name="dlat" id="distlat">
</div><!--/price-range--> </div><!--/price-range-->
</div><!-- panel-body --> </div><!-- panel-body -->
</div> </div>
{% if entries('advs').isEnabled('searchbydistance') %} {{ asset_add("scripts.js", "visiosoft.module.searchbydistance::js/script.js") }}
<div class="panel-heading"> {% endif %}
<a data-toggle="collapse" data-parent="#accordion" href="#accordion-four"> <div id="search-button">
<h4 class="panel-title"> <button type="submit"
{{ trans("visiosoft.module.searchbydistance::field.searchbydistance") }} class="btn btn-default">{{ trans("visiosoft.module.advs::field.search") }}</button>
<span class="pull-right"><i class="fa fa-plus"></i></span> </div>
</h4> </div><!-- panel -->
</a>
</div><!-- panel-heading -->
<div id="accordion-four" class="panel-collapse collapse in" aria-expanded="true" style="">
<!-- panel-body -->
<div class="panel-body">
<div class="price-range"><!--price-range-->
<select name="distance" id="distance" class="form-control"> </div><!-- panel-group -->
<option value="10" {{ request.distance==10 ? 'selected' : '' }}>10</option> </div>
<option value="20" {{ request.distance==20 ? 'selected' : '' }}>20</option>
<option value="50" {{ request.distance==50 ? 'selected' : '' }}>50</option>
</select>
<input type="hidden" name="dlong" id="distlong">
<input type="hidden" name="dlat" id="distlat">
</div><!--/price-range-->
</div><!-- panel-body -->
</div>
{{ asset_add("scripts.js", "visiosoft.module.searchbydistance::js/script.js") }}
{% endif %}
<div id="search-button">
<button type="submit" class="btn btn-default">{{ trans("visiosoft.module.advs::field.search") }}</button>
</div>
</div><!-- panel -->
</div><!-- panel-group -->
</div>
</div><!-- accordion--> </div><!-- accordion-->
{{ asset_add("scripts.js", "visiosoft.module.advs::js/filterLocation.js") }} {{ asset_add("scripts.js", "visiosoft.module.advs::js/filterLocation.js") }}

50
addons/default/visiosoft/default-theme/resources/css/default/main.css
View File

@ -5936,3 +5936,53 @@ input[name="username"] {
max-height: 200px; max-height: 200px;
overflow: scroll; overflow: scroll;
} }
::-webkit-scrollbar {
-webkit-appearance: none;
}
::-webkit-scrollbar:vertical {
width: 12px;
}
::-webkit-scrollbar:horizontal {
height: 12px;
}
::-webkit-scrollbar-thumb {
background-color: rgba(0, 0, 0, .5);
border-radius: 10px;
border: 2px solid #ffffff;
}
::-webkit-scrollbar-track {
border-radius: 10px;
background-color: #ffffff;
}
.recommended-ads h4 {
display: inline-block !important;
}
#swipeTableModal {
position: fixed;
background: rgb(0,0,0,0.60);
height: 100vh;
padding-top: 58%;
text-align: center;
}
#swipeTableModal img{
max-width: 80px
}
#swipeTableModal button{
border: 1px solid #fff;
background-color: transparent;
font-size: 20px;
cursor: pointer;
border-radius: 3px;
color: white;
width: 90px;
}
#swipeTableModal p{
color: white;
font-weight: 700;
font-size: 18px;
}

11
addons/default/visiosoft/default-theme/resources/css/default/responsive.css
View File

@ -1740,6 +1740,17 @@
/* XS Portrait */ /* XS Portrait */
@media (max-width: 479px) { @media (max-width: 479px) {
.table-recommended-section {
padding: 10px;
}
.table-image {
min-width: 80px;
}
.favorite-searches {
margin-bottom: 10px;
padding-bottom: 15px;
height:auto;
}
.user-images .img-responsive { .user-images .img-responsive {
margin: auto; margin: auto;
border-radius: 35px; border-radius: 35px;

BIN
addons/default/visiosoft/default-theme/resources/images/scroll-screen.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

3
addons/default/visiosoft/default-theme/resources/js/scroll-screen.js Normal file
View File

@ -0,0 +1,3 @@
$(window).on('load',function(){
$('#swipeTableModal').modal('show');
});

2
addons/default/visiosoft/default-theme/resources/lang/en/fields.php
View File

@ -13,4 +13,6 @@ return [
'join-us' => 'Join Us', 'join-us' => 'Join Us',
'sign-in' => 'Sign In', 'sign-in' => 'Sign In',
'new-here' => 'New here ?', 'new-here' => 'New here ?',
'scroll-screen-for-details' => 'Scroll Screen for Table View',
'close' => 'Close'
]; ];

2
addons/default/visiosoft/default-theme/resources/lang/tr/fields.php
View File

@ -7,4 +7,6 @@ return [
'join-us' => 'Üye Ol', 'join-us' => 'Üye Ol',
'sign-in' => 'Üye Girişi', 'sign-in' => 'Üye Girişi',
'new-here' => 'Avantajlar için ', 'new-here' => 'Avantajlar için ',
'scroll-screen-for-details' => 'Ayrıntılar için Ekranı Kaydır',
'close' => 'Kapat'
]; ];

5
addons/default/visiosoft/default-theme/resources/views/partials/footer.twig
View File

@ -101,6 +101,7 @@
Inc.</a></p> Inc.</a></p>
</div> </div>
</div><!-- footer-bottom --> </div><!-- footer-bottom -->
{% if setting_value('visiosoft.theme.default::template') == "s" %}
<div class="row s-bottom-bar navbar-fixed-bottom visible-xs text-center"> <div class="row s-bottom-bar navbar-fixed-bottom visible-xs text-center">
<div class="col-xs-2 center-block d-flex showcase-btn"> <div class="col-xs-2 center-block d-flex showcase-btn">
<a style="color: #999;"> <a style="color: #999;">
@ -128,12 +129,14 @@
</a> </a>
</div> </div>
</div> </div>
{% endif %}
</footer> </footer>
{% include "theme::partials/s-search-modal" %} {% include "theme::partials/s-search-modal" %}
{% if setting('visiosoft.module.advs::google_statistic_code') != "" %} {% if setting('visiosoft.module.advs::google_statistic_code') != "" %}
<script async <script async
src="https://www.googletagmanager.com/gtag/js?id={{ setting('visiosoft.module.advs::google_statistic_code') }}"></script> src="https://www.googletagmanager.com/gtag/js?id={{ setting('visiosoft.module.advs::google_statistic_code') }}"></script>

10
addons/default/visiosoft/default-theme/resources/views/scroll-modal.twig Normal file
View File

@ -0,0 +1,10 @@
<div id="swipeTableModal" class="modal fade" role="dialog">
<div class="modal-dialog">
<div class="modal-body" onclick="$('#swipeTableModal').modal('hide');">
<img src="{{ img('theme::images/scroll-screen.gif').url }}">
<p>{{ trans('theme::fields.scroll-screen-for-details') }}</p>
<button>{{ trans('theme::fields.close') }}</button>
</div>
</div>
</div>
{{ asset_add("scripts.js", "theme::js/scroll-screen.js") }}