Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/it1901/course-material.git

lectures/build.gradle

@@ -61,7 +61,7 @@ asciidoctorRevealJs {
     outputDir file('build/docs/revealjs')
 	resources {
 		from('revealjs') {
-	    	include 'images/*'
+	    	include 'images/**'
 	    	include '**/*.css'
 	 	}
 		into '.'

lectures/revealjs/02-software-development.adoc

+= Software Development 
+:customcss: slides.css
+:icons: font
+
+++++
+	<img id="main-logo" class="main-logo" src="images/template/main_logo_eng_no_text.png" width="300" alt="ntnu logo"/>
+++++
+
+[.smaller-80][.center-paragraph]
+IT1901 Fall 2019 - 2nd Lecture
+
+[background-color = "#124990"]
+[color = "#fff6d5"]
+== Overview
+
+- About software development
+- Software development methods
+- Software quality.
+- Practices used in modern agile development
+
+[background-color = "#124990"]
+[color = "#fff6d5"]
+== About Software Development
+
+== What is Software Development
+
+[background-color = "#124990"]
+[color = "#fff6d5"]
+== Software development methods
+
+
+[background-color = "#124990"]
+[color = "#fff6d5"]
+== Software quality
+
+== What is software quality ?
+
+
+[background-color = "#124990"]
+[color = "#fff6d5"]
+== Practices used in modern agile development
+
+** source code management (SCM)
+** issue tracking
+** continuous integration (CI)
+
+== Source Code Management (SCM)
+
+== SCM Tools
+
+- CVS
+- SVN
+- Git
+- Mercurial
+
+
+== Issue Tracking
+
+
+== Continuous Integration (CI)
+
+
+== ! 
+
+image::../images/lecture02/doad.jpg[canvas, size=contain]
+
+++++
+ <div id="footer" class="footer">
+ 	<div style="display:table-row;">
+     <span class="element" style="width:150px;">
+     	<a href="https://www.ntnu.no" target="_blank">
+     		<img 	id="footer-logo" class="footer-logo" 
+     				src="images/template/logo_ntnu.png" 
+     				alt="ntnu logo" height="28"/>
+     	</a>
+     </span>
+     <span class="element" style="width:300px;">| IT1901 - 2nd lecture </span>
+     <span class="element">| Software Development </span>
+     <span class="element">&nbsp;&nbsp;&nbsp;&nbsp;</span>
+  </div>   
+ </div>
+ 
+ <div id="vertical-ntnu-name" class="vertical-ntnu-name">
+ 	<span class="helper"></span>
+ 	<img src="images/template/vertical-ntnu-name.png" alt="Norwegian University of Science and Technology" />
+ </div>
+ 
+ <script type="text/javascript">
+     window.addEventListener("load", function() {
+         revealDiv = document.querySelector("body div.reveal")
+         footer = document.getElementById("footer");
+         revealDiv.appendChild(footer);
+         
+         titleSlideDiv = document.querySelector("div.slides section.title")
+         mainLogo = document.getElementById("main-logo");
+         titleSlideDiv.prepend(mainLogo);
+         
+         vertName =  document.getElementById("vertical-ntnu-name");
+         revealDiv.appendChild(vertName);
+     } );
+ </script>
+++++
\ No newline at end of file

lectures/revealjs/course-intro.adoc

@@ -3,7 +3,7 @@
 :icons: font
 
 ++++
-	<!-- img id="main-logo" class="main-logo" src="images/main_logo_eng.png" alt="ntnu logo"/ -->
+	<img id="main-logo" class="main-logo" src="images/template/main_logo_eng_no_text.png" width="300" alt="ntnu logo"/>
 ++++
 
 [.smaller-80]
@@ -128,18 +128,31 @@ Gruppekontrakt skal godkjennes av studentassistent, signeres av alle gruppemedle
 https://bit.ly/2HdMRQi
 
 [.right]
-image::../images/qrcode-group-registration.svg[width=400]
+image::../images/lecture01/qrcode-group-registration.svg[width=400]
 
 == ! 
 
-image::../images/teamwork.png[canvas, size=contain]
+image::../images/lecture01/teamwork.png[canvas, size=contain]
 
 ++++
  <div id="footer" class="footer">
-     <span class="element"><a href="www.ntnu.no"><img id="footer-logo" class="footer-logo" src="images/logo_ntnu.png" alt="ntnu logo"/></a></span>
-     <span class="element">| IT1901 </span>
+ <div style="display:table-row;">
+     <span class="element" style="width:150px;">
+     	<a href="https://www.ntnu.no" target="_blank">
+     		<img 	id="footer-logo" class="footer-logo" 
+     				src="images/template/logo_ntnu.png" 
+     				alt="ntnu logo" height="28"/>
+     	</a>
+     </span>
+     <span class="element" style="width:300px;">| IT1901 </span>
      <span class="element">| Course Introduction </span>
      <span class="element">&nbsp;&nbsp;&nbsp;&nbsp;</span>
+ 	</div>
+  </div> 
+ 
+ <div id="vertical-ntnu-name" class="vertical-ntnu-name">
+ 	<span class="helper"></span>
+ 	<img src="images/template/vertical-ntnu-name.jpg" alt="Norwegian University of Science and Technology" />
  </div>
  
  <script type="text/javascript">
@@ -147,6 +160,13 @@ image::../images/teamwork.png[canvas, size=contain]
          revealDiv = document.querySelector("body div.reveal")
          footer = document.getElementById("footer");
          revealDiv.appendChild(footer);
+         
+         titleSlideDiv = document.querySelector("div.slides section.title")
+         mainLogo = document.getElementById("main-logo");
+         titleSlideDiv.prepend(mainLogo);
+         
+         vertName =  document.getElementById("vertical-ntnu-name");
+         revealDiv.appendChild(vertName);
      } );
  </script>
 ++++
\ No newline at end of file

lectures/revealjs/slides.css

@@ -180,40 +180,76 @@ section h2 {
 
 /* solution for footer based on http://blog.schauderhaft.de/2018/07/23/footer-in-revealjs-from-asciidoc/ */
  .footer {
-   position: absolute;
-   display: table;
-   width: 100%;
-   bottom: 0;
-   background-color: #0000AA;
+	position: absolute;
+   	display: table;
+   	width: 100%;
+   	bottom: 0;
+   	height: 40px;
+   	background-color: #124990;
+	border-top: 2px solid  #fff6d5;
  }
     
  .footer span {
-   display: table-cell;
-   color: #FFFFFF;
-   padding: 0px 15px 5px;
-    
-   text-align: center;
-   font-family: "Verdana", sans-serif;
-   font-size: 70%;
+   	display: table-cell;
+   	color: #fff6d5;
+   	padding: 0px 15px 5px;
+   	 
+   	text-align: left;
+   	font-family: "Verdana", sans-serif;
+   	font-size: 55%;
+	vertical-align: middle;
  }
     
  .footer span:nth-of-type(1) {
-   text-align: left;
+   	text-align: left;
  }
 
  .footer span:nth-last-child(1) {
-   text-align: right;
+   	text-align: right;
  }
 
 .footer-logo{
 	vertical-align: middle;
+	    margin-top: 5px;
 }
 
 
 .main-logo{
-	position: absolute;
+	position: relative;
    	display: block;
-   	width: 300;
-   	top: 10;
-	left:10;
-}
\ No newline at end of file
+    border: none  !important;
+    box-shadow: none  !important;
+}
+
+
+.vertical-ntnu-name {
+	position: absolute;
+	height: 100%;
+	right: 5px;
+	vertical-align: middle;
+}
+
+.vertical-ntnu-name img {
+	display: inline;
+	vertical-align: middle;
+	border: none !important;
+	box-shadow: none !important;
+}
+
+.vertical-ntnu-name span.vertical-ntnu-text {
+	display: inline;
+	vertical-align: middle;
+	border: none !important;
+	box-shadow: none !important;	
+}
+
+
+.helper {
+    display: inline-block;
+    height: 100%;
+    vertical-align: middle;
+}
+
+/* body div.reveal {
+	margin-bottom: 40px !important;
+} */