Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions Resources/views/Form/fields.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@
</div>
</div>
<div class="image_preview select-image-button" id="image_preview_{{ form[name].vars.id }}" style="z-index: 1050">
<div class="image_edit_button">
<span class="btn btn-success select-image-button">
<i class="glyphicon glyphicon-edit glyphicon-white"></i> {% trans %}Edit{% endtrans %}
</span>
</div>
{% if not disabled %}
<div class="image_edit_button">
<span class="btn btn-success select-image-button">
<i class="glyphicon glyphicon-edit glyphicon-white"></i> {% trans %}Edit{% endtrans %}
</span>
</div>
{% endif %}
<div id="image_preview_image_{{form[name].vars.id}}">
{% if not options.fieldImage %}
{% if form[name].vars.value %}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.3.0-dev"
}
}
}