Update meta tags position #17

g0vhk-io · Mar 28, 2018 · a541478 · a541478
1 parent dbd5ba9
commit a541478
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/gov_track_hk_web/templates/base.html b/gov_track_hk_web/templates/base.html
@@ -1,6 +1,13 @@
 {% load render_bundle from webpack_loader %}
 <html>
 <head>
+    <meta property="og:url" content="{{request.build_absolute_uri}}" />
+    <meta property="og:type" content="article" />
+    <meta property="og:title" content="{%block og_title%}g0vhk.io (Pre-Alpha){%endblock%}" />
+    <meta property="og:description" content="{%block og_desc%}線上民主平台{%endblock%}" />
+    <meta property="og:image" content="{%block og_image%}/static/gov_bg.png{%endblock%}"/>
+    <meta property="og:image:width" content="{%block og_image_width%}1600{%endblock%}"/>
+    <meta property="og:image:height" content="{%block og_image_height%}800{%endblock%}"/>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"></link>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css"></link>
     <link rel="stylesheet" href="/static/default.css"></link>
@@ -12,14 +19,6 @@
     <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet"/>
     <link rel="stylesheet" href="https://cdn.datatables.net/1.10.12/css/jquery.dataTables.min.css"></link>
     <link rel="shortcut icon" href="/static/favicon.ico"></link>
-    <meta property="og:url" content="{{request.build_absolute_uri}}" />
-    <meta property="og:type" content="article" />
-    <meta property="og:title" content="{%block og_title%}g0vhk.io (Pre-Alpha){%endblock%}" />
-    <meta property="og:description" content="{%block og_desc%}線上民主平台{%endblock%}" />
-    <meta property="og:image" content="{%block og_image%}/static/gov_bg.png{%endblock%}"/>
-    <meta property="og:image:width" content="{%block og_image_width%}1600{%endblock%}"/>
-    <meta property="og:image:height" content="{%block og_image_height%}800{%endblock%}"/>
-
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
     <script src="https://cdn.datatables.net/1.10.12/js/jquery.dataTables.min.js"></script>

diff --git a/gov_track_hk_web/templates/legco/vote_detail.html b/gov_track_hk_web/templates/legco/vote_detail.html
@@ -1,11 +1,7 @@
 {% extends 'legco/base.html'%}
 {% load legco_extras %}
 {%block og_title%}g0vhk.io - {{vote.motion.name_ch}}{%endblock og_title%}
-{%block og_desc%}{{vote.motion.name_ch}}
-日期: {{vote.date|parse_date_chinese}} {{vote.time}}<br/>
-動議人: {%if vote.motion.mover_ch|length > 0 %}{{vote.motion.mover_ch}}{%else%}沒有{%endif%}<br/>
-結果: {{overall_result|vote_result_chinese}}<br/>
-{%endblock%}
+{%block og_desc%}{{vote.motion.name_ch}}{%endblock%}
 {%block og_image%}{{og_image_url}}{%endblock%}
 {%block og_image_width%}1200{%endblock%}
 {%block og_image_height%}630{%endblock%}