paoda
/
polyglot
mirror of https://github.com/beatriceo/polyglot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #70 from beatriceo/profile-pic-fix 

Website now supports non 1:1 aspect ratio images
This commit is contained in:
Beatrice Olivera 2018-09-06 12:46:54 +01:00 committed by GitHub
parent b41512eba8 0e151e5e1d
commit 110fa37c42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/uploaders/photo_uploader.rb
View File

@ -1,3 +1,6 @@
class PhotoUploader < CarrierWave::Uploader::Base class PhotoUploader < CarrierWave::Uploader::Base
include Cloudinary::CarrierWave include Cloudinary::CarrierWave
process convert: "jpg"
process tags: ["profile_picture"]
end end

7
app/views/pages/_contact.html.erb
View File

@ -3,7 +3,9 @@
<% if contact.photo.url.nil? %> <% if contact.photo.url.nil? %>
<img src="https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png" class="avatar profile dropdown-toggle img-circle" width=65> <img src="https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png" class="avatar profile dropdown-toggle img-circle" width=65>
<% else %> <% else %>
<%= cl_image_tag contact.photo, class: "profile avatar dropdown-toggle img-circle", width:65%> <%= cl_image_tag(contact.photo, class: "profile avatar dropdown-toggle img-circle", width:65, transformation: [
{ gravity: "face:auto", width: 100, height: 100, radius: "max", crop: "crop" }
])%>
<% end %> <% end %>
<div class="text text-color"> <div class="text text-color">
<% if contact.first_name.nil? || contact.last_name.nil? %> <% if contact.first_name.nil? || contact.last_name.nil? %>
@ -39,7 +41,8 @@
<% if contact.photo.url.nil? %> <% if contact.photo.url.nil? %>
<img src="https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png" class="avatar profile dropdown-toggle img-circle modal-picture" width=150> <img src="https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png" class="avatar profile dropdown-toggle img-circle modal-picture" width=150>
<% else %> <% else %>
<%= cl_image_tag contact.photo, class: "profile avatar dropdown-toggle img-circle modal-picture", width:150%> <%= cl_image_tag(contact.photo, class: "profile avatar dropdown-toggle img-circle modal-picture", width:150, transformation: [
{ gravity: "face:auto", width: 100, height: 100, radius: "max", crop: "crop" }])%>
<% end %> <% end %>
<div class="modal-text"> <div class="modal-text">
<h4 class="modal-title" id="myModalLabel">Calling</h4> <h4 class="modal-title" id="myModalLabel">Calling</h4>

4
app/views/shared/_navbar.html.erb
View File

@ -15,7 +15,9 @@
<% if current_user.photo.url.nil? %> <% if current_user.photo.url.nil? %>
<img src="https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png" class="avatar dropdown-toggle img-circle"> <img src="https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png" class="avatar dropdown-toggle img-circle">
<% else %> <% else %>
<%= cl_image_tag current_user.photo, class: "avatar dropdown-toggle img-circle"%> <%= cl_image_tag(current_user.photo, class: "avatar dropdown-toggle img-circle", transformation: [
{ gravity: "face:auto", width: 100, height: 100, radius: "max", crop: "crop" }
])%>
<% end %> <% end %>
</div> </div>
<ul class="dropdown-menu dropdown-menu-right polyglot-dropdown"> <ul class="dropdown-menu dropdown-menu-right polyglot-dropdown">