forked from External/greenlight
		
	| @@ -86,7 +86,7 @@ class @Recordings | |||||||
|               str = '' |               str = '' | ||||||
|               if row.published |               if row.published | ||||||
|                 if data.length == 1 |                 if data.length == 1 | ||||||
|                   str = '<a class="btn btn-default" href="'+data[0].url+'" target="_blank"><i class="fa fa-play-circle"></i></a>' |                   str = '<a class="btn btn-default play-tooltip" href="'+data[0].url+'" target="_blank"><i class="fa fa-play-circle"></i></a>' | ||||||
|                 else |                 else | ||||||
|                   for d in data |                   for d in data | ||||||
|                     str += '<a href="'+d.url+'" target="_blank">'+d.type_i18n+'</a> ' |                     str += '<a href="'+d.url+'" target="_blank">'+d.type_i18n+'</a> ' | ||||||
| @@ -137,6 +137,14 @@ class @Recordings | |||||||
|     }; |     }; | ||||||
|     $('#recordings').tooltip(options) |     $('#recordings').tooltip(options) | ||||||
|  |  | ||||||
|  |     options.selector = '.visibility-tooltip' | ||||||
|  |     options.title = I18n.change_visibility | ||||||
|  |     $('#recordings').tooltip(options) | ||||||
|  |  | ||||||
|  |     options.selector = '.play-tooltip' | ||||||
|  |     options.title = I18n.play_recording | ||||||
|  |     $('#recordings').tooltip(options) | ||||||
|  |  | ||||||
|     $(document).one "turbolinks:before-cache", => |     $(document).one "turbolinks:before-cache", => | ||||||
|       @getTable().api().clear().draw().destroy() |       @getTable().api().clear().draw().destroy() | ||||||
|  |  | ||||||
|   | |||||||
| @@ -23,7 +23,7 @@ | |||||||
|   <div class="verticle-line"></div> |   <div class="verticle-line"></div> | ||||||
|   <div class="col-xs-6"> |   <div class="col-xs-6"> | ||||||
|     <%= render 'shared/title', title: t('join'), title_class: 'join-meeting-title' %> |     <%= render 'shared/title', title: t('join'), title_class: 'join-meeting-title' %> | ||||||
|     <button type="button" class="btn btn-primary center-block meeting-start"> |     <button type="button" class="btn btn-primary center-block meeting-start has-tooltip" data-placement="top" title="<%= t('start_meeting') %>"> | ||||||
|       <%= t('start_join') %> |       <%= t('start_join') %> | ||||||
|     </button> |     </button> | ||||||
|   </div> |   </div> | ||||||
|   | |||||||
| @@ -74,7 +74,7 @@ | |||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
|   <div class="recording-actions"> |   <div class="recording-actions"> | ||||||
|     <button type="button" class="btn btn-default has-popover recording-update-trigger" |     <button type="button" class="btn btn-default has-popover recording-update-trigger visibility-tooltip" | ||||||
|             data-placement="left" data-popover-body=".recording-visibility-popover" |             data-placement="left" data-popover-body=".recording-visibility-popover" | ||||||
|             data-popover-title="<%= t('change_recording_visibility') %>"> |             data-popover-title="<%= t('change_recording_visibility') %>"> | ||||||
|       <%= icon('eye') %> |       <%= icon('eye') %> | ||||||
|   | |||||||
| @@ -40,10 +40,8 @@ Rails.application.configure do | |||||||
|   # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] |   # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] | ||||||
|  |  | ||||||
|   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. |   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. | ||||||
|   config.force_ssl = ENV['DISABLE_FORCE_SSL'].blank? |   config.force_ssl = ENV['ENABLE_FORCE_SSL'] == 'true' | ||||||
|  |  | ||||||
|   # Use the lowest log level to ensure availability of diagnostic information |  | ||||||
|   # when problems arise. |  | ||||||
|   config.log_level = :info |   config.log_level = :info | ||||||
|  |  | ||||||
|   # Prepend all log lines with the following tags. |   # Prepend all log lines with the following tags. | ||||||
|   | |||||||
| @@ -43,11 +43,13 @@ en-US: | |||||||
|   change_recording_visibility: "Change visibility to:" |   change_recording_visibility: "Change visibility to:" | ||||||
|   client: |   client: | ||||||
|     are_you_sure: Are you sure? |     are_you_sure: Are you sure? | ||||||
|  |     change_visibility: Change visibility | ||||||
|     delete_recording: Delete recording |     delete_recording: Delete recording | ||||||
|     meeting_ended: Meeting was ended |     meeting_ended: Meeting was ended | ||||||
|     meeting_started: Meeting was started |     meeting_started: Meeting was started | ||||||
|     no_recordings: No Recordings |     no_recordings: No Recordings | ||||||
|     no_recordings_yet: No Recordings (Yet!) |     no_recordings_yet: No Recordings (Yet!) | ||||||
|  |     play_recording: Play recording | ||||||
|     publish_recording: Publish recording |     publish_recording: Publish recording | ||||||
|     published: Everyone |     published: Everyone | ||||||
|     recording_created: A recording was created |     recording_created: A recording was created | ||||||
| @@ -111,6 +113,7 @@ en-US: | |||||||
|   signin_text: Log in with %{provider} |   signin_text: Log in with %{provider} | ||||||
|   start: Start |   start: Start | ||||||
|   start_join: Start |   start_join: Start | ||||||
|  |   start_meeting: Start meeting | ||||||
|   thumbnails: Thumbnails |   thumbnails: Thumbnails | ||||||
|   url_copy_explanation: Copy this URL to invite others to the meeting |   url_copy_explanation: Copy this URL to invite others to the meeting | ||||||
|   user_person_room: "%{name} personal room" |   user_person_room: "%{name} personal room" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user