More slides, and pictures.

diff --git a/antismash_lca2011.html b/antismash_lca2011.html
index f46ffecbc390b62f3479b6a41296ff1881cd8725..afb2ee932245d07fd74ff93049a605e5c28b0805 100644 (file)
--- a/antismash_lca2011.html
+++ b/antismash_lca2011.html
@@ -49,48 +49,70 @@
     Kai Blin<br>
     Division for Microbiology/Biotechnology
   </div>
     Kai Blin<br>
     Division for Microbiology/Biotechnology
   </div>

+  </section>

 
 

-
+  <section class="slide" id="background">
+  <h1>Biological Background</h2>

   </section>
 
   </section>
 

-  <section class="slide" id="overview">
-    <h2>Overview</h2>
-    <ul class="toc">
-      <li>Biological Background</li>
-      <li>Searching for Antibiotics</li>
-      <li>Some Thoughts on Academic Open Source Software Projects</li>
-    </ul>
+  <section class="slide" id="background-definition">
+    <h2>Biotechnology - Definition</h2>
+
+    <blockquote cite="http://www.cbd.int/convention/articles/?a=cbd-02">
+        [...] any <span id="definition-technological">technological application</span>
+        that uses <span id="definition-biological">biological systems, living organisms,
+        or derivatives thereof</span>, to make or modify
+        <span id="definition-products">products or processes</span> for specific use.
+    </blockquote>
+    <cite>The UN Convention on Biological Diversity</cite>
+    <div class="slide" id="background-definition-technological"></div>
+    <div class="slide" id="background-definition-biological"></div>
+    <div class="slide" id="background-definition-products"></div>

   </section>
 
   </section>
 

-  <section class="slide" id="background">
-  <h1>Biological Background</h2>
+
+
+  <section class="slide" id="cell-animation-begin">
+    <h2>Cell</h2>
+    <div id="cell-canvas"></div>
+    <div class="slide" id="cell-animation-factory"></div>

   </section>
 
   </section>
 

-  <section class="slide" id="background-metaphor">
-    <h2>Biotechnology</h2>
+  <section class="slide" id="background-example-beer">
+    <img src="beer.jpg">
+  </section>

 
 

-    <ul>
-      <li class="slide" id="work-with-bacteria">Work with bacteria</li>
-      <li class="slide" id="turn-bacteria-into-factories">Turn them into factories</li>
-    </ul>
+  <section class="slide" id="background-example-insulin">
+    <img src="insulin.jpg">

   </section>
 
   </section>
 

+  <section class="slide" id="bacteria-animation-begin">
+    <h2>Biofactories</h2>
+    <div id="bacteria-canvas"></div>
+    <div class="slide" id="bacteria-animation-grow"></div>
+  </section>

 
 

-  <section class="slide" id="background-metaphor-cell">
-    Cell = Factory
+  <section class="slide" id="background-metaphor-machines">
+    <h2>Enzymes</h2>
+    <ul>
+      <li class="slide" id="enzymes">Chemical Reactions</li>
+      <li class="slide" id="sensors">Sensors</li>
+      <li class="slide" id="regulators">Regulators</li>
+      <li class="slide" id="ribosomes">Ribosomes</li>
+    </ul>

   </section>
 
   </section>
 

-  <section class="slide" id="background-metaphor-protein">
-    Protein = Machine
+  <section class="slide" id="background-metaphor-gene-tools">
+    <img src="tools.jpg">

   </section>
 
   </section>
 

-  <section class="slide" id="background-metaphor-protein">
-    Protein = Machine
+  <section class="slide" id="background-metaphor-gene-blueprint">
+    <img src="blueprint.jpg">

   </section>
 
   <section class="slide" id="background-metaphor-gene">
   </section>
 
   <section class="slide" id="background-metaphor-gene">

-    Gene = Blueprint
-  </section>
+    <h1>Gene</h1>
+  </slide>

 
   <section class="slide" id="background-metaphor-assembly">
     DNA --copy-&gt; mRNA --ribosome-&gt; Protein
 
   <section class="slide" id="background-metaphor-assembly">
     DNA --copy-&gt; mRNA --ribosome-&gt; Protein

diff --git a/antismash_talk.css b/antismash_talk.css
index 9cd3c432bcae5c13a4b5d5e8866cb08b87ec2751..b4e7d74c1ad0917df92544798d79582a95e6c614 100644 (file)
--- a/antismash_talk.css
+++ b/antismash_talk.css
@@ -73,3 +73,23 @@ footer #uni-logo {
   margin-top: 1em;
   margin-bottom: 0em;
 }
   margin-top: 1em;
   margin-bottom: 0em;
 }

+
+#background {
+  background-image: url(bio_background.jpg);
+}
+
+#background > h1 {
+    color: #222;
+}
+
+.on-slide-background-definition-technological #definition-technological {
+    color: #a31b37;
+}
+
+.on-slide-background-definition-biological #definition-biological {
+    color: #a31b37;
+}
+
+.on-slide-background-definition-products #definition-products {
+    color: #a31b37;
+}

diff --git a/antismash_talk.js b/antismash_talk.js
index 0cddda2b8aa512b3df120a9cfcce0e24be8e040b..9c6882cbe61f7622aecefb194356f3919de36f38 100644 (file)
--- a/antismash_talk.js
+++ b/antismash_talk.js
@@ -2,12 +2,38 @@ $(function() {
   // Deck initialization
   $.deck('.slide');
 
   // Deck initialization
   $.deck('.slide');
 

-  $('#style-themes').change(function() {
-    $('#style-theme-link').attr('href', $(this).val());
-  });
-
-  $('#transition-themes').change(function() {
-    $('#transition-theme-link').attr('href', $(this).val());
+  $(document).bind('deck.change', function(event, from, to) {
+    var target = $.deck('getSlide', to);
+    var slide_id = target.attr('id');
+    switch (slide_id) {
+    case "cell-animation-begin":
+      cell_animation_begin();
+      break;
+    case "cell-animation-factory":
+      cell_animation_factory();
+      break;
+    case "bacteria-animation-begin":
+      bacteria_animation_begin();
+      break;
+    case "bacteria-animation-grow":
+      bacteria_animation_grow();
+      break;
+    }

   });
 });
 
   });
 });
 

+function cell_animation_begin() {
+  $('#cell-canvas').text("Picture of a cell here");
+}
+
+function cell_animation_factory() {
+  $('#cell-canvas').text("Look, the cell turned into a factory!");
+}
+
+function bacteria_animation_begin() {
+  $('#bacteria-canvas').text("A single bacterium");
+}
+
+function bacteria_animation_grow() {
+  $('#bacteria-canvas').text("Look, they're growing");
+}

diff --git a/beer.jpg b/beer.jpg
new file mode 100644 (file)
index 0000000..253bc73
Binary files /dev/null and b/beer.jpg differ

diff --git a/bio_background.jpg b/bio_background.jpg
new file mode 100644 (file)
index 0000000..edf5d26
Binary files /dev/null and b/bio_background.jpg differ

diff --git a/blueprint.jpg b/blueprint.jpg
new file mode 100644 (file)
index 0000000..e881813
Binary files /dev/null and b/blueprint.jpg differ

diff --git a/insulin.jpg b/insulin.jpg
new file mode 100644 (file)
index 0000000..ee2ec47
Binary files /dev/null and b/insulin.jpg differ

diff --git a/script.txt b/script.txt
index 7c5bc436e58964cd7f05b0713b0a289c85b21ede..e15e5b14288ec6e2ed42c25c35698beaa886b019 100644 (file)
--- a/script.txt
+++ b/script.txt
@@ -89,4 +89,5 @@ complement strand is trivial. So all you need to store is a (potentially pretty
 long) sequence of As, Ts, Gs and Cs.
 
 
 long) sequence of As, Ts, Gs and Cs.
 
 

+

 (Quip about a graded test at the end of the talk)
 (Quip about a graded test at the end of the talk)

diff --git a/tools.jpg b/tools.jpg
new file mode 100644 (file)
index 0000000..5059b79
Binary files /dev/null and b/tools.jpg differ