Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Completely disabled all avatar functionality #2961

Merged
merged 1 commit into from
Oct 19, 2021
Merged

Completely disabled all avatar functionality #2961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions app/assets/javascripts/room.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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='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>"
Expand Down
1 change: 0 additions & 1 deletion app/controllers/concerns/joiner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ 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]
Expand Down
1 change: 0 additions & 1 deletion app/controllers/rooms_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ 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)
Expand Down
14 changes: 5 additions & 9 deletions app/views/rooms/cant_create_rooms.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,11 @@
<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") %>
<% end %>
<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 %>
</div>
</div>
</div>
Expand Down
6 changes: 1 addition & 5 deletions app/views/rooms/components/_room_event.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>
<span class="avatar"><%= @room.owner.name.first %></span>
<h5 id="room-owner-name" class="font-weight-normal ml-4 mt-3 d-inline-block"><%= @room.owner.name %> (<%= t("room.owner") %>)</h5>
</div>

Expand Down
7 changes: 1 addition & 6 deletions app/views/shared/_header.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="avatar"><%= current_user.name.first %></span>
<span class="ml-2 d-none d-lg-block">
<span class="text-default username"><%= current_user.name %></span>
</span>
Expand Down
14 changes: 0 additions & 14 deletions app/views/users/components/_account.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" %>
Expand Down