modified navigation

4 files changed, 163 insertions, 143 deletions

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 12cacb7..2853908 100755
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -42,83 +42,6 @@ link = "plugins/filterizr/jquery.filterizr.min.js"
 link = "plugins/google-map/gmap.js"
 
 
-############################## navigation ###############################
-
-# main menu
-[[menu.main]]
-name = "About"
-URL = "about"
-weight = 1
-
-[[menu.main]]
-name = "course"
-URL = "course"
-weight = 2
-
-[[menu.main]]
-weight = 3
-name = "Pages"
-hasChildren = true
-
-  [[menu.main]]
-  parent = "Pages"
-  name = "teacher"
-  URL = "teacher"
-
-  [[menu.main]]
-  parent = "Pages"
-  name = "notice"
-  URL = "notice"
-
-  [[menu.main]]
-  parent = "Pages"
-  name = "event"
-  URL = "event"
-
-  [[menu.main]]
-  parent = "Pages"
-  name = "scholarship"
-  URL = "scholarship"
-
-  [[menu.main]]
-  parent = "Pages"
-  name = "research"
-  URL = "research"
-  
-[[menu.main]]
-name = "blog"
-URL = "blog"
-weight = 4
-  
-[[menu.main]]
-name = "Contact"
-URL = "contact"
-weight = 5
-
-
-# footer menu
-
-[[menu.footer]]
-name = "teacher"
-URL = "teacher"
-
-[[menu.footer]]
-name = "notice"
-URL = "notice"
-
-[[menu.footer]]
-name = "event"
-URL = "event"
-
-[[menu.footer]]
-name = "scholarship"
-URL = "scholarship"
-
-[[menu.footer]]
-name = "research"
-URL = "research"
-
-
 #################### default parameters ################################
 [params]
 logo = "images/logo.png"
@@ -199,6 +122,85 @@ home = "Home"
 copyright = "Copyright © 2020 a hugo theme by [themefisher](https://themefisher.com)"
 
 
+
+################### English navigation ####################
+
+# main menu
+[[Languages.en.menu.main]]
+name = "About"
+url = "about"
+weight = 1
+
+[[Languages.en.menu.main]]
+name = "course"
+url = "course"
+weight = 2
+
+[[Languages.en.menu.main]]
+weight = 3
+name = "Pages"
+hasChildren = true
+
+  [[Languages.en.menu.main]]
+  parent = "Pages"
+  name = "teacher"
+  url = "teacher"
+
+  [[Languages.en.menu.main]]
+  parent = "Pages"
+  name = "notice"
+  url = "notice"
+
+  [[Languages.en.menu.main]]
+  parent = "Pages"
+  name = "event"
+  url = "event"
+
+  [[Languages.en.menu.main]]
+  parent = "Pages"
+  name = "scholarship"
+  url = "scholarship"
+
+  [[Languages.en.menu.main]]
+  parent = "Pages"
+  name = "research"
+  url = "research"
+  
+[[Languages.en.menu.main]]
+name = "blog"
+url = "blog"
+weight = 4
+  
+[[Languages.en.menu.main]]
+name = "Contact"
+url = "contact"
+weight = 5
+
+
+# footer menu
+
+[[Languages.en.menu.footer]]
+name = "teacher"
+url = "teacher"
+
+[[Languages.en.menu.footer]]
+name = "notice"
+url = "notice"
+
+[[Languages.en.menu.footer]]
+name = "event"
+url = "event"
+
+[[Languages.en.menu.footer]]
+name = "scholarship"
+url = "scholarship"
+
+[[Languages.en.menu.footer]]
+name = "research"
+url = "research"
+
+
+
 ################################### French language #####################################
 [Languages.fr]
 languageName = "Fr"
@@ -207,4 +209,82 @@ contentDir = "content/french"
 weight = 2
 home = "Accueil"
 # copyright
-copyright = "Copyright © 2020 a hugo theme by [themefisher](https://themefisher.com)"
\ No newline at end of file
+copyright = "Copyright © 2020 a hugo theme by [themefisher](https://themefisher.com)"
+
+
+
+################### French navigation ####################
+
+# main menu
+[[Languages.fr.menu.main]]
+name = "À propos"
+url = "about"
+weight = 1
+
+[[Languages.fr.menu.main]]
+name = "Cours"
+url = "course"
+weight = 2
+
+[[Languages.fr.menu.main]]
+weight = 3
+name = "Pages"
+hasChildren = true
+
+  [[Languages.fr.menu.main]]
+  parent = "Pages"
+  name = "teacher"
+  url = "teacher"
+
+  [[Languages.fr.menu.main]]
+  parent = "Pages"
+  name = "notice"
+  url = "notice"
+
+  [[Languages.fr.menu.main]]
+  parent = "Pages"
+  name = "Évènement"
+  url = "event"
+
+  [[Languages.fr.menu.main]]
+  parent = "Pages"
+  name = "Cursus"
+  url = "scholarship"
+
+  [[Languages.fr.menu.main]]
+  parent = "Pages"
+  name = "research"
+  url = "research"
+  
+[[Languages.fr.menu.main]]
+name = "blog"
+url = "blog"
+weight = 4
+  
+[[Languages.fr.menu.main]]
+name = "Contact"
+url = "contact"
+weight = 5
+
+
+# footer menu
+
+[[Languages.fr.menu.footer]]
+name = "teacher"
+url = "teacher"
+
+[[Languages.fr.menu.footer]]
+name = "notice"
+url = "notice"
+
+[[Languages.fr.menu.footer]]
+name = "event"
+url = "event"
+
+[[Languages.fr.menu.footer]]
+name = "scholarship"
+url = "scholarship"
+
+[[Languages.fr.menu.footer]]
+name = "research"
+url = "research"
diff --git a/exampleSite/i18n/en.yaml b/exampleSite/i18n/en.yaml
index c95af6a..bf7cc82 100644
--- a/exampleSite/i18n/en.yaml
+++ b/exampleSite/i18n/en.yaml
@@ -107,34 +107,4 @@
   translation: Our Teachers
 
 - id: download
-  translation: Download
-
-- id: About
-  translation: About
-
-- id: course
-  translation: course
-
-- id: Pages
-  translation: Pages
-
-#- id: teacher
-#  translation: teacher
-
-- id: notice
-  translation: notice
-
-- id: event
-  translation: event
-
-- id: scholarship
-  translation: scholarship
-
-- id: research
-  translation: research
-
-- id: blog
-  translation: blog
-
-- id: contact
-  translation: contact
+  translation: Download
\ No newline at end of file
diff --git a/exampleSite/i18n/fr.yaml b/exampleSite/i18n/fr.yaml
index b412b42..5715deb 100644
--- a/exampleSite/i18n/fr.yaml
+++ b/exampleSite/i18n/fr.yaml
@@ -107,34 +107,4 @@
   translation: Nos enseignants
 
 - id: download
-  translation: Télécharger
-
-- id: About
-  translation: À propos
-
-- id: course
-  translation: Cours
-
-- id: Pages
-  translation: Pages
-
-#- id: teacher
-#  translation: Enseignant·e
-
-- id: notice
-  translation: notice
-
-- id: event
-  translation: Évènement
-
-- id: scholarship
-  translation: Cursus
-
-- id: research
-  translation: Recherches
-
-- id: blog
-  translation: Blog
-
-- id: contact
-  translation: Contact
+  translation: Télécharger
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 0901771..72bd52f 100755
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -44,17 +44,17 @@
             {{ if .HasChildren }}

             <li class="nav-item dropdown">

               <a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown">

-                {{ i18n .Name }}

+                {{ .Name }}

               </a>

               <div class="dropdown-menu">

                 {{ range .Children }}

-                <a class="dropdown-item" href="{{ .URL | absLangURL }}">{{ i18n .Name }}</a>

+                <a class="dropdown-item" href="{{ .URL | absLangURL }}">{{ .Name }}</a>

                 {{ end }}

               </div>

             </li>

             {{ else }}

             <li class="nav-item">

-              <a class="nav-link" href="{{ .URL | absLangURL }}">{{ i18n .Name }}</a>

+              <a class="nav-link" href="{{ .URL | absLangURL }}">{{ .Name }}</a>

             </li>

             {{ end }}

             {{ end }}