Merge pull request #35 from ercchy/gh-pages

Some cleanup

_includes/navigation.html

@@ -28,9 +28,6 @@
 						<a href="{{ site.baseurl }}{{ first_post.url }}"
 						   class="dropdown-item">
 							{{ module }}
-							{% comment %}
-							<span>{{ forloop.index }}</span>
-							{% endcomment %}
 						</a>
 					</li>
 				{% endfor %}

_includes/next_module.html

@@ -2,16 +2,16 @@
 {% assign prev=null %}
 {% assign temp=null %}
 
-{% for mod in site.data.course.modules %}
-	{% if mod == module and forloop.first != true %}
-		{% assign prev=temp %}
-		{% assign prev_post=site.categories[prev]|reverse|first %}
+{% for m in site.data.course.modules %}
+	{% if m == module and forloop.first != true %}
+		{% assign p = forloop.index0 | minus:1  %}
+		{% assign prev = site.data.course.modules[p] %}
+		{% assign prev_post = site.categories[prev]|reverse|first %}
 	{% endif %}
-	{% if mod == module and forloop.last != true %}
-		{% assign n=forloop.index0 | plus:1  %}
-		{% assign next=site.data.course.modules[n] %}
-		{% assign next_post=site.categories[next]|reverse|first %}
+	{% if m == module and forloop.last != true %}
+		{% assign n = forloop.index0 | plus:1  %}
+		{% assign next = site.data.course.modules[n] %}
+		{% assign next_post = site.categories[next]|reverse|first %}
 	{% endif %}
-	{% assign temp=mod %}
 {% endfor %}
 

_includes/side_toolbar.html

@@ -1,6 +1,4 @@
 <div class="sidebar col-md-3">
-	{% assign url_items = page.url | split:"/" %}
-	{% assign module = url_items[1] %}
 	{% include next_module.html %}
 
 	{% if prev %}

_layouts/course_page.html

@@ -1,6 +1,7 @@
 ---
 layout: base
 ---
+{% assign module=page.categories[0] %}
 <div class="clearfix">
 	{% include side_toolbar.html %}
 	<div class="col-md-9 background-white">
@@ -8,9 +9,7 @@ layout: base
 			<div class="row">
 				<div class="content col-lg-12">
 					{{ content }}
-					{% assign module=page.categories[0] %}
 					{% include next_in_module.html %}
-
 					{% if prev or next %}
 						<hr />
 					{% endif %}

_sass/_nav.scss

@@ -1,61 +1,3 @@
 .navbar.navbar-default {
 	margin-bottom: 0;
-}
-/*
-.navbar-nav .dropdown {
-	position: relative !important;
-}
-
-$bottom-positioning: -25px;
-
-.navbar-nav .dropdown a:before {
-	font-family: FontAwesome;
-	color: $gray;
-	position: absolute;
-	bottom: $bottom-positioning;
-	font-size: 1.5em;
-	line-height: 0;
-	left: 50%;
-	margin-left: -11px;
-	z-index: 1;
-}
-
-.navbar-nav .dropdown.active a:before {
-	color: $white;
-}
-
-.navbar-nav .dropdown a:after {
-	content: "";
-	position: absolute;
-	bottom: $bottom-positioning;
-	border-bottom: 1px solid $gray;
-	width: 100%;
-	left: 0;
-}
-
-.navbar-nav .dropdown.first a:after {
-	width: 50%;
-	left: 50%;
-}
-
-.navbar-nav .dropdown.last a:after {
-	width: 50%;
-	left: 0;
-}
-
-.navbar-nav .dropdown span {
-	position: absolute;
-	line-height: 0;
-	bottom: $bottom-positioning;
-	left: 50%;
-	margin-left: -4px;
-	color: $white;
-	font-size: 0.8em;
-	font-weight: bold;
-	z-index: 2;
-}
-
-.navbar-nav .dropdown.active span {
-	color: $brand-primary;
-}
-*/
+}