Updated Funding information and newsletter pages, inc. news section

Change-Id: Ie2d8eec1408f49f26cbac8c1e19a8e556559c135
Signed-off-by: Martin Lowe <martin.lowe@eclipse-foundation.org>
diff --git a/eclipse_newsletter/2020/july/5.php b/eclipse_newsletter/2020/july/5.php
new file mode 100644
index 0000000..0d02e87
--- /dev/null
+++ b/eclipse_newsletter/2020/july/5.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright (c) 2020 Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * Contributors:
+ *   Eric Poirier (Eclipse Foundation) - Initial implementation
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
+  $App = new App ();
+  require_once ('_variables.php');
+
+  // Begin: page-specific settings. Change these.
+  $pageTitle = "Newsletter news";
+  $pageKeywords = "eclipse, newsletter, automation";
+  $pageAuthor = "Eclipse Foundation";
+  $pageDescription = "Newsletter News";
+
+  // Uncomment and set $original_url if you know the original url of this article.
+  //$original_url = "http://eclipse.org/community/eclipse_newsletter/";
+  //$og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
+
+  // Place your html content in a file called content/en_article1.php
+  $script_name = $App->getScriptName();
+
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_generate_page_article.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/2020/july/content/en_1.php b/eclipse_newsletter/2020/july/content/en_1.php
index 3355afd..b754152 100644
--- a/eclipse_newsletter/2020/july/content/en_1.php
+++ b/eclipse_newsletter/2020/july/content/en_1.php
@@ -114,7 +114,7 @@
 <p>
 	<img
 		alt="Figure 1: Basic Control Loop Implemented in Eclipse Arrowhead"
-		src="images/1_1.png" class="img img-responsive" />
+		src="images/1_1.jpg" class="img img-responsive" />
 </p>
 <p>Once deployed, the control loop operates autonomously until further
 	notice from the Orchestration or Authorisation system.</p>
@@ -139,7 +139,7 @@
 	<img
 		alt="Figure 3: A Complex SoS Engineered From Interactions Among Local
 	Clouds"
-		src="images/1_3.png" class="img img-responsive" />
+		src="images/1_3.jpg" class="img img-responsive" />
 </p>
 <h2>Looking at the Bigger Picture</h2>
 <p>Engineering larger automation and digitalization solutions is
@@ -165,7 +165,7 @@
 	(v4.1.3), release candidate, and prototype software.</p>
 <p>
 	<img alt="Figure 4: Current Roadmap for Eclipse Arrowhead Core Systems"
-		src="images/1_4.png" class="img img-responsive" />
+		src="images/1_4.jpg" class="img img-responsive" />
 </p>
 <p>The focus of the releases is as follows:</p>
 <ul>
@@ -199,14 +199,6 @@
 	ISBN number is 9781498756754. A quick online search should find the
 	book.
 </p>
-<h2>Funding Acknowledgements</h2>
-<p>The Arrowhead Tools research project is funded by the European
-	Commission, through the European Horizon 2020 research and innovation
-	program, the Electronic Components and Systems for European Leadership
-	(ECSEL) Joint Undertaking, and national funding authorities in Sweden,
-	Spain, Poland, Germany, Italy, Czech Republic, Netherlands, Belgium,
-	Latvia, Romania, Hungary, Finland, Turkey, and Switzerland under the
-	research project Arrowhead Tools with Grant Agreement no. 826452.</p>
 <div class="margin-bottom-20">
   <?php print $Theme->getShareButtonsHTML(); ?>
 </div>
@@ -235,6 +227,30 @@
     </div>
   </div>
 </div>
+<div class="row margin-top-20">
+	<div class="col-xs-24 col-sm-8  match-height-item-by-row">
+		<img src="images/3_6.png" alt="European Union Horizon 2020" class="img img-responsive" />
+		<img src="images/1_8.png" alt="ECSEL Joint Undertaking" class="img img-responsive" />
+	</div>
+	<div class="col-xs-24 col-sm-8 vertical-align match-height-item-by-row">
+		<ul>
+			<li>Website: <a href="https://arrowhead.eu/">arrowhead.eu</a></li>
+			<li>Twitter: <a href="https://www.twitter.com/ArrowheadEU">@ArrowheadEU</a></li>
+			<li>Youtube: <a href="https://www.youtube.com/user/ArrowheadProject">Arrowhead</a></li>
+			<li>Eclipse Project: <a href="https://projects.eclipse.org/projects/iot.arrowhead">Eclipse Arrowhead | projects.eclipse.org</a></li>
+		</ul>
+	</div>
+	<div class="col-xs-24 col-sm-8 vertical-align match-height-item-by-row">
+		<img src="images/1_9.png" alt="Arrowhead" class="img img-responsive" />
+	</div>
+</div>
+<p>The Arrowhead Tools research project is funded by the European
+	Commission, through the European Horizon 2020 research and innovation
+	program, the Electronic Components and Systems for European Leadership
+	(ECSEL) Joint Undertaking, and national funding authorities in Sweden,
+	Spain, Poland, Germany, Italy, Czech Republic, Netherlands, Belgium,
+	Latvia, Romania, Hungary, Finland, Turkey, and Switzerland under the
+	research project Arrowhead Tools with Grant Agreement no. 826452.</p>
 <p class="margin-top-20" id="footnote_1">[i] Delsing, J. Eliasson, J. van Deventer, H. Derhamy, and P. Varga,
 	“Enabling iot automation using local clouds,” in 2016 IEEE 3rd World
 	Forum on Internet of Things (WF-IoT), 2016, pp. 502–507</p>
\ No newline at end of file
diff --git a/eclipse_newsletter/2020/july/content/en_3.php b/eclipse_newsletter/2020/july/content/en_3.php
index 98a3e38..21c110e 100644
--- a/eclipse_newsletter/2020/july/content/en_3.php
+++ b/eclipse_newsletter/2020/july/content/en_3.php
@@ -239,7 +239,7 @@
 						src="images/3_5.png" />
 				</div>
 				<div class="col-sm-16">
-					<p class="author-name">Anna Carolina</p>
+					<p class="author-name">Anna Carolina Principato</p>
 					<p class="author-bio">Anna Carolina Principato has a Master&#39;s
 						degree in Romance Philology from the Ludwig Maximilian University
 						of Munich. For more than 10 years, Anna has been working as an
@@ -256,13 +256,19 @@
 </div>
 <div class="row">
 	<div class="col-xs-24 col-sm-8">
-		<img src="images/3_7.png" alt="" class="img img-responsive" />
+		<img src="images/3_6.png" alt="" class="img img-responsive" />
 	</div>
 	<div class="col-xs-24 col-sm-8">
 		<ul>
 			<li>Website: <a href="https://robmosys.eu/">robmosys.eu/</a></li>
-			<li>Twitter:<a href="https://www.twitter.com/RobMoSys">@RobMoSys</a></li>
+			<li>Twitter: <a href="https://www.twitter.com/RobMoSys">@RobMoSys</a></li>
+			<li>Youtube: <a href="https://www.youtube.com/channel/UCURqFtHgAPsXl9mB_QgbB0w/featured">RobMoSys</a></li>
 		</ul>
+        <p>Eclipse Projects:</p>
+        <ul>
+        	<li><a href="https://projects.eclipse.org/projects/modeling.smartmdsd">Eclipse SmartMDSD | projects.eclipse.org</a></li>
+            <li><a href="https://www.eclipse.org/papyrus/components/robotics/">Papyrus for Robotics</a></li>
+        </ul>
 	</div>
 	<div class="col-xs-24 col-sm-8">
 		<img src="images/3_1.png" alt="" class="img img-responsive" />
diff --git a/eclipse_newsletter/2020/july/content/en_4.php b/eclipse_newsletter/2020/july/content/en_4.php
index 464a64d..f31f071 100644
--- a/eclipse_newsletter/2020/july/content/en_4.php
+++ b/eclipse_newsletter/2020/july/content/en_4.php
@@ -118,7 +118,7 @@
 <div class="bottomitem">
 	<h3>About the Author</h3>
 	<div class="row">
-		<div class="col-sm-12">
+		<div class="col-sm-24">
 			<div class="row margin-bottom-20">
 				<div class="col-sm-8">
 					<img class="img-responsive" alt="Marco Jahn" src="images/4_1.png" />
diff --git a/eclipse_newsletter/2020/july/content/en_5.php b/eclipse_newsletter/2020/july/content/en_5.php
new file mode 100644
index 0000000..fa1ffef
--- /dev/null
+++ b/eclipse_newsletter/2020/july/content/en_5.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright (c) 2020 Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * Contributors:
+ *   Martin Lowe (Eclipse Foundation) - Initial implementation
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+// This file must be included
+if (basename(__FILE__) == basename($_SERVER['PHP_SELF'])) {
+  exit();
+}
+?>
+<h1><?php echo $pageTitle; ?></h1>
+<h2>Jakarta EE Survey Results and Milestone Release Now Available</h2>
+<p>June was a big month for Jakarta EE with the release of the 2020
+	Jakarta EE Developer Survey results and the Jakarta EE 9 milestone
+	release.</p>
+
+<p>This year&rsquo;s Jakarta EE Developer Survey revealed a number of
+	interesting trends, including the fact that Jakarta EE adoption is on
+	the rise. Survey responses showed that:</p>
+<ul>
+	<li>Jakarta EE is emerging as the second-place cloud native framework
+		with 35 percent usage.</li>
+	<li>Together, Java 8 and Jakarta EE 8 hit the mainstream with 55
+		percent adoption. Despite only shipping in September 2019, Jakarta EE
+		8 usage skyrocketed to 17 percent.</li>
+</ul>
+<p>
+	Get the complete survey results <a
+		href="https://www.google.com/url?q=https://outreach.jakartaee.org/2020-developer-survey-report&amp;sa=D&amp;ust=1595864660443000&amp;usg=AOvVaw1aPeF7dPPcZB5QA3dCRtXh">here</a>.
+</p>
+<p>The Jakarta EE 9 milestone release reinforces the value the industry
+	sees in Jakarta EE. Technology leaders are investing to ensure their
+	software supports the Jakarta EE 9 namespace and others have indicated
+	they will do the same. With the full Jakarta EE 9 release later this
+	year, Jakarta EE will be ideally positioned to drive true open source,
+	cloud native innovation using Java.</p>
+
+<p>
+	Find Jakarta EE 9 milestone platform information <a
+		href="https://www.google.com/url?q=https://jakarta.ee/specifications/platform/9/&amp;sa=D&amp;ust=1595864660443000&amp;usg=AOvVaw1cX95BYUtwneMX6Q5tHaH_">here</a>.
+</p>
+<p>
+	For deeper insight into industry adoption of Jakarta EE, how
+	architectural approaches are evolving, and Jakarta EE community growth,
+	read<a
+		href="https://www.google.com/url?q=https://blogs.eclipse.org/post/mike-milinkovich/jakarta-ee-taking&amp;sa=D&amp;ust=1595864660444000&amp;usg=AOvVaw3ylcWRAZROh9jSlqhfD_N5">this
+		blog</a>&nbsp;by Eclipse Foundation Executive Director, Mike
+	Milinkovich.
+
+</p>
+<hr />
+<h2>Start Planning Your EclipseCon 2020 Experience</h2>
+<p>
+	<a
+		href="https://www.google.com/url?q=https://www.eclipsecon.org/2020&amp;sa=D&amp;ust=1595864660445000&amp;usg=AOvVaw058BcLcZDwkHeLmP9AJiae">EclipseCon
+		2020</a>&nbsp;will be held October 19-20 and is a free, virtual event
+	this year so more community members can join in.
+</p>
+
+<p>Here are just a few ways you can start planning your EclipseCon 2020
+	experience today:</p>
+<ul>
+	<li><a
+		href="https://www.google.com/url?q=https://www.eclipsecon.org/2020/registration&amp;sa=D&amp;ust=1595864660445000&amp;usg=AOvVaw3FMONcy1EM4YiuBtESqyhB">Register
+			online</a>. There&rsquo;s no registration fee, but you do need to
+		register to attend.</li>
+	<li><a
+		href="https://www.google.com/url?q=https://www.eclipsecon.org/2020/community-day&amp;sa=D&amp;ust=1595864660446000&amp;usg=AOvVaw0dmKF-BvVBcOQU_s95dRh4">Reserve
+			your spot in Community Day</a>. Community Day will be held on Monday,
+		October 19. Participating in Community Day is a great way to grow your
+		own Eclipse community and gain visibility into other communities and
+		projects. Space for sessions is limited, so be sure to request your
+		spot early.</li>
+	<li><a
+		href="https://www.google.com/url?q=https://www.eclipsecon.org/2020/sessions&amp;sa=D&amp;ust=1595864660447000&amp;usg=AOvVaw2N6oVN_3UghHjTAI1ql-7R">Check
+			out the EclipseCon 2020 sessions</a>.The EclipseCon 2020 program has
+		been announced, so take a few minutes to find the topics and talks
+		that interest you most.</li>
+</ul>
+<hr />
+<h2>Get Involved in Eclipse SAM IoT 2020</h2>
+<p>
+	<a
+		href="https://www.google.com/url?q=https://events.eclipse.org/2020/sam-iot/&amp;sa=D&amp;ust=1595864660448000&amp;usg=AOvVaw136mIvYH4qp45Px-mATW7n">Eclipse
+		SAM IoT</a>&nbsp;is the first virtual Eclipse conference on Security,
+	Artificial Intelligence, and Modeling (SAM) for next-generation
+	Internet of Things (IoT). This free event will be held September 17-18,
+	2020.
+</p>
+
+<p>As we move into the next stage of IoT evolution, resolving technical
+	challenges such as low latency, high reliability, security, and dynamic
+	resource allocation is critical to enable smart factories, smart
+	cities, critical infrastructure, and cooperative service robotics.
+	Efforts so far have led to innovations in edge computing, artificial
+	intelligence and analytics, digital twins, and security and trust
+	technologies.</p>
+
+<p>Experts and Researchers: Submit a Paper</p>
+<p>If you&rsquo;re an expert or a researcher in any of these areas,
+	please consider presenting your work to SAM IoT conference participants
+	&mdash; a mix of researchers, industry players, and representatives
+	from standards bodies. We welcome all submissions and there&rsquo;s no
+	need for projects to be associated with the Eclipse Foundation or its
+	projects.</p>
+
+<p>
+	To review the submission guidelines and submit your paper, click <a
+		href="https://www.google.com/url?q=https://events.eclipse.org/2020/sam-iot/call-for-papers/&amp;sa=D&amp;ust=1595864660449000&amp;usg=AOvVaw1XooKefz9kC71_dEZRNl1P">here</a>.
+</p>
+<p>
+	The final date for submissions is July 22, 2020, and selected papers
+	will be published under the Creative Commons License 4.0 on <a
+		href="https://www.google.com/url?q=http://ceur-ws.org/&amp;sa=D&amp;ust=1595864660449000&amp;usg=AOvVaw0XdwjHpqiTF1XoUnDBnkOU">ceur-ws.org</a>.
+</p>
+
+<p>Participants: Register Today</p>
+<p>
+	To register for the Eclipse SAM IoT virtual conference, click <a
+		href="https://www.google.com/url?q=https://www.eventbrite.de/e/eclipse-sam-iot-2020-tickets-107823242220&amp;sa=D&amp;ust=1595864660450000&amp;usg=AOvVaw0Q5rMbYoPJyXFMcEUKHTzG">here</a>.
+</p>
\ No newline at end of file
diff --git a/eclipse_newsletter/2020/july/content/en_index.php b/eclipse_newsletter/2020/july/content/en_index.php
index 447738d..703c560 100644
--- a/eclipse_newsletter/2020/july/content/en_index.php
+++ b/eclipse_newsletter/2020/july/content/en_index.php
@@ -352,7 +352,7 @@
 
 												<p
 													style="margin: 10px 0; padding: 0; mso-line-height-rule: exactly; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #3d3935; font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 150%; text-align: left;">
-													Finally, read our News section to find out why June was a
+													Finally, <a href="/community/eclipse_newsletter/2020/july/5.php">read our News section</a> to find out why June was a
 													big month for Jakarta EE.<br> &nbsp;<br> And, be sure to
 													register for these upcoming free, virtual events:
 												</p>
diff --git a/eclipse_newsletter/2020/july/images/1_1.jpg b/eclipse_newsletter/2020/july/images/1_1.jpg
new file mode 100644
index 0000000..d37c4f3
--- /dev/null
+++ b/eclipse_newsletter/2020/july/images/1_1.jpg
Binary files differ
diff --git a/eclipse_newsletter/2020/july/images/1_1.png b/eclipse_newsletter/2020/july/images/1_1.png
deleted file mode 100644
index 98f0b86..0000000
--- a/eclipse_newsletter/2020/july/images/1_1.png
+++ /dev/null
Binary files differ
diff --git a/eclipse_newsletter/2020/july/images/1_2.png b/eclipse_newsletter/2020/july/images/1_2.png
index 9343f58..341ad6d 100644
--- a/eclipse_newsletter/2020/july/images/1_2.png
+++ b/eclipse_newsletter/2020/july/images/1_2.png
Binary files differ
diff --git a/eclipse_newsletter/2020/july/images/1_3.jpg b/eclipse_newsletter/2020/july/images/1_3.jpg
new file mode 100644
index 0000000..b55a51e
--- /dev/null
+++ b/eclipse_newsletter/2020/july/images/1_3.jpg
Binary files differ
diff --git a/eclipse_newsletter/2020/july/images/1_3.png b/eclipse_newsletter/2020/july/images/1_3.png
deleted file mode 100644
index e593db7..0000000
--- a/eclipse_newsletter/2020/july/images/1_3.png
+++ /dev/null
Binary files differ
diff --git a/eclipse_newsletter/2020/july/images/1_4.jpg b/eclipse_newsletter/2020/july/images/1_4.jpg
new file mode 100644
index 0000000..145e48b
--- /dev/null
+++ b/eclipse_newsletter/2020/july/images/1_4.jpg
Binary files differ
diff --git a/eclipse_newsletter/2020/july/images/1_4.png b/eclipse_newsletter/2020/july/images/1_4.png
deleted file mode 100644
index f330dbe..0000000
--- a/eclipse_newsletter/2020/july/images/1_4.png
+++ /dev/null
Binary files differ
diff --git a/eclipse_newsletter/2020/july/images/1_8.png b/eclipse_newsletter/2020/july/images/1_8.png
new file mode 100644
index 0000000..af09f75
--- /dev/null
+++ b/eclipse_newsletter/2020/july/images/1_8.png
Binary files differ
diff --git a/eclipse_newsletter/2020/july/images/1_9.png b/eclipse_newsletter/2020/july/images/1_9.png
new file mode 100644
index 0000000..e2bbada
--- /dev/null
+++ b/eclipse_newsletter/2020/july/images/1_9.png
Binary files differ