diff --git a/app/assets/javascripts/room.js b/app/assets/javascripts/room.js index 213410901b..70c638388f 100644 --- a/app/assets/javascripts/room.js +++ b/app/assets/javascripts/room.js @@ -344,7 +344,7 @@ 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"), @@ -352,8 +352,16 @@ function displaySharedUsers(path) { 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') diff --git a/app/controllers/concerns/joiner.rb b/app/controllers/concerns/joiner.rb index f887ed43ec..3132eb0cc0 100644 --- a/app/controllers/concerns/joiner.rb +++ b/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] diff --git a/app/controllers/recordings_controller.rb b/app/controllers/recordings_controller.rb index 54b9d784d4..18bbe3a7b0 100644 --- a/app/controllers/recordings_controller.rb +++ b/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]) diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb index 934eab058d..ed21bcdcb6 100644 --- a/app/controllers/rooms_controller.rb +++ b/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) diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index d33db5be95..21d4560f52 100755 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -18,6 +18,32 @@

<%= t("landing.welcome").html_safe %>

+
+
+

<%= t("landing.enterid") %>

+
+
+
+
+ + + class="btn btn-primary btn-sm px-7 form-control join-form"> + +
+
+
+
+
+ + +

<%= t("landing.about", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank", rel: "noopener")).html_safe %>

<%= link_to "https://youtu.be/Hso8yLzkqj8", target: "_blank" do %>

<%= t("landing.video") %>

diff --git a/app/views/rooms/cant_create_rooms.html.erb b/app/views/rooms/cant_create_rooms.html.erb index 2d9f356ff8..cb661fa60f 100644 --- a/app/views/rooms/cant_create_rooms.html.erb +++ b/app/views/rooms/cant_create_rooms.html.erb @@ -20,11 +20,15 @@
- <%= current_user.name.first %> -

<%= current_user.name %>

- <%= link_to edit_user_path(current_user), class: "btn btn-outline-primary mt-2" do %> - <%= t("room.no_room.edit_profile") %> - <% end %> + <% if current_user.image.blank? || !valid_url?(current_user.image) %> + <%= current_user.name.first %> + <% else %> + <%= image_tag(current_user.image, class: "avatar avatar-xxxl card-profile-img") %> + <% end %> +

<%= current_user.name %>

+ <%= link_to edit_user_path(current_user), class: "btn btn-outline-primary mt-2" do %> + <%= t("room.no_room.edit_profile") %> + <% end %>
diff --git a/app/views/rooms/components/_room_event.html.erb b/app/views/rooms/components/_room_event.html.erb index 2482c4657a..a218e37a82 100644 --- a/app/views/rooms/components/_room_event.html.erb +++ b/app/views/rooms/components/_room_event.html.erb @@ -25,7 +25,11 @@
- <%= @room.owner.name.first %> + <% if @room.owner.image.blank? %> + <%= @room.owner.name.first %> + <% else %> + + <% end %>
<%= @room.owner.name %> (<%= t("room.owner") %>)
diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb index 73d9de9c42..2ada39c2cf 100755 --- a/app/views/shared/_header.html.erb +++ b/app/views/shared/_header.html.erb @@ -40,7 +40,12 @@
- <%= current_user.name.first %> + <% if current_user.image.blank? || !valid_url?(current_user.image) %> + <%= current_user.name.first %> + <% else %> + <%= current_user.name.first %> + <%= image_tag(current_user.image, id: "user-image", class: "avatar") %> + <% end %> <%= current_user.name %> diff --git a/app/views/shared/components/_public_recording_row.html.erb b/app/views/shared/components/_public_recording_row.html.erb index 673e6e04f7..07a267c74c 100644 --- a/app/views/shared/components/_public_recording_row.html.erb +++ b/app/views/shared/components/_public_recording_row.html.erb @@ -31,12 +31,23 @@ <% if recording_thumbnails? %> - <% 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"} %> + <% 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 %> + + <% end %> <% end %> diff --git a/app/views/shared/components/_recording_row.html.erb b/app/views/shared/components/_recording_row.html.erb index 962411a016..441e3261c7 100644 --- a/app/views/shared/components/_recording_row.html.erb +++ b/app/views/shared/components/_recording_row.html.erb @@ -34,9 +34,29 @@ <% 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 %> +
+ +
+ <% 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") %> + + <%= img[:alt].strip[0..20] %> + + <% end %> + <% end %> +
+
+ <% end %> + <% end %> <% end %> <% end %> <% end %> diff --git a/app/views/users/components/_account.html.erb b/app/views/users/components/_account.html.erb index 77ad5eac1e..30a31bfa98 100644 --- a/app/views/users/components/_account.html.erb +++ b/app/views/users/components/_account.html.erb @@ -60,6 +60,20 @@ <%= translated_role_name(@user.role) %> <% end %> + + <%= f.label :image, t("settings.account.image"), class: "form-label mt-5" %> +
+
+ <% if @user.image.blank? || !valid_url?(@user.image) %> + <%= @user.name.first %> + <% else %> + <%= image_tag(@user.image, class: "avatar avatar-xxl mr-5 mt-2") %> + <% end %> +
+
+ <%= f.text_field :image, class: "form-control #{form_is_invalid?(@user, :image)}", placeholder: t("settings.account.image_url") %> +
+
<%= f.submit t("update"), class: "btn btn-primary float-right ml-4" %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 0684d66622..59234241fd 100755 --- a/config/locales/en.yml +++ b/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