refactor join and update imaging

Signed-off-by: Toshaan Bharvani <toshaan@vantosh.com>

content/join/_index.md

@@ -1,9 +1,7 @@
 ---
-title: 'Membership'
-date: 2021-07-17
+title: Membership
 type: join
 layout: single
-
 intro:
   subtitle: Welcome to the era of Open Computing!
   intro:
@@ -17,54 +15,19 @@ intro:
     - Increase visibility as OpenPOWER amplifies member success across the industry
     - Build a partner network as an active member within the OpenPOWER community
     - Showcase your OpenPOWER products, services, training, and resources on OpenPOWER Ready
-
-
-membership-levels:
-  title: Membership Levels
-  subtitle: The OpenPOWER Foundation is a 501c6 not-for-profit entity with a Board of Directors and a Technical Steering Committee.
-  text: OpenPOWER offers a tiered membership of Platinum, Gold, Silver, and Associate/Academic memberships
-  options:  
-    - option: Membership levels provide either a default Board of Director position (Platinum) or an opportunity to be elected to the Board (Gold, Silver, and Associate/Academic members). The Bylaws detail additional governance by the Board including maximum seats, terms, etc.
-    - option: The Technical Steering Committee is formed from the Work Group Leads from the core projects and one representative designated by each Platinum member.
-  features:
-    - feature: Annual fee and dedicated full-time equivalent (FTEs) – verification of committed number of FTEs on honor system
-    - feature: Contributors, committers, Work Group leads and project leads influence Technical Steering Committee
-    - feature: Associate/Academic level is not available to corporations
-  image-table: 
-        image: thumb-8.jpg
-        alt: Membership Levels Table
-
-membership-benefits:
-   title: Membership Benefits 
-   image-table: 
-        image: thumb-9.jpg
-        alt: Membership Benefits Table
-
 become-member:
   title: Become a Member
   options:
-   - 
-     title: Individual membership
-     text: Individual membership
+   - title: Individual membership
+     text: Individual personal membership
      cta_url: 'https://enrollment.lfx.linuxfoundation.org/?individual&project=openpowerfoundation'
-     cta_text: Join
-     image: thumb-7.jpg
-
-   - 
-     title: Corporate membership
-     text: Corporate membership
+     cta_text: Join as an Individual
+     image: individual.jpg
+   - title: Corporate membership
+     text: Corporate company membership
      cta_url: 'https://enrollment.lfx.linuxfoundation.org/?project=openpowerfoundation'
-     cta_text: Join
-     image: thumb-7-1.jpg
- 
+     cta_text: Join as a Corperate
+     image: corperate.jpg
+date: 2022-01-03
 draft: false
 ---
-
-
-| Membership Level     | Annual Fee | Technical Steering Committee    | Board of Directors                                               |
-|----------------------|------------|---------------------------------|------------------------------------------------------------------|
-| Platinum             | $100k      | 1 voting participant per member | 1 voting participant per member                                  |
-| Gold                 | $60k       | If a WG lead                    | 1 elected voting participant per three gold member level         |
-| Silver               | $20k       | If a WG lead                    | 1 elected voting participant for all silver members              |
-| Associate / Academic | $0         | If a WG lead                    | 1 elected non-voting observer for all associate/acedemic members |
-

content/join/benefits.md

@@ -1,30 +1,26 @@
 ---
 title: 'Membership Benefits'
 date: 2021-07-17
-type: join
 draft: false
 ---
 
-
 | OpenPOWER Foundation Membership Matrix                     | Associate | ISV     | Silver  | Gold    | Platinum |
-|------------------------------------------------------------|-----------|-----|---------|------|----------|
-| Working Group Participation                                | x         | x   | x       | x    | x        |
-| Marketing Committee Participation                          | x         | x   | x       | x    | x        |
-| Access to Specifications Approved by the Board             | x         | x   | x       | x    | x        |
-| Access to Draft Specifications in development              | x         | x   | x       | x    | x        |
-| Petition TSC to create a new workgroup or project          | x         | x   | x       | x    | x        |
-| Exhibit opportunities as OPF-hosted and exhibiting events  | x         | x   | x       | x    | x        |
-| Participate in OpenPOWER Ambassador Program                | x         | x   | x       | x    | x        |
-| Speaker Opportunities at OPF-hosted events                 | x         |     | 1+      | 2+   | 2+       |
-| Keynote Opportunities at OPF-hosted events                 |           |     |         |      | x        |
-| Registration/exibit at OPF events                          |           |     | 5%      | 10%  | 20%      |
-| Member logo featured on the website                        | x         | x   | x       | x    | x        |
-| Member logo featured on the website homepage               |           |     |         | x    | x        |
-| Member logo featured on event signage                      |           |     |         | x    | x        |
-| Member profile featured on website spotlight               |           |     |         | x    | x        |
-| Member name inclusion in Press Releases                    |           |     |         | 1x/yr| 2x/yr    |
+|------------------------------------------------------------|-----------|---------|---------|---------|----------|
+| Working Group Participation                                | {{<v>}}   | {{<v>}} | {{<v>}} | {{<v>}} | {{<v>}}  |
+| Marketing Committee Participation                          | {{<v>}}   | {{<v>}} | {{<v>}} | {{<v>}} | {{<v>}}  |
+| Access to Specifications Approved by the Board             | {{<v>}}   | {{<v>}} | {{<v>}} | {{<v>}} | {{<v>}}  |
+| Access to Draft Specifications in development              | {{<v>}}   | {{<v>}} | {{<v>}} | {{<v>}} | {{<v>}}  |
+| Petition TSC to create a new workgroup or project          | {{<v>}}   | {{<v>}} | {{<v>}} | {{<v>}} | {{<v>}}  |
+| Exhibit opportunities as OPF-hosted and exhibiting events  | {{<v>}}   | {{<v>}} | {{<v>}} | {{<v>}} | {{<v>}}  |
+| Participate in OpenPOWER Ambassador Program                | {{<v>}}   | {{<v>}} | {{<v>}} | {{<v>}} | {{<v>}}  |
+| Speaker Opportunities at OPF-hosted events                 | {{<v>}}   | {{<x>}} | 1+      | 2+      | 2+       |
+| Keynote Opportunities at OPF-hosted events                 | {{<x>}}   | {{<x>}} | {{<x>}} | {{<x>}} | {{<v>}}  |
+| Registration/exibit at OPF events                          | {{<x>}}   | {{<x>}} | 5%      | 10%     | 20%      |
+| Member logo featured on the website                        | {{<v>}}   | {{<v>}} | {{<v>}} | {{<v>}} | {{<v>}}  |
+| Member logo featured on the website homepage               | {{<x>}}   | {{<x>}} | {{<x>}} | {{<v>}} | {{<v>}}  |
+| Member logo featured on event signage                      | {{<x>}}   | {{<x>}} | {{<x>}} | {{<v>}} | {{<v>}}  |
+| Member profile featured on website spotlight               | {{<x>}}   | {{<x>}} | {{<x>}} | {{<v>}} | {{<v>}}  |
+| Member name inclusion in Press Releases                    | {{<x>}}   | {{<x>}} | {{<x>}} | 1/year  | 2/year   |
 | Final Approval of New Projects                             | <span>Board membership required</span>             |
 | Final Approval and Voting of IP and Specifications         | <span>Board membership required</span>             |
 | Manage the Future Direction of the Organization            | <span>Board membership required</span>             |
-
-

content/join/levels.md

@@ -0,0 +1,24 @@
+---
+title: Membership Levels
+date: 2022-01-03
+draft: false
+---
+
+The OpenPOWER Foundation is a 501c6 not-for-profit entity with a Board of Directors and a Technical Steering Committee.
+
+- Membership levels provide either a default Board of Director position (Platinum) or an opportunity to be elected to the Board (Gold, Silver, and Associate/Academic members). The Bylaws detail additional governance by the Board including maximum seats, terms, etc.
+- The Technical Steering Committee is formed from the Work Group Leads from the core projects and one representative designated by each Platinum member.
+
+OpenPOWER offers a tiered membership of Platinum, Gold, Silver, and Associate/Academic memberships
+
+- Annual fee and dedicated full-time equivalent (FTEs) – verification of committed number of FTEs on honor system
+- Contributors, committers, Work Group leads and project leads influence Technical Steering Committee
+- Associate/Academic level is not available to corporations
+
+
+| Membership Level | Annual Fee | FTEs | Technical Steering Committee                  | Board/Voting Position                          |
+|------------------|------------|------|-----------------------------------------------|------------------------------------------------|
+| Platinum         | $100k      | 10 | One seat per member not otherwise represented | Includes Board position, includes TSC position |
+| Gold             | $60k       | 3  | May be on TSC if Work Group lead              | Gold members may elect up to one BOD member per three Gold members |
+| Silver           | $20k<br>$5k if <300 employees<br>$0 if < 300 employees and an Independent Software Vendor (ISV) or for Open Source Community Projects 										| 0    | May be on TSC if Work Group lead              | One board seat elected by all Silver members   |
+| Associate and Academic | $0  | 0 | May be on TSC if Work Group lead | May be elected to one community observer, non-voting Board seat |

content/join/welcome.md

@@ -0,0 +1,10 @@
+---
+title: Welcome to the era of Open Computing!
+date: 2022-01-03
+draft: false
+---
+
+The OpenPOWER Foundation is a non-profit organization supporting the free and open RISC instruction set architecture and extensions.
+We enable open community collaboration, technology advancements in the OpenPOWER ecosystem, and visibility of OpenPOWER successes.
+
+Join us and see how open technical collaboration along with the support of many OpenPOWER programs can help drive your business forward.

content/join/why.md

@@ -0,0 +1,11 @@
+---
+title: Why Join?
+date: 2022-01-03
+draft: false
+---
+
+- Accelerate technical development of your own POWER based products
+- Contribute technical resource, best practices, and code to help guide and influence OpenPOWER deliverables
+- Increase visibility as OpenPOWER amplifies member success across the industry
+- Build a partner network as an active member within the OpenPOWER community
+- Showcase your OpenPOWER products, services, training, and resources on OpenPOWER Ready

themes/openpowerfoundation/layouts/join/single.html

@@ -1,70 +1,44 @@
 {{ partial "header.html" . }}
 {{ partial "navbar.html" . }}
-
 <main id="main" class="main join">
-	<div class="container">
+<div class="container">
 	<section id="intro">
 	<div class="row">
 		<h1 class="section-header my-3 my-md-5 text-center">{{ .Title }}</h1>
-			<h2 class="mt-0 pt-0">{{ .Param "intro.subtitle" }}</h2>
-			{{ range .Param "intro.intro" }}
-				<p>{{ . }}</p>
+		{{ with $.Site.GetPage "join/welcome" }}
+			<h2 class="mt-0 pt-0">{{ .Title }}</h2>
+			<div class="mb-0 pb-0 mt-5">{{ .Content }}</div>
 		{{ end }}
 	</div>
 	</section>
 	<section id="teaser">
 	<div class="teaser__info">
-			<h2>{{ .Param "intro.teaser.title" }}</h2>
-			<ul class="mb-0 pb-0">
-			{{ range .Param "intro.options" }}
-				<li>{{ . }}</li>
+		{{ with $.Site.GetPage "join/why" }}
+			<h2 class="mt-0 pt-0">{{ .Title }}</h2>
+			<div class="mb-0 pb-0 mt-5">{{ .Content }}</div>
 		{{ end }}
-			</ul>
 	</div>
 	</section>
-
 	<section id="membership-levels">
-    <h2>{{ .Param "membership-levels.title" }}</h2>
-    <p>{{ .Param "membership-levels.subtitle" }}</p>
-
-    <ul class="mb-0 pb-0">
-        {{ range .Param "membership-levels.options" }}
-          <li>{{ .option }}</li>  
+		{{ with $.Site.GetPage "join/levels" }}
+			<h2 class="mt-0 pt-0">{{ .Title }}</h2>
+			<div class="membership-data mt-5">{{ .Content }}</div>
 		{{ end }}
-    </ul>
-
-	<p>&nbsp;</p>
-
-    <p class="membership-levels-text">{{ .Param "membership-levels.text" }}</p>
-    <ul class="mb-0 pb-0">
-        {{ range .Param "membership-levels.features" }}
-           <li>{{ .feature }}</li>
-        {{ end }}
-    </ul>
-
-    <div class="membership-data mt-5">
-      {{ .Content }}
-    </div>
 	</section>
-
 	<section id="membership-benefits">
 	<div class="teaser__info">
-        <h2 class="text-center mb-5 pb-2">{{ .Param "membership-benefits.title" }}</h2>
-        <div class="benefits-data">
-        {{ range where .Site.Pages "Section" "join" }}
-           {{if eq .Title "Membership Benefits"}}
-             {{ .Content }}
+		{{ with $.Site.GetPage "join/benefits" }}
+			<h2 class="mt-0 pt-0">{{ .Title }}</h2>
+			<div class="benefits-data mt-5">{{ .Content }}</div>
 		{{ end}}
-        {{ end}}
-        </div>
 	</div>
 	</section>
-
 	<section id="become-member">
 		<h2 class="text-center mb-5 pb-3">{{ .Param "become-member.title" }}</h2>
 		<div class="row">
 		{{ range .Param "become-member.options" }}
-                        <article class="post__article col-md-6">
+			<article class="post__article col-md-6 text-center">
+				<div class="h2">{{ .title }}</div>
 				<div class="post__thumb">
 					{{ $imagename := .image }}
 					{{ $imagelocation := (printf "%s/%s" "images/join/" $imagename) }}
@@ -72,14 +46,14 @@
 					{{ $image := $imageresource.Fit "600x390" }}
 					<img class="img-fluid"  src="{{  $image.RelPermalink }}" alt="{{ .title }}" title="{{ .title }}">
 				</div>
-                            <div class="h2">{{ .title }}</div>
 				<p>{{ .text }}</p>
-                            <p><a class="btn-outline-primary btn-sm btn" href="{{ .cta_url }}">{{ .cta_text }}&nbsp;<i class="fas fa-external-link-alt"></i></a></p>
+				<p><a class="btn-outline-primary btn-sm btn" href="{{ .cta_url }}">
+						{{ .cta_text }}&nbsp;<i class="fas fa-external-link-alt"></i>
+				</a></p>
 			</article>
 		{{ end }}
 		</div>
 	</section>
-     </div>
+</div>
 </main>
-
 {{ partial "footer.html" . }}

themes/openpowerfoundation/layouts/shortcodes/v.html

@@ -0,0 +1 @@
+<i class="far fa-check-square"></i>

themes/openpowerfoundation/layouts/shortcodes/x.html

@@ -0,0 +1 @@
+<i class="far fa-square"></i>