From 48fe071af1f0142d604df07353c91b9c4bc44c6d Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Thu, 24 Nov 2016 16:55:54 -0500 Subject: [PATCH 1/4] update room title --- app/views/landing/_rooms_center_panel.html.erb | 16 +++++++++------- config/locales/en-us.yml | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/views/landing/_rooms_center_panel.html.erb b/app/views/landing/_rooms_center_panel.html.erb index a978897f..c065d027 100644 --- a/app/views/landing/_rooms_center_panel.html.erb +++ b/app/views/landing/_rooms_center_panel.html.erb @@ -1,12 +1,14 @@ <% content_for :title do %>
- <% if admin? && !@meeting_running %> - <%= t('start_new_session') %> - <% elsif !admin? %> - <%= t('join_session_user', name: @user.username) %> - <% else %> - <%= t('join_session') %> - <% end %> +

+ <% if admin? && !@meeting_running %> + <%= t('your_personal_room') %> + <% elsif !admin? %> + <%= t('join_session_user', name: @user.username) %> + <% else %> + <%= t('join_session') %> + <% end %> +

<% end %> diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index d117fdd9..45b68e17 100644 --- a/config/locales/en-us.yml +++ b/config/locales/en-us.yml @@ -35,7 +35,7 @@ en-US: unpublish_recording: Hide recording copied: Copied copy_error: Use Ctrl-c to copy - create_session: Create a session + create_session: Create a Session create_your_session: Create your own session date_recorded: Date duration: Duration @@ -59,7 +59,7 @@ en-US: return_to_room: Return to your personal room session_url_explanation: The session will be taking place using the following URL start: Start - start_new_session: Start a new session + your_personal_room: Your Personal Room thumbnails: Thumbnails url_copy_explanation: Copy this URL to invite others to the meeting url_refresh_hint: Generate a new meeting URL From 3f6111795a0a82f33ce1b46a9fd867f24a09aa0e Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Thu, 24 Nov 2016 17:13:32 -0500 Subject: [PATCH 2/4] place recording popovers in table for handlers --- app/assets/javascripts/landing.js | 15 --------------- app/assets/javascripts/recordings.coffee | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js index b9fb8843..acd58be9 100644 --- a/app/assets/javascripts/landing.js +++ b/app/assets/javascripts/landing.js @@ -108,21 +108,6 @@ }; $(document).tooltip(options); - // enable popovers - var options = { - selector: '.has-popover', - container: 'body', - html: true, - trigger: 'focus', - title: function() { - return I18n.are_you_sure; - }, - content: function() { - return $(".delete-popover-body").html(); - } - }; - $('#recordings').popover(options); - // focus name input or join button if ($('.meeting-user-name').is(':visible')) { $('.meeting-user-name').focus(); diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee index 03b09085..08c559f6 100644 --- a/app/assets/javascripts/recordings.coffee +++ b/app/assets/javascripts/recordings.coffee @@ -81,11 +81,22 @@ class @Recordings }) options = { selector: '.delete-tooltip', - container: 'body', placement: 'bottom', title: I18n.delete_recording }; - $('#recordings').tooltip(options); + $('#recordings').tooltip(options) + + # enable popovers + options = { + selector: '.has-popover', + html: true, + trigger: 'focus', + title: -> + return I18n.are_you_sure; + content: -> + return $(".delete-popover-body").html() + } + $('#recordings').popover(options) # Gets the current instance or creates a new one @getInstance: -> From 6fd3554af8e29e7857b5f0cad13ff71ca90f1210 Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Thu, 24 Nov 2016 17:37:12 -0500 Subject: [PATCH 3/4] more obvious when no recordings --- app/assets/javascripts/recordings.coffee | 4 ++-- config/locales/en-us.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee index 08c559f6..6f38c168 100644 --- a/app/assets/javascripts/recordings.coffee +++ b/app/assets/javascripts/recordings.coffee @@ -13,8 +13,8 @@ class @Recordings info: false, order: [[ 0, "desc" ]], language: { - emptyTable: I18n.no_recordings, - zeroRecords: I18n.no_recordings + emptyTable: '

'+I18n.no_recordings+'

', + zeroRecords: '

'+I18n.no_recordings+'

' }, columns: [ { data: "start_time" }, diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index 45b68e17..b20bd003 100644 --- a/config/locales/en-us.yml +++ b/config/locales/en-us.yml @@ -27,7 +27,7 @@ en-US: delete_recording: Delete recording meeting_ended: Meeting was ended meeting_started: Meeting was started - no_recordings: No recordings + no_recordings: No Recordings publish_recording: Publish recording recording_deleted: Recording was deleted recording_published: Recording was published From 25f8b547e5964934a90fe6e0d3a66f59ee50a882 Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Thu, 24 Nov 2016 17:42:08 -0500 Subject: [PATCH 4/4] modify encrypted id --- app/models/user.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 873a2b6f..bc013b56 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,10 +1,5 @@ class User < ApplicationRecord - # validates :username, - # format: { with: /\A^[0-9a-z-_]+\Z/, - # message: "Only allows lowercase alphanumeric characters with dashes and underscores", - # allow_blank: true } - before_create :set_encrypted_id def self.from_omniauth(auth_hash) @@ -28,6 +23,6 @@ class User < ApplicationRecord end def set_encrypted_id - self.encrypted_id = Digest::SHA1.hexdigest(uid+provider) + self.encrypted_id = "#{username[0..1]}-#{Digest::SHA1.hexdigest(uid+provider)[0..7]}" end end