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

Merge branches 'fatihalp' and 'master' of https://github.com/openclassify/openclassify into fatihalp

Browse Source
This commit is contained in:
Fatih Alp 2021-01-18 00:37:04 +03:00
commit bbe6879ad5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@
</div> </div>
{{ addBlock('ads-list/row-bottom',{'show_favorite_search':true})|raw }} {{ addBlock('ads-list/row-bottom',{'show_favorite_search':true})|raw }}
</div> </div>
{{ addBlock('ads-list/row',{'topfields':topfields,'selectRange':selectRange,'advs':advs})|raw }} {{ addBlock('ads-list/row',{'topfields':topfields,'selectRange':selectRange,'advs':advs, 'mainCats':mainCats|length})|raw }}
<div class="row products-list"> <div class="row products-list">
{% block listContent %} {% block listContent %}
{% include "visiosoft.module.advs::list/partials/ads" %} {% include "visiosoft.module.advs::list/partials/ads" %}

2
app/Providers/AppServiceProvider.php
View File

@ -16,7 +16,7 @@ class AppServiceProvider extends ServiceProvider
{ {
//Auto Language Switcher //Auto Language Switcher
view()->composer('*', function ($view) { view()->composer('*', function ($view) {
if (config('advs.lang_switcher_for_browser') and is_null(Request()->session()->get('_locale'))) { if (config('advs.lang_switcher_for_browser') and is_null(Request()->session()->get('_locale')) and isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
$lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);//Get Browser Language $lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);//Get Browser Language
$acceptLang = config('streams::locales.enabled'); //Supported Language $acceptLang = config('streams::locales.enabled'); //Supported Language
$lang = in_array($lang, $acceptLang) ? $lang : config('streams::locales.default', 'en'); $lang = in_array($lang, $acceptLang) ? $lang : config('streams::locales.default', 'en');

2
package.json
View File

@ -10,7 +10,7 @@
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
}, },
"devDependencies": { "devDependencies": {
"axios": "^0.19", "axios": "^0.21",
"bootstrap": "^4.1.0", "bootstrap": "^4.1.0",
"cross-env": "^5.1", "cross-env": "^5.1",
"jquery": "^3.2", "jquery": "^3.2",