Merge branch 'master' of github.com:brettp/Elgg

200 files changed, 6866 insertions, 1409 deletions

diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php
index b626085d7..8a21c1f8d 100644
--- a/mod/blog/languages/en.php
+++ b/mod/blog/languages/en.php
@@ -12,9 +12,9 @@ $english = array(
 	'blog:blog' => 'Blog',
 	'item:object:blog' => 'Blogs',
 
-	'blog:title:user_blogs' => '%s\'s Blogs',
-	'blog:title:all_blogs' => 'All Site Blogs',
-	'blog:title:friends' => 'Friends\' Blogs',
+	'blog:title:user_blogs' => '%s\'s blogs',
+	'blog:title:all_blogs' => 'All site blogs',
+	'blog:title:friends' => 'Friends\' blogs',
 
 	'blog:group' => 'Group blog',
 	'blog:enableblog' => 'Enable group blog',
@@ -53,8 +53,11 @@ $english = array(
 	'blog:error:revision_not_found' => 'Cannot find this revision.',
 
 	// river
-	'blog:river:create' => 'published a blog post',
-	'river:commented:object:blog' => 'the blog',
+	'river:create:object:blog' => '%s published a blog post %s',
+	'river:comment:object:blog' => '%s commented on the blog %s',
+
+	// notifications
+	'blog:newpost' => 'A new blog post',
 
 	// widget
 	'blog:widget:description' => 'Display your latest blog posts',
diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 8964d5b53..b7b1a2baa 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -38,7 +38,7 @@ function blog_get_page_content_read($guid = NULL) {
 	}
 
 	elgg_push_breadcrumb($blog->title);
-	$return['content'] = elgg_view_entity($blog, TRUE);
+	$return['content'] = elgg_view_entity($blog, array('full_view' => true));
 	//check to see if comment are on
 	if ($blog->comments_on != 'Off') {
 		$return['content'] .= elgg_view_comments($blog);
@@ -88,8 +88,12 @@ function blog_get_page_content_list($container_guid = NULL) {
 	} else {
 		$return['filter_context'] = 'all';
 		$return['title'] = elgg_echo('blog:title:all_blogs');
+		elgg_pop_breadcrumb();
+		elgg_push_breadcrumb(elgg_echo('blog:blogs'));
 	}
 
+	elgg_register_title_button();
+
 	// show all posts for admin or users looking at their own blogs
 	// show only published posts for other users.
 	if (!(elgg_is_admin_logged_in() || (elgg_is_logged_in() && $container_guid == $loggedin_userid))) {
@@ -127,6 +131,8 @@ function blog_get_page_content_friends($user_guid) {
 	elgg_push_breadcrumb($crumbs_title, "blog/owner/{$user->username}");
 	elgg_push_breadcrumb(elgg_echo('friends'));
 
+	elgg_register_title_button();
+
 	if (!$friends = get_user_friends($user_guid, ELGG_ENTITIES_ANY_VALUE, 0)) {
 		$return['content'] .= elgg_echo('friends:none:you');
 		return $return;
@@ -233,7 +239,6 @@ function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) {
 	return array(
 		'content' => $content,
 		'title' => $title,
-		'buttons' => '',
 		'filter' => '',
 	);
 }
@@ -251,13 +256,13 @@ function blog_get_page_content_edit($page, $guid = 0, $revision = NULL) {
 	elgg_load_js('elgg.blog');
 
 	$return = array(
-		'buttons' => '',
 		'filter' => '',
 	);
 
 	$vars = array();
 	$vars['id'] = 'blog-post-edit';
 	$vars['name'] = 'blog_post';
+	$vars['class'] = 'elgg-form-alt';
 
 	if ($page == 'edit') {
 		$blog = get_entity((int)$guid);
diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php
index 6cfe6c98e..d769fbd59 100644
--- a/mod/blog/views/default/blog/group_module.php
+++ b/mod/blog/views/default/blog/group_module.php
@@ -14,10 +14,6 @@ $all_link = elgg_view('output/url', array(
 	'text' => elgg_echo('link:view:all'),
 ));
 
-$header = "<span class=\"groups-widget-viewall\">$all_link</span>";
-$header .= '<h3>' . elgg_echo('blog:group') . '</h3>';
-
-
 elgg_push_context('widgets');
 $options = array(
 	'type' => 'object',
@@ -34,12 +30,14 @@ if (!$content) {
 	$content = '<p>' . elgg_echo('blog:none') . '</p>';
 }
 
-if ($group->canWriteToContainer()) {
-	$new_link = elgg_view('output/url', array(
-		'href' => "blog/add/$group->guid",
-		'text' => elgg_echo('blog:write'),
-	));
-	$content .= "<span class='elgg-widget-more'>$new_link</span>";
-}
+$new_link = elgg_view('output/url', array(
+	'href' => "blog/add/$group->guid",
+	'text' => elgg_echo('blog:write'),
+));
 
-echo elgg_view_module('info', '', $content, array('header' => $header));
+echo elgg_view('groups/profile/module', array(
+	'title' => elgg_echo('blog:group'),
+	'content' => $content,
+	'all_link' => $all_link,
+	'add_link' => $new_link,
+));
diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
index d99f45f01..8246fdec3 100644
--- a/mod/blog/views/default/forms/blog/save.php
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -6,6 +6,7 @@
  */
 
 $blog = get_entity($vars['guid']);
+$vars['entity'] = $blog;
 
 $draft_warning = $vars['draft_warning'];
 if ($draft_warning) {
@@ -133,6 +134,8 @@ $body_input
 	$tags_input
 </div>
 
+$categories_input
+
 <div>
 	<label for="blog_comments_on">$comments_label</label>
 	$comments_input
@@ -148,9 +151,7 @@ $body_input
 	$status_input
 </div>
 
-$categories_input
-
-<div class="elgg-form-footer-alt">
+<div class="elgg-foot">
 	<div class="elgg-subtext mbm">
 	$save_status <span class="blog-save-status-time">$saved</span>
 	</div>
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 8456829fe..ba08180b1 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -74,6 +74,7 @@ if ($full) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
+	$params = $params + $vars;
 	$list_body = elgg_view('object/elements/summary', $params);
 
 	$blog_info = elgg_view_image_block($owner_icon, $list_body);
@@ -94,6 +95,7 @@ HTML;
 		'tags' => $tags,
 		'content' => $excerpt,
 	);
+	$params = $params + $vars;
 	$list_body = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view_image_block($owner_icon, $list_body);
diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
index bd2405d42..613cbb165 100644
--- a/mod/blog/views/default/river/object/blog/create.php
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -7,29 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->excerpt);
 $excerpt = elgg_get_excerpt($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
-
-$group_string = '';
-$container = $object->getContainerEntity();
-if ($container instanceof ElggGroup) {
-	$params = array(
-		'href' => $container->getURL(),
-		'text' => $container->name,
-	);
-	$group_link = elgg_view('output/url', $params);
-	$group_string = elgg_echo('river:ingroup', array($group_link));
-}
-
-echo elgg_echo('blog:river:create');
-
-echo " $link $group_string";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
\ No newline at end of file
diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php
index 42865f8cf..1d32a0344 100644
--- a/mod/bookmarks/languages/en.php
+++ b/mod/bookmarks/languages/en.php
@@ -35,10 +35,10 @@ $english = array(
 	'bookmarks:visit' => "Visit resource",
 	'bookmarks:recent' => "Recent bookmarks",
 
-	'bookmarks:river:created' => 'bookmarked %s',
+	'river:create:object:bookmarks' => '%s bookmarked %s',
+	'river:comment:object:bookmarks' => '%s commented on a bookmark %s',
 	'bookmarks:river:annotate' => 'a comment on this bookmark',
 	'bookmarks:river:item' => 'an item',
-	'river:commented:object:bookmarks' => 'a bookmark',
 
 	'item:object:bookmarks' => 'Bookmarks',
 
diff --git a/mod/bookmarks/pages/bookmarks/add.php b/mod/bookmarks/pages/bookmarks/add.php
index c7fd3cf79..d80d4a4bc 100644
--- a/mod/bookmarks/pages/bookmarks/add.php
+++ b/mod/bookmarks/pages/bookmarks/add.php
@@ -15,7 +15,6 @@ $content = elgg_view_form('bookmarks/save', array(), $vars);
 
 $body = elgg_view_layout('content', array(
 	'filter' => '',
-	'buttons' => '',
 	'content' => $content,
 	'title' => $title,
 ));
diff --git a/mod/bookmarks/pages/bookmarks/all.php b/mod/bookmarks/pages/bookmarks/all.php
index 0978fd7fd..d9ac2767f 100644
--- a/mod/bookmarks/pages/bookmarks/all.php
+++ b/mod/bookmarks/pages/bookmarks/all.php
@@ -5,6 +5,11 @@
  * @package ElggBookmarks
  */
 
+elgg_pop_breadcrumb();
+elgg_push_breadcrumb(elgg_echo('bookmarks'));
+
+elgg_register_title_button();
+
 $offset = (int)get_input('offset', 0);
 $content = elgg_list_entities(array(
 	'type' => 'object',
diff --git a/mod/bookmarks/pages/bookmarks/edit.php b/mod/bookmarks/pages/bookmarks/edit.php
index 24513a960..93b143c36 100644
--- a/mod/bookmarks/pages/bookmarks/edit.php
+++ b/mod/bookmarks/pages/bookmarks/edit.php
@@ -23,7 +23,6 @@ $content = elgg_view_form('bookmarks/save', array(), $vars);
 
 $body = elgg_view_layout('content', array(
 	'filter' => '',
-	'buttons' => '',
 	'content' => $content,
 	'title' => $title,
 ));
diff --git a/mod/bookmarks/pages/bookmarks/friends.php b/mod/bookmarks/pages/bookmarks/friends.php
index 6e3f77cf6..3491090a5 100644
--- a/mod/bookmarks/pages/bookmarks/friends.php
+++ b/mod/bookmarks/pages/bookmarks/friends.php
@@ -10,6 +10,8 @@ $owner = elgg_get_page_owner_entity();
 elgg_push_breadcrumb($owner->name, "bookmarks/owner/$owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
 
+elgg_register_title_button();
+
 $title = elgg_echo('bookmarks:friends');
 
 $content = list_user_friends_objects($owner->guid, 'bookmarks', 10, false);
diff --git a/mod/bookmarks/pages/bookmarks/owner.php b/mod/bookmarks/pages/bookmarks/owner.php
index f12d1d83f..679c986be 100644
--- a/mod/bookmarks/pages/bookmarks/owner.php
+++ b/mod/bookmarks/pages/bookmarks/owner.php
@@ -9,6 +9,8 @@ $page_owner = elgg_get_page_owner_entity();
 
 elgg_push_breadcrumb($page_owner->name);
 
+elgg_register_title_button();
+
 $offset = (int)get_input('offset', 0);
 $content .= elgg_list_entities(array(
 	'type' => 'object',
diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php
index d0a9c630a..8e097b090 100644
--- a/mod/bookmarks/pages/bookmarks/view.php
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -21,7 +21,7 @@ $title = $bookmark->title;
 
 elgg_push_breadcrumb($title);
 
-$content = elgg_view_entity($bookmark, true);
+$content = elgg_view_entity($bookmark, array('full_view' => true));
 $content .= elgg_view_comments($bookmark);
 
 $body = elgg_view_layout('content', array(
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 1fb79deb6..2a7b44e97 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -88,7 +88,6 @@ function bookmarks_page_handler($page) {
 	elgg_load_library('elgg:bookmarks');
 
 	elgg_push_breadcrumb(elgg_echo('bookmarks'), 'bookmarks/all');
-	elgg_push_context('bookmarks');
 
 	// old group usernames
 	if (substr_count($page[0], 'group:')) {
diff --git a/mod/bookmarks/views/default/bookmarks/group_module.php b/mod/bookmarks/views/default/bookmarks/group_module.php
index 3166fc0f0..3797de010 100644
--- a/mod/bookmarks/views/default/bookmarks/group_module.php
+++ b/mod/bookmarks/views/default/bookmarks/group_module.php
@@ -16,9 +16,6 @@ $all_link = elgg_view('output/url', array(
 	'text' => elgg_echo('link:view:all'),
 ));
 
-$header = "<span class=\"groups-widget-viewall\">$all_link</span>";
-$header .= '<h3>' . elgg_echo('bookmarks:group') . '</h3>';
-
 elgg_push_context('widgets');
 $options = array(
 	'type' => 'object',
@@ -35,12 +32,14 @@ if (!$content) {
 	$content = '<p>' . elgg_echo('bookmarks:none') . '</p>';
 }
 
-if ($group->canWriteToContainer()) {
-	$new_link = elgg_view('output/url', array(
-		'href' => "bookmarks/add/$group->guid",
-		'text' => elgg_echo('bookmarks:add'),
-	));
-	$content .= "<span class='elgg-widget-more'>$new_link</span>";
-}
+$new_link = elgg_view('output/url', array(
+	'href' => "bookmarks/add/$group->guid",
+	'text' => elgg_echo('bookmarks:add'),
+));
 
-echo elgg_view_module('info', '', $content, array('header' => $header));
+echo elgg_view('groups/profile/module', array(
+	'title' => elgg_echo('bookmarks:group'),
+	'content' => $content,
+	'all_link' => $all_link,
+	'add_link' => $new_link,
+));
diff --git a/mod/bookmarks/views/default/forms/bookmarks/save.php b/mod/bookmarks/views/default/forms/bookmarks/save.php
index 886283202..7d064a55b 100644
--- a/mod/bookmarks/views/default/forms/bookmarks/save.php
+++ b/mod/bookmarks/views/default/forms/bookmarks/save.php
@@ -44,7 +44,7 @@ if ($categories) {
 	<label><?php echo elgg_echo('access'); ?></label><br />
 	<?php echo elgg_view('input/access', array('name' => 'access_id', 'value' => $access_id)); ?>
 </div>
-<div>
+<div class="elgg-foot">
 <?php
 
 echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid));
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index 38b0a721a..ca1f5d312 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -65,6 +65,7 @@ if ($full && !elgg_in_context('gallery')) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
+	$params = $params + $vars;
 	$list_body = elgg_view('object/elements/summary', $params);
 	$bookmark_info = elgg_view_image_block($owner_icon, $list_body);
 
@@ -118,7 +119,8 @@ HTML;
 		'tags' => $tags,
 		'content' => $content,
 	);
-
+	$params = $params + $vars;
 	$body = elgg_view('object/elements/summary', $params);
+	
 	echo elgg_view_image_block($owner_icon, $body);
 }
\ No newline at end of file
diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php
index 743efdb22..984d109be 100644
--- a/mod/bookmarks/views/default/river/object/bookmarks/create.php
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -8,29 +8,8 @@
 $object = $vars['item']->getObjectEntity();
 $excerpt = elgg_get_excerpt($object->description);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
-
-$group_string = '';
-$container = $object->getContainerEntity();
-if ($container instanceof ElggGroup) {
-	$params = array(
-		'href' => $container->getURL(),
-		'text' => $container->name,
-	);
-	$group_link = elgg_view('output/url', $params);
-	$group_string = elgg_echo('river:ingroup', array($group_link));
-}
-
-$link = elgg_echo('bookmarks:river:created', array($link));
-
-echo " $link $group_string";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+	'attachments' => elgg_view('output/url', array('href' => $object->address)),
+));
diff --git a/mod/categories/actions/save.php b/mod/categories/actions/save.php
deleted file mode 100644
index 26222a030..000000000
--- a/mod/categories/actions/save.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Saves the available categories for the site
- *
- * @note The categories for an object are saved through an event handler: categories_save()
- *
- * @package ElggCategories
- */
-
-$categories = get_input('categories');
-$categories = string_to_tag_array($categories);
-
-$site = elgg_get_site_entity();
-$site->categories = $categories;
-system_message(elgg_echo("categories:save:success"));
-
-elgg_delete_admin_notice('categories_admin_notice_no_categories');
-
-forward(REFERER);
\ No newline at end of file
diff --git a/mod/categories/activate.php b/mod/categories/activate.php
new file mode 100644
index 000000000..80159d089
--- /dev/null
+++ b/mod/categories/activate.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Prompt the user to add categories after activating
+ */
+
+//categories_admin_notice_no_categories
+$site = get_config('site');
+if (!$site->categories) {
+	$message = elgg_echo('categories:on_activate_reminder', array(elgg_normalize_url('admin/plugin_settings/categories')));
+	elgg_add_admin_notice('categories_admin_notice_no_categories', $message);
+}
\ No newline at end of file
diff --git a/mod/categories/languages/en.php b/mod/categories/languages/en.php
index 1954ba8d9..eaa65b13e 100644
--- a/mod/categories/languages/en.php
+++ b/mod/categories/languages/en.php
@@ -9,7 +9,7 @@ $english = array(
 	'categories:explanation' => 'To set some predefined site-wide categories that will be used throughout your system, enter them below, separated with commas. Compatible tools will then display them when the user creates or edits content.',
 	'categories:save:success' => 'Site categories were successfully saved.',
 	'categories:results' => "Results for the site category: %s",
-	'categories:on_enable_reminder' => "You haven't added any categories yet!  <a href=\"%s\">Add categories now.</a>",
+	'categories:on_activate_reminder' => "Site-wide Cateogires won't work until you add categories. <a href=\"%s\">Add categories now.</a>",
 );
 
 add_translation("en", $english);
\ No newline at end of file
diff --git a/mod/categories/start.php b/mod/categories/start.php
index ff5b01efc..2ccea0d70 100644
--- a/mod/categories/start.php
+++ b/mod/categories/start.php
@@ -15,13 +15,14 @@ function categories_init() {
 
 	elgg_extend_view('css/elgg', 'categories/css');
 
-	$action_base = elgg_get_plugins_path() . 'categories/actions';
-	elgg_register_action('settings/categories/save', "$action_base/save.php", 'admin');
-
 	elgg_register_page_handler('categories', 'categories_page_handler');
 
 	elgg_register_event_handler('update', 'all', 'categories_save');
 	elgg_register_event_handler('create', 'all', 'categories_save');
+
+	// To keep the category plugins in the settings area and because we have to do special stuff,
+	// handle saving ourself.
+	elgg_register_plugin_hook_handler('action', 'plugins/settings/save', 'categories_save_site_categories');
 }
 
 
@@ -54,3 +55,29 @@ function categories_save($event, $object_type, $object) {
 	}
 	return TRUE;
 }
+
+/**
+ * Saves the site categories.
+ *
+ * @param type $hook
+ * @param type $type
+ * @param type $value
+ * @param type $params
+ */
+function categories_save_site_categories($hook, $type, $value, $params) {
+	$plugin_id = get_input('plugin_id');
+	if ($plugin_id != 'categories') {
+		return $value;
+	}
+
+	$categories = get_input('categories');
+	$categories = string_to_tag_array($categories);
+
+	$site = elgg_get_site_entity();
+	$site->categories = $categories;
+	system_message(elgg_echo("categories:save:success"));
+
+	elgg_delete_admin_notice('categories_admin_notice_no_categories');
+
+	forward(REFERER);
+}
\ No newline at end of file
diff --git a/mod/categories/views/default/input/categories.php b/mod/categories/views/default/input/categories.php
index 1f71dc0b4..75960d257 100644
--- a/mod/categories/views/default/input/categories.php
+++ b/mod/categories/views/default/input/categories.php
@@ -23,6 +23,10 @@ if (!empty($categories)) {
 		$categories = array($categories);
 	}
 
+	// checkboxes want Label => value, so in our case we need category => category
+	$categories = array_flip($categories);
+	array_walk($categories, create_function('&$v, $k', '$v = $k;'));
+
 	?>
 
 <div class="categories">
diff --git a/mod/categories/views/default/settings/categories/edit.php b/mod/categories/views/default/plugins/categories/settings.php
index 3802da95a..3802da95a 100644
--- a/mod/categories/views/default/settings/categories/edit.php
+++ b/mod/categories/views/default/plugins/categories/settings.php
diff --git a/mod/custom_index/index.php b/mod/custom_index/index.php
index e39e6ef29..53990a006 100644
--- a/mod/custom_index/index.php
+++ b/mod/custom_index/index.php
@@ -35,7 +35,8 @@ $newest_members = elgg_list_entities_from_metadata(array(
 	'limit' => 10,
 	'full_view' => false,
 	'pagination' => false,
-	'gallery' => true,
+	'list_type' => 'gallery',
+	'gallery_class' => 'elgg-gallery-users',
 	'size' => 'small',
 ));
 
diff --git a/mod/custom_index/views/default/page/layouts/custom_index.php b/mod/custom_index/views/default/page/layouts/custom_index.php
index 0883e7274..6b3f6d739 100644
--- a/mod/custom_index/views/default/page/layouts/custom_index.php
+++ b/mod/custom_index/views/default/page/layouts/custom_index.php
@@ -17,7 +17,7 @@
 // Top box for login or welcome message
 if (elgg_is_logged_in()) {
 	$top_box = "<h2>" . elgg_echo("welcome") . " ";
-	$top_box .= get_loggedin_user()->name;
+	$top_box .= elgg_get_logged_in_user_entity()->name;
 	$top_box .= "</h2>";
 } else {
 	$top_box = $vars['login'];
diff --git a/mod/dashboard/start.php b/mod/dashboard/start.php
index 4fa048b3d..69572bd32 100644
--- a/mod/dashboard/start.php
+++ b/mod/dashboard/start.php
@@ -8,6 +8,8 @@ elgg_register_event_handler('init', 'system', 'dashboard_init');
 function dashboard_init() {
 	elgg_register_page_handler('dashboard', 'dashboard_page_handler');
 
+	elgg_extend_view('css/elgg', 'dashboard/css');
+
 	elgg_register_menu_item('topbar', array(
 		'name' => 'dashboard',
 		'href' => 'dashboard',
@@ -15,6 +17,8 @@ function dashboard_init() {
 		'priority' => 450,
 		'section' => 'alt',
 	));
+
+	elgg_register_plugin_hook_handler('get_list', 'default_widgets', 'dashboard_default_widgets');
 }
 
 function dashboard_page_handler() {
@@ -40,3 +44,27 @@ function dashboard_page_handler() {
 
 	echo elgg_view_page($title, $body);
 }
+
+
+/**
+ * Register user dashboard with default widgets
+ *
+ * @param unknown_type $hook
+ * @param unknown_type $type
+ * @param unknown_type $return
+ * @param unknown_type $params
+ * @return array
+ */
+function dashboard_default_widgets($hook, $type, $return, $params) {
+	$return[] = array(
+		'name' => elgg_echo('dashboard'),
+		'widget_context' => 'dashboard',
+		'widget_columns' => 3,
+
+		'event' => 'create',
+		'entity_type' => 'user',
+		'entity_subtype' => ELGG_ENTITIES_ANY_VALUE,
+	);
+
+	return $return;
+}
\ No newline at end of file
diff --git a/mod/dashboard/views/default/dashboard/blurb.php b/mod/dashboard/views/default/dashboard/blurb.php
index 202be1dc5..9293e513a 100644
--- a/mod/dashboard/views/default/dashboard/blurb.php
+++ b/mod/dashboard/views/default/dashboard/blurb.php
@@ -9,7 +9,7 @@
 <?php 
 	echo elgg_view('output/longtext', array(
 		'id' => 'dashboard-info',
-		'class' => 'elgg-inner elgg-border-plain pam mhs mbl mtn',
+		'class' => 'elgg-inner pam mhs mtn',
 		'value' => elgg_echo("dashboard:nowidgets"),
 	));
 
diff --git a/mod/dashboard/views/default/dashboard/css.php b/mod/dashboard/views/default/dashboard/css.php
new file mode 100644
index 000000000..f49293293
--- /dev/null
+++ b/mod/dashboard/views/default/dashboard/css.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * User dashboard CSS
+ */
+?>
+
+#dashboard-info {
+	border: 2px solid #dedede;
+	margin-bottom: 15px;
+}
diff --git a/mod/developers/actions/developers/inspect.php b/mod/developers/actions/developers/inspect.php
new file mode 100644
index 000000000..6fd9e90f9
--- /dev/null
+++ b/mod/developers/actions/developers/inspect.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Ajax endpoint for inspection
+ *
+ */
+
+$inspect_type = get_input('inspect_type');
+$method = 'get' . str_replace(' ', '', $inspect_type);
+
+$inspector = new ElggInspector();
+if ($inspector && method_exists($inspector, $method)) {
+	$tree = $inspector->$method();
+	echo elgg_view('developers/tree', array('tree' => $tree));
+} else {
+	echo 'error';
+}
diff --git a/mod/developers/actions/developers/settings.php b/mod/developers/actions/developers/settings.php
index d8be34866..811fd22c0 100644
--- a/mod/developers/actions/developers/settings.php
+++ b/mod/developers/actions/developers/settings.php
@@ -17,8 +17,6 @@ if (get_input('view_path_cache')) {
 	elgg_disable_filepath_cache();
 }
 
-elgg_set_plugin_setting('display_errors', get_input('display_errors'), 'developers');
-
 $debug = get_input('debug_level');
 if ($debug) {
 	set_config('debug', $debug, $site->getGUID());
@@ -26,4 +24,12 @@ if ($debug) {
 	unset_config('debug', $site->getGUID());
 }
 
+$simple_settings = array('display_errors', 'screen_log', 'show_strings',
+	'wrap_views', 'log_events',);
+foreach ($simple_settings as $setting) {
+	elgg_set_plugin_setting($setting, get_input($setting), 'developers');
+}
+
+system_message(elgg_echo('developers:settings:success'));
+
 forward(REFERER);
diff --git a/mod/developers/classes/ElggInspector.php b/mod/developers/classes/ElggInspector.php
new file mode 100644
index 000000000..e83fc6b81
--- /dev/null
+++ b/mod/developers/classes/ElggInspector.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * Inspect Elgg variables
+ *
+ */
+
+class ElggInspector {
+
+	/**
+	 * Get Elgg event information
+	 *
+	 * returns [event,type] => array(handlers)
+	 */
+	public function getEvents() {
+		global $CONFIG;
+
+		$tree = array();
+		foreach ($CONFIG->events as $event => $types) {
+			foreach ($types as $type => $handlers) {
+				$tree[$event . ',' . $type] = array_values($handlers);
+			}
+		}
+
+		ksort($tree);
+
+		return $tree;
+	}
+
+	/**
+	 * Get Elgg plugin hooks information
+	 *
+	 * returns [hook,type] => array(handlers)
+	 */
+	public function getPluginHooks() {
+		global $CONFIG;
+
+		$tree = array();
+		foreach ($CONFIG->hooks as $hook => $types) {
+			foreach ($types as $type => $handlers) {
+				$tree[$hook . ',' . $type] = array_values($handlers);
+			}
+		}
+
+		ksort($tree);
+
+		return $tree;
+	}
+
+	/**
+	 * Get Elgg view information
+	 *
+	 * returns [view] => array(view location and extensions)
+	 */
+	public function getViews() {
+		global $CONFIG;
+
+		$coreViews = $this->recurseFileTree($CONFIG->viewpath . "default/");
+
+		// remove base path and php extension
+		array_walk($coreViews, create_function('&$v,$k', 'global $CONFIG; $v = substr($v, strlen($CONFIG->viewpath . "default/"), -4);'));
+
+		// setup views array before adding extensions and plugin views
+		$views = array();
+		foreach ($coreViews as $view) {
+			$views[$view] = array($CONFIG->viewpath . "default/" . $view . ".php");
+		}
+
+		// add plugins and handle overrides
+		foreach ($CONFIG->views->locations['default'] as $view => $location) {
+			$views[$view] = array($location . $view . ".php");
+		}
+
+		// now extensions
+		foreach ($CONFIG->views->extensions as $view => $extensions) {
+			$view_list = array();
+			foreach ($extensions as $priority => $ext_view) {
+				if (isset($views[$ext_view])) {
+					$view_list[] = $views[$ext_view][0];
+				}
+			}
+			if (count($view_list) > 0) {
+				$views[$view] = $view_list;
+			}
+		}
+
+		ksort($views);
+
+		return $views;
+	}
+
+	/**
+	 * Get Elgg widget information
+	 *
+	 * returns [widget] => array(name, contexts)
+	 */
+	public function getWidgets() {
+		global $CONFIG;
+
+		$tree = array();
+		foreach ($CONFIG->widgets->handlers as $handler => $handler_obj) {
+			$tree[$handler] = array($handler_obj->name, implode(',', array_values($handler_obj->context)));
+		}
+
+		ksort($tree);
+
+		return $tree;
+	}
+
+
+	/**
+	 * Get Elgg actions information
+	 *
+	 * returns [action] => array(file, public, admin)
+	 */
+	public function getActions() {
+		global $CONFIG;
+
+		$tree = array();
+		foreach ($CONFIG->actions as $action => $info) {
+			$tree[$action] = array($info['file'], ($info['public']) ? 'public' : 'logged in only', ($info['admin']) ? 'admin only' : 'non-admin');
+		}
+
+		ksort($tree);
+
+		return $tree;
+	}
+
+	/**
+	 * Get simplecache information
+	 *
+	 * returns [views]
+	 */
+	public function getSimpleCache() {
+		global $CONFIG;
+
+		$tree = array();
+		foreach ($CONFIG->views->simplecache as $view) {
+			$tree[$view] = "";
+		}
+
+		ksort($tree);
+
+		return $tree;
+	}
+
+	/**
+	 * Get Elgg web services API methods
+	 *
+	 * returns [method] => array(function, parameters, call_method, api auth, user auth)
+	 */
+	public function getWebServices() {
+		global $API_METHODS;
+
+		$tree = array();
+		foreach ($API_METHODS as $method => $info) {
+			$params = implode(', ', array_keys($info['parameters']));
+			if (!$params) {
+				$params = 'none';
+			}
+			$tree[$method] = array(
+				$info['function'],
+				"params: $params",
+				$info['call_method'],
+				($info['require_api_auth']) ? 'API authentication required' : 'No API authentication required',
+			 	($info['require_user_auth']) ? 'User authentication required' : 'No user authentication required',
+			);
+		}
+
+		ksort($tree);
+
+		return $tree;
+	}
+
+	/**
+	 * Create array of all php files in directory and subdirectories
+	 *
+	 * @param $dir full path to directory to begin search
+	 * @return array of every php file in $dir or below in file tree
+	 */
+	protected function recurseFileTree($dir) {
+		$view_list = array();
+
+		$handle = opendir($dir);
+		while ($file = readdir($handle)) {
+			if ($file[0] == '.') {
+
+			} else if (is_dir($dir . $file)) {
+				$view_list = array_merge($view_list, $this->recurseFileTree($dir . $file. "/"));
+			} else {
+				$extension = strrchr(trim($file, "/"), '.');
+				if ($extension === ".php") {
+					$view_list[] = $dir . $file;
+				}
+			}
+		}
+		closedir($handle);
+
+		return $view_list;
+	}
+
+}
diff --git a/mod/developers/classes/ElggLogCache.php b/mod/developers/classes/ElggLogCache.php
new file mode 100644
index 000000000..5bd4bce28
--- /dev/null
+++ b/mod/developers/classes/ElggLogCache.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Cache logging information for later display
+ *
+ */
+
+class ElggLogCache {
+	protected $cache;
+
+	public function __construct() {
+		$this->cache = array();
+	}
+
+	/**
+	 * Insert into cache
+	 * 
+	 * @param mixed $data The log data to cache
+	 */
+	public function insert($data) {
+		$this->cache[] = $data;
+	}
+
+	/**
+	 * Insert into cache from plugin hook
+	 * 
+	 * @param string $hook
+	 * @param string $type
+	 * @param bool   $result 
+	 * @param array  $params Must have the data at $params['msg']
+	 */
+	public function insertDump($hook, $type, $result, $params) {
+		$this->insert($params['msg']);
+		return false;
+	}
+
+	/**
+	 * Get the cache
+	 *
+	 * @return array
+	 */
+	public function get() {
+		return $this->cache;
+	}
+}
diff --git a/mod/developers/languages/en.php b/mod/developers/languages/en.php
index 53a9cd686..42df52134 100644
--- a/mod/developers/languages/en.php
+++ b/mod/developers/languages/en.php
@@ -9,6 +9,7 @@ $english = array(
 	'admin:developers' => 'Developers',
 	'admin:developers:settings' => 'Developer Settings',
 	'admin:developers:preview' => 'Theming Preview',
+	'admin:developers:inspect' => 'Inspect',
 
 	// settings
 	'elgg_dev_tools:settings:explanation' => 'Control your development and debugging settings below. Some of these settings are also available on other admin pages.',
@@ -20,11 +21,25 @@ $english = array(
 	'developers:help:debug_level' => "This controls the amount of information logged. See elgg_log() for more information.",
 	'developers:label:display_errors' => 'Display fatal PHP errors',
 	'developers:help:display_errors' => "By default, Elgg's .htaccess file supresses the display of fatal errors.",
+	'developers:label:screen_log' => "Log to the screen",
+	'developers:help:screen_log' => "This displays elgg_log() and elgg_dump() output on the web page.",
+	'developers:label:show_strings' => "Show raw translation strings",
+	'developers:help:show_strings' => "This displays the translation strings used by elgg_echo().",
+	'developers:label:wrap_views' => "Wrap views",
+	'developers:help:wrap_views' => "This wraps almost every view with HTML comments. Useful for finding the view creating particular HTML.",
+	'developers:label:log_events' => "Log events and plugin hooks",
+	'developers:help:log_events' => "Write events and plugin hooks to the log. Warning: there are many of these per page.",
 
 	'developers:debug:off' => 'Off',
 	'developers:debug:error' => 'Error',
 	'developers:debug:warning' => 'Warning',
 	'developers:debug:notice' => 'Notice',
+	
+	// inspection
+	'developers:inspect:help' => 'Inspect configuration of the Elgg framework.',
+
+	// event logging
+	'developers:event_log_msg' => "%s: '%s, %s' in %s",
 
 	// theme preview
 	'theme_preview:general' => 'Introduction',
@@ -37,6 +52,9 @@ $english = array(
 	'theme_preview:modules' => 'Modules',
 	'theme_preview:navigation' => 'Navigation',
 	'theme_preview:typography' => 'Typography',
+
+	// status messages
+	'developers:settings:success' => 'Settings saved',
 );
 
 add_translation('en', $english);
diff --git a/mod/developers/start.php b/mod/developers/start.php
index c05432e30..d9e1141e0 100644
--- a/mod/developers/start.php
+++ b/mod/developers/start.php
@@ -12,11 +12,19 @@ function developers_init() {
 	elgg_register_event_handler('pagesetup', 'system', 'developers_setup_menu');
 
 	elgg_extend_view('css/admin', 'developers/css');
+	elgg_extend_view('css/elgg', 'developers/css');
 
 	elgg_register_page_handler('theme_preview', 'developers_theme_preview_controller');
 
 	$action_base = elgg_get_plugins_path() . 'developers/actions/developers';
 	elgg_register_action('developers/settings', "$action_base/settings.php", 'admin');
+	elgg_register_action('developers/inspect', "$action_base/inspect.php", 'admin');
+
+	elgg_register_js('jquery.jstree', 'mod/developers/vendors/jsTree/jquery.jstree.js', 'footer');
+	elgg_register_css('jquery.jstree', 'mod/developers/vendors/jsTree/themes/default/style.css');
+
+	elgg_register_js('elgg.dev', 'js/developers/developers.js', 'footer');
+	elgg_load_js('elgg.dev');
 }
 
 function developers_process_settings() {
@@ -25,16 +33,119 @@ function developers_process_settings() {
 	} else {
 		ini_set('display_errors', 0);
 	}
+
+	if (elgg_get_plugin_setting('screen_log', 'developers') == 1) {
+		$cache = new ElggLogCache();
+		elgg_set_config('log_cache', $cache);
+		elgg_register_plugin_hook_handler('debug', 'log', array($cache, 'insertDump'));
+		elgg_extend_view('page/elements/foot', 'developers/log');
+	}
+
+	if (elgg_get_plugin_setting('show_strings', 'developers') == 1) {
+		// first and last in case a plugin registers a translation in an init method
+		elgg_register_event_handler('init', 'system', 'developers_clear_strings', 1000);
+		elgg_register_event_handler('init', 'system', 'developers_clear_strings', 1);
+	}
+
+	if (elgg_get_plugin_setting('wrap_views', 'developers') == 1) {
+		elgg_register_plugin_hook_handler('view', 'all', 'developers_wrap_views');
+	}
+
+	if (elgg_get_plugin_setting('log_events', 'developers') == 1) {
+		elgg_register_event_handler('all', 'all', 'developers_log_events', 1);
+		elgg_register_plugin_hook_handler('all', 'all', 'developers_log_events', 1);
+	}
 }
 
 function developers_setup_menu() {
 	if (elgg_in_context('admin')) {
 		elgg_register_admin_menu_item('develop', 'settings', 'developers');
+		elgg_register_admin_menu_item('develop', 'inspect', 'developers');
 		elgg_register_admin_menu_item('develop', 'preview', 'developers');
 	}
 }
 
 /**
+* Clear all the strings so the raw descriptor strings are displayed
+*/
+function developers_clear_strings() {
+	global $CONFIG;
+
+	$language = get_language();
+	$CONFIG->translations[$language] = array();
+	$CONFIG->translations['en'] = array();
+}
+
+/**
+ * Post-process a view to add wrapper comments to it
+ */
+function developers_wrap_views($hook, $type, $result, $params) {
+	if (elgg_get_viewtype() != "default") {
+		return;
+	}
+
+	$excluded_bases = array('css', 'js', 'input', 'output', 'embed', 'icon',);
+
+	$excluded_views = array(
+		'page/default',
+		'page/admin',
+		'page/elements/head',
+	);
+
+	$view = $params['view'];
+
+	$view_hierarchy = explode('/',$view);
+	if (in_array($view_hierarchy[0], $excluded_bases)) {
+		return;
+	}
+
+	if (in_array($view, $excluded_views)) {
+		return;
+	}
+
+	if ($result) {
+		$result = "<!-- developers:begin $view -->$result<!-- developers:end $view -->";
+	}
+
+	return $result;
+}
+
+/**
+* Log the events and plugin hooks
+*/
+function developers_log_events($name, $type) {
+
+	// filter out some very common events
+	if ($name == 'view' || $name == 'display' || $name == 'log' || $name == 'debug') {
+		return;
+	}
+	if ($name == 'session:get' || $name == 'validate') {
+		return;
+	}
+
+	$stack = debug_backtrace();
+	if ($stack[2]['function'] == 'elgg_trigger_event') {
+		$event_type = 'Event';
+	} else {
+		$event_type = 'Plugin hook';
+	}
+	$function = $stack[3]['function'] . '()';
+	if ($function == 'require_once' || $function == 'include_once') {
+		$function = $stack[3]['file'];
+	}
+
+	$msg = elgg_echo('developers:event_log_msg', array(
+		$event_type,
+		$name,
+		$type,
+		$function,
+	));
+	elgg_dump($msg, false, 'WARNING');
+
+	unset($stack);
+}
+
+/**
  * Serve the theme preview pages
  *
  * @param array $page
diff --git a/mod/developers/vendors/jsTree/jquery.jstree.js b/mod/developers/vendors/jsTree/jquery.jstree.js
new file mode 100644
index 000000000..965a612f6
--- /dev/null
+++ b/mod/developers/vendors/jsTree/jquery.jstree.js
@@ -0,0 +1,4544 @@
+/*

+ * jsTree 1.0-rc3

+ * http://jstree.com/

+ *

+ * Copyright (c) 2010 Ivan Bozhanov (vakata.com)

+ *

+ * Licensed same as jquery - under the terms of either the MIT License or the GPL Version 2 License

+ *   http://www.opensource.org/licenses/mit-license.php

+ *   http://www.gnu.org/licenses/gpl.html

+ *

+ * $Date: 2011-02-09 01:17:14 +0200 (ср, 09 февр 2011) $

+ * $Revision: 236 $

+ */

+

+/*jslint browser: true, onevar: true, undef: true, bitwise: true, strict: true */

+/*global window : false, clearInterval: false, clearTimeout: false, document: false, setInterval: false, setTimeout: false, jQuery: false, navigator: false, XSLTProcessor: false, DOMParser: false, XMLSerializer: false*/

+

+"use strict";

+

+// top wrapper to prevent multiple inclusion (is this OK?)

+(function () { if(jQuery && jQuery.jstree) { return; }

+	var is_ie6 = false, is_ie7 = false, is_ff2 = false;

+

+/* 

+ * jsTree core

+ */

+(function ($) {

+	// Common functions not related to jsTree 

+	// decided to move them to a `vakata` "namespace"

+	$.vakata = {};

+	// CSS related functions

+	$.vakata.css = {

+		get_css : function(rule_name, delete_flag, sheet) {

+			rule_name = rule_name.toLowerCase();

+			var css_rules = sheet.cssRules || sheet.rules,

+				j = 0;

+			do {

+				if(css_rules.length && j > css_rules.length + 5) { return false; }

+				if(css_rules[j].selectorText && css_rules[j].selectorText.toLowerCase() == rule_name) {

+					if(delete_flag === true) {

+						if(sheet.removeRule) { sheet.removeRule(j); }

+						if(sheet.deleteRule) { sheet.deleteRule(j); }

+						return true;

+					}

+					else { return css_rules[j]; }

+				}

+			}

+			while (css_rules[++j]);

+			return false;

+		},

+		add_css : function(rule_name, sheet) {

+			if($.jstree.css.get_css(rule_name, false, sheet)) { return false; }

+			if(sheet.insertRule) { sheet.insertRule(rule_name + ' { }', 0); } else { sheet.addRule(rule_name, null, 0); }

+			return $.vakata.css.get_css(rule_name);

+		},

+		remove_css : function(rule_name, sheet) { 

+			return $.vakata.css.get_css(rule_name, true, sheet); 

+		},

+		add_sheet : function(opts) {

+			var tmp = false, is_new = true;

+			if(opts.str) {

+				if(opts.title) { tmp = $("style[id='" + opts.title + "-stylesheet']")[0]; }

+				if(tmp) { is_new = false; }

+				else {

+					tmp = document.createElement("style");

+					tmp.setAttribute('type',"text/css");

+					if(opts.title) { tmp.setAttribute("id", opts.title + "-stylesheet"); }

+				}

+				if(tmp.styleSheet) {

+					if(is_new) { 

+						document.getElementsByTagName("head")[0].appendChild(tmp); 

+						tmp.styleSheet.cssText = opts.str; 

+					}

+					else {

+						tmp.styleSheet.cssText = tmp.styleSheet.cssText + " " + opts.str; 

+					}

+				}

+				else {

+					tmp.appendChild(document.createTextNode(opts.str));

+					document.getElementsByTagName("head")[0].appendChild(tmp);

+				}

+				return tmp.sheet || tmp.styleSheet;

+			}

+			if(opts.url) {

+				if(document.createStyleSheet) {

+					try { tmp = document.createStyleSheet(opts.url); } catch (e) { }

+				}

+				else {

+					tmp			= document.createElement('link');

+					tmp.rel		= 'stylesheet';

+					tmp.type	= 'text/css';

+					tmp.media	= "all";

+					tmp.href	= opts.url;

+					document.getElementsByTagName("head")[0].appendChild(tmp);

+					return tmp.styleSheet;

+				}

+			}

+		}

+	};

+

+	// private variables 

+	var instances = [],			// instance array (used by $.jstree.reference/create/focused)

+		focused_instance = -1,	// the index in the instance array of the currently focused instance

+		plugins = {},			// list of included plugins

+		prepared_move = {};		// for the move_node function

+

+	// jQuery plugin wrapper (thanks to jquery UI widget function)

+	$.fn.jstree = function (settings) {

+		var isMethodCall = (typeof settings == 'string'), // is this a method call like $().jstree("open_node")

+			args = Array.prototype.slice.call(arguments, 1), 

+			returnValue = this;

+

+		// if a method call execute the method on all selected instances

+		if(isMethodCall) {

+			if(settings.substring(0, 1) == '_') { return returnValue; }

+			this.each(function() {

+				var instance = instances[$.data(this, "jstree-instance-id")],

+					methodValue = (instance && $.isFunction(instance[settings])) ? instance[settings].apply(instance, args) : instance;

+					if(typeof methodValue !== "undefined" && (settings.indexOf("is_") === 0 || (methodValue !== true && methodValue !== false))) { returnValue = methodValue; return false; }

+			});

+		}

+		else {

+			this.each(function() {

+				// extend settings and allow for multiple hashes and $.data

+				var instance_id = $.data(this, "jstree-instance-id"),

+					a = [],

+					b = settings ? $.extend({}, true, settings) : {},

+					c = $(this), 

+					s = false, 

+					t = [];

+				a = a.concat(args);

+				if(c.data("jstree")) { a.push(c.data("jstree")); }

+				b = a.length ? $.extend.apply(null, [true, b].concat(a)) : b;

+

+				// if an instance already exists, destroy it first

+				if(typeof instance_id !== "undefined" && instances[instance_id]) { instances[instance_id].destroy(); }

+				// push a new empty object to the instances array

+				instance_id = parseInt(instances.push({}),10) - 1;

+				// store the jstree instance id to the container element

+				$.data(this, "jstree-instance-id", instance_id);

+				// clean up all plugins

+				b.plugins = $.isArray(b.plugins) ? b.plugins : $.jstree.defaults.plugins.slice();

+				b.plugins.unshift("core");

+				// only unique plugins

+				b.plugins = b.plugins.sort().join(",,").replace(/(,|^)([^,]+)(,,\2)+(,|$)/g,"$1$2$4").replace(/,,+/g,",").replace(/,$/,"").split(",");

+

+				// extend defaults with passed data

+				s = $.extend(true, {}, $.jstree.defaults, b);

+				s.plugins = b.plugins;

+				$.each(plugins, function (i, val) { 

+					if($.inArray(i, s.plugins) === -1) { s[i] = null; delete s[i]; } 

+					else { t.push(i); }

+				});

+				s.plugins = t;

+

+				// push the new object to the instances array (at the same time set the default classes to the container) and init

+				instances[instance_id] = new $.jstree._instance(instance_id, $(this).addClass("jstree jstree-" + instance_id), s); 

+				// init all activated plugins for this instance

+				$.each(instances[instance_id]._get_settings().plugins, function (i, val) { instances[instance_id].data[val] = {}; });

+				$.each(instances[instance_id]._get_settings().plugins, function (i, val) { if(plugins[val]) { plugins[val].__init.apply(instances[instance_id]); } });

+				// initialize the instance

+				setTimeout(function() { instances[instance_id].init(); }, 0);

+			});

+		}

+		// return the jquery selection (or if it was a method call that returned a value - the returned value)

+		return returnValue;

+	};

+	// object to store exposed functions and objects

+	$.jstree = {

+		defaults : {

+			plugins : []

+		},

+		_focused : function () { return instances[focused_instance] || null; },

+		_reference : function (needle) { 

+			// get by instance id

+			if(instances[needle]) { return instances[needle]; }

+			// get by DOM (if still no luck - return null

+			var o = $(needle); 

+			if(!o.length && typeof needle === "string") { o = $("#" + needle); }

+			if(!o.length) { return null; }

+			return instances[o.closest(".jstree").data("jstree-instance-id")] || null; 

+		},

+		_instance : function (index, container, settings) { 

+			// for plugins to store data in

+			this.data = { core : {} };

+			this.get_settings	= function () { return $.extend(true, {}, settings); };

+			this._get_settings	= function () { return settings; };

+			this.get_index		= function () { return index; };

+			this.get_container	= function () { return container; };

+			this.get_container_ul = function () { return container.children("ul:eq(0)"); };

+			this._set_settings	= function (s) { 

+				settings = $.extend(true, {}, settings, s);

+			};

+		},

+		_fn : { },

+		plugin : function (pname, pdata) {

+			pdata = $.extend({}, {

+				__init		: $.noop, 

+				__destroy	: $.noop,

+				_fn			: {},

+				defaults	: false

+			}, pdata);

+			plugins[pname] = pdata;

+

+			$.jstree.defaults[pname] = pdata.defaults;

+			$.each(pdata._fn, function (i, val) {

+				val.plugin		= pname;

+				val.old			= $.jstree._fn[i];

+				$.jstree._fn[i] = function () {

+					var rslt,

+						func = val,

+						args = Array.prototype.slice.call(arguments),

+						evnt = new $.Event("before.jstree"),

+						rlbk = false;

+

+					if(this.data.core.locked === true && i !== "unlock" && i !== "is_locked") { return; }

+

+					// Check if function belongs to the included plugins of this instance

+					do {

+						if(func && func.plugin && $.inArray(func.plugin, this._get_settings().plugins) !== -1) { break; }

+						func = func.old;

+					} while(func);

+					if(!func) { return; }

+

+					// context and function to trigger events, then finally call the function

+					if(i.indexOf("_") === 0) {

+						rslt = func.apply(this, args);

+					}

+					else {

+						rslt = this.get_container().triggerHandler(evnt, { "func" : i, "inst" : this, "args" : args, "plugin" : func.plugin });

+						if(rslt === false) { return; }

+						if(typeof rslt !== "undefined") { args = rslt; }

+

+						rslt = func.apply(

+							$.extend({}, this, { 

+								__callback : function (data) { 

+									this.get_container().triggerHandler( i + '.jstree', { "inst" : this, "args" : args, "rslt" : data, "rlbk" : rlbk });

+								},

+								__rollback : function () { 

+									rlbk = this.get_rollback();

+									return rlbk;

+								},

+								__call_old : function (replace_arguments) {

+									return func.old.apply(this, (replace_arguments ? Array.prototype.slice.call(arguments, 1) : args ) );

+								}

+							}), args);

+					}

+

+					// return the result

+					return rslt;

+				};

+				$.jstree._fn[i].old = val.old;

+				$.jstree._fn[i].plugin = pname;

+			});

+		},

+		rollback : function (rb) {

+			if(rb) {

+				if(!$.isArray(rb)) { rb = [ rb ]; }

+				$.each(rb, function (i, val) {

+					instances[val.i].set_rollback(val.h, val.d);

+				});

+			}

+		}

+	};

+	// set the prototype for all instances

+	$.jstree._fn = $.jstree._instance.prototype = {};

+

+	// load the css when DOM is ready

+	$(function() {

+		// code is copied from jQuery ($.browser is deprecated + there is a bug in IE)

+		var u = navigator.userAgent.toLowerCase(),

+			v = (u.match( /.+?(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1],

+			css_string = '' + 

+				'.jstree ul, .jstree li { display:block; margin:0 0 0 0; padding:0 0 0 0; list-style-type:none; } ' + 

+				'.jstree li { display:block; min-height:18px; line-height:18px; white-space:nowrap; margin-left:18px; min-width:18px; } ' + 

+				'.jstree-rtl li { margin-left:0; margin-right:18px; } ' + 

+				'.jstree > ul > li { margin-left:0px; } ' + 

+				'.jstree-rtl > ul > li { margin-right:0px; } ' + 

+				'.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; } ' + 

+				'.jstree a { display:inline-block; line-height:16px; height:16px; color:black; white-space:nowrap; text-decoration:none; padding:1px 2px; margin:0; } ' + 

+				'.jstree a:focus { outline: none; } ' + 

+				'.jstree a > ins { height:16px; width:16px; } ' + 

+				'.jstree a > .jstree-icon { margin-right:3px; } ' + 

+				'.jstree-rtl a > .jstree-icon { margin-left:3px; margin-right:0; } ' + 

+				'li.jstree-open > ul { display:block; } ' + 

+				'li.jstree-closed > ul { display:none; } ';

+		// Correct IE 6 (does not support the > CSS selector)

+		if(/msie/.test(u) && parseInt(v, 10) == 6) { 

+			is_ie6 = true;

+

+			// fix image flicker and lack of caching

+			try {

+				document.execCommand("BackgroundImageCache", false, true);

+			} catch (err) { }

+

+			css_string += '' + 

+				'.jstree li { height:18px; margin-left:0; margin-right:0; } ' + 

+				'.jstree li li { margin-left:18px; } ' + 

+				'.jstree-rtl li li { margin-left:0px; margin-right:18px; } ' + 

+				'li.jstree-open ul { display:block; } ' + 

+				'li.jstree-closed ul { display:none !important; } ' + 

+				'.jstree li a { display:inline; border-width:0 !important; padding:0px 2px !important; } ' + 

+				'.jstree li a ins { height:16px; width:16px; margin-right:3px; } ' + 

+				'.jstree-rtl li a ins { margin-right:0px; margin-left:3px; } ';

+		}

+		// Correct IE 7 (shifts anchor nodes onhover)

+		if(/msie/.test(u) && parseInt(v, 10) == 7) { 

+			is_ie7 = true;

+			css_string += '.jstree li a { border-width:0 !important; padding:0px 2px !important; } ';

+		}

+		// correct ff2 lack of display:inline-block

+		if(!/compatible/.test(u) && /mozilla/.test(u) && parseFloat(v, 10) < 1.9) {

+			is_ff2 = true;

+			css_string += '' + 

+				'.jstree ins { display:-moz-inline-box; } ' + 

+				'.jstree li { line-height:12px; } ' + // WHY??

+				'.jstree a { display:-moz-inline-box; } ' + 

+				'.jstree .jstree-no-icons .jstree-checkbox { display:-moz-inline-stack !important; } ';

+				/* this shouldn't be here as it is theme specific */

+		}

+		// the default stylesheet

+		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });

+	});

+

+	// core functions (open, close, create, update, delete)

+	$.jstree.plugin("core", {

+		__init : function () {

+			this.data.core.locked = false;

+			this.data.core.to_open = this.get_settings().core.initially_open;

+			this.data.core.to_load = this.get_settings().core.initially_load;

+		},

+		defaults : { 

+			html_titles	: false,

+			animation	: 500,

+			initially_open : [],

+			initially_load : [],

+			open_parents : true,

+			notify_plugins : true,

+			rtl			: false,

+			load_open	: false,

+			strings		: {

+				loading		: "Loading ...",

+				new_node	: "New node",

+				multiple_selection : "Multiple selection"

+			}

+		},

+		_fn : { 

+			init	: function () { 

+				this.set_focus(); 

+				if(this._get_settings().core.rtl) {

+					this.get_container().addClass("jstree-rtl").css("direction", "rtl");

+				}

+				this.get_container().html("<ul><li class='jstree-last jstree-leaf'><ins>&#160;</ins><a class='jstree-loading' href='#'><ins class='jstree-icon'>&#160;</ins>" + this._get_string("loading") + "</a></li></ul>");

+				this.data.core.li_height = this.get_container_ul().find("li.jstree-closed, li.jstree-leaf").eq(0).height() || 18;

+

+				this.get_container()

+					.delegate("li > ins", "click.jstree", $.proxy(function (event) {

+							var trgt = $(event.target);

+							if(trgt.is("ins") && event.pageY - trgt.offset().top < this.data.core.li_height) { this.toggle_node(trgt); }

+						}, this))

+					.bind("mousedown.jstree", $.proxy(function () { 

+							this.set_focus(); // This used to be setTimeout(set_focus,0) - why?

+						}, this))

+					.bind("dblclick.jstree", function (event) { 

+						var sel;

+						if(document.selection && document.selection.empty) { document.selection.empty(); }

+						else {

+							if(window.getSelection) {

+								sel = window.getSelection();

+								try { 

+									sel.removeAllRanges();

+									sel.collapse();

+								} catch (err) { }

+							}

+						}

+					});

+				if(this._get_settings().core.notify_plugins) {

+					this.get_container()

+						.bind("load_node.jstree", $.proxy(function (e, data) { 

+								var o = this._get_node(data.rslt.obj),

+									t = this;

+								if(o === -1) { o = this.get_container_ul(); }

+								if(!o.length) { return; }

+								o.find("li").each(function () {

+									var th = $(this);

+									if(th.data("jstree")) {

+										$.each(th.data("jstree"), function (plugin, values) {

+											if(t.data[plugin] && $.isFunction(t["_" + plugin + "_notify"])) {

+												t["_" + plugin + "_notify"].call(t, th, values);

+											}

+										});

+									}

+								});

+							}, this));

+				}

+				if(this._get_settings().core.load_open) {

+					this.get_container()

+						.bind("load_node.jstree", $.proxy(function (e, data) { 

+								var o = this._get_node(data.rslt.obj),

+									t = this;

+								if(o === -1) { o = this.get_container_ul(); }

+								if(!o.length) { return; }

+								o.find("li.jstree-open:not(:has(ul))").each(function () {

+									t.load_node(this, $.noop, $.noop);

+								});

+							}, this));

+				}

+				this.__callback();

+				this.load_node(-1, function () { this.loaded(); this.reload_nodes(); });

+			},

+			destroy	: function () { 

+				var i,

+					n = this.get_index(),

+					s = this._get_settings(),

+					_this = this;

+

+				$.each(s.plugins, function (i, val) {

+					try { plugins[val].__destroy.apply(_this); } catch(err) { }

+				});

+				this.__callback();

+				// set focus to another instance if this one is focused

+				if(this.is_focused()) { 

+					for(i in instances) { 

+						if(instances.hasOwnProperty(i) && i != n) { 

+							instances[i].set_focus(); 

+							break; 

+						} 

+					}

+				}

+				// if no other instance found

+				if(n === focused_instance) { focused_instance = -1; }

+				// remove all traces of jstree in the DOM (only the ones set using jstree*) and cleans all events

+				this.get_container()

+					.unbind(".jstree")

+					.undelegate(".jstree")

+					.removeData("jstree-instance-id")

+					.find("[class^='jstree']")

+						.andSelf()

+						.attr("class", function () { return this.className.replace(/jstree[^ ]*|$/ig,''); });

+				$(document)

+					.unbind(".jstree-" + n)

+					.undelegate(".jstree-" + n);

+				// remove the actual data

+				instances[n] = null;

+				delete instances[n];

+			},

+

+			_core_notify : function (n, data) {

+				if(data.opened) {

+					this.open_node(n, false, true);

+				}

+			},

+

+			lock : function () {

+				this.data.core.locked = true;

+				this.get_container().children("ul").addClass("jstree-locked").css("opacity","0.7");

+				this.__callback({});

+			},

+			unlock : function () {

+				this.data.core.locked = false;

+				this.get_container().children("ul").removeClass("jstree-locked").css("opacity","1");

+				this.__callback({});

+			},

+			is_locked : function () { return this.data.core.locked; },

+			save_opened : function () {

+				var _this = this;

+				this.data.core.to_open = [];

+				this.get_container_ul().find("li.jstree-open").each(function () { 

+					if(this.id) { _this.data.core.to_open.push("#" + this.id.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:")); }

+				});

+				this.__callback(_this.data.core.to_open);

+			},

+			save_loaded : function () { },

+			reload_nodes : function (is_callback) {

+				var _this = this,

+					done = true,

+					current = [],

+					remaining = [];

+				if(!is_callback) { 

+					this.data.core.reopen = false; 

+					this.data.core.refreshing = true; 

+					this.data.core.to_open = $.map($.makeArray(this.data.core.to_open), function (n) { return "#" + n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"); });

+					this.data.core.to_load = $.map($.makeArray(this.data.core.to_load), function (n) { return "#" + n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"); });

+					if(this.data.core.to_open.length) {

+						this.data.core.to_load = this.data.core.to_load.concat(this.data.core.to_open);

+					}

+				}

+				if(this.data.core.to_load.length) {

+					$.each(this.data.core.to_load, function (i, val) {

+						if(val == "#") { return true; }

+						if($(val).length) { current.push(val); }

+						else { remaining.push(val); }

+					});

+					if(current.length) {

+						this.data.core.to_load = remaining;

+						$.each(current, function (i, val) { 

+							if(!_this._is_loaded(val)) {

+								_this.load_node(val, function () { _this.reload_nodes(true); }, function () { _this.reload_nodes(true); });

+								done = false;

+							}

+						});

+					}

+				}

+				if(this.data.core.to_open.length) {

+					$.each(this.data.core.to_open, function (i, val) {

+						_this.open_node(val, false, true); 

+					});

+				}

+				if(done) { 

+					// TODO: find a more elegant approach to syncronizing returning requests

+					if(this.data.core.reopen) { clearTimeout(this.data.core.reopen); }

+					this.data.core.reopen = setTimeout(function () { _this.__callback({}, _this); }, 50);

+					this.data.core.refreshing = false;

+					this.reopen();

+				}

+			},

+			reopen : function () {

+				var _this = this;

+				if(this.data.core.to_open.length) {

+					$.each(this.data.core.to_open, function (i, val) {

+						_this.open_node(val, false, true); 

+					});

+				}

+				this.__callback({});

+			},

+			refresh : function (obj) {

+				var _this = this;

+				this.save_opened();

+				if(!obj) { obj = -1; }

+				obj = this._get_node(obj);

+				if(!obj) { obj = -1; }

+				if(obj !== -1) { obj.children("UL").remove(); }

+				else { this.get_container_ul().empty(); }

+				this.load_node(obj, function () { _this.__callback({ "obj" : obj}); _this.reload_nodes(); });

+			},

+			// Dummy function to fire after the first load (so that there is a jstree.loaded event)

+			loaded	: function () { 

+				this.__callback(); 

+			},

+			// deal with focus

+			set_focus	: function () { 

+				if(this.is_focused()) { return; }

+				var f = $.jstree._focused();

+				if(f) { f.unset_focus(); }

+

+				this.get_container().addClass("jstree-focused"); 

+				focused_instance = this.get_index(); 

+				this.__callback();

+			},

+			is_focused	: function () { 

+				return focused_instance == this.get_index(); 

+			},

+			unset_focus	: function () {

+				if(this.is_focused()) {

+					this.get_container().removeClass("jstree-focused"); 

+					focused_instance = -1; 

+				}

+				this.__callback();

+			},

+

+			// traverse

+			_get_node		: function (obj) { 

+				var $obj = $(obj, this.get_container()); 

+				if($obj.is(".jstree") || obj == -1) { return -1; } 

+				$obj = $obj.closest("li", this.get_container()); 

+				return $obj.length ? $obj : false; 

+			},

+			_get_next		: function (obj, strict) {

+				obj = this._get_node(obj);

+				if(obj === -1) { return this.get_container().find("> ul > li:first-child"); }

+				if(!obj.length) { return false; }

+				if(strict) { return (obj.nextAll("li").size() > 0) ? obj.nextAll("li:eq(0)") : false; }

+

+				if(obj.hasClass("jstree-open")) { return obj.find("li:eq(0)"); }

+				else if(obj.nextAll("li").size() > 0) { return obj.nextAll("li:eq(0)"); }

+				else { return obj.parentsUntil(".jstree","li").next("li").eq(0); }

+			},

+			_get_prev		: function (obj, strict) {

+				obj = this._get_node(obj);

+				if(obj === -1) { return this.get_container().find("> ul > li:last-child"); }

+				if(!obj.length) { return false; }

+				if(strict) { return (obj.prevAll("li").length > 0) ? obj.prevAll("li:eq(0)") : false; }

+

+				if(obj.prev("li").length) {

+					obj = obj.prev("li").eq(0);

+					while(obj.hasClass("jstree-open")) { obj = obj.children("ul:eq(0)").children("li:last"); }

+					return obj;

+				}

+				else { var o = obj.parentsUntil(".jstree","li:eq(0)"); return o.length ? o : false; }

+			},

+			_get_parent		: function (obj) {

+				obj = this._get_node(obj);

+				if(obj == -1 || !obj.length) { return false; }

+				var o = obj.parentsUntil(".jstree", "li:eq(0)");

+				return o.length ? o : -1;

+			},

+			_get_children	: function (obj) {

+				obj = this._get_node(obj);

+				if(obj === -1) { return this.get_container().children("ul:eq(0)").children("li"); }

+				if(!obj.length) { return false; }

+				return obj.children("ul:eq(0)").children("li");

+			},

+			get_path		: function (obj, id_mode) {

+				var p = [],

+					_this = this;

+				obj = this._get_node(obj);

+				if(obj === -1 || !obj || !obj.length) { return false; }

+				obj.parentsUntil(".jstree", "li").each(function () {

+					p.push( id_mode ? this.id : _this.get_text(this) );

+				});

+				p.reverse();

+				p.push( id_mode ? obj.attr("id") : this.get_text(obj) );

+				return p;

+			},

+

+			// string functions

+			_get_string : function (key) {

+				return this._get_settings().core.strings[key] || key;

+			},

+

+			is_open		: function (obj) { obj = this._get_node(obj); return obj && obj !== -1 && obj.hasClass("jstree-open"); },

+			is_closed	: function (obj) { obj = this._get_node(obj); return obj && obj !== -1 && obj.hasClass("jstree-closed"); },

+			is_leaf		: function (obj) { obj = this._get_node(obj); return obj && obj !== -1 && obj.hasClass("jstree-leaf"); },

+			correct_state	: function (obj) {

+				obj = this._get_node(obj);

+				if(!obj || obj === -1) { return false; }

+				obj.removeClass("jstree-closed jstree-open").addClass("jstree-leaf").children("ul").remove();

+				this.__callback({ "obj" : obj });

+			},

+			// open/close

+			open_node	: function (obj, callback, skip_animation) {

+				obj = this._get_node(obj);

+				if(!obj.length) { return false; }

+				if(!obj.hasClass("jstree-closed")) { if(callback) { callback.call(); } return false; }

+				var s = skip_animation || is_ie6 ? 0 : this._get_settings().core.animation,

+					t = this;

+				if(!this._is_loaded(obj)) {

+					obj.children("a").addClass("jstree-loading");

+					this.load_node(obj, function () { t.open_node(obj, callback, skip_animation); }, callback);

+				}

+				else {

+					if(this._get_settings().core.open_parents) {

+						obj.parentsUntil(".jstree",".jstree-closed").each(function () {

+							t.open_node(this, false, true);

+						});

+					}

+					if(s) { obj.children("ul").css("display","none"); }

+					obj.removeClass("jstree-closed").addClass("jstree-open").children("a").removeClass("jstree-loading");

+					if(s) { obj.children("ul").stop(true, true).slideDown(s, function () { this.style.display = ""; t.after_open(obj); }); }

+					else { t.after_open(obj); }

+					this.__callback({ "obj" : obj });

+					if(callback) { callback.call(); }

+				}

+			},

+			after_open	: function (obj) { this.__callback({ "obj" : obj }); },

+			close_node	: function (obj, skip_animation) {

+				obj = this._get_node(obj);

+				var s = skip_animation || is_ie6 ? 0 : this._get_settings().core.animation,

+					t = this;

+				if(!obj.length || !obj.hasClass("jstree-open")) { return false; }

+				if(s) { obj.children("ul").attr("style","display:block !important"); }

+				obj.removeClass("jstree-open").addClass("jstree-closed");

+				if(s) { obj.children("ul").stop(true, true).slideUp(s, function () { this.style.display = ""; t.after_close(obj); }); }

+				else { t.after_close(obj); }

+				this.__callback({ "obj" : obj });

+			},

+			after_close	: function (obj) { this.__callback({ "obj" : obj }); },

+			toggle_node	: function (obj) {

+				obj = this._get_node(obj);

+				if(obj.hasClass("jstree-closed")) { return this.open_node(obj); }

+				if(obj.hasClass("jstree-open")) { return this.close_node(obj); }

+			},

+			open_all	: function (obj, do_animation, original_obj) {

+				obj = obj ? this._get_node(obj) : -1;

+				if(!obj || obj === -1) { obj = this.get_container_ul(); }

+				if(original_obj) { 

+					obj = obj.find("li.jstree-closed");

+				}

+				else {

+					original_obj = obj;

+					if(obj.is(".jstree-closed")) { obj = obj.find("li.jstree-closed").andSelf(); }

+					else { obj = obj.find("li.jstree-closed"); }

+				}

+				var _this = this;

+				obj.each(function () { 

+					var __this = this; 

+					if(!_this._is_loaded(this)) { _this.open_node(this, function() { _this.open_all(__this, do_animation, original_obj); }, !do_animation); }

+					else { _this.open_node(this, false, !do_animation); }

+				});

+				// so that callback is fired AFTER all nodes are open

+				if(original_obj.find('li.jstree-closed').length === 0) { this.__callback({ "obj" : original_obj }); }

+			},

+			close_all	: function (obj, do_animation) {

+				var _this = this;

+				obj = obj ? this._get_node(obj) : this.get_container();

+				if(!obj || obj === -1) { obj = this.get_container_ul(); }

+				obj.find("li.jstree-open").andSelf().each(function () { _this.close_node(this, !do_animation); });

+				this.__callback({ "obj" : obj });

+			},

+			clean_node	: function (obj) {

+				obj = obj && obj != -1 ? $(obj) : this.get_container_ul();

+				obj = obj.is("li") ? obj.find("li").andSelf() : obj.find("li");

+				obj.removeClass("jstree-last")

+					.filter("li:last-child").addClass("jstree-last").end()

+					.filter(":has(li)")

+						.not(".jstree-open").removeClass("jstree-leaf").addClass("jstree-closed");

+				obj.not(".jstree-open, .jstree-closed").addClass("jstree-leaf").children("ul").remove();

+				this.__callback({ "obj" : obj });

+			},

+			// rollback

+			get_rollback : function () { 

+				this.__callback();

+				return { i : this.get_index(), h : this.get_container().children("ul").clone(true), d : this.data }; 

+			},

+			set_rollback : function (html, data) {

+				this.get_container().empty().append(html);

+				this.data = data;

+				this.__callback();

+			},

+			// Dummy functions to be overwritten by any datastore plugin included

+			load_node	: function (obj, s_call, e_call) { this.__callback({ "obj" : obj }); },

+			_is_loaded	: function (obj) { return true; },

+

+			// Basic operations: create

+			create_node	: function (obj, position, js, callback, is_loaded) {

+				obj = this._get_node(obj);

+				position = typeof position === "undefined" ? "last" : position;

+				var d = $("<li />"),

+					s = this._get_settings().core,

+					tmp;

+

+				if(obj !== -1 && !obj.length) { return false; }

+				if(!is_loaded && !this._is_loaded(obj)) { this.load_node(obj, function () { this.create_node(obj, position, js, callback, true); }); return false; }

+

+				this.__rollback();

+

+				if(typeof js === "string") { js = { "data" : js }; }

+				if(!js) { js = {}; }

+				if(js.attr) { d.attr(js.attr); }

+				if(js.metadata) { d.data(js.metadata); }

+				if(js.state) { d.addClass("jstree-" + js.state); }

+				if(!js.data) { js.data = this._get_string("new_node"); }

+				if(!$.isArray(js.data)) { tmp = js.data; js.data = []; js.data.push(tmp); }

+				$.each(js.data, function (i, m) {

+					tmp = $("<a />");

+					if($.isFunction(m)) { m = m.call(this, js); }

+					if(typeof m == "string") { tmp.attr('href','#')[ s.html_titles ? "html" : "text" ](m); }

+					else {

+						if(!m.attr) { m.attr = {}; }

+						if(!m.attr.href) { m.attr.href = '#'; }

+						tmp.attr(m.attr)[ s.html_titles ? "html" : "text" ](m.title);

+						if(m.language) { tmp.addClass(m.language); }

+					}

+					tmp.prepend("<ins class='jstree-icon'>&#160;</ins>");

+					if(m.icon) { 

+						if(m.icon.indexOf("/") === -1) { tmp.children("ins").addClass(m.icon); }

+						else { tmp.children("ins").css("background","url('" + m.icon + "') center center no-repeat"); }

+					}

+					d.append(tmp);

+				});

+				d.prepend("<ins class='jstree-icon'>&#160;</ins>");

+				if(obj === -1) {

+					obj = this.get_container();

+					if(position === "before") { position = "first"; }

+					if(position === "after") { position = "last"; }

+				}

+				switch(position) {

+					case "before": obj.before(d); tmp = this._get_parent(obj); break;

+					case "after" : obj.after(d);  tmp = this._get_parent(obj); break;

+					case "inside":

+					case "first" :

+						if(!obj.children("ul").length) { obj.append("<ul />"); }

+						obj.children("ul").prepend(d);

+						tmp = obj;

+						break;

+					case "last":

+						if(!obj.children("ul").length) { obj.append("<ul />"); }

+						obj.children("ul").append(d);

+						tmp = obj;

+						break;

+					default:

+						if(!obj.children("ul").length) { obj.append("<ul />"); }

+						if(!position) { position = 0; }

+						tmp = obj.children("ul").children("li").eq(position);

+						if(tmp.length) { tmp.before(d); }

+						else { obj.children("ul").append(d); }

+						tmp = obj;

+						break;

+				}

+				if(tmp === -1 || tmp.get(0) === this.get_container().get(0)) { tmp = -1; }

+				this.clean_node(tmp);

+				this.__callback({ "obj" : d, "parent" : tmp });

+				if(callback) { callback.call(this, d); }

+				return d;

+			},

+			// Basic operations: rename (deal with text)

+			get_text	: function (obj) {

+				obj = this._get_node(obj);

+				if(!obj.length) { return false; }

+				var s = this._get_settings().core.html_titles;

+				obj = obj.children("a:eq(0)");

+				if(s) {

+					obj = obj.clone();

+					obj.children("INS").remove();

+					return obj.html();

+				}

+				else {

+					obj = obj.contents().filter(function() { return this.nodeType == 3; })[0];

+					return obj.nodeValue;

+				}

+			},

+			set_text	: function (obj, val) {

+				obj = this._get_node(obj);

+				if(!obj.length) { return false; }

+				obj = obj.children("a:eq(0)");

+				if(this._get_settings().core.html_titles) {

+					var tmp = obj.children("INS").clone();

+					obj.html(val).prepend(tmp);

+					this.__callback({ "obj" : obj, "name" : val });

+					return true;

+				}

+				else {

+					obj = obj.contents().filter(function() { return this.nodeType == 3; })[0];

+					this.__callback({ "obj" : obj, "name" : val });

+					return (obj.nodeValue = val);

+				}

+			},

+			rename_node : function (obj, val) {

+				obj = this._get_node(obj);

+				this.__rollback();

+				if(obj && obj.length && this.set_text.apply(this, Array.prototype.slice.call(arguments))) { this.__callback({ "obj" : obj, "name" : val }); }

+			},

+			// Basic operations: deleting nodes

+			delete_node : function (obj) {

+				obj = this._get_node(obj);

+				if(!obj.length) { return false; }

+				this.__rollback();

+				var p = this._get_parent(obj), prev = $([]), t = this;

+				obj.each(function () {

+					prev = prev.add(t._get_prev(this));

+				});

+				obj = obj.detach();

+				if(p !== -1 && p.find("> ul > li").length === 0) {

+					p.removeClass("jstree-open jstree-closed").addClass("jstree-leaf");

+				}

+				this.clean_node(p);

+				this.__callback({ "obj" : obj, "prev" : prev, "parent" : p });

+				return obj;

+			},

+			prepare_move : function (o, r, pos, cb, is_cb) {

+				var p = {};

+

+				p.ot = $.jstree._reference(o) || this;

+				p.o = p.ot._get_node(o);

+				p.r = r === - 1 ? -1 : this._get_node(r);

+				p.p = (typeof pos === "undefined" || pos === false) ? "last" : pos; // TODO: move to a setting

+				if(!is_cb && prepared_move.o && prepared_move.o[0] === p.o[0] && prepared_move.r[0] === p.r[0] && prepared_move.p === p.p) {

+					this.__callback(prepared_move);

+					if(cb) { cb.call(this, prepared_move); }

+					return;

+				}

+				p.ot = $.jstree._reference(p.o) || this;

+				p.rt = $.jstree._reference(p.r) || this; // r === -1 ? p.ot : $.jstree._reference(p.r) || this

+				if(p.r === -1 || !p.r) {

+					p.cr = -1;

+					switch(p.p) {

+						case "first":

+						case "before":

+						case "inside":

+							p.cp = 0; 

+							break;

+						case "after":

+						case "last":

+							p.cp = p.rt.get_container().find(" > ul > li").length; 

+							break;

+						default:

+							p.cp = p.p;

+							break;

+					}

+				}

+				else {

+					if(!/^(before|after)$/.test(p.p) && !this._is_loaded(p.r)) {

+						return this.load_node(p.r, function () { this.prepare_move(o, r, pos, cb, true); });

+					}

+					switch(p.p) {

+						case "before":

+							p.cp = p.r.index();

+							p.cr = p.rt._get_parent(p.r);

+							break;

+						case "after":

+							p.cp = p.r.index() + 1;

+							p.cr = p.rt._get_parent(p.r);

+							break;

+						case "inside":

+						case "first":

+							p.cp = 0;

+							p.cr = p.r;

+							break;

+						case "last":

+							p.cp = p.r.find(" > ul > li").length; 

+							p.cr = p.r;

+							break;

+						default: 

+							p.cp = p.p;

+							p.cr = p.r;

+							break;

+					}

+				}

+				p.np = p.cr == -1 ? p.rt.get_container() : p.cr;

+				p.op = p.ot._get_parent(p.o);

+				p.cop = p.o.index();

+				if(p.op === -1) { p.op = p.ot ? p.ot.get_container() : this.get_container(); }

+				if(!/^(before|after)$/.test(p.p) && p.op && p.np && p.op[0] === p.np[0] && p.o.index() < p.cp) { p.cp++; }

+				//if(p.p === "before" && p.op && p.np && p.op[0] === p.np[0] && p.o.index() < p.cp) { p.cp--; }

+				p.or = p.np.find(" > ul > li:nth-child(" + (p.cp + 1) + ")");

+				prepared_move = p;

+				this.__callback(prepared_move);

+				if(cb) { cb.call(this, prepared_move); }

+			},

+			check_move : function () {

+				var obj = prepared_move, ret = true, r = obj.r === -1 ? this.get_container() : obj.r;

+				if(!obj || !obj.o || obj.or[0] === obj.o[0]) { return false; }

+				if(obj.op && obj.np && obj.op[0] === obj.np[0] && obj.cp - 1 === obj.o.index()) { return false; }

+				obj.o.each(function () { 

+					if(r.parentsUntil(".jstree", "li").andSelf().index(this) !== -1) { ret = false; return false; }

+				});

+				return ret;

+			},

+			move_node : function (obj, ref, position, is_copy, is_prepared, skip_check) {

+				if(!is_prepared) { 

+					return this.prepare_move(obj, ref, position, function (p) {

+						this.move_node(p, false, false, is_copy, true, skip_check);

+					});

+				}

+				if(is_copy) { 

+					prepared_move.cy = true;

+				}

+				if(!skip_check && !this.check_move()) { return false; }

+

+				this.__rollback();

+				var o = false;

+				if(is_copy) {

+					o = obj.o.clone(true);

+					o.find("*[id]").andSelf().each(function () {

+						if(this.id) { this.id = "copy_" + this.id; }

+					});

+				}

+				else { o = obj.o; }

+

+				if(obj.or.length) { obj.or.before(o); }

+				else { 

+					if(!obj.np.children("ul").length) { $("<ul />").appendTo(obj.np); }

+					obj.np.children("ul:eq(0)").append(o); 

+				}

+

+				try { 

+					obj.ot.clean_node(obj.op);

+					obj.rt.clean_node(obj.np);

+					if(!obj.op.find("> ul > li").length) {

+						obj.op.removeClass("jstree-open jstree-closed").addClass("jstree-leaf").children("ul").remove();

+					}

+				} catch (e) { }

+

+				if(is_copy) { 

+					prepared_move.cy = true;

+					prepared_move.oc = o; 

+				}

+				this.__callback(prepared_move);

+				return prepared_move;

+			},

+			_get_move : function () { return prepared_move; }

+		}

+	});

+})(jQuery);

+//*/

+

+/* 

+ * jsTree ui plugin

+ * This plugins handles selecting/deselecting/hovering/dehovering nodes

+ */

+(function ($) {

+	var scrollbar_width, e1, e2;

+	$(function() {

+		if (/msie/.test(navigator.userAgent.toLowerCase())) {

+			e1 = $('<textarea cols="10" rows="2"></textarea>').css({ position: 'absolute', top: -1000, left: 0 }).appendTo('body');

+			e2 = $('<textarea cols="10" rows="2" style="overflow: hidden;"></textarea>').css({ position: 'absolute', top: -1000, left: 0 }).appendTo('body');

+			scrollbar_width = e1.width() - e2.width();

+			e1.add(e2).remove();

+		} 

+		else {

+			e1 = $('<div />').css({ width: 100, height: 100, overflow: 'auto', position: 'absolute', top: -1000, left: 0 })

+					.prependTo('body').append('<div />').find('div').css({ width: '100%', height: 200 });

+			scrollbar_width = 100 - e1.width();

+			e1.parent().remove();

+		}

+	});

+	$.jstree.plugin("ui", {

+		__init : function () { 

+			this.data.ui.selected = $(); 

+			this.data.ui.last_selected = false; 

+			this.data.ui.hovered = null;

+			this.data.ui.to_select = this.get_settings().ui.initially_select;

+

+			this.get_container()

+				.delegate("a", "click.jstree", $.proxy(function (event) {

+						event.preventDefault();

+						event.currentTarget.blur();

+						if(!$(event.currentTarget).hasClass("jstree-loading")) {

+							this.select_node(event.currentTarget, true, event);

+						}

+					}, this))

+				.delegate("a", "mouseenter.jstree", $.proxy(function (event) {

+						if(!$(event.currentTarget).hasClass("jstree-loading")) {

+							this.hover_node(event.target);

+						}

+					}, this))

+				.delegate("a", "mouseleave.jstree", $.proxy(function (event) {

+						if(!$(event.currentTarget).hasClass("jstree-loading")) {

+							this.dehover_node(event.target);

+						}

+					}, this))

+				.bind("reopen.jstree", $.proxy(function () { 

+						this.reselect();

+					}, this))

+				.bind("get_rollback.jstree", $.proxy(function () { 

+						this.dehover_node();

+						this.save_selected();

+					}, this))

+				.bind("set_rollback.jstree", $.proxy(function () { 

+						this.reselect();

+					}, this))

+				.bind("close_node.jstree", $.proxy(function (event, data) { 

+						var s = this._get_settings().ui,

+							obj = this._get_node(data.rslt.obj),

+							clk = (obj && obj.length) ? obj.children("ul").find("a.jstree-clicked") : $(),

+							_this = this;

+						if(s.selected_parent_close === false || !clk.length) { return; }

+						clk.each(function () { 

+							_this.deselect_node(this);

+							if(s.selected_parent_close === "select_parent") { _this.select_node(obj); }

+						});

+					}, this))

+				.bind("delete_node.jstree", $.proxy(function (event, data) { 

+						var s = this._get_settings().ui.select_prev_on_delete,

+							obj = this._get_node(data.rslt.obj),

+							clk = (obj && obj.length) ? obj.find("a.jstree-clicked") : [],

+							_this = this;

+						clk.each(function () { _this.deselect_node(this); });

+						if(s && clk.length) { 

+							data.rslt.prev.each(function () { 

+								if(this.parentNode) { _this.select_node(this); return false; /* if return false is removed all prev nodes will be selected */}

+							});

+						}

+					}, this))

+				.bind("move_node.jstree", $.proxy(function (event, data) { 

+						if(data.rslt.cy) { 

+							data.rslt.oc.find("a.jstree-clicked").removeClass("jstree-clicked");

+						}

+					}, this));

+		},

+		defaults : {

+			select_limit : -1, // 0, 1, 2 ... or -1 for unlimited

+			select_multiple_modifier : "ctrl", // on, or ctrl, shift, alt

+			select_range_modifier : "shift",

+			selected_parent_close : "select_parent", // false, "deselect", "select_parent"

+			selected_parent_open : true,

+			select_prev_on_delete : true,

+			disable_selecting_children : false,

+			initially_select : []

+		},

+		_fn : { 

+			_get_node : function (obj, allow_multiple) {

+				if(typeof obj === "undefined" || obj === null) { return allow_multiple ? this.data.ui.selected : this.data.ui.last_selected; }

+				var $obj = $(obj, this.get_container()); 

+				if($obj.is(".jstree") || obj == -1) { return -1; } 

+				$obj = $obj.closest("li", this.get_container()); 

+				return $obj.length ? $obj : false; 

+			},

+			_ui_notify : function (n, data) {

+				if(data.selected) {

+					this.select_node(n, false);

+				}

+			},

+			save_selected : function () {

+				var _this = this;

+				this.data.ui.to_select = [];

+				this.data.ui.selected.each(function () { if(this.id) { _this.data.ui.to_select.push("#" + this.id.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:")); } });

+				this.__callback(this.data.ui.to_select);

+			},

+			reselect : function () {

+				var _this = this,

+					s = this.data.ui.to_select;

+				s = $.map($.makeArray(s), function (n) { return "#" + n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"); });

+				// this.deselect_all(); WHY deselect, breaks plugin state notifier?

+				$.each(s, function (i, val) { if(val && val !== "#") { _this.select_node(val); } });

+				this.data.ui.selected = this.data.ui.selected.filter(function () { return this.parentNode; });

+				this.__callback();

+			},

+			refresh : function (obj) {

+				this.save_selected();

+				return this.__call_old();

+			},

+			hover_node : function (obj) {

+				obj = this._get_node(obj);

+				if(!obj.length) { return false; }

+				//if(this.data.ui.hovered && obj.get(0) === this.data.ui.hovered.get(0)) { return; }

+				if(!obj.hasClass("jstree-hovered")) { this.dehover_node(); }

+				this.data.ui.hovered = obj.children("a").addClass("jstree-hovered").parent();

+				this._fix_scroll(obj);

+				this.__callback({ "obj" : obj });

+			},

+			dehover_node : function () {

+				var obj = this.data.ui.hovered, p;

+				if(!obj || !obj.length) { return false; }

+				p = obj.children("a").removeClass("jstree-hovered").parent();

+				if(this.data.ui.hovered[0] === p[0]) { this.data.ui.hovered = null; }

+				this.__callback({ "obj" : obj });

+			},

+			select_node : function (obj, check, e) {

+				obj = this._get_node(obj);

+				if(obj == -1 || !obj || !obj.length) { return false; }

+				var s = this._get_settings().ui,

+					is_multiple = (s.select_multiple_modifier == "on" || (s.select_multiple_modifier !== false && e && e[s.select_multiple_modifier + "Key"])),

+					is_range = (s.select_range_modifier !== false && e && e[s.select_range_modifier + "Key"] && this.data.ui.last_selected && this.data.ui.last_selected[0] !== obj[0] && this.data.ui.last_selected.parent()[0] === obj.parent()[0]),

+					is_selected = this.is_selected(obj),

+					proceed = true,

+					t = this;

+				if(check) {

+					if(s.disable_selecting_children && is_multiple && 

+						(

+							(obj.parentsUntil(".jstree","li").children("a.jstree-clicked").length) ||

+							(obj.children("ul").find("a.jstree-clicked:eq(0)").length)

+						)

+					) {

+						return false;

+					}

+					proceed = false;

+					switch(!0) {

+						case (is_range):

+							this.data.ui.last_selected.addClass("jstree-last-selected");

+							obj = obj[ obj.index() < this.data.ui.last_selected.index() ? "nextUntil" : "prevUntil" ](".jstree-last-selected").andSelf();

+							if(s.select_limit == -1 || obj.length < s.select_limit) {

+								this.data.ui.last_selected.removeClass("jstree-last-selected");

+								this.data.ui.selected.each(function () {

+									if(this !== t.data.ui.last_selected[0]) { t.deselect_node(this); }

+								});

+								is_selected = false;

+								proceed = true;

+							}

+							else {

+								proceed = false;

+							}

+							break;

+						case (is_selected && !is_multiple): 

+							this.deselect_all();

+							is_selected = false;

+							proceed = true;

+							break;

+						case (!is_selected && !is_multiple): 

+							if(s.select_limit == -1 || s.select_limit > 0) {

+								this.deselect_all();

+								proceed = true;

+							}

+							break;

+						case (is_selected && is_multiple): 

+							this.deselect_node(obj);

+							break;

+						case (!is_selected && is_multiple): 

+							if(s.select_limit == -1 || this.data.ui.selected.length + 1 <= s.select_limit) { 

+								proceed = true;

+							}

+							break;

+					}

+				}

+				if(proceed && !is_selected) {

+					if(!is_range) { this.data.ui.last_selected = obj; }

+					obj.children("a").addClass("jstree-clicked");

+					if(s.selected_parent_open) {

+						obj.parents(".jstree-closed").each(function () { t.open_node(this, false, true); });

+					}

+					this.data.ui.selected = this.data.ui.selected.add(obj);

+					this._fix_scroll(obj.eq(0));

+					this.__callback({ "obj" : obj, "e" : e });

+				}

+			},

+			_fix_scroll : function (obj) {

+				var c = this.get_container()[0], t;

+				if(c.scrollHeight > c.offsetHeight) {

+					obj = this._get_node(obj);

+					if(!obj || obj === -1 || !obj.length || !obj.is(":visible")) { return; }

+					t = obj.offset().top - this.get_container().offset().top;

+					if(t < 0) { 

+						c.scrollTop = c.scrollTop + t - 1; 

+					}

+					if(t + this.data.core.li_height + (c.scrollWidth > c.offsetWidth ? scrollbar_width : 0) > c.offsetHeight) { 

+						c.scrollTop = c.scrollTop + (t - c.offsetHeight + this.data.core.li_height + 1 + (c.scrollWidth > c.offsetWidth ? scrollbar_width : 0)); 

+					}

+				}

+			},

+			deselect_node : function (obj) {

+				obj = this._get_node(obj);

+				if(!obj.length) { return false; }

+				if(this.is_selected(obj)) {

+					obj.children("a").removeClass("jstree-clicked");

+					this.data.ui.selected = this.data.ui.selected.not(obj);

+					if(this.data.ui.last_selected.get(0) === obj.get(0)) { this.data.ui.last_selected = this.data.ui.selected.eq(0); }

+					this.__callback({ "obj" : obj });

+				}

+			},

+			toggle_select : function (obj) {

+				obj = this._get_node(obj);

+				if(!obj.length) { return false; }

+				if(this.is_selected(obj)) { this.deselect_node(obj); }

+				else { this.select_node(obj); }

+			},

+			is_selected : function (obj) { return this.data.ui.selected.index(this._get_node(obj)) >= 0; },

+			get_selected : function (context) { 

+				return context ? $(context).find("a.jstree-clicked").parent() : this.data.ui.selected; 

+			},

+			deselect_all : function (context) {

+				var ret = context ? $(context).find("a.jstree-clicked").parent() : this.get_container().find("a.jstree-clicked").parent();

+				ret.children("a.jstree-clicked").removeClass("jstree-clicked");

+				this.data.ui.selected = $([]);

+				this.data.ui.last_selected = false;

+				this.__callback({ "obj" : ret });

+			}

+		}

+	});

+	// include the selection plugin by default

+	$.jstree.defaults.plugins.push("ui");

+})(jQuery);

+//*/

+

+/* 

+ * jsTree CRRM plugin

+ * Handles creating/renaming/removing/moving nodes by user interaction.

+ */

+(function ($) {

+	$.jstree.plugin("crrm", { 

+		__init : function () {

+			this.get_container()

+				.bind("move_node.jstree", $.proxy(function (e, data) {

+					if(this._get_settings().crrm.move.open_onmove) {

+						var t = this;

+						data.rslt.np.parentsUntil(".jstree").andSelf().filter(".jstree-closed").each(function () {

+							t.open_node(this, false, true);

+						});

+					}

+				}, this));

+		},

+		defaults : {

+			input_width_limit : 200,

+			move : {

+				always_copy			: false, // false, true or "multitree"

+				open_onmove			: true,

+				default_position	: "last",

+				check_move			: function (m) { return true; }

+			}

+		},

+		_fn : {

+			_show_input : function (obj, callback) {

+				obj = this._get_node(obj);

+				var rtl = this._get_settings().core.rtl,

+					w = this._get_settings().crrm.input_width_limit,

+					w1 = obj.children("ins").width(),

+					w2 = obj.find("> a:visible > ins").width() * obj.find("> a:visible > ins").length,

+					t = this.get_text(obj),

+					h1 = $("<div />", { css : { "position" : "absolute", "top" : "-200px", "left" : (rtl ? "0px" : "-1000px"), "visibility" : "hidden" } }).appendTo("body"),

+					h2 = obj.css("position","relative").append(

+					$("<input />", { 

+						"value" : t,

+						"class" : "jstree-rename-input",

+						// "size" : t.length,

+						"css" : {

+							"padding" : "0",

+							"border" : "1px solid silver",

+							"position" : "absolute",

+							"left"  : (rtl ? "auto" : (w1 + w2 + 4) + "px"),

+							"right" : (rtl ? (w1 + w2 + 4) + "px" : "auto"),

+							"top" : "0px",

+							"height" : (this.data.core.li_height - 2) + "px",

+							"lineHeight" : (this.data.core.li_height - 2) + "px",

+							"width" : "150px" // will be set a bit further down

+						},

+						"blur" : $.proxy(function () {

+							var i = obj.children(".jstree-rename-input"),

+								v = i.val();

+							if(v === "") { v = t; }

+							h1.remove();

+							i.remove(); // rollback purposes

+							this.set_text(obj,t); // rollback purposes

+							this.rename_node(obj, v);

+							callback.call(this, obj, v, t);

+							obj.css("position","");

+						}, this),

+						"keyup" : function (event) {

+							var key = event.keyCode || event.which;

+							if(key == 27) { this.value = t; this.blur(); return; }

+							else if(key == 13) { this.blur(); return; }

+							else {

+								h2.width(Math.min(h1.text("pW" + this.value).width(),w));

+							}

+						},

+						"keypress" : function(event) {

+							var key = event.keyCode || event.which;

+							if(key == 13) { return false; }

+						}

+					})

+				).children(".jstree-rename-input"); 

+				this.set_text(obj, "");

+				h1.css({

+						fontFamily		: h2.css('fontFamily')		|| '',

+						fontSize		: h2.css('fontSize')		|| '',

+						fontWeight		: h2.css('fontWeight')		|| '',

+						fontStyle		: h2.css('fontStyle')		|| '',

+						fontStretch		: h2.css('fontStretch')		|| '',

+						fontVariant		: h2.css('fontVariant')		|| '',

+						letterSpacing	: h2.css('letterSpacing')	|| '',

+						wordSpacing		: h2.css('wordSpacing')		|| ''

+				});

+				h2.width(Math.min(h1.text("pW" + h2[0].value).width(),w))[0].select();

+			},

+			rename : function (obj) {

+				obj = this._get_node(obj);

+				this.__rollback();

+				var f = this.__callback;

+				this._show_input(obj, function (obj, new_name, old_name) { 

+					f.call(this, { "obj" : obj, "new_name" : new_name, "old_name" : old_name });

+				});

+			},

+			create : function (obj, position, js, callback, skip_rename) {

+				var t, _this = this;

+				obj = this._get_node(obj);

+				if(!obj) { obj = -1; }

+				this.__rollback();

+				t = this.create_node(obj, position, js, function (t) {

+					var p = this._get_parent(t),

+						pos = $(t).index();

+					if(callback) { callback.call(this, t); }

+					if(p.length && p.hasClass("jstree-closed")) { this.open_node(p, false, true); }

+					if(!skip_rename) { 

+						this._show_input(t, function (obj, new_name, old_name) { 

+							_this.__callback({ "obj" : obj, "name" : new_name, "parent" : p, "position" : pos });

+						});

+					}

+					else { _this.__callback({ "obj" : t, "name" : this.get_text(t), "parent" : p, "position" : pos }); }

+				});

+				return t;

+			},

+			remove : function (obj) {

+				obj = this._get_node(obj, true);

+				var p = this._get_parent(obj), prev = this._get_prev(obj);

+				this.__rollback();

+				obj = this.delete_node(obj);

+				if(obj !== false) { this.__callback({ "obj" : obj, "prev" : prev, "parent" : p }); }

+			},

+			check_move : function () {

+				if(!this.__call_old()) { return false; }

+				var s = this._get_settings().crrm.move;

+				if(!s.check_move.call(this, this._get_move())) { return false; }

+				return true;

+			},

+			move_node : function (obj, ref, position, is_copy, is_prepared, skip_check) {

+				var s = this._get_settings().crrm.move;

+				if(!is_prepared) { 

+					if(typeof position === "undefined") { position = s.default_position; }

+					if(position === "inside" && !s.default_position.match(/^(before|after)$/)) { position = s.default_position; }

+					return this.__call_old(true, obj, ref, position, is_copy, false, skip_check);

+				}

+				// if the move is already prepared

+				if(s.always_copy === true || (s.always_copy === "multitree" && obj.rt.get_index() !== obj.ot.get_index() )) {

+					is_copy = true;

+				}

+				this.__call_old(true, obj, ref, position, is_copy, true, skip_check);

+			},

+

+			cut : function (obj) {

+				obj = this._get_node(obj, true);

+				if(!obj || !obj.length) { return false; }

+				this.data.crrm.cp_nodes = false;

+				this.data.crrm.ct_nodes = obj;

+				this.__callback({ "obj" : obj });

+			},

+			copy : function (obj) {

+				obj = this._get_node(obj, true);

+				if(!obj || !obj.length) { return false; }

+				this.data.crrm.ct_nodes = false;

+				this.data.crrm.cp_nodes = obj;

+				this.__callback({ "obj" : obj });

+			},

+			paste : function (obj) { 

+				obj = this._get_node(obj);

+				if(!obj || !obj.length) { return false; }

+				var nodes = this.data.crrm.ct_nodes ? this.data.crrm.ct_nodes : this.data.crrm.cp_nodes;

+				if(!this.data.crrm.ct_nodes && !this.data.crrm.cp_nodes) { return false; }

+				if(this.data.crrm.ct_nodes) { this.move_node(this.data.crrm.ct_nodes, obj); this.data.crrm.ct_nodes = false; }

+				if(this.data.crrm.cp_nodes) { this.move_node(this.data.crrm.cp_nodes, obj, false, true); }

+				this.__callback({ "obj" : obj, "nodes" : nodes });

+			}

+		}

+	});

+	// include the crr plugin by default

+	// $.jstree.defaults.plugins.push("crrm");

+})(jQuery);

+//*/

+

+/* 

+ * jsTree themes plugin

+ * Handles loading and setting themes, as well as detecting path to themes, etc.

+ */

+(function ($) {

+	var themes_loaded = [];

+	// this variable stores the path to the themes folder - if left as false - it will be autodetected

+	$.jstree._themes = false;

+	$.jstree.plugin("themes", {

+		__init : function () { 

+			this.get_container()

+				.bind("init.jstree", $.proxy(function () {

+						var s = this._get_settings().themes;

+						this.data.themes.dots = s.dots; 

+						this.data.themes.icons = s.icons; 

+						this.set_theme(s.theme, s.url);

+					}, this))

+				.bind("loaded.jstree", $.proxy(function () {

+						// bound here too, as simple HTML tree's won't honor dots & icons otherwise

+						if(!this.data.themes.dots) { this.hide_dots(); }

+						else { this.show_dots(); }

+						if(!this.data.themes.icons) { this.hide_icons(); }

+						else { this.show_icons(); }

+					}, this));

+		},

+		defaults : { 

+			theme : "default", 

+			url : false,

+			dots : true,

+			icons : true

+		},

+		_fn : {

+			set_theme : function (theme_name, theme_url) {

+				if(!theme_name) { return false; }

+				if(!theme_url) { theme_url = $.jstree._themes + theme_name + '/style.css'; }

+				if($.inArray(theme_url, themes_loaded) == -1) {

+					$.vakata.css.add_sheet({ "url" : theme_url });

+					themes_loaded.push(theme_url);

+				}

+				if(this.data.themes.theme != theme_name) {

+					this.get_container().removeClass('jstree-' + this.data.themes.theme);

+					this.data.themes.theme = theme_name;

+				}

+				this.get_container().addClass('jstree-' + theme_name);

+				if(!this.data.themes.dots) { this.hide_dots(); }

+				else { this.show_dots(); }

+				if(!this.data.themes.icons) { this.hide_icons(); }

+				else { this.show_icons(); }

+				this.__callback();

+			},

+			get_theme	: function () { return this.data.themes.theme; },

+

+			show_dots	: function () { this.data.themes.dots = true; this.get_container().children("ul").removeClass("jstree-no-dots"); },

+			hide_dots	: function () { this.data.themes.dots = false; this.get_container().children("ul").addClass("jstree-no-dots"); },

+			toggle_dots	: function () { if(this.data.themes.dots) { this.hide_dots(); } else { this.show_dots(); } },

+

+			show_icons	: function () { this.data.themes.icons = true; this.get_container().children("ul").removeClass("jstree-no-icons"); },

+			hide_icons	: function () { this.data.themes.icons = false; this.get_container().children("ul").addClass("jstree-no-icons"); },

+			toggle_icons: function () { if(this.data.themes.icons) { this.hide_icons(); } else { this.show_icons(); } }

+		}

+	});

+	// autodetect themes path

+	$(function () {

+		if($.jstree._themes === false) {

+			$("script").each(function () { 

+				if(this.src.toString().match(/jquery\.jstree[^\/]*?\.js(\?.*)?$/)) { 

+					$.jstree._themes = this.src.toString().replace(/jquery\.jstree[^\/]*?\.js(\?.*)?$/, "") + 'themes/'; 

+					return false; 

+				}

+			});

+		}

+		if($.jstree._themes === false) { $.jstree._themes = "themes/"; }

+	});

+	// include the themes plugin by default

+	$.jstree.defaults.plugins.push("themes");

+})(jQuery);

+//*/

+

+/*

+ * jsTree hotkeys plugin

+ * Enables keyboard navigation for all tree instances

+ * Depends on the jstree ui & jquery hotkeys plugins

+ */

+(function ($) {

+	var bound = [];

+	function exec(i, event) {

+		var f = $.jstree._focused(), tmp;

+		if(f && f.data && f.data.hotkeys && f.data.hotkeys.enabled) { 

+			tmp = f._get_settings().hotkeys[i];

+			if(tmp) { return tmp.call(f, event); }

+		}

+	}

+	$.jstree.plugin("hotkeys", {

+		__init : function () {

+			if(typeof $.hotkeys === "undefined") { throw "jsTree hotkeys: jQuery hotkeys plugin not included."; }

+			if(!this.data.ui) { throw "jsTree hotkeys: jsTree UI plugin not included."; }

+			$.each(this._get_settings().hotkeys, function (i, v) {

+				if(v !== false && $.inArray(i, bound) == -1) {

+					$(document).bind("keydown", i, function (event) { return exec(i, event); });

+					bound.push(i);

+				}

+			});

+			this.get_container()

+				.bind("lock.jstree", $.proxy(function () {

+						if(this.data.hotkeys.enabled) { this.data.hotkeys.enabled = false; this.data.hotkeys.revert = true; }

+					}, this))

+				.bind("unlock.jstree", $.proxy(function () {

+						if(this.data.hotkeys.revert) { this.data.hotkeys.enabled = true; }

+					}, this));

+			this.enable_hotkeys();

+		},

+		defaults : {

+			"up" : function () { 

+				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;

+				this.hover_node(this._get_prev(o));

+				return false; 

+			},

+			"ctrl+up" : function () { 

+				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;

+				this.hover_node(this._get_prev(o));

+				return false; 

+			},

+			"shift+up" : function () { 

+				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;

+				this.hover_node(this._get_prev(o));

+				return false; 

+			},

+			"down" : function () { 

+				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;

+				this.hover_node(this._get_next(o));

+				return false;

+			},

+			"ctrl+down" : function () { 

+				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;

+				this.hover_node(this._get_next(o));

+				return false;

+			},

+			"shift+down" : function () { 

+				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;

+				this.hover_node(this._get_next(o));

+				return false;

+			},

+			"left" : function () { 

+				var o = this.data.ui.hovered || this.data.ui.last_selected;

+				if(o) {

+					if(o.hasClass("jstree-open")) { this.close_node(o); }

+					else { this.hover_node(this._get_prev(o)); }

+				}

+				return false;

+			},

+			"ctrl+left" : function () { 

+				var o = this.data.ui.hovered || this.data.ui.last_selected;

+				if(o) {

+					if(o.hasClass("jstree-open")) { this.close_node(o); }

+					else { this.hover_node(this._get_prev(o)); }

+				}

+				return false;

+			},

+			"shift+left" : function () { 

+				var o = this.data.ui.hovered || this.data.ui.last_selected;

+				if(o) {

+					if(o.hasClass("jstree-open")) { this.close_node(o); }

+					else { this.hover_node(this._get_prev(o)); }

+				}

+				return false;

+			},

+			"right" : function () { 

+				var o = this.data.ui.hovered || this.data.ui.last_selected;

+				if(o && o.length) {

+					if(o.hasClass("jstree-closed")) { this.open_node(o); }

+					else { this.hover_node(this._get_next(o)); }

+				}

+				return false;

+			},

+			"ctrl+right" : function () { 

+				var o = this.data.ui.hovered || this.data.ui.last_selected;

+				if(o && o.length) {

+					if(o.hasClass("jstree-closed")) { this.open_node(o); }

+					else { this.hover_node(this._get_next(o)); }

+				}

+				return false;

+			},

+			"shift+right" : function () { 

+				var o = this.data.ui.hovered || this.data.ui.last_selected;

+				if(o && o.length) {

+					if(o.hasClass("jstree-closed")) { this.open_node(o); }

+					else { this.hover_node(this._get_next(o)); }

+				}

+				return false;

+			},

+			"space" : function () { 

+				if(this.data.ui.hovered) { this.data.ui.hovered.children("a:eq(0)").click(); } 

+				return false; 

+			},

+			"ctrl+space" : function (event) { 

+				event.type = "click";

+				if(this.data.ui.hovered) { this.data.ui.hovered.children("a:eq(0)").trigger(event); } 

+				return false; 

+			},

+			"shift+space" : function (event) { 

+				event.type = "click";

+				if(this.data.ui.hovered) { this.data.ui.hovered.children("a:eq(0)").trigger(event); } 

+				return false; 

+			},

+			"f2" : function () { this.rename(this.data.ui.hovered || this.data.ui.last_selected); },

+			"del" : function () { this.remove(this.data.ui.hovered || this._get_node(null)); }

+		},

+		_fn : {

+			enable_hotkeys : function () {

+				this.data.hotkeys.enabled = true;

+			},

+			disable_hotkeys : function () {

+				this.data.hotkeys.enabled = false;

+			}

+		}

+	});

+})(jQuery);

+//*/

+

+/* 

+ * jsTree JSON plugin

+ * The JSON data store. Datastores are build by overriding the `load_node` and `_is_loaded` functions.

+ */

+(function ($) {

+	$.jstree.plugin("json_data", {

+		__init : function() {

+			var s = this._get_settings().json_data;

+			if(s.progressive_unload) {

+				this.get_container().bind("after_close.jstree", function (e, data) {

+					data.rslt.obj.children("ul").remove();

+				});

+			}

+		},

+		defaults : { 

+			// `data` can be a function:

+			//  * accepts two arguments - node being loaded and a callback to pass the result to

+			//  * will be executed in the current tree's scope & ajax won't be supported

+			data : false, 

+			ajax : false,

+			correct_state : true,

+			progressive_render : false,

+			progressive_unload : false

+		},

+		_fn : {

+			load_node : function (obj, s_call, e_call) { var _this = this; this.load_node_json(obj, function () { _this.__callback({ "obj" : _this._get_node(obj) }); s_call.call(this); }, e_call); },

+			_is_loaded : function (obj) { 

+				var s = this._get_settings().json_data;

+				obj = this._get_node(obj); 

+				return obj == -1 || !obj || (!s.ajax && !s.progressive_render && !$.isFunction(s.data)) || obj.is(".jstree-open, .jstree-leaf") || obj.children("ul").children("li").length > 0;

+			},

+			refresh : function (obj) {

+				obj = this._get_node(obj);

+				var s = this._get_settings().json_data;

+				if(obj && obj !== -1 && s.progressive_unload && ($.isFunction(s.data) || !!s.ajax)) {

+					obj.removeData("jstree-children");

+				}

+				return this.__call_old();

+			},

+			load_node_json : function (obj, s_call, e_call) {

+				var s = this.get_settings().json_data, d,

+					error_func = function () {},

+					success_func = function () {};

+				obj = this._get_node(obj);

+

+				if(obj && obj !== -1 && (s.progressive_render || s.progressive_unload) && !obj.is(".jstree-open, .jstree-leaf") && obj.children("ul").children("li").length === 0 && obj.data("jstree-children")) {

+					d = this._parse_json(obj.data("jstree-children"), obj);

+					if(d) {

+						obj.append(d);

+						if(!s.progressive_unload) { obj.removeData("jstree-children"); }

+					}

+					this.clean_node(obj);

+					if(s_call) { s_call.call(this); }

+					return;

+				}

+

+				if(obj && obj !== -1) {

+					if(obj.data("jstree-is-loading")) { return; }

+					else { obj.data("jstree-is-loading",true); }

+				}

+				switch(!0) {

+					case (!s.data && !s.ajax): throw "Neither data nor ajax settings supplied.";

+					// function option added here for easier model integration (also supporting async - see callback)

+					case ($.isFunction(s.data)):

+						s.data.call(this, obj, $.proxy(function (d) {

+							d = this._parse_json(d, obj);

+							if(!d) { 

+								if(obj === -1 || !obj) {

+									if(s.correct_state) { this.get_container().children("ul").empty(); }

+								}

+								else {

+									obj.children("a.jstree-loading").removeClass("jstree-loading");

+									obj.removeData("jstree-is-loading");

+									if(s.correct_state) { this.correct_state(obj); }

+								}

+								if(e_call) { e_call.call(this); }

+							}

+							else {

+								if(obj === -1 || !obj) { this.get_container().children("ul").empty().append(d.children()); }

+								else { obj.append(d).children("a.jstree-loading").removeClass("jstree-loading"); obj.removeData("jstree-is-loading"); }

+								this.clean_node(obj);

+								if(s_call) { s_call.call(this); }

+							}

+						}, this));

+						break;

+					case (!!s.data && !s.ajax) || (!!s.data && !!s.ajax && (!obj || obj === -1)):

+						if(!obj || obj == -1) {

+							d = this._parse_json(s.data, obj);

+							if(d) {

+								this.get_container().children("ul").empty().append(d.children());

+								this.clean_node();

+							}

+							else { 

+								if(s.correct_state) { this.get_container().children("ul").empty(); }

+							}

+						}

+						if(s_call) { s_call.call(this); }

+						break;

+					case (!s.data && !!s.ajax) || (!!s.data && !!s.ajax && obj && obj !== -1):

+						error_func = function (x, t, e) {

+							var ef = this.get_settings().json_data.ajax.error; 

+							if(ef) { ef.call(this, x, t, e); }

+							if(obj != -1 && obj.length) {

+								obj.children("a.jstree-loading").removeClass("jstree-loading");

+								obj.removeData("jstree-is-loading");

+								if(t === "success" && s.correct_state) { this.correct_state(obj); }

+							}

+							else {

+								if(t === "success" && s.correct_state) { this.get_container().children("ul").empty(); }

+							}

+							if(e_call) { e_call.call(this); }

+						};

+						success_func = function (d, t, x) {

+							var sf = this.get_settings().json_data.ajax.success; 

+							if(sf) { d = sf.call(this,d,t,x) || d; }

+							if(d === "" || (d && d.toString && d.toString().replace(/^[\s\n]+$/,"") === "") || (!$.isArray(d) && !$.isPlainObject(d))) {

+								return error_func.call(this, x, t, "");

+							}

+							d = this._parse_json(d, obj);

+							if(d) {

+								if(obj === -1 || !obj) { this.get_container().children("ul").empty().append(d.children()); }

+								else { obj.append(d).children("a.jstree-loading").removeClass("jstree-loading"); obj.removeData("jstree-is-loading"); }

+								this.clean_node(obj);

+								if(s_call) { s_call.call(this); }

+							}

+							else {

+								if(obj === -1 || !obj) {

+									if(s.correct_state) { 

+										this.get_container().children("ul").empty(); 

+										if(s_call) { s_call.call(this); }

+									}

+								}

+								else {

+									obj.children("a.jstree-loading").removeClass("jstree-loading");

+									obj.removeData("jstree-is-loading");

+									if(s.correct_state) { 

+										this.correct_state(obj);

+										if(s_call) { s_call.call(this); } 

+									}

+								}

+							}

+						};

+						s.ajax.context = this;

+						s.ajax.error = error_func;

+						s.ajax.success = success_func;

+						if(!s.ajax.dataType) { s.ajax.dataType = "json"; }

+						if($.isFunction(s.ajax.url)) { s.ajax.url = s.ajax.url.call(this, obj); }

+						if($.isFunction(s.ajax.data)) { s.ajax.data = s.ajax.data.call(this, obj); }

+						$.ajax(s.ajax);

+						break;

+				}

+			},

+			_parse_json : function (js, obj, is_callback) {

+				var d = false, 

+					p = this._get_settings(),

+					s = p.json_data,

+					t = p.core.html_titles,

+					tmp, i, j, ul1, ul2;

+

+				if(!js) { return d; }

+				if(s.progressive_unload && obj && obj !== -1) { 

+					obj.data("jstree-children", d);

+				}

+				if($.isArray(js)) {

+					d = $();

+					if(!js.length) { return false; }

+					for(i = 0, j = js.length; i < j; i++) {

+						tmp = this._parse_json(js[i], obj, true);

+						if(tmp.length) { d = d.add(tmp); }

+					}

+				}

+				else {

+					if(typeof js == "string") { js = { data : js }; }

+					if(!js.data && js.data !== "") { return d; }

+					d = $("<li />");

+					if(js.attr) { d.attr(js.attr); }

+					if(js.metadata) { d.data(js.metadata); }

+					if(js.state) { d.addClass("jstree-" + js.state); }

+					if(!$.isArray(js.data)) { tmp = js.data; js.data = []; js.data.push(tmp); }

+					$.each(js.data, function (i, m) {

+						tmp = $("<a />");

+						if($.isFunction(m)) { m = m.call(this, js); }

+						if(typeof m == "string") { tmp.attr('href','#')[ t ? "html" : "text" ](m); }

+						else {

+							if(!m.attr) { m.attr = {}; }

+							if(!m.attr.href) { m.attr.href = '#'; }

+							tmp.attr(m.attr)[ t ? "html" : "text" ](m.title);

+							if(m.language) { tmp.addClass(m.language); }

+						}

+						tmp.prepend("<ins class='jstree-icon'>&#160;</ins>");

+						if(!m.icon && js.icon) { m.icon = js.icon; }

+						if(m.icon) { 

+							if(m.icon.indexOf("/") === -1) { tmp.children("ins").addClass(m.icon); }

+							else { tmp.children("ins").css("background","url('" + m.icon + "') center center no-repeat"); }

+						}

+						d.append(tmp);

+					});

+					d.prepend("<ins class='jstree-icon'>&#160;</ins>");

+					if(js.children) { 

+						if(s.progressive_render && js.state !== "open") {

+							d.addClass("jstree-closed").data("jstree-children", js.children);

+						}

+						else {

+							if(s.progressive_unload) { d.data("jstree-children", js.children); }

+							if($.isArray(js.children) && js.children.length) {

+								tmp = this._parse_json(js.children, obj, true);

+								if(tmp.length) {

+									ul2 = $("<ul />");

+									ul2.append(tmp);

+									d.append(ul2);

+								}

+							}

+						}

+					}

+				}

+				if(!is_callback) {

+					ul1 = $("<ul />");

+					ul1.append(d);

+					d = ul1;

+				}

+				return d;

+			},

+			get_json : function (obj, li_attr, a_attr, is_callback) {

+				var result = [], 

+					s = this._get_settings(), 

+					_this = this,

+					tmp1, tmp2, li, a, t, lang;

+				obj = this._get_node(obj);

+				if(!obj || obj === -1) { obj = this.get_container().find("> ul > li"); }

+				li_attr = $.isArray(li_attr) ? li_attr : [ "id", "class" ];

+				if(!is_callback && this.data.types) { li_attr.push(s.types.type_attr); }

+				a_attr = $.isArray(a_attr) ? a_attr : [ ];

+

+				obj.each(function () {

+					li = $(this);

+					tmp1 = { data : [] };

+					if(li_attr.length) { tmp1.attr = { }; }

+					$.each(li_attr, function (i, v) { 

+						tmp2 = li.attr(v); 

+						if(tmp2 && tmp2.length && tmp2.replace(/jstree[^ ]*/ig,'').length) {

+							tmp1.attr[v] = (" " + tmp2).replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,""); 

+						}

+					});

+					if(li.hasClass("jstree-open")) { tmp1.state = "open"; }

+					if(li.hasClass("jstree-closed")) { tmp1.state = "closed"; }

+					if(li.data()) { tmp1.metadata = li.data(); }

+					a = li.children("a");

+					a.each(function () {

+						t = $(this);

+						if(

+							a_attr.length || 

+							$.inArray("languages", s.plugins) !== -1 || 

+							t.children("ins").get(0).style.backgroundImage.length || 

+							(t.children("ins").get(0).className && t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').length)

+						) { 

+							lang = false;

+							if($.inArray("languages", s.plugins) !== -1 && $.isArray(s.languages) && s.languages.length) {

+								$.each(s.languages, function (l, lv) {

+									if(t.hasClass(lv)) {

+										lang = lv;

+										return false;

+									}

+								});

+							}

+							tmp2 = { attr : { }, title : _this.get_text(t, lang) }; 

+							$.each(a_attr, function (k, z) {

+								tmp2.attr[z] = (" " + (t.attr(z) || "")).replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"");

+							});

+							if($.inArray("languages", s.plugins) !== -1 && $.isArray(s.languages) && s.languages.length) {

+								$.each(s.languages, function (k, z) {

+									if(t.hasClass(z)) { tmp2.language = z; return true; }

+								});

+							}

+							if(t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/^\s+$/ig,"").length) {

+								tmp2.icon = t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"");

+							}

+							if(t.children("ins").get(0).style.backgroundImage.length) {

+								tmp2.icon = t.children("ins").get(0).style.backgroundImage.replace("url(","").replace(")","");

+							}

+						}

+						else {

+							tmp2 = _this.get_text(t);

+						}

+						if(a.length > 1) { tmp1.data.push(tmp2); }

+						else { tmp1.data = tmp2; }

+					});

+					li = li.find("> ul > li");

+					if(li.length) { tmp1.children = _this.get_json(li, li_attr, a_attr, true); }

+					result.push(tmp1);

+				});

+				return result;

+			}

+		}

+	});

+})(jQuery);

+//*/

+

+/* 

+ * jsTree languages plugin

+ * Adds support for multiple language versions in one tree

+ * This basically allows for many titles coexisting in one node, but only one of them being visible at any given time

+ * This is useful for maintaining the same structure in many languages (hence the name of the plugin)

+ */

+(function ($) {

+	$.jstree.plugin("languages", {

+		__init : function () { this._load_css();  },

+		defaults : [],

+		_fn : {

+			set_lang : function (i) { 

+				var langs = this._get_settings().languages,

+					st = false,

+					selector = ".jstree-" + this.get_index() + ' a';

+				if(!$.isArray(langs) || langs.length === 0) { return false; }

+				if($.inArray(i,langs) == -1) {

+					if(!!langs[i]) { i = langs[i]; }

+					else { return false; }

+				}

+				if(i == this.data.languages.current_language) { return true; }

+				st = $.vakata.css.get_css(selector + "." + this.data.languages.current_language, false, this.data.languages.language_css);

+				if(st !== false) { st.style.display = "none"; }

+				st = $.vakata.css.get_css(selector + "." + i, false, this.data.languages.language_css);

+				if(st !== false) { st.style.display = ""; }

+				this.data.languages.current_language = i;

+				this.__callback(i);

+				return true;

+			},

+			get_lang : function () {

+				return this.data.languages.current_language;

+			},

+			_get_string : function (key, lang) {

+				var langs = this._get_settings().languages,

+					s = this._get_settings().core.strings;

+				if($.isArray(langs) && langs.length) {

+					lang = (lang && $.inArray(lang,langs) != -1) ? lang : this.data.languages.current_language;

+				}

+				if(s[lang] && s[lang][key]) { return s[lang][key]; }

+				if(s[key]) { return s[key]; }

+				return key;

+			},

+			get_text : function (obj, lang) {

+				obj = this._get_node(obj) || this.data.ui.last_selected;

+				if(!obj.size()) { return false; }

+				var langs = this._get_settings().languages,

+					s = this._get_settings().core.html_titles;

+				if($.isArray(langs) && langs.length) {

+					lang = (lang && $.inArray(lang,langs) != -1) ? lang : this.data.languages.current_language;

+					obj = obj.children("a." + lang);

+				}

+				else { obj = obj.children("a:eq(0)"); }

+				if(s) {

+					obj = obj.clone();

+					obj.children("INS").remove();

+					return obj.html();

+				}

+				else {

+					obj = obj.contents().filter(function() { return this.nodeType == 3; })[0];

+					return obj.nodeValue;

+				}

+			},

+			set_text : function (obj, val, lang) {

+				obj = this._get_node(obj) || this.data.ui.last_selected;

+				if(!obj.size()) { return false; }

+				var langs = this._get_settings().languages,

+					s = this._get_settings().core.html_titles,

+					tmp;

+				if($.isArray(langs) && langs.length) {

+					lang = (lang && $.inArray(lang,langs) != -1) ? lang : this.data.languages.current_language;

+					obj = obj.children("a." + lang);

+				}

+				else { obj = obj.children("a:eq(0)"); }

+				if(s) {

+					tmp = obj.children("INS").clone();

+					obj.html(val).prepend(tmp);

+					this.__callback({ "obj" : obj, "name" : val, "lang" : lang });

+					return true;

+				}

+				else {

+					obj = obj.contents().filter(function() { return this.nodeType == 3; })[0];

+					this.__callback({ "obj" : obj, "name" : val, "lang" : lang });

+					return (obj.nodeValue = val);

+				}

+			},

+			_load_css : function () {

+				var langs = this._get_settings().languages,

+					str = "/* languages css */",

+					selector = ".jstree-" + this.get_index() + ' a',

+					ln;

+				if($.isArray(langs) && langs.length) {

+					this.data.languages.current_language = langs[0];

+					for(ln = 0; ln < langs.length; ln++) {

+						str += selector + "." + langs[ln] + " {";

+						if(langs[ln] != this.data.languages.current_language) { str += " display:none; "; }

+						str += " } ";

+					}

+					this.data.languages.language_css = $.vakata.css.add_sheet({ 'str' : str, 'title' : "jstree-languages" });

+				}

+			},

+			create_node : function (obj, position, js, callback) {

+				var t = this.__call_old(true, obj, position, js, function (t) {

+					var langs = this._get_settings().languages,

+						a = t.children("a"),

+						ln;

+					if($.isArray(langs) && langs.length) {

+						for(ln = 0; ln < langs.length; ln++) {

+							if(!a.is("." + langs[ln])) {

+								t.append(a.eq(0).clone().removeClass(langs.join(" ")).addClass(langs[ln]));

+							}

+						}

+						a.not("." + langs.join(", .")).remove();

+					}

+					if(callback) { callback.call(this, t); }

+				});

+				return t;

+			}

+		}

+	});

+})(jQuery);

+//*/

+

+/*

+ * jsTree cookies plugin

+ * Stores the currently opened/selected nodes in a cookie and then restores them

+ * Depends on the jquery.cookie plugin

+ */

+(function ($) {

+	$.jstree.plugin("cookies", {

+		__init : function () {

+			if(typeof $.cookie === "undefined") { throw "jsTree cookie: jQuery cookie plugin not included."; }

+

+			var s = this._get_settings().cookies,

+				tmp;

+			if(!!s.save_loaded) {

+				tmp = $.cookie(s.save_loaded);

+				if(tmp && tmp.length) { this.data.core.to_load = tmp.split(","); }

+			}

+			if(!!s.save_opened) {

+				tmp = $.cookie(s.save_opened);

+				if(tmp && tmp.length) { this.data.core.to_open = tmp.split(","); }

+			}

+			if(!!s.save_selected) {

+				tmp = $.cookie(s.save_selected);

+				if(tmp && tmp.length && this.data.ui) { this.data.ui.to_select = tmp.split(","); }

+			}

+			this.get_container()

+				.one( ( this.data.ui ? "reselect" : "reopen" ) + ".jstree", $.proxy(function () {

+					this.get_container()

+						.bind("open_node.jstree close_node.jstree select_node.jstree deselect_node.jstree", $.proxy(function (e) { 

+								if(this._get_settings().cookies.auto_save) { this.save_cookie((e.handleObj.namespace + e.handleObj.type).replace("jstree","")); }

+							}, this));

+				}, this));

+		},

+		defaults : {

+			save_loaded		: "jstree_load",

+			save_opened		: "jstree_open",

+			save_selected	: "jstree_select",

+			auto_save		: true,

+			cookie_options	: {}

+		},

+		_fn : {

+			save_cookie : function (c) {

+				if(this.data.core.refreshing) { return; }

+				var s = this._get_settings().cookies;

+				if(!c) { // if called manually and not by event

+					if(s.save_loaded) {

+						this.save_loaded();

+						$.cookie(s.save_loaded, this.data.core.to_load.join(","), s.cookie_options);

+					}

+					if(s.save_opened) {

+						this.save_opened();

+						$.cookie(s.save_opened, this.data.core.to_open.join(","), s.cookie_options);

+					}

+					if(s.save_selected && this.data.ui) {

+						this.save_selected();

+						$.cookie(s.save_selected, this.data.ui.to_select.join(","), s.cookie_options);

+					}

+					return;

+				}

+				switch(c) {

+					case "open_node":

+					case "close_node":

+						if(!!s.save_opened) { 

+							this.save_opened(); 

+							$.cookie(s.save_opened, this.data.core.to_open.join(","), s.cookie_options); 

+						}

+						if(!!s.save_loaded) { 

+							this.save_loaded(); 

+							$.cookie(s.save_loaded, this.data.core.to_load.join(","), s.cookie_options); 

+						}

+						break;

+					case "select_node":

+					case "deselect_node":

+						if(!!s.save_selected && this.data.ui) { 

+							this.save_selected(); 

+							$.cookie(s.save_selected, this.data.ui.to_select.join(","), s.cookie_options); 

+						}

+						break;

+				}

+			}

+		}

+	});

+	// include cookies by default

+	// $.jstree.defaults.plugins.push("cookies");

+})(jQuery);

+//*/

+

+/*

+ * jsTree sort plugin

+ * Sorts items alphabetically (or using any other function)

+ */

+(function ($) {

+	$.jstree.plugin("sort", {

+		__init : function () {

+			this.get_container()

+				.bind("load_node.jstree", $.proxy(function (e, data) {

+						var obj = this._get_node(data.rslt.obj);

+						obj = obj === -1 ? this.get_container().children("ul") : obj.children("ul");

+						this.sort(obj);

+					}, this))

+				.bind("rename_node.jstree create_node.jstree create.jstree", $.proxy(function (e, data) {

+						this.sort(data.rslt.obj.parent());

+					}, this))

+				.bind("move_node.jstree", $.proxy(function (e, data) {

+						var m = data.rslt.np == -1 ? this.get_container() : data.rslt.np;

+						this.sort(m.children("ul"));

+					}, this));

+		},

+		defaults : function (a, b) { return this.get_text(a) > this.get_text(b) ? 1 : -1; },

+		_fn : {

+			sort : function (obj) {

+				var s = this._get_settings().sort,

+					t = this;

+				obj.append($.makeArray(obj.children("li")).sort($.proxy(s, t)));

+				obj.find("> li > ul").each(function() { t.sort($(this)); });

+				this.clean_node(obj);

+			}

+		}

+	});

+})(jQuery);

+//*/

+

+/*

+ * jsTree DND plugin

+ * Drag and drop plugin for moving/copying nodes

+ */

+(function ($) {

+	var o = false,

+		r = false,

+		m = false,

+		ml = false,

+		sli = false,

+		sti = false,

+		dir1 = false,

+		dir2 = false,

+		last_pos = false;

+	$.vakata.dnd = {

+		is_down : false,

+		is_drag : false,

+		helper : false,

+		scroll_spd : 10,

+		init_x : 0,

+		init_y : 0,

+		threshold : 5,

+		helper_left : 5,

+		helper_top : 10,

+		user_data : {},

+

+		drag_start : function (e, data, html) { 

+			if($.vakata.dnd.is_drag) { $.vakata.drag_stop({}); }

+			try {

+				e.currentTarget.unselectable = "on";

+				e.currentTarget.onselectstart = function() { return false; };

+				if(e.currentTarget.style) { e.currentTarget.style.MozUserSelect = "none"; }

+			} catch(err) { }

+			$.vakata.dnd.init_x = e.pageX;

+			$.vakata.dnd.init_y = e.pageY;

+			$.vakata.dnd.user_data = data;

+			$.vakata.dnd.is_down = true;

+			$.vakata.dnd.helper = $("<div id='vakata-dragged' />").html(html); //.fadeTo(10,0.25);

+			$(document).bind("mousemove", $.vakata.dnd.drag);

+			$(document).bind("mouseup", $.vakata.dnd.drag_stop);

+			return false;

+		},

+		drag : function (e) { 

+			if(!$.vakata.dnd.is_down) { return; }

+			if(!$.vakata.dnd.is_drag) {

+				if(Math.abs(e.pageX - $.vakata.dnd.init_x) > 5 || Math.abs(e.pageY - $.vakata.dnd.init_y) > 5) { 

+					$.vakata.dnd.helper.appendTo("body");

+					$.vakata.dnd.is_drag = true;

+					$(document).triggerHandler("drag_start.vakata", { "event" : e, "data" : $.vakata.dnd.user_data });

+				}

+				else { return; }

+			}

+

+			// maybe use a scrolling parent element instead of document?

+			if(e.type === "mousemove") { // thought of adding scroll in order to move the helper, but mouse poisition is n/a

+				var d = $(document), t = d.scrollTop(), l = d.scrollLeft();

+				if(e.pageY - t < 20) { 

+					if(sti && dir1 === "down") { clearInterval(sti); sti = false; }

+					if(!sti) { dir1 = "up"; sti = setInterval(function () { $(document).scrollTop($(document).scrollTop() - $.vakata.dnd.scroll_spd); }, 150); }

+				}

+				else { 

+					if(sti && dir1 === "up") { clearInterval(sti); sti = false; }

+				}

+				if($(window).height() - (e.pageY - t) < 20) {

+					if(sti && dir1 === "up") { clearInterval(sti); sti = false; }

+					if(!sti) { dir1 = "down"; sti = setInterval(function () { $(document).scrollTop($(document).scrollTop() + $.vakata.dnd.scroll_spd); }, 150); }

+				}

+				else { 

+					if(sti && dir1 === "down") { clearInterval(sti); sti = false; }

+				}

+

+				if(e.pageX - l < 20) {

+					if(sli && dir2 === "right") { clearInterval(sli); sli = false; }

+					if(!sli) { dir2 = "left"; sli = setInterval(function () { $(document).scrollLeft($(document).scrollLeft() - $.vakata.dnd.scroll_spd); }, 150); }

+				}

+				else { 

+					if(sli && dir2 === "left") { clearInterval(sli); sli = false; }

+				}

+				if($(window).width() - (e.pageX - l) < 20) {

+					if(sli && dir2 === "left") { clearInterval(sli); sli = false; }

+					if(!sli) { dir2 = "right"; sli = setInterval(function () { $(document).scrollLeft($(document).scrollLeft() + $.vakata.dnd.scroll_spd); }, 150); }

+				}

+				else { 

+					if(sli && dir2 === "right") { clearInterval(sli); sli = false; }

+				}

+			}

+

+			$.vakata.dnd.helper.css({ left : (e.pageX + $.vakata.dnd.helper_left) + "px", top : (e.pageY + $.vakata.dnd.helper_top) + "px" });

+			$(document).triggerHandler("drag.vakata", { "event" : e, "data" : $.vakata.dnd.user_data });

+		},

+		drag_stop : function (e) {

+			if(sli) { clearInterval(sli); }

+			if(sti) { clearInterval(sti); }

+			$(document).unbind("mousemove", $.vakata.dnd.drag);

+			$(document).unbind("mouseup", $.vakata.dnd.drag_stop);

+			$(document).triggerHandler("drag_stop.vakata", { "event" : e, "data" : $.vakata.dnd.user_data });

+			$.vakata.dnd.helper.remove();

+			$.vakata.dnd.init_x = 0;

+			$.vakata.dnd.init_y = 0;

+			$.vakata.dnd.user_data = {};

+			$.vakata.dnd.is_down = false;

+			$.vakata.dnd.is_drag = false;

+		}

+	};

+	$(function() {

+		var css_string = '#vakata-dragged { display:block; margin:0 0 0 0; padding:4px 4px 4px 24px; position:absolute; top:-2000px; line-height:16px; z-index:10000; } ';

+		$.vakata.css.add_sheet({ str : css_string, title : "vakata" });

+	});

+

+	$.jstree.plugin("dnd", {

+		__init : function () {

+			this.data.dnd = {

+				active : false,

+				after : false,

+				inside : false,

+				before : false,

+				off : false,

+				prepared : false,

+				w : 0,

+				to1 : false,

+				to2 : false,

+				cof : false,

+				cw : false,

+				ch : false,

+				i1 : false,

+				i2 : false,

+				mto : false

+			};

+			this.get_container()

+				.bind("mouseenter.jstree", $.proxy(function (e) {

+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {

+							if(this.data.themes) {

+								m.attr("class", "jstree-" + this.data.themes.theme); 

+								if(ml) { ml.attr("class", "jstree-" + this.data.themes.theme); }

+								$.vakata.dnd.helper.attr("class", "jstree-dnd-helper jstree-" + this.data.themes.theme);

+							}

+							//if($(e.currentTarget).find("> ul > li").length === 0) {

+							if(e.currentTarget === e.target && $.vakata.dnd.user_data.obj && $($.vakata.dnd.user_data.obj).length && $($.vakata.dnd.user_data.obj).parents(".jstree:eq(0)")[0] !== e.target) { // node should not be from the same tree

+								var tr = $.jstree._reference(e.target), dc;

+								if(tr.data.dnd.foreign) {

+									dc = tr._get_settings().dnd.drag_check.call(this, { "o" : o, "r" : tr.get_container(), is_root : true });

+									if(dc === true || dc.inside === true || dc.before === true || dc.after === true) {

+										$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");

+									}

+								}

+								else {

+									tr.prepare_move(o, tr.get_container(), "last");

+									if(tr.check_move()) {

+										$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");

+									}

+								}

+							}

+						}

+					}, this))

+				.bind("mouseup.jstree", $.proxy(function (e) {

+						//if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree && $(e.currentTarget).find("> ul > li").length === 0) {

+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree && e.currentTarget === e.target && $.vakata.dnd.user_data.obj && $($.vakata.dnd.user_data.obj).length && $($.vakata.dnd.user_data.obj).parents(".jstree:eq(0)")[0] !== e.target) { // node should not be from the same tree

+							var tr = $.jstree._reference(e.currentTarget), dc;

+							if(tr.data.dnd.foreign) {

+								dc = tr._get_settings().dnd.drag_check.call(this, { "o" : o, "r" : tr.get_container(), is_root : true });

+								if(dc === true || dc.inside === true || dc.before === true || dc.after === true) {

+									tr._get_settings().dnd.drag_finish.call(this, { "o" : o, "r" : tr.get_container(), is_root : true });

+								}

+							}

+							else {

+								tr.move_node(o, tr.get_container(), "last", e[tr._get_settings().dnd.copy_modifier + "Key"]);

+							}

+						}

+					}, this))

+				.bind("mouseleave.jstree", $.proxy(function (e) {

+						if(e.relatedTarget && e.relatedTarget.id && e.relatedTarget.id === "jstree-marker-line") {

+							return false; 

+						}

+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {

+							if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }

+							if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }

+							if(this.data.dnd.to1) { clearTimeout(this.data.dnd.to1); }

+							if(this.data.dnd.to2) { clearTimeout(this.data.dnd.to2); }

+							if($.vakata.dnd.helper.children("ins").hasClass("jstree-ok")) {

+								$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");

+							}

+						}

+					}, this))

+				.bind("mousemove.jstree", $.proxy(function (e) {

+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {

+							var cnt = this.get_container()[0];

+

+							// Horizontal scroll

+							if(e.pageX + 24 > this.data.dnd.cof.left + this.data.dnd.cw) {

+								if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }

+								this.data.dnd.i1 = setInterval($.proxy(function () { this.scrollLeft += $.vakata.dnd.scroll_spd; }, cnt), 100);

+							}

+							else if(e.pageX - 24 < this.data.dnd.cof.left) {

+								if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }

+								this.data.dnd.i1 = setInterval($.proxy(function () { this.scrollLeft -= $.vakata.dnd.scroll_spd; }, cnt), 100);

+							}

+							else {

+								if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }

+							}

+

+							// Vertical scroll

+							if(e.pageY + 24 > this.data.dnd.cof.top + this.data.dnd.ch) {

+								if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }

+								this.data.dnd.i2 = setInterval($.proxy(function () { this.scrollTop += $.vakata.dnd.scroll_spd; }, cnt), 100);

+							}

+							else if(e.pageY - 24 < this.data.dnd.cof.top) {

+								if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }

+								this.data.dnd.i2 = setInterval($.proxy(function () { this.scrollTop -= $.vakata.dnd.scroll_spd; }, cnt), 100);

+							}

+							else {

+								if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }

+							}

+

+						}

+					}, this))

+				.bind("scroll.jstree", $.proxy(function (e) { 

+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree && m && ml) {

+							m.hide();

+							ml.hide();

+						}

+					}, this))

+				.delegate("a", "mousedown.jstree", $.proxy(function (e) { 

+						if(e.which === 1) {

+							this.start_drag(e.currentTarget, e);

+							return false;

+						}

+					}, this))

+				.delegate("a", "mouseenter.jstree", $.proxy(function (e) { 

+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {

+							this.dnd_enter(e.currentTarget);

+						}

+					}, this))

+				.delegate("a", "mousemove.jstree", $.proxy(function (e) { 

+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {

+							if(!r || !r.length || r.children("a")[0] !== e.currentTarget) {

+								this.dnd_enter(e.currentTarget);

+							}

+							if(typeof this.data.dnd.off.top === "undefined") { this.data.dnd.off = $(e.target).offset(); }

+							this.data.dnd.w = (e.pageY - (this.data.dnd.off.top || 0)) % this.data.core.li_height;

+							if(this.data.dnd.w < 0) { this.data.dnd.w += this.data.core.li_height; }

+							this.dnd_show();

+						}

+					}, this))

+				.delegate("a", "mouseleave.jstree", $.proxy(function (e) { 

+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {

+							if(e.relatedTarget && e.relatedTarget.id && e.relatedTarget.id === "jstree-marker-line") {

+								return false; 

+							}

+								if(m) { m.hide(); }

+								if(ml) { ml.hide(); }

+							/*

+							var ec = $(e.currentTarget).closest("li"), 

+								er = $(e.relatedTarget).closest("li");

+							if(er[0] !== ec.prev()[0] && er[0] !== ec.next()[0]) {

+								if(m) { m.hide(); }

+								if(ml) { ml.hide(); }

+							}

+							*/

+							this.data.dnd.mto = setTimeout( 

+								(function (t) { return function () { t.dnd_leave(e); }; })(this),

+							0);

+						}

+					}, this))

+				.delegate("a", "mouseup.jstree", $.proxy(function (e) { 

+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {

+							this.dnd_finish(e);

+						}

+					}, this));

+

+			$(document)

+				.bind("drag_stop.vakata", $.proxy(function () {

+						if(this.data.dnd.to1) { clearTimeout(this.data.dnd.to1); }

+						if(this.data.dnd.to2) { clearTimeout(this.data.dnd.to2); }

+						if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }

+						if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }

+						this.data.dnd.after		= false;

+						this.data.dnd.before	= false;

+						this.data.dnd.inside	= false;

+						this.data.dnd.off		= false;

+						this.data.dnd.prepared	= false;

+						this.data.dnd.w			= false;

+						this.data.dnd.to1		= false;

+						this.data.dnd.to2		= false;

+						this.data.dnd.i1		= false;

+						this.data.dnd.i2		= false;

+						this.data.dnd.active	= false;

+						this.data.dnd.foreign	= false;

+						if(m) { m.css({ "top" : "-2000px" }); }

+						if(ml) { ml.css({ "top" : "-2000px" }); }

+					}, this))

+				.bind("drag_start.vakata", $.proxy(function (e, data) {

+						if(data.data.jstree) { 

+							var et = $(data.event.target);

+							if(et.closest(".jstree").hasClass("jstree-" + this.get_index())) {

+								this.dnd_enter(et);

+							}

+						}

+					}, this));

+				/*

+				.bind("keydown.jstree-" + this.get_index() + " keyup.jstree-" + this.get_index(), $.proxy(function(e) {

+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree && !this.data.dnd.foreign) {

+							var h = $.vakata.dnd.helper.children("ins");

+							if(e[this._get_settings().dnd.copy_modifier + "Key"] && h.hasClass("jstree-ok")) {

+								h.parent().html(h.parent().html().replace(/ \(Copy\)$/, "") + " (Copy)");

+							} 

+							else {

+								h.parent().html(h.parent().html().replace(/ \(Copy\)$/, ""));

+							}

+						}

+					}, this)); */

+

+

+

+			var s = this._get_settings().dnd;

+			if(s.drag_target) {

+				$(document)

+					.delegate(s.drag_target, "mousedown.jstree-" + this.get_index(), $.proxy(function (e) {

+						o = e.target;

+						$.vakata.dnd.drag_start(e, { jstree : true, obj : e.target }, "<ins class='jstree-icon'></ins>" + $(e.target).text() );

+						if(this.data.themes) { 

+							if(m) { m.attr("class", "jstree-" + this.data.themes.theme); }

+							if(ml) { ml.attr("class", "jstree-" + this.data.themes.theme); }

+							$.vakata.dnd.helper.attr("class", "jstree-dnd-helper jstree-" + this.data.themes.theme); 

+						}

+						$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");

+						var cnt = this.get_container();

+						this.data.dnd.cof = cnt.offset();

+						this.data.dnd.cw = parseInt(cnt.width(),10);

+						this.data.dnd.ch = parseInt(cnt.height(),10);

+						this.data.dnd.foreign = true;

+						e.preventDefault();

+					}, this));

+			}

+			if(s.drop_target) {

+				$(document)

+					.delegate(s.drop_target, "mouseenter.jstree-" + this.get_index(), $.proxy(function (e) {

+							if(this.data.dnd.active && this._get_settings().dnd.drop_check.call(this, { "o" : o, "r" : $(e.target), "e" : e })) {

+								$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");

+							}

+						}, this))

+					.delegate(s.drop_target, "mouseleave.jstree-" + this.get_index(), $.proxy(function (e) {

+							if(this.data.dnd.active) {

+								$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");

+							}

+						}, this))

+					.delegate(s.drop_target, "mouseup.jstree-" + this.get_index(), $.proxy(function (e) {

+							if(this.data.dnd.active && $.vakata.dnd.helper.children("ins").hasClass("jstree-ok")) {

+								this._get_settings().dnd.drop_finish.call(this, { "o" : o, "r" : $(e.target), "e" : e });

+							}

+						}, this));

+			}

+		},

+		defaults : {

+			copy_modifier	: "ctrl",

+			check_timeout	: 100,

+			open_timeout	: 500,

+			drop_target		: ".jstree-drop",

+			drop_check		: function (data) { return true; },

+			drop_finish		: $.noop,

+			drag_target		: ".jstree-draggable",

+			drag_finish		: $.noop,

+			drag_check		: function (data) { return { after : false, before : false, inside : true }; }

+		},

+		_fn : {

+			dnd_prepare : function () {

+				if(!r || !r.length) { return; }

+				this.data.dnd.off = r.offset();

+				if(this._get_settings().core.rtl) {

+					this.data.dnd.off.right = this.data.dnd.off.left + r.width();

+				}

+				if(this.data.dnd.foreign) {

+					var a = this._get_settings().dnd.drag_check.call(this, { "o" : o, "r" : r });

+					this.data.dnd.after = a.after;

+					this.data.dnd.before = a.before;

+					this.data.dnd.inside = a.inside;

+					this.data.dnd.prepared = true;

+					return this.dnd_show();

+				}

+				this.prepare_move(o, r, "before");

+				this.data.dnd.before = this.check_move();

+				this.prepare_move(o, r, "after");

+				this.data.dnd.after = this.check_move();

+				if(this._is_loaded(r)) {

+					this.prepare_move(o, r, "inside");

+					this.data.dnd.inside = this.check_move();

+				}

+				else {

+					this.data.dnd.inside = false;

+				}

+				this.data.dnd.prepared = true;

+				return this.dnd_show();

+			},

+			dnd_show : function () {

+				if(!this.data.dnd.prepared) { return; }

+				var o = ["before","inside","after"],

+					r = false,

+					rtl = this._get_settings().core.rtl,

+					pos;

+				if(this.data.dnd.w < this.data.core.li_height/3) { o = ["before","inside","after"]; }

+				else if(this.data.dnd.w <= this.data.core.li_height*2/3) {

+					o = this.data.dnd.w < this.data.core.li_height/2 ? ["inside","before","after"] : ["inside","after","before"];

+				}

+				else { o = ["after","inside","before"]; }

+				$.each(o, $.proxy(function (i, val) { 

+					if(this.data.dnd[val]) {

+						$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");

+						r = val;

+						return false;

+					}

+				}, this));

+				if(r === false) { $.vakata.dnd.helper.children("ins").attr("class","jstree-invalid"); }

+				

+				pos = rtl ? (this.data.dnd.off.right - 18) : (this.data.dnd.off.left + 10);

+				switch(r) {

+					case "before":

+						m.css({ "left" : pos + "px", "top" : (this.data.dnd.off.top - 6) + "px" }).show();

+						if(ml) { ml.css({ "left" : (pos + 8) + "px", "top" : (this.data.dnd.off.top - 1) + "px" }).show(); }

+						break;

+					case "after":

+						m.css({ "left" : pos + "px", "top" : (this.data.dnd.off.top + this.data.core.li_height - 6) + "px" }).show();

+						if(ml) { ml.css({ "left" : (pos + 8) + "px", "top" : (this.data.dnd.off.top + this.data.core.li_height - 1) + "px" }).show(); }

+						break;

+					case "inside":

+						m.css({ "left" : pos + ( rtl ? -4 : 4) + "px", "top" : (this.data.dnd.off.top + this.data.core.li_height/2 - 5) + "px" }).show();

+						if(ml) { ml.hide(); }

+						break;

+					default:

+						m.hide();

+						if(ml) { ml.hide(); }

+						break;

+				}

+				last_pos = r;

+				return r;

+			},

+			dnd_open : function () {

+				this.data.dnd.to2 = false;

+				this.open_node(r, $.proxy(this.dnd_prepare,this), true);

+			},

+			dnd_finish : function (e) {

+				if(this.data.dnd.foreign) {

+					if(this.data.dnd.after || this.data.dnd.before || this.data.dnd.inside) {

+						this._get_settings().dnd.drag_finish.call(this, { "o" : o, "r" : r, "p" : last_pos });

+					}

+				}

+				else {

+					this.dnd_prepare();

+					this.move_node(o, r, last_pos, e[this._get_settings().dnd.copy_modifier + "Key"]);

+				}

+				o = false;

+				r = false;

+				m.hide();

+				if(ml) { ml.hide(); }

+			},

+			dnd_enter : function (obj) {

+				if(this.data.dnd.mto) { 

+					clearTimeout(this.data.dnd.mto);

+					this.data.dnd.mto = false;

+				}

+				var s = this._get_settings().dnd;

+				this.data.dnd.prepared = false;

+				r = this._get_node(obj);

+				if(s.check_timeout) { 

+					// do the calculations after a minimal timeout (users tend to drag quickly to the desired location)

+					if(this.data.dnd.to1) { clearTimeout(this.data.dnd.to1); }

+					this.data.dnd.to1 = setTimeout($.proxy(this.dnd_prepare, this), s.check_timeout); 

+				}

+				else { 

+					this.dnd_prepare(); 

+				}

+				if(s.open_timeout) { 

+					if(this.data.dnd.to2) { clearTimeout(this.data.dnd.to2); }

+					if(r && r.length && r.hasClass("jstree-closed")) { 

+						// if the node is closed - open it, then recalculate

+						this.data.dnd.to2 = setTimeout($.proxy(this.dnd_open, this), s.open_timeout);

+					}

+				}

+				else {

+					if(r && r.length && r.hasClass("jstree-closed")) { 

+						this.dnd_open();

+					}

+				}

+			},

+			dnd_leave : function (e) {

+				this.data.dnd.after		= false;

+				this.data.dnd.before	= false;

+				this.data.dnd.inside	= false;

+				$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");

+				m.hide();

+				if(ml) { ml.hide(); }

+				if(r && r[0] === e.target.parentNode) {

+					if(this.data.dnd.to1) {

+						clearTimeout(this.data.dnd.to1);

+						this.data.dnd.to1 = false;

+					}

+					if(this.data.dnd.to2) {

+						clearTimeout(this.data.dnd.to2);

+						this.data.dnd.to2 = false;

+					}

+				}

+			},

+			start_drag : function (obj, e) {

+				o = this._get_node(obj);

+				if(this.data.ui && this.is_selected(o)) { o = this._get_node(null, true); }

+				var dt = o.length > 1 ? this._get_string("multiple_selection") : this.get_text(o),

+					cnt = this.get_container();

+				if(!this._get_settings().core.html_titles) { dt = dt.replace(/</ig,"&lt;").replace(/>/ig,"&gt;"); }

+				$.vakata.dnd.drag_start(e, { jstree : true, obj : o }, "<ins class='jstree-icon'></ins>" + dt );

+				if(this.data.themes) { 

+					if(m) { m.attr("class", "jstree-" + this.data.themes.theme); }

+					if(ml) { ml.attr("class", "jstree-" + this.data.themes.theme); }

+					$.vakata.dnd.helper.attr("class", "jstree-dnd-helper jstree-" + this.data.themes.theme); 

+				}

+				this.data.dnd.cof = cnt.offset();

+				this.data.dnd.cw = parseInt(cnt.width(),10);

+				this.data.dnd.ch = parseInt(cnt.height(),10);

+				this.data.dnd.active = true;

+			}

+		}

+	});

+	$(function() {

+		var css_string = '' + 

+			'#vakata-dragged ins { display:block; text-decoration:none; width:16px; height:16px; margin:0 0 0 0; padding:0; position:absolute; top:4px; left:4px; ' + 

+			' -moz-border-radius:4px; border-radius:4px; -webkit-border-radius:4px; ' +

+			'} ' + 

+			'#vakata-dragged .jstree-ok { background:green; } ' + 

+			'#vakata-dragged .jstree-invalid { background:red; } ' + 

+			'#jstree-marker { padding:0; margin:0; font-size:12px; overflow:hidden; height:12px; width:8px; position:absolute; top:-30px; z-index:10001; background-repeat:no-repeat; display:none; background-color:transparent; text-shadow:1px 1px 1px white; color:black; line-height:10px; } ' + 

+			'#jstree-marker-line { padding:0; margin:0; line-height:0%; font-size:1px; overflow:hidden; height:1px; width:100px; position:absolute; top:-30px; z-index:10000; background-repeat:no-repeat; display:none; background-color:#456c43; ' + 

+			' cursor:pointer; border:1px solid #eeeeee; border-left:0; -moz-box-shadow: 0px 0px 2px #666; -webkit-box-shadow: 0px 0px 2px #666; box-shadow: 0px 0px 2px #666; ' + 

+			' -moz-border-radius:1px; border-radius:1px; -webkit-border-radius:1px; ' +

+			'}' + 

+			'';

+		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });

+		m = $("<div />").attr({ id : "jstree-marker" }).hide().html("&raquo;")

+			.bind("mouseleave mouseenter", function (e) { 

+				m.hide();

+				ml.hide();

+				e.preventDefault(); 

+				e.stopImmediatePropagation(); 

+				return false; 

+			})

+			.appendTo("body");

+		ml = $("<div />").attr({ id : "jstree-marker-line" }).hide()

+			.bind("mouseup", function (e) { 

+				if(r && r.length) { 

+					r.children("a").trigger(e); 

+					e.preventDefault(); 

+					e.stopImmediatePropagation(); 

+					return false; 

+				} 

+			})

+			.bind("mouseleave", function (e) { 

+				var rt = $(e.relatedTarget);

+				if(rt.is(".jstree") || rt.closest(".jstree").length === 0) {

+					if(r && r.length) { 

+						r.children("a").trigger(e); 

+						m.hide();

+						ml.hide();

+						e.preventDefault(); 

+						e.stopImmediatePropagation(); 

+						return false; 

+					}

+				}

+			})

+			.appendTo("body");

+		$(document).bind("drag_start.vakata", function (e, data) {

+			if(data.data.jstree) { m.show(); if(ml) { ml.show(); } }

+		});

+		$(document).bind("drag_stop.vakata", function (e, data) {

+			if(data.data.jstree) { m.hide(); if(ml) { ml.hide(); } }

+		});

+	});

+})(jQuery);

+//*/

+

+/*

+ * jsTree checkbox plugin

+ * Inserts checkboxes in front of every node

+ * Depends on the ui plugin

+ * DOES NOT WORK NICELY WITH MULTITREE DRAG'N'DROP

+ */

+(function ($) {

+	$.jstree.plugin("checkbox", {

+		__init : function () {

+			this.data.checkbox.noui = this._get_settings().checkbox.override_ui;

+			if(this.data.ui && this.data.checkbox.noui) {

+				this.select_node = this.deselect_node = this.deselect_all = $.noop;

+				this.get_selected = this.get_checked;

+			}

+

+			this.get_container()

+				.bind("open_node.jstree create_node.jstree clean_node.jstree refresh.jstree", $.proxy(function (e, data) { 

+						this._prepare_checkboxes(data.rslt.obj);

+					}, this))

+				.bind("loaded.jstree", $.proxy(function (e) {

+						this._prepare_checkboxes();

+					}, this))

+				.delegate( (this.data.ui && this.data.checkbox.noui ? "a" : "ins.jstree-checkbox") , "click.jstree", $.proxy(function (e) {

+						e.preventDefault();

+						if(this._get_node(e.target).hasClass("jstree-checked")) { this.uncheck_node(e.target); }

+						else { this.check_node(e.target); }

+						if(this.data.ui && this.data.checkbox.noui) {

+							this.save_selected();

+							if(this.data.cookies) { this.save_cookie("select_node"); }

+						}

+						else {

+							e.stopImmediatePropagation();

+							return false;

+						}

+					}, this));

+		},

+		defaults : {

+			override_ui : false,

+			two_state : false,

+			real_checkboxes : false,

+			checked_parent_open : true,

+			real_checkboxes_names : function (n) { return [ ("check_" + (n[0].id || Math.ceil(Math.random() * 10000))) , 1]; }

+		},

+		__destroy : function () {

+			this.get_container()

+				.find("input.jstree-real-checkbox").removeClass("jstree-real-checkbox").end()

+				.find("ins.jstree-checkbox").remove();

+		},

+		_fn : {

+			_checkbox_notify : function (n, data) {

+				if(data.checked) {

+					this.check_node(n, false);

+				}

+			},

+			_prepare_checkboxes : function (obj) {

+				obj = !obj || obj == -1 ? this.get_container().find("> ul > li") : this._get_node(obj);

+				if(obj === false) { return; } // added for removing root nodes

+				var c, _this = this, t, ts = this._get_settings().checkbox.two_state, rc = this._get_settings().checkbox.real_checkboxes, rcn = this._get_settings().checkbox.real_checkboxes_names;

+				obj.each(function () {

+					t = $(this);

+					c = t.is("li") && (t.hasClass("jstree-checked") || (rc && t.children(":checked").length)) ? "jstree-checked" : "jstree-unchecked";

+					t.find("li").andSelf().each(function () {

+						var $t = $(this), nm;

+						$t.children("a" + (_this.data.languages ? "" : ":eq(0)") ).not(":has(.jstree-checkbox)").prepend("<ins class='jstree-checkbox'>&#160;</ins>").parent().not(".jstree-checked, .jstree-unchecked").addClass( ts ? "jstree-unchecked" : c );

+						if(rc) {

+							if(!$t.children(":checkbox").length) {

+								nm = rcn.call(_this, $t);

+								$t.prepend("<input type='checkbox' class='jstree-real-checkbox' id='" + nm[0] + "' name='" + nm[0] + "' value='" + nm[1] + "' />");

+							}

+							else {

+								$t.children(":checkbox").addClass("jstree-real-checkbox");

+							}

+							if(c === "jstree-checked") { 

+								$t.children(":checkbox").attr("checked","checked"); 

+							}

+						}

+						if(c === "jstree-checked" && !ts) {

+							$t.find("li").addClass("jstree-checked");

+						}

+					});

+				});

+				if(!ts) {

+					if(obj.length === 1 && obj.is("li")) { this._repair_state(obj); }

+					if(obj.is("li")) { obj.each(function () { _this._repair_state(this); }); }

+					else { obj.find("> ul > li").each(function () { _this._repair_state(this); }); }

+					obj.find(".jstree-checked").parent().parent().each(function () { _this._repair_state(this); }); 

+				}

+			},

+			change_state : function (obj, state) {

+				obj = this._get_node(obj);

+				var coll = false, rc = this._get_settings().checkbox.real_checkboxes;

+				if(!obj || obj === -1) { return false; }

+				state = (state === false || state === true) ? state : obj.hasClass("jstree-checked");

+				if(this._get_settings().checkbox.two_state) {

+					if(state) { 

+						obj.removeClass("jstree-checked").addClass("jstree-unchecked"); 

+						if(rc) { obj.children(":checkbox").removeAttr("checked"); }

+					}

+					else { 

+						obj.removeClass("jstree-unchecked").addClass("jstree-checked"); 

+						if(rc) { obj.children(":checkbox").attr("checked","checked"); }

+					}

+				}

+				else {

+					if(state) { 

+						coll = obj.find("li").andSelf();

+						if(!coll.filter(".jstree-checked, .jstree-undetermined").length) { return false; }

+						coll.removeClass("jstree-checked jstree-undetermined").addClass("jstree-unchecked"); 

+						if(rc) { coll.children(":checkbox").removeAttr("checked"); }

+					}

+					else { 

+						coll = obj.find("li").andSelf();

+						if(!coll.filter(".jstree-unchecked, .jstree-undetermined").length) { return false; }

+						coll.removeClass("jstree-unchecked jstree-undetermined").addClass("jstree-checked"); 

+						if(rc) { coll.children(":checkbox").attr("checked","checked"); }

+						if(this.data.ui) { this.data.ui.last_selected = obj; }

+						this.data.checkbox.last_selected = obj;

+					}

+					obj.parentsUntil(".jstree", "li").each(function () {

+						var $this = $(this);

+						if(state) {

+							if($this.children("ul").children("li.jstree-checked, li.jstree-undetermined").length) {

+								$this.parentsUntil(".jstree", "li").andSelf().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");

+								if(rc) { $this.parentsUntil(".jstree", "li").andSelf().children(":checkbox").removeAttr("checked"); }

+								return false;

+							}

+							else {

+								$this.removeClass("jstree-checked jstree-undetermined").addClass("jstree-unchecked");

+								if(rc) { $this.children(":checkbox").removeAttr("checked"); }

+							}

+						}

+						else {

+							if($this.children("ul").children("li.jstree-unchecked, li.jstree-undetermined").length) {

+								$this.parentsUntil(".jstree", "li").andSelf().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");

+								if(rc) { $this.parentsUntil(".jstree", "li").andSelf().children(":checkbox").removeAttr("checked"); }

+								return false;

+							}

+							else {

+								$this.removeClass("jstree-unchecked jstree-undetermined").addClass("jstree-checked");

+								if(rc) { $this.children(":checkbox").attr("checked","checked"); }

+							}

+						}

+					});

+				}

+				if(this.data.ui && this.data.checkbox.noui) { this.data.ui.selected = this.get_checked(); }

+				this.__callback(obj);

+				return true;

+			},

+			check_node : function (obj) {

+				if(this.change_state(obj, false)) { 

+					obj = this._get_node(obj);

+					if(this._get_settings().checkbox.checked_parent_open) {

+						var t = this;

+						obj.parents(".jstree-closed").each(function () { t.open_node(this, false, true); });

+					}

+					this.__callback({ "obj" : obj }); 

+				}

+			},

+			uncheck_node : function (obj) {

+				if(this.change_state(obj, true)) { this.__callback({ "obj" : this._get_node(obj) }); }

+			},

+			check_all : function () {

+				var _this = this, 

+					coll = this._get_settings().checkbox.two_state ? this.get_container_ul().find("li") : this.get_container_ul().children("li");

+				coll.each(function () {

+					_this.change_state(this, false);

+				});

+				this.__callback();

+			},

+			uncheck_all : function () {

+				var _this = this,

+					coll = this._get_settings().checkbox.two_state ? this.get_container_ul().find("li") : this.get_container_ul().children("li");

+				coll.each(function () {

+					_this.change_state(this, true);

+				});

+				this.__callback();

+			},

+

+			is_checked : function(obj) {

+				obj = this._get_node(obj);

+				return obj.length ? obj.is(".jstree-checked") : false;

+			},

+			get_checked : function (obj, get_all) {

+				obj = !obj || obj === -1 ? this.get_container() : this._get_node(obj);

+				return get_all || this._get_settings().checkbox.two_state ? obj.find(".jstree-checked") : obj.find("> ul > .jstree-checked, .jstree-undetermined > ul > .jstree-checked");

+			},

+			get_unchecked : function (obj, get_all) { 

+				obj = !obj || obj === -1 ? this.get_container() : this._get_node(obj);

+				return get_all || this._get_settings().checkbox.two_state ? obj.find(".jstree-unchecked") : obj.find("> ul > .jstree-unchecked, .jstree-undetermined > ul > .jstree-unchecked");

+			},

+

+			show_checkboxes : function () { this.get_container().children("ul").removeClass("jstree-no-checkboxes"); },

+			hide_checkboxes : function () { this.get_container().children("ul").addClass("jstree-no-checkboxes"); },

+

+			_repair_state : function (obj) {

+				obj = this._get_node(obj);

+				if(!obj.length) { return; }

+				var rc = this._get_settings().checkbox.real_checkboxes,

+					a = obj.find("> ul > .jstree-checked").length,

+					b = obj.find("> ul > .jstree-undetermined").length,

+					c = obj.find("> ul > li").length;

+				if(c === 0) { if(obj.hasClass("jstree-undetermined")) { this.change_state(obj, false); } }

+				else if(a === 0 && b === 0) { this.change_state(obj, true); }

+				else if(a === c) { this.change_state(obj, false); }

+				else { 

+					obj.parentsUntil(".jstree","li").andSelf().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");

+					if(rc) { obj.parentsUntil(".jstree", "li").andSelf().children(":checkbox").removeAttr("checked"); }

+				}

+			},

+			reselect : function () {

+				if(this.data.ui && this.data.checkbox.noui) { 

+					var _this = this,

+						s = this.data.ui.to_select;

+					s = $.map($.makeArray(s), function (n) { return "#" + n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"); });

+					this.deselect_all();

+					$.each(s, function (i, val) { _this.check_node(val); });

+					this.__callback();

+				}

+				else { 

+					this.__call_old(); 

+				}

+			},

+			save_loaded : function () {

+				var _this = this;

+				this.data.core.to_load = [];

+				this.get_container_ul().find("li.jstree-closed.jstree-undetermined").each(function () {

+					if(this.id) { _this.data.core.to_load.push("#" + this.id); }

+				});

+			}

+		}

+	});

+	$(function() {

+		var css_string = '.jstree .jstree-real-checkbox { display:none; } ';

+		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });

+	});

+})(jQuery);

+//*/

+

+/* 

+ * jsTree XML plugin

+ * The XML data store. Datastores are build by overriding the `load_node` and `_is_loaded` functions.

+ */

+(function ($) {

+	$.vakata.xslt = function (xml, xsl, callback) {

+		var rs = "", xm, xs, processor, support;

+		// TODO: IE9 no XSLTProcessor, no document.recalc

+		if(document.recalc) {

+			xm = document.createElement('xml');

+			xs = document.createElement('xml');

+			xm.innerHTML = xml;

+			xs.innerHTML = xsl;

+			$("body").append(xm).append(xs);

+			setTimeout( (function (xm, xs, callback) {

+				return function () {

+					callback.call(null, xm.transformNode(xs.XMLDocument));

+					setTimeout( (function (xm, xs) { return function () { $(xm).remove(); $(xs).remove(); }; })(xm, xs), 200);

+				};

+			})(xm, xs, callback), 100);

+			return true;

+		}

+		if(typeof window.DOMParser !== "undefined" && typeof window.XMLHttpRequest !== "undefined" && typeof window.XSLTProcessor === "undefined") {

+			xml = new DOMParser().parseFromString(xml, "text/xml");

+			xsl = new DOMParser().parseFromString(xsl, "text/xml");

+			// alert(xml.transformNode());

+			// callback.call(null, new XMLSerializer().serializeToString(rs));

+			

+		}

+		if(typeof window.DOMParser !== "undefined" && typeof window.XMLHttpRequest !== "undefined" && typeof window.XSLTProcessor !== "undefined") {

+			processor = new XSLTProcessor();

+			support = $.isFunction(processor.transformDocument) ? (typeof window.XMLSerializer !== "undefined") : true;

+			if(!support) { return false; }

+			xml = new DOMParser().parseFromString(xml, "text/xml");

+			xsl = new DOMParser().parseFromString(xsl, "text/xml");

+			if($.isFunction(processor.transformDocument)) {

+				rs = document.implementation.createDocument("", "", null);

+				processor.transformDocument(xml, xsl, rs, null);

+				callback.call(null, new XMLSerializer().serializeToString(rs));

+				return true;

+			}

+			else {

+				processor.importStylesheet(xsl);

+				rs = processor.transformToFragment(xml, document);

+				callback.call(null, $("<div />").append(rs).html());

+				return true;

+			}

+		}

+		return false;

+	};

+	var xsl = {

+		'nest' : '<' + '?xml version="1.0" encoding="utf-8" ?>' + 

+			'<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >' + 

+			'<xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" standalone="no" indent="no" media-type="text/html" />' + 

+			'<xsl:template match="/">' + 

+			'	<xsl:call-template name="nodes">' + 

+			'		<xsl:with-param name="node" select="/root" />' + 

+			'	</xsl:call-template>' + 

+			'</xsl:template>' + 

+			'<xsl:template name="nodes">' + 

+			'	<xsl:param name="node" />' + 

+			'	<ul>' + 

+			'	<xsl:for-each select="$node/item">' + 

+			'		<xsl:variable name="children" select="count(./item) &gt; 0" />' + 

+			'		<li>' + 

+			'			<xsl:attribute name="class">' + 

+			'				<xsl:if test="position() = last()">jstree-last </xsl:if>' + 

+			'				<xsl:choose>' + 

+			'					<xsl:when test="@state = \'open\'">jstree-open </xsl:when>' + 

+			'					<xsl:when test="$children or @hasChildren or @state = \'closed\'">jstree-closed </xsl:when>' + 

+			'					<xsl:otherwise>jstree-leaf </xsl:otherwise>' + 

+			'				</xsl:choose>' + 

+			'				<xsl:value-of select="@class" />' + 

+			'			</xsl:attribute>' + 

+			'			<xsl:for-each select="@*">' + 

+			'				<xsl:if test="name() != \'class\' and name() != \'state\' and name() != \'hasChildren\'">' + 

+			'					<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>' + 

+			'				</xsl:if>' + 

+			'			</xsl:for-each>' + 

+			'	<ins class="jstree-icon"><xsl:text>&#xa0;</xsl:text></ins>' + 

+			'			<xsl:for-each select="content/name">' + 

+			'				<a>' + 

+			'				<xsl:attribute name="href">' + 

+			'					<xsl:choose>' + 

+			'					<xsl:when test="@href"><xsl:value-of select="@href" /></xsl:when>' + 

+			'					<xsl:otherwise>#</xsl:otherwise>' + 

+			'					</xsl:choose>' + 

+			'				</xsl:attribute>' + 

+			'				<xsl:attribute name="class"><xsl:value-of select="@lang" /> <xsl:value-of select="@class" /></xsl:attribute>' + 

+			'				<xsl:attribute name="style"><xsl:value-of select="@style" /></xsl:attribute>' + 

+			'				<xsl:for-each select="@*">' + 

+			'					<xsl:if test="name() != \'style\' and name() != \'class\' and name() != \'href\'">' + 

+			'						<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>' + 

+			'					</xsl:if>' + 

+			'				</xsl:for-each>' + 

+			'					<ins>' + 

+			'						<xsl:attribute name="class">jstree-icon ' + 

+			'							<xsl:if test="string-length(attribute::icon) > 0 and not(contains(@icon,\'/\'))"><xsl:value-of select="@icon" /></xsl:if>' + 

+			'						</xsl:attribute>' + 

+			'						<xsl:if test="string-length(attribute::icon) > 0 and contains(@icon,\'/\')"><xsl:attribute name="style">background:url(<xsl:value-of select="@icon" />) center center no-repeat;</xsl:attribute></xsl:if>' + 

+			'						<xsl:text>&#xa0;</xsl:text>' + 

+			'					</ins>' + 

+			'					<xsl:copy-of select="./child::node()" />' + 

+			'				</a>' + 

+			'			</xsl:for-each>' + 

+			'			<xsl:if test="$children or @hasChildren"><xsl:call-template name="nodes"><xsl:with-param name="node" select="current()" /></xsl:call-template></xsl:if>' + 

+			'		</li>' + 

+			'	</xsl:for-each>' + 

+			'	</ul>' + 

+			'</xsl:template>' + 

+			'</xsl:stylesheet>',

+

+		'flat' : '<' + '?xml version="1.0" encoding="utf-8" ?>' + 

+			'<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >' + 

+			'<xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" standalone="no" indent="no" media-type="text/xml" />' + 

+			'<xsl:template match="/">' + 

+			'	<ul>' + 

+			'	<xsl:for-each select="//item[not(@parent_id) or @parent_id=0 or not(@parent_id = //item/@id)]">' + /* the last `or` may be removed */

+			'		<xsl:call-template name="nodes">' + 

+			'			<xsl:with-param name="node" select="." />' + 

+			'			<xsl:with-param name="is_last" select="number(position() = last())" />' + 

+			'		</xsl:call-template>' + 

+			'	</xsl:for-each>' + 

+			'	</ul>' + 

+			'</xsl:template>' + 

+			'<xsl:template name="nodes">' + 

+			'	<xsl:param name="node" />' + 

+			'	<xsl:param name="is_last" />' + 

+			'	<xsl:variable name="children" select="count(//item[@parent_id=$node/attribute::id]) &gt; 0" />' + 

+			'	<li>' + 

+			'	<xsl:attribute name="class">' + 

+			'		<xsl:if test="$is_last = true()">jstree-last </xsl:if>' + 

+			'		<xsl:choose>' + 

+			'			<xsl:when test="@state = \'open\'">jstree-open </xsl:when>' + 

+			'			<xsl:when test="$children or @hasChildren or @state = \'closed\'">jstree-closed </xsl:when>' + 

+			'			<xsl:otherwise>jstree-leaf </xsl:otherwise>' + 

+			'		</xsl:choose>' + 

+			'		<xsl:value-of select="@class" />' + 

+			'	</xsl:attribute>' + 

+			'	<xsl:for-each select="@*">' + 

+			'		<xsl:if test="name() != \'parent_id\' and name() != \'hasChildren\' and name() != \'class\' and name() != \'state\'">' + 

+			'		<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>' + 

+			'		</xsl:if>' + 

+			'	</xsl:for-each>' + 

+			'	<ins class="jstree-icon"><xsl:text>&#xa0;</xsl:text></ins>' + 

+			'	<xsl:for-each select="content/name">' + 

+			'		<a>' + 

+			'		<xsl:attribute name="href">' + 

+			'			<xsl:choose>' + 

+			'			<xsl:when test="@href"><xsl:value-of select="@href" /></xsl:when>' + 

+			'			<xsl:otherwise>#</xsl:otherwise>' + 

+			'			</xsl:choose>' + 

+			'		</xsl:attribute>' + 

+			'		<xsl:attribute name="class"><xsl:value-of select="@lang" /> <xsl:value-of select="@class" /></xsl:attribute>' + 

+			'		<xsl:attribute name="style"><xsl:value-of select="@style" /></xsl:attribute>' + 

+			'		<xsl:for-each select="@*">' + 

+			'			<xsl:if test="name() != \'style\' and name() != \'class\' and name() != \'href\'">' + 

+			'				<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>' + 

+			'			</xsl:if>' + 

+			'		</xsl:for-each>' + 

+			'			<ins>' + 

+			'				<xsl:attribute name="class">jstree-icon ' + 

+			'					<xsl:if test="string-length(attribute::icon) > 0 and not(contains(@icon,\'/\'))"><xsl:value-of select="@icon" /></xsl:if>' + 

+			'				</xsl:attribute>' + 

+			'				<xsl:if test="string-length(attribute::icon) > 0 and contains(@icon,\'/\')"><xsl:attribute name="style">background:url(<xsl:value-of select="@icon" />) center center no-repeat;</xsl:attribute></xsl:if>' + 

+			'				<xsl:text>&#xa0;</xsl:text>' + 

+			'			</ins>' + 

+			'			<xsl:copy-of select="./child::node()" />' + 

+			'		</a>' + 

+			'	</xsl:for-each>' + 

+			'	<xsl:if test="$children">' + 

+			'		<ul>' + 

+			'		<xsl:for-each select="//item[@parent_id=$node/attribute::id]">' + 

+			'			<xsl:call-template name="nodes">' + 

+			'				<xsl:with-param name="node" select="." />' + 

+			'				<xsl:with-param name="is_last" select="number(position() = last())" />' + 

+			'			</xsl:call-template>' + 

+			'		</xsl:for-each>' + 

+			'		</ul>' + 

+			'	</xsl:if>' + 

+			'	</li>' + 

+			'</xsl:template>' + 

+			'</xsl:stylesheet>'

+	},

+	escape_xml = function(string) {

+		return string

+			.toString()

+			.replace(/&/g, '&amp;')

+			.replace(/</g, '&lt;')

+			.replace(/>/g, '&gt;')

+			.replace(/"/g, '&quot;')

+			.replace(/'/g, '&apos;');

+	};

+	$.jstree.plugin("xml_data", {

+		defaults : { 

+			data : false,

+			ajax : false,

+			xsl : "flat",

+			clean_node : false,

+			correct_state : true,

+			get_skip_empty : false,

+			get_include_preamble : true

+		},

+		_fn : {

+			load_node : function (obj, s_call, e_call) { var _this = this; this.load_node_xml(obj, function () { _this.__callback({ "obj" : _this._get_node(obj) }); s_call.call(this); }, e_call); },

+			_is_loaded : function (obj) { 

+				var s = this._get_settings().xml_data;

+				obj = this._get_node(obj);

+				return obj == -1 || !obj || (!s.ajax && !$.isFunction(s.data)) || obj.is(".jstree-open, .jstree-leaf") || obj.children("ul").children("li").size() > 0;

+			},

+			load_node_xml : function (obj, s_call, e_call) {

+				var s = this.get_settings().xml_data,

+					error_func = function () {},

+					success_func = function () {};

+

+				obj = this._get_node(obj);

+				if(obj && obj !== -1) {

+					if(obj.data("jstree-is-loading")) { return; }

+					else { obj.data("jstree-is-loading",true); }

+				}

+				switch(!0) {

+					case (!s.data && !s.ajax): throw "Neither data nor ajax settings supplied.";

+					case ($.isFunction(s.data)):

+						s.data.call(this, obj, $.proxy(function (d) {

+							this.parse_xml(d, $.proxy(function (d) {

+								if(d) {

+									d = d.replace(/ ?xmlns="[^"]*"/ig, "");

+									if(d.length > 10) {

+										d = $(d);

+										if(obj === -1 || !obj) { this.get_container().children("ul").empty().append(d.children()); }

+										else { obj.children("a.jstree-loading").removeClass("jstree-loading"); obj.append(d); obj.removeData("jstree-is-loading"); }

+										if(s.clean_node) { this.clean_node(obj); }

+										if(s_call) { s_call.call(this); }

+									}

+									else {

+										if(obj && obj !== -1) { 

+											obj.children("a.jstree-loading").removeClass("jstree-loading");

+											obj.removeData("jstree-is-loading");

+											if(s.correct_state) { 

+												this.correct_state(obj);

+												if(s_call) { s_call.call(this); } 

+											}

+										}

+										else {

+											if(s.correct_state) { 

+												this.get_container().children("ul").empty();

+												if(s_call) { s_call.call(this); } 

+											}

+										}

+									}

+								}

+							}, this));

+						}, this));

+						break;

+					case (!!s.data && !s.ajax) || (!!s.data && !!s.ajax && (!obj || obj === -1)):

+						if(!obj || obj == -1) {

+							this.parse_xml(s.data, $.proxy(function (d) {

+								if(d) {

+									d = d.replace(/ ?xmlns="[^"]*"/ig, "");

+									if(d.length > 10) {

+										d = $(d);

+										this.get_container().children("ul").empty().append(d.children());

+										if(s.clean_node) { this.clean_node(obj); }

+										if(s_call) { s_call.call(this); }

+									}

+								}

+								else { 

+									if(s.correct_state) { 

+										this.get_container().children("ul").empty(); 

+										if(s_call) { s_call.call(this); }

+									}

+								}

+							}, this));

+						}

+						break;

+					case (!s.data && !!s.ajax) || (!!s.data && !!s.ajax && obj && obj !== -1):

+						error_func = function (x, t, e) {

+							var ef = this.get_settings().xml_data.ajax.error; 

+							if(ef) { ef.call(this, x, t, e); }

+							if(obj !== -1 && obj.length) {

+								obj.children("a.jstree-loading").removeClass("jstree-loading");

+								obj.removeData("jstree-is-loading");

+								if(t === "success" && s.correct_state) { this.correct_state(obj); }

+							}

+							else {

+								if(t === "success" && s.correct_state) { this.get_container().children("ul").empty(); }

+							}

+							if(e_call) { e_call.call(this); }

+						};

+						success_func = function (d, t, x) {

+							d = x.responseText;

+							var sf = this.get_settings().xml_data.ajax.success; 

+							if(sf) { d = sf.call(this,d,t,x) || d; }

+							if(d === "" || (d && d.toString && d.toString().replace(/^[\s\n]+$/,"") === "")) {

+								return error_func.call(this, x, t, "");

+							}

+							this.parse_xml(d, $.proxy(function (d) {

+								if(d) {

+									d = d.replace(/ ?xmlns="[^"]*"/ig, "");

+									if(d.length > 10) {

+										d = $(d);

+										if(obj === -1 || !obj) { this.get_container().children("ul").empty().append(d.children()); }

+										else { obj.children("a.jstree-loading").removeClass("jstree-loading"); obj.append(d); obj.removeData("jstree-is-loading"); }

+										if(s.clean_node) { this.clean_node(obj); }

+										if(s_call) { s_call.call(this); }

+									}

+									else {

+										if(obj && obj !== -1) { 

+											obj.children("a.jstree-loading").removeClass("jstree-loading");

+											obj.removeData("jstree-is-loading");

+											if(s.correct_state) { 

+												this.correct_state(obj);

+												if(s_call) { s_call.call(this); } 

+											}

+										}

+										else {

+											if(s.correct_state) { 

+												this.get_container().children("ul").empty();

+												if(s_call) { s_call.call(this); } 

+											}

+										}

+									}

+								}

+							}, this));

+						};

+						s.ajax.context = this;

+						s.ajax.error = error_func;

+						s.ajax.success = success_func;

+						if(!s.ajax.dataType) { s.ajax.dataType = "xml"; }

+						if($.isFunction(s.ajax.url)) { s.ajax.url = s.ajax.url.call(this, obj); }

+						if($.isFunction(s.ajax.data)) { s.ajax.data = s.ajax.data.call(this, obj); }

+						$.ajax(s.ajax);

+						break;

+				}

+			},

+			parse_xml : function (xml, callback) {

+				var s = this._get_settings().xml_data;

+				$.vakata.xslt(xml, xsl[s.xsl], callback);

+			},

+			get_xml : function (tp, obj, li_attr, a_attr, is_callback) {

+				var result = "", 

+					s = this._get_settings(), 

+					_this = this,

+					tmp1, tmp2, li, a, lang;

+				if(!tp) { tp = "flat"; }

+				if(!is_callback) { is_callback = 0; }

+				obj = this._get_node(obj);

+				if(!obj || obj === -1) { obj = this.get_container().find("> ul > li"); }

+				li_attr = $.isArray(li_attr) ? li_attr : [ "id", "class" ];

+				if(!is_callback && this.data.types && $.inArray(s.types.type_attr, li_attr) === -1) { li_attr.push(s.types.type_attr); }

+

+				a_attr = $.isArray(a_attr) ? a_attr : [ ];

+

+				if(!is_callback) { 

+					if(s.xml_data.get_include_preamble) { 

+						result += '<' + '?xml version="1.0" encoding="UTF-8"?' + '>'; 

+					}

+					result += "<root>"; 

+				}

+				obj.each(function () {

+					result += "<item";

+					li = $(this);

+					$.each(li_attr, function (i, v) { 

+						var t = li.attr(v);

+						if(!s.xml_data.get_skip_empty || typeof t !== "undefined") {

+							result += " " + v + "=\"" + escape_xml((" " + (t || "")).replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"")) + "\""; 

+						}

+					});

+					if(li.hasClass("jstree-open")) { result += " state=\"open\""; }

+					if(li.hasClass("jstree-closed")) { result += " state=\"closed\""; }

+					if(tp === "flat") { result += " parent_id=\"" + escape_xml(is_callback) + "\""; }

+					result += ">";

+					result += "<content>";

+					a = li.children("a");

+					a.each(function () {

+						tmp1 = $(this);

+						lang = false;

+						result += "<name";

+						if($.inArray("languages", s.plugins) !== -1) {

+							$.each(s.languages, function (k, z) {

+								if(tmp1.hasClass(z)) { result += " lang=\"" + escape_xml(z) + "\""; lang = z; return false; }

+							});

+						}

+						if(a_attr.length) { 

+							$.each(a_attr, function (k, z) {

+								var t = tmp1.attr(z);

+								if(!s.xml_data.get_skip_empty || typeof t !== "undefined") {

+									result += " " + z + "=\"" + escape_xml((" " + t || "").replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"")) + "\"";

+								}

+							});

+						}

+						if(tmp1.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/^\s+$/ig,"").length) {

+							result += ' icon="' + escape_xml(tmp1.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"")) + '"';

+						}

+						if(tmp1.children("ins").get(0).style.backgroundImage.length) {

+							result += ' icon="' + escape_xml(tmp1.children("ins").get(0).style.backgroundImage.replace("url(","").replace(")","").replace(/'/ig,"").replace(/"/ig,"")) + '"';

+						}

+						result += ">";

+						result += "<![CDATA[" + _this.get_text(tmp1, lang) + "]]>";

+						result += "</name>";

+					});

+					result += "</content>";

+					tmp2 = li[0].id || true;

+					li = li.find("> ul > li");

+					if(li.length) { tmp2 = _this.get_xml(tp, li, li_attr, a_attr, tmp2); }

+					else { tmp2 = ""; }

+					if(tp == "nest") { result += tmp2; }

+					result += "</item>";

+					if(tp == "flat") { result += tmp2; }

+				});

+				if(!is_callback) { result += "</root>"; }

+				return result;

+			}

+		}

+	});

+})(jQuery);

+//*/

+

+/*

+ * jsTree search plugin

+ * Enables both sync and async search on the tree

+ * DOES NOT WORK WITH JSON PROGRESSIVE RENDER

+ */

+(function ($) {

+	$.expr[':'].jstree_contains = function(a,i,m){

+		return (a.textContent || a.innerText || "").toLowerCase().indexOf(m[3].toLowerCase())>=0;

+	};

+	$.expr[':'].jstree_title_contains = function(a,i,m) {

+		return (a.getAttribute("title") || "").toLowerCase().indexOf(m[3].toLowerCase())>=0;

+	};

+	$.jstree.plugin("search", {

+		__init : function () {

+			this.data.search.str = "";

+			this.data.search.result = $();

+			if(this._get_settings().search.show_only_matches) {

+				this.get_container()

+					.bind("search.jstree", function (e, data) {

+						$(this).children("ul").find("li").hide().removeClass("jstree-last");

+						data.rslt.nodes.parentsUntil(".jstree").andSelf().show()

+							.filter("ul").each(function () { $(this).children("li:visible").eq(-1).addClass("jstree-last"); });

+					})

+					.bind("clear_search.jstree", function () {

+						$(this).children("ul").find("li").css("display","").end().end().jstree("clean_node", -1);

+					});

+			}

+		},

+		defaults : {

+			ajax : false,

+			search_method : "jstree_contains", // for case insensitive - jstree_contains

+			show_only_matches : false

+		},

+		_fn : {

+			search : function (str, skip_async) {

+				if($.trim(str) === "") { this.clear_search(); return; }

+				var s = this.get_settings().search, 

+					t = this,

+					error_func = function () { },

+					success_func = function () { };

+				this.data.search.str = str;

+

+				if(!skip_async && s.ajax !== false && this.get_container_ul().find("li.jstree-closed:not(:has(ul)):eq(0)").length > 0) {

+					this.search.supress_callback = true;

+					error_func = function () { };

+					success_func = function (d, t, x) {

+						var sf = this.get_settings().search.ajax.success; 

+						if(sf) { d = sf.call(this,d,t,x) || d; }

+						this.data.search.to_open = d;

+						this._search_open();

+					};

+					s.ajax.context = this;

+					s.ajax.error = error_func;

+					s.ajax.success = success_func;

+					if($.isFunction(s.ajax.url)) { s.ajax.url = s.ajax.url.call(this, str); }

+					if($.isFunction(s.ajax.data)) { s.ajax.data = s.ajax.data.call(this, str); }

+					if(!s.ajax.data) { s.ajax.data = { "search_string" : str }; }

+					if(!s.ajax.dataType || /^json/.exec(s.ajax.dataType)) { s.ajax.dataType = "json"; }

+					$.ajax(s.ajax);

+					return;

+				}

+				if(this.data.search.result.length) { this.clear_search(); }

+				this.data.search.result = this.get_container().find("a" + (this.data.languages ? "." + this.get_lang() : "" ) + ":" + (s.search_method) + "(" + this.data.search.str + ")");

+				this.data.search.result.addClass("jstree-search").parent().parents(".jstree-closed").each(function () {

+					t.open_node(this, false, true);

+				});

+				this.__callback({ nodes : this.data.search.result, str : str });

+			},

+			clear_search : function (str) {

+				this.data.search.result.removeClass("jstree-search");

+				this.__callback(this.data.search.result);

+				this.data.search.result = $();

+			},

+			_search_open : function (is_callback) {

+				var _this = this,

+					done = true,

+					current = [],

+					remaining = [];

+				if(this.data.search.to_open.length) {

+					$.each(this.data.search.to_open, function (i, val) {

+						if(val == "#") { return true; }

+						if($(val).length && $(val).is(".jstree-closed")) { current.push(val); }

+						else { remaining.push(val); }

+					});

+					if(current.length) {

+						this.data.search.to_open = remaining;

+						$.each(current, function (i, val) { 

+							_this.open_node(val, function () { _this._search_open(true); }); 

+						});

+						done = false;

+					}

+				}

+				if(done) { this.search(this.data.search.str, true); }

+			}

+		}

+	});

+})(jQuery);

+//*/

+

+/* 

+ * jsTree contextmenu plugin

+ */

+(function ($) {

+	$.vakata.context = {

+		hide_on_mouseleave : false,

+

+		cnt		: $("<div id='vakata-contextmenu' />"),

+		vis		: false,

+		tgt		: false,

+		par		: false,

+		func	: false,

+		data	: false,

+		rtl		: false,

+		show	: function (s, t, x, y, d, p, rtl) {

+			$.vakata.context.rtl = !!rtl;

+			var html = $.vakata.context.parse(s), h, w;

+			if(!html) { return; }

+			$.vakata.context.vis = true;

+			$.vakata.context.tgt = t;

+			$.vakata.context.par = p || t || null;

+			$.vakata.context.data = d || null;

+			$.vakata.context.cnt

+				.html(html)

+				.css({ "visibility" : "hidden", "display" : "block", "left" : 0, "top" : 0 });

+

+			if($.vakata.context.hide_on_mouseleave) {

+				$.vakata.context.cnt

+					.one("mouseleave", function(e) { $.vakata.context.hide(); });

+			}

+

+			h = $.vakata.context.cnt.height();

+			w = $.vakata.context.cnt.width();

+			if(x + w > $(document).width()) { 

+				x = $(document).width() - (w + 5); 

+				$.vakata.context.cnt.find("li > ul").addClass("right"); 

+			}

+			if(y + h > $(document).height()) { 

+				y = y - (h + t[0].offsetHeight); 

+				$.vakata.context.cnt.find("li > ul").addClass("bottom"); 

+			}

+

+			$.vakata.context.cnt

+				.css({ "left" : x, "top" : y })

+				.find("li:has(ul)")

+					.bind("mouseenter", function (e) { 

+						var w = $(document).width(),

+							h = $(document).height(),

+							ul = $(this).children("ul").show(); 

+						if(w !== $(document).width()) { ul.toggleClass("right"); }

+						if(h !== $(document).height()) { ul.toggleClass("bottom"); }

+					})

+					.bind("mouseleave", function (e) { 

+						$(this).children("ul").hide(); 

+					})

+					.end()

+				.css({ "visibility" : "visible" })

+				.show();

+			$(document).triggerHandler("context_show.vakata");

+		},

+		hide	: function () {

+			$.vakata.context.vis = false;

+			$.vakata.context.cnt.attr("class","").css({ "visibility" : "hidden" });

+			$(document).triggerHandler("context_hide.vakata");

+		},

+		parse	: function (s, is_callback) {

+			if(!s) { return false; }

+			var str = "",

+				tmp = false,

+				was_sep = true;

+			if(!is_callback) { $.vakata.context.func = {}; }

+			str += "<ul>";

+			$.each(s, function (i, val) {

+				if(!val) { return true; }

+				$.vakata.context.func[i] = val.action;

+				if(!was_sep && val.separator_before) {

+					str += "<li class='vakata-separator vakata-separator-before'></li>";

+				}

+				was_sep = false;

+				str += "<li class='" + (val._class || "") + (val._disabled ? " jstree-contextmenu-disabled " : "") + "'><ins ";

+				if(val.icon && val.icon.indexOf("/") === -1) { str += " class='" + val.icon + "' "; }

+				if(val.icon && val.icon.indexOf("/") !== -1) { str += " style='background:url(" + val.icon + ") center center no-repeat;' "; }

+				str += ">&#160;</ins><a href='#' rel='" + i + "'>";

+				if(val.submenu) {

+					str += "<span style='float:" + ($.vakata.context.rtl ? "left" : "right") + ";'>&raquo;</span>";

+				}

+				str += val.label + "</a>";

+				if(val.submenu) {

+					tmp = $.vakata.context.parse(val.submenu, true);

+					if(tmp) { str += tmp; }

+				}

+				str += "</li>";

+				if(val.separator_after) {

+					str += "<li class='vakata-separator vakata-separator-after'></li>";

+					was_sep = true;

+				}

+			});

+			str = str.replace(/<li class\='vakata-separator vakata-separator-after'\><\/li\>$/,"");

+			str += "</ul>";

+			$(document).triggerHandler("context_parse.vakata");

+			return str.length > 10 ? str : false;

+		},

+		exec	: function (i) {

+			if($.isFunction($.vakata.context.func[i])) {

+				// if is string - eval and call it!

+				$.vakata.context.func[i].call($.vakata.context.data, $.vakata.context.par);

+				return true;

+			}

+			else { return false; }

+		}

+	};

+	$(function () {

+		var css_string = '' + 

+			'#vakata-contextmenu { display:block; visibility:hidden; left:0; top:-200px; position:absolute; margin:0; padding:0; min-width:180px; background:#ebebeb; border:1px solid silver; z-index:10000; *width:180px; } ' + 

+			'#vakata-contextmenu ul { min-width:180px; *width:180px; } ' + 

+			'#vakata-contextmenu ul, #vakata-contextmenu li { margin:0; padding:0; list-style-type:none; display:block; } ' + 

+			'#vakata-contextmenu li { line-height:20px; min-height:20px; position:relative; padding:0px; } ' + 

+			'#vakata-contextmenu li a { padding:1px 6px; line-height:17px; display:block; text-decoration:none; margin:1px 1px 0 1px; } ' + 

+			'#vakata-contextmenu li ins { float:left; width:16px; height:16px; text-decoration:none; margin-right:2px; } ' + 

+			'#vakata-contextmenu li a:hover, #vakata-contextmenu li.vakata-hover > a { background:gray; color:white; } ' + 

+			'#vakata-contextmenu li ul { display:none; position:absolute; top:-2px; left:100%; background:#ebebeb; border:1px solid gray; } ' + 

+			'#vakata-contextmenu .right { right:100%; left:auto; } ' + 

+			'#vakata-contextmenu .bottom { bottom:-1px; top:auto; } ' + 

+			'#vakata-contextmenu li.vakata-separator { min-height:0; height:1px; line-height:1px; font-size:1px; overflow:hidden; margin:0 2px; background:silver; /* border-top:1px solid #fefefe; */ padding:0; } ';

+		$.vakata.css.add_sheet({ str : css_string, title : "vakata" });

+		$.vakata.context.cnt

+			.delegate("a","click", function (e) { e.preventDefault(); })

+			.delegate("a","mouseup", function (e) {

+				if(!$(this).parent().hasClass("jstree-contextmenu-disabled") && $.vakata.context.exec($(this).attr("rel"))) {

+					$.vakata.context.hide();

+				}

+				else { $(this).blur(); }

+			})

+			.delegate("a","mouseover", function () {

+				$.vakata.context.cnt.find(".vakata-hover").removeClass("vakata-hover");

+			})

+			.appendTo("body");

+		$(document).bind("mousedown", function (e) { if($.vakata.context.vis && !$.contains($.vakata.context.cnt[0], e.target)) { $.vakata.context.hide(); } });

+		if(typeof $.hotkeys !== "undefined") {

+			$(document)

+				.bind("keydown", "up", function (e) { 

+					if($.vakata.context.vis) { 

+						var o = $.vakata.context.cnt.find("ul:visible").last().children(".vakata-hover").removeClass("vakata-hover").prevAll("li:not(.vakata-separator)").first();

+						if(!o.length) { o = $.vakata.context.cnt.find("ul:visible").last().children("li:not(.vakata-separator)").last(); }

+						o.addClass("vakata-hover");

+						e.stopImmediatePropagation(); 

+						e.preventDefault();

+					} 

+				})

+				.bind("keydown", "down", function (e) { 

+					if($.vakata.context.vis) { 

+						var o = $.vakata.context.cnt.find("ul:visible").last().children(".vakata-hover").removeClass("vakata-hover").nextAll("li:not(.vakata-separator)").first();

+						if(!o.length) { o = $.vakata.context.cnt.find("ul:visible").last().children("li:not(.vakata-separator)").first(); }

+						o.addClass("vakata-hover");

+						e.stopImmediatePropagation(); 

+						e.preventDefault();

+					} 

+				})

+				.bind("keydown", "right", function (e) { 

+					if($.vakata.context.vis) { 

+						$.vakata.context.cnt.find(".vakata-hover").children("ul").show().children("li:not(.vakata-separator)").removeClass("vakata-hover").first().addClass("vakata-hover");

+						e.stopImmediatePropagation(); 

+						e.preventDefault();

+					} 

+				})

+				.bind("keydown", "left", function (e) { 

+					if($.vakata.context.vis) { 

+						$.vakata.context.cnt.find(".vakata-hover").children("ul").hide().children(".vakata-separator").removeClass("vakata-hover");

+						e.stopImmediatePropagation(); 

+						e.preventDefault();

+					} 

+				})

+				.bind("keydown", "esc", function (e) { 

+					$.vakata.context.hide(); 

+					e.preventDefault();

+				})

+				.bind("keydown", "space", function (e) { 

+					$.vakata.context.cnt.find(".vakata-hover").last().children("a").click();

+					e.preventDefault();

+				});

+		}

+	});

+

+	$.jstree.plugin("contextmenu", {

+		__init : function () {

+			this.get_container()

+				.delegate("a", "contextmenu.jstree", $.proxy(function (e) {

+						e.preventDefault();

+						if(!$(e.currentTarget).hasClass("jstree-loading")) {

+							this.show_contextmenu(e.currentTarget, e.pageX, e.pageY);

+						}

+					}, this))

+				.delegate("a", "click.jstree", $.proxy(function (e) {

+						if(this.data.contextmenu) {

+							$.vakata.context.hide();

+						}

+					}, this))

+				.bind("destroy.jstree", $.proxy(function () {

+						// TODO: move this to descruct method

+						if(this.data.contextmenu) {

+							$.vakata.context.hide();

+						}

+					}, this));

+			$(document).bind("context_hide.vakata", $.proxy(function () { this.data.contextmenu = false; }, this));

+		},

+		defaults : { 

+			select_node : false, // requires UI plugin

+			show_at_node : true,

+			items : { // Could be a function that should return an object like this one

+				"create" : {

+					"separator_before"	: false,

+					"separator_after"	: true,

+					"label"				: "Create",

+					"action"			: function (obj) { this.create(obj); }

+				},

+				"rename" : {

+					"separator_before"	: false,

+					"separator_after"	: false,

+					"label"				: "Rename",

+					"action"			: function (obj) { this.rename(obj); }

+				},

+				"remove" : {

+					"separator_before"	: false,

+					"icon"				: false,

+					"separator_after"	: false,

+					"label"				: "Delete",

+					"action"			: function (obj) { if(this.is_selected(obj)) { this.remove(); } else { this.remove(obj); } }

+				},

+				"ccp" : {

+					"separator_before"	: true,

+					"icon"				: false,

+					"separator_after"	: false,

+					"label"				: "Edit",

+					"action"			: false,

+					"submenu" : { 

+						"cut" : {

+							"separator_before"	: false,

+							"separator_after"	: false,

+							"label"				: "Cut",

+							"action"			: function (obj) { this.cut(obj); }

+						},

+						"copy" : {

+							"separator_before"	: false,

+							"icon"				: false,

+							"separator_after"	: false,

+							"label"				: "Copy",

+							"action"			: function (obj) { this.copy(obj); }

+						},

+						"paste" : {

+							"separator_before"	: false,

+							"icon"				: false,

+							"separator_after"	: false,

+							"label"				: "Paste",

+							"action"			: function (obj) { this.paste(obj); }

+						}

+					}

+				}

+			}

+		},

+		_fn : {

+			show_contextmenu : function (obj, x, y) {

+				obj = this._get_node(obj);

+				var s = this.get_settings().contextmenu,

+					a = obj.children("a:visible:eq(0)"),

+					o = false,

+					i = false;

+				if(s.select_node && this.data.ui && !this.is_selected(obj)) {

+					this.deselect_all();

+					this.select_node(obj, true);

+				}

+				if(s.show_at_node || typeof x === "undefined" || typeof y === "undefined") {

+					o = a.offset();

+					x = o.left;

+					y = o.top + this.data.core.li_height;

+				}

+				i = obj.data("jstree") && obj.data("jstree").contextmenu ? obj.data("jstree").contextmenu : s.items;

+				if($.isFunction(i)) { i = i.call(this, obj); }

+				this.data.contextmenu = true;

+				$.vakata.context.show(i, a, x, y, this, obj, this._get_settings().core.rtl);

+				if(this.data.themes) { $.vakata.context.cnt.attr("class", "jstree-" + this.data.themes.theme + "-context"); }

+			}

+		}

+	});

+})(jQuery);

+//*/

+

+/* 

+ * jsTree types plugin

+ * Adds support types of nodes

+ * You can set an attribute on each li node, that represents its type.

+ * According to the type setting the node may get custom icon/validation rules

+ */

+(function ($) {

+	$.jstree.plugin("types", {

+		__init : function () {

+			var s = this._get_settings().types;

+			this.data.types.attach_to = [];

+			this.get_container()

+				.bind("init.jstree", $.proxy(function () { 

+						var types = s.types, 

+							attr  = s.type_attr, 

+							icons_css = "", 

+							_this = this;

+

+						$.each(types, function (i, tp) {

+							$.each(tp, function (k, v) { 

+								if(!/^(max_depth|max_children|icon|valid_children)$/.test(k)) { _this.data.types.attach_to.push(k); }

+							});

+							if(!tp.icon) { return true; }

+							if( tp.icon.image || tp.icon.position) {

+								if(i == "default")	{ icons_css += '.jstree-' + _this.get_index() + ' a > .jstree-icon { '; }

+								else				{ icons_css += '.jstree-' + _this.get_index() + ' li[' + attr + '="' + i + '"] > a > .jstree-icon { '; }

+								if(tp.icon.image)	{ icons_css += ' background-image:url(' + tp.icon.image + '); '; }

+								if(tp.icon.position){ icons_css += ' background-position:' + tp.icon.position + '; '; }

+								else				{ icons_css += ' background-position:0 0; '; }

+								icons_css += '} ';

+							}

+						});

+						if(icons_css !== "") { $.vakata.css.add_sheet({ 'str' : icons_css, title : "jstree-types" }); }

+					}, this))

+				.bind("before.jstree", $.proxy(function (e, data) { 

+						var s, t, 

+							o = this._get_settings().types.use_data ? this._get_node(data.args[0]) : false, 

+							d = o && o !== -1 && o.length ? o.data("jstree") : false;

+						if(d && d.types && d.types[data.func] === false) { e.stopImmediatePropagation(); return false; }

+						if($.inArray(data.func, this.data.types.attach_to) !== -1) {

+							if(!data.args[0] || (!data.args[0].tagName && !data.args[0].jquery)) { return; }

+							s = this._get_settings().types.types;

+							t = this._get_type(data.args[0]);

+							if(

+								( 

+									(s[t] && typeof s[t][data.func] !== "undefined") || 

+									(s["default"] && typeof s["default"][data.func] !== "undefined") 

+								) && this._check(data.func, data.args[0]) === false

+							) {

+								e.stopImmediatePropagation();

+								return false;

+							}

+						}

+					}, this));

+			if(is_ie6) {

+				this.get_container()

+					.bind("load_node.jstree set_type.jstree", $.proxy(function (e, data) {

+							var r = data && data.rslt && data.rslt.obj && data.rslt.obj !== -1 ? this._get_node(data.rslt.obj).parent() : this.get_container_ul(),

+								c = false,

+								s = this._get_settings().types;

+							$.each(s.types, function (i, tp) {

+								if(tp.icon && (tp.icon.image || tp.icon.position)) {

+									c = i === "default" ? r.find("li > a > .jstree-icon") : r.find("li[" + s.type_attr + "='" + i + "'] > a > .jstree-icon");

+									if(tp.icon.image) { c.css("backgroundImage","url(" + tp.icon.image + ")"); }

+									c.css("backgroundPosition", tp.icon.position || "0 0");

+								}

+							});

+						}, this));

+			}

+		},

+		defaults : {

+			// defines maximum number of root nodes (-1 means unlimited, -2 means disable max_children checking)

+			max_children		: -1,

+			// defines the maximum depth of the tree (-1 means unlimited, -2 means disable max_depth checking)

+			max_depth			: -1,

+			// defines valid node types for the root nodes

+			valid_children		: "all",

+

+			// whether to use $.data

+			use_data : false, 

+			// where is the type stores (the rel attribute of the LI element)

+			type_attr : "rel",

+			// a list of types

+			types : {

+				// the default type

+				"default" : {

+					"max_children"	: -1,

+					"max_depth"		: -1,

+					"valid_children": "all"

+

+					// Bound functions - you can bind any other function here (using boolean or function)

+					//"select_node"	: true

+				}

+			}

+		},

+		_fn : {

+			_types_notify : function (n, data) {

+				if(data.type && this._get_settings().types.use_data) {

+					this.set_type(data.type, n);

+				}

+			},

+			_get_type : function (obj) {

+				obj = this._get_node(obj);

+				return (!obj || !obj.length) ? false : obj.attr(this._get_settings().types.type_attr) || "default";

+			},

+			set_type : function (str, obj) {

+				obj = this._get_node(obj);

+				var ret = (!obj.length || !str) ? false : obj.attr(this._get_settings().types.type_attr, str);

+				if(ret) { this.__callback({ obj : obj, type : str}); }

+				return ret;

+			},

+			_check : function (rule, obj, opts) {

+				obj = this._get_node(obj);

+				var v = false, t = this._get_type(obj), d = 0, _this = this, s = this._get_settings().types, data = false;

+				if(obj === -1) { 

+					if(!!s[rule]) { v = s[rule]; }

+					else { return; }

+				}

+				else {

+					if(t === false) { return; }

+					data = s.use_data ? obj.data("jstree") : false;

+					if(data && data.types && typeof data.types[rule] !== "undefined") { v = data.types[rule]; }

+					else if(!!s.types[t] && typeof s.types[t][rule] !== "undefined") { v = s.types[t][rule]; }

+					else if(!!s.types["default"] && typeof s.types["default"][rule] !== "undefined") { v = s.types["default"][rule]; }

+				}

+				if($.isFunction(v)) { v = v.call(this, obj); }

+				if(rule === "max_depth" && obj !== -1 && opts !== false && s.max_depth !== -2 && v !== 0) {

+					// also include the node itself - otherwise if root node it is not checked

+					obj.children("a:eq(0)").parentsUntil(".jstree","li").each(function (i) {

+						// check if current depth already exceeds global tree depth

+						if(s.max_depth !== -1 && s.max_depth - (i + 1) <= 0) { v = 0; return false; }

+						d = (i === 0) ? v : _this._check(rule, this, false);

+						// check if current node max depth is already matched or exceeded

+						if(d !== -1 && d - (i + 1) <= 0) { v = 0; return false; }

+						// otherwise - set the max depth to the current value minus current depth

+						if(d >= 0 && (d - (i + 1) < v || v < 0) ) { v = d - (i + 1); }

+						// if the global tree depth exists and it minus the nodes calculated so far is less than `v` or `v` is unlimited

+						if(s.max_depth >= 0 && (s.max_depth - (i + 1) < v || v < 0) ) { v = s.max_depth - (i + 1); }

+					});

+				}

+				return v;

+			},

+			check_move : function () {

+				if(!this.__call_old()) { return false; }

+				var m  = this._get_move(),

+					s  = m.rt._get_settings().types,

+					mc = m.rt._check("max_children", m.cr),

+					md = m.rt._check("max_depth", m.cr),

+					vc = m.rt._check("valid_children", m.cr),

+					ch = 0, d = 1, t;

+

+				if(vc === "none") { return false; } 

+				if($.isArray(vc) && m.ot && m.ot._get_type) {

+					m.o.each(function () {

+						if($.inArray(m.ot._get_type(this), vc) === -1) { d = false; return false; }

+					});

+					if(d === false) { return false; }

+				}

+				if(s.max_children !== -2 && mc !== -1) {

+					ch = m.cr === -1 ? this.get_container().find("> ul > li").not(m.o).length : m.cr.find("> ul > li").not(m.o).length;

+					if(ch + m.o.length > mc) { return false; }

+				}

+				if(s.max_depth !== -2 && md !== -1) {

+					d = 0;

+					if(md === 0) { return false; }

+					if(typeof m.o.d === "undefined") {

+						// TODO: deal with progressive rendering and async when checking max_depth (how to know the depth of the moved node)

+						t = m.o;

+						while(t.length > 0) {

+							t = t.find("> ul > li");

+							d ++;

+						}

+						m.o.d = d;

+					}

+					if(md - m.o.d < 0) { return false; }

+				}

+				return true;

+			},

+			create_node : function (obj, position, js, callback, is_loaded, skip_check) {

+				if(!skip_check && (is_loaded || this._is_loaded(obj))) {

+					var p  = (typeof position == "string" && position.match(/^before|after$/i) && obj !== -1) ? this._get_parent(obj) : this._get_node(obj),

+						s  = this._get_settings().types,

+						mc = this._check("max_children", p),

+						md = this._check("max_depth", p),

+						vc = this._check("valid_children", p),

+						ch;

+					if(typeof js === "string") { js = { data : js }; }

+					if(!js) { js = {}; }

+					if(vc === "none") { return false; } 

+					if($.isArray(vc)) {

+						if(!js.attr || !js.attr[s.type_attr]) { 

+							if(!js.attr) { js.attr = {}; }

+							js.attr[s.type_attr] = vc[0]; 

+						}

+						else {

+							if($.inArray(js.attr[s.type_attr], vc) === -1) { return false; }

+						}

+					}

+					if(s.max_children !== -2 && mc !== -1) {

+						ch = p === -1 ? this.get_container().find("> ul > li").length : p.find("> ul > li").length;

+						if(ch + 1 > mc) { return false; }

+					}

+					if(s.max_depth !== -2 && md !== -1 && (md - 1) < 0) { return false; }

+				}

+				return this.__call_old(true, obj, position, js, callback, is_loaded, skip_check);

+			}

+		}

+	});

+})(jQuery);

+//*/

+

+/* 

+ * jsTree HTML plugin

+ * The HTML data store. Datastores are build by replacing the `load_node` and `_is_loaded` functions.

+ */

+(function ($) {

+	$.jstree.plugin("html_data", {

+		__init : function () { 

+			// this used to use html() and clean the whitespace, but this way any attached data was lost

+			this.data.html_data.original_container_html = this.get_container().find(" > ul > li").clone(true);

+			// remove white space from LI node - otherwise nodes appear a bit to the right

+			this.data.html_data.original_container_html.find("li").andSelf().contents().filter(function() { return this.nodeType == 3; }).remove();

+		},

+		defaults : { 

+			data : false,

+			ajax : false,

+			correct_state : true

+		},

+		_fn : {

+			load_node : function (obj, s_call, e_call) { var _this = this; this.load_node_html(obj, function () { _this.__callback({ "obj" : _this._get_node(obj) }); s_call.call(this); }, e_call); },

+			_is_loaded : function (obj) { 

+				obj = this._get_node(obj); 

+				return obj == -1 || !obj || (!this._get_settings().html_data.ajax && !$.isFunction(this._get_settings().html_data.data)) || obj.is(".jstree-open, .jstree-leaf") || obj.children("ul").children("li").size() > 0;

+			},

+			load_node_html : function (obj, s_call, e_call) {

+				var d,

+					s = this.get_settings().html_data,

+					error_func = function () {},

+					success_func = function () {};

+				obj = this._get_node(obj);

+				if(obj && obj !== -1) {

+					if(obj.data("jstree-is-loading")) { return; }

+					else { obj.data("jstree-is-loading",true); }

+				}

+				switch(!0) {

+					case ($.isFunction(s.data)):

+						s.data.call(this, obj, $.proxy(function (d) {

+							if(d && d !== "" && d.toString && d.toString().replace(/^[\s\n]+$/,"") !== "") {

+								d = $(d);

+								if(!d.is("ul")) { d = $("<ul />").append(d); }

+								if(obj == -1 || !obj) { this.get_container().children("ul").empty().append(d.children()).find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon"); }

+								else { obj.children("a.jstree-loading").removeClass("jstree-loading"); obj.append(d).children("ul").find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon"); obj.removeData("jstree-is-loading"); }

+								this.clean_node(obj);

+								if(s_call) { s_call.call(this); }

+							}

+							else {

+								if(obj && obj !== -1) {

+									obj.children("a.jstree-loading").removeClass("jstree-loading");

+									obj.removeData("jstree-is-loading");

+									if(s.correct_state) { 

+										this.correct_state(obj);

+										if(s_call) { s_call.call(this); } 

+									}

+								}

+								else {

+									if(s.correct_state) { 

+										this.get_container().children("ul").empty();

+										if(s_call) { s_call.call(this); } 

+									}

+								}

+							}

+						}, this));

+						break;

+					case (!s.data && !s.ajax):

+						if(!obj || obj == -1) {

+							this.get_container()

+								.children("ul").empty()

+								.append(this.data.html_data.original_container_html)

+								.find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end()

+								.filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");

+							this.clean_node();

+						}

+						if(s_call) { s_call.call(this); }

+						break;

+					case (!!s.data && !s.ajax) || (!!s.data && !!s.ajax && (!obj || obj === -1)):

+						if(!obj || obj == -1) {

+							d = $(s.data);

+							if(!d.is("ul")) { d = $("<ul />").append(d); }

+							this.get_container()

+								.children("ul").empty().append(d.children())

+								.find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end()

+								.filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");

+							this.clean_node();

+						}

+						if(s_call) { s_call.call(this); }

+						break;

+					case (!s.data && !!s.ajax) || (!!s.data && !!s.ajax && obj && obj !== -1):

+						obj = this._get_node(obj);

+						error_func = function (x, t, e) {

+							var ef = this.get_settings().html_data.ajax.error; 

+							if(ef) { ef.call(this, x, t, e); }

+							if(obj != -1 && obj.length) {

+								obj.children("a.jstree-loading").removeClass("jstree-loading");

+								obj.removeData("jstree-is-loading");

+								if(t === "success" && s.correct_state) { this.correct_state(obj); }

+							}

+							else {

+								if(t === "success" && s.correct_state) { this.get_container().children("ul").empty(); }

+							}

+							if(e_call) { e_call.call(this); }

+						};

+						success_func = function (d, t, x) {

+							var sf = this.get_settings().html_data.ajax.success; 

+							if(sf) { d = sf.call(this,d,t,x) || d; }

+							if(d === "" || (d && d.toString && d.toString().replace(/^[\s\n]+$/,"") === "")) {

+								return error_func.call(this, x, t, "");

+							}

+							if(d) {

+								d = $(d);

+								if(!d.is("ul")) { d = $("<ul />").append(d); }

+								if(obj == -1 || !obj) { this.get_container().children("ul").empty().append(d.children()).find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon"); }

+								else { obj.children("a.jstree-loading").removeClass("jstree-loading"); obj.append(d).children("ul").find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon"); obj.removeData("jstree-is-loading"); }

+								this.clean_node(obj);

+								if(s_call) { s_call.call(this); }

+							}

+							else {

+								if(obj && obj !== -1) {

+									obj.children("a.jstree-loading").removeClass("jstree-loading");

+									obj.removeData("jstree-is-loading");

+									if(s.correct_state) { 

+										this.correct_state(obj);

+										if(s_call) { s_call.call(this); } 

+									}

+								}

+								else {

+									if(s.correct_state) { 

+										this.get_container().children("ul").empty();

+										if(s_call) { s_call.call(this); } 

+									}

+								}

+							}

+						};

+						s.ajax.context = this;

+						s.ajax.error = error_func;

+						s.ajax.success = success_func;

+						if(!s.ajax.dataType) { s.ajax.dataType = "html"; }

+						if($.isFunction(s.ajax.url)) { s.ajax.url = s.ajax.url.call(this, obj); }

+						if($.isFunction(s.ajax.data)) { s.ajax.data = s.ajax.data.call(this, obj); }

+						$.ajax(s.ajax);

+						break;

+				}

+			}

+		}

+	});

+	// include the HTML data plugin by default

+	$.jstree.defaults.plugins.push("html_data");

+})(jQuery);

+//*/

+

+/* 

+ * jsTree themeroller plugin

+ * Adds support for jQuery UI themes. Include this at the end of your plugins list, also make sure "themes" is not included.

+ */

+(function ($) {

+	$.jstree.plugin("themeroller", {

+		__init : function () {

+			var s = this._get_settings().themeroller;

+			this.get_container()

+				.addClass("ui-widget-content")

+				.addClass("jstree-themeroller")

+				.delegate("a","mouseenter.jstree", function (e) {

+					if(!$(e.currentTarget).hasClass("jstree-loading")) {

+						$(this).addClass(s.item_h);

+					}

+				})

+				.delegate("a","mouseleave.jstree", function () {

+					$(this).removeClass(s.item_h);

+				})

+				.bind("init.jstree", $.proxy(function (e, data) { 

+						data.inst.get_container().find("> ul > li > .jstree-loading > ins").addClass("ui-icon-refresh");

+						this._themeroller(data.inst.get_container().find("> ul > li"));

+					}, this))

+				.bind("open_node.jstree create_node.jstree", $.proxy(function (e, data) { 

+						this._themeroller(data.rslt.obj);

+					}, this))

+				.bind("loaded.jstree refresh.jstree", $.proxy(function (e) {

+						this._themeroller();

+					}, this))

+				.bind("close_node.jstree", $.proxy(function (e, data) {

+						this._themeroller(data.rslt.obj);

+					}, this))

+				.bind("delete_node.jstree", $.proxy(function (e, data) {

+						this._themeroller(data.rslt.parent);

+					}, this))

+				.bind("correct_state.jstree", $.proxy(function (e, data) {

+						data.rslt.obj

+							.children("ins.jstree-icon").removeClass(s.opened + " " + s.closed + " ui-icon").end()

+							.find("> a > ins.ui-icon")

+								.filter(function() { 

+									return this.className.toString()

+										.replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"")

+										.indexOf("ui-icon-") === -1; 

+								}).removeClass(s.item_open + " " + s.item_clsd).addClass(s.item_leaf || "jstree-no-icon");

+					}, this))

+				.bind("select_node.jstree", $.proxy(function (e, data) {

+						data.rslt.obj.children("a").addClass(s.item_a);

+					}, this))

+				.bind("deselect_node.jstree deselect_all.jstree", $.proxy(function (e, data) {

+						this.get_container()

+							.find("a." + s.item_a).removeClass(s.item_a).end()

+							.find("a.jstree-clicked").addClass(s.item_a);

+					}, this))

+				.bind("dehover_node.jstree", $.proxy(function (e, data) {

+						data.rslt.obj.children("a").removeClass(s.item_h);

+					}, this))

+				.bind("hover_node.jstree", $.proxy(function (e, data) {

+						this.get_container()

+							.find("a." + s.item_h).not(data.rslt.obj).removeClass(s.item_h);

+						data.rslt.obj.children("a").addClass(s.item_h);

+					}, this))

+				.bind("move_node.jstree", $.proxy(function (e, data) {

+						this._themeroller(data.rslt.o);

+						this._themeroller(data.rslt.op);

+					}, this));

+		},

+		__destroy : function () {

+			var s = this._get_settings().themeroller,

+				c = [ "ui-icon" ];

+			$.each(s, function (i, v) {

+				v = v.split(" ");

+				if(v.length) { c = c.concat(v); }

+			});

+			this.get_container()

+				.removeClass("ui-widget-content")

+				.find("." + c.join(", .")).removeClass(c.join(" "));

+		},

+		_fn : {

+			_themeroller : function (obj) {

+				var s = this._get_settings().themeroller;

+				obj = !obj || obj == -1 ? this.get_container_ul() : this._get_node(obj).parent();

+				obj

+					.find("li.jstree-closed")

+						.children("ins.jstree-icon").removeClass(s.opened).addClass("ui-icon " + s.closed).end()

+						.children("a").addClass(s.item)

+							.children("ins.jstree-icon").addClass("ui-icon")

+								.filter(function() { 

+									return this.className.toString()

+										.replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"")

+										.indexOf("ui-icon-") === -1; 

+								}).removeClass(s.item_leaf + " " + s.item_open).addClass(s.item_clsd || "jstree-no-icon")

+								.end()

+							.end()

+						.end()

+					.end()

+					.find("li.jstree-open")

+						.children("ins.jstree-icon").removeClass(s.closed).addClass("ui-icon " + s.opened).end()

+						.children("a").addClass(s.item)

+							.children("ins.jstree-icon").addClass("ui-icon")

+								.filter(function() { 

+									return this.className.toString()

+										.replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"")

+										.indexOf("ui-icon-") === -1; 

+								}).removeClass(s.item_leaf + " " + s.item_clsd).addClass(s.item_open || "jstree-no-icon")

+								.end()

+							.end()

+						.end()

+					.end()

+					.find("li.jstree-leaf")

+						.children("ins.jstree-icon").removeClass(s.closed + " ui-icon " + s.opened).end()

+						.children("a").addClass(s.item)

+							.children("ins.jstree-icon").addClass("ui-icon")

+								.filter(function() { 

+									return this.className.toString()

+										.replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"")

+										.indexOf("ui-icon-") === -1; 

+								}).removeClass(s.item_clsd + " " + s.item_open).addClass(s.item_leaf || "jstree-no-icon");

+			}

+		},

+		defaults : {

+			"opened"	: "ui-icon-triangle-1-se",

+			"closed"	: "ui-icon-triangle-1-e",

+			"item"		: "ui-state-default",

+			"item_h"	: "ui-state-hover",

+			"item_a"	: "ui-state-active",

+			"item_open"	: "ui-icon-folder-open",

+			"item_clsd"	: "ui-icon-folder-collapsed",

+			"item_leaf"	: "ui-icon-document"

+		}

+	});

+	$(function() {

+		var css_string = '' + 

+			'.jstree-themeroller .ui-icon { overflow:visible; } ' + 

+			'.jstree-themeroller a { padding:0 2px; } ' + 

+			'.jstree-themeroller .jstree-no-icon { display:none; }';

+		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });

+	});

+})(jQuery);

+//*/

+

+/* 

+ * jsTree unique plugin

+ * Forces different names amongst siblings (still a bit experimental)

+ * NOTE: does not check language versions (it will not be possible to have nodes with the same title, even in different languages)

+ */

+(function ($) {

+	$.jstree.plugin("unique", {

+		__init : function () {

+			this.get_container()

+				.bind("before.jstree", $.proxy(function (e, data) { 

+						var nms = [], res = true, p, t;

+						if(data.func == "move_node") {

+							// obj, ref, position, is_copy, is_prepared, skip_check

+							if(data.args[4] === true) {

+								if(data.args[0].o && data.args[0].o.length) {

+									data.args[0].o.children("a").each(function () { nms.push($(this).text().replace(/^\s+/g,"")); });

+									res = this._check_unique(nms, data.args[0].np.find("> ul > li").not(data.args[0].o), "move_node");

+								}

+							}

+						}

+						if(data.func == "create_node") {

+							// obj, position, js, callback, is_loaded

+							if(data.args[4] || this._is_loaded(data.args[0])) {

+								p = this._get_node(data.args[0]);

+								if(data.args[1] && (data.args[1] === "before" || data.args[1] === "after")) {

+									p = this._get_parent(data.args[0]);

+									if(!p || p === -1) { p = this.get_container(); }

+								}

+								if(typeof data.args[2] === "string") { nms.push(data.args[2]); }

+								else if(!data.args[2] || !data.args[2].data) { nms.push(this._get_string("new_node")); }

+								else { nms.push(data.args[2].data); }

+								res = this._check_unique(nms, p.find("> ul > li"), "create_node");

+							}

+						}

+						if(data.func == "rename_node") {

+							// obj, val

+							nms.push(data.args[1]);

+							t = this._get_node(data.args[0]);

+							p = this._get_parent(t);

+							if(!p || p === -1) { p = this.get_container(); }

+							res = this._check_unique(nms, p.find("> ul > li").not(t), "rename_node");

+						}

+						if(!res) {

+							e.stopPropagation();

+							return false;

+						}

+					}, this));

+		},

+		defaults : { 

+			error_callback : $.noop

+		},

+		_fn : { 

+			_check_unique : function (nms, p, func) {

+				var cnms = [];

+				p.children("a").each(function () { cnms.push($(this).text().replace(/^\s+/g,"")); });

+				if(!cnms.length || !nms.length) { return true; }

+				cnms = cnms.sort().join(",,").replace(/(,|^)([^,]+)(,,\2)+(,|$)/g,"$1$2$4").replace(/,,+/g,",").replace(/,$/,"").split(",");

+				if((cnms.length + nms.length) != cnms.concat(nms).sort().join(",,").replace(/(,|^)([^,]+)(,,\2)+(,|$)/g,"$1$2$4").replace(/,,+/g,",").replace(/,$/,"").split(",").length) {

+					this._get_settings().unique.error_callback.call(null, nms, p, func);

+					return false;

+				}

+				return true;

+			},

+			check_move : function () {

+				if(!this.__call_old()) { return false; }

+				var p = this._get_move(), nms = [];

+				if(p.o && p.o.length) {

+					p.o.children("a").each(function () { nms.push($(this).text().replace(/^\s+/g,"")); });

+					return this._check_unique(nms, p.np.find("> ul > li").not(p.o), "check_move");

+				}

+				return true;

+			}

+		}

+	});

+})(jQuery);

+//*/

+

+/*

+ * jsTree wholerow plugin

+ * Makes select and hover work on the entire width of the node

+ * MAY BE HEAVY IN LARGE DOM

+ */

+(function ($) {

+	$.jstree.plugin("wholerow", {

+		__init : function () {

+			if(!this.data.ui) { throw "jsTree wholerow: jsTree UI plugin not included."; }

+			this.data.wholerow.html = false;

+			this.data.wholerow.to = false;

+			this.get_container()

+				.bind("init.jstree", $.proxy(function (e, data) { 

+						this._get_settings().core.animation = 0;

+					}, this))

+				.bind("open_node.jstree create_node.jstree clean_node.jstree loaded.jstree", $.proxy(function (e, data) { 

+						this._prepare_wholerow_span( data && data.rslt && data.rslt.obj ? data.rslt.obj : -1 );

+					}, this))

+				.bind("search.jstree clear_search.jstree reopen.jstree after_open.jstree after_close.jstree create_node.jstree delete_node.jstree clean_node.jstree", $.proxy(function (e, data) { 

+						if(this.data.to) { clearTimeout(this.data.to); }

+						this.data.to = setTimeout( (function (t, o) { return function() { t._prepare_wholerow_ul(o); }; })(this,  data && data.rslt && data.rslt.obj ? data.rslt.obj : -1), 0);

+					}, this))

+				.bind("deselect_all.jstree", $.proxy(function (e, data) { 

+						this.get_container().find(" > .jstree-wholerow .jstree-clicked").removeClass("jstree-clicked " + (this.data.themeroller ? this._get_settings().themeroller.item_a : "" ));

+					}, this))

+				.bind("select_node.jstree deselect_node.jstree ", $.proxy(function (e, data) { 

+						data.rslt.obj.each(function () { 

+							var ref = data.inst.get_container().find(" > .jstree-wholerow li:visible:eq(" + ( parseInt((($(this).offset().top - data.inst.get_container().offset().top + data.inst.get_container()[0].scrollTop) / data.inst.data.core.li_height),10)) + ")");

+							// ref.children("a")[e.type === "select_node" ? "addClass" : "removeClass"]("jstree-clicked");

+							ref.children("a").attr("class",data.rslt.obj.children("a").attr("class"));

+						});

+					}, this))

+				.bind("hover_node.jstree dehover_node.jstree", $.proxy(function (e, data) { 

+						this.get_container().find(" > .jstree-wholerow .jstree-hovered").removeClass("jstree-hovered " + (this.data.themeroller ? this._get_settings().themeroller.item_h : "" ));

+						if(e.type === "hover_node") {

+							var ref = this.get_container().find(" > .jstree-wholerow li:visible:eq(" + ( parseInt(((data.rslt.obj.offset().top - this.get_container().offset().top + this.get_container()[0].scrollTop) / this.data.core.li_height),10)) + ")");

+							// ref.children("a").addClass("jstree-hovered");

+							ref.children("a").attr("class",data.rslt.obj.children(".jstree-hovered").attr("class"));

+						}

+					}, this))

+				.delegate(".jstree-wholerow-span, ins.jstree-icon, li", "click.jstree", function (e) {

+						var n = $(e.currentTarget);

+						if(e.target.tagName === "A" || (e.target.tagName === "INS" && n.closest("li").is(".jstree-open, .jstree-closed"))) { return; }

+						n.closest("li").children("a:visible:eq(0)").click();

+						e.stopImmediatePropagation();

+					})

+				.delegate("li", "mouseover.jstree", $.proxy(function (e) {

+						e.stopImmediatePropagation();

+						if($(e.currentTarget).children(".jstree-hovered, .jstree-clicked").length) { return false; }

+						this.hover_node(e.currentTarget);

+						return false;

+					}, this))

+				.delegate("li", "mouseleave.jstree", $.proxy(function (e) {

+						if($(e.currentTarget).children("a").hasClass("jstree-hovered").length) { return; }

+						this.dehover_node(e.currentTarget);

+					}, this));

+			if(is_ie7 || is_ie6) {

+				$.vakata.css.add_sheet({ str : ".jstree-" + this.get_index() + " { position:relative; } ", title : "jstree" });

+			}

+		},

+		defaults : {

+		},

+		__destroy : function () {

+			this.get_container().children(".jstree-wholerow").remove();

+			this.get_container().find(".jstree-wholerow-span").remove();

+		},

+		_fn : {

+			_prepare_wholerow_span : function (obj) {

+				obj = !obj || obj == -1 ? this.get_container().find("> ul > li") : this._get_node(obj);

+				if(obj === false) { return; } // added for removing root nodes

+				obj.each(function () {

+					$(this).find("li").andSelf().each(function () {

+						var $t = $(this);

+						if($t.children(".jstree-wholerow-span").length) { return true; }

+						$t.prepend("<span class='jstree-wholerow-span' style='width:" + ($t.parentsUntil(".jstree","li").length * 18) + "px;'>&#160;</span>");

+					});

+				});

+			},

+			_prepare_wholerow_ul : function () {

+				var o = this.get_container().children("ul").eq(0), h = o.html();

+				o.addClass("jstree-wholerow-real");

+				if(this.data.wholerow.last_html !== h) {

+					this.data.wholerow.last_html = h;

+					this.get_container().children(".jstree-wholerow").remove();

+					this.get_container().append(

+						o.clone().removeClass("jstree-wholerow-real")

+							.wrapAll("<div class='jstree-wholerow' />").parent()

+							.width(o.parent()[0].scrollWidth)

+							.css("top", (o.height() + ( is_ie7 ? 5 : 0)) * -1 )

+							.find("li[id]").each(function () { this.removeAttribute("id"); }).end()

+					);

+				}

+			}

+		}

+	});

+	$(function() {

+		var css_string = '' + 

+			'.jstree .jstree-wholerow-real { position:relative; z-index:1; } ' + 

+			'.jstree .jstree-wholerow-real li { cursor:pointer; } ' + 

+			'.jstree .jstree-wholerow-real a { border-left-color:transparent !important; border-right-color:transparent !important; } ' + 

+			'.jstree .jstree-wholerow { position:relative; z-index:0; height:0; } ' + 

+			'.jstree .jstree-wholerow ul, .jstree .jstree-wholerow li { width:100%; } ' + 

+			'.jstree .jstree-wholerow, .jstree .jstree-wholerow ul, .jstree .jstree-wholerow li, .jstree .jstree-wholerow a { margin:0 !important; padding:0 !important; } ' + 

+			'.jstree .jstree-wholerow, .jstree .jstree-wholerow ul, .jstree .jstree-wholerow li { background:transparent !important; }' + 

+			'.jstree .jstree-wholerow ins, .jstree .jstree-wholerow span, .jstree .jstree-wholerow input { display:none !important; }' + 

+			'.jstree .jstree-wholerow a, .jstree .jstree-wholerow a:hover { text-indent:-9999px; !important; width:100%; padding:0 !important; border-right-width:0px !important; border-left-width:0px !important; } ' + 

+			'.jstree .jstree-wholerow-span { position:absolute; left:0; margin:0px; padding:0; height:18px; border-width:0; padding:0; z-index:0; }';

+		if(is_ff2) {

+			css_string += '' + 

+				'.jstree .jstree-wholerow a { display:block; height:18px; margin:0; padding:0; border:0; } ' + 

+				'.jstree .jstree-wholerow-real a { border-color:transparent !important; } ';

+		}

+		if(is_ie7 || is_ie6) {

+			css_string += '' + 

+				'.jstree .jstree-wholerow, .jstree .jstree-wholerow li, .jstree .jstree-wholerow ul, .jstree .jstree-wholerow a { margin:0; padding:0; line-height:18px; } ' + 

+				'.jstree .jstree-wholerow a { display:block; height:18px; line-height:18px; overflow:hidden; } ';

+		}

+		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });

+	});

+})(jQuery);

+//*/

+

+/*

+* jsTree model plugin

+* This plugin gets jstree to use a class model to retrieve data, creating great dynamism

+*/

+(function ($) {

+	var nodeInterface = ["getChildren","getChildrenCount","getAttr","getName","getProps"],

+		validateInterface = function(obj, inter) {

+			var valid = true;

+			obj = obj || {};

+			inter = [].concat(inter);

+			$.each(inter, function (i, v) {

+				if(!$.isFunction(obj[v])) { valid = false; return false; }

+			});

+			return valid;

+		};

+	$.jstree.plugin("model", {

+		__init : function () {

+			if(!this.data.json_data) { throw "jsTree model: jsTree json_data plugin not included."; }

+			this._get_settings().json_data.data = function (n, b) {

+				var obj = (n == -1) ? this._get_settings().model.object : n.data("jstree_model");

+				if(!validateInterface(obj, nodeInterface)) { return b.call(null, false); }

+				if(this._get_settings().model.async) {

+					obj.getChildren($.proxy(function (data) {

+						this.model_done(data, b);

+					}, this));

+				}

+				else {

+					this.model_done(obj.getChildren(), b);

+				}

+			};

+		},

+		defaults : {

+			object : false,

+			id_prefix : false,

+			async : false

+		},

+		_fn : {

+			model_done : function (data, callback) {

+				var ret = [], 

+					s = this._get_settings(),

+					_this = this;

+

+				if(!$.isArray(data)) { data = [data]; }

+				$.each(data, function (i, nd) {

+					var r = nd.getProps() || {};

+					r.attr = nd.getAttr() || {};

+					if(nd.getChildrenCount()) { r.state = "closed"; }

+					r.data = nd.getName();

+					if(!$.isArray(r.data)) { r.data = [r.data]; }

+					if(_this.data.types && $.isFunction(nd.getType)) {

+						r.attr[s.types.type_attr] = nd.getType();

+					}

+					if(r.attr.id && s.model.id_prefix) { r.attr.id = s.model.id_prefix + r.attr.id; }

+					if(!r.metadata) { r.metadata = { }; }

+					r.metadata.jstree_model = nd;

+					ret.push(r);

+				});

+				callback.call(null, ret);

+			}

+		}

+	});

+})(jQuery);

+//*/

+

+})();
\ No newline at end of file
diff --git a/mod/developers/vendors/jsTree/themes/apple/bg.jpg b/mod/developers/vendors/jsTree/themes/apple/bg.jpg
new file mode 100644
index 000000000..3aad05d8f
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/apple/bg.jpg
diff --git a/mod/developers/vendors/jsTree/themes/apple/d.png b/mod/developers/vendors/jsTree/themes/apple/d.png
new file mode 100644
index 000000000..2463ba6df
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/apple/d.png
diff --git a/mod/developers/vendors/jsTree/themes/apple/dot_for_ie.gif b/mod/developers/vendors/jsTree/themes/apple/dot_for_ie.gif
new file mode 100644
index 000000000..c0cc5fda7
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/apple/dot_for_ie.gif
diff --git a/mod/developers/vendors/jsTree/themes/apple/style.css b/mod/developers/vendors/jsTree/themes/apple/style.css
new file mode 100644
index 000000000..db7a143e0
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/apple/style.css
@@ -0,0 +1,61 @@
+/*

+ * jsTree apple theme 1.0

+ * Supported features: dots/no-dots, icons/no-icons, focused, loading

+ * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search

+ */

+

+.jstree-apple > ul { background:url("bg.jpg") left top repeat; }

+.jstree-apple li, 

+.jstree-apple ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }

+.jstree-apple li { background-position:-90px 0; background-repeat:repeat-y;  }

+.jstree-apple li.jstree-last { background:transparent; }

+.jstree-apple .jstree-open > ins { background-position:-72px 0; }

+.jstree-apple .jstree-closed > ins { background-position:-54px 0; }

+.jstree-apple .jstree-leaf > ins { background-position:-36px 0; }

+

+.jstree-apple a { border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; text-shadow:1px 1px 1px white; }

+.jstree-apple .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 3px 0 1px; text-shadow:1px 1px 1px silver; }

+.jstree-apple .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 3px 0 1px; }

+.jstree-apple a .jstree-icon { background-position:-56px -20px; }

+.jstree-apple a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }

+

+.jstree-apple.jstree-focused { background:white; }

+

+.jstree-apple .jstree-no-dots li, 

+.jstree-apple .jstree-no-dots .jstree-leaf > ins { background:transparent; }

+.jstree-apple .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }

+.jstree-apple .jstree-no-dots .jstree-closed > ins { background-position:0 0; }

+

+.jstree-apple .jstree-no-icons a .jstree-icon { display:none; }

+

+.jstree-apple .jstree-search { font-style:italic; }

+

+.jstree-apple .jstree-no-icons .jstree-checkbox { display:inline-block; }

+.jstree-apple .jstree-no-checkboxes .jstree-checkbox { display:none !important; }

+.jstree-apple .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }

+.jstree-apple .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }

+.jstree-apple .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }

+.jstree-apple .jstree-checked > a > .checkbox:hover { background-position:-38px -37px; }

+.jstree-apple .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }

+.jstree-apple .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }

+

+#vakata-dragged.jstree-apple ins { background:transparent !important; }

+#vakata-dragged.jstree-apple .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }

+#vakata-dragged.jstree-apple .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }

+#jstree-marker.jstree-apple { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }

+

+.jstree-apple a.jstree-search { color:aqua; }

+.jstree-apple .jstree-locked a { color:silver; cursor:default; }

+

+#vakata-contextmenu.jstree-apple-context, 

+#vakata-contextmenu.jstree-apple-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }

+#vakata-contextmenu.jstree-apple-context li { }

+#vakata-contextmenu.jstree-apple-context a { color:black; }

+#vakata-contextmenu.jstree-apple-context a:hover, 

+#vakata-contextmenu.jstree-apple-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }

+#vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a, 

+#vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }

+#vakata-contextmenu.jstree-apple-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }

+#vakata-contextmenu.jstree-apple-context li ul { margin-left:-4px; }

+

+/* TODO: IE6 support - the `>` selectors */
\ No newline at end of file
diff --git a/mod/developers/vendors/jsTree/themes/apple/throbber.gif b/mod/developers/vendors/jsTree/themes/apple/throbber.gif
new file mode 100644
index 000000000..5b33f7e54
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/apple/throbber.gif
diff --git a/mod/developers/vendors/jsTree/themes/classic/d.gif b/mod/developers/vendors/jsTree/themes/classic/d.gif
new file mode 100644
index 000000000..6eb0004ce
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/classic/d.gif
diff --git a/mod/developers/vendors/jsTree/themes/classic/d.png b/mod/developers/vendors/jsTree/themes/classic/d.png
new file mode 100644
index 000000000..275daeca2
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/classic/d.png
diff --git a/mod/developers/vendors/jsTree/themes/classic/dot_for_ie.gif b/mod/developers/vendors/jsTree/themes/classic/dot_for_ie.gif
new file mode 100644
index 000000000..c0cc5fda7
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/classic/dot_for_ie.gif
diff --git a/mod/developers/vendors/jsTree/themes/classic/style.css b/mod/developers/vendors/jsTree/themes/classic/style.css
new file mode 100644
index 000000000..492856ddc
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/classic/style.css
@@ -0,0 +1,77 @@
+/*

+ * jsTree classic theme 1.0

+ * Supported features: dots/no-dots, icons/no-icons, focused, loading

+ * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search

+ */

+

+.jstree-classic li, 

+.jstree-classic ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }

+.jstree-classic li { background-position:-90px 0; background-repeat:repeat-y;  }

+.jstree-classic li.jstree-last { background:transparent; }

+.jstree-classic .jstree-open > ins { background-position:-72px 0; }

+.jstree-classic .jstree-closed > ins { background-position:-54px 0; }

+.jstree-classic .jstree-leaf > ins { background-position:-36px 0; }

+

+.jstree-classic .jstree-hovered { background:#e7f4f9; border:1px solid #e7f4f9; padding:0 2px 0 1px; }

+.jstree-classic .jstree-clicked { background:navy; border:1px solid navy; padding:0 2px 0 1px; color:white; }

+.jstree-classic a .jstree-icon { background-position:-56px -19px; }

+.jstree-classic .jstree-open > a .jstree-icon { background-position:-56px -36px; }

+.jstree-classic a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }

+

+.jstree-classic.jstree-focused { background:white; }

+

+.jstree-classic .jstree-no-dots li, 

+.jstree-classic .jstree-no-dots .jstree-leaf > ins { background:transparent; }

+.jstree-classic .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }

+.jstree-classic .jstree-no-dots .jstree-closed > ins { background-position:0 0; }

+

+.jstree-classic .jstree-no-icons a .jstree-icon { display:none; }

+

+.jstree-classic .jstree-search { font-style:italic; }

+

+.jstree-classic .jstree-no-icons .jstree-checkbox { display:inline-block; }

+.jstree-classic .jstree-no-checkboxes .jstree-checkbox { display:none !important; }

+.jstree-classic .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }

+.jstree-classic .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }

+.jstree-classic .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }

+.jstree-classic .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; }

+.jstree-classic .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }

+.jstree-classic .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }

+

+#vakata-dragged.jstree-classic ins { background:transparent !important; }

+#vakata-dragged.jstree-classic .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }

+#vakata-dragged.jstree-classic .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }

+#jstree-marker.jstree-classic { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }

+

+.jstree-classic a.jstree-search { color:aqua; }

+.jstree-classic .jstree-locked a { color:silver; cursor:default; }

+

+#vakata-contextmenu.jstree-classic-context, 

+#vakata-contextmenu.jstree-classic-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }

+#vakata-contextmenu.jstree-classic-context li { }

+#vakata-contextmenu.jstree-classic-context a { color:black; }

+#vakata-contextmenu.jstree-classic-context a:hover, 

+#vakata-contextmenu.jstree-classic-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }

+#vakata-contextmenu.jstree-classic-context li.jstree-contextmenu-disabled a, 

+#vakata-contextmenu.jstree-classic-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }

+#vakata-contextmenu.jstree-classic-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }

+#vakata-contextmenu.jstree-classic-context li ul { margin-left:-4px; }

+

+/* IE6 BEGIN */

+.jstree-classic li, 

+.jstree-classic ins,

+#vakata-dragged.jstree-classic .jstree-invalid, 

+#vakata-dragged.jstree-classic .jstree-ok, 

+#jstree-marker.jstree-classic { _background-image:url("d.gif"); }

+.jstree-classic .jstree-open ins { _background-position:-72px 0; }

+.jstree-classic .jstree-closed ins { _background-position:-54px 0; }

+.jstree-classic .jstree-leaf ins { _background-position:-36px 0; }

+.jstree-classic .jstree-open a ins.jstree-icon { _background-position:-56px -36px; }

+.jstree-classic .jstree-closed a ins.jstree-icon { _background-position:-56px -19px; }

+.jstree-classic .jstree-leaf a ins.jstree-icon { _background-position:-56px -19px; }

+#vakata-contextmenu.jstree-classic-context ins { _display:none; }

+#vakata-contextmenu.jstree-classic-context li { _zoom:1; }

+.jstree-classic .jstree-undetermined a .jstree-checkbox { _background-position:-20px -19px; }

+.jstree-classic .jstree-checked a .jstree-checkbox { _background-position:-38px -19px; }

+.jstree-classic .jstree-unchecked a .jstree-checkbox { _background-position:-2px -19px; }

+/* IE6 END */
\ No newline at end of file
diff --git a/mod/developers/vendors/jsTree/themes/classic/throbber.gif b/mod/developers/vendors/jsTree/themes/classic/throbber.gif
new file mode 100644
index 000000000..5b33f7e54
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/classic/throbber.gif
diff --git a/mod/developers/vendors/jsTree/themes/default-rtl/d.gif b/mod/developers/vendors/jsTree/themes/default-rtl/d.gif
new file mode 100644
index 000000000..d85aba049
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default-rtl/d.gif
diff --git a/mod/developers/vendors/jsTree/themes/default-rtl/d.png b/mod/developers/vendors/jsTree/themes/default-rtl/d.png
new file mode 100644
index 000000000..5179cf64e
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default-rtl/d.png
diff --git a/mod/developers/vendors/jsTree/themes/default-rtl/dots.gif b/mod/developers/vendors/jsTree/themes/default-rtl/dots.gif
new file mode 100644
index 000000000..00433648c
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default-rtl/dots.gif
diff --git a/mod/developers/vendors/jsTree/themes/default-rtl/style.css b/mod/developers/vendors/jsTree/themes/default-rtl/style.css
new file mode 100644
index 000000000..d51aef6cc
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default-rtl/style.css
@@ -0,0 +1,84 @@
+/*

+ * jsTree default-rtl theme 1.0

+ * Supported features: dots/no-dots, icons/no-icons, focused, loading

+ * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search

+ */

+

+.jstree-default-rtl li, 

+.jstree-default-rtl ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }

+.jstree-default-rtl li { background-position:-90px 0; background-repeat:repeat-y; }

+.jstree-default-rtl li.jstree-last { background:transparent; }

+.jstree-default-rtl .jstree-open > ins { background-position:-72px 0; }

+.jstree-default-rtl .jstree-closed > ins { background-position:-54px 0; }

+.jstree-default-rtl .jstree-leaf > ins { background-position:-36px 0; }

+

+.jstree-default-rtl .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 2px 0 1px; }

+.jstree-default-rtl .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 2px 0 1px; }

+.jstree-default-rtl a .jstree-icon { background-position:-56px -19px; }

+.jstree-default-rtl a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }

+

+.jstree-default-rtl.jstree-focused { background:#ffffee; }

+

+.jstree-default-rtl .jstree-no-dots li, 

+.jstree-default-rtl .jstree-no-dots .jstree-leaf > ins { background:transparent; }

+.jstree-default-rtl .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }

+.jstree-default-rtl .jstree-no-dots .jstree-closed > ins { background-position:0 0; }

+

+.jstree-default-rtl .jstree-no-icons a .jstree-icon { display:none; }

+

+.jstree-default-rtl .jstree-search { font-style:italic; }

+

+.jstree-default-rtl .jstree-no-icons .jstree-checkbox { display:inline-block; }

+.jstree-default-rtl .jstree-no-checkboxes .jstree-checkbox { display:none !important; }

+.jstree-default-rtl .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }

+.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }

+.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }

+.jstree-default-rtl .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; }

+.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }

+.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }

+

+#vakata-dragged.jstree-default-rtl ins { background:transparent !important; }

+#vakata-dragged.jstree-default-rtl .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }

+#vakata-dragged.jstree-default-rtl .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }

+#jstree-marker.jstree-default-rtl { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }

+

+.jstree-default-rtl a.jstree-search { color:aqua; }

+.jstree-default-rtl .jstree-locked a { color:silver; cursor:default; }

+

+#vakata-contextmenu.jstree-default-rtl-context, 

+#vakata-contextmenu.jstree-default-rtl-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }

+#vakata-contextmenu.jstree-default-rtl-context li { }

+#vakata-contextmenu.jstree-default-rtl-context a { color:black; }

+#vakata-contextmenu.jstree-default-rtl-context a:hover, 

+#vakata-contextmenu.jstree-default-rtl-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }

+#vakata-contextmenu.jstree-default-rtl-context li.jstree-contextmenu-disabled a, 

+#vakata-contextmenu.jstree-default-rtl-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }

+#vakata-contextmenu.jstree-default-rtl-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }

+#vakata-contextmenu.jstree-default-rtl-context li ul { margin-left:-4px; }

+

+/* IE6 BEGIN */

+.jstree-default-rtl li, 

+.jstree-default-rtl ins,

+#vakata-dragged.jstree-default-rtl .jstree-invalid, 

+#vakata-dragged.jstree-default-rtl .jstree-ok, 

+#jstree-marker.jstree-default-rtl { _background-image:url("d.gif"); }

+.jstree-default-rtl .jstree-open ins { _background-position:-72px 0; }

+.jstree-default-rtl .jstree-closed ins { _background-position:-54px 0; }

+.jstree-default-rtl .jstree-leaf ins { _background-position:-36px 0; }

+.jstree-default-rtl a ins.jstree-icon { _background-position:-56px -19px; }

+#vakata-contextmenu.jstree-default-rtl-context ins { _display:none; }

+#vakata-contextmenu.jstree-default-rtl-context li { _zoom:1; }

+.jstree-default-rtl .jstree-undetermined a .jstree-checkbox { _background-position:-18px -19px; }

+.jstree-default-rtl .jstree-checked a .jstree-checkbox { _background-position:-36px -19px; }

+.jstree-default-rtl .jstree-unchecked a .jstree-checkbox { _background-position:0px -19px; }

+/* IE6 END */

+

+/* RTL part */

+.jstree-default-rtl .jstree-hovered, .jstree-default-rtl .jstree-clicked { padding:0 1px 0 2px; }

+.jstree-default-rtl li { background-image:url("dots.gif"); background-position: 100% 0px; }

+.jstree-default-rtl .jstree-checked > a > .jstree-checkbox { background-position:-36px -19px; margin-left:2px; }

+.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox { background-position:0px -19px; margin-left:2px; }

+.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox { background-position:-18px -19px; margin-left:2px; }

+.jstree-default-rtl .jstree-checked > a > .jstree-checkbox:hover { background-position:-36px -37px; }

+.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox:hover { background-position:0px -37px; }

+.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-18px -37px; }
\ No newline at end of file
diff --git a/mod/developers/vendors/jsTree/themes/default-rtl/throbber.gif b/mod/developers/vendors/jsTree/themes/default-rtl/throbber.gif
new file mode 100644
index 000000000..5b33f7e54
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default-rtl/throbber.gif
diff --git a/mod/developers/vendors/jsTree/themes/default/d.gif b/mod/developers/vendors/jsTree/themes/default/d.gif
new file mode 100644
index 000000000..0e958d387
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default/d.gif
diff --git a/mod/developers/vendors/jsTree/themes/default/d.png b/mod/developers/vendors/jsTree/themes/default/d.png
new file mode 100644
index 000000000..8540175a0
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default/d.png
diff --git a/mod/developers/vendors/jsTree/themes/default/style.css b/mod/developers/vendors/jsTree/themes/default/style.css
new file mode 100644
index 000000000..238ce1a1c
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default/style.css
@@ -0,0 +1,74 @@
+/*

+ * jsTree default theme 1.0

+ * Supported features: dots/no-dots, icons/no-icons, focused, loading

+ * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search

+ */

+

+.jstree-default li, 

+.jstree-default ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }

+.jstree-default li { background-position:-90px 0; background-repeat:repeat-y; }

+.jstree-default li.jstree-last { background:transparent; }

+.jstree-default .jstree-open > ins { background-position:-72px 0; }

+.jstree-default .jstree-closed > ins { background-position:-54px 0; }

+.jstree-default .jstree-leaf > ins { background-position:-36px 0; }

+

+.jstree-default .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 2px 0 1px; }

+.jstree-default .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 2px 0 1px; }

+.jstree-default a .jstree-icon { background-position:-56px -19px; }

+.jstree-default a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }

+

+.jstree-default.jstree-focused { background:#ffffee; }

+

+.jstree-default .jstree-no-dots li, 

+.jstree-default .jstree-no-dots .jstree-leaf > ins { background:transparent; }

+.jstree-default .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }

+.jstree-default .jstree-no-dots .jstree-closed > ins { background-position:0 0; }

+

+.jstree-default .jstree-no-icons a .jstree-icon { display:none; }

+

+.jstree-default .jstree-search { font-style:italic; }

+

+.jstree-default .jstree-no-icons .jstree-checkbox { display:inline-block; }

+.jstree-default .jstree-no-checkboxes .jstree-checkbox { display:none !important; }

+.jstree-default .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }

+.jstree-default .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }

+.jstree-default .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }

+.jstree-default .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; }

+.jstree-default .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }

+.jstree-default .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }

+

+#vakata-dragged.jstree-default ins { background:transparent !important; }

+#vakata-dragged.jstree-default .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }

+#vakata-dragged.jstree-default .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }

+#jstree-marker.jstree-default { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }

+

+.jstree-default a.jstree-search { color:aqua; }

+.jstree-default .jstree-locked a { color:silver; cursor:default; }

+

+#vakata-contextmenu.jstree-default-context, 

+#vakata-contextmenu.jstree-default-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }

+#vakata-contextmenu.jstree-default-context li { }

+#vakata-contextmenu.jstree-default-context a { color:black; }

+#vakata-contextmenu.jstree-default-context a:hover, 

+#vakata-contextmenu.jstree-default-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }

+#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a, 

+#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }

+#vakata-contextmenu.jstree-default-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }

+#vakata-contextmenu.jstree-default-context li ul { margin-left:-4px; }

+

+/* IE6 BEGIN */

+.jstree-default li, 

+.jstree-default ins,

+#vakata-dragged.jstree-default .jstree-invalid, 

+#vakata-dragged.jstree-default .jstree-ok, 

+#jstree-marker.jstree-default { _background-image:url("d.gif"); }

+.jstree-default .jstree-open ins { _background-position:-72px 0; }

+.jstree-default .jstree-closed ins { _background-position:-54px 0; }

+.jstree-default .jstree-leaf ins { _background-position:-36px 0; }

+.jstree-default a ins.jstree-icon { _background-position:-56px -19px; }

+#vakata-contextmenu.jstree-default-context ins { _display:none; }

+#vakata-contextmenu.jstree-default-context li { _zoom:1; }

+.jstree-default .jstree-undetermined a .jstree-checkbox { _background-position:-20px -19px; }

+.jstree-default .jstree-checked a .jstree-checkbox { _background-position:-38px -19px; }

+.jstree-default .jstree-unchecked a .jstree-checkbox { _background-position:-2px -19px; }

+/* IE6 END */
\ No newline at end of file
diff --git a/mod/developers/vendors/jsTree/themes/default/throbber.gif b/mod/developers/vendors/jsTree/themes/default/throbber.gif
new file mode 100644
index 000000000..5b33f7e54
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default/throbber.gif
diff --git a/mod/developers/views/default/admin/developers/inspect.php b/mod/developers/views/default/admin/developers/inspect.php
new file mode 100644
index 000000000..cfa3de2ea
--- /dev/null
+++ b/mod/developers/views/default/admin/developers/inspect.php
@@ -0,0 +1,14 @@
+<?php
+/**
+* Inspect View
+*
+* Inspect global variables of Elgg
+*/
+
+elgg_load_js('jquery.jstree');
+elgg_load_css('jquery.jstree');
+
+echo elgg_view_form('developers/inspect', array('class' => 'developers-form-inspect'));
+
+echo '<div id="developers-inspect-results"></div>';
+echo elgg_view('graphics/ajax_loader', array('id' => 'developers-ajax-loader'));
diff --git a/mod/developers/views/default/admin/developers/settings.php b/mod/developers/views/default/admin/developers/settings.php
index 705ad00c6..287f4d99e 100644
--- a/mod/developers/views/default/admin/developers/settings.php
+++ b/mod/developers/views/default/admin/developers/settings.php
@@ -3,13 +3,6 @@
  * Developer settings
  */
 
-$sections = array(
-	'simple_cache' => 'checkbox',
-	'view_path_cache' => 'checkbox',
-	'display_errors' => 'checkbox',
-	'debug_level' => 'pulldown',
-);
-
 $data = array(
 	'simple_cache' => array(
 		'type' => 'checkbox',
@@ -39,6 +32,30 @@ $data = array(
 			'NOTICE' => elgg_echo('developers:debug:notice'),
 		),
 	),
+
+	'screen_log' => array(
+		'type' => 'checkbox',
+		'value' => 1,
+		'checked' => elgg_get_plugin_setting('screen_log', 'developers') == 1,
+	),
+	
+	'show_strings' => array(
+		'type' => 'checkbox',
+		'value' => 1,
+		'checked' => elgg_get_plugin_setting('show_strings', 'developers') == 1,
+	),
+
+	'wrap_views' => array(
+		'type' => 'checkbox',
+		'value' => 1,
+		'checked' => elgg_get_plugin_setting('wrap_views', 'developers') == 1,
+	),
+
+	'log_events' => array(
+		'type' => 'checkbox',
+		'value' => 1,
+		'checked' => elgg_get_plugin_setting('log_events', 'developers') == 1,
+	),
 );
 
 $form_vars = array('id' => 'developer-settings-form');
diff --git a/mod/developers/views/default/developers/css.php b/mod/developers/views/default/developers/css.php
index 5e8419945..4690945a9 100644
--- a/mod/developers/views/default/developers/css.php
+++ b/mod/developers/views/default/developers/css.php
@@ -12,3 +12,12 @@
 #developer-settings-form label {
 	margin-right: 5px;
 }
+.elgg-page .jstree-default.jstree-focused {
+	background-color: transparent;
+}
+.developers-log {
+	background-color: #EBF5FF;
+	border: 1px solid #999;
+	color: #666;
+	padding: 20px;
+}
diff --git a/mod/developers/views/default/developers/log.php b/mod/developers/views/default/developers/log.php
new file mode 100644
index 000000000..98120ca98
--- /dev/null
+++ b/mod/developers/views/default/developers/log.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Logging information
+ */
+
+$cache = elgg_get_config('log_cache');
+$items = $cache->get();
+
+echo '<div class="developers-log">';
+if ($items) {
+	foreach ($items as $item) {
+		echo '<pre>';
+		print_r($item);
+		echo '</pre>';
+	}
+}
+
+echo '</div>';
\ No newline at end of file
diff --git a/mod/developers/views/default/developers/tree.php b/mod/developers/views/default/developers/tree.php
new file mode 100644
index 000000000..a8e47333b
--- /dev/null
+++ b/mod/developers/views/default/developers/tree.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Displays a tree for inspection
+ *
+ * @uses $vars['tree']
+ */
+
+echo "<ul>";
+foreach ($vars['tree'] as $key => $arr) {
+	echo "<li><a>$key</a>";
+	echo "<ul>";
+	foreach ($arr as $value) {
+		echo "<li><a>$value</a></li>";
+	}
+	echo "</ul>";
+	echo "</li>";
+}
+echo "</ul>";
diff --git a/mod/developers/views/default/forms/developers/inspect.php b/mod/developers/views/default/forms/developers/inspect.php
new file mode 100644
index 000000000..a1b433fea
--- /dev/null
+++ b/mod/developers/views/default/forms/developers/inspect.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Configuration inspection form
+ */
+
+echo '<div>';
+echo '<p>' . elgg_echo('developers:inspect:help') . '</p>';
+
+echo elgg_view('input/dropdown', array(
+	'name' => 'inspect_type',
+	'options_values' => array(
+		'Actions' => 'Actions',
+		'Events' => 'Events',
+		'Plugin Hooks' => 'Plugin Hooks',
+		'Simple Cache' => 'Simple Cache',
+		'Views' => 'Views',
+		'Web Services' => 'Web Services',
+		'Widgets' => 'Widgets',
+	),
+));
+
+echo elgg_view('input/submit', array('value' => elgg_echo('submit')));
+echo '</div>';
diff --git a/mod/developers/views/default/forms/developers/settings.php b/mod/developers/views/default/forms/developers/settings.php
index a442ca0ce..584f6af30 100644
--- a/mod/developers/views/default/forms/developers/settings.php
+++ b/mod/developers/views/default/forms/developers/settings.php
@@ -29,6 +29,6 @@ foreach ($vars['data'] as $name => $info) {
 	echo '</div>';
 }
 
-echo '<div>';
+echo '<div class="elgg-foot">';
 echo elgg_view('input/submit', array('value' => elgg_echo('save')));
 echo '</div>';
diff --git a/mod/developers/views/default/js/developers/developers.php b/mod/developers/views/default/js/developers/developers.php
new file mode 100644
index 000000000..e6c249eb1
--- /dev/null
+++ b/mod/developers/views/default/js/developers/developers.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Elgg developers tool JavaScript
+ */
+?>
+
+elgg.provide('elgg.dev');
+
+elgg.dev.init = function() {
+	$('.developers-form-inspect').live('submit', elgg.dev.inspectSubmit);
+}
+
+/**
+ * Submit the inspect form through Ajax
+ *
+ * Requires the jQuery Form Plugin.
+ *
+ * @param {Object} event
+ */
+elgg.dev.inspectSubmit = function(event) {
+
+	$("#developers-inspect-results").hide();
+	$("#developers-ajax-loader").show();
+	
+	$(this).ajaxSubmit({
+		success  : function(response) {
+			if (response) {
+				$("#developers-inspect-results").html(response.output);
+				$("#developers-inspect-results").jstree({
+					"plugins" : [ "themes", "html_data" ],
+					"themes" : {"icons" : false}
+				}).bind("loaded.jstree", function() {
+					$("#developers-inspect-results").fadeIn();
+					$("#developers-ajax-loader").hide();
+				});
+			}
+		}
+	});
+
+	event.preventDefault();
+}
+
+elgg.register_hook_handler('init', 'system', elgg.dev.init);
\ No newline at end of file
diff --git a/mod/embed/images/close_button.gif b/mod/embed/images/close_button.gif
deleted file mode 100644
index 822ea8527..000000000
--- a/mod/embed/images/close_button.gif
+++ /dev/null
diff --git a/mod/embed/js/embed.js b/mod/embed/js/embed.js
deleted file mode 100644
index c29083af7..000000000
--- a/mod/embed/js/embed.js
+++ /dev/null
@@ -1,10 +0,0 @@
-$(function() {
-
-	// change for dropdown
-	$('#embed_upload').live('change', function() {
-		var upload_section = $(this).val();
-		var url = elgg.get_site_url() + 'embed/embed?active_section=upload&active_upload_section=' + upload_section;
-		$('#facebox .body .content').load(url);
-	});
-
-});
\ No newline at end of file
diff --git a/mod/embed/start.php b/mod/embed/start.php
index f6f49a53f..bdd832b4e 100644
--- a/mod/embed/start.php
+++ b/mod/embed/start.php
@@ -13,33 +13,42 @@ elgg_register_event_handler('init', 'system', 'embed_init');
  */
 function embed_init() {
 	elgg_extend_view('css/elgg', 'embed/css');
-	elgg_extend_view('js/elgg', 'embed/js');
-	elgg_extend_view('js/elgg', 'embed/lightbox_init');
 	
 	elgg_register_plugin_hook_handler('register', 'menu:longtext', 'embed_longtext_menu');
 
 	// Page handler for the modal media embed
 	elgg_register_page_handler('embed', 'embed_page_handler');
 	
-	elgg_register_js('elgg.embed', 'mod/embed/js/embed.js', 'footer');
+	elgg_register_js('elgg.embed', 'js/embed/embed.js', 'footer');
 }
 
+/**
+ * Add the embed menu item to the long text menu
+ *
+ * @param string $hook
+ * @param string $type
+ * @param array $items
+ * @param array $vars
+ * @return array
+ */
 function embed_longtext_menu($hook, $type, $items, $vars) {
-	// yeah this is naughty.  embed and ecml might want to merge.
-	if (elgg_is_active_plugin('ecml')) {
-		$active_section = 'active_section=web_services&';
-	} else {
-		$active_section = '';
+
+	if (elgg_get_context() == 'embed') {
+		return $items;
 	}
 	
 	$items[] = ElggMenuItem::factory(array(
 		'name' => 'embed',
-		'href' => "embed?{$active_section}internal_id={$vars['id']}",
+		'href' => "embed",
 		'text' => elgg_echo('media:insert'),
-		'rel' => 'facebox',
-		'link_class' => 'elgg-longtext-control',
-		'priority' => 1,
+		'rel' => 'lightbox',
+		'link_class' => "elgg-longtext-control elgg-lightbox embed-control embed-control-{$vars['id']}",
+		'priority' => 10,
 	));
+
+	elgg_load_js('lightbox');
+	elgg_load_css('lightbox');
+	elgg_load_js('elgg.embed');
 	
 	return $items;
 }
@@ -72,8 +81,10 @@ function embed_page_handler($page) {
 			
 			elgg_sort_3d_array_by_value($sections, 'name');
 			elgg_sort_3d_array_by_value($upload_sections, 'name');
-			$active_section = get_input('active_section', NULL);
-			$internal_id = get_input('internal_id', NULL);
+			$active_section = get_input('active_section', '');
+			$active_section = preg_replace('[\W]', '', $active_section);
+			$internal_id = get_input('internal_id', '');
+			$internal_id = preg_replace('[\W]', '', $internal_id);
 
 			echo elgg_view('embed/embed', array(
 				'sections' => $sections,
diff --git a/mod/embed/views/default/embed/addcontentjs.php b/mod/embed/views/default/embed/addcontentjs.php
index 18d2927fd..ffed211f5 100644
--- a/mod/embed/views/default/embed/addcontentjs.php
+++ b/mod/embed/views/default/embed/addcontentjs.php
@@ -3,4 +3,5 @@
  * Blank for compatibility.
  * @deprecated 1.8
  */
-?>
\ No newline at end of file
+
+elgg_deprecated_notice("The view 'embed/addcontentjs' has been deprecated.", 1.8);
diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
index 44491846b..150dc8733 100644
--- a/mod/embed/views/default/embed/css.php
+++ b/mod/embed/views/default/embed/css.php
@@ -5,6 +5,71 @@
  * @package embed
  */
 ?>
+.embed-wrapper {
+	width: 730px;
+	min-height: 400px;
+	margin: 5px;
+}
+.embed-wrapper h2 {
+	color: #333333;
+	margin-bottom: 10px;
+}
+.embed-wrapper .elgg-item {
+	cursor: pointer;
+}
+
+/* ***************************************
+	EMBED TABBED PAGE NAVIGATION
+*************************************** */
+.embed-wrapper .elgg-tabs a:hover {
+	color: #666;
+}
+
+.embed-wrapper p {
+	color: #333;
+}
+.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;
diff --git a/mod/embed/views/default/embed/embed.php b/mod/embed/views/default/embed/embed.php
index eeeb1d244..2d8de1ca4 100644
--- a/mod/embed/views/default/embed/embed.php
+++ b/mod/embed/views/default/embed/embed.php
@@ -10,48 +10,18 @@
  */
 
 $sections = elgg_extract('sections', $vars, array());
-$active_section = elgg_extract('active_section', $vars, array_shift(array_keys($sections)));
+$active_section = elgg_extract('active_section', $vars, array_shift(array_keys($sections)), false);
 $upload_sections = elgg_extract('upload_sections', $vars, array());
 $internal_id = elgg_extract('internal_id', $vars);
 
 if (!$sections) {
 	$content = elgg_echo('embed:no_sections');
 } else {
-	$offset = max(0, get_input('offset', 0));
-	$limit = get_input('limit', 10);
-
 	$content = elgg_view_title(elgg_echo('embed:media'));
-	//$content .= elgg_echo('embed:instructions');
-
-	// prepare tabbed menu
-	$tabs = array();
-	foreach ($sections as $section_id => $section_info) {
-		$tab = array(
-			'title' => $section_info['name'],
-			'url' => '#',
-			'url_class' => 'embed_section',
-			'url_id' => $section_id,
-		);
+	$content .= elgg_view('embed/tabs', $vars);
 
-		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')
-		);
-	}
-
-	$tabs_html = elgg_view('navigation/tabs', array('tabs' => $tabs));
-	$content .= $tabs_html;
+	$offset = (int)max(0, get_input('offset', 0));
+	$limit = (int)get_input('limit', 5);
 
 	// build the items and layout.
 	if ($active_section == 'upload' || array_key_exists($active_section, $sections)) {
@@ -59,8 +29,6 @@ if (!$sections) {
 		$layout = isset($section_info['layout']) ? $section_info['layout'] : 'list';
 
 		$params =  array(
-			//'type'	=> $type,
-			//'subtype'	=> $subtype,
 			'offset' => $offset,
 			'limit' => $limit,
 			'section' => $active_section,
@@ -73,10 +41,13 @@ if (!$sections) {
 		if ($section_content = elgg_view("embed/$active_section/content", $params)) {
 			// handles its own pagination
 			$content .= $section_content;
-		} elseif ($embed_info = elgg_trigger_plugin_hook('embed_get_items', $active_section, $params, array('items' => array(), 'count' => 0))) {
-			// check if we have an override for this section type.
-			$view = "embed/$active_section/item/$layout";
+		} else {
+			// see if anyone has any items to display for the active section
+			$result = array('items' => array(), 'count' => 0);
+			$embed_info = elgg_trigger_plugin_hook('embed_get_items', $active_section, $params, $result);
 
+			// do we use default view or has someone defined "embed/$active_section/item/$layout"
+			$view = "embed/$active_section/item/$layout";
 			if (!elgg_view_exists($view)) {
 				$view = "embed/item/$layout";
 			}
@@ -84,80 +55,32 @@ if (!$sections) {
 			if (!isset($embed_info['items']) || !is_array($embed_info['items']) || !count($embed_info['items'])) {
 				$content .= elgg_echo('embed:no_section_content');
 			} else {
-				// pull out some common tests
-				// embed requires ECML, but until we have plugin deps working
-				// we need to explicitly check and use a fallback.
-				if ($ecml_enabled = elgg_is_active_plugin('ecml')){
-					$ecml_valid_keyword = ecml_is_valid_keyword($active_section);
-				} else {
-					$ecml_valid_keyword = FALSE;
-				}
-				
-				$items_content = '<ul class="elgg-list">';
-				foreach ($embed_info['items'] as $item) {
-					$item_params = array(
-						'section' => $active_section,
-						'item' => $item,
-						'ecml_enabled' => $ecml_enabled,
-						'ecml_keyword' => ($ecml_valid_keyword) ? $active_section : 'entity',
-						'icon_size' => elgg_extract('icon_size', $section_info, 'tiny'),
-					);
-	
-					$items_content .= '<li class="elgg-list-item">' . elgg_view($view, $item_params) . '</li>';
-				}
-				$items_content .= '</ul>';
-				
-				$params['content'] = $items_content;
-				$params['count'] = $embed_info['count'];
-	
-				$content .= elgg_view('navigation/pagination', $params);
-				$content .= elgg_view("embed/layouts/$layout", $params);
+
+				elgg_push_context('widgets');
+				$content .= elgg_view_entity_list($embed_info['items'], array(
+					'full_view' => false,
+					'count' => $embed_info['count'],
+					'pagination' => true,
+					'position' => 'before',
+					'offset' => $offset,
+					'limit' => $limit,
+				));
+				elgg_pop_context();
+
+				$js = elgg_view('js/embed/inline', array(
+					'items' => $embed_info['items'],
+				));
 			}
-		} else {
-			$content .= elgg_echo('embed:no_section_content');
 		}
 	} else {
 		$content .= elgg_echo('embed:invalid_section');
 	}
 }
 
-echo $content;
-?>
-
-<?php //@todo: JS 1.8: ugly ?>
-<script type="text/javascript">
-$(function() {
-	var internal_id = '<?php echo addslashes($internal_id); ?>';
-
-	// Remove any existing "live" handlers
-	$('.embed_data').die('click');
-	$('.embed_section').die('click');
-	$('#facebox .elgg-pagination a').die('click');
-	
-	// insert embed codes
-	$('.embed_data').live('click', function() {
-		var embed_code = $(this).data('embed_code');
-		elggEmbedInsertContent(embed_code, internal_id);
-		
-		return false;
-	});
-
-	// tabs
-	$('.embed_section').live('click', function() {
-		var section = $(this).attr('id');
-		var url = elgg.config.wwwroot + 'embed/embed?active_section=' + section + '&internal_id=' + internal_id;
-		$('#facebox .body .content').load(url);
+echo '<div class="embed-wrapper">' . $content . '</div>';
 
-		return false;
-	});
-
-	// pagination
-	function elggPaginationClick() {
-		$('#facebox .body .content').load($(this).attr('href'));
-		return false;
-	}
-
-	$('#facebox .elgg-pagination a').live('click', elggPaginationClick);
-});
-
-</script>
+if (isset($js)) {
+	echo '<script type="text/javascript">';
+	echo $js;
+	echo '</script>';
+}
diff --git a/mod/embed/views/default/embed/js.php b/mod/embed/views/default/embed/js.php
deleted file mode 100644
index a0a2e8ff5..000000000
--- a/mod/embed/views/default/embed/js.php
+++ /dev/null
@@ -1,428 +0,0 @@
-<?php
-/**
- * JS interface for inserting content into the active editor.
- * 
- * @todo: 1.8 JS: Ugh
- */
-
-?>
-$(function() { 
-	$('a[rel*=facebox]').facebox();
-
-	// Only apply the .live binding after facebox has been displayed
-	$(document).bind('afterReveal.facebox', function() {
-	
-		// fire off the ajax upload
-		$('#file_embed_upload').live('submit', function() {
-			var options = {
-				success: function(data) {
-					var info = jQuery.parseJSON(data);
-
-					if (info.status == 'success') {
-						$('.popup .content').load(elgg.get_site_url() + 'embed/embed?active_section=file');
-					} else {
-						$('.popup .content').find('form').prepend('<p>' + info.message + '</p>');
-					}
-				}
-			};
-			$(this).ajaxSubmit(options);
-			return false;
-		});
-	});
-});
-function elggEmbedInsertContent(content, textAreaId) {
-	content = ' ' + content + ' ';
-	
-	// default input.
-	// if this doesn't match anything it won't add anything.
-	$('#' + textAreaId).val($('#' + textAreaId).val() + ' ' + content);
-	
-	<?php
-		// This view includes the guts of the function to do the inserting.
-		// Anything that overrides input/longtext with its own editor
-		// needs to supply its own function here that inserts
-		// content into textAreaId.
-		// See TinyMCE as an example.
-		
-		// for compatibility
-		// the old on that was overriden.
-		echo elgg_view('embed/addcontentjs');
-		
-		// the one you should extend.
-		//@todo This should fire a plugin hook or event, not require extending the view! >_<
-		echo elgg_view('embed/custom_insert_js');
-	?>
-	
-	
-	$.facebox.close();
-}
-
-/*
- * Facebox (for jQuery)
- * version: 1.2 (05/05/2008)
- * @requires jQuery v1.2 or later
- *
- * Examples at http://famspam.com/facebox/
- *
- * Licensed under the MIT:
- *   http://www.opensource.org/licenses/mit-license.php
- *
- * Copyright 2007, 2008 Chris Wanstrath [ chris@ozmm.org ]
- *
- * Usage:
- *
- *  jQuery(document).ready(function() {
- *    jQuery('a[rel*=facebox]').facebox()
- *  })
- *
- *  <a href="#terms" rel="facebox">Terms</a>
- *    Loads the #terms div in the box
- *
- *  <a href="terms.html" rel="facebox">Terms</a>
- *    Loads the terms.html page in the box
- *
- *  <a href="terms.png" rel="facebox">Terms</a>
- *    Loads the terms.png image in the box
- *
- *
- *  You can also use it programmatically:
- *
- *    jQuery.facebox('some html')
- *
- *  The above will open a facebox with "some html" as the content.
- *
- *    jQuery.facebox(function($) {
- *      $.get('blah.html', function(data) { $.facebox(data) })
- *    })
- *
- *  The above will show a loading screen before the passed function is called,
- *  allowing for a better ajaxy experience.
- *
- *  The facebox function can also display an ajax page or image:
- *
- *    jQuery.facebox({ ajax: 'remote.html' })
- *    jQuery.facebox({ image: 'dude.jpg' })
- *
- *  Want to close the facebox?  Trigger the 'close.facebox' document event:
- *
- *    jQuery(document).trigger('close.facebox')
- *
- *  Facebox also has a bunch of other hooks:
- *
- *    loading.facebox
- *    beforeReveal.facebox
- *    reveal.facebox (aliased as 'afterReveal.facebox')
- *    init.facebox
- *
- *  Simply bind a function to any of these hooks:
- *
- *   $(document).bind('reveal.facebox', function() { ...stuff to do after the facebox and contents are revealed... })
- *
- */
-(function($) {
-$.facebox = function(data, klass) {
-	$.facebox.loading()
-
-	if (data.ajax) fillFaceboxFromAjax(data.ajax)
-	else if (data.image) fillFaceboxFromImage(data.image)
-	else if (data.div) fillFaceboxFromHref(data.div)
-	else if ($.isFunction(data)) data.call($)
-	else $.facebox.reveal(data, klass)
-}
-
-/*
-   * Public, $.facebox methods
-   */
-
-$.extend($.facebox, {
-	settings: {
-	opacity      : 0.7,
-	overlay      : true,
-	loadingImage : '<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif',
-	closeImage   : '<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif',
-	imageTypes   : [ 'png', 'jpg', 'jpeg', 'gif' ],
-	faceboxHtml  : '\
-	<div id="facebox" class="hidden"> \
-	<div class="popup"> \
-		<div class="body"> \
-			<div class="footer"> \
-				<a href="#" class="close"> \
-					<img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" title="close" class="close_image" width="22" height="22" border="0" /> \
-				</a> \
-				</div> \
-				<div class="content"> \
-				</div> \
-		</div> \
-	</div> \
-	</div>'
-	},
-
-	loading: function() {
-	init()
-	if ($('#facebox .loading').length == 1) return true
-	showOverlay()
-
-	$('#facebox .content').empty()
-	$('#facebox .body').children().hide().end().
-		append('<div class="loading"><br /><br /><img src="'+$.facebox.settings.loadingImage+'"/><br /><br /></div>')
-
-	$('#facebox').css({
-		top:	getPageScroll()[1] + (getPageHeight() / 10),
-		// Curverider addition (pagewidth/2 - modalwidth/2)
-		left: ((getPageWidth() / 2) - ($('#facebox').width() / 2))
-	}).show()
-
-	$(document).bind('keydown.facebox', function(e) {
-		if (e.keyCode == 27) $.facebox.close()
-		return true
-	})
-	$(document).trigger('loading.facebox')
-	},
-
-	reveal: function(data, klass) {
-	$(document).trigger('beforeReveal.facebox')
-	if (klass) $('#facebox .content').addClass(klass)
-	$('#facebox .content').append(data)
-
-	setTimeout(function() {
-		$('#facebox .loading').remove();
-		$('#facebox .body').children().fadeIn('slow');
-		$('#facebox').css('left', $(window).width() / 2 - ($('#facebox').width() / 2));
-		$(document).trigger('reveal.facebox').trigger('afterReveal.facebox');
-		}, 100);
-
-	//$('#facebox .loading').remove()
-	//$('#facebox .body').children().fadeIn('slow')
-	//$('#facebox').css('left', $(window).width() / 2 - ($('#facebox').width() / 2))
-	//$(document).trigger('reveal.facebox').trigger('afterReveal.facebox')
-
-	},
-
-	close: function() {
-	$(document).trigger('close.facebox')
-	return false
-	}
-})
-
-/*
-   * Public, $.fn methods
-   */
-
-// Curverider addition
-/*
-	$.fn.wait = function(time, type) {
-		time = time || 3000;
-		type = type || "fx";
-		return this.queue(type, function() {
-			var self = this;
-			setTimeout(function() {
-				//$(self).queue();
-				$('#facebox .loading').remove();
-			}, time);
-		});
-	};
-*/
-
-$.fn.facebox = function(settings) {
-	init(settings)
-
-	function clickHandler() {
-	$.facebox.loading(true)
-
-	// support for rel="facebox.inline_popup" syntax, to add a class
-	// also supports deprecated "facebox[.inline_popup]" syntax
-	var klass = this.rel.match(/facebox\[?\.(\w+)\]?/)
-	if (klass) klass = klass[1]
-
-	fillFaceboxFromHref(this.href, klass)
-	return false
-	}
-
-	return this.click(clickHandler)
-}
-
-/*
-   * Private methods
-   */
-
-// called one time to setup facebox on this page
-function init(settings) {
-	if ($.facebox.settings.inited) return true
-	else $.facebox.settings.inited = true
-
-	$(document).trigger('init.facebox')
-	/* makeCompatible() */
-
-	var imageTypes = $.facebox.settings.imageTypes.join('|')
-	$.facebox.settings.imageTypesRegexp = new RegExp('\.' + imageTypes + '$', 'i')
-
-	if (settings) $.extend($.facebox.settings, settings)
-	$('body').append($.facebox.settings.faceboxHtml)
-
-	var preload = [ new Image(), new Image() ]
-	preload[0].src = $.facebox.settings.closeImage
-	preload[1].src = $.facebox.settings.loadingImage
-	preload.push(new Image())
-
-/*
-	$('#facebox').find('.b:first, .bl, .br, .tl, .tr').each(function() {
-	preload.push(new Image())
-	preload.slice(-1).src = $(this).css('background-image').replace(/url\((.+)\)/, '$1')
-	})
-*/
-
-	$('#facebox .close').click($.facebox.close)
-	$('#facebox .close_image').attr('src', $.facebox.settings.closeImage)
-}
-
-// getPageScroll() by quirksmode.com
-function getPageScroll() {
-	var xScroll, yScroll;
-	if (self.pageYOffset) {
-	yScroll = self.pageYOffset;
-	xScroll = self.pageXOffset;
-	} else if (document.documentElement && document.documentElement.scrollTop) {	 // Explorer 6 Strict
-	yScroll = document.documentElement.scrollTop;
-	xScroll = document.documentElement.scrollLeft;
-	} else if (document.body) {// all other Explorers
-	yScroll = document.body.scrollTop;
-	xScroll = document.body.scrollLeft;
-	}
-	return new Array(xScroll,yScroll)
-}
-
-	// Adapted from getPageSize() by quirksmode.com
-	function getPageHeight() {
-	var windowHeight
-	if (self.innerHeight) {	// all except Explorer
-	windowHeight = self.innerHeight;
-	} else if (document.documentElement && document.documentElement.clientHeight) { // Explorer 6 Strict Mode
-	windowHeight = document.documentElement.clientHeight;
-	} else if (document.body) { // other Explorers
-	windowHeight = document.body.clientHeight;
-	}
-	return windowHeight
-	}
-
-	// Curverider addition
-	function getPageWidth() {
-	var windowWidth;
-	if( typeof( window.innerWidth ) == 'number' ) {
-		windowWidth = window.innerWidth; //Non-IE
-	} else if( document.documentElement && ( document.documentElement.clientWidth ) ) {
-		windowWidth = document.documentElement.clientWidth; //IE 6+ in 'standards compliant mode'
-	} else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
-		windowWidth = document.body.clientWidth; //IE 4 compatible
-	}
-	return windowWidth
-	}
-
-
-
-// Backwards compatibility
-/*
-function makeCompatible() {
-	var $s = $.facebox.settings
-
-	$s.loadingImage = $s.loading_image || $s.loadingImage
-	$s.closeImage = $s.close_image || $s.closeImage
-	$s.imageTypes = $s.image_types || $s.imageTypes
-	$s.faceboxHtml = $s.facebox_html || $s.faceboxHtml
-}
-*/
-
-// Figures out what you want to display and displays it
-// formats are:
-//     div: #id
-//   image: blah.extension
-//    ajax: anything else
-function fillFaceboxFromHref(href, klass) {
-	// div
-	if (href.match(/#/)) {
-	var url    = window.location.href.split('#')[0]
-	var target = href.replace(url,'')
-	$.facebox.reveal($(target).clone().show(), klass)
-
-	// image
-	} else if (href.match($.facebox.settings.imageTypesRegexp)) {
-	fillFaceboxFromImage(href, klass)
-	// ajax
-	} else {
-	fillFaceboxFromAjax(href, klass)
-	}
-}
-
-function fillFaceboxFromImage(href, klass) {
-	var image = new Image()
-	image.onload = function() {
-	$.facebox.reveal('<div class="image"><img src="' + image.src + '" /></div>', klass)
-	}
-	image.src = href
-}
-
-function fillFaceboxFromAjax(href, klass) {
-	$.get(href, function(data) { $.facebox.reveal(data, klass) })
-}
-
-function skipOverlay() {
-	return $.facebox.settings.overlay == false || $.facebox.settings.opacity === null
-}
-
-function showOverlay() {
-	if (skipOverlay()) return
-
-	if ($('facebox_overlay').length == 0)
-	$("body").append('<div id="facebox_overlay" class="facebox_hide"></div>')
-
-	$('#facebox_overlay').hide().addClass("facebox_overlayBG")
-	.css('opacity', $.facebox.settings.opacity)
-	/* .click(function() { $(document).trigger('close.facebox') }) */
-	.fadeIn(400)
-	return false
-}
-
-function hideOverlay() {
-	if (skipOverlay()) return
-
-	$('#facebox_overlay').fadeOut(400, function(){
-	$("#facebox_overlay").removeClass("facebox_overlayBG")
-	$("#facebox_overlay").addClass("facebox_hide")
-	$("#facebox_overlay").remove()
-	})
-
-	return false
-}
-
-/*
-   * Bindings
-   */
-
-$(document).bind('close.facebox', function() {
-	$(document).unbind('keydown.facebox')
-	$('#facebox').fadeOut(function() {
-	$('#facebox .content').removeClass().addClass('content')
-	hideOverlay()
-	$('#facebox .loading').remove()
-	})
-})
-
-
-
-
-	// Curverider addition
-	$(window).resize(function(){
-	//alert("resized");
-
-	$('#facebox').css({
-		top:	getPageScroll()[1] + (getPageHeight() / 10),
-		left: ((getPageWidth() / 2) - 365)
-	})
-
-
-	});
-
-
-
-
-
-})(jQuery);
diff --git a/mod/embed/views/default/embed/tabs.php b/mod/embed/views/default/embed/tabs.php
new file mode 100644
index 000000000..3f377fee5
--- /dev/null
+++ b/mod/embed/views/default/embed/tabs.php
@@ -0,0 +1,40 @@
+<?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/embed/upload/content.php b/mod/embed/views/default/embed/upload/content.php
index b7bcc76a0..8bedf5ad1 100644
--- a/mod/embed/views/default/embed/upload/content.php
+++ b/mod/embed/views/default/embed/upload/content.php
@@ -4,6 +4,7 @@
  */
 $upload_sections = elgg_extract('upload_sections', $vars, array());
 $active_section = get_input('active_upload_section', array_shift(array_keys($upload_sections)));
+$active_section = preg_replace('[\W]', '', $active_section);
 
 $options = array();
 
@@ -19,16 +20,21 @@ if ($upload_sections) {
 		'value' => $active_section
 	));
 
-	echo "<div class='embed_modal_upload'>";
-	echo "<p>" . elgg_echo('embed:upload_type') . "$input</p>";
-
+	// hack this in for now as we clean up this mess
+	$form_vars = array(
+		'enctype' => 'multipart/form-data',
+		'class' => 'elgg-form',
+	);
+	$upload_content = elgg_view_form('file/upload', $form_vars);
+/*
 	if (!$upload_content = elgg_view($upload_sections[$active_section]['view'])) {
 		$upload_content = elgg_echo('embed:no_upload_content');
 	}
-
-	echo $upload_content . "</div>";
-
-	elgg_load_js('elgg.embed');
+*/
+	echo "<div class='mbm'>" . elgg_echo('embed:upload_type') . "$input</div>";
+	echo "<div class='embed-upload'>";
+	echo $upload_content;
+	echo "</div>";
 
 } else {
 	echo elgg_echo('embed:no_upload_sections');
diff --git a/mod/embed/views/default/js/embed/embed.php b/mod/embed/views/default/js/embed/embed.php
new file mode 100644
index 000000000..ea92ba1fd
--- /dev/null
+++ b/mod/embed/views/default/js/embed/embed.php
@@ -0,0 +1,108 @@
+elgg.provide('elgg.embed');
+
+elgg.embed.init = function() {
+
+	// inserts the embed content into the textarea
+	$(".embed-wrapper .elgg-item").live('click', elgg.embed.insert);
+
+	// caches the current textarea id
+	$(".embed-control").live('click', function() {
+		var classes = $(this).attr('class');
+		var embedClass = classes.split(/[, ]+/).pop();
+		var textAreaId = embedClass.substr(embedClass.indexOf('embed-control-') + "embed-control-".length);
+		elgg.embed.textAreaId = textAreaId;
+	});
+
+	// special pagination helper for lightbox
+	$('.embed-wrapper .elgg-pagination a').live('click', elgg.embed.pagination);
+
+	$('.embed-section').live('click', elgg.embed.loadTab);
+
+	$('.embed-upload .elgg-form').live('submit', elgg.embed.submit);
+}
+
+/**
+ * Inserts data attached to an embed list item in textarea
+ *
+ * @todo generalize lightbox closing and wysiwyg refreshing
+ *
+ * @param {Object} event
+ * @return void
+ */
+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'); ?>
+
+	$.fancybox.close();
+
+	event.preventDefault();
+}
+
+/**
+ * Submit an upload form through Ajax
+ *
+ * Requires the jQuery Form Plugin. Because files cannot be uploaded with
+ * XMLHttpRequest, the plugin uses an invisible iframe. This results in the
+ * the X-Requested-With header not being set. To work around this, we are
+ * sending the header as a POST variable and Elgg's code checks for it in
+ * elgg_is_xhr().
+ *
+ * @param {Object} event
+ * @return bool
+ */
+elgg.embed.submit = function(event) {
+	
+	$(this).ajaxSubmit({
+		dataType : 'json',
+		data     : { 'X-Requested-With' : 'XMLHttpRequest'},
+		success  : function(response) {
+			if (response) {
+				if (response.system_messages) {
+					elgg.register_error(response.system_messages.error);
+					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?active_section=file';
+					$('.embed-wrapper').parent().load(url);
+				}
+			}
+		}
+	});
+
+	// this was bubbling up the DOM causing a submission
+	event.preventDefault();
+	event.stopPropagation();
+}
+
+/**
+ * Loads the next chunk of content within the lightbox
+ *
+ * @param {Object} event
+ * @return void
+ */
+elgg.embed.pagination = function(event) {
+	$('.embed-wrapper').parent().load($(this).attr('href'));
+	event.preventDefault();
+}
+
+/**
+ * Loads an embed tab
+ *
+ * @param {Object} 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);
+	event.preventDefault();
+}
+
+elgg.register_hook_handler('init', 'system', elgg.embed.init);
diff --git a/mod/embed/views/default/js/embed/inline.php b/mod/embed/views/default/js/embed/inline.php
new file mode 100644
index 000000000..0672a68f8
--- /dev/null
+++ b/mod/embed/views/default/js/embed/inline.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Inline embed JavaScript for attaching the insert data to list items
+ *
+ * @uses $vars['items']
+ */
+
+foreach ($vars['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);
+
+	$icon = "<img src=\"{$item->getIcon($icon_size)}\" />" . htmlspecialchars($title, ENT_QUOTES, 'UTF-8', false);
+
+	$embed_code = elgg_view('output/url', array(
+		'href' => $item->getURL(),
+		'title' => $title,
+		'text' => $icon,
+		'encode_text' => false,
+	));
+	$embed_code = json_encode($embed_code);
+
+	echo "$('#elgg-object-{$item->getGUID()}').data('embed_code', $embed_code);";
+}
\ No newline at end of file
diff --git a/mod/externalpages/views/default/forms/expages/edit.php b/mod/externalpages/views/default/forms/expages/edit.php
index b0060477e..ca83ea7df 100644
--- a/mod/externalpages/views/default/forms/expages/edit.php
+++ b/mod/externalpages/views/default/forms/expages/edit.php
@@ -49,9 +49,10 @@ echo <<<EOT
 	<label>$external_page_title</label>
 	$input_area
 </div>
+<div class="elgg-foot">
 $hidden_value
 $hidden_type
 $submit_input
-
+<div>
 EOT;
 
diff --git a/mod/file/actions/file/upload.php b/mod/file/actions/file/upload.php
index 5d5c28bee..88a01745d 100644
--- a/mod/file/actions/file/upload.php
+++ b/mod/file/actions/file/upload.php
@@ -13,8 +13,6 @@ $container_guid = (int) get_input('container_guid', 0);
 $guid = (int) get_input('file_guid');
 $tags = get_input("tags");
 
-$ajax = get_input('ajax', FALSE);
-
 if ($container_guid == 0) {
 	$container_guid = elgg_get_logged_in_user_guid();
 }
@@ -33,17 +31,8 @@ if ($new_file) {
 	if (empty($_FILES['upload']['name'])) {
 
 		$error = elgg_echo('file:nofile');
-
-		if ($ajax) {
-			echo json_encode(array(
-				'status' => 'error',
-				'message' => $error
-			));
-			exit;
-		} else {
-			register_error($error);
-			forward(REFERER);
-		}
+		register_error($error);
+		forward(REFERER);
 	}
 
 	$file = new FilePluginFile();
@@ -106,9 +95,10 @@ if (isset($_FILES['upload']['name']) && !empty($_FILES['upload']['name'])) {
 	$file->originalfilename = $_FILES['upload']['name'];
 	$file->simpletype = file_get_simple_type($_FILES['upload']['type']);
 
+	// Open the file to guarantee the directory exists
 	$file->open("write");
-	$file->write(get_uploaded_file('upload'));
 	$file->close();
+	move_uploaded_file($_FILES['upload']['tmp_name'], $file->getFilenameOnFilestore());
 
 	$guid = $file->save();
 
@@ -158,44 +148,22 @@ elgg_clear_sticky_form('file');
 
 
 // handle results differently for new files and file updates
-// ajax is only for new files from embed right now.
 if ($new_file) {
 	if ($guid) {
 		$message = elgg_echo("file:saved");
-		if ($ajax) {
-			echo json_encode(array(
-				'status' => 'success',
-				'message' => $message
-			));
-			exit;
-
-		} else {
-			system_message($message);
-			add_to_river('river/object/file/create', 'create', elgg_get_logged_in_user_guid(), $file->guid);
-		}
+		system_message($message);
+		add_to_river('river/object/file/create', 'create', elgg_get_logged_in_user_guid(), $file->guid);
 	} else {
 		// failed to save file object - nothing we can do about this
 		$error = elgg_echo("file:uploadfailed");
-
-		if ($ajax) {
-			echo json_encode(array(
-				'status' => 'error',
-				'message' => $error
-			));
-			exit;
-
-		} else {
-			register_error($error);
-		}
+		register_error($error);
 	}
 
-	if (!$ajax) {
-		$container = get_entity($container_guid);
-		if (elgg_instanceof($container, 'group')) {
-			forward("file/group/$container->guid/all");
-		} else {
-			forward("file/owner/$container->username");
-		}
+	$container = get_entity($container_guid);
+	if (elgg_instanceof($container, 'group')) {
+		forward("file/group/$container->guid/all");
+	} else {
+		forward("file/owner/$container->username");
 	}
 
 } else {
diff --git a/mod/file/download.php b/mod/file/download.php
index a386d490f..8e0287a1e 100644
--- a/mod/file/download.php
+++ b/mod/file/download.php
@@ -33,8 +33,7 @@ if (strpos($mime, "image/") !== false) {
 	header("Content-Disposition: attachment; filename=\"$filename\"");
 }
 
-$contents = $file->grabFile();
-$splitString = str_split($contents, 8192);
-foreach ($splitString as $chunk) {
-	echo $chunk;
-}
+ob_clean();
+flush();
+readfile($file->getFilenameOnFilestore());
+exit;
diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php
index 7ced3f112..72b198d54 100644
--- a/mod/file/languages/en.php
+++ b/mod/file/languages/en.php
@@ -11,11 +11,8 @@ $english = array(
 	 * Menu items and titles
 	 */
 	'file' => "Files",
-	'files' => "My Files",
-	'file:yours' => "Your files",
-	'file:yours:friends' => "Your friends' files",
 	'file:user' => "%s's files",
-	'file:friends' => "%s's friends' files",
+	'file:friends' => "Friends' files",
 	'file:all' => "All site files",
 	'file:edit' => "Edit file",
 	'file:more' => "More files",
@@ -73,8 +70,8 @@ $english = array(
 
 	'file:display:number' => "Number of files to display",
 
-	'file:river:create' => 'uploaded the file',
-	'river:commented:object:file' => 'the file',
+	'river:create:object:file' => '%s uploaded the file %s',
+	'river:comment:object:file' => '%s commented on the file %s',
 
 	'item:object:file' => 'Files',
 
diff --git a/mod/file/pages/file/edit.php b/mod/file/pages/file/edit.php
index 66529af0b..b396c6e9b 100644
--- a/mod/file/pages/file/edit.php
+++ b/mod/file/pages/file/edit.php
@@ -35,7 +35,6 @@ $body = elgg_view_layout('content', array(
 	'content' => $content,
 	'title' => $title,
 	'filter' => '',
-	'buttons' => '',
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/file/pages/file/friends.php b/mod/file/pages/file/friends.php
index 65fc66f62..0b351efaf 100644
--- a/mod/file/pages/file/friends.php
+++ b/mod/file/pages/file/friends.php
@@ -11,8 +11,9 @@ elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
 
+elgg_register_title_button();
 
-$title = elgg_echo("file:friends", array($owner->name));
+$title = elgg_echo("file:friends");
 
 // offset is grabbed in list_user_friends_objects
 $content = list_user_friends_objects($owner->guid, 'file', 10, false);
diff --git a/mod/file/pages/file/owner.php b/mod/file/pages/file/owner.php
index 69ec30425..4e2ec89d4 100644
--- a/mod/file/pages/file/owner.php
+++ b/mod/file/pages/file/owner.php
@@ -13,24 +13,24 @@ $owner = elgg_get_page_owner_entity();
 elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 elgg_push_breadcrumb($owner->name);
 
+elgg_register_title_button();
+
 $params = array();
 
 if ($owner->guid == elgg_get_logged_in_user_guid()) {
 	// user looking at own files
-	$title = elgg_echo('file:yours');
 	$params['filter_context'] = 'mine';
 } else if (elgg_instanceof($owner, 'user')) {
 	// someone else's files
-	$title = elgg_echo("file:user", array($owner->name));
-	// do not show button or select a tab when viewing someone else's posts
+	// do not show select a tab when viewing someone else's posts
 	$params['filter_context'] = 'none';
-	$params['buttons'] = '';
 } else {
 	// group files
-	$title = elgg_echo("file:user", array($owner->name));
 	$params['filter'] = '';
 }
 
+$title = elgg_echo("file:user", array($owner->name));
+
 // List files
 $content = elgg_list_entities(array(
 	'types' => 'object',
diff --git a/mod/file/pages/file/search.php b/mod/file/pages/file/search.php
index 77c92f444..3e85d45db 100644
--- a/mod/file/pages/file/search.php
+++ b/mod/file/pages/file/search.php
@@ -15,10 +15,10 @@ group_gatekeeper();
 
 // Get input
 $md_type = 'simpletype';
-$tag = get_input('tag');
+// avoid reflected XSS attacks by only allowing alnum characters
+$file_type = preg_replace('[\W]', '', get_input('tag'));
 $listtype = get_input('listtype');
-$friends = get_input('friends', false);
-
+$friends = (bool)get_input('friends', false);
 
 // breadcrumbs
 elgg_push_breadcrumb(elgg_echo('file'), "file/all");
@@ -32,8 +32,8 @@ if ($owner) {
 if ($friends && $owner) {
 	elgg_push_breadcrumb(elgg_echo('friends'), "file/friends/$owner->username");
 }
-if ($tag) {
-	elgg_push_breadcrumb(elgg_echo("file:type:$tag"));
+if ($file_type) {
+	elgg_push_breadcrumb(elgg_echo("file:type:$file_type"));
 } else {
 	elgg_push_breadcrumb(elgg_echo('all'));
 }
@@ -41,10 +41,10 @@ if ($tag) {
 // title
 if (!$owner) {
 	// world files
-	$title = elgg_echo('all') . ' ' . elgg_echo("file:type:$tag");
+	$title = elgg_echo('all') . ' ' . elgg_echo("file:type:$file_type");
 } else {
 	$friend_string = $friends ? elgg_echo('file:title:friends') : '';
-	$type_string = elgg_echo("file:type:$tag");
+	$type_string = elgg_echo("file:type:$file_type");
 	$title = elgg_echo('file:list:title', array($owner->name, $friend_string, $type_string));
 }
 
@@ -76,9 +76,9 @@ $params = array(
 	'full_view' => false,
 );
 
-if ($tag) {
+if ($file_type) {
 	$params['metadata_name'] = $md_type;
-	$params['metadata_value'] = $tag;
+	$params['metadata_value'] = $file_type;
 	$content = elgg_list_entities_from_metadata($params);
 } else {
 	$content = elgg_list_entities($params);
@@ -86,7 +86,6 @@ if ($tag) {
 
 $body = elgg_view_layout('content', array(
 	'filter' => '',
-	'buttons' => '',
 	'content' => $content,
 	'title' => $title,
 	'sidebar' => $sidebar,
diff --git a/mod/file/pages/file/upload.php b/mod/file/pages/file/upload.php
index d97cc038d..3aa25b6db 100644
--- a/mod/file/pages/file/upload.php
+++ b/mod/file/pages/file/upload.php
@@ -32,7 +32,6 @@ $body = elgg_view_layout('content', array(
 	'content' => $content,
 	'title' => $title,
 	'filter' => '',
-	'buttons' => '',
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/file/pages/file/view.php b/mod/file/pages/file/view.php
index daa2a400e..50c55a74f 100644
--- a/mod/file/pages/file/view.php
+++ b/mod/file/pages/file/view.php
@@ -22,14 +22,20 @@ $title = $file->title;
 
 elgg_push_breadcrumb($title);
 
-$content = elgg_view_entity($file, true);
+$content = elgg_view_entity($file, array('full_view' => true));
 $content .= elgg_view_comments($file);
 
+elgg_register_menu_item('title', array(
+	'name' => 'download',
+	'text' => elgg_echo('file:download'),
+	'href' => "mod/file/download.php?file_guid=$file->guid",
+	'link_class' => 'elgg-button elgg-button-action',
+));
+
 $body = elgg_view_layout('content', array(
 	'content' => $content,
 	'title' => $title,
 	'filter' => '',
-	'header' => '',
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/file/pages/file/world.php b/mod/file/pages/file/world.php
index bfe965084..e438ca2f0 100644
--- a/mod/file/pages/file/world.php
+++ b/mod/file/pages/file/world.php
@@ -7,6 +7,8 @@
 
 elgg_push_breadcrumb(elgg_echo('file'));
 
+elgg_register_title_button();
+
 $limit = get_input("limit", 10);
 
 $title = elgg_echo('file:all');
diff --git a/mod/file/views/default/file/embed_upload.php b/mod/file/views/default/file/embed_upload.php
deleted file mode 100644
index e5076b052..000000000
--- a/mod/file/views/default/file/embed_upload.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- * Files upload form for embed
- */
-
-echo elgg_view_form('file/upload', array('id' => 'file_embed_upload'), array('ajax' => TRUE));
-
-
diff --git a/mod/file/views/default/file/group_module.php b/mod/file/views/default/file/group_module.php
index 830b1096c..c37b13927 100644
--- a/mod/file/views/default/file/group_module.php
+++ b/mod/file/views/default/file/group_module.php
@@ -14,10 +14,6 @@ $all_link = elgg_view('output/url', array(
 	'text' => elgg_echo('link:view:all'),
 ));
 
-$header = "<span class=\"groups-widget-viewall\">$all_link</span>";
-$header .= '<h3>' . elgg_echo('file:group') . '</h3>';
-
-
 elgg_push_context('widgets');
 $options = array(
 	'type' => 'object',
@@ -34,12 +30,14 @@ if (!$content) {
 	$content = '<p>' . elgg_echo('file:none') . '</p>';
 }
 
-if ($group->canWriteToContainer()) {
-	$new_link = elgg_view('output/url', array(
-		'href' => "file/add/$group->guid",
-		'text' => elgg_echo('file:add'),
-	));
-	$content .= "<span class='elgg-widget-more'>$new_link</span>";
-}
+$new_link = elgg_view('output/url', array(
+	'href' => "file/add/$group->guid",
+	'text' => elgg_echo('file:add'),
+));
 
-echo elgg_view_module('info', '', $content, array('header' => $header));
+echo elgg_view('groups/profile/module', array(
+	'title' => elgg_echo('file:group'),
+	'content' => $content,
+	'all_link' => $all_link,
+	'add_link' => $new_link,
+));
diff --git a/mod/file/views/default/file/typecloud.php b/mod/file/views/default/file/typecloud.php
index ce4d6c127..4253bf674 100644
--- a/mod/file/views/default/file/typecloud.php
+++ b/mod/file/views/default/file/typecloud.php
@@ -15,7 +15,7 @@ function file_type_cloud_get_url($type, $friends) {
 	} 
 
 	if ($type->tag == "image") {
-		$url .= "&listtype=gallery";
+		$url .= "&list_type=gallery";
 	}
 
 	if (elgg_get_page_owner_guid()) {
diff --git a/mod/file/views/default/forms/file/upload.php b/mod/file/views/default/forms/file/upload.php
index 001e66674..f637a419e 100644
--- a/mod/file/views/default/forms/file/upload.php
+++ b/mod/file/views/default/forms/file/upload.php
@@ -11,13 +11,17 @@ $desc = elgg_extract('description', $vars, '');
 $tags = elgg_extract('tags', $vars, '');
 $access_id = elgg_extract('access_id', $vars, ACCESS_DEFAULT);
 $container_guid = elgg_extract('container_guid', $vars);
+if (!$container_guid) {
+	$container_guid = elgg_get_logged_in_user_guid();
+}
 $guid = elgg_extract('guid', $vars, null);
-$ajax = elgg_extract('ajax', $vars, FALSE);
 
 if ($guid) {
 	$file_label = elgg_echo("file:replace");
+	$submit_label = elgg_echo('save');
 } else {
 	$file_label = elgg_echo("file:file");
+	$submit_label = elgg_echo('upload');
 }
 
 ?>
@@ -49,21 +53,16 @@ if ($categories) {
 	<label><?php echo elgg_echo('access'); ?></label><br />
 	<?php echo elgg_view('input/access', array('name' => 'access_id', 'value' => $access_id)); ?>
 </div>
-<div>
+<div class="elgg-foot">
 <?php
 
 echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid));
 
-//@todo this should not be necessary in 1.8... -- ajax actions can be auto-detected
-if ($ajax) {
-	echo elgg_view('input/hidden', array('name' => 'ajax', 'value' => 1));
-}
-
 if ($guid) {
 	echo elgg_view('input/hidden', array('name' => 'file_guid', 'value' => $guid));
 }
 
-echo elgg_view('input/submit', array('value' => elgg_echo("save")));
+echo elgg_view('input/submit', array('value' => $submit_label));
 
 ?>
 </div>
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 93a21c8e6..95e190d35 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -67,12 +67,6 @@ if ($full && !elgg_in_context('gallery')) {
 		$extra = elgg_view("file/specialcontent/$base_type/default", $vars);
 	}
 
-	$download = elgg_view('output/url', array(
-		'href' => "mod/file/download.php?file_guid=$file->guid",
-		'text' => elgg_echo("file:download"),
-		'class' => 'elgg-button elgg-button-action',
-	));
-
 	$header = elgg_view_title($file->title);
 
 	$params = array(
@@ -82,17 +76,16 @@ if ($full && !elgg_in_context('gallery')) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
+	$params = $params + $vars;
 	$list_body = elgg_view('object/elements/summary', $params);
 
 	$file_info = elgg_view_image_block($file_icon, $list_body);
 
 	echo <<<HTML
-$header
 $file_info
 <div class="file elgg-content">
 	$body
 	$extra
-	<p>$download</p>
 </div>
 HTML;
 
@@ -112,6 +105,7 @@ HTML;
 		'tags' => $tags,
 		'content' => $excerpt,
 	);
+	$params = $params + $vars;
 	$list_body = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view_image_block($file_icon, $list_body);
diff --git a/mod/file/views/default/river/object/file/create.php b/mod/file/views/default/river/object/file/create.php
index 620d1d18c..dad629120 100644
--- a/mod/file/views/default/river/object/file/create.php
+++ b/mod/file/views/default/river/object/file/create.php
@@ -7,29 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = elgg_get_excerpt($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
-
-$group_string = '';
-$container = $object->getContainerEntity();
-if ($container instanceof ElggGroup) {
-	$params = array(
-		'href' => $container->getURL(),
-		'text' => $container->name,
-	);
-	$group_link = elgg_view('output/url', $params);
-	$group_string = elgg_echo('river:ingroup', array($group_link));
-}
-
-echo elgg_echo('file:river:create');
-
-echo " $link $group_string";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
\ No newline at end of file
diff --git a/mod/groups/actions/discussion/reply/save.php b/mod/groups/actions/discussion/reply/save.php
index 109938dbb..a1ed036b6 100644
--- a/mod/groups/actions/discussion/reply/save.php
+++ b/mod/groups/actions/discussion/reply/save.php
@@ -9,6 +9,7 @@ gatekeeper();
 // Get input
 $entity_guid = (int) get_input('entity_guid');
 $text = get_input('group_topic_post');
+$annotation_id = (int) get_input('annotation_id');
 
 // reply cannot be empty
 if (empty($text)) {
@@ -30,16 +31,30 @@ if (!$group->canWriteToContainer($user)) {
 	forward(REFERER);
 }
 
-
-// add the reply to the forum topic
-$reply_id = $topic->annotate('group_topic_post', $text, $topic->access_id, $user->guid);
-if ($reply_id == false) {
-	system_message(elgg_echo('groupspost:failure'));
-	forward(REFERER);
+// if editing a reply, make sure it's valid
+if ($annotation_id) {
+	$annotation = elgg_get_annotation_from_id($annotation_id);
+	if (!$annotation->canEdit()) {
+		register_error(elgg_echo('groups:notowner'));
+		forward(REFERER);
+	}
+
+	$annotation->value = $text;
+	if (!$annotation->save()) {
+		system_message(elgg_echo('groups:forumpost:error'));
+		forward(REFERER);
+	}
+	system_message(elgg_echo('groups:forumpost:edited'));
+} else {
+	// add the reply to the forum topic
+	$reply_id = $topic->annotate('group_topic_post', $text, $topic->access_id, $user->guid);
+	if ($reply_id == false) {
+		system_message(elgg_echo('groupspost:failure'));
+		forward(REFERER);
+	}
+
+	add_to_river('river/annotation/group_topic_post/reply', 'reply', $user->guid, $topic->guid, "", 0, $reply_id);
+	system_message(elgg_echo('groupspost:success'));
 }
 
-add_to_river('river/annotation/group_topic_post/reply', 'reply', $user->guid, $topic->guid, "", 0, $reply_id);
-
-system_message(elgg_echo('groupspost:success'));
-
 forward(REFERER);
diff --git a/mod/groups/actions/groups/membership/remove.php b/mod/groups/actions/groups/membership/remove.php
new file mode 100644
index 000000000..650d35286
--- /dev/null
+++ b/mod/groups/actions/groups/membership/remove.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Remove a user from a group
+ *
+ * @package ElggGroups
+ */
+
+$user_guid = get_input('user_guid');
+$group_guid = get_input('group_guid');
+
+$user = get_entity($user_guid);
+$group = get_entity($group_guid);
+
+elgg_set_page_owner_guid($group->guid);
+
+if (($user instanceof ElggUser) && ($group instanceof ElggGroup) && $group->canEdit()) {
+	// Don't allow removing group owner
+	if ($group->getOwnerGUID() != $user->getGUID()) {
+		if ($group->leave($user)) {
+			system_message(elgg_echo("groups:removed", array($user->name)));
+		} else {
+			register_error(elgg_echo("groups:cantremove"));
+		}
+	} else {
+		register_error(elgg_echo("groups:cantremove"));
+	}
+} else {
+	register_error(elgg_echo("groups:cantremove"));
+}
+
+forward(REFERER);
diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index 63a6df3a9..9f8bed9a4 100644
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -166,6 +166,9 @@ $english = array(
 	'groups:notitle' => 'Groups must have a title',
 	'groups:cantjoin' => 'Can not join group',
 	'groups:cantleave' => 'Could not leave group',
+	'groups:removeuser' => 'Remove from group',
+	'groups:cantremove' => 'Cannot remove user from group',
+	'groups:removed' => 'Successfully removed %s from group',
 	'groups:addedtogroup' => 'Successfully added the user to the group',
 	'groups:joinrequestnotmade' => 'Could not request to join group',
 	'groups:joinrequestmade' => 'Requested to join group',
@@ -210,10 +213,10 @@ or click below to view the group's join requests:
 		Forum river items
 	*/
 
-	'groups:river:create' => 'created the group',
-	'groups:river:join' => 'joined the group',
-	'forumtopic:river:create' => 'added a new discussion topic',
-	'groups:river:reply' => 'replied on the discussion topic',
+	'river:create:group:default' => '%s created the group %s',
+	'river:join:group:default' => '%s joined the group %s',
+	'river:create:object:groupforumtopic' => '%s added a new discussion topic %s',
+	'river:reply:object:groupforumtopic' => '%s replied on the discussion topic %s',
 	
 	'groups:nowidgets' => 'No widgets have been defined for this group.',
 
diff --git a/mod/groups/lib/discussion.php b/mod/groups/lib/discussion.php
index 94d212ef6..e129e0f9d 100644
--- a/mod/groups/lib/discussion.php
+++ b/mod/groups/lib/discussion.php
@@ -23,7 +23,6 @@ function discussion_handle_all_page() {
 		'content' => $content,
 		'title' => elgg_echo('discussion:latest'),
 		'filter' => '',
-		'buttons' => '',
 	);
 	$body = elgg_view_layout('content', $params);
 
@@ -46,6 +45,8 @@ function discussion_handle_list_page($guid) {
 	}
 	elgg_push_breadcrumb($group->name);
 
+	elgg_register_title_button();
+
 	group_gatekeeper();
 
 	$title = elgg_echo('item:object:groupforumtopic');
@@ -67,10 +68,6 @@ function discussion_handle_list_page($guid) {
 		'filter' => '',
 	);
 
-	if (!$group->canWriteToContainer()) {
-		$params['buttons'] = '';
-	}
-
 	$body = elgg_view_layout('content', $params);
 
 	echo elgg_view_page($title, $body);
@@ -131,7 +128,6 @@ function discussion_handle_edit_page($type, $guid) {
 		'content' => $content,
 		'title' => $title,
 		'filter' => '',
-		'buttons' => '',
 	);
 	$body = elgg_view_layout('content', $params);
 
@@ -167,7 +163,7 @@ function discussion_handle_view_page($guid) {
 	elgg_push_breadcrumb($group->name, "discussion/owner/$group->guid");
 	elgg_push_breadcrumb($topic->title);
 
-	$content = elgg_view_entity($topic, true);
+	$content = elgg_view_entity($topic, array('full_view' => true));
 	if ($topic->status == 'closed') {
 		$content .= elgg_view('discussion/replies', array(
 			'entity' => $topic,
@@ -190,7 +186,6 @@ function discussion_handle_view_page($guid) {
 		'content' => $content,
 		'title' => $topic->title,
 		'filter' => '',
-		'buttons' => '',
 	);
 	$body = elgg_view_layout('content', $params);
 
diff --git a/mod/groups/lib/groups.php b/mod/groups/lib/groups.php
index 279c5f238..12a22deb4 100644
--- a/mod/groups/lib/groups.php
+++ b/mod/groups/lib/groups.php
@@ -12,6 +12,8 @@ function groups_handle_all_page() {
 	elgg_pop_breadcrumb();
 	elgg_push_breadcrumb(elgg_echo('groups'));
 
+	elgg_register_title_button();
+
 	$selected_tab = get_input('filter', 'newest');
 
 	switch ($selected_tab) {
@@ -81,7 +83,6 @@ function groups_search_page() {
 		'content' => $content,
 		'sidebar' => $sidebar,
 		'filter' => false,
-		'buttons' => false,
 		'title' => $title,
 	);
 	$body = elgg_view_layout('content', $params);
@@ -99,6 +100,8 @@ function groups_handle_owned_page() {
 	$title = elgg_echo('groups:owned');
 	elgg_push_breadcrumb($title);
 
+	elgg_register_title_button();
+
 	$content = elgg_list_entities(array(
 		'type' => 'group',
 		'owner_guid' => elgg_get_page_owner_guid(),
@@ -125,6 +128,8 @@ function groups_handle_mine_page() {
 	$title = elgg_echo('groups:yours');
 	elgg_push_breadcrumb($title);
 
+	elgg_register_title_button();
+
 	$content = elgg_list_entities_from_relationship_count(array(
 		'type' => 'group',
 		'relationship' => 'member',
@@ -175,7 +180,6 @@ function groups_handle_edit_page($page, $guid = 0) {
 		'content' => $content,
 		'title' => $title,
 		'filter' => '',
-		'buttons' => '',
 	);
 	$body = elgg_view_layout('content', $params);
 
@@ -201,7 +205,6 @@ function groups_handle_invitations_page() {
 		'content' => $content,
 		'title' => $title,
 		'filter' => '',
-		'buttons' => '',
 	);
 	$body = elgg_view_layout('content', $params);
 
@@ -234,11 +237,12 @@ function groups_handle_profile_page($guid) {
 		$sidebar = '';
 	}
 
+	groups_register_profile_buttons($group);
+
 	$params = array(
 		'content' => $content,
 		'sidebar' => $sidebar,
 		'title' => $group->name,
-		'buttons' => elgg_view('groups/profile/buttons', array('entity' => $group)),
 		'filter' => '',
 	);
 	$body = elgg_view_layout('content', $params);
@@ -280,7 +284,6 @@ function groups_handle_activity_page($guid) {
 	$params = array(
 		'content' => $content,
 		'title' => $title,
-		'buttons' => '',
 		'filter' => '',
 	);
 	$body = elgg_view_layout('content', $params);
@@ -307,7 +310,7 @@ function groups_handle_members_page($guid) {
 	$title = elgg_echo('groups:members:title', array($group->name));
 
 	elgg_push_breadcrumb($group->name, $group->getURL());
-	elgg_push_breadcrumb(elgg_echo('groups:members:'));
+	elgg_push_breadcrumb(elgg_echo('groups:members'));
 
 	$content = elgg_list_entities_from_relationship(array(
 		'relationship' => 'member',
@@ -320,7 +323,6 @@ function groups_handle_members_page($guid) {
 	$params = array(
 		'content' => $content,
 		'title' => $title,
-		'buttons' => '',
 		'filter' => '',
 	);
 	$body = elgg_view_layout('content', $params);
@@ -348,7 +350,7 @@ function groups_handle_invite_page($guid) {
 	if ($group && $group->canEdit()) {
 		$content = elgg_view_form('groups/invite', array(
 			'id' => 'invite_to_group',
-			'class' => 'mtm',
+			'class' => 'elgg-form-alt mtm',
 		), array(
 			'entity' => $group,
 		));
@@ -359,7 +361,6 @@ function groups_handle_invite_page($guid) {
 	$params = array(
 		'content' => $content,
 		'title' => $title,
-		'buttons' => '',
 		'filter' => '',
 	);
 	$body = elgg_view_layout('content', $params);
@@ -403,10 +404,57 @@ function groups_handle_requests_page($guid) {
 	$params = array(
 		'content' => $content,
 		'title' => $title,
-		'buttons' => '',
 		'filter' => '',
 	);
 	$body = elgg_view_layout('content', $params);
 
 	echo elgg_view_page($title, $body);
 }
+
+/**
+ * Registers the buttons for title area of the group profile page
+ *
+ * @param ElggGroup $group
+ */
+function groups_register_profile_buttons($group) {
+
+	$actions = array();
+
+	// group owners
+	if ($group->canEdit()) {
+		// edit and invite
+		$url = elgg_get_site_url() . "groups/edit/{$group->getGUID()}";
+		$actions[$url] = 'groups:edit';
+		$url = elgg_get_site_url() . "groups/invite/{$group->getGUID()}";
+		$actions[$url] = 'groups:invite';
+	}
+
+	// group members
+	if ($group->isMember($user)) {
+		// leave
+		$url = elgg_get_site_url() . "action/groups/leave?group_guid={$group->getGUID()}";
+		$url = elgg_add_action_tokens_to_url($url);
+		$actions[$url] = 'groups:leave';
+	} else {
+		// join - admins can always join.
+		$url = elgg_get_site_url() . "action/groups/join?group_guid={$group->getGUID()}";
+		$url = elgg_add_action_tokens_to_url($url);
+		if ($group->isPublicMembership() || $group->canEdit()) {
+			$actions[$url] = 'groups:join';
+		} else {
+			// request membership
+			$actions[$url] = 'groups:joinrequest';
+		}
+	}
+
+	if ($actions) {
+		foreach ($actions as $url => $text) {
+			elgg_register_menu_item('title', array(
+				'name' => $text,
+				'href' => $url,
+				'text' => elgg_echo($text),
+				'link_class' => 'elgg-button elgg-button-action',
+			));
+		}
+	}
+}
diff --git a/mod/groups/start.php b/mod/groups/start.php
index 73bdd08a9..9e4694457 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -44,6 +44,7 @@ function groups_init() {
 	elgg_register_action("groups/invite", "$action_base/invite.php");
 	elgg_register_action("groups/join", "$action_base/join.php");
 	elgg_register_action("groups/leave", "$action_base/leave.php");
+	elgg_register_action("groups/remove", "$action_base/remove.php");
 	elgg_register_action("groups/killrequest", "$action_base/delete_request.php");
 	elgg_register_action("groups/killinvitation", "$action_base/delete_invite.php");
 	elgg_register_action("groups/addtogroup", "$action_base/add.php");
@@ -60,6 +61,12 @@ function groups_init() {
 
 	// group entity menu
 	elgg_register_plugin_hook_handler('register', 'menu:entity', 'groups_entity_menu_setup');
+	
+	// group user hover menu	
+	elgg_register_plugin_hook_handler('register', 'menu:user_hover', 'groups_user_entity_menu_setup');
+
+	// delete and edit annotations for topic replies
+	elgg_register_plugin_hook_handler('register', 'menu:annotation', 'groups_annotation_menu_setup');
 
 	//extend some views
 	elgg_extend_view('css/elgg', 'groups/css');
@@ -367,6 +374,89 @@ function groups_entity_menu_setup($hook, $type, $return, $params) {
 }
 
 /**
+ * Add a remove user link to user hover menu when the page owner is a group
+ */
+function groups_user_entity_menu_setup($hook, $type, $return, $params) {
+	if (elgg_is_logged_in()) {
+		$group = elgg_get_page_owner_entity();
+		
+		// Check for valid group
+		if (!elgg_instanceof($group, 'group')) {
+			return $return;
+		}
+	
+		$entity = $params['entity'];
+		
+		// Make sure we have a user and that user is a member of the group
+		if (!elgg_instanceof($entity, 'user') || !$group->isMember($entity)) {
+			return $return;
+		}
+
+		// Add remove link if we can edit the group, and if we're not trying to remove the group owner
+		if ($group->canEdit() && $group->getOwnerGUID() != $entity->guid) {
+			$remove = elgg_view('output/confirmlink', array(
+				'href' => "action/groups/remove?user_guid={$entity->guid}&group_guid={$group->guid}",
+				'text' => elgg_echo('groups:removeuser'),
+			));
+
+			$options = array(
+				'name' => 'removeuser',
+				'text' => $remove,
+				'priority' => 999,
+			);
+			$return[] = ElggMenuItem::factory($options);
+		} 
+	}
+
+	return $return;
+}
+
+/**
+ * Add edit and delete links for forum replies
+ */
+function groups_annotation_menu_setup($hook, $type, $return, $params) {
+	if (elgg_in_context('widgets')) {
+		return $return;
+	}
+	
+	$annotation = $params['annotation'];
+
+	if ($annotation->name != 'group_topic_post') {
+		return $return;
+	}
+
+	if ($annotation->canEdit()) {
+		$url = elgg_http_add_url_query_elements('action/discussion/reply/delete', array(
+			'annotation_id' => $annotation->id,
+		));
+
+		$options = array(
+			'name' => 'delete',
+			'href' => $url,
+			'text' => "<span class=\"elgg-icon elgg-icon-delete\"></span>",
+			'confirm' => elgg_echo('deleteconfirm'),
+			'text_encode' => false
+		);
+		$return[] = ElggMenuItem::factory($options);
+
+		$url = elgg_http_add_url_query_elements('discussion', array(
+			'annotation_id' => $annotation->id,
+		));
+
+		$options = array(
+			'name' => 'edit',
+			'href' => "#edit-annotation-$annotation->id",
+			'text' => elgg_echo('edit'),
+			'text_encode' => false,
+			'rel' => 'toggle',
+		);
+		$return[] = ElggMenuItem::factory($options);
+	}
+
+	return $return;
+}
+
+/**
  * Groups created so create an access list for it
  */
 function groups_create_event_listener($event, $object_type, $object) {
@@ -621,7 +711,7 @@ function discussion_init() {
 
 	// commenting not allowed on discussion topics (use a different annotation)
 	elgg_register_plugin_hook_handler('permissions_check:comment', 'object', 'discussion_comment_override');
-
+	
 	$action_base = elgg_get_plugins_path() . 'groups/actions/discussion';
 	elgg_register_action('discussion/save', "$action_base/save.php");
 	elgg_register_action('discussion/delete', "$action_base/delete.php");
@@ -722,7 +812,7 @@ function discussion_owner_block_menu($hook, $type, $return, $params) {
  * Add the reply button for the river
  */
 function discussion_add_to_river_menu($hook, $type, $return, $params) {
-	if (elgg_is_logged_in()) {
+	if (elgg_is_logged_in() && !elgg_in_context('widgets')) {
 		$item = $params['item'];
 		$object = $item->getObjectEntity();
 		if (elgg_instanceof($object, 'object', 'groupforumtopic')) {
@@ -734,7 +824,7 @@ function discussion_add_to_river_menu($hook, $type, $return, $params) {
 						'href' => "#groups-reply-$object->guid",
 						'text' => elgg_view_icon('speech-bubble'),
 						'title' => elgg_echo('reply:this'),
-						'link_class' => "elgg-toggler",
+						'rel' => 'toggle',
 						'priority' => 50,
 					);
 					$return[] = ElggMenuItem::factory($options);
diff --git a/mod/groups/views/default/annotation/group_topic_post.php b/mod/groups/views/default/annotation/group_topic_post.php
index d2303aba8..f38d2a77a 100644
--- a/mod/groups/views/default/annotation/group_topic_post.php
+++ b/mod/groups/views/default/annotation/group_topic_post.php
@@ -1,8 +1,19 @@
 <?php
-/**
- * Discussion reply
+/*
+ * Embeds an edit link for the annotation
  */
 
-$vars['delete_action'] = 'action/discussion/reply/delete';
+$annotation = elgg_extract('annotation', $vars);
 
 echo elgg_view('annotation/default', $vars);
+
+if ($annotation->canEdit()) {
+	$form = elgg_view_form('discussion/reply/save', array(), array_merge(array(
+			'entity' => get_entity($annotation->entity_guid),
+			'annotation' => $annotation
+		), $vars)
+	);
+
+	echo "<div class=\"hidden mbm\" id=\"edit-annotation-$annotation->id\">$form</div>";
+}
+
diff --git a/mod/groups/views/default/discussion/group_module.php b/mod/groups/views/default/discussion/group_module.php
index 165d9b1be..3a46e336e 100644
--- a/mod/groups/views/default/discussion/group_module.php
+++ b/mod/groups/views/default/discussion/group_module.php
@@ -17,10 +17,6 @@ $all_link = elgg_view('output/url', array(
 	'text' => elgg_echo('link:view:all'),
 ));
 
-$header = "<span class=\"groups-widget-viewall\">$all_link</span>";
-$header .= '<h3>' . elgg_echo('discussion:group') . '</h3>';
-
-
 elgg_push_context('widgets');
 $options = array(
 	'type' => 'object',
@@ -37,12 +33,14 @@ if (!$content) {
 	$content = '<p>' . elgg_echo('grouptopic:notcreated') . '</p>';
 }
 
-if ($group->canWriteToContainer()) {
-	$new_link = elgg_view('output/url', array(
-		'href' => "discussion/add/" . $group->getGUID(),
-		'text' => elgg_echo('groups:addtopic'),
-	));
-	$content .= "<span class='elgg-widget-more'>$new_link</span>";
-}
+$new_link = elgg_view('output/url', array(
+	'href' => "discussion/add/" . $group->getGUID(),
+	'text' => elgg_echo('groups:addtopic'),
+));
 
-echo elgg_view_module('info', '', $content, array('header' => $header));
+echo elgg_view('groups/profile/module', array(
+	'title' => elgg_echo('discussion:group'),
+	'content' => $content,
+	'all_link' => $all_link,
+	'add_link' => $new_link,
+));
\ No newline at end of file
diff --git a/mod/groups/views/default/forms/discussion/reply/save.php b/mod/groups/views/default/forms/discussion/reply/save.php
index be258b8fe..083fefb78 100644
--- a/mod/groups/views/default/forms/discussion/reply/save.php
+++ b/mod/groups/views/default/forms/discussion/reply/save.php
@@ -1,29 +1,57 @@
 <?php
 /**
- * Discussion topic reply form bofy
+ * Discussion topic reply form body
  *
  * @uses $vars['entity'] A discussion topic object
  * @uses $vars['inline'] Display a shortened form?
  */
 
-
 if (isset($vars['entity']) && elgg_is_logged_in()) {
+	echo elgg_view('input/hidden', array(
+		'name' => 'entity_guid',
+		'value' => $vars['entity']->getGUID(),
+	));
+
 	$inline = elgg_extract('inline', $vars, false);
 
+	$annotation = elgg_extract('annotation', $vars);
+	
+	$value = '';
+
+	if ($annotation) {
+		$value = $annotation->value;
+		echo elgg_view('input/hidden', array(
+			'name' => 'annotation_id',
+			'value' => $annotation->id
+		));
+	}
+
 	if ($inline) {
-		echo elgg_view('input/text', array('name' => 'group_topic_post'));
+		echo elgg_view('input/text', array('name' => 'group_topic_post', 'value' => $value));
 		echo elgg_view('input/submit', array('value' => elgg_echo('reply')));
 	} else {
 ?>
 	<div>
-		<label><?php echo elgg_echo("reply"); ?></label>
-		<?php echo elgg_view('input/longtext', array('name' => 'group_topic_post')); ?>
+		<label>
+		<?php
+			if ($annotation) {
+				echo elgg_echo('edit');
+			} else {
+				echo elgg_echo("reply");
+			}
+		?>
+		</label>
+		<?php echo elgg_view('input/longtext', array('name' => 'group_topic_post', 'value' => $value)); ?>
 	</div>
+	<div class="elgg-foot">
 <?php
+	if ($annotation) {
+		echo elgg_view('input/submit', array('value' => elgg_echo('save')));
+	} else {
 		echo elgg_view('input/submit', array('value' => elgg_echo('reply')));
 	}
-	echo elgg_view('input/hidden', array(
-		'name' => 'entity_guid',
-		'value' => $vars['entity']->getGUID(),
-	));
+?>
+	</div>
+<?php
+	}
 }
diff --git a/mod/groups/views/default/forms/discussion/save.php b/mod/groups/views/default/forms/discussion/save.php
index 5d50d5c91..a6582ede7 100644
--- a/mod/groups/views/default/forms/discussion/save.php
+++ b/mod/groups/views/default/forms/discussion/save.php
@@ -42,7 +42,7 @@ $guid = elgg_extract('guid', $vars, null);
 	<label><?php echo elgg_echo('access'); ?></label><br />
 	<?php echo elgg_view('input/access', array('name' => 'access_id', 'value' => $access_id)); ?>
 </div>
-<div>
+<div class="elgg-foot">
 <?php
 
 echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid));
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index b67134c63..26436ef01 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -126,7 +126,7 @@ if ($tools) {
 	}
 }
 ?>
-<div class="elgg-form-footer-alt">
+<div class="elgg-foot">
 <?php
 
 if (isset($vars['entity'])) {
diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php
index 83139c2ee..ef3131782 100644
--- a/mod/groups/views/default/forms/groups/invite.php
+++ b/mod/groups/views/default/forms/groups/invite.php
@@ -12,7 +12,7 @@ $friends = elgg_get_logged_in_user_entity()->getFriends('', 0);
 
 if ($friends) {
 	echo elgg_view('input/friendspicker', array('entities' => $friends, 'name' => 'user_guid', 'highlight' => 'all'));
-	echo '<div class="elgg-form-footer">';
+	echo '<div class="elgg-foot">';
 	echo elgg_view('input/hidden', array('name' => 'forward_url', 'value' => $forward_url));
 	echo elgg_view('input/hidden', array('name' => 'group_guid', 'value' => $group->guid));
 	echo elgg_view('input/submit', array('value' => elgg_echo('invite')));
diff --git a/mod/groups/views/default/group/default.php b/mod/groups/views/default/group/default.php
index 2aa377813..fc91f90d0 100644
--- a/mod/groups/views/default/group/default.php
+++ b/mod/groups/views/default/group/default.php
@@ -31,6 +31,7 @@ if ($vars['full_view']) {
 		'metadata' => $metadata,
 		'subtitle' => $group->briefdescription,
 	);
+	$params = $params + $vars;
 	$list_body = elgg_view('group/elements/summary', $params);
 
 	echo elgg_view_image_block($icon, $list_body);
diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index 37fc5dc10..9c65d1602 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -36,15 +36,14 @@
 	margin: 0;
 }
 
-#groups-tools > .elgg-module {
-	float: left;
-	margin-bottom: 40px;
+#groups-tools > li {
+	width: 48%;
 	min-height: 200px;
-	width: 350px;
+	margin-bottom: 40px;
 }
 
-#groups-tools > .elgg-module:nth-child(odd) {
-	margin-right: 30px;
+#groups-tools > li:nth-child(odd) {
+	margin-right: 4%;
 }
 
 .groups-widget-viewall {
diff --git a/mod/groups/views/default/groups/edit.php b/mod/groups/views/default/groups/edit.php
index 5076cc49a..24a1c3f1e 100644
--- a/mod/groups/views/default/groups/edit.php
+++ b/mod/groups/views/default/groups/edit.php
@@ -7,6 +7,9 @@
 
 $entity = elgg_extract('entity', $vars, null);
 
-$form_vars = array('enctype' => 'multipart/form-data');
+$form_vars = array(
+	'enctype' => 'multipart/form-data',
+	'class' => 'elgg-form-alt',
+);
 $body_vars = array('entity' => $entity);
 echo elgg_view_form('groups/edit', $form_vars, $body_vars);
diff --git a/mod/groups/views/default/groups/js.php b/mod/groups/views/default/groups/js.php
index dec31cf54..ad742445b 100644
--- a/mod/groups/views/default/groups/js.php
+++ b/mod/groups/views/default/groups/js.php
@@ -1,4 +1,5 @@
 
 $(function() {
-	$('#groups-tools').find('.elgg-module:odd').addClass('odd');
+	// jQuery uses 0-based indexing
+	$('#groups-tools').children('li:even').addClass('odd');
 });
diff --git a/mod/groups/views/default/groups/profile/activity_module.php b/mod/groups/views/default/groups/profile/activity_module.php
index 4ea97cad6..5e557b443 100644
--- a/mod/groups/views/default/groups/profile/activity_module.php
+++ b/mod/groups/views/default/groups/profile/activity_module.php
@@ -21,16 +21,13 @@ $all_link = elgg_view('output/url', array(
 	'text' => elgg_echo('link:view:all'),
 ));
 
-$header = "<span class=\"groups-widget-viewall\">$all_link</span>";
-$header .= '<h3>' . elgg_echo('groups:activity') . '</h3>';
-
 
 elgg_push_context('widgets');
 $db_prefix = elgg_get_config('dbprefix');
 $content = elgg_list_river(array(
 	'limit' => 4,
 	'pagination' => false,
-	'joins' => array("join {$db_prefix}entities e1 on e1.guid = rv.object_guid"),
+	'joins' => array("JOIN {$db_prefix}entities e1 ON e1.guid = rv.object_guid"),
 	'wheres' => array("(e1.container_guid = $group->guid)"),
 ));
 elgg_pop_context();
@@ -39,4 +36,8 @@ if (!$content) {
 	$content = '<p>' . elgg_echo('groups:activity:none') . '</p>';
 }
 
-echo elgg_view_module('info', '', $content, array('header' => $header));
+echo elgg_view('groups/profile/module', array(
+	'title' => elgg_echo('groups:activity'),
+	'content' => $content,
+	'all_link' => $all_link,
+));
diff --git a/mod/groups/views/default/groups/profile/buttons.php b/mod/groups/views/default/groups/profile/buttons.php
deleted file mode 100644
index 55e99f59c..000000000
--- a/mod/groups/views/default/groups/profile/buttons.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Content header action buttons
- *
- * @uses $vars['entity']
- * 
- * @todo This should be done by registering menu items with the page actions menu
- */
-
-if (!elgg_is_logged_in()) {
-	return true;
-}
-
-
-$actions = array();
-
-// group owners
-if ($vars['entity']->canEdit()) {
-	// edit and invite
-	$url = elgg_get_site_url() . "groups/edit/{$vars['entity']->getGUID()}";
-	$actions[$url] = elgg_echo('groups:edit');
-	$url = elgg_get_site_url() . "groups/invite/{$vars['entity']->getGUID()}";
-	$actions[$url] = elgg_echo('groups:invite');
-}
-
-// group members
-if ($vars['entity']->isMember($user)) {
-	// leave
-	$url = elgg_get_site_url() . "action/groups/leave?group_guid={$vars['entity']->getGUID()}";
-	$url = elgg_add_action_tokens_to_url($url);
-	$actions[$url] = elgg_echo('groups:leave');
-} else {
-	// join - admins can always join.
-	$url = elgg_get_site_url() . "action/groups/join?group_guid={$vars['entity']->getGUID()}";
-	$url = elgg_add_action_tokens_to_url($url);
-	if ($vars['entity']->isPublicMembership() || $vars['entity']->canEdit()) {
-		$actions[$url] = elgg_echo('groups:join');
-	} else {
-		// request membership
-		$actions[$url] = elgg_echo('groups:joinrequest');
-	}
-}
-
-// display action buttons
-if ($actions) {
-	echo '<ul class="elgg-menu elgg-menu-title elgg-menu-hz">';
-	foreach ($actions as $url => $action) {
-		echo '<li>';
-		echo elgg_view('output/url', array(
-			'text' => $action,
-			'href' => $url,
-			'class' => 'elgg-button elgg-button-action',
-		));
-		echo '</li>';
-	}
-	echo '</ul>';
-}
diff --git a/mod/groups/views/default/groups/profile/module.php b/mod/groups/views/default/groups/profile/module.php
new file mode 100644
index 000000000..9d0b18266
--- /dev/null
+++ b/mod/groups/views/default/groups/profile/module.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Group module (also called a group widget)
+ *
+ * @uses $vars['title']    The title of the module
+ * @uses $vars['content']  The module content
+ * @uses $vars['all_link'] A link to list content
+ * @uses $vars['add_link'] A link to create content
+ */
+
+$group = elgg_get_page_owner_entity();
+
+$header = "<span class=\"groups-widget-viewall\">{$vars['all_link']}</span>";
+$header .= '<h3>' . $vars['title'] . '</h3>';
+
+if ($group->canWriteToContainer() && isset($vars['add_link'])) {
+	$vars['content'] .= "<span class='elgg-widget-more'>{$vars['add_link']}</span>";
+}
+
+echo '<li>';
+echo elgg_view_module('info', '', $vars['content'], array(
+	'header' => $header,
+	'class' => 'elgg-module-group',
+));
+echo '</li>';
diff --git a/mod/groups/views/default/groups/profile/widgets.php b/mod/groups/views/default/groups/profile/widgets.php
index 28e43fdc4..caf019a3a 100644
--- a/mod/groups/views/default/groups/profile/widgets.php
+++ b/mod/groups/views/default/groups/profile/widgets.php
@@ -6,10 +6,19 @@
 */ 
 	
 // tools widget area
-echo '<div id="groups-tools" class="mtl clearfix">';
+echo '<div id="groups-tools" class="elgg-gallery elgg-gallery-fluid mtl clearfix">';
 	
 // enable tools to extend this area
-echo elgg_view("groups/tool_latest", array('entity' => $vars['entity']));
+echo elgg_view("groups/tool_latest", $vars);
+
+// backward compatibility
+$right = elgg_view('groups/right_column', $vars);
+$left = elgg_view('groups/left_column', $vars);
+if ($right || $left) {
+	elgg_deprecated_notice('The views groups/right_column and groups/left_column have been replaced by groups/tool_latest', 1.8);
+	echo $left;
+	echo $right;
+}
 
 echo "</div>";		 
 
diff --git a/mod/groups/views/default/groups/sidebar/featured.php b/mod/groups/views/default/groups/sidebar/featured.php
index 695782783..8bd51ab5c 100644
--- a/mod/groups/views/default/groups/sidebar/featured.php
+++ b/mod/groups/views/default/groups/sidebar/featured.php
@@ -17,7 +17,7 @@ if ($featured_groups) {
 	elgg_push_context('widgets');
 	$body = '';
 	foreach ($featured_groups as $group) {
-		$body .= elgg_view_entity($group, false);
+		$body .= elgg_view_entity($group, array('full_view' => false));
 	}
 	elgg_pop_context();
 
diff --git a/mod/groups/views/default/groups/sidebar/members.php b/mod/groups/views/default/groups/sidebar/members.php
index 28111554f..7249ffbf4 100644
--- a/mod/groups/views/default/groups/sidebar/members.php
+++ b/mod/groups/views/default/groups/sidebar/members.php
@@ -21,7 +21,8 @@ $body = elgg_list_entities_from_relationship(array(
 	'inverse_relationship' => true,
 	'types' => 'user',
 	'limit' => $limit,
-	'gallery' => true,
+	'list_type' => 'gallery',
+	'gallery_class' => 'elgg-gallery-users',
 ));
 
 $body .= "<div class='center mts'>$all_link</div>";
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 3a4decbe4..22589b84d 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -67,6 +67,7 @@ if ($full) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
+	$params = $params + $vars;
 	$list_body = elgg_view('object/elements/summary', $params);
 
 	$info = elgg_view_image_block($poster_icon, $list_body);
@@ -90,6 +91,7 @@ HTML;
 		'tags' => $tags,
 		'content' => $excerpt,
 	);
+	$params = $params + $vars;
 	$list_body = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view_image_block($poster_icon, $list_body);
diff --git a/mod/groups/views/default/river/annotation/group_topic_post/reply.php b/mod/groups/views/default/river/annotation/group_topic_post/reply.php
index 1999c8dd9..cc94fbd43 100644
--- a/mod/groups/views/default/river/annotation/group_topic_post/reply.php
+++ b/mod/groups/views/default/river/annotation/group_topic_post/reply.php
@@ -4,24 +4,9 @@
  */
 $object = $vars['item']->getObjectEntity();
 $reply = $vars['item']->getAnnotation();
+$excerpt = elgg_get_excerpt($reply->value);
 
-$url = $object->getURL();
-$title = $object->title;
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $title,
-);
-$object_link = elgg_view('output/url', $params);
-
-$type = $object->getType();
-$subtype = $object->getSubtype();
-
-echo elgg_echo('groups:river:reply') . ' ';
-echo $object_link;
-
-if ($reply) {
-	$excerpt = elgg_get_excerpt($reply->value);
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
\ No newline at end of file
diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php
index a70f8b51d..cacb5ad3f 100644
--- a/mod/groups/views/default/river/group/create.php
+++ b/mod/groups/views/default/river/group/create.php
@@ -7,19 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = elgg_get_excerpt($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->name,
-);
-$link = elgg_view('output/url', $params);
-
-
-echo elgg_echo('groups:river:create');
-
-echo " $link";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
\ No newline at end of file
diff --git a/mod/groups/views/default/river/object/groupforumtopic/create.php b/mod/groups/views/default/river/object/groupforumtopic/create.php
index 466196921..80e7b09aa 100644
--- a/mod/groups/views/default/river/object/groupforumtopic/create.php
+++ b/mod/groups/views/default/river/object/groupforumtopic/create.php
@@ -7,36 +7,16 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = elgg_get_excerpt($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
-
-$group_string = '';
-$container = $object->getContainerEntity();
-if ($container instanceof ElggGroup) {
-	$params = array(
-		'href' => $container->getURL(),
-		'text' => $container->name,
-	);
-	$group_link = elgg_view('output/url', $params);
-	$group_string = elgg_echo('river:ingroup', array($group_link));
-}
-
-echo elgg_echo('forumtopic:river:create');
-
-echo " $link $group_string";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
-
-if (elgg_is_logged_in() && $container->canWriteToContainer()) {
+$responses = '';
+if (elgg_is_logged_in() && $object->canAnnotate(0, 'group_topic_post')) {
 	// inline comment form
 	$form_vars = array('id' => "groups-reply-{$object->getGUID()}", 'class' => 'hidden');
 	$body_vars = array('entity' => $object, 'inline' => true);
-	echo elgg_view_form('discussion/reply/save', $form_vars, $body_vars);
+	$responses = elgg_view_form('discussion/reply/save', $form_vars, $body_vars);
 }
+
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+	'responses' => $responses,
+));
diff --git a/mod/groups/views/default/river/relationship/member/create.php b/mod/groups/views/default/river/relationship/member/create.php
index 060826649..d1c4c3ed3 100644
--- a/mod/groups/views/default/river/relationship/member/create.php
+++ b/mod/groups/views/default/river/relationship/member/create.php
@@ -3,14 +3,6 @@
  * Group join river view.
  */
 
-$object = $vars['item']->getObjectEntity();
-
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->name,
-);
-$link = elgg_view('output/url', $params);
-
-echo elgg_echo('groups:river:join');
-
-echo " $link";
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+));
diff --git a/mod/invitefriends/views/default/forms/invitefriends/invite.php b/mod/invitefriends/views/default/forms/invitefriends/invite.php
index 5af8b5da0..0d7f5d9f2 100644
--- a/mod/invitefriends/views/default/forms/invitefriends/invite.php
+++ b/mod/invitefriends/views/default/forms/invitefriends/invite.php
@@ -27,7 +27,7 @@ if (elgg_get_config('allow_registration')) {
 </div>
 HTML;
 
-	echo '<div>';
+	echo '<div class="elgg-foot">';
 	echo elgg_view('input/submit', array('value' => elgg_echo('send')));
 	echo '</div>';
 } else {
diff --git a/mod/likes/actions/likes/add.php b/mod/likes/actions/likes/add.php
index 7ccb19d92..b76c1bea9 100644
--- a/mod/likes/actions/likes/add.php
+++ b/mod/likes/actions/likes/add.php
@@ -57,8 +57,5 @@ if ($entity->owner_guid != $user->guid) {
 
 system_message(elgg_echo("likes:likes"));
 
-//add to river
-add_to_river('annotation/annotatelike', 'likes', $user->guid, $entity->guid, "", 0, $annotation);
-
 // Forward back to the page where the user 'liked' the object
 forward(REFERER);
diff --git a/mod/likes/start.php b/mod/likes/start.php
index b2aa83260..d45fb96b3 100644
--- a/mod/likes/start.php
+++ b/mod/likes/start.php
@@ -9,6 +9,7 @@ elgg_register_event_handler('init', 'system', 'likes_init');
 function likes_init() {
 
 	elgg_extend_view('css/elgg', 'likes/css');
+	elgg_extend_view('js/elgg', 'likes/js');
 
 	// registered with priority < 500 so other plugins can remove likes
 	elgg_register_plugin_hook_handler('register', 'menu:river', 'likes_river_menu_setup', 400);
@@ -29,15 +30,27 @@ function likes_entity_menu_setup($hook, $type, $return, $params) {
 
 	$entity = $params['entity'];
 
-	// likes
+	// likes button
 	$options = array(
 		'name' => 'likes',
-		'text' => elgg_view('likes/display', array('entity' => $entity)),
+		'text' => elgg_view('likes/button', array('entity' => $entity)),
 		'href' => false,
 		'priority' => 1000,
 	);
 	$return[] = ElggMenuItem::factory($options);
 
+	// likes count
+	$count = elgg_view('likes/count', array('entity' => $entity));
+	if ($count) {
+		$options = array(
+			'name' => 'likes_count',
+			'text' => $count,
+			'href' => false,
+			'priority' => 1001,
+		);
+		$return[] = ElggMenuItem::factory($options);
+	}
+
 	return $return;
 }
 
@@ -50,14 +63,27 @@ function likes_river_menu_setup($hook, $type, $return, $params) {
 		$object = $item->getObjectEntity();
 		if (!elgg_in_context('widgets') && $item->annotation_id == 0) {
 			if ($object->canAnnotate(0, 'likes')) {
+				// like button
 				$options = array(
 					'name' => 'likes',
 					'href' => false,
-					'text' => elgg_view('likes/display', array('entity' => $object)),
+					'text' => elgg_view('likes/button', array('entity' => $object)),
 					'is_action' => true,
 					'priority' => 100,
 				);
 				$return[] = ElggMenuItem::factory($options);
+
+				// likes count
+				$count = elgg_view('likes/count', array('entity' => $object));
+				if ($count) {
+					$options = array(
+						'name' => 'likes_count',
+						'text' => $count,
+						'href' => false,
+						'priority' => 101,
+					);
+					$return[] = ElggMenuItem::factory($options);
+				}
 			}
 		}
 	}
diff --git a/mod/likes/views/default/likes/display.php b/mod/likes/views/default/likes/button.php
index 2dc50ddd0..383e1bb63 100644
--- a/mod/likes/views/default/likes/display.php
+++ b/mod/likes/views/default/likes/button.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Elgg likes display
+ * Elgg likes button
  *
  * @uses $vars['entity']
  */
@@ -40,26 +40,3 @@ if (elgg_is_logged_in() && $vars['entity']->canAnnotate(0, 'likes')) {
 }
 
 echo $likes_button;
-
-$list = '';
-$num_of_likes = likes_count($vars['entity']);
-
-if ($num_of_likes) {
-	// display the number of likes
-	if ($num_of_likes == 1) {
-		$likes_string = elgg_echo('likes:userlikedthis', array($num_of_likes));
-	} else {
-		$likes_string = elgg_echo('likes:userslikedthis', array($num_of_likes));
-	}
-	$params = array(
-		'text' => $likes_string,
-		'title' => elgg_echo('likes:see'),
-		'rel' => 'popup',
-		'href' => "#likes-$guid"
-	);
-	$list = elgg_view('output/url', $params);
-	$list .= "<div class='elgg-module elgg-module-popup elgg-likes-list hidden clearfix' id='likes-$guid'>";
-	$list .= elgg_list_annotations(array('guid' => $guid, 'annotation_name' => 'likes', 'limit' => 99));
-	$list .= "</div>";
-	echo $list;
-}
diff --git a/mod/likes/views/default/likes/count.php b/mod/likes/views/default/likes/count.php
new file mode 100644
index 000000000..bdc50bcd1
--- /dev/null
+++ b/mod/likes/views/default/likes/count.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Count of who has liked something
+ *
+ *  @uses $vars['entity']
+ */
+
+
+$list = '';
+$num_of_likes = likes_count($vars['entity']);
+$guid = $vars['entity']->getGUID();
+
+if ($num_of_likes) {
+	// display the number of likes
+	if ($num_of_likes == 1) {
+		$likes_string = elgg_echo('likes:userlikedthis', array($num_of_likes));
+	} else {
+		$likes_string = elgg_echo('likes:userslikedthis', array($num_of_likes));
+	}
+	$params = array(
+		'text' => $likes_string,
+		'title' => elgg_echo('likes:see'),
+		'rel' => 'popup',
+		'href' => "#likes-$guid"
+	);
+	$list = elgg_view('output/url', $params);
+	$list .= "<div class='elgg-module elgg-module-popup elgg-likes-list hidden clearfix' id='likes-$guid'>";
+	$list .= elgg_list_annotations(array('guid' => $guid, 'annotation_name' => 'likes', 'limit' => 99));
+	$list .= "</div>";
+	echo $list;
+}
diff --git a/mod/likes/views/default/likes/css.php b/mod/likes/views/default/likes/css.php
index cb0334b7c..fabf54e46 100644
--- a/mod/likes/views/default/likes/css.php
+++ b/mod/likes/views/default/likes/css.php
@@ -11,3 +11,7 @@
 	width: 345px;
 	position: absolute;
 }
+
+.elgg-menu .elgg-menu-item-likes-count {
+	margin-left: 3px;
+}
diff --git a/mod/likes/views/default/likes/js.php b/mod/likes/views/default/likes/js.php
new file mode 100644
index 000000000..b7e000539
--- /dev/null
+++ b/mod/likes/views/default/likes/js.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Likes JavaScript extension for elgg.js
+ */
+?>
+
+/**
+ * Repositions the likes popup
+ *
+ * @param {String} hook    'getOptions'
+ * @param {String} type    'ui.popup'
+ * @param {Object} params  An array of info about the target and source.
+ * @param {Object} options Options to pass to
+ *
+ * @return {Object}
+ */
+elgg.ui.likesPopupHandler = function(hook, type, params, options) {
+	if (params.target.hasClass('elgg-likes-list')) {
+		options.my = 'right bottom';
+		options.at = 'left top';
+		return options;
+	}
+	return null;
+};
+
+elgg.register_hook_handler('getOptions', 'ui.popup', elgg.ui.likesPopupHandler);
\ No newline at end of file
diff --git a/mod/likes/views/default/river/annotation/likes/create.php b/mod/likes/views/default/river/annotation/likes/create.php
deleted file mode 100644
index 463fe5049..000000000
--- a/mod/likes/views/default/river/annotation/likes/create.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Likes river view
- *
- * @todo not finished
- */
-
-$object = $vars['item']->getObjectEntity();
-$comment = $vars['item']->getAnnotation();
-
-$url = $object->getURL();
-$title = $object->title;
-if (!$title) {
-	$title = elgg_echo('untitled');
-}
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $title,
-);
-$object_link = elgg_view('output/url', $params);
-
-$type = $object->getType();
-$subtype = $object->getSubtype();
-
-$type_string = elgg_echo("river:commented:$type:$subtype");
-echo elgg_echo('river:likes', array($type_string, $object_link));
diff --git a/mod/logbrowser/views/default/logbrowser/form.php b/mod/logbrowser/views/default/logbrowser/form.php
index d2476afac..d5cf9f6b8 100644
--- a/mod/logbrowser/views/default/logbrowser/form.php
+++ b/mod/logbrowser/views/default/logbrowser/form.php
@@ -59,9 +59,12 @@
 	$toggle_link = elgg_view('output/url', array(
 		'href' => '#log-browser-search-form',
 		'text' => elgg_echo('logbrowser:search'),
-		'class' => 'elgg-toggler',
+		'rel' => 'toggle',
 	));
 ?>
+	<p>
+		<?php echo $toggle_link; ?>
+	</p>
 	<div id="log-browser-search-form" class="elgg-module elgg-module-inline hidden">
 		<div class="elgg-head">
 			<h3><?php echo elgg_echo('logbrowser:search'); ?></h3>
@@ -70,7 +73,4 @@
 			<?php echo $wrappedform; ?>
 		</div>
 	</div>
-	<p>
-		<?php echo $toggle_link; ?>
-	</p>
 </div>
\ No newline at end of file
diff --git a/mod/logrotate/views/default/settings/logrotate/edit.php b/mod/logrotate/views/default/settings/logrotate/edit.php
index 32d59faa5..64c7bf743 100644
--- a/mod/logrotate/views/default/settings/logrotate/edit.php
+++ b/mod/logrotate/views/default/settings/logrotate/edit.php
@@ -36,7 +36,7 @@ if (!$time) {
 	
 	<?php
 		echo elgg_view('input/pulldown', array(
-			'internalname' => 'params[time]',
+			'name' => 'params[time]',
 			'options_values' => array(
 				'weekly' => elgg_echo('logrotate:week'),
 				'monthly' => elgg_echo('logrotate:month'),
diff --git a/mod/members/pages/members/index.php b/mod/members/pages/members/index.php
index 4f23c6322..330ef66bf 100644
--- a/mod/members/pages/members/index.php
+++ b/mod/members/pages/members/index.php
@@ -28,7 +28,6 @@ $params = array(
 	'content' => $content,
 	'sidebar' => elgg_view('members/sidebar'),
 	'title' => $title . " ($num_members)",
-	'buttons' => '',
 	'filter_override' => elgg_view('members/nav', array('selected' => $vars['page'])),
 );
 
diff --git a/mod/members/pages/members/search.php b/mod/members/pages/members/search.php
index 39b54990e..94127768a 100644
--- a/mod/members/pages/members/search.php
+++ b/mod/members/pages/members/search.php
@@ -19,16 +19,16 @@ if ($vars['search_type'] == 'tag') {
 	$users = $results['entities'];
 	$content = elgg_view_entity_list($users, $count, $offset, $limit, false, false, true);
 } else {
-	$name = get_input('name');
+	$name = sanitize_string(get_input('name'));
 
 	$title = elgg_echo('members:title:searchname', array($name));
 
-	global $CONFIG;
+	$db_prefix = elgg_get_config('dbprefix');
 	$params = array(
 		'type' => 'user',
 		'full_view' => false,
-		'joins' => array("join {$CONFIG->dbprefix}users_entity u on e.guid=u.guid"),
-		'wheres' => array("(u.name like \"%{$name}%\" or u.username like \"%{$name}%\")"),
+		'joins' => array("JOIN {$db_prefix}users_entity u ON e.guid=u.guid"),
+		'wheres' => array("(u.name LIKE \"%{$name}%\" OR u.username LIKE \"%{$name}%\")"),
 	);
 	$content .= elgg_list_entities($params);
 }
diff --git a/mod/messageboard/languages/en.php b/mod/messageboard/languages/en.php
index d8ccbdeee..9027eb650 100644
--- a/mod/messageboard/languages/en.php
+++ b/mod/messageboard/languages/en.php
@@ -26,10 +26,7 @@ $english = array(
 	/**
 	 * Message board widget river
 	 */
-	'messageboard:river:added' => "posted on",
-	'messageboard:river:user' => "%s's",
-	'messageboard:river:messageboard' => "message board",
-
+	'river:messageboard:user:default' => "%s posted on %s's message board",
 
 	/**
 	 * Status messages
diff --git a/mod/messageboard/pages/messageboard/owner.php b/mod/messageboard/pages/messageboard/owner.php
index 58021c29e..2c854d4f3 100644
--- a/mod/messageboard/pages/messageboard/owner.php
+++ b/mod/messageboard/pages/messageboard/owner.php
@@ -16,7 +16,8 @@ elgg_push_breadcrumb($page_owner->name, $page_owner->getURL());
 $options = array(
 	'annotations_name' => 'messageboard',
 	'guid' => $page_owner_guid,
-	'limit' => 10
+	'limit' => 10,
+	'reverse_order_by' => true,
 );
 
 if ($history_user) {
@@ -47,7 +48,6 @@ if (!$content) {
 
 $vars = array(
 	'filter' => false,
-	'buttons' => false,
 	'content' => $content,
 	'title' => $title,
 	'reverse_order_by' => true
diff --git a/mod/messageboard/start.php b/mod/messageboard/start.php
index efe453286..8a7f00958 100644
--- a/mod/messageboard/start.php
+++ b/mod/messageboard/start.php
@@ -26,6 +26,9 @@ function messageboard_init() {
 	$action_path = dirname(__FILE__) . '/actions';
 	elgg_register_action("messageboard/add", "$action_path/add.php");
 	elgg_register_action("messageboard/delete", "$action_path/delete.php");
+
+	// delete annotations for posts
+	elgg_register_plugin_hook_handler('register', 'menu:annotation', 'messageboard_annotation_menu_setup');
 }
 
 /**
@@ -127,4 +130,32 @@ function messageboard_add($poster, $owner, $message, $access_id = ACCESS_PUBLIC)
 	return $result;
 }
 
+
+/**
+ * Add edit and delete links for forum replies
+ */
+function messageboard_annotation_menu_setup($hook, $type, $return, $params) {
+	$annotation = $params['annotation'];
+	if ($annotation->name != 'messageboard') {
+		return $return;
+	}
+
+	if ($annotation->canEdit()) {
+		$url = elgg_http_add_url_query_elements('action/messageboard/delete', array(
+			'annotation_id' => $annotation->id,
+		));
+
+		$options = array(
+			'name' => 'delete',
+			'href' => $url,
+			'text' => "<span class=\"elgg-icon elgg-icon-delete\"></span>",
+			'confirm' => elgg_echo('deleteconfirm'),
+			'text_encode' => false
+		);
+		$return[] = ElggMenuItem::factory($options);
+	}
+
+	return $return;
+}
+
 elgg_register_event_handler('init', 'system', 'messageboard_init');
\ No newline at end of file
diff --git a/mod/messageboard/views/default/annotation/messageboard.php b/mod/messageboard/views/default/annotation/messageboard.php
deleted file mode 100644
index 8dfba3a22..000000000
--- a/mod/messageboard/views/default/annotation/messageboard.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Message board post
- *
- * @uses $vars['annotation']  ElggAnnotation object
- * @uses $vars['full_view']        Display fill view or brief view
- */
-
-$vars['delete_action'] = 'action/messageboard/delete';
-
-echo elgg_view('annotation/default', $vars);
\ No newline at end of file
diff --git a/mod/messageboard/views/default/forms/messageboard/add.php b/mod/messageboard/views/default/forms/messageboard/add.php
index 87bec9b20..b219fd800 100644
--- a/mod/messageboard/views/default/forms/messageboard/add.php
+++ b/mod/messageboard/views/default/forms/messageboard/add.php
@@ -7,7 +7,7 @@
 
 echo elgg_view('input/plaintext', array(
 	'name' => 'message_content',
-	'class' => 'messageboard-input'
+	'class' => 'messageboard-input mbs'
 ));
 
 echo elgg_view('input/hidden', array(
diff --git a/mod/messageboard/views/default/river/object/messageboard/create.php b/mod/messageboard/views/default/river/object/messageboard/create.php
index 0268930bf..975598805 100644
--- a/mod/messageboard/views/default/river/object/messageboard/create.php
+++ b/mod/messageboard/views/default/river/object/messageboard/create.php
@@ -3,22 +3,9 @@
  * Messageboard river view
  */
 
-$performed_by = $vars['item']->getSubjectEntity();
-$performed_on = $vars['item']->getObjectEntity();
+$messageboard = $vars['item']->getAnnotation();
 
-$comment = $vars['item']->getAnnotation();
-
-$link = elgg_view('output/url', array(
-	'href' => $performed_on->getURL(),
-	'text' => elgg_echo('messageboard:river:user', array($performed_on->name)),
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $messageboard->value,
 ));
-
-echo elgg_echo("messageboard:river:added");
-echo " $link ";
-echo elgg_echo("messageboard:river:messageboard");
-
-if ($comment) {
-	echo '<div class="elgg-river-content">';
-	echo elgg_get_excerpt($comment->value);
-	echo '</div>';
-}
diff --git a/mod/messages/pages/messages/inbox.php b/mod/messages/pages/messages/inbox.php
index 4b2d11bbf..fdfc20c43 100644
--- a/mod/messages/pages/messages/inbox.php
+++ b/mod/messages/pages/messages/inbox.php
@@ -15,6 +15,8 @@ if (!$page_owner) {
 
 elgg_push_breadcrumb(elgg_echo('messages:inbox'));
 
+elgg_register_title_button();
+
 $title = elgg_echo('messages:user', array($page_owner->name));
 
 $list = elgg_list_entities_from_metadata(array(
diff --git a/mod/messages/pages/messages/read.php b/mod/messages/pages/messages/read.php
index c5d1d4941..310485ee2 100644
--- a/mod/messages/pages/messages/read.php
+++ b/mod/messages/pages/messages/read.php
@@ -26,24 +26,24 @@ if ($page_owner->getGUID() == $message->toId) {
 }
 elgg_push_breadcrumb($title);
 
-$buttons = '';
-$content = elgg_view_entity($message, true);
+$content = elgg_view_entity($message, array('full_view' => true));
 if ($inbox) {
 	$form_params = array(
 		'id' => 'messages-reply-form',
-		'class' => 'hidden',
+		'class' => 'hidden mtl',
 		'action' => 'action/messages/send',
 	);
 	$body_params = array('message' => $message);
 	$content .= elgg_view_form('messages/reply', $form_params, $body_params);
 
 	if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
-		$buttons = elgg_view('output/url', array(
+		elgg_register_menu_item('title', array(
+			'name' => 'reply',
+			'href' => '#messages-reply-form',
 			'text' => elgg_echo('messages:answer'),
-			'class' => 'elgg-button elgg-button-action',
-			'id' => 'messages-show-reply',
+			'link_class' => 'elgg-button elgg-button-action',
+			'rel' => 'toggle',
 		));
-		$buttons = "<ul class=\"elgg-menu elgg-menu-title\"><li>$buttons</li></ul>";
 	}
 }
 
@@ -51,7 +51,6 @@ $body = elgg_view_layout('content', array(
 	'content' => $content,
 	'title' => $title,
 	'filter' => '',
-	'buttons' => $buttons,
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/messages/pages/messages/send.php b/mod/messages/pages/messages/send.php
index 884c20cca..1b821d185 100644
--- a/mod/messages/pages/messages/send.php
+++ b/mod/messages/pages/messages/send.php
@@ -14,7 +14,7 @@ $title = elgg_echo('messages:add');
 
 elgg_push_breadcrumb($title);
 
-$params = messages_prepare_form_vars(get_input('send_to'));
+$params = messages_prepare_form_vars((int)get_input('send_to'));
 $params['friends'] = $page_owner->getFriends();
 $content = elgg_view_form('messages/send', array(), $params);
 
@@ -22,7 +22,6 @@ $body = elgg_view_layout('content', array(
 	'content' => $content,
 	'title' => $title,
 	'filter' => '',
-	'buttons' => '',
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/messages/pages/messages/sent.php b/mod/messages/pages/messages/sent.php
index f884643e0..af06ab273 100644
--- a/mod/messages/pages/messages/sent.php
+++ b/mod/messages/pages/messages/sent.php
@@ -15,6 +15,8 @@ if (!$page_owner) {
 
 elgg_push_breadcrumb(elgg_echo('messages:sent'));
 
+elgg_register_title_button();
+
 $title = elgg_echo('messages:sentmessages', array($page_owner->name));
 
 $list = elgg_list_entities_from_metadata(array(
diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php
index 01fe0f431..7e182b8f0 100644
--- a/mod/messages/views/default/forms/messages/process.php
+++ b/mod/messages/views/default/forms/messages/process.php
@@ -17,7 +17,7 @@ echo '<div class="messages-container">';
 echo $messages;
 echo '</div>';
 
-echo '<div class="messages-buttonbank">';
+echo '<div class="elgg-foot messages-buttonbank">';
 echo elgg_view('input/submit', array(
 	'value' => elgg_echo('delete'),
 	'name' => 'delete',
diff --git a/mod/messages/views/default/forms/messages/reply.php b/mod/messages/views/default/forms/messages/reply.php
index e8a27f03e..9f3f4b57e 100644
--- a/mod/messages/views/default/forms/messages/reply.php
+++ b/mod/messages/views/default/forms/messages/reply.php
@@ -33,6 +33,6 @@ echo elgg_view('input/hidden', array(
 	));
 	?>
 </div>
-<div>
+<div class="elgg-foot">
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?>
 </div>
\ No newline at end of file
diff --git a/mod/messages/views/default/forms/messages/send.php b/mod/messages/views/default/forms/messages/send.php
index c0a095993..b0638e0c0 100644
--- a/mod/messages/views/default/forms/messages/send.php
+++ b/mod/messages/views/default/forms/messages/send.php
@@ -49,6 +49,6 @@ $recipient_drop_down = elgg_view('input/dropdown', array(
 	));
 	?>
 </div>
-<div>
+<div class="elgg-foot">
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?>
 </div>
diff --git a/mod/messages/views/default/messages/js.php b/mod/messages/views/default/messages/js.php
index 5f6b476e7..39f93e645 100644
--- a/mod/messages/views/default/messages/js.php
+++ b/mod/messages/views/default/messages/js.php
@@ -3,8 +3,4 @@ $(function() {
 	$("#messages-toggle").click(function() {
 		$('input[type=checkbox]').click();
 	});
-	
-	$("#messages-show-reply").click(function() {
-		$('#messages-reply-form').slideToggle('medium');
-	});
 });
diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index 0f1e11a57..c6701cc3e 100644
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -1,11 +1,11 @@
 <?php
-
 /**
  * Elgg notifications plugin
  *
  * @package ElggNotifications
  */
 
+elgg_register_event_handler('init', 'system', 'notifications_plugin_init');
 
 function notifications_plugin_init() {
 
@@ -187,5 +187,3 @@ function notifications_update_collection_notify($event, $object_type, $returnval
 		}
 	}
 }
-
-elgg_register_event_handler('init', 'system', 'notifications_plugin_init', 1000);
diff --git a/mod/notifications/views/default/forms/notificationsettings/groupsave.php b/mod/notifications/views/default/forms/notificationsettings/groupsave.php
index 2bf0d9628..61b94ff8b 100644
--- a/mod/notifications/views/default/forms/notificationsettings/groupsave.php
+++ b/mod/notifications/views/default/forms/notificationsettings/groupsave.php
@@ -96,7 +96,7 @@ END;
 		</table>
 <?php
 }
-	echo '<div class="mtm">';
+	echo '<div class="elgg-foot mtm">';
 	echo elgg_view('input/submit', array('value' => elgg_echo('save')));
 	echo '</div>';
 	
diff --git a/mod/notifications/views/default/forms/notificationsettings/save.php b/mod/notifications/views/default/forms/notificationsettings/save.php
index 0306080b8..ff32d8558 100644
--- a/mod/notifications/views/default/forms/notificationsettings/save.php
+++ b/mod/notifications/views/default/forms/notificationsettings/save.php
@@ -5,4 +5,9 @@
 
 echo elgg_view('notifications/subscriptions/personal');
 echo elgg_view('notifications/subscriptions/collections');
-echo elgg_view('notifications/subscriptions/forminternals');
\ No newline at end of file
+echo elgg_view('notifications/subscriptions/forminternals');
+
+?>
+<div class="elgg-foot">
+<?php echo elgg_view('input/submit', array('value' => elgg_echo('save'))); ?>
+</div>
diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php
index 008e98554..f2f6238f9 100644
--- a/mod/notifications/views/default/notifications/subscriptions/form.php
+++ b/mod/notifications/views/default/notifications/subscriptions/form.php
@@ -8,4 +8,4 @@ echo elgg_view('subscriptions/form/additions',$vars);
 	
 // Display a description
 
-echo elgg_view_form('notificationsettings/save');
+echo elgg_view_form('notificationsettings/save', array('class' => 'elgg-form-alt'));
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index b059db487..106eadc54 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -324,12 +324,4 @@ if (!isset($vars['replacement'])) {
 }
 
 ?>
-
-	<div class="elgg-form-footer-alt">
-<?php
-echo elgg_view('input/submit', array(
-	'value' => elgg_echo('save'),
-));
-?>
-	</p>
 </div>
diff --git a/mod/pages/languages/en.php b/mod/pages/languages/en.php
index f590afb9c..1c6d0318c 100644
--- a/mod/pages/languages/en.php
+++ b/mod/pages/languages/en.php
@@ -38,13 +38,12 @@ $english = array(
 	* River
 	**/
 
-	'pages:river:create' => 'created the page',
-	'pages:river:created' => "%s wrote",
-	'pages:river:updated' => "%s updated",
-	'pages:river:posted' => "%s posted",
-	'pages:river:update' => "a page titled",
-	'river:commented:object:page' => 'the page',
-	'river:commented:object:page_top' => 'the page',
+	'river:create:object:page' => '%s created a page %s',
+	'river:create:object:page_top' => '%s created a page %s',
+	'river:update:object:page' => '%s updated a page %s',
+	'river:update:object:page_top' => '%s updated a page %s',
+	'river:comment:object:page' => '%s commented on a page titled %s',
+	'river:comment:object:page_top' => '%s commented on a page titled %s',
 
 	/**
 	 * Form fields
diff --git a/mod/pages/pages/pages/edit.php b/mod/pages/pages/pages/edit.php
index 8e530084b..e6c2ea015 100644
--- a/mod/pages/pages/pages/edit.php
+++ b/mod/pages/pages/pages/edit.php
@@ -34,7 +34,6 @@ if ($page->canEdit()) {
 
 $body = elgg_view_layout('content', array(
 	'filter' => '',
-	'buttons' => '',
 	'content' => $content,
 	'title' => $title,
 ));
diff --git a/mod/pages/pages/pages/friends.php b/mod/pages/pages/pages/friends.php
index 13aa28578..c55b27466 100644
--- a/mod/pages/pages/pages/friends.php
+++ b/mod/pages/pages/pages/friends.php
@@ -13,6 +13,8 @@ if (!$owner) {
 elgg_push_breadcrumb($owner->name, "pages/owner/$owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
 
+elgg_register_title_button();
+
 $title = elgg_echo('pages:friends');
 
 $content = list_user_friends_objects($owner->guid, 'page_top', 10, false);
diff --git a/mod/pages/pages/pages/history.php b/mod/pages/pages/pages/history.php
index a7ef57b6b..a63b37a7a 100644
--- a/mod/pages/pages/pages/history.php
+++ b/mod/pages/pages/pages/history.php
@@ -34,7 +34,6 @@ $content = list_annotations($page_guid, 'page', 20, false);
 
 $body = elgg_view_layout('content', array(
 	'filter' => '',
-	'buttons' => '',
 	'content' => $content,
 	'title' => $title,
 	'sidebar' => elgg_view('pages/sidebar/navigation', array('page' => $page)),
diff --git a/mod/pages/pages/pages/new.php b/mod/pages/pages/pages/new.php
index 42a8e04e1..7cab2facb 100644
--- a/mod/pages/pages/pages/new.php
+++ b/mod/pages/pages/pages/new.php
@@ -30,7 +30,6 @@ $content = elgg_view_form('pages/edit', array(), $vars);
 
 $body = elgg_view_layout('content', array(
 	'filter' => '',
-	'buttons' => '',
 	'content' => $content,
 	'title' => $title,
 ));
diff --git a/mod/pages/pages/pages/owner.php b/mod/pages/pages/pages/owner.php
index c1169085f..2ff310ac8 100644
--- a/mod/pages/pages/pages/owner.php
+++ b/mod/pages/pages/pages/owner.php
@@ -17,6 +17,8 @@ $title = elgg_echo('pages:owner', array($owner->name));
 
 elgg_push_breadcrumb($owner->name);
 
+elgg_register_title_button();
+
 $content = elgg_list_entities(array(
 	'types' => 'object',
 	'subtypes' => 'page_top',
diff --git a/mod/pages/pages/pages/revision.php b/mod/pages/pages/pages/revision.php
index 83d72286c..66a36e4e7 100644
--- a/mod/pages/pages/pages/revision.php
+++ b/mod/pages/pages/pages/revision.php
@@ -45,7 +45,6 @@ $sidebar = elgg_view('pages/sidebar/history', array('page' => $page));
 
 $body = elgg_view_layout('content', array(
 	'filter' => '',
-	'buttons' => '',
 	'content' => $content,
 	'title' => $title,
 	'sidebar' => $sidebar,
diff --git a/mod/pages/pages/pages/view.php b/mod/pages/pages/pages/view.php
index b73bc985c..5dfb76b55 100644
--- a/mod/pages/pages/pages/view.php
+++ b/mod/pages/pages/pages/view.php
@@ -29,23 +29,21 @@ if (elgg_instanceof($container, 'group')) {
 pages_prepare_parent_breadcrumbs($page);
 elgg_push_breadcrumb($title);
 
-$content = elgg_view_entity($page, true);
+$content = elgg_view_entity($page, array('full_view' => true));
 $content .= elgg_view_comments($page);
 
-$buttons = '';
 if (elgg_get_logged_in_user_guid() == $page->getOwnerGuid()) {
 	$url = "pages/add/$page->guid";
-	$buttons = elgg_view('output/url', array(
-			'text' => elgg_echo('pages:newchild'),
+	elgg_register_menu_item('title', array(
+			'name' => 'subpage',
 			'href' => $url,
-			'class' => 'elgg-button elgg-button-action',
-		));
-	$buttons = "<ul class=\"elgg-menu elgg-menu-title\"><li>$buttons</li></ul>";
+			'text' => elgg_echo('pages:newchild'),
+			'link_class' => 'elgg-button elgg-button-action',
+	));
 }
 
 $body = elgg_view_layout('content', array(
 	'filter' => '',
-	'buttons' => $buttons,
 	'content' => $content,
 	'title' => $title,
 	'sidebar' => elgg_view('pages/sidebar/navigation'),
diff --git a/mod/pages/pages/pages/world.php b/mod/pages/pages/pages/world.php
index 267670144..e6a705b6b 100644
--- a/mod/pages/pages/pages/world.php
+++ b/mod/pages/pages/pages/world.php
@@ -10,6 +10,8 @@ $title = elgg_echo('pages:all');
 elgg_pop_breadcrumb();
 elgg_push_breadcrumb(elgg_echo('pages'));
 
+elgg_register_title_button();
+
 $content = elgg_list_entities(array(
 	'types' => 'object',
 	'subtypes' => 'page_top',
diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php
index 5186da11c..c29de1085 100644
--- a/mod/pages/views/default/forms/pages/edit.php
+++ b/mod/pages/views/default/forms/pages/edit.php
@@ -30,7 +30,7 @@ if (!empty($cats)) {
 }
 
 
-echo '<div>';
+echo '<div class="elgg-foot">';
 if ($vars['guid']) {
 	echo elgg_view('input/hidden', array(
 		'name' => 'page_guid',
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 2ad44e38c..8ba9fc298 100644
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -82,6 +82,7 @@ if ($full) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
+	$params = $params + $vars;
 	$list_body = elgg_view('object/elements/summary', $params);
 
 	$info = elgg_view_image_block($page_icon, $list_body);
@@ -103,6 +104,7 @@ HTML;
 		'tags' => $tags,
 		'content' => $excerpt,
 	);
+	$params = $params + $vars;
 	$list_body = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view_image_block($page_icon, $list_body);
diff --git a/mod/pages/views/default/pages/group_module.php b/mod/pages/views/default/pages/group_module.php
index 1d3437e18..7e2656ca3 100644
--- a/mod/pages/views/default/pages/group_module.php
+++ b/mod/pages/views/default/pages/group_module.php
@@ -17,9 +17,6 @@ $all_link = elgg_view('output/url', array(
 	'text' => elgg_echo('link:view:all'),
 ));
 
-$header = "<span class=\"groups-widget-viewall\">$all_link</span>";
-$header .= '<h3>' . elgg_echo('pages:group') . '</h3>';
-
 
 elgg_push_context('widgets');
 $options = array(
@@ -37,12 +34,14 @@ if (!$content) {
 	$content = '<p>' . elgg_echo('pages:none') . '</p>';
 }
 
-if ($group->canWriteToContainer()) {
-	$new_link = elgg_view('output/url', array(
-		'href' => "pages/add/$group->guid",
-		'text' => elgg_echo('pages:add'),
-	));
-	$content .= "<span class='elgg-widget-more'>$new_link</span>";
-}
+$new_link = elgg_view('output/url', array(
+	'href' => "pages/add/$group->guid",
+	'text' => elgg_echo('pages:add'),
+));
 
-echo elgg_view_module('info', '', $content, array('header' => $header));
+echo elgg_view('groups/profile/module', array(
+	'title' => elgg_echo('pages:group'),
+	'content' => $content,
+	'all_link' => $all_link,
+	'add_link' => $new_link,
+));
diff --git a/mod/pages/views/default/river/object/page/create.php b/mod/pages/views/default/river/object/page/create.php
index 032046063..ca15ddea7 100644
--- a/mod/pages/views/default/river/object/page/create.php
+++ b/mod/pages/views/default/river/object/page/create.php
@@ -7,29 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = elgg_get_excerpt($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
-
-$group_string = '';
-$container = $object->getContainerEntity();
-if ($container instanceof ElggGroup) {
-	$params = array(
-		'href' => $container->getURL(),
-		'text' => $container->name,
-	);
-	$group_link = elgg_view('output/url', $params);
-	$group_string = elgg_echo('river:ingroup', array($group_link));
-}
-
-echo elgg_echo('pages:river:create');
-
-echo " $link $group_string";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php
index 48d7ff24f..5a65a3a26 100644
--- a/mod/profile/views/default/profile/owner_block.php
+++ b/mod/profile/views/default/profile/owner_block.php
@@ -35,7 +35,7 @@ if (elgg_is_admin_logged_in() && elgg_get_logged_in_user_guid() != elgg_get_page
 	$text = elgg_echo('admin:options');
 
 	$admin_links = '<ul class="profile-admin-menu-wrapper">';
-	$admin_links .= "<li><a class=\"elgg-toggler\" href=\"#profile-menu-admin\">$text&hellip;</a>";
+	$admin_links .= "<li><a rel=\"toggle\" href=\"#profile-menu-admin\">$text&hellip;</a>";
 	$admin_links .= '<ul class="profile-admin-menu" id="profile-menu-admin">';
 	foreach ($admin as $menu_item) {
 		$admin_links .= elgg_view('navigation/menu/elements/item', array('item' => $menu_item));
diff --git a/mod/reportedcontent/views/default/forms/reportedcontent/add.php b/mod/reportedcontent/views/default/forms/reportedcontent/add.php
index 0b1716a35..f9986849d 100644
--- a/mod/reportedcontent/views/default/forms/reportedcontent/add.php
+++ b/mod/reportedcontent/views/default/forms/reportedcontent/add.php
@@ -48,7 +48,7 @@ $owner = elgg_get_logged_in_user_entity();
 		)); 
 	?>
 </div>
-<div>
+<div class="elgg-foot">
 	<?php
 		echo elgg_view('input/submit', array(
 			'value' => elgg_echo('reportedcontent:report'),
diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php
index b8c443450..6bcbf6e5d 100644
--- a/mod/reportedcontent/views/default/object/reported_content.php
+++ b/mod/reportedcontent/views/default/object/reported_content.php
@@ -58,7 +58,7 @@ if ($report->state == 'archived') {
 			<?php echo elgg_view('output/url', array(
 				'href' => "#report-$report->guid",
 				'text' => elgg_echo('reportedcontent:moreinfo'),
-				'class' => "elgg-toggler",
+				'rel' => "toggle",
 			));
 			?>
 		</p>
diff --git a/mod/search/views/default/search/entity.php b/mod/search/views/default/search/entity.php
index 2193a70d8..e04d08836 100644
--- a/mod/search/views/default/search/entity.php
+++ b/mod/search/views/default/search/entity.php
@@ -27,7 +27,7 @@ if (!$icon) {
 	} else {
 		// display a generic icon if no owner, though there will probably be
 		// other problems if the owner can't be found.
-		$icon = elgg_view_entity($entity, 'tiny');
+		$icon = elgg_view_entity_icon($entity, 'tiny');
 	}
 }
 
diff --git a/mod/search/views/default/search/list.php b/mod/search/views/default/search/list.php
index c5afaaa86..c5249fe77 100644
--- a/mod/search/views/default/search/list.php
+++ b/mod/search/views/default/search/list.php
@@ -37,8 +37,8 @@ $query = http_build_query(
 $url = elgg_get_site_url() . "search?$query";
 
 // get pagination
-if (array_key_exists('pagination', $vars) && $vars['pagination']) {
-	$nav .= elgg_view('navigation/pagination',array(
+if (array_key_exists('pagination', $vars['params']) && $vars['params']['pagination']) {
+	$nav = elgg_view('navigation/pagination',array(
 		'baseurl' => $url,
 		'offset' => $vars['params']['offset'],
 		'count' => $vars['results']['count'],
@@ -82,7 +82,8 @@ $more = ($more_check > 0) ? $more_check : 0;
 if ($more) {
 	$title_key = ($more == 1) ? 'comment' : 'comments';
 	$more_str = elgg_echo('search:more', array($count, $type_str));
-	$more_link = "<li class='elgg-list-item'><a href=\"$url\">$more_str</a></li>";
+	$more_url = elgg_http_remove_url_query_element($url, 'limit');
+	$more_link = "<li class='elgg-item'><a href=\"$more_url\">$more_str</a></li>";
 } else {
 	$more_link = '';
 }
@@ -98,7 +99,7 @@ if ($view) {
 	$body .= '<ul class="elgg-list search-list">';
 	foreach ($entities as $entity) {
 		$id = "elgg-{$entity->getType()}-{$entity->getGUID()}";
-		$body .= "<li id=\"$id\" class=\"elgg-list-item\">";
+		$body .= "<li id=\"$id\" class=\"elgg-item\">";
 		$body .= elgg_view($view, array(
 			'entity' => $entity,
 			'params' => $vars['params'],
diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php
index 1b9d71c56..9716fc060 100644
--- a/mod/thewire/languages/en.php
+++ b/mod/thewire/languages/en.php
@@ -13,7 +13,7 @@ $english = array(
 	'thewire:user' => "%s's wire posts",
 	'thewire:friends' => "Friends' wire posts",
 	'thewire:reply' => "Reply",
-	'thewire:replying' => "Replying to %s who wrote",
+	'thewire:replying' => "Replying to %s (@%s) who wrote",
 	'thewire:thread' => "Thread",
 	'thewire:charleft' => "characters remaining",
 	'thewire:tags' => "Wire posts tagged with '%s'",
@@ -29,7 +29,8 @@ $english = array(
 	/**
 	 * The wire river
 	 */
-	'thewire:river:create' => "posted to the wire",
+	'river:create:object:thewire' => "%s posted to the %s",
+	'thewire:wire' => 'wire',
 
 	/**
 	 * Wire widget
diff --git a/mod/thewire/pages/thewire/everyone.php b/mod/thewire/pages/thewire/everyone.php
index e3d38ace5..e78395c31 100644
--- a/mod/thewire/pages/thewire/everyone.php
+++ b/mod/thewire/pages/thewire/everyone.php
@@ -9,7 +9,8 @@ elgg_push_breadcrumb(elgg_echo('thewire'));
 $title = elgg_echo('thewire:everyone');
 
 if (elgg_is_logged_in()) {
-	$content .= elgg_view_form('thewire/add');
+	$form_vars = array('class' => 'thewire-form');
+	$content .= elgg_view_form('thewire/add', $form_vars);
 	$content .= elgg_view('input/urlshortener');
 }
 
@@ -23,7 +24,6 @@ $body = elgg_view_layout('content', array(
 	'filter_context' => 'all',
 	'content' => $content,
 	'title' => $title,
-	'buttons' => false,
 	'sidebar' => elgg_view('thewire/sidebar'),
 ));
 
diff --git a/mod/thewire/pages/thewire/friends.php b/mod/thewire/pages/thewire/friends.php
index ab452aa55..265b73eab 100644
--- a/mod/thewire/pages/thewire/friends.php
+++ b/mod/thewire/pages/thewire/friends.php
@@ -11,13 +11,18 @@ elgg_push_breadcrumb(elgg_echo('thewire'), "thewire/all");
 elgg_push_breadcrumb($owner->name, "thewire/owner/$owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
 
-$content = list_user_friends_objects($owner->guid, 'thewire', 15, false);
+if (get_loggedin_userid() == $owner->guid) {
+	$form_vars = array('class' => 'thewire-form');
+	$content = elgg_view_form('thewire/add', $form_vars);
+	$content .= elgg_view('input/urlshortener');
+}
+
+$content .= list_user_friends_objects($owner->guid, 'thewire', 15, false);
 
 $body = elgg_view_layout('content', array(
 	'filter_context' => 'friends',
 	'content' => $content,
 	'title' => $title,
-	'buttons' => false,
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/thewire/owner.php b/mod/thewire/pages/thewire/owner.php
index d61307990..b6449b217 100644
--- a/mod/thewire/pages/thewire/owner.php
+++ b/mod/thewire/pages/thewire/owner.php
@@ -12,7 +12,8 @@ elgg_push_breadcrumb(elgg_echo('thewire'), "thewire/all");
 elgg_push_breadcrumb($owner->name);
 
 if (get_loggedin_userid() == $owner->guid) {
-	$content = elgg_view_form('thewire/add');
+	$form_vars = array('class' => 'thewire-form');
+	$content = elgg_view_form('thewire/add', $form_vars);
 	$content .= elgg_view('input/urlshortener');
 }
 
@@ -27,7 +28,6 @@ $body = elgg_view_layout('content', array(
 	'filter_context' => 'mine',
 	'content' => $content,
 	'title' => $title,
-	'buttons' => false,
 	'sidebar' => elgg_view('thewire/sidebar'),
 ));
 
diff --git a/mod/thewire/pages/thewire/previous.php b/mod/thewire/pages/thewire/previous.php
index 45c1e1095..a3f1cb01c 100644
--- a/mod/thewire/pages/thewire/previous.php
+++ b/mod/thewire/pages/thewire/previous.php
@@ -15,7 +15,6 @@ $body = elgg_view_layout('content', array(
 	'filter' => false,
 	'content' => $body,
 	'title' => $title,
-	'buttons' => false,
 ));
 
 echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/mod/thewire/pages/thewire/reply.php b/mod/thewire/pages/thewire/reply.php
index 826d513b6..df4511c51 100644
--- a/mod/thewire/pages/thewire/reply.php
+++ b/mod/thewire/pages/thewire/reply.php
@@ -14,7 +14,8 @@ elgg_push_breadcrumb(elgg_echo('thewire'), 'thewire/all');
 elgg_push_breadcrumb($title);
 
 $content = elgg_view('thewire/reply', array('post' => $post));
-$content .= elgg_view_form('thewire/add', array(), array('post' => $post));
+$form_vars = array('class' => 'thewire-form');
+$content .= elgg_view_form('thewire/add', $form_vars, array('post' => $post));
 $content .= elgg_view('input/urlshortener');
 
 
@@ -22,7 +23,6 @@ $body = elgg_view_layout('content', array(
 	'filter' => false,
 	'content' => $content,
 	'title' => $title,
-	'buttons' => false,
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/thewire/tag.php b/mod/thewire/pages/thewire/tag.php
index 53f9e9db9..1c88030ec 100644
--- a/mod/thewire/pages/thewire/tag.php
+++ b/mod/thewire/pages/thewire/tag.php
@@ -30,7 +30,6 @@ $body = elgg_view_layout('content', array(
 	'filter' => false,
 	'content' => $content,
 	'title' => $title,
-	'buttons' => false,
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/thewire/thread.php b/mod/thewire/pages/thewire/thread.php
index 5c32a8400..ec2709430 100644
--- a/mod/thewire/pages/thewire/thread.php
+++ b/mod/thewire/pages/thewire/thread.php
@@ -22,7 +22,6 @@ $body = elgg_view_layout('content', array(
 	'filter' => false,
 	'content' => $content,
 	'title' => $title,
-	'buttons' => false,
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 0e6bd7794..9d3993b6f 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -278,6 +278,16 @@ function thewire_save_post($text, $userid, $access_id, $parent_guid = 0, $method
 
 	if ($guid) {
 		add_to_river('river/object/thewire/create', 'create', $post->owner_guid, $post->guid);
+
+		// let other plugins know we are setting a user status
+		$params = array(
+			'entity' => $post,
+			'user' => $post->getOwnerEntity(),
+			'message' => $post->description,
+			'url' => $post->getURL(),
+			'origin' => 'thewire',
+		);
+		elgg_trigger_plugin_hook('status', 'user', $params);
 	}
 	
 	return $guid;
@@ -401,7 +411,7 @@ function thewire_setup_entity_menu_items($hook, $type, $value, $params) {
 			'text' => elgg_echo('thewire:previous'),
 			'href' => "thewire/previous/$entity->guid",
 			'priority' => 160,
-			'class' => 'thewire-previous',
+			'link_class' => 'thewire-previous',
 			'title' => elgg_echo('thewire:previous:help'),
 		);
 		$value[] = ElggMenuItem::factory($options);
diff --git a/mod/thewire/views/default/forms/thewire/add.php b/mod/thewire/views/default/forms/thewire/add.php
index 67585b0df..8607b3662 100644
--- a/mod/thewire/views/default/forms/thewire/add.php
+++ b/mod/thewire/views/default/forms/thewire/add.php
@@ -20,12 +20,17 @@ if ($post) {
 		'value' => $post->guid,
 	));
 }
+
+echo elgg_view('input/plaintext', array(
+	'name' => 'body',
+	'class' => 'mtm',
+	'id' => 'thewire-textarea',
+));
 ?>
-<textarea id="thewire-textarea" name="body" class="mtm"></textarea>
 <div id="thewire-characters-remaining">
 	<span>140</span> <?php echo elgg_echo('thewire:charleft'); ?>
 </div>
-<div class="mts">
+<div class="elgg-foot mts">
 <?php
 
 echo elgg_view('input/submit', array(
diff --git a/mod/thewire/views/default/js/thewire.php b/mod/thewire/views/default/js/thewire.php
index 1eda90bee..d9bf6d10e 100644
--- a/mod/thewire/views/default/js/thewire.php
+++ b/mod/thewire/views/default/js/thewire.php
@@ -30,7 +30,7 @@ elgg.thewire.init = function() {
  */
 elgg.thewire.textCounter = function(textarea, status, limit) {
 
-	var remaining_chars = limit - textarea.value.length;
+	var remaining_chars = limit - $(textarea).val().length;
 	status.html(remaining_chars);
 
 	if (remaining_chars < 0) {
@@ -83,4 +83,4 @@ elgg.thewire.viewPrevious = function(event) {
 	event.preventDefault();
 }
 
-elgg.register_hook_handler('init', 'system', elgg.thewire.init);
\ No newline at end of file
+elgg.register_hook_handler('init', 'system', elgg.thewire.init);
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 3ae347711..2727df60d 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -51,6 +51,7 @@ $params = array(
 	'content' => thewire_filter($post->description),
 	'tags' => false,
 );
+$params = $params + $vars;
 $list_body = elgg_view('object/elements/summary', $params);
 
 echo elgg_view_image_block($owner_icon, $list_body);
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index d4dac38ee..c3c434858 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -7,18 +7,23 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = thewire_filter($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
+$subject = $vars['item']->getSubjectEntity();
+$subject_link = elgg_view('output/url', array(
+	'href' => $subject->getURL(),
+	'text' => $subject->name,
+	'class' => 'elgg-river-subject',
+));
 
-echo elgg_echo('thewire:river:create');
+$object_link = elgg_view('output/url', array(
+	'href' => "thewire/owner/$subject->username",
+	'text' => elgg_echo('thewire:wire'),
+	'class' => 'elgg-river-object',
+));
 
-echo " $link";
+$summary = elgg_echo("river:create:object:thewire", array($subject_link, $object_link));
 
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+	'summary' => $summary,
+));
\ No newline at end of file
diff --git a/mod/thewire/views/default/thewire/reply.php b/mod/thewire/views/default/thewire/reply.php
index 3794e1454..341b691b1 100644
--- a/mod/thewire/views/default/thewire/reply.php
+++ b/mod/thewire/views/default/thewire/reply.php
@@ -5,7 +5,10 @@
 
 $post = $vars['post'];
 $poster = $post->getOwnerEntity();
-
+$poster_details = array(
+	htmlspecialchars($poster->name,  ENT_QUOTES, 'UTF-8'),
+	htmlspecialchars($poster->username,  ENT_QUOTES, 'UTF-8'),
+);
 ?>
-<b><?php echo elgg_echo('thewire:replying', array($poster->name)); ?>: </b>
+<b><?php echo elgg_echo('thewire:replying', $poster_details); ?>: </b>
 <?php echo $post->description;
\ No newline at end of file
diff --git a/mod/tinymce/css/elgg_tinymce.css b/mod/tinymce/css/elgg_tinymce.css
new file mode 100644
index 000000000..503e78c35
--- /dev/null
+++ b/mod/tinymce/css/elgg_tinymce.css
@@ -0,0 +1,5 @@
+/* CSS for TinyMCE content iframe */
+body, td, pre {
+	color: #333;
+	font: 80%/1.4 "Lucida Grande",Verdana,sans-serif;
+}
\ No newline at end of file
diff --git a/mod/tinymce/start.php b/mod/tinymce/start.php
index 3b662308a..ee7154d22 100644
--- a/mod/tinymce/start.php
+++ b/mod/tinymce/start.php
@@ -5,6 +5,8 @@
  * @package ElggTinyMCE
  */
 
+elgg_register_event_handler('init', 'system', 'tinymce_init');
+
 function tinymce_init() {
 	elgg_extend_view('css/elgg', 'tinymce/css');
 	elgg_extend_view('css/admin', 'tinymce/css');
@@ -30,5 +32,3 @@ function tinymce_longtext_menu($hook, $type, $items, $vars) {
 	
 	return $items;
 }
-
-elgg_register_event_handler('init', 'system', 'tinymce_init', 9999);
diff --git a/mod/tinymce/tinymce_content.css b/mod/tinymce/tinymce_content.css
deleted file mode 100644
index af7c9bde7..000000000
--- a/mod/tinymce/tinymce_content.css
+++ /dev/null
@@ -1 +0,0 @@
-body, td, pre {color:#000; font-family:"Lucida Grande",Arial,Tahoma,Verdana,sans-serif; font-size:13px; margin:8px;} 
diff --git a/mod/tinymce/views/default/js/tinymce.php b/mod/tinymce/views/default/js/tinymce.php
index 092983d1d..55e0c7ae1 100644
--- a/mod/tinymce/views/default/js/tinymce.php
+++ b/mod/tinymce/views/default/js/tinymce.php
@@ -56,17 +56,17 @@ elgg.tinymce.init = function() {
 			//show the number of words
 			ed.onLoadContent.add(function(ed, o) {
 				var strip = (tinyMCE.activeEditor.getContent()).replace(/(&lt;([^&gt;]+)&gt;)/ig,"");
-				var text = " <?php echo elgg_echo('tinymce:word_count'); ?>" + strip.split(' ').length + ' ';
+				var text = elgg.echo('tinymce:word_count') + strip.split(' ').length + ' ';
 				tinymce.DOM.setHTML(tinymce.DOM.get(tinyMCE.activeEditor.id + '_path_row'), text);
 			});
 	
 			ed.onKeyUp.add(function(ed, e) {
 				var strip = (tinyMCE.activeEditor.getContent()).replace(/(&lt;([^&gt;]+)&gt;)/ig,"");
-				var text = " <?php echo elgg_echo('tinymce:word_count'); ?>" + strip.split(' ').length + ' ';
+				var text = elgg.echo('tinymce:word_count') + strip.split(' ').length + ' ';
 				tinymce.DOM.setHTML(tinymce.DOM.get(tinyMCE.activeEditor.id + '_path_row'), text);
 			});
 		},
-		content_css: elgg.config.wwwroot + 'mod/tinymce/tinymce_content.css'
+		content_css: elgg.config.wwwroot + 'mod/tinymce/css/elgg_tinymce.css'
 	});
 
 }
diff --git a/mod/tinymce/views/default/tinymce/css.php b/mod/tinymce/views/default/tinymce/css.php
index 5d008024f..b12cae82c 100644
--- a/mod/tinymce/views/default/tinymce/css.php
+++ b/mod/tinymce/views/default/tinymce/css.php
@@ -26,3 +26,6 @@
 	-moz-border-radius: 4px;
 	border-radius: 4px;
 }
+.mceLast .mceStatusbar {
+	padding-left: 5px;
+}
diff --git a/mod/twitter/views/default/twitter/css.php b/mod/twitter/views/default/twitter/css.php
index cb58e8fb1..eb0cda98a 100644
--- a/mod/twitter/views/default/twitter/css.php
+++ b/mod/twitter/views/default/twitter/css.php
@@ -54,7 +54,7 @@ p.twitter_username .input-text {
 	padding:2px;
 	margin:0 0 5px 0;
 }
-#twitter_widget li a {
+#twitter_widget li > a {
 	display:block;
 	margin:0 0 0 4px;
 }
diff --git a/mod/twitter_api/actions/twitter_api/interstitial_settings.php b/mod/twitter_api/actions/twitter_api/interstitial_settings.php
new file mode 100644
index 000000000..5f742efd8
--- /dev/null
+++ b/mod/twitter_api/actions/twitter_api/interstitial_settings.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Save settings for first time logins with twitter
+ */
+elgg_make_sticky_form('twitter_api_interstitial');
+
+$display_name = get_input('display_name');
+$email = get_input('email');
+$password_1 = get_input('password_1');
+$password_2 = get_input('password_2');
+
+if (!$display_name) {
+	register_error(elgg_echo('twitter_api:interstitial:no_display_name'));
+	forward(REFERER);
+}
+
+if ($email && !is_email_address($email)) {
+	register_error(elgg_echo('twitter_api:interstitial:invalid_email'));
+	forward(REFERER);
+}
+
+$existing_user = get_user_by_email($email);
+if ($email && $existing_user) {
+	register_error(elgg_echo('twitter_api:interstitial:existing_email'));
+	forward(REFERER);
+}
+
+if ($password_1 && !($password_1 == $password_2)) {
+	register_error(elgg_echo('twitter_api:interstitial:password_mismatch'));
+	forward(REFERER);
+}
+
+$user = elgg_get_logged_in_user_entity();
+$user->name = $display_name;
+
+if ($email) {
+	$user->email = $email;
+}
+
+if ($password_1) {
+	$user->salt = generate_random_cleartext_password();
+	$user->password = generate_user_password($user, $password_1);
+}
+
+if (!$user->save()) {
+	register_error(elgg_echo('twitter_api:interstitial:cannot_save'));
+	forward(REFERER);
+}
+
+elgg_clear_sticky_form('twitter_api_interstitial');
+
+system_message(elgg_echo('twitter_api:interstitial:saved'));
+forward('/');
\ No newline at end of file
diff --git a/mod/twitter_api/graphics/sign-in-with-twitter-d.png b/mod/twitter_api/graphics/sign-in-with-twitter-d.png
new file mode 100644
index 000000000..b49a0ba59
--- /dev/null
+++ b/mod/twitter_api/graphics/sign-in-with-twitter-d.png
diff --git a/mod/twitter_api/graphics/sign-in-with-twitter-l.png b/mod/twitter_api/graphics/sign-in-with-twitter-l.png
new file mode 100644
index 000000000..834d43cfd
--- /dev/null
+++ b/mod/twitter_api/graphics/sign-in-with-twitter-l.png
diff --git a/mod/twitter_api/languages/en.php b/mod/twitter_api/languages/en.php
index 940a49d9b..9d8554a9e 100644
--- a/mod/twitter_api/languages/en.php
+++ b/mod/twitter_api/languages/en.php
@@ -11,10 +11,11 @@ $english = array(
 	'twitter_api:consumer_key' => 'Consumer Key',
 	'twitter_api:consumer_secret' => 'Consumer Secret',
 
-	'twitter_api:settings:instructions' => 'You must obtain a consumer key and secret from <a href="https://twitter.com/oauth_clients" target="_blank">Twitter</a>. Most of the fields are self explanatory, the one piece of data you will need is the callback url which takes the form http://[yoursite]/action/twitterlogin/return - [yoursite] is the url of your Elgg network.',
+	'twitter_api:settings:instructions' => 'You must obtain a consumer key and secret from <a href="https://dev.twitter.com/apps/new" target="_blank">Twitter</a>. Fill out the new app application. Select "Browser" as the application type and "Read & Write" for the access type. The callback url is %stwitter_api/authorize',
 
 	'twitter_api:usersettings:description' => "Link your %s account with Twitter.",
 	'twitter_api:usersettings:request' => "You must first <a href=\"%s\">authorize</a> %s to access your Twitter account.",
+	'twitter_api:usersettings:cannot_revoke' => "You cannot unlink you account with Twitter because you haven't provided an email address or password. <a href=\"%s\">Provide them now</a>.",
 	'twitter_api:authorize:error' => 'Unable to authorize Twitter.',
 	'twitter_api:authorize:success' => 'Twitter access has been authorized.',
 
@@ -28,7 +29,30 @@ $english = array(
 	'twitter_api:login:error' => 'Unable to login with Twitter.',
 	'twitter_api:login:email' => "You must enter a valid email address for your new %s account.",
 
+	'twitter_api:invalid_page' => 'Invalid page',
+
 	'twitter_api:deprecated_callback_url' => 'The callback URL has changed for Twitter API to %s.  Please ask your administrator to change it.',
+
+	'twitter_api:interstitial:settings' => 'Configure your settings',
+	'twitter_api:interstitial:description' => 'You\'re almost ready to use %s! We need a few more details before you can continue. These are optional, but will allow you login if Twitter goes down or you decide to unlink your accounts.',
+
+	'twitter_api:interstitial:username' => 'This is your username. It cannot be changed. If you set a password, you can use the username or your email address to log in.',
+
+	'twitter_api:interstitial:name' => 'This is the name people will see when interacting with you.',
+
+	'twitter_api:interstitial:email' => 'Your email address. Users cannot see this by default.',
+
+	'twitter_api:interstitial:password' => 'A password to login if Twitter is down or you decide to unlink your accounts.',
+	'twitter_api:interstitial:password2' => 'The same password, again.',
+
+	'twitter_api:interstitial:no_thanks' => 'No thanks',
+
+	'twitter_api:interstitial:no_display_name' => 'You must have a display name.',
+	'twitter_api:interstitial:invalid_email' => 'You must enter a valid email address or nothing.',
+	'twitter_api:interstitial:existing_email' => 'This email address is already registered on this site.',
+	'twitter_api:interstitial:password_mismatch' => 'Your passwords do not match.',
+	'twitter_api:interstitial:cannot_save' => 'Cannot save account details.',
+	'twitter_api:interstitial:saved' => 'Account details saved!',
 );
 
 add_translation('en', $english);
diff --git a/mod/twitter_api/lib/twitter_api.php b/mod/twitter_api/lib/twitter_api.php
index 0621c2b13..b14b84f2d 100644
--- a/mod/twitter_api/lib/twitter_api.php
+++ b/mod/twitter_api/lib/twitter_api.php
@@ -24,9 +24,9 @@ function twitter_api_allow_sign_on_with_twitter() {
 }
 
 /**
- * Forwards
+ * Forwards the user to twitter to authenticate
  *
- * @todo what is this?
+ * This includes the login URL as the callback
  */
 function twitter_api_forward() {
 	// sanity check
@@ -41,7 +41,18 @@ function twitter_api_forward() {
 }
 
 /**
- * Log in a user with twitter.
+ * Log in a user referred from Twitter's OAuth API
+ *
+ * If the user has already linked their account with Twitter, it is a seamless
+ * login. If this is a first time login (or a user from deprecated twitter login
+ * plugin), we create a new account (update the account).
+ *
+ * If a plugin wants to be notified when someone logs in with twitter or a new
+ * twitter user signs up, register for the standard login or create user events
+ * and check for 'twitter_api' context.
+ *
+ * The user has to be redirected from Twitter for this to work. It depends on
+ * the Twitter OAuth data.
  */
 function twitter_api_login() {
 
@@ -64,32 +75,26 @@ function twitter_api_login() {
 			'access_key' => $token['oauth_token'],
 			'access_secret' => $token['oauth_token_secret'],
 		),
-		'limit' => 0
+		'limit' => 0,
 	);
 
 	$users = elgg_get_entities_from_plugin_user_settings($options);
 
 	if ($users) {
 		if (count($users) == 1 && login($users[0])) {
-			system_message(elgg_echo('twitter_api:login:success'));
-			
-			// trigger login hook
-			elgg_trigger_plugin_hook('login', 'twitter_api', array('user' => $users[0]));
+			system_message(elgg_echo('twitter_api:login:success'));			
 		} else {
-			system_message(elgg_echo('twitter_api:login:error'));
+			register_error(elgg_echo('twitter_api:login:error'));
 		}
-
-		forward();
-	} else {
-		// need Twitter account credentials
-		elgg_load_library('twitter_oauth');
 		
+		forward(elgg_get_site_url());
+	} else {
 		$consumer_key = elgg_get_plugin_setting('consumer_key', 'twitter_api');
 		$consumer_secret = elgg_get_plugin_setting('consumer_secret', 'twitter_api');
 		$api = new TwitterOAuth($consumer_key, $consumer_secret, $token['oauth_token'], $token['oauth_token_secret']);
 		$twitter = $api->get('account/verify_credentials');
 
-		// backward compatibility for stalled-development Twitter Login plugin
+		// backward compatibility for deprecated Twitter Login plugin
 		$user = FALSE;
 		if ($twitter_user = get_user_by_username($token['screen_name'])) {
 			if (($screen_name = $twitter_user->twitter_screen_name) && ($screen_name == $token['screen_name'])) {
@@ -101,48 +106,10 @@ function twitter_api_login() {
 
 		// create new user
 		if (!$user) {
-			// check new registration allowed
-			if (!twitter_api_allow_new_users_with_twitter()) {
-				register_error(elgg_echo('registerdisabled'));
-				forward();
-			}
-
-			// trigger a hook for plugin authors to intercept
-			if (!elgg_trigger_plugin_hook('new_twitter_user', 'twitter_service', array('account' => $twitter), TRUE)) {
-				// halt execution
-				register_error(elgg_echo('twitter_api:login:error'));
-				forward();
-			}
-
-			// Elgg-ify Twitter credentials
-			$username = $twitter->screen_name;
-			while (get_user_by_username($username)) {
-				$username = $twitter->screen_name . '_' . rand(1000, 9999);
-			}
-
-			$password = generate_random_cleartext_password();
-			$name = $twitter->name;
-
-			$user = new ElggUser();
-			$user->username = $username;
-			$user->name = $name;
-			$user->access_id = ACCESS_PUBLIC;
-			$user->salt = generate_random_cleartext_password();
-			$user->password = generate_user_password($user, $password);
-			$user->owner_guid = 0;
-			$user->container_guid = 0;
-
-			if (!$user->save()) {
-				register_error(elgg_echo('registerbad'));
-				forward();
-			}
-
-			// @todo require email address?
-
+			$user = twitter_api_create_user($twitter);
 			$site_name = elgg_get_site_entity()->name;
 			system_message(elgg_echo('twitter_api:login:email', array($site_name)));
-
-			$forward = "settings/user/{$user->username}";
+			$forward = "twitter_api/intersitial";
 		}
 
 		// set twitter services tokens
@@ -156,9 +123,6 @@ function twitter_api_login() {
 		// login new user
 		if (login($user)) {
 			system_message(elgg_echo('twitter_api:login:success'));
-			
-			// trigger login hook for new user
-			elgg_trigger_plugin_hook('first_login', 'twitter_api', array('user' => $user));
 		} else {
 			system_message(elgg_echo('twitter_api:login:error'));
 		}
@@ -172,10 +136,50 @@ function twitter_api_login() {
 }
 
 /**
+ * Create a new user from Twitter information
+ * 
+ * @param object $twitter Twitter OAuth response
+ * @return ElggUser
+ */
+function twitter_api_create_user($twitter) {
+	// check new registration allowed
+	if (!twitter_api_allow_new_users_with_twitter()) {
+		register_error(elgg_echo('registerdisabled'));
+		forward();
+	}
+
+	// Elgg-ify Twitter credentials
+	$username = $twitter->screen_name;
+	while (get_user_by_username($username)) {
+		// @todo I guess we just hope this is good enough
+		$username = $twitter->screen_name . '_' . rand(1000, 9999);
+	}
+
+	$password = generate_random_cleartext_password();
+	$name = $twitter->name;
+
+	$user = new ElggUser();
+	$user->username = $username;
+	$user->name = $name;
+	$user->access_id = ACCESS_PUBLIC;
+	$user->salt = generate_random_cleartext_password();
+	$user->password = generate_user_password($user, $password);
+	$user->owner_guid = 0;
+	$user->container_guid = 0;
+
+	if (!$user->save()) {
+		register_error(elgg_echo('registerbad'));
+		forward();
+	}
+
+	return $user;
+}
+
+/**
  * Pull in the latest avatar from twitter.
  *
- * @param unknown_type $user
- * @param unknown_type $file_location
+ * @param ElggUser $user
+ * @param string   $file_location
  */
 function twitter_api_update_user_avatar($user, $file_location) {
 	// twitter's images have a few suffixes:
@@ -213,8 +217,6 @@ function twitter_api_update_user_avatar($user, $file_location) {
 	
 	// update user's icontime
 	$user->icontime = time();
-
-	return TRUE;
 }
 
 /**
@@ -243,7 +245,6 @@ function twitter_api_authorize() {
 		),
 		'limit' => 0
 	);
-
 	$users = elgg_get_entities_from_plugin_user_settings($options);
 
 	if ($users) {
@@ -281,13 +282,12 @@ function twitter_api_revoke() {
 }
 
 /**
- * Returns the url to authorize a user.
+ * Gets the url to authorize a user.
  *
  * @param string $callback The callback URL
  */
-function twitter_api_get_authorize_url($callback = NULL) {
+function twitter_api_get_authorize_url($callback = NULL, $login = true) {
 	global $SESSION;
-	elgg_load_library('twitter_oauth');
 
 	$consumer_key = elgg_get_plugin_setting('consumer_key', 'twitter_api');
 	$consumer_secret = elgg_get_plugin_setting('consumer_secret', 'twitter_api');
@@ -302,7 +302,7 @@ function twitter_api_get_authorize_url($callback = NULL) {
 		'oauth_token_secret' => $token['oauth_token_secret'],
 	);
 
-	return $twitter->getAuthorizeURL($token['oauth_token']);
+	return $twitter->getAuthorizeURL($token['oauth_token'], $login);
 }
 
 /**
@@ -312,7 +312,6 @@ function twitter_api_get_authorize_url($callback = NULL) {
  */
 function twitter_api_get_access_token($oauth_verifier = FALSE) {
 	global $SESSION;
-	elgg_load_library('twitter_oauth');
 
 	$consumer_key = elgg_get_plugin_setting('consumer_key', 'twitter_api');
 	$consumer_secret = elgg_get_plugin_setting('consumer_secret', 'twitter_api');
diff --git a/mod/twitter_api/pages/twitter_api/interstitial.php b/mod/twitter_api/pages/twitter_api/interstitial.php
new file mode 100644
index 000000000..d1f1ac20c
--- /dev/null
+++ b/mod/twitter_api/pages/twitter_api/interstitial.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * An interstitial page for newly created Twitter users.
+ *
+ * This prompts them to enter an email address and set a password in case Twitter goes down or they
+ * want to disassociate their account from twitter.
+ */
+
+$title = elgg_echo('twitter_api:interstitial:settings');
+
+$site = get_config('site');
+$content = elgg_echo('twitter_api:interstitial:description', array($site->name));
+$content .= elgg_view_form('twitter_api/interstitial_settings');
+
+$params = array(
+	'content' => $content,
+	'title' => $title,
+);
+$body = elgg_view_layout('one_sidebar', $params);
+
+echo elgg_view_page($title, $body);
diff --git a/mod/twitter_api/start.php b/mod/twitter_api/start.php
index 8a49db719..b17643c8c 100644
--- a/mod/twitter_api/start.php
+++ b/mod/twitter_api/start.php
@@ -12,14 +12,14 @@ function twitter_api_init() {
 
 	// require libraries
 	$base = elgg_get_plugins_path() . 'twitter_api';
-	elgg_register_library('twitter_oauth', "$base/vendors/twitteroauth/twitterOAuth.php");
+	elgg_register_class('TwitterOAuth', "$base/vendors/twitteroauth/twitterOAuth.php");
 	elgg_register_library('twitter_api', "$base/lib/twitter_api.php");
-
 	elgg_load_library('twitter_api');
 
 	// extend site views
-	elgg_extend_view('metatags', 'twitter_api/metatags');
-	elgg_extend_view('css', 'twitter_api/css');
+	//elgg_extend_view('metatags', 'twitter_api/metatags');
+	elgg_extend_view('css/elgg', 'twitter_api/css');
+	elgg_extend_view('css/admin', 'twitter_api/css');
 
 	// sign on with twitter
 	if (twitter_api_allow_sign_on_with_twitter()) {
@@ -34,14 +34,17 @@ function twitter_api_init() {
 	// register Walled Garden public pages
 	elgg_register_plugin_hook_handler('public_pages', 'walled_garden', 'twitter_api_public_pages');
 
-	// allow plugin authors to hook into this service
-	elgg_register_plugin_hook_handler('tweet', 'twitter_service', 'twitter_api_tweet');
+	// push status messages to twitter
+	elgg_register_plugin_hook_handler('status', 'user', 'twitter_api_tweet');
+
+	$actions = dirname(__FILE__) . '/actions/twitter_api';
+	elgg_register_action('twitter_api/interstitial_settings', "$actions/interstitial_settings.php", 'logged_in');
 }
 
 /**
  * Handles old pg/twitterservice/ handler
  *
- * @param array$page
+ * @param array $page
  */
 function twitter_api_pagehandler_deprecated($page) {
 	$url = elgg_get_site_url() . 'pg/twitter_api/authorize';
@@ -55,7 +58,7 @@ function twitter_api_pagehandler_deprecated($page) {
 /**
  * Serves pages for twitter.
  *
- * @param array$page
+ * @param array $page
  */
 function twitter_api_pagehandler($page) {
 	if (!isset($page[0])) {
@@ -75,6 +78,18 @@ function twitter_api_pagehandler($page) {
 		case 'login':
 			twitter_api_login();
 			break;
+		case 'interstitial':
+			gatekeeper();
+			// only let twitter users do this.
+			$guid = elgg_get_logged_in_user_guid();
+			$twitter_name = elgg_get_plugin_user_setting('twitter_name', $guid, 'twitter_api');
+			if (!$twitter_name) {
+				register_error(elgg_echo('twitter_api:invalid_page'));
+				forward();
+			}
+			$pages = dirname(__FILE__) . '/pages/twitter_api';
+			include "$pages/interstitial.php";
+			break;
 		default:
 			forward();
 			break;
@@ -82,53 +97,48 @@ function twitter_api_pagehandler($page) {
 }
 
 /**
- * Push a tweet to twitter.
+ * Push a status update to twitter.
  *
- * @param unknown_type $hook
- * @param unknown_type $entity_type
- * @param unknown_type $returnvalue
- * @param unknown_type $params
+ * @param string $hook
+ * @param string $type
+ * @param null   $returnvalue
+ * @param array  $params
  */
-function twitter_api_tweet($hook, $entity_type, $returnvalue, $params) {
-	static $plugins;
-	if (!$plugins) {
-		$plugins = elgg_trigger_plugin_hook('plugin_list', 'twitter_service', NULL, array());
-	}
+function twitter_api_tweet($hook, $type, $returnvalue, $params) {
 
-	// ensure valid plugin
-	if (!in_array($params['plugin'], $plugins)) {
-		return NULL;
+	if (!elgg_instanceof($params['user'])) {
+		return;
 	}
 
+	// @todo - allow admin to select origins?
+
 	// check admin settings
 	$consumer_key = elgg_get_plugin_setting('consumer_key', 'twitter_api');
 	$consumer_secret = elgg_get_plugin_setting('consumer_secret', 'twitter_api');
 	if (!($consumer_key && $consumer_secret)) {
-		return NULL;
+		return;
 	}
 
 	// check user settings
-	$user_id = elgg_get_logged_in_user_guid();
+	$user_id = $params['user']->getGUID();
 	$access_key = elgg_get_plugin_user_setting('access_key', $user_id, 'twitter_api');
 	$access_secret = elgg_get_plugin_user_setting('access_secret', $user_id, 'twitter_api');
 	if (!($access_key && $access_secret)) {
-		return NULL;
+		return;
 	}
 
 	// send tweet
 	$api = new TwitterOAuth($consumer_key, $consumer_secret, $access_key, $access_secret);
 	$response = $api->post('statuses/update', array('status' => $params['message']));
-
-	return TRUE;
 }
 
 /**
- * Return tweets for a user.
+ * Get tweets for a user.
  *
- * @param int $user_id The Elgg user GUID
+ * @param int   $user_id The Elgg user GUID
  * @param array $options
  */
-function twitter_api_fetch_tweets($user_guid, $options=array()) {
+function twitter_api_fetch_tweets($user_guid, $options = array()) {
 	// check admin settings
 	$consumer_key = elgg_get_plugin_setting('consumer_key', 'twitter_api');
 	$consumer_secret = elgg_get_plugin_setting('consumer_secret', 'twitter_api');
@@ -151,10 +161,10 @@ function twitter_api_fetch_tweets($user_guid, $options=array()) {
 /**
  * Register as public pages for walled garden.
  *
- * @param unknown_type $hook
- * @param unknown_type $type
- * @param unknown_type $return_value
- * @param unknown_type $params
+ * @param string $hook
+ * @param string $type
+ * @param array  $return_value
+ * @param array  $params
  */
 function twitter_api_public_pages($hook, $type, $return_value, $params) {
 	$return_value[] = 'twitter_api/forward';
diff --git a/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php b/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php
new file mode 100644
index 000000000..fdeafd46d
--- /dev/null
+++ b/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Make the user set up some alternative ways to login.
+ */
+
+$user = elgg_get_logged_in_user_entity();
+
+if (elgg_is_sticky_form('twitter_api_interstitial')) {
+	extract(elgg_get_sticky_values('twitter_api_interstitial'));
+	elgg_clear_sticky_form('twitter_api_interstitial');
+}
+
+if (!isset($display_name)) {
+	$display_name = $user->name;
+}
+
+// username
+$title = elgg_echo('username');
+
+$body = elgg_echo('twitter_api:interstitial:username');
+$body .= elgg_view('input/text', array('value' => $user->username, 'disabled' => 'disabled'));
+
+echo elgg_view_module('info', $title, $body);
+
+// display name
+$title = elgg_echo('name');
+
+$body = elgg_echo('twitter_api:interstitial:name');
+$body .= elgg_view('input/text', array('name' => 'display_name', 'value' => $display_name));
+
+echo elgg_view_module('info', $title, $body);
+
+// email
+$title = elgg_echo('email');
+
+$body = elgg_echo('twitter_api:interstitial:email');
+$body .= elgg_view('input/email', array('name' => 'email', 'value' => $email));
+
+echo elgg_view_module('info', $title, $body);
+
+// password
+$title = elgg_echo('password');
+
+$body = elgg_echo('twitter_api:interstitial:password');
+$body .= elgg_view('input/password', array('name' => 'password_1'));
+$body .= elgg_echo('twitter_api:interstitial:password2');
+$body .= elgg_view('input/password', array('name' => 'password_2'));
+
+echo elgg_view_module('info', $title, $body);
+
+// buttons
+
+echo elgg_view('input/submit', array(
+	'text' => elgg_echo('save')
+));
+
+echo elgg_view('output/url', array(
+	'class' => 'right',
+	'text' => elgg_echo('twitter_api:interstitial:no_thanks'),
+	'href' => '/',
+));
\ No newline at end of file
diff --git a/mod/twitter_api/views/default/settings/twitter_api/edit.php b/mod/twitter_api/views/default/settings/twitter_api/edit.php
index 9deac3989..4e52a5c9d 100644
--- a/mod/twitter_api/views/default/settings/twitter_api/edit.php
+++ b/mod/twitter_api/views/default/settings/twitter_api/edit.php
@@ -1,8 +1,9 @@
 <?php
 /**
- *
+ * Twitter API plugin settings
  */
-$insert_view = elgg_view('twittersettings/extend');
+
+$instructions = elgg_echo('twitter_api:settings:instructions', array(elgg_get_site_url()));
 
 $consumer_key_string = elgg_echo('twitter_api:consumer_key');
 $consumer_key_view = elgg_view('input/text', array(
@@ -15,7 +16,7 @@ $consumer_secret_string = elgg_echo('twitter_api:consumer_secret');
 $consumer_secret_view = elgg_view('input/text', array(
 	'name' => 'params[consumer_secret]',
 	'value' => $vars['entity']->consumer_secret,
-	'class' => 'text_input',
+	'class' => 'text_input twitter-secret',
 ));
 
 $sign_on_with_twitter_string = elgg_echo('twitter_api:login');
@@ -39,9 +40,9 @@ $new_users_with_twitter_view = elgg_view('input/dropdown', array(
 ));
 
 $settings = <<<__HTML
-<div>$insert_view</div>
-<div>$consumer_key_string $consumer_key_view</div>
-<div>$consumer_secret_string $consumer_secret_view</div>
+<div class="elgg-instructs mtm"><p>$instructions</p></div>
+<div><label>$consumer_key_string</label><br /> $consumer_key_view</div>
+<div><label>$consumer_secret_string</label><br /> $consumer_secret_view</div>
 <div>$sign_on_with_twitter_string $sign_on_with_twitter_view</div>
 <div>$new_users_with_twitter $new_users_with_twitter_view</div>
 __HTML;
diff --git a/mod/twitter_api/views/default/twitter_api/css.php b/mod/twitter_api/views/default/twitter_api/css.php
index 140ce6a52..04bbed668 100644
--- a/mod/twitter_api/views/default/twitter_api/css.php
+++ b/mod/twitter_api/views/default/twitter_api/css.php
@@ -4,9 +4,10 @@
  */
 ?>
 
-#twitter_api_site_settings .text_input {
-	width: 350px;
-}
 #login_with_twitter {
 	padding: 10px 0 0 0;
 }
+
+.twitter-secret {
+	width: 400px;
+}
\ No newline at end of file
diff --git a/mod/twitter_api/views/default/twitter_api/login.php b/mod/twitter_api/views/default/twitter_api/login.php
index d0aca87ac..17bd76d56 100644
--- a/mod/twitter_api/views/default/twitter_api/login.php
+++ b/mod/twitter_api/views/default/twitter_api/login.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * 
+ * Extension of login form for Twitter sign in
  */
 
 $url = elgg_get_site_url() . 'twitter_api/forward';
-$img_url = elgg_get_site_url() . 'mod/twitter_api/graphics/sign_in_with_twitter.gif';
+$img_url = elgg_get_site_url() . 'mod/twitter_api/graphics/sign-in-with-twitter-d.png';
 
 $login = <<<__HTML
 <div id="login_with_twitter">
diff --git a/mod/twitter_api/views/default/usersettings/twitter_api/edit.php b/mod/twitter_api/views/default/usersettings/twitter_api/edit.php
index 77dd5cc5d..acb8d9af5 100644
--- a/mod/twitter_api/views/default/usersettings/twitter_api/edit.php
+++ b/mod/twitter_api/views/default/usersettings/twitter_api/edit.php
@@ -1,22 +1,29 @@
 <?php
 /**
- * 
+ * User settings for Twitter API
  */
 
-$user_id = elgg_get_logged_in_user_guid();
-$twitter_name = get_plugin_usersetting('twitter_name', $user_id, 'twitter_api');
-$access_key = get_plugin_usersetting('access_key', $user_id, 'twitter_api');
-$access_secret = get_plugin_usersetting('access_secret', $user_id, 'twitter_api');
+$user = elgg_get_logged_in_user_entity();
+$user_guid = $user->getGUID();
+$twitter_name = get_plugin_usersetting('twitter_name', $user_guid, 'twitter_api');
+$access_key = get_plugin_usersetting('access_key', $user_guid, 'twitter_api');
+$access_secret = get_plugin_usersetting('access_secret', $user_guid, 'twitter_api');
 
 $site_name = elgg_get_site_entity()->name;
 echo '<div>' . elgg_echo('twitter_api:usersettings:description', array($site_name)) . '</div>';
 
 if (!$access_key || !$access_secret) {
 	// send user off to validate account
-	$request_link = twitter_api_get_authorize_url();
+	$request_link = twitter_api_get_authorize_url(null, false);
 	echo '<div>' . elgg_echo('twitter_api:usersettings:request', array($request_link, $site_name)) . '</div>';
 } else {
-	$url = elgg_get_site_url() . "twitter_api/revoke";
-	echo '<div class="twitter_anywhere">' . elgg_echo('twitter_api:usersettings:authorized', array($site_name, $twitter_name)) . '</div>';
-	echo '<div>' . sprintf(elgg_echo('twitter_api:usersettings:revoke'), $url) . '</div>';
+	// if this user logged in through twitter and never set up an email address, don't
+	// let them disassociate their account.
+	if ($user->email) {
+		$url = elgg_get_site_url() . "twitter_api/revoke";
+		echo '<div class="twitter_anywhere">' . elgg_echo('twitter_api:usersettings:authorized', array($site_name, $twitter_name)) . '</div>';
+		echo '<div>' . sprintf(elgg_echo('twitter_api:usersettings:revoke'), $url) . '</div>';
+	} else {
+		echo elgg_echo('twitter_api:usersettings:cannot_revoke', array(elgg_normalize_url('twitter_api/interstitial')));
+	}
 }
diff --git a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
index f979d5e2c..2872b7a0c 100644
--- a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
+++ b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
@@ -40,7 +40,7 @@ elgg_set_ignore_access($ia);
 
 // setup pagination
 $pagination = elgg_view('navigation/pagination',array(
-	'baseurl' => $vars['url'] . '/uservalidationbyemail/admin',
+	'baseurl' => 'admin/users/unvalidated',
 	'offset' => $offset,
 	'count' => $count,
 	'limit' => $limit,