gui loose ends

explorerjs.html

@@ -155,13 +155,13 @@
 
             <li>
                <a>
-                <button type="button" id="changetype" class="btn btn-success btn-sm">Change Type</button>
+                <button type="button" id="changetype" class="btn btn-success btn-sm">Change<br>Type</button>
                </a>
             </li>
 
             <li>
                <a>
-                <button type="button" id="changelevel" class="btn btn-primary btn-sm" disabled>Change Level</button>
+                <button type="button" id="changelevel" class="btn btn-primary btn-sm" title="sélectionnez des sommets pour changer de niveau" disabled>Change<br>Level</button>
                </a>
             </li>
 
@@ -451,11 +451,11 @@
           </h4>
         </div>
 
-        <div class="panel-collapse collapse" id="le_tutorial">
-          <!-- TODO: outcloud the video for better stream+player -->
+        <!-- TODO: outcloud the video for better stream+player -->
+        <!-- <div class="panel-collapse collapse" id="le_tutorial">
           <video width="100%"
             src="video/AXA2015.mp4" controls=""  frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></video>
-        </div>
+        </div> -->
       </div>
 
       <div class="panel panel-default" id="tips_panel">
@@ -532,7 +532,7 @@
           </div>
 
           <div class="modal-body form-horizontal">
-            Which atributes do you want to keep?:
+            Which attributes do you want to keep?:
             <div class="form-group">
               <label class="col-lg-2 control-label"> </label>
               <div class="col-lg-10">

extras_explorerjs.js

@@ -305,6 +305,7 @@ function getTopPapers(type){
     if(TW.getAdditionalInfo){
         jsonparams=getSelections();
 
+        var joined_q = jsonparams.map(function(w) {return '('+w+')'}).join(' AND ')
 
         // console.log(jsonparams)
         // theHtml = "<p> jsonparams:"+jsonparams+" </p>"
@@ -312,16 +313,21 @@ function getTopPapers(type){
         $.ajax({
             type: 'GET',
             url: TW.APINAME,
-            data: {'query': jsonparams.join(' AND ')},
+            data: {'query': joined_q},
             contentType: "application/json",
             success : function(data){
                 // console.log(data);
 
                 var topTweetsHtml = ''
 
-                for (var k in data) {
-                  let tweetJson = data[k]
-                  topTweetsHtml += RenderTweet(tweetJson)
+                if (data.length) {
+                  for (var k in data) {
+                    let tweetJson = data[k]
+                    topTweetsHtml += RenderTweet(tweetJson)
+                  }
+                }
+                else {
+                  topTweetsHtml = `<p class="micromessage centered">The query <span class=code>${joined_q}</span> delivers no results on Twitter with the topic #Presidentielles2017 and most related hashtags</p>`
                 }
 
                 $("#topPapers").html(topTweetsHtml);
@@ -331,12 +337,6 @@ function getTopPapers(type){
                 console.log('Page Not found: getTopPapers');
             }
         });
-
-
-        // var theHtml = '<blockquote class="twitter-tweet"><p lang="fr" dir="ltr"><a href="https://twitter.com/hashtag/BuzzFeedHamon?src=hash">#BuzzFeedHamon</a> B. Hamon a une culture large de tous les domaines et est le seul candidat à maitriser tous les sujets et ne pas dire d&#39;intox!</p>&mdash; Nadine Badr Vovelle (@NadineVovelle) <a href="https://twitter.com/NadineVovelle/status/854322537198702592">April 18, 2017</a></blockquote><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>'
-        //
-        // $("#topPapers").html(theHtml);
-        // $("#topPapers").show()
     }
 }
 
@@ -446,32 +446,32 @@ function RenderTweet( tweet) {
 }
 
 //FOR UNI-PARTITE
-function selectionUni(currentNode){
-    console.log("\tin selectionUni:"+currentNode.id);
-    if(checkBox==false && cursor_size==0) {
-        highlightSelectedNodes(false);
-        opossites = [];
-        selections = [];
-    }
-
-    if((typeof selections[currentNode.id])=="undefined"){
-        selections[currentNode.id] = 1;
-        currentNode.active=true;
-    }
-    else {
-        delete selections[currentNode.id];
-        currentNode.active=false;
-    }
-    //highlightOpossites(nodes1[currentNode.id].neighbours);
-    //        currentNode.color = currentNode.customAttrs['true_color'];
-    //        currentNode.customAttrs['grey'] = 0;
-    //
-    //
-
-
-    TW.partialGraph.zoomTo(TW.partialGraph._core.width / 2, TW.partialGraph._core.height / 2, 0.8);
-    TW.partialGraph.render();
-}
+// function selectionUni(currentNode){
+//     console.log("\tin selectionUni:"+currentNode.id);
+//     if(checkBox==false && cursor_size==0) {
+//         highlightSelectedNodes(false);
+//         opossites = [];
+//         selections = [];
+//     }
+//
+//     if((typeof selections[currentNode.id])=="undefined"){
+//         selections[currentNode.id] = 1;
+//         currentNode.active=true;
+//     }
+//     else {
+//         delete selections[currentNode.id];
+//         currentNode.active=false;
+//     }
+//     //highlightOpossites(nodes1[currentNode.id].neighbours);
+//     //        currentNode.color = currentNode.customAttrs['true_color'];
+//     //        currentNode.customAttrs['grey'] = 0;
+//     //
+//     //
+//
+//
+//     TW.partialGraph.zoomTo(TW.partialGraph._core.width / 2, TW.partialGraph._core.height / 2, 0.8);
+//     TW.partialGraph.render();
+// }
 
 //JUST ADEME
 function camaraButton(){

libs/css2/twjs.css

@@ -121,6 +121,14 @@ html, body {
   display: none; /*not shown at init*/
 }
 
+/*thick buttons needs lift*/
+#changetype, #changelevel{
+  position: relative;
+  bottom: 2px;
+  font-size: 11px;
+  line-height: 12px;
+}
+
 /* override navbar toggle on right side when collapsed */
 #toolbar-open {
   float:left !important;
@@ -266,6 +274,14 @@ p.micromessage{
     font-size:80%;
 }
 
+.centered {
+  text-align: center;
+}
+
+.code {
+  font-family: "Fira Sans", "Courier", "Courier New", monospace;
+  color: '#222'
+}
 
 
 /* switch css -- generic (src: proto.io/freebies/onoff/)*/