From b66c5a4e02d9ef6627262f8174baeaf86eb183f2 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 10 Mar 2016 13:29:02 +0100 Subject: [PATCH 01/10] fix php error caused by blogFeatures function --- controller/classes/Subtemplate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller/classes/Subtemplate.php b/controller/classes/Subtemplate.php index 2f927f3..e047fab 100644 --- a/controller/classes/Subtemplate.php +++ b/controller/classes/Subtemplate.php @@ -361,7 +361,7 @@ class Subtemplate { $postTitle = $feature->post_title; $url = get_permalink($feature->ID); $content = substr($feature->post_content, 0, 144) . '...'; - $date = date('F Y',$feature->post_date); + $date = date('F Y', strtotime($feature->post_date)); $image = wp_get_attachment_image_src(get_post_thumbnail_id($feature->ID),'blog-feature-crop')[0]; if ($page == "home") { From 1ff581d67b11b812f26518c64963d161735b7b58 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 10 Mar 2016 14:01:12 +0100 Subject: [PATCH 02/10] refactor & simplify featured posts markup & styles --- assets/_src/less/ascribe/_blog.less | 23 +++++++++++ controller/classes/Subtemplate.php | 59 +++++++++++++---------------- 2 files changed, 50 insertions(+), 32 deletions(-) diff --git a/assets/_src/less/ascribe/_blog.less b/assets/_src/less/ascribe/_blog.less index 357abf5..7ba8125 100644 --- a/assets/_src/less/ascribe/_blog.less +++ b/assets/_src/less/ascribe/_blog.less @@ -111,3 +111,26 @@ } } } + + +// +// Featured Blog Posts +// +.subtemplate--featured { + @media (@screen-sm) { + .grid__col { flex: 33%; } + } +} + +.subtemplate--featured--more { + &:extend(.text-center); + margin-bottom: 0; +} + +.featured { + +} + +.featured__title { + &:extend(.h4); +} diff --git a/controller/classes/Subtemplate.php b/controller/classes/Subtemplate.php index e047fab..6ae2397 100644 --- a/controller/classes/Subtemplate.php +++ b/controller/classes/Subtemplate.php @@ -349,14 +349,20 @@ class Subtemplate { return $result; } - public function blogFeatures($page = "home") { + + + // + // Subtemplate: Featured Blog Posts + // + public function blogFeatures() { + $blogFeatures = ''; - $subtemplateTitle = get_sub_field('section_title'); + $subtemplateTitle = get_sub_field('section_title'); + if (have_rows('blog_features','option')) { while (have_rows('blog_features','option')) { the_row(); - $title = get_sub_field('feature_title'); $feature = get_sub_field('post'); $postTitle = $feature->post_title; $url = get_permalink($feature->ID); @@ -364,43 +370,32 @@ class Subtemplate { $date = date('F Y', strtotime($feature->post_date)); $image = wp_get_attachment_image_src(get_post_thumbnail_id($feature->ID),'blog-feature-crop')[0]; - if ($page == "home") { - $blogFeatures .= "
- {$postTitle} Image -

{$title}

-

{$postTitle}

-
"; - - } - else { - $blogFeatures .= "
-

{$postTitle}

- -
{$content}
-
"; - - } + $blogFeatures .= "
+ +
+ {$postTitle} Image +

{$postTitle}

+
+ +
"; } } - if ($page == "home") { - $result = "
-
-

{$subtemplateTitle}

-
+ $result = "
+

{$subtemplateTitle}

+
{$blogFeatures} -
-
"; - } - else { - $result = "
- {$blogFeatures} -
"; - } +

Go to Blog

+ "; return $result; } + + + // + // Subtemplate: Team + // public function team($subtemplateTitle) { $content = get_sub_field('content'); $meetTeamLink = get_sub_field('meet_the_team_link'); From 4d4c719dac99b21f7c5cf72a67cd917132b73cb7 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 10 Mar 2016 14:18:33 +0100 Subject: [PATCH 03/10] fix more php errors --- content-blog.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content-blog.php b/content-blog.php index 9d92a79..1419ba0 100644 --- a/content-blog.php +++ b/content-blog.php @@ -1,5 +1,5 @@
- + by on
From 7a14aa09aafd8873def28a0bb8b44665b49d41d1 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 10 Mar 2016 14:36:18 +0100 Subject: [PATCH 04/10] get blog url the right way --- controller/classes/Subtemplate.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/controller/classes/Subtemplate.php b/controller/classes/Subtemplate.php index 6ae2397..419e849 100644 --- a/controller/classes/Subtemplate.php +++ b/controller/classes/Subtemplate.php @@ -369,6 +369,8 @@ class Subtemplate { $content = substr($feature->post_content, 0, 144) . '...'; $date = date('F Y', strtotime($feature->post_date)); $image = wp_get_attachment_image_src(get_post_thumbnail_id($feature->ID),'blog-feature-crop')[0]; + $blogPage = get_page_by_title('Blog'); + $blogUrl = get_permalink($blogPage->ID); $blogFeatures .= "
@@ -383,10 +385,10 @@ class Subtemplate { $result = "

{$subtemplateTitle}

-
+
{$blogFeatures}
-

Go to Blog

+

Go to Blog

"; return $result; From f70e6edbb8be7e6b47a9104706644961aeb89310 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 10 Mar 2016 14:36:32 +0100 Subject: [PATCH 05/10] featured posts interaction --- assets/_src/less/ascribe/_blog.less | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/assets/_src/less/ascribe/_blog.less b/assets/_src/less/ascribe/_blog.less index 7ba8125..53dd074 100644 --- a/assets/_src/less/ascribe/_blog.less +++ b/assets/_src/less/ascribe/_blog.less @@ -120,6 +120,8 @@ @media (@screen-sm) { .grid__col { flex: 33%; } } + + .grid__col > a { display: block; } } .subtemplate--featured--more { @@ -128,9 +130,40 @@ } .featured { + position: relative; + transition: .2s ease-out; + a:hover &, + a:focus & { + transform: scale(1.01); + box-shadow: 0 4px 8px fade(#000, 20%); + } + + a:active & { + top: 1px; + transform: none; + transition: none; + box-shadow: none; + } } .featured__title { &:extend(.h4); + margin: 0; + font-size: @font-size-base; + color: #fff; + position: absolute; + left: 0; + bottom: 0; + background: fade(@blueDeep, 70%); + padding: (@spacer / 4); + transition: .2s ease-out; + + a:hover &, + a:focus & { color: @link-color; } +} + +.featured__image { + max-height: 175px; + display: block; } From d5bc500acaf5ba1c13fccf41867ad2b05cd9b23c Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 10 Mar 2016 15:05:06 +0100 Subject: [PATCH 06/10] fix avatars --- assets/_src/less/ascribe/_blog.less | 10 ++++++++++ content-blog.php | 9 +++++---- sidebar-blog.php | 20 -------------------- 3 files changed, 15 insertions(+), 24 deletions(-) delete mode 100644 sidebar-blog.php diff --git a/assets/_src/less/ascribe/_blog.less b/assets/_src/less/ascribe/_blog.less index 53dd074..7e7ba76 100644 --- a/assets/_src/less/ascribe/_blog.less +++ b/assets/_src/less/ascribe/_blog.less @@ -32,6 +32,16 @@ margin-bottom: 35px; font-weight: 500; font-size: 16px; + + .avatar { + width: 48px; + height: 48px; + border-radius: 50%; + vertical-align: middle; + display: inline-block; + margin-right: (@spacer / 4); + border: 1px solid #CFEEF3; + } } diff --git a/content-blog.php b/content-blog.php index 1419ba0..d089ca3 100644 --- a/content-blog.php +++ b/content-blog.php @@ -1,5 +1,5 @@ -
> +
ID ); ?>>
@@ -43,7 +44,7 @@ $url = get_the_permalink();
- + by on
diff --git a/sidebar-blog.php b/sidebar-blog.php deleted file mode 100644 index beb26e4..0000000 --- a/sidebar-blog.php +++ /dev/null @@ -1,20 +0,0 @@ -"; -} -?> - - From d1793240bbf884554d41737bf151e70b59522bd7 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 10 Mar 2016 15:18:34 +0100 Subject: [PATCH 07/10] blog element tweaks --- assets/_src/less/ascribe/_blog.less | 10 ++++++++++ content-blog.php | 6 +++++- template-blogheader.php | 8 +++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/assets/_src/less/ascribe/_blog.less b/assets/_src/less/ascribe/_blog.less index 7e7ba76..c41f0cb 100644 --- a/assets/_src/less/ascribe/_blog.less +++ b/assets/_src/less/ascribe/_blog.less @@ -45,6 +45,16 @@ } +// +// WP Media +// +.wp-caption-text { + &:extend(.small); + color: @greyHr; + font-style: italic; +} + + // // Categories list // diff --git a/content-blog.php b/content-blog.php index d089ca3..6c11ede 100644 --- a/content-blog.php +++ b/content-blog.php @@ -37,8 +37,12 @@ $avatar = get_avatar( get_the_author_meta('ID'), 96 ); if ( has_post_thumbnail() ) { // check if the post has a Post Thumbnail assigned to it. $thumb = wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'blog-crop'); - echo "{$title} image"; + if ( is_singular() ) { + echo "{$title} image"; + } else { + echo "{$title} image"; + } } ?> diff --git a/template-blogheader.php b/template-blogheader.php index 69063da..8ceb16b 100644 --- a/template-blogheader.php +++ b/template-blogheader.php @@ -27,7 +27,13 @@ require 'controller/init.php';
-

ascribe blog

+ + ID); + ?> + +

ascribe blog