Merge pull request #165 from multiparty/IGH_Issue63

Editing grammar in text.
multiparty · Jul 11, 2019 · 784d913 · 784d913
2 parents dfc456d + 0c4609e
commit 784d913
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/client/index.html b/client/index.html
@@ -139,7 +139,7 @@ <h2 class="text-center">View your data</h2>
         <hr/>
         <h3>Entered Data</h3>
 
-        <span class="qtip-red">Red cells</span> <span>indicate an error - click on the cell to see the error message.</span>
+        <span class="qtip-red">Red cells</span> <span>indicate an error. Click on the cell to see the error message.</span>
         <p></p>
         <span class="qtip-yellow"> Yellow cells</span> <span> indicate the value might be outside of the expected range. Please double-check
           to make sure the data is correct. You will still be able to submit your data.</span>
@@ -170,7 +170,7 @@ <h2 class="text-center">Answer additional questions</h2>
     <section id="review-and-submit" class="card col-md-10 col-md-offset-1">
       <h2 class="text-center">Verify and submit your data</h2>
       <p class="text-center">
-        Please ensure that all data entered is accurate.
+        Please ensure that all entered data is accurate.
       </p>
       <hr/>
       <div class="row">
@@ -179,7 +179,7 @@ <h2 class="text-center">Verify and submit your data</h2>
           <form>
             <div class="checkbox">
               <label>
-                <input type="checkbox" id="verify" name="verify">I verified all data is correct
+                <input type="checkbox" id="verify" name="verify">I verified all data is correct.
               </label>
             </div>
           </form>
@@ -193,7 +193,7 @@ <h4>Errors</h4>
           </div>
           <h4>Submission history</h4>
           <ul id="submission-history">
-            <li>You have not submitted yet</li>
+            <li>You have not submitted yet.</li>
           </ul>
         </div>
       </div>

diff --git a/client/unmask.html b/client/unmask.html
@@ -56,21 +56,21 @@ <h1>Trusted Party<br/>
   <div class="row">
     <section id="session-area" class="card col-md-10 col-md-offset-1">
       <h2 class="text-center">Unmask Aggregate Data</h2>
-      <p class="text-center">Please make sure you have the correct session key, session password, and private key</p>
+      <p class="text-center">Please make sure you have the correct {{ session_key }}, session password, and private key.</p>
       <hr/>
       <div class="row">
         <div class="col-md-6">
           <form>
             <div class="form-group">
-              <label class="control-label" for="session">Session Key</label>
-              <input type="text" id="session" class="form-control" placeholder="Session Key"
+              <label class="control-label" for="session">{{ session_key }}</label>
+              <input type="text" id="session" class="form-control" placeholder="{{ session_key }}"
                      pattern="^[a-zA-Z0-9]{26}$" autocomplete="off" required/>
               <span id="session-success" class="success-icon glyphicon glyphicon-ok form-control-feedback hidden"
                     aria-hidden="true"></span>
               <span id="session-fail" class="fail-icon glyphicon glyphicon-remove form-control-feedback hidden"
                     aria-hidden="true"></span>
               <span id="session-fail-help"
-                    class="fail-help help-block hidden">Please input the 26-character session key.</span>
+                    class="fail-help help-block hidden">Please input the 26-character {{ session_key }}.</span>
               <span id="session-fail-custom-help"
                     class="fail-custom help-block hidden"></span>
             </div>
@@ -98,9 +98,7 @@ <h2 class="text-center">Unmask Aggregate Data</h2>
           <input type="file" id="choose-file" accept=".pem">
         </div>
         <div class="col-md-6">
-          <div id="submit">
-            <!-- <button id="unmask-button" class="btn btn-primary">Unmask</button> -->
-          </div>
+          <div id="submit"></div>
         </div>
       </div>
     </section>
@@ -109,19 +107,11 @@ <h2 class="text-center">Unmask Aggregate Data</h2>
   <div class="row">
     <section id="instructions" class="card col-md-10 col-md-offset-1">
       <h2 class="text-center">Aggregate data</h2>
-      <p class="text-center">Your data will appear here after you submit the session key, password, and private key</p>
+      <p class="text-center">Your data will appear here after you submit the {{ session_key }}, password, and private key.</p>
       <span id="expand-table-button" class="arrow-down"></span>
 
       <div id="tables-area">
         <hr/>
-        <!-- <h3 id="number-of-mbes-name" class="head_element"></h3>
-        <div id="number-of-mbes" class="table-section"></div>
-
-        <h3 id="addressable-spend-name" class="head_element"></h3>
-        <div id="addressable-spend" class="table-section"></div>
-
-        <h3 id="amount-spent-with-mbes-name" class="head_element"></h3>
-        <div id="amount-spent-with-mbes" class="table-section"></div> -->
       </div>
 
     </section>