Merge pull request #432 from path-cc/preview-contact

Add preview contact page

Author: CannonLock

.github/workflows/deploy-preview.yml

@@ -4,11 +4,6 @@ on:
   push:
     branches:
       - preview-**
-  workflow_call:
-    inputs:
-      branch:
-        required: true
-        type: string
 
 jobs:
   Deploy-Web-Preview:
@@ -20,14 +15,17 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
-          ref: ${{ inputs.branch }}
 
       - name: Get branch name
         run: echo "BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
 
+      - name: Update Submodules
+        run: |
+          git submodule update --init --recursive --remote    
+
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.4
           bundler-cache: true
 
       - name: Configure for Dev Preview

_articles

@@ -13,17 +13,6 @@
       </button>
       <div id="navbarNavDropdown" class="collapse navbar-collapse justify-content-between">
         <ul class="navbar-nav">
-          <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" href="#" id="about-nav" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              About
-            </a>
-            <div class="dropdown-menu" aria-labelledby="about-nav">
-              <a class="dropdown-item" href="{{ '/about' | relative_url }}">PATh</a>
-              <a class="dropdown-item" href="{{ '/team' | relative_url }}">Team</a>
-              <a class="dropdown-item" href="{{ '/glossary' | relative_url }}">Glossary</a>
-              <a class="dropdown-item" href="{{ '/contact' | relative_url }}">Contact</a>
-            </div>
-          </li>
           <li class="nav-item dropdown">
             <a class="nav-link dropdown-toggle" href="#" id="facility-nav" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
               Facility
@@ -51,6 +40,19 @@
               <a class="dropdown-item" href="{{ '/news' | relative_url }}">News</a>
             </div>
           </li>
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="#" id="about-nav" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            About
+          </a>
+          <div class="dropdown-menu" aria-labelledby="about-nav">
+            <a class="dropdown-item" href="{{ '/about' | relative_url }}">PATh</a>
+            <a class="dropdown-item" href="{{ '/team' | relative_url }}">Team</a>
+            <a class="dropdown-item" href="{{ '/glossary' | relative_url }}">Glossary</a>
+          </div>
+        </li>
+          <li class="nav-item {% if 'contact' == page.url %}active{% endif %}">
+            <a class="nav-link" href="/contact">Contact</a>
+          </li>
         </ul>
         <div class="social-media d-none d-lg-block">
           <a class="text-decoration-none" href="https://www.youtube.com/channel/UCd1UBXmZIgB4p85t2tu-gLw">

_includes/layout/header.html

@@ -289,3 +289,20 @@ main {
 main {
   min-height: 60vh;
 }
+
+@include media-breakpoint-down(lg) {
+  #portal-frame {
+    height: 546px
+  }
+}
+
+@include media-breakpoint-up(lg) {
+  #portal-frame {
+    height: 580px;
+  }
+}
+@include media-breakpoint-up(xl) {
+  #portal-frame {
+    height: 620px;
+  }
+}

assets/css/style.scss

@@ -1,8 +1,14 @@
 ---
-title: Contact
+title: Talk to Us
 layout: sub-page
 ---
 
+We want to hear from you! Get in touch via this form and a member of our research computing facilitation team will do their best to reach out to you within 1 business day.
+
+<iframe id="portal-frame" src="https://osg-portal.osgdev.chtc.io/contact" width="100%" frameborder="0"></iframe>
+
+## Specific Questions?
+
 PATh is a unique partnership between the Center for High Throughput Computing (CHTC) and the OSG Consortium.
 
 * For enquiries about the *PATh project*, please contact the [PATh leadership](mailto:[email protected]).