Merge branch 'master' of github.com:pks/lfpe

4 files changed, 16 insertions, 7 deletions

diff --git a/inc/help.inc.php b/inc/help.inc.php
index 86ddf70..121c087 100644
--- a/inc/help.inc.php
+++ b/inc/help.inc.php
@@ -9,18 +9,20 @@
 <p><span style="border-bottom:1px solid #ccc">Instructions for the graphical interface:</span></p>
 <p>Mark all phrases as finished (phrases are highlighted in dark gray color) and press 'Next' to submit a post-edition in the graphical interface. Keyboard interface:</p>
 <ul>
-  <li><strong>Moving around:</strong> Press <strong>Shift+S</strong>, then select phrases using the arrow keys. This is the default mode. Use <strong>Shift+I</strong> to jump to the first phrase, or <strong>Shift+O</strong> to the very last phrase.</li>
+  <li><strong>Moving around:</strong> Press <strong>Shift+S</strong>, then select phrases using the arrow keys. This is the default mode. Use <strong>Shift+I</strong> to jump to the first phrase, or <strong>Shift+O</strong> (or Shift+F/Shift+G) to the very last phrase.</li>
   <li><strong>Editing text:</strong> Double click on a phrase or press <strong>Shift+E</strong> to edit the contents of the current phrase. Press 'Return' to save.</li>
-  <li><strong>Reordering of target phrases:</strong> Press <strong>Shift+M</strong>, then use the arrow keys to move the selected phrase. Press 'Return' to fix its position.</li>
+  <li><strong>Reordering of target phrases:</strong> Press <strong>Shift+M</strong> or (Shift+X), then use the arrow keys to move the selected phrase. Press 'Return' to fix its position.</li>
   <li><strong>Mark phrase as finished:</strong> Press <strong>Return</strong> to mark phrases as finished (press 'Return' again to undo). Moving, editing, aligning or deleting of finished phrases is not possible.</li>
   <li><strong>Adding target phrases:</strong> To add a phrase right next to the currently selected one, press <strong>Shift+A</strong>.</li>
   <li><strong>Removing target phrases:</strong> Press <strong>Shift+D</strong> to delete the currently selected phrase.</li>
   <li><strong>Adding/removing alignments:</strong> Select a source phrase by clicking on it, then click on a target phrase to connect or disconnect it with the selected source phrase. Click the selected source phrase again to cancel.</li>
-  <li><strong>Undo:</strong> Press <strong>Shift+U</strong> to undo alignments, text edits and deletion of phrases.</li>
+  <li><strong>Undo:</strong> Press <strong>Shift+U</strong> (or Shift+R) to undo alignments, text edits and deletion of phrases.</li>
   <li><strong>Reset:</strong> Click 'Reset' button to restart editing of the current segment.</li>
 </ul>
 
-<p>The interface was tested with <strong>Firefox</strong> 31, 38 and 43.</p>
+<p>While editing text, you can press <strong>CTRL+&lt;left/right arrows&gt;</strong> to move the curose word-wise.</p>
+
+<p>The interface was tested with <strong>Firefox</strong> 31, 38, 43 and 45.</p>
 
 <!--<p><span style="border-bottom:1px solid #ccc">Known issues:</span></p>
 <ul>
diff --git a/index.php b/index.php
index b2a810f..5b6f33f 100644
--- a/index.php
+++ b/index.php
@@ -28,8 +28,8 @@
   <input type="txt" id="name" name="name" style="width:12em" />
   &nbsp;&nbsp;&nbsp;&nbsp;<strong>Session type:</strong>
   <select name="ui_type">
-    <option value="t">text</option>
-    <!--<option value="g">graphical</option>-->
+    <!--<option value="t">text</option>-->
+    <option value="g">graphical</option>
 </select>
 &nbsp;&nbsp;&nbsp;
 <input type="button" value="Submit" onclick="check_submit()" />
diff --git a/interface.php b/interface.php
index ddd9348..9c5531c 100644
--- a/interface.php
+++ b/interface.php
@@ -20,6 +20,10 @@
 <!-- Derivation editor -->
 <div id="derivation_editor">
   <div id="holder" style="width:100px; overflow-x:scroll"></div>
+  <div class="small">
+    <p><strong>Source:</strong> <span id="de_source">n/a</span></p>
+    <p><strong>Target:</strong> <span id="de_original_mt">n/a</span></p>
+  </div>
 </div>
 <!-- /Derivation editor-->
 
diff --git a/js/interface.js b/js/interface.js
index 677c343..ec36af7 100644
--- a/js/interface.js
+++ b/js/interface.js
@@ -460,6 +460,8 @@ var request_and_process_next = function ()
         $("#textboxes").fadeTo(200,1);
       } else {
         $("#derivation_editor").fadeTo(200,1);
+        $("#de_source").text(data["raw_source"]);
+        $("#de_original_mt").text(data["transl_detok"]);
       }
 
       var id          = data["progress"];
@@ -555,7 +557,8 @@ var reset = function ()
     //TEXT_count_kbd = 0;
     $("#target_textarea").val($("#original_mt").val());
   } else if (ui_type == "g") {
-    DE_init(false)
+    DE_init(false);
+    DE_update_str();
   }
 }