Addressing #5, #14, #15, #16, #17

pootlepress · Mar 24, 2016 · d0f93ff · d0f93ff
1 parent 212ff89
commit d0f93ff
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 9 deletions.
diff --git a/content.php b/content.php
@@ -10,18 +10,18 @@
 		<?php
 		if ( is_single() ) {
 			fastshop_posted_on();
-			the_title( '<h1 class="entry-title" itemprop="name headline">', '</h1>' );
-		} else {
-			if ( 'post' == get_post_type() ) {
-				fastshop_posted_on();
-			}
-
-			the_title( sprintf( '<h1 class="entry-title" itemprop="name headline"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h1>' );
 		}
+		the_title( sprintf( '<h1 class="entry-title" itemprop="name headline"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h1>' );
 		?>
 	</header><!-- .entry-header -->
 	<aside class="entry-meta">
-		<?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?>
+		<?php
+		if ( ! is_single() ) {
+			if ( 'post' == get_post_type() ) {
+				fastshop_posted_on();
+			}
+		}
+		if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?>
 
 			<?php
 			/* translators: used between list items, there is a space after the comma */

diff --git a/header.php b/header.php
@@ -34,7 +34,12 @@
 		$home = '';
 		$blog = '';
 	}
+	ob_start();
+	wc_print_notices();
+	$notices = ob_get_contents();
+	ob_end_clean();
 	$fs_data = array(
+		'notices'  => $notices,
 		'url'      => FS_URL,
 		'home'     => $home,
 		'blog'     => $blog,

diff --git a/inc/functions/template-tags.php b/inc/functions/template-tags.php
@@ -287,6 +287,6 @@ function fastshop_posted_on() {
 			_x( 'by %s', 'post author', 'fastshop' ),
 			'<span class="vcard author"><span class="fn" itemprop="author"><a class="url fn n" rel="author" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . esc_html( get_the_author() ) . '</a></span></span>'
 		);
-		echo apply_filters( 'fastshop_single_post_posted_on_html', '<span class="posted-on">' . $posted_on . '</span><span class="byline"> ' . $byline . '</span>', $posted_on, $byline );
+		echo apply_filters( 'fastshop_single_post_posted_on_html', "<div class='posted-on-by'><span class='posted-on'>$posted_on</span> <span class='byline'>$byline</span></div>", $posted_on, $byline );
 	}
 }
diff --git a/ng/product.component.ts b/ng/product.component.ts
@@ -12,6 +12,7 @@ import {ProductsComponent} from "./products.component.ts";
 	directives: [ ProductsComponent ],
 })
 export class ProductComponent implements OnInit {
+	notices = '';
 	private product : SingleProduct = {
 		post_classes	: '',
 		slug			: '',
@@ -34,6 +35,8 @@ export class ProductComponent implements OnInit {
 	}
 
 	ngOnInit() {
+		this.notices = fastshopData.notices;
+		fastshopData.notices = '';
 		this.wpApi.api( 'product?name=' + this.routeParams.params.slug )
 			.success( res => {
 				this.product = JSON.parse( res );

diff --git a/ng/tpl/product.html b/ng/tpl/product.html
@@ -1,3 +1,4 @@
+<div *ngIf="notices" [innerHTML]="notices"></div>
 <div *ngIf="product && product.ID" [attr.id]="'product-' + product.ID" [ngClass]="product.post_classes">
 	<span *ngIf="product.sale" class="onsale">Sale!</span>
 	<div class="images">

diff --git a/style.css b/style.css
@@ -531,6 +531,7 @@ body {
 	content: '\f002';
 	position: absolute;
 	top: 0;
+	left: 0;
 	color: #444;
 }
 
@@ -1513,6 +1514,7 @@ fieldset legend {
 		margin: 0 0 0 -1.6em;
 		padding-left: 0;
 		display: block;
+		overflow: visible;
 	}
 
 	.main-navigation ul li,
@@ -1981,6 +1983,7 @@ video {
 .pagination {
 	text-align: center;
 	margin-bottom: 1.6em;
+	clear: both;
 }
 
 .pagination .page-numbers,
@@ -2584,6 +2587,7 @@ fastshop {
 router-outlet + * {
 	display: block;
 	background: #fff;
+	position: relative;
 }
 
 router-outlet + *:after {