You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2020/02/11 08:47:32 UTC

[plc4x] branch develop updated: - Refactored the user section index.html - Split up the images into subdirectories

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new e9f2584  - Refactored the user section index.html - Split up the images into subdirectories
e9f2584 is described below

commit e9f2584ba797ce1e3d2f85c3fe807c188c8cd1ae
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Feb 11 09:47:20 2020 +0100

    - Refactored the user section index.html
    - Split up the images into subdirectories
---
 src/site/asciidoc/index.adoc                       |  18 +-
 src/site/asciidoc/users/index.adoc                 | 319 +++++++++++++++++++--
 .../{ => integrations}/apache_calcite_logo.svg     |   0
 .../{ => integrations}/apache_camel_logo.png       | Bin
 .../{ => integrations}/apache_edgent_logo.png      | Bin
 .../{ => integrations}/apache_iotdb_logo.png       | Bin
 .../{ => integrations}/apache_kafka_logo.png       | Bin
 .../images/{ => integrations}/apache_nifi_logo.svg |   0
 .../{ => integrations}/apache_streampipes_logo.png | Bin
 .../{ => integrations}/eclipse_ditto_logo.png      | Bin
 .../{ => integrations}/elastic_logstash_logo.png   | Bin
 11 files changed, 309 insertions(+), 28 deletions(-)

diff --git a/src/site/asciidoc/index.adoc b/src/site/asciidoc/index.adoc
index 40698ab..eca96fd 100644
--- a/src/site/asciidoc/index.adoc
+++ b/src/site/asciidoc/index.adoc
@@ -78,7 +78,7 @@
                                        <div class="card h-100 p-5 justify-content-center"
                                             onclick="location.href='https://calcite.apache.org';" style="cursor:pointer;">
                                            <div class="d-flex align-items-center justify-content-center h-100">
-                                               <img src="images/apache_calcite_logo.svg" alt="Card image cap">
+                                               <img src="images/integrations/apache_calcite_logo.svg" alt="Card image cap">
                                            </div>
                                            <div class="card-body">
                                                <h5 class="card-title"><b>Apache Calcite</b></h5>
@@ -91,7 +91,7 @@
                                        <div class="card h-100 p-5 justify-content-center"
                                             onclick="location.href='https://camel.apache.org';" style="cursor:pointer;">
                                            <div class="d-flex align-items-center justify-content-center h-100">
-                                               <img src="images/apache_camel_logo.png" alt="Card image cap">
+                                               <img src="images/integrations/apache_camel_logo.png" alt="Card image cap">
                                            </div>
                                            <div class="card-body">
                                                <h5 class="card-title"><b>Apache Camel</b></h5>
@@ -104,7 +104,7 @@
                                        <div class="card h-100 p-5 justify-content-center"
                                             onclick="location.href='https://edgent.apache.org';" style="cursor:pointer;">
                                            <div class="d-flex align-items-center justify-content-center h-100">
-                                               <img src="images/apache_edgent_logo.png" alt="Card image cap">
+                                               <img src="images/integrations/apache_edgent_logo.png" alt="Card image cap">
                                            </div>
                                            <div class="card-body">
                                                <h5 class="card-title"><b>Apache Edgent</b></h5>
@@ -117,7 +117,7 @@
                                        <div class="card h-100 p-5 justify-content-center"
                                             onclick="location.href='https://iotdb.apache.org';" style="cursor:pointer;">
                                            <div class="d-flex align-items-center justify-content-center h-100">
-                                               <img src="images/apache_iotdb_logo.png" alt="Card image cap">
+                                               <img src="images/integrations/apache_iotdb_logo.png" alt="Card image cap">
                                            </div>
                                            <div class="card-body">
                                                <h5 class="card-title"><b>Apache IoTDB (incubating)</b></h5>
@@ -130,7 +130,7 @@
                                        <div class="card h-100 p-5 justify-content-center"
                                             onclick="location.href='https://kafka.apache.org';" style="cursor:pointer;">
                                            <div class="d-flex align-items-center justify-content-center h-100">
-                                               <img src="images/apache_kafka_logo.png" alt="Card image cap">
+                                               <img src="images/integrations/apache_kafka_logo.png" alt="Card image cap">
                                            </div>
                                            <div class="card-body">
                                                <h5 class="card-title"><b>Apache Kafka</b></h5>
@@ -143,7 +143,7 @@
                                        <div class="card h-100 p-5 justify-content-center"
                                             onclick="location.href='https://nifi.apache.org';" style="cursor:pointer;">
                                            <div class="d-flex align-items-center justify-content-center h-100">
-                                               <img src="images/apache_nifi_logo.svg" alt="Card image cap">
+                                               <img src="images/integrations/apache_nifi_logo.svg" alt="Card image cap">
                                            </div>
                                            <div class="card-body">
                                                <h5 class="card-title"><b>Apache Nifi</b></h5>
@@ -157,7 +157,7 @@
                                             onclick="location.href='https://streampipes.apache.org';"
                                             style="cursor:pointer;">
                                            <div class="d-flex align-items-center justify-content-center h-100">
-                                               <img src="images/apache_streampipes_logo.png" alt="Card image cap">
+                                               <img src="images/integrations/apache_streampipes_logo.png" alt="Card image cap">
                                            </div>
                                            <div class="card-body">
                                                <h5 class="card-title"><b>Apache StreamPipes (incubating)</b></h5>
@@ -171,7 +171,7 @@
                                             onclick="location.href='https://www.eclipse.org/ditto/';"
                                             style="cursor:pointer;">
                                            <div class="d-flex align-items-center justify-content-center h-100">
-                                               <img src="images/eclipse_ditto_logo.png" alt="Card image cap">
+                                               <img src="images/integrations/eclipse_ditto_logo.png" alt="Card image cap">
                                            </div>
                                            <div class="card-body">
                                                <h5 class="card-title"><b>Eclipse Ditto</b></h5>
@@ -185,7 +185,7 @@
                                             onclick="location.href='https://www.elastic.co/products/logstash';"
                                             style="cursor:pointer;">
                                            <div class="d-flex align-items-center justify-content-center h-100">
-                                               <img src="images/elastic_logstash_logo.png" alt="Card image cap">
+                                               <img src="images/integrations/elastic_logstash_logo.png" alt="Card image cap">
                                            </div>
                                            <div class="card-body">
                                                <h5 class="card-title"><b>Elastic Logstash</b></h5>
diff --git a/src/site/asciidoc/users/index.adoc b/src/site/asciidoc/users/index.adoc
index f36fd2f..1f039a5 100644
--- a/src/site/asciidoc/users/index.adoc
+++ b/src/site/asciidoc/users/index.adoc
@@ -29,28 +29,309 @@ This is possible, as PLC4X implements drivers for the most common industrial com
 
 Currently we support the following protocols:
 
-- link:protocols/ab-eth.html[Allen Bradley: AB-ETH]
-- link:protocols/ads.html[Beckhoff: ADS/AMS]
-- link:protocols/bacnetip.html[BACnet/IP]
-- link:protocols/deltav.html[Emerson DeltaV]
-- link:protocols/df1.html[DF1]
-- link:protocols/ethernet-ip.html[EtherNet/IP]
-- link:protocols/knxnetip.html[KNXnet/IP]
-- link:protocols/modbus.html[Modbus (TCP/Serial)]
-- link:protocols/opc-ua.html[OPC UA]
-- link:protocols/s7.html[Siemens: S7 (Step7)]
+++++
+<div id="protocolCarousel" class="carousel slide" data-ride="carousel">
+  <div class="carousel-inner">
+    <div class="carousel-item active">
+      <div class="col-md-12 col-lg-4">
+        <div class="card h-100 p-5 justify-content-center"
+             onclick="location.href='protocols/ab-eth.html';" style="cursor:pointer;">
+          <!--div class="d-flex align-items-center justify-content-center h-100">
+            <img src="images/protocols/ab-eth-logo.png" alt="Card image cap">
+          </div-->
+          <div class="card-body">
+            <h5 class="card-title"><b>AB-ETH</b></h5>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="carousel-item">
+      <div class="col-md-12 col-lg-4">
+        <div class="card h-100 p-5 justify-content-center"
+             onclick="location.href='protocols/ads.html';" style="cursor:pointer;">
+          <!--div class="d-flex align-items-center justify-content-center h-100">
+            <img src="images/protocols/ads-logo.png" alt="Card image cap">
+          </div-->
+          <div class="card-body">
+            <h5 class="card-title"><b>ADS/AMS</b></h5>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="carousel-item">
+      <div class="col-md-12 col-lg-4">
+        <div class="card h-100 p-5 justify-content-center"
+             onclick="location.href='protocols/bacnetip.html';" style="cursor:pointer;">
+          <!--div class="d-flex align-items-center justify-content-center h-100">
+            <img src="images/protocols/bacnetip-logo.png" alt="Card image cap">
+          </div-->
+          <div class="card-body">
+            <h5 class="card-title"><b>BACnet/IP</b></h5>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="carousel-item">
+      <div class="col-md-12 col-lg-4">
+        <div class="card h-100 p-5 justify-content-center"
+             onclick="location.href='protocols/deltav.html';" style="cursor:pointer;">
+          <!--div class="d-flex align-items-center justify-content-center h-100">
+            <img src="images/protocols/deltav-logo.png" alt="Card image cap">
+          </div-->
+          <div class="card-body">
+            <h5 class="card-title"><b>DeltaV</b></h5>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="carousel-item">
+      <div class="col-md-12 col-lg-4">
+        <div class="card h-100 p-5 justify-content-center"
+             onclick="location.href='protocols/df1.html';" style="cursor:pointer;">
+          <!--div class="d-flex align-items-center justify-content-center h-100">
+            <img src="images/protocols/df1-logo.png" alt="Card image cap">
+          </div-->
+          <div class="card-body">
+            <h5 class="card-title"><b>DF1</b></h5>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="carousel-item">
+      <div class="col-md-12 col-lg-4">
+        <div class="card h-100 p-5 justify-content-center"
+             onclick="location.href='protocols/ethernet-ip.html';" style="cursor:pointer;">
+          <!--div class="d-flex align-items-center justify-content-center h-100">
+            <img src="images/protocols/ethernet-ip-logo.pngg" alt="Card image cap">
+          </div-->
+          <div class="card-body">
+            <h5 class="card-title"><b>EtherNet/IP</b></h5>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="carousel-item">
+      <div class="col-md-12 col-lg-4">
+        <div class="card h-100 p-5 justify-content-center"
+             onclick="location.href='protocols/knxnetip.html';"
+             style="cursor:pointer;">
+          <!--div class="d-flex align-items-center justify-content-center h-100">
+            <img src="images/protocols/knxnetip-logo.png" alt="Card image cap">
+          </div-->
+          <div class="card-body">
+            <h5 class="card-title"><b>KNXnet/IP</b></h5>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="carousel-item">
+      <div class="col-md-12 col-lg-4">
+        <div class="card h-100 p-5 justify-content-center"
+             onclick="location.href='protocols/modbus.html';"
+             style="cursor:pointer;">
+          <!--div class="d-flex align-items-center justify-content-center h-100">
+            <img src="images/protocols/modbus-logo.png" alt="Card image cap">
+          </div-->
+          <div class="card-body">
+            <h5 class="card-title"><b>Modbus</b></h5>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="carousel-item">
+      <div class="col-md-12 col-lg-4">
+        <div class="card h-100 p-5 justify-content-center"
+             onclick="location.href='protocols/opc-ua.html';"
+             style="cursor:pointer;">
+          <!--div class="d-flex align-items-center justify-content-center h-100">
+            <img src="images/protocols/opc-ua-logo.png" alt="Card image cap">
+          </div-->
+          <div class="card-body">
+            <h5 class="card-title"><b>OPC UA</b></h5>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="carousel-item">
+      <div class="col-md-12 col-lg-4">
+        <div class="card h-100 p-5 justify-content-center"
+             onclick="location.href='protocols/s7.html';"
+             style="cursor:pointer;">
+          <!--div class="d-flex align-items-center justify-content-center h-100">
+            <img src="images/protocols/s7-logo.png" alt="Card image cap">
+          </div-->
+          <div class="card-body">
+            <h5 class="card-title"><b>S7 (Step7)</b></h5>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="carousel-item">
+      <div class="col-md-12 col-lg-4">
+        <div class="card h-100 p-5 justify-content-center"
+             onclick="location.href='protocols/simulated.html';"
+             style="cursor:pointer;">
+          <!--div class="d-flex align-items-center justify-content-center h-100">
+            <img src="images/protocols/simulated-logo.png" alt="Card image cap">
+          </div-->
+          <div class="card-body">
+            <h5 class="card-title"><b>Simulated</b></h5>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <a class="carousel-control-prev" href="#protocolCarousel" role="button" data-slide="prev">
+    <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+    <span class="sr-only">Previous</span>
+  </a>
+  <a class="carousel-control-next" href="#protocolCarousel" role="button" data-slide="next">
+    <span class="carousel-control-next-icon" aria-hidden="true"></span>
+    <span class="sr-only">Next</span>
+  </a>
+</div>
+<br/>
+<br/>
+++++
 
 Besides providing access to devices using one of above protocols, PLC4X also ships with integration modules for the following tools and frameworks.
 
-[width=100%,cols="^.^,^.^,^.^"]
-|===
-a|image::apache_calcite_logo.svg[width=80%,link=https://calcite.apache.org] a|image::apache_camel_logo.png[width=80%,link=https://camel.apache.org] a|image::apache_edgent_logo.png[width=80%,link=https://edgent.incubator.apache.org]
-|icon:check[role=green] https://calcite.apache.org[Apache Calcite™]         |icon:check[role=green] https://camel.apache.org[Apache Camel™]         |icon:check[role=green] https://edgent.incubator.apache.org[Apache Edgent™ (retired)]
-a|image::apache_iotdb_logo.png[width=80%,link=https://iotdb.apache.org]     a|image::apache_kafka_logo.png[width=80%,link=https://kafka.apache.org] a|image::apache_nifi_logo.svg[width=80%,link=https://nifi.apache.org]
-|icon:check[role=green] https://iotdb.apache.org[Apache IoTDB™ (incubating)]|icon:check[role=green] https://kafka.apache.org[Apache Kafka™]         |icon:wrench[role=green] https://nifi.apache.org[Apache Nifi™]
-a|image::apache_streampipes_logo.png[width=80%,link=https://streampipes.apache.org]     a|image::eclipse_ditto_logo.png[link=https://www.eclipse.org/ditto/] a|image::elastic_logstash_logo.png[width=80%,link=https://www.elastic.co/de/products/logstash]
-|icon:wrench[role=yellow] https://streampipes.apache.org[Apache StreamPipes™ (incubating)]   |icon:wrench[role=yellow] https://www.eclipse.org/ditto/]              |icon:wrench[role=green] https://www.elastic.co/de/products/logstash[Elastic Logstash™]
-|===
+++++
+                    <div id="integrationCarousel" class="carousel slide" data-ride="carousel">
+                        <div class="carousel-inner">
+                            <div class="carousel-item active">
+                                <div class="col-md-12 col-lg-4">
+                                    <div class="card h-100 p-5 justify-content-center"
+                                         onclick="location.href='integrations/apache-calcite.html';" style="cursor:pointer;">
+                                        <div class="d-flex align-items-center justify-content-center h-100">
+                                            <img src="../images/integrations/apache_calcite_logo.svg" alt="Card image cap">
+                                        </div>
+                                        <div class="card-body">
+                                            <h5 class="card-title"><b>Apache Calcite™</b></h5>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="carousel-item">
+                                <div class="col-md-12 col-lg-4">
+                                    <div class="card h-100 p-5 justify-content-center"
+                                         onclick="location.href='integrations/apache-camel.html';" style="cursor:pointer;">
+                                        <div class="d-flex align-items-center justify-content-center h-100">
+                                            <img src="../images/integrations/apache_camel_logo.png" alt="Card image cap">
+                                        </div>
+                                        <div class="card-body">
+                                            <h5 class="card-title"><b>Apache Camel™</b></h5>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="carousel-item">
+                                <div class="col-md-12 col-lg-4">
+                                    <div class="card h-100 p-5 justify-content-center"
+                                         onclick="location.href='integrations/apache-edgent.html';" style="cursor:pointer;">
+                                        <div class="d-flex align-items-center justify-content-center h-100">
+                                            <img src="../images/integrations/apache_edgent_logo.png" alt="Card image cap">
+                                        </div>
+                                        <div class="card-body">
+                                            <h5 class="card-title"><b>Apache Edgent™ (retired)</b></h5>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="carousel-item">
+                                <div class="col-md-12 col-lg-4">
+                                    <div class="card h-100 p-5 justify-content-center"
+                                         onclick="location.href='integrations/apache-iotdb.html';" style="cursor:pointer;">
+                                        <div class="d-flex align-items-center justify-content-center h-100">
+                                            <img src="../images/integrations/apache_iotdb_logo.png" alt="Card image cap">
+                                        </div>
+                                        <div class="card-body">
+                                            <h5 class="card-title"><b>Apache IoTDB™ (incubating)</b></h5>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="carousel-item">
+                                <div class="col-md-12 col-lg-4">
+                                    <div class="card h-100 p-5 justify-content-center"
+                                         onclick="location.href='integrations/apache-kafka.html';" style="cursor:pointer;">
+                                        <div class="d-flex align-items-center justify-content-center h-100">
+                                            <img src="../images/integrations/apache_kafka_logo.png" alt="Card image cap">
+                                        </div>
+                                        <div class="card-body">
+                                            <h5 class="card-title"><b>Apache Kafka™</b></h5>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="carousel-item">
+                                <div class="col-md-12 col-lg-4">
+                                    <div class="card h-100 p-5 justify-content-center"
+                                         onclick="location.href='integrations/apache-nifi.html';" style="cursor:pointer;">
+                                        <div class="d-flex align-items-center justify-content-center h-100">
+                                            <img src="../images/integrations/apache_nifi_logo.svg" alt="Card image cap">
+                                        </div>
+                                        <div class="card-body">
+                                            <h5 class="card-title"><b>Apache Nifi™</b></h5>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="carousel-item">
+                                <div class="col-md-12 col-lg-4">
+                                    <div class="card h-100 p-5 justify-content-center"
+                                         onclick="location.href='integrations/apache-streampipes.html';"
+                                         style="cursor:pointer;">
+                                        <div class="d-flex align-items-center justify-content-center h-100">
+                                            <img src="../images/integrations/apache_streampipes_logo.png" alt="Card image cap">
+                                        </div>
+                                        <div class="card-body">
+                                            <h5 class="card-title"><b>Apache StreamPipes™ (incubating)</b></h5>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="carousel-item">
+                                <div class="col-md-12 col-lg-4">
+                                    <div class="card h-100 p-5 justify-content-center"
+                                         onclick="location.href='integrations/eclipse-ditto.html';"
+                                         style="cursor:pointer;">
+                                        <div class="d-flex align-items-center justify-content-center h-100">
+                                            <img src="../images/integrations/eclipse_ditto_logo.png" alt="Card image cap">
+                                        </div>
+                                        <div class="card-body">
+                                            <h5 class="card-title"><b>Eclipse Ditto</b></h5>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="carousel-item">
+                                <div class="col-md-12 col-lg-4">
+                                    <div class="card h-100 p-5 justify-content-center"
+                                         onclick="location.href='integrations/elastic-logstash.html';"
+                                         style="cursor:pointer;">
+                                        <div class="d-flex align-items-center justify-content-center h-100">
+                                            <img src="../images/integrations/elastic_logstash_logo.png" alt="Card image cap">
+                                        </div>
+                                        <div class="card-body">
+                                            <h5 class="card-title"><b>Elastic Logstash™</b></h5>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <a class="carousel-control-prev" href="#integrationCarousel" role="button" data-slide="prev">
+                            <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+                            <span class="sr-only">Previous</span>
+                        </a>
+                        <a class="carousel-control-next" href="#integrationCarousel" role="button" data-slide="next">
+                            <span class="carousel-control-next-icon" aria-hidden="true"></span>
+                            <span class="sr-only">Next</span>
+                        </a>
+                    </div>
+<br/>
+<br/>
+++++
 
 As last category of tools come modules that can be used in your applications:
 
diff --git a/src/site/resources/images/apache_calcite_logo.svg b/src/site/resources/images/integrations/apache_calcite_logo.svg
similarity index 100%
rename from src/site/resources/images/apache_calcite_logo.svg
rename to src/site/resources/images/integrations/apache_calcite_logo.svg
diff --git a/src/site/resources/images/apache_camel_logo.png b/src/site/resources/images/integrations/apache_camel_logo.png
similarity index 100%
rename from src/site/resources/images/apache_camel_logo.png
rename to src/site/resources/images/integrations/apache_camel_logo.png
diff --git a/src/site/resources/images/apache_edgent_logo.png b/src/site/resources/images/integrations/apache_edgent_logo.png
similarity index 100%
rename from src/site/resources/images/apache_edgent_logo.png
rename to src/site/resources/images/integrations/apache_edgent_logo.png
diff --git a/src/site/resources/images/apache_iotdb_logo.png b/src/site/resources/images/integrations/apache_iotdb_logo.png
similarity index 100%
rename from src/site/resources/images/apache_iotdb_logo.png
rename to src/site/resources/images/integrations/apache_iotdb_logo.png
diff --git a/src/site/resources/images/apache_kafka_logo.png b/src/site/resources/images/integrations/apache_kafka_logo.png
similarity index 100%
rename from src/site/resources/images/apache_kafka_logo.png
rename to src/site/resources/images/integrations/apache_kafka_logo.png
diff --git a/src/site/resources/images/apache_nifi_logo.svg b/src/site/resources/images/integrations/apache_nifi_logo.svg
similarity index 100%
rename from src/site/resources/images/apache_nifi_logo.svg
rename to src/site/resources/images/integrations/apache_nifi_logo.svg
diff --git a/src/site/resources/images/apache_streampipes_logo.png b/src/site/resources/images/integrations/apache_streampipes_logo.png
similarity index 100%
rename from src/site/resources/images/apache_streampipes_logo.png
rename to src/site/resources/images/integrations/apache_streampipes_logo.png
diff --git a/src/site/resources/images/eclipse_ditto_logo.png b/src/site/resources/images/integrations/eclipse_ditto_logo.png
similarity index 100%
rename from src/site/resources/images/eclipse_ditto_logo.png
rename to src/site/resources/images/integrations/eclipse_ditto_logo.png
diff --git a/src/site/resources/images/elastic_logstash_logo.png b/src/site/resources/images/integrations/elastic_logstash_logo.png
similarity index 100%
rename from src/site/resources/images/elastic_logstash_logo.png
rename to src/site/resources/images/integrations/elastic_logstash_logo.png