Merge branch 'master' into staging

Author: awhicks

app/controllers/embed_controller.rb

@@ -20,8 +20,9 @@ def show
       @message = "No resource found with the name \"#{params[:ex_short_name]}\""
       render 'lti/error' and return
     end
-    if !@ex.av_address.blank?
-      @ex_url = "#{request.protocol}#{request.host_with_port}/OpenDSA/#{@ex.av_address}"
+    inlineav_path = @ex.av_address.presence || InstExercise.inlineav_metadata_path(@ex.short_name)
+    if inlineav_path.present?
+      @ex_url = "#{request.protocol}#{request.host_with_port}/OpenDSA/#{inlineav_path}"
       render 'embed_av', layout: 'embed_inlineav'
     elsif !@ex.learning_tool.blank?
       # external tool

app/models/inst_exercise.rb

@@ -125,6 +125,16 @@ def self.embed_code(host, short_name, av_address=nil, height=nil)
     return "<iframe src=\"#{url}\" height=\"600\" width=\"100%\"></iframe>"
   end
 
+  def self.inlineav_metadata_path(short_name)
+    return nil if short_name.blank?
+    opendsa_root = Rails.root.join(OpenDSA::OPENDSA_DIRECTORY)
+    metadata_dir = opendsa_root.join('Metadata', 'inlineav')
+    return nil unless metadata_dir.exist?
+    match = Dir.glob(metadata_dir.join('**', "#{short_name}.html").to_s).first
+    return nil if match.blank?
+    Pathname.new(match).relative_path_from(opendsa_root).to_s
+  end
+
   #~ Instance methods .........................................................
 
   def embed_url(host)

app/views/home/books.html.haml

@@ -32,46 +32,6 @@
   content with annotations. Examples of these are shown in the
   supplemental section below.
 
-%p
-  Canvas versions (you will need to register for a free account at
-  %a{ href: 'http://canvas.instructure.com', target: "_blank" }
-    http://canvas.instructure.com
-  to view):
-
-%ul
-  %li
-    %a{ href: 'https://canvas.instructure.com/enroll/AA7HDH', target: "_blank" }
-      An objects-first CS1 course
-
-  %li
-    %a{ href: 'https://canvas.instructure.com/enroll/TXJGTB', target: "_blank" }
-      Data Structures topics for a CS2-level course
-
-  %li
-    %a{ href: 'https://canvas.instructure.com/enroll/JWADTJ', target: "_blank" }
-      A post-CS2-level course
-    on Data Structures (that we refer to as "CS3").
-
-  %li
-    %a{ href: 'https://canvas.instructure.com/enroll/8PMDLD', target: "_blank" }
-      A senior-level course on Algorithm Design and Analysis.
-
-  %li
-    %a{ href: 'https://canvas.instructure.com/enroll/FYDK3F', target: "_blank" }
-      All current OpenDSA content
-    related to Data Structures and Algorithms.
-
-  %li
-    %a{ href: 'https://canvas.instructure.com/enroll/MYGH4J', target: "_blank" }
-      Programming Languages
-
-  %li
-    %a{ href: 'https://canvas.instructure.com/enroll/HE9XXP', target: "_blank" }
-      Formal Languages and Automata (Programmed Instruction Version)
-
-%p
-  <br/>
-
 %p
   Supplemental reading versions and course slides/notes (directly accessible HTML pages):
 
@@ -132,6 +92,57 @@
     %a{ href: url, target: "_blank" }
       Coursenotes form of presentation slides a Formal Languages and Automata course
 
+%p
+  <br/>
+
+%p
+  [SORRY: Instructure has turned off canvas.instructure.com for
+  now. We will restore access to Canvas versions of these courses once
+  Instructure comes up with an alternative public site.]
+
+%p
+  <br/>
+
+%p
+  Canvas versions (you will need to register for a free account at
+  %a{ href: 'http://canvas.instructure.com', target: "_blank" }
+    http://canvas.instructure.com
+  to view):
+
+%ul
+  %li
+    %a{ href: 'https://canvas.instructure.com/enroll/AA7HDH', target: "_blank" }
+      An objects-first CS1 course
+
+  %li
+    %a{ href: 'https://canvas.instructure.com/enroll/TXJGTB', target: "_blank" }
+      Data Structures topics for a CS2-level course
+
+  %li
+    %a{ href: 'https://canvas.instructure.com/enroll/JWADTJ', target: "_blank" }
+      A post-CS2-level course
+    on Data Structures (that we refer to as "CS3").
+
+  %li
+    %a{ href: 'https://canvas.instructure.com/enroll/8PMDLD', target: "_blank" }
+      A senior-level course on Algorithm Design and Analysis.
+
+  %li
+    %a{ href: 'https://canvas.instructure.com/enroll/FYDK3F', target: "_blank" }
+      All current OpenDSA content
+    related to Data Structures and Algorithms.
+
+  %li
+    %a{ href: 'https://canvas.instructure.com/enroll/MYGH4J', target: "_blank" }
+      Programming Languages
+
+  %li
+    %a{ href: 'https://canvas.instructure.com/enroll/HE9XXP', target: "_blank" }
+      Formal Languages and Automata (Programmed Instruction Version)
+
+%p
+  <br/>
+
 %p
   WARNING TO INSTRUCTORS: Some instructors like to give their students
   access to these public instances of our materials. That is fine so