aboutsummaryrefslogtreecommitdiff
path: root/mod/embed
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-23 12:12:05 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-23 12:12:05 +0000
commit8ddab046c44e6f8f95a8b82fc492d7b0407389d1 (patch)
treea57463d83a73ab2e81f4182d1a5f46959e04ca71 /mod/embed
parent37235af003b133fd84dded5cec886ce3d169521f (diff)
downloadelgg-8ddab046c44e6f8f95a8b82fc492d7b0407389d1.tar.gz
elgg-8ddab046c44e6f8f95a8b82fc492d7b0407389d1.tar.bz2
Updated longtext/tinymce area extra controls. Moved and updated ecml help link, 'edit/remove editor' link and 'add media' links both moved and improved. Redundant css removed.
git-svn-id: http://code.elgg.org/elgg/trunk@5860 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/embed')
-rw-r--r--mod/embed/languages/en.php2
-rw-r--r--mod/embed/start.php2
-rw-r--r--mod/embed/views/default/embed/css.php11
-rw-r--r--mod/embed/views/default/embed/link.php2
4 files changed, 3 insertions, 14 deletions
diff --git a/mod/embed/languages/en.php b/mod/embed/languages/en.php
index ca57f4a9b..c92c5efad 100644
--- a/mod/embed/languages/en.php
+++ b/mod/embed/languages/en.php
@@ -2,7 +2,7 @@
$english = array(
- 'media:insert' => 'Embed / upload media',
+ 'media:insert' => 'Embed media',
'embed:instructions' => 'Click on any file to embed it into your content.',
diff --git a/mod/embed/start.php b/mod/embed/start.php
index d6bdcc0c9..f98c21245 100644
--- a/mod/embed/start.php
+++ b/mod/embed/start.php
@@ -19,7 +19,7 @@
elgg_extend_view('css','embed/css');
elgg_extend_view('js/initialise_elgg','embed/js');
elgg_extend_view('metatags','embed/metatags');
- elgg_extend_view('input/longtext','embed/link',10);
+ elgg_extend_view('input/longtext','embed/link',1);
// Page handler for the modal media embed
register_page_handler('embed','embed_page_handler');
diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
index 1b4f3ca80..d528ab1cc 100644
--- a/mod/embed/views/default/embed/css.php
+++ b/mod/embed/views/default/embed/css.php
@@ -91,17 +91,6 @@
#media_embed .embed_instructions {
margin:10px 0 5px 0;
}
-a.embed_media {
- margin:0;
- float:right;
- display:block;
- text-align: right;
- font-weight: normal;
-}
-label a.embed_media {
- font-size:0.8em;
-}
-
/* modal tabs */
#embed_media_tabs {
diff --git a/mod/embed/views/default/embed/link.php b/mod/embed/views/default/embed/link.php
index 0dd77ac99..14b33d4c2 100644
--- a/mod/embed/views/default/embed/link.php
+++ b/mod/embed/views/default/embed/link.php
@@ -1 +1 @@
-<a class="embed_media small link" href="<?php echo $vars['url'] . 'pg/embed/media'; ?>?internalname=<?php echo $vars['internalname']; ?>" rel="facebox"><?php echo elgg_echo('media:insert'); ?></a><br /> \ No newline at end of file
+<a class="longtext_control small link" href="<?php echo $vars['url'] . 'pg/embed/media'; ?>?internalname=<?php echo $vars['internalname']; ?>" rel="facebox"><?php echo elgg_echo('media:insert'); ?></a> \ No newline at end of file