Clean layouts

.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

.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}}

_about_pages/definitions.adoc

@@ -26,7 +26,7 @@ consists of up to seven elected  Directors which may be but need not be
 representatives of CalConnect Members. The Board is responsible for the
 governance of The Calendaring and Scheduling Consortium, Inc. (that is, the
 corporation itself) in accordance with the
-link:{{'/docs/bylaws.pdf' | relative_url}}[Bylaws].
+link:{{'/policies' | relative_url}}[Bylaws].
 
 [#BOF]
 == BOF
@@ -62,7 +62,7 @@ CalConnect Conferences are where link:#PC[Provisional Committees] report on
 their findings and where link:#TC[Technical Committees] report on their work,
 hold discussions and resolve outstanding issues. Conferences also provide an
 opportunity to foster new work and ideas through BOFs and Workshops, and a
-general plenary session. See link:{{'/conferences' | relative_url }}[CalConnect Conferences] for more
+general plenary session. See link:{{'/events/conferences' | relative_url }}[CalConnect Conferences] for more
 information.
 
 [#Consortium]
@@ -93,7 +93,7 @@ the member when necessary.
 
 == Observer
 
-An link:{{'/events/events-activities/observers' | relative_url }}[Observer] is an individual
+An link:{{'/events/observers' | relative_url }}[Observer] is an individual
 from a non-member who is attending a link:#Conference[CalConnect
 Conference] to determine whether or not his or her organization should
 become a link:#Member[member]. An organization may send one or more

_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.png' | 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)

_about_pages/policies.adoc

@@ -14,13 +14,13 @@ The Articles of Incorporation of The Calendaring and Scheduling Consortium, inco
 
 == Bylaws
 
-Details: link:{{'/docs/corporate/TCSC%20Bylaws%20Revision%209%202020-02-21.pdf' | relative_url }}[Bylaws]
+Details: link:{{'/docs/corporate/TCSC Bylaws Revision 9 2020-02-21.pdf' | relative_url }}[Bylaws]
 
 The Bylaws of The Calendaring and Scheduling Consortium, adopted February 27, 2004; amended May 16, 2005, April 4, 2008, July 25, 2008, July 9, 2010, April 11, 2014, August 8, 2014, April 14, 2017, November 15, 2019, and February 21, 2020.
 
 == Intellectual property rights policy
 
-Details: link:{{'/about/policies/ipr-policy' | relative_url }}[Intellectual Property Rights Policy]
+Details: link:{{'/about/policies/intellectual-property-rights-policy' | relative_url }}[Intellectual Property Rights Policy]
 
 Intellectual Property Rights policy.
 

_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*]

_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)*]

_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)*]

_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)*]
+Details: link:{{'/resources/7-things-you-should-know-about/tasks' | relative_url }}[*Tasks (VTODOs)*]

_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
 

_about_pages/technical-committees/closed-tcs.adoc

@@ -127,15 +127,7 @@ In 2017, TC-RESOURCE was closed and responsibility for its outstanding specifica
 
 == TC-TASKS
 
-TC-TASKS was chartered to extend the functionality of the iCalendar and specifically VTODO object model to provide enhanced support for tasks including needs such as project management, smart power grids and business task scheduling, in a way that allows a calendaring system to manage the data and calendaring clients to display and change it.
-
-The approach taken was to survey existing task management standards in particular WS-HumanTask and WS-Calendar and to incorporate elements from these into the iCalendar standards which are required for the communication of task scheduling information and execution of tasks by a participant.
-
-A number of areas were identified for extension and identified within the scope section of this document. The extensions deal principally with the Object Model and not the API or Protocol for operating on tasks. It was not the aim of this committee to replicate or subsume the definition, sequencing or co-ordination of tasks best performed by a project management, workforce or process management technologies but to provide a calendaring based platform for communication of tasks with task performers.
-
-The Technical Committee produced a Task Architecture[Task Architecture] which was published by CalConnect, and a Tasks Extensions to iCalendar specification currently at the IETF.
-
-In 2017 TC-TASKS was closed and responsibility for its outstanding specification at the IETF transferred to TC-CALENDAR.
+See {{'/about/technical-committees/tc-tasks' | relative_url}}[TC-TASKS].
 
 == TC-TIMEZONE (original and reactivation)
 

_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

_about_pages/technical-committees/tc-tasks.adoc

@@ -0,0 +1,51 @@
+---
+layout: page
+title: CalConnect TASKS Technical Committee
+type: about
+permalink: /about/technical-committees/:title
+order: 16
+---
+
+= CalConnect TASKS Technical Committee
+
+== Charter
+
+TC-TASKS was chartered to extend the functionality of the iCalendar and
+specifically VTODO object model to provide enhanced support for tasks including
+needs such as project management, smart power grids and business task
+scheduling, in a way that allows a calendaring system to manage the data and
+calendaring clients to display and change it.
+
+The approach taken was to survey existing task management standards in
+particular WS-HumanTask and WS-Calendar and to incorporate elements from these
+into the iCalendar standards which are required for the communication of task
+scheduling information and execution of tasks by a participant.
+
+A number of areas were identified for extension and identified within the scope
+section of this document. The extensions deal principally with the Object Model
+and not the API or Protocol for operating on tasks. It was not the aim of this
+committee to replicate or subsume the definition, sequencing or co-ordination of
+tasks best performed by a project management, workforce or process management
+technologies but to provide a calendaring based platform for communication of
+tasks with task performers.
+
+The Technical Committee produced a Task Architecture which was published by
+CalConnect, and a Tasks Extensions to iCalendar specification currently at the
+IETF.
+
+== Out of Scope
+
+-
+
+== Deliverables
+
+== Begin and End Dates
+
+* *Begin:* 2013-02-11
+* *End:* 2017
+
+In 2017 TC-TASKS was closed and responsibility for its outstanding specification
+at the IETF transferred to TC-CALENDAR.
+
+== Milestones and Work Products
+

_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
@@ -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

_event_pages/about-events.adoc

@@ -33,8 +33,8 @@ conference, or as a completely separeate event; testing is now
 incorporated into the regular CalConnect Conferences and is generally
 not a separate event.
 
-A non-member may be an link:{{'/observer' | relative_url }}[Observer] at a single
-CalConnect Conference to determine whether they wish to join.
+A non-member may be an link:{{'/events/observers' | relative_url }}[Observer] at
+a single CalConnect Conference to determine whether they wish to join.
 
 Logistics information for each coming event is provided as early as
 possible after a prospective host agrees to a location and dates.  As

_event_pages/conferences.adoc

@@ -17,7 +17,7 @@ venue. Registration for the Conference is first-come, first-served.
 Although attendance at CalConnect Conferences is generally limited to
 CalConnect member representatives, a prospective member may send one or
 more
-link:{{'/events/events-activities/observers' | relative_url }}[Observers]
+link:{{'/events/observers' | relative_url }}[Observers]
 to a single Conference to determine whether or not it wishes to join.
 Observers pay the same registration fee as regular participants and may
 participate in all Conference activities, but may not vote.

_event_pages/events-activities.adoc

@@ -23,29 +23,29 @@ public.
 
 === CalConnect Conferences
 
-* link:{{'/conferences' | relative_url }}[*CalConnect Conferences*]
+* link:{{'/events/conferences' | relative_url }}[*CalConnect Conferences*]
 Specific information about upcoming Conferences can be found at
 
 * link:{{'/events' | relative_url }}[Future Events]; generally the sessions and abstracts are
 available several weeks before each event on the event web page. The
 event pages for past events can be found at
 link:{{'/events/past-events' | relative_url }}[Past Events]. Reports on past events may be
-found at link:{{'/events/events/event-reports' | relative_url }}[Event Reports]
+found at link:{{'/events/event-reports' | relative_url }}[Event Reports]
 or the https://standards.calconnect.org/[Standards Repository/Document
 Register].
 
-* link:{{'/conferencefees' | relative_url }}[*Conference Fees*]
+* link:{{'/events/conference-fees' | relative_url }}[*Conference Fees*]
 Conference Registration Fees.
 
-* link:{{'/conferencereg' | relative_url }}[*Conference Registration*]
+* link:{{'/events/event-registration-payment' | relative_url }}[*Conference Registration*]
 The Registration form for the upcoming Conference. This form is used for
 both member representatives and for observers.
 
 
 === Other CalConnect Activities
 
 The technical work of CalConnect is largely done by
-link:{{'/about/technical-committees/tcs-active' | relative_url }}[Technical Committees].
+link:{{'/about/technical-committees' | relative_url }}[Technical Committees].
 
 Any member of CalConnect may propose a Technical Committee, and nominate
 an individual to Chair the TC if it is approved. Approval of a new

_event_pages/past-events.html

@@ -15,7 +15,7 @@ <h2>Past Events</h2>
     <div class="views-field views-field-field-image">
       <div class="field-content">
         <a href="{{event.url | relative_url }}">
-          <img typeof="foaf:Image" class="img-responsive" src="{{event.image | relative_url}}" width="557" height="300"
+          <img typeof="foaf:Image" class="img-responsive" src="{{event.image | relative_url}}"
             alt="Event Image">
         </a>
       </div>

_events/calconnect-calendarfest-2021.adoc

@@ -9,7 +9,7 @@ image: /assets/images/CalConnectEventTBD.jpg
 
 == CalConnect CalendarFest 2021 📆🎉 (Autumn 2021)
 
-image::{{'/assets/images/CalConnectEventTBD.jpg' | relative_url }}[CalConnect Virtual Conference Spring 2022,800,530]
+image::{{'/assets/images/CalConnectEventTBD.jpg' | relative_url }}[CalConnect Virtual Conference Spring 2022]
 
 CalendarFest is a novel (virtual) event, which wants to let users and developers
 of (electronic) calendar applications, servers, and related groupware systems,
@@ -28,7 +28,7 @@ current topics in electronic calendaring from different perspectives.
 [[registration]]
 == Participation
 
-Participation at CalendarFest will be free for presenters of accepted talks. Other participants need to link:{{'/news/2021-09-02-registration-open-october-2021-calconnect-virtual-conference' | relative_url}}[register] for a small organizational fee, which also allows for participation at the  “colocated” CalConnect Virtual Conference.
+Participation at CalendarFest will be free for presenters of accepted talks. Other participants need to link:{{'/news/2021-09-02-registration-is-open-for-the-october-2021-calconnect-virtual-conference' | relative_url}}[register] for a small organizational fee, which also allows for participation at the  “colocated” CalConnect Virtual Conference.
 
 
 [[location]]

_events/calconnect-nottingham-spring-2022.adoc

@@ -9,7 +9,7 @@ image: /assets/images/nottingham.jpg
 
 == CalConnect Nottingham 2022, November, 2022, Hosted By Cronofy
 
-image::{{'/assets/images/nottingham.jpg' | relative_url }}[Nottingham, U.K.,750,404]
+image::{{'/assets/images/nottingham.jpg' | relative_url }}[Nottingham, U.K.]
 
 Monday, November 14, 2022 to Wednesday, November 16, 2022
 
@@ -101,7 +101,7 @@ Rental Cars and Taxis: All airports have rental car facilities and taxis availab
 [[lodging]]
 == Lodging
 
-At this time, the conference hotel is the https://all.accor.com/hotel/8061/index.en.shtml[Mercure Nottingham City Centre George Hotel], 2 George Street, Nottingham NG1 3BP United Kingdom Tel: +441159853600, Fax: (+44)115/9599777, There is no corporate rate, so book directly with the hotel via the webite. This hotel has a restaurant and bar.
+At this time, the conference hotel is the https://all.accor.com/hotel/8061/index.en[Mercure Nottingham City Centre George Hotel], 2 George Street, Nottingham NG1 3BP United Kingdom Tel: +441159853600, Fax: (+44)115/9599777, There is no corporate rate, so book directly with the hotel via the webite. This hotel has a restaurant and bar.
 
 One alternative is the https://www3.hilton.com/en/hotels/united-kingdom/hilton-nottingham-EMANOHN/index.html[Nottingham Hilton], Milton Street, Nottingham, NG1 3PZ, United Kingdom TEL: +44-115-934-9700 FAX: +44-115-934-9711. There is no corporate rate, so book directly with the hotel via the website.
 
@@ -114,7 +114,7 @@ There are a variety of other hotels iin the same area.
 
 === CalConnect Nottingham 2022
 
-_This schedule will be updated as new information and new sessions are added.  Please check periodically for changes and additions.‚ The event calendar will be activated closer to the event.‚_
+_This schedule will be updated as new information and new sessions are added.  Please check periodically for changes and additions. The event calendar will be activated closer to the event.‚_
 
 All times shown are UK local time