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 #600 from openclassify/vedatakdogan

Browse Source 
Vedatakdogan
This commit is contained in:
Ozcan Durak 2020-06-22 12:46:55 +03:00 committed by GitHub
commit a5f51f7688
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig
View File

@ -4,16 +4,16 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="generator" content="{{ config_get('streams::distribution.name') }}"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<meta name="description" content="{{ setting_value('streams::description') }}"/>
<meta name="description" content="{{ setting_value('streams::description')|slice(0,160) }}"/>
<!-- Meta Tags -->
<title>
{% set title = trans(template.meta_title) %}
{% set showTitle = template.showTitle is same as(false) ? false : true %}
{% if showTitle %}
{{ setting_value('streams::name', config_get('streams::distribution.name')) }}
&#8250;
{% set title = setting_value('streams::name', config_get('streams::distribution.name'))~"|"~trans(template.meta_title) %}
{% endif %}
{{ trans(template.meta_title) }}
{{ title|slice(0,60) }}
</title>
{% include "visiosoft.theme.base::partials/ogdata" %}

8
addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
View File

@ -1,8 +1,8 @@
{% block ogdata %}
<meta property="og:site_name"
content="{{ template.get('og_site_name', setting_value('streams::name', config_get('streams::distribution.name'))) }}"/>
<meta property="og:description" content="{{ template.get('og_description', trans(template.meta_description)) }}"/>
<meta property="og:title" content="{{ template.get('og_title', trans(template.meta_title)) }}"/>
<meta property="og:description" content="{{ template.get('og_description', trans(template.meta_description))|slice(0,160) }}"/>
<meta property="og:title" content="{{ template.get('og_title', trans(template.meta_title))|slice(0,60) }}"/>
<meta property="og:url" content="{{ template.get('og_url', url_current()) }}"/>
<meta property="og:image" content="{{ template.get('og_image', trans(template.meta_image)) }}"/>
<meta property="og:type" content="website"/>
@ -10,7 +10,7 @@
<!-- Meta for twitter sharing -->
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:site" content="{{ template.get('og_site_name', setting_value('streams::name', config_get('streams::distribution.name'))) }}">
<meta name="twitter:title" content="{{ template.get('og_title', trans(template.meta_title)) }}">
<meta name="twitter:description" content="{{ template.get('og_description', trans(template.meta_description)) }}">
<meta name="twitter:title" content="{{ template.get('og_title', trans(template.meta_title))|slice(0,60) }}">
<meta name="twitter:description" content="{{ template.get('og_description', trans(template.meta_description))|slice(0,160) }}">
<meta name="twitter:image" content="{{ template.get('og_image', trans(template.meta_image)) }}">
{% endblock %}

4
addons/default/visiosoft/location-module/src/Http/Controller/AjaxController.php
View File

@ -112,8 +112,8 @@ class AjaxController extends PublicController
{
if ($this->request->name) {
$slug = Str::slug($this->request->name, '_');
if ($city = $this->city_model->newQuery()->where('slug', 'LIKE', $slug . '%')->first()) {
return ['success' => true, 'link' => route('visiosoft.module.advs::list') . '?city[]=' . $city->id];
if ($city = $this-> city_model->newQuery()->where('slug', 'LIKE', $slug . '%')->first()) {
return ['success' => true, 'city' => $city];
} else {
return ['success' => false];
}