lessons in correct order and scoreboard visible again (#680)

webgoat-container/src/main/resources/templates/scoreboard.html

@@ -19,7 +19,7 @@
     <link rel="shortcut icon" th:href="@{/images/favicon.ico}" type="image/x-icon"/>
 
     <!-- Require.js used to load js asynchronously -->
-    <script src="js/libs/require.min.js" data-main="js/scoreboard.js"/>
+    <script src="js/libs/require.min.js" data-main="js/scoreboard.js"></script>
     <!-- main css -->
     <link rel="stylesheet" type="text/css" th:href="@{/css/main.css}"/>
     <link rel="stylesheet" type="text/css" th:href="@{/plugins/bootstrap/css/bootstrap.min.css}"/>

webgoat-lessons/chrome-dev-tools/src/main/java/org/owasp/webgoat/chrome_dev_tools/ChromeDevTools.java

@@ -40,7 +40,7 @@ public class ChromeDevTools extends Lesson {
 
     @Override
     public String getTitle() {
-      return "chrome-dev-tools.title";
+      return "3.chrome-dev-tools.title";//3rd lesson in General
     }
 
     @Override

webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties

@@ -1,4 +1,4 @@
-chrome-dev-tools.title=Google Chrome Developer Tools
+3.chrome-dev-tools.title=Developer Tools
 
 xss-dom-message-success=Correct!
 xss-dom-message-failure=Incorrect.

webgoat-lessons/cia/src/main/java/org/owasp/webgoat/cia/CIA.java

@@ -18,7 +18,7 @@ public class CIA extends Lesson {
 
     @Override
     public String getTitle() {
-        return "cia.title";
+        return "4.cia.title";//4th lesson in general
     }
 
     @Override

webgoat-lessons/cia/src/main/resources/i18n/WebGoatLabels.properties

@@ -1 +1 @@
-cia.title=CIA triad
+4.cia.title=CIA Triad

webgoat-lessons/http-basics/src/main/java/org/owasp/webgoat/http_basics/HttpBasics.java

@@ -35,7 +35,7 @@ public class HttpBasics extends Lesson {
 
     @Override
     public String getTitle() {
-        return "http-basics.title";
+        return "1.http-basics.title";//first lesson in general
     }
 
     @Override

webgoat-lessons/http-basics/src/main/resources/i18n/WebGoatLabels.properties

@@ -1,6 +1,6 @@
 http-basics.EnterYourName=Enter your Name
 http-basics.Go!=Go!
-http-basics.title=HTTP Basics
+1.http-basics.title=HTTP Basics
 
 
 http-basics.hints.http_basics_lesson.1=Type in your name and press 'go'

webgoat-lessons/http-basics/src/main/resources/i18n/WebGoatLabels_nl.properties

@@ -1,6 +1,6 @@
 http-basics.EnterYourName=Voer je naam in
 http-basics.Go!=Go!
-http-basics.title=HTTP Basics
+1.http-basics.title=HTTP Basics
 
 
 

webgoat-lessons/http-proxies/src/main/java/org/owasp/webgoat/http_proxies/HttpProxies.java

@@ -42,7 +42,7 @@ public class HttpProxies extends Lesson {
 
     @Override
     public String getTitle() {
-        return "http-proxies.title";
+        return "2.http-proxies.title";//second lesson in GENERAL
     }
 
     @Override

webgoat-lessons/http-proxies/src/main/resources/i18n/WebGoatLabels.properties

@@ -1,4 +1,4 @@
-http-proxies.title=HTTP Proxies
+2.http-proxies.title=HTTP Proxies
 
 http-proxies.intercept.success=Well done, you tampered the request as expected
 http-proxies.intercept.failure=Please try again. Make sure to make all the changes. And case sensitivity may matter ... or not, you never know!

webgoat-lessons/password-reset/src/main/resources/lessonPlans/en/PasswordReset_simple.adoc

@@ -1,6 +1,6 @@
 == Email functionality with WebWolf
 
-Let's first do a simple assignment to make sure you are able to read e-mails with WebWolf, first start WebWolf (see http://)
+Let's first do a simple assignment to make sure you are able to read e-mails with WebWolf, first start WebWolf (see webWolfLink:here[])
 In the reset page below send an e-mail to `username@webgoat.org` (part behind the @ is not important)
 Open WebWolf and read the e-mail and login with your username and the password provided in the e-mail.
 

webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/advanced/SqlInjectionAdvanced.java

@@ -30,12 +30,12 @@ import org.springframework.stereotype.Component;
 public class SqlInjectionAdvanced extends Lesson {
     @Override
     public Category getDefaultCategory() {
-        return Category.INJECTION;
+        return Category.INJECTION; 
     }
 
     @Override
     public String getTitle() {
-        return "sql.advanced.title";
+        return "2.sql.advanced.title";
     }
 
     @Override

webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjection.java

@@ -35,7 +35,7 @@ public class SqlInjection extends Lesson {
 
     @Override
     public String getTitle() {
-        return "sql.injection.title";
+        return "1.sql.injection.title";
     }
 
     @Override

webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/mitigation/SqlInjectionMitigations.java

@@ -35,7 +35,7 @@ public class SqlInjectionMitigations extends Lesson {
 
     @Override
     public String getTitle() {
-        return "sql.mitigation.title";
+        return "3.sql.mitigation.title";
     }
 
     @Override

webgoat-lessons/sql-injection/src/main/resources/i18n/WebGoatLabels.properties

@@ -1,7 +1,8 @@
 #StringSqlInjection.java
-sql.injection.title=SQL Injection (introduction)
-sql.mitigation.title=SQL Injection (mitigation)
-sql.advanced.title=SQL Injection (advanced)
+1.sql.injection.title=SQL Injection (intro)
+2.sql.advanced.title=SQL Injection (advanced)
+3.sql.mitigation.title=SQL Injection (mitigation)
+
         
 SqlInjectionChallenge1=Look at the different response you receive from the server
 SqlInjectionChallenge2=The vulnerability is on the register form