From 2c364675eeb2fcd6f53190367d62a7527c7425e6 Mon Sep 17 00:00:00 2001
From: tomjohnson1492 <tomjohnson1492@gmail.com>
Date: Sun, 20 Mar 2016 01:07:29 -0700
Subject: [PATCH] fixing site errors

---
 _includes/head.html    |  2 +-
 _includes/sidebar.html |  9 ++---
 _includes/topnav.html  | 42 +++++++++--------------
 _layouts/default.html  | 76 ++++++++++++++++++------------------------
 4 files changed, 52 insertions(+), 77 deletions(-)

diff --git a/_includes/head.html b/_includes/head.html
index 4b08f68..08784b9 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -24,7 +24,7 @@
 <script src="{{ "/js/toc.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 -->
 <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 4ff4e91..4c35c81 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -36,15 +36,12 @@
             });
 
         </script>
+        {% include custom/sidebarconfigs.html %}
 
-
+        <span class="siteTagline">{{sidebar[0].product}}</span>
+        <span class="versionTagline">{{sidebar[0].version}}</span>
         <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 subcategory in entry.subcategories %}
                 {% if subcategory.output contains "web" %}
diff --git a/_includes/topnav.html b/_includes/topnav.html
index 6b98138..af1b8e5 100644
--- a/_includes/topnav.html
+++ b/_includes/topnav.html
@@ -1,5 +1,5 @@
 <!-- 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="navbar-header">
             <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>
             </button>
-
             <a class="fa fa-home fa-lg navbar-brand" href="{{site.baseurl}}/">&nbsp;<span class="projectTitle"> {{site.topnav_title}}</span></a>
-
         </div>
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
             <ul class="nav navbar-nav navbar-right">
                 <!-- entries without drop-downs appear here -->
-
                 {% for entry in site.data.topnav.topnav %}
                 {% for subcategory in entry.subcategories %}
                 {% if subcategory.external_url %}
@@ -27,14 +24,10 @@
                 {% endif %}
                 {% endfor %}
                 {% endfor %}
-
-
                 <!-- entries with drop-downs appear here -->
                 <!-- 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">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ subcategory.title }}<b class="caret"></b></a>
                     <ul class="dropdown-menu">
@@ -47,37 +40,34 @@
                         <li><a href="{{subitem.url | prepend: site.baseurl}}">{{subitem.title}}</a></li>
                         {% endif %}
                         {% endfor %}
-
                     </ul>
                 </li>
                 {% endfor %}
                 {% endfor %}
-
                 {% include feedback.html %}
-
                 <!--comment out this block if you want to hide search-->
                 <li>
-                     <!--start search-->
+                    <!--start search-->
                     <div id="search-demo-container">
                         <input type="text" id="search-input" placeholder="{{site.data.strings.search_placeholder_text}}">
                         <ul id="results-container"></ul>
                     </div>
                     <script src="{{ "/js/jekyll-search.js" | prepend: site.baseurl }}" type="text/javascript"></script>
                     <script type="text/javascript">
-                        SimpleJekyllSearch.init({
-                            searchInput: document.getElementById('search-input'),
-                            resultsContainer: document.getElementById('results-container'),
-                            dataSource: '{{ "/search.json" | prepend: site.baseurl }}',
-                            searchResultTemplate: '<li><a href="{url}" title="{{page.title | replace: "'", "\"}}">{title}</a></li>',
-                        noResultsText: '{{site.data.strings.search_no_results_text}}',
-                                limit: 10,
-                                fuzzy: true,
-                        })
+                            SimpleJekyllSearch.init({
+                                searchInput: document.getElementById('search-input'),
+                                resultsContainer: document.getElementById('results-container'),
+                                dataSource: '{{ "/search.json" | prepend: site.baseurl }}',
+                                searchResultTemplate: '<li><a href="{url}" title="{{page.title | replace: "'", "\"}}">{title}</a></li>',
+                    noResultsText: '{{site.data.strings.search_no_results_text}}',
+                            limit: 10,
+                            fuzzy: true,
+                    })
                     </script>
-                     <!--end search-->
+                    <!--end search-->
                 </li>
-
-
+            </ul>
+        </div>
         </div>
         <!-- /.container -->
 </nav>
\ No newline at end of file
diff --git a/_layouts/default.html b/_layouts/default.html
index d4de92e..90c8310 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,53 +1,41 @@
 <!DOCTYPE html>
-  <head>
-
- {% include head.html %}
-
-<script>
-  $(function () {
-      $('[data-toggle="tooltip"]').tooltip()
-  })
-</script>
-
-{% if page.datatable == "active" %}
-<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>
+<head>
+    {% include head.html %}
+    <script>
+        $(function () {
+            $('[data-toggle="tooltip"]').tooltip()
+        })
+    </script>
+    {% if page.datatable == "active" %}
+    <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">&nbsp;</div>
+    {% include sidebar.html %}
 
-   {% include topnav.html %}
-
-
-    <!-- Page Content -->
-    <div class="container">
-        <div class="col-lg-12">&nbsp;</div>
-
-
-{% include sidebar.html %}
-
-            <!-- Content Column -->
-            <div class="col-md-9">
-                {{content}}
-            </div><!-- /.row -->
-
-    </div>    <!-- /.container -->
-
+    <!-- Content Column -->
+    <div class="col-md-9">
+        {{content}}
+    </div>
+    <!-- /.row -->
+</div>
+<!-- /.container -->
 </body>
 {% if site.google_analytics %}
 {% include google_analytics.html %}
 {% endif %}
-
 </html>
-