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

[MediaBundle]: imageurlretina not defined #1013

Merged
merged 1 commit into from
Feb 17, 2016
Merged

[MediaBundle]: imageurlretina not defined #1013

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: 7 additions & 0 deletions src/Kunstmaan/FormBundle/UPGRADE-3.5.1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# UPGRADE FROM 3.4 to 3.5

## FileFormSubmissionField changes

When using the FormBundle with the FileUploadPagePart, files with the same name were overridden. Therefore we have added two new fields to the FileFormSubmissionField, UUID and URL. By doing this, every file that is being uploaded will be placed into a unique folder.

When updating from a previous version, be sure to update your database scheme.
4 changes: 2 additions & 2 deletions src/Kunstmaan/MediaBundle/Resources/views/Chooser/chooserShowFolder.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
{{ parent() }}
{% else %}
<p class="text--muted">
{{ 'media.media.no' |trans }}
{{ 'media.media.no' |trans }}
</p>
{% endif %}
{% else %}
Expand All @@ -211,7 +211,7 @@
<a href="javascript:void(0)" class="js-url-chooser-media-select thumbnail media-thumbnail" data-thumb-path="{{ imageurl }}" data-path="{{ media.url }}" data-title="{{ media.name|escape('js') }}" data-id="{{ media.id }}" data-cke="{% if cKEditorFuncNum %}true{% else %}false{% endif %}">
<figure>
{% if imageurl %}
<img src="{{ imageurl }}" srcset="{{ imageurl }} 1x, {{ imageurlretina }} 2x" alt="{{ media.name }}" class="media-thumbnail__img">
<img src="{{ imageurl }}" srcset="{{ imageurl }} 1x, {{ imageurlretina is defined ? ', ' ~ imageurlretina ~ " 2x" }}" alt="{{ media.name }}" class="media-thumbnail__img">
{% else %}
<i class="fa fa-file-o media-thumbnail__icon"></i>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion src/Kunstmaan/MediaBundle/Resources/views/Form/formWidgets.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
{% endif %}
{% endif %}
{% if imageurl %}
<img src="{{ imageurl }}" srcset="{{ imageurl }} 1x, {{ imageurlretina }} 2x" alt="{{ media.name }}" id="{{ id }}__preview__img" class="thumbnail-img media-chooser__preview__img">
<img src="{{ imageurl }}" srcset="{{ imageurl }} 1x, {{ imageurlretina is defined ? ', ' ~ imageurlretina ~ " 2x" }}" alt="{{ media.name }}" id="{{ id }}__preview__img" class="thumbnail-img media-chooser__preview__img">
<figcaption id="{{ id }}__preview__title" class="media-chooser__preview__title">
{{ media.name }}
</figcaption>
Expand Down