fixing site errors

This commit is contained in:
tomjohnson1492
2016-03-20 01:07:29 -07:00
parent 46e3acad63
commit 2c364675ee
4 changed files with 52 additions and 77 deletions

View File

@ -24,7 +24,7 @@
<script src="{{ "/js/toc.js" | prepend: site.baseurl }}"></script> <script src="{{ "/js/toc.js" | prepend: site.baseurl }}"></script>
<script src="{{ "/js/customscripts.js" | prepend: site.baseurl }}"></script> <script src="{{ "/js/customscripts.js" | prepend: site.baseurl }}"></script>
<link rrel="shortcut icon" href="{{ "/images/favicon.ico" | prepend: site.baseurl }}"> <link rel="shortcut icon" href="{{ "/images/favicon.ico" | prepend: site.baseurl }}">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->

View File

@ -36,15 +36,12 @@
}); });
</script> </script>
{% include custom/sidebarconfigs.html %}
<span class="siteTagline">{{sidebar[0].product}}</span>
<span class="versionTagline">{{sidebar[0].version}}</span>
<ul id="mysidebar" class="nav"> <ul id="mysidebar" class="nav">
{% include custom/sidebarconfigs.html %}
<span class="siteTagline">{{sidebar[0].product}}</span>
<span class="versionTagline">{{sidebar[0].version}}</span>
{% for entry in sidebar %} {% for entry in sidebar %}
{% for subcategory in entry.subcategories %} {% for subcategory in entry.subcategories %}
{% if subcategory.output contains "web" %} {% if subcategory.output contains "web" %}

View File

@ -1,5 +1,5 @@
<!-- Navigation --> <!-- Navigation -->
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container topnavlinks"> <div class="container topnavlinks">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
@ -8,14 +8,11 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="fa fa-home fa-lg navbar-brand" href="{{site.baseurl}}/">&nbsp;<span class="projectTitle"> {{site.topnav_title}}</span></a> <a class="fa fa-home fa-lg navbar-brand" href="{{site.baseurl}}/">&nbsp;<span class="projectTitle"> {{site.topnav_title}}</span></a>
</div> </div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<!-- entries without drop-downs appear here --> <!-- entries without drop-downs appear here -->
{% for entry in site.data.topnav.topnav %} {% for entry in site.data.topnav.topnav %}
{% for subcategory in entry.subcategories %} {% for subcategory in entry.subcategories %}
{% if subcategory.external_url %} {% if subcategory.external_url %}
@ -27,14 +24,10 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
<!-- entries with drop-downs appear here --> <!-- entries with drop-downs appear here -->
<!-- conditional logic to control which topnav appears for the audience defined in the configuration file.--> <!-- conditional logic to control which topnav appears for the audience defined in the configuration file.-->
{% for entry in site.data.topnav.topnav_dropdowns %}
{% for subcategory in entry.subcategories %}
{% for entry in site.data.topnav.topnav_dropdowns %}
{% for subcategory in entry.subcategories %}
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ subcategory.title }}<b class="caret"></b></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ subcategory.title }}<b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
@ -47,37 +40,34 @@
<li><a href="{{subitem.url | prepend: site.baseurl}}">{{subitem.title}}</a></li> <li><a href="{{subitem.url | prepend: site.baseurl}}">{{subitem.title}}</a></li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
</li> </li>
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% include feedback.html %} {% include feedback.html %}
<!--comment out this block if you want to hide search--> <!--comment out this block if you want to hide search-->
<li> <li>
<!--start search--> <!--start search-->
<div id="search-demo-container"> <div id="search-demo-container">
<input type="text" id="search-input" placeholder="{{site.data.strings.search_placeholder_text}}"> <input type="text" id="search-input" placeholder="{{site.data.strings.search_placeholder_text}}">
<ul id="results-container"></ul> <ul id="results-container"></ul>
</div> </div>
<script src="{{ "/js/jekyll-search.js" | prepend: site.baseurl }}" type="text/javascript"></script> <script src="{{ "/js/jekyll-search.js" | prepend: site.baseurl }}" type="text/javascript"></script>
<script type="text/javascript"> <script type="text/javascript">
SimpleJekyllSearch.init({ SimpleJekyllSearch.init({
searchInput: document.getElementById('search-input'), searchInput: document.getElementById('search-input'),
resultsContainer: document.getElementById('results-container'), resultsContainer: document.getElementById('results-container'),
dataSource: '{{ "/search.json" | prepend: site.baseurl }}', dataSource: '{{ "/search.json" | prepend: site.baseurl }}',
searchResultTemplate: '<li><a href="{url}" title="{{page.title | replace: "'", "\"}}">{title}</a></li>', searchResultTemplate: '<li><a href="{url}" title="{{page.title | replace: "'", "\"}}">{title}</a></li>',
noResultsText: '{{site.data.strings.search_no_results_text}}', noResultsText: '{{site.data.strings.search_no_results_text}}',
limit: 10, limit: 10,
fuzzy: true, fuzzy: true,
}) })
</script> </script>
<!--end search--> <!--end search-->
</li> </li>
</ul>
</div>
</div> </div>
<!-- /.container --> <!-- /.container -->
</nav> </nav>

View File

@ -1,53 +1,41 @@
<!DOCTYPE html> <!DOCTYPE html>
<head> <head>
{% include head.html %}
{% include head.html %} <script>
$(function () {
<script> $('[data-toggle="tooltip"]').tooltip()
$(function () { })
$('[data-toggle="tooltip"]').tooltip() </script>
}) {% if page.datatable == "active" %}
</script> <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>
{% if page.datatable == "active" %} <script>
<link rel="stylesheet" type="text/css" href="//cdn.datatables.net/1.10.5/css/jquery.dataTables.css"> $(document).ready(function(){
<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>
$('table.datatable').DataTable( {
paging: false,
stateSave: true
}
);
</script>
{% endif %}
</head>
<body> <body>
{% include topnav.html %}
<!-- Page Content -->
<div class="container">
<div class="col-lg-12">&nbsp;</div>
{% include sidebar.html %}
{% include topnav.html %} <!-- Content Column -->
<div class="col-md-9">
{{content}}
<!-- Page Content --> </div>
<div class="container"> <!-- /.row -->
<div class="col-lg-12">&nbsp;</div> </div>
<!-- /.container -->
{% include sidebar.html %}
<!-- Content Column -->
<div class="col-md-9">
{{content}}
</div><!-- /.row -->
</div> <!-- /.container -->
</body> </body>
{% if site.google_analytics %} {% if site.google_analytics %}
{% include google_analytics.html %} {% include google_analytics.html %}
{% endif %} {% endif %}
</html> </html>