Merge branch 'master' of gl.kwarc.info:static/www.kwarc.info

README.md

@@ -119,6 +119,8 @@ Furthermore, if these are mixed between folders and static items, the folders wi
 A submenu is automatically expanded if any of the submenu items inside it are clicked. 
 Alternatively, if the menu item contains an `active` key, it is checked as well. 
 
+Furthermore, a menu may have the `url` key. If it is given, upon clicking the menu item, the given (internal) url is opened instead of opening the menu. 
+
 ### Working locally
 
 If you want to do more than the occasional editing, you'll soon realise GitHub's editor and preview are too limited. 

_config.yml

@@ -82,41 +82,37 @@ menu:
       
     - title: 'People'
       active: '/people/'
+      url: '/people/'
       items:
-        - title: 'Current Members'
-          url: '/people/'
         - title: 'Former Members'
           url: '/people/former/'
-        - title: 'Bibliography'
-          external: true
-          url: 'https://kwarc.github.io/bibs/'
     
     - title: 'Research'
+      url: '/research/'
       folder: 'research'
+      items:
+        - title: 'Bibliography'
+          external: true
+          url: 'https://kwarc.github.io/bibs/'
     
     - title: 'Systems'
       active: '/systems/'
+      url: '/systems/'
       items:
-          - title: 'Current Systems'
-            url: '/systems/'
           - title: 'Historic Systems'
             url: '/systems/historic/'
     
     - title: 'Projects'
       active: '/projects/'
+      url: '/projects/'
       items:
-          - title: 'Current Projects'
-            url: '/projects/'
           - title: 'Completed Projects'
             url: '/projects/completed/'
     
     - title: '4Students: Courses & Theses'
+      url: '/courses/overview/'
       active: '/courses/'
       items:
-          - title: 'Overview'
-            url: '/courses/overview/'
-          - title: 'Current Courses'
-            url: '/courses/'
           - title: 'Former Courses'
             url: '/courses/former/'	
           - title: 'Upcoming Courses'
@@ -125,10 +121,12 @@ menu:
             url: '/courses/theses/'
 
     - title: 'Events'
-      folder: 'events'
+      url: '/events/'
+      active: '/events/'
     
     - title: 'Hiring'
-      folder: 'hiring'
+      url: '/hiring/'
+      active: '/hiring/'
       
     - title: 'Contact'
       url: '/contact/'

_includes/menu_sub.html

@@ -43,7 +43,7 @@
     <li class="no-padding">
         <ul class="collapsible collapsible-accordion">
             <li class="bold">
-                <a class="collapsible-header {% if menu_active %}active{% endif %}">
+                <a class="collapsible-header {% if menu_active %}active{% endif %}" {% if item.url %}href="{{item.url}}"{%endif %}>
                     {% if item.menu_title %}
                         {{ item.menu_title }}
                     {% else %}
@@ -57,9 +57,11 @@
                             {% for item in sorted_pages %}
                             
                                 {% assign sub_components = item.url | split: '/' %}
-                                {% if sub_components[1] == item_folder %}
-                                    {% include menu_single.html %}
-                                {% endif %}
+                                {% unless item.hidden %}
+                                    {% if sub_components[1] == item_folder %}
+                                        {% include menu_single.html %}
+                                    {% endif %}
+                                {% endunless %}
                             {% endfor %}
                         {% endif %}
 

research/index.md

@@ -2,7 +2,7 @@
 layout: page
 title: KWARC Research
 menu_title: Overview
-menu_order: 101
+hidden: true
 ---
  The KWARC research group conducts research in knowledge representation with a view towards applications in knowledge management.
  We extend techniques from [formal methods](formal-methods/) so that they can be used in settings where formalization is either infeasible or too costly.