From b2ade4565ad21ce49b3794a52153602cb7b8280b Mon Sep 17 00:00:00 2001
From: dengenxp <taharaxp@gmail.com>
Date: Sun, 8 Jan 2017 19:48:14 +0900
Subject: [PATCH] Changed the type of Structured Data from Article to WebPage
 (bug #710) Also added support for WPHeader, WPFooter and
 SiteNavigationElement

---
 public_html/layout/denim/archivestorytext.thtml      |  6 +++---
 public_html/layout/denim/breadcrumbs.thtml           |  6 +++---
 public_html/layout/denim/featuredstorytext.thtml     |  6 +++---
 public_html/layout/denim/footer.thtml                |  4 ++--
 public_html/layout/denim/header.thtml                | 12 ++++++------
 public_html/layout/denim/menunavigation.thtml        |  4 ++--
 public_html/layout/denim/storytext.thtml             |  6 +++---
 public_html/layout/denim/topicrelated.thtml          |  2 +-
 public_html/layout/denim_curve/footer.thtml          |  4 ++--
 .../layout/modern_curve/archivestorytext.thtml       |  6 +++---
 public_html/layout/modern_curve/breadcrumbs.thtml    |  6 +++---
 .../layout/modern_curve/featuredstorytext.thtml      |  6 +++---
 public_html/layout/modern_curve/footer.thtml         |  6 +++---
 public_html/layout/modern_curve/header.thtml         | 10 +++++-----
 public_html/layout/modern_curve/menunavigation.thtml |  6 +++---
 public_html/layout/modern_curve/storytext.thtml      |  8 ++++----
 public_html/layout/modern_curve/topicrelated.thtml   |  2 +-
 17 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/public_html/layout/denim/archivestorytext.thtml b/public_html/layout/denim/archivestorytext.thtml
index a6e8a028f..931068bdf 100644
--- a/public_html/layout/denim/archivestorytext.thtml
+++ b/public_html/layout/denim/archivestorytext.thtml
@@ -1,8 +1,8 @@
 {# begin {templatelocation} #}
 
-<article itemscope itemtype="http://schema.org/Article" class="storytext archivestorytext">
+<article class="storytext archivestorytext">
   <header>
-    <h2 itemprop="name" class="story_title">{story_title_link}</h2>
+    <h2 class="story_title" itemprop="headline">{story_title_link}</h2>
 
     <div class="story_icon">
       {!if email_icon}<a title="{lang_email_story}" href="{email_story_url}" class="uk-icon-hover uk-icon-envelope-o"></a>{!endif}
@@ -17,7 +17,7 @@
     </ul>
   </header>
 
-  <div itemprop="articleBody" class="story_introtext">
+  <div class="story_introtext" itemprop="description">
 {!if story_anchortag_and_image_no_align}
     <span class="story_image">{story_anchortag_and_image_no_align}</span>
 {!endif}
diff --git a/public_html/layout/denim/breadcrumbs.thtml b/public_html/layout/denim/breadcrumbs.thtml
index 780922695..5539abeb0 100644
--- a/public_html/layout/denim/breadcrumbs.thtml
+++ b/public_html/layout/denim/breadcrumbs.thtml
@@ -7,17 +7,17 @@
 {# end {templatelocation} #}
 
 <!-- BEGIN breadcrumb -->
-<ul{!if microdata} itemscope itemtype="http://schema.org/BreadcrumbList"{!endif} class="uk-breadcrumb">
+<ul{!if microdata} itemscope="itemscope" itemtype="http://schema.org/BreadcrumbList"{!endif} class="uk-breadcrumb">
 {breadcrumb_items}
 </ul>
 <!-- END breadcrumb -->
 
 <!-- BEGIN breadcrumb_item -->
-<li{!if microdata} itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"{!endif}><a href="{url}"{!if microdata} itemprop="item"{!endif}><span{!if microdata} itemprop="name"{!endif}>{name}</span></a>
+<li{!if microdata} itemprop="itemListElement" itemscope="itemscope" itemtype="http://schema.org/ListItem"{!endif}><a href="{url}"{!if microdata} itemprop="item"{!endif}><span{!if microdata} itemprop="name"{!endif}>{name}</span></a>
 {!if microdata}<meta itemprop="position" content="{count}"{xhtml}>{!endif}</li>
 <!-- END breadcrumb_item -->
 
 <!-- BEGIN breadcrumb_item_nolink -->
-<li{!if microdata} itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"{!endif}><span{!if microdata} itemprop="name"{!endif}>{name}</span>
+<li{!if microdata} itemprop="itemListElement" itemscope="itemscope" itemtype="http://schema.org/ListItem"{!endif}><span{!if microdata} itemprop="name"{!endif}>{name}</span>
 {!if microdata}<meta itemprop="position" content="{count}"{xhtml}>{!endif}</li>
 <!-- END breadcrumb_item_nolink -->
diff --git a/public_html/layout/denim/featuredstorytext.thtml b/public_html/layout/denim/featuredstorytext.thtml
index 177837bff..d7903d8bc 100644
--- a/public_html/layout/denim/featuredstorytext.thtml
+++ b/public_html/layout/denim/featuredstorytext.thtml
@@ -1,8 +1,8 @@
 {# begin {templatelocation} #}
 
-<article itemscope itemtype="http://schema.org/Article" class="storytext featuredstorytext">
+<article class="storytext featuredstorytext">
   <header>
-    <h2 itemprop="name" class="story_title">{start_storylink_anchortag}{story_title}{end_storylink_anchortag}</h2>
+    <h2 class="story_title" itemprop="headline">{start_storylink_anchortag}{story_title}{end_storylink_anchortag}</h2>
 
     <div class="story_icon">
       {!if email_icon}<a title="{lang_email_story}" href="{email_story_url}" class="uk-icon-hover uk-icon-envelope-o"></a>{!endif}
@@ -17,7 +17,7 @@
     </ul>
   </header>
 
-  <div itemprop="articleBody" class="story_introtext">
+  <div class="story_introtext" itemprop="description">
 {!if story_anchortag_and_image_no_align}
     <span class="story_image">{story_anchortag_and_image_no_align}</span>
 {!endif}
diff --git a/public_html/layout/denim/footer.thtml b/public_html/layout/denim/footer.thtml
index 4cf9827ef..7c3a3c83b 100644
--- a/public_html/layout/denim/footer.thtml
+++ b/public_html/layout/denim/footer.thtml
@@ -11,9 +11,9 @@
 
     <hr class="separator"{xhtml}>
 
-    <footer id="footer" role="contentinfo" class="clearfix">
+    <footer id="footer" role="contentinfo" class="clearfix" itemscope="itemscope" itemtype="http://schema.org/WPFooter">
       <div id="footer-content">
-        <div id="copyright">{copyright_msg}</div>
+        <div id="copyright" itemprop="copyrightHolder" itemscope="itemscope" itemtype="http://schema.org/Organization"><span itemprop="name">{copyright_msg}</span></div>
         <div id="trademark">{trademark_msg}</div>
         <div id="powered_by">{powered_by}&nbsp;<a href="https://www.geeklog.net/">Geeklog</a></div>
         <div id="execution_textandtime">{execution_textandtime}</div>
diff --git a/public_html/layout/denim/header.thtml b/public_html/layout/denim/header.thtml
index cc43bca07..21d6d3124 100644
--- a/public_html/layout/denim/header.thtml
+++ b/public_html/layout/denim/header.thtml
@@ -22,16 +22,16 @@
 <!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 </head>
 
-<body dir="{direction}" class="{layout_columns}">
+<body dir="{direction}" class="{layout_columns}" itemscope="itemscope" itemtype="http://schema.org/WebPage">
 {# start {templatelocation} #}
 
   <!-- #container { -->
   <div id="container">
-    <header id="header" role="banner" class="brand-text">
+    <header id="header" role="banner" class="brand-text" itemscope="itemscope" itemtype="http://schema.org/WPHeader">
       <div id="header-content">
         <a class="tm-toggle uk-navbar-toggle uk-visible-small" href="#offcanvas" data-uk-offcanvas="{mode:'reveal'}"></a>
         <div class="nameplate">
-          <h1 class="site_name"><a href="{site_url}" title="{site_name}">{site_name}</a></h1>
+          <h1 class="site_name" itemprop="name"><a href="{site_url}" title="{site_name}" itemprop="url">{site_name}</a></h1>
           <p class="site_slogan">{site_slogan}</p>
         </div>
       </div>
@@ -39,7 +39,7 @@
 
     <hr class="separator"{xhtml}>
 
-    <nav id="navigation" role="navigation" class="uk-hidden-small">
+    <nav id="navigation" role="navigation" class="uk-hidden-small" itemscope="itemscope" itemtype="http://schema.org/SiteNavigationElement">
       <div class="navigation_content uk-navbar uk-navbar-attached gl-navbar-small">
         <ul id="navigation_ul" class="uk-navbar-nav">
           {menu_elements}
@@ -60,7 +60,7 @@
       </div>
     </nav>
 
-    <div id="offcanvas" class="uk-offcanvas">
+    <div id="offcanvas" class="uk-offcanvas" itemscope="itemscope" itemtype="http://schema.org/SiteNavigationElement">
       <div class="uk-offcanvas-bar">
         <ul class="uk-nav uk-nav-offcanvas">
           {menu_elements}
@@ -75,7 +75,7 @@
 
       <!-- Center Block Container -->
       <div id="centerblocks">
-        <main id="main-content" role="main">
+        <main id="main-content" role="main" itemscope="itemscope" itemprop="mainContentOfPage" itemtype="http://schema.org/WebPageElement">
           <p class="welcome_msg">{welcome_msg}&nbsp;{datetime}</p>
           {breadcrumb_trail}
 
diff --git a/public_html/layout/denim/menunavigation.thtml b/public_html/layout/denim/menunavigation.thtml
index 84163b11d..133edce0d 100644
--- a/public_html/layout/denim/menunavigation.thtml
+++ b/public_html/layout/denim/menunavigation.thtml
@@ -1,10 +1,10 @@
 {# {templatelocation} - The Menu Navigation uses template blocks which is built into this file #}
 
 <!-- BEGIN menuitem -->
-<li class="menuitem"><a href="{menuitem_url}">{menuitem_text}</a></li>
+<li class="menuitem" itemprop="name"><a href="{menuitem_url}" itemprop="url">{menuitem_text}</a></li>
 <!-- END menuitem -->
 <!-- BEGIN menuitem_last -->
-<li class="menuitem last-child"><a href="{menuitem_url}">{menuitem_text}</a></li>
+<li class="menuitem last-child" itemprop="name"><a href="{menuitem_url}" itemprop="url">{menuitem_text}</a></li>
 <!-- END menuitem_last -->
 <!-- BEGIN menuitem_none -->
 
diff --git a/public_html/layout/denim/storytext.thtml b/public_html/layout/denim/storytext.thtml
index 91e3d24b8..c61200734 100644
--- a/public_html/layout/denim/storytext.thtml
+++ b/public_html/layout/denim/storytext.thtml
@@ -1,8 +1,8 @@
 {# begin {templatelocation} #}
 
-<article itemscope itemtype="http://schema.org/Article" class="storytext">
+<article class="storytext">
   <header>
-    <h2 itemprop="name" class="story_title">{start_storylink_anchortag}{story_title}{end_storylink_anchortag}</h2>
+    <h2 class="story_title" itemprop="headline">{start_storylink_anchortag}{story_title}{end_storylink_anchortag}</h2>
 
     <div class="story_icon">
       {!if email_icon}<a title="{lang_email_story}" href="{email_story_url}" class="uk-icon-hover uk-icon-envelope-o"></a>{!endif}
@@ -17,7 +17,7 @@
     </ul>
   </header>
 
-  <div itemprop="articleBody" class="story_introtext">
+  <div class="story_introtext" itemprop="description">
 {!if story_anchortag_and_image_no_align}
     <span class="story_image">{story_anchortag_and_image_no_align}</span>
 {!endif}
diff --git a/public_html/layout/denim/topicrelated.thtml b/public_html/layout/denim/topicrelated.thtml
index fd6ee07b4..0382e974e 100644
--- a/public_html/layout/denim/topicrelated.thtml
+++ b/public_html/layout/denim/topicrelated.thtml
@@ -5,7 +5,7 @@
 {# end {templatelocation} #}
 
 <!-- BEGIN topicitem -->
-<a href="{topic_url}"><span itemprop="articleSection">{topic}</span></a>
+<a href="{topic_url}">{topic}</a>
 <!-- END topicitem -->
 <!-- BEGIN separator -->
 &nbsp;
diff --git a/public_html/layout/denim_curve/footer.thtml b/public_html/layout/denim_curve/footer.thtml
index cdae1e8cf..0cccfff7c 100644
--- a/public_html/layout/denim_curve/footer.thtml
+++ b/public_html/layout/denim_curve/footer.thtml
@@ -11,9 +11,9 @@
 
     <hr class="separator"{xhtml}>
 
-    <footer id="footer" role="contentinfo" class="clearfix">
+    <footer id="footer" role="contentinfo" class="clearfix" itemscope="itemscope" itemtype="http://schema.org/WPFooter">
       <div id="footer-content">
-        <div id="copyright">{copyright_msg}</div>
+        <div id="copyright" itemprop="copyrightHolder" itemscope="itemscope" itemtype="http://schema.org/Organization"><span itemprop="name">{copyright_msg}</span></div>
         <div id="trademark">{trademark_msg}</div>
         <div id="powered_by">{powered_by}&nbsp;<a href="https://www.geeklog.net/">Geeklog</a></div>
         <div id="execution_textandtime">{execution_textandtime}</div>
diff --git a/public_html/layout/modern_curve/archivestorytext.thtml b/public_html/layout/modern_curve/archivestorytext.thtml
index b8dee1b2b..5e9174d71 100644
--- a/public_html/layout/modern_curve/archivestorytext.thtml
+++ b/public_html/layout/modern_curve/archivestorytext.thtml
@@ -1,7 +1,7 @@
 {# begin {templatelocation} #}
 
-<div itemscope itemtype="http://schema.org/Article" class="archivestorytext">
-  <h2 itemprop="name" class="story_title">{story_title_link}</h2>
+<div class="archivestorytext">
+  <h2 class="story_title" itemprop="headline">{story_title_link}</h2>
 
   <ul class="icon">
     <li>{email_icon}</li>
@@ -31,7 +31,7 @@
 
   <div style="clear:both"></div>
 
-  <div itemprop="articleBody" class="story_introtext">
+  <div class="story_introtext" itemprop="description">
     {story_text_no_br}
   </div>
 
diff --git a/public_html/layout/modern_curve/breadcrumbs.thtml b/public_html/layout/modern_curve/breadcrumbs.thtml
index f4a2f4d20..ceeb1a57b 100644
--- a/public_html/layout/modern_curve/breadcrumbs.thtml
+++ b/public_html/layout/modern_curve/breadcrumbs.thtml
@@ -3,13 +3,13 @@
 {breadcrumbs}
 
 <!-- BEGIN breadcrumb -->
-<div {!if microdata} itemscope itemtype="http://schema.org/BreadcrumbList" {!endif}class="bc_navigation">
+<div {!if microdata} itemscope="itemscope" itemtype="http://schema.org/BreadcrumbList" {!endif}class="bc_navigation">
     {breadcrumb_items}
 </div>
 <!-- END breadcrumb -->
 
 <!-- BEGIN breadcrumb_item -->
-<span{!if microdata} itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"{!endif}>
+<span{!if microdata} itemprop="itemListElement" itemscope="itemscope" itemtype="http://schema.org/ListItem"{!endif}>
     {separator}
     <a href="{url}"{!if microdata} itemprop="item"{!endif}>
         <span{!if microdata} itemprop="name"{!endif}>{name}</span>
@@ -19,7 +19,7 @@
 <!-- END breadcrumb_item -->
 
 <!-- BEGIN breadcrumb_item_nolink -->
-<span{!if microdata} itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"{!endif}>
+<span{!if microdata} itemprop="itemListElement" itemscope="itemscope" itemtype="http://schema.org/ListItem"{!endif}>
     {separator}
     <span{!if microdata} itemprop="name"{!endif}>{name}</span>
     {!if microdata}<meta itemprop="position" content="{count}" />{!endif}
diff --git a/public_html/layout/modern_curve/featuredstorytext.thtml b/public_html/layout/modern_curve/featuredstorytext.thtml
index 73abefa0d..10d2681f4 100644
--- a/public_html/layout/modern_curve/featuredstorytext.thtml
+++ b/public_html/layout/modern_curve/featuredstorytext.thtml
@@ -1,7 +1,7 @@
 {# begin {templatelocation} #}
 
-<div itemscope itemtype="http://schema.org/Article" class="featuredstorytext">
-  <h2 itemprop="name" class="story_title">{start_storylink_anchortag}{story_title}{end_storylink_anchortag}</h2>
+<div class="featuredstorytext">
+  <h2 class="story_title" itemprop="headline">{start_storylink_anchortag}{story_title}{end_storylink_anchortag}</h2>
 
   <ul class="icon">
     <li>{email_icon}</li>
@@ -31,7 +31,7 @@
 
   <div style="clear:both"></div>
 
-  <div itemprop="articleBody" class="story_introtext">
+  <div class="story_introtext" itemprop="description">
     {story_text_no_br}
   </div>
 
diff --git a/public_html/layout/modern_curve/footer.thtml b/public_html/layout/modern_curve/footer.thtml
index 3531fb921..6ed710b71 100644
--- a/public_html/layout/modern_curve/footer.thtml
+++ b/public_html/layout/modern_curve/footer.thtml
@@ -13,10 +13,10 @@
       <hr class="separator"{xhtml}>
 
       <!-- #footer { -->
-      <div id="footer">
+      <div id="footer" itemscope="itemscope" itemtype="http://schema.org/WPFooter">
         <div id="footer-content">
-        <ul class="copyright">
-          <li class="copyright_notice"><address>{copyright_notice}</address></li>
+        <ul class="copyright" itemprop="copyrightHolder" itemscope="itemscope" itemtype="http://schema.org/Organization">
+          <li class="copyright_notice" itemprop="name"><address>{copyright_notice}</address></li>
         </ul>
         <ul class="site_info">
           <li class="powered_by">{powered_by}&nbsp;<a href="https://www.geeklog.net/">Geeklog</a></li>
diff --git a/public_html/layout/modern_curve/header.thtml b/public_html/layout/modern_curve/header.thtml
index 100c00529..0de9f47af 100644
--- a/public_html/layout/modern_curve/header.thtml
+++ b/public_html/layout/modern_curve/header.thtml
@@ -10,15 +10,15 @@
 {rel_links}
 {plg_headercode}
   </head>
-  <body dir="{direction}" class="{layout_columns}">
+  <body dir="{direction}" class="{layout_columns}" itemscope="itemscope" itemtype="http://schema.org/WebPage">
 {# begin {templatelocation} #}
 
 <!-- #container { -->
     <div id="container">
       <!-- #header { -->
-      <div id="header">
+      <div id="header" itemscope="itemscope" itemtype="http://schema.org/WPHeader">
         <div id="header-content">
-          <h1 class="site_name"><a href="{site_url}"><img src="{site_logo}" width="226" height="80" alt="{site_name}"{xhtml}></a></h1>
+          <h1 class="site_name" itemprop="name"><a href="{site_url}" itemprop="url"><img src="{site_logo}" width="226" height="80" alt="{site_name}"{xhtml}></a></h1>
          <p class="site_slogan">{site_slogan}</p>
         </div>
       </div>
@@ -27,7 +27,7 @@
       <hr class="separator"{xhtml}>
 
       <!-- #navigation { -->
-      <div id="navigation">
+      <div id="navigation" itemscope="itemscope" itemtype="http://schema.org/SiteNavigationElement">
         <ul>
           {menu_elements}
         </ul>
@@ -48,7 +48,7 @@
         {# Center Block Container #}
         <div id="centerblocks">
           <p class="welcome_msg">{welcome_msg}&nbsp;{datetime}</p>
-          <div id="centerblocks-content">
+          <div id="centerblocks-content" itemscope="itemscope" itemprop="mainContentOfPage" itemtype="http://schema.org/WebPageElement">
           {breadcrumb_trail}
 
 {# end {templatelocation} #}
diff --git a/public_html/layout/modern_curve/menunavigation.thtml b/public_html/layout/modern_curve/menunavigation.thtml
index 2d0071ab3..133edce0d 100644
--- a/public_html/layout/modern_curve/menunavigation.thtml
+++ b/public_html/layout/modern_curve/menunavigation.thtml
@@ -1,10 +1,10 @@
-{# begin {templatelocation} - The Menu Navigation uses template blocks which is built into this file #}
+{# {templatelocation} - The Menu Navigation uses template blocks which is built into this file #}
 
 <!-- BEGIN menuitem -->
-<li class="menuitem"><a href="{menuitem_url}">{menuitem_text}</a></li>
+<li class="menuitem" itemprop="name"><a href="{menuitem_url}" itemprop="url">{menuitem_text}</a></li>
 <!-- END menuitem -->
 <!-- BEGIN menuitem_last -->
-<li class="menuitem last-child"><a href="{menuitem_url}">{menuitem_text}</a></li>
+<li class="menuitem last-child" itemprop="name"><a href="{menuitem_url}" itemprop="url">{menuitem_text}</a></li>
 <!-- END menuitem_last -->
 <!-- BEGIN menuitem_none -->
 
diff --git a/public_html/layout/modern_curve/storytext.thtml b/public_html/layout/modern_curve/storytext.thtml
index 51337de83..eb7b12ad4 100644
--- a/public_html/layout/modern_curve/storytext.thtml
+++ b/public_html/layout/modern_curve/storytext.thtml
@@ -1,7 +1,7 @@
 {# begin {templatelocation} #}
 
-<div itemscope itemtype="http://schema.org/Article" class="storytext">
-  <h2 itemprop="name" class="story_title">{start_storylink_anchortag}{story_title}{end_storylink_anchortag}</h2>
+<div class="storytext">
+  <h2 class="story_title" itemprop="headline">{start_storylink_anchortag}{story_title}{end_storylink_anchortag}</h2>
 
   <ul class="icon">
     <li>{email_icon}</li>
@@ -31,7 +31,7 @@
 
   <div style="clear:both"></div>
 
-  <div itemprop="articleBody" class="story_introtext">
+  <div class="story_introtext" itemprop="description">
     {story_text_no_br}
   </div>
 
@@ -42,7 +42,7 @@
     {related_articles_by_keyword}
   {!endif}
 
-    {!if navi_list}
+{!if navi_list}
   <ul class="navi">
     {!if page_selector}<li>{page_selector}</li>{!endif}
     {!if readmore_link}<li>{readmore_link}</li>{!endif}
diff --git a/public_html/layout/modern_curve/topicrelated.thtml b/public_html/layout/modern_curve/topicrelated.thtml
index fd6ee07b4..0382e974e 100644
--- a/public_html/layout/modern_curve/topicrelated.thtml
+++ b/public_html/layout/modern_curve/topicrelated.thtml
@@ -5,7 +5,7 @@
 {# end {templatelocation} #}
 
 <!-- BEGIN topicitem -->
-<a href="{topic_url}"><span itemprop="articleSection">{topic}</span></a>
+<a href="{topic_url}">{topic}</a>
 <!-- END topicitem -->
 <!-- BEGIN separator -->
 &nbsp;