Merge branch 'master' of ssh://212.235.189.51:22122/codeq-web

1 files changed, 35 insertions, 32 deletions

diff --git a/index.html b/index.html
index 077a700..57b60b9 100644
--- a/index.html
+++ b/index.html
@@ -44,12 +44,6 @@
                     </ul>
                     <ul class="nav navbar-nav navbar-right">
                         <p class="navbar-text" id="signed-in-title"></p>
-                        <!--<li class="dropdown lang-selection">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
-                                <span class="lang-choice"></span>
-                            </a>
-                            <ul class="dropdown-menu"></ul>
-                        </li>-->
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
                                 <span class="glyphicon glyphicon glyphicon-user"></span>
@@ -74,6 +68,11 @@
                                             <!--<option value="d">Dolgooooooooooooooooooooooooooooooooooooooooooooooo</option>-->
                                         </select>
                                     </div>
+                                    <div class="form-group">
+                                        <span class="small" data-tkey="robot_address">Robot’s address</span>
+                                        <a class="text-muted" data-container="body" data-toggle="popover" data-trigger="hover" data-placement="left" data-html="true" data-content="<span class='small'>Set the robot's IP address.</span>" data-original-title="" title=""><i class="glyphicon glyphicon-question-sign"></i></a><br>
+                                        <input type="text" class="form-control" id="robot_address_input" />
+                                    </div>
                                     <!--<div class="form-group">
                                         <span class="small" data-tkey="language">
                                             Language
@@ -201,34 +200,40 @@
         <!-- problem screen: prolog -->
         <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">
-                    <div class="description-container">
-                        <h2 class="title" data-dict="prolog" data-tkey="slug"></h2>
-                        <div class="description" data-dict="prolog" data-tkey="description"></div>
+                <div class="col-lg-4 col-md-4 col-sm-12 block block-left">
+                    <div class="col-lg-12 col-md-12 col-sm-12 block block1">
+                        <div class="scrollable-content-container">
+                            <div class="description-container">
+                                <h2 class="title" data-dict="prolog" data-tkey="slug"></h2>
+                                <div class="description" data-dict="prolog" data-tkey="description"></div>
+                            </div>
+                        </div>
+                        <div class="block-label">Instructions</div>
                     </div>
-                    <div class="block-label">Instructions</div>
-                </div>
-                <div class="col-lg-3 col-md-6 col-sm-12 block block2">
-                    <nav class="navbar navbar-default block-toolbar">
-                        <div class="container-fluid">
-                            <button type="button" class="btn btn-default navbar-btn btn-plan" data-tkey="btn_plan">Plan</button>
-                            <button type="button" class="btn btn-default navbar-btn btn-hint" data-tkey="btn_hint">Hint</button>
-                            <button type="button" class="btn btn-default navbar-btn btn-test" data-tkey="btn_test">Test</button>
+                    <div class="col-lg-12 col-md-12 col-sm-12 block block4">
+                        <div class="scrollable-content-container">
+                            <div class="hints"></div>
                         </div>
-                    </nav>
-                    <div class="code_editor"></div>
-                    <div class="block-statusbar"></div>
-                    <div class="block-label">Code</div>
-                </div>
-                <div class="col-lg-3 col-md-6 col-sm-12 block block3">
-                    <div class="console"></div>
-                    <div class="block-label">Console</div>
+                        <div class="block-label">Hints</div>
+                    </div>
                 </div>
-                <div class="col-lg-3 col-md-6 col-sm-12 block block4">
-                    <div class="scrollable-content-container">
-                        <div class="hints"></div>
+                <div class="col-lg-8 col-md-8 col-sm-12 block block-right ">
+                    <div class="col-lg-6 col-md-12 col-sm-12 block block2">
+                        <nav class="navbar navbar-default block-toolbar">
+                            <div class="container-fluid">
+                                <button type="button" class="btn btn-default navbar-btn btn-plan" data-tkey="btn_plan">Plan</button>
+                                <button type="button" class="btn btn-default navbar-btn btn-hint" data-tkey="btn_hint">Hint</button>
+                                <button type="button" class="btn btn-default navbar-btn btn-test" data-tkey="btn_test">Test</button>
+                            </div>
+                        </nav>
+                        <div class="code_editor"></div>
+                        <div class="block-statusbar"></div>
+                        <div class="block-label">Code</div>
+                    </div>
+                    <div class="col-lg-6 col-md-12 col-sm-12 block block3">
+                        <div class="console"></div>
+                        <div class="block-label">Console</div>
                     </div>
-                    <div class="block-label">Hints</div>
                 </div>
             </div><!--/row-->
         </div><!--container-->
@@ -292,7 +297,6 @@
                             <button type="button" class="btn btn-default navbar-btn btn-plan">Plan</button>
                             <button type="button" class="btn btn-default navbar-btn btn-hint">Hint</button>
                             <button type="button" class="btn btn-default navbar-btn btn-run">Run</button>
-                            <input type="text" id="robot_ip" placeholder="Robot's IP"></input>
                             <button type="button" class="btn btn-default navbar-btn btn-stop">Stop</button>
                         </div>
                     </nav>
@@ -500,7 +504,6 @@
         <!-- codeq app cont. -->
         <script src="js/codeq/init.js"></script>
         <script src="js/codeq/translation.js"></script>
-        <script src="js/codeq/statusbar.js"></script>
         <script src="js/codeq/navigation.js"></script>
         <script src="js/codeq/comms.js"></script>
         <script src="js/codeq/console.js"></script>