Merge branch 'staging' of https://github.com/OpenDSA/OpenDSA-LTI into staging

Author: awhicks

app/assets/javascripts/textbooks.js

@@ -192,7 +192,7 @@
     messages = check_completeness(true);
     if (messages.length !== 0) {
       form_alert(messages);
-      $('#btn-gen-textbook').prop('disabled', false);
+      $('#btn-gen-textbook').attr('disabled', false);
       return;
     }
     organization_id = $('#organization-select').val();

app/models/inst_exercise.rb

@@ -30,7 +30,6 @@ class InstExercise < ApplicationRecord
   #~ Hooks ....................................................................
   #~ Class methods ............................................................
   def self.save_data_from_json(book, inst_section, exercise_name, exercise_obj, update_mode = false)
-    # puts "inst_exercises"
     require 'json'
     ex = InstExercise.find_by short_name: exercise_name
     if !ex and exercise_obj.is_a?(Hash)
@@ -87,6 +86,16 @@ def self.save_data_from_json(book, inst_section, exercise_name, exercise_obj, up
     end
 
     book_sec_ex.save
+
+    if exercise_obj.key?('url')
+      ex.update(
+        short_name: exercise_name,
+        name:       exercise_obj['long_name'],
+        av_address: exercise_obj['url'],
+        width:      exercise_obj['width'],
+        height:     exercise_obj['height']
+      ) 
+    end
   end
 
   def self.get_av_dimensions(av_path)

app/views/courses/show.html.haml

@@ -64,12 +64,14 @@
               - course = Course.find_by(id:offering.course_id)
               - organization = Organization.find_by(id:course.organization_id)
               - term = Term.find_by(id:offering.term_id)
-              - if ENV["opendsa_branch"] == "staging"
-                = link_to "Textbook URL", "https://opendsax.cs.vt.edu/ODSA/" + "/Books/#{organization.slug}/#{course.slug}/#{term.slug}/#{offering.label}/html/"
+              - route = "Books/#{organization.slug}/#{course.slug}/#{term.slug}/#{offering.label}/html/".gsub(" ","_")
+              - if ENV["host_url"].include? "localhost"
+                - route = ENV["host_url"].gsub("-lti","") +"/" + route + "index.html"
+              - elsif ENV["opendsa_branch"] == "staging"
+                - route = "https://opendsax.cs.vt.edu/ODSA/" + route
               - elsif ENV["opendsa_branch"] == "master"
-                = link_to "Textbook URL", "https://opendsa-server.cs.vt.edu/ODSA/" + "/Books/#{organization.slug}/#{course.slug}/#{term.slug}/#{offering.label}/html/"
-              - else
-                = link_to "Textbook URL", ENV["config_api_link"].gsub("/api/configure/","/Books/#{organization.slug}/#{course.slug}/#{term.slug}/#{offering.label}/html/index.html")
+                - route = "https://opendsa-server.cs.vt.edu/ODSA/" + route
+              = link_to "Textbook URL", route
             %td
               - inst_book = InstBook.find_by(course_offering_id:offering.id)
               - form_name = 'compile_book_' + inst_book.id.to_s