this is the part of #21 where we'll use the message instead of the di…

…rect newsletter shortcode

front-page.php

@@ -64,7 +64,7 @@
 
 		<aside class="o-content-message o-content-message-homepage">
 			<article class="o-content-message-body o-content-message-homepage-body">
-				<?php echo do_shortcode( '[newsletter_form placement="frontpage" content_before="<header><h3 class=\'a-signup-title-homepage\'>Stay informed</h3><h4>Sign up for our daily newsletter</h4></header>" in_content_label="Enter your email address or see our <a href=\'/newsletters/\'>other free newsletter options</a>" in_content_label_placement="after"]' ); ?>
+				<?php do_action( 'wp_message_inserter', 'homepage_middle' ); ?>
 			</article>
 		</aside>
 

template-parts/content.php

@@ -74,8 +74,7 @@
 	<?php minnpost_share_buttons( 'bottom' ); ?>
 
 	<?php if ( 'on' !== get_post_meta( get_the_ID(), '_mp_remove_newsletter_signup_from_display', true ) ) : ?>
-		<?php /* TODO: we would change this to instead run the 'message' plugin, which would have content around the shortcode, and would contain the shortcode itself */ ?>
-		<?php echo do_shortcode( '[newsletter_form placement="instory" content_before="<h3 class=\'a-signup-title\'>Get MinnPost in your email inbox:</h3>" content_after="<p>You can also <a href=\'/newsletters/\'>learn about all our free newsletter options</a>.</p>"]' ); ?>
+		<?php do_action( 'wp_message_inserter', 'article_bottom' ); ?>
 	<?php endif; ?>
 
 	<?php