better brand management + nicer logos

explorerjs.html

@@ -160,8 +160,8 @@
             <li><a href="http://www.politoscope.org"
                   class="navbar-higher"
                   title="Politoscope">
-                  <img src="libs/img2/politoscope_logo.jpg"
-                       style="width:60px; position:absolute; top:-60px; left:-75px; z-index:5; overflow:visible; background-color:white">
+                  <img src="libs/img2/logo.png"
+                       style="width:60px; position:absolute; top:-60px; left:-75px; z-index:5; overflow:visible;">
             </a></li>
 
             <li>
@@ -768,15 +768,12 @@
 
   <!-- classic tinawebJS imports -->
   <script type="text/javascript" src="tinawebJS/jLouvain.js"></script>
-  <!-- <script src="tinawebJS/sigma.v1.customized.js" type="text/javascript" language="javascript"></script> -->
-  <!-- <script src="tinawebJS/sigma.forceatlas2.js" type="text/javascript" language="javascript"></script> -->
   <script src="settings_explorerjs.js" type="text/javascript" language="javascript"></script>
   <script src="tinawebJS/enviroment.js" type="text/javascript" language="javascript"></script>
   <script src="tinawebJS/sigma.parseCustom.js" type="text/javascript" language="javascript"></script>
   <script src="tinawebJS/sigmaUtils.js" type="text/javascript" language="javascript"></script>
   <script src="extras_explorerjs.js" type="text/javascript" language="javascript"></script>
   <script src="tinawebJS/methods.js" type="text/javascript" language="javascript"></script>
-  <!-- <script src="tinawebJS/asyncFA2.js" type="text/javascript" language="javascript"></script> -->
   <script src="tinawebJS/Tinaweb.js" type="text/javascript" language="javascript"></script>
   <script src="tinawebJS/main.js" type="text/javascript" language="javascript"></script>
   <script src="twitterAPI2/twitterlibs/widgets.js" type="text/javascript" language="javascript"></script>

tinawebJS/enviroment.js

@@ -131,8 +131,14 @@ function getHeatmapColors(nClasses) {
 }
 
 
-function writeBrand (brandString) {
+function writeBrand (brandString, brandLink) {
   document.getElementById('twbrand').innerHTML = brandString
+  let anchors = document.getElementsByClassName('twbrand-link')
+  for (var k in anchors) {
+    if (anchors[k] && anchors[k].href) {
+      anchors[k].href = brandLink
+    }
+  }
 }
 
 function writeLabel (aMapLabel) {

tinawebJS/main.js

@@ -55,8 +55,8 @@ TW.instance.init()
 TW.instance.initGUIListeners();
 TW.instance.initSearchListeners();
 
-// show the custom name of the app
-writeBrand(TW.conf.branding)
+// show the custom name + home link of the app
+writeBrand(TW.conf.branding, TW.conf.brandingLink)
 
 // choosing the input
 // -------------------
@@ -361,9 +361,6 @@ function mainStartGraph(inFormat, inData, twInstance) {
       // ex: [true,false] = [nodes of type 0 shown  ; nodes of type 1 not drawn]
       var initialActivetypes = TW.instance.initialActivetypes( TW.categories )
 
-      // remember it
-      TW.pushState({'activetypes': initialActivetypes})
-
       // XML parsing from ParseCustom
       var dicts = start.makeDicts(TW.categories); // > parse json or gexf, dictfy
 
@@ -437,7 +434,6 @@ function mainStartGraph(inFormat, inData, twInstance) {
         if (TW.graphData.nodes.length == 0) console.error("empty graph")
         if (TW.graphData.edges.length == 0) console.error("no edges in graph")
 
-
       // our final sigma params (cf github.com/jacomyal/sigma.js/wiki/Settings)
       TW.customSettings = Object.assign(
 
@@ -493,6 +489,9 @@ function mainStartGraph(inFormat, inData, twInstance) {
       });
       // ==================================================================
 
+      // a new state
+      TW.pushState({'activetypes': initialActivetypes})
+
       // NB the list of nodes and edges from TW.graphData will be changed
       //    by changeLevel, changeType or subset sliders => no need to keep it
       delete TW.graphData