Updated embed/ecml modal interface

git-svn-id: http://code.elgg.org/elgg/trunk@6680 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/ecml/views/default/ecml/admin/css.php b/mod/ecml/views/default/ecml/admin/css.php
index d91fd779c2b047e8c2c5bf3aa634c9111dc07a77..5c70d5242316720fd0ce41c76de3a17609cbb185 100644 (file)
--- a/mod/ecml/views/default/ecml/admin/css.php
+++ b/mod/ecml/views/default/ecml/admin/css.php
@@ -77,7 +77,8 @@
        padding:10px;
 }
 #ecml_preview object,
-#ecml_preview embed {
+#ecml_preview embed,
+#ecml_preview iframe {
        width: auto;
        max-height:240px;
 }

diff --git a/mod/ecml/views/default/embed/web_services/content.php b/mod/ecml/views/default/embed/web_services/content.php
index ecd023011b4cedfbdda58b5b296e72a8c67137ea..d47e655b65f1bd239f80e581fab7dfa3a1d8e476 100644 (file)
--- a/mod/ecml/views/default/embed/web_services/content.php
+++ b/mod/ecml/views/default/embed/web_services/content.php
@@ -57,7 +57,7 @@ echo "<div class='embed_content_section instructions hidden'><a class='ecml_embe
 echo "<div id='embed_ecml_keyword_help' class='hidden'></div></div>";
 
 echo "<div id='embed_service_url'><label>URL".$input."</label>";
-echo "<div class='ecml_generated_code'>ECML: <span id='ecml_code'></span></div></div>";
+echo "<div class='ecml_generated_code hidden'>ECML: <span id='ecml_code'></span></div></div>";
 
 echo "<div class='embed_content_section preview hidden'><a class='ecml_embed_preview link'>Preview</a>";
 echo "<div id='ecml_preview' class='hidden'></div></div>";
@@ -173,6 +173,7 @@ $(function() {
                                $('#ecml_code').html(data.ecml);
                                $('body').data('elgg_embed_ecml', data.ecml);
                                $('.embed_content_section.preview').removeClass('hidden'); // reveal preview link/panel
+                               $('.ecml_generated_code').removeClass('hidden'); // reveal ecml generated code
 
                                // set status for embed button
                                embed_button.removeAttr('disabled').removeClass('embed_disabled').removeClass('embed_warning').addClass('embed_good');

diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
index 20c7549b8a4fcba4eb5b240c0e4419bd8c5762ce..8cb55970dac6ebc85e11a857273d9790ae90816c 100644 (file)
--- a/mod/embed/views/default/embed/css.php
+++ b/mod/embed/views/default/embed/css.php
@@ -39,7 +39,7 @@
        float: right;
        width:22px;
        height:22px;
-       margin:0;
+       margin:-4px 0 0 0;
        padding:0;
 }
 #facebox .footer img.close_image {