Merge branch 'master' of github.rtp.raleigh.ibm.com:tonechecker/tone-…

…analyzer-nodejs
personality-insights · Sep 15, 2015 · 63e9e42 · 63e9e42
2 parents ffd3658 + 164daaf
commit 63e9e42
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/public/js/index.js b/public/js/index.js
@@ -37,7 +37,7 @@ var toneGenomeViz = new umviz.models.toneGenome()
   .width(880)
   .height(190)
   .margin({ top: -15, right: 50, bottom: 100, left: 45 })
-  .layoutMetric('count')
+  .layoutMetric('percentile')
   .colorSchema(COLOR_SCHEMA);
 
 // Visualization container
@@ -296,8 +296,8 @@ $(document).ready(function() {
         data: {
           word: word,
           limit: SYNONYM_LIMITS,
-//          context: cntxt.context,
-//          index: cntxt.offset,
+          context: cntxt.context.join(' '),
+          index: cntxt.offset, 
           hops: SYNONYM_HOPS
         },
         url: 'synonyms',

diff --git a/views/index.jade b/views/index.jade
@@ -53,11 +53,11 @@ block row-content
             div(role="tabpanel")
               ul.nav.nav-tabs(role="tablist")
                 li.active(role="presentation")
-                  a.metric-count(href="#wordcount", aria-controls="count", role="tab" data-toggle="tab")
-                    | Word Count
-                li(role="presentation")
                   a.metric-percentile(href="#percentile", aria-controls="percentile", role="tab", data-toggle="tab")
                     | Percentile
+                li(role="presentation")
+                  a.metric-count(href="#wordcount", aria-controls="count", role="tab" data-toggle="tab")
+                    | Word Count
                 li(role="presentation")
                   a(href="#json", aria-controls="json", role="tab" data-toggle="tab")
                     | JSON
@@ -66,13 +66,13 @@ block row-content
               div.form-group.row
                 div.col-lg-12.col-md-12.col-sm-12
                   div.tab-content
-                    div.tab-pane.active(id="wordcount", role="tabpanel")
-                      p Word Count returns the percentage of words per tone
-                        | and the total number of words for each individual
-                        | tone trait.
                     div.tab-pane(id="percentile", role="tabpanel")
                       p Percentile compares the raw output score to a preset scorecard.
                         | For this demo the scorecard is Business Email.
+                    div.tab-pane.active(id="wordcount", role="tabpanel")
+                      p Word Count returns the percentage of words per tone
+                        | and the total number of words for each individual
+                        | tone trait.    
                     div.tab-pane(id="json", role="tabpanel")
                       pre.json-div
                     div#visualization