[MERGE] Merge with Samuel updates.

static/js/libs

-/srv/gargantext_lib/libs
\ No newline at end of file
+/srv/gargantext_lib/js/libs
\ No newline at end of file

templates/explorer.html

 
-{% extends "menu.html" %}
-
 {% block css %}
 {% load staticfiles %}
 <link rel="stylesheet" href="{% static "css/bootstrap.css" %}">
@@ -10,10 +8,12 @@
 <link rel="stylesheet" href="{% static "js/libs/css2/freshslider.css" %}" media="screen">
 <link rel="stylesheet" href="{% static "js/libs/css2/custom.css" %}" media="screen">
 <link rel="stylesheet" href="{% static "js/libs/css2/sidebar.css" %}" media="screen">
+
 <!-- 
 <link rel="stylesheet" href="{% static "js/libs/bootswatch/css/bootswatch.css" %}">
 <link rel="stylesheet" href="{% static "js/libs/css2/font.css" %}" type="text/css">
---!>
+-->
+
 {% endblock %}
 
 
@@ -235,7 +235,7 @@
         <div id="tips"></div>
         <div id="names"></div>
 
-
+        
         <br>
         <div id="tab-container" class='tab-container' style="display: none;">
 
@@ -254,7 +254,8 @@
            </div>
 
         </div>
-
+        
+        
         <!-- <div id="topPapers"></div> -->
         <div id="information"></div>
       </div>
@@ -331,8 +332,6 @@
 </div>
 
 
-
-
 <div id="geomapmodal" class="modal fade">
 
     <!-- <div class="modal-content"> -->
@@ -344,7 +343,7 @@
         <div class="geomapCont"></div>
       </div>
     <!-- </div> -->
-  <!-- <div class="geomapCont"></div> -->
+      <!-- <div class="geomapCont"></div> -->
       <div id="closegeomap" data-dismiss="modal"></div>
 </div>
 
@@ -352,16 +351,17 @@
 </div>
 
 
+	<script src="{% static "js/libs/jquery/jquery-1.10.2.js" %}" type="text/javascript"></script>
+	<script src="{% static "js/libs/jquery/jquery-ui.js" %}" type="text/javascript"></script>
 
-    <script src="{% static "js/libs/jquery/jquery-1.10.2.js" %}" type="text/javascript"></script>
-    <script src="{% static "js/libs/jquery/jquery-ui.js" %}" type="text/javascript"></script>
     <script src="{% static "js/libs/jquery/jquery.ba-dotimeout.min.js" %}" type="text/javascript"></script>
     <script src="{% static "js/libs/jquery/jquery.mousewheel.min.js" %}" type="text/javascript"></script>
 
-    <script type="text/javascript" src="{% static "js/libs/freshslider.1.0.js" %}"></script>
+    <script type="text/javascript" src="{% static "js/libs/freshslider.1.0.js" %}"></script>    
     <script type="text/javascript" src="{% static "js/libs/readmore.js" %}"></script>
     <script type="text/javascript" src="{% static "js/libs/jquery/jquery.easytabs.min.js" %}"></script>
     
+    
     <script src="{% static "js/libs/bootstrap/js/bootstrap.min.js" %}"></script>
     <script src="{% static "js/libs/bootstrap/js/bootstrap-modal.js" %}" type="text/javascript"></script>
     <script src="{% static "js/libs/bootstrap/js/bootstrap-hover-dropdown.min.js" %}" type="text/javascript"></script>
@@ -383,13 +383,15 @@
     <script src="{% static "js/tinawebJS/main.js" %}" type="text/javascript" language="javascript"></script>
 
     <script type="text/javascript">
-        $('#tab-container').easytabs({updateHash:false});
+        // $('#tab-container').easytabs({updateHash:false});
         // Popup window code
-        function newPopup(url) {
-          popupWindow = window.open(
-            url,'popUpWindow','height=700,width=800,left=10,top=10,resizable=yes,scrollbars=yes,toolbar=no,menubar=no,location=no,directories=no,status=no')
-        }
+      $('#tab-container').easytabs({updateHash:false});
+      function newPopup(url) {
+        popupWindow = window.open(
+          url,'popUpWindow','height=700,width=800,left=10,top=10,resizable=yes,scrollbars=yes,toolbar=no,menubar=no,location=no,directories=no,status=no')
+      }
     </script>
 
 
+
 {% endblock %}