Dev v2 allin

app/assets/javascripts/room.js

@@ -344,16 +344,24 @@ function displaySharedUsers(path) {
     users.forEach(function(user) {
 
       listName = document.createElement("li"),
-      spanAvatar = document.createElement("span"),
+      spanAvatar = undefined,
       spanName = document.createElement("span"),
       spanUid = document.createElement("span"),
       spanRemove = document.createElement("span"),
       spanRemoveIcon = document.createElement("i");
 
       listName.setAttribute('class', 'list-group-item text-left')
       listName.setAttribute('data-uid', user.uid)
-      spanAvatar.innerText = user.name.charAt(0)
-      spanAvatar.setAttribute('class', 'avatar float-left mr-2')
+      if (user.image) {
+        spanAvatar = document.createElement("img")
+        spanAvatar.setAttribute('id', 'user-image')
+        spanAvatar.setAttribute('class', 'avatar float-left mr-2')
+        spanAvatar.setAttribute('src', user.image)
+      } else {
+        spanAvatar = document.createElement("span")
+        spanAvatar.innerText = user.name.charAt(0)
+        spanAvatar.setAttribute('class', 'avatar float-left mr-2')
+      }
       spanName.setAttribute('class', 'shared-user')
       spanName.innerText = user.name
       spanUid.setAttribute('class', 'text-muted ml-1')

app/controllers/concerns/joiner.rb

@@ -70,6 +70,7 @@ def join_room(opts)
       opts[:mute_on_start] = room_setting_with_config("muteOnStart")
 
       if current_user
+        opts[:avatarURL] = current_user.image if current_user.image.present? && valid_avatar?(current_user.image)
         redirect_to join_path(@room, current_user.name, opts, current_user.uid)
       else
         join_name = params[:join_name] || params[@room.invite_path][:join_name]

app/controllers/recordings_controller.rb

@@ -24,9 +24,12 @@ class RecordingsController < ApplicationController
 
   # POST /:meetingID/:record_id
   def update
-    meta = {
-      "meta_#{META_LISTED}" => (params[:state] == "public"),
-    }
+    meta = {}
+    if params[:state]
+      meta["meta_#{META_LISTED}"] = (params[:state] == "public")
+    elsif params[:thumbnails]
+      meta["meta_imagesel"] = params[:thumbnails]
+    end
 
     if params[:state] == "protected"
       protect_recording(params[:record_id])

app/controllers/rooms_controller.rb

@@ -181,6 +181,7 @@ def start
     opts[:mute_on_start] = room_setting_with_config("muteOnStart")
     opts[:require_moderator_approval] = room_setting_with_config("requireModeratorApproval")
     opts[:record] = record_meeting
+    opts[:avatarURL] = current_user.image if current_user.image.present? && valid_avatar?(current_user.image)
 
     begin
       redirect_to join_path(@room, current_user.name, opts, current_user.uid)

app/views/main/index.html.erb

@@ -18,6 +18,32 @@
     <div class="row">
       <div class="col-md-12 col-sm-12 text-center">
         <h1 id="main-text" class="display-4 mb-4"> <%= t("landing.welcome").html_safe %></h1>
+        <div class="row">
+          <div class="col-lg-6 col-md-6 col-sm-12 mb-5 align-top">
+            <h3 class="font-weight-normal ml-4 mt-3 text-right"><%= t("landing.enterid") %></h3>
+          </div>
+          <div class="col-lg-6 col-md-6 col-sm-12">
+            <form name="myForm" onsubmit="Jump(); return false;">
+              <div class="input-group">
+                <input required="required" value="" class="form-control join-form" placeholder="aaa-bbb-ccc" value="" autofocus="autofocus" type="text" name="mID">
+                <span class="input-group-append">
+                  <input type="submit" value=<%= t("room.join") %> class="btn btn-primary btn-sm px-7 form-control join-form">
+                </span>
+              </div>
+            </form>
+          </div>
+        </div>
+        <br>
+
+        <script type="text/javascript">
+          function Jump(){
+            var b = location.href.match(/b\/$/) ? '' : 'b/';
+            var rid = document.myForm.mID.value.replace(/-/g,'').replace(/(...)(?!$)/g, '$1-');
+            location.href = b + rid;
+            return;
+          }
+        </script>
+
         <p class="lead offset-lg-2 col-lg-8 col-sm-12 "><%= t("landing.about", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank", rel: "noopener")).html_safe %></p>
         <%= link_to "https://youtu.be/Hso8yLzkqj8", target: "_blank" do %>
           <h4><%= t("landing.video") %> <i class="far fa-play-circle ml-1"></i></h4>

app/views/rooms/cant_create_rooms.html.erb

@@ -20,11 +20,15 @@
                         <div class="card card-profile h-100">
                             <div class="card-header bg-primary h-50"></div>
                             <div class="card-body text-center">
-                              <span class="avatar avatar-xxxl card-profile-img bg-primary"><%= current_user.name.first %></span>
-                              <h2 class="mb-3"><%= current_user.name %></h2>
-                              <%= link_to edit_user_path(current_user), class: "btn btn-outline-primary mt-2" do %>
-                                  <i class="dropdown-icon fas fa-id-card mr-3"></i><%= t("room.no_room.edit_profile") %>
-                              <% end %>
+                                <% if current_user.image.blank? || !valid_url?(current_user.image) %>
+                                    <span class="avatar avatar-xxxl card-profile-img bg-primary"><%= current_user.name.first %></span>
+                                <% else %>
+                                    <%= image_tag(current_user.image, class: "avatar avatar-xxxl card-profile-img") %>
+                                <% end %>
+                                <h2 class="mb-3"><%= current_user.name %></h2>
+                                <%= link_to edit_user_path(current_user), class: "btn btn-outline-primary mt-2" do %>
+                                    <i class="dropdown-icon fas fa-id-card mr-3"></i><%= t("room.no_room.edit_profile") %>
+                                <% end %>
                             </div>
                         </div>
                     </div>

app/views/rooms/components/_room_event.html.erb

@@ -25,7 +25,11 @@
 
     <div class="row">
       <div class="col-lg-6 col-md-6 col-sm-12 mb-5">
-        <span class="avatar"><%= @room.owner.name.first %></span>
+        <% if @room.owner.image.blank? %>
+          <span class="avatar"><%= @room.owner.name.first %></span>
+        <% else %>
+          <span class="avatar" style="background-image: url(<%= @room.owner.image %>)"></span>
+        <% end %>
         <h5 id="room-owner-name" class="font-weight-normal ml-4 mt-3 d-inline-block"><%= @room.owner.name %> (<%= t("room.owner") %>)</h5>
       </div>
 

app/views/shared/_header.html.erb

@@ -40,7 +40,12 @@
 
           <div class="dropdown">
             <a href="#" class="nav-link pr-0" data-toggle="dropdown">
-              <span class="avatar"><%= current_user.name.first %></span>
+              <% if current_user.image.blank? || !valid_url?(current_user.image) %>
+                <span class="avatar"><%= current_user.name.first %></span>
+              <% else %>
+                <span id="user-avatar" class="avatar d-none"><%= current_user.name.first %></span>
+                <%= image_tag(current_user.image, id: "user-image", class: "avatar") %>
+              <% end %>
               <span class="ml-2 d-none d-lg-block">
                 <span class="text-default username"><%= current_user.name %></span>
               </span>

app/views/shared/components/_public_recording_row.html.erb

@@ -31,12 +31,23 @@
   </td>
   <% if recording_thumbnails? %>
     <td class="overflow-hidden">
-      <% p = recording[:playbacks].find do |p| p.key?(:preview) end %>
-      <% if p %>
-        <% safe_recording_images(p[:preview][:images][:image]).each do |img| %>
-          <%= image_tag(img[:content].strip, class: "thumbnail px-2") %>
-        <% end %>
+      <% if id_p = recording[:playbacks].find_index{|p| p[:type]=="presentation"} %>
+        <a href="<%= recording[:playbacks][id_p][:url] %>" target="_blank">
       <% end %>
+        <% p = recording[:playbacks].find do |p| p.key?(:preview) end %>
+        <% if p %>
+          <% imagesel = if recording[:metadata][:imagesel]; recording[:metadata][:imagesel].split("-").collect{|x| x.to_i} else [0,1,2] end %>
+          <% if p[:preview][:images][:image] %>
+            <% imagesel.collect{|i| safe_recording_images(p[:preview][:images][:image])[i]}.each do |img| %>
+              <% if img %>
+                <%= image_tag(img[:content].strip, class: "thumbnail px-2") %>
+              <% end %>
+            <% end %>
+          <% end %>
+        <% end %>
+      <% if id_p %>
+        </a>
+      <% end %> 
     </td>
   <% end %>
   <td id="recording-length" class="text-left" data-full-length="<%=recording[:playbacks].first[:length]%>">

app/views/shared/components/_recording_row.html.erb

@@ -34,9 +34,29 @@
     <td class="overflow-hidden">
       <% if recording[:published] %>
         <% p = recording[:playbacks].find do |p| p.key?(:preview) end %>
-        <% if p %>
-          <% safe_recording_images(p[:preview][:images][:image]).each do |img| %>
-            <%= image_tag(img[:content].strip, class: "thumbnail px-2") %>
+        <% if p %> 
+          <% imagesel = if recording[:metadata][:imagesel]; recording[:metadata][:imagesel].split(/-/).collect{|x| x.to_i} else [0,1,2] end %>
+          <% if p[:preview][:images][:image] %>
+            <% imagesel.collect{|i| safe_recording_images(p[:preview][:images][:image])[i]}.each_with_index do |img, imgidxdsp| %>
+              <% if img %>
+                <div class="dropdown" style="position:unset;">
+                  <button class="btn btn-sm btn-secondary dropdown-toggle" data-toggle="dropdown"><%= image_tag(img[:content].strip, class: "thumbnail") %></button>
+                  <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                  <% safe_recording_images(p[:preview][:images][:image]).each_with_index do |img,imgidx| %>
+                    <% imgselary = imagesel.dup %>
+                    <% imgselary[imgidxdsp] = imgidx %>
+                    <% activecls = if imagesel[imgidxdsp] == imgidx ; "dropdown-item active" else "dropdown-item" end %>
+                    <%= button_to update_recording_path(meetingID: recording[:meetingID], record_id: recording[:recordID], thumbnails: "#{imgselary.join("-")}"), class: "#{activecls}", "data-disable": "" do %>
+                    <%= image_tag(img[:content].strip, class: "thumbnail") %>
+                    <span class="small text-muted">
+                    <%= img[:alt].strip[0..20] %>
+                    </span>
+                    <% end %>
+                  <% end %>
+                  </div>
+                </div>
+              <% end %>
+            <% end %>
           <% end %>
         <% end %>
       <% end %>

app/views/users/components/_account.html.erb

@@ -60,6 +60,20 @@
         <%= translated_role_name(@user.role) %>
       </span>
     <% end %>
+
+    <%= f.label :image, t("settings.account.image"), class: "form-label mt-5" %>
+    <div class="row">
+      <div class="col-5 col-sm-2">
+        <% if @user.image.blank? || !valid_url?(@user.image) %>
+          <span class="avatar avatar-xxl mr-5 mt-2 bg-primary"><%= @user.name.first %></span>
+        <% else %>
+          <%= image_tag(@user.image, class: "avatar avatar-xxl mr-5 mt-2") %>
+        <% end %>
+      </div>
+      <div class="col-7 col-sm-10 mt-5">
+        <%= f.text_field :image, class: "form-control #{form_is_invalid?(@user, :image)}", placeholder: t("settings.account.image_url") %>
+      </div>
+    </div>
   </div>
   <div class="card-footer">
     <%= f.submit t("update"), class: "btn btn-primary float-right ml-4" %>

config/locales/en.yml

@@ -341,6 +341,7 @@ en:
     video: Watch our tutorial on using Greenlight
     upgrade: Show me how to upgrade to 2.0!
     version: We've released a new version of Greenlight, but your database isn't compatible.
+    enterid: Enter a room ID
   language_default: Default (browser language)
   ldap_error: Unable to connect to the LDAP server. Please check your LDAP configuration in the env file and ensure your server is running.
   login: Sign in