Redesign Website
- Added Contributing page
- changed feature description
- changed offers formatting
Signed-off-by: Siwara Schmitt <siwara.schmitt@iese.fraunhofer.de>
diff --git a/config.toml b/config.toml
index 40ae5f4..b6dbecc 100644
--- a/config.toml
+++ b/config.toml
@@ -70,6 +70,11 @@
name = "Download"
url = "https://projects.eclipse.org/projects/technology.basyx/downloads"
weight = 40
+
+[[menu.main]]
+ name = "Contributing"
+ url = "/contributing/"
+ weight = 50
#[[menu.main]]
diff --git a/content/contributing/images/BaSyxDesign.png b/content/contributing/images/BaSyxDesign.png
new file mode 100644
index 0000000..a2da880
--- /dev/null
+++ b/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/data/features/cloud.yaml b/data/features/cloud.yaml
index c065061..5a755a9 100644
--- a/data/features/cloud.yaml
+++ b/data/features/cloud.yaml
@@ -1,5 +1,5 @@
weight: 5
-name: "Cloud Connectivity & Deployments"
+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"
diff --git a/data/offers/1.yaml b/data/offers/1.yaml
index d30566d..ea0eac9 100644
--- a/data/offers/1.yaml
+++ b/data/offers/1.yaml
@@ -1,6 +1,6 @@
product: "Shopfloor 4.0"
-text: "Fraunhofer IESE, NetApp and objective partner are offering an off-the-shelf Industrie 4.0 solution based on Eclipse BaSyx."
+text: "Fraunhofer IESE is offering an off-the-shelf Industrie 4.0 solution based on Eclipse BaSyx with its partners NetApp and objective partner."
#organisation: ""
#position: ""
logo: "../img/offers/Fraunhofer_iese_logo.png"
\ No newline at end of file
