From 1a79e4520f0db9423fb414c5534fd5004637d51d Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 15 Oct 2017 02:58:10 +0200
Subject: [PATCH] Embed block moved

---
 app/locales/cn.yml                            |  2 +-
 app/locales/de.yml                            |  2 +-
 app/locales/en.yml                            |  2 +-
 app/locales/es.yml                            |  2 +-
 app/locales/fr.yml                            |  2 +-
 src/Gist/Resources/views/View/embed.html.twig |  4 ----
 src/Gist/Resources/views/View/view.html.twig  | 18 +++++++++++++-----
 web/app/css/themes/dark.css                   |  2 +-
 web/app/js/app.js                             |  6 +++---
 9 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/locales/cn.yml b/app/locales/cn.yml
index adfe2d8..9af2b92 100644
--- a/app/locales/cn.yml
+++ b/app/locales/cn.yml
@@ -37,7 +37,7 @@ gist:
         raw: '源文件'
         download: '下载'
         clone: '克隆'
-        embed: '引用:'
+        embed: '引用'
         add: '新建'
 
 date:
diff --git a/app/locales/de.yml b/app/locales/de.yml
index c91934d..28a0314 100644
--- a/app/locales/de.yml
+++ b/app/locales/de.yml
@@ -37,7 +37,7 @@ gist:
         raw: 'RAW'
         download: 'Herunterladen'
         clone: 'Klonen'
-        embed: 'Einfügen:'
+        embed: 'Einfügen'
         add: 'Hinzufügen'
 
 date:
diff --git a/app/locales/en.yml b/app/locales/en.yml
index ff80822..dd99aba 100644
--- a/app/locales/en.yml
+++ b/app/locales/en.yml
@@ -38,7 +38,7 @@ gist:
         raw: 'RAW'
         download: 'Download'
         clone: 'Clone'
-        embed: 'Embed:'
+        embed: 'Embed'
         add: 'New'
 
 date:
diff --git a/app/locales/es.yml b/app/locales/es.yml
index 2d8176b..679d0f1 100644
--- a/app/locales/es.yml
+++ b/app/locales/es.yml
@@ -37,7 +37,7 @@ gist:
         raw: 'RAW'
         download: 'Descargar'
         clone: 'Clonar'
-        embed: 'Insertar : '
+        embed: 'Insertar'
         add: 'Añadir'
 
 date:
diff --git a/app/locales/fr.yml b/app/locales/fr.yml
index 8741cf5..68759cd 100644
--- a/app/locales/fr.yml
+++ b/app/locales/fr.yml
@@ -37,7 +37,7 @@ gist:
         raw: 'RAW'
         download: 'Télécharger'
         clone: 'Clôner'
-        embed: 'Insérer : '
+        embed: 'Insérer'
         add: 'Ajouter'
 
 date:
diff --git a/src/Gist/Resources/views/View/embed.html.twig b/src/Gist/Resources/views/View/embed.html.twig
index cc35adc..0e456a3 100644
--- a/src/Gist/Resources/views/View/embed.html.twig
+++ b/src/Gist/Resources/views/View/embed.html.twig
@@ -12,10 +12,6 @@
     {% endif %}
 
     <style type="text/css">
-        #embed {
-            padding: 0;
-        }
-
         .panel-body {
             padding: 0;
         }
diff --git a/src/Gist/Resources/views/View/view.html.twig b/src/Gist/Resources/views/View/view.html.twig
index c45ed24..58ba304 100644
--- a/src/Gist/Resources/views/View/view.html.twig
+++ b/src/Gist/Resources/views/View/view.html.twig
@@ -64,11 +64,19 @@
                             <div id="viewer">
                                 <pre><code {% if gist.cipher %}data-cipher{% endif %} class="language-{{ gist.type }}" data-dependencies="{{ gist.type }}">{{ raw_content }}</code></pre>
                             </div>
-
-                            <p id="embed" class="pull-right">
-                                {{ 'gist.action.embed'|trans }}
-                                <input type="text" class="form-control" id="embed-input" value="{{ '<div%key%id="gist-' ~ gist.file ~ '-' ~ commit ~ '" class="gist-container"></div><script src="' ~ app.request.getSchemeAndHttpHost() ~ path('embedjs', app.request.attributes.get('_route_params')) ~ '" async></script>' }}" />
-                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    {{ 'gist.action.embed'|trans }}
+                </div>
+                <div class="panel-body" id="embed">
+                    <div class="tab-content">
+                        <div class="tab-pane active in">
+                            <pre><code class="language-html">{{ '<div%key%id="gist-' ~ gist.file ~ '-' ~ commit ~ '" class="gist-container"></div>
+<script src="' ~ app.request.getSchemeAndHttpHost() ~ path('embedjs', app.request.attributes.get('_route_params')) ~ '" async></script>' }}</code></pre>
                         </div>
                     </div>
                 </div>
diff --git a/web/app/css/themes/dark.css b/web/app/css/themes/dark.css
index 19528c8..ab05c08 100644
--- a/web/app/css/themes/dark.css
+++ b/web/app/css/themes/dark.css
@@ -26,7 +26,7 @@ body {
 	margin-right: 4px;
 }
 
-#viewer pre, #viewer code, #revisions pre, #revisions code {
+#viewer pre, #viewer code, #revisions pre, #revisions code, #embed pre, #embed code {
     background: none !important;
 	white-space: pre-wrap;
 	white-space: -moz-pre-wrap;
diff --git a/web/app/js/app.js b/web/app/js/app.js
index a3624fc..2a11cb6 100644
--- a/web/app/js/app.js
+++ b/web/app/js/app.js
@@ -144,7 +144,7 @@ var viewerEvents = function() {
         var key = getKey();
 
         var $cipherEditor = $('.cipher-editor');
-        var $embedInput = $('#embed-input');
+        var $embedCode = $('#embed code');
 
         var to = ' ';
 
@@ -177,8 +177,8 @@ var viewerEvents = function() {
             }
         }
 
-        if ($embedInput.length) {
-            $embedInput.val($embedInput.val().replace('%key%', to));
+        if ($embedCode.length) {
+            $embedCode.html($embedCode.html().replace('%key%', to));
         }
     });
 }