[FEATURE] GRAPH removing top bar and fix settings.

gargantext_web/settings.py

@@ -86,7 +86,7 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'NAME': 'gargandb',
-        'USER': 'pksm3',
+        'USER': 'alexandre',
         'PASSWORD': 'C8kdcUrAQy66U',
         #'USER': 'gargantext',
         #'PASSWORD': 'C8krdcURAQy99U',

node/models.py

@@ -96,13 +96,9 @@ class Node(CTENode):
     
     
     def add_resource(self, **kwargs):
-<<<<<<< HEAD
         # only for tests
         resource = Resource(guid=str(time()), digest=str(time()), **kwargs )
         
-=======
-        resource = Resource(**kwargs)
->>>>>>> 00f422e66ce8fcb7f534fdb51a21500042c8b6f9
         # TODO: verifier si tous ces 'save' sont reellement utiles
         resource.save()
         node_resource = Node_Resource(

templates/explorer.html

@@ -25,51 +25,6 @@
         </div>
 
 
-  	<!-- this is the topbar -->
-    <div id="fixedtop" class="navbar navbar-default navbar-fixed-top">
-      <div class="container">
-
-        <div class="navbar-header">
-          <a href="index.html" class="navbar-brand"> <img width="20px" src="libs/img2/home.png"></img> ComexJS</a>
-          <button class="navbar-toggle" type="button" data-toggle="collapse" data-target="#navbar-main">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-        </div>
-
-        <div class="navbar-collapse collapse" id="navbar-main">
-          <ul class="nav navbar-nav">
-
-            <li class="disabled">
-		          <a>
-                <span class="label label-default">NETWORK: </span>
-              </a>
-            </li>
-
-            <li>
-              <a>
-                <span id="network" class="label label-success"></span>
-              </a>
-            </li>
-            
-
-            <li>
-            .
-            <div id="log"></div>
-            </li>
-
-          </ul>
-
-          <ul class="nav navbar-nav navbar-right">
-            <li><a href="http://www.cnrs.fr" target="_blank">CNRS</a></li>
-            <li><a href="http://iscpif.fr" target="_blank">ISC-PIF</a></li>
-          </ul>
-
-        </div><!--navbar-main-->
-      </div><!--container-->
-    </div><!--navbar-fixed-top-->
-
     <!-- this is the tweakbar -->
     <div id="defaultop" class="navbar navbar-default">
         <div class="navbar-collapse collapse navbar-responsive-collapse">