Merge branch 'master' of https://github.com/Leitet/Lecture-OER

Leitet · Oct 24, 2014 · 5185d77 · 5185d77
2 parents 9f42c56 + 04a8b52
commit 5185d77
Showing 1 changed file with 67 additions and 39 deletions.
diff --git a/index.html b/index.html
@@ -75,10 +75,10 @@ <h3 class="dark">campus/distans sedan 2002</h3>
   <slide class="fill nobackground" style="background-image: url(images/oerstockholm/road.jpg)">
     <hgroup>
       <h2 class="white">Vår resa</h2>
-      
+
     </hgroup>
-    
-    <footer class="source dark right"><a href="http://www.flickr.com/photos/72213316@N00/">http://www.flickr.com/photos/72213316@N00/</a></footer>   
+
+    <footer class="source dark right"><a href="http://www.flickr.com/photos/72213316@N00/">http://www.flickr.com/photos/72213316@N00/</a></footer>
     <aside class="note">
       <ul>
         <li>Egenskriven kursplattform</li>
@@ -92,13 +92,13 @@ <h2 class="white">Vår resa</h2>
       <ul>
         <li>Ett lärarkollegie som är med på notera</li>
       </ul>
-    </aside> 
+    </aside>
   </slide>
 
   <slide class="fill nobackground" style="background-image: url(images/oerstockholm/moodle.png);">
-    
+
   </slide>
-  
+
   <slide class="fill nobackground" style="background-image: url(images/oerstockholm/closed.jpg)">
     <hgroup class="box-white right">
       <h2 class="dark">Stängt för studenter</h2>
@@ -129,14 +129,14 @@ <h2 class="dark white">"Jaha! Så det är en MOOC?"</h2>
           <li></li>
 
        </ul>
-     </aside>    
+     </aside>
   </slide>
-  
+
   <slide class="fill nobackground" style="background-image: url(images/oerstockholm/wp1_transparent.png);">
     <article class="flexbox vcenter">
 
       <img src="images/oerstockholm/wordpress.png" style="background: #FFF;" class="reflect center shadow" alt="Description" title="Description">
-    
+
     </article>
 
     <aside class="note">
@@ -154,7 +154,7 @@ <h2 class="dark white">"Jaha! Så det är en MOOC?"</h2>
     <article class="flexbox vcenter">
 
       <img src="images/oerstockholm/seo.png" class="reflect center shadow" alt="Description" title="Description">
-    
+
     </article>
   </slide>
 
@@ -165,7 +165,7 @@ <h2>Ledord</h2>
     <article class="flexbox vcenter">
 
      "En öppen utbildning"
-    
+
     </article>
   </slide>
 
@@ -184,21 +184,21 @@ <h2>Ledord</h2>
     </aside>
 
   </slide>
-  
-  <slide class="fill nobackground" style="background-image: url(images/oerstockholm/forward.jpg);">  
+
+  <slide class="fill nobackground" style="background-image: url(images/oerstockholm/forward.jpg);">
     <article>
       <h2 class="white">Positiva effekter?</h2>
- 
-    
+
+
     </article>
     <footer class="source dark right"><a href="http://www.flickr.com/photos/b-tal/">http://www.flickr.com/photos/b-tal/</a></footer>
   </slide>
-    
+
   <slide class="fill nobackground" style="background-image: url(images/oerstockholm/students.jpg)">
     <hgroup>
       <h2 class="white">Ökat söktryck (?)</h2>
     </hgroup>
-    
+
     <article class="flexbox vcenter">
       <img src="images/oerstockholm/chart.png" class="center" alt="Description" title="Description" style="" />
     </article>
@@ -210,7 +210,7 @@ <h2 class="white">Ökat söktryck (?)</h2>
       <h2 class="white">Ökad insyn, högre kvalité (?)</h2>
     </hgroup>
     <footer class="source dark right"><a href="http://www.flickr.com/photos/klean-dk/5732678091/sizes/l/">http://www.flickr.com/photos/klean-dk/</a></footer>
-    
+
   </slide>
 
   <slide class="fill nobackground" style="background-image: url(images/oerstockholm/samverkan.jpg)">
@@ -271,7 +271,7 @@ <h2 class="dark">Samarbete över gränserna</h2>
 ">https://www.flickr.com/photos/tvoe/
 </a></footer>
   </slide>
-  
+
   <slide class="fill nobackground" style="background-image: url(images/oerstockholm/fun.jpg)">
     <hgroup>
       <h2 class="white">Roligt!</h2>
@@ -286,7 +286,7 @@ <h2>Reaktioner?</h2>
     <article class="flexbox vcenter">
 
       <img src="images/oerstockholm/tweet.png" class="reflect center shadow" alt="Description" title="Description">
-    
+
     </article>
   </slide>
 
@@ -329,23 +329,51 @@ <h2>Webbprogrammerare.se - En "öppen" utbildning</h2>
     <article class="vleft">
       <hgroup class="flexbox  auto-fadein">
         <br /><br /><br /><br /><br /><h2>Frågor?</h2>
-       
+
       </hgroup>
       <p class="auto-fadein box-white" data-config-contact>
         <!-- populated from slide_config.json -->
       </p>
-      
+
     </article>
-
-    <footer class="source dark right">Foto: Nisse Nilsson</a></footer>    
+
+    <footer class="source dark right">Foto: Nisse Nilsson</a></footer>
+  </slide>
+
+  <slide class="fill nobackground" style="">
+    <hgroup>
+      <h2 class="dark">Nästa gång!</h2>
+      <p style="margin-top: 100px;">
+        <h3>Wikipediaprojektet och IKT-stöd på fakulteten</h3>
+
+      </p>
+      <p>
+         <strong>Tid och plats:</strong><br /> 7/11 klockan 10.00. Sal ny105, Kalmar nyckel alt. via Adobe Connect
+       </p>
+      <p style="margin-top: 50px;">
+        Mer information:<br />
+        <a href="http://thajo.github.io/pedagogiskt_seminarium/">http://thajo.github.io/pedagogiskt_seminarium/</a>
+      </p>
+    </hgroup>
+     <footer class="source dark right"></footer>
+
+     <aside class="note">
+       <ul>
+         <li>Hur hitta resurserna?</li>
+         <li>Svårt att avgöra kvaliten</li>
+         <li>Inget system för sammarbete</li>
+         <li>Svårt att återföra, reuse</li>
+       </ul>
+     </aside>
+
   </slide>
 
   <slide class="fill nobackground" style="background-image: url(images/opencourse.jpg)">
     <hgroup>
       <h2 class="dark">Open Source?</h2>
     </hgroup>
      <footer class="source dark right"><a href="http://www.flickr.com/photos/marcwathieu/">http://www.flickr.com/photos/marcwathieu/</a></footer>
-    
+
      <aside class="note">
        <ul>
          <li>Hur hitta resurserna?</li>
@@ -361,17 +389,17 @@ <h2 class="dark">Open Source?</h2>
   <slide class="nobackground">
     <article class="flexbox vcenter auto-fadein">
 
-      
+
       <img src="images/oerstockholm/GitHub_Logo.png" class="reflect center" alt="Description" title="Description">
-      <footer class="source right"><a href="https://github.com/">https://github.com/</a></footer> 
+      <footer class="source right"><a href="https://github.com/">https://github.com/</a></footer>
+
 
-
     </article>
   </slide>
 
   <slide class="nobackground" style="background-color: #000;">
     <iframe width="780" height="439" src="https://www.youtube.com/embed/r0ji8FDNTj0" frameborder="0" allowfullscreen style="border: 0px;"></iframe>
-    <footer class="source right"><a href="http://www.youtube.com/watch?v=r0ji8FDNTj0">http://www.youtube.com/watch?v=r0ji8FDNTj0</a></footer>    
+    <footer class="source right"><a href="http://www.youtube.com/watch?v=r0ji8FDNTj0">http://www.youtube.com/watch?v=r0ji8FDNTj0</a></footer>
   </slide>
 
   <slide class="nobackground">
@@ -381,12 +409,12 @@ <h2>Forkning</h2>
     <article class="flexbox vcenter">
 
       <img src="images/oerstockholm/fork.gif" class="reflect center" alt="Description" title="Description">
-    
+
     </article>
   </slide>
 
   <slide class="fill nobackground" style="background-image: url(images/oerstockholm/gh_leitet.png)">
-  
+
   </slide>
 
   <slide  class="fill nobackground" style="background-image: url(images/oerstockholm/gh_leitet_transparent.png)">
@@ -396,31 +424,31 @@ <h2>Forkning</h2>
   </slide>
 
   <slide class="fill nobackground" style="background-image: url(images/oerstockholm/gh_crockford.png)">
-     
+
   </slide>
 
   <slide class="fill nobackground" style="background-image: url(images/oerstockholm/keyboard.jpg)">
     <article class="flexbox vcenter auto-fadein">
       <img src="images/oerstockholm/cp_gh1.png" class="reflect center" alt="Description" title="Description">
     </article>
-  
-    <footer class="source right"><a href="http://www.flickr.com/photos/donsolo/2462966749/sizes/l/">http://www.flickr.com/photos/donsolo/</a></footer> 
+
+    <footer class="source right"><a href="http://www.flickr.com/photos/donsolo/2462966749/sizes/l/">http://www.flickr.com/photos/donsolo/</a></footer>
   </slide>
-  
+
   <slide class="fill nobackground" style="background-image: url(images/oerstockholm/keyboard.jpg)">
     <article class="flexbox vcenter auto-fadein">
       <img src="images/oerstockholm/cp_gh2.png" class="reflect center" alt="Description" title="Description">
     </article>
-  
-    <footer class="source right"><a href="http://www.flickr.com/photos/donsolo/2462966749/sizes/l/">http://www.flickr.com/photos/donsolo/</a></footer> 
+
+    <footer class="source right"><a href="http://www.flickr.com/photos/donsolo/2462966749/sizes/l/">http://www.flickr.com/photos/donsolo/</a></footer>
   </slide>
 
 <slide class="fill nobackground" style="background-image: url(images/oerstockholm/keyboard.jpg)">
     <article class="flexbox vcenter">
       <img src="images/oerstockholm/cp_gh3.png" class="reflect center" alt="Description" title="Description">
     </article>
-  
-    <footer class="source right"><a href="http://www.flickr.com/photos/donsolo/2462966749/sizes/l/">http://www.flickr.com/photos/donsolo/</a></footer> 
+
+    <footer class="source right"><a href="http://www.flickr.com/photos/donsolo/2462966749/sizes/l/">http://www.flickr.com/photos/donsolo/</a></footer>
   </slide>