further updates to menu nav

_data/menu-variants.yml

@@ -2,8 +2,10 @@ main:
   - conference: 
     en: 
       name: 2020
+      url: "/rf2020/"
     fr: 
       name: 2020
+      url: "fr/rf2020/"
     items:
       - program: 
         en: 
@@ -19,20 +21,13 @@ main:
         fr: 
           name: intervenant·e·x
           url: /rf2020/participants
-      - participants: 
+      - credits: 
         en: 
-          name: gallery
+          name: credits
-          url: "/rf2020/gallery"
+          url: "/rf2020/credits"
         fr: 
-          name: gallery
+          name: intervenant·e·x
-          url: /rf2020/gallery
+          url: /rf2020/credits
-      - participants: 
-        en: 
-          name: watch
-          url: "/rf2020/watch"
-        fr: 
-          name: watch
-          url: /rf2020/watch
   - about: 
     en: 
       name: about

_includes/common/navigation.html

@@ -16,7 +16,7 @@
     {% for item in menu %}
       {% if item.items %}
         <div class="nav-group nofocus" tabindex="0">
-            <a class="nav-link colour-{{ item.colour | default: 'black' }} {{ item.case }}">{{ item[page.lang].name }}</a>
+            <a href="{{ site.baseurl | append: item[page.lang].url }}" class="nav-link colour-{{ item.colour | default: 'black' }} {{ item.case }}">{{ item[page.lang].name }}</a>
           {% for sublink in item.items %}
             {% if page.lang == 'en' %}
               <a class="sub-nav-link colour-{{ sublink.colour | default: 'black' }} {{ sublink.case }}" href="{{ site.baseurl | append: sublink[page.lang].url }}">{{ sublink[page.lang].name }}</a>