Merge pull request #26 from 4ertovo4ka/meta_tags_og

morgangt · web-flow · commit 714f055fe219 · 2019-09-18T18:42:58.000+03:00
Meta tags og
diff --git a/assets/images/python_ru_social_thumb.png b/assets/images/python_ru_social_thumb.png
diff --git a/python_ru/settings/base.py b/python_ru/settings/base.py
@@ -160,14 +160,14 @@
                        'Language']},
             {'name': 'links', 'items': ['Link', 'Unlink', 'Anchor']},
             {'name': 'insert',
-             'items': ['Image', 'CodeSnippet', 'Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'PageBreak']},
+             'items': ['Image', 'CodeSnippet', 'Embed', 'Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'PageBreak']},
             '/',
             {'name': 'styles', 'items': [
                 'Styles', 'Format', 'Font', 'FontSize']},
             {'name': 'colors', 'items': ['TextColor', 'BGColor']},
         ],
         'toolbar': 'toolbar_CustomConfig',  # put tollbar config name here
-        'removePlugins': 'stylesheetparser',
+        'removePlugins': ','.join(['stylesheetparser', 'flash']),
         'extraPlugins': ','.join([
             'codesnippet',
             'div',
@@ -180,7 +180,8 @@
             'clipboard',
             'dialog',
             'dialogui',
-            'elementspath'
+            'elementspath',
+            'embed'
         ]),
     },
 }
diff --git a/templates/base.html b/templates/base.html
@@ -6,24 +6,34 @@
   <meta name="viewport" content="width=device-width, initial-scale=1" />
         <meta name="google-site-verification" content="RAskX0UNOnUGX4OiXn7jalIRZj-SwZej5FRKUlBHEnM" />
   <title>Python.ru{% block title %} {% endblock %}</title>
+  {% if request.path == "/" %}
+    <meta property="og:url" content="{{ request.get_host }}">
+    <meta property="og:image" content="{{ request.get_host }}{% static "images/python_ru_social_thumb.png" %}" />
+    <meta property="og:title" content="python.ru" />
+    <meta property="og:description" content="python.ru русскоязычное сообщество языка python" />
+    <meta property="og:type" content="website" />
+    <meta property="og:site_name" content="python.ru">
+  {% else %}
     {% block head %}
 
     {% endblock %}
+  {% endif %}
+
+    
   <link media="all" rel="stylesheet" href="{% static "css/all.css" %}" />
   <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,600' rel='stylesheet' type='text/css'>
   <link rel="apple-touch-icon" sizes="180x180" href="{% static "favicons/apple-touch-icon.png" %}">
   <link rel="icon" type="image/png" href="{% static "favicons/favicon-32x32.png" %}" sizes="32x32">
   <link rel="icon" type="image/png" href="{% static "favicons/favicon-16x16.png" %}" sizes="16x16">
   <link rel="manifest" href="{% static "favicons/manifest.json" %}">
   <link rel="mask-icon" href="{% static "favicons/safari-pinned-tab.svg" %}" color="#5bbad5">
+  <link rel="stylesheet"
+      href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.10/styles/default.min.css">
+  <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.10/highlight.min.js"></script>
+  <script>hljs.initHighlightingOnLoad();</script>
   <meta name="theme-color" content="#ffffff">
 
-    <meta property="og:url" content="">
-    <meta property="og:image" content="}" />
-    <meta property="og:title" content="python.ru" />
-    <meta property="og:description" content="python.ru русскоязычное сообщество языка python" />
-    <meta property="og:type" content="website" />
-    <meta property="og:site_name" content="Хабр">
+    
 
 </head>
 <body>
diff --git a/templates/post.html b/templates/post.html
@@ -4,11 +4,13 @@
 {% block title %} | {{ post.name }} {% endblock %}
 {% block head %}
 
-    <meta property="og:url" content="">
+    <meta property="og:url" content="{{ request.get_host }}{{ request.get_full_path }}">
     {% if post.image %}
     <meta property="og:image" content="{% thumbnail post.image %}" />
+    {% else %}
+    <meta property="og:image" content="{{ request.get_host }}{% static "images/python_ru_social_thumb.png" %}" />
     {% endif %}
-    <meta property="og:title" content="python.ru | {{ post.name }} " />
+    <meta property="og:title" content="{{ post.name }} " />
     <meta property="og:description" content="{{ post.description }} " />
     <meta property="og:type" content="article" />
 
