commit 9d239d1bf219db024445237f174345071ffa7f86
author genia.likes.science@gmail.com <genia.likes.science@gmail.com> Tue May 14 01:31:28 2013 -0700
committer genia.likes.science@gmail.com <genia.likes.science@gmail.com> Tue May 14 01:31:28 2013 -0700
tree 2e06cc338c38573950152a7c43124a71f0558d67
parent ba4533f3ac262fb37e269545a774d84f275b82f1

Some appearance and text changes - awaiting demo approval

asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java

diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java b/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java
index 202c060..8be9eaa 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java
@@ -380,7 +380,7 @@
             hcc.waitForCompletion(jobId);
             long endTime = System.currentTimeMillis();
             double duration = (endTime - startTime) / 1000.00;
-            out.println("<pre>Duration: " + duration + "</pre>");
+            out.println("<pre>Duration: " + duration + " sec</pre>");
         }
 
     }
@@ -402,7 +402,7 @@
             }
             long endTime = System.currentTimeMillis();
             double duration = (endTime - startTime) / 1000.00;
-            out.println("<pre>Duration: " + duration + "</pre>");
+            out.println("<pre>Duration: " + duration + " sec</pre>");
         }
 
     }

asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/APIServlet.java

diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/APIServlet.java b/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/APIServlet.java
index f92e4e0..c7a1297 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/APIServlet.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/APIServlet.java
@@ -78,7 +78,7 @@
             aqlTranslator.compileAndExecute(hcc, hds, false);
             long endTime = System.currentTimeMillis();
             duration = (endTime - startTime) / 1000.00;
-            out.println("<PRE>Duration of all jobs: " + duration + " msec</PRE>");
+            out.println("<PRE>Duration of all jobs: " + duration + " sec</PRE>");
         } catch (ParseException | TokenMgrError | edu.uci.ics.asterix.aqlplus.parser.TokenMgrError pe) {
             out.println("<pre class=\"error\">");
             String message = pe.getMessage();

asterix-app/src/main/resources/webui/querytemplate.html

diff --git a/asterix-app/src/main/resources/webui/querytemplate.html b/asterix-app/src/main/resources/webui/querytemplate.html
index 192bfbd..a36599b 100644
--- a/asterix-app/src/main/resources/webui/querytemplate.html
+++ b/asterix-app/src/main/resources/webui/querytemplate.html
@@ -87,7 +87,7 @@
               <label class="checkbox"><input type="checkbox"
                   checked="checked" name="print-job" value="true" /> Print Hyracks job</label>
             </div>
-            <button type="submit" class="btn btn-custom-darken">Execute</button>
+            <button type="submit" class="btn btn-custom-darken">Run</button>
           </form>
         </div>
 
@@ -105,7 +105,6 @@
     <section class="line"><hr></section>
     <section class="content">
       <section class="left">
-        AsterixDB - More Engine, Less Trunk
       </section>
       <section class="right">
         &copy; Copyright 2013 University of California, Irvine

asterix-app/src/main/resources/webui/static/css/style.css

diff --git a/asterix-app/src/main/resources/webui/static/css/style.css b/asterix-app/src/main/resources/webui/static/css/style.css
index c9ed6c7..38e4abe 100644
--- a/asterix-app/src/main/resources/webui/static/css/style.css
+++ b/asterix-app/src/main/resources/webui/static/css/style.css
@@ -1,6 +1,6 @@
 body {
     background: none repeat scroll 0 0 white;
-    color: #222222;
+    color: #17265a;
     font-family: 'Bitter';
     font-size: 14px;
     line-height: 17px;
@@ -73,6 +73,7 @@
     margin-top: 2px;
     padding-bottom: 10px;
     font-weight: bold;
+    color : #17265a;
 }
 
 div.output .message {
@@ -146,6 +147,10 @@
     padding-bottom: 0;
 }
 
+.navbar .nav > li > a {
+    color: #17265a;
+}
+
 i {
     margin-left: 4px;
 }