From c7b0817dabd1ea596086b03569d4480355e5f721 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 1 Oct 2011 12:42:00 -0400
Subject: using the menu system for the embed tabs and adding a reusable select
 list view

---
 mod/embed/views/default/js/embed/embed.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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

diff --git a/mod/embed/views/default/js/embed/embed.php b/mod/embed/views/default/js/embed/embed.php
index e9e08f9a0..49c277b69 100644
--- a/mod/embed/views/default/js/embed/embed.php
+++ b/mod/embed/views/default/js/embed/embed.php
@@ -15,9 +15,9 @@ elgg.embed.init = function() {
 	});
 
 	// special pagination helper for lightbox
-	$('.embed-wrapper .elgg-pagination a').live('click', elgg.embed.pagination);
+	$('.embed-wrapper .elgg-pagination a').live('click', elgg.embed.loadContent);
 
-	$('.embed-section').live('click', elgg.embed.loadTab);
+	$('.embed-section').live('click', elgg.embed.loadContent);
 
 	$('.embed-upload .elgg-form').live('submit', elgg.embed.submit);
 }
@@ -87,7 +87,7 @@ elgg.embed.submit = function(event) {
  * @param {Object} event
  * @return void
  */
-elgg.embed.pagination = function(event) {
+elgg.embed.loadContent = function(event) {
 	$('.embed-wrapper').parent().load($(this).attr('href'));
 	event.preventDefault();
 }
@@ -99,9 +99,7 @@ elgg.embed.pagination = function(event) {
  * @return void
  */
 elgg.embed.loadTab = function(event) {
-	var section = $(this).attr('id');
-	var url = elgg.config.wwwroot + 'embed/embed?active_section=' + section;
-	$('.embed-wrapper').parent().load(url);
+	$('.embed-wrapper').parent().load($(this).attr('href'));
 	event.preventDefault();
 }
 
-- 
cgit v1.2.3


From f352b05780a1896302d5a25936477b371c0f4dfd Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 1 Oct 2011 14:35:10 -0400
Subject: removed unnecessary code

---
 mod/embed/views/default/embed/css.php             | 264 ----------------------
 mod/embed/views/default/embed/embed.php           |  45 ----
 mod/embed/views/default/embed/item.php            |   2 +-
 mod/embed/views/default/embed/list.php            |   3 -
 mod/embed/views/default/embed/tabs.php            |  40 ----
 mod/embed/views/default/group/default/embed.php   |   5 -
 mod/embed/views/default/js/embed/embed.php        |  14 +-
 mod/embed/views/default/object/default/embed.php  |   6 -
 mod/embed/views/default/object/file/embed.php     |  16 --
 mod/embed/views/default/object/file/embedlist.php |  11 -
 mod/embed/views/default/site/default/embed.php    |   5 -
 mod/embed/views/default/user/default/embed.php    |   5 -
 12 files changed, 2 insertions(+), 414 deletions(-)
 delete mode 100644 mod/embed/views/default/embed/embed.php
 delete mode 100644 mod/embed/views/default/embed/tabs.php
 delete mode 100644 mod/embed/views/default/group/default/embed.php
 delete mode 100644 mod/embed/views/default/object/default/embed.php
 delete mode 100644 mod/embed/views/default/object/file/embed.php
 delete mode 100644 mod/embed/views/default/object/file/embedlist.php
 delete mode 100644 mod/embed/views/default/site/default/embed.php
 delete mode 100644 mod/embed/views/default/user/default/embed.php

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

diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
index 03373da2b..f654a208a 100644
--- a/mod/embed/views/default/embed/css.php
+++ b/mod/embed/views/default/embed/css.php
@@ -31,267 +31,3 @@
 .embed-wrapper .elgg-image-block:hover {
 	background-color: #eee;
 }
-<?php
-return true;
-?>
-/***************
- Form
-******************/
-/* input field classes */
-.embed-wrapper .elgg-input-text,
-.embed-wrapper .elgg-input-tags {
-	font: 120% Arial, Helvetica, sans-serif;
-	padding: 5px;
-	border: 1px solid #ccc;
-	color:#666;
-	background-color: white;
-
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-
-	-webkit-box-shadow: none;
-	-moz-box-shadow: none;
-	box-shadow: none;
-}
-.embed-wrapper .elgg-input-text:focus,
-.embed-wrapper .elgg-input-tags:focus {
-	border: solid 1px #4690d6;
-	background: #e4ecf5;
-	color:#333;
-}
-.embed-wrapper .elgg-input-file {
-	background-color: white;
-}
-
-.embed-wrapper label {
-	color:#333;
-}
-
-
-
-
-#facebox {
-	position: absolute;
-	top: 0;
-	left: 0;
-	z-index: 10000;
-	text-align: left;
-}
-#facebox .popup {
-	position: relative;
-}
-#facebox .body {
-	padding: 10px 15px 20px 15px;
-	background-color: white;
-	width: 730px;
-	min-height:400px;
-	
-	-webkit-border-radius: 8px; 
-	-moz-border-radius: 8px;
-	border-radius: 8px;
-}
-#facebox .loading {
-	text-align: center;
-	padding: 100px 10px 100px 10px;
-}
-#facebox .image {
-	text-align: center;
-}
-#facebox .footer {
-	float: right;
-	width:22px;
-	height:22px;
-	margin:-4px 0 0 0;
-	padding:0;
-}
-#facebox .footer img.close_image {
-	background: url(<?php echo elgg_get_site_url(); ?>mod/embed/images/close_button.gif) no-repeat left top;
-}
-#facebox .footer img.close_image:hover {
-	background: url(<?php echo elgg_get_site_url(); ?>mod/embed/images/close_button.gif) no-repeat left -31px;
-}
-#facebox_overlay {
-	position: fixed;
-	top: 0px;
-	left: 0px;
-	height:100%;
-	width:100%;
-}
-.facebox_hide {
-	z-index:-100;
-}
-.facebox_overlayBG {
-	background-color: #000;
-	z-index: 9999;
-}
-* html #facebox_overlay { /* ie6 hack */
-	position: absolute;
-	height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#facebox .body .content h2 {
-	color:#333333;
-}
-
-
-/* embeded content links */
-.embeded_file.link {
-	display: inline;
-	margin-right: 5px;
-	padding-left: 14px;
-	background-repeat: no-repeat;
-	
-	-webkit-background-size: 12px 16px;
-	-moz-background-size: 12px 16px; 
-	background-size: 12px 16px;
-}
-
-/* entity listings */
-.embed_data .elgg-image img {
-	cursor: pointer;
-}
-.embed_data .elgg-image-block  {
-	border-bottom:none;
-}
-.embed_modal_videolist .elgg-image img {
-	width:75px;
-	height:auto;
-}
-.embed_modal_document .embed_data .elgg-body {
-	margin-top:0;
-	margin-left:7px;
-}
-.embed_modal_tidypics .embed_data .elgg-body {
-	margin-top:11px;
-}
-.embed_modal_file .embed_data .elgg-body {
-	margin-top:0px;
-	margin-left:9px;
-}
-.embed_data .elgg-body {
-	width:auto;
-	margin-top:15px;
-	margin-left:15px;
-}
-.embed_data .elgg-image-block {
-	cursor:pointer;
-}
-
-/* input field classes */
-#facebox .content .elgg-input-text,
-#facebox .content .elgg-input-tags {
-	font: 120% Arial, Helvetica, sans-serif;
-	padding: 5px;
-	border: 1px solid #ccc;
-	color:#666;
-	background-color: white;
-	
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	
-	-webkit-box-shadow: none;
-	-moz-box-shadow: none;
-	box-shadow: none;
-}
-#facebox .content .elgg-input-text:focus,
-#facebox .content .elgg-input-tags:focus {
-	border: solid 1px #4690d6;
-	background: #e4ecf5;
-	color:#333;
-}
-#facebox .content .elgg-input-file {
-	background-color: white;
-}
-#facebox .content p {
-	color:#333;
-}
-#facebox .content p.entity-title {
-	color:#666;
-}
-#facebox .content .elgg-image-block:hover {
-	background-color: #eee;
-}
-#facebox .content label {
-	color:#333;
-}
-
-
-/* ***************************************
-	ELGG TABBED PAGE NAVIGATION
-*************************************** */
-#facebox .body .elgg-tabs {
-	margin-bottom:5px;
-	padding: 0;
-	border-bottom: 2px solid #ccc;
-	display:table;
-	width:100%;
-}
-#facebox .body .elgg-tabs ul {
-	list-style: none;
-	padding: 0;
-	margin: 0;
-}
-#facebox .body .elgg-tabs li {
-	float: left;
-	border: 2px solid #ccc;
-	border-bottom-width: 0;
-	background: #eee;
-	margin: 0 0 0 10px;
-	
-	-webkit-border-radius:5px 5px 0 0;
-	-moz-border-radius: 5px 5px 0 0;
-	border-raidus: 5px 5px 0 0;
-}
-#facebox .body .elgg-tabs a {
-	text-decoration: none;
-	display: block;
-	padding:3px 10px 0 10px;
-	text-align: center;
-	height:21px;
-	color:#999;
-}
-#facebox .body .elgg-tabs a:hover {
-	background: #dedede;
-	color:#666;
-}
-#facebox .body .elgg-tabs .selected {
-	border-color: #ccc;
-	background: white;
-}
-#facebox .body .elgg-tabs .selected a {
-	position: relative;
-	top: 2px;
-	background: white;
-}
-
-
-
-/* Pagination (override core elgg css defaults) */
-#facebox .body .pagination {
-	float:right;	
-}
-#facebox .body .pagination .pagination-number {
-	border:1px solid #999; 
-	color:#666;
-}
-#facebox .body .pagination .pagination-number:hover {
-	background-color:#aaa; 
-	color:black;
-}
-#facebox .body .pagination .pagination-previous,
-#facebox .body .pagination .pagination-next {
-	border:1px solid #999; 
-	color:#666;
-}
-#facebox .body .pagination .pagination-previous:hover,
-#facebox .body .pagination .pagination-next:hover {
-	background-color:#aaa; 
-	color:black;
-}
-#facebox .body .pagination .pagination-currentpage {
-	background-color:#666; 
-	border:1px solid #666; 
-	color:white;
-}
\ No newline at end of file
diff --git a/mod/embed/views/default/embed/embed.php b/mod/embed/views/default/embed/embed.php
deleted file mode 100644
index 2bd329690..000000000
--- a/mod/embed/views/default/embed/embed.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Embed landing page
- *
- * @todo Yes this is a lot of logic for a view.  A good bit of it can be moved
- * to the page handler
- *
- * @uses string $vars['sections'] Array of section_id => Section Display Name
- * @uses string $vars['active_section'] Currently selected section_id
- */
-
-$sections = elgg_extract('sections', $vars, array());
-$active_section = elgg_extract('active_section', $vars, array_shift(array_keys($sections)), false);
-$upload_sections = elgg_extract('upload_sections', $vars, array());
-
-if (!$sections) {
-	$content = elgg_echo('embed:no_sections');
-} else {
-	$content = elgg_view_title(elgg_echo('embed:media'));
-	$content .= elgg_view('embed/tabs', $vars);
-
-	$offset = (int)max(0, get_input('offset', 0));
-	$limit = (int)get_input('limit', 5);
-
-	// find the view to display
-	// @todo make it so you don't have to manually create views for each page
-	$view = "embed/$active_section/content";
-	
-	$section_content = elgg_view($view, $vars);
-
-	// build the items and layout.
-	if ($section_content) {
-		$content .= $section_content;
-	} else {
-		$content .= elgg_echo('embed:no_section_content');
-	}
-}
-
-echo '<div class="embed-wrapper">' . $content . '</div>';
-
-if (isset($js)) {
-	echo '<script type="text/javascript">';
-	echo $js;
-	echo '</script>';
-}
diff --git a/mod/embed/views/default/embed/item.php b/mod/embed/views/default/embed/item.php
index a64a67d8b..c6faa450b 100644
--- a/mod/embed/views/default/embed/item.php
+++ b/mod/embed/views/default/embed/item.php
@@ -2,7 +2,7 @@
 /**
  * Embeddable content list item view
  *
- * @uses $vars['entity']
+ * @uses $vars['entity'] ElggEntity object
  */
 
 $entity = $vars['entity'];
diff --git a/mod/embed/views/default/embed/list.php b/mod/embed/views/default/embed/list.php
index e36280e88..c13639cff 100644
--- a/mod/embed/views/default/embed/list.php
+++ b/mod/embed/views/default/embed/list.php
@@ -9,9 +9,6 @@
  * @uses $vars['limit']       Number of items per page
  * @uses $vars['count']       Number of items in the complete list
  *
- * @uses $vars['pagination']  Show pagination? (default: true)
- * @uses $vars['position']    Position of the pagination: before, after, or both
- * @uses $vars['full_view']   Show the full view of the items (default: false)
  * @uses $vars['list_class']  Additional CSS class for the <ul> element
  * @uses $vars['item_class']  Additional CSS class for the <li> elements
  */
diff --git a/mod/embed/views/default/embed/tabs.php b/mod/embed/views/default/embed/tabs.php
deleted file mode 100644
index 3f377fee5..000000000
--- a/mod/embed/views/default/embed/tabs.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Embed tabs
- *
- * @uses $vars['sections']
- * @uses $vars['upload_sections']
- * @uses $vars['actibe_section']
- */
-
-$sections = elgg_extract('sections', $vars, array());
-$active_section = elgg_extract('active_section', $vars, array_shift(array_keys($sections)));
-$upload_sections = elgg_extract('upload_sections', $vars, array());
-
-$tabs = array();
-foreach ($sections as $section_id => $section_info) {
-	$tab = array(
-		'title' => $section_info['name'],
-		'url' => '#',
-		'url_class' => 'embed-section',
-		'url_id' => $section_id,
-	);
-
-	if ($section_id == $active_section) {
-		$tab['selected'] = TRUE;
-	}
-	$tabs[] = $tab;
-}
-
-// make sure upload is always the last tab
-if ($upload_sections) {
-	$tabs[] = array(
-		'title' => elgg_echo('embed:upload'),
-		'url' => '#',
-		'url_class' => 'embed-section',
-		'url_id' => 'upload',
-		'selected' => ($active_section == 'upload')
-	);
-}
-
-echo elgg_view('navigation/tabs', array('tabs' => $tabs));
diff --git a/mod/embed/views/default/group/default/embed.php b/mod/embed/views/default/group/default/embed.php
deleted file mode 100644
index bf51f0a7d..000000000
--- a/mod/embed/views/default/group/default/embed.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-	if ($vars['entity'] instanceof ElggGroup) {
-		echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->name . '</a>';
-	}
-?>
\ No newline at end of file
diff --git a/mod/embed/views/default/js/embed/embed.php b/mod/embed/views/default/js/embed/embed.php
index 49c277b69..e60c6b367 100644
--- a/mod/embed/views/default/js/embed/embed.php
+++ b/mod/embed/views/default/js/embed/embed.php
@@ -1,4 +1,3 @@
-//<script>
 elgg.provide('elgg.embed');
 
 elgg.embed.init = function() {
@@ -82,7 +81,7 @@ elgg.embed.submit = function(event) {
 }
 
 /**
- * Loads the next chunk of content within the lightbox
+ * Loads content within the lightbox
  *
  * @param {Object} event
  * @return void
@@ -92,15 +91,4 @@ elgg.embed.loadContent = function(event) {
 	event.preventDefault();
 }
 
-/**
- * Loads an embed tab
- *
- * @param {Object} event
- * @return void
- */
-elgg.embed.loadTab = function(event) {
-	$('.embed-wrapper').parent().load($(this).attr('href'));
-	event.preventDefault();
-}
-
 elgg.register_hook_handler('init', 'system', elgg.embed.init);
diff --git a/mod/embed/views/default/object/default/embed.php b/mod/embed/views/default/object/default/embed.php
deleted file mode 100644
index aca2ceea1..000000000
--- a/mod/embed/views/default/object/default/embed.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-if ($vars['entity'] instanceof ElggObject) {
-	$title = htmlspecialchars($vars['entity']->title, ENT_QUOTES);
-	echo "<a href=\"{$vars['entity']->getURL()}\">$title</a>";
-}
diff --git a/mod/embed/views/default/object/file/embed.php b/mod/embed/views/default/object/file/embed.php
deleted file mode 100644
index b93c46e5e..000000000
--- a/mod/embed/views/default/object/file/embed.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-	$mime = $vars['entity']->mimetype;
-	
-	if (elgg_view_exists('file/specialcontent/' . $mime)) {
-		$content = elgg_view('file/specialcontent/' . $mime, $vars);
-	} else if (elgg_view_exists("file/specialcontent/" . substr($mime,0,strpos($mime,'/')) . "/default")) {
-		$content = elgg_view("file/specialcontent/" . substr($mime,0,strpos($mime,'/')) . "/default", $vars);
-	}
-	
-	if (empty($content) || substr_count(strtolower($content),'<embed') || substr_count(strtolower($content),'<object') || substr_count(strtolower($content),'<script')) {
-		echo elgg_view('object/default/embed',$vars);
-	} else {
-		echo $content;
-	}
-	
-?>
\ No newline at end of file
diff --git a/mod/embed/views/default/object/file/embedlist.php b/mod/embed/views/default/object/file/embedlist.php
deleted file mode 100644
index 5a3163e4c..000000000
--- a/mod/embed/views/default/object/file/embedlist.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-	$file = $vars['entity'];
-	$friendlytime = elgg_view_friendly_time($vars['entity']->time_created);
-	
-	$info = "<p class='entity-title'> <a href=\"{$file->getURL()}\">{$file->title}</a></p>";
-	$info .= "<p class='elgg-subtitle'>{$friendlytime}";
-	$icon = "<a href=\"{$file->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $file->mimetype, 'thumbnail' => $file->thumbnail, 'file_guid' => $file->guid, 'size' => 'small')) . "</a>";
-?>
-<div id="embed_entity_<?php echo $file->guid; ?>">
-	<?php echo elgg_view_image_block($icon, $info); ?>
-</div>
diff --git a/mod/embed/views/default/site/default/embed.php b/mod/embed/views/default/site/default/embed.php
deleted file mode 100644
index 2e8920a9a..000000000
--- a/mod/embed/views/default/site/default/embed.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-	if ($vars['entity'] instanceof ElggSite) {	
-		echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->name . '</a>';	
-	}
-?>
\ No newline at end of file
diff --git a/mod/embed/views/default/user/default/embed.php b/mod/embed/views/default/user/default/embed.php
deleted file mode 100644
index df538c94c..000000000
--- a/mod/embed/views/default/user/default/embed.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-	if ($vars['entity'] instanceof ElggUser) {	
-		echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->name . '</a>';	
-	}
-?>
\ No newline at end of file
-- 
cgit v1.2.3


From 418078a8d4c157c1c88d196d3b24ff0f0893b764 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 1 Oct 2011 16:30:04 -0400
Subject: cleaned up the embed item view and removed the inline js

---
 mod/embed/start.php                        |  1 +
 mod/embed/views/default/embed/css.php      |  6 +++-
 mod/embed/views/default/embed/item.php     | 44 ++++++++++++++++++------------
 mod/embed/views/default/js/embed/embed.php | 27 +++++++++++++-----
 4 files changed, 52 insertions(+), 26 deletions(-)

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

diff --git a/mod/embed/start.php b/mod/embed/start.php
index a87776c7e..015c0c0e4 100644
--- a/mod/embed/start.php
+++ b/mod/embed/start.php
@@ -129,6 +129,7 @@ function embed_get_list_options($options = array()) {
 	$defaults = array(
 		'limit' => 6,
 		'container_guid' => $container_guid,
+		'item_class' => 'embed-item',
 	);
 
 	$options = array_merge($defaults, $options);
diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
index f654a208a..324ed1038 100644
--- a/mod/embed/views/default/embed/css.php
+++ b/mod/embed/views/default/embed/css.php
@@ -28,6 +28,10 @@
 .embed-wrapper p {
 	color: #333;
 }
-.embed-wrapper .elgg-image-block:hover {
+.embed-item {
+	padding-left: 5px;
+	padding-right: 5px;
+}
+.embed-item:hover {
 	background-color: #eee;
 }
diff --git a/mod/embed/views/default/embed/item.php b/mod/embed/views/default/embed/item.php
index c6faa450b..4087b7408 100644
--- a/mod/embed/views/default/embed/item.php
+++ b/mod/embed/views/default/embed/item.php
@@ -7,25 +7,33 @@
 
 $entity = $vars['entity'];
 
-$image = elgg_view_entity_icon($entity, 'small');
-
-$body = "<h4>" . $entity->title . "</h4>";
-
-$icon = "<img src=\"{$entity->getIconURL('small')}\" />";
-
-$embed_code = elgg_view('output/url', array(
-	'href' => $entity->getURL(),
+$title = $entity->title;
+if (!$title) {
+	$title = $entity->name;
+}
+
+// different entity types have different title attribute names.
+$title = isset($entity->name) ? $entity->name : $entity->title;
+// don't let it be too long
+$title = elgg_get_excerpt($title);
+
+$owner = $entity->getOwnerEntity();
+if ($owner) {
+	$author_text = elgg_echo('byline', array($owner->name));
+	$date = elgg_view_friendly_time($entity->time_created);
+	$subtitle = "$author_text $date";
+} else {
+	$subtitle = '';
+}
+
+$params = array(
 	'title' => $title,
-	'text' => $icon,
-	'encode_text' => FALSE
-));
+	'entity' => $entity,
+	'subtitle' => $subtitle,
+	'tags' => FALSE,
+);
+$body = elgg_view('object/elements/summary', $params);
 
+$image = elgg_view_entity_icon($entity, 'small');
 
-echo "<div class=\"embed_data\" id=\"embed_{$entity->getGUID()}\">";
 echo elgg_view_image_block($image, $body);
-echo '</div>';
-
-// @todo JS 1.8: is this approach better than inline js?
-echo "<script type=\"text/javascript\">
-	$('#embed_{$entity->getGUID()}').data('embed_code', " . json_encode($embed_code) . ");
-</script>";
diff --git a/mod/embed/views/default/js/embed/embed.php b/mod/embed/views/default/js/embed/embed.php
index e60c6b367..37246ee8a 100644
--- a/mod/embed/views/default/js/embed/embed.php
+++ b/mod/embed/views/default/js/embed/embed.php
@@ -3,7 +3,7 @@ elgg.provide('elgg.embed');
 elgg.embed.init = function() {
 
 	// inserts the embed content into the textarea
-	$(".embed_data").live('click', elgg.embed.insert);
+	$(".embed-item").live('click', elgg.embed.insert);
 
 	// caches the current textarea id
 	$(".embed-control").live('click', function() {
@@ -24,7 +24,7 @@ elgg.embed.init = function() {
 /**
  * Inserts data attached to an embed list item in textarea
  *
- * @todo generalize lightbox closing and wysiwyg refreshing
+ * @todo generalize lightbox closing
  *
  * @param {Object} event
  * @return void
@@ -32,10 +32,23 @@ elgg.embed.init = function() {
 elgg.embed.insert = function(event) {
 	var textAreaId = elgg.embed.textAreaId;
 
-	var content = $(this).data('embed_code');
-	$('#' + textAreaId).val($('#' + textAreaId).val() + ' ' + content + ' ');
-
-	<?php echo elgg_view('embed/custom_insert_js'); ?>
+	// generalize this based on a css class attached to what should be inserted
+	var content = ' ' + $(this).find(".elgg-image").html() + ' ';
+	
+<?php
+// If a wysiwyg editor has been registered, it handles the insertion by
+// overriding the embed/custom_insert_js view. See the TinyMCE plugin for an
+// example of this.
+$custom_insert_code = elgg_view('embed/custom_insert_js');
+if ($custom_insert_code) {
+	echo $custom_insert_code;
+} else {
+?>
+	$('#' + textAreaId).val($('#' + textAreaId).val() + content);
+	$('#' + textAreaId).focus();
+<?php
+}
+?>
 
 	$.fancybox.close();
 
@@ -68,7 +81,7 @@ elgg.embed.submit = function(event) {
 				if (response.status >= 0) {
 					// @todo - really this should forward to what the registered defined
 					// For example, forward to images tab if an image was uploaded
-					var url = elgg.config.wwwroot + 'embed/embed?active_section=file';
+					var url = elgg.config.wwwroot + 'embed/embed';
 					$('.embed-wrapper').parent().load(url);
 				}
 			}
-- 
cgit v1.2.3


From bc292c96ac6b118bd7a99509fce1c11bb232aeb2 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 1 Oct 2011 16:54:24 -0400
Subject: fixed the forwarding of an embed upload form

---
 mod/embed/views/default/js/embed/embed.php         |  5 +-
 mod/file/views/default/embed/file/content.php      | 61 ----------------------
 .../views/default/embed/file_upload/content.php    |  9 +++-
 3 files changed, 9 insertions(+), 66 deletions(-)
 delete mode 100644 mod/file/views/default/embed/file/content.php

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

diff --git a/mod/embed/views/default/js/embed/embed.php b/mod/embed/views/default/js/embed/embed.php
index 37246ee8a..6d4e2e4ea 100644
--- a/mod/embed/views/default/js/embed/embed.php
+++ b/mod/embed/views/default/js/embed/embed.php
@@ -79,9 +79,8 @@ elgg.embed.submit = function(event) {
 					elgg.system_message(response.system_messages.success);
 				}
 				if (response.status >= 0) {
-					// @todo - really this should forward to what the registered defined
-					// For example, forward to images tab if an image was uploaded
-					var url = elgg.config.wwwroot + 'embed/embed';
+					var forward = $('input[name=embed_forward]').val();
+					var url = elgg.normalize_url('embed/tab/' + forward);
 					$('.embed-wrapper').parent().load(url);
 				}
 			}
diff --git a/mod/file/views/default/embed/file/content.php b/mod/file/views/default/embed/file/content.php
deleted file mode 100644
index eadcd1a6d..000000000
--- a/mod/file/views/default/embed/file/content.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * List files available for upload
- */
-
-$active_section = elgg_extract('active_section', $vars);
-
-$options = array(
-	'owner_guid' => elgg_get_logged_in_user_guid(),
-	'type_subtype_pair' => array('object' => 'file'),
-	'count' => true
-);
-
-$count = elgg_get_entities($options);
-
-if ($count) {
-	echo "<div class='embed_modal_$active_section'>";
-
-	unset($options['count']);
-	$items = elgg_get_entities($options);
-
-	foreach ($items as $item) {
-
-		// different entity types have different title attribute names.
-		$title = isset($item->name) ? $item->name : $item->title;
-		// don't let it be too long
-		$title = elgg_get_excerpt($title);
-
-		$author_text = elgg_echo('byline', array($owner->name));
-		$date = elgg_view_friendly_time($item->time_created);
-
-		$subtitle = "$author_text $date";
-
-		$icon = "<img src=\"{$item->getIconURL($icon_size)}\" />";
-
-		$embed_code = elgg_view('output/url', array(
-			'href' => $item->getURL(),
-			'title' => $title,
-			'text' => $icon,
-			'encode_text' => FALSE
-		));
-
-		$item_icon = elgg_view_entity_icon($item, $icon_size);
-
-		$params = array(
-			'title' => $title,
-			'entity' => $item,
-			'subtitle' => $subtitle,
-			'tags' => FALSE,
-		);
-		$list_body = elgg_view('object/elements/summary', $params);
-
-		// @todo JS 1.8: is this approach better than inline js?
-		echo "<div class=\"embed_data\" id=\"embed_{$item->getGUID()}\">" . elgg_view_image_block($item_icon, $list_body) . '</div>';
-		echo "<script type=\"text/javascript\">
-			$('#embed_{$item->getGUID()}').data('embed_code', " . json_encode($embed_code) . ");
-		</script>";
-	}
-
-	echo '</div>';
-}
\ No newline at end of file
diff --git a/mod/file/views/default/embed/file_upload/content.php b/mod/file/views/default/embed/file_upload/content.php
index 13c18f745..a530b3194 100644
--- a/mod/file/views/default/embed/file_upload/content.php
+++ b/mod/file/views/default/embed/file_upload/content.php
@@ -9,7 +9,12 @@ $form_vars = array(
 );
 $upload_content = elgg_view_form('file/upload', $form_vars);
 
-echo "<div class='mbm'>" . elgg_echo('embed:upload_type') . "$input</div>";
 echo "<div class='embed-upload'>";
 echo $upload_content;
-echo "</div>";
\ No newline at end of file
+echo "</div>";
+
+// the tab we want to be forwarded to after upload is complete
+echo elgg_view('input/hidden', array(
+	'name' => 'embed_forward',
+	'value' => 'file',
+));
\ No newline at end of file
-- 
cgit v1.2.3


From d7549a210074a29f004642d713ede6ce04703bcc Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 1 Oct 2011 17:38:47 -0400
Subject: Updated the instructions

---
 mod/embed/README.txt                       | 236 +++++++----------------------
 mod/embed/views/default/js/embed/embed.php |  25 ++-
 2 files changed, 66 insertions(+), 195 deletions(-)

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

diff --git a/mod/embed/README.txt b/mod/embed/README.txt
index 33c9fff65..c7ce2e528 100644
--- a/mod/embed/README.txt
+++ b/mod/embed/README.txt
@@ -1,198 +1,74 @@
-Embed plugin - Point-and-click embedding using ECML.
+Embed plugin
 
 CONTENTS:
 	1. Overview
-	2. Extending Embed
-		1. Registering and Populating Embed Sections
-		2. Registering Upload Sections
-		3. Advanced Layouts
-		4. Javascript
-	3. Other Editors and Embed
+	2. Adding a Tab
+	3. Populating a Select Tab
+	4. Populating an Upload Tab
+	5. Other WYSIWYG Editors and Embed
 
 	
 1. Overview
 	The Embed plugin is a simple way to allow users to link to or embed
 	their personal network content or third party resources in any text area.
-	
-	Embed includes support for the default input/longtext view, but is easily
-	extendable to include support for rich text editors like TinyMCE or CK 
-	Editor.
 
+	The Embed plugin adds a menu item to the longtext menu. Clicking on this
+	link pops up a lightbox. The lightbox has two types of tabs: one for
+	selecting content to embed and one for uploading new content.
 
-2. Extending Embed
-	The Embed plugin can be extended by other plugins using a combination
-	of plugin hooks and specific views.
-	
-	Plugins can register a new content section or a new upload section.
-	
-	Plugins can also provide special views for their embed section, if
-	they require something the default view doesn't provide.
+2. Adding a Tab
+	The Embed plugin uses the menu system to manage its tabs. Use
+	elgg_register_menu_item() for the embed menu to add a new tab like this:
 
+	$item = ElggMenuItem::factory(array(
+		'name' => 'file',
+		'text' => elgg_echo('file'),
+		'section' => 'select',
+		'data' => array(
+			'options' => array(
+				'type' => 'object',
+				'subtype' => 'file',
+			),
+		),
+	));
+	elgg_register_menu_item('embed', $item);
 
-2.1  Registering and Populating Embed Sections
-	Plugins providing embed content should reply to two hooks: embed_get_sections:all
-	and embed_get_items:$section_name.
-	
-	Embed emits the 'embed_get_sections' hook to populate the tabs of the modal display.
-	Plugins supporting embed should reply by pushing an array element to the passed
-	$value.
-	
-	Register plugins hooks like this:
-	
-		register_plugin_hook('embed_get_sections', 'all', 'my_plugin_embed_get_sections');
-		
-		function my_plugin_embed_get_sections($hook, $type, $value, $params) {
-			$value['videolist'] = array(
-				'name' => elgg_echo('my_plugin'),
-				'layout' => 'list',
-				'icon_size' => 'medium',
-			);
-		
-			return $value;
-		}
-	
-	The index of the returned array is the id used for the Embed section.
-	
-	Options available in the array value are:
-		name => The friendly name to display in the tab
-		layout => The layout style to use.  Layouts are found in the 
-				embed/layouts/$layout and embed/item/$layout views.  
-				Default supported layouts are list and gallery.
-		icon_size => The icon size to use for in the item list.
-		
-		
-	Embed emits the 'embed_get_items' hook to populate the embed section.  Plugins
-	supporting embed should reply by returning an array of ElggEntities, which will
-	be formatted by Embed.  If you need specific formatting for items, see section 2.3.
-	
-		register_plugin_hook('embed_get_items', 'videolist', 'videolist_embed_get_items');
-		
-		function my_plugin_embed_get_items($hook, $type, $value, $params) {
-			$options = array(
-				'owner_guid' => get_loggedin_userid(),
-				'type_subtype_pair' => array('object' => 'my_plugin_type'),
-				'count' => TRUE
-			);
-		
-			if ($count = elgg_get_entities($options)) {
-				$value['count'] += $count;
-			
-				unset($options['count']);
-				$options['offset'] = $params['offset'];
-				$options['limit'] = $params['limit'];
-			
-				$items = elgg_get_entities($options);
-			
-				$value['items'] = array_merge($items, $value['items']);
-			}
-		
-			return $value;
-		}
-		
-		Values passed in $params are:
-			offset - Offset for entity list.
-			limit - Limit for entity list.
-			section - The current active section.
-			upload_sections - Valid upload sections.
-			internal_name - Internal name of the input field
-			
-		The function should return $value as:
-			items - An array of ElggEntities
-			count - The count of all available entities to embed
-			
-		In case other plugins want to mangle the value, be sure to
-		check for existing values before appending.
+	Parameters:
+		name: The unique name of the tab.
+		text: The text shown on the tab
+		section: 'select' for embed selection or 'upload' for uploading new content
+		data: an array of parameters for creating the tab and its content. See
+			the two sections below for data key values for the two tab types.
 
+	Select tab data parameters:
+		options: array of options passed to elgg_list_entities()
 
-2.2 Registering Upload Sections
-	Embed includes a special tab, Upload, that allows users to immediatley
-	upload a new item.  Like the embed sections, plugins can extend this
-	to add their own upload form.
-	
-	Embed emits the embed_get_upload_sections:all hook to populate the
-	dropdown in the upload tab.  Plugins should respond to this hook
-	by returning an array with details about the upload section:  
-	
-		register_plugin_hook('embed_get_upload_sections', 'all', 'my_plugin_embed_get_upload_sections');
-		
-		function my_plugin_embed_get_upload_sections($hook, $type, $value, $params) {
-			$value['my_plugin'] = array(
-				'name' => elgg_echo('my_plugin'),
-				'view' => 'my_plugin/forms/embed_upload'
-			);
-	
-			return $value;
-		}
-		
-	The array index is the ID of the upload section, and the values are:
-		name - The friendly name of the upload section
-		view - The view to use for the upload section's content
-	
-	The upload form view should use AJAX to upload a file and return
-	the user to the correct section or automatically insert the new upload
-	into the text area.  See Tidypics as an example. 
-	
-	
-2.3 Advanced Layouts
-	By default, Embed will automatically format items returned by 
-	embed_get_items hooks.  If you need special formatting you can
-	override both the content and layout views.
-	
-	Embed looks for a section-specific views before defaulting to built
-	in formatting:
-		embed/$section/content - The content of the embed section
-								including all headers and navigation elements.
-		embed/$section/item/$layout - The content of the embed section
-								for the specific layout.  Inserted
-								between navigation elements.
-								
-	Embed also supports adhoc layouts that can be shared among different plugins.
-	To use a specific layout, register the embed section with your own layout
-	and create the appropriate layout view:
-	
-		function my_plugin_embed_get_sections($hook, $type, $value, $params) {
-			$value['videolist'] = array(
-				'name' => elgg_echo('my_plugin'),
-				'layout' => 'shared_embed_layout',
-				'icon_size' => 'medium',
-			);
-		
-			return $value;
-		}
-		
-		Create the views 'embed/layouts/shared_embed_layout' and 
-		'embed/items/shared_embed_layout.'  See the default list and 
-		gallery layouts as examples.
-		
-		
-2.4 Javascript
-	If you use a custom layout you need to provide a way to insert
-	the user's selection into the current editor.  Usually this will be
-	an onClick event via Javascript.  Embed provides a helper function for
-	this:
-	
-	elggEmbedInsertContent(content, textAreaId)
-	
-	Content is the pre-formatted content to insert into the text area,
-	and textAreaId is the name of the text area.  This name is
-	sent via GET as 'internal_name.'
-	
+	Upload tab data parameters:
+		view: the view used to render the tab content
+
+	See the file plugin for examples of registering both tab types.
+
+
+3. Populating a Select Tab
+	Nothing should be required other than setting the options parameter array
+	when registering the tab. See the view embed/item to see how an entity is
+	rendered.
+
+4. Populating an Upload Tab
+	The view that is registered must be defined. It must include a form for
+	uploading the content. The form must be wrapped in a div with the class
+	.embed-upload. Somewhere in the view must be a hidden input field with the
+	name embed_hidden with its value be the name of the tab to forward the user
+	to when uploading is complete.
+
+	See the view embed/file_upload/content for an example
 	
-3. Other Editors and Embed
+5. Other WYSIWYG Editors and Embed
 	Embed ships with support for the default input/longtext textarea.
-	Plugins replacing this view are expected to include Javascript to
+	Plugins replacing this view are expected to include JaVascript to
 	allow embed to work with the new editors.
 	
-	The elggEmbedInsertContent() JS function can be extened for custom
-	text editors by extending the embed/custom_insert_js view.  Plugins 
-	should extend this view with javascript code that inserts
-	content into the specific text area.  Variables available within
-	this view are:
-		str content The content to insert.
-		str textAreaId The name of the textarea to receive the content.
-	
-	Note: Extend this view; don't override it.  It is important to correctly
-	extend this view for compatibility across multiple plugins and textarea 
-	states.  Your custom JS should run without error no matter plugin order 
-	or rich text editor status.  See TinyMCE as an example of how to losely 
-	extend this function.
\ No newline at end of file
+	To add custom JavaScript into the Embed plugin's elgg.embed.insert() function,
+	override the view embed/custom_insert_js. The textarea jQuery object is
+	available as the variable textArea and the content to be inserted is the
+	variable content. See the TinyMCE plugin for an example of this view.
\ No newline at end of file
diff --git a/mod/embed/views/default/js/embed/embed.php b/mod/embed/views/default/js/embed/embed.php
index 6d4e2e4ea..840d8f89c 100644
--- a/mod/embed/views/default/js/embed/embed.php
+++ b/mod/embed/views/default/js/embed/embed.php
@@ -14,9 +14,9 @@ elgg.embed.init = function() {
 	});
 
 	// special pagination helper for lightbox
-	$('.embed-wrapper .elgg-pagination a').live('click', elgg.embed.loadContent);
+	$('.embed-wrapper .elgg-pagination a').live('click', elgg.embed.forward);
 
-	$('.embed-section').live('click', elgg.embed.loadContent);
+	$('.embed-section').live('click', elgg.embed.forward);
 
 	$('.embed-upload .elgg-form').live('submit', elgg.embed.submit);
 }
@@ -31,25 +31,20 @@ elgg.embed.init = function() {
  */
 elgg.embed.insert = function(event) {
 	var textAreaId = elgg.embed.textAreaId;
+	var textArea = $('#' + textAreaId);
 
 	// generalize this based on a css class attached to what should be inserted
 	var content = ' ' + $(this).find(".elgg-image").html() + ' ';
 	
+	textArea.val(textArea.val() + content);
+	textArea.focus();
+	
 <?php
-// If a wysiwyg editor has been registered, it handles the insertion by
-// overriding the embed/custom_insert_js view. See the TinyMCE plugin for an
-// example of this.
-$custom_insert_code = elgg_view('embed/custom_insert_js');
-if ($custom_insert_code) {
-	echo $custom_insert_code;
-} else {
-?>
-	$('#' + textAreaId).val($('#' + textAreaId).val() + content);
-	$('#' + textAreaId).focus();
-<?php
-}
+// See the TinyMCE plugin for an example of this view
+ echo elgg_view('embed/custom_insert_js');
 ?>
 
+
 	$.fancybox.close();
 
 	event.preventDefault();
@@ -98,7 +93,7 @@ elgg.embed.submit = function(event) {
  * @param {Object} event
  * @return void
  */
-elgg.embed.loadContent = function(event) {
+elgg.embed.forward = function(event) {
 	$('.embed-wrapper').parent().load($(this).attr('href'));
 	event.preventDefault();
 }
-- 
cgit v1.2.3


From fa04d6615760a014f7557f2d28ff864eebce8551 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Mon, 3 Oct 2011 21:30:30 -0400
Subject: removed the sections from the menu to provide more flexibility in tab
 ordering

---
 mod/embed/README.txt                               | 36 ++++++++++++----------
 mod/embed/views/default/embed/css.php              |  2 +-
 mod/embed/views/default/embed/layout.php           | 25 +++++++--------
 mod/embed/views/default/js/embed/embed.php         |  2 +-
 mod/embed/views/default/navigation/menu/embed.php  | 19 +++++-------
 mod/file/start.php                                 |  6 ++--
 .../views/default/embed/file_upload/content.php    |  8 ++---
 7 files changed, 44 insertions(+), 54 deletions(-)

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

diff --git a/mod/embed/README.txt b/mod/embed/README.txt
index c7ce2e528..cecee08c0 100644
--- a/mod/embed/README.txt
+++ b/mod/embed/README.txt
@@ -13,8 +13,9 @@ CONTENTS:
 	their personal network content or third party resources in any text area.
 
 	The Embed plugin adds a menu item to the longtext menu. Clicking on this
-	link pops up a lightbox. The lightbox has two types of tabs: one for
-	selecting content to embed and one for uploading new content.
+	link pops up a lightbox. The lightbox supports lists of content for insertion
+	and uploading new content.
+
 
 2. Adding a Tab
 	The Embed plugin uses the menu system to manage its tabs. Use
@@ -23,7 +24,7 @@ CONTENTS:
 	$item = ElggMenuItem::factory(array(
 		'name' => 'file',
 		'text' => elgg_echo('file'),
-		'section' => 'select',
+		'priority' => 10,
 		'data' => array(
 			'options' => array(
 				'type' => 'object',
@@ -36,32 +37,33 @@ CONTENTS:
 	Parameters:
 		name: The unique name of the tab.
 		text: The text shown on the tab
-		section: 'select' for embed selection or 'upload' for uploading new content
-		data: an array of parameters for creating the tab and its content. See
-			the two sections below for data key values for the two tab types.
-
-	Select tab data parameters:
-		options: array of options passed to elgg_list_entities()
-
-	Upload tab data parameters:
-		view: the view used to render the tab content
+		priority: Placement of the tab.
+		data: An array of parameters for creating the tab and its content.
+			When listing content using the embed list view, pass the options for the
+			elgg_list_entities() function as 'options'.
+			When using a custom view for listing content or for uploading new
+			content, pass the view name as 'view'.
 
 	See the file plugin for examples of registering both tab types.
 
 
-3. Populating a Select Tab
+3. Populating a Content Select Tab
 	Nothing should be required other than setting the options parameter array
 	when registering the tab. See the view embed/item to see how an entity is
 	rendered.
 
+	If creating a custom list, the <li> elements must have a class of .embed-item.
+	The HTML content that is inserted must use the class .elgg-image.
+
+
 4. Populating an Upload Tab
 	The view that is registered must be defined. It must include a form for
-	uploading the content. The form must be wrapped in a div with the class
-	.embed-upload. Somewhere in the view must be a hidden input field with the
-	name embed_hidden with its value be the name of the tab to forward the user
-	to when uploading is complete.
+	uploading the content. The form must .elgg-form-embed. Somewhere in the view
+	must be a hidden input field with the name embed_hidden with its value be
+	the name of the tab to forward the user to when uploading is complete.
 
 	See the view embed/file_upload/content for an example
+
 	
 5. Other WYSIWYG Editors and Embed
 	Embed ships with support for the default input/longtext textarea.
diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
index 324ed1038..034c0fcfe 100644
--- a/mod/embed/views/default/embed/css.php
+++ b/mod/embed/views/default/embed/css.php
@@ -8,7 +8,7 @@
 .embed-wrapper {
 	width: 730px;
 	min-height: 400px;
-	margin: 15px;
+	margin: 20px 15px;
 }
 .embed-wrapper h2 {
 	color: #333333;
diff --git a/mod/embed/views/default/embed/layout.php b/mod/embed/views/default/embed/layout.php
index 73c26810d..c1e43f13c 100644
--- a/mod/embed/views/default/embed/layout.php
+++ b/mod/embed/views/default/embed/layout.php
@@ -8,20 +8,17 @@ $title =  elgg_view_title(elgg_echo('embed:media'));
 $menu = elgg_view_menu('embed');
 
 $selected = elgg_get_config('embed_tab');
-switch ($selected->getData('tab_type')) {
-	case 'select':
-		$tab = elgg_list_entities(
-				embed_get_list_options($selected->getData('options')),
-				'elgg_get_entities',
-				'embed_list_items'
-				);
-		if (!$tab) {
-			$tab = elgg_echo('embed:no_section_content');
-		}
-		break;
-	case 'upload':
-		$tab = elgg_view($selected->getData('view'), $vars);
-		break;
+if ($selected->getData('view')) {
+	$tab = elgg_view($selected->getData('view'), $vars);
+} else {
+	$tab = elgg_list_entities(
+			embed_get_list_options($selected->getData('options')),
+			'elgg_get_entities',
+			'embed_list_items'
+			);
+	if (!$tab) {
+		$tab = elgg_echo('embed:no_section_content');
+	}
 }
 
 echo <<<HTML
diff --git a/mod/embed/views/default/js/embed/embed.php b/mod/embed/views/default/js/embed/embed.php
index 840d8f89c..bb80919a9 100644
--- a/mod/embed/views/default/js/embed/embed.php
+++ b/mod/embed/views/default/js/embed/embed.php
@@ -18,7 +18,7 @@ elgg.embed.init = function() {
 
 	$('.embed-section').live('click', elgg.embed.forward);
 
-	$('.embed-upload .elgg-form').live('submit', elgg.embed.submit);
+	$('.elgg-form-embed').live('submit', elgg.embed.submit);
 }
 
 /**
diff --git a/mod/embed/views/default/navigation/menu/embed.php b/mod/embed/views/default/navigation/menu/embed.php
index 36cedc47e..1a6a18f05 100644
--- a/mod/embed/views/default/navigation/menu/embed.php
+++ b/mod/embed/views/default/navigation/menu/embed.php
@@ -2,20 +2,17 @@
 /**
  * Embed tabs
  *
- * @uses $vars['menu']['select']
- * @uses $vars['menu']['upload']
+ * @uses $vars['menu']['default']
  */
 
 $tabs = array();
-foreach (array('select', 'upload') as $type) {
-	foreach ($vars['menu'][$type] as $menu_item) {
-		$tabs[] = array(
-			'title' => $menu_item->getText(),
-			'url' => 'embed/tab/' . $menu_item->getName(),
-			'url_class' => 'embed-section',
-			'selected' => $menu_item->getSelected(),
-		);
-	}
+foreach ($vars['menu']['default'] as $menu_item) {
+	$tabs[] = array(
+		'title' => $menu_item->getText(),
+		'url' => 'embed/tab/' . $menu_item->getName(),
+		'url_class' => 'embed-section',
+		'selected' => $menu_item->getSelected(),
+	);
 }
 
 echo elgg_view('navigation/tabs', array('tabs' => $tabs));
diff --git a/mod/file/start.php b/mod/file/start.php
index 16ce0e233..843ae0794 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -61,9 +61,8 @@ function file_init() {
 	$item = ElggMenuItem::factory(array(
 		'name' => 'file',
 		'text' => elgg_echo('file'),
-		'section' => 'select',
+		'priority' => 10,
 		'data' => array(
-			'tab_type' => 'select',
 			'options' => array(
 				'type' => 'object',
 				'subtype' => 'file',
@@ -75,9 +74,8 @@ function file_init() {
 	$item = ElggMenuItem::factory(array(
 		'name' => 'file_upload',
 		'text' => elgg_echo('file:upload'),
-		'section' => 'upload',
+		'priority' => 100,
 		'data' => array(
-			'tab_type' => 'upload',
 			'view' => 'embed/file_upload/content',
 		),
 	));
diff --git a/mod/file/views/default/embed/file_upload/content.php b/mod/file/views/default/embed/file_upload/content.php
index a530b3194..4d3db0d97 100644
--- a/mod/file/views/default/embed/file_upload/content.php
+++ b/mod/file/views/default/embed/file_upload/content.php
@@ -5,13 +5,9 @@
 
 $form_vars = array(
 	'enctype' => 'multipart/form-data',
-	'class' => 'elgg-form',
+	'class' => 'elgg-form-embed',
 );
-$upload_content = elgg_view_form('file/upload', $form_vars);
-
-echo "<div class='embed-upload'>";
-echo $upload_content;
-echo "</div>";
+echo elgg_view_form('file/upload', $form_vars);
 
 // the tab we want to be forwarded to after upload is complete
 echo elgg_view('input/hidden', array(
-- 
cgit v1.2.3


From 9d5c00c78c0666a31485d870a1e657d4557b23c4 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Mon, 3 Oct 2011 21:56:14 -0400
Subject: using better insert class

---
 mod/embed/README.txt                        |  2 +-
 mod/embed/views/default/embed/item.php      |  2 +-
 mod/embed/views/default/js/embed/embed.php  |  2 +-
 mod/file/views/default/icon/object/file.php | 15 ++++++++++-----
 views/default/icon/default.php              |  5 ++++-
 5 files changed, 17 insertions(+), 9 deletions(-)

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

diff --git a/mod/embed/README.txt b/mod/embed/README.txt
index cecee08c0..51b120d96 100644
--- a/mod/embed/README.txt
+++ b/mod/embed/README.txt
@@ -53,7 +53,7 @@ CONTENTS:
 	rendered.
 
 	If creating a custom list, the <li> elements must have a class of .embed-item.
-	The HTML content that is inserted must use the class .elgg-image.
+	The HTML content that is inserted must use the class .embed-insert.
 
 
 4. Populating an Upload Tab
diff --git a/mod/embed/views/default/embed/item.php b/mod/embed/views/default/embed/item.php
index 4087b7408..3060de879 100644
--- a/mod/embed/views/default/embed/item.php
+++ b/mod/embed/views/default/embed/item.php
@@ -34,6 +34,6 @@ $params = array(
 );
 $body = elgg_view('object/elements/summary', $params);
 
-$image = elgg_view_entity_icon($entity, 'small');
+$image = elgg_view_entity_icon($entity, 'small', array('link_class' => 'embed-insert'));
 
 echo elgg_view_image_block($image, $body);
diff --git a/mod/embed/views/default/js/embed/embed.php b/mod/embed/views/default/js/embed/embed.php
index bb80919a9..3126e12f7 100644
--- a/mod/embed/views/default/js/embed/embed.php
+++ b/mod/embed/views/default/js/embed/embed.php
@@ -34,7 +34,7 @@ elgg.embed.insert = function(event) {
 	var textArea = $('#' + textAreaId);
 
 	// generalize this based on a css class attached to what should be inserted
-	var content = ' ' + $(this).find(".elgg-image").html() + ' ';
+	var content = ' ' + $(this).find(".embed-insert").parent().html() + ' ';
 	
 	textArea.val(textArea.val() + content);
 	textArea.focus();
diff --git a/mod/file/views/default/icon/object/file.php b/mod/file/views/default/icon/object/file.php
index 6357d418f..7feba7af3 100644
--- a/mod/file/views/default/icon/object/file.php
+++ b/mod/file/views/default/icon/object/file.php
@@ -2,9 +2,10 @@
 /**
  * File icon view
  *
- * @uses $vars['entity'] The entity the icon represents - uses getIconURL() method
- * @uses $vars['size']   topbar, tiny, small, medium (default), large, master
- * @uses $vars['href']   Optional override for link
+ * @uses $vars['entity']     The entity the icon represents - uses getIconURL() method
+ * @uses $vars['size']       topbar, tiny, small, medium (default), large, master
+ * @uses $vars['href']       Optional override for link
+ * @uses $vars['link_class'] Optional CSS class added to img
  */
 
 $entity = $vars['entity'];
@@ -32,10 +33,14 @@ $img_src = elgg_format_url($img_src);
 $img = "<img $class src=\"$img_src\" alt=\"$title\" />";
 
 if ($url) {
-	echo elgg_view('output/url', array(
+	$params = array(
 		'href' => $url,
 		'text' => $img,
-	));
+	);
+	if (isset($vars['link_class'])) {
+		$params['class'] = $vars['link_class'];
+	}
+	echo elgg_view('output/url', $params);
 } else {
 	echo $img;
 }
diff --git a/views/default/icon/default.php b/views/default/icon/default.php
index c5749ba04..3abd96b96 100644
--- a/views/default/icon/default.php
+++ b/views/default/icon/default.php
@@ -8,6 +8,7 @@
  * @uses $vars['entity'] The entity the icon represents - uses getIconURL() method
  * @uses $vars['size']   topbar, tiny, small, medium (default), large, master
  * @uses $vars['href']   Optional override for link
+ * @uses $vars['img_class']  Optional CSS class added to img
  */
 
 $entity = $vars['entity'];
@@ -18,6 +19,8 @@ if (!in_array($vars['size'], $sizes)) {
 	$vars['size'] = "medium";
 }
 
+$class = elgg_extract('img_class', $vars, '');
+
 if (isset($entity->name)) {
 	$title = $entity->name;
 } else {
@@ -30,7 +33,7 @@ if (isset($vars['href'])) {
 }
 
 $img_src = $entity->getIconURL($vars['size']);
-$img = "<img src=\"$img_src\" alt=\"$title\" />";
+$img = "<img $class src=\"$img_src\" alt=\"$title\" />";
 
 if ($url) {
 	echo elgg_view('output/url', array(
-- 
cgit v1.2.3