content/about-us/_index.md

@@ -4,5 +4,5 @@ weight = 4
 sort_by = "weight"
 
 [extra]
-title = "About us"
+in_topbar = true
 +++

content/artiq/_index.md

@@ -3,4 +3,8 @@ title = "ARTIQ control system"
 weight = 1
 sort_by = "weight"
 redirect_to = "artiq/artiq"
+
+[extra]
+in_topbar = true
+place_order = true
 +++

content/artiq/funding.md

@@ -13,7 +13,7 @@ The free and open dissemination of methods and results is central to scientific
 The ARTIQ and Sinara authors, contributors, and supporters consider the free and open exchange of scientific tools to be equally important and have chosen the licensing terms of ARTIQ and Sinara accordingly. ARTIQ, including its gateware, the firmware, and the ARTIQ tools and libraries are licensed as LGPLv3+. The Sinara hardware designs are licensed under CERN OHL.
 This ensures that a user of ARTIQ or Sinara hardware designs obtains broad rights to use, redistribute, study, and modify them.
 
-ARTIQ and the related components that we are developing ([Migen/MiSoC](/misc/migen), [nMigen](/misc/nmigen), [smoltcp](/software/smoltcp), [minimq](https://github.com/quartiq/minimq), [zynq-rs](https://git.m-labs.hk/m-labs/zynq-rs), [SiPyCo](https://github.com/m-labs/sipyco), [RayOpt](https://github.com/quartiq/rayopt), [WFVM](https://git.m-labs.hk/m-labs/wfvm), ...) need to be kept on a sound financial basis. We have been relying on a combination of [hardware sales](../place-order), sponsorships, and grants.
+ARTIQ and the related components that we are developing ([Migen/MiSoC](/misc/migen), [nMigen](/misc/nmigen), [smoltcp](/software/smoltcp), [minimq](https://github.com/quartiq/minimq), [zynq-rs](https://git.m-labs.hk/m-labs/zynq-rs), [SiPyCo](https://github.com/m-labs/sipyco), [RayOpt](https://github.com/quartiq/rayopt), [WFVM](https://git.m-labs.hk/m-labs/wfvm), ...) need to be kept on a sound financial basis. We have been relying on a combination of [hardware sales](../../order), sponsorships, and grants.
 
 {% end %}
 

content/artiq/sinara-core.md

@@ -14,7 +14,7 @@ The first ARTIQ core devices used hardware built in-house by physicists (based o
 
 The Sinara hardware is in active development, and the latest information is available <a href="https://github.com/sinara-hw" target="_blank" rel="noopener noreferrer">on the wiki of each project's page</a>. Most of the hardware engineering is done at the <a href="https://www.ise.pw.edu.pl/" target="_blank" rel="noopener noreferrer">Institute for Electronics Systems</a> at the Warsaw University of Technology.
 
-Kasli and EEMs can be ordered now. We can deliver a rack-mountable crate that contains all the cards, is fully tested, and is ready to be connected to your experiment and computer network. Use our [web-based configuration and ordering tool](../place-order), or contact {{ email(address="sales") }} with your requirements, and we will establish a quote.
+Kasli and EEMs can be ordered now. We can deliver a rack-mountable crate that contains all the cards, is fully tested, and is ready to be connected to your experiment and computer network. Use our [web-based configuration and ordering tool](../../order), or contact {{ email(address="sales") }} with your requirements, and we will establish a quote.
 
 {% end %}
 
@@ -376,7 +376,7 @@ There are several DIN-rail compatible modules for use with Banker. They are inte
 
 We can deliver a rack-mountable crate that contains all the cards, is fully tested, and is ready to be connected to your experiment and computer network. The lead time can be as short as a few working days and we will provide assistance to help you set up your new equipment with ARTIQ via the online helpdesk. Using our AFWS tool, you can keep the firmware of your M-Labs devices up-to-date easily, and benefit from the new features we continuously develop into ARTIQ.
 
-Use our [web-based configuration and ordering tool](../place-order), or contact {{ email(address="sales") }} with your requirements, and we will establish a quote.
+Use our [web-based configuration and ordering tool](../../order), or contact {{ email(address="sales") }} with your requirements, and we will establish a quote.
 
 {% end %}
 

content/lasers/_index.md

@@ -2,5 +2,9 @@
 title = "Lasers"
 weight = 2
 sort_by = "weight"
+redirect_to = "lasers/kirdy"
 
+[extra]
+in_topbar = true
+place_order = true
 +++

content/lasers/place-order.md

@@ -1,8 +0,0 @@
-+++
-title = "Order hardware"
-weight = 5
-template = "page-place-order.html"
-
-[extra]
-menu_item = "th1"
-+++

content/misc/_index.md

@@ -3,4 +3,7 @@ title = "Miscellaneous"
 weight = 3
 sort_by = "weight"
 redirect_to = "misc/migen"
+
+[extra]
+in_topbar = true
 +++

content/order/_index.md

@@ -1,8 +1,7 @@
 +++
 title = "Order hardware"
-weight = 5
 template = "page-place-order.html"
 
 [extra]
-menu_item = "th1"
-+++
+in_topbar = false
++++

content/other/_index.md

@@ -1,4 +1,7 @@
 +++
 title = "Other"
 render = false
+
+[extra]
+in_topbar = false
 +++

templates/_base.html

@@ -97,7 +97,7 @@
                 {% set root_current_path = current_path | trim_start_matches(pat='/') | split(pat='/') | first %}
                 {% set root_section_path = subsection.path | trim_start_matches(pat='/') | split(pat='/') | first %}
 
-                {% if subsection.pages|length > 0 and subsection.title != 'Other' %}
+                {% if subsection.pages|length > 0 and subsection.extra.in_topbar %}
 
                   <li class="nav-item ms-0 ms-md-4 dropdown {% if root_current_path == root_section_path %}active{% endif %}">
                     <a class="nav-link dropdown-toggle {% if current_path == subsection.path %}active{% endif %}" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -105,18 +105,20 @@
                     </a>
                     <div class="dropdown-menu shadow-none shadow-lg text-start text-lg-start" aria-labelledby="navbarDropdown">
                       {% for tmp_page in subsection.pages %}
-                        {% if tmp_page.extra.menu_item and tmp_page.extra.menu_item == "th1" %}
-                        <a class="dropdown-item pt-2 pb-2 mx-4 mt-2 mb-2 mt-sm-3 mb-sm-3 w-auto btn btn-primary btn-inversed {% if current_path == tmp_page.path %}active{% endif %} rounded-1" href="{{ tmp_page.permalink | safe }}" itemprop="url">
-                          <center>{{ tmp_page.title }}</center>
-                        </a>
-                        {% else %}
                         <a class="dropdown-item pt-2 pb-2 {% if current_path == tmp_page.path %}active{% endif %}" href="{{ tmp_page.permalink | safe }}" itemprop="url">{{ tmp_page.title }}</a>
-                        {% endif %}
                       {% endfor %}
+
+                      {% if subsection.extra.place_order %}
+                            <a class="dropdown-item pt-2 pb-2 mx-4 mt-2 mb-2 mt-sm-3 mb-sm-3 w-auto btn btn-primary btn-inversed {% if current_path == "order/_index.md" %}active{% endif %} rounded-1" href="{{
+                            get_url(path="@/order/_index.md") | safe }}" itemprop="url">
+                              <center>{{ "Order hardware" }}</center>
+                            </a>
+                      {% endif %}
+
                     </div>
                   </li>
 
-                {% elif subsection.title != 'Other' %}
+                {% elif subsection.extra.in_topbar %}
 
                   <li class="nav-item ms-0 ms-md-4 {% if current_path == subsection.path %}active{% endif %}">
                     <a class="nav-link" href="{{ subsection.permalink | safe }}">{{ subsection.title }}</a>

templates/index.html

@@ -91,7 +91,7 @@
               </p>
               </div>
 
-              <a href="{{ get_url(path='@/artiq/place-order.md') }}" class="btn btn-primary btn-inversed btn-lg" itemprop="url">Order hardware</a>
+              <a href="{{ get_url(path='@/order/_index.md') }}" class="btn btn-primary btn-inversed btn-lg" itemprop="url">Order hardware</a>
               <a href="https://m-labs.hk/artiq/manual/" class="btn btn-primary btn-lg" itemprop="url">Manual</a>
               <a href="https://forum.m-labs.hk" class="btn btn-primary btn-lg" itemprop="url">Forum</a>
               <a href="{{ get_url(path='@/artiq/artiq.md') }}" class="btn btn-primary btn-lg" itemprop="url">More...</a>