From 0a3ba94a2805b8550c45f3fbf9dc9df148ff03a5 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 12 Feb 2011 00:58:11 +0000
Subject: light clean up on the embed plugin which doesn't appear to work at
 present

git-svn-id: http://code.elgg.org/elgg/trunk@8125 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/embed/views/default/embed/addcontentjs.php  | 1 +
 mod/embed/views/default/embed/lightbox_init.php | 6 ++++++
 mod/embed/views/default/embed/link.php          | 7 ++++++-
 mod/embed/views/default/embed/metatags.php      | 6 ------
 4 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 mod/embed/views/default/embed/lightbox_init.php
 delete mode 100644 mod/embed/views/default/embed/metatags.php

(limited to 'mod/embed/views/default')

diff --git a/mod/embed/views/default/embed/addcontentjs.php b/mod/embed/views/default/embed/addcontentjs.php
index c32d90871..18d2927fd 100644
--- a/mod/embed/views/default/embed/addcontentjs.php
+++ b/mod/embed/views/default/embed/addcontentjs.php
@@ -1,5 +1,6 @@
 <?php 
 /**
  * Blank for compatibility.
+ * @deprecated 1.8
  */
 ?>
\ No newline at end of file
diff --git a/mod/embed/views/default/embed/lightbox_init.php b/mod/embed/views/default/embed/lightbox_init.php
new file mode 100644
index 000000000..9f271067b
--- /dev/null
+++ b/mod/embed/views/default/embed/lightbox_init.php
@@ -0,0 +1,6 @@
+<?php //@todo JS 1.8: no ?>
+<script type="text/javascript">
+	jQuery(document).ready(function($) {
+		$('a[rel*=facebox]').facebox()
+	});
+</script>
diff --git a/mod/embed/views/default/embed/link.php b/mod/embed/views/default/embed/link.php
index c4fae0d42..4ed193047 100644
--- a/mod/embed/views/default/embed/link.php
+++ b/mod/embed/views/default/embed/link.php
@@ -10,5 +10,10 @@ if (elgg_is_active_plugin('ecml')) {
 	$active_section = '';
 }
 
+$url = "pg/embed/?{$active_section}internal_name={$vars['internalname']}";
+$url = elgg_normalize_url($url);
+
 ?>
-<a class="elgg-longtext-control small link" href="<?php echo elgg_get_site_url() . 'pg/embed'; ?>?<?php echo $active_section; ?>internal_name=<?php echo $vars['internalname']; ?>" rel="facebox"><?php echo elgg_echo('media:insert'); ?></a>
+<a class="elgg-longtext-control" href="<?php echo $url; ?>" rel="facebox">
+	<?php echo elgg_echo('media:insert'); ?>
+</a>
diff --git a/mod/embed/views/default/embed/metatags.php b/mod/embed/views/default/embed/metatags.php
deleted file mode 100644
index 5ff602362..000000000
--- a/mod/embed/views/default/embed/metatags.php
+++ /dev/null
@@ -1,6 +0,0 @@
-		<?php //@todo JS 1.8: no ?>
-		<script type="text/javascript">
-		jQuery(document).ready(function($) {
-		$('a[rel*=facebox]').facebox()
-		});
-		</script>
-- 
cgit v1.2.3