major updates across the theme to make it more user-centered

This commit is contained in:
Tom Johnson
2015-05-05 14:06:11 -07:00
parent a44149986a
commit 18e31994f2
67 changed files with 1048 additions and 683 deletions

View File

@@ -6,24 +6,12 @@
{% include head.html %}
{% if page.video == true %}
<link href="https://vjs.zencdn.net/4.12/video-js.css" rel="stylesheet">
<script src="https://vjs.zencdn.net/4.12/video.js"></script>
{%comment%}
<!--
if you want the video js and css local instead of cdn, use the following code instead of the cdn links above.
-->
<link href="{{ "/js/video-js/video-js.min.css" | prepend:site.baseurl }}" rel="stylesheet" type="text/css"></link>
<script src="{{ "/js/video-js/video.js" | prepend:site.baseurl }}"></script>
<script> videojs.options.flash.swf = "{{site.baseurl}}/js/video-js/video-js.swf";</script>
{%endcomment%}
{% endif %}
{% if page.datatable == true %}
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.5/css/jquery.dataTables.css">
<script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/1.10.5/js/jquery.dataTables.js"></script>
{% endif %}

View File

@@ -3,27 +3,20 @@
<html>
<head>
{% include head.html %}
{% comment %}
<script>
Prince.addScriptFunc("datestamp", function() {
return (new Date()).toString();
});
</script>
{% endcomment %}
<link rel="stylesheet" href="{{ "/css/customstyles.css" | prepend:site.baseurl }}" type='text/css'>
<link rel="stylesheet" href="{{ "/css/printstyles.css" | prepend:site.baseurl }}" type='text/css'>
{% if site.audience == "writer" %}
<link rel="stylesheet" href="{{ "/css/print-header-writer.css" | prepend:site.baseurl }}" type='text/css'>
{% else if site.audience == "designer" %}
<link rel="stylesheet" href="{{ "/css/print-header-designer.css" | prepend:site.baseurl }}" type='text/css'>
{% if site.audience == "fe" %}
<link rel="stylesheet" href="{{ "/css/print-header-fe.css" | prepend:site.baseurl }}" type='text/css'>
{% elsif site.audience == "customer" %}
<link rel="stylesheet" href="{{ "/css/print-header-customer.css" | prepend:site.baseurl }}" type='text/css'>
{% elsif site.audience == "sales" %}
<link rel="stylesheet" href="{{ "/css/print-header-sales.css" | prepend:site.baseurl }}" type='text/css'>
{% endif %}
{% if page.datatable == true %}
<link rel="stylesheet" type="text/css" href="//cdn.datatables.net/1.10.5/css/jquery.dataTables.css">
<script type="text/javascript" charset="utf8" src="//cdn.datatables.net/1.10.5/js/jquery.dataTables.js"></script>
{% endif %}
</head>
<body class="print">

View File

@@ -5,36 +5,49 @@ comments: true
<div class="post-header">
<h1 class="post-title-main">{{ page.title }}</h1>
{% unless page.type == "noTags" %}
<div class="pageTags">
{% for tag in page.tags %}
{% if site.data.tags.allowed-tags contains tag %}
<a href="{{ "/tag-" | prepend: site.baseurl | append: {{tag}}/index.html ">
<button type="button" class="btn btn-default navbar-btn">{{tag}}</button></a>
{% endif %}
{% endfor %}
</div>
{% if site.show_audience_label == true %}
{% if page.audience != null %}
<div class="audienceLabel">
<div class="prefaceAudienceLabel">Visibility</div>
{% if page.audience contains "writer" %}<span class="label label-info myLabel">Writer</span> {% endif %}
{% unless page.metadata == false %}
<p>
{% if page.audience contains "designer" %}<span class="label label-warning">Designer</span> {% endif %}
</div>
{% endif %}
{% endif %}
</div>
<div class="pageMetadata">
<div class="pageMetadataTitle">Table of Contents</div>
{% include toc.html %}
<hr/>
<div class="pageMetadataTitle">Page Information</div>
{% if page.tags != null %}
<span class="metadataRow">Tags: </span>
{% for tag in page.tags %}
{% if site.data.tags.allowed-tags contains tag %}
<a href="{{ "/tag-" | prepend: site.baseurl | append: {{tag}}/index.html ">{{tag}}</a>{% unless forloop.last %}, {% endunless%}
{% endif %}
{% endfor %}</p>
{% endif %}
{% if site.show_audience_label == true and page.audience != null %}
<p>
<span class="metadataRow">Audience: </span>
{% for audience in page.audience %}
{{audience}} {% unless forloop.last %}, {% endunless%}
{% endfor %}
</p>
{% endif %}
{% if page.last_updated != null %}
<p><span class="metadataRow">Last updated: </span>{{page.last_updated}}</p>
{% endif %}
</div> <!-- end pageMetadata -->
{% endunless %}
<div class="post-content">
{% include toc.html %}
{% if page.summary %}
<div class="summary">{{page.summary}}</div>
{% endif %}
{{ content }}
{% if site.disqus %}
{% include disqus.html %}
{% endif %}
</div>

View File

@@ -11,6 +11,9 @@ comments: true
<div class="post-content">
{% include toc.html %}
{% if page.summary %}
<div class="summary">{{page.summary}}</div>
{% endif %}
{{ content }}
</div>