diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-15 15:20:54 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-15 16:55:40 +0300 |
| commit | 1714883107b7b8b8f2ef8c2836acc2866362738e (patch) | |
| tree | 4c79d81c52b932c20d0ddfb467175f39e281faf3 /app/views/profiles/show.html.haml | |
| parent | ea7d062fa60e3e622288237fc66a815348bbcf36 (diff) | |
Revert "Merge branch 'avatar-cropping' into 'master'
"
This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing
changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
Diffstat (limited to 'app/views/profiles/show.html.haml')
| -rw-r--r-- | app/views/profiles/show.html.haml | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 3d1ba49491c..cd582ba7060 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -1,7 +1,4 @@ = form_for @user, url: profile_path, method: :put, html: { multipart: true, class: "edit-user prepend-top-default" }, authenticity_token: true do |f| - = f.hidden_field :avatar_crop_x - = f.hidden_field :avatar_crop_y - = f.hidden_field :avatar_crop_size -if @user.errors.any? %div.alert.alert-danger %ul @@ -97,19 +94,3 @@ .prepend-top-default.append-bottom-default = f.submit 'Update profile settings', class: "btn btn-success" = link_to "Cancel", user_path(current_user), class: "btn btn-cancel" - -.modal.modal-profile-crop - .modal-dialog - .modal-content - .modal-header - %button.close{type: 'button', data: {dismiss: 'modal'}} - %span - × - %h4.modal-title - Crop your new profile picture - .modal-body - %p - %img.modal-profile-crop-image - .modal-footer - %button.btn.btn-primary.js-upload-user-avatar{:type => "button"} - Set new profile picture |