From 00d849ce1f14c2f2794763878689356cb6bbde64 Mon Sep 17 00:00:00 2001
From: Mathieu Cornic <mathieu.cornic@gmail.com>
Date: Sun, 2 Oct 2016 18:22:32 +0200
Subject: [PATCH] Revert "Menu generation using Content file instead
 directories" (#10)

---
 layouts/partials/header.html | 34 ++++++++----------------------
 layouts/partials/menu.html   | 41 ------------------------------------
 2 files changed, 9 insertions(+), 66 deletions(-)

diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 82873bc4c7..533ad0f55d 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -48,32 +48,16 @@
                 {{ if and (not .Params.chapter) (.Params.toc) }}
                 <span id="toc-menu"><a href=""><i class="fa fa-list-alt"></i></a></span>
                 {{ end }}
-                 {{ if $page.Site.Params.createFromSiteMenusMain}}
-                    {{ $type := .Params.menu.main.parent }}
-                    {{ $relLink := .RelPermalink }}
-                    {{ range $name , $value := .Site.Menus.main }}
-
-                        {{ if eq $value.Identifier $type }} 
-                          {{ if ne $relLink $value.URL }}
-                               <a href="{{  $value.URL }}" itemprop="url"><span itemprop="title"> <b>{{  $value.Name }}</b></span></a> <i class="fa fa-angle-right"></i>
-                          {{ end }}
-                        {{ end }}
+                {{ $type := .Type }}
+                {{ $relLink := .RelPermalink }}
+                {{ range $name , $value := .Site.Sections }}
+                  {{ if eq $name $type }}
+                    {{ $first := (index $value 0).Page }}
+                    {{ if ne $first.RelPermalink $relLink }}
+                <a href="{{ $first.RelPermalink }}" itemprop="url"><span itemprop="title">{{ $first.Title }}</span></a> <i class="fa fa-angle-right"></i>
                     {{ end }}
-                 
-                 {{else}} <!-- use current method as default-->
-                
-                      {{ $type := .Type }}
-                      {{ $relLink := .RelPermalink }}
-                      {{ range $name , $value := .Site.Sections }}
-                        {{ if eq $name $type }}
-                          {{ $first := (index $value 0).Page }}
-                          {{ if ne $first.RelPermalink $relLink }}
-                      <a href="{{ $first.RelPermalink }}" itemprop="url"><span itemprop="title">{{ $first.Title }}</span></a> <i class="fa fa-angle-right"></i>
-                          {{ end }}
-                        {{ end }}
-                      {{ end }}
-                 {{end}}
-                
+                  {{ end }}
+                {{ end }}
                 {{ with .Title }}<span itemprop="title"> {{ . }}</span>{{ end }}
               </div>
               {{ if .Params.toc }}
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index b07494281c..c5d4fd78e2 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -16,42 +16,6 @@
   <div class="highlightable">
     <ul class="topics">
       {{ $page := . }}
-      
- {{ if $page.Site.Params.createFromSiteMenusMain}}
-    {{ range .Site.Menus.main }}
-        <li class="dd-item  {{ if eq $page.RelPermalink .URL }}active{{ end }} {{if in $page.RelPermalink .URL }}parent{{ end }}" data-nav-id="{{.URL}}">
-          <a href="{{.URL}}">
-            <span>{{ .Pre  }} {{ .Name }} {{ if $page.Site.Params.showVisitedLinks}}  <i class="fa fa-check read-icon"> {{ end }} </i> </span>
-          </a>
-          {{ if .HasChildren }}
-          <ul>
-            {{ range $lvl2 := .Children}}
-            <li class="dd-item {{ if eq $page.RelPermalink $lvl2.URL }}active{{ end }}" data-nav-id="{{$lvl2.URL}}">
-              <a href="{{$lvl2.URL}}">
-                <span> {{  $lvl2.Pre  }} {{ $lvl2.Name  }} {{ if $page.Site.Params.showVisitedLinks}} <i class="fa fa-check read-icon"></i> {{ end }} </span>
-              </a>
-
-              {{ if $lvl2.HasChildren }}
-              <!-- if children has children 3rd level -->
-              <ul>
-                {{ range $lvl3 := $lvl2.Children}}
-                <li class="dd-item {{ if eq $page.RelPermalink $lvl3.URL }}active{{ end }}" data-nav-id="{{$lvl3.URL}}">
-                  <a href="{{$lvl3.URL}}">
-                    <span>{{  $lvl3.Pre  }} {{ $lvl3.Name  }}    {{ if $page.Site.Params.showVisitedLinks}}  <i class="fa fa-check read-icon"></i> {{ end }} </span>
-                  </a>
-                </li>
-                {{ end }}
-              </ul>
-              {{ end }}
-            </li>
-            {{ end }}
-          </ul>
-          {{ end }}
-        </li>
-    {{ end }}
- {{else}}
-<!-- Use default method, create menu from folder structure -->
-    
       {{ range $key , $value := .Site.Sections }}
       {{ if ne $key "" }}
       {{ $first := (index $value 0).Page }}
@@ -84,11 +48,6 @@
       </li>
       {{ end }}
       {{ end }}
-      
-     {{ end }}
-      
-      
-      
     </ul>
     <hr>
      {{ if .Site.Params.showVisitedLinks}}