diff --git a/lectures/build.gradle b/lectures/build.gradle
index ea7ae84954514bb20e395f16ee060f2908a158e5..94ec6b78ea0c9f2d8518e03d92093dab28b3b941 100644
--- a/lectures/build.gradle
+++ b/lectures/build.gradle
@@ -61,7 +61,7 @@ asciidoctorRevealJs {
outputDir file('build/docs/revealjs')
resources {
from('revealjs') {
- include 'images/*'
+ include 'images/**'
include '**/*.css'
}
into '.'
diff --git a/lectures/revealjs/02-software-development.adoc b/lectures/revealjs/02-software-development.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e0fde072d7ff260a8d60056b8211db48fa4643ee
--- /dev/null
+++ b/lectures/revealjs/02-software-development.adoc
@@ -0,0 +1,102 @@
+= 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"> </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
diff --git a/lectures/revealjs/course-intro.adoc b/lectures/revealjs/course-intro.adoc
index 253d829ba8611589435538d737b5977d665a782f..75b6d2f8781fae999f13c754faee9900108939ff 100644
--- a/lectures/revealjs/course-intro.adoc
+++ b/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"> </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
diff --git a/lectures/revealjs/images/qrcode-group-registration.svg b/lectures/revealjs/images/lecture01/qrcode-group-registration.svg
similarity index 100%
rename from lectures/revealjs/images/qrcode-group-registration.svg
rename to lectures/revealjs/images/lecture01/qrcode-group-registration.svg
diff --git a/lectures/revealjs/images/teamwork.png b/lectures/revealjs/images/lecture01/teamwork.png
similarity index 100%
rename from lectures/revealjs/images/teamwork.png
rename to lectures/revealjs/images/lecture01/teamwork.png
diff --git a/lectures/revealjs/images/lecture02/doad.jpg b/lectures/revealjs/images/lecture02/doad.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..542314640f06a971f0c30c1f72ee1114b5f91fdf
Binary files /dev/null and b/lectures/revealjs/images/lecture02/doad.jpg differ
diff --git a/lectures/revealjs/images/hovedlogo_eng.png b/lectures/revealjs/images/template/hovedlogo_eng.png
similarity index 100%
rename from lectures/revealjs/images/hovedlogo_eng.png
rename to lectures/revealjs/images/template/hovedlogo_eng.png
diff --git a/lectures/revealjs/images/logo_ntnu.png b/lectures/revealjs/images/template/logo_ntnu.png
similarity index 100%
rename from lectures/revealjs/images/logo_ntnu.png
rename to lectures/revealjs/images/template/logo_ntnu.png
diff --git a/lectures/revealjs/images/logo_ntnu_u-slagord_neg.png b/lectures/revealjs/images/template/logo_ntnu_u-slagord_neg.png
similarity index 100%
rename from lectures/revealjs/images/logo_ntnu_u-slagord_neg.png
rename to lectures/revealjs/images/template/logo_ntnu_u-slagord_neg.png
diff --git a/lectures/revealjs/images/main_logo_eng.png b/lectures/revealjs/images/template/main_logo_eng.png
similarity index 100%
rename from lectures/revealjs/images/main_logo_eng.png
rename to lectures/revealjs/images/template/main_logo_eng.png
diff --git a/lectures/revealjs/images/template/main_logo_eng_no_text.png b/lectures/revealjs/images/template/main_logo_eng_no_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..003f597aee7f69007664056b751a1cf02c20dda1
Binary files /dev/null and b/lectures/revealjs/images/template/main_logo_eng_no_text.png differ
diff --git a/lectures/revealjs/images/template/tekst-en.jpg b/lectures/revealjs/images/template/tekst-en.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..90f730872b4c008480b04b89e2dfca647d032d1d
Binary files /dev/null and b/lectures/revealjs/images/template/tekst-en.jpg differ
diff --git a/lectures/revealjs/images/template/vertical-ntnu-name.jpg b/lectures/revealjs/images/template/vertical-ntnu-name.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..256034a7de9e4ff0cea30f55580087ee1a31bef0
Binary files /dev/null and b/lectures/revealjs/images/template/vertical-ntnu-name.jpg differ
diff --git a/lectures/revealjs/images/template/vertical-ntnu-name.png b/lectures/revealjs/images/template/vertical-ntnu-name.png
new file mode 100644
index 0000000000000000000000000000000000000000..9eec1161f37a8ed2222c7848700e68048b189646
Binary files /dev/null and b/lectures/revealjs/images/template/vertical-ntnu-name.png differ
diff --git a/lectures/revealjs/slides.css b/lectures/revealjs/slides.css
index 04fd168c6c29f8e911ce8bef67055211e2dc55a3..ef62a7edfd8961bad88597cee913cd005f1abad2 100644
--- a/lectures/revealjs/slides.css
+++ b/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;
+} */