Commit c39ccba3 authored by c24b's avatar c24b

TPL: chart modifier up results down

parent 595e2812
...@@ -80,15 +80,14 @@ ...@@ -80,15 +80,14 @@
</a></li> --> </a></li> -->
<!-- TODO fix: category0 -> category1 switching --> <!-- TODO fix: category0 -> category1 switching -->
<li class='basicitem'><a> <li id="filter_graph" class='basicitem help'><a>
<!-- Create a subgraph --> <!-- Create a subgraph -->
<ul id="category0" class="nav"> <ul id="category0" class="nav">
<li><small>Nodes</small> <div id="slidercat0nodesweight" class="settingslider"></div></li> <li><small>Nodes</small> <div id="slidercat0nodesweight" class="settingslider"></div></li>
<li><small>Edges</small> <div id="slidercat0edgesweight" class="settingslider"></div></li> <li><small>Edges</small> <div id="slidercat0edgesweight" class="settingslider"></div></li>
</ul> </ul>
</a></li> </a></li>
<li id="filter_graph" class="basicitem help">
<li>
<!-- <li class='basicitem'><a> <!-- <li class='basicitem'><a>
Compare<br> Compare<br>
......
...@@ -21,6 +21,21 @@ ...@@ -21,6 +21,21 @@
<div class="container"> <div class="container">
<div class="col-md-3 col-md-offset-2"> <div class="col-md-3 col-md-offset-2">
<div class="bs-callout">
<div class="row">
<div id="monthly-volume-chart"></div>
</div>
<div id="content_loader">
<br>
<center>
<!-- <img width="10%" src="{% static "img/ajax-loader.gif"%}"></img> -->
</center>
<br>
</div>
</div>
<div id="monthly-move-chart"> <div id="monthly-move-chart">
<center> <center>
<p id="sources_time" class="help"> <p id="sources_time" class="help">
...@@ -36,19 +51,6 @@ ...@@ -36,19 +51,6 @@
</center> </center>
</div> </div>
<div class="bs-callout">
<div class="row">
<div id="monthly-volume-chart"></div>
</div>
<div id="content_loader">
<br>
<center>
<!-- <img width="10%" src="{% static "img/ajax-loader.gif"%}"></img> -->
</center>
<br>
</div>
</div>
</div> </div>
</div> </div>
......
...@@ -78,15 +78,7 @@ em { ...@@ -78,15 +78,7 @@ em {
<div class="container"> <div class="container">
<div class="col-md-3 col-md-offset-2"> <div class="col-md-3 col-md-offset-2">
<div id="monthly-move-chart">
<center>
<p id="terms_time" class="help">Select a score/frequency range in the chart with blue bars to zoom in <p>
<p align="center">
<!--<a class="btn btn-xs btn-default" role="button" href="/chart/corpus/{{ corpus.id }}/data.csv">Save</a>-->
<a class="btn btn-xs btn-default" href="javascript:volumeChart.filterAll();dc.redrawAll();">Reset</a></p>
<div class="clearfix"></div>
</center>
</div>
<div class="bs-callout"> <div class="bs-callout">
<div class="row"> <div class="row">
...@@ -101,6 +93,15 @@ em { ...@@ -101,6 +93,15 @@ em {
<br> <br>
</div> </div>
</div> </div>
<div id="monthly-move-chart">
<center>
<p id="terms_time" class="help">Select a score/frequency range in the chart with blue bars to zoom in <p>
<p align="center">
<!--<a class="btn btn-xs btn-default" role="button" href="/chart/corpus/{{ corpus.id }}/data.csv">Save</a>-->
<a class="btn btn-xs btn-default" href="javascript:volumeChart.filterAll();dc.redrawAll();">Reset</a></p>
<div class="clearfix"></div>
</center>
</div>
</div> </div>
</div> </div>
......
...@@ -19,30 +19,34 @@ ...@@ -19,30 +19,34 @@
<div class="container"> <div class="container">
<div class="col-md-3 col-md-offset-2"> <div class="col-md-3 col-md-offset-2">
<div id="monthly-move-chart"> <div class="bs-callout">
<center > <div class="row">
<p class="help" id="titles_time">Select a time range in the chart with blue bars to zoom in </p>
<p align="center"> <div id="monthly-volume-chart"></div>
<!--<a class="btn btn-xs btn-default" role="button" href="/chart/corpus/{{ corpus.id }}/data.csv">Save</a>--> </div>
<a class="btn btn-xs btn-default" href="javascript:volumeChart.filterAll();dc.redrawAll();">Reset</a> <div id="monthly-move-chart">
</p> <center>
<div class="clearfix"></div> <p class="help" id="titles_time">Select a time range in the chart with blue bars to zoom in </p>
</center> <p align="center">
</div> <!--<a class="btn btn-xs btn-default" role="button" href="/chart/corpus/{{ corpus.id }}/data.csv">Save</a>-->
<a class="btn btn-xs btn-default" href="javascript:volumeChart.filterAll();dc.redrawAll();">Reset</a>
</p>
<div class="clearfix"></div>
</center>
</div>
<div id="content_loader">
<br>
<center>
<img width="10%" src="{% static "img/ajax-loader.gif"%}"></img>
</center>
<br>
</div>
</div>
<div class="bs-callout">
<div class="row">
<div id="monthly-volume-chart"></div>
</div>
<div id="content_loader">
<br>
<center>
<img width="10%" src="{% static "img/ajax-loader.gif"%}"></img>
</center>
<br>
</div>
</div>
</div> </div>
</div> </div>
......
...@@ -399,6 +399,7 @@ ...@@ -399,6 +399,7 @@
<script type="text/javascript" src="{% static "lib/gargantext/garganrest.js" %}"></script> <script type="text/javascript" src="{% static "lib/gargantext/garganrest.js" %}"></script>
<!-- Graph renaming (load after garganrest)--> <!-- Graph renaming (load after garganrest)-->
<script type="text/javascript" src="{% static "lib/gargantext/graph_renamer.js" %}"></script> <script type="text/javascript" src="{% static "lib/gargantext/graph_renamer.js" %}"></script>
<!-- <script type="text/javascript" src="{% static "lib/gargantext/help.js" %}"></script> -->
{% endif %} {% endif %}
{% if debug == False %} {% if debug == False %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment