Skip to content

Commit

Permalink
Merge pull request #1218 from avalonmediasystem/hydra10-processing-st…
Browse files Browse the repository at this point in the history
…atus

fix processing status and now playing indicator
  • Loading branch information
carrickr authored Sep 29, 2016
2 parents 7e7455d + f9f428c commit c315ffb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions app/assets/javascripts/avalon_progress.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ class AvalonProgress
sections = $('a[data-segment]')
sections.each (i,sec) =>
id = $(sec).data('segment')
bar = $(sec).closest('.panel-title').find('span.progress')
info_box = $(sec).next('div.alert')
section_node = $(sec).closest('.panel-title')
bar = section_node.find('span.progress')
info_box = section_node.find('div.alert')

info = @data[id]

Expand Down
4 changes: 2 additions & 2 deletions app/helpers/media_objects_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def structure_html section, index, show_progress
if section.structuralMetadata.empty?
label = "#{index+1}. #{stream_label_for(section)} #{duration}".html_safe
link = link_to label, share_link_for( section ), data: data, class: 'playable wrap' + (current ? ' current-stream current-section' : '')
return "#{headeropen}<ul><li>#{link}</li></ul>#{headerclose}"
return "#{headeropen}<ul><li class='stream-li'>#{link}</li></ul>#{headerclose}"
end

sectionnode = section.structuralMetadata.xpath('//Item')
Expand Down Expand Up @@ -224,7 +224,7 @@ def parse_node section, node, tracknumber
url = "#{share_link_for( section )}?t=#{start},#{stop}"
data = {segment: section.id, is_video: section.is_video?, native_url: native_url, fragmentbegin: start, fragmentend: stop}
link = link_to label, url, data: data, class: 'playable wrap'+(is_current_section?(section) ? ' current-stream' : '' )
return "<li>#{link}</li>", tracknumber
return "<li class='stream-li'>#{link}</li>", tracknumber
end
end

Expand Down

0 comments on commit c315ffb

Please sign in to comment.