aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-07-09 18:20:53 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-07-09 18:20:53 +0000
commit78dcae873b1690c67d14ad7c8adada32183e3bd3 (patch)
tree65ffc44913cc3111755c8d95ce6c080dceb20ffe
parentf7a087feda3fc66f8622047780143182e3840fb0 (diff)
downloadelgg-78dcae873b1690c67d14ad7c8adada32183e3bd3.tar.gz
elgg-78dcae873b1690c67d14ad7c8adada32183e3bd3.tar.bz2
Updated embed/ecml modal interface
git-svn-id: http://code.elgg.org/elgg/trunk@6680 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/ecml/views/default/ecml/admin/css.php3
-rw-r--r--mod/ecml/views/default/embed/web_services/content.php3
-rw-r--r--mod/embed/views/default/embed/css.php2
3 files changed, 5 insertions, 3 deletions
diff --git a/mod/ecml/views/default/ecml/admin/css.php b/mod/ecml/views/default/ecml/admin/css.php
index d91fd779c..5c70d5242 100644
--- 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 ecd023011..d47e655b6 100644
--- 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 20c7549b8..8cb55970d 100644
--- 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 {