Update OpenCert website after Plenary meeting in Vienna

Change-Id: I766729fa3414b89d0b8c175045e1e1d6ede7fa42
diff --git a/hugo/config.toml b/hugo/config.toml
index 7308dd9..34ba3fa 100644
--- a/hugo/config.toml
+++ b/hugo/config.toml
@@ -1,20 +1,15 @@
 MetaDataFormat = "yaml"
 theme = "solstice"
-languageCode = "en-us"
 title = "OpenCert"
-publishDir = "../"
-baseurl = "https://polarsys.org/opencert/"
-#baseurl = "/"
+#baseurl = "https://polarsys.org/opencert/"
+baseurl = "/"
+sectionPagesMenu = "main"
 
 [params]
   description = "The OpenCert project"
   author = "Antoine THOMAS for the Eclipse Foundation, Huascar Espinoza for Technalia"
   logo = "images/logo.png"
 
-[taxonomies]
-  tag = "tags"
-  group = "groups"
-
 [[menu.main]]
   name = "Home"
   weight = -200
@@ -22,16 +17,10 @@
   url= "/"
 
 [[menu.main]]
-  name = "Getting Started"
+  name = "Resources"
   weight = -150
-  identifier = "gettingstarted"
-  url= "/gettingstarted/"
-
-[[menu.main]]
-  name = "Documentation"
-  weight = -120
-  identifier = "documentation"
-  url= "/documentation/"
+  identifier = "resources"
+  url= "/resources/"
 
 [[menu.main]]
   name = "Community"
diff --git a/hugo/content/about.md b/hugo/content/about.md
deleted file mode 100644
index ec723d4..0000000
--- a/hugo/content/about.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-date: 2017-06-07
-title: About
----
-
----
-OpenCert is not a monolithic platform. The OpenCert Tool Platform is composed of various contributions that cover the different features:
-
-* OpenCert Core toolset supports evidence management, assurance case specification and compliance management functionalities.
-* The CHESS toolset adds support for Architecture-Driven Assurance. The CHESS toolset leverages another important PolarSys project, the Papyrus platform for UML design and profiles.
-* EPF Composer supports the process specification and process compliance.
-
-The main contributions come from the AMASS project ([www.amass-ecsel.eu](http://www.amass-ecsel.eu)). The reuse of existing open source projects shows the pragmatism of the approach, and the application of a good practice of open source communities that is to “join and contribute to existing communities” instead of “reinventing the wheel”. As such, the OpenCert open source platform is a good example of the advantages of open source software that can be combined and extended more easily as all APIs and formats are open.
diff --git a/hugo/content/about/index.md b/hugo/content/about/index.md
new file mode 100644
index 0000000..9e299e3
--- /dev/null
+++ b/hugo/content/about/index.md
@@ -0,0 +1,16 @@
+---
+date: 2017-06-07
+title: About
+---
+
+---
+OpenCert is not a monolithic platform. The OpenCert Tool Platform is composed of various contributions that cover the different features:
+
+* <img src="../images/logo.png" class="img-responsive" alt="OpenCert logo"> [OpenCert Core](https://www.polarsys.org/projects/polarsys.opencert) toolset supports evidence management, assurance case specification and compliance management functionalities.
+* <img src="../images/chess-logo.png" class="img-responsive" alt="Chess logo"> The [Chess toolset](https://www.polarsys.org/chess/) adds support for Architecture-Driven Assurance. The CHESS toolset leverages another important PolarSys project, the Papyrus platform for UML design and profiles.
+* [EPF Composer](http://www.eclipse.org/epf/) supports the process specification and process compliance.
+
+The main contributions come from the [AMASS project](http://www.amass-ecsel.eu). The reuse of existing open source projects shows the pragmatism of the approach, and the application of a best practices of software engineering and open source communities: “join and contribute to existing communities” instead of “reinventing the wheel”. As such, the OpenCert open source platform is a good example of the advantages of open source software that can be combined and extended more easily as all APIs and formats are open.
+
+<img src="http://www.amass-ecsel.eu/sites/amass.drupal.pulsartecnalia.com/files/pictures/PartnersMap_nov2016.PNG" class="img-responsive" alt="CAMASS partners">
+
diff --git a/hugo/content/community.md b/hugo/content/community/index.md
similarity index 92%
rename from hugo/content/community.md
rename to hugo/content/community/index.md
index eacefb6..6a4992d 100644
--- a/hugo/content/community.md
+++ b/hugo/content/community/index.md
@@ -6,7 +6,6 @@
 ---
 ### Communication channels
 
-Communications Channels
 Learn about OpenCert, join the community, connect with other CHESS users, get support and service:
 
 * [Forum](https://polarsys.org/forums/): Consult the OpenCert forum and ask questions about the tool. This also the forum about CHESS and other Polarsys projects.
@@ -20,6 +19,5 @@
 You can use the code from these repositories to experiment, test, build, create patches, issue pull requests, etc. This project uses Gerrit Code Review; please see [contributing via Gerrit](http://wiki.eclipse.org/Gerrit).
 
 Clone: https://git.polarsys.org/r/opencert/opencert
-Browse: http://git.polarsys.org/c/opencert/opencert.git
 
-We will migrate the code to the Polarsys Git repository soon.
+Browse: http://git.polarsys.org/c/opencert/opencert.git
diff --git a/hugo/content/downloads.md b/hugo/content/downloads/index.md
similarity index 100%
rename from hugo/content/downloads.md
rename to hugo/content/downloads/index.md
diff --git a/hugo/content/index.md b/hugo/content/home/index.md
similarity index 95%
rename from hugo/content/index.md
rename to hugo/content/home/index.md
index f69d03a..997e0bd 100644
--- a/hugo/content/index.md
+++ b/hugo/content/home/index.md
@@ -9,7 +9,7 @@
 
 
 <div class="embed-responsive embed-responsive-16by9">
-<iframe width="560" height="315" src="https://www.youtube.com/embed/36d-LF-ns44" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+{{< youtube 36d-LF-ns44 >}}
 </div>
 
 ## Approach
diff --git a/hugo/content/news/hello-world.md b/hugo/content/news/2017-06-07-hello-world.md
similarity index 100%
rename from hugo/content/news/hello-world.md
rename to hugo/content/news/2017-06-07-hello-world.md
diff --git a/hugo/content/news/2018-03-09-new-prototype.md b/hugo/content/news/2018-03-09-new-prototype.md
new file mode 100644
index 0000000..66b8cc8
--- /dev/null
+++ b/hugo/content/news/2018-03-09-new-prototype.md
@@ -0,0 +1,12 @@
+---
+date: 2018-03-09
+title: New integrated prototype built by the AMASS project team
+---
+
+
+_Article by **Gaël Blondelle**, Eclipse Foundation_
+
+The AMASS project partners invested lots of energy to build the new prototype of the AMASS Open Platform. 
+
+<!--more-->
+Read more information at on [the project website](https://www.amass-ecsel.eu/content/amass-prototype-p1)
\ No newline at end of file
diff --git a/hugo/content/news/2018-03-22-new-content.md b/hugo/content/news/2018-03-22-new-content.md
new file mode 100644
index 0000000..6165b70
--- /dev/null
+++ b/hugo/content/news/2018-03-22-new-content.md
@@ -0,0 +1,12 @@
+---
+date: 2018-03-22
+title: New content on the OpenCert website
+---
+
+
+_Article by **Gaël Blondelle**, Eclipse Foundation_
+
+To accompany there new prototype, the AMASS partners updated the web site with new content. 
+
+<!--more-->
+Several topics have been put together in the [resources](../resources/) section.
\ No newline at end of file
diff --git a/hugo/content/documentation.md b/hugo/content/resources/documentation.md
similarity index 85%
rename from hugo/content/documentation.md
rename to hugo/content/resources/documentation.md
index f123d89..9d52c7b 100644
--- a/hugo/content/documentation.md
+++ b/hugo/content/resources/documentation.md
@@ -3,6 +3,10 @@
 title: Documentation
 ---
 
+Access to the documentation of the initial OpenCert package produced by the AMASS partners
+
+<!--more-->
+
 ---
 User Manual:  
 [OpenCert_UserManual_07062017.pdf](OpenCert_UserManual_07062017.pdf)
diff --git a/hugo/content/gettingstarted.md b/hugo/content/resources/gettingstarted.md
similarity index 90%
rename from hugo/content/gettingstarted.md
rename to hugo/content/resources/gettingstarted.md
index 5e17cb9..8786641 100644
--- a/hugo/content/gettingstarted.md
+++ b/hugo/content/resources/gettingstarted.md
@@ -3,20 +3,19 @@
 title: Getting Started with OpenCert
 ---
 
----
 This section guides the end-user through the use of OpenCert.
 
+<!--more-->
+
 ---
 
 ##	Installation
 It must be noted that the pre-existing OpenCert tools are designed to follow client-server architecture approach:
 
 * OpenCert server - installed in a central host machine
-*	One or many OpenCert clients - each of which installed on specific user machines
+* One or many OpenCert clients - each of which installed on specific user machines
 
-This installation relates to a standalone version of OpenCert, including Papyrus/CHESS plugins.
-
-OpenCert can also use the Eclipse Process Framework (EPF) toolset. That can be downloaded in a separate Eclipse standalone version (http://www.eclipse.org/epf/downloads/downloads.php). We plan to integrate the whole toolsets in the same standalone version in future releases.
+This installation relates to a standalone version of OpenCert, including Papyrus/CHESS, EPF Composer and BVR plugins.
 
 ### Client bundle download
 It is required to have installed (minimum) **Java Environment 1.8**.
diff --git a/hugo/content/resources/training.md b/hugo/content/resources/training.md
new file mode 100644
index 0000000..6b94fe2
--- /dev/null
+++ b/hugo/content/resources/training.md
@@ -0,0 +1,47 @@
+---
+date: 2018-03-22
+title: Online training
+---
+
+This page references the latest training material available for the OpenCert platform.
+
+<!--more-->
+
+## Training - Winter series 2018
+### Training on the Prototype P1: WP3 Session #1 (26 Jan 2018)
+* Workflow overview
+* System Component Specification: Requirement specification
+* Requirement Formalization: Formalize requirements with formal properties, Contract editor with content assist
+* Requirement Early Validation: Metrics
+* Functional Refinement: Architectural refinement, Contract refinement, Contract-based views
+{{< youtube EysXR-JSilM >}}
+
+### Training on the Prototype P1: WP3 Session #2 (31 Jan 2018)
+* Components nominal and faulty behaviour definition
+* Functional early verification: Integration of CHESS and V&V tools, Contract refinement analysis, Contract validation, Contract-based verification of refinement
+* Safety analysis: Fault tree generation, Contract-based safety analysis
+* Safety Case: Generate product-based assurance arguments from CHESS model, Link architecture-related entities, Document generation
+* Upcoming features: Savona, Simulation-based Fault Injection, Requirement Early Validation
+{{< youtube lK8bfr_uz6c >}}
+
+### Training on the Prototype P1: WP4 Session #1 (25 Jan 2018)
+* Dependability assurance case modelling
+* Contract-based multi-concern assurance
+* System-dependability co-analysis: via Papyrus, via Safety Architect and via Concerto
+{{< youtube oEopBXgxxkc >}}
+
+### Training on the Prototype P1: WP4 Session #2 (26 Jan 2018)
+* System dependability co-analysis: WEFACT training and via WEFACT
+{{< youtube VPGjEg9hR_Y >}}
+
+### Training on the Prototype P1: WP5 Session (26 Jan 2018)
+* OSLC KM integration in AMASS
+{{< youtube 94XCH6Q9v-8 >}}
+
+### Training on the Prototype P1: WP6 Session (24 Jan 2018)
+* Introduction to filtering at Assurance Project generation by Criticality/Applicability level
+* Reuse Assistant
+* Compliance Map Report
+* Management of Families-Lines: Variability Management support at process level and at component level, cross-concern variability management
+* Semi-automatic generation of Arguments: Product arguments and process arguments
+{{< youtube XHt2SkzL7XU >}}
diff --git a/hugo/static/images/chess-logo.png b/hugo/static/images/chess-logo.png
new file mode 100644
index 0000000..d9fb315
--- /dev/null
+++ b/hugo/static/images/chess-logo.png
Binary files differ