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 #553 from openclassify/vedat

Browse Source 
add sidebar block
This commit is contained in:
Ozcan Durak 2020-05-13 19:07:44 +03:00 committed by GitHub
commit dea447f19d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/default/visiosoft/base-theme/resources/views/partials/categories.twig
View File

@ -33,6 +33,7 @@
</span>
</a>
</li>
{{ addBlock('base/leftSidebar')|raw }}
</ul>
{{ addBlock('base/categoriesRow')|raw }}

14
addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php
View File

@ -41,8 +41,16 @@ class DefaultadminThemeServiceProvider extends AddonServiceProvider
AbstractPaginator::$defaultView = 'visiosoft.theme.defaultadmin::pagination/bootstrap-4';
AbstractPaginator::$defaultSimpleView = 'streams::pagination/simple-bootstrap-4';
}
public function getOverrides()
{
$request = app('Illuminate\Http\Request');
protected $overrides = [
'streams::form/partials/tabs' => 'visiosoft.theme.defaultadmin::form/partials/tabs',
];
if ($request->segment(2) === "users") {
return [
'streams::form/partials/tabs' => 'visiosoft.theme.defaultadmin::form/partials/tabs',
];
}
return parent::getOverrides();
}
}

23
addons/default/visiosoft/location-module/resources/js/addressSelect.js
View File

@ -44,18 +44,16 @@ $('.edit-this-address').on('click', function () {
$("#newAdd-address").find('select[name="country"]').val(address_detail.country_id)
//Get City Options
var cat = default_country;
var level = 1;
var name = 'city';
Locations(cat, level, name);
crud('id=' + address_detail.country_id, '/ajax/getCities', 'POST',function (callback){
setSelectOptions($("#newAdd-address").find('select[name="city"]'),callback,'id','name');
})
//Get District Options
var selectedCity = new Promise(function (resolve) {
crud('id=' + address_detail.city, '/ajax/getDistricts', 'POST',function (callback){
setSelectOptions($("#newAdd-address").find('select[name="district"]'),callback,'id','name');
});
$("#newAdd-address").find('select[name="city"]').val(address_detail.city)
var cat = address_detail.city;
var level = 2;
var name = 'district';
Locations(cat, level, name);
resolve();
});
//Selected District
@ -88,4 +86,11 @@ $("#newAdd-address").submit(function (e) {
alert(response.msg)
}
});
});
});
function setSelectOptions(input, options, valueParams, TitleParams) {
input.html("<option value=''>...</option>");
$.each(options, function (index, value) {
input.append("<option value='" + value[valueParams] + "'>" + value[TitleParams] + "</option>");
});
}

4
addons/default/visiosoft/location-module/resources/views/new-ad/map.twig
View File

@ -13,7 +13,7 @@
</li>
</ul>
<div class="tab-content bg-light">
<div role="tabpanel" class="tab-pane m-0 pt-2" id="location">
<div role="tabpanel" class="tab-pane m-0 pt-2 active" id="location">
<div class="col-12 row">
<div class="col-sm-4">
<ul style="padding: 0" class="list-unstyled">
@ -44,7 +44,7 @@
</div>
<div role="tabpanel" class="tab-pane active" id="my_address">
<div role="tabpanel" class="tab-pane" id="my_address">
<div class="col-md-12">
<input type="hidden" name="address_id">
<table class="table addressSelect">

3
addons/default/visiosoft/location-module/resources/views/new-ad/modals.twig
View File

@ -82,7 +82,7 @@
<i class="fa fa-save "></i>
{{ trans('streams::button.save') }}
</button>
<button type="button" class="btn btn-secondary"
<button type="button" class="btn btn-sm btn-secondary"
data-dismiss="modal">{{ trans("visiosoft.module.carts::button.close") }}</button>
</div>
@ -102,5 +102,4 @@
<script>
var default_country = "{{ setting_value('visiosoft.module.location::default_country') }}"
</script>
{{ asset_add("scripts.js", "visiosoft.module.profile::assets/js/country.js") }}
{{ asset_add("scripts.js", "visiosoft.theme.base::js/phoneField.js") }}