minor fixes

djangocon · Oct 24, 2023 · 89275be · 89275be
1 parent 501dad1
commit 89275be
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 49 deletions.
diff --git a/Gemfile b/Gemfile
@@ -16,6 +16,7 @@ gem "minima", "~> 2.5"
 # If you have any plugins, put them here!
 group :jekyll_plugins do
   gem "jekyll-feed", "~> 0.12"
+  gem 'jekyll-redirect-from'
 end
 
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -31,3 +32,4 @@ gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
 # Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem
 # do not have a Java counterpart.
 gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]
+
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -33,6 +33,8 @@ GEM
       webrick (~> 1.7)
     jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
+    jekyll-redirect-from (0.16.0)
+      jekyll (>= 3.3, < 5.0)
     jekyll-sass-converter (2.2.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-seo-tag (2.8.0)
@@ -65,12 +67,7 @@ GEM
       ffi (~> 1.9)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    tzinfo (2.0.5)
-      concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.7)
-      tzinfo (>= 1.0.0)
     unicode-display_width (2.3.0)
-    wdm (0.1.1)
     webrick (1.7.0)
 
 PLATFORMS
@@ -83,6 +80,7 @@ DEPENDENCIES
   http_parser.rb (~> 0.6.0)
   jekyll (~> 4.3.1)
   jekyll-feed (~> 0.12)
+  jekyll-redirect-from
   minima (~> 2.5)
   tzinfo (>= 1, < 3)
   tzinfo-data

diff --git a/_config.yml b/_config.yml
@@ -28,6 +28,7 @@ sass:
 
 plugins:
   - jekyll-feed
+  - jekyll-redirect-from
 
 
 collections:  

diff --git a/_data/nav.yml b/_data/nav.yml
@@ -1,8 +1,20 @@
-- name: Home
-  link: /
+# - name: Home
+#   link: /
+
+- name: About
+  link: #
+  sublink:
+    - name: Team
+      link: /team
+    - name: Conduct
+      link: /conduct/
+
+- name: Schedules
+  link: /schedules/
 
 - name: Speakers
   link: /speakers/
+
 # - name: Information
 #   link: #
 #   sublink:
@@ -31,12 +43,11 @@
       link: /grant/
     - name: Status
       link: /grant-status/
-- name: Conduct
-  link: /conduct/
+
+
 - name: News
   link: /news/
-- name: Team
-  link: /team
+
 
 - name: Travellers
   link: #

diff --git a/_data/schedule.yaml b/_data/schedule.yaml
@@ -1,11 +1,11 @@
 - day: 1
   events:
-    - date: "06-11-2023"
+    - date: "07-11-2023"
       time: "8:00"
       event: Introductions
       endtime: "8:30"
 
-    - date: "06-11-2023"
+    - date: "07-11-2023"
       time: "11:00"
       event: Keynote
       speaker: Kojo Idrissa
@@ -19,11 +19,11 @@
       mastodon: "https://fosstodon.org/@kojoidrissa"
       endtime: "12:30"
 
-    - date: "06-11-2023"  
+    - date: "07-11-2023"  
       time: "11:00"
       event: Break
 
-    - date: "06-11-2023"
+    - date: "07-11-2023"
       time: "11:30"
       endtime: ""
       event: Short talk
@@ -37,7 +37,7 @@
       image: eva400.jpg
       description:
 
-    - date: "06-11-2023"
+    - date: "07-11-2023"
       time: "12:00"
       endtime: ""
       event: Short talk
@@ -51,7 +51,7 @@
       image: fuad400.jpg
       description:
 
-    - date: "06-11-2023"
+    - date: "07-11-2023"
       time: "12:30"
       endtime: ""
       event: Short talk
@@ -65,12 +65,12 @@
       mastodon:
       description:
 
-    - date: "06-11-2023"
+    - date: "07-11-2023"
       time: "13:00"
       endtime: ""
       event: Lunch
 
-    - date: "06-11-2023"
+    - date: "07-11-2023"
       time: "14:00"
       endtime: ""
       event: Short talk
@@ -84,7 +84,7 @@
       image: honza400.jpg
       description:
 
-    - date: "06-11-2023"
+    - date: "07-11-2023"
       time: "14:30"
       endtime: ""
       event: Short talk
@@ -98,7 +98,7 @@
       mastodon: "https://mastodon.social/@HotMitmita"
       description:
 
-    - date: "06-11-2023"
+    - date: "07-11-2023"
       time: "15:00"
       endtime: ""
       event: Short talk
@@ -112,12 +112,12 @@
       image: vuyisile400.jpg
       description:
 
-    - date: "06-11-2023"
+    - date: "07-11-2023"
       time: "15:30"
       endtime: ""
       event: Break
 
-    - date: "06-11-2023"
+    - date: "07-11-2023"
       time: "16:00"
       endtime: ""
       event: Long talk
@@ -131,12 +131,12 @@
       image: "sheena400.jpg"
       description:
 
-    - date: "06-11-2023"
+    - date: "07-11-2023"
       time: "16:45"
       endtime: ""
       event: Lighting talks
 
-    - date: "06-11-2023"
+    - date: "07-11-2023"
       time: "17:15"
       endtime: "17:30"
       event: Closing remarks
@@ -149,7 +149,7 @@
       endtime: ""
       event: Introductions
 
-    - date: "07-11-2023"
+    - date: "08-11-2023"
       time: "10:00"
       endtime: ""
       event: Keynote
@@ -289,12 +289,12 @@
 
 - day: 3
   events:
-    - date: "08-11-2023"
+    - date: "09-11-2023"
       time: "9:00"
       endtime: ""
       event: Introductions
 
-    - date: "08-11-2023"
+    - date: "09-11-2023"
       time: "10:00"
       endtime: ""
       event: Keynote
@@ -308,12 +308,12 @@
       twitter: "VeldaKiara"
       description:
 
-    - date: "08-11-2023"
+    - date: "09-11-2023"
       time: "11:00"
       endtime: ""
       event: Break
 
-    - date: "08-11-2023"
+    - date: "09-11-2023"
       time: "11:30"
       endtime: ""
       event: Short talk
@@ -327,7 +327,7 @@
       image: "mariusz400.png"
       description:
 
-    - date: "08-11-2023"
+    - date: "09-11-2023"
       time: "12:00"
       endtime: ""
       event: Short talk
@@ -341,7 +341,7 @@
       image: samweli400.jpg
       description:
 
-    - date: "08-11-2023"
+    - date: "09-11-2023"
       time: "12:30"
       endtime: ""
       event: Short talk
@@ -355,12 +355,12 @@
       image: brayan400.jpg
       description:
 
-    - date: "08-11-2023"
+    - date: "09-11-2023"
       time: "13:00"
       endtime: ""
       event: Lunch
 
-    - date: "08-11-2023"
+    - date: "09-11-2023"
       time: "14:00"
       endtime: ""
       event: Short talk
@@ -374,7 +374,7 @@
       image: "atieno400.jpg"
       description:
 
-    - date: "08-11-2023"
+    - date: "09-11-2023"
       time: "14:30"
       endtime: ""
       event: Short talk
@@ -389,7 +389,7 @@
       description:
 
 
-    - date: "08-11-2023"
+    - date: "09-11-2023"
       time: "15:00"
       endtime: ""
       event: Short talk
@@ -403,13 +403,13 @@
       twitter: "tahaafarooq"
       description:
 
-    - date: "08-11-2023"
+    - date: "09-11-2023"
       time: "15:30"
       endtime: ""
       event: Break
 
 
-    - date: "08-11-2023"
+    - date: "09-11-2023"
       time: "16:00"
       endtime: ""
       event: Long talk
@@ -423,12 +423,12 @@
       image: "daniele400.jpg"
       description:
 
-    - date: "08-11-2023"
+    - date: "09-11-2023"
       time: "16:45"
       endtime: ""
       event: Lighting talks
 
-    - date: "08-11-2023"
+    - date: "09-11-2023"
       time: "17:15"
       endtime: "17:30"
       event: Closing remarks
diff --git a/_includes/home.html b/_includes/home.html
@@ -75,7 +75,7 @@ <h5 class="card-title">Talks</h5>
           </div>
           <div class="card-footer">
             <p class="text-body-secondary">Three days of talks, on programming, technology, careers, society and business, with speakers from across the world. <em>We've confirmed our first speakers, more coming soon.</em></p>
-            <a href="/talks" class="btn btn-primary">Meet some speakers</a>
+            <a href="/speakers" class="btn btn-primary">Meet some speakers</a>
           </div>
         </div>
       </div>

diff --git a/_includes/our-schedules.html b/_includes/our-schedules.html
@@ -31,16 +31,16 @@
 <ul class="nav nav-pills mb-3" id="pills-tab" role="tablist">
     <li class="nav-item" role="presentation">
         <button class="nav-link" id="pills-day-one-tab" data-bs-toggle="pill" data-bs-target="#pills-day-one" type="button"
-            role="tab" aria-controls="pills-day-one" aria-selected="false" data-date="2023-11-06">Talks: Day 1</button>
+            role="tab" aria-controls="pills-day-one" aria-selected="false" data-date="2023-11-07">Talks: Day 1</button>
     </li>
     <li class="nav-item" role="presentation">
         <button class="nav-link" id="pills-day-two-tab" data-bs-toggle="pill" data-bs-target="#pills-day-two"
-            type="button" role="tab" aria-controls="pills-day-two" aria-selected="false" data-date="2023-11-07">Talks:
+            type="button" role="tab" aria-controls="pills-day-two" aria-selected="false" data-date="2023-11-08">Talks:
             Day 2</button>
     </li>
     <li class="nav-item" role="presentation">
         <button class="nav-link" id="pills-day-three-tab" data-bs-toggle="pill" data-bs-target="#pills-day-three"
-            type="button" role="tab" aria-controls="pills-day-three" aria-selected="false" data-date="2023-11-08">Talks:
+            type="button" role="tab" aria-controls="pills-day-three" aria-selected="false" data-date="2023-11-09">Talks:
             Day 3</button>
     </li>
 </ul>
@@ -357,10 +357,10 @@ <h3><strong>{{ event.event }}</strong></h3>
     });
 
 // Tabs activation based on the date
-    var currentDate = new Date();
-    var day = currentDate.getDate();
-    var month = currentDate.getMonth() + 1; 
-    var year = currentDate.getFullYear();
+    var current_date = new Date();
+    var day = current_date.getDate();
+    var month = current_date.getMonth() + 1; 
+    var year = current_date.getFullYear();
 
     // Format the date in YYYY-MM-DD format
     var formattedDate = year + '-' + (month < 10 ? '0' : '') + month + '-' + (day < 10 ? '0' : '') + day;

diff --git a/_pages/schedules.md b/_pages/schedules.md
@@ -1,7 +1,9 @@
 ---
 title: Schedules
 layout: default
-permalink: /talks/schedules/
+permalink: /schedules
+redirect_from:
+  - /talks/schedules/
 ---
 
 Schedules