Merge branch 'master' of odie.guru.si:codeq-web

Conflicts:
	index.html

1 files changed, 48 insertions, 14 deletions

diff --git a/index.html b/index.html
index 700a170..f7971bf 100644
--- a/index.html
+++ b/index.html
@@ -36,10 +36,11 @@
                 <!-- 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-language"><a href="">Language</a></li>
-                        <li style="display: none;" id="navigation-problem"><a href="">Problem</a></li>
-                        <li style="display: none;" id="navigation-python"><a href="">Python</a></li>
-                        <li style="display: none;" id="navigation-prolog"><a href="">Prolog</a></li>
+                        <li style="display: none;" id="navigation-language"><a href="" data-tkey="language">Language</a></li>
+                        <li style="display: none;" id="navigation-problem"><a href="" data-tkey="problem">Problem</a></li>
+                        <li style="display: none;" id="navigation-python"><a href="" data-tkey="python">Python</a></li>
+                        <li style="display: none;" id="navigation-prolog"><a href="" data-tkey="prolog">Prolog</a></li>
+                        <li style="display: none;" id="navigation-robot"><a href="" data-tkey="robot">Robot</a></li>
                     </ul>
                     <ul class="nav navbar-nav navbar-right">
                         <p class="navbar-text" id="signed-in-title"></p>
@@ -54,10 +55,10 @@
                                 <span class="glyphicon glyphicon glyphicon-user"></span>
                             </a>
                             <ul class="dropdown-menu">
-                                <li id="navigation-logout"><a href="#">Logout</a></li>
-                                <li id="navigation-profile"><a href="#">Profile</a></li>
+                                <li id="navigation-logout"><a href="#" data-tkey="logout">Logout</a></li>
+                                <li id="navigation-profile"><a href="#" data-tkey="profile">Profile</a></li>
                                 <li role="separator" class="divider"></li>
-                                <li><a href="#" data-toggle="modal" data-target="#modalChangePassword">Change password</a></li>
+                                <li><a href="#" data-toggle="modal" data-target="#modalChangePassword" data-tkey="change_pass">Change password</a></li>
                             </ul>
                         </li>
                         <li class="dropdown">
@@ -65,7 +66,7 @@
                             <div class="dropdown-menu" style="background-color: #fff">
                                 <form class="form col-sm-12">
                                     <div class="form-group">
-                                        <span class="small">Language</span>
+                                        <span class="small" data-tkey="language">Language</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'>Select the UI language.</span>" data-original-title="" title=""><i class="glyphicon glyphicon-question-sign"></i></a><br>
                                         <select class="form-control">
                                             <option value="sl">Slovensko</option>
@@ -74,7 +75,7 @@
                                         </select>
                                     </div>
                                     <div class="form-group">
-                                        <span class="small">
+                                        <span class="small" data-tkey="language">
                                             Language
                                         </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'>Select the UI language.</span>" data-original-title="" title=""><i class="glyphicon glyphicon-question-sign"></i></a><br>
@@ -164,9 +165,9 @@
                 <div class="col-lg-3 col-md-6 col-sm-12 block block2" style="padding-top: 51px; padding-bottom: 21px;">
                     <nav class="navbar navbar-default block-toolbar">
                         <div class="container-fluid">
-                            <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-test">Test</button>
+                            <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>
@@ -195,10 +196,42 @@
                 <div class="col-lg-3 col-md-6 col-sm-12 block block2"  style="padding-top: 51px; padding-bottom: 21px;">
                     <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>
+                            <button type="button" class="btn btn-default navbar-btn btn-run" data-tkey="btn_run">Run</button>
+                            <button type="button" class="btn btn-default navbar-btn btn-stop" data-tkey="btn_stop">Stop</button>
+                        </div>
+                    </nav>
+                    <div class="code_editor"></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>
+                <div class="col-lg-3 col-md-6 col-sm-12 block block4">
+                    <div class="hints"></div>
+                    <div class="block-label">Hints</div>
+                </div>
+            </div><!--/row-->
+        </div><!--container-->
+
+        <!-- problem screen: robot -->
+        <div class="container-fluid quadrants block1" id="screen_robot" style="display: none;">
+            <div class="row">
+                <div class="col-lg-3 col-md-6 col-sm-12 block block1">
+                    <h2 class="title translatable" data-dict="robot" data-tkey="slug"></h2>
+                    <div class="description translatable" data-dict="robot" data-tkey="description"></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">
+                        <div class="container-fluid">
                             <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-test">Test</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>
@@ -222,7 +255,7 @@
             <h2>
                 Profile
                 <div class="btn-group btn-group-xs hidden-md pull-right">
-                    <a href="" data-toggle="modal" data-target="#modalChangePassword" class="btn btn-default">Change Password</a>
+                    <a href="" data-toggle="modal" data-target="#modalChangePassword" class="btn btn-default" data-tkey="change_pass">Change Password</a>
                     <a href="#" class="btn btn-default" id="btnProfileGoBack">Go back</a>
                 </div>
             </h2>
@@ -438,6 +471,7 @@
         <script src="js/codeq/hint.js"></script>
         <script src="js/codeq/prolog.js"></script>
         <script src="js/codeq/python.js"></script>
+        <script src="js/codeq/robot.js"></script>
         <script src="js/codeq/login.js"></script>
         <script src="js/codeq/profile.js"></script>
         <script src="js/codeq/language.js"></script>