From 3cb089d675e08a0807c3914fb953e95c86bde133 Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Tue, 2 May 2017 15:01:10 +0200
Subject: [PATCH] Layout improvements

---
 .../src/main/resources/html/Challenge4.html   |   4 +-
 .../src/main/resources/html/Challenge5.html   | 137 +-----------------
 .../en/Challenge_introduction.adoc            |  13 +-
 3 files changed, 16 insertions(+), 138 deletions(-)

diff --git a/webgoat-lessons/challenge/src/main/resources/html/Challenge4.html b/webgoat-lessons/challenge/src/main/resources/html/Challenge4.html
index 85028116b..9f34c287a 100644
--- a/webgoat-lessons/challenge/src/main/resources/html/Challenge4.html
+++ b/webgoat-lessons/challenge/src/main/resources/html/Challenge4.html
@@ -9,7 +9,7 @@
     <script th:src="@{/lesson_js/challenge4.js}" language="JavaScript"></script>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
-        <div class="container">
+        <div class="container-fluid">
             <div class="row">
                 <div class="col-md-6">
                     <div class="panel panel-login">
@@ -101,7 +101,7 @@
             </div>
         </div>
         <br/>
-        <form class="attack-form form-inline" method="POST" name="form" action="/WebGoat/challenge/flag">
+        <form class="attack-form" method="POST" name="form" action="/WebGoat/challenge/flag">
             <div class="form-group">
                 <div class="input-group">
                     <div class="input-group-addon"><i class="fa fa-flag-checkered" aria-hidden="true"
diff --git a/webgoat-lessons/challenge/src/main/resources/html/Challenge5.html b/webgoat-lessons/challenge/src/main/resources/html/Challenge5.html
index 7a5756ad9..47e15e371 100644
--- a/webgoat-lessons/challenge/src/main/resources/html/Challenge5.html
+++ b/webgoat-lessons/challenge/src/main/resources/html/Challenge5.html
@@ -10,7 +10,7 @@
     <script th:src="@{/lesson_js/challenge5.js}" language="JavaScript"></script>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
-        <div class="container">
+        <div class="container-fluid">
 
             <div class="row">
 
@@ -44,145 +44,14 @@
                         <h3>Vote for your favorite</h3>
                     </div>
                     <div id ="votesList" class="list-group">
-                        <a href="#" class="list-group-item active">
-                            <div class="media col-md-3">
-                                <figure>
-                                    <img class="media-object img-rounded"
-                                         th:src="@{/images/challenge1-small.png}"
-                                         alt="placehold.it/350x250"/>
-                                </figure>
-                            </div>
-                            <div class="col-md-6">
-                                <h4 class="list-group-item-heading">Admin lost password</h4>
-                                <p class="list-group-item-text">In this challenge you will need to help the admin and
-                                    find the password in
-                                    order to login
-                                </p>
-                            </div>
-                            <div class="col-md-3 text-center">
-                                <h2> 14240
-                                    <small> votes</small>
-                                </h2>
-                                <button type="button" class="btn btn-default btn-lg btn-block"> Vote Now!</button>
-                                <div class="stars">
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star-empty"></span>
-                                </div>
-                                <p> Average 4.5
-                                    <small> /</small>
-                                    5
-                                </p>
-                            </div>
-                            <div class="clearfix"></div>
-                        </a>
-                        <a href="#" class="list-group-item">
-                            <div class="media col-md-3">
-                                <figure>
-                                    <img class="media-object img-rounded"
-                                         th:src="@{/images/challenge5-small.png}"
-                                         alt="placehold.it/350x250"/>
-                                </figure>
-                            </div>
-                            <div class="col-md-6">
-                                <h4 class="list-group-item-heading">Vote for your favourite</h4>
-                                <p class="list-group-item-text">In this challenge.....
-                                </p>
-                            </div>
-                            <div class="col-md-3 text-center">
-                                <h2> 14240
-                                    <small> votes</small>
-                                </h2>
-                                <button type="button" class="btn btn-primary btn-lg btn-block">Vote Now!</button>
-                                <div class="stars">
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star-empty"></span>
-                                </div>
-                                <p> Average 4.2
-                                    <small> /</small>
-                                    5
-                                </p>
-                            </div>
-                            <div class="clearfix"></div>
-                        </a>
-                        <a href="#" class="list-group-item">
-                            <div class="media col-md-3">
-                                <figure>
-                                    <img class="media-object img-rounded img-responsive"
-                                         th:src="@{/images/challenge2-small.png}"
-                                         alt="placehold.it/350x250"/>
-                                </figure>
-                            </div>
-                            <div class="col-md-6">
-                                <h4 class="list-group-item-heading">Get is for free</h4>
-                                <p class="list-group-item-text">The objective for this challenge is to buy a Samsung
-                                    phone for free.
-                                </p>
-                            </div>
-                            <div class="col-md-3 text-center">
-                                <h2> 12424
-                                    <small> votes</small>
-                                </h2>
-                                <button type="button" class="btn btn-primary btn-lg btn-block">Vote Now!</button>
-                                <div class="stars">
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star-empty"></span>
-                                    <span class="glyphicon glyphicon-star-empty"></span>
-                                </div>
-                                <p> Average 3
-                                    <small> /</small>
-                                    5
-                                </p>
-                            </div>
-                            <div class="clearfix"></div>
-                        </a>
-                        <a href="#" class="list-group-item">
-                            <div class="media col-xs-12 col-md-3">
-                                <figure>
-                                    <img class="media-object img-rounded img-responsive"
-                                         th:src="@{/images/challenge3-small.png}"
-                                         alt="placehold.it/350x250"/>
-                                </figure>
-                            </div>
-                            <div class="col-md-6">
-                                <h4 class="list-group-item-heading">Photo comments </h4>
-                                <p class="list-group-item-text">In this challenge you can comment on the photo you
-                                    will need to find the flag somewhere.
-                                </p>
-                            </div>
-                            <div class="col-md-3 text-center">
-                                <h2> 13540
-                                    <small> votes</small>
-                                </h2>
-                                <button type="button" class="btn btn-primary btn-lg btn-block">Vote Now!</button>
-                                <div class="stars">
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star"></span>
-                                    <span class="glyphicon glyphicon-star-empty"></span>
-                                </div>
-                                <p> Average 4.1
-                                    <small> /</small>
-                                    5
-                                </p>
-                            </div>
-                            <div class="clearfix"></div>
-                        </a>
+
                     </div>
                 </div>
             </div>
         </div>
 
         <br/>
-        <form class="attack-form form-inline" method="POST" name="form" action="/WebGoat/challenge/flag">
+        <form class="attack-form" method="POST" name="form" action="/WebGoat/challenge/flag">
             <div class="form-group">
                 <div class="input-group">
                     <div class="input-group-addon"><i class="fa fa-flag-checkered" aria-hidden="true"
diff --git a/webgoat-lessons/challenge/src/main/resources/lessonPlans/en/Challenge_introduction.adoc b/webgoat-lessons/challenge/src/main/resources/lessonPlans/en/Challenge_introduction.adoc
index 3f4d14759..03774d6f7 100644
--- a/webgoat-lessons/challenge/src/main/resources/lessonPlans/en/Challenge_introduction.adoc
+++ b/webgoat-lessons/challenge/src/main/resources/lessonPlans/en/Challenge_introduction.adoc
@@ -1,4 +1,4 @@
-== Welcome to the WebGoat challenge (CTF)
+=== Welcome to the WebGoat challenge (CTF)
 
 :hardbreaks:
 In this CTF you will need to solve a couple of challenges, each challenge will give you a flag which you will
@@ -6,8 +6,17 @@ need to post in order to gain points.
 
 Flags have the following format: `a7179f89-906b-4fec-9d99-f15b796e7208`
 
+==== Rules
 
-Have fun!!
+- Do not try to hack the competition infrastructure. If you happen to find a bug or vulnerability please send us
+an e-mail.
+
+- Play fair, do not try sabotage other competing teams, or in any way hindering the progress of another team.
+
+- Brute forcing of challenges / flags is not allowed.
+
+:hardbreaks:
+*Have fun!!*
 Team WebGoat