Merge pull request #265 from OCHA-DAP/dev

dev into prod
OCHA-DAP · May 23, 2024 · 9a6d62b · 9a6d62b
2 parents 5c386d3 + dcc4418
commit 9a6d62b
Show file tree

Hide file tree

Showing 9 changed files with 112 additions and 10 deletions.
diff --git a/build/blank-pages.css b/build/blank-pages.css
diff --git a/build/blank-pages.css.map b/build/blank-pages.css.map
diff --git a/build/js/humdata-blankpage.js b/build/js/humdata-blankpage.js
diff --git a/build/js/humdata-blankpage.js.map b/build/js/humdata-blankpage.js.map
diff --git a/build/page-templates/blank.php b/build/page-templates/blank.php
@@ -36,8 +36,9 @@
 	<link rel="icon" href="https://centre.humdata.org/wp-content/uploads/2018/07/favicon_32x32.png" sizes="192x192">
 	<link rel="apple-touch-icon" href="https://centre.humdata.org/wp-content/uploads/2018/07/favicon_32x32.png">
 	<meta name="msapplication-TileImage" content="https://centre.humdata.org/wp-content/uploads/2018/07/favicon_32x32.png">
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" crossorigin="anonymous">
-	<link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri().'/blank-pages.css?v=3'; ?>"/>
+	<link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri().'/blank-pages.css?v=7'; ?>"/>
 </head>
 <body>
 
@@ -61,7 +62,7 @@
 		mpTrack.pageView(document.title, '<?php echo get_post($pageID)->post_name; ?>');
 	}
 </script>
-<script src="<?php echo get_stylesheet_directory_uri().'/js/humdata-blankpages.js'; ?>"></script>
+<script src="<?php echo get_stylesheet_directory_uri().'/js/humdata-blankpage.js?v=2'; ?>"></script>
 
 </body>
 </html>
diff --git a/gulpconfig.js b/gulpconfig.js
@@ -49,7 +49,7 @@ module.exports = {
       footer: ['footer'],
       //header: ['header'],
       //pageloader: ['pageloader', 'footer']
-      blankpages: ['blankpages'],
+      blankpage: ['blankpage'],
       mixpanel: ['mixpanel'],
     },
     chunks: { // Chunks are arrays of paths or globs matching a set of source files; this way you can organize a bunch of scripts that go together into pieces that can then be bundled (above)
@@ -85,8 +85,8 @@ module.exports = {
       mixpanel: [
         src+'scripts/humdata-mixpanel.js',
       ],
-      blankpages: [
-        src+'scripts/humdata-blankpages.js',
+      blankpage: [
+        src+'scripts/humdata-blankpage.js',
       ]
     },
     dest: build+'js/', // Where the scripts end up in your theme

diff --git a/src/page-templates/blank.php b/src/page-templates/blank.php
@@ -36,8 +36,9 @@
 	<link rel="icon" href="https://centre.humdata.org/wp-content/uploads/2018/07/favicon_32x32.png" sizes="192x192">
 	<link rel="apple-touch-icon" href="https://centre.humdata.org/wp-content/uploads/2018/07/favicon_32x32.png">
 	<meta name="msapplication-TileImage" content="https://centre.humdata.org/wp-content/uploads/2018/07/favicon_32x32.png">
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" crossorigin="anonymous">
-	<link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri().'/blank-pages.css?v=3'; ?>"/>
+	<link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri().'/blank-pages.css?v=7'; ?>"/>
 </head>
 <body>
 
@@ -61,7 +62,7 @@
 		mpTrack.pageView(document.title, '<?php echo get_post($pageID)->post_name; ?>');
 	}
 </script>
-<script src="<?php echo get_stylesheet_directory_uri().'/js/humdata-blankpages.js'; ?>"></script>
+<script src="<?php echo get_stylesheet_directory_uri().'/js/humdata-blankpage.js?v=2'; ?>"></script>
 
 </body>
 </html>
diff --git a/src/scripts/humdata-blankpages.js → src/scripts/humdata-blankpage.js b/src/scripts/humdata-blankpages.js → src/scripts/humdata-blankpage.js
@@ -1,6 +1,8 @@
 (function ($) {
 
     $(document).ready(function () {
+        var $registrationContainer = $('#hdf2024 #register').first();
+        var $registrationAnchor = $('#hdf2024 #registration-anchor').first();
         var $registrationForm = $('#hdf2024 #registration-form').first();
         var $submitBtn = $registrationForm.find('.btn');
         var $submitSpinner = $registrationForm.find('.spinner');
@@ -35,6 +37,11 @@
                 }
             });
         });
+
+        if(window.location.href.indexOf('register=true') > -1) {
+            $registrationContainer.removeClass('d-none');
+            $registrationAnchor.removeClass('d-none');
+        }
     });
 
 })(jQuery);
diff --git a/src/scss/blank-pages.scss b/src/scss/blank-pages.scss
@@ -11,9 +11,13 @@ $malibu-color: #5EB1E4;
 
   h2 {
     color: #000;
-    font-size: 24px;
+    font-size: 22px;
     font-weight: 300;
     line-height: 26px;
+    a {
+      color: $red-color;
+      text-decoration: none;
+    }
   }
 
   h4 {
@@ -151,6 +155,7 @@ $malibu-color: #5EB1E4;
     font-size: 22px;
     border-left: 1px solid $green-color;
     font-weight: 300;
+    line-height: 26px;
   }
 
   .feature {
@@ -170,6 +175,91 @@ $malibu-color: #5EB1E4;
     }
   }
 
+  #programme {
+    font-size: 22px;
+    font-weight: 300;
+    color: #000;
+    line-height: 26px;
+    .wrapper {
+      border-top: 1px solid $green-color;
+      a {
+        color: $red-color;
+        text-decoration: none;
+      }
+      .nav {
+        &.nav-pills {
+          .nav-item {
+            .nav-link {
+              color: $green-color;
+              font-weight: 300;
+              border-radius: 0;
+              border: 1px solid $green-color;
+              &.active {
+                color: #fff;
+                background-color: $green-color;
+              }
+            }
+          }
+        }
+      }
+      .tab-content {
+        .tab-pane {
+          .day {
+            font-size: 22px;
+            font-weight: 500;
+            color: $red-color;
+            margin-top: 2rem;
+            margin-bottom: 2rem;
+          }
+          .event {
+            margin-bottom: 1rem;
+            border-bottom: 1px solid $green-color;
+            .time {
+              font-size: 20px;
+              font-weight: 500;
+              margin-bottom: 0;
+            }
+            .name {
+              font-size: 20px;
+              font-weight: 500;
+              margin-bottom: 1rem;
+            }
+            .description {
+              font-size: 20px;
+              font-weight: 300;
+              margin-bottom: 0;
+              &:last-child {
+                margin-bottom: 1rem;
+              }
+            }
+            .highlight {
+              color: $green-color;
+            }
+          }
+          .subevents {
+            margin-bottom: 1rem;
+            .sub-event {
+              padding-left: 2rem;
+              margin-bottom: 1rem;
+              border-bottom: 0;
+              &:last-child {
+                border-bottom: 1px solid $green-color;
+              }
+              .name {
+                margin-bottom: 0;
+              }
+            }
+            hr {
+              margin-left: 2rem;
+              border-top-color: $green-color;
+              opacity: .25;
+            }
+          }
+        }
+      }
+    }
+  }
+
   .footer {
     a {
       color: #fff;