Skip to content
Snippets Groups Projects
Unverified Commit 159222d5 authored by Ahmad Farhat's avatar Ahmad Farhat Committed by GitHub
Browse files

Completely disabled all avatar functionality (#2961)

parent 02b1e4c5
Branches
Tags release-2.10.0.2
No related merge requests found
......@@ -343,12 +343,7 @@ function displaySharedUsers(path) {
users.forEach(function(user) {
user_list_html += "<li class='list-group-item text-left' data-uid='" + user.uid + "'>"
if (user.image) {
user_list_html += "<img id='user-image' class='avatar float-left mr-2' src='" + user.image + "'></img>"
} else {
user_list_html += "<span class='avatar float-left mr-2'>" + user.name.charAt(0) + "</span>"
}
user_list_html += "<span class='shared-user'>" + user.name + "<span class='text-muted ml-1'>" + user.uid + "</span></span>"
user_list_html += "<span class='text-primary float-right shared-user cursor-pointer' onclick='removeSharedUser(this)'><i class='fas fa-times'></i></span>"
user_list_html += "</li>"
......
......@@ -70,7 +70,6 @@ module Joiner
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]
......
......@@ -180,7 +180,6 @@ class RoomsController < ApplicationController
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)
......
......@@ -20,11 +20,7 @@
<div class="card card-profile h-100">
<div class="card-header bg-primary h-50"></div>
<div class="card-body text-center">
<% 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") %>
......
......@@ -25,11 +25,7 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 mb-5">
<% 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>
......
......@@ -40,12 +40,7 @@
<div class="dropdown">
<a href="#" class="nav-link pr-0" data-toggle="dropdown">
<% 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>
......
......@@ -60,20 +60,6 @@
<%= 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" %>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment