From 4c3b854603eb43325a6f71cf1dd5a88146ab9ff7 Mon Sep 17 00:00:00 2001
From: Denver Prophit Jr <denver@denverprophit.us>
Date: Fri, 17 Nov 2017 08:13:29 -0500
Subject: [PATCH] Updates content template for schema answer

Updates issue /designwall/dw-question-answer/#218 for answer schema
---
 templates/content-single-answer.php | 51 +++++++++++++++++++----------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/templates/content-single-answer.php b/templates/content-single-answer.php
index dabaaeea..9e913a28 100644
--- a/templates/content-single-answer.php
+++ b/templates/content-single-answer.php
@@ -6,28 +6,43 @@
  * @since DW Question & Answer 1.4.3
  */
 ?>
-<div class="<?php echo dwqa_post_class() ?>">
-	<div class="dwqa-answer-vote" data-nonce="<?php echo wp_create_nonce( '_dwqa_answer_vote_nonce' ) ?>" data-post="<?php the_ID(); ?>">
-		<span class="dwqa-vote-count"><?php echo dwqa_vote_count() ?></span>
-		<a class="dwqa-vote dwqa-vote-up" href="#"><?php _e( 'Vote Up', 'dwqa' ); ?></a>
-		<a class="dwqa-vote dwqa-vote-down" href="#"><?php _e( 'Vote Down', 'dwqa' ); ?></a>
-	</div>
+<div class="<?php echo dwqa_post_class() ?>"
+     itemprop="suggestedAnswer<?php if ( dwqa_is_the_best_answer() ) : ?> acceptedAnswer<?php endif; ?>" itemscope
+     itemtype="http://schema.org/Answer">
+    <aside class="dwqa-answer-vote" data-nonce="<?php echo wp_create_nonce( '_dwqa_answer_vote_nonce' ) ?>"
+           data-post="<?php the_ID(); ?>">
+
+        <span class="dwqa-vote-count" itemprop="upvoteCount"><?php echo dwqa_vote_count() ?></span>
+        <a class="dwqa-vote dwqa-vote-up" href="#"><?php _e( 'Vote Up', 'dwqa' ); ?></a>
+        <a class="dwqa-vote dwqa-vote-down" href="#"><?php _e( 'Vote Down', 'dwqa' ); ?></a>
+
+    </aside>
 	<?php if ( dwqa_current_user_can( 'edit_question', dwqa_get_question_from_answer_id() ) ) : ?>
-		<?php $action = dwqa_is_the_best_answer() ? 'dwqa-unvote-best-answer' : 'dwqa-vote-best-answer' ; ?>
-		<a class="dwqa-pick-best-answer" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array( 'answer' => get_the_ID(), 'action' => $action ), admin_url( 'admin-ajax.php' ) ), '_dwqa_vote_best_answer' ) ) ?>"><?php _e( 'Best Answer', 'dwqa' ) ?></a>
+		<?php $action = dwqa_is_the_best_answer() ? 'dwqa-unvote-best-answer' : 'dwqa-vote-best-answer'; ?>
+        <aside>
+            <a class="dwqa-pick-best-answer" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array(
+				'answer' => get_the_ID(),
+				'action' => $action
+			), admin_url( 'admin-ajax.php' ) ), '_dwqa_vote_best_answer' ) ) ?>"><?php _e( 'Best Answer', 'dwqa' ) ?></a>
+        </aside>
 	<?php elseif ( dwqa_is_the_best_answer() ) : ?>
-		<span class="dwqa-pick-best-answer"><?php _e( 'Best Answer', 'dwqa' ) ?></span>
+        <aside><span class="dwqa-pick-best-answer"><?php _e( 'Best Answer', 'dwqa' ) ?></span></aside>
+
 	<?php endif; ?>
-	<div class="dwqa-answer-meta">
+    <aside class="dwqa-answer-meta">
 		<?php $user_id = get_post_field( 'post_author', get_the_ID() ) ? get_post_field( 'post_author', get_the_ID() ) : 0 ?>
-		<?php printf( __( '<span><a href="%s">%s%s</a> %s answered %s ago</span>', 'dwqa' ), dwqa_get_author_link( $user_id ), get_avatar( $user_id, 48 ), get_the_author(), dwqa_print_user_badge( $user_id ), human_time_diff( get_post_time( 'U', true ) ) ) ?>
+		<?php printf( __( '<span><a href="%s"><span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">%s%s</span></span></a> %s answered %s ago</span>', 'dwqa' ), dwqa_get_author_link( $user_id ), get_avatar( $user_id, 48 ), get_the_author(), dwqa_print_user_badge( $user_id ), human_time_diff( get_post_time( 'U', true ) ) ) ?>
 		<?php if ( 'private' == get_post_status() ) : ?>
-			<span><?php _e( '&nbsp;&bull;&nbsp;', 'dwqa' ); ?></span>
-			<span><?php _e( 'Private', 'dwqa' ) ?></span>
+            <span><?php _e( '&nbsp;&bull;&nbsp;', 'dwqa' ); ?></span>
+            <span><?php _e( 'Private', 'dwqa' ) ?></span>
 		<?php endif; ?>
-		<span class="dwqa-answer-actions"><?php dwqa_answer_button_action(); ?></span>
-	</div>
-	<div class="dwqa-answer-content"><?php the_content(); ?></div>
-	<?php do_action('dwqa_after_show_content_answer', get_the_ID()); ?>
-	<?php comments_template(); ?>
+        <span class="dwqa-answer-actions"><?php dwqa_answer_button_action(); ?></span>
+    </aside>
+    <span class="dwqa-answer-content" itemprop="text"><?php the_content(); ?>
+</span>
 </div>
+<?php do_action( 'dwqa_after_show_content_answer', get_the_ID() ); ?>
+<?php comments_template(); ?>
+</div>
+
+<!-- TODO Add parentItem schema attribute -->