From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 24 Jul 2018 09:02:51 +0000 (+0200)
Subject: Changed the schema.org searchaction metadata into json-ld
X-Git-Tag: 5.2.0_Alpha_1~364^2~121
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e01fbba22a56d18f75dc8ff9a77c0f975d32967c;p=GitHub%2FWoltLab%2FWCF.git

Changed the schema.org searchaction metadata into json-ld

Closes #2723
---

diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index d53e9cfa85..684c702caa 100644
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -226,3 +226,4 @@ requirejs.config({
 </script>
 
 {include file='imageViewer'}
+{include file='headIncludeJsonLd'}
diff --git a/com.woltlab.wcf/templates/headIncludeJsonLd.tpl b/com.woltlab.wcf/templates/headIncludeJsonLd.tpl
new file mode 100644
index 0000000000..7c66ef34fd
--- /dev/null
+++ b/com.woltlab.wcf/templates/headIncludeJsonLd.tpl
@@ -0,0 +1,14 @@
+{capture assign='__websiteUrl'}{link encode=false}{/link}{/capture}
+{capture assign='__searchTargetUrl'}{link controller='Search' encode=false}q={/link}{literal}{search_term_string}{/literal}{/capture}
+<script type="application/ld+json">
+{
+"@context": "http://schema.org",
+"@type": "WebSite",
+"url": "{@$__websiteUrl|encodeJSON}",
+"potentialAction": {
+"@type": "SearchAction",
+"target": "{@$__searchTargetUrl|encodeJSON}",
+"query-input": "required name=search_term_string"
+}
+}
+</script>
diff --git a/com.woltlab.wcf/templates/pageHeaderSearch.tpl b/com.woltlab.wcf/templates/pageHeaderSearch.tpl
index a682135211..e7901daed5 100644
--- a/com.woltlab.wcf/templates/pageHeaderSearch.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderSearch.tpl
@@ -20,14 +20,8 @@
 
 {event name='settings'}
 
-<div id="pageHeaderSearch" class="pageHeaderSearch" itemscope itemtype="http://schema.org/WebSite" itemid="{link}{/link}">
-	<meta itemprop="url" content="{link}{/link}">
-	<meta itemprop="name" content="{PAGE_TITLE|language}">
-	<meta itemprop="description" content="{PAGE_DESCRIPTION|language}">
-	
-	<form method="post" action="{@$__searchLink}" itemprop="potentialAction" itemscope itemtype="http://schema.org/SearchAction">
-		<meta itemprop="target" content="{link controller='Search'}q={/link}{literal}{q}{/literal}">
-		
+<div id="pageHeaderSearch" class="pageHeaderSearch">
+	<form method="post" action="{@$__searchLink}">
 		<div id="pageHeaderSearchInputContainer" class="pageHeaderSearchInputContainer">
 			<div class="pageHeaderSearchType dropdown">
 				<a href="#" class="button dropdownToggle">{@$__searchTypeLabel}</a>
@@ -54,7 +48,7 @@
 				</ul>
 			</div>
 			
-			<input itemprop="query-input" type="search" name="q" id="pageHeaderSearchInput" class="pageHeaderSearchInput" placeholder="{lang}wcf.global.search.enterSearchTerm{/lang}" autocomplete="off" value="{if $query|isset}{$query}{/if}" required>
+			<input type="search" name="q" id="pageHeaderSearchInput" class="pageHeaderSearchInput" placeholder="{lang}wcf.global.search.enterSearchTerm{/lang}" autocomplete="off" value="{if $query|isset}{$query}{/if}" required>
 			
 			<button class="pageHeaderSearchInputButton button" type="submit">
 				<span class="icon icon16 fa-search pointer" title="{lang}wcf.global.search{/lang}"></span>