template fix.

AliYmn · Feb 13, 2017 · f1ac952 · f1ac952
1 parent bf4c73a
commit f1ac952
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 16 deletions.
diff --git a/DjangoBlog/settings.py b/DjangoBlog/settings.py
@@ -57,6 +57,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+
 ]
 
 ROOT_URLCONF = 'DjangoBlog.urls'

diff --git a/blog/templatetags/blog_tags.py b/blog/templatetags/blog_tags.py
@@ -87,4 +87,8 @@ def site_email():
 
 @register.filter(name='post_tags')
 def post_tags(value):
-    return str("{},".format(value)).replace("-", " ")
+    return str("{},".format(value)).replace("-", " ")
+
+@register.filter(name='tags_list')
+def tags_list(value):
+    return str("{}".format(value)).replace("-", " ")
diff --git a/blog/views.py b/blog/views.py
@@ -1,7 +1,6 @@
 from django.views.generic import ListView,TemplateView,DetailView
 from .models import Post,Category,Love,Skills,IpController,Tags
 from django.shortcuts import get_list_or_404
-from django.http import HttpResponse
 
 class HomeListView(ListView):
     """Ana Sayfa"""
@@ -119,4 +118,5 @@ def get_context_data(self, **kwargs):
         context = super(TagsView, self).get_context_data(**kwargs)
         context['last_content'] = Post.objects.all().filter(is_active=True).order_by('-time')
         context['category'] = Category.objects.all()
+        context['tags'] = Tags.objects.all().filter(blog__is_active=True,tags=self.kwargs['slug'])[:1]
         return context
diff --git a/templates/about.html b/templates/about.html
@@ -11,7 +11,7 @@
 {% block og_title %}{% site_title %} Kimdir?{% endblock %}
 {% block og_description %} {% site_description %} {% endblock %}
 {% block og_url %}{{request.get_raw_uri}}{% endblock %}
-{% block og_site_name %}{% site_title %}-{% site_slogan %}{% endblock %}
+{% block og_site_name %}{% site_title %} Kimdir?{% endblock %}
 {% block og_image %}{{request.get_raw_uri}}{% site_image %}{% endblock %}
 
 {{% block content %}

diff --git a/templates/base.html b/templates/base.html
@@ -10,8 +10,8 @@
 <title>{% block title %}{% endblock %}</title>
 
 <!-- SEO -->
-<meta name="author" content="Ali Yaman"/>
-<meta name="owner" content="Ali Yaman"/>
+<meta name="author" content="{% site_author %}"/>
+<meta name="owner" content="{% site_author %}"/>
 <meta name="copyright" content="(c) 2017"/>
 <meta name="robots" content="noodp"/>
 <meta name="title" content="{% block meta_title %}{% endblock %}"/>

diff --git a/templates/blog_list.html b/templates/blog_list.html
@@ -35,7 +35,7 @@
     <span class="badge">{{ i.time }}</span><div class="pull-right"><span class="label label-success">{{ i.site_hit }} kez okundu</span></div>
     {{ i.content|safe|truncatewords:15 }}
     <div>
-    <p class="text-muted"> <i class="fa fa-hashtag" aria-hidden="true"></i> Kategori :  <a href="/kategori/{{ i.category_list }}">{{ i.category_list }}</a></p>
+    <p class="text-muted"> <i class="fa fa-hashtag" aria-hidden="true"></i> Kategori :  <a href="/kategori/{{ i.category_list.url }}">{{ i.category_list }}</a></p>
      </div>
     <hr>
     {% endfor %}

diff --git a/templates/category_page.html b/templates/category_page.html
@@ -1,11 +1,10 @@
 {% extends 'base.html' %}
 {% load static %}
-
 {% load blog_tags %}
-<!-- SEO -->
 
-{% block title %}{% site_title %} - {% site_slogan %}{% endblock %}
-{% block meta_title %}{% site_title %} - {% site_slogan %}{% endblock %}
+<!-- SEO -->
+{% block title %}Kategori | {% for i in post_obj %}{{ i.category_list.title }}{% endfor %}{% endblock %}
+{% block meta_title %}Kategori | {% for i in category %}{{ i.category_list.title }}{% endfor %}{% endblock %}
 {% block description %}{% site_description %}{% endblock %}
 {% block keywords %}{% site_tags %}{% endblock %}
 <!-- SEO -->

diff --git a/templates/contact.html b/templates/contact.html
@@ -4,15 +4,15 @@
 {% load blog_tags %}
 <!-- SEO -->
 
-{% block title %}{% site_title %} - {% site_slogan %}{% endblock %}
-{% block meta_title %}{% site_title %} - {% site_slogan %}{% endblock %}
+{% block title %}{% site_title %} - İletişim{% endblock %}
+{% block meta_title %}{% site_title %} - İletişim{% endblock %}
 {% block description %}{% site_description %}{% endblock %}
 {% block keywords %}{% site_tags %}{% endblock %}
 <!-- SEO -->
-{% block og_title %}{% site_title %} - {% site_slogan %}{% endblock %}
+{% block og_title %}{% site_title %} - İletişim{% endblock %}
 {% block og_description %}{% site_description %}{% endblock %}
 {% block og_url %}{{request.get_raw_uri}}{% endblock %}
-{% block og_site_name %}{% site_title %} - {% site_slogan %}{% endblock %}
+{% block og_site_name %}{% site_title %} - İletişim{% endblock %}
 {% block og_image %}{{request.get_raw_uri}}{% site_image %}{% endblock %}
 
 {% block content %}

diff --git a/templates/tags.html b/templates/tags.html
@@ -4,8 +4,9 @@
 {% load blog_tags %}
 <!-- SEO -->
 
-{% block title %}{% site_title %} - {% site_slogan %}{% endblock %}
-{% block meta_title %}{% site_title %} - {% site_slogan %}{% endblock %}
+
+{% block title %}{% for i in tags %}{{ i.tags.title|tags_list }}{% endfor %}{% endblock %}
+{% block meta_title %}{% for i in tags %}{{ i.tags.title|tags_list }}{% endfor %}{% endblock %}
 {% block description %}{% site_description %}{% endblock %}
 {% block keywords %}{% site_tags %}{% endblock %}
 <!-- SEO -->