d3graph 3.1.0__tar.gz → 3.1.2__tar.gz

{d3graph-3.1.0 → d3graph-3.1.2}/MANIFEST.in

@@ -1,3 +1,4 @@
 include d3graph/d3js/*.js
 include d3graph/d3js/*.css
 include d3graph/d3js/*.j2
+include d3graph/d3js/logo.txt

{d3graph-3.1.0/d3graph.egg-info → d3graph-3.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: d3graph
-Version: 3.1.0
+Version: 3.1.2
 Summary: Python package to create interactive network based on d3js.
 Author-email: Erdogan Taskesen <erdogant@gmail.com>
 License-Expression: BSD-3-Clause

{d3graph-3.1.0 → d3graph-3.1.2}/d3graph/__init__.py

@@ -17,7 +17,7 @@ from d3graph.d3graph import (
 
 __author__ = 'Erdogan Tasksen'
 __email__ = 'erdogant@gmail.com'
-__version__ = '3.1.0'
+__version__ = '3.1.2'
 
 # Setup root logger
 _logger = logging.getLogger('d3graph')

{d3graph-3.1.0 → d3graph-3.1.2}/d3graph/d3graph.py

@@ -98,7 +98,7 @@ class d3graph:
         # Set paths
         self.config['curpath'] = os.path.dirname(os.path.abspath(__file__))
         self.config['d3_library'] = os.path.abspath(os.path.join(self.config['curpath'], 'd3js/d3.v3.js'))
-        self.config['d3_script'] = os.path.abspath(os.path.join(self.config['curpath'], 'd3js/d3graphscript.js'))
+        self.config['d3_script'] = os.path.abspath(os.path.join(self.config['curpath'], 'd3js/d3graph.js'))
         self.config['css'] = os.path.abspath(os.path.join(self.config['curpath'], 'd3js/style.css'))
 
     def _clean(self, clean_config: bool = True) -> None:
@@ -908,7 +908,7 @@ class d3graph:
             jinja_env = Environment(loader=PackageLoader(package_name=__name__, package_path='d3js'))
         except:
             jinja_env = Environment(loader=PackageLoader(package_name='d3graph', package_path='d3js'))
-        index_template = jinja_env.get_template('index.html.j2')
+        index_template = jinja_env.get_template('d3graph.html.j2')
         html = index_template.render(content)
 
         index_file = self.config['filepath']

d3graph-3.1.0/d3graph/d3js/index.html.j2 → d3graph-3.1.2/d3graph/d3js/d3graph.html.j2

@@ -19,11 +19,23 @@
      HTML into a page that supplies its own button chrome but still wants
      the slider). -->
 {% if show_controls or max_slider > min_slider %}
-<div class="header-row">
-    <div class="search-wrap">
-        <input class="search-input" id="searchInput" type="search" placeholder="Find a node…" autocomplete="off" spellcheck="false" />
-        <div class="search-results" id="searchResults"></div>
+<div class="header-row">
+    
+    <div class="header-row-left">
+        <div class="top-panel-left">
+            <a href="https://d3blocks.github.io/d3blocks/" title="D3Blocks">
+                <img src="{% include 'logo.txt' %}" alt="D3Blocks" style="width:150px;height:auto;display:block;pointer-events:auto" />
+            </a>
+        </div>
     </div>
+
+    <div class="header-row-left">
+        <div class="search-wrap">
+            <input class="search-input" id="searchInput" type="search" placeholder="Find a node…" autocomplete="off" spellcheck="false" />
+            <div class="search-results" id="searchResults"></div>
+        </div>
+    </div>
+
     {% if max_slider > min_slider %}
     {{ slider_comment_start }}
     <div class="slider-container">
@@ -37,11 +49,13 @@
     {{ slider_comment_stop }}
     {% endif %}
 {% if show_controls %}
+
 <div class="top-panel">
     <button id="darkModeSwitch" class="button-switch">{% if dark_mode %}☀ Light Mode{% else %}🌙 Dark Mode{% endif %}</button>
     <button id="edgeToggleButton" class="button-switch">Hide Edges</button>
     <button id="densityToggleButton" class="button-switch">{% if show_density %}Hide Density{% else %}Show Density{% endif %}</button>
 </div>
+
 {% endif %}
 </div>
 {% endif %}
@@ -50,6 +64,7 @@
 <!-- Side panel: data/image export actions, previously loose buttons in the
      top-panel row — grouped here since they're one-off actions rather than
      persistent view controls, and it keeps the top-panel row shorter. -->
+
 <div class="stats-panel collapsed" id="exportPanel">
     <div class="stats-panel-title">Export<span class="stats-panel-toggle" aria-hidden="true"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><polyline points="6 9 12 15 18 9"></polyline></svg></span></div>
     <div class="stats-panel-body">
@@ -77,7 +92,7 @@
 <!-- Layout panel (Force-directed / Circular / Grid) removed from the UI -
      circular/grid felt too static to be useful. The underlying setLayout()/
 
-     layoutCircular()/layoutGrid() functions are still in d3graphscript.js,
+     layoutCircular()/layoutGrid() functions are still in d3graph.js,
      just unwired, in case this is worth revisiting later. -->
 
 <!-- Side panel: interactively tune the force simulation -->
@@ -148,7 +163,7 @@
 
     <script>
         {% include "d3.v3.js" %}
-        {% include "d3graphscript.js" %}
+        {% include "d3graph.js" %}
 
         graph = {{ json_data }}