Bug 558391 - [Releng] Update the webpage and release material

Change-Id: I16a65ddc2007edea1dcae77db75730f289622b3d
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
diff --git a/download.html b/download.html
index e79240e..4c57a92 100644
--- a/download.html
+++ b/download.html
@@ -76,8 +76,8 @@
 
         </div>
     </nav>
-    <section id="main" class="custom-section">
-
+    
+    <section id="rcp" class="custom-section">
         <div class="container">
             <h1 class="section-title wrap">Eclipse Papyrus&trade; Downloads</h1>
             <div class="row">
@@ -93,6 +93,100 @@
                     </p>
                 </div>
             </div>
+        
+            <h1 class="section-title wrap">Eclipse Papyrus RCP</h1>
+        
+            <h2 class="subsection-title wrap">Latest Released RCP</h2>
+                <div class="col-md-6">
+                    <div class="panel panel-default panel-default-custom">
+
+                        <div class="panel-heading">
+                            <b>2019-12 release (4.6.0)</b>
+                        </div>
+                        <div class="panel-body panel-body-custom">
+                            <p>
+                                <img src="img/win.png" alt="Windows">&nbsp;:&nbsp;
+                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2019-12/4.6.0/papyrus-2019-12-4.6.0-win64.zip'">64 Bits</button>
+                            </p>
+                            <p>
+                                <img src="img/linux.png" alt="Linux">&nbsp;:&nbsp;
+                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2019-12/4.6.0/papyrus-2019-12-4.6.0-linux64.tar.gz'">64 Bits</button>
+                            </p>
+                            <p>
+                                <img src="img/osx.png" alt="OS X">&nbsp;:&nbsp;
+                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2019-12/4.6.0/papyrus-2019-12-4.6.0-macosx64.tar.gz'">64 Bits</button>
+                            </p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="panel panel-default panel-default-custom">
+
+                        <div class="panel-heading">
+                            <b>2020-03 release (4.7.0)</b>
+                        </div>
+                        <div class="panel-body panel-body-custom">
+                            <p>
+                                <img src="img/win.png" alt="Windows">&nbsp;:&nbsp;
+                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2020-03/4.7.0/papyrus-2020-03-4.7.0-win64.zip'">64 Bits</button>
+                            </p>
+                            <p>
+                                <img src="img/linux.png" alt="Linux">&nbsp;:&nbsp;
+                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2020-03/4.7.0/papyrus-2020-03-4.7.0-linux64.tar.gz'">64 Bits</button>
+                            </p>
+                            <p>
+                                <img src="img/osx.png" alt="OS X">&nbsp;:&nbsp;
+                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2020-03/4.7.0/papyrus-2020-03-4.7.0-macosx64.tar.gz'">64 Bits</button>
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            
+
+            <h2 class="subsection-title wrap">Weekly RCP</h2>
+            <div class="row">
+                <div class="col-md-12">
+                    <p class="text-justify">For advanced users and pioneers, you can access the latest commits done within Eclipse Papyrus by accessing its nightly builds...</p>
+                </div>
+                <div class="col-md-6">
+                    <div class="panel panel-default panel-default-custom">
+
+                        <div class="panel-heading">
+                            <b>2020-06 (4.8.0) nightly</b>
+                        </div>
+                        
+                        <div class="panel-body panel-body-custom">
+                            <p class="text-left">
+                                <img src="img/win.png" alt="Windows">&nbsp;:&nbsp;
+                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Rcp/lastSuccessfulBuild/artifact/products/papyrus-win-64.zip'">64 Bits</button>
+                            </p>
+                            <p class="text-left">
+                                <img src="img/linux.png" alt="Linux">&nbsp;:&nbsp;
+                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Rcp/lastSuccessfulBuild/artifact/products/papyrus-linux-64.tar.gz'">64 Bits</button>
+                            </p>
+                            <p class="text-left">
+                                <img src="img/osx.png" alt="OS X">&nbsp;:&nbsp;
+                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Rcp/lastSuccessfulBuild/artifact/products/papyrus-macosx-64.tar.gz'">64 Bits</button>
+                            </p>
+                        </div>
+                    </div>
+                </div>  
+            </div>
+            
+        </div>
+
+    </section>
+    
+    <section id="main" class="custom-section">
+
+        <div class="container">
+        
+            <h1 class="section-title wrap">Eclipse Papyrus Update sites</h1>
+
+            <h2 class="subsection-title wrap">Packages Downloads</h2>
+            <p class="text-justify">
+                If you are interested in a specific package release of Eclipse Papyrus, you may find it directly in <a href="downloads/index.php">Eclipse Papyrus Packages Downloads</a>.
+            </p>
             
             <h2 class="subsection-title wrap">Update Sites</h2>
             <h3 class="subsubsection-title wrap">Setup Eclipse Papyrus with Update Sites</h3>
@@ -114,21 +208,62 @@
 
             <div class="panel-group wrap" id="accordion">
                 <div class="panel panel-default">
+
                     <a data-toggle="collapse" data-parent="#accordion" href="#member1">
                         <div class="panel-heading  panel-heading-custom">
-                            <h1 class="solution-heading">Release Update Sites</h1>
+                            <h1 class="solution-heading">Nightly Update Sites</h1>
+
+                            <b>&nbsp;<span class="caret"></span></b>
+
+                        </div>
+                    </a>
+                    <div id="member1" class="panel-collapse collapse" role="tabpanel">
+                        <div class="panel-body panel-body-custom">
+                            <p class="text-justify"><b>Master</b></p>
+
+                            <ul class="text-justify">
+                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master">http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+                <div class="panel panel-default">
+
+                    <a data-toggle="collapse" data-parent="#accordion" href="#member2">
+                        <div class="panel-heading  panel-heading-custom">
+                            <h1 class="solution-heading">Latest Release Update Site</h1>
+
+                            <b>&nbsp;<span class="caret"></span></b>
+
+                        </div>
+                    </a>
+                    <div id="member2" class="panel-collapse collapse in" role="tabpanel">
+                        <div class="panel-body panel-body-custom">
+                            <p class="text-justify"><b>Eclipse Papyrus 2020-03 (4.7.X)</b></p>
+                            
+                            <ul class="text-justify">
+                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-03">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-03</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+                <div class="panel panel-default">
+                    <a data-toggle="collapse" data-parent="#accordion" href="#member3">
+                        <div class="panel-heading  panel-heading-custom">
+                            <h1 class="solution-heading">Old Release Update Sites</h1>
 
                             <b>&nbsp;<span class="caret"></span></b>
                         </div>
                     </a>
-                    <div id="member1" class="panel-collapse collapse in" role="tabpanel">
+                    <div id="member3" class="panel-collapse collapse" role="tabpanel">
                         <div class="panel-body panel-body-custom">
+                            
                             <p class="text-justify"><b>Eclipse Papyrus 2019-12 (4.6.X)</b></p>
-
+                            
                             <ul class="text-justify">
                                 <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-12">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-12</a></li>
                             </ul>
-                        
+                            
                             <p class="text-justify"><b>Eclipse Papyrus 2019-09 (4.5.X)</b></p>
 
                             <ul class="text-justify">
@@ -215,123 +350,10 @@
                         </div>
                     </div>
                 </div>
-                <div class="panel panel-default">
-
-                    <a data-toggle="collapse" data-parent="#accordion" href="#member2">
-                        <div class="panel-heading  panel-heading-custom">
-                            <h1 class="solution-heading">Nightly Update Sites</h1>
-
-                            <b>&nbsp;<span class="caret"></span></b>
-
-                        </div>
-                    </a>
-                    <div id="member2" class="panel-collapse collapse" role="tabpanel">
-                        <div class="panel-body panel-body-custom">
-                            <p class="text-justify"><b>Master</b></p>
-
-                            <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master">http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <h2 class="subsection-title wrap">Packages Downloads</h2>
-            <p class="text-justify">
-                If you are interested in a specific package release of Eclipse Papyrus, you may find it directly in <a href="downloads/index.php">Eclipse Papyrus Packages Downloads</a>.
-            </p>
-            
-        </div>
-        
-    </section>
-    
-    <section id="rcp" class="custom-section">
-        <div class="container">
-        
-            <h1 class="section-title wrap">Eclipse Papyrus RCP</h1>
-        
-            <h2 class="subsection-title wrap">Latest Released RCP</h2>
-             <div class="row">
-                <div class="col-md-6">
-                    <div class="panel panel-default panel-default-custom">
-
-                        <div class="panel-heading">
-                            <b>2019-09 release (4.5.0)</b>
-                        </div>
-                        <div class="panel-body panel-body-custom">
-                            <p>
-                                <img src="img/win.png" alt="Windows">&nbsp;:&nbsp;
-                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2019-09/4.5.0/papyrus-2019-09-4.5.0-win64.zip'">64 Bits</button>
-                            </p>
-                            <p>
-                                <img src="img/linux.png" alt="Linux">&nbsp;:&nbsp;
-                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2019-09/4.5.0/papyrus-2019-09-4.5.0-linux64.tar.gz'">64 Bits</button>
-                            </p>
-                            <p>
-                                <img src="img/osx.png" alt="OS X">&nbsp;:&nbsp;
-                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2019-09/4.5.0/papyrus-2019-09-4.5.0-macosx64.tar.gz'">64 Bits</button>
-                            </p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-6">
-                    <div class="panel panel-default panel-default-custom">
-
-                        <div class="panel-heading">
-                            <b>2019-12 release (4.6.0)</b>
-                        </div>
-                        <div class="panel-body panel-body-custom">
-                            <p>
-                                <img src="img/win.png" alt="Windows">&nbsp;:&nbsp;
-                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2019-12/4.6.0/papyrus-2019-12-4.6.0-win64.zip'">64 Bits</button>
-                            </p>
-                            <p>
-                                <img src="img/linux.png" alt="Linux">&nbsp;:&nbsp;
-                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2019-12/4.6.0/papyrus-2019-12-4.6.0-linux64.tar.gz'">64 Bits</button>
-                            </p>
-                            <p>
-                                <img src="img/osx.png" alt="OS X">&nbsp;:&nbsp;
-                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2019-12/4.6.0/papyrus-2019-12-4.6.0-macosx64.tar.gz'">64 Bits</button>
-                            </p>
-                        </div>
-                    </div>
-                </div>                
-            </div>
-            
-
-            <h2 class="subsection-title wrap">Weekly RCP</h2>
-            <div class="row">
-                <div class="col-md-12">
-                    <p class="text-justify">For advanced users and pioneers, you can access the latest commits done within Eclipse Papyrus by accessing its nightly builds...</p>
-                </div>
-                <div class="col-md-6">
-                    <div class="panel panel-default panel-default-custom">
-
-                        <div class="panel-heading">
-                            <b>2020-03 (4.7.0) nightly</b>
-                        </div>
-                        
-                        <div class="panel-body panel-body-custom">
-                            <p class="text-left">
-                                <img src="img/win.png" alt="Windows">&nbsp;:&nbsp;
-                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Rcp/lastSuccessfulBuild/artifact/products/papyrus-win-64.zip'">64 Bits</button>
-                            </p>
-                            <p class="text-left">
-                                <img src="img/linux.png" alt="Linux">&nbsp;:&nbsp;
-                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Rcp/lastSuccessfulBuild/artifact/products/papyrus-linux-64.tar.gz'">64 Bits</button>
-                            </p>
-                            <p class="text-left">
-                                <img src="img/osx.png" alt="OS X">&nbsp;:&nbsp;
-                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Rcp/lastSuccessfulBuild/artifact/products/papyrus-macosx-64.tar.gz'">64 Bits</button>
-                            </p>
-                        </div>
-                    </div>
-                </div>  
             </div>
             
         </div>
-
+        
     </section>
     
 
diff --git a/news/news.xml b/news/news.xml
index 1dcced0..50c03b4 100644
--- a/news/news.xml
+++ b/news/news.xml
@@ -16,6 +16,16 @@
 -->
 <news>
     <item
+        date="2020-03-19"
+        title="Papyrus 4.7.0 2020-03 Released"
+        link="http://projects.eclipse.org/projects/modeling.mdt.papyrus/releases/4.7.0">
+        <p>
+            The Eclipse Papyrus 4.7.0 2020-03 release is now available!
+            Go to the <a href="https://www.eclipse.org/papyrus/download.html#accordion">Download page</a> to install it as an update site or a zip archive. 
+            The associated RCP is available from the <a href="https://www.eclipse.org/papyrus/download.html#rcp">RCP download page</a> as well.
+        </p>
+    </item>
+    <item
         date="2019-12-18"
         title="Papyrus 4.6.0 2019-12 Released"
         link="http://projects.eclipse.org/projects/modeling.mdt.papyrus/releases/4.6.0">