diff --git a/archetypes/article.md b/archetypes/article.md
new file mode 100644
index 0000000000000000000000000000000000000000..7e7ff3fea42ace5a3ba4d4fe7c47d8e67968ffcd
--- /dev/null
+++ b/archetypes/article.md
@@ -0,0 +1,3 @@
++++
+link = "#"
++++
\ No newline at end of file
diff --git a/content/article/2014-03-24-java-tutorial.md b/content/article/2014-03-24-java-tutorial.md
new file mode 100644
index 0000000000000000000000000000000000000000..0dfde7cfee8ba3250523f361e2008774e54c87cf
--- /dev/null
+++ b/content/article/2014-03-24-java-tutorial.md
@@ -0,0 +1,6 @@
++++
+date = "2015-03-24T15:54:26+01:00"
+title = "Open IoT Stack for Java Tutorial"
+link = "/java/tutorial"
++++
+
diff --git a/layouts/index.html b/layouts/index.html
index 480ffc89c52122ee541e3224d596ec9273fb1159..d8c2ce5f42a7f2be6bec64077697544963069ede 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -191,26 +191,21 @@
<div class="col-md-6 col-md-offset-1">
<section class="subsection-header featured-articles">
- <h2>Featured Articles</h2>
+ <h2>Featured Articles<span></span></h2>
<div class="row">
- <div class="col-md-6">
- <div class=" featured-articles-item">
- <a href="/java/tutorial">
- <h3>Open IoT Stack for Java Tutorial</h3>
- <!-- <p>Use Kura and MQTT to connect a greenhouse</p>
- -->
- </a>
- </div>
+ {{ range first 2 (where .Data.Pages ".Type" "article") }}
- </div>
- <div class="col-md-6">
- <div class="featured-articles-item">
- <h3>Open IoT Stack for Java Tutorial</h3>
- <!-- <p>Use Kura and MQTT to connect a greenhouse</p> -->
+ <div class="col-md-6">
+ <div class="featured-articles-item">
+ <a href="{{ .Params.link }}">
+ <h3>{{ .Title }} </h3>
+ </a>
+ </div>
</div>
- </div>
+
+ {{ end }}
</div>
</section>
@@ -221,7 +216,7 @@
<div class="col-md-6">
<section class="subsection-header latest-news">
- <h2>Latest News</h2>
+ <h2>Latest News<span></span></h2>
{{ range first 2 (where .Data.Pages ".Type" "news") }}
@@ -246,7 +241,7 @@
<div class="col-md-6">
<section class="subsection-header upcoming-events">
- <h2>Upcoming Events</h2>
+ <h2>Upcoming Events<span></span></h2>
<div class="row">
{{ $.Scratch.Set "idx" 0 }}
diff --git a/public/article/2014-03-24-java-tutorial/index.html b/public/article/2014-03-24-java-tutorial/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/public/article/index.html b/public/article/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/public/article/index.xml b/public/article/index.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d77403cfe1ca4baf2e3f88615cc435429088aedf
--- /dev/null
+++ b/public/article/index.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+ <channel>
+ <title>Articles on </title>
+ <link>http://localhost:1313/article/</link>
+ <description>Recent content in Articles on </description>
+ <generator>Hugo -- gohugo.io</generator>
+ <lastBuildDate>Tue, 24 Mar 2015 15:54:26 +0100</lastBuildDate>
+ <atom:link href="http://localhost:1313/article/index.xml" rel="self" type="application/rss+xml" />
+
+ <item>
+ <title>Open IoT Stack for Java Tutorial</title>
+ <link>http://localhost:1313/article/2014-03-24-java-tutorial/</link>
+ <pubDate>Tue, 24 Mar 2015 15:54:26 +0100</pubDate>
+
+ <guid>http://localhost:1313/article/2014-03-24-java-tutorial/</guid>
+ <description></description>
+ </item>
+
+ </channel>
+</rss>
\ No newline at end of file
diff --git a/public/assets/css/bootstrap.css b/public/assets/css/bootstrap.css
index bb4b39fe1db42740e28c68eae407e373d2851638..5864725cadc790c380c53369a7204657c1c68031 100644
--- a/public/assets/css/bootstrap.css
+++ b/public/assets/css/bootstrap.css
@@ -4256,12 +4256,22 @@ main.main {
main.main .subsection-header h2 {
color: whitesmoke;
display: block;
- height: 79px;
+ height: 76px;
width: 100%;
background-size: 100%;
padding: 28px;
font-size: 21px;
margin-bottom: 30px; }
+ main.main .subsection-header h2 span {
+ width: 83px;
+ height: 76px;
+ background: #3085cb;
+ position: absolute;
+ top: 25px;
+ right: 15px; }
+ @media (max-width: 991px) {
+ main.main .subsection-header h2 span {
+ top: 0px; } }
main.main section.first {
background-color: whitesmoke;
background-image: url(../images/section-first-divider.png);
@@ -4309,7 +4319,9 @@ main.main {
main.main section.second .community p {
font-size: 1.5em; }
main.main section.second .latest-news h2 {
- background-image: url(../images/heading-latest_news.jpg); }
+ background-image: url(../images/heading-latest_news.png); }
+ main.main section.second .latest-news h2 span {
+ background-image: url(../images/heading-latest_news-icon.png); }
main.main section.second .latest-news .latest-news-item {
border-bottom: 1px solid #c2c2c2;
padding-bottom: 10px;
@@ -4325,7 +4337,9 @@ main.main {
margin-bottom: 35px;
border-bottom: 0px; }
main.main section.second .featured-articles h2 {
- background-image: url(../images/heading-featured.jpg); }
+ background-image: url(../images/heading-featured.png); }
+ main.main section.second .featured-articles h2 span {
+ background-image: url(../images/heading-featured-icon.png); }
main.main section.second .featured-articles .featured-articles-item {
background-image: url(../images/open-iot-bg.jpg);
background-size: cover;
@@ -4339,7 +4353,9 @@ main.main {
padding: 40px 0;
margin: 0; }
main.main section.second .upcoming-events h2 {
- background-image: url(../images/heading-upcoming_events.jpg); }
+ background-image: url(../images/heading-upcoming_events.png); }
+ main.main section.second .upcoming-events h2 span {
+ background-image: url(../images/heading-upcoming_events-icon.png); }
main.main section.second .upcoming-events .upcoming-events-item {
text-align: center;
color: whitesmoke;
@@ -4431,10 +4447,12 @@ main.main {
padding-bottom: 50px;
color: #551f62; }
main.main .mb-logo {
- padding-top: 70px;
+ padding-top: 40px;
padding-left: 30px; }
main.main .members-info {
- margin-bottom: 3em; }
+ margin-bottom: 3em;
+ border-bottom: 1px dotted #3085cb;
+ padding-bottom: 40px; }
main.main .videos h2 {
background-image: url(../images/heading-upcoming_events.jpg); }
main.main .presentations h2 {
diff --git a/public/assets/images/heading-community-icon.png b/public/assets/images/heading-community-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a26ff970c53a7af9d261c84ca9d7207130e220a
Binary files /dev/null and b/public/assets/images/heading-community-icon.png differ
diff --git a/public/assets/images/heading-community.png b/public/assets/images/heading-community.png
index f235436afce4572308134ff7a831436d730e9c1f..db5efa2c6786c81ccf7d8d043f067eb7a2e8234a 100644
Binary files a/public/assets/images/heading-community.png and b/public/assets/images/heading-community.png differ
diff --git a/public/assets/images/heading-featured-icon.png b/public/assets/images/heading-featured-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..11e4deb45053ec79141aed0859f0eed4e447110f
Binary files /dev/null and b/public/assets/images/heading-featured-icon.png differ
diff --git a/public/assets/images/heading-featured.png b/public/assets/images/heading-featured.png
index 10e64c132fb129fa95667228f943b6a53e58e742..8fed4a02b17e4b92b7f01d08523f4b10adde94b4 100644
Binary files a/public/assets/images/heading-featured.png and b/public/assets/images/heading-featured.png differ
diff --git a/public/assets/images/heading-latest_news-icon.png b/public/assets/images/heading-latest_news-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..65b761801b60b1773a2e05c4acaddd5b42b3496c
Binary files /dev/null and b/public/assets/images/heading-latest_news-icon.png differ
diff --git a/public/assets/images/heading-latest_news.png b/public/assets/images/heading-latest_news.png
index 1839a48bfe190a90b4be1cfa85fbaf7f1e51c550..2b73d0499423a7a10731c18c3448c8bce4785a1f 100644
Binary files a/public/assets/images/heading-latest_news.png and b/public/assets/images/heading-latest_news.png differ
diff --git a/public/assets/images/heading-upcoming_events-icon.png b/public/assets/images/heading-upcoming_events-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7cfe061392cf0d36975e86f06cf9b6782733b24
Binary files /dev/null and b/public/assets/images/heading-upcoming_events-icon.png differ
diff --git a/public/assets/images/heading-upcoming_events.png b/public/assets/images/heading-upcoming_events.png
index fe8062d36897d152e31709680e1faecc72b000fa..d4081d1dad2aa930609e354bd83458cb56829a19 100644
Binary files a/public/assets/images/heading-upcoming_events.png and b/public/assets/images/heading-upcoming_events.png differ
diff --git a/public/assets/stylesheets/theme/_main.scss b/public/assets/stylesheets/theme/_main.scss
index 5b1002aa8db9882bdf3d4f67949bfff3a93bd0d7..1af4e68925f0ff73f60688d4391eadbee7c9dd1b 100644
--- a/public/assets/stylesheets/theme/_main.scss
+++ b/public/assets/stylesheets/theme/_main.scss
@@ -27,12 +27,25 @@ main.main {
h2 {
color: $white;
display: block;
- height: 79px;
+ height: 76px;
width: 100%;
background-size: 100%;
padding: 28px;
font-size: 21px;
margin-bottom: 30px;
+
+ span {
+ width: 83px;
+ height: 76px;
+ background: $blue;
+ position: absolute;
+ top: 25px;
+ @media (max-width: $screen-sm-max) {
+ top: 0px;
+ }
+ right: 15px;
+ }
+
}
}
section.first {
@@ -98,7 +111,10 @@ main.main {
}
.latest-news {
h2 {
- background-image: url(../images/heading-latest_news.jpg);
+ background-image: url(../images/heading-latest_news.png);
+ span {
+ background-image: url(../images/heading-latest_news-icon.png);
+ }
}
.latest-news-item {
border-bottom: 1px solid darken($white, 20%);
@@ -122,7 +138,10 @@ main.main {
}
.featured-articles {
h2 {
- background-image: url(../images/heading-featured.jpg);
+ background-image: url(../images/heading-featured.png);
+ span {
+ background-image: url(../images/heading-featured-icon.png);
+ }
}
.featured-articles-item {
background-image: url(../images/open-iot-bg.jpg);
@@ -152,7 +171,10 @@ main.main {
}
.upcoming-events {
h2 {
- background-image: url(../images/heading-upcoming_events.jpg);
+ background-image: url(../images/heading-upcoming_events.png);
+ span {
+ background-image: url(../images/heading-upcoming_events-icon.png);
+ }
}
.upcoming-events-item {
text-align: center;
@@ -278,12 +300,14 @@ main.main {
// working group page
.mb-logo {
- padding-top: 70px;
+ padding-top: 40px;
padding-left: 30px;
}
.members-info {
margin-bottom: 3em;
+ border-bottom: 1px dotted $blue;
+ padding-bottom: 40px;
}
diff --git a/public/index.html b/public/index.html
index 88d4a186c6d5bb88abc0ba1c7f23dfc4a5b88319..06d0a3499d8b3b2c532d00356164e7e63cae744a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -189,25 +189,21 @@
<div class="col-md-6 col-md-offset-1">
<section class="subsection-header featured-articles">
- <h2>Featured Articles</h2>
+ <h2>Featured Articles<span></span></h2>
<div class="row">
- <div class="col-md-6">
- <div class=" featured-articles-item">
- <a href="/java/tutorial">
- <h3>Open IoT Stack for Java Tutorial</h3>
-
- </a>
- </div>
+
- </div>
- <div class="col-md-6">
- <div class="featured-articles-item">
- <h3>Open IoT Stack for Java Tutorial</h3>
-
+ <div class="col-md-6">
+ <div class="featured-articles-item">
+ <a href="/java/tutorial">
+ <h3>Open IoT Stack for Java Tutorial </h3>
+ </a>
+ </div>
</div>
- </div>
+
+
</div>
</section>
@@ -218,7 +214,7 @@
<div class="col-md-6">
<section class="subsection-header latest-news">
- <h2>Latest News</h2>
+ <h2>Latest News<span></span></h2>
@@ -255,7 +251,7 @@
<div class="col-md-6">
<section class="subsection-header upcoming-events">
- <h2>Upcoming Events</h2>
+ <h2>Upcoming Events<span></span></h2>
<div class="row">
@@ -440,8 +436,8 @@
<div class="col-md-4 col-xs-6" style="padding:20px 60px; display:none;">
<div style="height: 120px; display:table-cell; vertical-align:middle;">
- <a href="http://eclipse.org/membership/showMember.php?member_id=656" target="_blank">
- <img src="/assets/images/members/logo-ibm.png" class="img-responsive" style="max-height:110px">
+ <a href="http://eclipse.org/membership/showMember.php?member_id=1152" target="_blank">
+ <img src="/assets/images/members/logo-gadgetkeeper.png" class="img-responsive" style="max-height:110px">
</a>
</div>
</div>
@@ -450,8 +446,8 @@
<div class="col-md-4 col-xs-6" style="padding:20px 60px; display:none;">
<div style="height: 120px; display:table-cell; vertical-align:middle;">
- <a href="http://eclipse.org/membership/showMember.php?member_id=1084" target="_blank">
- <img src="/assets/images/members/logo-ibh.png" class="img-responsive" style="max-height:110px">
+ <a href="http://eclipse.org/membership/showMember.php?member_id=656" target="_blank">
+ <img src="/assets/images/members/logo-ibm.png" class="img-responsive" style="max-height:110px">
</a>
</div>
</div>
@@ -460,8 +456,8 @@
<div class="col-md-4 col-xs-6" style="padding:20px 60px; display:none;">
<div style="height: 120px; display:table-cell; vertical-align:middle;">
- <a href="http://eclipse.org/membership/showMember.php?member_id=1152" target="_blank">
- <img src="/assets/images/members/logo-gadgetkeeper.png" class="img-responsive" style="max-height:110px">
+ <a href="http://eclipse.org/membership/showMember.php?member_id=1084" target="_blank">
+ <img src="/assets/images/members/logo-ibh.png" class="img-responsive" style="max-height:110px">
</a>
</div>
</div>
@@ -490,8 +486,8 @@
<div class="col-md-4 col-xs-6" style="padding:20px 60px; display:none;">
<div style="height: 120px; display:table-cell; vertical-align:middle;">
- <a href="http://eclipse.org/membership/showMember.php?member_id=1101" target="_blank">
- <img src="/assets/images/members/logo-m2m-alliance.png" class="img-responsive" style="max-height:110px">
+ <a href="http://eclipse.org/membership/showMember.php?member_id=1151" target="_blank">
+ <img src="/assets/images/members/logo-litmus.png" class="img-responsive" style="max-height:110px">
</a>
</div>
</div>
@@ -500,8 +496,8 @@
<div class="col-md-4 col-xs-6" style="padding:20px 60px; display:none;">
<div style="height: 120px; display:table-cell; vertical-align:middle;">
- <a href="http://eclipse.org/membership/showMember.php?member_id=1151" target="_blank">
- <img src="/assets/images/members/logo-litmus.png" class="img-responsive" style="max-height:110px">
+ <a href="http://eclipse.org/membership/showMember.php?member_id=1101" target="_blank">
+ <img src="/assets/images/members/logo-m2m-alliance.png" class="img-responsive" style="max-height:110px">
</a>
</div>
</div>
diff --git a/public/index.xml b/public/index.xml
index 6bfe7884db98d04886d1394911e85c814a079592..3b9f403b594497324d54c86529b039e8cd2770ed 100644
--- a/public/index.xml
+++ b/public/index.xml
@@ -132,6 +132,20 @@ The ThingFabric platform has a unique protocol-agnostic architecture that enable
</description>
</item>
+ <item>
+ <title>GadgetKeeper</title>
+ <link>http://localhost:1313/member/gadgetkeeper/</link>
+ <pubDate>Sun, 08 Mar 2015 15:31:18 -0700</pubDate>
+
+ <guid>http://localhost:1313/member/gadgetkeeper/</guid>
+ <description><p>GadgetKeeper is an Internet Of Things platform allowing the rapid creation if IoT solutions to connect your sensors, devices, equipment (&ldquo;Things&rdquo;) with people and systems.</p>
+
+<p>GadgetKeeper&rsquo;s technology eliminates complexity by simplifying and standardizing the way information is managed and exchanged so that physical and virtual assets and services can work together as one integrated system.</p>
+
+<p>GadgetKeeper provides you with foundational IoT building blocks (compete object model for things/services, templates and versioning, reach data types, programmable business logic) and services (data storage, time series, multiple communication protocols, integration with external services, life-cycle management and elastic scalability) allowing you to focus on product innovation rather than on enabling infrastructure.</p>
+</description>
+ </item>
+
<item>
<title>IBM</title>
<link>http://localhost:1313/member/ibm/</link>
@@ -153,20 +167,6 @@ The ThingFabric platform has a unique protocol-agnostic architecture that enable
</description>
</item>
- <item>
- <title>GadgetKeeper</title>
- <link>http://localhost:1313/member/gadgetkeeper/</link>
- <pubDate>Sun, 08 Mar 2015 15:31:18 -0700</pubDate>
-
- <guid>http://localhost:1313/member/gadgetkeeper/</guid>
- <description><p>GadgetKeeper is an Internet Of Things platform allowing the rapid creation if IoT solutions to connect your sensors, devices, equipment (&ldquo;Things&rdquo;) with people and systems.</p>
-
-<p>GadgetKeeper&rsquo;s technology eliminates complexity by simplifying and standardizing the way information is managed and exchanged so that physical and virtual assets and services can work together as one integrated system.</p>
-
-<p>GadgetKeeper provides you with foundational IoT building blocks (compete object model for things/services, templates and versioning, reach data types, programmable business logic) and services (data storage, time series, multiple communication protocols, integration with external services, life-cycle management and elastic scalability) allowing you to focus on product innovation rather than on enabling infrastructure.</p>
-</description>
- </item>
-
<item>
<title>itemis</title>
<link>http://localhost:1313/member/itemis/</link>
diff --git a/public/java/download/index.html b/public/java/download/index.html
index 42fb0652c4c27808fb24bc07e5dbc30cbde59f67..c0247b07d42d36f5d09b11ba8b3b4493c15fcf06 100644
--- a/public/java/download/index.html
+++ b/public/java/download/index.html
@@ -2,221 +2,198 @@
<html lang="en">
<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>iot.eclipse.org — Download the Open IoT stack for Java</title>
- <meta name="description" content="Download the Open IoT stack for Java">
- <meta name="author" content="Eclipse.org">
- <link rel="author" href="humans.txt" />
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
- <!--[if lt IE 9]>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <title>iot.eclipse.org — Download the Open IoT stack for Java</title>
+ <meta name="description" content="Download the Open IoT stack for Java">
+ <meta name="author" content="Eclipse.org">
+ <link rel="author" href="humans.txt" />
+ <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+ <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
-
- <!-- Custom Fonts -->
- <link href='http://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
- <link href='http://fonts.googleapis.com/css?family=Lekton:400,700' rel='stylesheet' type='text/css'>
-
- <!-- Le styles -->
- <link href="/css/bootstrap/bootstrap.min.css" rel="stylesheet">
- <link href="/css/theme.css" rel="stylesheet">
- <link href="/css/bootstrap/bootstrap-responsive.min.css" rel="stylesheet">
- <link href="../stylesheet/prism.css" rel="stylesheet" />
- <link href="../stylesheet/bootstrap-lightbox.min.css" rel="stylesheet" />
-
- <style type="text/css">
- .container h4 {
- margin-left: 3em;
- }
- .container h4:before {
- content: "> ";
- }
- img.fleft {
- float: left;
- width: 200px;
- margin-right: 2em;
- margin-bottom: 1em;
- }
- </style>
-
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-594061-11']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script');
- ga.type = 'text/javascript';
- ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0];
- s.parentNode.insertBefore(ga, s);
- })();
- </script>
-
+ <!-- Bootstrap -->
+ <link href="/assets/css/bootstrap.css" rel="stylesheet">
+ <link href="../stylesheet/prism.css" rel="stylesheet" />
+ <link href="../stylesheet/bootstrap-lightbox.min.css" rel="stylesheet" />
+ <style type="text/css">
+ .container h4 {
+ margin-left: 3em;
+ }
+
+ .container h4:before {
+ content: "> ";
+ }
+
+ img.fleft {
+ float: left;
+ width: 200px;
+ margin-right: 2em;
+ margin-bottom: 1em;
+ }
+ </style>
+ <script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-594061-11']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
+ </script>
</head>
<body>
-
- <div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span>
- </a> <a class="brand" href="/index.html">iot.eclipse.org</a>
- <div class="nav-collapse">
- <ul class="nav">
- <li><a href="/frameworks.html">Services & Frameworks</a>
- </li>
- <li><a href="/protocols.html">Protocols</a>
- </li>
- <li><a href="/tools.html">Tools</a>
- </li>
- <li><a href="/community.html">Community</a>
- </li>
- <li><a href="/ecosystem.html">Ecosystem</a>
- </li>
- <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">See it live <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="/demo" class="active">Live Demo</a>
- </li>
- <li><a href="/sandbox.html">Sandbox</a>
- </li>
- </ul>
- </li>
- </ul>
- <ul class="nav pull-right">
- <li>
- <div style="padding-top: 20px;">
- <div class="g-plusone" data-href="http://iot.eclipse.org/"></div>
- </div>
- </li>
- </ul>
- </div>
- <!--/.nav-collapse -->
- </div>
+ <header>
+ <nav class="navbar navbar-default">
+ <div class="container">
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/">
+ <img alt="Brand" src="/assets/images/iot-logo.png">
+ </a>
</div>
- </div>
-
- <!-- Place this tag after the last +1 button tag. -->
- <script type="text/javascript">
- (function() {
- var po = document.createElement('script');
- po.type = 'text/javascript';
- po.async = true;
- po.src = 'https://apis.google.com/js/plusone.js';
- var s = document.getElementsByTagName('script')[0];
- s.parentNode.insertBefore(po, s);
- })();
- </script>
-
-
-
- <div class="container">
-
-
- <div class="well">
- <div class="page-header">
- <h1>
- Download
- </h1>
- </div>
-
- <div>
- <p class="lead">Starting building your IoT solutions using the Open IoT Stack for Java thanks to our open-source software components.</p>
- </div>
- </div>
-
-
- <!-- Example row of columns -->
- <div class="row">
-
- <div id="kura" class="span6">
- <h2>Kura</h2>
- <p>Kura offers a Java/OSGi-based container for IoT applications running in service gateways.</p>
- <p>You can download ready-to-use Kura distributions for popular IoT platforms like Raspberry Pi and BeagleBone Black <a href="https://www.eclipse.org/kura/downloads.php#debian_packages" target="_blank">here</a>.</p>
- </div>
-
- <div id="smarthome" class="span6">
- <h2>SmartHome</h2>
- <p>Eclipse SmartHome is designed as a set of OSGi bundles that can be run on any OSGi container, such as Eclipse Equinox or Apache Felix.</p>
- <p>You can download the Eclipse SmartHome Designer <a href="https://www.eclipse.org/smarthome/download.html" target="_blank">here</a>.
- </div>
-
- </div>
-
- <div class="row">
-
- <div id="californium" class="span6">
- <h2>Californium</h2>
- <p>Eclipse Californium is a powerful CoAP framework targetting back-end services and stronger Internet of Things devices.
- </p>
- <p>You can use Californium in your Java-based IoT project by using the Maven artifacts available <a href="https://repo.eclipse.org/content/groups/californium/" target="_blank">here</a>.
- </div>
-
- <div id="paho" class="span6">
- <h2>Paho</h2>
- <p>The Eclipse Paho project provides open-source implementations of MQTT clients and tools.
- </p>
- <p>You can use the Java client in your Java SE project by following the instructions <a href="https://www.eclipse.org/paho/clients/java/" target="_blank">here</a>.
- <br> For Android, you may want to check out the <a href="https://www.eclipse.org/paho/clients/android/" target="_blank">ready-to-use Android service</a>.
- </div>
-
- </div>
-
- <div class="row">
-
- <div id="om2m" class="span6">
- <h2>OM2M</h2>
- <p>The OM2M project, is an open source implementation of the ETSI M2M standard.
- </p>
- <p>You can check out the source code from <a href="http://git.eclipse.org/c/om2m" target="_blank">OM2M's git repo</a>.
- </div>
-
- <div id="scada" class="span6">
- <h2>Eclipse SCADA</h2>
- <p>Eclipse SCADA provides a state of the art open source SCADA system, from communication system, to monitoring, data archiving and advanced GUIs.
- </p>
- <p>You can download Eclipse SCADA <a href="https://www.eclipse.org/eclipsescada/downloads.html" target="_blank">here</a>.
- </div>
-
- </div>
-
-
-
-
-
- <hr>
- <footer>
- <ul class="nav nav-pills">
- <li><a href="index.html">Home</a>
+ <!-- Collect the nav links, forms, and other content for toggling -->
+ <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+ <ul class="nav navbar-nav navbar-right">
+ <li><a href="/getting-started">Getting Started</a>
+ </li>
+ <li><a href="#" class="dropdown-toggle" data-toggle="dropdown">Technology</a>
+ <ul class="dropdown-menu" role="menu">
+ <li><a href="/standards">Standards</a>
</li>
- <li><a href="http://www.eclipse.org/legal/privacy.php" target="_blank">Privacy Policy</a>
+ <li><a href="/frameworks">Services & Frameworks</a>
</li>
- <li><a href="http://www.eclipse.org/legal/termsofuse.php" target="_blank">Terms of Use</a>
+ <li><a href="/projects">All the projects</a>
</li>
- <li><a href="http://www.eclipse.org/legal/copyright.php" target="_blank">Copyright Agent</a>
+ </ul>
+ </li>
+ <li><a href="#" class="dropdown-toggle" data-toggle="dropdown">Community</a>
+ <ul class="dropdown-menu" role="menu">
+ <li><a href="#">Resources</a>
</li>
- <li><a href="http://www.eclipse.org/legal/" target="_blank">Legal</a>
+ <li><a href="#">News</a>
</li>
- <li><a href="contact.html" data-toggle="modal" data-target="#contact-modal">Contact Us</a>
+ <li><a href="#">Events</a>
</li>
- <li class="pull-right">Copyright © 2015 The Eclipse Foundation. All Rights Reserved.</li>
- </ul>
- </footer>
- <div id="contact-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="contact-label" aria-hidden="true" style="display: none;"></div>
+ </ul>
+ </li>
+ <li><a href="/working-group">Working Group</a>
+ </li>
+ <li style="min-width: 100px; padding-top: 15px; padding-left: 8px;">
+ <div class="g-plusone" data-size="medium" data-href="http://iot.eclipse.org"></div>
+ </li>
+ </ul>
+ </div>
+ <!-- /.navbar-collapse -->
+ </div>
+ <!-- /.container-fluid -->
+ </nav>
+ </header>
+ <!-- Place this tag after the last +1 button tag. -->
+ <script type="text/javascript">
+ (function() {
+ var po = document.createElement('script');
+ po.type = 'text/javascript';
+ po.async = true;
+ po.src = 'https://apis.google.com/js/plusone.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(po, s);
+ })();
+ </script>
+ <main class="main">
+ <div class="well">
+ <div class="container">
+ <h1>
+ Download
+ </h1>
+ <div>
+ <p class="lead">Starting building your IoT solutions using the Open IoT Stack for Java thanks to our open-source software components.</p>
+ </div>
+ </div>
</div>
- <!-- /container -->
-
- <!-- JS is at the end of the document so the pages load faster -->
- <script src="/js/jquery.js"></script>
- <script src="/js/bootstrap/bootstrap.min.js"></script>
- <script src="/js/index.js"></script>
-
- <script src="../js/prism.js"></script>
- <script src="../js/bootstrap-lightbox.min.js"></script>
-
-
+ <div class="container">
+ <!-- Example row of columns -->
+ <div class="row">
+ <div id="kura" class="col-md-6">
+ <h2 class="purple">Kura</h2>
+ <p>Kura offers a Java/OSGi-based container for IoT applications running in service gateways.</p>
+ <p>You can download ready-to-use Kura distributions for popular IoT platforms like Raspberry Pi and BeagleBone Black <a href="https://www.eclipse.org/kura/downloads.php#debian_packages" target="_blank">here</a>.</p>
+ </div>
+ <div id="smarthome" class="col-md-6">
+ <h2 class="purple">SmartHome</h2>
+ <p>Eclipse SmartHome is designed as a set of OSGi bundles that can be run on any OSGi container, such as Eclipse Equinox or Apache Felix.</p>
+ <p>You can download the Eclipse SmartHome Designer <a href="https://www.eclipse.org/smarthome/download.html" target="_blank">here</a>.</p>
+ </div>
+ </div>
+ <div class="row">
+ <div id="californium" class="col-md-6">
+ <h2 class="purple">Californium</h2>
+ <p>Eclipse Californium is a powerful CoAP framework targetting back-end services and stronger Internet of Things devices.
+ </p>
+ <p>You can use Californium in your Java-based IoT project by using the Maven artifacts available <a href="https://repo.eclipse.org/content/groups/californium/" target="_blank">here</a>.</p>
+ </div>
+ <div id="paho" class="col-md-6">
+ <h2 class="purple">Paho</h2>
+ <p>The Eclipse Paho project provides open-source implementations of MQTT clients and tools.
+ </p>
+ <p>You can use the Java client in your Java SE project by following the instructions <a href="https://www.eclipse.org/paho/clients/java/" target="_blank">here</a>.
+ <br> For Android, you may want to check out the <a href="https://www.eclipse.org/paho/clients/android/" target="_blank">ready-to-use Android service</a>.</p>
+ </div>
+ </div>
+ <div class="row">
+ <div id="om2m" class="col-md-6">
+ <h2 class="purple">OM2M</h2>
+ <p>The OM2M project, is an open source implementation of the ETSI M2M standard.
+ </p>
+ <p>You can check out the source code from <a href="http://git.eclipse.org/c/om2m" target="_blank">OM2M's git repo</a>.
+ </div>
+ <div id="scada" class="col-md-6">
+ <h2 class="purple">Eclipse SCADA</h2>
+ <p>Eclipse SCADA provides a state of the art open source SCADA system, from communication system, to monitoring, data archiving and advanced GUIs.
+ </p>
+ <p>You can download Eclipse SCADA <a href="https://www.eclipse.org/eclipsescada/downloads.html" target="_blank">here</a>.
+ </div>
+ </div>
+ </div>
+ </main>
+ <hr>
+ <footer>
+ <ul class="nav nav-pills">
+ <li><a href="index.html">Home</a>
+ </li>
+ <li><a href="http://www.eclipse.org/legal/privacy.php" target="_blank">Privacy Policy</a>
+ </li>
+ <li><a href="http://www.eclipse.org/legal/termsofuse.php" target="_blank">Terms of Use</a>
+ </li>
+ <li><a href="http://www.eclipse.org/legal/copyright.php" target="_blank">Copyright Agent</a>
+ </li>
+ <li><a href="http://www.eclipse.org/legal/" target="_blank">Legal</a>
+ </li>
+ <li><a href="contact.html" data-toggle="modal" data-target="#contact-modal">Contact Us</a>
+ </li>
+ <li class="pull-right">Copyright © 2015 The Eclipse Foundation. All Rights Reserved.</li>
+ </ul>
+ </footer>
+ <div id="contact-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="contact-label" aria-hidden="true" style="display: none;"></div>
+ <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+ <!-- Include all compiled plugins (below), or include individual files as needed -->
+ <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+ <script src="/js/index.js"></script>
+ <script src="../js/prism.js"></script>
+ <script src="../js/bootstrap-lightbox.min.js"></script>
</body>
</html>
diff --git a/public/java/tutorial/index.html b/public/java/tutorial/index.html
index 7f1a7a58d7d0e0841744a7cb2b7e2d4682af377b..df5810052aa83c59e8eee494d7bd65c938344814 100644
--- a/public/java/tutorial/index.html
+++ b/public/java/tutorial/index.html
@@ -57,45 +57,59 @@
<body>
<header>
- <nav class="navbar">
+ <nav class="navbar navbar-default">
<div class="container">
- <div class="row">
- <div class="col-sm-2">
- <a href="/"><img src="/assets/images/iot-logo.png">
- </a>
- </div>
- <div class="col-sm-10">
- <ul class="list-inline right menu">
- <li><a href="#" class="dropdown-toggle" data-toggle="dropdown">Technology</a>
- <ul class="dropdown-menu">
- <li><a href="/standards">Standards</a>
- </li>
- <li><a href="/frameworks">Services & Frameworks</a>
- </li>
- <li><a href="/projects">All the projects</a>
- </li>
- </ul>
- </li>
- <li><a href="#" class="dropdown-toggle" data-toggle="dropdown">Community</a>
- <ul class="dropdown-menu">
- <li><a href="#">Resources</a>
- </li>
- <li><a href="#">News</a>
- </li>
- <li><a href="#">Events</a>
- </li>
- </ul>
- </li>
- <li><a href="/ecosystem">Members</a>
- </li>
- <li><a href="#">Getting Started</a>
- </li>
- </ul>
- </div>
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/">
+ <img alt="Brand" src="/assets/images/iot-logo.png">
+ </a>
</div>
+
+ <!-- Collect the nav links, forms, and other content for toggling -->
+ <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+ <ul class="nav navbar-nav navbar-right">
+ <li><a href="/getting-started">Getting Started</a>
+ </li>
+ <li><a href="#" class="dropdown-toggle" data-toggle="dropdown">Technology</a>
+ <ul class="dropdown-menu" role="menu">
+ <li><a href="/standards">Standards</a>
+ </li>
+ <li><a href="/frameworks">Services & Frameworks</a>
+ </li>
+ <li><a href="/projects">All the projects</a>
+ </li>
+ </ul>
+ </li>
+ <li><a href="#" class="dropdown-toggle" data-toggle="dropdown">Community</a>
+ <ul class="dropdown-menu" role="menu">
+ <li><a href="#">Resources</a>
+ </li>
+ <li><a href="#">News</a>
+ </li>
+ <li><a href="#">Events</a>
+ </li>
+ </ul>
+ </li>
+ <li><a href="/working-group">Working Group</a>
+ </li>
+ <li style="min-width: 100px; padding-top: 15px; padding-left: 8px;">
+ <div class="g-plusone" data-size="medium" data-href="http://iot.eclipse.org"></div>
+ </li>
+ </ul>
+ </div>
+ <!-- /.navbar-collapse -->
</div>
+ <!-- /.container-fluid -->
</nav>
+
</header>
<!-- Place this tag after the last +1 button tag. -->
@@ -465,11 +479,10 @@ sudo dpkg -i kura_1.0.0_raspberry-pi_armv6.deb</code></pre>
</footer>
-
- <!-- JS is at the end of the document so the pages load faster -->
- <script src="/js/jquery.js"></script>
- <script src="/js/bootstrap/bootstrap.min.js"></script>
- <script src="/js/index.js"></script>
+ <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+ <!-- Include all compiled plugins (below), or include individual files as needed -->
+ <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script src="../js/prism.js"></script>
<script src="../js/bootstrap-lightbox.min.js"></script>
diff --git a/public/sitemap.xml b/public/sitemap.xml
index 461063bb6a7f2f74d85d2dabc5558dd16fcafd63..922a56ccd4696f678c951d30ff4adba65eb8f843 100644
--- a/public/sitemap.xml
+++ b/public/sitemap.xml
@@ -1,144 +1,69 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-
- <url>
- <loc>http://localhost:1313/</loc>
- <lastmod>2015-06-23T16:12:42+01:00</lastmod>
- <priority>0</priority>
- </url>
-
- <url>
- <loc>http://localhost:1313/working-group/dummy/</loc>
- </url>
-
- <url>
- <loc>http://localhost:1313/news/2015-02-09-announcing-open-iot-challenge/</loc>
- <lastmod>2015-02-09T16:28:26-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/news/2015-03-04-case-study-mqtt/</loc>
- <lastmod>2015-03-04T00:00:00+00:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/2lemetry/</loc>
- <lastmod>2015-03-08T15:31:13-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/actuate/</loc>
- <lastmod>2015-03-08T15:31:14-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/bitreactive/</loc>
- <lastmod>2015-03-08T15:31:15-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/bosch/</loc>
- <lastmod>2015-03-08T15:31:15-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/canonical/</loc>
- <lastmod>2015-03-08T15:31:16-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/dcsquare/</loc>
- <lastmod>2015-03-08T15:31:16-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/dtag/</loc>
- <lastmod>2015-03-08T15:31:17-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/eurotech/</loc>
- <lastmod>2015-03-08T15:31:17-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/ibm/</loc>
- <lastmod>2015-03-08T15:31:18-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/ibh/</loc>
- <lastmod>2015-03-08T15:31:18-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/gadgetkeeper/</loc>
- <lastmod>2015-03-08T15:31:18-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/itemis/</loc>
- <lastmod>2015-03-08T15:31:19-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/laas/</loc>
- <lastmod>2015-03-08T15:31:19-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/m2m-alliance/</loc>
- <lastmod>2015-03-08T15:31:20-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/litmus/</loc>
- <lastmod>2015-03-08T15:31:20-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/openhab/</loc>
- <lastmod>2015-03-08T15:31:21-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/member/sierra/</loc>
- <lastmod>2015-03-08T15:31:22-07:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/event/2015-03-09-eclipsecon2015/</loc>
- <lastmod>2015-03-09T00:00:00+00:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/event/2015-03-18-eclipse-day-dresden/</loc>
- <lastmod>2015-03-18T00:00:00+00:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/news/2015-03-19-the-open-iot-challenge-project-are-way-cool/</loc>
- <lastmod>2015-03-19T00:00:00+00:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/event/2015-03-23-iot-conference/</loc>
- <lastmod>2015-03-23T16:12:42+01:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/event/2015-05-06-iot-devcon/</loc>
- <lastmod>2015-05-06T16:12:42+01:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/event/2015-05-12-iot-world/</loc>
- <lastmod>2015-05-12T16:12:42+01:00</lastmod>
- </url>
-
- <url>
- <loc>http://localhost:1313/event/2015-06-23-solidcon/</loc>
- <lastmod>2015-06-23T16:12:42+01:00</lastmod>
- </url>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset
+ xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
+ http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+<!-- created with Free Online Sitemap Generator www.xml-sitemaps.com -->
+
+<url>
+ <loc>http://iot.eclipse.org/</loc>
+ <lastmod>2014-02-04T15:20:19+00:00</lastmod>
+ <changefreq>weekly</changefreq>
+ <priority>1.00</priority>
+</url>
+<url>
+ <loc>http://iot.eclipse.org/index.html</loc>
+ <lastmod>2014-02-04T15:20:19+00:00</lastmod>
+ <changefreq>weekly</changefreq>
+ <priority>0.80</priority>
+</url>
+<url>
+ <loc>http://iot.eclipse.org/frameworks.html</loc>
+ <lastmod>2014-02-04T15:20:19+00:00</lastmod>
+ <changefreq>weekly</changefreq>
+ <priority>0.80</priority>
+</url>
+<url>
+ <loc>http://iot.eclipse.org/protocols.html</loc>
+ <lastmod>2014-02-04T15:20:19+00:00</lastmod>
+ <changefreq>weekly</changefreq>
+ <priority>0.80</priority>
+</url>
+<url>
+ <loc>http://iot.eclipse.org/tools.html</loc>
+ <lastmod>2014-02-04T15:20:19+00:00</lastmod>
+ <changefreq>weekly</changefreq>
+ <priority>0.80</priority>
+</url>
+<url>
+ <loc>http://iot.eclipse.org/community.html</loc>
+ <lastmod>2014-02-04T15:20:19+00:00</lastmod>
+ <changefreq>weekly</changefreq>
+ <priority>0.80</priority>
+</url>
+<url>
+ <loc>http://iot.eclipse.org/demo/</loc>
+ <lastmod>2014-02-04T15:20:19+00:00</lastmod>
+ <changefreq>weekly</changefreq>
+ <priority>0.80</priority>
+</url>
+<url>
+ <loc>http://iot.eclipse.org/sandbox.html</loc>
+ <lastmod>2014-02-04T15:20:19+00:00</lastmod>
+ <changefreq>weekly</changefreq>
+ <priority>0.80</priority>
+</url>
+<url>
+ <loc>http://iot.eclipse.org/contact.html</loc>
+ <lastmod>2014-02-04T15:20:19+00:00</lastmod>
+ <changefreq>weekly</changefreq>
+ <priority>0.80</priority>
+</url>
+<url>
+ <loc>http://iot.eclipse.org/demo/index.html</loc>
+ <lastmod>2014-02-04T15:20:19+00:00</lastmod>
+ <changefreq>weekly</changefreq>
+ <priority>0.64</priority>
+</url>
</urlset>
\ No newline at end of file
diff --git a/public/working-group/index.html b/public/working-group/index.html
index fd35ba575b9de5bce7d16e2b51d244c31c9ef8c4..f283b203eb7a4ab45d04e566656153eef9fa3274 100644
--- a/public/working-group/index.html
+++ b/public/working-group/index.html
@@ -144,7 +144,7 @@
</div>
</div>
</div>
-
+
<div class="row members-info" id="member-ibm">
<div class="col-md-2 col-md-offset-1 mb-logo">
<a href="http://eclipse.org/membership/showMember.php?member_id=656">
@@ -161,7 +161,7 @@
</div>
</div>
</div>
-
+
<div class="row members-info" id="member-eurotech">
<div class="col-md-2 col-md-offset-1 mb-logo">
<a href="http://eclipse.org/membership/showMember.php?member_id=968">
@@ -214,15 +214,15 @@
</div>
</div>
- <div class="row members-info" id="member-m2m-alliance">
+ <div class="row members-info" id="member-litmus">
<div class="col-md-2 col-md-offset-1 mb-logo">
- <a href="http://eclipse.org/membership/showMember.php?member_id=1101">
- <img src="/images/ecosystem/logo-m2m-alliance.png" alt="M2M Alliance" class="img-responsive" />
+ <a href="http://eclipse.org/membership/showMember.php?member_id=1151">
+ <img src="/images/ecosystem/logo-litmus.png" alt="Litmus Automation" class="img-responsive" />
</a>
</div>
<div class="col-md-8 col-md-offset-1 mb-info">
<div class="mb-info-container">
- <h2>M2M Alliance </h2>
+ <h2>Litmus Automation </h2>
</div>
<div>
@@ -231,15 +231,15 @@
</div>
</div>
- <div class="row members-info" id="member-litmus">
+ <div class="row members-info" id="member-m2m-alliance">
<div class="col-md-2 col-md-offset-1 mb-logo">
- <a href="http://eclipse.org/membership/showMember.php?member_id=1151">
- <img src="/images/ecosystem/logo-litmus.png" alt="Litmus Automation" class="img-responsive" />
+ <a href="http://eclipse.org/membership/showMember.php?member_id=1101">
+ <img src="/images/ecosystem/logo-m2m-alliance.png" alt="M2M Alliance" class="img-responsive" />
</a>
</div>
<div class="col-md-8 col-md-offset-1 mb-info">
<div class="mb-info-container">
- <h2>Litmus Automation </h2>
+ <h2>M2M Alliance </h2>
</div>
<div>
@@ -281,52 +281,52 @@
</div>
</div>
</div>
-
- <div class="row members-info" id="member-ibh">
+
+ <div class="row members-info" id="member-gadgetkeeper">
<div class="col-md-2 col-md-offset-1 mb-logo">
- <a href="http://eclipse.org/membership/showMember.php?member_id=1084">
- <img src="/images/ecosystem/logo-ibh.png" alt="IBH SYSTEMS" class="img-responsive" />
+ <a href="http://eclipse.org/membership/showMember.php?member_id=1152">
+ <img src="/images/ecosystem/logo-gadgetkeeper.png" alt="GadgetKeeper" class="img-responsive" />
</a>
</div>
<div class="col-md-8 col-md-offset-1 mb-info">
<div class="mb-info-container">
- <h2>IBH SYSTEMS </h2> <p>IBH SYSTEMS GmbH is the lead developer of the Eclipse SCADA system, a true open source SCADA platform.</p>
+ <h2>GadgetKeeper </h2> <p>GadgetKeeper is an Internet Of Things platform allowing the rapid creation if IoT solutions to connect your sensors, devices, equipment (“Things”) with people and systems.</p>
-<p>Eclipse SCADA offers a fully featured SCADA platform from the integration of field devices, over middleware functionality, to HMI components. It provides a communication abstraction layer, monitoring and archival services, a visual interface and a sophisticated system to configure complex SCADA installations. As the lead developer, IBH SYSTEMS GmbH offers consulting, custom development and integration for Eclipse SCADA.</p>
+<p>GadgetKeeper’s technology eliminates complexity by simplifying and standardizing the way information is managed and exchanged so that physical and virtual assets and services can work together as one integrated system.</p>
+
+<p>GadgetKeeper provides you with foundational IoT building blocks (compete object model for things/services, templates and versioning, reach data types, programmable business logic) and services (data storage, time series, multiple communication protocols, integration with external services, life-cycle management and elastic scalability) allowing you to focus on product innovation rather than on enabling infrastructure.</p>
</div>
<div>
- <a href="http://ibh-systems.com " target="_blank"><button class="btn btn-info">Read more <i class="icon-chevron-right"></i></button></a>
+ <a href="http://gadgetkeeper.com " target="_blank"><button class="btn btn-info">Read more <i class="icon-chevron-right"></i></button></a>
- <a href="https://www.youtube.com/watch?v=UYlmzuwBV30 " target="_blank"><button class="btn btn-info">View Demo <i class="icon-eye-open"></i></button></a>
+ <a href="http://gadgetkeeper.com/demo " target="_blank"><button class="btn btn-info">View Demo <i class="icon-eye-open"></i></button></a>
</div>
</div>
</div>
-
- <div class="row members-info" id="member-gadgetkeeper">
+
+ <div class="row members-info" id="member-ibh">
<div class="col-md-2 col-md-offset-1 mb-logo">
- <a href="http://eclipse.org/membership/showMember.php?member_id=1152">
- <img src="/images/ecosystem/logo-gadgetkeeper.png" alt="GadgetKeeper" class="img-responsive" />
+ <a href="http://eclipse.org/membership/showMember.php?member_id=1084">
+ <img src="/images/ecosystem/logo-ibh.png" alt="IBH SYSTEMS" class="img-responsive" />
</a>
</div>
<div class="col-md-8 col-md-offset-1 mb-info">
<div class="mb-info-container">
- <h2>GadgetKeeper </h2> <p>GadgetKeeper is an Internet Of Things platform allowing the rapid creation if IoT solutions to connect your sensors, devices, equipment (“Things”) with people and systems.</p>
-
-<p>GadgetKeeper’s technology eliminates complexity by simplifying and standardizing the way information is managed and exchanged so that physical and virtual assets and services can work together as one integrated system.</p>
+ <h2>IBH SYSTEMS </h2> <p>IBH SYSTEMS GmbH is the lead developer of the Eclipse SCADA system, a true open source SCADA platform.</p>
-<p>GadgetKeeper provides you with foundational IoT building blocks (compete object model for things/services, templates and versioning, reach data types, programmable business logic) and services (data storage, time series, multiple communication protocols, integration with external services, life-cycle management and elastic scalability) allowing you to focus on product innovation rather than on enabling infrastructure.</p>
+<p>Eclipse SCADA offers a fully featured SCADA platform from the integration of field devices, over middleware functionality, to HMI components. It provides a communication abstraction layer, monitoring and archival services, a visual interface and a sophisticated system to configure complex SCADA installations. As the lead developer, IBH SYSTEMS GmbH offers consulting, custom development and integration for Eclipse SCADA.</p>
</div>
<div>
- <a href="http://gadgetkeeper.com " target="_blank"><button class="btn btn-info">Read more <i class="icon-chevron-right"></i></button></a>
+ <a href="http://ibh-systems.com " target="_blank"><button class="btn btn-info">Read more <i class="icon-chevron-right"></i></button></a>
- <a href="http://gadgetkeeper.com/demo " target="_blank"><button class="btn btn-info">View Demo <i class="icon-eye-open"></i></button></a>
+ <a href="https://www.youtube.com/watch?v=UYlmzuwBV30 " target="_blank"><button class="btn btn-info">View Demo <i class="icon-eye-open"></i></button></a>
</div>
</div>
diff --git a/static/assets/css/bootstrap.css b/static/assets/css/bootstrap.css
index bb4b39fe1db42740e28c68eae407e373d2851638..5864725cadc790c380c53369a7204657c1c68031 100644
--- a/static/assets/css/bootstrap.css
+++ b/static/assets/css/bootstrap.css
@@ -4256,12 +4256,22 @@ main.main {
main.main .subsection-header h2 {
color: whitesmoke;
display: block;
- height: 79px;
+ height: 76px;
width: 100%;
background-size: 100%;
padding: 28px;
font-size: 21px;
margin-bottom: 30px; }
+ main.main .subsection-header h2 span {
+ width: 83px;
+ height: 76px;
+ background: #3085cb;
+ position: absolute;
+ top: 25px;
+ right: 15px; }
+ @media (max-width: 991px) {
+ main.main .subsection-header h2 span {
+ top: 0px; } }
main.main section.first {
background-color: whitesmoke;
background-image: url(../images/section-first-divider.png);
@@ -4309,7 +4319,9 @@ main.main {
main.main section.second .community p {
font-size: 1.5em; }
main.main section.second .latest-news h2 {
- background-image: url(../images/heading-latest_news.jpg); }
+ background-image: url(../images/heading-latest_news.png); }
+ main.main section.second .latest-news h2 span {
+ background-image: url(../images/heading-latest_news-icon.png); }
main.main section.second .latest-news .latest-news-item {
border-bottom: 1px solid #c2c2c2;
padding-bottom: 10px;
@@ -4325,7 +4337,9 @@ main.main {
margin-bottom: 35px;
border-bottom: 0px; }
main.main section.second .featured-articles h2 {
- background-image: url(../images/heading-featured.jpg); }
+ background-image: url(../images/heading-featured.png); }
+ main.main section.second .featured-articles h2 span {
+ background-image: url(../images/heading-featured-icon.png); }
main.main section.second .featured-articles .featured-articles-item {
background-image: url(../images/open-iot-bg.jpg);
background-size: cover;
@@ -4339,7 +4353,9 @@ main.main {
padding: 40px 0;
margin: 0; }
main.main section.second .upcoming-events h2 {
- background-image: url(../images/heading-upcoming_events.jpg); }
+ background-image: url(../images/heading-upcoming_events.png); }
+ main.main section.second .upcoming-events h2 span {
+ background-image: url(../images/heading-upcoming_events-icon.png); }
main.main section.second .upcoming-events .upcoming-events-item {
text-align: center;
color: whitesmoke;
@@ -4431,10 +4447,12 @@ main.main {
padding-bottom: 50px;
color: #551f62; }
main.main .mb-logo {
- padding-top: 70px;
+ padding-top: 40px;
padding-left: 30px; }
main.main .members-info {
- margin-bottom: 3em; }
+ margin-bottom: 3em;
+ border-bottom: 1px dotted #3085cb;
+ padding-bottom: 40px; }
main.main .videos h2 {
background-image: url(../images/heading-upcoming_events.jpg); }
main.main .presentations h2 {
diff --git a/static/assets/images/heading-community-icon.png b/static/assets/images/heading-community-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a26ff970c53a7af9d261c84ca9d7207130e220a
Binary files /dev/null and b/static/assets/images/heading-community-icon.png differ
diff --git a/static/assets/images/heading-community.png b/static/assets/images/heading-community.png
index f235436afce4572308134ff7a831436d730e9c1f..db5efa2c6786c81ccf7d8d043f067eb7a2e8234a 100644
Binary files a/static/assets/images/heading-community.png and b/static/assets/images/heading-community.png differ
diff --git a/static/assets/images/heading-featured-icon.png b/static/assets/images/heading-featured-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..11e4deb45053ec79141aed0859f0eed4e447110f
Binary files /dev/null and b/static/assets/images/heading-featured-icon.png differ
diff --git a/static/assets/images/heading-featured.png b/static/assets/images/heading-featured.png
index 10e64c132fb129fa95667228f943b6a53e58e742..8fed4a02b17e4b92b7f01d08523f4b10adde94b4 100644
Binary files a/static/assets/images/heading-featured.png and b/static/assets/images/heading-featured.png differ
diff --git a/static/assets/images/heading-latest_news-icon.png b/static/assets/images/heading-latest_news-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..65b761801b60b1773a2e05c4acaddd5b42b3496c
Binary files /dev/null and b/static/assets/images/heading-latest_news-icon.png differ
diff --git a/static/assets/images/heading-latest_news.png b/static/assets/images/heading-latest_news.png
index 1839a48bfe190a90b4be1cfa85fbaf7f1e51c550..2b73d0499423a7a10731c18c3448c8bce4785a1f 100644
Binary files a/static/assets/images/heading-latest_news.png and b/static/assets/images/heading-latest_news.png differ
diff --git a/static/assets/images/heading-upcoming_events-icon.png b/static/assets/images/heading-upcoming_events-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7cfe061392cf0d36975e86f06cf9b6782733b24
Binary files /dev/null and b/static/assets/images/heading-upcoming_events-icon.png differ
diff --git a/static/assets/images/heading-upcoming_events.png b/static/assets/images/heading-upcoming_events.png
index fe8062d36897d152e31709680e1faecc72b000fa..d4081d1dad2aa930609e354bd83458cb56829a19 100644
Binary files a/static/assets/images/heading-upcoming_events.png and b/static/assets/images/heading-upcoming_events.png differ
diff --git a/static/assets/stylesheets/theme/_main.scss b/static/assets/stylesheets/theme/_main.scss
index 5b1002aa8db9882bdf3d4f67949bfff3a93bd0d7..1af4e68925f0ff73f60688d4391eadbee7c9dd1b 100644
--- a/static/assets/stylesheets/theme/_main.scss
+++ b/static/assets/stylesheets/theme/_main.scss
@@ -27,12 +27,25 @@ main.main {
h2 {
color: $white;
display: block;
- height: 79px;
+ height: 76px;
width: 100%;
background-size: 100%;
padding: 28px;
font-size: 21px;
margin-bottom: 30px;
+
+ span {
+ width: 83px;
+ height: 76px;
+ background: $blue;
+ position: absolute;
+ top: 25px;
+ @media (max-width: $screen-sm-max) {
+ top: 0px;
+ }
+ right: 15px;
+ }
+
}
}
section.first {
@@ -98,7 +111,10 @@ main.main {
}
.latest-news {
h2 {
- background-image: url(../images/heading-latest_news.jpg);
+ background-image: url(../images/heading-latest_news.png);
+ span {
+ background-image: url(../images/heading-latest_news-icon.png);
+ }
}
.latest-news-item {
border-bottom: 1px solid darken($white, 20%);
@@ -122,7 +138,10 @@ main.main {
}
.featured-articles {
h2 {
- background-image: url(../images/heading-featured.jpg);
+ background-image: url(../images/heading-featured.png);
+ span {
+ background-image: url(../images/heading-featured-icon.png);
+ }
}
.featured-articles-item {
background-image: url(../images/open-iot-bg.jpg);
@@ -152,7 +171,10 @@ main.main {
}
.upcoming-events {
h2 {
- background-image: url(../images/heading-upcoming_events.jpg);
+ background-image: url(../images/heading-upcoming_events.png);
+ span {
+ background-image: url(../images/heading-upcoming_events-icon.png);
+ }
}
.upcoming-events-item {
text-align: center;
@@ -278,12 +300,14 @@ main.main {
// working group page
.mb-logo {
- padding-top: 70px;
+ padding-top: 40px;
padding-left: 30px;
}
.members-info {
margin-bottom: 3em;
+ border-bottom: 1px dotted $blue;
+ padding-bottom: 40px;
}
diff --git a/static/java/download/index.html b/static/java/download/index.html
index 42fb0652c4c27808fb24bc07e5dbc30cbde59f67..c0247b07d42d36f5d09b11ba8b3b4493c15fcf06 100644
--- a/static/java/download/index.html
+++ b/static/java/download/index.html
@@ -2,221 +2,198 @@
<html lang="en">
<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>iot.eclipse.org — Download the Open IoT stack for Java</title>
- <meta name="description" content="Download the Open IoT stack for Java">
- <meta name="author" content="Eclipse.org">
- <link rel="author" href="humans.txt" />
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
- <!--[if lt IE 9]>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <title>iot.eclipse.org — Download the Open IoT stack for Java</title>
+ <meta name="description" content="Download the Open IoT stack for Java">
+ <meta name="author" content="Eclipse.org">
+ <link rel="author" href="humans.txt" />
+ <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+ <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
-
- <!-- Custom Fonts -->
- <link href='http://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
- <link href='http://fonts.googleapis.com/css?family=Lekton:400,700' rel='stylesheet' type='text/css'>
-
- <!-- Le styles -->
- <link href="/css/bootstrap/bootstrap.min.css" rel="stylesheet">
- <link href="/css/theme.css" rel="stylesheet">
- <link href="/css/bootstrap/bootstrap-responsive.min.css" rel="stylesheet">
- <link href="../stylesheet/prism.css" rel="stylesheet" />
- <link href="../stylesheet/bootstrap-lightbox.min.css" rel="stylesheet" />
-
- <style type="text/css">
- .container h4 {
- margin-left: 3em;
- }
- .container h4:before {
- content: "> ";
- }
- img.fleft {
- float: left;
- width: 200px;
- margin-right: 2em;
- margin-bottom: 1em;
- }
- </style>
-
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-594061-11']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script');
- ga.type = 'text/javascript';
- ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0];
- s.parentNode.insertBefore(ga, s);
- })();
- </script>
-
+ <!-- Bootstrap -->
+ <link href="/assets/css/bootstrap.css" rel="stylesheet">
+ <link href="../stylesheet/prism.css" rel="stylesheet" />
+ <link href="../stylesheet/bootstrap-lightbox.min.css" rel="stylesheet" />
+ <style type="text/css">
+ .container h4 {
+ margin-left: 3em;
+ }
+
+ .container h4:before {
+ content: "> ";
+ }
+
+ img.fleft {
+ float: left;
+ width: 200px;
+ margin-right: 2em;
+ margin-bottom: 1em;
+ }
+ </style>
+ <script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-594061-11']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
+ </script>
</head>
<body>
-
- <div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span>
- </a> <a class="brand" href="/index.html">iot.eclipse.org</a>
- <div class="nav-collapse">
- <ul class="nav">
- <li><a href="/frameworks.html">Services & Frameworks</a>
- </li>
- <li><a href="/protocols.html">Protocols</a>
- </li>
- <li><a href="/tools.html">Tools</a>
- </li>
- <li><a href="/community.html">Community</a>
- </li>
- <li><a href="/ecosystem.html">Ecosystem</a>
- </li>
- <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">See it live <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="/demo" class="active">Live Demo</a>
- </li>
- <li><a href="/sandbox.html">Sandbox</a>
- </li>
- </ul>
- </li>
- </ul>
- <ul class="nav pull-right">
- <li>
- <div style="padding-top: 20px;">
- <div class="g-plusone" data-href="http://iot.eclipse.org/"></div>
- </div>
- </li>
- </ul>
- </div>
- <!--/.nav-collapse -->
- </div>
+ <header>
+ <nav class="navbar navbar-default">
+ <div class="container">
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/">
+ <img alt="Brand" src="/assets/images/iot-logo.png">
+ </a>
</div>
- </div>
-
- <!-- Place this tag after the last +1 button tag. -->
- <script type="text/javascript">
- (function() {
- var po = document.createElement('script');
- po.type = 'text/javascript';
- po.async = true;
- po.src = 'https://apis.google.com/js/plusone.js';
- var s = document.getElementsByTagName('script')[0];
- s.parentNode.insertBefore(po, s);
- })();
- </script>
-
-
-
- <div class="container">
-
-
- <div class="well">
- <div class="page-header">
- <h1>
- Download
- </h1>
- </div>
-
- <div>
- <p class="lead">Starting building your IoT solutions using the Open IoT Stack for Java thanks to our open-source software components.</p>
- </div>
- </div>
-
-
- <!-- Example row of columns -->
- <div class="row">
-
- <div id="kura" class="span6">
- <h2>Kura</h2>
- <p>Kura offers a Java/OSGi-based container for IoT applications running in service gateways.</p>
- <p>You can download ready-to-use Kura distributions for popular IoT platforms like Raspberry Pi and BeagleBone Black <a href="https://www.eclipse.org/kura/downloads.php#debian_packages" target="_blank">here</a>.</p>
- </div>
-
- <div id="smarthome" class="span6">
- <h2>SmartHome</h2>
- <p>Eclipse SmartHome is designed as a set of OSGi bundles that can be run on any OSGi container, such as Eclipse Equinox or Apache Felix.</p>
- <p>You can download the Eclipse SmartHome Designer <a href="https://www.eclipse.org/smarthome/download.html" target="_blank">here</a>.
- </div>
-
- </div>
-
- <div class="row">
-
- <div id="californium" class="span6">
- <h2>Californium</h2>
- <p>Eclipse Californium is a powerful CoAP framework targetting back-end services and stronger Internet of Things devices.
- </p>
- <p>You can use Californium in your Java-based IoT project by using the Maven artifacts available <a href="https://repo.eclipse.org/content/groups/californium/" target="_blank">here</a>.
- </div>
-
- <div id="paho" class="span6">
- <h2>Paho</h2>
- <p>The Eclipse Paho project provides open-source implementations of MQTT clients and tools.
- </p>
- <p>You can use the Java client in your Java SE project by following the instructions <a href="https://www.eclipse.org/paho/clients/java/" target="_blank">here</a>.
- <br> For Android, you may want to check out the <a href="https://www.eclipse.org/paho/clients/android/" target="_blank">ready-to-use Android service</a>.
- </div>
-
- </div>
-
- <div class="row">
-
- <div id="om2m" class="span6">
- <h2>OM2M</h2>
- <p>The OM2M project, is an open source implementation of the ETSI M2M standard.
- </p>
- <p>You can check out the source code from <a href="http://git.eclipse.org/c/om2m" target="_blank">OM2M's git repo</a>.
- </div>
-
- <div id="scada" class="span6">
- <h2>Eclipse SCADA</h2>
- <p>Eclipse SCADA provides a state of the art open source SCADA system, from communication system, to monitoring, data archiving and advanced GUIs.
- </p>
- <p>You can download Eclipse SCADA <a href="https://www.eclipse.org/eclipsescada/downloads.html" target="_blank">here</a>.
- </div>
-
- </div>
-
-
-
-
-
- <hr>
- <footer>
- <ul class="nav nav-pills">
- <li><a href="index.html">Home</a>
+ <!-- Collect the nav links, forms, and other content for toggling -->
+ <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+ <ul class="nav navbar-nav navbar-right">
+ <li><a href="/getting-started">Getting Started</a>
+ </li>
+ <li><a href="#" class="dropdown-toggle" data-toggle="dropdown">Technology</a>
+ <ul class="dropdown-menu" role="menu">
+ <li><a href="/standards">Standards</a>
</li>
- <li><a href="http://www.eclipse.org/legal/privacy.php" target="_blank">Privacy Policy</a>
+ <li><a href="/frameworks">Services & Frameworks</a>
</li>
- <li><a href="http://www.eclipse.org/legal/termsofuse.php" target="_blank">Terms of Use</a>
+ <li><a href="/projects">All the projects</a>
</li>
- <li><a href="http://www.eclipse.org/legal/copyright.php" target="_blank">Copyright Agent</a>
+ </ul>
+ </li>
+ <li><a href="#" class="dropdown-toggle" data-toggle="dropdown">Community</a>
+ <ul class="dropdown-menu" role="menu">
+ <li><a href="#">Resources</a>
</li>
- <li><a href="http://www.eclipse.org/legal/" target="_blank">Legal</a>
+ <li><a href="#">News</a>
</li>
- <li><a href="contact.html" data-toggle="modal" data-target="#contact-modal">Contact Us</a>
+ <li><a href="#">Events</a>
</li>
- <li class="pull-right">Copyright © 2015 The Eclipse Foundation. All Rights Reserved.</li>
- </ul>
- </footer>
- <div id="contact-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="contact-label" aria-hidden="true" style="display: none;"></div>
+ </ul>
+ </li>
+ <li><a href="/working-group">Working Group</a>
+ </li>
+ <li style="min-width: 100px; padding-top: 15px; padding-left: 8px;">
+ <div class="g-plusone" data-size="medium" data-href="http://iot.eclipse.org"></div>
+ </li>
+ </ul>
+ </div>
+ <!-- /.navbar-collapse -->
+ </div>
+ <!-- /.container-fluid -->
+ </nav>
+ </header>
+ <!-- Place this tag after the last +1 button tag. -->
+ <script type="text/javascript">
+ (function() {
+ var po = document.createElement('script');
+ po.type = 'text/javascript';
+ po.async = true;
+ po.src = 'https://apis.google.com/js/plusone.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(po, s);
+ })();
+ </script>
+ <main class="main">
+ <div class="well">
+ <div class="container">
+ <h1>
+ Download
+ </h1>
+ <div>
+ <p class="lead">Starting building your IoT solutions using the Open IoT Stack for Java thanks to our open-source software components.</p>
+ </div>
+ </div>
</div>
- <!-- /container -->
-
- <!-- JS is at the end of the document so the pages load faster -->
- <script src="/js/jquery.js"></script>
- <script src="/js/bootstrap/bootstrap.min.js"></script>
- <script src="/js/index.js"></script>
-
- <script src="../js/prism.js"></script>
- <script src="../js/bootstrap-lightbox.min.js"></script>
-
-
+ <div class="container">
+ <!-- Example row of columns -->
+ <div class="row">
+ <div id="kura" class="col-md-6">
+ <h2 class="purple">Kura</h2>
+ <p>Kura offers a Java/OSGi-based container for IoT applications running in service gateways.</p>
+ <p>You can download ready-to-use Kura distributions for popular IoT platforms like Raspberry Pi and BeagleBone Black <a href="https://www.eclipse.org/kura/downloads.php#debian_packages" target="_blank">here</a>.</p>
+ </div>
+ <div id="smarthome" class="col-md-6">
+ <h2 class="purple">SmartHome</h2>
+ <p>Eclipse SmartHome is designed as a set of OSGi bundles that can be run on any OSGi container, such as Eclipse Equinox or Apache Felix.</p>
+ <p>You can download the Eclipse SmartHome Designer <a href="https://www.eclipse.org/smarthome/download.html" target="_blank">here</a>.</p>
+ </div>
+ </div>
+ <div class="row">
+ <div id="californium" class="col-md-6">
+ <h2 class="purple">Californium</h2>
+ <p>Eclipse Californium is a powerful CoAP framework targetting back-end services and stronger Internet of Things devices.
+ </p>
+ <p>You can use Californium in your Java-based IoT project by using the Maven artifacts available <a href="https://repo.eclipse.org/content/groups/californium/" target="_blank">here</a>.</p>
+ </div>
+ <div id="paho" class="col-md-6">
+ <h2 class="purple">Paho</h2>
+ <p>The Eclipse Paho project provides open-source implementations of MQTT clients and tools.
+ </p>
+ <p>You can use the Java client in your Java SE project by following the instructions <a href="https://www.eclipse.org/paho/clients/java/" target="_blank">here</a>.
+ <br> For Android, you may want to check out the <a href="https://www.eclipse.org/paho/clients/android/" target="_blank">ready-to-use Android service</a>.</p>
+ </div>
+ </div>
+ <div class="row">
+ <div id="om2m" class="col-md-6">
+ <h2 class="purple">OM2M</h2>
+ <p>The OM2M project, is an open source implementation of the ETSI M2M standard.
+ </p>
+ <p>You can check out the source code from <a href="http://git.eclipse.org/c/om2m" target="_blank">OM2M's git repo</a>.
+ </div>
+ <div id="scada" class="col-md-6">
+ <h2 class="purple">Eclipse SCADA</h2>
+ <p>Eclipse SCADA provides a state of the art open source SCADA system, from communication system, to monitoring, data archiving and advanced GUIs.
+ </p>
+ <p>You can download Eclipse SCADA <a href="https://www.eclipse.org/eclipsescada/downloads.html" target="_blank">here</a>.
+ </div>
+ </div>
+ </div>
+ </main>
+ <hr>
+ <footer>
+ <ul class="nav nav-pills">
+ <li><a href="index.html">Home</a>
+ </li>
+ <li><a href="http://www.eclipse.org/legal/privacy.php" target="_blank">Privacy Policy</a>
+ </li>
+ <li><a href="http://www.eclipse.org/legal/termsofuse.php" target="_blank">Terms of Use</a>
+ </li>
+ <li><a href="http://www.eclipse.org/legal/copyright.php" target="_blank">Copyright Agent</a>
+ </li>
+ <li><a href="http://www.eclipse.org/legal/" target="_blank">Legal</a>
+ </li>
+ <li><a href="contact.html" data-toggle="modal" data-target="#contact-modal">Contact Us</a>
+ </li>
+ <li class="pull-right">Copyright © 2015 The Eclipse Foundation. All Rights Reserved.</li>
+ </ul>
+ </footer>
+ <div id="contact-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="contact-label" aria-hidden="true" style="display: none;"></div>
+ <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+ <!-- Include all compiled plugins (below), or include individual files as needed -->
+ <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+ <script src="/js/index.js"></script>
+ <script src="../js/prism.js"></script>
+ <script src="../js/bootstrap-lightbox.min.js"></script>
</body>
</html>
diff --git a/static/java/tutorial/index.html b/static/java/tutorial/index.html
index 7f1a7a58d7d0e0841744a7cb2b7e2d4682af377b..df5810052aa83c59e8eee494d7bd65c938344814 100644
--- a/static/java/tutorial/index.html
+++ b/static/java/tutorial/index.html
@@ -57,45 +57,59 @@
<body>
<header>
- <nav class="navbar">
+ <nav class="navbar navbar-default">
<div class="container">
- <div class="row">
- <div class="col-sm-2">
- <a href="/"><img src="/assets/images/iot-logo.png">
- </a>
- </div>
- <div class="col-sm-10">
- <ul class="list-inline right menu">
- <li><a href="#" class="dropdown-toggle" data-toggle="dropdown">Technology</a>
- <ul class="dropdown-menu">
- <li><a href="/standards">Standards</a>
- </li>
- <li><a href="/frameworks">Services & Frameworks</a>
- </li>
- <li><a href="/projects">All the projects</a>
- </li>
- </ul>
- </li>
- <li><a href="#" class="dropdown-toggle" data-toggle="dropdown">Community</a>
- <ul class="dropdown-menu">
- <li><a href="#">Resources</a>
- </li>
- <li><a href="#">News</a>
- </li>
- <li><a href="#">Events</a>
- </li>
- </ul>
- </li>
- <li><a href="/ecosystem">Members</a>
- </li>
- <li><a href="#">Getting Started</a>
- </li>
- </ul>
- </div>
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/">
+ <img alt="Brand" src="/assets/images/iot-logo.png">
+ </a>
</div>
+
+ <!-- Collect the nav links, forms, and other content for toggling -->
+ <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+ <ul class="nav navbar-nav navbar-right">
+ <li><a href="/getting-started">Getting Started</a>
+ </li>
+ <li><a href="#" class="dropdown-toggle" data-toggle="dropdown">Technology</a>
+ <ul class="dropdown-menu" role="menu">
+ <li><a href="/standards">Standards</a>
+ </li>
+ <li><a href="/frameworks">Services & Frameworks</a>
+ </li>
+ <li><a href="/projects">All the projects</a>
+ </li>
+ </ul>
+ </li>
+ <li><a href="#" class="dropdown-toggle" data-toggle="dropdown">Community</a>
+ <ul class="dropdown-menu" role="menu">
+ <li><a href="#">Resources</a>
+ </li>
+ <li><a href="#">News</a>
+ </li>
+ <li><a href="#">Events</a>
+ </li>
+ </ul>
+ </li>
+ <li><a href="/working-group">Working Group</a>
+ </li>
+ <li style="min-width: 100px; padding-top: 15px; padding-left: 8px;">
+ <div class="g-plusone" data-size="medium" data-href="http://iot.eclipse.org"></div>
+ </li>
+ </ul>
+ </div>
+ <!-- /.navbar-collapse -->
</div>
+ <!-- /.container-fluid -->
</nav>
+
</header>
<!-- Place this tag after the last +1 button tag. -->
@@ -465,11 +479,10 @@ sudo dpkg -i kura_1.0.0_raspberry-pi_armv6.deb</code></pre>
</footer>
-
- <!-- JS is at the end of the document so the pages load faster -->
- <script src="/js/jquery.js"></script>
- <script src="/js/bootstrap/bootstrap.min.js"></script>
- <script src="/js/index.js"></script>
+ <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+ <!-- Include all compiled plugins (below), or include individual files as needed -->
+ <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script src="../js/prism.js"></script>
<script src="../js/bootstrap-lightbox.min.js"></script>