Merge pull request #49 from openclassify/vedat2

Vedat2

addons/default/visiosoft/advs-module/src/Adv/AdvModel.php

@@ -209,10 +209,12 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
         {
             $id = $object->id;
             $seo = str_slug($object->name);
+            $seo = str_replace('_','-',$seo);
             return \route('adv_detail_seo', [$id,$seo]);
         }
         $id = $object->getObject()->id;
         $seo = str_slug($object->getObject()->name);
+        $seo = str_replace('_','-',$seo);
         return \route('adv_detail_seo', [$id,$seo]);
     }
 
@@ -222,6 +224,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
         {
             $id = $adv->id;
             $seo = str_slug($adv->name);
+            $seo = str_replace('_','-',$seo);
             return \route('adv_detail_seo', [$id,$seo]);
         }
     }

addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php

@@ -156,6 +156,7 @@ class AdvsController extends PublicController
         }
 
         $adv = $advRepository->getListItemAdv($id);
+        $adv->meta_tags = explode(' ',$adv->name);
 
         $recommended_advs = $advRepository->getRecommendedAds($adv->id);
         foreach ($recommended_advs as $index => $ad) {

addons/default/visiosoft/default-theme/resources/config/settings.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'meta_tags' => [
+        'type' => 'anomaly.field_type.tags',
+        'config' => [
+            'default_value' => ['Openclassify'],
+        ],
+    ],
+];

addons/default/visiosoft/default-theme/resources/lang/en/setting.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'meta_tags' => [
+        'name' => 'Meta Keywords',
+    ],
+
+];

addons/default/visiosoft/default-theme/resources/lang/tr/setting.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'meta_tags' => [
+        'name' => 'Anahtar Kelimeler',
+    ],
+
+];

addons/default/visiosoft/default-theme/resources/views/home/featured.twig

@@ -21,7 +21,7 @@
                                                 <div class="featured-image">
                                                     {% if adv.cover_photo != null %}
                                                         <a href="{{ adv.detail_url }}"><img
-                                                                    src="{{ adv.cover_photo }}" alt=""
+                                                                    src="{{ adv.cover_photo }}" alt="{{ adv.name }}"
                                                                     class="img-respocive"></a>
                                                     {% endif %}
                                                 </div>

addons/default/visiosoft/default-theme/resources/views/home/trend.twig

@@ -17,7 +17,7 @@
                     <div class="item-image-box col-sm-4">
                         <!-- item-image -->
                         <div class="item-image">
-                                <a href="{{ url('advs/adv/' ~ adv.id)}}"><img src="{{ adv.cover_photo }}" alt="" class="img-respocive"></a>
+                                <a href="{{ url('advs/adv/' ~ adv.id)}}"><img src="{{ adv.cover_photo }}" alt="{{ adv.name }}" class="img-respocive"></a>
                         </div><!-- item-image -->
                     </div><!-- item-image-box -->
 
@@ -65,7 +65,7 @@
                     <div class="item-image-box col-sm-4">
                         <!-- item-image -->
                         <div class="item-image">
-                                <a href="{{ url('advs/adv/' ~ adv_of_days.id)}}"><img src="{{ adv.cover_photo }}" alt="" class="img-respocive"></a>
+                                <a href="{{ url('advs/adv/' ~ adv_of_days.id)}}"><img src="{{ adv.cover_photo }}" alt="{{ adv.name }}" class="img-respocive"></a>
                             {% if adv.is_get_adv == "1" %}
                                 <a href="#" class="verified" data-toggle="tooltip" data-placement="top" title="Get ilanı"><i class="fa fa-check-square-o"></i></a>
                             {% endif %}

addons/default/visiosoft/default-theme/resources/views/indexes/index.twig

@@ -116,7 +116,7 @@
                                             <div class="featured">
                                                 <div class="featured-image">
                                                         <a href="{{ adv.detail_url }}"><img
-                                                                    src="{{ adv.cover_photo }}" alt=""
+                                                                    src="{{ adv.cover_photo }}" alt="{{ substr(adv.name,0,25) }}"
                                                                     class="img-respocive"></a>
                                                 </div>
 
@@ -205,7 +205,7 @@
                                             <!-- item-image -->
                                             <div class="item-image">
                                                     <a href="{{ adv.detail_url }}"><img
-                                                                src="{{ adv.cover_photo }}" alt=""
+                                                                src="{{ adv.cover_photo }}" alt="{{ adv.name }}"
                                                                 class="img-respocive"></a>
                                             </div><!-- item-image -->
                                         </div><!-- item-image-box -->
@@ -261,7 +261,7 @@
                                             <!-- item-image -->
                                             <div class="item-image">
                                                     <a href="{{ adv.detail_url }}"><img
-                                                                src="{{ adv.cover_photo }}" alt=""
+                                                                src="{{ adv.cover_photo }}" alt="{{ adv.name }}"
                                                                 class="img-respocive"></a>
 
                                                 {% if adv.is_get_adv == "1" %}
@@ -337,7 +337,7 @@
                         <li class="category-item">
                             <div class="category-icon home_footer_categories_field_icon">
                                 {% if cat.files[0].path != "" %}
-                                    <img src="{{ url('files/' ~ cat.files[0].path) }}" alt="images"
+                                    <img src="{{ url('files/' ~ cat.files[0].path) }}" alt="{{ cat.name }}"
                                          class="img-responsive">
                                 {% endif %}
                             </div>

addons/default/visiosoft/default-theme/resources/views/partials/metadata.twig

@@ -9,7 +9,6 @@
 <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,500,700,300' rel='stylesheet' type='text/css'>
 <link href='https://fonts.googleapis.com/css?family=Signika+Negative:400,300,600,700' rel='stylesheet' type='text/css'>
 
-
 <!-- Meta Tags -->
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width"/>
@@ -18,12 +17,13 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 <meta name="description" content="{{ trans(template.meta_description) }}"/>
 
+{% if app.request.pathInfo == "/" %}
+    <meta name="keywords" content="{% for tag in setting_value('visiosoft.theme.default::meta_tags') %}{{ tag }},{% endfor %}">
+{% else %}
+    <meta name="keywords" content="{% for tag in adv.meta_tags %}{{ tag }},{% endfor %}">
+{% endif %}
 
-<title>
+<title>{{ setting_value('streams::name', config_get('streams::distribution.name')) }}|{{ trans(template.meta_title) }}</title>
-    {{ setting_value('streams::name', config_get('streams::distribution.name')) }}
-    &#8250;
-    {{ trans(template.meta_title) }}
-</title>
 
 <!-- Favicon -->
 {#{{ favicons("theme::img/favicon.png") }}#}

addons/default/visiosoft/default-theme/resources/views/partials/nav.twig

@@ -10,12 +10,11 @@
                     </button>
                     <a class="navbar-brand" href="/">
                         {% if setting_value('visiosoft.module.advs::logo') == NULL %}
-                            <img class="img-responsive" src="{{ img('theme::images/logo-horizontal.png').url }}"
+                            <img class="img-responsive" alt="{{ trans(template.meta_title) }}-Logo" src="{{ img('theme::images/logo-horizontal.png').url }}">
-                                 alt="Logo">
                         {% else %}
                             <img class="img-responsive"
                                  src="{{ url('files/' ~ file(setting_value('visiosoft.module.advs::logo')).path) }}"
-                                 alt="Logo">
+                                 alt="{{ trans(template.meta_title) }}-Logo">
                         {% endif %}
                     </a>
                 </div>
@@ -73,7 +72,7 @@
 
                     <ul class="nav navbar-nav controls-menu-right" style="float: right;">
                         {% set current_locale = entries('advs').getCurrentLocale() %}
-                        {{ languageSwitcher('openclassify-lang', {'toggle_title': '<img src="'~img('theme::images/flags/'~config('app.locale')~'.png').url~'" class="lang-flag" >' ~current_locale~'','toggle_class':'navigation-lang-field-none'}) }}
+                        {{ languageSwitcher('openclassify-lang', {'toggle_title': '<img alt="'~config('app.locale')~'" src="'~img('theme::images/flags/'~config('app.locale')~'.png').url~'" class="lang-flag" >' ~current_locale~'','toggle_class':'navigation-lang-field-none'}) }}
 
                         {% if auth_check() %}
                             <li class="dropdown profile-navigation-field">
@@ -130,7 +129,7 @@
                                         <li>
                                 <span class="cart-item">
                                     <span class="cart-item-left">
-                                        <img src="{{ item_cart.cover_photo }}" alt="" height="50" width="70"
+                                        <img src="{{ item_cart.cover_photo }}" alt="{{ item_cart.name }}" height="50" width="70"
                                              class="item-cart-img">
                                         <span class="item-name">{{ item_cart.name }}</span>
                                         <span class="item-price">{{ item_cart.priceFormat(item_cart) }}</span>