mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 09:53:15 +00:00
Bump Embed-Bundle at v0.1.0 - fix permaview iframe link
This commit is contained in:
@@ -27,7 +27,7 @@
|
|||||||
"bootstrap-sass": "v2.3.2.2",
|
"bootstrap-sass": "v2.3.2.2",
|
||||||
"jquery.lazyload": "~1.9.7",
|
"jquery.lazyload": "~1.9.7",
|
||||||
"jquery-treeview": "~1.4.2",
|
"jquery-treeview": "~1.4.2",
|
||||||
"alchemy-embed-medias": "https://github.com/alchemy-fr/embed-bundle.git"
|
"alchemy-embed-medias": "~0.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"mocha": "latest",
|
"mocha": "latest",
|
||||||
|
@@ -35,7 +35,7 @@
|
|||||||
"php": ">=5.5",
|
"php": ">=5.5",
|
||||||
|
|
||||||
"alchemy-fr/tcpdf-clone": "~6.0",
|
"alchemy-fr/tcpdf-clone": "~6.0",
|
||||||
"alchemy/embed-bundle": "dev-master@dev",
|
"alchemy/embed-bundle": "~0.1.0",
|
||||||
"alchemy/geonames-api-consumer": "~0.1.0",
|
"alchemy/geonames-api-consumer": "~0.1.0",
|
||||||
"alchemy/google-plus-api-client": "~0.6.2",
|
"alchemy/google-plus-api-client": "~0.6.2",
|
||||||
"alchemy/mediavorus": "^0.4.4",
|
"alchemy/mediavorus": "^0.4.4",
|
||||||
|
17
composer.lock
generated
17
composer.lock
generated
@@ -4,8 +4,8 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"hash": "9cbb232263e66f0b496e4b0bbfe50ba2",
|
"hash": "8a03f54c53aac0be4b6bec5ee24be736",
|
||||||
"content-hash": "548f5bb46cedc32f324eaa9012d9d14e",
|
"content-hash": "c03239742e332a5a20589d3f5ec09b9a",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "alchemy-fr/tcpdf-clone",
|
"name": "alchemy-fr/tcpdf-clone",
|
||||||
@@ -122,16 +122,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "alchemy/embed-bundle",
|
"name": "alchemy/embed-bundle",
|
||||||
"version": "dev-master",
|
"version": "v0.1.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/alchemy-fr/embed-bundle.git",
|
"url": "https://github.com/alchemy-fr/embed-bundle.git",
|
||||||
"reference": "639e6a2649df04254ed3dfc1a6d42c1821873673"
|
"reference": "fc5fb948b15b10262a8da52e54e11fe1d2ed2904"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/639e6a2649df04254ed3dfc1a6d42c1821873673",
|
"url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/fc5fb948b15b10262a8da52e54e11fe1d2ed2904",
|
||||||
"reference": "639e6a2649df04254ed3dfc1a6d42c1821873673",
|
"reference": "fc5fb948b15b10262a8da52e54e11fe1d2ed2904",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
@@ -169,10 +169,10 @@
|
|||||||
],
|
],
|
||||||
"description": "Embed resources bundle",
|
"description": "Embed resources bundle",
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/alchemy-fr/embed-bundle/tree/master",
|
"source": "https://github.com/alchemy-fr/embed-bundle/tree/v0.1.0",
|
||||||
"issues": "https://github.com/alchemy-fr/embed-bundle/issues"
|
"issues": "https://github.com/alchemy-fr/embed-bundle/issues"
|
||||||
},
|
},
|
||||||
"time": "2015-12-18 09:36:03"
|
"time": "2015-12-21 10:19:25"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "alchemy/geonames-api-consumer",
|
"name": "alchemy/geonames-api-consumer",
|
||||||
@@ -6338,7 +6338,6 @@
|
|||||||
],
|
],
|
||||||
"minimum-stability": "stable",
|
"minimum-stability": "stable",
|
||||||
"stability-flags": {
|
"stability-flags": {
|
||||||
"alchemy/embed-bundle": 20,
|
|
||||||
"alchemy/rest-bundle": 20,
|
"alchemy/rest-bundle": 20,
|
||||||
"alchemy/task-manager": 20,
|
"alchemy/task-manager": 20,
|
||||||
"goodby/csv": 20,
|
"goodby/csv": 20,
|
||||||
|
@@ -8,9 +8,7 @@
|
|||||||
|
|
||||||
{% block stylesheet %}
|
{% block stylesheet %}
|
||||||
<link type="text/css" rel="stylesheet" href="/assets/permaview/css/permaview{% if not app.debug %}.min{% endif %}.css">
|
<link type="text/css" rel="stylesheet" href="/assets/permaview/css/permaview{% if not app.debug %}.min{% endif %}.css">
|
||||||
<style type="text/css">
|
<style type="text/css"></style>
|
||||||
|
|
||||||
</style>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block rss %}
|
{% block rss %}
|
||||||
@@ -24,8 +22,8 @@
|
|||||||
<h1>{{ record.get_title() }}</h1>
|
<h1>{{ record.get_title() }}</h1>
|
||||||
|
|
||||||
<div class="preview">
|
<div class="preview">
|
||||||
<iframe width="{{ subdef.get_width() }}" height="{{ subdef.get_height() }}"
|
<iframe width="100%" height="{{ subdef.get_height() }}"
|
||||||
src="{{ app['request'].baseUrl }}/embed/{{ record.getBaseId() }}/{{ record.getRecordId() }}/{{ subdef.get_name() }}/?token={{ token }}"
|
src="{{ app['request'].baseUrl }}/embed/{{ subdef.get_sbas_id() }}/{{ record.getRecordId() }}/{{ subdef.get_name() }}/?token={{ token }}"
|
||||||
frameborder="0" allowfullscreen></iframe>
|
frameborder="0" allowfullscreen></iframe>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user