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

Fix: better html markup for input fields #2336

Merged
merged 2 commits into from
Jun 24, 2015
Merged

Fix: better html markup for input fields #2336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e79b8ab
Fix: better html markup for input fields
dalpo Jun 19, 2015
ae88825
Fix: better image preview from browsed images
dalpo Jun 19, 2015
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
2 changes: 1 addition & 1 deletion app/assets/javascripts/rails_admin/ra.widgets.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
input = this
image_container = $("#" + input.id).parent().children(".preview")
unless image_container.length
image_container = $("#" + input.id).parent().prepend($('<img />').addClass('preview')).find('img.preview')
image_container = $("#" + input.id).parent().prepend($('<img />').addClass('preview').addClass('img-thumbnail')).find('img.preview')
image_container.parent().find('img:not(.preview)').hide()
ext = $("#" + input.id).val().split('.').pop().toLowerCase()
if input.files and input.files[0] and $.inArray(ext, ['gif','png','jpg','jpeg','bmp']) != -1
Expand Down
12 changes: 12 additions & 0 deletions app/assets/stylesheets/rails_admin/base/theming.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,18 @@ body.rails_admin {
display:none;
}

.control-group.image_field {
.img-thumbnail {
margin-bottom: 10px;
}

.btn-remove-image {
&.btn-info {
margin-top: 10px;
}
}
}

legend {
cursor:pointer;
i {
Expand Down
5 changes: 3 additions & 2 deletions app/assets/stylesheets/rails_admin/ra.widgets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ iframe.wysihtml5-sandbox{
height: 250px !important;
width: 75% !important;
}

.controls img.preview{
max-height: 100px;
max-width: 100px;
max-height: 200px;
max-width: 300px;
}
8 changes: 6 additions & 2 deletions app/views/rails_admin/main/_form_file_upload.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
.toggle{style: ('display:none;' if file && field.delete_method && form.object.send(field.delete_method) == '1')}
- if value = field.pretty_value
= value

= form.file_field(field.name, field.html_attributes.reverse_merge({ data: { fileupload: true }}))

- if field.optional? && field.errors.blank? && file && field.delete_method
%a.btn.btn-info{href: '#', :'data-toggle' => 'button', onclick: "$(this).siblings('[type=checkbox]').click(); $(this).siblings('.toggle').toggle('slow'); jQuery(this).toggleClass('btn-danger btn-info'); return false"}
%a.btn.btn-info.btn-remove-image{href: '#', :'data-toggle' => 'button', role: 'button', onclick: "$(this).siblings('[type=checkbox]').click(); $(this).siblings('.toggle').toggle('slow'); jQuery(this).toggleClass('btn-danger btn-info'); return false;"}
%i.icon-white.icon-trash
= I18n.t('admin.actions.delete.menu').capitalize + " #{field.label.downcase}"
= form.check_box(field.delete_method, style: 'display:none;' )

= form.check_box(field.delete_method, style: 'display:none;')

- if field.cache_method
= form.hidden_field(field.cache_method)
3 changes: 2 additions & 1 deletion lib/rails_admin/config/fields/types/file_upload.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ class FileUpload < RailsAdmin::Config::Fields::Base
url = resource_url
if image
thumb_url = resource_url(thumb_method)
url != thumb_url ? v.link_to(v.image_tag(thumb_url, class: 'img-polaroid'), url, target: '_blank') : v.image_tag(thumb_url)
image_html = v.image_tag(thumb_url, class: 'img-thumbnail')
url != thumb_url ? v.link_to(image_html, url, target: '_blank') : image_html
else
v.link_to(nil, url, target: '_blank')
end
Expand Down