Skip to content

Commit

Permalink
Saving state of work in progress.
Browse files Browse the repository at this point in the history
  • Loading branch information
Josh Mervine committed Aug 16, 2013
1 parent 456f0dd commit 0852804
Show file tree
Hide file tree
Showing 42 changed files with 287 additions and 1,239 deletions.
71 changes: 57 additions & 14 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,72 @@
keywords: site, wide, default, keywords

# path to bootstrap css template if not specified,
# uses full bootstrap-combined.min.css
#
# These free themes are provided by my firends at http://bootstrapcdn.com
#
#bootstrap_css: //netdna.bootstrapcdn.com/bootswatch/2.3.2/amelia/bootstrap.min.css
#bootstrap_css: //netdna.bootstrapcdn.com/bootswatch/2.3.2/cerulean/bootstrap.min.css
#bootstrap_css: //netdna.bootstrapcdn.com/bootswatch/2.3.2/cosmo/bootstrap.min.css
#bootstrap_css: //netdna.bootstrapcdn.com/bootswatch/2.3.2/cyborg/bootstrap.min.css
#bootstrap_css: //netdna.bootstrapcdn.com/bootswatch/2.3.2/flatly/bootstrap.min.css
#bootstrap_css: //netdna.bootstrapcdn.com/bootswatch/2.3.2/journal/bootstrap.min.css
#bootstrap_css: //netdna.bootstrapcdn.com/bootswatch/2.3.2/readable/bootstrap.min.css
#bootstrap_css: //netdna.bootstrapcdn.com/bootswatch/2.3.2/simplex/bootstrap.min.css
#bootstrap_css: //netdna.bootstrapcdn.com/bootswatch/2.3.2/slate/bootstrap.min.css
#bootstrap_css: //netdna.bootstrapcdn.com/bootswatch/2.3.2/spacelab/bootstrap.min.css
#bootstrap_css: //netdna.bootstrapcdn.com/bootswatch/2.3.2/spruce/bootstrap.min.css
#bootstrap_css: //netdna.bootstrapcdn.com/bootswatch/2.3.2/superhero/bootstrap.min.css
#bootstrap_css: //netdna.bootstrapcdn.com/bootswatch/2.3.2/united/bootstrap.min.css

# inverse bootstrap navbar
#bs_nav_inverse: true

# This section turns on javascript components,
# they're off by default to make things faster.
bootstrap_js: true
imagesloaded_js: true # gives images a loading icon
fancybox: true

sticky_footer: true

# don't use this without sticky_footer
#footer_color: 'black'

menu:
Home: /
Archives: /archives
Projects: /projects
About: /about

widgets:
widgets:
- search
- category
- tag
- twitter

excerpt_link: Read More
excerpt_link: read more

# not currently working
#twitter:
#username: mervinej
#show_replies: true
#tweet_count: 5

twitter:
username:
show_replies: false
tweet_count: 5
# or
twitter_id: mervinej

facebook_id: mervinej
linkedin_id: mervinej
github_id: jmervine

addthis:
enable: true
pubid:
facebook: true
pubid: ra-520c00d223718563
twitter: true
google: true
pinterest: true

fancybox: true
facebook: true

google_analytics:
rss:
rss:

disqus_shortname: rubyops

17 changes: 11 additions & 6 deletions layout/_partial/after_footer.ejs
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
<script src="<%- config.root %>js/jquery.imagesloaded.min.js"></script>
<script src="<%- config.root %>js/gallery.js"></script>

<script src="//code.jquery.com/jquery.js"></script>
<% if (theme.bootstrap_js) { %>
<script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
<% } %>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0-wip/js/bootstrap.min.js"></script>
<script src="<%- config.root %>js/respond.min.js"></script>
<%- partial('google_analytics') %>
<% if (theme.imagesloaded_js) { %>
<script src="//cdn.jsdelivr.net/imagesloaded/3.0.4/imagesloaded.pkgd.js"></script>
<% } %>
<% if (config.disqus_shortname){ %>
<script type="text/javascript">
var disqus_shortname = '<%= config.disqus_shortname %>';
(function(){
var dsq = document.createElement('script');
dsq.type = 'text/javascript';
Expand All @@ -14,7 +20,6 @@ var disqus_shortname = '<%= config.disqus_shortname %>';
}());
</script>
<% } %>

<% if (theme.fancybox){ %>
<link rel="stylesheet" href="<%- config.root %>fancybox/jquery.fancybox.css" media="screen" type="text/css">
<script src="<%- config.root %>fancybox/jquery.fancybox.pack.js"></script>
Expand All @@ -23,4 +28,4 @@ var disqus_shortname = '<%= config.disqus_shortname %>';
$('.fancybox').fancybox();
})(jQuery);
</script>
<% } %>
<% } %>
44 changes: 19 additions & 25 deletions layout/_partial/archive.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,28 @@ if (page.archive){
else title = __('archive_a');
}
%>
<h2 class="archive-title<% if (page.tag){ %> tag<% } else if (page.category){ %> category<% } %>"><%= title %></h2>

<div class="row-fluid">
<h1><%- title %></h1>
<% if (pagination == 2){ %>
<% page.posts.each(function(item){ %>
<%- partial('article', {item: item, index: true}) %>
<% }); %>
<%- partial('pagination') %>
<% } else { %>
<div class="archive">
<% page.each(function(item){ %>
<article class="<%= item.layout %>">
<div class="post-content">
<header>
<div class="icon"></div>
<time datetime="<%= item.date.toDate().toISOString() %>"><a href="<%- config.root %><%- item.path %>"><%= item.date.format(config.date_format) %></a></time>
<% if (item.link){ %>
<% if (item.title){ %>
<h1 class="title link"><a href="<%- item.link %>" target="_blank"><%= item.title %></a></h1>
<% } else { %>
<h1 class="title link"><a href="<%- item.link %>" target="_blank"><%= item.link %></a></h1>
<% } %>
<% } else { %>
<h1 class="title"><a href="<%- config.root %><%- item.path %>"><%= item.title %></a></h1>
<% } %>
</header>
</div>
</article>
<% }); %>
</div>
<% } %>
<p>
<% page.each(function(item){ %>
<div class="icon"></div>
<time datetime="<%= item.date.toDate().toISOString() %>"><a href="<%- config.root %><%- item.path %>"><%= item.date.format(config.date_format) %></a></time>
<% if (item.link){ %>
<% if (item.title){ %>
<h1 class="title link"><a href="<%- item.link %>" target="_blank"><%= item.title %></a></h1>
<% } else { %>
<h1 class="title link"><a href="<%- item.link %>" target="_blank"><%= item.link %></a></h1>
<% } %>
<% } else { %>
<h1 class="title"><a href="<%- config.root %><%- item.path %>"><%= item.title %></a></h1>
<% } %>
<% }); %>
</p>
<% } %>
</div>
71 changes: 32 additions & 39 deletions layout/_partial/article.ejs
Original file line number Diff line number Diff line change
@@ -1,42 +1,35 @@
<article class="<%= item.layout %>">
<% if (item.photos){ %>
<%- partial('post/gallery') %>
<% if (item.photos){ %>
<%- partial('post/gallery') %>
<% } %>
<% if (item.layout != 'page'){ %>
<div class="page-header">
<div class="icon"></div>
<time datetime="<%= item.date.toDate().toISOString() %>"><a href="<%- config.root %><%- item.path %>"><%= item.date.format(config.date_format) %></a></time>
<%- partial('post/title') %>
</div>
<% } %>
<p>
<% if (item.excerpt && index){ %>
<%- item.excerpt %>
<% } else { %>
<%- item.content %>
<% } %>
</p>
<% if (index){ %>
<div class="row-fluid">
<% if (item.excerpt){ %>
<div class="span3">
<a href="<%- config.root %><%- item.path %>#more" class="more-link"><%= theme.excerpt_link %></a>
</div>
<% } %>
<div class="post-content">
<header>
<% if (item.layout != 'page'){ %>
<div class="icon"></div>
<time datetime="<%= item.date.toDate().toISOString() %>"><a href="<%- config.root %><%- item.path %>"><%= item.date.format(config.date_format) %></a></time>
<% } %>
<%- partial('post/title') %>
</header>
<div class="entry">
<% if (item.excerpt && index){ %>
<%- item.excerpt %>
<% } else { %>
<%- item.content %>
<% } %>
<% if (item.comment && config.disqus_shortname){ %>
<div class="span3">
<a href="<%- item.permalink %>#disqus_thread" class="comment-link">Comments</a>
</div>
<footer>
<% if (index){ %>
<% if (item.excerpt){ %>
<div class="alignleft">
<a href="<%- config.root %><%- item.path %>#more" class="more-link"><%= theme.excerpt_link %></a>
</div>
<% } %>
<% if (item.comment && config.disqus_shortname){ %>
<div class="alignright">
<a href="<%- item.permalink %>#disqus_thread" class="comment-link">Comments</a>
</div>
<% } %>
<% } else { %>
<%- partial('post/category') %>
<%- partial('post/tag') %>
<%- partial('post/share') %>
<% } %>
<div class="clearfix"></div>
</footer>
<% } %>
</div>
</article>

<%- partial('comment') %>
<% } else { %>
<%- partial('post/category') %>
<%- partial('post/tag') %>
<% } %>
<%- partial('comment') %>
8 changes: 4 additions & 4 deletions layout/_partial/comment.ejs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<% if (config.disqus_shortname && page.comments){ %>
<section id="comment">
<h1 class="title"><%= __('comment') %></h1>
<div class="row-fluid">
<h2><%= __('comment') %></h1>
<div id="disqus_thread">
<noscript>Please enable JavaScript to view the <a href="//disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
</div>
</section>
<% } %>
</div>
<% } %>
17 changes: 10 additions & 7 deletions layout/_partial/footer.ejs
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<div class="alignleft">
<% if (config.author){ %>
&copy; <%= new Date().getFullYear() %> <%= config.author %>
<% } else { %>
&copy; <%= new Date().getFullYear() %> <%= config.title %>
<% } %>
<div id="footer">
<div class="container">
<p class="muted credit">
<% if (config.author){ %>
&copy; <%= new Date().getFullYear() %> <%= config.author %>
<% } else { %>
&copy; <%= new Date().getFullYear() %> <%= config.title %>
<% } %>
</p>
</div>
</div>
<div class="clearfix"></div>
2 changes: 1 addition & 1 deletion layout/_partial/google_analytics.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
<% } %>
<% } %>
35 changes: 28 additions & 7 deletions layout/_partial/head.ejs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE HTML>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
Expand All @@ -25,8 +25,12 @@
<% } else if (page.content){ %>
<meta name="description" content="<%= strip_html(page.content).replace(/^\s*/, '').replace(/\s*$/, '').substring(0, 150) %>">
<% } %>
<% if (page.keywords){ %><meta name="keywords" content="<%= page.keywords %>"><% } %>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<% if (page.keywords){ %>
<meta name="keywords" content="<%= page.keywords %>">
<% } else if (config.keywords) { %>
<meta name="keywords" content="<%= page.config %>">
<% } %>
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<% if (page.title){ %><meta property="og:title" content="<%= page.title %>"/><% } %>
<meta property="og:site_name" content="<%= config.title %>"/>
Expand All @@ -38,9 +42,26 @@
<% } %>

<link href="<%- config.root %>favicon.png" rel="icon">

<link rel="alternate" href="<% if (theme.rss){ %><%- theme.rss %><% } else { %><%- config.root %>atom.xml<% } %>" title="<%= config.title %>" type="application/atom+xml">
<link rel="stylesheet" href="<%- config.root %>css/style.css" media="screen" type="text/css">
<!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8/jquery.min.js"></script>
<%- partial('google_analytics') %>

<style>
#wrap > .container {
/* should equal navbar height */
padding-top: 50px;
}
<% if (theme.footer_color){ %>
#footer {
background-color: <%-theme.footer_color%>;
}
<% } %>
</style>
<% if (theme.bootstrap_css) { %>
<link rel="stylesheet" href="<%-theme.bootstrap_css%>">
<% } else { %>
<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
<% } %>
<% if (theme.sticky_footer) { %>
<link rel="stylesheet" href="<%-config.root%>css/sticky_footer.css">
<% } %>
</head>
46 changes: 34 additions & 12 deletions layout/_partial/header.ejs
Original file line number Diff line number Diff line change
@@ -1,13 +1,35 @@
<div class="alignleft">
<h1><a href="<%- config.root %>"><%= config.title %></a></h1>
<h2><a href="<%- config.root %>"><% if (config.subtitle){ %><%= config.subtitle %><% } %></a></h2>
<div class="navbar <% if (theme.bs_nav_inverse) { %>navbar-inverse <%}%>navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="brand" href="<%- config.root %>"><%- config.title %></a>
<div class="nav-collapse collapse navbar-responsive-collapse">
<ul class="nav">
<% for (var i in theme.menu){ %>
<li><a href="<%- theme.menu[i] %>"><%- i %></a></li>
<% } %>
</ul>
<ul class="nav pull-right">
<% if (theme.twitter && theme.twitter.username) { %>
<li><a href="https://twitter.com/<%- theme.twitter.username %>">twitter</a></li>
<% } else if (theme.twitter_id) { %>
<li><a href="https://twitter.com/<%- theme.twitter_id %>">twitter</a></li>
<% } %>
<% if (theme.facebook_id) { %>
<li><a href="https://www.facebook.com/<%- theme.facebook_id %>">facebook</a></li>
<% } %>
<% if (theme.linked_id) { %>
<li><a href="http://www.linkedin.com/in/<%- theme.linkedin_id %>">linkedin</a></li>
<% } %>
<% if (theme.github_id) { %>
<li><a href="https://github.com/jmervine<%- theme.twitter_id %>">github</a></li>
<% } %>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>
</div>
<nav id="main-nav" class="alignright">
<ul>
<% for (var i in theme.menu){ %>
<li><a href="<%- theme.menu[i] %>"><%= i %></a></li>
<% } %>
</ul>
<div class="clearfix"></div>
</nav>
<div class="clearfix"></div>
Loading

0 comments on commit 0852804

Please sign in to comment.