Merge branch 'staging' into lti13

OpenDSA · Sep 10, 2024 · 048c6e5 · 048c6e5
2 parents 12dd503 + f1e322a
commit 048c6e5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
@@ -44,10 +44,10 @@ def index
         "keywords": keywords, 
         "exercise_name": exercise.name,
         "iframe_url": exercise.embed_url(host_url),
-        "lti_url": "#{host_url}/lti/launch?custom_ex_short_name=#{exercise.short_name}"
+        "lti_url": "#{host_url}/lti/launch?custom_ex_short_name=#{exercise.short_name}&custom_ex_settings=%7B%7D"
       }
     end.compact
 
     render json: export_data
   end
-end
+end
diff --git a/app/models/inst_book.rb b/app/models/inst_book.rb
@@ -326,4 +326,4 @@ def parse_json_options(json_str)
     {} 
   end
 
-end
+end
diff --git a/app/views/layouts/embed_inlineav.html.erb b/app/views/layouts/embed_inlineav.html.erb
@@ -4,7 +4,7 @@
   <title><%= @ex.name %></title>
   <link href="/OpenDSA/RST/_themes/haiku/static/haiku.css_t" rel="stylesheet" type="text/css"/>
   <link href="/OpenDSA/lib/normalize.css" rel="stylesheet" type="text/css"/>
-  <link href="/OpenDSA/JSAV/css/JSAV.css" rel="stylesheet" type="text/css"/>
+  <link href="/OpenDSA/lib/JSAV.css" rel="stylesheet" type="text/css"/>
   <link href="/OpenDSA/lib/odsaMOD-min.css" rel="stylesheet" type="text/css"/>
   <link href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css" rel="stylesheet" type="text/css"/>
   <link href="/OpenDSA/lib/odsaStyle-min.css" rel="stylesheet" type="text/css"/>
@@ -25,9 +25,9 @@
   <script src="https://code.jquery.com/jquery-2.1.4.min.js" type="text/javascript"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"></script>
   <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js" type="text/javascript"></script>
-  <script src="/OpenDSA/JSAV/lib/jquery.transit.js" type="text/javascript"></script>
-  <script src="/OpenDSA/JSAV/lib/raphael.js" type="text/javascript"></script>
-  <script src="/OpenDSA/JSAV/build/JSAV-min.js" type="text/javascript"></script>
+  <script src="/OpenDSA/lib/jquery.transit.js" type="text/javascript"></script>
+  <script src="/OpenDSA/lib/raphael.js" type="text/javascript"></script>
+  <script src="/OpenDSA/lib/JSAV-min.js" type="text/javascript"></script>
   <script src="/OpenDSA/lib/odsaUtils.js" type="text/javascript"></script>
   <script src="/OpenDSA/lib/odsaMOD.js" type="text/javascript"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.6/d3.min.js" type="text/javascript"></script>
@@ -36,4 +36,4 @@
     <%= yield %>
   </div>
 </body>
-</html>
+</html>
diff --git a/app/views/layouts/lti_launch.html.erb b/app/views/layouts/lti_launch.html.erb
@@ -4,7 +4,7 @@
   <title><%= @ex.name %></title>
   <link href="/OpenDSA/RST/_themes/haiku/static/haiku.css_t" rel="stylesheet" type="text/css"/>
   <link href="/OpenDSA/lib/normalize.css" rel="stylesheet" type="text/css"/>
-  <link href="/OpenDSA/JSAV/css/JSAV.css" rel="stylesheet" type="text/css"/>
+  <link href="/OpenDSA/lib/JSAV.css" rel="stylesheet" type="text/css"/>
   <link href="/OpenDSA/lib/odsaMOD-min.css" rel="stylesheet" type="text/css"/>
   <link href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css" rel="stylesheet" type="text/css"/>
   <link href="/OpenDSA/lib/odsaStyle-min.css" rel="stylesheet" type="text/css"/>
@@ -55,9 +55,9 @@
   <script src="https://code.jquery.com/jquery-2.1.4.min.js" type="text/javascript"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"></script>
   <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js" type="text/javascript"></script>
-  <script src="/OpenDSA/JSAV/lib/jquery.transit.js" type="text/javascript"></script>
-  <script src="/OpenDSA/JSAV/lib/raphael.js" type="text/javascript"></script>
-  <script src="/OpenDSA/JSAV/build/JSAV-min.js" type="text/javascript"></script>
+  <script src="/OpenDSA/lib/jquery.transit.js" type="text/javascript"></script>
+  <script src="/OpenDSA/lib/raphael.js" type="text/javascript"></script>
+  <script src="/OpenDSA/lib/JSAV-min.js" type="text/javascript"></script>
   <script src="/OpenDSA/lib/odsaUtils.js" type="text/javascript"></script>
   <script src="/OpenDSA/lib/odsaMOD.js" type="text/javascript"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.6/d3.min.js" type="text/javascript"></script>
@@ -123,4 +123,4 @@
     </form>
   </div>
 </body>
-</html>
+</html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -326,4 +326,4 @@ def parse_json_options(json_str) @@
         {}
       end
-    end
+    end