forked from M-Labs/web2019
refactor(about-us): Cleans as possible
/about-us/ is a section not a page. Thus, according to Zola, a section has a _index.md .. but an _index.md file is attach with an file.html. That's why we cannot take advantage of a markdown content..for a section content. It's the same thing with the homepage. So basically, homepage and all section content (e.g URL like this ROOT/section/ ) will have its HTML file.
This commit is contained in:
parent
5622a66951
commit
0df8ab1fdb
@ -3,4 +3,7 @@ title = "About us"
|
||||
weight = 4
|
||||
sort_by = "weight"
|
||||
template = "customs/about-us.html"
|
||||
|
||||
[extra]
|
||||
title = "About us"
|
||||
+++
|
||||
|
||||
@ -1,31 +1,6 @@
|
||||
{% extends 'section.html' %}
|
||||
|
||||
|
||||
{% block hero %}
|
||||
|
||||
<div class="container-fluid hero2 d-flex flex-column justify-content-center">
|
||||
|
||||
<div class="container">
|
||||
|
||||
<div class="row mt-4 mb-4">
|
||||
|
||||
<div class="col-12 text-center mt-n0 mt-lg-n5">
|
||||
|
||||
<h1>About us</h1>
|
||||
|
||||
<img src="{{ get_url(path='images/ion@2x.png', cachebust=true) }}" width="100" align="ion">
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block main %}
|
||||
|
||||
<main class="container">
|
||||
@ -36,41 +11,25 @@
|
||||
|
||||
{% block main_content %}
|
||||
|
||||
<div class="mb-5 pb-5 text-center ">
|
||||
<div class="text-center">
|
||||
|
||||
<h5 class="mb-3">History</h5>
|
||||
<h5 class="mb-4">History</h5>
|
||||
|
||||
<div class="row">
|
||||
<p>
|
||||
Milkymist was founded in summer 2007 by Sébastien Bourdeauducq. The open source project tackled the development of a system-on-chip design capable of running MilkDrop. The name "Milkymist" was chosen to evoke a parallel MilkDrop. The development was no small task, as it required designing and/or integrating a powerful 32-bit microprocessor core, basic peripherals, many interfaces, a fast SDRAM controller, and graphics acceleration. The video synthesizer born out of those efforts, the <a href="https://m-labs.hk/m1.html" target="_blank" rel="noopener noreferrer">Milkymist One</a>, was launched in September 2011 with the help of open hardware company Sharism at Work.
|
||||
</p>
|
||||
|
||||
<div class="col-12">
|
||||
<p>
|
||||
Components of the Milkymist system-on-chip soon found many other uses, such as <a href="https://m-labs.hk/jpl_letter.jpg" target="_blank" rel="noopener noreferrer">software-defined radio</a> on board the International Space Station. The community grew and activities diversified, with the development of a <a href="http://www.ohwr.org/projects/tdc-core/wiki" target="_blank" rel="noopener noreferrer">TDC core</a> for CERN (using a variant of the Milkymist SoC for integration), the <a href="{{ get_url(path='@/gateware/migen.md') }}">Migen</a> logic design system and its application to the Rhino software-defined radio platform, and the <a href="https://m-labs.hk/mixxeo.html" target="_blank" rel="noopener noreferrer">Mixxeo</a> digital video mixer. In 2013, Milkymist was renamed to M-Labs to mark the more varied activities, and formally incorporated in Hong Kong as M-Labs Limited.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Milkymist was founded in summer 2007 by Sébastien Bourdeauducq. The open source project tackled the development of a system-on-chip design capable of running MilkDrop. The name "Milkymist" was chosen to evoke a parallel MilkDrop. The development was no small task, as it required designing and/or integrating a powerful 32-bit microprocessor core, basic peripherals, many interfaces, a fast SDRAM controller, and graphics acceleration. The video synthesizer born out of those efforts, the <a href="https://m-labs.hk/m1.html" target="_blank" rel="noopener noreferrer">Milkymist One</a>, was launched in September 2011 with the help of open hardware company Sharism at Work.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
|
||||
<p>
|
||||
Components of the Milkymist system-on-chip soon found many other uses, such as <a href="https://m-labs.hk/jpl_letter.jpg" target="_blank" rel="noopener noreferrer">software-defined radio</a> on board the International Space Station. The community grew and activities diversified, with the development of a <a href="http://www.ohwr.org/projects/tdc-core/wiki" target="_blank" rel="noopener noreferrer">TDC core</a> for CERN (using a variant of the Milkymist SoC for integration), the <a href="https://m-labs.hk/migen/index.html" target="_blank" rel="noopener noreferrer">Migen</a> logic design system and its application to the Rhino software-defined radio platform, and the <a href="https://m-labs.hk/mixxeo.html" target="_blank" rel="noopener noreferrer">Mixxeo</a> digital video mixer. In 2013, Milkymist was renamed to M-Labs to mark the more varied activities, and formally incorporated in Hong Kong as M-Labs Limited.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
|
||||
<p>
|
||||
The company's current main project is <a href="{{ get_url(path='@/experiment-control/artiq.md') }}">ARTIQ</a>, a leading-edge open source control system for quantum information experiments. In 2016, Robert Jördens joined the directorate of the company to further develop ARTIQ and other physics-related projects.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<p>
|
||||
The company's current main project is <a href="{{ get_url(path='@/experiment-control/artiq.md') }}">ARTIQ</a>, a leading-edge open source control system for quantum information experiments. In 2016, Robert Jördens joined the directorate of the company to further develop ARTIQ and other physics-related projects.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
||||
</div>
|
||||
|
||||
@ -79,24 +38,8 @@
|
||||
</main>
|
||||
|
||||
|
||||
<div class="container-fluid hero3 d-flex flex-column justify-content-center">
|
||||
{% set separator_title = "Contact us" %}
|
||||
|
||||
<div class="container">
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="col-12 text-center mt-0 mt-lg-5">
|
||||
|
||||
<h1>Contact us</h1>
|
||||
|
||||
<img src="{{ get_url(path='images/ion@2x.png', cachebust=true) }}" width="100" align="ion">
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
{% include "includes/separator_design.html" %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
23
templates/includes/separator_design.html
Normal file
23
templates/includes/separator_design.html
Normal file
@ -0,0 +1,23 @@
|
||||
<div class="container-fluid hero3 d-flex flex-column justify-content-center">
|
||||
|
||||
<div class="container">
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="col-12 text-center mt-0 mt-lg-5">
|
||||
|
||||
{% if separator_title %}
|
||||
|
||||
<h2>{{ separator_title }}</h2>
|
||||
|
||||
<img src="{{ get_url(path='images/ion@2x.png', cachebust=true) }}" width="100" align="ion">
|
||||
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@ -1,26 +1,28 @@
|
||||
{% extends '_base.html' %}
|
||||
|
||||
|
||||
{% block main %}
|
||||
{% block hero %}
|
||||
|
||||
<main class="container">
|
||||
<div class="container-fluid hero2 d-flex flex-column justify-content-center">
|
||||
|
||||
<div class="row mt-5 pt-5 pb-5">
|
||||
<div class="container">
|
||||
|
||||
<div class="col-12">
|
||||
<div class="row mt-4 mb-4">
|
||||
|
||||
{% block main_content %}
|
||||
<div class="col-12 text-center mt-n0 mt-lg-n5">
|
||||
|
||||
{% if page and page.content %}
|
||||
{{ page.content | safe }}
|
||||
{% endif %}
|
||||
{% if section.extra.title %}
|
||||
<h1>{{ section.extra.title | markdown | safe }}</h1>
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
<img src="{{ get_url(path='images/ion@2x.png', cachebust=true) }}" width="100" align="ion">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</main>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user