OSDN Git Service

(root) / newslash / newslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 03c7edc)
template: fix <head> tag (add ld+json and ogp tags)
authorhylom <hylom@users.sourceforge.jp>
Fri, 19 Apr 2019 12:04:21 +0000 (21:04 +0900)
committerhylom <hylom@users.sourceforge.jp>
Fri, 19 Apr 2019 12:04:21 +0000 (21:04 +0900)
src/newslash_web/templates/common/analytics.html.tt2 patch | blob | history
src/newslash_web/templates/common/header.html.tt2 patch | blob | history

diff --git a/src/newslash_web/templates/common/analytics.html.tt2 b/src/newslash_web/templates/common/analytics.html.tt2
index 3a43062..a019b9a 100644 (file)
--- a/src/newslash_web/templates/common/analytics.html.tt2
+++ b/src/newslash_web/templates/common/analytics.html.tt2
@@ -1,4 +1,5 @@
-[%- IF Analytics && Analytics.tag -%]
+[%- IF helpers.app.mode == "production" %]
+[%-   IF Analytics && Analytics.tag -%]
 <script async src="https://www.googletagmanager.com/gtag/js?id=[% Analytics.tag %]"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
@@ -7,6 +8,9 @@
 
   gtag('config', '[% Analytics.tag %]');
 </script>
-[%- ELSE -%]
+[%-   ELSE -%]
 <!-- no Analytics.tag given -->
+[%-   END -%]
+[%- ELSE -%]
+<!-- running under [% helpers.app.mode %] mode. no Analytics code inserted. -->
 [%- END -%]
diff --git a/src/newslash_web/templates/common/header.html.tt2 b/src/newslash_web/templates/common/header.html.tt2
index be3332a..0c11b5e 100644 (file)
--- a/src/newslash_web/templates/common/header.html.tt2
+++ b/src/newslash_web/templates/common/header.html.tt2
@@ -1,23 +1,14 @@
   <head>
     <!-- newslash: [% INCLUDE package_revision %] -->
-    [%- IF helpers.app.mode == "production" %]
     [% INCLUDE common/analytics %]
-    [%- ELSE %]
-    <!-- running under [% helpers.app.mode %] mode. -->
-    [%- END %]
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" >
     <meta name="viewport" content="width=device-width" >
 
-    [%- # IF noindex -%]
+    [%- IF config.System.noindex -%]
     <meta name="robots" content="noindex" >
-    [%- #END -%]
-
-    [%- IF canonical %]
-    <link rel="caonical" href="[% canonical %]" >
     [%- END -%]
 
     [%- INCLUDE common/title %]
-    [%- INCLUDE common/meta_description %]
 
     <link rel="stylesheet" type="text/css" media="screen, projection" href="[% helpers.preprocessor.get_md5_path('/css/newslash.css'); %]" />
     <script src="[% Site.js_path %]/jquery/jquery-3.1.1.min.js"></script>
@@ -49,6 +40,25 @@
     [% helpers.load_js("newslash-admin.js") %]
     [%- END -%]
 
+    [%- IF canonical -%]
+    <link rel="caonical" href="[% canonical %]" >
+    <meta property="og:url" content="[% canonical %]" >
+    [%- END -%]
+
+    [%- INCLUDE common/meta_description %]
+    <meta property="fb:admins" content="1259000255,100001650003925,739629250,1275798062,100001440290532">
+    <meta property="fb:page_id" content="164298693588834">
+    <meta property="article:publisher" content="https://www.facebook.com/srad.jp">
+    <meta property="og:type" content="website">
+    <meta property="twitter:card" content="summary">
+    <meta property="twitter:domain" content="srad.jp">
+    <meta property="twitter:site" content="@sradjp">
+    [%- IF thumbnail %]
+    <meta property="og:image" content="[% thumbnail %]">
+    [%- END %]
+
+    [%- INCLUDE common/json_ld %]
+    
     [%- helpers.ad_code("head-element") %]
 
   </head>
newslash
About OSDN
Find Software
Develop Software
Help