Merge pull request #17 from ScottSmith95/2.9.3

Decode 2.9.3
WPChill · Apr 14, 2014 · 423889d · 423889d
2 parents 8f3a460 + f452808
commit 423889d
Show file tree

Hide file tree

Showing 47 changed files with 2,016 additions and 1,250 deletions.
diff --git a/comments.php b/comments.php
@@ -70,13 +70,29 @@
 	?>
 		<p class="no-comments"><?php _e( 'Comments are closed.', 'decode' ); ?></p>
 	<?php endif; ?>
+
+	<?php
+	if (get_theme_mod( 'show_allowed_tags', false ) == true ) {
+		$comments_args = array(
+			'title_reply'          => __( 'Leave a Reply', 'decode' ),
+			'title_reply_to'       => __( 'Leave a Reply to %s', 'decode' ),
+			'cancel_reply_link'    => __( 'Cancel reply', 'decode' ),
+			'label_submit'         => __( 'Post Comment', 'decode' ),
+		);
+	}
+
+	else {
+		$comments_args = array(
+			'comment_notes_after'  => '',
+			'title_reply'          => __( 'Leave a Reply', 'decode' ),
+			'title_reply_to'       => __( 'Leave a Reply to %s', 'decode' ),
+			'cancel_reply_link'    => __( 'Cancel reply', 'decode' ),
+			'label_submit'         => __( 'Post Comment', 'decode' ),
+		);
+	}
+	?>
 
-	<?php comment_form( array(
-		'title_reply'          => __( 'Leave a Reply', 'decode' ),
-		'title_reply_to'       => __( 'Leave a Reply to %s', 'decode' ),
-		'cancel_reply_link'    => __( 'Cancel reply', 'decode' ),
-		'label_submit'         => __( 'Post Comment', 'decode' ),
-	) ); ?>
+	<?php comment_form( $comments_args ); ?>
 
 	<?php
 		_x( 'Comment', 'noun', 'decode' );
@@ -86,20 +102,21 @@
 		__( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes: %s', 'decode' );
 	?>
 
-
-	<script>		
-		function hasClass(el, cls) {
-			return (' ' + el.className + ' ').indexOf(' ' + cls + ' ') > -1;
-		}
-
-		var target = document.querySelector('.form-allowed-tags');
-
-		document.querySelector('textarea#comment').addEventListener('click', function() {
-			if (!hasClass(target, 'visible')) {
-				target.className += ' ' + 'visible';
+	<?php if (get_theme_mod( 'show_allowed_tags', false ) == true ) : ?>
+		<script>		
+			function hasClass(el, cls) {
+				return (' ' + el.className + ' ').indexOf(' ' + cls + ' ') > -1;
 			}
-		}, false);
-	</script>
+
+			var target = document.querySelector('.form-allowed-tags');
+
+			document.querySelector('textarea#comment').addEventListener('click', function() {
+				if (!hasClass(target, 'visible')) {
+					target.className += ' ' + 'visible';
+				}
+			}, false);
+		</script>
+	<?php endif; ?>
 
 </div><!-- #comments -->
 	<?php tha_comments_after(); ?>

diff --git a/content-excerpt.php b/content-excerpt.php
@@ -16,23 +16,23 @@
 		<?php endif; ?>
 		<div class="entry-title"><h2><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2></div>
 		<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'above' && get_theme_mod( 'show_entry_date_on_excerpts', false ) == true ) : ?>
-		<div class="entry-meta above-content">
+		<div class="entry-meta">
 			<p class="date"><?php decode_posted_on(); ?></p>
-		</div><!-- .entry-meta -->
+		</div>
 		<?php endif; ?>
 	</header><!-- .entry-header -->
 
 	<div class="entry-summary">
 		<?php the_excerpt(); ?>
 	</div><!-- .entry-summary -->
 
-	<footer class="entry-meta">
+	<footer class="entry-footer">
 	<a class="read-more-link" href="<?php echo get_permalink(); ?>"><?php _e('Read More&hellip;', 'decode'); ?></a>
 	<?php edit_post_link( __( 'Edit', 'decode' ), '<div class="edit-link">', '</div>' ); ?>
 	<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' && get_theme_mod( 'show_entry_date_on_excerpts', false ) == true ) : ?>
 			<p class="date"><?php decode_posted_on(); ?></p>
 		<?php endif; ?>
-	</footer><!-- .entry-meta -->
+	</footer><!-- .entry-footer -->
 
 	<?php tha_entry_bottom(); ?>
 </article><!-- #post-<?php the_ID(); ?> -->

diff --git a/content-link.php b/content-link.php
@@ -16,9 +16,9 @@
 			<?php endif; ?>
 		<div class="entry-title"><h2><?php decode_print_post_title() ?><?php if ( get_theme_mod( 'link_post_title_arrow', false ) == true ) echo '<span class="link-title-arrow">&#8594;</span>'; ?></h2></div>
 		<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'above' ) : ?>
-		<div class="entry-meta above-content">
+		<div class="entry-meta">
 			<p class="date"><?php decode_posted_on(); ?></p>
-		</div><!-- .entry-meta -->
+		</div>
 		<?php endif; ?>
 	</header><!-- .entry-header -->
 
@@ -28,7 +28,7 @@
 
 	<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
 
-	<footer class="entry-meta">
+	<footer class="entry-footer">
 		<?php if (get_theme_mod( 'enable_comments', true ) == true && ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
 			<div class="comments-link <?php echo get_theme_mod( 'enable_comments', '' ); ?>"><?php comments_popup_link( __( 'Leave a comment', 'decode' ), __( '1 Comment', 'decode' ), __( '% Comments', 'decode' ) ); ?></div>
 		<?php endif; ?>
@@ -42,7 +42,7 @@
 		<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
 			<p class="date"><?php decode_posted_on(); ?></p>
 		<?php endif; ?>
-	</footer><!-- .entry-meta -->
+	</footer><!-- .entry-footer -->
 
 	<?php tha_entry_bottom(); ?>
 </article><!-- #post-<?php the_ID(); ?> -->

diff --git a/content-page.php b/content-page.php
@@ -17,15 +17,14 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
+
 		<?php the_content(); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
-
-		<footer>
-			<?php edit_post_link( __( 'Edit', 'decode' ), '<span class="edit-link">', '</span>' ); ?>
-		</footer>
+		<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>	
 
 	</div><!-- .entry-content -->
 
+	<?php edit_post_link( __( 'Edit', '_s' ), '<footer class="entry-footer"><span class="edit-link">', '</span></footer>' ); ?>
+
 	<?php tha_entry_bottom(); ?>
 </article><!-- #post-<?php the_ID(); ?> -->
 	<?php tha_entry_after(); ?>
diff --git a/content-quote.php b/content-quote.php
@@ -14,7 +14,7 @@
 
 	<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
 
-	<footer class="entry-meta">
+	<footer class="entry-footer">
 		<?php if (get_theme_mod( 'enable_comments', true ) == true && ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
 			<div class="comments-link <?php echo get_theme_mod( 'enable_comments', '' ); ?>"><?php comments_popup_link( __( 'Leave a comment', 'decode' ), __( '1 Comment', 'decode' ), __( '% Comments', 'decode' ) ); ?></div>
 		<?php endif; ?>
@@ -26,7 +26,7 @@
 			<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode')  . the_category(', '); ?></p>
 		<?php endif; ?>
 		<p class="date"><?php decode_posted_on(); ?></p>
-	</footer><!-- .entry-meta -->
+	</footer><!-- .entry-footer -->
 
 	<?php tha_entry_bottom(); ?>
 </article><!-- #post-<?php the_ID(); ?> -->

diff --git a/content-search.php b/content-search.php
@@ -15,8 +15,7 @@
 			<?php the_excerpt(); ?>
 		</div><!-- .entry-summary -->
 	</a>
-	<footer class="entry-meta">
-		<?php edit_post_link( __( 'Edit', 'decode' ), '<div class="edit-link">', '</div>' ); ?>
-	</footer>
+
+	<?php edit_post_link( __( 'Edit', '_s' ), '<footer class="entry-footer"><span class="edit-link">', '</span></footer>' ); ?>
 
 </article><!-- #post-<?php the_ID(); ?> -->
diff --git a/content-single.php b/content-single.php
@@ -12,7 +12,7 @@
 
 			<div class="entry-content"><?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>
 			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
-		<footer class="entry-meta">
+		<footer class="entry-footer">
 			<?php if (get_theme_mod( 'show_author_section', false ) == true ) : ?>
 				<section class="author-section cf">
 					<div class="author-image"><a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )?>" rel="author"><?php echo get_avatar( get_the_author_meta( 'ID' ), 250 ); ?></a></div>
@@ -28,7 +28,7 @@
 			<p class="tags"><?php the_tags(__( 'Tagged as: ', 'decode' ),', '); ?></p>
 			<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category(', '); ?></p>
 			<p class="date"><?php decode_posted_on(); ?></p>
-		</footer><!-- .entry-meta -->
+		</footer><!-- .entry-footer -->
 
 		<?php tha_entry_bottom(); ?>
 	</article><!-- #post-<?php the_ID(); ?> -->
@@ -48,13 +48,13 @@
 			<?php endif; ?>
 			<div class="entry-title"><h2><?php decode_print_post_title() ?><?php if (get_theme_mod( 'link_post_title_arrow', false ) == true ) echo '<span class="link-title-arrow">&#8594;</span>'; ?></h2></div>
 			<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'above' ) : ?>
-			<div class="entry-meta above-content">
+			<div class="entry-meta">
 				<p class="date"><?php decode_posted_on(); ?></p>
 			</div><!-- .entry-meta -->
 			<?php endif; ?>
 		</header>
 		<div class="entry-content"><?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>
-		<footer class="entry-meta">
+		<footer class="entry-footer">
 			<?php if (get_theme_mod( 'show_author_section', false ) == true ) : ?>
 				<section class="author-section cf">
 					<div class="author-image"><a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )?>" rel="author"><?php echo get_avatar( get_the_author_meta( 'ID' ), 250 ); ?></a></div>
@@ -72,7 +72,7 @@
 			<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
 				<p class="date"><?php decode_posted_on(); ?></p>
 			<?php endif; ?>
-		</footer><!-- .entry-meta -->
+		</footer><!-- .entry-footer -->
 
 		<?php tha_entry_bottom(); ?>
 	</article>
@@ -92,14 +92,14 @@
 			<?php endif; ?>
 			<div class="entry-title"><h2><?php the_title(); ?></h2></div>
 			<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'above' ) : ?>
-			<div class="entry-meta above-content">
+			<div class="entry-meta">
 				<p class="date"><?php decode_posted_on(); ?></p>
 			</div><!-- .entry-meta -->
 			<?php endif; ?>
 		</header><!-- .entry-header -->
 		<div class="entry-content"><?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>
 		<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
-		<footer class="entry-meta">
+		<footer class="entry-footer">
 			<?php if (get_theme_mod( 'show_author_section', false ) == true ) : ?>
 				<section class="author-section cf">
 					<div class="author-image"><a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )?>" rel="author"><?php echo get_avatar( get_the_author_meta( 'ID' ), 250 ); ?></a></div>
@@ -117,7 +117,7 @@
 			<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
 				<p class="date"><?php decode_posted_on(); ?></p>
 			<?php endif; ?>
-		</footer><!-- .entry-meta -->
+		</footer><!-- .entry-footer -->
 
 		<?php tha_entry_bottom(); ?>
 	</article><!-- #post-<?php the_ID(); ?> -->

diff --git a/content.php b/content.php
@@ -16,9 +16,9 @@
 			<?php endif; ?>
 		<div class="entry-title"><h2><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2></div>
 		<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'above' ) : ?>
-		<div class="entry-meta above-content">
+		<div class="entry-meta">
 			<p class="date"><?php decode_posted_on(); ?></p>
-		</div><!-- .entry-meta -->
+		</div>
 		<?php endif; ?>
 	</header><!-- .entry-header -->
 
@@ -28,7 +28,7 @@
 
 	<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
 
-	<footer class="entry-meta below-content">
+	<footer class="entry-footer below-content">
 		<?php if (get_theme_mod( 'enable_comments', true ) == true && ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
 			<div class="comments-link <?php echo get_theme_mod( 'enable_comments', '' ); ?>"><?php comments_popup_link( __( 'Leave a comment', 'decode' ), __( '1 Comment', 'decode' ), __( '% Comments', 'decode' ) ); ?></div>
 		<?php endif; ?>
@@ -42,7 +42,7 @@
 		<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
 			<p class="date"><?php decode_posted_on(); ?></p>
 		<?php endif; ?>
-	</footer><!-- .entry-meta -->
+	</footer><!-- .entry-footer -->
 
 	<?php tha_entry_bottom(); ?>
 </article><!-- #post-<?php the_ID(); ?> -->