fix conflict

_config.yml

@@ -47,13 +47,14 @@ navigationLinks:
  - {permalink: "/registration/", text: "Register"}
  #- {permalink: "/news/", text: "News"}
  - {link: "https://forms.gle/5Kc4QUkhibvuopA48", text: "Get involved"}
- - {link: "https://forms.gle/MQAHpunT1aCn7ueRA", text: "Keep me informed"}
+ #- {link: "https://forms.gle/MQAHpunT1aCn7ueRA", text: "Keep me informed"}
  - {permalink: "/schedule/", text: "Schedule"}
  - {permalink: "/speakers/", text: "Speakers"}
- - {permalink: "/sessions/", text: "Sessions"}
+ #- {permalink: "/sessions/", text: "Sessions"}
  - {permalink: "/transport/", text: "Getting here"}
- - {permalink: "/partners/", text: "Partners & Sponsors"}
- - {link: "https://www.linkedin.com/showcase/resbaz-qld", text: "Follow us for updates"}
+ - {permalink: "/dietaries/", text: "Facilities"}
+ - {permalink: "/partners/", text: "Sponsors"}
+ - {link: "https://www.linkedin.com/showcase/resbaz-qld", text: "Updates"}
  - {permalink: "/cod/", text: "Code of Conduct"}
    # bottomNavigationLinks:
   # - {link: "https://forms.gle/5Kc4QUkhibvuopA48", text: "Get involved - volunteer here!"}
@@ -75,7 +76,7 @@ aboutText: "<p>ResBaz is more than a conference - it's a two-day festival of dig
 <p>In 2024, ResBazQld is now in its eighth year!
 In the spirit of a marketplace or bazaar, ResBaz is a highly participatory event where researchers from many different disciplines can learn, share knowledge and skills, and have fun!</p>
 
-<p>Who should attend? Researchers at ALL levels from ALL disciplines. PhD candidates, research masters students and early career researchers are especially encouraged to attend. Research technologists and research software engineers who support researchers to do their job should also come along! Sessions at this year's ResBaz will offer a brief practical introduction to a broad selection of topics and tools related to digital research practice relevant across the disciplines.</p>.
+<p>Who should attend? Researchers at ALL levels from ALL disciplines. PhD candidates, research masters students and early career researchers are especially encouraged to attend. Research technologists and research software engineers who support researchers to do their job should also come along! Sessions at this year's ResBaz will offer a brief practical introduction to a broad selection of topics and tools related to digital research practice relevant across the disciplines.</p>
 
 <p>ACU, Brisbane campus is set in beautiful surrounds and is just 12 km north of the city centre. There is free parking and <a href='https://www.acu.edu.au/locations/brisbane'>public transport opportunities</a>.</p>"
 
@@ -201,11 +202,12 @@ footerBlocks:
   title: "Gold Sponsors"
   links:
    - {link: "https://ardc.edu.au", text: "ARDC", imageUrl: "../img/organizers/ARDC_logo_RGB.png"}
+   - {link: "https://taylorandfrancis.com/", text: "Taylor & Francis", imageUrl: "../img/organizers/TaylorFrancisLogo.png"}
  -    
-#  title: "Silver Sponsor"
-#  links:
-#   #- {link: "https://www.aarnet.edu.au/", text: "AARNet", imageUrl: "../img/organizers/aarnet.png"}
-# -  
+  title: "Silver Sponsor"
+  links:
+   - {link: "https://www.springernature.com/gp", text: "Springer Nature", imageUrl: "../img/organizers/logo-springernature.svgf"}
+ -  
   title: "Collaborating Institutes"
   links:
    - {text: "ACU", description: "ACU", link: "https://www.acu.edu.au/", imageUrl: "../img/organizers/acu_logo_purple.svg"}

_data/organizers.yml

@@ -1,18 +1,23 @@
 -
   group: "Gold Sponsors"
   elements: 
-    - {name: "ARDC", description: "ARDC", link: "https://ardc.edu.au", imageUrl: "../img/organizers/ARDC_logo_RGB.png"}
+    - {description: "ARDC", link: "https://ardc.edu.au", imageUrl: "../img/organizers/ARDC_logo_RGB.png"}
+    - {link: "https://taylorandfrancis.com/", imageUrl: "../img/organizers/TaylorFrancisLogo.png"}
+-
+  group: "Silver Sponsors"
+  elements: 
+    - {description: "Springer Nature", link: "https://www.springernature.com/gp", imageUrl: "../img/organizers/logo-springernature.svg"}
 -
   group: "Main organisers"
   elements: 
-   - {name: "QCIF", description: "Queensland Cyber Infrastructure Foundation", link: "https://www.qcif.edu.au/", imageUrl: "../img/organizers/QCIF_Logo_Master.png", width: "120px"}
-   - {name: "ACU", description: "ACU", link: "https://www.acu.edu.au/", imageUrl: "../img/organizers/acu_logo_purple.svg"} 
+   - {description: "QCIF",  link: "https://www.qcif.edu.au/", imageUrl: "../img/organizers/QCIF_Logo_Master.png", width: "120px"}
+   - {description: "ACU",  link: "https://www.acu.edu.au/", imageUrl: "../img/organizers/acu_logo_purple.svg"} 
 -
   group: "Co-organisers"
   elements: 
-   - {name: "The University of Queensland", description: "UQ", link: "https://www.uq.edu.au/", imageUrl: "../img/organizers/uq.jpg"}
-   - {name: "QCIF", description: "QCIF", link: "https://www.qcif.edu.au/", imageUrl: "../img/organizers/QCIF_Logo_Master.png"}
-   - {name: "Griffith University", description: "Griffith University", link: "griffith.edu.au",  imageUrl: "../img/organizers/GU.gif"}
-   - {name: "QUT", description: "QUT", link: "https://www.qut.edu.au/", imageUrl: "../img/organizers/QUT.gif"}
-   - {name: "UniSC", description: "Sunshine Coast Uni", link: "https://www.usc.edu.au/", imageUrl: "../img/organizers/USC_Name.PNG"}
+   - {description: "The University of Queensland", link: "https://www.uq.edu.au/", imageUrl: "../img/organizers/uq.jpg"}
+   - {description: "QCIF", link: "https://www.qcif.edu.au/", imageUrl: "../img/organizers/QCIF_Logo_Master.png"}
+   - {description: "Griffith University", link: "griffith.edu.au",  imageUrl: "../img/organizers/GU.gif"}
+   - {description: "QUT", link: "https://www.qut.edu.au/", imageUrl: "../img/organizers/QUT.gif"}
+   - {description: "UniSC", link: "https://www.usc.edu.au/", imageUrl: "../img/organizers/USC_Name.PNG"}
 -

_data/sessions.yml

@@ -6,22 +6,22 @@
   hidden: true
   description: null  
 -
-  title: Registration
+  title: Registration - Building 216, Level 1 (ground floor), Room 18 - Enter through the Library.
   themes: []
   id: 001
   speakers: 
   hidden: true
-  description: null  
+  description:   
 -
-  title: Morning tea
+  title: Morning tea - Building 216, Level 1 (ground floor), Room 18 - Enter through the Library.
   themes: []
   id: 002 
   speakers: 
   service: true
   hidden: true
   description: null
 -
-  title: Afternoon tea
+  title: Afternoon tea - Building 216, Level 1 (ground floor), Room 18 - Enter through the Library.
   themes: []
   id: 003
   speakers:
@@ -30,7 +30,7 @@
   hidden: true
   description: null
 -
-  title: Lunch and Stalls
+  title: Lunch and Stalls - Building 216, Level 1 (ground floor), Room 18 - Enter through the Library.
   themes: []
   id: 004
   speakers:
@@ -150,7 +150,7 @@
   hidden: false
   description: The workshop will cover the use of LLM to process data qualitatively as well as perform extractive reasoning on the data. LLM Summarisation of data and outputs is also discussed. The objective of the workshop is to demonstrate the usefulness of LLM to accelerate research outputs and discovery when working with research data. We will discuss the benefits and limitations as well as the considerations that need to be made with data and data processing. There will be a practical demonstration of the processing of some data drawn from various sources such as Reddit, YouTube and NewsTalk. 
 -
-  title: Demystifying AI for Research  
+  title: Demystifying AI for Research (Booked out) 
   themes: []
   id: 2008
   speakers: [206]
@@ -359,7 +359,7 @@
   title: "R Shiny essentials: from data to interactive dashboards"
   themes: []
   id: 2026
-  speakers: [216,217]
+  speakers: [216]
   subtype: Workshop
   service:
   hidden: false
@@ -373,4 +373,4 @@
   service:
   hidden: false
   description: 
--
+-

_includes/about.html

@@ -1,7 +1,7 @@
 <!-- About Section -->
 <section id="about" class="about">
     <div class="content-wrapper">
-       <!--  <div class="col-lg-8 col-lg-offset-2"> -->
+         <div class="col-lg-8 col-lg-offset-2"> 
             <h3>{{ site.aboutTitle }}</h3>
             <div class="row about-details">
                 {% assign animationDelay = 0 %}
@@ -17,14 +17,11 @@ <h5>{{ site.aboutSubtitle }}</h5>
 <br><br><br>
 
        <!--  </div> -->
-    </div>
+    </div></section><section>
     <div>
         <a href="https://docs.google.com/forms/d/e/1FAIpQLSdC0yPGVLhDgFsCPHGhJqCk_4W3SjP5DP1AkuqEaEaESlJj5w/viewform"><button type="button" class="btn btn-primary"><h6>Register</h6></button></a><br><br>
-        <a href="https://forms.gle/5Kc4QUkhibvuopA48"><button type="button" class="btn btn-primary"><h6>Host a presentation, stall or social event</h6></button></a><br><br>
-        <a href="https://forms.gle/vC5aW9msmL8MByKX8"><button type="button" class="btn btn-primary"><h6>Host a workshop</h6></button></a><br><br>
         <a href="https://forms.gle/5Kc4QUkhibvuopA48"><button type="button" class="btn btn-primary"><h6>Volunteer to be a helper</h6></button></a><br><br>
         <a href="https://forms.gle/5Kc4QUkhibvuopA48"><button type="button" class="btn btn-primary"><h6>Interested in being a sponsor?</h6></button></a><br><br>
-        <a href="https://forms.gle/GXbJfxi3DgWdwSeMA"><button type="button" class="btn btn-primary"><h6>Keep Me Informed</h6></button></a>
     </div>
 </section>
 <!-- End About Section -->

dietaries.html

@@ -0,0 +1,37 @@
+---
+layout: default
+title: Facilities, Catering and Cultural
+permalink: /dietaries/
+modal: all
+image: Wattle_ResbazQld_NathCampus.jpg
+---
+
+ {% include top-section.html %}
+<section>
+ <table width=70% style="margin-left:auto;margin-right:auto;"><tr><td>
+   <br><br>
+   <p> While we endevour to meet all dietary needs, we would like to be open with what we're offering to ensure you can make your best decisions regarding any diet, cultural or personal needs. </p>
+   <br><br>
+   <h4>Morning and Afternoon tea</h4>
+   <br><br>
+   <p>We will provide a selection of light morning and afternoon refreshments, including fruit, muesli bars, and assorted snacks. For those with larger appetites, we recommend bringing additional food. 
+   <br>
+   Tea and coffee will be available, along with numerous water refill stations. We encourage you to bring a reusable water bottle or keep cup to support our sustainability initiatives.</p>
+   <br>
+   <br>
+
+   <h4>Lunch</h4>
+   <p>For lunches, we will have available 
+   <br>- Sandwiches, including vegetarian sandwiches
+   <br>- Pizza including gluten free, vegan and vegetarian pizza from Domino's (details <a href="https://www.dominos.com.au/landing-pages/frequently-asked-questions">on ingredients here</a>)
+   <br>- Subs from Red Rooster (who have information about their <a href="https://www.redrooster.com.au/faq/">halal certified chicken and practices here</a>)
+   <br><br>
+   For those where this may not fit your dietary needs, we suggest bringing in your lunch. Food purchasing options are also available as below.
+   <br><br></p>
+   <br><br><h4>Food Purchasing options</h4>
+   <p>A cafe is located at building 205 on the<a href="https://www.acu.edu.au/locations/brisbane/brisbane-campus-map"> campus map.</a></p>
+   <br><br>
+   <h4>Prayer space</h4>
+   <p>A Multifaith room is available on campus, located at 208 G on the<a href="https://www.acu.edu.au/locations/brisbane/brisbane-campus-map"> campus map</a>.</p>
+ </td></tr></table>
+</section>

registration.html

@@ -21,6 +21,7 @@
         </div>
     </div></a>
 </section>
+<section>
 <br><br><br>
 <h4><b>
     Who can register?