Changes

app/controllers/admin/accounts_controller.rb

@@ -20,6 +20,7 @@ class Admin::AccountsController < Admin::ApplicationController
 
   def show
     @videos = filtered_account_videos.order(created_at: :desc, project_id: :desc).paginate(page: params[:page])
+    @broadcasts = account_broadcasts.order(created_at: :desc, project_id: :desc).paginate(page: params[:page])
   end
 
   def edit
@@ -70,4 +71,8 @@ class Admin::AccountsController < Admin::ApplicationController
       @account.videos
     end
   end
+
+  def account_broadcasts
+    @account.broadcasts
+  end
 end

app/controllers/admin/broadcasts_controller.rb

@@ -0,0 +1,24 @@
+class Admin::BroadcastsController < Admin::ApplicationController
+  before_action :set_broadcast, only: [:edit, :update]
+
+  def edit
+  end
+
+  def update
+    if @broadcast.update(broadcast_update_params)
+      redirect_to [:admin, @broadcast.project.account], notice: t(".notice")
+    else
+      render :edit
+    end
+  end
+
+  private
+
+  def set_broadcast
+    @broadcast = authorize policy_scope(Broadcast).find(params[:id])
+  end
+
+  def broadcast_update_params
+    params.require(:broadcast).permit(:stream_url_override, :stream_key_override, :director_mode_video_embed)
+  end
+end

app/controllers/broadcast_recordings_controller.rb

@@ -0,0 +1,26 @@
+class BroadcastRecordingsController < ApplicationController
+  layout "project"
+
+  before_action :set_project
+  before_action :set_broadcast
+  before_action :set_recording
+
+  def destroy
+    @recording.update(hidden: true)
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
+  end
+
+  private
+
+  def set_project
+    @project = policy_scope(Project).find(params[:project_id])
+  end
+
+  def set_broadcast
+    @broadcast = authorize policy_scope(@project.broadcasts).find(params[:broadcast_id])
+  end
+
+  def set_recording
+    @recording = authorize policy_scope(@broadcast.broadcast_recordings).find(params[:id])
+  end
+end

app/controllers/broadcasts_controller.rb

@@ -27,7 +27,7 @@ class BroadcastsController < ApplicationController
 
   def show
     @conference_url = url_for [@broadcast.project, @broadcast, :zoom_meeting]
-    @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
     @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page])
     render layout: 'application'
   end

app/controllers/public/broadcasts_controller.rb

@@ -5,7 +5,7 @@ class Public::BroadcastsController < Public::BaseController
   def show
     @conference_url = broadcast_zoom_meeting_url(@broadcast.token)
     @multi_view_broadcasts = multi_view_broadcasts
-    @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
     @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page])
 
     render 'broadcasts/show'

app/controllers/stream_notifications_controller.rb

@@ -35,7 +35,7 @@ class StreamNotificationsController < ApplicationController
       duration = notification.dig(:data, :duration)
 
       recording = @broadcast.broadcast_recordings.create!(asset_uid: asset_uid, asset_playback_uid: playback_uid, file_name: file_name, duration: duration)
-      recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
+      recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
 
       link = helpers.link_to(recording.broadcast_name.titleize, recording.download_url, target: "_blank")
       message = "Your recent live stream has been recorded and is available for download here: #{link}"

app/models/account.rb

@@ -5,6 +5,7 @@ class Account < ApplicationRecord
   has_many :users, through: :account_auths
   has_many :projects, dependent: :destroy
   has_many :videos, through: :projects
+  has_many :broadcasts, through: :projects
   has_many :contract_templates, through: :projects
 
   validates :name, presence: true

app/models/broadcast.rb

@@ -35,7 +35,11 @@ class Broadcast < ApplicationRecord
   end
 
   def stream_server_url
-    ENV['MUX_BROADCAST_SERVER_URL']
+    stream_url_override.presence || ENV["MUX_BROADCAST_SERVER_URL"]
+  end
+
+  def stream_server_key
+    stream_key_override.presence || stream_key
   end
 
   def zoom_meeting_url

app/models/broadcast_recording.rb

@@ -5,6 +5,8 @@ class BroadcastRecording < ApplicationRecord
 
   validates :asset_uid, uniqueness: true
 
+  scope :visible, -> { where(hidden: false) }
+
   def download_url
     "https://stream.mux.com/#{asset_playback_uid}/#{file_name}?download=#{download_file_name}"
   end

app/policies/broadcast_recording_policy.rb

@@ -0,0 +1,9 @@
+class BroadcastRecordingPolicy < ApplicationPolicy
+  def destroy?
+    if user.nil? || user.user.nil?
+      return false
+    end
+    
+    user.manager? || user.account_manager?
+  end
+end

app/views/admin/accounts/_broadcast.html.erb

@@ -0,0 +1,13 @@
+<tr>
+  <td><%= broadcast.project.name %></td>
+  <td><%= broadcast.name %></td>
+  <td class="text-right">
+    <div class="btn-group">
+      <%= button_tag "Manage", class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %>
+      <div class="dropdown-menu dropdown-menu-right">
+        <%= link_to "View on Mux", "#{ENV['MUX_LIVE_STREAM_DASHBOARD_URL']}/#{broadcast.stream_uid}", class: "dropdown-item", target: "_blank" %>
+        <%= link_to "Edit", [:edit, :admin, broadcast, locale: I18n.locale], class: "dropdown-item" %>
+      </div>
+    </div>
+  </td>
+</tr>

app/views/admin/accounts/show.html.erb

@@ -34,5 +34,25 @@
         <%= will_paginate @videos %>
       </div>
     <% end %>
+    <hr>
+    <%= card_field_set_tag "Broadcasts" do %>
+      <div class="table-responsive-sm">
+        <table class="table table-striped tr-px-4 align-all-middle">
+          <thead class="thead-light">
+            <tr>
+              <th>Project</th>
+              <th>Name</th>
+              <th></th>
+            </tr>
+          </thead>
+          <tbody id="broadcasts">
+            <%= render partial: "admin/accounts/broadcast", collection: @broadcasts %>
+          </tbody>
+        </table>
+      </div>
+      <div id="broadcasts_pagination">
+        <%= will_paginate @broadcasts %>
+      </div>
+    <% end %>
   </div>
 </div>

app/views/admin/broadcasts/_form.html.erb

@@ -0,0 +1,14 @@
+<%= errors_summary_for broadcast %>
+
+<%= bootstrap_form_with model: model, local: true do |form| %>
+  <%= form.text_field :stream_url_override %>
+  <%= form.text_field :stream_key_override %>
+  <%= form.text_area :director_mode_video_embed %>
+
+  <div class="row align-items-center text-center mt-4">
+    <%= link_to t("shared.cancel"), [:admin, broadcast.project.account], class: "col-3 text-reset" %>
+    <div class="col-9">
+      <%= form.submit class: class_string("btn btn-block", ["btn-success", "btn-primary"] => broadcast.new_record?), data: { disable_with: t("shared.disable_with") } %>
+    </div>
+  </div>
+<% end %>

app/views/admin/broadcasts/edit.html.erb

@@ -0,0 +1,6 @@
+<div class="card shadow-sm">
+  <%= card_header text: t(".heading"), close_action_path: [:admin, @broadcast.project.account] %>
+  <div class="card-body">
+    <%= render "form", model: [:admin, @broadcast], broadcast: @broadcast %>
+  </div>
+</div>

app/views/broadcast_recordings/destroy.js.erb

@@ -0,0 +1,6 @@
+var dom_id = "<%= dom_id(@recording) %>"
+$('[data-id="' + dom_id + '"]').remove();
+<% if @recordings.empty? %>
+  $("#broadcast_recordings_nav").append('<p class="dropdown-item text-muted">Recordings will appear here</p>')
+<% end %>
+$("#broadcast_recordings").html("<%= j render(partial: 'broadcasts/broadcast_recordings', locals: { recordings: @recordings, broadcast: @broadcast }) %>");

app/views/broadcasts/_broadcast.html.erb

@@ -16,8 +16,8 @@
     <div class="btn-group">
       <%= button_tag t(".actions.manage"), class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %>
       <div class="dropdown-menu dropdown-menu-right">
-        <%= link_to fa_icon("link fw", text: "Copy Stream URL"), ENV['MUX_BROADCAST_SERVER_URL'], class: "dropdown-item", data: { behavior: "clipboard" } %>
-        <%= link_to fa_icon("key fw", text: "Copy Stream Key"), broadcast.stream_key, class: "dropdown-item", data: { behavior: "clipboard" } %>
+        <%= link_to fa_icon("link fw", text: "Copy Stream URL"), broadcast.stream_server_url, class: "dropdown-item", data: { behavior: "clipboard" } %>
+        <%= link_to fa_icon("key fw", text: "Copy Stream Key"), broadcast.stream_server_key, class: "dropdown-item", data: { behavior: "clipboard" } %>
         <% if policy(broadcast).show? %>
           <%= link_to fa_icon("file-video-o fw", text: "View"), [broadcast.project, broadcast], class: "dropdown-item", target: '_blank' %>
         <% end %>

app/views/broadcasts/_broadcast_recording_nav.html.erb

@@ -1,2 +1,3 @@
-<%= link_to broadcast_recording.download_file_name, "javascript:void(0);", class: "dropdown-item", data: { behavior: "play_recording", playback_url: broadcast_recording.playback_url } %>
+<%= link_to broadcast_recording.download_file_name, "javascript:void(0);", class: "dropdown-item", data: { behavior: "play_recording", playback_url: broadcast_recording.playback_url, id: dom_id(broadcast_recording) } %>
+
 

app/views/broadcasts/_broadcast_recordings.html.erb

@@ -2,7 +2,12 @@
   <p>Click below to download the recordings of the live stream.</p>
   <ul class="mt-2">
     <% recordings.each do |recording| %>
-      <li><%= link_to(recording.download_file_name, recording.download_url, target: "_blank") %></li>
+      <li>
+        <%= link_to(recording.download_file_name, recording.download_url, target: "_blank") %> 
+        <% if (controller.class.module_parent.to_s != "Public" && policy(BroadcastRecording).destroy?) %>
+          <%= link_to "Hide", [broadcast.project, broadcast, recording], class: "btn-sm btn-primary ml-1 text-decoration-none", remote: true, method: :delete, data: { confirm: t('.confirm_hide') } %>
+        <% end %>
+      </li>
     <% end %>
   </ul>
   <div id="recordings_pagination" class="row mt-5 justify-content-center">

app/views/broadcasts/_video.html.erb

@@ -1,5 +1,9 @@
 <% if broadcast.streamer_recording? && broadcast.active? %>
   <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream"></div>
+<% elsif broadcast.director_mode_video_embed.present? && params[:director_mode] == "true" %>
+  <div class="embed-responsive-item" data-video-type="stream">
+    <%= raw broadcast.director_mode_video_embed %>
+  </div>
 <% else %>
   <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream">
     <table class="w-100 h-100 bg-secondary">
@@ -12,4 +16,4 @@
       </tbody>
     </table>
   </div>
-<% end %>
+<% end %>

app/views/broadcasts/show.html.erb

@@ -39,6 +39,15 @@
                   <%= link_to broadcast.name.titleize, broadcast.url, data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
                 <% end %>
               <% end %>
+              <% if @broadcast.director_mode_video_embed.present? %>
+                <h5 class="dropdown-header">Director Mode</h5>
+                <% unless params[:director_mode] %>
+                  <%= link_to "Enable Director Mode", url_for(params.permit!.merge(director_mode: true)), class: "dropdown-item" %>
+                <% else %>
+                  <%= link_to "Disable Director Mode", url_for(params.permit!.except(:director_mode)), class: "dropdown-item" %>
+
+                <% end %>
+              <% end %>
               <h5 class="dropdown-header">Previous Sessions</h5>
               <div id="broadcast_recordings_nav">
                 <% if @recordings.any? %>

app/views/location_releases/_location_release.html.erb

@@ -16,10 +16,10 @@
     <% end %>
   </td>
   <td>
-    <%= location_release.name %>
+    <%= contact_info(name: location_release.name, address: location_release.address) %>
   </td>
   <td>
-    <%= contact_info address: location_release.address %>
+    <%= contact_info_for(location_release.contact_person) %>
   </td>
   <td>
     <%= notes_preview location_release.notes.order_by_recent %>

app/views/location_releases/index.html.erb

@@ -28,8 +28,8 @@
         <th data-behavior="all-selectable"><%= check_box_tag "location_release_ids[]", false, false %></th>
         <th><%= t '.table_headers.approved'%></th>
         <th></th>
-        <th><%= t(".table_headers.name") %></th>
-        <th><%= t(".table_headers.address") %>
+        <th><%= t(".table_headers.location_info") %></th>
+        <th><%= t(".table_headers.owner_info") %>
         <th><%= t(".table_headers.notes") %></th>
         <th><%= t(".table_headers.tags") %></th>
         <th><%= t(".table_headers.signed_at") %></th>

app/views/public/amendments/new.html.erb

@@ -8,6 +8,10 @@
   <div class="card-body">
     <%= errors_summary_for @release %>
     <%= bootstrap_form_with model: @release, method: :post, url: public_send("account_project_contract_template_#{@contract_template.release_type}_release_amendments_path"), local: true do |form| %>
+      <%= card_field_set_tag t('.signed_contract_preview') do %>
+        <embed class="embeded-contract-preview" type="application/pdf" src="<%= url_for([@release, :contracts, format: "pdf"]) %>" width="80%" height="1200" />
+      <% end %>
+
       <%= card_field_set_tag t(".amendment.heading") do %>
         <p><%= @contract_template.amendment_clause %></p>
       <% end %>