Revert "cleanup and new navigation ideas"
This commit is contained in:
Tom Johnson
@ -1,73 +1,85 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
{% include head.html %}
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
// Initialize navgoco with default options
|
||||
$("#mysidebar").navgoco({
|
||||
caretHtml: '',
|
||||
accordion: true,
|
||||
openClass: 'active', // open
|
||||
save: false, // leave false or nav highlighting doesn't work right
|
||||
cookie: {
|
||||
name: 'navgoco',
|
||||
expires: false,
|
||||
path: '/'
|
||||
},
|
||||
slide: {
|
||||
duration: 400,
|
||||
easing: 'swing'
|
||||
}
|
||||
});
|
||||
<head>
|
||||
{% include head.html %}
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
// Initialize navgoco with default options
|
||||
$("#mysidebar").navgoco({
|
||||
caretHtml: '',
|
||||
accordion: true,
|
||||
openClass: 'active', // open
|
||||
save: false, // leave false or nav highlighting doesn't work right
|
||||
cookie: {
|
||||
name: 'navgoco',
|
||||
expires: false,
|
||||
path: '/'
|
||||
},
|
||||
slide: {
|
||||
duration: 400,
|
||||
easing: 'swing'
|
||||
}
|
||||
});
|
||||
|
||||
$("#collapseAll").click(function(e) {
|
||||
e.preventDefault();
|
||||
$("#mysidebar").navgoco('toggle', false);
|
||||
});
|
||||
$("#collapseAll").click(function(e) {
|
||||
e.preventDefault();
|
||||
$("#mysidebar").navgoco('toggle', false);
|
||||
});
|
||||
|
||||
$("#expandAll").click(function(e) {
|
||||
e.preventDefault();
|
||||
$("#mysidebar").navgoco('toggle', true);
|
||||
});
|
||||
});
|
||||
$("#expandAll").click(function(e) {
|
||||
e.preventDefault();
|
||||
$("#mysidebar").navgoco('toggle', true);
|
||||
});
|
||||
|
||||
$(function () {
|
||||
$('[data-toggle="tooltip"]').tooltip()
|
||||
})
|
||||
</script>
|
||||
{% if page.datatable %}
|
||||
<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>
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
$('table.datatable').DataTable( {
|
||||
paging: false,
|
||||
stateSave: true
|
||||
}
|
||||
);
|
||||
</script>
|
||||
{% endif %}
|
||||
</head>
|
||||
<body>
|
||||
{% include topnav.html %}
|
||||
<div class="container"> <!-- Page Content -->
|
||||
<div class="col-lg-12">
|
||||
|
||||
</div>
|
||||
<div class="row"> <!-- Content Row -->
|
||||
{% include sidebar.html collection=page.collection %}
|
||||
<div class="col-md-9"> <!-- Content Column -->
|
||||
{{ content }}
|
||||
</div> <!-- /.row -->
|
||||
</div> <!-- /.container -->
|
||||
</div>
|
||||
<script>
|
||||
jQuery(function ($) {
|
||||
$('.post-content').annotator()
|
||||
.annotator('setupPlugins', { tokenUrl: 'http://example.com/api/token' });
|
||||
});
|
||||
</script>
|
||||
{% include google_analytics.html %}
|
||||
</body>
|
||||
</html>
|
||||
});
|
||||
|
||||
</script>
|
||||
<script>
|
||||
$(function () {
|
||||
$('[data-toggle="tooltip"]').tooltip()
|
||||
})
|
||||
</script>
|
||||
{% 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>
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
|
||||
$('table.datatable').DataTable( {
|
||||
paging: false,
|
||||
stateSave: true
|
||||
}
|
||||
);
|
||||
</script>
|
||||
{% endif %}
|
||||
|
||||
</head>
|
||||
<body>
|
||||
{% include topnav.html %}
|
||||
<!-- Page Content -->
|
||||
<div class="container">
|
||||
<div class="col-lg-12"> </div>
|
||||
<!-- Content Row -->
|
||||
<div class="row">
|
||||
<!-- Sidebar Column -->
|
||||
<div class="col-md-3">
|
||||
|
||||
{% include sidebar.html %}
|
||||
<!-- Content Column -->
|
||||
<div class="col-md-9">
|
||||
{{content}}
|
||||
</div>
|
||||
<!-- /.row -->
|
||||
</div>
|
||||
<!-- /.container -->
|
||||
</div>
|
||||
<script>
|
||||
jQuery(function ($) {
|
||||
$('.post-content').annotator()
|
||||
.annotator('setupPlugins', {tokenUrl: 'http://example.com/api/token'})
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
{% if site.google_analytics %}
|
||||
{% include google_analytics.html %}
|
||||
{% endif %}
|
||||
</html>
|
||||
3
_layouts/none.html
Normal file
3
_layouts/none.html
Normal file
@ -0,0 +1,3 @@
|
||||
---
|
||||
---
|
||||
{{content}}
|
||||
@ -3,63 +3,61 @@ layout: default
|
||||
---
|
||||
|
||||
<div class="post-header">
|
||||
<h1 class="post-title-main">
|
||||
{% if page.homepage == true %}
|
||||
{{ site.homepage_title }}
|
||||
{% else %}
|
||||
{{ page.title }}
|
||||
{% endif %}
|
||||
</h1>
|
||||
<h1 class="post-title-main">{% if page.homepage == true %} {{site.homepage_title}} {% else %}{{ page.title }}{% endif %}</h1>
|
||||
</div>
|
||||
|
||||
{% if page.map == true %}
|
||||
<script>
|
||||
$(document).ready ( function(){
|
||||
$('.box{{page.box_number}}').addClass('active');
|
||||
$('.modalButton{{page.box_number}}').addClass('active');
|
||||
});
|
||||
</script>
|
||||
|
||||
{% include custom/{{page.map_name}}.html %}
|
||||
<script>
|
||||
$(document).ready ( function(){
|
||||
$('.box{{page.box_number}}').addClass('active');
|
||||
$('.modalButton{{page.box_number}}').addClass('active');
|
||||
});
|
||||
</script>
|
||||
|
||||
{% include custom/{{page.map_name}}.html %}
|
||||
|
||||
{% endif %}
|
||||
|
||||
<div class="post-content">
|
||||
|
||||
{% if page.summary %}
|
||||
<div class="summary">{{ page.summary }}</div>
|
||||
{% endif %}
|
||||
{% if page.summary %}
|
||||
<div class="summary">{{page.summary}}</div>
|
||||
{% endif %}
|
||||
|
||||
{% unless page.toc == false %}
|
||||
{% include toc.html %}
|
||||
{% endunless %}
|
||||
{% unless page.toc == false %}
|
||||
{% include toc.html %}
|
||||
{% endunless %}
|
||||
|
||||
{% unless jekyll.environment == "production" %}
|
||||
{% if site.github_editme_path %}
|
||||
<a target="_blank" href="https://github.com/{{ site.github_editme_path }}{% unless page.url contains "html" %}{{ page.url | replace: '.html', '.md' }}{% endunless %}{% if page.url contains "html" %}{{ page.url }}{% endif %}" class="btn btn-default githubEditButton" role="button"><i class="fa fa-github fa-lg"></i> Edit me</a>
|
||||
{% endif %}
|
||||
{% endunless %}
|
||||
{% unless jekyll.environment == "production" %}
|
||||
|
||||
{{ content }}
|
||||
{% if site.github_editme_path %}
|
||||
|
||||
<a target="_blank" href="https://github.com/{{site.github_editme_path}}{% unless page.url contains "html" %}{{page.url | replace: '.html', '.md'}}{% endunless %}{% if page.url contains "html" %}{{page.url }}{% endif %}" class="btn btn-default githubEditButton" role="button"><i class="fa fa-github fa-lg"></i> Edit me</a>
|
||||
{% endif %}
|
||||
|
||||
{% endunless %}
|
||||
|
||||
{{content}}
|
||||
|
||||
<div class="tags">
|
||||
{% if page.tags != null %}
|
||||
<strong>Tags: </strong>
|
||||
{% assign projectTags = site.data.tags.allowed-tags %}
|
||||
{% for tag in page.tags %}
|
||||
{% if projectTags contains tag %}
|
||||
<a href="{{ "/tag_" | prepend: site.baseurl | append: tag }}" class="btn btn-default navbar-btn cursorNorm" role="button">{{ page.tagName }}{{ tag }}</a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% if page.tags != null %}
|
||||
<b>Tags: </b>
|
||||
{% assign projectTags = site.data.tags.allowed-tags %}
|
||||
{% for tag in page.tags %}
|
||||
{% if projectTags contains tag %}
|
||||
<a href="{{ "/tag_" | prepend: site.baseurl | append: tag }}" class="btn btn-default navbar-btn cursorNorm" role="button">{{page.tagName}}{{tag}}</a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% if site.disqus %}
|
||||
{% include disqus.html %}
|
||||
{% endif %}
|
||||
{% if site.disqus %}
|
||||
{% include disqus.html %}
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
{{ site.data.alerts.hr_shaded }}
|
||||
{{site.data.alerts.hr_shaded}}
|
||||
|
||||
{% include footer.html %}
|
||||
|
||||
@ -3,34 +3,43 @@ layout: default
|
||||
---
|
||||
<article class="post" itemscope itemtype="http://schema.org/BlogPosting">
|
||||
|
||||
<header class="post-header">
|
||||
<h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
|
||||
<p class="post-meta">
|
||||
<time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %}<span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">/ {{ page.author }}</span></span>{% endif %}
|
||||
{% if page.tags != null %}/
|
||||
{% assign projectTags = site.data.tags.allowed-tags %}
|
||||
{% for tag in page.tags %}
|
||||
{% if projectTags contains tag %}
|
||||
<a href="{{ "/tag_" | prepend: site.baseurl | append: tag }}">{{ tag }}</a>
|
||||
{% unless forloop.last %}, {% endunless%}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</p>
|
||||
</header>
|
||||
<header class="post-header">
|
||||
<h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
|
||||
<p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time> {% if page.author %}<span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">/ {{ page.author }}</span></span>{% endif %}{% if page.tags != null %}/
|
||||
{% assign projectTags = site.data.tags.allowed-tags %}
|
||||
{% for tag in page.tags %}
|
||||
{% if projectTags contains tag %}
|
||||
<a href="{{ "/tag_" | prepend: site.baseurl | append: tag }}">{{tag}}</a>{% unless forloop.last %}, {% endunless%}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
</p>
|
||||
|
||||
|
||||
</header>
|
||||
|
||||
<div class="post-content" itemprop="articleBody">
|
||||
|
||||
{% if page.summary %}
|
||||
<div class="summary">{{page.summary}}</div>
|
||||
{% endif %}
|
||||
|
||||
{{ content }}
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="post-content" itemprop="articleBody">
|
||||
{% if page.summary %}
|
||||
<div class="summary">{{page.summary}}</div>
|
||||
{% endif %}
|
||||
{{ content }}
|
||||
</div>
|
||||
</article>
|
||||
|
||||
{% if site.disqus %}
|
||||
{% include disqus.html %}
|
||||
{% include disqus.html %}
|
||||
{% endif %}
|
||||
|
||||
{{ site.data.alerts.hr_shaded }}
|
||||
{{site.data.alerts.hr_shaded}}
|
||||
|
||||
{% include footer.html %}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user