Skip to content
This repository was archived by the owner on Oct 10, 2018. It is now read-only.

Site author #20

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Site author #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6392ecc
add support for default author in _config.yml
bwheeler96 May 20, 2014
f0e708b
adds support for author thumbnails
bwheeler96 May 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,53 @@ inc:
subtitle: "Modern Jekyll based blog for companies"
cover_image: blog-cover.jpg
logo: logo.png

# Company information
company: Incorporated
url: http://sendtoinc.com/
facebook: sendtoinc
twitter: sendtoinc
gplus: '101183822199340201470'
about_link: https://sendtoinc.com/about/

# Product Information
product_link: http://incorporated.sendtoinc.com/
tagline: "Get a modern blog for your company"

# Comments
disqus:
# Eg. "exampleblog" Set to false to disable comments
shortname: false

# Sharing settings
sharing:
twitter: false
facebook: false
gplus: false
hn: false
# Analytics


# Analytics
analytics:
google: false # Add tracking code in _includes/_google-analytics.html


# Google Fonts
# eg. 'Droid+Sans:400,700|Droid+Serif:400,700'
google_font: 'Droid+Sans:400,700'

# Setup your fonts, colors etc at _assets/stylesheets/main.scss

author:
name: Brian Wheeler
link: brianw.io
twitter: karrisaarinen
gplus: 100687498195339762535
bio: Co-founder, Design
image: ks.png

show_author_thumbnails: false

url: http://incorporated.sendtoinc.com
source: .
destination: ./_site
Expand Down Expand Up @@ -122,4 +132,4 @@ assets:
cachebust: none
cache: false
gzip: [ text/css, application/javascript ]
debug: false
debug: false
25 changes: 15 additions & 10 deletions _layouts/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
{% assign author = page.author %}
{% if page.author == %}
{% assign author = site.author %}
{% endif %}

<!DOCTYPE html>
<html>
<head>
Expand All @@ -11,25 +16,25 @@
<link href="{{ site_url }}/feed.xml" rel="alternate" type="application/rss+xml" title="{{ site.inc.title }}" />
<meta name="title" content="{% if page.title %}{{ page.title }} {% else %}{{ site.inc.title }}{% endif %}">
<link rel="canonical" href="{{ site.url }}{{ page.url }}">
{% if page.site.gplus %}<link rel="publisher" href="https://plus.google.com/{{ site.inc.gplus }}">{% endif %}
{% if page.author.gplus %}<link rel="author" href="https://plus.google.com/{{ page.author.gplus }}">{% endif %}
{% if page.site.gplus %}<link rel="publisher" href="https://plus.google.com/{{ site.inc.gplus }}">{% endif %}
{% if author.gplus %}<link rel="author" href="https://plus.google.com/{{ author.gplus }}">{% endif %}
<meta property="og:title" content="{% if page.title %}{{ page.title }} {% else %}{{ site.inc.title }}{% endif %}"/>
<meta property="og:url" content="{{ site.url }}{{ page.url }}"/>
{% if page.cover_image %}
<meta property="og:image" content="{{ site.url }}/images/{{ page.cover_image }}"/>
{% if page.main_image %}
<meta property="og:image" content="{{ site.url }}/images/{{ page.main_image }}"/>
<meta property="og:image" content="{{ site.url }}/images/{{ page.main_image }}"/>
{% endif %}
<meta property="og:image" content="{{ site.url }}/images/{{ site.inc.logo }}"/>
<meta property="og:image" content="{{ site.url }}/images/{{ site.inc.logo }}"/>
{% endif %}
{% if page.excerpt %}
<meta property="og:description" content="{{ page.excerpt }}"/>
<meta name="description" content="{{ page.excerpt }}"/>
{% endif %}
<meta property="og:site_name" content="{{ site.inc.title }}">
<meta property="og:site_name" content="{{ site.inc.title }}">
</head>
<body>

<section class="site-nav">
<header>
<nav id="navigation">
Expand All @@ -51,22 +56,22 @@

<footer class="site-footer">
<div class="container">
&copy; {{ site.time | date: "%Y" }}
&copy; {{ site.time | date: "%Y" }}

<nav>
<a href="{{ site.inc.url }}">{{ site.inc.company }}</a> &middot;
<a href="/">Blog</a> &middot;
{% if site.inc.product_link %}<a href="{{ site.inc.product_link }}">Product</a> &middot; {% endif %}
{% if site.inc.about_link %}<a href="{{ site.inc.about_link }}">About</a>{% endif %}
</nav>

<nav class="social">
{% if site.inc.twitter %}
<a href="https://twitter.com/{{ site.inc.twitter }}" title="Follow on Twitter" target="_blank"><i class="icon icon-twitter black"></i></a>
{% endif %}
{% if site.inc.facebook %}
<a href="http://facebook.com/{{ site.inc.facebook }}" title="Follow on Facebook" target="_blank"><i class="icon icon-facebook black"></i></a>
{% endif %}
{% endif %}
<a href="/feed.xml" title="RSS Feed">
<i class="icon icon-rss black"></i>
</a>
Expand Down
9 changes: 5 additions & 4 deletions _layouts/post.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
layout: base
---
{% if page.cover_image %}

<div class="article-cover">
<div>
<img src="/images/{{ page.cover_image }}" class="image">
Expand All @@ -13,7 +14,7 @@
<div class="container">
<header>
<div class="meta">
By <address><a rel="author" href="{{ page.author.link }}" title="{{ page.author.name }}" target="_blank">{{ page.author.name }}</a></address> &mdash;
By <address><a rel="author" href="{{ author.link }}" title="{{ author.name }}" target="_blank">{{ author.name }}</a></address> &mdash;
<time pubdate datetime="{{ page.date | date: "%Y-%d-%B" }}" title="{{ page.date | date: "%B %d, %Y" }}">{{ page.date | date: "%B %d, %Y" }}</time>
</div>
<h1 class="title">{{ page.title }}</h1>
Expand All @@ -27,9 +28,9 @@ <h1 class="title">{{ page.title }}</h1>

<footer>
<address>
{% if page.author.image %}<img src="/images/{{ page.author.image }}">{% endif %}
<p>Written by <strong><a rel="author" href="https://twitter.com/{{ page.author.twitter }}" title="{{ page.author_name }}" target="_blank">{{ page.author.name }}</a></strong><br>
<span class="muted">{{ page.author.bio }}</span>
{% if author.image %}<img src="/images/{{ author.image }}">{% endif %}
<p>Written by <strong><a rel="author" href="https://twitter.com/{{ author.twitter }}" title="{{ author.name }}" target="_blank">{{ author.name }}</a></strong><br>
<span class="muted">{{ author.bio }}</span>
</p>
</address>

Expand Down
30 changes: 15 additions & 15 deletions _posts/2013-10-08-incorporated.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ excerpt: "Incorporated provides a great typography, responsive design, author de
author:
name: Karri Saarinen
twitter: karrisaarinen
gplus: 100687498195339762535
gplus: 100687498195339762535
bio: Co-founder, Design
image: ks.png
---
Expand All @@ -34,10 +34,10 @@ excerpt: "Incorporated provides a great typography, responsive design, author de
author:
name: Karri Saarinen
twitter: karrisaarinen
gplus: 100687498195339762535
gplus: 100687498195339762535
bio: Co-founder, Design
image: ks.jpg

# Keep it as draft, not published in index.html or feed.xml
draft: false
{% endhighlight %}
Expand All @@ -56,7 +56,7 @@ $fontheadings: "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
/* Text colors */
$text: #21272d;
$textmuted: #848484;
$accent: #2077b2;
$accent: #2077b2;
{% endhighlight %}

config.yml:
Expand All @@ -66,37 +66,37 @@ inc:
title: "Jekyll Incorporated"
subtitle: "Modern Jekyll based blog for companies"
cover_image: blog-cover.jpg

# Company information
company: Incorporated
url: http://incorporated.sendtoinc.com/
facebook: sendtoinc
twitter: sendtoinc
about_link: https://sendtoinc.com/about/

# Product Information
product_link: http://incorporated.sendtoinc.com/
tagline: "Get a modern blog for your company"

# Comments
disqus:
# Eg. "exampleblog" Set to false to disable comments
shortname: false


# Sharing settings
sharing:
twitter: false
facebook: false
gplus: false
hn: false
# Analytics


# Analytics
analytics:
google:
google:
# eg. 'UA-123-12'
id: false
id: false
{% endhighlight %}

**Zoomable images**
Expand All @@ -105,4 +105,4 @@ inc:
**Awesome quotes**
> “Effective companies tend to communicate more, their people are curious and they have opinions”

Stay tuned for updates.
Stay tuned for updates.
14 changes: 10 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
layout: base
---
<div class="blog-cover" style="background-image:url(/images/{{ site.inc.cover_image }});">

<section>
<div class="container">
<h1>{{ site.inc.title }}</h1>
{% if site.inc.subtitle %}<h3>{{ site.inc.subtitle }}</h3>{% endif %}

{% if site.inc.twitter %}
<a href="https://twitter.com/{{ site.inc.twitter }}" title="Follow on Twitter" target="_blank"><i class="icon icon-twitter"></i></a>
{% endif %}
Expand All @@ -26,12 +26,18 @@ <h1>{{ site.inc.title }}</h1>
{% for post in paginator.posts %}
{% unless post.draft %}
<section class="index">
<!-- {% if post.author.image %}<img src="/images/{{ post.author.image }}" class="avatar">{% endif %}-->
{% if site.show_author_thumbnails %}
{% if post.author.image %}<img src="/images/{{ post.author.image }}" class="avatar">{% endif %}
{% endif %}
<div>
<h2 class="title"><a href="{{ post.url }}" rel="prefetch">{{ post.title }}</a></h2>
<p>{{ post.excerpt }}</p>
<div class="meta">
Written By <address>{{ post.author.name }}</address> &mdash;
{% assign author = post.author %}
{% if post.author == %}
{% assign author = site.author %}
{% endif %}
Written By <address>{{ author.name }}</address> &mdash;
<time pubdate datetime="{{ post.date | date: "%Y-%d-%B" }}" title="{{ post.date | date: "%B %d, %Y" }}">{{ post.date | date: "%B %d, %Y" }}</time>
</div>
</div>
Expand Down