Merge branch 'staging'
Signed-off-by: Siwara Schmitt <siwara.schmitt@iese.fraunhofer.de>
diff --git a/Jenkinsfile b/Jenkinsfile
index 110ff49..62f7a36 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,4 @@
pipeline {
-
agent {
kubernetes {
label 'hugo-agent'
@@ -9,18 +8,24 @@
labels:
run: hugo
name: hugo-pod
+kind: Pod
spec:
containers:
- name: jnlp
volumeMounts:
- mountPath: /home/jenkins/.ssh
name: volume-known-hosts
+ - mountPath: "/home/jenkins"
+ name: "jenkins-home"
+ readOnly: false
- name: hugo
image: eclipsecbi/hugo:0.42.1
- command:
- - cat
tty: true
+ command:
+ - cat
volumes:
+ - name: "jenkins-home"
+ emptyDir: {}
- configMap:
name: known-hosts
name: volume-known-hosts
@@ -40,9 +45,10 @@
options {
buildDiscarder(logRotator(numToKeepStr: '5'))
checkoutToSubdirectory('hugo')
+ disableConcurrentBuilds()
}
- stages {
+ stages {
stage('Checkout www repo') {
steps {
dir('www') {
@@ -79,6 +85,15 @@
}
}
}
+
+ stage('Run maven') {
+ steps {
+ container('jnlp') {
+ sh 'mkdir -p /home/jenkins/foobar'
+ }
+ }
+ }
+
stage('Push to $env.BRANCH_NAME branch') {
when {
anyOf {
diff --git a/config.toml b/config.toml
index 4959f5a..d5184c3 100644
--- a/config.toml
+++ b/config.toml
@@ -25,22 +25,31 @@
name = "Home"
url = "/"
weight = 10
+
+[[menu.main]]
+ name = "Blog"
+ url = "/blog/"
+ weight = 15
[[menu.main]]
name = "About"
url = "/about/"
- weight = 15
-
+ weight = 20
+
#[[menu.main]]
-# name = "Blog"
-# url = "/blog/"
-# weight = 20
-
+# name = "Details"
+# url = "/"
+# weight = 20
[[menu.main]]
- name = "Use Cases"
- url = "/use case/"
- weight = 25
+ name = "Reference Projects"
+ url = "https://wiki.eclipse.org/BaSyx_/_Reference_Projects"
+ weight = 25
+
+#[[menu.main]]
+# name = "Use Cases"
+# url = "/use case/"
+# weight = 25
#[[menu.main]]
# name = "Forum"
@@ -52,10 +61,20 @@
url = "https://wiki.eclipse.org/BaSyx"
weight = 30
+#[[menu.main]]
+# name = "Offers"
+# url = "/offer/"
+# weight = 35
+
[[menu.main]]
name = "Download"
url = "https://projects.eclipse.org/projects/technology.basyx/downloads"
weight = 40
+
+[[menu.main]]
+ name = "Contributing"
+ url = "https://wiki.eclipse.org/BaSyx_/_Developer_/_Contributing"
+ weight = 50
#[[menu.main]]
@@ -92,8 +111,8 @@
[params]
viewMorePostLink = "/blog/"
author = "Admin"
- defaultKeywords = ["industrie 4.0", "iot", "basys 4.0", "basyx", "smart production", "digitalization", "cyber physical systems"]
- defaultDescription = "Eclipse BaSyx community website"
+ defaultKeywords = ["industrie 4.0", "iot", "basys 4.0", "basys 4.2", "basyx", "smart production", "digitalization", "cyber physical systems", "ecosystem", "BaSyx offers", "Digital Twin", "Asset Administration Shell"]
+ defaultDescription = "Eclipse BaSyx Community Website"
# Google Maps API key (if not set will default to not passing a key.)
#googleMapsApiKey = "AIzaSyCFhtWLJcE30xOAjcbSFi-0fnoVmQZPb1Y"
@@ -116,7 +135,7 @@
# Enable the contact form by entering your Formspree.io email
email = ""
- #copyright = "Copyright © 2019 The Eclipse Foundation. All Rights Reserved."
+ #copyright = "Copyright © 2021 The Eclipse Foundation. All Rights Reserved."
# Format dates with Go's time formatting
date_format = "January 2, 2006"
@@ -136,7 +155,7 @@
# longitude = "-77.028333"
[Permalinks]
-# blog = "/blog/:year/:month/:day/:filename/"
+ blog = "/blog/:year/:month/:day/:filename/"
# Enable or disable top bar with social icons
[params.topbar]
@@ -155,7 +174,7 @@
[params.carousel]
enable = true
- # All carroussel items are defined in their own files. You can find example items
+ # All carousel items are defined in their own files. You can find example items
# at 'exampleSite/data/carousel'.
# For more information take a look at the README.
@@ -188,3 +207,8 @@
[params.about]
enable = true
title = "Eclipse BaSyx Project"
+
+[params.testimonials]
+ enable = false
+ title = "Testimonials"
+ subtitle = "Have a look what BaSyx users said about the open source Industrie 4.0 platform."
diff --git a/content/about.md b/content/about.md
deleted file mode 100644
index ffd0341..0000000
--- a/content/about.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: "About"
-date: 2019-02-14T10:08:18+01:00
-draft: false
-type: about
----
-<p class="lead">
-Eclipse BaSyx is an open source platform for the next generation automation. As a reference technology platform, the BaSyx project enables large and small industries, research institutes, academia, and interested persons, to participate in the fourth industrial revolution.
-</p>
-
-<p class="lead">
-By providing common Industrie 4.0 components and an extendable SDK the platform accelerates the development of Industrie 4.0 solutions.
-The Eclipse BaSyx platform addresses challenges like changeable production to enable individualized goods, exploiting big data analytics and connecting heterogenous devices and systems while minimizing downtime and other associated costs.
-<!--use cases like a profitable production of a small lot size or a predictive maintenance for devices.
-Connecting devices at the shop-floor with IT systems at the office-floor, Big Data Analytics and new Business Models are further examples what the platform enables.
-More details about the mentioned use cases could be read <a href="/basyx/use-case/">here</a>.-->
-</p>
-
-
-<!--more-->
-
-<p class="lead">
-To meet these challenges the BaSyx platform is designed as follows:
-<ul class="lead">
- <li>The plant level consists of high-level plant components that manage, optimize, and monitor the production.</li></br>
- <li>The middleware level consists of re-useable Industrie 4.0 components that implement required generic and plant-independent capabilities for Industrie 4.0 production lines. Registry and Discovery services, protocol gateways, and Asset Administration Shell providers for example reside on the middleware level.</li></br>
- <li>The device level consists of automation devices that offer a BaSyx conforming interface. Further at the device level, field devices without any compliant BaSyx interfaces are getting connected. This is done by bridging devices that have BaSyx conforming interfaces for those field devices.</li></br>
- <li>The field level consists of automation devices, sensors, and actuators without a specific BaSyx conforming interface.</li>
-
-</ul>
-</p>
-
-<p style="text-align:center;">
- <a href="BaSyxDesign.png">
- <img src="BaSyxDesign.png"
- alt="BaSyx Design" width="100%">
- </a>
-</p>
-
-<p class="lead">
- You can learn more about BaSyx in our detailed documentation provided on the <a href="https://wiki.eclipse.org/BaSyx">Eclipse Foundation Wiki</a> or by contacting us on <a href="basyx-dev@eclipse.org">basyx-dev@eclipse.org</a>.
-</p>
-
-<p class="lead">
-The Project is actively supported by the German <a href="https://www.basys40.de" target="_blank" rel="noopener">BaSys 4.0 research project</a>, which focuses on research and specification of key Industrie 4.0 concepts, participates in standardization activities, and integrates existing standards and technologies into an Industrie 4.0 middleware project.
-</p>
-
-
diff --git a/content/about/BaSyxDesign.png b/content/about/images/BaSyxDesign.png
similarity index 100%
rename from content/about/BaSyxDesign.png
rename to content/about/images/BaSyxDesign.png
Binary files differ
diff --git a/content/about/index.md b/content/about/index.md
new file mode 100644
index 0000000..d7fdf45
--- /dev/null
+++ b/content/about/index.md
@@ -0,0 +1,50 @@
+---
+title: "About"
+#date: 2020-12-01T10:08:18+01:00
+draft: false
+type: about
+
+---
+
+
+<div align="justify" >
+
+
+ <p class="lead">
+ Eclipse BaSyx is the open source platform for next generation automation. It implements key concepts defined by Platform Industrie 4.0, such as the Asset Administration Shell as standardized digital twin.
+ Our mission is to provide a free software platform that enables all interested parties, large and small companies, research institutes, academia, and interested persons,
+ to participate in and to shape the fourth industrial revolution. We believe that the availability of a free reference technology platform is a key success factor for the
+ Industrie 4.0.
+ </p>
+
+ <p class="lead">
+ Eclipse BaSyx therefore provides common and re-useable off-the shelf Industrie 4.0 components and SDKs (Java, C# and C++) that support the implementation of new Industrie 4.0 software components
+ to enable rapid development of Industrie 4.0 solutions. BaSyx furthermore supports reference application scenarios for common
+ Industrie 4.0 challenges such as a changeable production to enable individualized goods, leveraging big data analytics and connecting heterogeneous devices and systems while minimizing
+ downtime and other associated costs.
+ </p>
+
+
+ <!--<p class="lead">
+ Eclipse BaSyx is actively supported by the <a href="https://www.basys40.de/" title=""> BaSys 4.2 </a> (Homepage, in German) research project, which is
+ funded by the German Ministry for Education and Research (BMBF, grant no. 01IS16022). BaSys 4.2 researches and specifies key concepts of Industrie 4.0, participates in standardization activities, and integrates existing
+ standards and technologies into an Industrie 4.0 middleware.
+ </p>-->
+
+ <p class="lead">
+ In the following video Frank Schnicke (Fraunhofer IESE) is explaining the Eclipse BaSyx middleware by using a model factory (English subtitles provided).
+ </p>
+
+
+</div>
+
+<div class="col-md-12">
+
+ <div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden;">
+ <iframe src="https://www.youtube-nocookie.com/embed/bMY8FLhjjRI" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; border:0;" allowfullscreen="" title="YouTube Video"></iframe>
+ </div>
+
+</div>
+
+
+
\ No newline at end of file
diff --git a/content/blog/_index.md b/content/blog/_index.md
new file mode 100644
index 0000000..59db226
--- /dev/null
+++ b/content/blog/_index.md
@@ -0,0 +1,3 @@
+---
+title: "Blog"
+---
diff --git a/content/blog/images/scsh1.png b/content/blog/images/scsh1.png
new file mode 100644
index 0000000..6ec9d5f
--- /dev/null
+++ b/content/blog/images/scsh1.png
Binary files differ
diff --git a/content/blog/images/scsh2.png b/content/blog/images/scsh2.png
new file mode 100644
index 0000000..769c7ee
--- /dev/null
+++ b/content/blog/images/scsh2.png
Binary files differ
diff --git a/content/blog/industry40BecomesPractical.md b/content/blog/industry40BecomesPractical.md
new file mode 100644
index 0000000..f5d6f1a
--- /dev/null
+++ b/content/blog/industry40BecomesPractical.md
@@ -0,0 +1,27 @@
+---
+title: "Industry 4.0 becomes practical"
+date: 2021-02-17
+#tags: ["ece18"]
+#categories: ["dissemination"]
+banner: "img/banners/banner-2.jpg"
+img_source: "© Fraunhofer IESE"
+---
+
+## Fraunhofer IESE brings flexible manufacturing to companies with Eclipse BaSyx.
+One of the goals of industry 4.0 is to be able to exchange devices with the same capabilities in a production plant without having to change the control system. The BaSys 4.0 project, funded by the German Federal Ministry of Education and Research, aims to solve this challenge in a practical way with the concept of service-based manufacturing. With the help of the Eclipse BaSyx, Fraunhofer IESE from Kaiserslautern and other project partners enable even small and medium-sized companies to make convertible manufacturing a reality.
+The term Industry 4.0 does not stand for a single technology, but for a new production concept. It is about adapting production to constantly increasing quality requirements, more rapidly changing markets and a greater product variety. The changeable production in lot size 1 is one of the main goals. However, it is also about open, highly networked automation systems that achieve end-to-end networking and thus enable access to production data, product information and the status of devices at any given time. Big-data analyses find optimization potential to predict errors and to work even more efficiently. Companies cannot achieve these goals with the typical IT infrastructure found in production plants today. Eclipse BaSyx, the open source Industrie 4.0 platform, helps to make production fit for the future.
+
+## With service-oriented manufacturing to changeable production.
+The national reference research project BaSys 4.2 designs the middleware for industry 4.0 applications. The implementation project Eclipse BaSyx provides these as an open source reference implementation and implements central industry 4.0 concepts. This enables companies to develop their own solutions for Industry 4.0 today. BaSys 4.0 remains closely linked to the standardization committees, such as Platform Industrie 4.0, in order to implement standards (e.g. the Asset Administration Shell) and share valuable experience with the committees.
+The core of Eclipse BaSyx is service-oriented manufacturing. This separates the implementation of a service from the production process that invokes the service. This addresses a central problem in the transformation of today's production processes: programmable logic controllers (PLC) define the production process, which is distributed over implementations in numerous PLCs. Changing the process in one place has side effects that require adjustments in many PLCs, for example, because the meaning of signals or messages changes. This leads to expensive downtimes. Service-oriented manufacturing separates the services from the process. The manufacturing process is described in an orchestrator that calls the services. Thanks to Eclipse BaSyx, PLCs no longer need to know when which service is required for the production of a workpiece and therefore do not need to be reprogrammed when the service sequence for a production process changes. Only the orchestrator is changed. Since it is defined at a higher level of abstraction, for example using Business Process Modeling Notation (BPMN), this change is much easier and therefore more efficient than reprogramming a PLC.
+
+## The Asset Administration Shell as Digital Twin
+In Eclipse BaSyx the Asset Administration Shell serves as a general communication interface. It is the digital twin of components and devices and is currently being standardized by Platform Industrie 4.0. The basic idea is that every asset in production, e.g. a machine, a production line, a product or even a worker has a corresponding management shell, which contains or refers to all information about this asset in digital form.
+This standardization of access to assets by means of Asset Administration Shells not only increases the reusability of software, but also the changeability. This means that devices with the same production capabilities can be exchanged for each other at will without having to change a control system.
+
+## The advantages of Eclipse BaSyx are manifold
+In addition to economical production up to lot size 1, Eclipse BaSyx offers further advantages. For example, applications that predict maintenance intervals can be implemented. In order to avoid downtimes, companies can change the configuration of the production process in advance - practising "Predictive Maintenance" - and thus avoid downtimes. In addition, the middleware enables the production process to be monitored from the office floor. Today, if a new device is to be connected to a production cell, the change must be transmitted over several levels on the shop floor until it reaches the systems on the office floor. This makes the maintenance of production equipment and systems very inflexible. With Eclipse BaSyx this becomes possible. In addition to the required device maintenance, the real-time data is available for various analyses, e.g. for optimizing the manufacturing process or to ensure product quality and reduce scrap.
+
+## With Shopfloor 4.0, Industrie 4.0 goes into practice as a complete package
+Fraunhofer IESE, NetApp and objective partner are jointly developing the Industry 4.0 solution "Shopfloor 4.0". NetApp provides the IT stack, Fraunhofer IESE integrates Eclipse BaSyx, and objective partner provides first-level support for the solution which integrates Eclipse BaSyx with SAP processes.
+Information about Shopfloor 4.0: https://www.objective-partner.de/shopfloor-40-flexibilitaet-in-der-fertigung/
\ No newline at end of file
diff --git a/content/about/BaSyxDesign.png b/content/contributing/images/BaSyxDesign.png
similarity index 100%
copy from content/about/BaSyxDesign.png
copy to content/contributing/images/BaSyxDesign.png
Binary files differ
diff --git a/content/contributing/index.md b/content/contributing/index.md
new file mode 100644
index 0000000..60282fd
--- /dev/null
+++ b/content/contributing/index.md
@@ -0,0 +1,156 @@
+---
+title: "Contributing to Eclipse BaSyx"
+date: 2019-01-29T09:46:31+02:00
+draft: false
+---
+
+**Get in touch** ! There is the
+### [BaSyx-dev mailing list](https://accounts.eclipse.org/mailing-list/BaSyx-dev) and a
+### **bi-weekly** [Zoom meeting](https://eclipse.zoom.us/j/537310990) every Thursday on even calendar weeks from 1-2pm (CET/CEST).
+
+-----------
+-----------
+
+
+# How to contribute to Eclipse BaSyx
+Great that you are interested in contributing to Eclipse BaSyx.
+We really looking forward to receive your contribution!
+
+In the project we agreed upon the following approach to add contributions to the project.
+
+1. Meet the Definition of Done (DoD)
+2. A review took place for the code
+3. The new feature was at least once tested manually, deployed to a running test instance
+4. Clearly outline third party dependencies
+
+## Definition of Done
+First, we have DoD for solved issues. Please check if you met all the items in the following list:
+
+* File headers in file OK (see section [License Headers](#licensing-and-file-header) for details)
+
+* Each new feature is developed in a separate branch
+ * Development branches should be named like`<github-nickname>/<issue>/<description>`, e.g. bs-jokri/#2/fix-connection-handling
+
+* Coding style
+ * Clean code is encouraged (see ‘Clean Code’ by Robert C. Martin or the
+ [Clean Code Cheatsheet](https://www.bbv.ch/images/bbv/pdf/downloads/V2_Clean_Code_V3.pdf).
+ Reviewers might refer to specific clean code practices to help improve contributed code.
+
+* Avoid (serious) compiler warnings
+
+* Add tests for new / added functionality
+
+* All tests pass
+ * Unit testing as it is already present
+ * You have more - use them!
+
+* Documentation
+ * Provide the necessary technical documentation of your feature in the respective
+ Github repository that you contribute to. Documentation is in markdown and it either
+ included in the top-level README.md file of the Github repository, or linked from
+ there.
+ * Update the high-level overview of Kuksa in the [kuksa.integration Wiki at Github](https://github.com/eclipse/kuksa.integration/wiki).
+ From the wiki, provide links to relevant technical documentation in the Github repositories.
+
+* Commit style
+ * Please write brief and useful commit messages: Separate the subject from body with a blank line because the subject line
+ is shown in the git history and should summarize the commit body. Use the body to explain what and why vs. how.
+ https://chris.beams.io/posts/git-commit/#seven-rules has more tips and details.
+ * Before you push your commits to a repository, you can squash your commits into one or more logical units of work, e.g. if
+ you want to add a new feature solely in a single commit.
+ * The [Pro Git book](https://git-scm.com/book/en/v2/) has a great section on [Rewriting
+ History](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History) and a section
+ on [Squashing](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#_squashing).
+ * Rebase during pull (i.e. `git pull --rebase`) instead of merging so all commits can
+ be signed off. You can also
+ [configure git to rebase by default](https://stackoverflow.com/questions/13846300/how-to-make-git-pull-use-rebase-by-default-for-all-my-repositories)
+ - you IDE will also have according configuration options.
+ * If you are not a committer to the project your commits need to be signed off with a valid Eclipse user account. Check the Eclipse handbook for details ([Eclipse Project Handbook](https://www.eclipse.org/projects/handbook/#resources-commit)).
+
+If you checked your code according to the DoD and you feel it can be merged to master, please create a PR to master.
+Each PR that is merged to master has to pass all tests and needs a code review of some other person of the project that looks onto your contribution from another angle,
+i.e. didn't work with you on the new feature. Probably a good idea is to have someone from another organization doing the review.
+Maybe you already have someone in mind doing the review, then request a review from this person via the github review functionallity.
+
+## Review
+If you conduct a code review, please look at the following issues:
+
+ * Is code style ok, not really formatting, but issues like style attributes in HTML tags or exception handling useful
+ * Are DoD items reached
+ * Are there any design / architecture issues
+ * Does the new feature fit the overall project goal, is it suitable for the community
+
+## Manual Test
+If applicable the new feature should at least be deployed and tested by someone before actually merged to master.
+This could be done by the same person that is doing the review but could be performed by another person.
+
+
+After review and tests are finished it should be documented who actually did the review and the test.
+Do this with the following lines in the comments of the PR.
+```
+review-by:email@domain.com
+```
+and
+```
+tested-by:email@domain.com
+```
+
+## Third party dependencies
+
+If you use third party content (import / include ...), you are required to list each third party content explicitly with its version number in the documentation or your pull-request comment.
+Please note that GPL software cannot be approved for Eclipse Kuksa.
+
+## Licensing and file header
+
+All files contributed require headers - this will ensure the license and copyright clearing at the end.
+Also, all contributions must have the same license as the original source.
+
+If a file has relevant functionality add the official EPL-2.0 header as described here
+https://www.eclipse.org/legal/epl-2.0/faq.php#h.q72cnghf29k0
+
+We recommend to use the releng copyright tool at:
+https://wiki.eclipse.org/Development_Resources/How_to_Use_Eclipse_Copyright_Tool
+
+```
+/*********************************************************************
+* Copyright (c) {date} {owner} [and others]
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
+```
+(please adapt comment characters usage)
+
+For small files such as property files, configuration files or standard XML files:
+
+```
+# Copyright <COPYRIGHT_HOLDER>, <YEAR>. Part of the Eclipse Kuksa Project.
+#
+# All rights reserved. This configuration file is provided to you under the
+# terms and conditions of the Eclipse Distribution License v1.0 which
+# accompanies this distribution, and is available at
+# http://www.eclipse.org/org/documents/edl-v10.php
+```
+
+## Eclipse Contributor Agreement
+
+Before your contribution can be accepted by the project team contributors must
+electronically sign the Eclipse Contributor Agreement (ECA).
+
+* http://www.eclipse.org/legal/ECA.php
+
+Commits that are provided by non-committers must have a Signed-off-by field in
+the footer indicating that the author is aware of the terms by which the
+contribution has been provided to the project. The non-committer must
+additionally have an Eclipse Foundation account and must have a signed Eclipse
+Contributor Agreement (ECA) on file.
+
+For more information, please see the Eclipse Committer Handbook:
+https://www.eclipse.org/projects/handbook/#resources-commit
+
+
+
+
\ No newline at end of file
diff --git a/content/use case/BigDataAnalytics.md b/content/use case/BigDataAnalytics.md
deleted file mode 100644
index 39be69a..0000000
--- a/content/use case/BigDataAnalytics.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-title: "Enabler Of Big Data Analytics"
-#date: 2019-03-13
-tags: ["Big Data Analytics"]
-#banner: "img/banners/banner-8.jpg"
-
----
-<p class="lead">
-Every factory device creates a continuous stream of data. Data analytics can provide valuable insights into production processes:
-<ul class="lead">
- <li>Which variables have impacts on production cost and quality?</li>
- <li>How can we predict production performance?</li>
- <li>Where is hidden potential for optimization in my manufacturing processes?</li>
-</ul>
-<p/>
-<p class="lead">
-Data analytics requires the combination of data from different sources, i.e. production devices, as well as IT servers. The ability of Eclipse BaSyx to structure machine and product data in Asset Administration Shells, enriching both with semantic information, then combining them, is the enabler for big data analysis. System architects can freely choose which cloud optionally preprocessed data is transferred. This ensures that data ownership remains with product and machine owners.
-<p/>
-<p style="text-align:center;">
- <a href="/basyx/use case/images/BigDataAnalytics.jpg">
- <img style="border:1px solid black" src="/basyx/use case/images/BigDataAnalytics.jpg" border="2" width="100%" alt=""/>
- </a>
-</p>
-</br></br>
\ No newline at end of file
diff --git a/content/use case/ChangeableProduction.md b/content/use case/ChangeableProduction.md
deleted file mode 100644
index 9a63b55..0000000
--- a/content/use case/ChangeableProduction.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-title: "Changeable Production To Enable Profitable Lot Size 1"
-#date: 2019-03-13
-tags: ["changeable production", "lot size 1"]
-#banner: "img/banners/banner-8.jpg"
----
-<p class="lead">
-Current production industry is designed for large lot sizes. Due to the shorter product lifecycles, manufacturing industry needs to shift its focus. Rapidly changing market requirements demand efficient changeable production processes. Furthermore, customers are increasingly attracted to tailored products that yield a much higher value creation than mass-produced goods. A major challenge for process changes is the necessary reprogramming of Programmable Logic Controllers (PLC). PLCs implement automation programs that execute pre-programmed sequences, optionally supporting a pre-defined amount of flexibility. The lack of a defined process model causes side-effects when PLC programs are changed, causing expensive down times for testing and fixing.
-<p/>
-<p class="lead">
-Eclipse BaSyx introduces service oriented programming for devices. PLC controllers implement real-time production services, an orchestrator controls service invocation, e.g. based on a recipe. This explicit process modeling enables rapid changes and removes side effects. BaSyx introduces the required interoperability and abstraction with the concept of the Asset Administration Shell and service interfaces. Through the standardization inherent in the Asset Administration Shell, devices may be replaced by another device with equal service interfaces, without having to change the plant application.
-<p/>
-<p style="text-align:center;">
- <a href="/basyx/use case/images/ChangableProduction.jpg">
- <img style="border:1px solid black" src="/basyx/use case/images/ChangableProduction.jpg" border="2" width="100%" alt=""/>
- </a>
-</p>
-</br></br>
\ No newline at end of file
diff --git a/content/use case/ConnectingITWithProductionDevices.md b/content/use case/ConnectingITWithProductionDevices.md
deleted file mode 100644
index cbe23cf..0000000
--- a/content/use case/ConnectingITWithProductionDevices.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-title: "Connecting IT And Production Devices On The Shop-Floor"
-#date: 2019-03-13
-tags: ["Dashboards", "Monitoring", "from Office-Floor to Shop-Floor"]
-#banner:"img/banners/banner-8.jpg"
----
-<p class="lead">
-Walking around the shop-floor to manually query machine states is inefficient and prevents operators from efficiently obtaining a holistic view on the complete production process. Streaming of live production data to IT on the office-floor remains a challenge that prevents efficient monitoring and understanding of production processes.
-<p/>
-<p class="lead">
-The BaSyx Virtual Automation Bus (VAB) enables machine to machine communication across the layers of the automation pyramid; shop-floor devices can directly interact with enterprise resource planning (ERP) systems, even if they use different protocols. Dashboards show focused process views and enable live monitoring of products and production processes. They enable workers and operators to monitor production processes, understand them, evaluate potential optimization, and to understand the impact of every production station on organizational success. Customers may access live production data to monitor the progress of their orders. Logistics may be dispatched on the spot to save storage space.
-<p/>
-<p style="text-align:center;">
- <a href="/basyx/use case/images/ConnectingITandDevices.jpg">
- <img style="border:1px solid black" src="/basyx/use case/images/ConnectingITandDevices.jpg" border="2" width="100%" alt=""/>
- </a>
-</p>
-</br></br>
\ No newline at end of file
diff --git a/content/use case/NewBusinessModels.md b/content/use case/NewBusinessModels.md
deleted file mode 100644
index 9fc3de2..0000000
--- a/content/use case/NewBusinessModels.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-title: "Enabler For New Business Models"
-#date: 2019-03-13
-tags: ["New Business Models"]
-#banner: "img/banners/banner-8.jpg"
----
-<p class="lead">
-Industrie 4.0 is about more efficient mass-production processes, and mass-customization, the efficient and inexpensive production of small lot sizes. Industrie 4.0 is also the end-to-end digitalization of manufacturing and enables new business models. The following exemplary Industrie 4.0 business models can be implemented with Eclipse BaSyx.
-<ol type="a" class="lead">
- <li><b>Data Brokering</b></br>Data produced in manufacturing processes is extremely valuable for equipment manufacturers and other third-party businesses since it enables prediction and optimization of manufacturing processes and product quality. Prediction models based on the combination of data from different sources will yield business advantages for companies, but they require a large data pool for their creation. Brokering of data, the ability to provide anonymized data that is compliant with the privacy of data providers, but that is a valuable source for data users, will be a key business after the fourth industrial revolution. </li></br>
- <li><b>Virtual Prototyping & Continuous Engineering</b></br>The integration of new devices and new device programs requires a significant amount of time during a change to production. Digital device twins may reduce this required time by providing, for example interaction models that enable engineers to adjust device-to-device communication and to validate service calls, call parameter, and potential side-effects without having to stop the production line. Asset Administration Shells provide the ability to store these simulation models in sub models, and to deliver them before the physical device is delivered. Ideally, production systems can communicate with a digital twin without knowing whether the communication partner is a virtual prototype or the real asset. This significantly reduces downtimes when integrating new devices, or when changing critical processes.</li></br>
- <li><b>Production as a Service</b></br>Production-as-a-Service changes the business model of manufacturers from selling produced goods to becoming the sole operator of a plant. Production is on a contract basis that guarantees access to manufacturing machines and resource availability. Manufacturing companies can focus on their core business: the manufacturing of goods. Customers can save time and costs, as well as react quickly to changing lot sizes. For smaller production companies there is an opportunity to sell selected machines via production-as-a-service models to compensate unused times. Companies that produce similar goods may implement production-as-a service as load-balancing to compensate periods with fewer requests and, at the same time, enable handling of requests that would be too large for their own machines. </li>
-</ol>
-<p/>
-<p style="text-align:center;">
- <a href="/basyx/use case/images/NewBusinessModels.jpg">
- <img style="border:1px solid black" src="/basyx/use case/images/NewBusinessModels.jpg" border="2" width="100%" alt=""/>
- </a>
-</p>
-</br></br>
\ No newline at end of file
diff --git a/content/use case/PredictiveMaintenance.md b/content/use case/PredictiveMaintenance.md
deleted file mode 100644
index c20f54a..0000000
--- a/content/use case/PredictiveMaintenance.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-title: "Predictive Maintenance"
-#date: 2019-03-13
-tags: ["Predictive Maintenance"]
-#banner:"img/banners/banner-8.jpg"
----
-<p class="lead">
-Repairing a device once it’s ‘broken’ can lead to unpredictable and expensive downtime. Scheduled maintenance improves the situation, but a static maintenance schedule can cause unnecessary interruptions. In the worst case, required parts need to be ordered, extending downtimes significantly. Predictive maintenance solves these issues:
-<ol class="lead">
- <li>Combining live sensor data and past experience enables prediction of necessary maintenance activities and schedules. Production processes can then be adapted to synchronize and integrate maintenance activities with the least possible impact.</li> </br>
- <li>Predictive maintenance data can be live information regarding the product quality that the devices produce. Maintenance for devices that produce lower quality batches may be delayed in this scenario, as long as the device output is still satisfactory.</li> </br>
- <li>Required spare parts may be ordered just in time, saving storage space and minimizing down times.</li>
-</ol>
-<p/>
-<p style="text-align:center;">
- <a href="/basyx/use case/images/PredictiveMaintenance.jpg">
- <img style="border:1px solid black" src="/basyx/use case/images/PredictiveMaintenance.jpg" width="100%" height="100%" alt=""/>
- </a>
-</p>
-</br></br>
\ No newline at end of file
diff --git a/content/use case/images/BigDataAnalytics.jpg b/content/use case/images/BigDataAnalytics.jpg
deleted file mode 100644
index a684fe3..0000000
--- a/content/use case/images/BigDataAnalytics.jpg
+++ /dev/null
Binary files differ
diff --git a/content/use case/images/ChangableProduction.jpg b/content/use case/images/ChangableProduction.jpg
deleted file mode 100644
index 3a91c6b..0000000
--- a/content/use case/images/ChangableProduction.jpg
+++ /dev/null
Binary files differ
diff --git a/content/use case/images/ConnectingITandDevices.jpg b/content/use case/images/ConnectingITandDevices.jpg
deleted file mode 100644
index 9455d97..0000000
--- a/content/use case/images/ConnectingITandDevices.jpg
+++ /dev/null
Binary files differ
diff --git a/content/use case/images/NewBusinessModels.jpg b/content/use case/images/NewBusinessModels.jpg
deleted file mode 100644
index 394ab91..0000000
--- a/content/use case/images/NewBusinessModels.jpg
+++ /dev/null
Binary files differ
diff --git a/content/use case/images/PredictiveMaintenance.jpg b/content/use case/images/PredictiveMaintenance.jpg
deleted file mode 100644
index 67d7510..0000000
--- a/content/use case/images/PredictiveMaintenance.jpg
+++ /dev/null
Binary files differ
diff --git a/data/carousel/BaSyx-slide-01.yaml b/data/carousel/BaSyx-slide-01.yaml
index 94463a0..d8e2417 100644
--- a/data/carousel/BaSyx-slide-01.yaml
+++ b/data/carousel/BaSyx-slide-01.yaml
@@ -1,5 +1,4 @@
weight: 2
title: "Eclipse BaSyx"
-description: ""
-#"<p>Open source </br> Industrie 4.0 middleware</p>"
+description: "<p>Industrie 4.0 middleware.</p>"
image: "img/carousel/basyx-slide-01.png"
diff --git a/data/features/aas.yaml b/data/features/aas.yaml
new file mode 100644
index 0000000..e09fc33
--- /dev/null
+++ b/data/features/aas.yaml
@@ -0,0 +1,16 @@
+weight: 1
+name: "Asset Administration Shells"
+description: "Asset Administration Shells (AAS) implement the Digital Twin and serve as unified interfaces for manufacturing assets that are usually using heterogenous communication technologies.
+<br> Eclipse BaSyx supports AAS types 1, 2 and 3."
+# Uncomment to add a link
+#link: "/basyx/use-case/bigdataanalytics"
+
+# Use either an image OR an icon
+image: "img/features/aas.png"
+#icon: "fa fa-line-chart"
+
+#"far fa-chart-bar"
+#"fab fa-mixcloud"
+#"fas fa-database"
+
+
diff --git a/data/features/analysis.yaml b/data/features/analysis.yaml
new file mode 100644
index 0000000..31fc055
--- /dev/null
+++ b/data/features/analysis.yaml
@@ -0,0 +1,16 @@
+weight: 6
+name: "Data Analysis"
+description: "Realizing applications for manufacturing data analysis and dashboards is possible with
+Eclipse BaSyx' ability of end-to-end communication and unified interfaces."
+# Uncomment to add a link
+#link: "/basyx/use-case/bigdataanalytics"
+
+# Use either an image OR an icon
+image: "img/features/analysis.png"
+#icon: "fa fa-line-chart"
+
+#"far fa-chart-bar"
+#"fab fa-mixcloud"
+#"fas fa-database"
+
+
diff --git a/data/features/bigDataAnalytics.yaml b/data/features/bigDataAnalytics.yaml
deleted file mode 100644
index e6a6e35..0000000
--- a/data/features/bigDataAnalytics.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-weight: 3
-name: "Enabler Of Big Data Analytics"
-description: "Connecting production devices on the shop-floor with data analysis on the office-floor, adapting data provided by devices"
-# Uncomment to add a link
-link: "/basyx/use-case/bigdataanalytics"
-
-# Use either an image OR an icon
-#image: ""
-icon: "fa fa-line-chart"
-
-#"far fa-chart-bar"
-#"fab fa-mixcloud"
-#"fas fa-database"
-
-
diff --git a/data/features/changeableProduction.yaml b/data/features/changeableProduction.yaml
deleted file mode 100644
index c05e171..0000000
--- a/data/features/changeableProduction.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-weight: 1
-name: "Changeable Production To Enable Profitable Lot Size 1"
-description: "Implementing changeable production, mass producing individualized goods and creating competitive advantage by reacting efficiently to changing market demands"
-
-# Uncomment to add a link
-link: "/basyx/use-case/changeableproduction"
-
-# Use either an image OR an icon
-# image: "[image-path]"
-icon: "fa fa-industry"
-#"fas fa-industry"
-#"fas fa-cubes"
\ No newline at end of file
diff --git a/data/features/cloud.yaml b/data/features/cloud.yaml
new file mode 100644
index 0000000..5a755a9
--- /dev/null
+++ b/data/features/cloud.yaml
@@ -0,0 +1,15 @@
+weight: 5
+name: "Cloud Infrastructure"
+description: "Shifting infrastructure according to demand is easy with Eclipse BaSyx' cloud connectivity and container-based deployment."
+# Uncomment to add a link
+#link: "/basyx/use-case/bigdataanalytics"
+
+# Use either an image OR an icon
+image: "img/features/cloud.png"
+#icon: "fa fa-line-chart"
+
+#"far fa-chart-bar"
+#"fab fa-mixcloud"
+#"fas fa-database"
+
+
diff --git a/data/features/connectingITProductionDevices.yaml b/data/features/connectingITProductionDevices.yaml
deleted file mode 100644
index fa225e8..0000000
--- a/data/features/connectingITProductionDevices.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-weight: 2
-name: "Connecting IT and production devices on the shop-floor"
-description: "Monitoring multiple devices from one location, creating dashboards that combine data sources, highlighting potential optimizations and live production data"
-
-# Uncomment to add a link
-link: "/basyx/use-case/connectingitwithproductiondevices"
-
-# Use either an image OR an icon
-# image: "[image-path]"
-icon: "fa fa-sitemap"
-#"fas fa-sitemap"
diff --git a/data/features/fieldbus.yaml b/data/features/fieldbus.yaml
new file mode 100644
index 0000000..f3fe244
--- /dev/null
+++ b/data/features/fieldbus.yaml
@@ -0,0 +1,15 @@
+weight: 3
+name: "End-to-end Communication"
+description: "Eclipse BaSyx enables an end-to-end networking from shopfloor to IT level. This guarantees a continuous data access from IT systems to manufacturing devices."
+# Uncomment to add a link
+#link: "/basyx/use-case/bigdataanalytics"
+
+# Use either an image OR an icon
+image: "img/features/fieldbus.png"
+#icon: "fa fa-line-chart"
+
+#"far fa-chart-bar"
+#"fab fa-mixcloud"
+#"fas fa-database"
+
+
diff --git a/data/features/it.yaml b/data/features/it.yaml
new file mode 100644
index 0000000..31aa18d
--- /dev/null
+++ b/data/features/it.yaml
@@ -0,0 +1,16 @@
+weight: 4
+name: "IT Systems Connectivity"
+description: "Eclipse BaSyx integrates ERP systems, MES and the IT infrastructure with unified interfaces.
+Data exchange between different IT systems is made easy."
+# Uncomment to add a link
+#link: "/basyx/use-case/bigdataanalytics"
+
+# Use either an image OR an icon
+image: "img/features/it.png"
+#icon: "fa fa-line-chart"
+
+#"far fa-chart-bar"
+#"fab fa-mixcloud"
+#"fas fa-database"
+
+
diff --git a/data/features/lotSize1.yaml b/data/features/lotSize1.yaml
new file mode 100644
index 0000000..9dfa98c
--- /dev/null
+++ b/data/features/lotSize1.yaml
@@ -0,0 +1,16 @@
+weight: 2
+name: "Lot Size 1 Production"
+description: "Eclipse BaSyx enables a service-oriented production which is the key factor for a changeable production.
+Thus, an efficient lot size one is made possible."
+# Uncomment to add a link
+#link: "/basyx/use-case/bigdataanalytics"
+
+# Use either an image OR an icon
+image: "img/features/roboter.png"
+#icon: "fa fa-line-chart"
+
+#"far fa-chart-bar"
+#"fab fa-mixcloud"
+#"fas fa-database"
+
+
diff --git a/data/features/newBusinessModels.yaml b/data/features/newBusinessModels.yaml
deleted file mode 100644
index ca75a5c..0000000
--- a/data/features/newBusinessModels.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-weight: 4
-name: "Enabler For New Business Models "
-description: "New business models utilizing new data sources like Big Data or marketplaces"
-
-# Uncomment to add a link
-link: "/basyx/use-case/newbusinessmodels"
-
-# Use either an image OR an icon
-# image: "[image-path]"
-icon: "fa fa-lightbulb-o"
\ No newline at end of file
diff --git a/data/features/predictiveMaintenance.yaml b/data/features/predictiveMaintenance.yaml
deleted file mode 100644
index 08a1cd2..0000000
--- a/data/features/predictiveMaintenance.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-weight: 5
-name: "Predictive Maintenance"
-description: "Increasing machine uptime and availability as well as optimizing maintenance downtimes"
-
-# Uncomment to add a link
-link: "/basyx/use-case/predictivemaintenance"
-
-# Use either an image OR an icon
-# image: "[image-path]"
-icon: "fa fa-wrench"
-#"fas fa-wrench"
-#"fas fa-user-cog"
-#"fas fa-cogs"
\ No newline at end of file
diff --git a/data/features/readMore.yaml b/data/features/readMore.yaml
deleted file mode 100644
index 2f0f927..0000000
--- a/data/features/readMore.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-weight: 6
-name: "read more"
-description: ""
-
-# Uncomment to add a link
-link: "/basyx/use-case"
-
-# Use either an image OR an icon
-# image: "[image-path]"
-icon: "fa fa-arrow-right"
\ No newline at end of file
diff --git a/data/testimonials/1.yaml b/data/testimonials/1.yaml
new file mode 100644
index 0000000..c41337e
--- /dev/null
+++ b/data/testimonials/1.yaml
@@ -0,0 +1,6 @@
+text: "Eclipse BaSyx with its interoperable architecture enables us and our customers to bring product data directly from product development to manufacturing.
+This is relevant for highly variable Configure-to-Order products (-> lot size 1).
+Also feedback from the shop floor to the engineering (product type) as well as to single products (instances -> Digital Twins) can be realized."
+name: "Christian Muggeo"
+position: "Team Lead Eng. Transformation, CONTACT Software"
+avatar: "img/testimonials/christian-muggeo.jpg"
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 946715d..2689c19 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -20,13 +20,13 @@
<div class="row">
<!-- *** LEFT COLUMN *** -->
- <div class="col-md-9">
+ <div class="col-md-9" id="blog-listing-medium">
- {{ $paginator := .Paginate (where .Data.Pages "Type" "use case") }}
+ {{ $paginator := .Paginate (where .Data.Pages "Type" "in" (slice "blog" "offer") )}}
{{ range $paginator.Pages }}
<section class="post">
<div class="row">
- <!--div class="col-md-4">
+ <div class="col-md-4">
<div class="image">
<a href="{{ .Permalink }}">
{{ if .Params.banner }}
@@ -35,8 +35,8 @@
<img src="{{ .Site.BaseURL}}img/placeholder.png" class="img-responsive" alt="">
{{ end }}
</a>
- </div>
- </div-->
+ </div>
+ </div>
<div class="col-md-8">
<h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
<div class="clearfix">
@@ -51,9 +51,9 @@
{{ end }}
</p>
- <!--p class="date-comments">
+ <p class="date-comments">
<a href="{{ .Permalink }}"><i class="fa fa-calendar-o"></i> {{ .Date.Format .Site.Params.date_format }}</a>
- </p-->
+ </p>
</div>
<p class="intro">{{ .Summary }}</p>
<p class="read-more"><a href="{{ .Permalink }}" class="btn btn-template-main">{{ i18n "continueReading" }}</a>
@@ -63,19 +63,19 @@
</section>
{{ end }}
- <!--<ul class="pager">
+ <ul class="pager">
{{ if .Paginator.HasPrev }}
- <li class="previous"><a href="{{ .Site.BaseURL }}{{ .Paginator.Prev.URL }}">← {{ i18n "newer" }}</a></li>
+ <li class="previous"><a href="{{ .Site.BaseURL }}{{ .Paginator.Prev.URL }}">← {{ i18n "next" }}</a></li>
{{ else }}
- <li class="previous disabled"><a href="#">← {{ i18n "newer" }}</a></li>
+ <li class="previous disabled"><a href="#">← {{ i18n "next" }}</a></li>
{{ end }}
{{ if .Paginator.HasNext }}
- <li class="next"><a href="{{ .Site.BaseURL }}{{ .Paginator.Next.URL }}">{{ i18n "older" }} →</a></li>
+ <li class="next"><a href="{{ .Site.BaseURL }}{{ .Paginator.Next.URL }}">{{ i18n "previous" }} →</a></li>
{{ else }}
- <li class="next disabled"><a href="#">{{ i18n "older" }} →</a></li>
+ <li class="next disabled"><a href="#">{{ i18n "previous" }} →</a></li>
{{ end }}
- </ul>-->
+ </ul>
</div>
<!-- /.col-md-9 -->
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 4aad058..bc6af37 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -2,6 +2,8 @@
<html lang="{{ .Site.LanguageCode }}">
{{ partial "head.html" . }}
+
+
<body>
@@ -22,11 +24,17 @@
<!-- *** LEFT COLUMN *** -->
- <div class="col-md-9" id="blog-post">
+ <div class="col-md-9" id="blog-post">
+ <div class="image" align="center">
+ {{ if .Params.banner }}
+ <img src="{{ .Site.BaseURL}}{{ .Params.banner }}" class="img-responsive" alt="">
+ {{ else }}
+ <img src="{{ .Site.BaseURL}}img/placeholder.png" class="img-responsive" alt="">
+ {{ end }}
+ </div>
- <!--p class="text-muted text-uppercase mb-small text-right">{{ if .Params.author }}{{ i18n "authorBy" }} <a href="#">{{ .Params.author }}</a> | {{ end }}{{ .Date.Format .Site.Params.date_format }}</p-->
- <p class="text-muted text-uppercase mb-small text-right">{{ if .Params.author }}{{ i18n "authorBy" }} <a href="#">{{ .Params.author }}</a> | {{ end }}</p>
-
+ <p class="text-muted text-uppercase mb-small text-right"> {{ if .Params.img_source }}{{ .Params.img_source }} | {{ end }} {{ if .Params.author }}{{ i18n "authorBy" }} <a href="#">{{ .Params.author }}</a> | {{ end }} {{ if .Params.date }}{{ .Date.Format .Site.Params.date_format }} {{ end }}</p>
+
<div id="post-content">
{{ .Content }}
</div>
diff --git a/layouts/index.html b/layouts/index.html
index bed63bd..4c29bc8 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -15,7 +15,7 @@
</header>
- {{ partial "carousel.html" . }}
+ <!--{{ partial "carousel.html" . }}-->
{{ partial "about.html" . }}
@@ -25,8 +25,8 @@
{{ partial "see_more.html" . }}
- <!-- {{ partial "recent_posts.html" . }} -->
-
+ {{ partial "recent_posts.html" . }}
+
{{ partial "clients.html" . }}
{{ partial "footer.html" . }}
diff --git a/layouts/partials/about.html b/layouts/partials/about.html
index 8d9e4ea..1337d8e 100644
--- a/layouts/partials/about.html
+++ b/layouts/partials/about.html
@@ -5,7 +5,31 @@
<div class="dark-mask"></div>
<div class="container">
<div class="col-md-12">
- {{range where .Site.Pages "Type" "=" "about"}}
+ <div class="col-md-7">
+ <p style="text-align:left;">
+
+ <div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden;">
+ <iframe src="https://www.youtube-nocookie.com/embed/kx2F5E5foLU" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; border:0;" allowfullscreen="" title="YouTube Video"></iframe>
+ </div>
+ </p>
+
+ </div>
+
+ <div class="col-md-5">
+ <div class="block">
+ <p class="lead">
+ <br>
+ Eclipse BaSyx is the open source implementation of key concepts defined by the Platform Industrie 4.0, such as the Asset Administration Shell.
+ </p>
+ <p class="lead">
+ The Eclipse BaSyx Platform provides ready-to-use components and extendable software development kits (SDK) for Java, C++ and C#.
+ </p>
+ </div>
+ </div>
+
+
+
+ <!--{{range where .Site.Pages "Type" "=" "about"}}
<div class="heading text-center">
<h2>{{ .Title }}</h2>
</div>
@@ -13,7 +37,7 @@
<p class="read-more">
<a href="{{ .Permalink }}" class="btn btn-template-main">{{ i18n "continueReading" }}</a>
</p>
- {{ end }}
+ {{ end }}-->
</div>
</div>
<!-- /.container -->
diff --git a/layouts/partials/features.html b/layouts/partials/features.html
index c9a5fbc..bf4d15e 100755
--- a/layouts/partials/features.html
+++ b/layouts/partials/features.html
@@ -2,16 +2,30 @@
{{ if .Site.Params.features.enable }}
{{ if gt (len .Site.Data.features) 0 }}
<section class="bar background-white">
+
+
<div class="container">
+
<div class="col-md-12">
- <div class="heading text-center">
- <!--<h2>{{ .Site.Params.features.title }}</h2> -->
- <h2>{{ "Use Cases" }}</h2>
- </div>
- </div>
+ <div class="heading text-center">
+ <!--h2>{{ .Site.Params.features.title }}</h2-->
+ <!--h2>{{ "Features" }}</h2-->
+ </div>
+ </div>
+
+ <div class="container col-md-12 img-responsive">
+ <p style="text-align:center;">
+ <img src="img/BaSyxFeatures.png" alt="BaSyx Features">
+ </p>
+ </br>
+ </br>
+
+ </div>
+
+
{{ range $index, $element := sort .Site.Data.features "weight" }}
{{ if eq (mod $index 3) 0 }}
- <div class="col-md-12">
+ <div class="col-md-12">
<div class="row">
{{ end }}
<div class="col-md-4">
@@ -31,7 +45,7 @@
{{ $element.name }}
{{ if isset $element "link"}}</a>{{ end }}
</h3>
- <p>{{ $element.description | markdownify }}</p>
+ <p align= "center">{{ $element.description | markdownify }}</p>
</div>
</div>
{{ if or (eq (mod $index 3) 2) (eq $index (sub (len $.Site.Data.features) 1 )) }}
@@ -44,3 +58,6 @@
{{ end }}
{{ end }}
{{ end }}
+
+
+
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 0c4b4b5..a094f6c 100755
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -13,11 +13,11 @@
</div>
<div class="col-md-4 col-sm-6" align="center">
- <p><strong>Eclipse BaSyx</strong> has its origins in the <a href="https://www.basys40.de/">BaSys 4.0 project</a> that is funded by the german Bundesministerium für Bildung und Forschung (BMBF)</p>
+ <p align="justify" ><strong>Eclipse BaSyx</strong> has its origins in the <a href="https://www.basys40.de/">BaSys 4 </a> concept that has been developed in the research projects BaSys 4.0 and BaSys 4.2. Both projects are funded by the german Federal Ministry for Ecducation and Research (BMBF).</p>
<hr class="hidden-md hidden-lg hidden-sm"/> <p>
<a href="https://www.bmbf.de/"> <img src="{{ .Site.BaseURL}}img/BMBF_Logo.png" class="img-responsive" width="200" alt="BMBF"/></a>
- <p>Copyright © 2019 <a href="http://eclipse.org">The Eclipse Foundation</a>. <br/>All Rights Reserved.</p>
+ <p>Copyright © 2021 <a href="http://eclipse.org">The Eclipse Foundation</a>. <br/>All Rights Reserved.</p>
</div>
<div class="col-md-4 col-sm-6">
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 2f8715d..a2ec286 100755
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,6 +1,8 @@
-<!--{{ partial "widgets/search.html" . }}-->
-{{ partial "widgets/usecases.html" . }}
+{{ partial "widgets/search.html" . }}
+
+<!--{{ partial "widgets/usecases.html" . }}-->
<!--{{ partial "widgets/categories.html" . }}-->
-<!--{{ partial "widgets/tags.html" . }}-->
+{{ partial "widgets/tags.html" . }}
+{{ partial "widgets/fundedBMBF.html" .}}
diff --git a/layouts/partials/testimonials.html b/layouts/partials/testimonials.html
new file mode 100644
index 0000000..9a12bdd
--- /dev/null
+++ b/layouts/partials/testimonials.html
@@ -0,0 +1,49 @@
+{{ if isset .Site.Params "testimonials" }}
+{{ if .Site.Params.testimonials.enable }}
+{{ if gt (len .Site.Data.testimonials) 0 }}
+<section class="bar background-pentagon no-mb">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="heading text-center">
+ <h2>{{ .Site.Params.testimonials.title }}</h2>
+ </div>
+
+ <p class="lead" align="center" >
+ {{ .Site.Params.testimonials.subtitle | markdownify }}
+ </p>
+
+ <!-- *** TESTIMONIALS CAROUSEL *** -->
+
+ <ul class="owl-carousel testimonials same-height-row">
+ {{ range .Site.Data.testimonials }}
+ <li class="item">
+ <div class="testimonial same-height-always">
+ <div class="text">
+ <p>{{ .text | markdownify }}</p>
+ </div>
+ <div class="bottom">
+ <div class="icon"><i class="fa fa-quote-left"></i>
+ </div>
+ <div class="name-picture">
+ <img class="" alt="" src="{{ .avatar | absURL }}">
+ <h6>{{ .name }}</h6>
+ <p>{{ .position }}</p>
+ </div>
+ </div>
+ </div>
+ </li>
+ {{ end }}
+ </ul>
+ <!-- /.owl-carousel -->
+
+ <!-- *** TESTIMONIALS CAROUSEL END *** -->
+ </div>
+
+ </div>
+ </div>
+</section>
+<!-- /.bar -->
+{{ end }}
+{{ end }}
+{{ end }}
diff --git a/layouts/partials/widgets/fundedBMBF.html b/layouts/partials/widgets/fundedBMBF.html
new file mode 100644
index 0000000..7d7faab
--- /dev/null
+++ b/layouts/partials/widgets/fundedBMBF.html
@@ -0,0 +1,11 @@
+<div class="panel sidebar-menu">
+ <!--
+ <div class="panel-heading">
+ <h3 class="panel-title"></h3>
+ </div>
+ -->
+
+ <div class="panel-body">
+ <img src="../img/BMBF_SponsoredBy_2017.jpg" alt="">
+ </div>
+</div>
diff --git a/static/css/style.blue.css b/static/css/style.blue.css
index 08b619c..e9b03dc 100755
--- a/static/css/style.blue.css
+++ b/static/css/style.blue.css
@@ -12,11 +12,7 @@
.navbar-header:after {
clear: both;
}
-.center-block {
- display: block;
- margin-left: auto;
- margin-right: auto;
-}
+
.pull-right {
float: right !important;
}
@@ -63,10 +59,10 @@
cursor: pointer !important;
}
.required {
- color: #467fbf;
+ color: #0cb2f0;
}
.accent {
- color: #467fbf;
+ color: #0cb2f0;
}
.text-uppercase {
text-transform: uppercase;
@@ -99,7 +95,7 @@
.heading h4,
.heading h5 {
display: inline-block;
- border-bottom: solid 5px #467fbf;
+ border-bottom: solid 5px #0cb2f0;
line-height: 1.1;
margin-bottom: 0;
padding-bottom: 10px;
@@ -113,7 +109,7 @@
.heading h4 i.fa,
.heading h5 i.fa {
display: inline-block;
- background: #467fbf;
+ background: #0cb2f0;
width: 30px;
height: 30px;
vertical-align: middle;
@@ -148,7 +144,7 @@
.ul-icons li i {
width: 20px;
height: 20px;
- background: #467fbf;
+ background: #0cb2f0;
color: #fff;
text-align: center;
border-radius: 10px;
@@ -162,7 +158,6 @@
font-family: Roboto, Helvetica, Arial, Sans-Serif
}
-
#text-page h1,
#text-page h2,
#text-page h3 {
@@ -317,7 +312,7 @@
border-top: solid 5px transparent;
}
.navbar ul.nav > li > a:hover {
- border-top: solid 5px #467fbf;
+ border-top: solid 5px #0cb2f0;
}
.navbar ul.nav > li.active > a,
.navbar ul.nav > li.open > a {
@@ -336,7 +331,7 @@
.navbar.navbar-light ul.nav > li.active > a {
border-top: solid 5px #294d76;
background: #fff !important;
- color: #555555 !important;
+ color: #555555!important;
}
.navbar.navbar-light ul.nav > li.active > a:hover {
border-top: solid 5px #294d76;
@@ -345,7 +340,7 @@
.navbar.navbar-light ul.nav > li.open > a:hover,
.navbar.navbar-light ul.nav > li > a:focus,
.navbar.navbar-light ul.nav > li.open > a:focus {
- border-top: solid 5px #467fbf;
+ border-top: solid 5px #0cb2f0;
background: #fff !important;
color: #555555 !important;
}
@@ -371,7 +366,7 @@
left: 0;
}
.navbar ul.dropdown-menu li a:hover {
- color: #467fbf;
+ color: #0cb2f0;
text-decoration: none;
background: none;
left: 2px;
@@ -423,7 +418,7 @@
transition: all 0.2s ease-out;
}
.navbar .yamm-content ul li a:hover {
- color: #467fbf;
+ color: #0cb2f0;
text-decoration: none;
padding-left: 2px;
}
@@ -456,12 +451,12 @@
.navbar .btn-default:focus,
.navbar .btn-default.navbar-toggle:focus {
background-color: #fff;
- border-color: #467fbf;
- color: #467fbf;
+ border-color: #0cb2f0;
+ color: #0cb2f0;
}
.navbar #search {
clear: both;
- border-top: solid 1px #467fbf;
+ border-top: solid 1px #0cb2f0;
text-align: right;
}
.navbar #search form {
@@ -510,7 +505,7 @@
margin-bottom: 20px;
}
#login-modal a {
- color: #467fbf;
+ color: #0cb2f0;
}
#login-modal p {
font-weight: 300;
@@ -550,16 +545,16 @@
border-radius: 0;
}
.btn-template-main {
- color: #467fbf;
+ color: #0cb2f0;
background-color: #ffffff;
- border-color: #467fbf;
+ border-color: #0cb2f0;
}
.btn-template-main:hover,
.btn-template-main:focus,
.btn-template-main:active,
.btn-template-main.active,
.open > .dropdown-toggle.btn-template-main {
- color: #467fbf;
+ color: #0cb2f0;
background-color: #e6e6e6;
border-color: #336194;
}
@@ -584,19 +579,19 @@
.btn-template-main[disabled].active,
fieldset[disabled] .btn-template-main.active {
background-color: #ffffff;
- border-color: #467fbf;
+ border-color: #0cb2f0;
}
.btn-template-main .badge {
color: #ffffff;
- background-color: #467fbf;
+ background-color: #0cb2f0;
}
.btn-template-main:hover,
.btn-template-main:focus,
.btn-template-main:active,
.btn-template-main.active {
- background: #467fbf;
+ background: #0cb2f0;
color: #ffffff;
- border-color: #467fbf;
+ border-color: #0cb2f0;
}
.btn-template-transparent-primary {
color: #ffffff;
@@ -644,7 +639,7 @@
.btn-template-transparent-primary:active,
.btn-template-transparent-primary.active {
background: #fff;
- color: #467fbf;
+ color: #0cb2f0;
border-color: #fff;
}
.btn-template-transparent-black {
@@ -698,8 +693,8 @@
}
.btn-template-primary {
color: #ffffff;
- background-color: #467fbf;
- border-color: #467fbf;
+ background-color: #0cb2f0;
+ border-color: #0cb2f0;
}
.btn-template-primary:hover,
.btn-template-primary:focus,
@@ -730,11 +725,11 @@
.btn-template-primary.disabled.active,
.btn-template-primary[disabled].active,
fieldset[disabled] .btn-template-primary.active {
- background-color: #467fbf;
- border-color: #467fbf;
+ background-color: #0cb2f0;
+ border-color: #0cb2f0;
}
.btn-template-primary .badge {
- color: #467fbf;
+ color: #0cb2f0;
background-color: #ffffff;
}
#intro {
@@ -810,7 +805,7 @@
left: 0;
width: 100%;
height: 100%;
- background: #467fbf;
+ background: #0cb2f0;
opacity: 0.9;
filter: alpha(opacity=90);
}
@@ -893,7 +888,7 @@
.panel.sidebar-menu .panel-heading h4,
.panel.sidebar-menu .panel-heading h5 {
display: inline-block;
- border-bottom: solid 5px #467fbf;
+ border-bottom: solid 5px #0cb2f0;
line-height: 1.1;
margin-bottom: 0;
padding-bottom: 10px;
@@ -980,7 +975,7 @@
padding: 5px;
border: solid 1px #eeeeee;
border-radius: 0;
- color: #467fbf;
+ color: #0cb2f0;
margin: 5px 5px 5px 0;
text-transform: uppercase;
letter-spacing: 0.08em;
@@ -988,9 +983,9 @@
font-size: 12px;
}
.panel.sidebar-menu ul.tag-cloud li a:hover {
- color: #467fbf;
+ color: #0cb2f0;
text-decoration: none;
- border-color: #467fbf;
+ border-color: #0cb2f0;
}
.panel.sidebar-menu ul.popular,
.panel.sidebar-menu ul.recent {
@@ -1078,7 +1073,7 @@
padding: 6px 20px 6px 20px;
margin: 30px 10px 10px -71px;
color: #fff;
- background-color: #467fbf;
+ background-color: #0cb2f0;
font-family: "Roboto", Helvetica, Arial, sans-serif;
}
.ribbon .theribbon:before,
@@ -1122,7 +1117,7 @@
.owl-theme .owl-controls .owl-page.active span,
.owl-carousel .owl-controls.clickable .owl-page:hover span,
.owl-theme .owl-controls.clickable .owl-page:hover span {
- background: #467fbf;
+ background: #0cb2f0;
}
.owl-carousel .owl-controls .owl-buttons,
.owl-theme .owl-controls .owl-buttons {
@@ -1137,7 +1132,7 @@
line-height: 25px;
margin: 0 5px 0 0;
font-size: 18px;
- color: #467fbf;
+ color: #0cb2f0;
padding: 0;
background: #fff;
border-radius: 13px;
@@ -1160,8 +1155,8 @@
left: 0;
width: 100%;
height: 100%;
- background: #467fbf;
- opacity: 0.9;
+ background: #999999;
+ opacity: 0;
filter: alpha(opacity=90);
}
.home-carousel .owl-carousel {
@@ -1192,7 +1187,7 @@
.home-carousel h3,
.home-carousel p,
.home-carousel ul {
- color: #fff;
+ color: #555555;
}
.home-carousel h1 {
font-weight: 700;
@@ -1261,7 +1256,7 @@
.testimonials .item {
list-style-type: none;
margin: 0 5px;
- background: #fff;
+ background: #fbfbfb;
padding-bottom: 60px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
@@ -1288,7 +1283,7 @@
clear: both;
}
.testimonials .item .testimonial .text {
- color: #999999;
+ color: #555555;
margin-bottom: 40px;
}
.testimonials .item .testimonial .bottom {
@@ -1303,7 +1298,7 @@
height: 50px;
}
.testimonials .item .testimonial .bottom .icon {
- color: #467fbf;
+ color: #0cb2f0;
font-size: 30px;
float: left;
width: 20%;
@@ -1319,7 +1314,7 @@
letter-spacing: 0.08em;
}
.testimonials .item .testimonial .name-picture p {
- color: #999999;
+ color: #555555;
margin: 0;
font-size: 12px;
}
@@ -1439,8 +1434,8 @@
margin-bottom: 40px;
}
.box-simple .icon {
- color: #467fbf;
- border-color: #467fbf;
+ color: #0cb2f0;
+ border-color: #0cb2f0;
-webkit-transition: all 0.2s ease-out;
-moz-transition: all 0.2s ease-out;
transition: all 0.2s ease-out;
@@ -1515,7 +1510,7 @@
height: 100%;
opacity: 0;
filter: alpha(opacity=0);
- background: #467fbf;
+ background: #0cb2f0;
}
.box-image .name {
position: absolute;
@@ -1593,7 +1588,7 @@
height: 100%;
opacity: 0;
filter: alpha(opacity=0);
- background: #467fbf;
+ background: #0cb2f0;
}
.box-image-text .top .name {
position: absolute;
@@ -1756,7 +1751,7 @@
}
.bar {
position: relative;
- background: #467fbf;
+ background: #0cb2f0;
padding: 60px 0;
}
.bar.background-pentagon {
@@ -1890,14 +1885,14 @@
margin-bottom: 20px;
padding-bottom: 15px;
text-align: center;
- border: solid 1px #467fbf;
+ border: solid 1px #0cb2f0;
overflow: hidden;
}
.packages .package .package-header {
height: 57px;
color: #fff;
line-height: 57px;
- background: #467fbf;
+ background: #0cb2f0;
}
.packages .package .package-header h5 {
color: #fff;
@@ -1970,8 +1965,8 @@
height: 300px;
}
#map.with-border {
- border-top: solid 1px #467fbf;
- border-bottom: solid 1px #467fbf;
+ border-top: solid 1px #0cb2f0;
+ border-bottom: solid 1px #0cb2f0;
}
#blog-listing-big .post,
#blog-homepage .post {
@@ -1994,7 +1989,7 @@
#blog-homepage .post h2 a:hover,
#blog-listing-big .post h4 a:hover,
#blog-homepage .post h4 a:hover {
- color: #467fbf;
+ color: #0cb2f0;
}
#blog-listing-big .post .author-category,
#blog-homepage .post .author-category {
@@ -2014,7 +2009,7 @@
}
#blog-listing-big .post .date-comments a:hover,
#blog-homepage .post .date-comments a:hover {
- color: #467fbf;
+ color: #0cb2f0;
}
@media (min-width: 768px) {
#blog-listing-big .post .date-comments,
@@ -2064,7 +2059,7 @@
color: #555555;
}
#blog-listing-medium .post h2 a:hover {
- color: #467fbf;
+ color: #0cb2f0;
}
#blog-listing-medium .post .author-category {
float: left;
@@ -2086,7 +2081,7 @@
margin-right: 20px;
}
#blog-listing-medium .post .date-comments a:hover {
- color: #467fbf;
+ color: #0cb2f0;
}
@media (min-width: 768px) {
#blog-listing-medium .post .date-comments {
@@ -2353,7 +2348,7 @@
}
#productMain .sizes a.active,
#productMain .sizes a:hover {
- background: #467fbf;
+ background: #0cb2f0;
color: #fff;
}
#productMain .sizes input {
@@ -2370,7 +2365,7 @@
border: solid 1px transparent;
}
#thumbs a.active {
- border-color: #467fbf;
+ border-color: #0cb2f0;
}
#product-social {
text-align: center;
@@ -2423,7 +2418,7 @@
}
#checkout .nav {
margin-bottom: 20px;
- border-bottom: solid 1px #467fbf;
+ border-bottom: solid 1px #0cb2f0;
}
#checkout .nav li {
height: 100%;
@@ -2490,7 +2485,7 @@
margin-bottom: 30px;
}
#get-it {
- background: #467fbf;
+ background: #0cb2f0;
padding: 50px 0 30px;
color: #fff;
text-align: center;
@@ -2536,7 +2531,7 @@
color: #999999;
}
#footer ul a:hover {
- color: #467fbf;
+ color: #0cb2f0;
text-decoration: none;
}
#footer .photostream div {
@@ -2603,7 +2598,7 @@
margin: 0 10px 0 0;
}
#footer .social a:hover {
- color: #467fbf;
+ color: #0cb2f0;
}
#copyright {
background: #333;
@@ -2679,10 +2674,10 @@
.nav .open > a:hover,
.nav .open > a:focus {
background-color: #eeeeee;
- border-color: #467fbf;
+ border-color: #0cb2f0;
}
.nav-tabs {
- border-bottom: 1px solid #467fbf;
+ border-bottom: 1px solid #0cb2f0;
}
.nav-tabs > li {
float: left;
@@ -2695,20 +2690,20 @@
border-radius: 0 0 0 0;
}
.nav-tabs > li > a:hover {
- border-color: #eeeeee #eeeeee #467fbf;
+ border-color: #eeeeee #eeeeee #0cb2f0;
}
.nav-tabs > li.active > a,
.nav-tabs > li.active > a:hover,
.nav-tabs > li.active > a:focus {
color: #555555;
background-color: #ffffff;
- border: 1px solid #467fbf;
+ border: 1px solid #0cb2f0;
border-bottom-color: transparent;
cursor: default;
}
.nav-tabs.nav-justified {
width: 100%;
- border-bottom: solid 1px #467fbf;
+ border-bottom: solid 1px #0cb2f0;
border-bottom: 0;
}
.nav-tabs.nav-justified > li {
@@ -2729,11 +2724,11 @@
.nav-tabs.nav-justified > .active > a,
.nav-tabs.nav-justified > .active > a:hover,
.nav-tabs.nav-justified > .active > a:focus {
- border: 1px solid #467fbf;
+ border: 1px solid #0cb2f0;
}
@media (min-width: 768px) {
.nav-tabs.nav-justified > li > a {
- border-bottom: 1px solid #467fbf;
+ border-bottom: 1px solid #0cb2f0;
border-radius: 0 0 0 0;
}
.nav-tabs.nav-justified > .active > a,
@@ -2755,7 +2750,7 @@
.nav-pills > li.active > a:hover,
.nav-pills > li.active > a:focus {
color: #ffffff;
- background-color: #467fbf;
+ background-color: #0cb2f0;
}
.nav-stacked > li {
float: none;
@@ -2766,7 +2761,7 @@
}
.nav-justified {
width: 100%;
- border-bottom: solid 1px #467fbf;
+ border-bottom: solid 1px #0cb2f0;
}
.nav-justified > li {
float: none;
@@ -2789,11 +2784,11 @@
.nav-tabs-justified > .active > a,
.nav-tabs-justified > .active > a:hover,
.nav-tabs-justified > .active > a:focus {
- border: 1px solid #467fbf;
+ border: 1px solid #0cb2f0;
}
@media (min-width: 768px) {
.nav-tabs-justified > li > a {
- border-bottom: 1px solid #467fbf;
+ border-bottom: 1px solid #0cb2f0;
border-radius: 0 0 0 0;
}
.nav-tabs-justified > .active > a,
@@ -3086,7 +3081,7 @@
.navbar-default .navbar-nav > .active > a:hover,
.navbar-default .navbar-nav > .active > a:focus {
color: #ffffff;
- background-color: #467fbf;
+ background-color: #0cb2f0;
}
.navbar-default .navbar-nav > .disabled > a,
.navbar-default .navbar-nav > .disabled > a:hover,
@@ -3099,7 +3094,7 @@
}
.navbar-default .navbar-toggle:hover,
.navbar-default .navbar-toggle:focus {
- background-color: #467fbf;
+ background-color: #0cb2f0;
}
.navbar-default .navbar-toggle .icon-bar {
background-color: #888888;
@@ -3111,7 +3106,7 @@
.navbar-default .navbar-nav > .open > a,
.navbar-default .navbar-nav > .open > a:hover,
.navbar-default .navbar-nav > .open > a:focus {
- background-color: #467fbf;
+ background-color: #0cb2f0;
color: #ffffff;
}
@media (max-width: 767px) {
@@ -3120,13 +3115,13 @@
}
.navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
.navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
- color: #467fbf;
+ color: #0cb2f0;
}
.navbar-default .navbar-nav .open .dropdown-menu > .active > a,
.navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
.navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
color: #ffffff;
- background-color: #467fbf;
+ background-color: #0cb2f0;
}
.navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,
.navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,
@@ -3162,7 +3157,7 @@
color: #555555;
}
a {
- color: #467fbf;
+ color: #0cb2f0;
text-decoration: none;
}
a:hover,
@@ -3249,7 +3244,7 @@
border-radius: 0;
}
.form-control:focus {
- border-color: #467fbf;
+ border-color: #0cb2f0;
outline: 0;
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(70, 127, 191, 0.6);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(70, 127, 191, 0.6);
@@ -3272,14 +3267,14 @@
.pager li > a,
.pager li > span {
background-color: #ffffff;
- border: 1px solid #467fbf;
+ border: 1px solid #0cb2f0;
border-radius: 0;
}
.pager li > a:hover,
.pager li > a:focus {
text-decoration: none;
color: #fff;
- background-color: #467fbf;
+ background-color: #0cb2f0;
}
.pager .disabled > a,
.pager .disabled > a:hover,
@@ -3300,7 +3295,7 @@
padding: 6px 12px;
line-height: 1.42857143;
text-decoration: none;
- color: #467fbf;
+ color: #0cb2f0;
background-color: #ffffff;
border: 1px solid #dddddd;
}
@@ -3308,7 +3303,7 @@
.pagination > li > span:hover,
.pagination > li > a:focus,
.pagination > li > span:focus {
- color: #467fbf;
+ color: #0cb2f0;
background-color: #b8cee6;
border-color: #dddddd;
}
@@ -3320,8 +3315,8 @@
.pagination > .active > span:focus {
z-index: 2;
color: #ffffff;
- background-color: #467fbf;
- border-color: #467fbf;
+ background-color: #0cb2f0;
+ border-color: #0cb2f0;
}
.pagination > .disabled > span,
.pagination > .disabled > span:hover,
@@ -3403,14 +3398,14 @@
font-style: italic;
}
.text-primary {
- color: #467fbf;
+ color: #0cb2f0;
}
a.text-primary:hover {
color: #36669c;
}
.bg-primary {
color: #fff;
- background-color: #467fbf;
+ background-color: #0cb2f0;
}
a.bg-primary:hover {
background-color: #36669c;
@@ -3423,7 +3418,7 @@
padding: 10px 20px;
margin: 0 0 20px;
font-size: 14px;
- border-left: 5px solid #467fbf;
+ border-left: 5px solid #0cb2f0;
}
blockquote footer,
blockquote small,
@@ -3440,7 +3435,7 @@
}
.blockquote-reverse,
blockquote.pull-right {
- border-right: 5px solid #467fbf;
+ border-right: 5px solid #0cb2f0;
}
address {
margin-bottom: 20px;
@@ -3485,22 +3480,22 @@
border-color: #ccc;
}
.panel-primary {
- border-color: #467fbf;
+ border-color: #0cb2f0;
}
.panel-primary > .panel-heading {
color: #ffffff;
- background-color: #467fbf;
- border-color: #467fbf;
+ background-color: #0cb2f0;
+ border-color: #0cb2f0;
}
.panel-primary > .panel-heading + .panel-collapse > .panel-body {
- border-top-color: #467fbf;
+ border-top-color: #0cb2f0;
}
.panel-primary > .panel-heading .badge {
- color: #467fbf;
+ color: #0cb2f0;
background-color: #ffffff;
}
.panel-primary > .panel-footer + .panel-collapse > .panel-body {
- border-bottom-color: #467fbf;
+ border-bottom-color: #0cb2f0;
}
.panel-primary .panel-title {
font-weight: 300;
@@ -3517,14 +3512,14 @@
}
a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
- color: #467fbf;
+ color: #0cb2f0;
background-color: #ffffff;
}
.nav-pills > li > a > .badge {
margin-left: 3px;
}
.progress-bar-primary {
- background-color: #467fbf;
+ background-color: #0cb2f0;
}
.progress-striped .progress-bar-primary {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -3560,3 +3555,4 @@
left: 15px;
right: 15px;
}
+
diff --git a/static/img/BMBF_SponsoredBy_2017.jpg b/static/img/BMBF_SponsoredBy_2017.jpg
new file mode 100644
index 0000000..83d948f
--- /dev/null
+++ b/static/img/BMBF_SponsoredBy_2017.jpg
Binary files differ
diff --git a/static/img/BaSyxFeatures.png b/static/img/BaSyxFeatures.png
new file mode 100644
index 0000000..637e08a
--- /dev/null
+++ b/static/img/BaSyxFeatures.png
Binary files differ
diff --git a/static/img/banners/banner-1.png b/static/img/banners/banner-1.png
new file mode 100644
index 0000000..7d7c1f0
--- /dev/null
+++ b/static/img/banners/banner-1.png
Binary files differ
diff --git a/static/img/banners/banner-2.jpg b/static/img/banners/banner-2.jpg
new file mode 100644
index 0000000..591ca06
--- /dev/null
+++ b/static/img/banners/banner-2.jpg
Binary files differ
diff --git a/static/img/banners/banner-8.jpg b/static/img/banners/banner-8.jpg
new file mode 100644
index 0000000..a312aa1
--- /dev/null
+++ b/static/img/banners/banner-8.jpg
Binary files differ
diff --git a/static/img/basyx-icon.png b/static/img/basyx-icon.png
index 8c75b32..e170c2d 100644
--- a/static/img/basyx-icon.png
+++ b/static/img/basyx-icon.png
Binary files differ
diff --git a/static/img/basyxlogo.png b/static/img/basyxlogo.png
index 226a4ff..da613e9 100644
--- a/static/img/basyxlogo.png
+++ b/static/img/basyxlogo.png
Binary files differ
diff --git a/static/img/basyxlogo_small.png b/static/img/basyxlogo_small.png
index 48bdbca..d3584c0 100644
--- a/static/img/basyxlogo_small.png
+++ b/static/img/basyxlogo_small.png
Binary files differ
diff --git a/static/img/carousel/basyx-slide-01.png b/static/img/carousel/basyx-slide-01.png
index 2453db4..be681cc 100644
--- a/static/img/carousel/basyx-slide-01.png
+++ b/static/img/carousel/basyx-slide-01.png
Binary files differ
diff --git a/static/img/favicon/android-icon-192x192.png b/static/img/favicon/android-icon-192x192.png
index e4e8dcf..8fd5bee 100644
--- a/static/img/favicon/android-icon-192x192.png
+++ b/static/img/favicon/android-icon-192x192.png
Binary files differ
diff --git a/static/img/favicon/apple-icon-114x114.png b/static/img/favicon/apple-icon-114x114.png
index 96c1425..9e635a6 100644
--- a/static/img/favicon/apple-icon-114x114.png
+++ b/static/img/favicon/apple-icon-114x114.png
Binary files differ
diff --git a/static/img/favicon/apple-icon-120x120.png b/static/img/favicon/apple-icon-120x120.png
index 6e536f4..0fe69c0 100644
--- a/static/img/favicon/apple-icon-120x120.png
+++ b/static/img/favicon/apple-icon-120x120.png
Binary files differ
diff --git a/static/img/favicon/apple-icon-144x144.png b/static/img/favicon/apple-icon-144x144.png
index 3475187..a45517d 100644
--- a/static/img/favicon/apple-icon-144x144.png
+++ b/static/img/favicon/apple-icon-144x144.png
Binary files differ
diff --git a/static/img/favicon/apple-icon-152x152.png b/static/img/favicon/apple-icon-152x152.png
index 08c8055..82b72b4 100644
--- a/static/img/favicon/apple-icon-152x152.png
+++ b/static/img/favicon/apple-icon-152x152.png
Binary files differ
diff --git a/static/img/favicon/apple-icon-180x180.png b/static/img/favicon/apple-icon-180x180.png
index b9811ec..f6b05f3 100644
--- a/static/img/favicon/apple-icon-180x180.png
+++ b/static/img/favicon/apple-icon-180x180.png
Binary files differ
diff --git a/static/img/favicon/apple-icon-57x57.png b/static/img/favicon/apple-icon-57x57.png
index e00c33f..7d9ba07 100644
--- a/static/img/favicon/apple-icon-57x57.png
+++ b/static/img/favicon/apple-icon-57x57.png
Binary files differ
diff --git a/static/img/favicon/apple-icon-60x60.png b/static/img/favicon/apple-icon-60x60.png
index aa4ec0a..dc02759 100644
--- a/static/img/favicon/apple-icon-60x60.png
+++ b/static/img/favicon/apple-icon-60x60.png
Binary files differ
diff --git a/static/img/favicon/apple-icon-72x72.png b/static/img/favicon/apple-icon-72x72.png
index 635ca5f..94c7b2f 100644
--- a/static/img/favicon/apple-icon-72x72.png
+++ b/static/img/favicon/apple-icon-72x72.png
Binary files differ
diff --git a/static/img/favicon/apple-icon-76x76.png b/static/img/favicon/apple-icon-76x76.png
index 41aec95..204b2d8 100644
--- a/static/img/favicon/apple-icon-76x76.png
+++ b/static/img/favicon/apple-icon-76x76.png
Binary files differ
diff --git a/static/img/favicon/favicon-16x16.png b/static/img/favicon/favicon-16x16.png
index 8dc4964..79e6406 100644
--- a/static/img/favicon/favicon-16x16.png
+++ b/static/img/favicon/favicon-16x16.png
Binary files differ
diff --git a/static/img/favicon/favicon-256x256.png b/static/img/favicon/favicon-256x256.png
index 70747f9..e82f10b 100644
--- a/static/img/favicon/favicon-256x256.png
+++ b/static/img/favicon/favicon-256x256.png
Binary files differ
diff --git a/static/img/favicon/favicon-32x32.png b/static/img/favicon/favicon-32x32.png
index 34d863a..cfea833 100644
--- a/static/img/favicon/favicon-32x32.png
+++ b/static/img/favicon/favicon-32x32.png
Binary files differ
diff --git a/static/img/favicon/favicon-96x96.png b/static/img/favicon/favicon-96x96.png
index a02e8df..d1a67f2 100644
--- a/static/img/favicon/favicon-96x96.png
+++ b/static/img/favicon/favicon-96x96.png
Binary files differ
diff --git a/static/img/favicon/ms-icon-144x144.png b/static/img/favicon/ms-icon-144x144.png
index ec8fa7b..a45517d 100644
--- a/static/img/favicon/ms-icon-144x144.png
+++ b/static/img/favicon/ms-icon-144x144.png
Binary files differ
diff --git a/static/img/favicon/ms-icon-150x150.png b/static/img/favicon/ms-icon-150x150.png
index 7029751..f094fa2 100644
--- a/static/img/favicon/ms-icon-150x150.png
+++ b/static/img/favicon/ms-icon-150x150.png
Binary files differ
diff --git a/static/img/favicon/ms-icon-310x310.png b/static/img/favicon/ms-icon-310x310.png
index 4509f76..24ec6c7 100644
--- a/static/img/favicon/ms-icon-310x310.png
+++ b/static/img/favicon/ms-icon-310x310.png
Binary files differ
diff --git a/static/img/favicon/ms-icon-70x70.png b/static/img/favicon/ms-icon-70x70.png
index 1ed4849..475f4e0 100644
--- a/static/img/favicon/ms-icon-70x70.png
+++ b/static/img/favicon/ms-icon-70x70.png
Binary files differ
diff --git a/static/img/features/aas.png b/static/img/features/aas.png
new file mode 100644
index 0000000..198310f
--- /dev/null
+++ b/static/img/features/aas.png
Binary files differ
diff --git a/static/img/features/analysis.png b/static/img/features/analysis.png
new file mode 100644
index 0000000..e1f6130
--- /dev/null
+++ b/static/img/features/analysis.png
Binary files differ
diff --git a/static/img/features/cloud.png b/static/img/features/cloud.png
new file mode 100644
index 0000000..94ac7a2
--- /dev/null
+++ b/static/img/features/cloud.png
Binary files differ
diff --git a/static/img/features/fieldbus.png b/static/img/features/fieldbus.png
new file mode 100644
index 0000000..91ffbad
--- /dev/null
+++ b/static/img/features/fieldbus.png
Binary files differ
diff --git a/static/img/features/it.png b/static/img/features/it.png
new file mode 100644
index 0000000..fd90424
--- /dev/null
+++ b/static/img/features/it.png
Binary files differ
diff --git a/static/img/features/roboter.png b/static/img/features/roboter.png
new file mode 100644
index 0000000..c2444f7
--- /dev/null
+++ b/static/img/features/roboter.png
Binary files differ
diff --git a/static/img/offers/Fraunhofer_iese_logo.png b/static/img/offers/Fraunhofer_iese_logo.png
new file mode 100644
index 0000000..34cc4af
--- /dev/null
+++ b/static/img/offers/Fraunhofer_iese_logo.png
Binary files differ
diff --git a/static/img/testimonials/christian-muggeo.jpg b/static/img/testimonials/christian-muggeo.jpg
new file mode 100644
index 0000000..952015c
--- /dev/null
+++ b/static/img/testimonials/christian-muggeo.jpg
Binary files differ
diff --git a/themes/hugo-universal-theme/i18n/en.yaml b/themes/hugo-universal-theme/i18n/en.yaml
index 431fd47..0f3cccc 100755
--- a/themes/hugo-universal-theme/i18n/en.yaml
+++ b/themes/hugo-universal-theme/i18n/en.yaml
@@ -69,3 +69,9 @@
- id: publishedOn
translation: "on"
+
+- id: next
+ translation: "Next"
+
+- id: previous
+ translation: "Previous"
