Merge branch 'samuel' into unstable

static/js/Docs_dyna_chart_and_table.js

@@ -519,6 +519,7 @@ function SearchFilters( elem ) {
 
 
 
+$("#corpusdisplayer").hide()
 // FIRST portion of code to be EXECUTED:
 // (3) Get records and hyperdata for paginator
 $.ajax({
@@ -536,6 +537,11 @@ $.ajax({
     AjaxRecords = data.records; // backup-ing in global variable!
 
     var result = Main_test(data.records , "filter_all")
+    
+    $("#corpusdisplayer").show()
+    $("#content_loader").remove()
+    $("#corpusdisplayer").click()
+
     console.log( result )
   },
 });

static/js/Journals_dyna_chart_and_table.js

@@ -275,10 +275,6 @@ function ulWriter(rowIndex, record, columns, cellWriter) {
   return '<tr data-stuff='+data_id+'>' + tr + '</tr>';
 }
 
-
-
-
-
 function Main_test( data , initial) {
 
 
@@ -484,17 +480,17 @@ function Main_test( data , initial) {
 
     // // // $("#score_column_id").children()[0].text = FirstScore
     // // // // MyTable.data('dynatable').process();
-
     if ( $(".imadiv").length>0 ) return 1;
     $('<br><br><div class="imadiv"></div>').insertAfter(".dynatable-per-page")
     $(".dynatable-record-count").insertAfter(".imadiv")
     $(".dynatable-pagination-links").insertAfter(".imadiv")
 
-
-
     return "OK"
 }
 
+
+$("#corpusdisplayer").hide()
+
 console.log(window.location.href+"/journals.json")
 $.ajax({
   url: window.location.href+"/journals.json",
@@ -506,9 +502,9 @@ $.ajax({
     // // Initializing the Charts and Table
     var result = Main_test( data , "FirstScore" )
     console.log( result )
-
-
-
+    $("#corpusdisplayer").show()
+    $("#content_loader").remove()
+    $("#corpusdisplayer").click()
 
   }
 });
\ No newline at end of file

static/js/NGrams_dyna_chart_and_table.js

@@ -20,8 +20,6 @@ function getCookie(name) {
 }
 
 
-
-
 var latest,oldest;
 
 var TheBuffer = false

templates/corpus/documents.html

@@ -56,10 +56,9 @@ th a {
                     <center>
                         Blue bars: all,  Green line for zooming : select a time range to zoom in
                     <p align="center">
-                    <a class="btn btn-xs btn-default" role="button" href="/chart/corpus/{{ corpus.id }}/data.csv">Save</a></p>
+                    <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>
 
-                    <a class="reset" href="javascript:volumeChart.filterAll();dc.redrawAll();"
-                                        style="display: none;">reset</a>
                     <div class="clearfix"></div>
                     </center>
                 </div>
@@ -91,8 +90,7 @@ th a {
                 <div class="panel-heading">
                     <h4 class="panel-title">
                         <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
-                        <p id="corpusdisplayer" onclick='Final_UpdateTable("click")' 
-                        class="btn btn-primary btn-lg" style="width:200px; margin:0 auto; display:block;">Open Folder</h2></p>
+                        <p id="corpusdisplayer" onclick='Final_UpdateTable("click")' class="btn btn-primary btn-lg" style="width:200px; margin:0 auto; display:block;">Open Folder</h2></p>
                         </a>
                     </h4>
                 </div>

templates/corpus/journals.html

@@ -122,10 +122,9 @@ input[type=radio]:checked + label {
                     <strong>Title</strong> (Blue bars: all,  Green line: zoom)
                             Select a time range to zoom in
                     <p align="center">
-                    <a class="btn btn-xs btn-default" role="button" href="/chart/corpus/{{ corpus.id }}/data.csv">Save</a></p>
+                    <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>
                     
-                    <a class="reset" href="javascript:volumeChart.filterAll();dc.redrawAll();"
-                                        style="display: none;">reset</a>
                     <div class="clearfix"></div>
                     </center>
                 </div>

templates/corpus/terms.html

@@ -137,10 +137,9 @@ input[type=radio]:checked + label {
                     <center>
                         Blue bars: all,  Green line for zooming : select a time range to zoom in
                     <p align="center">
-                    <a class="btn btn-xs btn-default" role="button" href="/chart/corpus/{{ corpus.id }}/data.csv">Save</a></p>
+                    <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>
 
-                    <a class="reset" href="javascript:volumeChart.filterAll();dc.redrawAll();"
-                                        style="display: none;">reset</a>
                     <div class="clearfix"></div>
                     </center>
                 </div>