Merge remote-tracking branch 'origin/master' into fix/go-download-kmp

keymanapp · Oct 20, 2024 · 31d31cb · 31d31cb
2 parents 5c0c04d + 812d869
commit 31d31cb
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 14 deletions.
diff --git a/_includes/2020/templates/Foot.php b/_includes/2020/templates/Foot.php
@@ -3,7 +3,7 @@
 
   namespace Keyman\Site\com\keyman\templates;
 
-  use Keyman\Site\com\keyman\Util;
+  use Keyman\Site\Common\ImageRandomizer;
   use Keyman\Site\com\keyman\KeymanVersion;
   use Keyman\Site\Common\KeymanHosts;
 
@@ -59,7 +59,7 @@ static function render(array $fields = []) {
         </div>
         <div class="footer-third sil-logo">
             <br>
-            <a href="/about/"><img id="sil-logo" src="<?php echo Util::cdn("img/sil-logo-blue-2017_1.png"); ?>" alt='SIL' /></a>
+            <a href="/about/"><img id="sil-logo" src="<?php echo ImageRandomizer::randomizer(); ?>" width="50%" alt='SIL' /></a>
             <p>Created by <a href="/about/">SIL Global</a></p>
         </div>
     </div>

diff --git a/about/developers/index.md b/about/developers/index.md
@@ -13,13 +13,12 @@ Computing degree, I worked with my wife for a year in Papua New Guinea as a volu
 International. I continued part-time development of Keyman during and after University and started working full time
 on the full suite of Keyman projects in 2005.
 
+Outside work I still ride my bike. We have two adult daughters and one son; currently, we are living in Phnom Penh,
+Cambodia where I am now the Product Owner for Keyman within SIL. I can speak, read, and write (and type!),
+to varying degrees, Khmer, Lao, Thai, and Tok Pisin, and used to speak French as a child.
 
-Outside work I still ride my bike. We have two daughters and one son. After living in Phnom Penh, Cambodia
-for two years, our family is back in Australia where I continue to lead the Keyman team within SIL.
-I can speak, read, and write, to varying degrees, Khmer, Lao, Thai and Tok Pisin, and used to speak French as a child.
-
-My personal blog can be found at [marc.durdin.net](https://marc.durdin.net/) and my Twitter account is
-[@MarcDurdin](https://www.twitter.com/MarcDurdin).
+My personal blog can be found at [marc.durdin.net](https://marc.durdin.net/);
+[@MarcDurdin](https://x.com/MarcDurdin) on x, [@marc@typo.social](https://typo.social/@marc) on Mastodon.
 
 ----
 

diff --git a/about/index.md b/about/index.md
@@ -13,8 +13,7 @@ Keyboard layouts are distributed through an open catalog to all major desktop an
 
 ## About SIL Global
 
-<!--div style=style='float:left; margin: 0 16px 0 0'-->
-![](/cdn/dev/img/sil-logo-blue-2017_1.png)
+<img id="sil-logo" src="/_common/assets/sil-logos-2024/sil-logo-abbysinica.png" width="30%" alt='SIL' />
 
 Keyman is created by SIL Global (formerly SIL International). Partners in Language Development,
 SIL Global is a faith-based nonprofit organization committed to serving language communities

diff --git a/cdn/dev/css/template.css b/cdn/dev/css/template.css
@@ -904,7 +904,7 @@ input[type="search"] {
 }
 
 .footer-third form {
-	width: 320px;
+	width: 100%;
 }
 
 .footer-third form input {
@@ -999,7 +999,7 @@ input[type="search"] {
 }
 
 .subscribe {
-	width: 90px;
+	width: fit-content;
 	margin: 0px;
 	border-top-left-radius: 0px;
 	border-bottom-left-radius: 0px;

diff --git a/index.php b/index.php
@@ -1,5 +1,6 @@
 <?php
 require_once('includes/template.php');
+require_once __DIR__ . '/_includes/autoload.php';
 
 // Required
 head([

diff --git a/jobs/brisbane.md b/jobs/brisbane.md
@@ -0,0 +1,78 @@
+---
+title: Full Mission Developer - Brisbane Event
+---
+
+Come and meet software developers working in mission, working in South East Asia
+and in Australia. Learn how you can get involved too!
+
+## We need you!
+
+We are seeking people like you who are:
+
+  * Innovative
+  * Technical
+  * Visionary
+  * Relational
+  * Faithful
+
+## About the event
+
+[Marc Durdin](/about/developers/) will be sharing on his experiences working as
+a software developer in the majority world — in Thailand, Papua New Guinea,
+Cambodia, and Laos. Watch the video to learn more about Marc's current context
+in Cambodia!
+
+<style>
+  p.video {
+    text-align: center;
+  }
+
+  @media all and (max-width: 1023px) {
+    p.video#video-mobile {
+      display: block;
+    }
+
+    p.video#video-desktop {
+      display: none;
+    }
+  }
+
+  @media all and (min-width: 1024px) {
+    p.video#video-mobile {
+      display: none;
+    }
+
+    p.video#video-desktop {
+      display: block;
+    }
+  }
+</style>
+
+<p class='video' id='video-desktop'>
+<iframe width="800" height="450" src="https://www.youtube.com/embed/UZ_lKqRlEBE?cc_lang_pref=en&si=i64xOskmlE-S98fZ" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
+</p>
+
+<p class='video' id='video-mobile'>
+<iframe src="https://www.youtube.com/embed/55HeegSJcVA?si=i64xOskmlE-S98fZ" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
+</p>
+
+We will have time for plenty of Q&A plus nibblies and drinks. Perhaps even some live coding!
+
+## Located in time and space
+
+[Rosalie Baptist Church](https://www.rosaliechurch.com.au/): [97 Fernberg Rd, Paddington QLD 4064](https://maps.app.goo.gl/2xKQ2uaey35tPMKZA)
+
+Starting at **7:00 pm**
+
+Contact: Ross Cruickshank, [[email protected]](mailto:[email protected]), 0410 190 154
+
+## More information
+
+* [Keyman Jobs](/jobs)
+* [About Keyman](/)
+
+---
+
+* [SIL Language Technology Careers Portal](https://careers.sil.org/jobs/dept/LangTech)
+* [Write to us](https://software.sil.org/about/contact/)
+* [Send us a tweet or DM on Twitter](https://x.com/keyman)
diff --git a/keyboards/keyboard.php b/keyboards/keyboard.php
@@ -2,6 +2,7 @@
   require_once('includes/template.php');
   require_once('includes/ui/keyboard-details.php');
   require_once('./session.php');
+  require_once __DIR__ . '/../_includes/autoload.php';
 
   if(isset($_REQUEST['legacy'])) {
     $id = find_id_by_legacy(clean_id($_REQUEST['legacy']));

diff --git a/resources/init-container.sh b/resources/init-container.sh
@@ -7,5 +7,6 @@ if [[ ! $1 =~ "debug" ]]; then
   php -d include_path=/var/www/html/_includes:. cdnrefresh.php
   cd ..
 else
-  echo "Skip Generating CDN"
+  echo "Skip Generating CDN and clean CDN cache"
+  rm -rf cdn/deploy
 fi
diff --git a/search/index.php b/search/index.php
@@ -1,5 +1,6 @@
 <?php
   require_once('includes/template.php');
+  require_once __DIR__ . '/../_includes/autoload.php';
   head([
     'title' => "Search Keyman Sites",
     'css' => ['template.css'],

diff --git a/windows/index.php b/windows/index.php
@@ -1,6 +1,7 @@
 <?php
   require_once('includes/template.php');
-
+  require_once __DIR__ . '/../_includes/autoload.php';
+
   // Required
   head([
     'title' =>'Keyman for Windows ' . $stable_version,