Merge branch 'samuel' into unstable

static/js/Journals_dyna_chart_and_table.js

@@ -275,6 +275,10 @@ function ulWriter(rowIndex, record, columns, cellWriter) {
   return '<tr data-stuff='+data_id+'>' + tr + '</tr>';
 }
 
+
+
+
+
 function Main_test( data , initial) {
 
 
@@ -480,15 +484,20 @@ 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")
@@ -502,6 +511,7 @@ $.ajax({
     // // Initializing the Charts and Table
     var result = Main_test( data , "FirstScore" )
     console.log( result )
+
     $("#corpusdisplayer").show()
     $("#content_loader").remove()
     $("#corpusdisplayer").click()

templates/corpus/terms.html

@@ -238,12 +238,74 @@ input[type=radio]:checked + label {
             </div>
 
           </div>
+
         </div>
+
+
       </div> 
 
     </div>
 
 
+    <div id="pre_savechanges" class="modal fade">
+
+      <div class="modal-dialog">
+
+        <div class="modal-content">
+          
+
+          <div class="modal-header">
+            <h3 class="modal-title">Do you want to apply these to the whole Project as well?:</h3>
+          </div>
+
+          <div class="modal-body">
+
+            <div id="stoplist_content">
+            </div>
+
+            <!-- 
+              <ul class="nav nav-tabs">
+                <li class="active"><a id="stoplist" href="#stoplist_content">Stop List</a></li>
+                <li><a id="maplist" href="#maplist_content">Map List</a></li>
+                <li><a id="grouplist" href="#grouplist_content">Group List</a></li>
+              </ul>
+
+              <div class="tab-content">
+                <div id="stoplist_content" class="tab-pane fade in active">
+                  <ul>
+                    <li>jiji01</li>
+                    <li>jiji02</li>
+                    <li>jiji03</li>
+                  </ul>
+                </div>
+
+                <div id="maplist_content" class="tab-pane fade">
+                  qowieuoqiwueowq
+                </div>
+
+                <div id="grouplist_content" class="tab-pane fade">
+                  asdhasjkdhasjdh
+                </div>
+
+              </div>
+            -->
+
+            <div class="modal-footer">
+              <button onclick="SaveGlobalChanges(this.id)" id="nope" type="button" class="btn btn-default" data-dismiss="modal">No</button>
+              <button onclick="SaveGlobalChanges(this.id)" id="yep" type="button" class="btn btn-primary">Yes</button>
+            </div>
+
+
+          </div>
+
+
+        </div>
+
+      </div>
+
+    </div>
+
+
 
 
 <div id="filter_search" style="visibility:hidden">
@@ -264,7 +326,7 @@ input[type=radio]:checked + label {
     <!-- </optgroup> -->
 </select>
 
-<button id="ImportList" onclick="GetUserPortfolio(); $('#corpuses').modal('show');" class="btn btn-warning">Import a Corpus-List</button>
+<button id="ImportList" onclick="GetUserPortfolio();" class="btn btn-warning">Import a Corpus-List</button>
 
 </div>