Merge pull request #28 from acep-uaf/nicole/draft-revisions

Nicole/draft revisions

assets/css/main.css

@@ -149,7 +149,7 @@
   color: var(--blue);
 }
 
-hgroup > h2 {
+.light-text * {
   color: var(--white);
 }
 

content/_index.md

@@ -0,0 +1,18 @@
++++
+title = "Home Page"
+heroTitle = "Alaska Regional Collaboration for Technology Innovation and Commercialization"
+heroCTAPrimaryText = "Learn More"
+heroCTAPrimaryUrl = "about/"
+heroCTASecondaryText = "Partners"
+heroCTASecondaryUrl = "partners/"
+heroBackgroundImage = "images/2019summit-bruno_a1s.jpeg"
+heroLogo = "images/arctic-logo.png"
+seeMoreText = "More Posts"
+mapContentP1 = "The Alaska Regional Collaboration for Technology Innovation and Commercialization (ARCTIC) is a collaboration designed to promote commerce and partnerships between Alaska and the Arctic and Pacific regions through advancements in energy through resiliency research, technology development/deployment and education."
+mapContentP2 = "The Alaska Regional Collaboration for Technology Innovation and Commercialization (ARCTIC) is a collaboration designed to promote commerce and partnerships between Alaska and the Arctic and Pacific regions through advancements in energy through resiliency research, technology development/deployment and education."
+staticMapImage = "images/static_map_placeholder.png"
++++
+
+The Alaska Regional Collaboration for Technology Innovation and Commercialization (ARCTIC) program is an Office of Naval (ONR) program established in 2017 in support of Navy’s needs for public-private partnerships promoting commerce and collaboration between Alaska and the Arctic and Pacific regions, centered around energy and resiliency research. Established in 2017, the ARCTIC program is an Office of Naval Research initiative designed to help Alaskan organizations and communities develop a thriving innovation ecosystem through energy resiliency research, technology development/deployment, and education. 
+
+ARCTIC leverages and augments existing capacity and accelerates the energy transition in Alaska and the North, while also building key partnerships between Alaska and the Arctic and Pacific regions. Our vision for capacity building under the ARCTIC program centers on sustainable, cost-effective energy solutions implemented with the following principles: Research and technology development is community-led and addresses local, self-identified economic needs; Alaskans are leaders and key partners in U.S. research and innovation Alaskan communities and small businesses thrive through economic diversification and development.

content/about/index.md

@@ -42,6 +42,9 @@ The objectives for ARCTIC III are as follows:
 - Support the diversification of Alaska’s innovation ecosystem through enhanced capacity and whole-of-community engagement.
 - Demonstrate that high penetrations of variable renewable energy on microgrids is both technically and economically feasible as well as broadly replicable.
 
+### DOD Relevance (?)
+ARCTIC was highlighted in the Navy’s 2021 Blue Arctic strategy as an investment in building public-private partnerships and innovative solutions to help transform operating abilities and regional understanding for Naval forces.
+
 ### Capacity Building Success and Challenges
 
 {{< rawhtml >}}

content/foundationalActivities/_index.md

@@ -1,5 +1,7 @@
 +++
 title = "Foundational Activities"
-description = "The ARCTIC program was modeled on the Asia-Pacific Technology and Education Partnership (APTEP) funded through ONR. ARCTIC’s original three fundamental pillars of “Education and Workforce, Research and Technology, and Business and Marketplace '' were derived from APTEP. After several iterations, these pillars have been adapted into five thematic foundational activities: Resiliency Research, Modeling Observations and Data, Technology Testing and Implementation, Education and Workforce Development, and Innovation Economy Development. These foundational activities are supported by a cross cutting Program Management and Support task that includes the architecture for the direct involvement of partner communities in this work."
+description = "The ARCTIC program was modeled on the Asia-Pacific Technology and Education Partnership (APTEP) funded through ONR. ARCTIC’s original three fundamental pillars of 'Education and Workforce, Research and Technology, and Business and Marketplace' were derived from APTEP. After several iterations, these pillars have been adapted into five thematic foundational activities: Resiliency Research, Modeling Observations and Data, Technology Testing and Implementation, Education and Workforce Development, and Innovation Economy Development. These foundational activities are supported by a cross cutting Program Management and Support task that includes the architecture for the direct involvement of partner communities in this work."
 FAdiagram = "images/fa-diagram.png"
-+++
+heroBackgroundImage = "images/2019summit-bruno_a1s.jpeg"
++++
+ARCTIC’s five foundational activities are closely integrated with partners at the local and state level. Supported by a cross-cutting Program Management and Support task, these activities highlight the collaboration required to advance Alaska’s resilience and innovation economy.

hugo.toml

@@ -52,51 +52,34 @@ relativeURLs = true
 
 
 [params.analytics.google]
-
 [params.analytics.yandex]
-
 [params.analytics.bing]
 
-  [params.label]
-  title = "_ARCTIC Program_"
-  text = "Welcome to the ARCTIC Program"
-  lightNavIcon = "images/favicon.png"
-  iconHeight = "35"
-  iconWIdth = "35"
-
-  [params.assets]
-  disableFingerprinting = false
-  favicon = "images/favicon.png"
-  favicon16x16 = "images/favicon.png"
-  favicon32x32 = "images/favicon-32x32.png"
-  apple_touch_icon = "images/favicon.png"
-  safari_pinned_tab = "images/favicon.png"
-
-  [params.homepage]
-  disableHeroSection = false
-  heroTitle = "Alaska Regional Collaboration for Technology Innovation and Commercialization"
-  heroDescription = "The Alaska Regional Collaboration for Technology Innovation and Commercialization (ARCTIC) program is an Office of Naval (ONR) program established in 2017 in support of Navy’s needs for public-private partnerships promoting commerce and collaboration between Alaska and the Arctic and Pacific regions, centered around energy and resiliency research. ARCTIC was highlighted in the Navy’s 2021 Blue Arctic strategy as an investment in building public-private partnerships and innovative solutions to help transform operating abilities and regional understanding for Naval forces."
-  heroCTAPrimaryText = "Learn More"
-  heroCTAPrimaryUrl = "about/"
-  heroCTASecondaryText = "Partners"
-  heroCTASecondaryUrl = "partners/"
-  heroBackgroundImage = "images/2019summit-bruno_a1s.jpeg"
-  heroLogo = "images/arctic-logo.png"
-  seeMoreText = "More Posts"
-  disableAboutSection = true
-  aboutTitle = "The ARCTIC Program"
-  aboutDescription = "An Office of Naval Research initiative"
-  aboutImgUrl = "images/arctic-program.webp"
-  aboutContent = "The Alaska Regional Collaboration for Technology Innovation and Commercialization (ARCTIC) is a collaboration designed to promote commerce and partnerships between Alaska and the Arctic and Pacific regions through advancements in energy through resiliency research, technology development/deployment and education."
-
-  [params.fuseOpts]
-  isCaseSensitive = false
-  shouldSort = true
-  location = "0"
-  distance = "1000"
-  threshold = "0.4"
-  minMatchCharLength = "0"
-  keys = [ "title", "permalink", "summary", "content" ]
+[params.label]
+title = "_ARCTIC Program_"
+text = "Welcome to the ARCTIC Program"
+lightNavIcon = "images/favicon.png"
+iconHeight = "35"
+iconWIdth = "35"
+
+[params.assets]
+disableFingerprinting = false
+favicon = "images/favicon.png"
+favicon16x16 = "images/favicon.png"
+favicon32x32 = "images/favicon-32x32.png"
+apple_touch_icon = "images/favicon.png"
+safari_pinned_tab = "images/favicon.png"
+footerLogo = "images/ARCTIC-logo.png"
+
+# Search
+[params.fuseOpts]
+isCaseSensitive = false
+shouldSort = true
+location = "0"
+distance = "1000"
+threshold = "0.4"
+minMatchCharLength = "0"
+keys = [ "title", "permalink", "summary", "content" ]
 
 [[params.plugins.css]]
 link = "plugins/css/pico.min.css"
@@ -118,12 +101,19 @@ pre = "info"
 url = "/about"
 weight = "20"
 
+[[menus.main]]
+name = "Activities"
+title = "Activities"
+pre = "activity"
+url = "/foundationalActivities"
+weight = "30"
+
 [[menus.main]]
 name = "Partners"
 title = "Partners"
 pre = "users"
 url = "/partners"
-weight = "30"
+weight = "40"
 
 [[menus.main]]
 name = "Search"

layouts/_default/about.html

@@ -3,7 +3,7 @@
 <section class="hero" style="background-image:linear-gradient(rgba(20,30,38, 0.9), rgba(24,44,54, 0.8)),
 url('{{ .Params.backgroundImage | relURL }}'); ">
   <header class="container">
-    <hgroup>
+    <hgroup class="light-text">
       <h1>{{.Params.title}}</h1>
       <h2>{{.Params.description}}</h2>
     </hgroup>
@@ -28,11 +28,6 @@ <h2>{{.Params.description}}</h2>
       <div class="about">
         {{ .Content }}
       </div>
-
-      <div>
-        {{- partial "foundational_activities" . }}
-        {{- partial "partners_large" . }}
-      </div>
     </div>
   </div>
   {{ end }}

layouts/_default/list.html

@@ -1,11 +1,12 @@
 {{ define "main" }}
 
 <section class="hero" style="background-image:linear-gradient(rgba(20,30,38, 0.9), rgba(24,44,54, 0.8)),
-url('{{.Params.Image}}');">
+url('{{.Params.HeroBackgroundImage | relURL }}');">
   <header class="container">
-    <hgroup>
+    <hgroup class="light-text">
       <h1>{{ .Title }}</h1>
-      <h2>{{ .Description }}</h2>
+      <br>
+      <p>{{ .Description }}</p>
     </hgroup>
   </header>
 </section>
@@ -26,7 +27,7 @@ <h2>{{ .Description }}</h2>
             width="600"
             height="400"
             layout="responsive"
-          ></img>
+          >
         </figure>
         {{end}}
 
@@ -46,6 +47,10 @@ <h3>{{ .Title }}</h3>
     </a>
     {{ end }}
   </div>
+  {{ if eq .File.Section "foundationalActivities" }}
+      {{- partial "extend_activities.html" . -}}
+  {{ end }}
+
   <!-- pagination -->
   <div>
     <div>

layouts/index.html

@@ -1,86 +1,52 @@
 {{ define "main" }}
-{{- if not (.Site.Params.homepage.disableHeroSection) }}
+
+<!-- Hero Section -->
 <section class="hero" style="background-image:linear-gradient(rgba(20,30,38, 0.9), rgba(24,44,54, 0.8)),
-url('{{.Site.Params.homepage.heroBackgroundImage}}'); ">
+url('{{.Params.heroBackgroundImage}}'); ">
   <header class="container">
-    <hgroup>
-      <img src="{{.Site.Params.homepage.heroLogo}}"></img>
-      <h1>{{.Site.Params.homepage.heroUpperTitle}}</h1>
-      <h1>{{.Site.Params.homepage.heroTitle}}</h1>
-      <h2>{{.Site.Params.homepage.heroDescription}}</h2>
+    <hgroup class="light-text">
+      <img src="{{.Params.heroLogo}}"></img>
+      <h1>{{.Params.heroUpperTitle}}</h1>
+      <h1>{{.Params.heroTitle}}</h1>
+      <p>{{ .Content }}</p>
     </hgroup>
     <div>
       <a
         class="hero-buttons"
-        href="{{ .Site.Params.homepage.heroCTAPrimaryUrl | relURL  }}"
+        href="{{ .Params.heroCTAPrimaryUrl | relURL  }}"
         role="button"
-        >{{.Site.Params.homepage.heroCTAPrimaryText}}</a
+        >{{.Params.heroCTAPrimaryText}}</a
       >
       <a
-        href="{{ .Site.Params.homepage.heroCTASecondaryUrl | relURL  }}"
+        href="{{ .Params.heroCTASecondaryUrl | relURL  }}"
         role="button"
         class="contrast outline"
-        >{{.Site.Params.homepage.heroCTASecondaryText}}</a
+        >{{.Params.heroCTASecondaryText}}</a
       >
     </div>
   </header>
 </section>
-{{ end }}
-
-{{- if not (.Site.Params.homepage.disableAboutSection) }}
-<section>
-  <hgroup class="text-center">
-    <h2>{{.Site.Params.homepage.aboutTitle}}</h2>
-    <h3>{{.Site.Params.homepage.aboutDescription}}</h3>
-  </hgroup>
-  <div class="container">
-    <div class="grid">
-      <div class="container" style="text-align: right;">
-        <img
-          src="{{.Site.Params.homepage.aboutImgUrl}}"
-          alt="{{.Site.Params.author}}"
-          width="300"
-          height="450"
-          layout="intrinsic"
-        ></img>
-      </div>
-      <div class="container">
-        {{.Site.Params.homepage.aboutContent}}
-      </div>
-    </div>
-  </div>
-</section>
-{{ end }}
 
+<!-- Map Section -->
 <section>
   <div class="container">
     <a href="#">
       <h2 class="h2-link">
-        Map Section <b><i data-feather="arrow-right-circle"></i></b>
+        Need Title (?) <b><i data-feather="arrow-right-circle"></i></b>
       </h2>
     </a>
     <div class="grid">
-      <div class="container">
-        <p>{{.Site.Params.homepage.aboutContent}}</p>
-        <p>{{.Site.Params.homepage.aboutContent}}</p>
+      <!--Col 1-->
+      <div>
+        <p>{{ .Params.MapContentP1}}</p>
+        <p>{{ .Params.MapContentP2}}</p>
       </div>
-      <div class="container" style="text-align: right;">
-        {{- partial "map.html" . -}}
+      <!--Col 2-->
+      <div>
+        <img src="{{ .Params.StaticMapImage | relURL }}" alt="Static Map Placeholder Image">
       </div>
     </div>
   </div>
 </section>
 
-<section>
-  <div class="container">
-    {{- partial "foundational_activities.html" . -}}
-  </div>
-</section>
-
-<section>
-  <div class="container">
-    {{- partial "partners_large.html" . -}}
-  </div>
-</section>
-
 {{ end }}

layouts/partials/extend_activities.html

@@ -0,0 +1,4 @@
+<div class="container">
+  <p>{{ .Content }}</p>
+  <img style="width: 100%;" src="{{ .Params.FAdiagram | relURL }}" alt="ARCTIC Foundational Activities Diagram"/>
+</div>

layouts/partials/footer.html

@@ -5,7 +5,7 @@
     <!-- ARCTIC Program Logo and Contact -->
     <div class="footer-section">
       <img
-        src="{{ .Site.Params.Homepage.heroLogo | relURL }}"
+        src="{{ .Site.Params.Assets.FooterLogo | relURL }}"
         alt="ARCTIC Program Logo"
       />
       <div class="card">