2026 calendar

marimo/calendar.html

@@ -19,15 +19,18 @@
             text-align: center;
             width: 85%;
             margin: 0 auto;
+            display: block;
         }
         .week-item {
             margin-bottom: 10px;
             padding: 5px;
             border-left: 3px solid #ddd;
             padding-left: 10px;
+            display: block;
         }
         .week-label {
             font-weight: bold;
+            display: block;
         }
         .intro {
             color: olive;
@@ -44,6 +47,7 @@
         .none {
             color: teal;
             font-weight: bold;
+            margin-top: 5px;
         }
         .due-date {
             color: red;
@@ -54,6 +58,8 @@
         .assessment {
             color: red;
             font-weight: bold;
+            display: block;
+            margin-top: 5px;
         }
         .holiday-list {
             margin-top: 20px;
@@ -65,88 +71,88 @@
     
     <div class="calendar">
         <div class="week-item">
-            <span class="week-label">Week 1 – </span>
-            <span class="intro">Introduction and refresher of statistics</span>
+            <span class="week-label">Week 1 </span>
+            <span class="lab">Introduction and Basic statistics numerical lab</span>
         </div>
         
         <div class="week-item">
-            <span class="week-label">Week 2 – </span>
-            <span class="lab">Basic statistics numerical laboratory</span>
+            <span class="week-label">Week 2 </span>
+            <span class="lab">Basic statistics numerical lab</span>
         </div>
         
         <div class="week-item">
-            <span class="week-label">Week 3 – </span>
-            <span class="drop-in">Drop-in session</span>
+            <span class="week-label">Week 3 </span>
+            <span class="lab">Bomb calobimetry lab</span>
+            <span class="due-date">First lab report due</span>
         </div>
         
         <div class="week-item">
-            <span class="week-label">Week 4 – </span>
-            <span class="lab">Bomb calorimetry numerical laboratory</span>
-            <span class="due-date">First lab report due</span>
+            <span class="week-label">Week 4 </span>
+            <span class="lab">Bomb calorimetry lab</span>
         </div>
         
         <div class="week-item">
-            <span class="week-label">Week 5 – </span>
-            <span class="drop-in">Drop-in session</span>
+            <span class="week-label">Week 5 </span>
+            <span class="drop-in">Lecture + workshop (Chemical potential)</span>
+            <span class="due-date">Second lab report due</span>
         </div>
         
         <div class="week-item">
-            <span class="week-label">Week 6 – </span>
-            <span class="none">No lab</span>
-            <span class="due-date">Second lab report due</span>
+            <span class="week-label">Week 6 </span>
+            <span class="none">No laboratory</span>
+            <span class="assessment">Mid-semester test</span>
         </div>
         
         <div class="week-item">
-            <span class="week-label">Week 7 – </span>
-            <span class="assessment">Progressive assessment</span>
+            <span class="week-label">Week 7 </span>
+            <span style="font-weight: bold;">Public holiday</span>
         </div>
         
         <div class="week-item">
-            <span class="week-label">Week 8 – </span>
-            <span class="lab">Crystal violet numerical laboratory</span>
+            <span class="week-label">Week 8 </span>
+            <span style="font-weight: bold;">Tuition Free Week</span>
         </div>
         
         <div class="week-item">
-            <span class="week-label">Week 9 – </span>
-            <span style="font-weight: bold;">Tuition free week</span>
+            <span class="week-label">Week 9 </span>
+            <span style="font-weight: bold;">Tuition Free Week</span>
         </div>
         
         <div class="week-item">
-            <span class="week-label">Week 10 – </span>
-            <span class="lab">Chemical equilibrium numerical laboratory</span>
-            <span class="due-date">Third lab report due</span>
+            <span class="week-label">Week 10 </span>
+            <span class="lab">Crystal Violet lab</span>
         </div>
         
         <div class="week-item">
-            <span class="week-label">Week 11 – </span>
-            <span class="drop-in">Drop-in session</span>
+            <span class="week-label">Week 11 </span>
+            <span class="lab">Crystal Violet lab</span>
         </div>
         
         <div class="week-item">
-            <span class="week-label">Week 12 – </span>
+            <span class="week-label">Week 12 </span>
             <span class="lab">Surface adsorption numerical laboratory</span>
-            <span class="due-date">Fourth lab report due</span>
+            <span class="due-date">Third lab report due</span>
         </div>
         
         <div class="week-item">
-            <span class="week-label">Week 13 – </span>
-            <span class="drop-in">Drop-in session</span>
+            <span class="week-label">Week 13 </span>
+            <span class="lab">Surface adsorption numerical laboratory</span>
         </div>
         
         <div class="week-item">
-            <span class="week-label">Week 14 – </span>
+            <span class="week-label">Week 14 </span>
             <span class="none">Study week</span>
-            <span class="due-date">Fifth lab report due</span>
+            <span class="due-date">Fourth lab report due</span>
         </div>
     </div>
     
     <h3>Public holidays</h3>
     <ul class="holiday-list">
         <li>2<sup>nd</sup> March – Labour Day</li>
-        <li>18<sup>th</sup> April – Good Friday</li>
-        <li>21<sup>st</sup> April – Easter Monday</li>
-        <li>22<sup>nd</sup> April – Easter Tuesday</li>
-        <li>25<sup>th</sup> April – Anzac Day</li>
+        <li>3<sup>rd</sup> April – Good Friday</li>
+        <li>6<sup>st</sup> April – Easter Monday</li>
+        <li>7<sup>nd</sup> April – Easter Tuesday</li>
+        <li>27<sup>th</sup> April – Anzac Day</li>
     </ul>
 </body>
 </html>

marimo/index.html

@@ -115,23 +115,23 @@
     <div class="lab-grid">
         <a href="/stats" class="lab-card">
             <h3 style="text-align: center">Statistics Lab</h3>
-            <p style="text-align: center">Basic statistical concepts and Python introduction<br>(Week 2)</p>
+            <p style="text-align: center">Basic statistical concepts and Python introduction<br>(Weeks 1-2)</p>
         </a>
         <a href="/bc" class="lab-card">
             <h3 style="text-align: center">Bomb Calorimetry Lab</h3>
-            <p style="text-align: center">Thermodynamics and heat measurements<br>(Week 4)</p>
+            <p style="text-align: center">Thermodynamics and heat measurements<br>(Weeks 3-4)</p>
         </a>
         <a href="/cv" class="lab-card">
             <h3 style="text-align: center">Crystal Violet Lab</h3>
-            <p style="text-align: center">Chemical kinetics and reaction rates<br>(Week 8)</p>
-        </a>
-        <a href="/eq" class="lab-card">
-            <h3 style="text-align: center">Chemical Equilibrium Lab</h3>
-            <p style="text-align: center">Numerical solution of equilibrium problems<br>(Week 10)</p>
+            <p style="text-align: center">Chemical kinetics and reaction rates<br>(Week10-11)</p>
         </a>
         <a href="/surface" class="lab-card">
             <h3 style="text-align: center">Surface Adsorption Lab</h3>
-            <p style="text-align: center">Equilibrium and surface chemistry<br>(Week 12)</p>
+            <p style="text-align: center">Equilibrium and surface chemistry<br>(Weeks 12-13)</p>
+        </a>
+        <a href="/eq" class="lab-card">
+            <h3 style="text-align: center">Chemical Equilibrium Lab</h3>
+            <p style="text-align: center">Numerical solution of equilibrium problems<br></p>
         </a>
     </div>