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 d53e9cfa85fb5c68c01ac07eb240ad899df0a6f7..684c702caaab0f7843eff4a493d4c9df05068bbc 100644 (file)
--- 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 (file)
index 0000000..7c66ef3
--- /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 a682135211af16600ea6d53116e1da5fd06e4060..e7901daed5e2039fbaefe7c1b0b8f3268a9e697c 100644 (file)
--- 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>