From ce7b7e89e51c14793c9739522fcba200b1f08435 Mon Sep 17 00:00:00 2001
From: Florian BLOUET <florian.blouet@gmail.com>
Date: Mon, 21 Dec 2015 11:28:17 +0100
Subject: [PATCH] Bump Embed-Bundle at v0.1.0 - fix permaview iframe link

---
 bower.json                       |  2 +-
 composer.json                    |  2 +-
 composer.lock                    | 17 ++++++++---------
 templates/web/overview.html.twig |  8 +++-----
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/bower.json b/bower.json
index 6994961fb6..b218c5231c 100644
--- a/bower.json
+++ b/bower.json
@@ -27,7 +27,7 @@
     "bootstrap-sass": "v2.3.2.2",
     "jquery.lazyload": "~1.9.7",
     "jquery-treeview": "~1.4.2",
-    "alchemy-embed-medias": "https://github.com/alchemy-fr/embed-bundle.git"
+    "alchemy-embed-medias": "~0.1.0"
   },
   "devDependencies": {
     "mocha": "latest",
diff --git a/composer.json b/composer.json
index 75f7c3ac01..20626aea43 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
         "php": ">=5.5",
 
         "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/google-plus-api-client":        "~0.6.2",
         "alchemy/mediavorus":                    "^0.4.4",
diff --git a/composer.lock b/composer.lock
index 25902d1ec5..e6bb6c378e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "9cbb232263e66f0b496e4b0bbfe50ba2",
-    "content-hash": "548f5bb46cedc32f324eaa9012d9d14e",
+    "hash": "8a03f54c53aac0be4b6bec5ee24be736",
+    "content-hash": "c03239742e332a5a20589d3f5ec09b9a",
     "packages": [
         {
             "name": "alchemy-fr/tcpdf-clone",
@@ -122,16 +122,16 @@
         },
         {
             "name": "alchemy/embed-bundle",
-            "version": "dev-master",
+            "version": "v0.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/alchemy-fr/embed-bundle.git",
-                "reference": "639e6a2649df04254ed3dfc1a6d42c1821873673"
+                "reference": "fc5fb948b15b10262a8da52e54e11fe1d2ed2904"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/639e6a2649df04254ed3dfc1a6d42c1821873673",
-                "reference": "639e6a2649df04254ed3dfc1a6d42c1821873673",
+                "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/fc5fb948b15b10262a8da52e54e11fe1d2ed2904",
+                "reference": "fc5fb948b15b10262a8da52e54e11fe1d2ed2904",
                 "shasum": ""
             },
             "require-dev": {
@@ -169,10 +169,10 @@
             ],
             "description": "Embed resources bundle",
             "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"
             },
-            "time": "2015-12-18 09:36:03"
+            "time": "2015-12-21 10:19:25"
         },
         {
             "name": "alchemy/geonames-api-consumer",
@@ -6338,7 +6338,6 @@
     ],
     "minimum-stability": "stable",
     "stability-flags": {
-        "alchemy/embed-bundle": 20,
         "alchemy/rest-bundle": 20,
         "alchemy/task-manager": 20,
         "goodby/csv": 20,
diff --git a/templates/web/overview.html.twig b/templates/web/overview.html.twig
index 9ee2eefe0b..0ab2dbefdc 100644
--- a/templates/web/overview.html.twig
+++ b/templates/web/overview.html.twig
@@ -8,9 +8,7 @@
 
 {% block stylesheet %}
     <link type="text/css" rel="stylesheet" href="/assets/permaview/css/permaview{% if not app.debug %}.min{% endif %}.css">
-        <style type="text/css">
-
-        </style>
+    <style type="text/css"></style>
 {% endblock %}
 
 {% block rss %}
@@ -24,8 +22,8 @@
         <h1>{{ record.get_title() }}</h1>
 
         <div class="preview">
-            <iframe width="{{ subdef.get_width() }}" height="{{ subdef.get_height() }}"
-                    src="{{ app['request'].baseUrl }}/embed/{{ record.getBaseId() }}/{{ record.getRecordId() }}/{{ subdef.get_name() }}/?token={{ token }}"
+            <iframe width="100%" height="{{ subdef.get_height() }}"
+                    src="{{ app['request'].baseUrl }}/embed/{{ subdef.get_sbas_id() }}/{{ record.getRecordId() }}/{{ subdef.get_name() }}/?token={{ token }}"
                     frameborder="0" allowfullscreen></iframe>
         </div>