Merge pull request #49 from zach-chai/room_updates

Room updates

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();

app/assets/javascripts/recordings.coffee

@@ -13,8 +13,8 @@ class @Recordings
       info: false,
       order: [[ 0, "desc" ]],
       language: {
-        emptyTable: I18n.no_recordings,
+        emptyTable: '<h3>'+I18n.no_recordings+'</h3>',
-        zeroRecords: I18n.no_recordings
+        zeroRecords: '<h3>'+I18n.no_recordings+'</h3>'
       },
       columns: [
         { data: "start_time" },
@@ -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: ->

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

app/views/landing/_rooms_center_panel.html.erb

@@ -1,12 +1,14 @@
 <% content_for :title do %>
   <div class="title">
-    <% if admin? && !@meeting_running %>
+    <h2>
-      <%= t('start_new_session') %>
+      <% if admin? && !@meeting_running %>
-    <% elsif !admin? %>
+        <%= t('your_personal_room') %>
-      <%= t('join_session_user', name: @user.username) %>
+      <% elsif !admin? %>
-    <% else %>
+        <%= t('join_session_user', name: @user.username) %>
-      <%= t('join_session') %>
+      <% else %>
-    <% end %>
+        <%= t('join_session') %>
+      <% end %>
+    </h2>
   </div>
 <% end %>
 

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
@@ -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