From 0df8ab1fdb5d140e02def0211b912cf97684a812 Mon Sep 17 00:00:00 2001 From: sovanna Date: Fri, 19 Jul 2019 12:38:11 +0200 Subject: [PATCH] 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. --- content/about-us/_index.md | 3 + templates/customs/about-us.html | 85 ++++-------------------- templates/includes/separator_design.html | 23 +++++++ templates/section.html | 24 ++++--- 4 files changed, 53 insertions(+), 82 deletions(-) create mode 100644 templates/includes/separator_design.html diff --git a/content/about-us/_index.md b/content/about-us/_index.md index c6055a1..d055d12 100644 --- a/content/about-us/_index.md +++ b/content/about-us/_index.md @@ -3,4 +3,7 @@ title = "About us" weight = 4 sort_by = "weight" template = "customs/about-us.html" + +[extra] +title = "About us" +++ diff --git a/templates/customs/about-us.html b/templates/customs/about-us.html index 6b56b51..2d42699 100644 --- a/templates/customs/about-us.html +++ b/templates/customs/about-us.html @@ -1,31 +1,6 @@ {% extends 'section.html' %} -{% block hero %} - -
- -
- -
- -
- -

About us

- - - -
- -
- -
- -
- -{% endblock %} - - {% block main %}
@@ -36,41 +11,25 @@ {% block main_content %} -
+
-
History
+
History
-
+

+ 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 Milkymist One, was launched in September 2011 with the help of open hardware company Sharism at Work. +

-
+

+ Components of the Milkymist system-on-chip soon found many other uses, such as software-defined radio on board the International Space Station. The community grew and activities diversified, with the development of a TDC core for CERN (using a variant of the Milkymist SoC for integration), the Migen logic design system and its application to the Rhino software-defined radio platform, and the Mixxeo 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. +

-

- 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 Milkymist One, was launched in September 2011 with the help of open hardware company Sharism at Work. -

- -
- -
- -

- Components of the Milkymist system-on-chip soon found many other uses, such as software-defined radio on board the International Space Station. The community grew and activities diversified, with the development of a TDC core for CERN (using a variant of the Milkymist SoC for integration), the Migen logic design system and its application to the Rhino software-defined radio platform, and the Mixxeo 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. -

- -
- -
- -
- -

- The company's current main project is ARTIQ, 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. -

- -
+

+ The company's current main project is ARTIQ, 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. +

- {% endblock %} + {% endblock %}
@@ -79,24 +38,8 @@
-
+ {% set separator_title = "Contact us" %} -
- -
- -
- -

Contact us

- - - -
- -
- -
- -
+ {% include "includes/separator_design.html" %} {% endblock %} diff --git a/templates/includes/separator_design.html b/templates/includes/separator_design.html new file mode 100644 index 0000000..d62469a --- /dev/null +++ b/templates/includes/separator_design.html @@ -0,0 +1,23 @@ +
+ +
+ +
+ +
+ + {% if separator_title %} + +

{{ separator_title }}

+ + + + {% endif %} + +
+ +
+ +
+ +
\ No newline at end of file diff --git a/templates/section.html b/templates/section.html index 9c0893e..ca2f9b5 100644 --- a/templates/section.html +++ b/templates/section.html @@ -1,26 +1,28 @@ {% extends '_base.html' %} -{% block main %} +{% block hero %} -
+
-
+
-
+
- {% block main_content %} +
- {% if page and page.content %} - {{ page.content | safe }} - {% endif %} + {% if section.extra.title %} +

{{ section.extra.title | markdown | safe }}

+ {% endif %} - {% endblock %} + -
+
+ +
-
+ {% endblock %}