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

Conflicts:
	index.html

1 files changed, 88 insertions, 38 deletions

diff --git a/index.html b/index.html
index b78f190..5f73cf0 100644
--- a/index.html
+++ b/index.html
@@ -44,12 +44,6 @@
                     </ul>
                     <ul class="nav navbar-nav navbar-right">
                         <p class="navbar-text"><span data-tkey="signed_in_as">Signed in as </span><span id="signed-in-title">Janez</span></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
@@ -128,7 +127,54 @@
                 </div>
             </form>
         </div-->
-
+<!--TODO -->
+        <!-- login screen -->
+        <div class="container" id="screen_login" style="display: none;">
+            <div class="modal-dialog modal-sm">
+                <!--div class="modal-content"-->
+                    <div class="row"><!--class="modal-header"-->
+                        <h3 class="text-center">Please sign in</h3>
+                    </div>
+                    <div class="row"><!--class="modal-body"-->
+                        <div class="row">
+                            <div class="col-md-12">
+                                Login via
+                                <div class="ssa-buttons">
+                                    <a href="#" class="ssa-buttons" role="button" data-dismiss="modal" data-toggle="modal" data-target="#modalAAI">
+                                        <img src="res/gumb_aaiprijava.png" style="width: 49%">
+                                    </a>
+                                </div>
+                                or
+                                <form class="form" role="form" method="post" action="login" accept-charset="UTF-8" id="login-nav">
+                                    <div class="form-group">
+                                        <label class="sr-only" for="username">Username</label>
+                                        <input type="text" class="form-control" id="username" placeholder="Username" required>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="sr-only" for="password">Password</label>
+                                        <input type="password" class="form-control" id="password" placeholder="Password" required>
+                                        <!--div class="help-block text-right"><a href="#">Forgot the password?</a></div-->
+                                    </div>
+                                    <div class="form-group">
+                                        <button class="btn btn-primary btn-block" type="button" id="submit">Sign in</button>
+                                    </div>
+                                    <!--div class="checkbox">
+                                        <label>
+                                            <input type="checkbox"> keep me logged-in
+                                        </label>
+                                    </div-->
+                                </form>
+                            </div>
+                        </div>
+                    </div><!--/modal-body-->
+                    <div class="row"><!-- class="modal-footer"-->
+                        <div class="text-center">
+                            New here ? <a href="#" role="button" data-dismiss="modal" data-toggle="modal" data-target="#modalSignUp"><b>Sign Up</b></a>
+                        </div>
+                    </div><!--/modal-footer-->
+                <!--/div-->
+            </div>
+        </div>
 
         <!-- main screen: programming language selection, settings, etc. -->
         <div class="container" id="screen_language" style="text-align: center; display: none;">
@@ -154,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-->
@@ -245,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>
@@ -299,7 +350,7 @@
 
         <!-- Modals -->
 
-        <div id="modalLogIn" class="modal fade in" tabindex="-1" role="dialog" aria-hidden="false" data-keyboard="false" data-backdrop="static" style="display: none;">
+        <!--<div id="modalLogIn" class="modal fade in" tabindex="-1" role="dialog" aria-hidden="false" data-keyboard="false" data-backdrop="static" style="display: none;">
             <div class="modal-dialog modal-sm">
                 <div class="modal-content">
                     <div class="modal-header">
@@ -323,7 +374,7 @@
                                     <div class="form-group">
                                         <label class="sr-only" for="password" data-tkey="password">Password</label>
                                         <input type="password" class="form-control" id="password" data-tkey-placeholder="password" placeholder="Password" required>
-                                        <!--div class="help-block text-right"><a href="#">Forgot the password?</a></div-->
+                                        <!--div class="help-block text-right"><a href="#">Forgot the password?</a></div->
                                     </div>
                                     <div class="form-group">
                                         <button class="btn btn-primary btn-block" type="button" id="submit" data-tkey="signin_button">Sign in</button>
@@ -332,11 +383,11 @@
                                         <label>
                                             <input type="checkbox"> keep me logged-in
                                         </label>
-                                    </div-->
+                                    </div->
                                 </form>
                             </div>
                         </div>
-                    </div><!--/modal-body-->
+                    </div><!--/modal-body->
                     <div class="modal-footer">
                         <div class="text-center">
                             <span data-tkey="signin_footer">New here ? </span><a href="#" role="button" data-dismiss="modal" data-toggle="modal" data-target="#modalSignUp"><b data-tkey="signin_footer_signup">Sign Up</b></a>
@@ -348,7 +399,7 @@
                     </div><!--/modal-footer-->
                 </div>
             </div>
-        </div>
+        </div>-->
 
 
         <div id="modalSignUp" class="modal fade in" tabindex="-1" role="dialog" aria-hidden="false" data-keyboard="false" data-backdrop="static" style="display: none;">
@@ -464,7 +515,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>