refactor menu + some forms to use bootstrap properly

1 files changed, 37 insertions, 31 deletions

diff --git a/index.html b/index.html
index 1dfe0e0..3613ad9 100644
--- a/index.html
+++ b/index.html
@@ -22,6 +22,7 @@
         <!-- the status bar at the top of each page -->
         <div class="navbar navbar-inverse navbar-fixed-top" id="topbar">
             <div class="container-fluid">
+                <!-- Brand and toggle get grouped for better mobile display -->
                 <div class="navbar-header">
                     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
                         <span class="icon-bar"></span>
@@ -29,6 +30,11 @@
                         <span class="icon-bar"></span>
                     </button>
                     <a class="navbar-brand" href="#" title="Intelligent tutor system">CodeQ</a>
+                    <!--a class="navbar-brand" id="title"></a-->
+                </div>
+
+                <!-- Collect the nav links, forms, and other content for toggling -->
+                <div class="collapse navbar-collapse">
                     <ul class="nav navbar-nav">
                         <li style="display: none;" id="navigation-login"><a href="">Login</a></li>
                         <li style="display: none;" id="navigation-language"><a href="">Language</a></li>
@@ -36,9 +42,6 @@
                         <li style="display: none;" id="navigation-python"><a href="">Python</a></li>
                         <li style="display: none;" id="navigation-prolog"><a href="">Prolog</a></li>
                     </ul>
-                    <a class="navbar-brand" id="title"></a>
-                </div>
-                <div class="collapse navbar-collapse">
                     <ul class="nav navbar-nav navbar-right">
                         <p class="navbar-text" id="signed-in-title">Signed in as Franc Jožef</p>
                         <li class="dropdown lang-selection">
@@ -65,42 +68,43 @@
         </div>
 
         <!-- login screen -->
-        <div id="screen_login" style="text-align: center;">
-            <h1>CodeQ Login</h1>
-            <hr>
-            <table style="margin: 0 auto;">
-                <tbody>
-                <tr>
-                    <td style="text-align: right;">Username:</td>
-                    <td><input type="text" name="username" id="username"></td>
-                </tr>
-                <tr>
-                    <td style="text-align: right;">Password:</td>
-                    <td><input type="password" name="password" id="password"></td>
-                </tr>
-                <tr>
-                    <td colspan="2" style="text-align: center;">
-                        <button type="button" id="submit">Login</button>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
+        <div class="container" id="screen_login">
+            <form class="form-signin">
+                <h2 class="form-signin-heading">Please login</h2>
+                <label for="username" class="sr-only">Username</label>
+                <input type="text" id="username" class="form-control" placeholder="Username" required="" autofocus="">
+                <label for="password" class="sr-only">Password</label>
+                <input type="password" id="password" class="form-control" placeholder="Password" required="">
+                <button class="btn btn-lg btn-default btn-block" type="button" id="submit">Login</button>
+            </form>
         </div>
 
         <!-- main screen: programming language selection, settings, etc. -->
-        <div id="screen_language" style="text-align: center; display: none;">
-            <h1>CodeQ Select Language</h1>
-            <hr>
-            <br>
-            <a id="choose-prolog">Prolog</a><br>
-            <a id="choose-python">Python</a>
+        <div class="container" id="screen_language" style="text-align: center; display: none;">
+            <div class="row">
+                <div class="col-lg-4" id="choose-prolog">
+                    <img class="img-circle" src=res/prolog.png alt="Generic placeholder image" width="140" height="140">
+                    <h2>Prolog</h2>
+                    <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.</p>
+                </div><!-- /.col-lg-4 -->
+                <div class="col-lg-4" id="choose-python">
+                    <img class="img-circle" src=res/python.png alt="Generic placeholder image" width="140" height="140">
+                    <h2>Python</h2>
+                    <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p>
+                </div><!-- /.col-lg-4 -->
+                <div class="col-lg-4" id="choose-python">
+                    <img class="img-circle" src=res/eve.png alt="Generic placeholder image" width="140" height="140">
+                    <h2>Robot</h2>
+                    <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p>
+                </div><!-- /.col-lg-4 -->
+            </div><!-- /.row -->
         </div>
 
         <!-- problem selection screen for a specific language: groups of problems, with descriptions -->
-        <div id="screen_problem" style="display: none;">
+        <div class="container" id="screen_problem" style="display: none;">
             <h1 class="language-title"></h1>
             <hr>
-            <div class="language-description"></div>
+            <h3 class="language-description"></h3>
             <ul class="language-problems"></ul>
         </div>
 
@@ -108,6 +112,7 @@
         <div class="container-fluid quadrants block1" id="screen_prolog" style="display: none;">
             <div class="row">
                 <div class="col-lg-3 col-md-6 col-sm-12 block block1">
+                    <h2 class="title"></h2>
                     <div class="description"></div>
                     <div class="block-label">Instructions</div>
                 </div>
@@ -137,6 +142,7 @@
         <div class="container-fluid quadrants block1" id="screen_python" style="display: none;">
             <div class="row">
                 <div class="col-lg-3 col-md-6 col-sm-12 block block1">
+                    <h2 class="title"></h2>
                     <div class="description"></div>
                     <div class="block-label">Instructions</div>
                 </div>