You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by mj...@apache.org on 2016/07/28 14:48:31 UTC

incubator-joshua git commit: rearranging and documenting the demo

Repository: incubator-joshua
Updated Branches:
  refs/heads/master 80c17ef6a -> c06a80d6a


rearranging and documenting the demo


Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/c06a80d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/c06a80d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/c06a80d6

Branch: refs/heads/master
Commit: c06a80d6ad03f9b748d43d6af83edc1792b7c8d6
Parents: 80c17ef
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Jul 27 16:45:19 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Jul 27 16:45:19 2016 -0400

----------------------------------------------------------------------
 demo/demo.js    | 14 ++++++++++++-
 demo/index.html | 59 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 46 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/c06a80d6/demo/demo.js
----------------------------------------------------------------------
diff --git a/demo/demo.js b/demo/demo.js
index 74dde59..e329617 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -81,14 +81,26 @@ $('#sourceTxt').keypress(function (e) {
     }
 });
 
+/*
+ * Retrieves the text from the text box and tokenizes it.
+ */
 function gettext() {
-    return $("#sourceTxt").val().replace(/([^\.!\?])([\.!\?,]+)/g, "$1 $2");
+    var text = $("#sourceTxt").val();
+    var tokenizedText = text.replace(/([\.!\?,;"'])/g, " $1 ").replace(/ +/g, " ");
+    // alert(text + " -> " + tokenizedText);
+    return tokenizedText;
 }
 
+/*
+ * Returns the name of the server.
+ */
 function getserver() {
     return $("#server_host").val()
 }
 
+/*
+ * Returns the name of the port.
+ */
 function getport() {
     return $("#server_port").val()
 }

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/c06a80d6/demo/index.html
----------------------------------------------------------------------
diff --git a/demo/index.html b/demo/index.html
index 3698982..8340b6a 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -19,6 +19,9 @@
       body {
         padding-top: 50px;
         padding-bottom: 20px;
+        <!-- background-image: url("apache_joshua_logo.png"); -->
+        <!-- background-repeat: no-repeat; -->
+        <!-- background-position: -300px -300px; -->
       }
     </style>
   </head>
@@ -62,7 +65,7 @@
     <div class="container">
       <div>
         <ul class="nav nav-tabs">
-          <li class="active"><a data-toggle="tab" href="#input">Input</a></li>
+          <li class="active"><a data-toggle="tab" href="#translate">Translate</a></li>
           <li><a data-toggle="tab" href="#rules">Rules</a></li>
           <li><a data-toggle="tab" href="#params">Parameters</a></li>
           <li><a data-toggle="tab" href="#instructions">Instructions</a></li>
@@ -70,7 +73,7 @@
       </div>
 
       <div class="tab-content">
-        <div id="input" class="tab-pane fade in active">
+        <div id="translate" class="tab-pane fade in active">
           <div class="panel panel-default">
             <div class="panel-heading">
               <h3 class="panel-title">Input</h3>
@@ -82,13 +85,40 @@
                   <fieldset class="form-group">
                     <textarea class="form-control" id="sourceTxt" rows="5" placeholder="Enter sentences one per line and type ^-return or \u2318-return to submit" autofocus="autofocus"></textarea>
                   </fieldset>
-                  <button class="btn btn-primary" type="submit" onclick="translate_default()">Translate</button>
+                </div>
+                <!-- <div class="col-lg-1"> -->
+                <!--   <button class="btn btn-primary" type="submit" onclick="translate_default()">Translate</button> -->
+                <!-- </div> -->
+              </div>
+              <div class="row">
+                <div class="col-lg-8">
+                  <form class="form-inline">
+                    <div class="form-group">
+                      Add New Phrase:
+                      <input type="text" class="form-control" placeholder="source side" id="addPhrase_source" size=20 />
+                      <input type="text" class="form-control" placeholder="target side" id="addPhrase_target" size=20 />
+                      <button type="button" class="btn btn-primary" id="add_rule">Add</button>
+                    </div>
+                  </form>
+
                   <!-- <input type="text" class="form-control" placeholder="Enter text to paraphrase" -->
                               <!--        id="sourceTxt" autofocus="autofocus" size=100 /> -->
                 </div>
               </div>
             </div>
 
+            <div class="panel-heading">
+              <h3 class="panel-title">Output</h3>
+            </div>
+            <div class="panel-body">
+              <div class="row">
+                <div class="col-lg-8" id="output">
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+            
               <!--
               <select id="ppdb_size">
                 <option value="S">S</option>
@@ -106,9 +136,6 @@
               </select>
               -->
 
-          </div>
-        </div>
-
         <div id="rules" class="tab-pane fade">
           <div class="panel panel-default">
             <div class="panel-heading">
@@ -118,15 +145,6 @@
             <div class="panel-body">
               <div class="row">
                 <div class="col-md-8 col-xs-12">
-                  <form class="form-inline">
-                    <div class="form-group">
-                      <input type="text" class="form-control" placeholder="source side" id="addPhrase_source" size=20 />
-                      <input type="text" class="form-control" placeholder="target side" id="addPhrase_target" size=20 />
-                    </div>
-                    <button type="button" class="btn btn-primary" id="add_rule">Add Rule</button>
-                  </form>
-                </div>
-                <div class="col-md-8 col-xs-12">
                   <table class="table table-striped table-condensed" id="ruletable">
                     <thead>
                       <tr>
@@ -245,17 +263,6 @@
         
       </div>
 
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <h3 class="panel-title">Output</h3>
-        </div>
-        <div class="panel-body">
-          <div class="row">
-            <div class="col-lg-8" id="output">
-            </div>
-          </div>
-        </div>
-      </div>
     </div>
 
     <hr/>