From 37b59298d4fe4b3f688a82e72117a1b4df1da583 Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Tue, 31 Dec 2024 19:02:47 +0800 Subject: [PATCH 01/15] chore: remove unused layouts and includes --- _includes/toc-mainPage-placeholder.html | 21 ------------ _layouts/toc-type.html | 44 ------------------------- 2 files changed, 65 deletions(-) delete mode 100644 _includes/toc-mainPage-placeholder.html delete mode 100644 _layouts/toc-type.html diff --git a/_includes/toc-mainPage-placeholder.html b/_includes/toc-mainPage-placeholder.html deleted file mode 100644 index 25187c6..0000000 --- a/_includes/toc-mainPage-placeholder.html +++ /dev/null @@ -1,21 +0,0 @@ -
    - {% for page in loopPages %} - {% if page.path contains '_appendixes' %} - {% assign subpages = site.appendixes | where: "parent", page.id | sort: "order" %} - {% else %} - {% assign subpages = site.pages | where: "parent", page.id | sort: "order" %} - {% endif %} - - {% if page.title == currentMainParent %} - {% for subpage in subpages %} - {% assign content_size = subpage.content | strip | size %} - {% if content_size > 0 %} -
  1. - - {{ subpage.title }} -
    2. - {% endif %} - {% endfor %} - {% endif %} - {% endfor %} -
diff --git a/_layouts/toc-type.html b/_layouts/toc-type.html deleted file mode 100644 index 0b19047..0000000 --- a/_layouts/toc-type.html +++ /dev/null @@ -1,44 +0,0 @@ ---- -layout: default ---- -
-
-
    -
  1. Home
    2. - {% if page.path contains '_appendixes' %} - - {% else %} - - {% endif %} - {% assign pageParents = page.parents | split:';' %} - {% for parent in pageParents %} - {% assign pageParentsDetails = parent| split:':' %} -
  2. {{pageParentsDetails[0]}}
    3. - {% endfor %} -
- - {% if content.size != 1 %} - {{ content }} - {% else %} - For information on {{page.title}} see: - {% assign currentMainParent = page.mainParent %} - - {% if page.path contains '_appendixes' %} - {% assign loopPages = site.appendixes | where: "parent", "/public" | sort: "order" %} - {% else %} - {% assign loopPages = site.pages | where: "parent", "/public" | sort: "order" %} - {% endif %} - - {% include toc-mainPage-placeholder.html loopPages=loopPages currentMainParent=currentMainParent %} - {% endif %} - -
-
-
    - {% assign currentPageUrl = page.url %} - {% assign currentPageTitle = page.title %} - {% assign pages = site.pages | where: "parent", "/public" | sort: "order" %} - {% include toc-sidebar.html pages=pages currentPageUrl=currentPageUrl currentMainParent=page.mainParent currentPageTitle=currentPageTitle%} -
-
-
From f61ad80f172ea971036617b4fc996a4d503c9844 Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Tue, 31 Dec 2024 19:05:07 +0800 Subject: [PATCH 02/15] fix: about page links for 7-things --- .../projects/abstract-calendaring-api.adoc | 2 +- .../projects/consensus-scheduling.adoc | 2 +- _about_pages/projects/push-for-caldav.adoc | 2 +- _about_pages/projects/tasks.adoc | 2 +- ...-30-2013-at-calconnect-roundtable-xxvi.adoc | 2 +- ...sus-scheduling-component-for-icalendar.adoc | 2 +- ...4-7-things-you-should-know-about-tasks.adoc | 2 +- ...rom-travel-industry-technology-experts.adoc | 2 +- ...-from-calconnect-xxix-in-san-francisco.adoc | 4 ++-- ...from-calconnect-xxx-in-dulles-virginia.adoc | 2 +- ...connect-xxxi-in-bedford-united-kingdom.adoc | 2 +- _resources/7-things-you-should-know-about.adoc | 18 +++++++++--------- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/_about_pages/projects/abstract-calendaring-api.adoc b/_about_pages/projects/abstract-calendaring-api.adoc index 77729bb..5102955 100644 --- a/_about_pages/projects/abstract-calendaring-api.adoc +++ b/_about_pages/projects/abstract-calendaring-api.adoc @@ -19,4 +19,4 @@ on that system. Work item of: link:{{'/about/technical-committees/tc-api' | relative_url }}[TC API]. -Details: link:{{'/7_things_api' | relative_url }}[*Abstract Calendaring API*] +Details: link:{{'/resources/7-things-you-should-know-about/abstract-calendaring-api' | relative_url }}[*Abstract Calendaring API*] diff --git a/_about_pages/projects/consensus-scheduling.adoc b/_about_pages/projects/consensus-scheduling.adoc index 207b325..4b6705e 100644 --- a/_about_pages/projects/consensus-scheduling.adoc +++ b/_about_pages/projects/consensus-scheduling.adoc @@ -20,4 +20,4 @@ additional iCalendar and iTIP component designed to allow the implementation of consensus scheduling with any system and client. link:{{'/about/technical-committees/tc-freebusy' | relative_url }}[TC FREEBUSY]. -Details: link:{{'/7_things_consensus_scheduling' | relative_url }}[*Consensus Scheduling (VPOLL)*] +Details: link:{{'/resources/7-things-you-should-know-about/consensus-scheduling' | relative_url }}[*Consensus Scheduling (VPOLL)*] diff --git a/_about_pages/projects/push-for-caldav.adoc b/_about_pages/projects/push-for-caldav.adoc index dcd4c38..04c7525 100644 --- a/_about_pages/projects/push-for-caldav.adoc +++ b/_about_pages/projects/push-for-caldav.adoc @@ -22,4 +22,4 @@ technologies that can be used when no other PUSH method is available. To help implementers we will provide guidelines to PUSH support on servers and clients. -Details: link:{{'/7_things_push' | relative_url }}[*PUSH for CalDAV (and CardDAV)*] +Details: link:{{'/resources/7-things-you-should-know-about/push' | relative_url }}[*PUSH for CalDAV (and CardDAV)*] diff --git a/_about_pages/projects/tasks.adoc b/_about_pages/projects/tasks.adoc index d68fcc0..e964486 100644 --- a/_about_pages/projects/tasks.adoc +++ b/_about_pages/projects/tasks.adoc @@ -19,4 +19,4 @@ link:{{'/about/technical-committees/tc-tasks' | relative_url }}[TC TASKS] is wor areas such as project management, WS Human Task, and smart grid energy management. -Details: link:{{'/7_things_tasks' | relative_url }}[*Tasks (VTODOs)*] \ No newline at end of file +Details: link:{{'/resources/7-things-you-should-know-about/tasks' | relative_url }}[*Tasks (VTODOs)*] \ No newline at end of file diff --git a/_posts/2012-12-13-calconnect-consensus-scheduling-workshop-january-30-2013-at-calconnect-roundtable-xxvi.adoc b/_posts/2012-12-13-calconnect-consensus-scheduling-workshop-january-30-2013-at-calconnect-roundtable-xxvi.adoc index 2760abc..4c066c6 100644 --- a/_posts/2012-12-13-calconnect-consensus-scheduling-workshop-january-30-2013-at-calconnect-roundtable-xxvi.adoc +++ b/_posts/2012-12-13-calconnect-consensus-scheduling-workshop-january-30-2013-at-calconnect-roundtable-xxvi.adoc @@ -61,7 +61,7 @@ Although there are a variety of consensus scheduling products and services avail CalConnect has for some time been working on developing a consensus scheduling solution that builds on the internet calendar standards of iCalendar and iTIP (the traditional solution to standards-based calendaring and scheduling). CalConnect's approach creates a new iCalendar component, VPOLL, and defines an iTIP process by which "`polls`" can be sent to participants and votes collected from them. CalConnect's work also looks at how this process can be integrated with calendaring system, such as those built on the standard CalDAV calendar server protocol, with the goal of providing more automation for voting and streamlining the decision process for voters. -Please see link:{{'/7_things_consensus_scheduling for' | relative_url}}[/7_things_consensus_scheduling for] a further introduction to consensus scheduling and why it matters to calendaring and scheduling. +Please see link:{{'/resources/7-things-you-should-know-about/consensus-scheduling for' | relative_url}}[/resources/7-things-you-should-know-about/consensus-scheduling for] a further introduction to consensus scheduling and why it matters to calendaring and scheduling. *Previous CalConnect Workshops:* diff --git a/_posts/2013-01-23-vpoll-consensus-scheduling-component-for-icalendar.adoc b/_posts/2013-01-23-vpoll-consensus-scheduling-component-for-icalendar.adoc index 0290c81..aa7f250 100644 --- a/_posts/2013-01-23-vpoll-consensus-scheduling-component-for-icalendar.adoc +++ b/_posts/2013-01-23-vpoll-consensus-scheduling-component-for-icalendar.adoc @@ -14,5 +14,5 @@ The VPOLL draft specification defining a new consensus scheduling component for This specification "`introduces a new iCalendar component (VPOLL) which allows for consensus scheduling, that is voting on a number of alternative meeting or task alternatives`". This draft standard is intended to provide the broad interoperability needed to allow users to participate in consensus scheduling using the calendaring products and service they prefer rather than the product or service used first to enumerate the event and the scheduling choices. -Consensus Scheduling is the subject of a workshop at CalConnect XXVI next week: https://calconnect.wordpress.com/2012/12/13/calconnect-consensus-scheduling-workshop-january-30-2013-at-calconnect-roundtable-xxvi/[Consensus Scheduling Workshop at CalConnect XXVI]. For more about Consensus Scheduling, see also link:{{'/7_things_consensus_scheduling' | relative_url}}[7 Things You Should Know About Consensus Scheduling]. +Consensus Scheduling is the subject of a workshop at CalConnect XXVI next week: https://calconnect.wordpress.com/2012/12/13/calconnect-consensus-scheduling-workshop-january-30-2013-at-calconnect-roundtable-xxvi/[Consensus Scheduling Workshop at CalConnect XXVI]. For more about Consensus Scheduling, see also link:{{'/resources/7-things-you-should-know-about/consensus-scheduling' | relative_url}}[7 Things You Should Know About Consensus Scheduling]. diff --git a/_posts/2013-05-24-7-things-you-should-know-about-tasks.adoc b/_posts/2013-05-24-7-things-you-should-know-about-tasks.adoc index ab232f6..2fefcb8 100644 --- a/_posts/2013-05-24-7-things-you-should-know-about-tasks.adoc +++ b/_posts/2013-05-24-7-things-you-should-know-about-tasks.adoc @@ -10,7 +10,7 @@ excerpt: The CalConnect TASKS technical committee has just published a new brief == 7 Things You Should Know About Tasks -The CalConnect TASKS technical committee has just published a new briefing document, link:{{'/7_things_tasks' | relative_url}}[7 Things You Should Know About Tasks], intended for a general audience. +The CalConnect TASKS technical committee has just published a new briefing document, link:{{'/resources/7-things-you-should-know-about/tasks' | relative_url}}[7 Things You Should Know About Tasks], intended for a general audience. ____ A "`task`" is a representation of an item of work assigned to an individual or organization. In RFC5545, Internet Calendaring and Scheduling Core Object Specification (iCalendar), these are "`VTODO`" calendar components, groupings of component properties and possibly "`VALARM`" calendar components that represent an action-item or assignment. Tasks (aka VTODO s) have been part of the iCalendar specification since it was adopted in 1998 as RFC 2445. diff --git a/_posts/2013-11-25-calconnect-seeks-assistance-from-travel-industry-technology-experts.adoc b/_posts/2013-11-25-calconnect-seeks-assistance-from-travel-industry-technology-experts.adoc index a29abf7..dfc2d97 100644 --- a/_posts/2013-11-25-calconnect-seeks-assistance-from-travel-industry-technology-experts.adoc +++ b/_posts/2013-11-25-calconnect-seeks-assistance-from-travel-industry-technology-experts.adoc @@ -25,7 +25,7 @@ Therefore, we are forming a working group, a collaboration between the calendari mailto:Dave.Thewlis@calconnect.org[Dave.Thewlis@calconnect.org] + +1 707 840 9391 -For additional background on travel itineraries and calendaring and scheduling see "`7 Things about Digital Travel Itineraries`" at link:{{'/7_things_itineraries' | relative_url}}[]. +For additional background on travel itineraries and calendaring and scheduling see "`7 Things about Digital Travel Itineraries`" at link:{{'/resources/7-things-you-should-know-about/itineraries' | relative_url}}[]. To learn more about becoming a member of CalConnect, see link:{{'/why-join' | relative_url}}[why join]. diff --git a/_posts/2014-02-27-observations-from-calconnect-xxix-in-san-francisco.adoc b/_posts/2014-02-27-observations-from-calconnect-xxix-in-san-francisco.adoc index f3e2c45..50dae15 100644 --- a/_posts/2014-02-27-observations-from-calconnect-xxix-in-san-francisco.adoc +++ b/_posts/2014-02-27-observations-from-calconnect-xxix-in-san-francisco.adoc @@ -55,9 +55,9 @@ _Much of the work in CalConnect is focused on specifications to become internet * link:{{'/ioptestevent28rpt' | relative_url}}[Report on Interoperability Test Event XXIX] -* link:{{'/7_things_itineraries' | relative_url}}[7 Things You Should Know About Digital Travel Itineraries] +* link:{{'/resources/7-things-you-should-know-about/itineraries' | relative_url}}[7 Things You Should Know About Digital Travel Itineraries] -* link:{{'/7_things_tasks' | relative_url}}[7 Things You Should Know About Tasks] +* link:{{'/resources/7-things-you-should-know-about/tasks' | relative_url}}[7 Things You Should Know About Tasks] *Recently updated internet drafts and published RFCs:* diff --git a/_posts/2014-06-24-observations-from-calconnect-xxx-in-dulles-virginia.adoc b/_posts/2014-06-24-observations-from-calconnect-xxx-in-dulles-virginia.adoc index db41e5d..67e227b 100644 --- a/_posts/2014-06-24-observations-from-calconnect-xxx-in-dulles-virginia.adoc +++ b/_posts/2014-06-24-observations-from-calconnect-xxx-in-dulles-virginia.adoc @@ -48,7 +48,7 @@ Much of the work in CalConnect is focused on specifications to be submitted as i * link:{{'/conference30rpt' | relative_url}}[Report on CalConnect Conference XXX] * link:{{'/ioptestevent30rpt' | relative_url}}[Report on Interoperability Test Event XXX] -* link:{{'/7_things_push' | relative_url}}[7 Things You Should Know About PUSH] +* link:{{'/resources/7-things-you-should-know-about/push' | relative_url}}[7 Things You Should Know About PUSH] * link:{{'/starterlistcaldavcarddav' | relative_url}}[Starter List of CalDAV and CardDAV Standards and Specifications] *Recently updated internet drafts and published RFCs:* diff --git a/_posts/2014-10-20-observations-from-calconnect-xxxi-in-bedford-united-kingdom.adoc b/_posts/2014-10-20-observations-from-calconnect-xxxi-in-bedford-united-kingdom.adoc index 33e19f2..478936f 100644 --- a/_posts/2014-10-20-observations-from-calconnect-xxxi-in-bedford-united-kingdom.adoc +++ b/_posts/2014-10-20-observations-from-calconnect-xxxi-in-bedford-united-kingdom.adoc @@ -49,7 +49,7 @@ Much of the work in CalConnect is focused on specifications to be submitted as i *Published documents* : * link:{{'/conference31rpt' | relative_url}}[Report on CalConnect Conference XXXI] -* link:{{'/7_things_api' | relative_url}}[7 Things You Should Know About the Abstract Calendaring API] +* link:{{'/resources/7-things-you-should-know-about/abstract-calendaring-api' | relative_url}}[7 Things You Should Know About the Abstract Calendaring API] * link:{{'/starterlistcaldavcarddav' | relative_url}}[Updated Starter List of CalDAV and CardDAV Standards and Specifications] *CalConnect internet drafts adopted for progression via IETF Working Groups*: diff --git a/_resources/7-things-you-should-know-about.adoc b/_resources/7-things-you-should-know-about.adoc index bcce954..873b757 100644 --- a/_resources/7-things-you-should-know-about.adoc +++ b/_resources/7-things-you-should-know-about.adoc @@ -5,9 +5,9 @@ type: resources --- :page-liquid: -= 7 Things You Should Know About... +== 7 Things You Should Know About... -== General +=== General CalConnect has initiated a new serious of high-level "briefing" documents, modeled on the "7 Things You Should Know About" series @@ -18,7 +18,7 @@ one and why one should care. Our thanks to Educause for the inspiration. Watch this space for new entries; they will be announced as they become available. -== 7 Things You Should Know About The Abstract Calendaring API +=== 7 Things You Should Know About The Abstract Calendaring API * link:{{'/resources/7-things-you-should-know-about/abstract-calendaring-api' | relative_url }}[7 Things You Should Know About The Abstract Calendaring API] @@ -28,7 +28,7 @@ and constraints on the data elements and ways in which they can be created and modified." -== 7 Things You Should Know About Calendar and Contacts Sharing +=== 7 Things You Should Know About Calendar and Contacts Sharing * link:{{'/resources/7-things-you-should-know-about/calendar-and-contacts-sharing' | relative_url }}[7 Things You Should Know About Calendar and Contacts Sharing] @@ -36,7 +36,7 @@ created and modified." calendars and CardDAV address books between users. " -== 7 Things You Should Know About Consensus Scheduling +=== 7 Things You Should Know About Consensus Scheduling * link:{{'/resources/7-things-you-should-know-about/consensus-scheduling' | relative_url }}[7 Things You Should Know About Consensus Scheduling] @@ -51,9 +51,9 @@ they may have to adjust their response for the benefit of the entire group." -== 7 Things You Should Know About Digital Travel Itineraries +=== 7 Things You Should Know About Digital Travel Itineraries -* link:{{'/resources/7-things-you-should-know-about/digital-travel-itineraries' | relative_url }}[7 Things You Should Know About Digital Travel Itineraries] +* link:{{'/resources/7-things-you-should-know-about/itineraries' | relative_url }}[7 Things You Should Know About Digital Travel Itineraries] "Itineraries typically contain information about planned routes, schedules, events and tasks for a trip, often divided up into several @@ -67,7 +67,7 @@ often involve items with a "time-based" element to them, such as when a travel segment is expected to start or end." -== 7 Things You Should Know About PUSH +=== 7 Things You Should Know About PUSH * link:{{'/resources/7-things-you-should-know-about/push' | relative_url }}[7 Things You Should Know About PUSH] @@ -77,7 +77,7 @@ rather than waiting for the client to ask the server about any changes (polling)." -== 7 Things You Should Know About Tasks +=== 7 Things You Should Know About Tasks * link:{{'/resources/7-things-you-should-know-about/tasks' | relative_url }}[7 Things You Should Know About Tasks] From 294f6bd9b8f69f4c4033f0ba539d6617fecd1c4e Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Tue, 31 Dec 2024 19:05:19 +0800 Subject: [PATCH 03/15] fix: TC abstract calendaring API links --- _resources/abstract-calendaring-api.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_resources/abstract-calendaring-api.adoc b/_resources/abstract-calendaring-api.adoc index 2c29254..a7b79cf 100644 --- a/_resources/abstract-calendaring-api.adoc +++ b/_resources/abstract-calendaring-api.adoc @@ -105,7 +105,7 @@ implementations, libraries, and other components. == What needs to be done, and what is CalConnect doing? CalConnect has chartered a Technical Committee, -https://calconnect.github.io/public/charter/charter-TC-API/[TC API] to +link:{{ '/about/technical-committees/tc-api' | relative_url }}[TC API] to define and document a calendaring architecture encompassing the existing calendaring and scheduling standards and protocols, and develop an abstract calendaring API which encompasses all of the major @@ -127,7 +127,7 @@ their product. == Need more information? -* https://calconnect.github.io/public/charter/charter-TC-API/[TC API] +* link:{{ '/about/technical-committees/tc-api' | relative_url }}[TC API] * link:{{'/architectures/Calendaring%20Architecture.pdf' | relative_url }}[Calendaring Service Architecture Diagram] From 0347c1ef6d901919b9800cbaac89d4dbb2b8c930 Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Tue, 31 Dec 2024 19:05:45 +0800 Subject: [PATCH 04/15] fix: breadcrumb links --- _includes/breadcrumbs.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html index 75d2b04..b2d94af 100644 --- a/_includes/breadcrumbs.html +++ b/_includes/breadcrumbs.html @@ -3,7 +3,7 @@ {% assign crumbs = page.url | remove:'/index.html' | split: '/' %} {% if page.collection == 'posts' %} {% comment %} News post-specific logic {% endcomment %} - / News + / News / {{ page.title }} {% else %} {% for crumb in crumbs offset: 1 %} @@ -14,10 +14,14 @@ / {{ page.title }} {% endif %} {% else %} - / {{ - crumb | replace:'-',' ' | remove:'.html' | capitalize }} + {% assign crumb_limit = forloop.index | plus: 1 %} + {% assign crumb_url = '' %} + {% for crumb in crumbs limit: crumb_limit %} + {% assign crumb_url = crumb_url | append: crumb | append: '/' %} + {% endfor %} + / + {{ crumb | replace: '-', ' ' | capitalize }} {% endif %} {% endfor %} {% endif %} - \ No newline at end of file + From 21322e1a9a1687915131a0140047d32c21ac45be Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Tue, 31 Dec 2024 19:05:50 +0800 Subject: [PATCH 05/15] fix: TC links --- _events/calconnect-xlv-june-3-7-2019.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_events/calconnect-xlv-june-3-7-2019.adoc b/_events/calconnect-xlv-june-3-7-2019.adoc index fa1c3b7..acd2bae 100644 --- a/_events/calconnect-xlv-june-3-7-2019.adoc +++ b/_events/calconnect-xlv-june-3-7-2019.adoc @@ -186,7 +186,7 @@ _Discussion on re-establishing TC-USECASE from last event. This session will con | 0945-1030 a| TC-LOCALIZATION + -_TC-LOCALIZATION was initiated following CalConnect XLIII but has not been activated. This session will review the charter discuss moving forward and a program of work. Draft charter: https://calconnect.github.io/public/charter/charter-TC-LOCALIZATION/_ +_TC-LOCALIZATION was initiated following CalConnect XLIII but has not been activated. This session will review the charter discuss moving forward and a program of work. Draft charter: link:{{ '/about/technical-committees/tc-localization' | relative_url }} | 1030-1100 | Break and Refreshments | 1100-1145 From 35128ec6e1b5de4d7c1abc879f0804a1165a17ab Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Tue, 31 Dec 2024 19:05:58 +0800 Subject: [PATCH 06/15] fix: remove `/public` link --- _includes/header.html | 1 - 1 file changed, 1 deletion(-) diff --git a/_includes/header.html b/_includes/header.html index 684360a..c2c103d 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -22,7 +22,6 @@
  • News
  • Resources
  • Contact
    • -
  • Public
    • From 3f287a53bc3998aa88c1730e7859e4bcee658f1b Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Thu, 2 Jan 2025 12:06:31 +0800 Subject: [PATCH 07/15] chore: update workflows --- .github/workflows/build_deploy.yml | 8 ++++---- .github/workflows/links.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml index 32c6a7f..66cba53 100644 --- a/.github/workflows/build_deploy.yml +++ b/.github/workflows/build_deploy.yml @@ -31,12 +31,12 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.2' + ruby-version: '3.3' bundler-cache: true cache-version: 0 # Increment this number if you need to re-download cached gems - name: Setup Pages id: pages - uses: actions/configure-pages@v3 + uses: actions/configure-pages@v5 - name: Build with Jekyll # Outputs to the './_site' directory by default @@ -46,7 +46,7 @@ jobs: - name: Upload artifact # Automatically uploads an artifact from the './_site' directory by default - uses: actions/upload-pages-artifact@v2 + uses: actions/upload-pages-artifact@v3 # Deployment job deploy: @@ -59,4 +59,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v2 + uses: actions/deploy-pages@v4 diff --git a/.github/workflows/links.yml b/.github/workflows/links.yml index f3b0ac6..1a7c196 100644 --- a/.github/workflows/links.yml +++ b/.github/workflows/links.yml @@ -11,11 +11,11 @@ jobs: link_checker: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.1' + ruby-version: '3.3' bundler-cache: true - name: Build site @@ -26,7 +26,7 @@ jobs: - name: Link Checker uses: lycheeverse/lychee-action@v2 with: - args: --verbose --no-progress -- _site/**/*.html + args: --verbose --no-progress -b _site --fallback-extensions html --offline _site/*.html _site/**/*.html fail: true env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} From f6eec3a63db8f38b8fbe764156c895bd0c9188dc Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Thu, 2 Jan 2025 12:06:44 +0800 Subject: [PATCH 08/15] chore: clean up, remove unused pages --- _includes/toc-sidebar.html | 49 -------------------------------------- _layouts/default.html | 2 +- 2 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 _includes/toc-sidebar.html diff --git a/_includes/toc-sidebar.html b/_includes/toc-sidebar.html deleted file mode 100644 index ba1b02f..0000000 --- a/_includes/toc-sidebar.html +++ /dev/null @@ -1,49 +0,0 @@ -{% if page.path contains '_appendixes' %} - {% assign loopPages = site.appendixes | sort: "order" %} -{% else %} - {% assign loopPages = include.pages | sort: "order" %} -{% endif %} - -{% for page in loopPages %} -{% if page.parents contains page.url %}active{% endif %} - {% assign content_size = page.content | strip | size %} - {% if include.currentMainParent == page.mainParent %} - - {% assign pageChilds = page.childs | split:',' %} - {% for pageChild in pageChilds %} - {% assign pageChildStripped = pageChild | downcase | remove: " " %} - {% assign currentPageTitleStripped = currentPageTitle | downcase | remove: " " %} - {% if pageChildStripped == currentPageTitleStripped %} - {% assign activeParent = true %} - {% break %} - {% else %} - {% assign activeParent = false %} - {% endif %} - {% endfor %} - - {% assign subpages = site.pages | where: "parent", page.id | sort: "order" %} -
  • - {% if include.level %} - {% if content_size == 0 %} -
    {{ page.title }}
    - {% else %} - - {{ page.title }} - {% endif %} - {% endif %} - - {% if page.path contains '_appendixes' %} - {% if content_size != 0 %} - {{ page.title }} - {% endif %} - - {% endif %} - - {% if subpages.size > 0 %} -
      - {% include toc-sidebar.html pages=subpages currentMainParent=page.mainParent level="secondary" %} -
    - {% endif %} -
    • - {% endif %} -{% endfor %} diff --git a/_layouts/default.html b/_layouts/default.html index 1389e85..0f58c73 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -9,7 +9,7 @@ {{ content }} {% include footer.html %} - + {% include script.html %} From d66d78194282913d914de9c190ce7ea946e43f53 Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Thu, 2 Jan 2025 12:15:17 +0800 Subject: [PATCH 09/15] fix: links --- _about_pages/liaisons-and-relationships.adoc | 6 +++--- _data/navigation.yml | 2 +- _includes/footer.html | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_about_pages/liaisons-and-relationships.adoc b/_about_pages/liaisons-and-relationships.adoc index 9bf29c9..8a7d198 100644 --- a/_about_pages/liaisons-and-relationships.adoc +++ b/_about_pages/liaisons-and-relationships.adoc @@ -23,9 +23,9 @@ President of CalConnect. [cols="1,1,1", options="header"] |=== -| https://www.iso.org/[image:{{'/assets/images/logo_iso.svg' | relative_url }}[ISO Logo]] -| https://www.m3aawg.org/[image:{{'/assets/images/logo_m3aawg.svg' | relative_url }}[M3AAWG Logo]] -| https://www.oasis-open.org/[image:{{'/assets/images/logo_oasis.svg' | relative_url }}[Oasis Logo]] +| https://www.iso.org/[image:{{'/assets/images/external-logos/logo_iso.svg' | relative_url }}[ISO Logo]] +| https://www.m3aawg.org/[image:{{'/assets/images/external-logos/logo_m3aawg.svg' | relative_url }}[M3AAWG Logo]] +| https://www.oasis-open.org/[image:{{'/assets/images/external-logos/logo_oasis.svg' | relative_url }}[Oasis Logo]] |=== == Internet Engineering Task Force (IETF) diff --git a/_data/navigation.yml b/_data/navigation.yml index ce6094d..f3dbb76 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -151,7 +151,7 @@ resources: - page: Public Discussion Lists url: /resources/discussion-lists - page: Public Review - url: /resources/public-review + url: https://standards.calconnect.org/public-review/ - page: Timezone changes knowledge base url: /resources/timezone-changes - page: Related Blogs diff --git a/_includes/footer.html b/_includes/footer.html index 8c393da..3b01b80 100755 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -44,7 +44,7 @@
  • Membership Benefits
  • Membership Categories and Fees
    • + href="{{'/membership/membership-categories-and-fees' | relative_url }}">Membership Categories and Fees
  • Membership Agreement
  • Code of @@ -52,7 +52,7 @@
  • Membership Application
  • Membership + href="{{'/membership/membership-fee-payment' | relative_url }}">Membership Fee Payment
  • Distinguished Service Award @@ -107,7 +107,7 @@
  • Architectural Diagrams
  • Public Review
    • + href="https://standards.calconnect.org/public-review/">Public Review
  • Presentations
    • From 9c021da5fff436a3d3b71bf22179c46056cd454f Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Thu, 2 Jan 2025 12:15:27 +0800 Subject: [PATCH 10/15] fix: styling names --- _includes/footer.html | 2 +- _sass/main.scss | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 3b01b80..9d08268 100755 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -115,7 +115,7 @@ -
  • Contact
    • +
  • Contact
    • diff --git a/_sass/main.scss b/_sass/main.scss index 94d8162..b1a9522 100644 --- a/_sass/main.scss +++ b/_sass/main.scss @@ -148,11 +148,6 @@ ol.breadcrumb li { #block-submenu a.active { background-color: #f5f5f5; } -#block-submenu li.menu-mlid-662 { - border-top: 1px solid #ccc; - padding: 0.5em 0; - border-bottom: 1px solid #ccc; -} h1.page-header { font-size: 2.2em; padding: 0; @@ -254,7 +249,7 @@ ul.testimonials li:nth-child(even) { #sitemap li li { display: none; } -#sitemap .menu-mlid-396 { +#sitemap .footer-contact { display: none; } body.front h1.page-header, From 9dd2454a45f216a5fc06c0369304508bddc026ed Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Thu, 2 Jan 2025 12:19:15 +0800 Subject: [PATCH 11/15] chore: enable tc-push page, comment out tc-streaming --- _about_pages/technical-committees.adoc | 6 ++-- .../technical-committees/tc-push.adoc | 1 - _data/navigation.yml | 32 +++++++++---------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/_about_pages/technical-committees.adoc b/_about_pages/technical-committees.adoc index 7f27443..fe91e66 100644 --- a/_about_pages/technical-committees.adoc +++ b/_about_pages/technical-committees.adoc @@ -125,11 +125,11 @@ Details: link:{{'/about/technical-committees/tc-sharing/' | relative_url}}[TC-SH Extend the existing caldav-sharing and caldav-notifications specifications to support address books and other resource types. -=== TC-STREAMING: Calendar data streaming +// === TC-STREAMING: Calendar data streaming -Details: link:{{'/about/technical-committees/tc-streaming/' | relative_url}}[TC-STREAMING Charter] +// Details: link:{{'/about/technical-committees/tc-streaming/' | relative_url}}[TC-STREAMING Charter] -Define and document a streaming protocol for calendar data. +// Define and document a streaming protocol for calendar data. === TC-TESTER: Testing framework diff --git a/_about_pages/technical-committees/tc-push.adoc b/_about_pages/technical-committees/tc-push.adoc index 671c736..fc3721b 100644 --- a/_about_pages/technical-committees/tc-push.adoc +++ b/_about_pages/technical-committees/tc-push.adoc @@ -4,7 +4,6 @@ title: CalConnect PUSH Technical Committee type: about permalink: /about/technical-committees/:title order: 11 -published: false --- = CalConnect PUSH Technical Committee diff --git a/_data/navigation.yml b/_data/navigation.yml index f3dbb76..4f09e91 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -13,35 +13,35 @@ about: url: /about/technical-committees subsubfolderitems: - page: TCC Technical Coordination Committee - url: /about/technical-committees/tcc/ + url: /about/technical-committees/tcc - page: TC-API - url: /about/technical-committees/tc-api/ + url: /about/technical-committees/tc-api - page: TC-AUTODISCOVERY - url: /about/technical-committees/tc-autodiscovery/ + url: /about/technical-committees/tc-autodiscovery - page: TC-CALENDAR - url: /about/technical-committees/tc-calendar/ + url: /about/technical-committees/tc-calendar - page: TC-CALSPAM - url: /about/technical-committees/tc-calspam/ + url: /about/technical-committees/tc-calspam - page: TC-CLIENT - url: /about/technical-committees/tc-client/ + url: /about/technical-committees/tc-client - page: TC-DATETIME - url: /about/technical-committees/tc-datetime/ + url: /about/technical-committees/tc-datetime - page: TC-DEVGUIDE - url: /about/technical-committees/tc-devguide/ + url: /about/technical-committees/tc-devguide - page: TC-LOCALIZATION - url: /about/technical-committees/tc-localization/ + url: /about/technical-committees/tc-localization - page: TC-PUBLISH - url: /about/technical-committees/tc-publish/ + url: /about/technical-committees/tc-publish - page: TC-PUSH - url: /about/technical-committees/tc-push/ + url: /about/technical-committees/tc-push - page: TC-SHARING - url: /about/technical-committees/tc-sharing/ - - page: TC-STREAMING - url: /about/technical-committees/tc-streaming/ + url: /about/technical-committees/tc-sharing + # - page: TC-STREAMING + # url: /about/technical-committees/tc-streaming - page: TC-TESTER - url: /about/technical-committees/tc-tester/ + url: /about/technical-committees/tc-tester - page: TC-VCARD - url: /about/technical-committees/tc-vcard/ + url: /about/technical-committees/tc-vcard - page: Closed TCs url: /about/technical-committees/closed-tcs - page: Major Work Projects From ad62756b03c6829f7851a90b2c730ee6049ad58c Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Thu, 2 Jan 2025 12:19:26 +0800 Subject: [PATCH 12/15] fix: fix calconnect hk logos --- .../calconnect-public-day-hong-kong-it-fest.adoc | 4 ++-- .../{logos.png => calconnect-hk-host-logos.png} | Bin 2 files changed, 2 insertions(+), 2 deletions(-) rename assets/images/{logos.png => calconnect-hk-host-logos.png} (100%) diff --git a/_events/calconnect-public-day-hong-kong-it-fest.adoc b/_events/calconnect-public-day-hong-kong-it-fest.adoc index 0264173..aec364f 100644 --- a/_events/calconnect-public-day-hong-kong-it-fest.adoc +++ b/_events/calconnect-public-day-hong-kong-it-fest.adoc @@ -39,7 +39,7 @@ Gary Schwartz, President, https://www.calconnect.org[The Calendaring & Schedulin Ir. Allen Yeung, CIO http://www.ogcio.gov.hk/[OGCIO] + Ronald Tse, CEO, https://www.ribose.com/home[Ribose] -image::/assets/images/ribose_120.jpg[OGCIO, Ribose, CalConnect,744,212] +image::/assets/images/calconnect-hk-host-logos.jpg[OGCIO, Ribose, CalConnect,744,212] [[registration]] == Registration Information @@ -229,7 +229,7 @@ mailto:schwag@rpi.edu[schwag@rpi.edu] ==== Ribose (CalConnect member) -http://www.ribose.com[image::/assets/images/ribose_120.jpg[Ribose Inc.]] +http://www.ribose.com[image::/assets/images/calconnect-hk-host-logos.jpg[Ribose Inc.]] Ribose is an online social collaboration platform that connects you with friends, family, co-workers, and communities in a new way. Our platform lets you focus on the task at hand while keeping you and your team on the same page. diff --git a/assets/images/logos.png b/assets/images/calconnect-hk-host-logos.png similarity index 100% rename from assets/images/logos.png rename to assets/images/calconnect-hk-host-logos.png From 4823f9c43f4f3ee89d41a7459a15bb93be9515cd Mon Sep 17 00:00:00 2001 From: Ronald Tse Date: Thu, 2 Jan 2025 12:19:31 +0800 Subject: [PATCH 13/15] fix: footer styling --- _includes/footer.html | 88 +++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 9d08268..2aec385 100755 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -8,107 +8,107 @@