From beb3ebf3d18623f8b4949ff31a267c85febc9588 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 24 Oct 2024 11:27:05 +0700 Subject: [PATCH 01/27] chore: add date --- jobs/brisbane.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/brisbane.md b/jobs/brisbane.md index af859087..15b3ad4d 100644 --- a/jobs/brisbane.md +++ b/jobs/brisbane.md @@ -62,7 +62,7 @@ We will have time for plenty of Q&A plus nibblies and drinks. Perhaps even some [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** +Starting at **7:00 pm, Saturday 14 December 2024** Contact: Ross Cruickshank, [ross_cruickshank@sil.org](mailto:ross_cruickshank@sil.org), 0410 190 154 From 05ea82391a61f169d20facdf92bfddfb77a04380 Mon Sep 17 00:00:00 2001 From: rc-swag <58423624+rc-swag@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:28:49 +1000 Subject: [PATCH 02/27] chore: add short bio for ross --- about/developers/index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/about/developers/index.md b/about/developers/index.md index f2b70e64..07288299 100644 --- a/about/developers/index.md +++ b/about/developers/index.md @@ -100,6 +100,10 @@ I am married, with two adult children, and two cats. I love playing computer ga My personal website can be found at [markcsinclair.co.uk](https://markcsinclair.co.uk/) +### Ross Cruickshank +
+With degrees in Electronics and Information Technology from QUT, I have worked across various roles in software and electronics engineering. This has given me experience in high-availability systems, microcontroller design, and software development. With Keyman, I contribute mostly to the Keyman for Windows product. I am based in Australia and outside of work, I enjoy spending time with my family, mountain biking and road cycling. + ## Previous Contributors More about [previous contributors](./previous) \ No newline at end of file From e260789fa19723fd78565f99dd681ee341cede34 Mon Sep 17 00:00:00 2001 From: rc-swag <58423624+rc-swag@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:29:16 +1000 Subject: [PATCH 03/27] chore: add ross link to avatar --- about/developers/index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/about/developers/index.md b/about/developers/index.md index 07288299..92f5c0eb 100644 --- a/about/developers/index.md +++ b/about/developers/index.md @@ -100,6 +100,10 @@ I am married, with two adult children, and two cats. I love playing computer ga My personal website can be found at [markcsinclair.co.uk](https://markcsinclair.co.uk/) +---- + +![](https://github.com/rc-swag.png?size=240) + ### Ross Cruickshank
With degrees in Electronics and Information Technology from QUT, I have worked across various roles in software and electronics engineering. This has given me experience in high-availability systems, microcontroller design, and software development. With Keyman, I contribute mostly to the Keyman for Windows product. I am based in Australia and outside of work, I enjoy spending time with my family, mountain biking and road cycling. From 6827fc4fe8538a397438533ae6e8efc1b4e736a1 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Mon, 28 Oct 2024 08:37:39 +0700 Subject: [PATCH 04/27] feat: Add metadata description content to headers --- _includes/2020/templates/Head.php | 3 +++ _includes/includes/md/mdhost.php | 1 + _includes/includes/template.php | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/_includes/2020/templates/Head.php b/_includes/2020/templates/Head.php index f9a4df0e..82dc47b6 100644 --- a/_includes/2020/templates/Head.php +++ b/_includes/2020/templates/Head.php @@ -27,6 +27,9 @@ static function render($fields = []) { description)) { + echo "\n"; + } if(KeymanHosts::Instance()->Tier() == KeymanHosts::TIER_STAGING) { echo ' '; } diff --git a/_includes/includes/md/mdhost.php b/_includes/includes/md/mdhost.php index 530dc210..40064004 100644 --- a/_includes/includes/md/mdhost.php +++ b/_includes/includes/md/mdhost.php @@ -14,6 +14,7 @@ 'title' => $md->PageTitle(), 'css' => ['template.css','prism.css'], 'showMenu' => $md->ShowMenu(), + 'description' => $md->PageDescription(), 'js' => ['prism.js'] ]); diff --git a/_includes/includes/template.php b/_includes/includes/template.php index 667d9c9c..5bcfde95 100644 --- a/_includes/includes/template.php +++ b/_includes/includes/template.php @@ -49,6 +49,9 @@ function head($args=[]){ }else{ $title = 'Keyman | Type to the world in your language'; } + if(isset($args['description'])) { + $description = $args['description']; + } if(isset($args['css'])){ $css = array(); foreach($args['css'] as $cssFile){ @@ -80,6 +83,7 @@ function head($args=[]){ // This avoids the global variable plague of earlier templates! $head = []; if(isset($title)) $head['title'] = $title; + if(isset($description)) $head['description'] = $description; if(isset($favicon)) $head['favicon'] = $favicon; if(isset($css)) $head['css'] = $css; if(isset($js)) $head['js'] = $js; From 1e9c090f14b795eb8aeb21704aec348d2f361b13 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Mon, 28 Oct 2024 08:47:34 +0700 Subject: [PATCH 05/27] fix: Update BOOTSTRAP_VERSION to chore/v0.11 For engineering testing --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 2e1ca04c..44313675 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ ## START STANDARD SITE BUILD SCRIPT INCLUDE readonly THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" readonly BOOTSTRAP="$(dirname "$THIS_SCRIPT")/resources/bootstrap.inc.sh" -readonly BOOTSTRAP_VERSION=v0.10 +readonly BOOTSTRAP_VERSION=chore/v0.11 [ -f "$BOOTSTRAP" ] && source "$BOOTSTRAP" || source <(curl -fs https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh) ## END STANDARD SITE BUILD SCRIPT INCLUDE From d259b7a7a26633547cc8bd190e312253b75c7234 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Mon, 28 Oct 2024 09:27:48 +0700 Subject: [PATCH 06/27] feat: Add descriptions for major pages --- android/index.php | 1 + downloads/archive/index.php | 4 +++- downloads/index.php | 1 + downloads/pre-release/index.php | 1 + index.php | 3 +++ iphone-and-ipad/index.php | 1 + keyboards/index.php | 1 + linux/index.php | 1 + mac/index.php | 1 + windows/download.php | 1 + windows/features.php | 1 + windows/index.php | 1 + 12 files changed, 16 insertions(+), 1 deletion(-) diff --git a/android/index.php b/android/index.php index ef878939..5ef7021d 100644 --- a/android/index.php +++ b/android/index.php @@ -7,6 +7,7 @@ // Required head([ 'title' =>'Keyman for Android', + 'description' => 'Keyman for Android', 'css' => ['template.css','feature-grid.css','app-store-links.css'], 'showMenu' => true, 'banner' => [ diff --git a/downloads/archive/index.php b/downloads/archive/index.php index 0ac32d3f..af95c6ae 100644 --- a/downloads/archive/index.php +++ b/downloads/archive/index.php @@ -6,12 +6,14 @@ // Required head([ 'title' =>'Download Archives', + 'description' => 'Keyman download archive: static activation license keys', 'css' => ['template.css', 'feature-grid.css'], 'showMenu' => true ]); require_once('./static-keys.php'); - +', + 'Keyman Downloads', + 'description' => 'Keyamn stable downloads', 'css' => ['template.css','index.css','app-store-links.css', 'prism.css'], 'js' => ['prism.js'], 'showMenu' => true diff --git a/downloads/pre-release/index.php b/downloads/pre-release/index.php index a1fd76b3..83fdc626 100644 --- a/downloads/pre-release/index.php +++ b/downloads/pre-release/index.php @@ -5,6 +5,7 @@ // Required head([ 'title' =>'Keyman Pre-release Versions', + 'description' => 'Keyman pre-release versions: alpha, beta', 'css' => ['template.css','index.css', 'app-store-links.css','prism.css'], 'showMenu' => true ]); diff --git a/index.php b/index.php index 5152706b..d0b7e3e2 100644 --- a/index.php +++ b/index.php @@ -5,6 +5,9 @@ // Required head([ 'title' =>'Keyman | Type to the world in your language', + 'description' => 'Unlock the power of your language with Keyman customizable keyboard software. + Available for Windows, Mac, and mobile devices, + we support over 1,000 languages to make communication seamless and meaningful.', 'css' => ['template.css','index.css'], 'showMenu' => true, 'addSection2' => false diff --git a/iphone-and-ipad/index.php b/iphone-and-ipad/index.php index a9237cbc..4d2c1520 100644 --- a/iphone-and-ipad/index.php +++ b/iphone-and-ipad/index.php @@ -7,6 +7,7 @@ // Required head([ 'title' =>'Keyman for iPhone and iPad', + 'description' => 'Keyman for iPhone and iPad', 'css' => ['template.css','feature-grid.css','app-store-links.css'], 'showMenu' => true, 'banner' => [ diff --git a/keyboards/index.php b/keyboards/index.php index cf6f227a..c188fa85 100644 --- a/keyboards/index.php +++ b/keyboards/index.php @@ -10,6 +10,7 @@ $head_options = [ 'title' =>'Keyboard Search', + 'description' => 'Keyman Keyboard Search', 'css' => [Util::cdn('css/template.css'), Util::cdn('keyboard-search/search.css')], 'js' => [Util::cdn('keyboard-search/jquery.mark.js'), Util::cdn('keyboard-search/dedicated-landing-pages.js'), Util::cdn('keyboard-search/search.js')] diff --git a/linux/index.php b/linux/index.php index 3001dd68..cf02ed1b 100644 --- a/linux/index.php +++ b/linux/index.php @@ -6,6 +6,7 @@ // Required head([ 'title' =>'Keyman ' . $stable_version . ' for Linux', + 'description' => 'Keyman for Linux stable', 'css' => ['template.css','index.css','desktop.css','feature-grid.css', 'prism.css'], 'js' => ['prism.js'], 'showMenu' => true, diff --git a/mac/index.php b/mac/index.php index 049ba5f5..e4f3019a 100644 --- a/mac/index.php +++ b/mac/index.php @@ -6,6 +6,7 @@ // Required head([ 'title' =>'Keyman ' . $stable_version . ' for macOS', + 'description' => 'Keyman for macOS stable', 'css' => ['template.css','index.css','desktop.css','feature-grid.css'], 'showMenu' => true, 'banner' => [ diff --git a/windows/download.php b/windows/download.php index c2dc2d57..cadcf103 100644 --- a/windows/download.php +++ b/windows/download.php @@ -5,6 +5,7 @@ // Required head([ 'title' =>'Download Keyman for Windows ' . $stable_version, + 'description' => 'Download Keyman for Windows stable', 'css' => ['template.css','index.css','desktop-download.css'], 'js' => ['download.js'], 'showMenu' => true diff --git a/windows/features.php b/windows/features.php index 99359eb1..c840c7c0 100644 --- a/windows/features.php +++ b/windows/features.php @@ -4,6 +4,7 @@ // Required head([ 'title' =>'Features | Keyman for Windows ' . $stable_version, + 'description' => 'Keyman for Windows Features', 'css' => ['template.css','feature-template.css'], 'showMenu' => true ]); diff --git a/windows/index.php b/windows/index.php index b5ab9c59..c56e0adc 100644 --- a/windows/index.php +++ b/windows/index.php @@ -5,6 +5,7 @@ // Required head([ 'title' =>'Keyman for Windows ' . $stable_version, + 'description' => 'Keyman for Windows', 'css' => ['template.css','index.css','desktop.css','feature-grid.css'], 'showMenu' => true, 'banner' => [ From e6cb3b000f92c4ad149d384333992e9a11444e5e Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Mon, 28 Oct 2024 10:05:00 +0700 Subject: [PATCH 07/27] fix typo --- downloads/archive/index.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/downloads/archive/index.php b/downloads/archive/index.php index af95c6ae..3683b12d 100644 --- a/downloads/archive/index.php +++ b/downloads/archive/index.php @@ -12,8 +12,6 @@ ]); require_once('./static-keys.php'); -', - Date: Mon, 28 Oct 2024 10:27:54 +0700 Subject: [PATCH 08/27] fix: Add alt text to main page images --- index.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/index.php b/index.php index 5152706b..8b0cbf79 100644 --- a/index.php +++ b/index.php @@ -64,7 +64,7 @@

Search over 2000 languages

- "> + " alt="Search button">
@@ -76,7 +76,7 @@ your language, and for over 99% of the global population’s mother tongues!

@@ -129,11 +129,11 @@ private static function render_top_menu(object $fields): void { Donate - " /> + " alt="help icon" />