Bug 570964 - Update to meeting minutes page to support both EF-US and EF-AISBL

- Initial design
- second design according to comment 8, doc from Shanda
- move Oct 2019 back to the main page, keep the previous archived;
  change to use id instead of name

Signed-off-by: Yi Liu <yi.liu@eclipse-foundation.org>
Change-Id: I409e65b0f37ec69ecc5041734ddaefdc0049b150

2 files changed, 74 insertions, 50 deletions

diff --git a/foundation/minutes.php b/foundation/minutes.php
index a7f9446d..bfa609be 100644
--- a/foundation/minutes.php
+++ b/foundation/minutes.php
@@ -32,15 +32,31 @@
 
   <div id="midcolumn">
     <h1><a name="top">$pageTitle</a></h1>
-        <ul>
+    <blockquote>
+    <ul>
       <li><a href="#board">Board of Directors Meetings</a></li>
+      <ul>
+      <li><a href="#boardAISBL">Eclipse Foundation AISBL</a></li>
+      <li><a href="#boardInc">Eclipse Foundation, Inc.</a></li>
+      </ul>
+
+      <li><a href="#assembly">General Assembly Meetings</a></li>
       <li><a href="#members">Members Meetings</a></li>
       <li><a href="#councils">Council Meetings</a></li>
-      <li><a href="minutes_archive.php">Meeting minutes archive</a> (for older content)</li>
+      <li><a href="#workingGroups">Working Groups</a></li>
+      <li><a href="minutes_archive.php">Meeting minutes archive</a></li>
     </ul>
+    </blockquote>
+    <div class="homeitem3col">
+    <h2 id="board">Board of Directors Meetings</h2>
+  </div>
+
+    <div class="homeitem3col">
+    <h3 id="boardAISBL">Eclipse Foundation AISBL</h3>
+  </div>
 
     <div class="homeitem3col">
-      <h3><a name="board">Board of Directors Meetings</a></h3>
+      <h3 id="boardInc">Eclipse Foundation, Inc.</h3>
       <ul>
       <li>Abridged Minutes
       - <a href="boardminutes/2020_12_16_Minutes.pdf">December 16, 2020 (pdf)</a> </li>
@@ -49,64 +65,40 @@
       <li>Abridged Minutes
       - <a href="boardminutes/2020_10_14_15_Minutes.pdf">October 14-15, 2020 (pdf)</a> </li>
       <li>Abridged Minutes
-                - <a href="boardminutes/2020_09_16_Minutes.pdf">September 16, 2020 (pdf)</a> </li>
-        <li>Abridged Minutes
-                - <a href="boardminutes/2020_08_19_Minutes.pdf">August 19, 2020 (pdf)</a> </li>
-        <li>Abridged Minutes
-                - <a href="boardminutes/2020_07_15_16_Minutes.pdf">July 15-16, 2020 (pdf)</a> </li>
-        <li>Abridged Minutes
-                - <a href="boardminutes/2020_06_16_18_Minutes.pdf">June 16-18, 2020 (pdf)</a> </li>
-        <li>Abridged Minutes
-                        - <a href="boardminutes/2020_05_20_26_Minutes.pdf">May 20 and 26, 2020 (pdf)</a> </li>
-        <li>Abridged Minutes
-                        - <a href="boardminutes/2020_04_15_Minutes.pdf">April 15, 2020 (pdf)</a> </li>
-        <li>Abridged Minutes
-                        - <a href="boardminutes/2020_03_24-25_Minutes.pdf">March 24-25, 2020 (pdf)</a> </li>
+            - <a href="boardminutes/2020_09_16_Minutes.pdf">September 16, 2020 (pdf)</a> </li>
         <li>Abridged Minutes
-                        - <a href="boardminutes/2020_02_26_Minutes.pdf">February 26, 2020 (pdf)</a> </li>
+            - <a href="boardminutes/2020_08_19_Minutes.pdf">August 19, 2020 (pdf)</a> </li>
         <li>Abridged Minutes
-                - <a href="boardminutes/2020_01_15_Minutes.pdf">January 15, 2020 (pdf)</a> </li>
+            - <a href="boardminutes/2020_07_15_16_Minutes.pdf">July 15-16, 2020 (pdf)</a> </li>
         <li>Abridged Minutes
-                - <a href="boardminutes/2019_12_18_Minutes.pdf">December 18, 2019 (pdf)</a> </li>
+            - <a href="boardminutes/2020_06_16_18_Minutes.pdf">June 16-18, 2020 (pdf)</a> </li>
         <li>Abridged Minutes
-                - <a href="boardminutes/2019_11_13_Minutes.pdf">November 13, 2019 (pdf)</a> </li>
+            - <a href="boardminutes/2020_05_20_26_Minutes.pdf">May 20 and 26, 2020 (pdf)</a> </li>
         <li>Abridged Minutes
-                - <a href="boardminutes/2019_10_21_Minutes.pdf">October 21, 2019 (pdf)</a> </li>
+            - <a href="boardminutes/2020_04_15_Minutes.pdf">April 15, 2020 (pdf)</a> </li>
         <li>Abridged Minutes
-                - <a href="boardminutes/2019_09_25_Minutes.pdf">September 25, 2019 (pdf)</a> </li>
+            - <a href="boardminutes/2020_03_24-25_Minutes.pdf">March 24-25, 2020 (pdf)</a> </li>
         <li>Abridged Minutes
-                - <a href="boardminutes/2019_08_21_Minutes.pdf">August 21, 2019 (pdf)</a> </li>
+            - <a href="boardminutes/2020_02_26_Minutes.pdf">February 26, 2020 (pdf)</a> </li>
         <li>Abridged Minutes
-                - <a href="boardminutes/2019_07_17_Minutes.pdf">July 17, 2019 (pdf)</a> </li>
+            - <a href="boardminutes/2020_01_15_Minutes.pdf">January 15, 2020 (pdf)</a> </li>
         <li>Abridged Minutes
-                - <a href="boardminutes/2019_06_18-19_Minutes.pdf">June 18-19, 2019 (pdf)</a> </li>
+            - <a href="boardminutes/2019_12_18_Minutes.pdf">December 18, 2019 (pdf)</a> </li>
         <li>Abridged Minutes
-                - <a href="boardminutes/2019_05_22_Minutes.pdf">May 22, 2019 (pdf)</a> </li>
+          - <a href="boardminutes/2019_11_13_Minutes.pdf">November 13, 2019 (pdf)</a> </li>
         <li>Abridged Minutes
-                - <a href="boardminutes/2019_04_17_Minutes.pdf">April 17, 2019 (pdf)</a> </li>
-        <li>Abridged Minutes
-                - <a href="boardminutes/2019_03_26_Minutes.pdf">March 26, 2019 (pdf)</a> </li>
-        <li>Abridged Minutes
-                - <a href="boardminutes/2019_02_20_Minutes.pdf">February 20, 2019 (pdf)</a> </li>
-        <li>Abridged Minutes
-                - <a href="boardminutes/2018_12_07_Minutes.pdf">December 7, 2018 (pdf)</a> </li>
-        <li>Abridged Minutes
-                - <a href="boardminutes/2018_10_22_Minutes.pdf">October 22, 2018 (pdf)</a> </li>
-        <li>Abridged Minutes
-                - <a href="boardminutes/2018_09_19_Minutes.pdf">September 19, 2018 (pdf)</a> </li>
-        <li>Abridged Minutes
-                - <a href="boardminutes/2018_08_15_Minutes.pdf">August 15, 2018 (pdf)</a> </li>
-        
-
-                <!-- <img src="../../images/new.gif" alt="new"> --> </li>
-
-            </ul>
+          - <a href="boardminutes/2019_10_21_Minutes.pdf">October 21, 2019 (pdf)</a> </li>
+      </ul>
 
     Abridged minutes for older board meetings can be found in the <a href="minutes_archive.php#board">minutes archive</a>.
 
+    <div class="homeitem3col">
+    <h2 id="assembly">Eclipse Foundation General Assembly Meetings</h2>
+  </div>
+
     </div>
     <div class="homeitem3col">
-      <h3><a name="members">Members Meetings</a></h3>
+      <h2 id="members">Eclipse Foundation, Inc. Members Meetings</h2>
 
     <p>The minutes for Members meetings after June, 2008 are hosted on <a target="_memonly" href="https://dev.eclipse.org/members-only/index.php">members only content page.</a></p>
 
@@ -114,12 +106,20 @@
 
     </div>
   <div class="homeitem3col">
-      <h3><a name="councils">Council Meetings</a></h3>
+      <h2 id="councils">Council Meetings</h2>
+      <p>Council Meeting minutes are categorized on the council page.</p>
       <ul>
-           <li><a href="council.php">Council Meeting minutes are categorized on the council page.</a></li>
+        <li><a href="https://wiki.eclipse.org/Architecture_Council/Meetings">Architecture Council/Meetings</a></li>
+        <li><a href="https://wiki.eclipse.org/Planning_Council#Meetings">Planning Council Meetings</a></li>
        </ul>
     </div>
 
+    <div class="homeitem3col">
+    <h2 id="workingGroups">Working Groups</h2>
+    <p>
+    Each Eclipse Foundation Working Group’s Steering Committee posts its meeting minutes on its respective working group <a href="https://accounts.eclipse.org/mailing-list">mailing list</a>, each of which is archived.
+     </p>
+    </div>
   </div>
 
 EOHTML;
diff --git a/foundation/minutes_archive.php b/foundation/minutes_archive.php
index c85e1dbd..a410c820 100644
--- a/foundation/minutes_archive.php
+++ b/foundation/minutes_archive.php
@@ -42,6 +42,30 @@
       <h3><a name="board">Board of Directors Meetings</a></h3>
       <ul>
         <li>Abridged Minutes
+              - <a href="boardminutes/2019_09_25_Minutes.pdf">September 25, 2019 (pdf)</a> </li>
+        <li>Abridged Minutes
+              - <a href="boardminutes/2019_08_21_Minutes.pdf">August 21, 2019 (pdf)</a> </li>
+        <li>Abridged Minutes
+              - <a href="boardminutes/2019_07_17_Minutes.pdf">July 17, 2019 (pdf)</a> </li>
+        <li>Abridged Minutes
+              - <a href="boardminutes/2019_06_18-19_Minutes.pdf">June 18-19, 2019 (pdf)</a> </li>
+        <li>Abridged Minutes
+              - <a href="boardminutes/2019_05_22_Minutes.pdf">May 22, 2019 (pdf)</a> </li>
+        <li>Abridged Minutes
+              - <a href="boardminutes/2019_04_17_Minutes.pdf">April 17, 2019 (pdf)</a> </li>
+        <li>Abridged Minutes
+              - <a href="boardminutes/2019_03_26_Minutes.pdf">March 26, 2019 (pdf)</a> </li>
+        <li>Abridged Minutes
+              - <a href="boardminutes/2019_02_20_Minutes.pdf">February 20, 2019 (pdf)</a> </li>
+        <li>Abridged Minutes
+              - <a href="boardminutes/2018_12_07_Minutes.pdf">December 7, 2018 (pdf)</a> </li>
+        <li>Abridged Minutes
+              - <a href="boardminutes/2018_10_22_Minutes.pdf">October 22, 2018 (pdf)</a> </li>
+        <li>Abridged Minutes
+              - <a href="boardminutes/2018_09_19_Minutes.pdf">September 19, 2018 (pdf)</a> </li>
+        <li>Abridged Minutes
+                - <a href="boardminutes/2018_08_15_Minutes.pdf">August 15, 2018 (pdf)</a> </li>
+        <li>Abridged Minutes
                 - <a href="boardminutes/2018_07_18_Minutes.pdf">July 18, 2018 (pdf)</a> </li>
         <li>Abridged Minutes
                 - <a href="boardminutes/2018_06_11-12_Minutes.pdf">June 11-12, 2018 (pdf)</a> </li>
@@ -75,9 +99,9 @@
                 - <a href="boardminutes/2017_01_18_Minutes.pdf">January 18, 2017 (pdf)</a> </li>
         <li>Abridged Minutes
                 - <a href="boardminutes/2016_12_14_Minutes.pdf">December 12, 2016 (pdf)</a> </li>
-              <li>Abridged Minutes
+        <li>Abridged Minutes
                 - <a href="boardminutes/2016_10_24_Minutes.pdf">October 24, 2016 (pdf)</a> </li>
-              <li>Abridged Minutes
+        <li>Abridged Minutes
                 - <a href="boardminutes/2016_09_21_Minutes.pdf">September 21, 2016 (pdf)</a> </li>
         <li>Abridged Minutes
                 - <a href="boardminutes/2016_06_15_Minutes.pdf">June 15-16, 2016 (pdf)</a> </li>
@@ -113,7 +137,7 @@
                 - <a href="boardminutes/2014_10_27_Minutes.pdf">October 27, 2014 (pdf)</a> </li>
         <li>Abridged Minutes
                 - <a href="boardminutes/2014_09_17_Minutes.pdf">September 17, 2014 (pdf)</a> </li>
-              <li>Abridged Minutes
+        <li>Abridged Minutes
                 - <a href="boardminutes/2014_08_20_Minutes.pdf">August 20, 2014 (pdf)</a> </li>
         <li>Abridged Minutes
                 - <a href="boardminutes/2014_06_16_Minutes.pdf">June 16, 2014 (pdf)</a> </li>