Pulled in the interface changes.

git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544

960 files changed, 61787 insertions, 2931 deletions

diff --git a/account/forgotten_password.php b/account/forgotten_password.php
index b3852f1ad..3895d506f 100644
--- a/account/forgotten_password.php
+++ b/account/forgotten_password.php
@@ -11,9 +11,7 @@
 require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
 
 if (!isloggedin()) {
-	$body = elgg_view_title(elgg_echo('user:password:lost')) . elgg_view("account/forms/forgotten_password");
-
-	page_draw(elgg_echo('user:password:lost'), elgg_view_layout("one_column", $body));
+	page_draw( elgg_echo('user:password:lost'), elgg_view("account/forms/forgotten_password") );
 } else {
 	forward();
 }
\ No newline at end of file
diff --git a/admin/plugins.php b/admin/plugins.php
index 2ccb8ecb0..ba6a3bf6b 100644
--- a/admin/plugins.php
+++ b/admin/plugins.php
@@ -23,6 +23,6 @@ $vars = array('installed_plugins' => get_installed_plugins());
 
 $title = elgg_view_title(elgg_echo('admin:plugins'));
 $main_box = elgg_view("admin/plugins", $vars);
-$content = elgg_view_layout("two_column_left_sidebar", '', $title . $main_box);
+$content = elgg_view_layout("one_column_with_sidebar", '', $title . $main_box);
 
 page_draw(elgg_echo('admin:plugins'), $content);
diff --git a/admin/site.php b/admin/site.php
index 5e0f2a6a0..ad05ea312 100644
--- a/admin/site.php
+++ b/admin/site.php
@@ -18,6 +18,6 @@ admin_gatekeeper();
 
 $title = elgg_view_title(elgg_echo('admin:site'));
 $main_box = elgg_view("admin/site");
-$content = elgg_view_layout("two_column_left_sidebar", '', $title . $main_box);
+$content = elgg_view_layout("one_column_with_sidebar", '', $title . $main_box);
 
 page_draw(elgg_echo("admin:site"), $content);
\ No newline at end of file
diff --git a/admin/statistics.php b/admin/statistics.php
index b71f64ef7..a267937f8 100644
--- a/admin/statistics.php
+++ b/admin/statistics.php
@@ -18,6 +18,6 @@ admin_gatekeeper();
 // Display main admin menu
 $title = elgg_view_title(elgg_echo('admin:statistics'));
 $main_box = elgg_view("admin/statistics");
-$content = elgg_view_layout("two_column_left_sidebar", '', $title . $main_box);
+$content = elgg_view_layout("one_column_with_sidebar", '', $title . $main_box);
 
 page_draw(elgg_echo("admin:statistics"), $content);
\ No newline at end of file
diff --git a/admin/user.php b/admin/user.php
index 9ba0423a8..16163e448 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -31,7 +31,7 @@ set_context('admin');
 
 // Display main admin menu
 page_draw(elgg_echo("admin:user"),
-	elgg_view_layout("two_column_left_sidebar",
+	elgg_view_layout("one_column_with_sidebar",
 		'',
 		$title . elgg_view("admin/user") . $result
 	)
diff --git a/dashboard/latest.php b/dashboard/latest.php
index 2017da944..750754518 100644
--- a/dashboard/latest.php
+++ b/dashboard/latest.php
@@ -15,9 +15,14 @@ require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
 
 // Load the front page
 global $CONFIG;
-$title = elgg_view_title(elgg_echo('content:latest'));
-set_context('search');
-$content = elgg_list_registered_entities(array('limit' => 10, 'full_view' => FALSE, 'allowed_types' => array('object','group')));
-set_context('latest');
-$content = elgg_view_layout('two_column_left_sidebar', '', $title . $content);
+
+if(is_plugin_enabled('riverdashboard')) {
+	$title = elgg_view_title(elgg_echo('content:latest'));
+	set_context('search');
+	$content = elgg_list_registered_entities(array('limit' => 10, 'full_view' => FALSE, 'allowed_types' => array('object','group')));
+	set_context('latest');
+} else {
+	$content = "Riverdashboard not loaded";
+}
+$content = elgg_view_layout('one_column_with_sidebar', '', $title . $content);
 page_draw(elgg_echo('content:latest'), $content);
diff --git a/friends/add.php b/friends/add.php
index 708461f60..a70dd12cf 100644
--- a/friends/add.php
+++ b/friends/add.php
@@ -20,7 +20,7 @@ $area2 = elgg_view('friends/forms/edit', array(
 );
 
 // Format page
-$body = elgg_view_layout('two_column_left_sidebar', '',
+$body = elgg_view_layout('one_column_with_sidebar', '',
 	elgg_view_title(elgg_echo('friends:collections:add')) . $area2);
 
 // Draw it
diff --git a/friends/collections.php b/friends/collections.php
index bc62e0905..e98f4b6a6 100644
--- a/friends/collections.php
+++ b/friends/collections.php
@@ -17,7 +17,7 @@ gatekeeper();
 $area2 = elgg_view_access_collections($_SESSION['user']->getGUID());
 
 // Format page
-$body = elgg_view_layout('two_column_left_sidebar', '',
+$body = elgg_view_layout('one_column_with_sidebar', '',
 	elgg_view_title(elgg_echo('friends:collections')) . $area2);
 
 // Draw it
diff --git a/friends/edit.php b/friends/edit.php
index e6cb83ce2..b9d682eb3 100644
--- a/friends/edit.php
+++ b/friends/edit.php
@@ -29,7 +29,7 @@ $collection_members = get_members_of_access_collection($collection_id);
 $area2 = elgg_view('friends/forms/edit', array('collection' => $collection, 'collection_members' => $collection_members));
 
 // Format page
-$body = elgg_view_layout('two_column_left_sidebar',$area1. $area2);
+$body = elgg_view_layout('one_column_with_sidebar', '', $area1.$area2);
 
 // Draw it
 page_draw(elgg_echo('friends:add'),$body);
\ No newline at end of file
diff --git a/friends/index.php b/friends/index.php
index 56df278ad..1a093da2e 100644
--- a/friends/index.php
+++ b/friends/index.php
@@ -17,6 +17,6 @@ $friends = sprintf(elgg_echo("friends:owned"),$owner->name);
 
 $area1 = elgg_view_title($friends);
 $area2 = list_entities_from_relationship('friend',$owner->getGUID(),false,'user','',0,10,false);
-$body = elgg_view_layout('two_column_left_sidebar', '', $area1 . $area2);
+$body = elgg_view_layout('one_column_with_sidebar', '', $area1 . $area2);
 
 page_draw($friends, $body);
diff --git a/friends/of.php b/friends/of.php
index c2e8a785e..b30b47215 100644
--- a/friends/of.php
+++ b/friends/of.php
@@ -17,7 +17,7 @@ $friends_of = sprintf(elgg_echo("friends:of:owned"),$owner->name);
 
 $area1 = elgg_view_title($friends_of);
 $area2 = list_entities_from_relationship('friend',$owner->getGUID(),true,'user','',0,10,false);
-$body = elgg_view_layout('two_column_left_sidebar', '', $area1 . $area2);
+$body = elgg_view_layout('one_column_with_sidebar', '', $area1 . $area2);
 
 page_draw($friends_of, $body);
 
diff --git a/mod/blog/actions/add.php b/mod/blog/actions/add.php
new file mode 100644
index 000000000..97634638e
--- /dev/null
+++ b/mod/blog/actions/add.php
@@ -0,0 +1,84 @@
+<?php
+
+	/**
+	 * Elgg blog: add post action
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in (send us to the front page if not)
+		gatekeeper();
+
+	// Get input data
+		$title = get_input('blogtitle');
+		$body = get_input('blogbody');
+		$tags = get_input('blogtags');
+		$access = get_input('access_id');
+		$comments_on = get_input('comments_select','Off');
+
+	// Cache to the session
+		$_SESSION['user']->blogtitle = $title;
+		$_SESSION['user']->blogbody = $body;
+		$_SESSION['user']->blogtags = $tags;
+		
+	// Convert string of tags into a preformatted array
+		$tagarray = string_to_tag_array($tags);
+		
+	// Make sure the title / description aren't blank
+		if (empty($title) || empty($body)) {
+			register_error(elgg_echo("blog:blank"));
+			forward($_SERVER['HTTP_REFERER']);
+		}
+
+	
+	// Initialise a new ElggObject
+		$blog = new ElggObject();
+	// Tell the system it's a blog post
+		$blog->subtype = "blog";
+	// Set its owner to the current user
+		$blog->owner_guid = get_loggedin_userid();
+	// Set it's container
+		$blog->container_guid = (int)get_input('container_guid', get_loggedin_userid());
+	// For now, set its access
+		$blog->access_id = $access;
+	// Set its title and description appropriately
+		$blog->title = $title;
+		$blog->description = $body;
+	// Now let's add tags. We can pass an array directly to the object property! Easy.
+		if (is_array($tagarray)) {
+			$blog->tags = $tagarray;
+		}
+	//whether the user wants to allow comments or not on the blog post
+		$blog->comments_on = $comments_on;
+		
+	// Now save the object
+		if (!$blog->save()) {
+			register_error(elgg_echo("blog:error"));
+			forward($_SERVER['HTTP_REFERER']);
+		}
+
+	// Success message
+		system_message(elgg_echo("blog:posted"));
+	// add to river
+		add_to_river('river/object/blog/create', 'create', get_loggedin_userid(), $blog->guid);
+	// Remove the blog post cache
+		//unset($_SESSION['blogtitle']); unset($_SESSION['blogbody']); unset($_SESSION['blogtags']);
+		remove_metadata($_SESSION['user']->guid,'blogtitle');
+		remove_metadata($_SESSION['user']->guid,'blogbody');
+		remove_metadata($_SESSION['user']->guid,'blogtags');
+			
+	// Forward to the main blog page
+		$page_owner = get_entity($blog->container_guid);
+		if ($page_owner instanceof ElggUser) {
+			$username = $page_owner->username;
+		} else if ($page_owner instanceof ElggGroup) {
+			$username = "group:" . $page_owner->guid;
+		}
+		
+		forward("pg/blog/$username");
+		
+?>
diff --git a/mod/blog/actions/delete.php b/mod/blog/actions/delete.php
new file mode 100644
index 000000000..c01ca3844
--- /dev/null
+++ b/mod/blog/actions/delete.php
@@ -0,0 +1,38 @@
+<?php
+
+	/**
+	 * Elgg blog: delete post action
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in (send us to the front page if not)
+		gatekeeper();
+
+	// Get input data
+		$guid = (int) get_input('blogpost');
+		
+	// Make sure we actually have permission to edit
+		$blog = get_entity($guid);
+		if ($blog->getSubtype() == "blog" && $blog->canEdit()) {
+	
+		// Get owning user
+				$owner = get_entity($blog->getOwner());
+		// Delete it!
+				$rowsaffected = $blog->delete();
+				if ($rowsaffected > 0) {
+		// Success message
+					system_message(elgg_echo("blog:deleted"));
+				} else {
+					register_error(elgg_echo("blog:notdeleted"));
+				}
+		// Forward to the main blog page
+				forward("mod/blog/?username=" . $owner->username);
+		
+		}
+		
+?>
\ No newline at end of file
diff --git a/mod/blog/actions/edit.php b/mod/blog/actions/edit.php
new file mode 100644
index 000000000..b44106645
--- /dev/null
+++ b/mod/blog/actions/edit.php
@@ -0,0 +1,86 @@
+<?php
+
+	/**
+	 * Elgg blog: edit post action
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in (send us to the front page if not)
+		gatekeeper();
+
+	// Get input data
+		$guid = (int) get_input('blogpost');
+		$title = get_input('blogtitle');
+		$body = get_input('blogbody');
+		$access = get_input('access_id');
+		$tags = get_input('blogtags');
+		$comments_on = get_input('comments_select','Off');
+		
+	// Make sure we actually have permission to edit
+		$blog = get_entity($guid);
+		if ($blog->getSubtype() == "blog" && $blog->canEdit()) {
+	
+		// Cache to the session
+			
+			$_SESSION['user']->blogtitle = $title;
+			$_SESSION['user']->blogbody = $body;
+			$_SESSION['user']->blogtags = $tags;
+			
+		// Convert string of tags into a preformatted array
+			$tagarray = string_to_tag_array($tags);
+			
+		// Make sure the title / description aren't blank
+			if (empty($title) || empty($body)) {
+				register_error(elgg_echo("blog:blank"));
+				forward("mod/blog/add.php");
+				
+		// Otherwise, save the blog post 
+			} else {
+				
+		// Get owning user
+				$owner = get_entity($blog->getOwner());
+		// For now, set its access to public (we'll add an access dropdown shortly)
+				$blog->access_id = $access;
+		// Set its title and description appropriately
+				$blog->title = $title;
+				$blog->description = $body;
+		// Before we can set metadata, we need to save the blog post
+				if (!$blog->save()) {
+					register_error(elgg_echo("blog:error"));
+					forward("mod/blog/edit.php?blogpost=" . $guid);
+				}
+		// Now let's add tags. We can pass an array directly to the object property! Easy.
+				$blog->clearMetadata('tags');
+				if (is_array($tagarray)) {
+					$blog->tags = $tagarray;
+				}
+
+				$blog->comments_on = $comments_on; //whether the users wants to allow comments or not on the blog post
+
+		// Success message
+				system_message(elgg_echo("blog:posted"));
+		//add to the river
+				add_to_river('river/object/blog/update','update',$_SESSION['user']->guid,$blog->guid);
+		// Remove the blog post cache
+				//unset($_SESSION['blogtitle']); unset($_SESSION['blogbody']); unset($_SESSION['blogtags']);
+				remove_metadata($_SESSION['user']->guid,'blogtitle');
+				remove_metadata($_SESSION['user']->guid,'blogbody');
+				remove_metadata($_SESSION['user']->guid,'blogtags');
+		// Forward to the main blog page
+			$page_owner = get_entity($blog->container_guid);
+			if ($page_owner instanceof ElggUser)
+				$username = $page_owner->username;
+			else if ($page_owner instanceof ElggGroup)
+				$username = "group:" . $page_owner->guid;
+			forward("pg/blog/$username");
+					
+			}
+		
+		}
+		
+?>
diff --git a/mod/blog/add.php b/mod/blog/add.php
new file mode 100644
index 000000000..cb3a3fc93
--- /dev/null
+++ b/mod/blog/add.php
@@ -0,0 +1,36 @@
+<?php
+
+	/**
+	 * Elgg blog add entry page
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		gatekeeper();
+		
+	// Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($_SESSION['guid']);
+		}
+		if ($page_owner instanceof ElggGroup)
+			$container = $page_owner->guid;
+			
+	//set the title
+		$area1 = elgg_view_title(elgg_echo('blog:addpost'));
+
+	// Get the form
+		$area1 .= elgg_view("blog/forms/edit", array('container_guid' => $container));
+		
+	// Display page
+		page_draw(elgg_echo('blog:addpost'),elgg_view_layout("edit_layout", $area1));
+
+		
+?>
\ No newline at end of file
diff --git a/mod/blog/archive.php b/mod/blog/archive.php
new file mode 100644
index 000000000..a1a6a528e
--- /dev/null
+++ b/mod/blog/archive.php
@@ -0,0 +1,50 @@
+<?php
+
+	/**
+	 * Elgg blog archive page
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($_SESSION['guid']);
+		}
+		
+	// Get timestamp upper and lower bounds
+		$timelower = (int) get_input('param2');
+		$timeupper = (int) get_input('param3');
+		if (empty($timelower)) {
+			forward('pg/blog/'.$page_owner->username);
+			exit;
+		}
+		if (empty($timeupper)) {
+			$timeupper = $timelower + (86400 * 30);
+		}
+
+	// Set blog title
+		$area2 = elgg_view_title(sprintf(elgg_echo('date:month:'.date('m',$timelower)),date('Y',$timelower)));
+		
+	// Get a list of blog posts
+		$area2 .= list_user_objects($page_owner->getGUID(),'blog',10,false,false,true,$timelower,$timeupper);
+
+	// Get blog tags
+
+	// Get blog categories
+		
+	// Display them in the page
+        $body = elgg_view_layout("two_column_left_sidebar", '', $area1 . $area2);
+		
+	// Display page
+		page_draw(sprintf(elgg_echo('blog:user'),$page_owner->name),$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/blog/edit.php b/mod/blog/edit.php
new file mode 100644
index 000000000..fbaf79108
--- /dev/null
+++ b/mod/blog/edit.php
@@ -0,0 +1,41 @@
+<?php
+
+	/**
+	 * Elgg blog edit entry page
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		gatekeeper();
+		
+	// Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($_SESSION['guid']);
+		}
+		
+	// Get the post, if it exists
+		$blogpost = (int) get_input('blogpost');
+		if ($post = get_entity($blogpost)) {
+			
+			if ($post->canEdit()) {
+				
+				$area1 = elgg_view_title(elgg_echo('blog:editpost'));
+				$area1 .= elgg_view("blog/forms/edit", array('entity' => $post));
+				$body = elgg_view_layout("edit_layout", $area1);
+				
+			}
+			
+		}
+		
+	// Display page
+		page_draw(sprintf(elgg_echo('blog:editpost'),$post->title),$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/blog/everyone.php b/mod/blog/everyone.php
new file mode 100644
index 000000000..47d22f35b
--- /dev/null
+++ b/mod/blog/everyone.php
@@ -0,0 +1,37 @@
+<?php
+
+	/**
+	 * Elgg view all blog posts from all users page
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		define('everyoneblog','true');
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	
+// Get the current page's owner
+		$page_owner = $_SESSION['user'];
+		set_page_owner($_SESSION['guid']);
+		
+		$area2 = elgg_view_title(elgg_echo('blog:everyone'));
+
+		$area2 .= "<div id='blogs'>" . elgg_list_entities(array('type' => 'object', 'subtype' => 'blog', 'limit' => 10, 'full_view' => FALSE)) . "<div class='clearfloat'></div></div>";
+
+		// get tagcloud
+		// $area3 = "This will be a tagcloud for all blog posts";
+
+		// Get categories, if they're installed
+		global $CONFIG;
+		$area3 = elgg_view('blog/categorylist',array('baseurl' => $CONFIG->wwwroot . 'search/?subtype=blog&tagtype=universal_categories&tag=','subtype' => 'blog'));
+
+		$body = elgg_view_layout("two_column_left_sidebar", '', $area2, $area3);
+		
+	// Display page
+		page_draw(elgg_echo('blog:everyone'),$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/blog/friends.php b/mod/blog/friends.php
new file mode 100644
index 000000000..2cef9c9e8
--- /dev/null
+++ b/mod/blog/friends.php
@@ -0,0 +1,47 @@
+<?php
+
+	/**
+	 * Elgg blog friends page
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		define('everyoneblog','true');
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($_SESSION['guid']);
+		}
+		if (!($page_owner instanceof ElggEntity)) forward();
+
+	//set the title
+        if($page_owner == $_SESSION['user']){
+			$title = elgg_echo('blog:yourfriends');
+		}else{
+			$title = $page_owner->name . "'s " . elgg_echo('blog:friends');
+		}
+		
+		$area2 = elgg_view_title($title);
+		
+		// Get a list of blog posts
+		$area2 .= "<div id='blogs'>" . list_user_friends_objects($page_owner->getGUID(),'blog',10,false) . "<div class='clearfloat'></div></div>";
+		
+	// Get categories, if they're installed
+		global $CONFIG;
+		$area3 = elgg_view('blog/categorylist',array('baseurl' => $CONFIG->wwwroot . 'search/?subtype=blog&owner_guid='.$page_owner->guid.'&friends='.$page_owner->guid.'&tagtype=universal_categories&tag=','subtype' => 'blog'));
+		
+	// Display them in the page
+        $body = elgg_view_layout("two_column_left_sidebar", '', $area1 . $area2, $area3);
+		
+	// Display page
+		page_draw($title, $body);
+		
+?>
\ No newline at end of file
diff --git a/mod/blog/index.php b/mod/blog/index.php
new file mode 100644
index 000000000..7c23e4089
--- /dev/null
+++ b/mod/blog/index.php
@@ -0,0 +1,53 @@
+<?php
+
+	/**
+	 * Elgg blog index page
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			
+			// guess that logged in user is the owner - if no logged in send to all blogs page
+			if (!isloggedin()) {
+				forward('mod/blog/everyone.php');
+			}
+			
+			$page_owner = $_SESSION['user'];
+			set_page_owner($_SESSION['guid']);
+		}
+
+	//set blog title
+		if($page_owner == $_SESSION['user']){
+			$area2 = elgg_view_title(elgg_echo('blog:your'));
+		}else{
+			//$area1 = elgg_view_title($page_owner->username . "'s " . elgg_echo('blog'));
+		}
+		
+	// Get a list of blog posts
+		$area2 .= "<div id=\"blogs\">";
+		$area2 .= elgg_list_entities(array('type' => 'object', 'subtype' => 'blog', 'container_guid' => page_owner(), 'limit' => 10, 'full_view' => FALSE, 'view_type_toggle' => FALSE));
+		$area2 .= "<div class='clearfloat'></div></div>";
+
+	// Get blog tags
+
+		// Get categories, if they're installed
+		global $CONFIG;
+		$area3 = elgg_view('blog/categorylist',array('baseurl' => $CONFIG->wwwroot . 'search/?subtype=blog&owner_guid='.$page_owner->guid.'&tagtype=universal_categories&tag=','subtype' => 'blog', 'owner_guid' => $page_owner->guid));
+		
+	// Display them in the page
+        $body = elgg_view_layout("two_column_left_sidebar", '', $area1 . $area2, $area3);
+		
+	// Display page
+		page_draw(sprintf(elgg_echo('blog:user'),$page_owner->name),$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php
new file mode 100644
index 000000000..9496cee00
--- /dev/null
+++ b/mod/blog/languages/en.php
@@ -0,0 +1,81 @@
+<?php
+
+	$english = array(
+	
+		/**
+		 * Menu items and titles
+		 */
+	
+			'blog' => "Blog",
+			'blogs' => "Blogs",
+			'blog:user' => "%s's blog",
+			'blog:user:friends' => "%s's friends' blog",
+			'blog:your' => "Your blog",
+			'blog:posttitle' => "%s's blog: %s",
+			'blog:friends' => "Friends' blogs",
+			'blog:yourfriends' => "Your friends' latest blogs",
+			'blog:everyone' => "All site blogs",
+			'blog:newpost' => "New blog post",
+			'blog:via' => "via blog",
+			'blog:read' => "Read blog",
+	
+			'blog:addpost' => "Write a blog post",
+			'blog:editpost' => "Edit blog post",
+	
+			'blog:text' => "Blog text",
+	
+			'blog:strapline' => "%s",
+			
+			'item:object:blog' => 'Blog posts',
+	
+			'blog:never' => 'never',
+			'blog:preview' => 'Preview',
+	
+			'blog:draft:save' => 'Save draft',
+			'blog:draft:saved' => 'Draft last saved',
+			'blog:comments:allow' => 'Allow comments',
+	
+			'blog:preview:description' => 'This is an unsaved preview of your blog post.',
+			'blog:preview:description:link' => 'To continue editing or save your post, click here.',
+	
+			'blog:enableblog' => 'Enable group blog',
+	
+			'blog:group' => 'Group blog',
+			
+         /**
+	     * Blog river
+	     **/
+	        
+	        //generic terms to use
+	        'blog:river:created' => "%s wrote",
+	        'blog:river:updated' => "%s updated",
+	        'blog:river:posted' => "%s posted",
+	        
+	        //these get inserted into the river links to take the user to the entity
+	        'blog:river:create' => "a new blog post titled",
+	        'blog:river:update' => "a blog post titled",
+	        'blog:river:annotate' => "a comment on this blog post",
+			
+	
+		/**
+		 * Status messages
+		 */
+	
+			'blog:posted' => "Your blog post was successfully posted.",
+			'blog:deleted' => "Your blog post was successfully deleted.",
+	
+		/**
+		 * Error messages
+		 */
+	
+			'blog:error' => 'Something went wrong. Please try again.',
+			'blog:save:failure' => "Your blog post could not be saved. Please try again.",
+			'blog:blank' => "Sorry; you need to fill in both the title and body before you can make a post.",
+			'blog:notfound' => "Sorry; we could not find the specified blog post.",
+			'blog:notdeleted' => "Sorry; we could not delete this blog post.",
+	
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
new file mode 100644
index 000000000..98c22b76f
--- /dev/null
+++ b/mod/blog/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider" />
+        <field key="version" value="1.7" />
+        <field key="description" value="Elgg blog plugin" />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+        <field key="licence" value="GNU Public License version 2" />
+        <field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/blog/preview.php b/mod/blog/preview.php
new file mode 100644
index 000000000..88d293487
--- /dev/null
+++ b/mod/blog/preview.php
@@ -0,0 +1,47 @@
+<?php
+
+	/**
+	 * Elgg blog: preview page
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+		require_once(dirname(dirname(dirname(__FILE__))).'/engine/start.php');
+
+	// Make sure we're logged in (send us to the front page if not)
+		gatekeeper();
+
+	// Get input data
+	
+		$blogpost = new stdClass;
+		$blogpost->title = get_input('blogtitle');
+		$blogpost->description = get_input('blogbody');
+		$blogpost->tags = get_input('blogtags');
+		$blogpost->access = get_input('access_id');
+		$blogpost->comments_on = get_input('comments_select');
+		$blogpost->time_created = time();
+		
+	// Convert string of tags into a preformatted array
+		$blogpost->tags = string_to_tag_array($blogpost->tags);
+		
+	// Display it
+		$area2 = elgg_view("blog/previewpane") .
+				 elgg_view("object/blog",array(
+											'entity' => $blogpost,
+											'entity_owner' => $_SESSION['user']->guid,
+											'comments' => false,
+											'full' => true
+											));
+											
+	// Set the title appropriately
+		$title = sprintf(elgg_echo("blog:posttitle"),$_SESSION['user']->name,$blogpost->title);
+
+	// Display through the correct canvas area
+		$body = elgg_view_layout("two_column_left_sidebar", '', $area1 . $area2);			
+		page_draw($blogpost->title,$body);
+
+?>
diff --git a/mod/blog/read.php b/mod/blog/read.php
new file mode 100644
index 000000000..7be396759
--- /dev/null
+++ b/mod/blog/read.php
@@ -0,0 +1,59 @@
+<?php
+
+	/**
+	 * Elgg read blog post page
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	// Get the specified blog post
+		$post = (int) get_input('blogpost');
+
+	// If we can get out the blog post ...
+		if ($blogpost = get_entity($post)) {
+			
+	// Get any comments
+			//$comments = $blogpost->getAnnotations('comments');
+		
+	// Set the page owner
+			if ($blogpost->container_guid) {
+				set_page_owner($blogpost->container_guid);
+			} else {
+				set_page_owner($blogpost->owner_guid);
+			}
+			
+	// Display it
+			$area2 = elgg_view_entity($blogpost, true);
+			/*$area2 = elgg_view("object/blog",array(
+											'entity' => $blogpost,
+											'entity_owner' => $page_owner,
+											'comments' => $comments,
+											'full' => true
+											));
+			*/								
+	// Set the title appropriately
+		$title = sprintf(elgg_echo("blog:posttitle"),$page_owner->name,$blogpost->title);
+
+	// Display through the correct canvas area
+		$body = elgg_view_layout("two_column_left_sidebar", '', $area1 . $area2);
+			
+	// If we're not allowed to see the blog post
+		} else {
+			
+	// Display the 'post not found' page instead
+			$body = elgg_view("blog/notfound");
+			$title = elgg_echo("blog:notfound");
+			
+		}
+		
+	// Display page
+		page_draw($title,$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/blog/savedraft.php b/mod/blog/savedraft.php
new file mode 100644
index 000000000..fd8197abd
--- /dev/null
+++ b/mod/blog/savedraft.php
@@ -0,0 +1,26 @@
+<?php
+
+	/**
+	 * Elgg blog autosaver
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load engine
+		require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
+		gatekeeper();
+		
+	// Get input data
+		$title = $_POST['blogtitle'];
+		$body = $_POST['blogbody'];
+		$tags = $_POST['blogtags'];
+	
+		$_SESSION['user']->blogtitle = $title;
+		$_SESSION['user']->blogbody = $body;
+		$_SESSION['user']->blogtags = $tags;
+		
+?>
\ No newline at end of file
diff --git a/mod/blog/start.php b/mod/blog/start.php
new file mode 100644
index 000000000..358c0f014
--- /dev/null
+++ b/mod/blog/start.php
@@ -0,0 +1,283 @@
+<?php
+
+	/**
+	 * Elgg blog plugin
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	/**
+	 * Blog initialisation
+	 *
+	 * These parameters are required for the event API, but we won't use them:
+	 * 
+	 * @param unknown_type $event
+	 * @param unknown_type $object_type
+	 * @param unknown_type $object
+	 */
+
+		function blog_init() {
+			
+			// Load system configuration
+				global $CONFIG;
+				
+			// Set up menu for logged in users
+				if (isloggedin()) {
+    				
+					add_menu(elgg_echo('blogs'), $CONFIG->wwwroot . "pg/blog/" . $_SESSION['user']->username);
+					
+			// And for logged out users
+				} else {
+					add_menu(elgg_echo('blogs'), $CONFIG->wwwroot . "mod/blog/everyone.php");
+				}
+				
+			// Extend system CSS with our own styles, which are defined in the blog/css view
+				elgg_extend_view('css','blog/css');
+				
+			// Extend hover-over menu	
+				elgg_extend_view('profile/menu/links','blog/menu');
+				
+			// Register a page handler, so we can have nice URLs
+				register_page_handler('blog','blog_page_handler');
+				
+			// Register a URL handler for blog posts
+				register_entity_url_handler('blog_url','object','blog');
+				
+			// Register this plugin's object for sending pingbacks
+				register_plugin_hook('pingback:object:subtypes', 'object', 'blog_pingback_subtypes');
+
+			// Register granular notification for this type
+			if (is_callable('register_notification_object'))
+				register_notification_object('object', 'blog', elgg_echo('blog:newpost'));
+
+			// Listen to notification events and supply a more useful message
+			register_plugin_hook('notify:entity:message', 'object', 'blog_notify_message');
+
+				
+			// Listen for new pingbacks
+				register_elgg_event_handler('create', 'object', 'blog_incoming_ping');
+				
+			// Register entity type
+				register_entity_type('object','blog');
+				
+			// Register an annotation handler for comments etc
+				register_plugin_hook('entity:annotate', 'object', 'blog_annotate_comments');
+				
+			// Add group menu option
+				add_group_tool_option('blog',elgg_echo('blog:enableblog'),true);
+		}
+		
+		function blog_pagesetup() {
+			
+			global $CONFIG;
+
+			//add submenu options
+				if (get_context() == "blog") {
+					$page_owner = page_owner_entity();
+						
+					if ((page_owner() == $_SESSION['guid'] || !page_owner()) && isloggedin()) {
+						add_submenu_item(elgg_echo('blog:your'),$CONFIG->wwwroot."pg/blog/" . $_SESSION['user']->username);
+						add_submenu_item(elgg_echo('blog:friends'),$CONFIG->wwwroot."pg/blog/" . $_SESSION['user']->username . "/friends/");
+						add_submenu_item(elgg_echo('blog:everyone'),$CONFIG->wwwroot."mod/blog/everyone.php");
+						
+					} else if (page_owner()) {
+						add_submenu_item(sprintf(elgg_echo('blog:user'),$page_owner->name),$CONFIG->wwwroot."pg/blog/" . $page_owner->username);
+						if ($page_owner instanceof ElggUser) { // Sorry groups, this isn't for you.
+							add_submenu_item(sprintf(elgg_echo('blog:user:friends'),$page_owner->name),$CONFIG->wwwroot."pg/blog/" . $page_owner->username . "/friends/");
+						}
+						add_submenu_item(elgg_echo('blog:everyone'),$CONFIG->wwwroot."mod/blog/everyone.php");
+					} else {
+						add_submenu_item(elgg_echo('blog:everyone'),$CONFIG->wwwroot."mod/blog/everyone.php");
+					}
+					
+					if (can_write_to_container(0, page_owner()) && isloggedin())
+						add_submenu_item(elgg_echo('blog:addpost'),$CONFIG->wwwroot."pg/blog/{$page_owner->username}/new/");
+						
+					if (!defined('everyoneblog') && page_owner()) {
+						
+						if ($dates = get_entity_dates('object','blog',page_owner())) {
+							foreach($dates as $date) {
+								$timestamplow = mktime(0,0,0,substr($date,4,2),1,substr($date,0,4));
+								$timestamphigh = mktime(0,0,0,((int) substr($date,4,2)) + 1,1,substr($date,0,4));
+								if (!isset($page_owner)) $page_owner = page_owner_entity();
+								$link = $CONFIG->wwwroot . 'pg/blog/' . $page_owner->username . '/archive/' . $timestamplow . '/' . $timestamphigh;
+								add_submenu_item(sprintf(elgg_echo('date:month:'.substr($date,4,2)),substr($date,0,4)),$link,'filter');
+							}								
+						}
+						
+					}
+					
+				}
+				
+			// Group submenu
+				$page_owner = page_owner_entity();
+				
+				if ($page_owner instanceof ElggGroup && get_context() == 'groups') {
+	    			if($page_owner->blog_enable != "no"){
+					    add_submenu_item(sprintf(elgg_echo("blog:group"),$page_owner->name), $CONFIG->wwwroot . "pg/blog/" . $page_owner->username );
+				    }
+				}
+		}
+		
+		/**
+		 * Blog page handler; allows the use of fancy URLs
+		 *
+		 * @param array $page From the page_handler function
+		 * @return true|false Depending on success
+		 */
+		function blog_page_handler($page) {
+			
+			// The first component of a blog URL is the username
+			if (isset($page[0])) {
+				set_input('username',$page[0]);
+			}
+			
+			// In case we have further input
+			if (isset($page[2])) {
+				set_input('param2',$page[2]);
+			}
+			// In case we have further input
+			if (isset($page[3])) {
+				set_input('param3',$page[3]);
+			}
+			
+			// The second part dictates what we're doing
+			if (isset($page[1])) {
+				switch($page[1]) {
+					case "read":		set_input('blogpost',$page[2]);
+										include(dirname(__FILE__) . "/read.php"); return true;
+										break;
+					case "archive":		include(dirname(__FILE__) . "/archive.php"); return true;
+										break;
+					case "friends":		include(dirname(__FILE__) . "/friends.php"); return true;
+										break;
+					case "new":			include(dirname(__FILE__) . "/add.php"); return true;
+										break;
+					
+				}
+			// If the URL is just 'blog/username', or just 'blog/', load the standard blog index
+			} else {
+				include(dirname(__FILE__) . "/index.php");
+				return true;
+			}
+			
+			return false;
+			
+		}
+		
+		/**
+		 * Hook into the framework and provide comments on blog entities.
+		 *
+		 * @param unknown_type $hook
+		 * @param unknown_type $entity_type
+		 * @param unknown_type $returnvalue
+		 * @param unknown_type $params
+		 * @return unknown
+		 */
+		function blog_annotate_comments($hook, $entity_type, $returnvalue, $params)
+		{
+			$entity = $params['entity'];
+			$full = $params['full'];
+			
+			if (
+				($entity instanceof ElggEntity) &&	// Is the right type 
+				($entity->getSubtype() == 'blog') &&  // Is the right subtype
+				($entity->comments_on!='Off') && // Comments are enabled
+				($full) // This is the full view
+			)
+			{
+				// Display comments
+				return elgg_view_comments($entity);
+			}
+			
+		}
+
+		/**
+		 * Returns a more meaningful message
+		 *
+		 * @param unknown_type $hook
+		 * @param unknown_type $entity_type
+		 * @param unknown_type $returnvalue
+		 * @param unknown_type $params
+		 */
+		function blog_notify_message($hook, $entity_type, $returnvalue, $params)
+		{
+			$entity = $params['entity'];
+			$to_entity = $params['to_entity'];
+			$method = $params['method'];
+			if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'blog'))
+			{
+				$descr = $entity->description;
+				$title = $entity->title;
+				if ($method == 'sms') {
+					$owner = $entity->getOwnerEntity();
+					return $owner->name . ' via blog: ' . $title;
+				}
+				if ($method == 'email') {
+					$owner = $entity->getOwnerEntity();
+					return $owner->name . ' via blog: ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
+				}
+			}
+			return null;
+		}
+
+
+		/**
+		 * Populates the ->getUrl() method for blog objects
+		 *
+		 * @param ElggEntity $blogpost Blog post entity
+		 * @return string Blog post URL
+		 */
+		function blog_url($blogpost) {
+			
+			global $CONFIG;
+			$title = $blogpost->title;
+			$title = friendly_title($title);
+			return $CONFIG->url . "pg/blog/" . $blogpost->getOwnerEntity()->username . "/read/" . $blogpost->getGUID() . "/" . $title;
+			
+		}
+		
+		/**
+		 * This function adds 'blog' to the list of objects which will be looked for pingback urls.
+		 *
+		 * @param unknown_type $hook
+		 * @param unknown_type $entity_type
+		 * @param unknown_type $returnvalue
+		 * @param unknown_type $params
+		 * @return unknown
+		 */
+		function blog_pingback_subtypes($hook, $entity_type, $returnvalue, $params)
+		{
+			$returnvalue[] = 'blog';
+			
+			return $returnvalue;
+		}
+		
+		/**
+		 * Listen to incoming pings, this parses an incoming target url - sees if its for me, and then
+		 * either passes it back or prevents it from being created and attaches it as an annotation to a given
+		 *
+		 * @param unknown_type $event
+		 * @param unknown_type $object_type
+		 * @param unknown_type $object
+		 */
+		function blog_incoming_ping($event, $object_type, $object)
+		{
+			// TODO: Get incoming ping object, see if its a ping on a blog and if so attach it as a comment
+		}
+		
+	// Make sure the blog initialisation function is called on initialisation
+		register_elgg_event_handler('init','system','blog_init');
+		register_elgg_event_handler('pagesetup','system','blog_pagesetup');
+		
+	// Register actions
+		global $CONFIG;
+		register_action("blog/add",false,$CONFIG->pluginspath . "blog/actions/add.php");
+		register_action("blog/edit",false,$CONFIG->pluginspath . "blog/actions/edit.php");
+		register_action("blog/delete",false,$CONFIG->pluginspath . "blog/actions/delete.php");
+		
+?>
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/categorylist.php b/mod/blog/views/default/blog/categorylist.php
new file mode 100644
index 000000000..90403c550
--- /dev/null
+++ b/mod/blog/views/default/blog/categorylist.php
@@ -0,0 +1,14 @@
+<?php
+	$list = elgg_view('categories/list',$vars);
+	if (!empty($list)) {
+?>
+
+	<div class="blog_categories">
+		<?php echo $list; ?>
+	</div>
+
+<?php
+
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php
new file mode 100644
index 000000000..c9522c901
--- /dev/null
+++ b/mod/blog/views/default/blog/css.php
@@ -0,0 +1,210 @@
+<?php
+
+	/**
+	 * Elgg blog CSS extender
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+#blogs .pagination {
+	margin:5px 10px 0 10px;
+	padding:5px;
+	display:block;
+}
+#blogs #two_column_left_sidebar_maincontent {
+	padding-bottom:10px;
+}
+
+.singleview {
+	margin-top:10px;
+}
+
+.blog_post_icon {
+	float:left;
+	margin:3px 0 0 0;
+	padding:0;
+}
+
+.blog_post h3 {
+	font-size: 150%;
+	margin:0 0 10px 0;
+	padding:0;
+}
+
+.blog_post h3 a {
+	text-decoration: none;
+}
+
+.blog_post p {
+	margin: 0 0 5px 0;
+}
+
+.blog_post .strapline {
+	margin: 0 0 0 35px;
+	padding:0;
+	color: #aaa;
+	line-height:1em;
+}
+.blog_post p.tags {
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/icon_tag.gif) no-repeat scroll left 2px;
+	margin:0 0 7px 35px;
+	padding:0pt 0pt 0pt 16px;
+	min-height:22px;
+}
+.blog_post .options {
+	margin:0;
+	padding:0;
+}
+
+.blog_post_body img[align="left"] {
+	margin: 10px 10px 10px 0;
+	float:left;
+}
+.blog_post_body img[align="right"] {
+	margin: 10px 0 10px 10px;
+	float:right;
+}
+.blog_post_body img {
+	margin: 10px !important;
+}
+
+.blog-comments h3 {
+	font-size: 150%;
+	margin-bottom: 10px;
+}
+.blog-comment {
+	margin-top: 10px;
+	margin-bottom:20px;
+	border-bottom: 1px solid #aaaaaa;
+}
+.blog-comment img {
+	float:left;
+	margin: 0 10px 0 0;
+}
+.blog-comment-menu {
+	margin:0;
+}
+.blog-comment-byline {
+	background: #dddddd;
+	height:22px;
+	padding-top:3px;
+	margin:0;
+}
+.blog-comment-text {
+	margin:5px 0 5px 0;
+}
+
+/* New blog edit column */
+#blog_edit_page {
+	/* background: #bbdaf7; */
+	margin-top:-10px;
+}
+#blog_edit_page #content_area_user_title h2 {
+	background: none;
+	border-top: none;
+	margin:0 0 10px 0px;
+	padding:0px 0 0 0;
+}
+#blog_edit_page #blog_edit_sidebar #content_area_user_title h2 {
+	background:none;
+	border-top:none;
+	margin:inherit;
+	padding:0 0 5px 5px;
+	font-size:1.25em;
+	line-height:1.2em;
+}
+#blog_edit_page #blog_edit_sidebar {
+	margin:0px 0 22px 0;
+	background: #dedede;
+	padding:5px;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	border-bottom:1px solid #cccccc;
+	border-right:1px solid #cccccc;
+}
+#blog_edit_page #two_column_left_sidebar_210 {
+	width:210px;
+	margin:0px 0 20px 0px;
+	min-height:360px;
+	float:left;
+	padding:0;
+}
+#blog_edit_page #two_column_left_sidebar_maincontent {
+	margin:0 0px 20px 20px;
+	padding:10px 20px 20px 20px;
+	width:670px;
+	background: #bbdaf7;
+}
+/* unsaved blog post preview */
+.blog_previewpane {
+    border:1px solid #D3322A;
+    background:#F7DAD8;
+	padding:10px;
+	margin:10px;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;	
+}
+.blog_previewpane p {
+	margin:0;
+}
+
+#blog_edit_sidebar .publish_controls,
+#blog_edit_sidebar .blog_access,
+#blog_edit_sidebar .publish_options,
+#blog_edit_sidebar .publish_blog,
+#blog_edit_sidebar .allow_comments,
+#blog_edit_sidebar .categories {
+	margin:0 5px 5px 5px;
+	border-top:1px solid #cccccc;
+}
+#blog_edit_page ul {
+	padding-left:0px;
+	margin:5px 0 5px 0;
+	list-style: none;
+}
+#blog_edit_page p {
+	margin:5px 0 5px 0;
+}
+#blog_edit_page #two_column_left_sidebar_maincontent p {
+	margin:0 0 15px 0;
+}
+#blog_edit_page .publish_blog input[type="submit"] {
+	font-weight: bold;
+	padding:2px;
+	height:auto;
+}
+#blog_edit_page .preview_button a {
+	font: 12px/100% Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	background:white;
+	border: 1px solid #cccccc;
+	color:#999999;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+	width: auto;
+	height: auto;
+	padding: 3px;
+	margin:1px 1px 5px 10px;
+	cursor: pointer;
+	float:right;
+}
+#blog_edit_page .preview_button a:hover {
+	background:#4690D6;
+	color:white;
+	text-decoration: none;
+	border: 1px solid #4690D6;
+}
+#blog_edit_page .allow_comments label {
+	font-size: 100%;
+}
+
+
+
+
+
+
diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php
new file mode 100644
index 000000000..d3f4d7e52
--- /dev/null
+++ b/mod/blog/views/default/blog/forms/edit.php
@@ -0,0 +1,200 @@
+<?php
+
+	/**
+	 * Elgg blog edit/add page
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['object'] Optionally, the blog post to edit
+	 */
+
+	// Set title, form destination
+		if (isset($vars['entity'])) {
+			$title = sprintf(elgg_echo("blog:editpost"),$object->title);
+			$action = "blog/edit";
+			$title = $vars['entity']->title;
+			$body = $vars['entity']->description;
+			$tags = $vars['entity']->tags;
+			if ($vars['entity']->comments_on == 'Off') {
+				$comments_on = false;
+			} else {
+				$comments_on = true;
+			}
+			$access_id = $vars['entity']->access_id;
+		} else  {
+			$title = elgg_echo("blog:addpost");
+			$action = "blog/add";
+			$tags = "";
+			$title = "";
+			$comments_on = true;
+			$description = "";
+			if (defined('ACCESS_DEFAULT'))
+				$access_id = ACCESS_DEFAULT;
+			else
+				$access_id = 0;
+				
+			$container = $vars['container_guid'] ? elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $vars['container_guid'])) : "";
+		}
+
+	// Just in case we have some cached details
+		if (empty($body)) {
+			$body = $vars['user']->blogbody;
+			if (!empty($body)) {
+				$title = $vars['user']->blogtitle;
+				$tags = $vars['user']->blogtags;
+			}
+		}
+
+	// set the required variables
+
+                $title_label = elgg_echo('title');
+                $title_textbox = elgg_view('input/text', array('internalname' => 'blogtitle', 'value' => $title));
+                $text_label = elgg_echo('blog:text');
+                $text_textarea = elgg_view('input/longtext', array('internalname' => 'blogbody', 'value' => $body));
+                $tag_label = elgg_echo('tags');
+                $tag_input = elgg_view('input/tags', array('internalname' => 'blogtags', 'value' => $tags));
+                $access_label = elgg_echo('access');
+
+		  //$comments_select = elgg_view('input/checkboxes', array('internalname' => 'comments_on', 'value' => ''));
+		  if($comments_on)
+		  	$comments_on_switch = "checked=\"checked\"";
+		  else
+			$comment_on_switch = "";
+
+          $access_input = elgg_view('input/access', array('internalname' => 'access_id', 'value' => $access_id));
+          $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('publish')));
+		  $conversation = elgg_echo('Conversation');
+		  $publish = elgg_echo('publish');
+		  $cat = elgg_echo('categories');
+		  $preview = elgg_echo('blog:preview');
+		  $privacy = elgg_echo('access');
+		  $savedraft = elgg_echo('blog:draft:save');
+		  $draftsaved = elgg_echo('blog:draft:saved');
+		  $never = elgg_echo('blog:never');
+		  $allowcomments = elgg_echo('blog:comments:allow');
+		  
+	// INSERT EXTRAS HERE
+		  $extras = elgg_view('categories',$vars);
+		  if (!empty($extras)) $extras = '<div id="blog_edit_sidebar">' . $extras . '</div>';
+		  
+?>
+
+<?php
+
+	$form_body = <<<EOT
+
+	<div id="two_column_left_sidebar_210">
+
+    		<div id="blog_edit_sidebar">
+			<div id="content_area_user_title">
+				<div class="preview_button"><a  onclick="javascript:saveDraft(true);return true;">{$preview}</a></div>
+			<h2>{$publish}</h2></div>
+			<div class="publish_controls">
+				<p>
+					<a href="#" onclick="javascript:saveDraft(false);return false;">{$savedraft}</a>
+				</p>
+			</div>
+			<div class="publish_options">
+				<!-- <p><b>{$publish}:</b> now <a href="">edit</a></p> -->
+				<p class="auto_save">{$draftsaved}: <span id="draftSavedCounter">{$never}</span></p>
+			</div>
+			<div class="blog_access">
+				<p>{$privacy}: {$access_input}
+			</p></div>
+			<div class="publish_blog">
+				{$submit_input}
+			</div>
+		</div>
+
+		<div id="blog_edit_sidebar">
+			<div id="content_area_user_title"><h2>{$conversation}</h2></div>
+			<div class="allow_comments">
+				<p><label>
+					<input type="checkbox" name="comments_select"  {$comments_on_switch} /> {$allowcomments}
+					</label></p>
+			</div>
+		</div>
+
+		{$extras}
+		
+		$container
+
+	</div><!-- /two_column_left_sidebar_210 -->
+
+	<!-- main content -->
+	<div id="two_column_left_sidebar_maincontent">
+EOT;
+
+?>
+
+<?php
+               
+                if (isset($vars['entity'])) {
+                  $entity_hidden = elgg_view('input/hidden', array('internalname' => 'blogpost', 'value' => $vars['entity']->getGUID()));
+                } else {
+                  $entity_hidden = '';
+                }
+
+                $form_body .= <<<EOT
+		<p>
+			<label>$title_label</label><br />
+                        $title_textbox
+		</p>
+		<p class='longtext_editarea'>
+			<label>$text_label</label><br />
+                        $text_textarea
+		</p>
+		<p>
+			<label>$tag_label</label><br />
+                        $tag_input
+		</p>
+		<!-- <p>
+			<label>$access_label</label><br />
+                        $access_input
+		</p> -->
+		<p>
+			$entity_hidden
+			<!-- $submit_input -->
+		</p>
+	</div><div class="clearfloat"></div><!-- /two_column_left_sidebar_maincontent -->
+EOT;
+
+      echo elgg_view('input/form', array('action' => "{$vars['url']}action/$action", 'body' => $form_body, 'internalid' => 'blogPostForm'));
+?>
+
+<script type="text/javascript">
+	setInterval( "saveDraft(false)", 120000);
+	function saveDraft(preview) {
+		temppreview = preview;
+
+		if (typeof(tinyMCE) != 'undefined') {
+			tinyMCE.triggerSave();
+		}
+		
+		var drafturl = "<?php echo $vars['url']; ?>mod/blog/savedraft.php";
+		var temptitle = $("input[name='blogtitle']").val();
+		var tempbody = $("textarea[name='blogbody']").val();
+		var temptags = $("input[name='blogtags']").val();
+		
+		var postdata = { blogtitle: temptitle, blogbody: tempbody, blogtags: temptags };
+		
+		$.post(drafturl, postdata, function() {
+			var d = new Date();
+			var mins = d.getMinutes() + '';
+			if (mins.length == 1) mins = '0' + mins;
+			$("span#draftSavedCounter").html(d.getHours() + ":" + mins);
+			if (temppreview == true) {
+				$("form#blogPostForm").attr("action","<?php echo $vars['url']; ?>mod/blog/preview.php");
+				$("input[name='submit']").click();
+				//$("form#blogPostForm").submit();
+				//document.blogPostForm.submit();
+			}
+		});
+				
+	}
+	
+</script>
diff --git a/mod/blog/views/default/blog/gallery.php b/mod/blog/views/default/blog/gallery.php
new file mode 100644
index 000000000..23f0418bc
--- /dev/null
+++ b/mod/blog/views/default/blog/gallery.php
@@ -0,0 +1,31 @@
+<?php
+
+	/**
+	 * Elgg blog listing
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+		$owner = $vars['entity']->getOwnerEntity();
+		$friendlytime = friendly_time($vars['entity']->time_created);
+		$icon = elgg_view(
+				"profile/icon", array(
+										'entity' => $owner,
+										'size' => 'small',
+									  )
+			);
+		$info = "<p>" . elgg_echo('blog') . ": <a href=\"{$vars['entity']->getURL()}\">{$vars['entity']->title}</a></p>";
+		$info .= "<p><a href=\"{$owner->getURL()}\">{$owner->name}</a> {$friendlytime}</p>";
+
+		//display
+		echo "<div class=\"blog_gallery\">";
+		echo "<div class=\"blog_gallery_icon\">" . $icon . "</div>";
+		echo "<div class=\"blog_gallery_content\">" . $info . "</div>";
+		echo "</div>";
+
+
+?>
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/listing.php b/mod/blog/views/default/blog/listing.php
new file mode 100644
index 000000000..b2dad2570
--- /dev/null
+++ b/mod/blog/views/default/blog/listing.php
@@ -0,0 +1,25 @@
+<?php
+
+	/**
+	 * Elgg blog listing
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+		$owner = $vars['entity']->getOwnerEntity();
+		$friendlytime = friendly_time($vars['entity']->time_created);
+		$icon = elgg_view(
+				"profile/icon", array(
+										'entity' => $owner,
+										'size' => 'small',
+									  )
+			);
+		$info = "<p>" . elgg_echo('blog') . ": <a href=\"{$vars['entity']->getURL()}\">{$vars['entity']->title}</a></p>";
+		$info .= "<p class=\"owner_timestamp\"><a href=\"{$owner->getURL()}\">{$owner->name}</a> {$friendlytime}</p>";
+		echo elgg_view_listing($icon,$info);
+
+?>
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/menu.php b/mod/blog/views/default/blog/menu.php
new file mode 100644
index 000000000..45384ae72
--- /dev/null
+++ b/mod/blog/views/default/blog/menu.php
@@ -0,0 +1,17 @@
+<?php
+
+	/**
+	 * Elgg hoverover extender for blog
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+
+	<p class="user_menu_blog">
+		<a href="<?php echo $vars['url']; ?>pg/blog/<?php echo $vars['entity']->username; ?>"><?php echo elgg_echo("blog"); ?></a>	
+	</p>
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/notfound.php b/mod/blog/views/default/blog/notfound.php
new file mode 100644
index 000000000..543b98374
--- /dev/null
+++ b/mod/blog/views/default/blog/notfound.php
@@ -0,0 +1,21 @@
+<?php
+
+	/**
+	 * Elgg blog not found page
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+
+	<p>
+		<?php
+
+			echo elgg_echo("blog:notfound");
+		
+		?>
+	</p>
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/previewpane.php b/mod/blog/views/default/blog/previewpane.php
new file mode 100644
index 000000000..0828c06a9
--- /dev/null
+++ b/mod/blog/views/default/blog/previewpane.php
@@ -0,0 +1,6 @@
+<div class="blog_previewpane">
+	<p>
+		<?php echo elgg_echo("blog:preview:description"); ?>
+		<a href="javascript:history.go(-1);"><?php echo elgg_echo("blog:preview:description:link"); ?></a>
+	</p>
+</div>
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/view.php b/mod/blog/views/default/blog/view.php
new file mode 100644
index 000000000..18841d224
--- /dev/null
+++ b/mod/blog/views/default/blog/view.php
@@ -0,0 +1,26 @@
+<?php
+
+	/**
+	 * Elgg blog view page
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['posts'] An array of posts to view
+	 */
+
+	// If there are any posts to view, view them
+		if (is_array($vars['posts']) && sizeof($vars['posts']) > 0) {
+			
+			foreach($vars['posts'] as $post) {
+				
+				echo elgg_view_entity($post);
+				
+			}
+			
+		}
+
+?>
\ No newline at end of file
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
new file mode 100644
index 000000000..898705911
--- /dev/null
+++ b/mod/blog/views/default/object/blog.php
@@ -0,0 +1,150 @@
+<?php
+
+	/**
+	 * Elgg blog individual post view
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Ben Werdmuller <ben@curverider.co.uk>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] Optionally, the blog post to view
+	 */
+
+		if (isset($vars['entity'])) {
+			
+			//display comments link?
+			if ($vars['entity']->comments_on == 'Off') {
+				$comments_on = false;
+			} else {
+				$comments_on = true;
+			}
+			
+			if (get_context() == "search" && $vars['entity'] instanceof ElggObject) {
+				
+				//display the correct layout depending on gallery or list view
+				if (get_input('search_viewtype') == "gallery") {
+
+					//display the gallery view
+            				echo elgg_view("blog/gallery",$vars);
+
+				} else {
+				
+					echo elgg_view("blog/listing",$vars);
+
+				}
+
+				
+			} else {
+			
+				if ($vars['entity'] instanceof ElggObject) {
+					
+					$url = $vars['entity']->getURL();
+					$owner = $vars['entity']->getOwnerEntity();
+					$canedit = $vars['entity']->canEdit();
+					
+				} else {
+					
+					$url = 'javascript:history.go(-1);';
+					$owner = $vars['user'];
+					$canedit = false;
+					
+				}
+?>
+
+	<div class="contentWrapper singleview">
+	
+	<div class="blog_post">
+		<h3><a href="<?php echo $url; ?>"><?php echo $vars['entity']->title; ?></a></h3>
+		<!-- display the user icon -->
+		<div class="blog_post_icon">
+		    <?php
+		        echo elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
+			?>
+	    </div>
+			<p class="strapline">
+				<?php
+	                
+					echo sprintf(elgg_echo("blog:strapline"),
+									date("F j, Y",$vars['entity']->time_created)
+					);
+				
+				?>
+				<?php echo elgg_echo('by'); ?> <a href="<?php echo $vars['url']; ?>pg/blog/<?php echo $owner->username; ?>"><?php echo $owner->name; ?></a> &nbsp; 
+				<!-- display the comments link -->
+				<?php
+					if($comments_on && $vars['entity'] instanceof ElggObject){
+			        //get the number of comments
+			    		$num_comments = elgg_count_comments($vars['entity']);
+			    ?>
+			    	<a href="<?php echo $url; ?>"><?php echo sprintf(elgg_echo("comments")) . " (" . $num_comments . ")"; ?></a><br />
+			    <?php
+		    		}
+		    	?>
+			</p>
+			<!-- display tags -->
+				<?php
+	
+					$tags = elgg_view('output/tags', array('tags' => $vars['entity']->tags));
+					if (!empty($tags)) {
+						echo '<p class="tags">' . $tags . '</p>';
+					}
+				
+					$categories = elgg_view('categories/view', $vars);
+					if (!empty($categories)) {
+						echo '<p class="categories">' . $categories . '</p>';
+					}
+				
+				?>
+			<div class="clearfloat"></div>
+			<div class="blog_post_body">
+
+			<!-- display the actual blog post -->
+				<?php
+			
+							echo elgg_view('output/longtext',array('value' => $vars['entity']->description));
+				
+				?>
+			</div><div class="clearfloat"></div>			
+			<!-- display edit options if it is the blog post owner -->
+			<p class="options">
+			<?php
+	
+				if ($canedit) {
+					
+				?>
+					<a href="<?php echo $vars['url']; ?>mod/blog/edit.php?blogpost=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("edit"); ?></a>  &nbsp; 
+					<?php
+					
+						echo elgg_view("output/confirmlink", array(
+							'href' => $vars['url'] . "action/blog/delete?blogpost=" . $vars['entity']->getGUID(),
+							'text' => elgg_echo('delete'),
+							'confirm' => elgg_echo('deleteconfirm'),
+						));
+	
+						// Allow the menu to be extended
+						echo elgg_view("editmenu",array('entity' => $vars['entity']));
+					
+					?>
+				<?php
+				}
+			
+			?>
+			</p>
+		</div>
+		</div>
+
+<?php
+
+			// If we've been asked to display the full view 
+			// Now handled by annotation framework
+				/*if (isset($vars['full']) && $vars['full'] == true && $comments_on == 'on' && $vars['entity'] instanceof ElggEntity) {
+					echo elgg_view_comments($vars['entity']);
+				}*/
+				
+			}
+
+		}
+
+?>
diff --git a/mod/blog/views/default/river/object/blog/annotate.php b/mod/blog/views/default/river/object/blog/annotate.php
new file mode 100644
index 000000000..77b75c6d9
--- /dev/null
+++ b/mod/blog/views/default/river/object/blog/annotate.php
@@ -0,0 +1,13 @@
+<?php
+
+	$statement = $vars['statement'];
+	$performed_by = $statement->getSubject();
+	$object = $statement->getObject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("blog:river:posted"),$url) . " ";
+	$string .= elgg_echo("blog:river:annotate:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
new file mode 100644
index 000000000..b5b3dc2e4
--- /dev/null
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -0,0 +1,20 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	$url = $object->getURL();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$contents = strip_tags($object->description); //strip tags from the contents to stop large images etc blowing out the river view
+	$string = sprintf(elgg_echo("blog:river:created"),$url) . " ";
+	$string .= elgg_echo("blog:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+	$string .= "<div class=\"river_content_display\">";
+	if(strlen($contents) > 200) {
+        	$string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
+    }else{
+	    $string .= $contents;
+    }
+	$string .= "</div>";
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/blog/views/default/river/object/blog/update.php b/mod/blog/views/default/river/object/blog/update.php
new file mode 100644
index 000000000..cf98afa8b
--- /dev/null
+++ b/mod/blog/views/default/river/object/blog/update.php
@@ -0,0 +1,13 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	$url = $object->getURL();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("blog:river:updated"),$url) . " ";
+    $string .= elgg_echo("blog:river:update") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+    	
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/bookmarks/actions/add.php b/mod/bookmarks/actions/add.php
new file mode 100644
index 000000000..a074719b1
--- /dev/null
+++ b/mod/bookmarks/actions/add.php
@@ -0,0 +1,72 @@
+<?php
+
+	/**
+	 * Elgg bookmarks add/save action
+	 * 
+	 * @package ElggBookmarks
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+	
+	gatekeeper();
+
+		$title = get_input('title');
+		$guid = get_input('bookmark_guid',0);
+		$description = get_input('description');
+		$address = get_input('address');
+		$access = get_input('access');
+		$shares = get_input('shares',array());
+		
+		$tags = get_input('tags');
+		$tagarray = string_to_tag_array($tags);
+		
+		if ($guid == 0) {
+			
+			$entity = new ElggObject;
+			$entity->subtype = "bookmarks";
+			$entity->owner_guid = $_SESSION['user']->getGUID();
+			$entity->container_guid = (int)get_input('container_guid', $_SESSION['user']->getGUID());
+			
+		} else {
+			
+			$canedit = false;
+			if ($entity = get_entity($guid)) {
+				if ($entity->canEdit()) {
+					$canedit = true;
+				}
+			}
+			if (!$canedit) {
+				system_message(elgg_echo('notfound'));
+				forward("pg/bookmarks");
+			}
+			
+		}
+		
+		$entity->title = $title;
+		$entity->address = $address;
+		$entity->description = $description;
+		$entity->access_id = $access;
+		$entity->tags = $tagarray;
+		
+		if ($entity->save()) {
+			$entity->clearRelationships();
+			$entity->shares = $shares;
+		
+			if (is_array($shares) && sizeof($shares) > 0) {
+				foreach($shares as $share) {
+					$share = (int) $share;
+					add_entity_relationship($entity->getGUID(),'share',$share);
+				}
+			}
+			system_message(elgg_echo('bookmarks:save:success'));
+			//add to river
+			add_to_river('river/object/bookmarks/create','create',$_SESSION['user']->guid,$entity->guid);
+			forward($entity->getURL());
+		} else {
+			register_error(elgg_echo('bookmarks:save:failed'));
+			forward("pg/bookmarks");
+		}
+
+?>
diff --git a/mod/bookmarks/actions/delete.php b/mod/bookmarks/actions/delete.php
new file mode 100644
index 000000000..217197b24
--- /dev/null
+++ b/mod/bookmarks/actions/delete.php
@@ -0,0 +1,32 @@
+<?php
+
+	/**
+	 * Elgg bookmarks delete action
+	 * 
+	 * @package ElggBookmarks
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+		$guid = get_input('bookmark_guid',0);
+		if ($entity = get_entity($guid)) {
+			
+			if ($entity->canEdit()) {
+				
+				if ($entity->delete()) {
+					
+					system_message(elgg_echo("bookmarks:delete:success"));
+					forward("pg/bookmarks/");					
+					
+				}
+				
+			}
+			
+		}
+		
+		register_error(elgg_echo("bookmarks:delete:failed"));
+		forward("pg/bookmarks/");
+
+?>
\ No newline at end of file
diff --git a/mod/bookmarks/add.php b/mod/bookmarks/add.php
new file mode 100644
index 000000000..030cec450
--- /dev/null
+++ b/mod/bookmarks/add.php
@@ -0,0 +1,46 @@
+<?php
+
+	/**
+	 * Elgg bookmarks plugin add bookmark page
+	 * 
+	 * @package ElggBookmarks
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Start engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// You need to be logged in for this one
+		gatekeeper();
+		
+	// Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($page_owner->getGUID());
+		}
+		if ($page_owner instanceof ElggGroup)
+			$container = $page_owner->guid;
+			
+		$area2 .= elgg_view_title(elgg_echo('bookmarks:this'), false);
+		
+	// If we've been given a bookmark to edit, grab it
+		if ($this_guid = get_input('bookmark',0)) {
+			$entity = get_entity($this_guid);
+			if ($entity->canEdit()) {
+				$area2 .= elgg_view('bookmarks/form',array('entity' => $entity, 'container_guid' => $container));
+			}
+		} else {
+			$area2 .= elgg_view('bookmarks/form', array('container_guid' => $container));
+		}
+		
+	// Format page
+		$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+		
+	// Draw it
+		page_draw(elgg_echo('bookmarks:add'),$body);
+
+?>
\ No newline at end of file
diff --git a/mod/bookmarks/bookmarklet.php b/mod/bookmarks/bookmarklet.php
new file mode 100644
index 000000000..7e24a55c6
--- /dev/null
+++ b/mod/bookmarks/bookmarklet.php
@@ -0,0 +1,35 @@
+<?php
+
+	/**
+	 * Elgg bookmarks plugin bookmarklet page
+	 * 
+	 * @package ElggBookmarks
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Start engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+		gatekeeper();
+		
+    // Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner) && ($_SESSION['user'])) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($page_owner->getGUID());
+		}
+		
+	// List bookmarks
+		$area2 = elgg_view_title(elgg_echo('bookmarks:bookmarklet'));
+		$area2 .= elgg_view('bookmarks/bookmarklet', array('pg_owner' => $page_owner));
+		
+	// Format page
+		$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+		
+	// Draw it
+		page_draw(elgg_echo('bookmarks:bookmarklet'),$body);
+
+?>
\ No newline at end of file
diff --git a/mod/bookmarks/everyone.php b/mod/bookmarks/everyone.php
new file mode 100644
index 000000000..70e60da2c
--- /dev/null
+++ b/mod/bookmarks/everyone.php
@@ -0,0 +1,35 @@
+<?php
+
+	/**
+	 * Elgg bookmarks plugin everyone page
+	 * 
+	 * @package ElggBookmarks
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Start engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($_SESSION['guid']);
+		}
+		
+	// List bookmarks
+		$area2 = elgg_view_title(elgg_echo('bookmarks:everyone'));
+		set_context('search');
+		$area2 .= elgg_list_entities(array('type' => 'object', 'subtype' => 'bookmarks', 'limit' => 10, 'full_view' => FALSE, 'view_toggle_type' => FALSE));
+		set_context('bookmarks');
+		
+	// Format page
+		$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+		
+	// Draw it
+		page_draw(elgg_echo('bookmarks:everyone'),$body);
+
+?>
\ No newline at end of file
diff --git a/mod/bookmarks/friends.php b/mod/bookmarks/friends.php
new file mode 100644
index 000000000..8d61f47d2
--- /dev/null
+++ b/mod/bookmarks/friends.php
@@ -0,0 +1,28 @@
+<?php
+
+	/**
+	 * Elgg bookmarks plugin friends' page
+	 * 
+	 * @package ElggBookmarks
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Start engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// List bookmarks
+		$area2 = elgg_view_title(elgg_echo('bookmarks:friends'));
+		set_context('search');
+		$area2 .= list_user_friends_objects(page_owner(),'bookmarks',10,false,false);
+		set_context('bookmarks');
+		
+	// Format page
+		$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+		
+	// Draw it
+		page_draw(elgg_echo('bookmarks:friends'),$body);
+
+?>
\ No newline at end of file
diff --git a/mod/bookmarks/inbox.php b/mod/bookmarks/inbox.php
new file mode 100644
index 000000000..061a51e18
--- /dev/null
+++ b/mod/bookmarks/inbox.php
@@ -0,0 +1,28 @@
+<?php
+
+	/**
+	 * Elgg bookmarks plugin inbox page
+	 * 
+	 * @package ElggBookmarks
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Start engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// List bookmarks
+		$area2 = elgg_view_title(elgg_echo('bookmarks:inbox'));
+		set_context('search');
+		$area2 .= list_entities_from_relationship('share',page_owner(),true,'object','bookmarks');
+		set_context('bookmarks');
+		
+	// Format page
+		$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+		
+	// Draw it
+		page_draw(elgg_echo('bookmarks:inbox'),$body);
+
+?>
\ No newline at end of file
diff --git a/mod/bookmarks/index.php b/mod/bookmarks/index.php
new file mode 100644
index 000000000..195327ebe
--- /dev/null
+++ b/mod/bookmarks/index.php
@@ -0,0 +1,36 @@
+<?php
+
+	/**
+	 * Elgg bookmarks plugin index page
+	 * 
+	 * @package ElggBookmarks
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Start engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($page_owner->getGUID());
+		}
+		
+		$title = sprintf(elgg_echo('bookmarks:read'), $page_owner->name);
+		
+	// List bookmarks
+		$area2 = elgg_view_title($title);
+		set_context('search');
+		$area2 .= elgg_list_entities(array('type' => 'object', 'subtype' => 'bookmarks', 'container_guid' => page_owner(), 'limit' => 10, 'full_view' => FALSE, 'view_type_toggle' => FALSE));
+		set_context('bookmarks');
+		
+	// Format page
+		$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+		
+	// Draw it
+		page_draw($title, $body);
+
+?>
\ No newline at end of file
diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php
new file mode 100644
index 000000000..da8476aa2
--- /dev/null
+++ b/mod/bookmarks/languages/en.php
@@ -0,0 +1,79 @@
+<?php
+
+	$english = array(
+	
+		/**
+		 * Menu items and titles
+		 */
+	
+			'bookmarks' => "Bookmarks",
+			'bookmarks:add' => "Add bookmark",
+			'bookmarks:read' => "%s's bookmarked items",
+			'bookmarks:friends' => "Friends' bookmarks",
+			'bookmarks:everyone' => "All site bookmarks",
+			'bookmarks:this' => "Bookmark this",
+			'bookmarks:this:group' => "Bookmark in %s",
+			'bookmarks:bookmarklet' => "Get bookmarklet",
+			'bookmarks:bookmarklet:group' => "Get group bookmarklet",
+			'bookmarks:inbox' => "Bookmarks inbox",
+			'bookmarks:more' => "More",
+			'bookmarks:shareditem' => "Bookmarked item",
+			'bookmarks:with' => "Share with",
+			'bookmarks:new' => "A new bookmarked item",
+			'bookmarks:via' => "via bookmarks",
+			'bookmarks:address' => "Address of the resource to bookmark",
+	
+			'bookmarks:delete:confirm' => "Are you sure you want to delete this resource?",
+	
+			'bookmarks:numbertodisplay' => 'Number of bookmarked items to display',
+	
+			'bookmarks:shared' => "Bookmarked",
+			'bookmarks:visit' => "Visit resource",
+			'bookmarks:recent' => "Recent bookmarks",
+	
+			'bookmarks:river:created' => '%s bookmarked',
+			'bookmarks:river:annotate' => 'a comment on this bookmarked item',
+			'bookmarks:river:item' => 'an item',
+	
+			'item:object:bookmarks' => 'Bookmarked items',
+	
+			'bookmarks:group' => 'Group bookmarks',
+			'bookmarks:enablebookmarks' => 'Enable group bookmarks',
+	
+	
+		/**
+		 * More text
+		 */
+		    
+		    'bookmarks:widget:description' => 
+		            "This widget is designed for your dashboard and will show you the latest items in your bookmarks inbox.",
+	
+			'bookmarks:bookmarklet:description' =>
+					"The bookmarks bookmarklet allows you to share any resource you find on the web with your friends, or just bookmark it for yourself. To use it, simply drag the following button to your browser's links bar:",
+
+	        'bookmarks:bookmarklet:descriptionie' =>
+					"If you are using Internet Explorer, you will need to right click on the bookmarklet icon, select 'add to favorites', and then the Links bar.",
+
+			'bookmarks:bookmarklet:description:conclusion' =>
+					"You can then save any page you visit by clicking it at any time.",
+	
+		/**
+		 * Status messages
+		 */
+	
+			'bookmarks:save:success' => "Your item was successfully bookmarked.",
+			'bookmarks:delete:success' => "Your bookmarked item was successfully deleted.",
+	
+		/**
+		 * Error messages
+		 */
+	
+			'bookmarks:save:failed' => "Your bookmarked item could not be saved. Please try again.",
+			'bookmarks:delete:failed' => "Your bookmarked item could not be deleted. Please try again.",
+	
+	
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml
new file mode 100644
index 000000000..687b62a7e
--- /dev/null
+++ b/mod/bookmarks/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider" />
+        <field key="version" value="1.7" />
+        <field key="description" value="Elgg bookmarks plugin." />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+		<field key="licence" value="GNU Public License version 2" />
+		<field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
new file mode 100644
index 000000000..9b7e1566b
--- /dev/null
+++ b/mod/bookmarks/start.php
@@ -0,0 +1,214 @@
+<?php
+
+/**
+ * Elgg Bookmarks plugin
+ *
+ * @package ElggBookmarks
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
+
+// Bookmarks initialisation function
+function bookmarks_init() {
+
+	// Grab the config global
+	global $CONFIG;
+
+	//add a tools menu option
+	if (isloggedin()) {
+		add_menu(elgg_echo('bookmarks'), $CONFIG->wwwroot . "pg/bookmarks/" . $_SESSION['user']->username . '/items');
+
+		// add "bookmark this" to owner block
+		elgg_extend_view('owner_block/extend', 'bookmarks/owner_block');
+	}
+
+	// Register a page handler, so we can have nice URLs
+	register_page_handler('bookmarks','bookmarks_page_handler');
+
+	// Add our CSS
+	elgg_extend_view('css','bookmarks/css');
+
+	// Register granular notification for this type
+	if (is_callable('register_notification_object')) {
+		register_notification_object('object', 'bookmarks', elgg_echo('bookmarks:new'));
+	}
+
+	// Listen to notification events and supply a more useful message
+	register_plugin_hook('notify:entity:message', 'object', 'bookmarks_notify_message');
+
+	// Register a URL handler for shared items
+	register_entity_url_handler('bookmark_url','object','bookmarks');
+
+	// Shares widget
+	add_widget_type('bookmarks',elgg_echo("bookmarks:recent"),elgg_echo("bookmarks:widget:description"));
+
+	// Register entity type
+	register_entity_type('object','bookmarks');
+
+	// Add group menu option
+	add_group_tool_option('bookmarks',elgg_echo('bookmarks:enablebookmarks'),true);
+
+}
+
+/**
+ * Sidebar menu for bookmarks
+ *
+ */
+function bookmarks_pagesetup() {
+	global $CONFIG;
+
+	$page_owner = page_owner_entity();
+
+	//add submenu options
+	if (get_context() == "bookmarks") {
+
+		if (isloggedin()) {
+			// link to add bookmark form
+			if ($page_owner instanceof ElggGroup) {
+				if ($page_owner->isMember(get_loggedin_user())) {
+					add_submenu_item(elgg_echo('bookmarks:add'), $CONFIG->wwwroot."pg/bookmarks/" . $page_owner->username . "/add");
+				}
+			} else {
+				add_submenu_item(elgg_echo('bookmarks:add'), $CONFIG->wwwroot."pg/bookmarks/" . $_SESSION['user']->username . "/add");
+				add_submenu_item(elgg_echo('bookmarks:inbox'),$CONFIG->wwwroot."pg/bookmarks/" . $_SESSION['user']->username . "/inbox");
+			}
+			if (page_owner()) {
+				add_submenu_item(sprintf(elgg_echo('bookmarks:read'), $page_owner->name),$CONFIG->wwwroot."pg/bookmarks/" . $page_owner->username . "/items");
+			}
+			if (!$page_owner instanceof ElggGroup) {
+				add_submenu_item(elgg_echo('bookmarks:friends'),$CONFIG->wwwroot."pg/bookmarks/" . $_SESSION['user']->username . "/friends");
+			}
+		}
+
+		if (!$page_owner instanceof ElggGroup) {
+			add_submenu_item(elgg_echo('bookmarks:everyone'),$CONFIG->wwwroot."mod/bookmarks/everyone.php");
+		}
+		
+		// Bookmarklet
+		if ((isloggedin()) && (page_owner()) && (can_write_to_container(0, page_owner()))) {
+
+			$bmtext = elgg_echo('bookmarks:bookmarklet');
+			if ($page_owner instanceof ElggGroup) {
+				$bmtext = elgg_echo('bookmarks:bookmarklet:group');
+			}
+			add_submenu_item($bmtext, $CONFIG->wwwroot . "pg/bookmarks/{$page_owner->username}/bookmarklet");
+		}
+
+	}
+
+	if ($page_owner instanceof ElggGroup && get_context() == 'groups') {
+		if ($page_owner->bookmarks_enable != "no") {
+			add_submenu_item(sprintf(elgg_echo("bookmarks:group"),$page_owner->name), $CONFIG->wwwroot . "pg/bookmarks/" . $page_owner->username . '/items');
+		}
+	}
+
+}
+
+/**
+ * Bookmarks page handler; allows the use of fancy URLs
+ *
+ * @param array $page From the page_handler function
+ * @return true|false Depending on success
+ */
+function bookmarks_page_handler($page) {
+
+	// The first component of a bookmarks URL is the username
+	if (isset($page[0])) {
+		set_input('username',$page[0]);
+	}
+
+	// The second part dictates what we're doing
+	if (isset($page[1])) {
+		switch($page[1]) {
+			case "read":		set_input('guid',$page[2]);
+				require(dirname(dirname(dirname(__FILE__))) . "/entities/index.php");
+				return true;
+				break;
+			case "friends":		include(dirname(__FILE__) . "/friends.php");
+				return true;
+				break;
+			case "inbox":		include(dirname(__FILE__) . "/inbox.php");
+				return true;
+				break;
+			case "items":		include(dirname(__FILE__) . "/index.php");
+				return true;
+				break;
+			case "add": 		include(dirname(__FILE__) . "/add.php");
+				return true;
+				break;
+			case "bookmarklet": include(dirname(__FILE__) . "/bookmarklet.php");
+				return true;
+				break;
+		}
+		// If the URL is just 'bookmarks/username', or just 'bookmarks/', load the standard bookmarks index
+	} else {
+		include(dirname(__FILE__) . "/index.php");
+		return true;
+	}
+
+	return false;
+
+}
+
+/**
+ * Populates the ->getUrl() method for bookmarked objects
+ *
+ * @param ElggEntity $entity The bookmarked object
+ * @return string bookmarked item URL
+ */
+function bookmark_url($entity) {
+
+	global $CONFIG;
+	$title = $entity->title;
+	$title = friendly_title($title);
+	return $CONFIG->url . "pg/bookmarks/" . $entity->getOwnerEntity()->username . "/read/" . $entity->getGUID() . "/" . $title;
+
+}
+
+/**
+ * Returns a more meaningful message
+ *
+ * @param unknown_type $hook
+ * @param unknown_type $entity_type
+ * @param unknown_type $returnvalue
+ * @param unknown_type $params
+ */
+function bookmarks_notify_message($hook, $entity_type, $returnvalue, $params) {
+	$entity = $params['entity'];
+	$to_entity = $params['to_entity'];
+	$method = $params['method'];
+	if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'bookmarks')) {
+		$descr = $entity->description;
+		$title = $entity->title;
+		global $CONFIG;
+		$url = $CONFIG->wwwroot . "pg/view/" . $entity->guid;
+		if ($method == 'sms') {
+			$owner = $entity->getOwnerEntity();
+			return $owner->name . ' ' . elgg_echo("bookmarks:via") . ': ' . $url . ' (' . $title . ')';
+		}
+		if ($method == 'email') {
+			$owner = $entity->getOwnerEntity();
+			return $owner->name . ' ' . elgg_echo("bookmarks:via") . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
+		}
+		if ($method == 'web') {
+			$owner = $entity->getOwnerEntity();
+			return $owner->name . ' ' . elgg_echo("bookmarks:via") . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
+		}
+
+	}
+	return null;
+}
+
+
+// Make sure the initialisation function is called on initialisation
+register_elgg_event_handler('init','system','bookmarks_init');
+register_elgg_event_handler('pagesetup','system','bookmarks_pagesetup');
+
+// Register actions
+global $CONFIG;
+register_action('bookmarks/add',false,$CONFIG->pluginspath . "bookmarks/actions/add.php");
+register_action('bookmarks/delete',false,$CONFIG->pluginspath . "bookmarks/actions/delete.php");
+
+?>
\ No newline at end of file
diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
new file mode 100644
index 000000000..b7a4757f6
--- /dev/null
+++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
@@ -0,0 +1,32 @@
+<?php
+
+	/**
+	 * Elgg get bookmarks bookmarklet view
+	 * 
+	 * @package ElggBookmarks
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	$page_owner = $vars['pg_owner'];
+	
+	$bookmarktext = elgg_echo("bookmarks:this");
+	if ($page_owner instanceof ElggGroup)	
+		$bookmarktext = sprintf(elgg_echo("bookmarks:this:group"), $page_owner->name)
+?>
+	<div class="contentWrapper">
+	<p>
+		<?php echo elgg_echo("bookmarks:bookmarklet:description"); ?>
+	</p>
+	<p class="sharing_bookmarklet">
+		<a href="javascript:location.href='<?php echo $vars['url']; ?>pg/bookmarks/<?php echo $page_owner->username; ?>/add?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)"> <img src="<?php echo $vars['url']; ?>_graphics/elgg_bookmarklet.gif" border="0" title="<?php echo $bookmarktext ?>" />   </a>
+	</p>
+	<p>
+		<?php echo elgg_echo("bookmarks:bookmarklet:descriptionie"); ?>
+	</p>
+	<p>
+		<?php echo elgg_echo("bookmarks:bookmarklet:description:conclusion"); ?>
+	</p>
+	</div>
\ No newline at end of file
diff --git a/mod/bookmarks/views/default/bookmarks/css.php b/mod/bookmarks/views/default/bookmarks/css.php
new file mode 100644
index 000000000..71d2d9ed6
--- /dev/null
+++ b/mod/bookmarks/views/default/bookmarks/css.php
@@ -0,0 +1,125 @@
+<?php
+
+	/**
+	 * Elgg bookmarks CSS
+	 * 
+	 * @package ElggBookmarks
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+?>
+
+.sharing_item {
+
+}
+
+.sharing_item_owner {
+	font-size: 90%;
+	margin: 10px 0 0 0;
+	color:#666666;
+}
+
+.sharing_item_owner .icon {
+	float: left;
+	margin-right: 5px;
+
+}
+.sharing_item_title h3 {
+	font-size: 150%;
+	margin-bottom: 5px;
+}
+.sharing_item_title h3 a {
+	text-decoration: none;
+}
+.sharing_item_description p {
+	margin:0;
+	padding:0 0 5px 0;
+}
+.sharing_item_tags {
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/icon_tag.gif) no-repeat scroll left 2px;
+	margin:0;
+	padding:0 0 0 14px;
+}
+
+.sharing_item_address a {
+	font: 12px/100% Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	color: #ffffff;
+	background:#4690d6;
+	border: 1px solid #4690d6;
+	-webkit-border-radius: 3px; 
+	-moz-border-radius: 3px;
+	width: auto;
+	height: 25px;
+	padding: 2px 6px 2px 6px;
+	margin:10px 0 10px 0;
+	cursor: pointer;
+}
+.sharing_item_address a:hover {
+	background: #0054a7;
+	border: 1px solid #0054a7;
+	text-decoration: none;
+}
+.sharing_item_controls p {
+	margin:0;
+}
+
+
+
+/* SHARES WIDGET VIEW */
+.shares_widget_wrapper {
+	background-color: white;
+	margin:0 10px 5px 10px;
+	padding:5px;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+}
+.shares_widget_icon {
+	float: left;
+	margin-right: 10px;
+}
+.shares_timestamp {
+	color:#666666;
+	margin:0;
+}
+.share_desc {
+	display:none;
+	line-height: 1.2em;
+}
+.shares_widget_content {
+	margin-left: 35px;
+}
+.shares_title {
+	margin:0;
+	line-height: 1.2em;
+}
+
+/* timestamp and user info in gallery and list view */
+.search_listing_info .shares_gallery_user,
+.share_gallery_info .shares_gallery_user,
+.share_gallery_info .shares_gallery_comments {
+	color:#666666;
+	margin:0;
+	font-size: 90%;	
+}
+
+
+/* ***************************************
+PAGE-OWNER BLOCK
+*************************************** */
+#owner_block_bookmark_this {
+	padding:5px 0 0 0;
+}
+#owner_block_bookmark_this a {
+	font-size: 90%;
+	color:#999999;
+	padding:0 0 4px 20px;
+	background: url(<?php echo $vars['url']; ?>_graphics/icon_bookmarkthis.gif) no-repeat left top;
+}
+#owner_block_bookmark_this a:hover {
+	color: #0054a7;
+}
+
diff --git a/mod/bookmarks/views/default/bookmarks/form.php b/mod/bookmarks/views/default/bookmarks/form.php
new file mode 100644
index 000000000..94897d0b0
--- /dev/null
+++ b/mod/bookmarks/views/default/bookmarks/form.php
@@ -0,0 +1,139 @@
+<?php
+
+	/**
+	 * Elgg bookmarks plugin form
+	 * 
+	 * @package ElggBookmarks
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Have we been supplied with an entity?
+		if (isset($vars['entity'])) {
+			
+			$guid = $vars['entity']->getGUID();
+			$title = $vars['entity']->title;
+			$description = $vars['entity']->description;
+			$address = $vars['entity']->address;
+			$tags = $vars['entity']->tags;
+			$access_id = $vars['entity']->access_id;
+			$shares = $vars['entity']->shares;
+			$owner = $vars['entity']->getOwnerEntity();
+			$highlight = 'default';
+			
+		} else {
+			
+			$guid = 0;
+			$title = get_input('title',"");
+			$description = "";
+			$address = get_input('address',"");
+			$highlight = 'all';
+			
+			if ($address == "previous")
+				$address = $_SERVER['HTTP_REFERER'];
+			$tags = array();
+			
+			if (defined('ACCESS_DEFAULT'))
+				$access_id = ACCESS_DEFAULT;
+			else
+				$access_id = 0;
+			$shares = array();
+			$owner = $vars['user'];
+			
+		}
+
+?>
+<div class="contentWrapper">
+	<form action="<?php echo $vars['url']; ?>action/bookmarks/add" method="post">
+		<?php echo elgg_view('input/securitytoken'); ?>
+		<p>
+			<label>
+				<?php 	echo elgg_echo('title'); ?>
+				<?php
+
+						echo elgg_view('input/text',array(
+								'internalname' => 'title',
+								'value' => $title,
+						)); 
+				
+				?>
+			</label>
+		</p>
+		<p>
+			<label>
+				<?php 	echo elgg_echo('bookmarks:address'); ?>
+				<?php
+
+						echo elgg_view('input/url',array(
+								'internalname' => 'address',
+								'value' => $address,
+						)); 
+				
+				?>
+			</label>
+		</p>
+		<p class="longtext_editarea">
+			<label>
+				<?php 	echo elgg_echo('description'); ?>
+				<br />
+				<?php
+
+						echo elgg_view('input/longtext',array(
+								'internalname' => 'description',
+								'value' => $description,
+						)); 
+				
+				?>
+			</label>
+		</p>
+		<p>
+			<label>
+				<?php 	echo elgg_echo('tags'); ?>
+				<?php
+
+						echo elgg_view('input/tags',array(
+								'internalname' => 'tags',
+								'value' => $tags,
+						)); 
+				
+				?>
+			</label>
+		</p>
+			<?php
+
+				//echo elgg_view('bookmarks/sharing',array('shares' => $shares, 'owner' => $owner));
+				if ($friends = elgg_get_entities_from_relationship(array('relationship' => 'friend', 'relationship_guid' => $owner->getGUID(), 'inverse_relationship' => FALSE, 'type' => 'user', 'limit' => 9999))) {
+?>
+		<p>
+					<label><?php echo elgg_echo("bookmarks:with"); ?></label><br />
+<?php
+					echo elgg_view('friends/picker',array('entities' => $friends, 'internalname' => 'shares', 'highlight' => $highlight));
+?>
+		</p>
+<?php
+				}
+			
+			?>
+		<p>
+			<label>
+				<?php 	echo elgg_echo('access'); ?>
+				<?php
+
+						echo elgg_view('input/access',array(
+								'internalname' => 'access',
+								'value' => $access_id,
+						)); 
+				
+				?>
+			</label>
+		</p>
+		<p>
+			<?php echo $vars['container_guid'] ? elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $vars['container_guid'])) : ""; ?>
+			<input type="hidden" name="bookmark_guid" value="<?php echo $guid; ?>" />
+			<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
+		</p>
+	
+	</form>
+</div>
\ No newline at end of file
diff --git a/mod/bookmarks/views/default/bookmarks/owner_block.php b/mod/bookmarks/views/default/bookmarks/owner_block.php
new file mode 100644
index 000000000..2cc8f6118
--- /dev/null
+++ b/mod/bookmarks/views/default/bookmarks/owner_block.php
@@ -0,0 +1,9 @@
+<?php
+
+$label = elgg_echo('bookmarks:this');
+$url = "'" . $vars['url'] . "mod/bookmarks/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)";
+
+?>
+<div id="owner_block_bookmark_this">
+<a href="javascript:location.href=<?php echo $url; ?>"><?php echo $label ?></a>
+</div>
diff --git a/mod/bookmarks/views/default/bookmarks/sharing.php b/mod/bookmarks/views/default/bookmarks/sharing.php
new file mode 100644
index 000000000..63738d94d
--- /dev/null
+++ b/mod/bookmarks/views/default/bookmarks/sharing.php
@@ -0,0 +1,80 @@
+<?php
+
+	$owner = $vars['owner'];
+	if ($friends = elgg_get_entities_from_relationship(array('relationship' => 'friend', 'relationship_guid' => $owner->getGUID(), 'inverse_relationship' => FALSE, 'type' => 'user', 'limit' => 9999))) {
+		
+?>
+	
+<table border="0" cellspacing="0" cellpadding="0">
+
+<?php
+		
+		$col = 0;
+		foreach($friends as $friend) {
+			
+			if ($col == 0) echo "<tr>";
+			
+			$label = elgg_view("profile/icon",array('entity' => $friend, 'size' => 'tiny')); 
+			$options[$label] = $friend->getGUID();
+			
+?>
+
+			<td>
+			
+				<input type="checkbox" name="shares[]" value="<?php echo $options[$label]; ?>" />
+			
+			</td>
+
+			<td >
+			
+				<div style="width: 25px; margin-bottom: 15px;">
+			<?php
+
+				echo $label;
+			
+			?>
+				</div>
+			</td>
+			<td style="width: 300px; padding: 5px;">
+				<?php
+
+					echo $friend->name;
+				
+				?>
+			</td>
+<?php
+			
+			
+			$col++;
+			
+			if ($col == 3) {
+				
+				$col = 0;
+				echo "</tr>";
+				
+			}
+			
+			
+		}
+		if ($col != 3) {
+			echo "</tr>";
+		}
+		
+		
+?>
+
+</table>
+
+<?php
+		
+		/*echo elgg_view('input/checkboxes',array(
+		
+			'internalname' => 'shares',
+			'options' => $options,
+			'value' => $vars['shares'],
+		
+		)); */
+		
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
new file mode 100644
index 000000000..45ed46769
--- /dev/null
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -0,0 +1,145 @@
+<?php
+
+	/**
+	 * Elgg bookmark view
+	 * 
+	 * @package ElggBookmarks
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	$owner = $vars['entity']->getOwnerEntity();
+	$friendlytime = friendly_time($vars['entity']->time_created);
+
+	if (get_context() == "search") {
+
+		if (get_input('search_viewtype') == "gallery") {
+
+			$parsed_url = parse_url($vars['entity']->address);
+			$faviconurl = $parsed_url['scheme'] . "://" . $parsed_url['host'] . "/favicon.ico";
+		
+			$info = "<p class=\"shares_gallery_title\">". elgg_echo("bookmarks:shared") .": <a href=\"{$vars['entity']->getURL()}\">{$vars['entity']->title}</a> (<a href=\"{$vars['entity']->address}\">".elgg_echo('bookmarks:visit')."</a>)</p>";
+			$info .= "<p class=\"shares_gallery_user\">By: <a href=\"{$vars['url']}pg/bookmarks/{$owner->username}\">{$owner->name}</a> <span class=\"shared_timestamp\">{$friendlytime}</span></p>";
+			$numcomments = elgg_count_comments($vars['entity']);
+			if ($numcomments)
+				$info .= "<p class=\"shares_gallery_comments\"><a href=\"{$vars['entity']->getURL()}\">".sprintf(elgg_echo("comments")). " (" . $numcomments . ")</a></p>";
+			
+			//display 
+			echo "<div class=\"share_gallery_view\">";
+			echo "<div class=\"share_gallery_info\">" . $info . "</div>";
+			echo "</div>";
+
+
+		} else {
+
+			$parsed_url = parse_url($vars['entity']->address);
+			$faviconurl = $parsed_url['scheme'] . "://" . $parsed_url['host'] . "/favicon.ico";
+			if (@file_exists($faviconurl)) {
+				$icon = "<img src=\"{$faviconurl}\" />";
+			} else {
+				$icon = elgg_view(
+					"profile/icon", array(
+										'entity' => $owner,
+										'size' => 'small',
+									  )
+				);
+			}
+		
+			$info = "<p class=\"shares_gallery_title\">". elgg_echo("bookmarks:shared") .": <a href=\"{$vars['entity']->getURL()}\">{$vars['entity']->title}</a> (<a href=\"{$vars['entity']->address}\">".elgg_echo('bookmarks:visit')."</a>)</p>";
+			$info .= "<p class=\"owner_timestamp\"><a href=\"{$vars['url']}pg/bookmarks/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
+			$numcomments = elgg_count_comments($vars['entity']);
+			if ($numcomments)
+				$info .= ", <a href=\"{$vars['entity']->getURL()}\">".sprintf(elgg_echo("comments")). " (" . $numcomments . ")</a>";
+		    $info .= "</p>";
+			echo elgg_view_listing($icon, $info);
+
+		}
+		
+	} else {
+
+?>
+	<?php echo elgg_view_title(elgg_echo('bookmarks:shareditem'), false); ?>
+	<div class="contentWrapper">
+	<div class="sharing_item">
+	
+		<div class="sharing_item_title">
+			<h3>
+				<a href="<?php echo $vars['entity']->address; ?>"><?php echo $vars['entity']->title; ?></a>
+			</h3>
+		</div>
+		<div class="sharing_item_owner">
+			<p> 
+				<b><a href="<?php echo $vars['url']; ?>pg/bookmarks/<?php echo $owner->username; ?>"><?php echo $owner->name; ?></a></b> 
+				<?php echo $friendlytime; ?>
+			</p>
+		</div>
+		<div class="sharing_item_description">
+				<?php echo elgg_view('output/longtext', array('value' => $vars['entity']->description)); ?>
+		</div>
+<?php
+
+	$tags = $vars['entity']->tags;
+	if (!empty($tags)) {
+
+?>
+		<div class="sharing_item_tags">
+			<p>
+				<?php echo elgg_view('output/tags',array('value' => $vars['entity']->tags)); ?>
+			</p>
+		</div>
+<?php
+
+	}
+
+?>
+		<div class="sharing_item_address">
+			<p>
+				<?php 
+
+					//echo elgg_view('output/url',array('value' => $vars['entity']->address));
+				
+				?>
+				<a href="<?php echo $vars['entity']->address; ?>"><?php echo elgg_echo('bookmarks:visit'); ?></a>
+			</p>
+		</div>		
+		<?php
+
+			if ($vars['entity']->canEdit()) {
+		
+		?>
+		<div class="sharing_item_controls">
+			<p>
+				<a href="<?php echo $vars['url']; ?>mod/bookmarks/add.php?bookmark=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo('edit'); ?></a> &nbsp; 
+				<?php 
+						echo elgg_view('output/confirmlink',array(
+						
+							'href' => $vars['url'] . "action/bookmarks/delete?bookmark_guid=" . $vars['entity']->getGUID(),
+							'text' => elgg_echo("delete"),
+							'confirm' => elgg_echo("bookmarks:delete:confirm"),
+						
+						));  
+					?>
+			</p>
+		</div>
+		<?php
+
+			}
+		
+		?>
+	
+	</div>
+	</div>
+<?php
+
+	if ($vars['full'])
+		echo elgg_view_comments($vars['entity']);
+
+?>
+	
+<?php
+
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/bookmarks/views/default/river/object/bookmarks/annotate.php b/mod/bookmarks/views/default/river/object/bookmarks/annotate.php
new file mode 100644
index 000000000..ce3945a2d
--- /dev/null
+++ b/mod/bookmarks/views/default/river/object/bookmarks/annotate.php
@@ -0,0 +1,13 @@
+<?php
+
+	$statement = $vars['statement'];
+	$performed_by = $statement->getSubject();
+	$object = $statement->getObject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("bookmarks:river:annotate"),$url) . " ";
+	$string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("bookmarks:river:item") . "</a>";
+
+?>
+
+<?php echo $string; ?>
\ 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
new file mode 100644
index 000000000..9e89a95de
--- /dev/null
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -0,0 +1,15 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	$url = $object->getURL();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("bookmarks:river:created"),$url) . " ";
+	$string .= "<a href=\"" . $object->getURL() . "\">" . $object->title . "</a>"; //elgg_echo("bookmarks:river:item") . "</a>";
+	
+?>
+
+<?php 
+	echo $string;
+?>
\ No newline at end of file
diff --git a/mod/bookmarks/views/default/widgets/bookmarks/edit.php b/mod/bookmarks/views/default/widgets/bookmarks/edit.php
new file mode 100644
index 000000000..c399fd6d1
--- /dev/null
+++ b/mod/bookmarks/views/default/widgets/bookmarks/edit.php
@@ -0,0 +1,18 @@
+<?php
+
+?>
+	<p>
+		<?php echo elgg_echo('bookmarks:numbertodisplay'); ?>:
+		<select name="params[num_display]">
+		    <option value="1" <?php if($vars['entity']->num_display == 1) echo "SELECTED"; ?>>1</option>
+		    <option value="2" <?php if($vars['entity']->num_display == 2) echo "SELECTED"; ?>>2</option>
+		    <option value="3" <?php if($vars['entity']->num_display == 3) echo "SELECTED"; ?>>3</option>
+		    <option value="4" <?php if($vars['entity']->num_display == 4) echo "SELECTED"; ?>>4</option>
+		    <option value="5" <?php if($vars['entity']->num_display == 5) echo "SELECTED"; ?>>5</option>
+		    <option value="6" <?php if($vars['entity']->num_display == 6) echo "SELECTED"; ?>>6</option>
+		    <option value="7" <?php if($vars['entity']->num_display == 7) echo "SELECTED"; ?>>7</option>
+		    <option value="8" <?php if($vars['entity']->num_display == 8) echo "SELECTED"; ?>>8</option>
+		    <option value="9" <?php if($vars['entity']->num_display == 9) echo "SELECTED"; ?>>9</option>
+		    <option value="10" <?php if($vars['entity']->num_display == 10) echo "SELECTED"; ?>>10</option>
+		</select>
+	</p>
\ No newline at end of file
diff --git a/mod/bookmarks/views/default/widgets/bookmarks/view.php b/mod/bookmarks/views/default/widgets/bookmarks/view.php
new file mode 100644
index 000000000..b7c35d2b8
--- /dev/null
+++ b/mod/bookmarks/views/default/widgets/bookmarks/view.php
@@ -0,0 +1,65 @@
+
+<script type="text/javascript">
+$(document).ready(function () {
+    $('a.share_more_info').click(function () {
+		$(this.parentNode).children("[class=share_desc]").slideToggle("fast");
+		return false;
+    });
+}); /* end document ready function */
+</script>
+
+	<?php
+
+	    //get the num of shares the user want to display
+		$num = $vars['entity']->num_display;
+		
+		//if no number has been set, default to 4
+		if(!$num)
+			$num = 4;
+			
+        //grab the users bookmarked items
+		$shares = elgg_get_entities(array('types' => 'object', 'subtypes' => 'bookmarks', 'container_guid' => $vars['entity']->owner_guid, 'limit' => $num, 'offset' =>  0));
+		
+		if($shares){
+
+			foreach($shares as $s){
+			
+				//get the owner
+				$owner = $s->getOwnerEntity();
+
+				//get the time
+				$friendlytime = friendly_time($s->time_created);
+
+				//get the user icon
+				$icon = elgg_view(
+						"profile/icon", array(
+										'entity' => $owner,
+										'size' => 'tiny',
+									  )
+					);
+
+				//get the bookmark title
+				$info = "<p class=\"shares_title\"><a href=\"{$s->getURL()}\">{$s->title}</a></p>";
+				
+				//get the user details
+				$info .= "<p class=\"shares_timestamp\"><small><a href=\"{$owner->getURL()}\">{$owner->name}</a> {$friendlytime}</small></p>";
+
+				//get the bookmark description
+				if($s->description)
+					$info .= "<a href=\"javascript:void(0);\" class=\"share_more_info\">".elgg_echo('bookmarks:more')."</a><br /><div class=\"share_desc\"><p>{$s->description}</p></div>";
+		
+				//display 
+				echo "<div class=\"shares_widget_wrapper\">";
+				echo "<div class=\"shares_widget_icon\">" . $icon . "</div>";
+				echo "<div class=\"shares_widget_content\">" . $info . "</div>";
+				echo "</div>";
+
+			}
+
+			$user_inbox = $vars['url'] . "pg/bookmarks/" . page_owner_entity()->username . "/inbox";
+			echo "<div class=\"shares_widget_wrapper\"><a href=\"{$user_inbox}\">".elgg_echo('bookmarks:inbox')."</a></div>";
+
+		}
+	
+	
+      ?>
\ No newline at end of file
diff --git a/mod/bookmarks/views/rss/object/bookmarks.php b/mod/bookmarks/views/rss/object/bookmarks.php
new file mode 100644
index 000000000..0dc38186e
--- /dev/null
+++ b/mod/bookmarks/views/rss/object/bookmarks.php
@@ -0,0 +1,18 @@
+<?php
+
+	$title = $vars['entity']->title;
+	if (empty($title)) {
+		$title = substr($vars['entity']->description,0,32);
+		if (strlen($vars['entity']->description) > 32)
+			$title .= " ...";
+	}
+
+?>
+
+	<item>
+	  <guid isPermaLink='true'><?php echo $vars['entity']->getURL(); ?></guid>
+	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>
+	  <link><?php echo $vars['entity']->address; ?></link>
+	  <title><![CDATA[<?php echo $title; ?>]]></title>
+	  <description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
+	</item>
diff --git a/mod/captcha/backgrounds/bg1.jpg b/mod/captcha/backgrounds/bg1.jpg
new file mode 100644
index 000000000..0e16b2265
--- /dev/null
+++ b/mod/captcha/backgrounds/bg1.jpg
diff --git a/mod/captcha/backgrounds/bg2.jpg b/mod/captcha/backgrounds/bg2.jpg
new file mode 100644
index 000000000..3357164a6
--- /dev/null
+++ b/mod/captcha/backgrounds/bg2.jpg
diff --git a/mod/captcha/backgrounds/bg3.jpg b/mod/captcha/backgrounds/bg3.jpg
new file mode 100644
index 000000000..96610abf4
--- /dev/null
+++ b/mod/captcha/backgrounds/bg3.jpg
diff --git a/mod/captcha/backgrounds/bg4.jpg b/mod/captcha/backgrounds/bg4.jpg
new file mode 100644
index 000000000..5123ed70e
--- /dev/null
+++ b/mod/captcha/backgrounds/bg4.jpg
diff --git a/mod/captcha/backgrounds/bg5.jpg b/mod/captcha/backgrounds/bg5.jpg
new file mode 100644
index 000000000..7ae7e6c22
--- /dev/null
+++ b/mod/captcha/backgrounds/bg5.jpg
diff --git a/mod/captcha/captcha.php b/mod/captcha/captcha.php
new file mode 100644
index 000000000..0947940ec
--- /dev/null
+++ b/mod/captcha/captcha.php
@@ -0,0 +1,41 @@
+<?php
+	/**
+	 * Elgg captcha plugin graphics file generator
+	 * 
+	 * @package ElggCaptcha
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	global $CONFIG;
+	$token = get_input('captcha_token');
+
+	// 	Output captcha
+	if ($token)
+	{ 
+		// Set correct header
+		header("Content-type: image/jpeg");
+	
+		// Generate captcha
+		$captcha = captcha_generate_captcha($token);
+		
+		// Pick a random background image
+		$n = rand(1, $CONFIG->captcha_num_bg);
+		$image = imagecreatefromjpeg($CONFIG->pluginspath . "captcha/backgrounds/bg$n.jpg");	
+		
+		// Create a colour (black so its not a simple matter of masking out one colour and ocring the rest)
+		$colour = imagecolorallocate($image, 0,0,0);
+		
+		// Write captcha to image
+		//imagestring($image, 5, 30, 4, $captcha, $black);
+		imagettftext($image, 30, 0, 10, 30, $colour, $CONFIG->pluginspath . "captcha/fonts/1.ttf", $captcha);
+		
+		// Output image
+		imagejpeg($image);
+		
+		// Free memory
+		imagedestroy($image);
+	}
+?>
\ No newline at end of file
diff --git a/mod/captcha/fonts/1.ttf b/mod/captcha/fonts/1.ttf
new file mode 100644
index 000000000..f5534f943
--- /dev/null
+++ b/mod/captcha/fonts/1.ttf
diff --git a/mod/captcha/fonts/Liberation_serif_License.txt b/mod/captcha/fonts/Liberation_serif_License.txt
new file mode 100644
index 000000000..41751f278
--- /dev/null
+++ b/mod/captcha/fonts/Liberation_serif_License.txt
@@ -0,0 +1,77 @@
+LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY LIBERATION FONT SOFTWARE
+This agreement governs the use of the Software and any updates to the
+Software, regardless of the delivery mechanism. Subject to the following
+terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to
+this collective work pursuant to the GNU General Public License v.2 with the
+exceptions set forth below and such other terms as our set forth in this End
+User License Agreement.
+1. The Software and License Exception. LIBERATION font software  (the
+"Software") consists of TrueType-OpenType formatted font software for
+rendering LIBERATION typefaces in sans serif, serif, and monospaced character
+styles. You are licensed to use, modify, copy, and distribute the Software
+pursuant to the GNU General Public License v.2 with the following exceptions:  
+1) As a special exception, if you create a document which uses this font, and
+embed this font or unaltered portions of this font into the document, this
+font does not by itself cause the resulting document to be covered by the GNU
+General Public License.  This exception does not however invalidate any other
+reasons why the document might be covered by the GNU General Public License. 
+If you modify this font, you may extend this exception to your version of the
+font, but you are not obligated to do so. If you do not wish to do so, delete
+this exception statement from your version. 
+
+2) As a further exception, any distribution of the object code of the Software
+in a physical product must provide you the right to access and modify the
+source code for the Software and to reinstall that modified version of the
+Software in object code form on the same physical product on which you
+received it.
+2. Intellectual Property Rights. The Software and each of its components,
+including the source code, documentation, appearance, structure and
+organization are owned by Red Hat and others and are protected under copyright
+and other laws. Title to the Software and any component, or to any copy,
+modification, or merged portion shall remain with the aforementioned, subject
+to the applicable license. The "LIBERATION" trademark is a trademark of Red
+Hat, Inc. in the U.S. and other countries. This agreement does not permit
+Client to distribute modified versions of the Software using Red Hat's
+trademarks. If Client makes a redistribution of a modified version of the
+Software, then Client must modify the files names to remove any reference to
+the Red Hat trademarks and must not use the Red Hat trademarks in any way to
+reference or promote the modified Software. 
+3. Limited Warranty. To the maximum extent permitted under applicable law, the
+Software is provided and licensed "as is" without warranty of any kind,
+expressed or implied, including the implied warranties of merchantability,
+non-infringement or fitness for a particular purpose. Red Hat does not warrant
+that the functions contained in the Software will meet Client's requirements
+or that the operation of the Software will be entirely error free or appear
+precisely as described in the accompanying documentation. 
+4. Limitation of Remedies and Liability.  To the maximum extent permitted by
+applicable law, Red Hat or any Red Hat authorized dealer will not be liable to
+Client for any incidental or consequential damages, including lost profits or
+lost savings arising out of the use or inability to use the Software, even if
+Red Hat or such dealer has been advised of the possibility of such damages. 
+5. Export Control. As required by U.S. law, Client represents and warrants
+that it: (a) understands that the Software is subject to export controls under
+the U.S. Commerce Department's Export Administration Regulations ("EAR"); (b)
+is not located in a prohibited destination country under the EAR or U.S.
+sanctions regulations (currently Cuba, Iran, Iraq, Libya, North Korea, Sudan
+and Syria); (c) will not export, re-export, or transfer the Software to any
+prohibited destination, entity, or individual without the necessary export
+license(s) or authorizations(s) from the U.S. Government; (d) will not use or
+transfer the Software for use in any sensitive nuclear, chemical or biological
+weapons, or missile technology end-uses unless authorized by the U.S.
+Government by regulation or specific license; (e) understands and agrees that
+if it is in the United States and exports or transfers the Software to
+eligible end users, it will, as required by EAR Section 740.17(e), submit
+semi-annual reports to the Commerce Department's Bureau of Industry & Security
+(BIS), which include the name and address (including country) of each
+transferee; and (f) understands that countries other than the United States
+may restrict the import, use, or export of encryption products and that it
+shall be solely responsible for compliance with any such import, use, or
+export restrictions.
+6. General. If any provision of this agreement is held to be unenforceable,
+that shall not affect the enforceability of the remaining provisions. This
+agreement shall be governed by the laws of the State of North Carolina and of
+the United States, without regard to any conflict of laws provisions, except
+that the United Nations Convention on the International Sale of Goods shall
+not apply.
+Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark
+of Red Hat, Inc.
diff --git a/mod/captcha/languages/en.php b/mod/captcha/languages/en.php
new file mode 100644
index 000000000..a45515ce3
--- /dev/null
+++ b/mod/captcha/languages/en.php
@@ -0,0 +1,20 @@
+<?php
+	/**
+	 * Elgg diagnostics language pack.
+	 * 
+	 * @package ElggDiagnostics
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$english = array(
+	
+		'captcha:entercaptcha' => 'Enter text from image',
+		'captcha:captchafail' => 'Sorry, the text that you entered didn\'t match the text in the image.',
+	
+	);
+					
+	add_translation("en",$english);
+?>
\ No newline at end of file
diff --git a/mod/captcha/manifest.xml b/mod/captcha/manifest.xml
new file mode 100644
index 000000000..ef8b66775
--- /dev/null
+++ b/mod/captcha/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+	<field key="author" value="Curverider Ltd" />
+	<field key="version" value="1.7" />
+	<field key="description" value="Provides captcha support (Requires the php_gd library)." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/captcha/start.php b/mod/captcha/start.php
new file mode 100644
index 000000000..9c76ce738
--- /dev/null
+++ b/mod/captcha/start.php
@@ -0,0 +1,141 @@
+<?php
+	/**
+	 * Elgg captcha plugin
+	 * 
+	 * @package ElggCaptcha
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	function captcha_init()
+	{
+		global $CONFIG;
+		
+		// Register page handler for captcha functionality
+		register_page_handler('captcha','captcha_page_handler');
+		
+		// Extend CSS
+		elgg_extend_view('css','captcha/css');
+		
+		// Number of background images
+		$CONFIG->captcha_num_bg = 5;
+		
+		// Default length
+		$CONFIG->captcha_length = 5;
+		
+		// Register a function that provides some default override actions
+		register_plugin_hook('actionlist', 'captcha', 'captcha_actionlist_hook');
+		
+		// Register actions to intercept
+		$actions = array();
+		$actions = trigger_plugin_hook('actionlist', 'captcha', null, $actions);
+		
+		if (($actions) && (is_array($actions)))
+		{
+			foreach ($actions as $action)
+				register_plugin_hook("action", $action, "captcha_verify_action_hook");
+		}
+	}
+	
+	function captcha_page_handler($page) 
+	{
+		global $CONFIG;
+		
+		if (isset($page[0])) {
+			set_input('captcha_token',$page[0]);
+		}
+
+		include($CONFIG->pluginspath . "captcha/captcha.php");
+	}
+	
+	/**
+	 * Generate a token to act as a seed value for the captcha algorithm.
+	 */
+	function captcha_generate_token()
+	{
+		return md5(generate_action_token(time()).rand()); // Use action token plus some random for uniqueness
+	}
+	
+	/**
+	 * Generate a captcha based on the given seed value and length.
+	 *
+	 * @param string $seed_token
+	 * @return string
+	 */
+	function captcha_generate_captcha($seed_token)
+	{
+		global $CONFIG;
+		
+		/*
+		 * We generate a token out of the random seed value + some session data, 
+		 * this means that solving via pr0n site or indian cube farm becomes
+		 * significantly more tricky (we hope).
+		 * 
+		 * We also add the site secret, which is unavailable to the client and so should
+		 * make it very very hard to guess values before hand.
+		 * 
+		 */
+		
+		return strtolower(substr(md5(generate_action_token(0) . $seed_token), 0, $CONFIG->captcha_length));
+	}
+	
+	/**
+	 * Verify a captcha based on the input value entered by the user and the seed token passed.
+	 *
+	 * @param string $input_value
+	 * @param string $seed_token
+	 * @return bool
+	 */
+	function captcha_verify_captcha($input_value, $seed_token)
+	{
+		if (strcasecmp($input_value, captcha_generate_captcha($seed_token)) == 0)
+			return true;
+			
+		return false;
+	}
+	
+	/**
+	 * Listen to the action plugin hook and check the captcha.
+	 *
+	 * @param unknown_type $hook
+	 * @param unknown_type $entity_type
+	 * @param unknown_type $returnvalue
+	 * @param unknown_type $params
+	 */
+	function captcha_verify_action_hook($hook, $entity_type, $returnvalue, $params)
+	{
+		$token = get_input('captcha_token');
+		$input = get_input('captcha_input');
+		
+		if (($token) && (captcha_verify_captcha($input, $token)))
+			return true;
+		
+		register_error(elgg_echo('captcha:captchafail'));
+			
+		return false;
+	}
+	
+	/**
+	 * This function returns an array of actions the captcha will expect a captcha for, other plugins may
+	 * add their own to this list thereby extending the use.
+	 *
+	 * @param unknown_type $hook
+	 * @param unknown_type $entity_type
+	 * @param unknown_type $returnvalue
+	 * @param unknown_type $params
+	 */
+	function captcha_actionlist_hook($hook, $entity_type, $returnvalue, $params)
+	{
+		if (!is_array($returnvalue))
+			$returnvalue = array();
+			
+		$returnvalue[] = 'register';
+		$returnvalue[] = 'user/requestnewpassword';
+			
+		return $returnvalue;
+	}
+	
+	register_elgg_event_handler('init','system','captcha_init');
+?>
\ No newline at end of file
diff --git a/mod/captcha/views/default/captcha/css.php b/mod/captcha/views/default/captcha/css.php
new file mode 100644
index 000000000..7466cbb24
--- /dev/null
+++ b/mod/captcha/views/default/captcha/css.php
@@ -0,0 +1,6 @@
+
+.captcha-input-image {
+	text-align: center;
+	margin: auto;
+}
+
diff --git a/mod/captcha/views/default/input/captcha.php b/mod/captcha/views/default/input/captcha.php
new file mode 100644
index 000000000..879a01c2d
--- /dev/null
+++ b/mod/captcha/views/default/input/captcha.php
@@ -0,0 +1,26 @@
+<?php
+	/**
+	 * Elgg captcha plugin captcha hook view override.
+	 * 
+	 * @package ElggCaptcha
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Generate a token which is then passed into the captcha algorithm for verification
+	$token = captcha_generate_token();
+?>
+<div class="captcha">
+	<input type="hidden" name="captcha_token" value="<?php echo $token; ?>" />
+	<label>
+		<?php echo elgg_echo('captcha:entercaptcha'); ?><br /><br />
+		<div class="captcha-right">
+			<img class="captcha-input-image" src="<?php echo $vars['url'] . "pg/captcha/$token"; ?>" /><br />
+		</div><br />
+		<div class="captcha-left">
+			<?php echo elgg_view('input/text', array('internalname' => 'captcha_input', 'class' => 'captcha-input-text')); ?>
+		</div>
+	</label>
+</div>
\ No newline at end of file
diff --git a/mod/categories/actions/save.php b/mod/categories/actions/save.php
new file mode 100644
index 000000000..c8d8bd051
--- /dev/null
+++ b/mod/categories/actions/save.php
@@ -0,0 +1,23 @@
+<?php
+
+	/**
+	 * Elgg categories plugin category saver
+	 * 
+	 * @package ElggCategories
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+		$categories = get_input('categories');
+		$categories = string_to_tag_array($categories);
+		
+		global $CONFIG;
+		$site = $CONFIG->site;
+		$site->categories = $categories;
+		system_message(elgg_echo("categories:save:success"));
+		
+		forward($_SERVER['HTTP_REFERER']);
+
+?>
diff --git a/mod/categories/languages/en.php b/mod/categories/languages/en.php
new file mode 100644
index 000000000..ecd01a9df
--- /dev/null
+++ b/mod/categories/languages/en.php
@@ -0,0 +1,14 @@
+<?php
+
+	$english = array(
+	
+		'categories' => 'Categories',
+		'categories:settings' => 'Set site categories',	
+		'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.',
+	
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml
new file mode 100644
index 000000000..443872e57
--- /dev/null
+++ b/mod/categories/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider" />
+        <field key="version" value="1.7" />
+        <field key="description" value="Site wide categories" />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+        <field key="licence" value="GNU Public License version 2" />
+        <field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/categories/readme.txt b/mod/categories/readme.txt
new file mode 100644
index 000000000..49241b2f4
--- /dev/null
+++ b/mod/categories/readme.txt
@@ -0,0 +1,26 @@
+Site-wide categories
+--------------------
+
+NOTES FOR PROGRAMMERS:
+
+If you're not a programmer, don't worry! All the main Elgg tools
+are already adapted to use categories, and a growing number of
+third party Elgg tools use it too.
+
+
+This plugin uses views and events hooks to allow you to easily add
+site-wide categories across Elgg tools.
+
+This is a two-line addition to any plugin.
+
+In your edit/create form:
+
+	echo elgg_view('categories', $vars);
+
+In your object view:
+
+	echo elgg_view('categories/view', $vars);
+	
+Note that in both cases, $vars['entity'] MUST be populated with
+the entity the categories apply to, if it exists. (i.e., there's
+no need for this on a create form.)
\ No newline at end of file
diff --git a/mod/categories/settings.php b/mod/categories/settings.php
new file mode 100644
index 000000000..85696730a
--- /dev/null
+++ b/mod/categories/settings.php
@@ -0,0 +1,43 @@
+<?php
+
+	/**
+	 * Elgg categories plugin settings page
+	 * 
+	 * @package ElggCategories
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load engine and restrict to admins 
+
+		require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
+		admin_gatekeeper();
+		
+	// Set context
+	
+		set_context('admin');
+		
+	// Get site and categories
+		
+		global $CONFIG;
+		$site = $CONFIG->site;
+		$categories = $site->categories;
+		
+		if (empty($categories)) $categories = array();
+		
+	// Load category save view
+	
+		$body = elgg_view('categories/settings',array(
+							'categories' => $categories,
+						));
+
+	// Layout
+
+		$body = elgg_view_layout('two_column_left_sidebar','', $body);
+						
+	// View page
+		page_draw(elgg_echo('categories:settings'),$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/categories/start.php b/mod/categories/start.php
new file mode 100644
index 000000000..1a8e686fe
--- /dev/null
+++ b/mod/categories/start.php
@@ -0,0 +1,70 @@
+<?php
+
+	/**
+	 * Elgg categories plugin
+	 * 
+	 * @package ElggCategories
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	/**
+	 * Initialise categories actions etc
+	 *
+	 */
+		function categories_init() {
+			
+			// Get config
+				global $CONFIG;
+				
+			elgg_extend_view('css', 'categories/css');
+			
+			// Register action
+				register_action('categories/save',false,$CONFIG->pluginspath . 'categories/actions/save.php',true);
+			
+		}
+	
+	/**
+	 * Set up menu items
+	 *
+	 */
+		function categories_pagesetup()
+		{
+			if (get_context() == 'admin' && isadminloggedin()) {
+				global $CONFIG;
+				add_submenu_item(elgg_echo('categories:settings'), $CONFIG->wwwroot . 'mod/categories/settings.php');
+			}
+		}
+		
+	/**
+	 * Save categories
+	 *
+	 */
+		function categories_save($event, $object_type, $object) {
+			
+			if ($object instanceof ElggEntity) {
+				
+				$marker = get_input('universal_category_marker');
+				if ($marker == 'on') {
+					
+					$categories = get_input('universal_categories_list');
+					if (empty($categories)) $categories = array();
+					
+					$object->universal_categories = $categories;
+					
+				}
+				
+			}
+			return true;
+			
+		}
+	
+
+	register_elgg_event_handler('init','system','categories_init');
+	register_elgg_event_handler('pagesetup','system','categories_pagesetup');
+	register_elgg_event_handler('update','all','categories_save');
+	register_elgg_event_handler('create','all','categories_save');
+
+?>
\ No newline at end of file
diff --git a/mod/categories/views/default/categories.php b/mod/categories/views/default/categories.php
new file mode 100644
index 000000000..f5a41cfa1
--- /dev/null
+++ b/mod/categories/views/default/categories.php
@@ -0,0 +1,48 @@
+<?php
+
+	/**
+	 * Elgg categories plugin
+	 * 
+	 * @package ElggCategories
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+		if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) {
+			$selected_categories = $vars['entity']->universal_categories;
+		}
+		$categories = $vars['config']->site->categories;
+		if (empty($categories)) $categories = array();
+		if (empty($selected_categories)) $selected_categories = array(); 
+
+		if (!empty($categories)) {
+			if (!is_array($categories)) $categories = array($categories);
+		
+?>
+
+		<div id="content_area_user_title"><h2 class="categoriestitle"><?php echo elgg_echo('categories'); ?></h2></div>
+		<div class="categories">
+			<p>
+			
+<?php
+
+		echo elgg_view('input/checkboxes',array(
+			'options' => $categories,
+			'value' => $selected_categories,
+			'internalname' => 'universal_categories_list'
+												));
+
+?>
+			<input type="hidden" name="universal_category_marker" value="on" />
+			</p>
+		</div>
+		
+<?php
+
+	} else {
+		echo '<input type="hidden" name="universal_category_marker" value="on" />';
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/categories/views/default/categories/css.php b/mod/categories/views/default/categories/css.php
new file mode 100644
index 000000000..d2cf5a8a8
--- /dev/null
+++ b/mod/categories/views/default/categories/css.php
@@ -0,0 +1,61 @@
+<?php
+	/**
+	 * Categories CSS extender
+	 * 
+	 * @package Elgg File Repository
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+?>
+
+.categories .input-checkboxes {
+	padding:0;
+	margin:2px 5px 0 0;
+}
+.categories label {
+	font-size: 100%;
+	line-height:1.2em;
+}
+
+#two_column_left_sidebar_maincontent .contentWrapper h2.categoriestitle {
+	padding: 0 0 3px 0;
+	margin:0;
+	font-size:120%;
+	color:#333333;
+}
+#two_column_left_sidebar_maincontent .contentWrapper .categories {
+	border:1px solid #CCCCCC;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+	padding:5px;
+	margin:0 0 15px 0;	
+}
+#two_column_left_sidebar_maincontent .contentWrapper .categories p {
+	margin:0;	
+}
+#two_column_left_sidebar_maincontent .contentWrapper .blog_post .categories {
+	border:none;
+	margin:0;
+	padding:0;
+}
+
+#two_column_left_sidebar .blog_categories {
+	background:white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+    padding:10px;
+    margin:0 10px 10px 10px;
+}
+#two_column_left_sidebar .blog_categories h2 {
+	background:none;
+	border-top:none;
+	margin:0;
+	padding:0 0 5px 0;
+	font-size:1.25em;
+	line-height:1.2em;
+	color:#0054A7;
+}
+#two_column_left_sidebar .blog_categories ul {
+	color:#0054A7;
+	margin:5px 0 0 0;
+}
\ No newline at end of file
diff --git a/mod/categories/views/default/categories/list.php b/mod/categories/views/default/categories/list.php
new file mode 100644
index 000000000..b6f9f4302
--- /dev/null
+++ b/mod/categories/views/default/categories/list.php
@@ -0,0 +1,41 @@
+<?php
+
+	$categories = $vars['config']->site->categories;
+	
+	if ($categories) {
+		if (!is_array($categories)) $categories = array($categories);
+		
+	if (!empty($vars['subtype'])) {
+		$flag = array();
+		$owner_guid = '';
+		if (isset($vars['owner_guid'])) $owner_guid = (int) $vars['owner_guid'];
+		if ($cats = get_tags(0,999,'universal_categories','object',$vars['subtype'],$owner_guid))
+			foreach($cats as $cat)
+				$flag[] = $cat->tag;
+				
+	} else {
+		$flag = null;
+	}
+	
+	if (is_null($flag) || !empty($flag)) {
+		
+?>
+
+	<h2><?php echo elgg_echo('categories'); ?></h2>
+	<div class="categories">
+		<?php
+
+			$catstring = '';
+			if (!empty($categories)) {
+				foreach($categories as $category) {
+					if (is_null($flag) || (is_array($flag) && in_array($category,$flag)))
+						$catstring .= '<li><a href="'.$vars['baseurl'].urlencode($category).'">'. $category .'</a></li>';
+				}
+			}
+			if (!empty($catstring)) echo "<ul>{$catstring}</ul>";
+		
+		?>
+	</div>
+<?php } 
+
+}?>
\ No newline at end of file
diff --git a/mod/categories/views/default/categories/settings.php b/mod/categories/views/default/categories/settings.php
new file mode 100644
index 000000000..6c55d88f9
--- /dev/null
+++ b/mod/categories/views/default/categories/settings.php
@@ -0,0 +1,26 @@
+<?php
+
+	echo elgg_view_title(elgg_echo('categories:settings'));
+
+?>
+
+	<div class="contentWrapper">
+		<p>
+			<?php echo elgg_echo('categories:explanation'); ?>
+		</p>
+	
+
+<?php
+
+	echo elgg_view(
+						'input/form',
+						array(
+							'action' => $vars['url'] . 'action/categories/save',
+							'method' => 'post',
+							'body' => elgg_view('categories/settingsform',$vars)
+						)
+					);
+
+?>
+
+</div>
\ No newline at end of file
diff --git a/mod/categories/views/default/categories/settingsform.php b/mod/categories/views/default/categories/settingsform.php
new file mode 100644
index 000000000..044f01dcd
--- /dev/null
+++ b/mod/categories/views/default/categories/settingsform.php
@@ -0,0 +1,7 @@
+<?php
+
+	echo elgg_view('input/tags',array('value' => $vars['categories'],
+									  'internalname' => 'categories'));
+
+?>
+	<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
\ No newline at end of file
diff --git a/mod/categories/views/default/categories/view.php b/mod/categories/views/default/categories/view.php
new file mode 100644
index 000000000..ef092ce84
--- /dev/null
+++ b/mod/categories/views/default/categories/view.php
@@ -0,0 +1,19 @@
+<?php
+
+	$linkstr = '';
+	if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) {
+		
+		$categories = $vars['entity']->universal_categories;
+		if (!empty($categories)) {
+			if (!is_array($categories)) $categories = array($categories);
+			foreach($categories as $category) {
+				$link = $vars['url'] . 'search?tagtype=universal_categories&tag=' . urlencode($category);
+				if (!empty($linkstr)) $linkstr .= ', ';
+				$linkstr .= '<a href="'.$link.'">' . $category . '</a>';
+			}
+		}
+		
+	}
+	echo $linkstr;
+
+?>
\ No newline at end of file
diff --git a/mod/custom_index/index.php b/mod/custom_index/index.php
new file mode 100644
index 000000000..953e2a85b
--- /dev/null
+++ b/mod/custom_index/index.php
@@ -0,0 +1,36 @@
+<?php
+
+	/**
+	 * Elgg custom index
+	 * 
+	 * @package ElggCustomIndex
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.com/
+	 */
+
+	// Get the Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+    //get required data		
+	set_context('search');//display results in search mode, which is list view
+	//grab the latest 4 blog posts. to display more, change 4 to something else
+	$blogs = elgg_list_entities(array('type' => 'object', 'subtype' => 'blog', 'limit' => 4, 'full_view' => FALSE, 'view_type_toggle' => FALSE, 'pagination' => FALSE));
+	//grab the latest bookmarks
+	$bookmarks = elgg_list_entities(array('type' => 'object', 'subtype' => 'bookmarks', 'limit' => 4, 'full_view' => FALSE, 'view_type_toggle' => FALSE, 'pagination' => FALSE));
+	//grab the latest files
+	$files = elgg_list_entities(array('type' => 'object', 'subtype' => 'file', 'limit' => 4, 'full_view' => FALSE, 'view_type_toggle' => FALSE, 'pagination' => FALSE));
+	//get the newest members who have an avatar
+	$newest_members = elgg_get_entities_from_metadata(array('metadata_names' => 'icontime', 'types' => 'user', 'limit' => 10));
+	//newest groups
+	$groups = elgg_list_entities(array(type => 'group', 'limit' => 4, 'full_view' => FALSE, 'view_type_toggle' => FALSE, 'pagination' => FALSE));
+	//grab the login form
+	$login = elgg_view("account/forms/login");
+	
+    //display the contents in our new canvas layout
+	$body = elgg_view_layout('new_index',$login, $files, $newest_members, $blogs, $groups, $bookmarks);
+   
+    page_draw($title, $body);
+		
+?>
\ No newline at end of file
diff --git a/mod/custom_index/languages/en.php b/mod/custom_index/languages/en.php
new file mode 100644
index 000000000..452bcf2e5
--- /dev/null
+++ b/mod/custom_index/languages/en.php
@@ -0,0 +1,17 @@
+<?php
+
+	$english = array(
+	
+			'custom:bookmarks' => "Latest bookmarks",
+			'custom:groups' => "Latest groups",
+			'custom:files' => "Latest files",
+			'custom:blogs' => "Latest blog posts",
+			'custom:members' => "Newest members",
+			'custom:nofiles' => "There are no files yet",
+			'custom:nogroups' => "There are no files yet",	
+	
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/custom_index/manifest.xml b/mod/custom_index/manifest.xml
new file mode 100644
index 000000000..2fb36cf22
--- /dev/null
+++ b/mod/custom_index/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider" />
+        <field key="version" value="1.7" />
+        <field key="description" value="A simple plugin to replace the sites index page with boxes containing the latest content from the site." />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+        <field key="licence" value="GNU Public License version 2" />
+        <field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/custom_index/start.php b/mod/custom_index/start.php
new file mode 100644
index 000000000..16d277a10
--- /dev/null
+++ b/mod/custom_index/start.php
@@ -0,0 +1,36 @@
+<?php
+
+	/**
+	 * Elgg custom index page
+	 * 
+	 * @package ElggIndexCustom
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.com/
+	 */
+
+	 
+    function indexCustom_init() {
+	
+        // Extend system CSS with our own styles
+				elgg_extend_view('css','custom_index/css');
+				
+       // Replace the default index page
+			register_plugin_hook('index','system','custom_index');
+			
+				
+    }
+    
+    function custom_index() {
+			
+			if (!include_once(dirname(__FILE__) . "/index.php")) return false;
+			return true;
+			
+		}
+
+
+    // Make sure the
+		    register_elgg_event_handler('init','system','indexCustom_init');
+
+?>
\ No newline at end of file
diff --git a/mod/custom_index/views/default/canvas/layouts/new_index.php b/mod/custom_index/views/default/canvas/layouts/new_index.php
new file mode 100644
index 000000000..e1b48ec0c
--- /dev/null
+++ b/mod/custom_index/views/default/canvas/layouts/new_index.php
@@ -0,0 +1,131 @@
+<?php
+
+	/**
+	 * Elgg custom profile 
+	 * You can edit the layout of this page with your own layout and style. Whatever you put in the file
+	 * will replace the frontpage of your Elgg site.
+	 * 
+	 * @package Elgg
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+	 
+?>
+
+<div id="custom_index">
+
+    <!-- left column content -->
+    <div id="index_left">
+        <!-- welcome message -->
+        <div id="index_welcome"> 
+        	<?php
+        		if (isloggedin()){
+	        		echo "<h2>" . elgg_echo("welcome") . " ";
+        			echo $vars['user']->name;
+        			echo "</h2>";
+    			}
+        	?>
+            <?php
+            	//include a view that plugins can extend
+            	echo elgg_view("index/lefthandside");
+            ?>
+	        <?php
+	            //this displays some content when the user is logged out
+			    if (!isloggedin()){
+	            	//display the login form
+			    	echo $vars['area1'];
+			    	echo "<div class=\"clearfloat\"></div>";
+		        }
+	        ?>
+        </div>
+<?php
+    if(is_plugin_enabled('file')){
+?> 	
+        <!-- display latest files -->
+        <div class="index_box">
+            <h2><?php echo elgg_echo("custom:files"); ?></h2>
+            <?php 
+                if (!empty($vars['area2'])) {
+                    echo $vars['area2'];//this will display files
+                }else{
+                    echo "<p><?php echo elgg_echo('custom:nofiles'); ?></p>";
+                }
+            ?>
+        </div>
+<?php
+	}
+	
+    if(is_plugin_enabled('groups')){
+?> 
+        <!-- display latest groups -->
+	    <div class="index_box">
+            <h2><?php echo elgg_echo("custom:groups"); ?></h2>
+        <?php 
+                if (!empty($vars['area5'])) {
+                    echo $vars['area5'];//this will display groups
+                }else{
+                    echo "<p><?php echo elgg_echo('custom:nogroups'); ?>.</p>";
+                }
+            ?>
+    	</div>
+<?php
+	}
+?>
+    </div>
+    
+    <!-- right hand column -->
+    <div id="index_right">
+        <!-- more content -->
+	    <?php
+            //include a view that plugins can extend
+            echo elgg_view("index/righthandside");
+        ?>
+        <!-- latest members -->
+        <div class="index_box">
+            <h2><?php echo elgg_echo("custom:members"); ?></h2>
+            <div class="contentWrapper">
+            <?php 
+                if(isset($vars['area3'])) {
+                    //display member avatars
+                    foreach($vars['area3'] as $members){
+                        echo "<div class=\"index_members\">";
+                        echo elgg_view("profile/icon",array('entity' => $members, 'size' => 'small'));
+                        echo "</div>";
+                    }
+                }
+            ?>
+	        <div class="clearfloat"></div>
+	        </div>
+        </div>
+<?php
+    if(is_plugin_enabled('blog')){
+?> 
+        <!-- latest blogs -->
+        <div class="index_box">
+            <h2><?php echo elgg_echo("custom:blogs"); ?></h2>
+            <?php 
+                if (isset($vars['area4'])) 
+                    echo $vars['area4']; //display blog posts
+            ?>
+        </div>
+<?php
+	}
+
+    if(is_plugin_enabled('bookmarks')){
+?>
+        <!-- display latest bookmarks -->
+    	<div class="index_box">
+            <h2><?php echo elgg_echo("custom:bookmarks"); ?></h2>
+            <?php 
+                if (isset($vars['area6'])) 
+                    echo $vars['area6']; //display bookmarks
+            ?>
+        </div>
+<?php
+	}
+?>
+    </div>
+    <div class="clearfloat"></div>
+</div>
\ No newline at end of file
diff --git a/mod/custom_index/views/default/custom_index/css.php b/mod/custom_index/views/default/custom_index/css.php
new file mode 100644
index 000000000..9c35aaa27
--- /dev/null
+++ b/mod/custom_index/views/default/custom_index/css.php
@@ -0,0 +1,86 @@
+<?php
+	/**
+	 * Custom Index page css extender
+	 * 
+	 * @package custom_index
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+?>
+
+#custom_index {
+	margin:10px;
+}
+#index_left {
+    width:442px;
+    float:left;
+    margin:0 0 30px 0;
+    padding:0 0 20px 0px;
+}
+#index_right {
+    width:442px;
+    float:right;
+    margin:0 0 30px 0;
+    padding:0 0px 20px 0;
+}
+#index_welcome {
+	padding:5px 10px 5px 10px;
+	margin:0 0 20px 0;
+	border:1px solid silver;
+	background: white;
+	-moz-border-radius: 8px;
+	-webkit-border-radius: 8px; 
+}
+#index_welcome #login-box {
+	margin:5px 0 10px 0;
+	padding:0 0 10px 0;
+	background: #dedede;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	width:240px;
+}
+#index_welcome #login-box form {
+	margin:0 10px 0 10px;
+	padding:0 10px 4px 10px;
+	background: white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	width:200px;
+}
+#index_welcome #login-box h2,
+.index_box h2 {
+	color:#0054A7;
+	font-size:1.35em;
+	line-height:1.2em;
+	margin:0 0 0 8px;
+	padding:5px;
+}
+#index_welcome #login-box h2 {
+	padding-bottom:5px;
+}
+
+.index_box {
+	margin:0 0 20px 0;
+	background: #dedede;
+	padding:0 0 5px 0;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+}
+
+.index_box .search_listing {
+
+}
+.index_box .index_members {
+	float:left;
+	margin:2pt 5px 3px 0pt;
+}
+#persistent_login {
+	float:right;
+	display:block;
+	margin-top:-34px;
+}
+
+
+
diff --git a/mod/defaultwidgets/actions/update.php b/mod/defaultwidgets/actions/update.php
new file mode 100644
index 000000000..aaf03430d
--- /dev/null
+++ b/mod/defaultwidgets/actions/update.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Elgg default_widgets plugin.
+ *
+ * @package DefaultWidgets
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU
+ * @author Milan Magudia & Curverider
+ * @copyright HedgeHogs.net & Curverider Ltd
+ * 
+ **/
+
+// validate user is an admin
+admin_gatekeeper ();
+
+// get parameters
+$context = get_input ( 'context' );
+$leftbar = str_replace ( '::0', '', get_input ( 'debugField1' ) );
+$middlebar = str_replace ( '::0', '', get_input ( 'debugField2' ) );
+$rightbar = str_replace ( '::0', '', get_input ( 'debugField3' ) );
+
+// make sure enough parameters are set
+if ($context && isset ( $leftbar ) && isset ( $middlebar ) && isset ( $rightbar )) {
+	
+	// join widgets into a single string
+	$widgets = $leftbar . '%%' . $middlebar . '%%' . $rightbar;
+	
+	// get the elgg object that contains our settings
+	$entities = elgg_get_entities (array('type' => 'object', 'subtype' => 'moddefaultwidgets', 'limit' => 9999));
+	
+	// create new object unless one already exists
+	if (! isset ( $entities [0] )) {
+		$entity = new ElggObject ( );
+		$entity->subtype = 'moddefaultwidgets';
+		$entity->owner_guid = $_SESSION ['user']->getGUID ();
+	} else {
+		$entity = $entities [0];
+	}
+	
+	// store the default widgets for each context
+	$entity->$context = $widgets;
+	
+	// make sure this object is public.
+	$entity->access_id = 2;
+	
+	// save the object or report error
+	if ($entity->save ()) {
+		system_message ( elgg_echo ( 'defaultwidgets:update:success' ) );
+		$entity->state = "active";
+		forward ( 'pg/admin' );
+	} else {
+		register_error ( elgg_echo ( 'defaultwidgets:update:failed' ) );
+		forward ( 'pg/defaultwidgets/' . $context );
+	}
+
+} else {
+	
+	// report incorrect parameters error
+	register_error ( elgg_echo ( 'defaultwidgets:update:noparams' ) );
+	forward ( 'pg/defaultwidgets/' . $context );
+
+}
diff --git a/mod/defaultwidgets/dashboard.php b/mod/defaultwidgets/dashboard.php
new file mode 100644
index 000000000..889bc8121
--- /dev/null
+++ b/mod/defaultwidgets/dashboard.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Elgg default_widgets plugin.
+ *
+ * @package DefaultWidgets
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU
+ * @author Milan Magudia & Curverider
+ * @copyright HedgeHogs.net & Curverider Ltd
+ * 
+ **/
+
+// load Elgg engine
+require_once (dirname ( dirname ( dirname ( __FILE__ ) ) ) . "/engine/start.php");
+
+// make sure only admins can view this
+admin_gatekeeper ();
+set_context ( 'admin' );
+
+// Set admin user for user block
+set_page_owner ( $_SESSION ['guid'] );
+
+// vars required for action gatekeeper
+$ts = time ();
+$token = generate_action_token ( $ts );
+$context = 'dashboard';
+
+// create the view
+$content = elgg_view ( "defaultwidgets/editor", array ('token' => $token, 'ts' => $ts, 'context' => $context ) );
+
+// Display main admin menu
+page_draw ( 'Default dashboard widgets for new users', $content );
diff --git a/mod/defaultwidgets/languages/en.php b/mod/defaultwidgets/languages/en.php
new file mode 100644
index 000000000..d6da12ba5
--- /dev/null
+++ b/mod/defaultwidgets/languages/en.php
@@ -0,0 +1,28 @@
+<?php
+
+$english = array (
+
+	/**
+	 * Nice name for the entity (shown in admin panel)
+	 */
+	'item:object:moddefaultwidgets' => 'DefaultWidgets settings',
+
+	/**
+	 * Menu items
+	 */
+	'defaultwidgets:menu:profile' => 'Default profile widgets',
+    'defaultwidgets:menu:dashboard' => 'Default dashboard widgets',
+
+    'defaultwidgets:admin:error' => 'Error: You are not logged in as an administrator',
+	'defaultwidgets:admin:notfound' => 'Error: Page not found',
+	'defaultwidgets:admin:loginfailure' => 'Warning: You are not currently logged is as an administrator',
+
+	'defaultwidgets:update:success' => 'Your widget settings have been saved',
+	'defaultwidgets:update:failed' => 'Error: settings have not been saved',
+	'defaultwidgets:update:noparams' => 'Error: incorrect form parameters',
+
+	'defaultwidgets:profile:title' => 'Set default widgets for new user profile pages',
+	'defaultwidgets:dashboard:title' => 'Set default widgets for new user dashboard pages',
+);
+
+add_translation ( "en", $english );
diff --git a/mod/defaultwidgets/manifest.xml b/mod/defaultwidgets/manifest.xml
new file mode 100644
index 000000000..8388e5803
--- /dev/null
+++ b/mod/defaultwidgets/manifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Milan Magudia &amp; Curverider" />
+        <field key="version" value="2.04" />
+        <field key="description" value="This plugin enables an administrator to define a default set of widgets for new users" />
+        <field key="copyright" value="HedgeHogs &amp; Curverider Ltd" />
+		<field key="licence" value="GNU Public License version 2" />      
+		<field key="elgg_version" value="2010030101" />  
+</plugin_manifest>
diff --git a/mod/defaultwidgets/profile.php b/mod/defaultwidgets/profile.php
new file mode 100644
index 000000000..68bf7a492
--- /dev/null
+++ b/mod/defaultwidgets/profile.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Elgg default_widgets plugin.
+ *
+ * @package DefaultWidgets
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU
+ * @author Milan Magudia & Curverider
+ * @copyright HedgeHogs.net & Curverider Ltd
+ * 
+ **/
+
+// load Elgg engine
+require_once (dirname ( dirname ( dirname ( __FILE__ ) ) ) . "/engine/start.php");
+
+// make sure only admins can view this
+admin_gatekeeper ();
+set_context ( 'admin' );
+
+// set admin user for user block
+set_page_owner ( $_SESSION ['guid'] );
+
+// vars required for action gatekeeper
+$ts = time ();
+$token = generate_action_token ( $ts );
+$context = 'profile';
+
+// create the view
+$content = elgg_view ( "defaultwidgets/editor", array ('token' => $token, 'ts' => $ts, 'context' => $context ) );
+
+// Display main admin menu
+page_draw ( 'Default profile widgets for new users', $content );
diff --git a/mod/defaultwidgets/start.php b/mod/defaultwidgets/start.php
new file mode 100644
index 000000000..e76e16e26
--- /dev/null
+++ b/mod/defaultwidgets/start.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * Elgg default_widgets plugin.
+ *
+ * @package DefaultWidgets
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU
+ * @author Milan Magudia & Curverider
+ * @copyright HedgeHogs.net & Curverider ltd
+ * 
+ * Code based on the work of:
+ * @author Jade Dominguez, Chad Sowald
+ * @copyright tastyseed,  2008
+ * @copyright Chad Sowald, 2008
+ * @link http://www.tastyseed.com
+ * @link http://www.chadsowald.com
+ * @author Diego Ramirez
+ * @links http://www.somosmas.org
+ * 
+ */
+
+global $CONFIG;
+
+/**
+ * Default widgets initialisation
+ *
+ * These parameters are required for the event API, but we won't use them:
+ * 
+ * @param unknown_type $event
+ * @param unknown_type $object_type
+ * @param unknown_type $object
+ */
+function defaultwidgets_init() {
+	
+	// Load system configuration
+	register_page_handler ( 'defaultwidgets', 'defaultwidgets_page_handler' );
+	
+	// register create user event hook
+	register_elgg_event_handler ( 'create', 'user', 'defaultwidgets_newusers' );
+	
+	// set the widget access to the default access on validation if this is not an admin-created user
+	if (!isadminloggedin()) {
+		register_elgg_event_handler('validate', 'user', 'defaultwidgets_reset_access');
+	}
+	
+	// Override metadata permissions
+	//register_plugin_hook ( 'permissions_check:metadata', 'object', 'defaultwidgets_can_edit_metadata' );
+}
+
+/**
+ * Overrides default permissions for the default widgets context
+ * 
+ */
+function defaultwidgets_can_edit($hook_name, $entity_type, $return_value, $parameters) {
+	global $defaultwidget_access;
+	
+	if ($defaultwidget_access) {
+		return true;
+	}
+	return $return_value;
+}
+
+/**
+ * Override the canEditMetadata function to return true for messages
+ *
+ */
+function defaultwidgets_can_edit_metadata($hook_name, $entity_type, $return_value, $parameters) {
+	global $defaultwidget_access;
+	
+	if ($defaultwidget_access) {
+		return true;
+	}
+	return $return_value;
+
+}
+
+/**
+ * Override the canEdit function to return true for messages within a particular context.
+ *
+ */
+function defaultwidgets_can_edit_container($hook_name, $entity_type, $return_value, $parameters) {
+	global $defaultwidget_access;
+	
+	if ($defaultwidget_access) {
+		return true;
+	}
+	return $return_value;
+}
+
+/**
+ * Extends the create user event to add admin defined widgets to the dashboard/profile context
+ */
+function defaultwidgets_newusers($event, $object_type, $object) {
+	
+	// turn on permissions override
+	global $defaultwidget_access, $CONFIG;
+	$defaultwidget_access = true;
+	
+	// get the new user guid
+	$guid = $object->guid;
+	
+	if (isadminloggedin()) {
+		// this is an admin-created user
+		// no permissions problems, so set proper access now
+		// use system default access (not the admin's default access!, because that could be a personal access level)
+		$widget_access = $CONFIG->default_access;
+	} else {
+		// this is a regular registration
+		// set widget access to public for now and reset it properly during the validate event
+		// to avoid Elgg permissions problems
+		$widget_access = ACCESS_PUBLIC;
+	}
+	
+	// check if it's set
+	if (! empty ( $guid )) {
+		
+		// get the user entity
+		if ($user = get_entity ( $guid )) {
+			
+			// can this user edit
+			if ($user->canEdit ()) {
+				
+				// each of the contexts to add widgets for
+				$contexts = array ('profile', 'dashboard' );
+				
+				// get the entities for the module
+				$entities = elgg_get_entities (array('type' => 'object', 'subtype' => 'moddefaultwidgets', 'limit' => 9999));
+				
+				// check if the entity exists
+				if (isset ( $entities [0] )) {
+					
+					// get the widgets for the context
+					$entity = $entities [0];
+					
+					foreach ( $contexts as $context ) {
+						$current_widgets = $entity->$context;
+						list ( $left, $middle, $right ) = split ( '%%', $current_widgets );
+						
+						// split columns into seperate widgets
+						$area1widgets = split ( '::', $left );
+						$area2widgets = split ( '::', $middle );
+						$area3widgets = split ( '::', $right );
+						
+						// clear out variables if no widgets are available
+						if ($area1widgets [0] == "")
+							$area1widgets = false;
+						if ($area2widgets [0] == "")
+							$area2widgets = false;
+						if ($area3widgets [0] == "")
+							$area3widgets = false;
+							
+						// generate left column widgets for a new user 
+						if ($area1widgets) {
+							foreach ( $area1widgets as $i => $widget ) {
+								add_widget ( $guid, $widget, $context, ($i + 1), 1, $widget_access );
+							}
+						}
+						
+						// generate middle column widgets for a new user
+						if ($area2widgets) {
+							foreach ( $area2widgets as $i => $widget ) {
+								add_widget ( $guid, $widget, $context, ($i + 1), 2, $widget_access );
+							}
+						}
+						
+						// generate right column widgets for a new user
+						if ($area3widgets) {
+							foreach ( $area3widgets as $i => $widget ) {
+								add_widget ( $guid, $widget, $context, ($i + 1), 3, $widget_access );
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	// turn off permissions override
+	$defaultwidget_access = false;
+}
+
+function defaultwidgets_reset_access($event, $object_type, $object) {
+	
+	global $defaultwidget_access;
+	
+	// turn on permissions override
+	$defaultwidget_access = true;
+	
+	// the widgets are disabled, so turn on the ability to see disabled entities
+	
+	$access_status = access_get_show_hidden_status();
+	access_show_hidden_entities(true);
+	
+	$widgets = elgg_get_entities(array('type' => 'object', 'subtype' => 'widget', 'owner_guid' => $object->getGUID()));
+	
+	if ($widgets) {
+		foreach($widgets as $widget) {
+			$widget->access_id = get_default_access();
+			$widget->save();
+		}
+	}
+	
+	access_show_hidden_entities($access_status);
+	
+	// turn off permissions override
+	$defaultwidget_access = false;
+	
+	return true;
+}
+
+/**
+ * Default widgets page handler; allows the use of fancy URLs
+ *
+ * @param array $page From the page_handler function
+ * @return true|false Depending on success
+ */
+function defaultwidgets_page_handler($page) {
+	global $CONFIG;
+	
+	if (isset ( $page [0] )) {
+		
+		switch ($page [0]) {
+			case "profile" :
+				include (dirname ( __FILE__ ) . "/profile.php");
+				break;
+			case "dashboard" :
+				include (dirname ( __FILE__ ) . "/dashboard.php");
+				break;
+		}
+	} else {
+		register_error ( elgg_echo ( "defaultwidgets:admin:notfound" ) );
+		forward ( $CONFIG->wwwroot );
+	}
+	return true;
+}
+
+/**
+ * Page setup. Adds admin controls to the admin panel.
+ *
+ */
+function defaultwidgets_pagesetup() {
+	if (get_context () == 'admin' && isadminloggedin ()) {
+		global $CONFIG;
+		add_submenu_item ( elgg_echo ( 'defaultwidgets:menu:profile' ), $CONFIG->wwwroot . 'pg/defaultwidgets/profile' );
+		add_submenu_item ( elgg_echo ( 'defaultwidgets:menu:dashboard' ), $CONFIG->wwwroot . 'pg/defaultwidgets/dashboard' );
+	}
+}
+
+// Make sure the status initialisation function is called on initialisation
+register_elgg_event_handler ( 'init', 'system', 'defaultwidgets_init' );
+register_elgg_event_handler ( 'pagesetup', 'system', 'defaultwidgets_pagesetup' );
+
+register_plugin_hook ( 'permissions_check', 'user', 'defaultwidgets_can_edit' );
+register_plugin_hook ( 'permissions_check', 'object', 'defaultwidgets_can_edit' );
+register_plugin_hook ( 'container_permissions_check', 'user', 'defaultwidgets_can_edit_container' );
+
+register_action ( "defaultwidgets/update", false, $CONFIG->pluginspath . "defaultwidgets/actions/update.php" );
diff --git a/mod/defaultwidgets/views/default/defaultwidgets/editor.php b/mod/defaultwidgets/views/default/defaultwidgets/editor.php
new file mode 100644
index 000000000..2241dd264
--- /dev/null
+++ b/mod/defaultwidgets/views/default/defaultwidgets/editor.php
@@ -0,0 +1,274 @@
+<?php
+
+	/**
+	 * Elgg default widget layout
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 * 
+	 * Edited version of the widget editor to be used to set default widgets
+ 	 * @author Milan Magudia & Curverider
+ 	 * @copyright HedgeHogs.net & Curverider Ltd
+ 	 * 
+ 	 **/
+
+		// set some defaults
+		$owner = page_owner_entity();
+		$context = $vars['context'];
+		$area1widgets = false;
+		$area2widgets = false;
+		$area3widgets = false;
+
+		// get available widget types
+		set_context ( $context );
+		$widgettypes = get_widget_types();
+		set_context ( 'admin' );		
+		
+		// get the entities for the module
+		$entities = elgg_get_entities(array('type' => 'object', 'subtype' => 'moddefaultwidgets', 'limit' => 9999));
+		
+		// check if the entity exists
+		if(isset($entities[0])) {
+			
+			// get the widgets for the context
+			$entity = $entities[0];
+			$current_widgets =  $entity->$context;
+			list($left, $middle, $right) = split('%%',$current_widgets);
+			
+			// split columns into seperate widgets
+			$area1widgets = split('::',$left);
+			$area2widgets = split('::',$middle);
+			$area3widgets = split('::',$right);
+		
+			// clear out variables if no widgets are available
+			if ($area1widgets[0] == "") $area1widgets = false;
+			if ($area2widgets[0] == "") $area2widgets = false;
+			if ($area3widgets[0] == "") $area3widgets = false;
+		}
+			
+?>
+<script type="text/javascript">
+$(document).ready(function () {
+	$('div#customise_editpanel').slideToggle("fast");
+});
+</script>
+
+<div id="customise_editpanel" style="visibility:visible;">
+
+<div id="customise_editpanel_rhs">
+<h2><?php echo elgg_echo("widgets:gallery"); ?></h2>
+<div id="widget_picker_gallery">
+
+
+<?php
+
+	foreach($widgettypes as $handler => $widget) {
+
+?>
+
+<table class="draggable_widget" cellspacing="0"><tr><td>
+	<h3>
+		<?php echo $widget->name; ?>
+		<input type="hidden" name="multiple" value="<?php if ((isset($widget->handler)) && (isset($widgettypes[$widget->handler]->multiple))) echo $widgettypes[$widget->handler]->multiple; ?>" />
+		<input type="hidden" name="side" value="<?php if ((isset($widget->handler)) && (isset($widgettypes[$widget->handler])) && (is_array($widgettypes[$widget->handler]->positions))) echo in_array('side',$widgettypes[$widget->handler]->positions); ?>" />
+		<input type="hidden" name="main" value="<?php if ((isset($widget->handler)) && (isset($widgettypes[$widget->handler])) && (is_array($widgettypes[$widget->handler]->positions))) echo in_array('main',$widgettypes[$widget->handler]->positions); ?>" />
+		<input type="hidden" name="handler" value="<?php echo htmlentities($handler); ?>" />
+		<input type="hidden" name="description" value="<?php echo htmlentities($widget->description, null, 'UTF-8'); ?>" />
+		<input type="hidden" name="guid" value="0" />
+	</h3>
+</td>
+<td width="17px" align="right"></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="14px" height="14px" class="more_info" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="15px" height="15px" class="drag_handle" /></a></td>
+</tr></table>
+
+<?php
+	}
+?>
+
+<br /><!-- bit of space at the bottom of the widget gallery -->
+
+</div><!-- /#customise_editpanel_rhs -->
+</div><!-- /#widget_picker_gallery -->
+
+
+<div class="customise_editpanel_instructions">
+<h2><?php echo elgg_echo('defaultwidgets:'.$context.':title'); ?></h2>
+<?php echo elgg_view('output/longtext', array('value' => elgg_echo('widgets:add:description'))); ?>
+</div>
+
+
+<div id="customise_page_view">
+
+<table cellspacing="0">
+  <tr>
+    <td colspan="2" align="left" valign="top">
+    
+    <?php
+	if(get_context() == "profile"){ 
+    ?>
+    		<h2 class="profile_box"><?php echo elgg_echo("widgets:profilebox"); ?></h2>
+    		<div id="profile_box_widgets">
+    		<p><small><?php echo elgg_echo('widgets:position:fixed'); ?></small></p>
+    		</div>
+    <?php
+	} 
+    ?>
+    
+    </td>
+    
+    
+    <td rowspan="2" align="left" valign="top">
+		<h2><?php echo elgg_echo("widgets:rightcolumn"); ?></h2>
+		<div id="rightcolumn_widgets" <?php if(get_context() == "profile")echo "class=\"long\""; ?>>
+		<?php
+			$rightcolumn_widgets = "";
+			if (is_array($area3widgets) && sizeof($area3widgets) > 0) {
+				foreach($area3widgets as $widget) {
+					if (!empty($rightcolumn_widgets)) {
+						$rightcolumn_widgets .= "::";
+					}
+					$rightcolumn_widgets .= "{$widget}::0";
+		?>
+		
+		<table class="draggable_widget" cellspacing="0"><tr><td width="149px">
+			<h3>
+				<?php echo $widgettypes[$widget]->name; ?>
+				<input type="hidden" name="handler" value="<?php 
+					echo $widget; 
+				?>" />
+				<input type="hidden" name="multiple" value="<?php echo $widgettypes[$widget]->multiple; ?>" />
+				<input type="hidden" name="side" value="<?php echo in_array('side',$widgettypes[$widget]->positions); ?>" />
+				<input type="hidden" name="main" value="<?php echo in_array('main',$widgettypes[$widget]->positions); ?>" />
+				<input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget]->description); ?>" />
+				<input type="hidden" name="guid" value="0" />
+			</h3>
+		</td>
+		<td width="17px" align="right"></td>
+		<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="14px" height="14px" class="more_info" /></a></td>
+		<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="15px" height="15px" class="drag_handle" /></a></td>
+		</tr></table>
+		
+		<?php
+					
+				}
+			}
+		?>
+		
+		</div>
+    </td><!-- /rightcolumn td -->
+    
+  </tr>
+  
+  <tr>
+
+<td>
+<h2><?php echo elgg_echo("widgets:leftcolumn"); ?></h2>
+<div id="leftcolumn_widgets">
+
+<?php
+	$leftcolumn_widgets = "";
+	if (is_array($area1widgets) && sizeof($area1widgets) > 0) {
+		foreach($area1widgets as $widget) {
+			if (!empty($leftcolumn_widgets)) {
+				$leftcolumn_widgets .= "::";
+			}
+			$leftcolumn_widgets .= "{$widget}::0";
+?>
+
+<table class="draggable_widget" cellspacing="0"><tr><td width="149px">
+	<h3>
+		<?php echo $widgettypes[$widget]->name; ?>
+		<input type="hidden" name="handler" value="<?php 
+			echo $widget; 
+		?>" />
+		<input type="hidden" name="multiple" value="<?php echo $widgettypes[$widget]->multiple; ?>" />
+		<input type="hidden" name="side" value="<?php echo in_array('side',$widgettypes[$widget]->positions); ?>" />
+		<input type="hidden" name="main" value="<?php echo in_array('main',$widgettypes[$widget]->positions); ?>" />
+		<input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget]->description); ?>" />
+		<input type="hidden" name="guid" value="0" />
+	</h3>
+</td>
+<td width="17px" align="right"></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="14px" height="14px" class="more_info" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="15px" height="15px" class="drag_handle" /></a></td>
+</tr></table>
+
+<?php
+			
+		}
+	}
+?>
+</div>
+</td>
+
+<td>
+
+<h2><?php echo elgg_echo("widgets:middlecolumn"); ?></h2>
+<div id="middlecolumn_widgets">
+
+<?php
+	$middlecolumn_widgets = "";
+	if (is_array($area2widgets) && sizeof($area2widgets) > 0) {
+		foreach($area2widgets as $widget) {
+			if (!empty($middlecolumn_widgets)) {
+				$middlecolumn_widgets .= "::";
+			}
+			$middlecolumn_widgets .= "{$widget}::0";
+?>
+
+<table class="draggable_widget" cellspacing="0"><tr><td width="149px">
+	<h3>
+		<?php echo $widgettypes[$widget]->name; ?>
+		<input type="hidden" name="handler" value="<?php 
+			echo $widget; 
+		?>" />
+		<input type="hidden" name="multiple" value="<?php echo $widgettypes[$widget]->multiple; ?>" />
+		<input type="hidden" name="side" value="<?php echo in_array('side',$widgettypes[$widget]->positions); ?>" />
+		<input type="hidden" name="main" value="<?php echo in_array('main',$widgettypes[$widget]->positions); ?>" />
+		<input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget]->description); ?>" />
+		<input type="hidden" name="guid" value="0" />
+	</h3>
+</td>
+<td width="17px" align="right"></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="14px" height="14px" class="more_info" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="15px" height="15px" class="drag_handle" /></a></td>
+</tr></table>
+
+<?php
+			
+		}
+	}
+?>
+
+</div>
+</td>
+
+
+
+
+
+
+</tr>
+</table>
+
+</div><!-- /#customise_page_view -->
+
+<form action="<?php echo $vars['url']; ?>action/defaultwidgets/update" method="post">
+<textarea type="textarea" value="Left widgets"   style="display:none" name="debugField1" id="debugField1" /><?php echo $leftcolumn_widgets; ?></textarea>
+<textarea type="textarea" value="Middle widgets" style="display:none" name="debugField2" id="debugField2" /><?php echo $middlecolumn_widgets; ?></textarea>
+<textarea type="textarea" value="Right widgets"  style="display:none" name="debugField3" id="debugField3" /><?php echo $rightcolumn_widgets; ?></textarea>
+<?php
+	echo elgg_view('input/hidden',array('internalname' => '__elgg_token', 'value' => $vars['token']));
+	echo elgg_view('input/hidden',array('internalname' => '__elgg_ts', 'value' => $vars['ts']));
+?>
+<input type="hidden" name="context" value="<?php echo $context; ?>" />
+<input type="hidden" name="owner" value="<?php echo page_owner(); ?>" />
+<input type="submit" value="<?php echo elgg_echo('save'); ?>" class="submit_button"  />
+
+</form>
+</div><!-- /customise_editpanel -->
diff --git a/mod/diagnostics/index.php b/mod/diagnostics/index.php
index 0cae3743c..324790f29 100644
--- a/mod/diagnostics/index.php
+++ b/mod/diagnostics/index.php
@@ -14,15 +14,15 @@ set_context('admin');
 
 // system diagnostics
 $body = elgg_view_title(elgg_echo('diagnostics'));
-$body .= elgg_view('page_elements/contentwrapper', array('body' =>
-	elgg_echo('diagnostics:description') . elgg_view('diagnostics/forms/download'))
+$body .= "<div class='admin_settings diagnostics'>";
+$body .= elgg_view('page_elements/elgg_content', array('body' =>
+	"<h3>".elgg_echo('diagnostics:report')."</h3>".elgg_echo('diagnostics:description') . elgg_view('diagnostics/forms/download'))
 );
 
 // unit tests
-$body .= elgg_view_title(elgg_echo('diagnostics:unittester'));
-
-$test_body = '<p>' . elgg_echo('diagnostics:unittester:description') . '</p>';
-$test_body .= '<h3>' . elgg_echo('diagnostics:unittester:warning') . '</h3>';
+$body .= "<h3>".elgg_echo('diagnostics:unittester')."</h3>";
+$test_body = "<p>" . elgg_echo('diagnostics:unittester:description') . "</p>";
+$test_body .= "<p>" . elgg_echo('diagnostics:unittester:warning') . "</p>";
 
 if (isset($CONFIG->debug)) {
 	// create a button to run tests
@@ -34,9 +34,9 @@ if (isset($CONFIG->debug)) {
 	$test_body .= elgg_echo('diagnostics:unittester:debug');
 }
 
-$body .= elgg_view('page_elements/contentwrapper', array(
+$body .= elgg_view('page_elements/elgg_content', array(
 	'body' => $test_body)
 );
-
+$body .= "</div>";
 // create page
-page_draw(elgg_echo('diagnostics'), elgg_view_layout("two_column_left_sidebar", '', $body));
+page_draw(elgg_echo('diagnostics'), elgg_view_layout("one_column_with_sidebar", '', $body));
diff --git a/mod/diagnostics/languages/en.php b/mod/diagnostics/languages/en.php
index ae72564d7..c195da672 100644
--- a/mod/diagnostics/languages/en.php
+++ b/mod/diagnostics/languages/en.php
@@ -10,6 +10,7 @@
 	$english = array(
 
 			'diagnostics' => 'System diagnostics',
+			'diagnostics:report' => 'Diagnostics Report',
 			'diagnostics:unittester' => 'Unit Tests',
 
 			'diagnostics:description' => 'The following diagnostic report is useful for diagnosing any problems with Elgg, and should be attached to any bug reports you file.',
@@ -17,7 +18,7 @@
 
 			'diagnostics:unittester:description' => 'Unit tests check Elgg Core for broken or buggy APIs.',
 			'diagnostics:unittester:debug' => 'The site must be in debug mode to run unit tests.',
-			'diagnostics:unittester:warning' => 'WARNING: These tests can leave behind debugging objects in your database.  DO NOT USE ON A PRODUCTION SITE!',
+			'diagnostics:unittester:warning' => 'WARNING: These tests can leave behind debugging objects in your database.<br />DO NOT USE ON A PRODUCTION SITE!',
 
 			'diagnostics:test:executetest' => 'Execute test',
 			'diagnostics:test:executeall' => 'Execute All',
diff --git a/mod/embed/README.txt b/mod/embed/README.txt
new file mode 100644
index 000000000..17f867d7a
--- /dev/null
+++ b/mod/embed/README.txt
@@ -0,0 +1,10 @@
+Embed plugin
+(c) 2009 Curverider Ltd
+Released under the GNU Public License version 2
+http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+
+The embed plugin requires Elgg 1.5 (or prior to the Elgg 1.5
+release, Elgg revision 2634 or above) and the file plugin.
+
+It makes use of the jQuery form plugin, available at:
+http://malsup.com/jquery/form/
\ No newline at end of file
diff --git a/mod/embed/embed.php b/mod/embed/embed.php
new file mode 100644
index 000000000..461bbdebb
--- /dev/null
+++ b/mod/embed/embed.php
@@ -0,0 +1,38 @@
+<?php
+
+	// This page can only be run from within the Elgg framework
+		if (!is_callable('elgg_view')) exit;
+		
+	// Get the name of the form field we need to inject into
+		$internalname = get_input('internalname');
+		
+		if (!isloggedin()) exit;
+		
+		global $SESSION;
+		
+		$offset = (int) get_input('offset',0);
+		$simpletype = get_input('simpletype');
+		$entity_types = array('object' => array('file'));
+
+		if (empty($simpletype)) {
+			$count = elgg_get_entities(array('type' => 'object', 'subtype' => 'file', 'owner_guid' => $SESSION['user']->guid, 'count' => TRUE));
+			$entities = elgg_get_entities(array('type' => 'object', 'subtype' => 'file', 'owner_guid' => $SESSION['user']->guid, 'limit' => 6, 'offset' => $offset));
+		} else {
+			$count = elgg_get_entities_from_metadata(array('metadata_name' => 'simpletype', 'metadata_value' => $simpletype, 'types' => 'object', 'subtypes' => 'file', 'owner_guid' => $SESSION['user']->guid, 'limit' => 6, 'offset' => $offset, 'count' => TRUE));
+			$entities = elgg_get_entities_from_metadata(array('metadata_name' => 'simpletype', 'metadata_value' => $simpletype, 'types' => 'object', 'subtypes' => 'file', 'owner_guid' => $SESSION['user']->guid, 'limit' => 6, 'offset' => $offset));
+		}
+		
+		$types = get_tags(0,10,'simpletype','object','file',$SESSION['user']->guid);
+		
+	// Echo the embed view
+		echo elgg_view('embed/media', array(
+							'entities' => $entities,
+							'internalname' => $internalname,
+							'offset' => $offset,
+							'count' => $count,
+							'simpletype' => $simpletype,
+							'limit' => 6,
+							'simpletypes' => $types,
+					   ));
+
+?>
\ No newline at end of file
diff --git a/mod/embed/images/button_spacer.gif b/mod/embed/images/button_spacer.gif
new file mode 100644
index 000000000..5bfd67a2d
--- /dev/null
+++ b/mod/embed/images/button_spacer.gif
diff --git a/mod/embed/images/close_button.gif b/mod/embed/images/close_button.gif
new file mode 100644
index 000000000..822ea8527
--- /dev/null
+++ b/mod/embed/images/close_button.gif
diff --git a/mod/embed/images/loading.gif b/mod/embed/images/loading.gif
new file mode 100644
index 000000000..5a9af96d2
--- /dev/null
+++ b/mod/embed/images/loading.gif
diff --git a/mod/embed/images/media_modal.png b/mod/embed/images/media_modal.png
new file mode 100644
index 000000000..9d206901a
--- /dev/null
+++ b/mod/embed/images/media_modal.png
diff --git a/mod/embed/languages/en.php b/mod/embed/languages/en.php
new file mode 100644
index 000000000..ca57f4a9b
--- /dev/null
+++ b/mod/embed/languages/en.php
@@ -0,0 +1,18 @@
+<?php
+
+	$english = array(
+	
+		'media:insert' => 'Embed / upload media',
+	
+		'embed:instructions' => 'Click on any file to embed it into your content.',
+	
+		'embed:media' => 'Embed media',
+		'upload:media' => 'Upload media',
+	
+		'embed:file:required' => 'No file upload facilities were found. The system administrator may need to upload the file plugin or similar.',
+	
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/embed/manifest.xml b/mod/embed/manifest.xml
new file mode 100644
index 000000000..a14e99b4b
--- /dev/null
+++ b/mod/embed/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="Allows users to easily upload and embed media into text areas." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2009-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/embed/start.php b/mod/embed/start.php
new file mode 100644
index 000000000..b14767381
--- /dev/null
+++ b/mod/embed/start.php
@@ -0,0 +1,50 @@
+<?php
+
+	/**
+	 * Elgg media embed plugin
+	 * 
+	 * @package ElggEmbed
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	/**
+	 * Init function
+	 *
+	 */
+		function embed_init() {
+			
+			// Extend useful views with stuff we need for our embed modal
+				elgg_extend_view('css','embed/css');
+				elgg_extend_view('js/initialise_elgg','embed/js');
+				elgg_extend_view('metatags','embed/metatags');
+				elgg_extend_view('input/longtext','embed/link',10);
+				
+			// Page handler for the modal media embed
+				register_page_handler('embed','embed_page_handler');
+			
+		}
+		
+	/**
+	 * Runs the 'embed' script
+	 *
+	 */
+		function embed_page_handler($page) {
+			
+			switch($page[0]) {
+				case 'upload':		require_once(dirname(__FILE__) . '/upload.php');
+									exit;
+									break;
+				default:			require_once(dirname(__FILE__) . '/embed.php');
+									exit;
+									break;			
+			}
+			
+		}
+
+	// Register the init action
+		register_elgg_event_handler('init','system','embed_init',10);
+
+?>
diff --git a/mod/embed/upload.php b/mod/embed/upload.php
new file mode 100644
index 000000000..21a24786d
--- /dev/null
+++ b/mod/embed/upload.php
@@ -0,0 +1,17 @@
+<?php
+
+	// This page can only be run from within the Elgg framework
+		if (!is_callable('elgg_view')) exit;
+		
+	// Get the name of the form field we need to inject into
+		$internalname = get_input('internalname');
+		
+		global $SESSION;
+		
+	// Echo the embed view
+		echo elgg_view('embed/upload', array(
+							'entities' => $entities,
+							'internalname' => $internalname,
+					   ));
+
+?>
\ No newline at end of file
diff --git a/mod/embed/views/default/embed/addcontentjs.php b/mod/embed/views/default/embed/addcontentjs.php
new file mode 100644
index 000000000..ee3678b89
--- /dev/null
+++ b/mod/embed/views/default/embed/addcontentjs.php
@@ -0,0 +1,4 @@
+
+	var entity;
+	$('textarea[name='+entityname+']').val($('textarea[name='+entityname+']').val() + ' ' + content);	
+	
diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
new file mode 100644
index 000000000..31d474a61
--- /dev/null
+++ b/mod/embed/views/default/embed/css.php
@@ -0,0 +1,222 @@
+<?php
+
+	/**
+	 * Elgg embed CSS - standard across all themes
+	 * 
+	 * @package embed
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+?>
+
+#facebox {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 10000;
+	text-align: left;
+}
+#facebox .popup {
+	position: relative;
+}
+#facebox .body {
+	padding: 10px;
+	background: white;
+	width: 730px;
+	-webkit-border-radius: 12px; 
+	-moz-border-radius: 12px;
+}
+#facebox .loading {
+	text-align: center;
+	padding: 100px 10px 100px 10px;
+}
+#facebox .image {
+	text-align: center;
+}
+#facebox .footer {
+	float: right;
+	width:22px;
+	height:22px;
+	margin:0;
+	padding:0;
+}
+#facebox .footer img.close_image {
+	background: url(<?php echo $vars['url']; ?>mod/embed/images/close_button.gif) no-repeat left top;
+}
+#facebox .footer img.close_image:hover {
+	background: url(<?php echo $vars['url']; ?>mod/embed/images/close_button.gif) no-repeat left -31px;
+}
+#facebox .footer a {
+	-moz-outline: none;
+	outline: none;
+}
+#facebox_overlay {
+	position: fixed;
+	top: 0px;
+	left: 0px;
+	height:100%;
+	width:100%;
+}
+.facebox_hide {
+	z-index:-100;
+}
+.facebox_overlayBG {
+	background-color: #000000;
+	z-index: 9999;
+}
+
+* html #facebox_overlay { /* ie6 hack */
+	position: absolute;
+	height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+}
+
+
+/* EMBED MEDIA TABS */
+#embed_media_tabs {
+	margin:10px 0 0 10px;
+	padding:0;
+}
+#embed_media_tabs ul {
+	list-style: none;
+	padding-left: 0;
+}
+#embed_media_tabs ul li {
+	float: left;
+	margin:0;
+	background:white;
+}
+#embed_media_tabs ul li a {
+	font-weight: bold;
+	font-size:1.35em;
+	text-align: center;
+	text-decoration: none;
+	color:#b6b6b6;
+	background: white;
+	display: block;
+	padding: 0 10px 0 10px;
+	margin:0 10px 0 10px;
+	height:25px;
+	width:auto;
+	border-top:2px solid #dedede;
+	border-left:2px solid #dedede;
+	border-right:2px solid #dedede;
+	-moz-border-radius-topleft: 8px;
+	-moz-border-radius-topright: 8px;
+	-webkit-border-top-left-radius: 8px;
+	-webkit-border-top-right-radius: 8px;
+}
+/* IE6 fix */
+* html #embed_media_tabs ul li a { display: inline; }
+
+#embed_media_tabs ul li a:hover {
+	background:#b6b6b6;
+	color:white;
+	border-top:2px solid #b6b6b6;
+	border-left:2px solid #b6b6b6;
+	border-right:2px solid #b6b6b6;
+}
+#embed_media_tabs ul li a.embed_tab_selected {
+	border-top:2px solid #dedede;
+	border-left:2px solid #dedede;
+	border-right:2px solid #dedede;
+	-webkit-border-top-left-radius: 8px;
+	-webkit-border-top-right-radius: 8px;
+	-moz-border-radius-topleft: 8px;
+	-moz-border-radius-topright: 8px;
+	background: #dedede;
+	color:#666666;
+	position: relative;
+	/* top: 2px; - only needed if selected tab needs to sit over a border */
+}
+
+#mediaUpload,
+#mediaEmbed {
+	margin:0 5px 10px 5px;
+	padding:10px;
+	border:2px solid #dedede;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	background: #dedede;
+}
+#mediaEmbed .search_listing {
+	margin:0 0 5px 0;
+	background: white;
+}
+
+h1.mediaModalTitle {
+	/* color:#0054A7; */
+	font-size:1.35em;
+	line-height:1.2em;
+	margin:0 0 0 8px;
+	padding:5px;
+}
+
+#mediaEmbed .pagination,
+#mediaUpload .pagination {
+	float:right;
+	padding:5px;
+	background:white;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;	
+}
+#mediaUpload label {
+	font-size:120%;
+}
+#mediaEmbed p.embedInstructions {
+	margin:10px 0 5px 0;
+}
+a.embed_media {
+	margin:0;
+	float:right;
+	display:block;
+	text-align: right;
+	font-size:1.0em;
+	font-weight: normal;
+}
+label a.embed_media {
+	font-size:0.8em;
+}
+
+
+
+
+/* ***************************************
+	PAGINATION
+*************************************** */
+#mediaEmbed .pagination .pagination_number {
+	border:1px solid #999999; 
+	color:#666666;
+}
+#mediaEmbed .pagination .pagination_number:hover {
+	background:#aaaaaa; 
+	color:black;
+}
+
+#mediaEmbed .pagination .pagination_previous,
+#mediaEmbed .pagination .pagination_next {
+	border:1px solid #999999; 
+	color:#666666;
+}
+#mediaEmbed .pagination .pagination_previous:hover,
+#mediaEmbed .pagination .pagination_next:hover {
+	background:#aaaaaa; 
+	color:black;
+}
+#mediaEmbed .pagination .pagination_currentpage {
+	background:#666666; 
+	border:1px solid #666666; 
+	color:white;
+}
+
+
+
+
+
+
+
+
+
+
diff --git a/mod/embed/views/default/embed/js.php b/mod/embed/views/default/embed/js.php
new file mode 100644
index 000000000..fa809ce23
--- /dev/null
+++ b/mod/embed/views/default/embed/js.php
@@ -0,0 +1,379 @@
+
+	function elggUpdateContent(content, entityname) {
+		content = ' ' + content + ' ';
+		<?php
+			echo elgg_view('embed/addcontentjs');
+		?>
+		$.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 $vars['url']; ?>mod/embed/images/loading.gif',
+      closeImage   : '<?php echo $vars['url']; ?>mod/embed/images/button_spacer.gif',
+      imageTypes   : [ 'png', 'jpg', 'jpeg', 'gif' ],
+      faceboxHtml  : '\
+    <div id="facebox" style="display:none;"> \
+      <div class="popup"> \
+	      <div class="body"> \
+		      <div class="footer"> \
+		          <a href="#" class="close"> \
+		            <img src="<?php echo $vars['url']; ?>mod/embed/images/button_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');
+        }, 1000);
+      
+      //$('#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/link.php b/mod/embed/views/default/embed/link.php
new file mode 100644
index 000000000..f8db0bd85
--- /dev/null
+++ b/mod/embed/views/default/embed/link.php
@@ -0,0 +1 @@
+<a class="embed_media" href="<?php echo $vars['url'] . 'pg/embed/media'; ?>?internalname=<?php echo $vars['internalname']; ?>" rel="facebox"><?php echo elgg_echo('media:insert'); ?></a><br />
\ No newline at end of file
diff --git a/mod/embed/views/default/embed/media.php b/mod/embed/views/default/embed/media.php
new file mode 100644
index 000000000..48bf65fdf
--- /dev/null
+++ b/mod/embed/views/default/embed/media.php
@@ -0,0 +1,66 @@
+<h1 class="mediaModalTitle">Embed / Upload Media</h1>
+<?php
+
+	echo elgg_view('embed/tabs',array('tab' => 'media', 'internalname' => $vars['internalname']));
+?>
+	<div id='mediaEmbed'>
+<?php
+	echo elgg_view('embed/pagination',array(
+												'offset' => $vars['offset'],
+												'baseurl' => $vars['url'] . 'pg/embed/media?internalname=' . $vars['internalname'] . "&amp;simpletype=" . $vars['simpletype'],
+												'limit' => $vars['limit'],
+												'count' => $vars['count']
+											));
+	
+	echo elgg_view('embed/simpletype',array(
+												'internalname' => $vars['internalname'],
+												'simpletypes' => $vars['simpletypes'],
+												'simpletype' => $vars['simpletype'],
+											));
+											
+	$context = get_context();
+	$entities = $vars['entities'];
+	if (is_array($entities) && !empty($entities)) {
+		
+		echo "<p class=\"embedInstructions\">" . elgg_echo('embed:instructions') . "</p>";
+		
+		foreach($entities as $entity) {
+			if ($entity instanceof ElggEntity) {
+
+				$mime = $entity->mimetype; 
+				
+				$enttype = $entity->getType();
+				$entsubtype = $entity->getSubtype();
+				
+				if (elgg_view_exists($enttype . '/' . $entsubtype . '/embed')) {
+					$content = elgg_view($enttype . '/' . $entsubtype . '/embed', array('entity' => $entity, 'full' => true));
+				} else {
+					$content = elgg_view($enttype . '/default/embed', array('entity' => $entity, 'full' => true));
+				}
+				
+				$content = str_replace("\n","", $content);
+				$content = str_replace("\r","", $content);
+				//$content = htmlentities($content,null,'utf-8');
+				$content = htmlentities($content, ENT_COMPAT, "UTF-8");
+				
+				$link = "javascript:elggUpdateContent('{$content}','{$vars['internalname']}');";
+				if ($entity instanceof ElggObject) { $title = $entity->title; $mime = $entity->mimetype; } else { $title = $entity->name; $mime = ''; }
+				
+				set_context('search');
+				
+				if (elgg_view_exists("{$enttype}/{$entsubtype}/embedlist")) {
+					$entview = elgg_view("{$enttype}/{$entsubtype}/embedlist",array('entity' => $entity));
+				} else {
+					$entview = elgg_view_entity($entity);
+				}
+				$entview = str_replace($entity->getURL(),$link,$entview);
+				echo $entview;
+				
+				set_context($context);				
+			
+			}
+		}
+	}
+
+?>
+</div>
\ No newline at end of file
diff --git a/mod/embed/views/default/embed/metatags.php b/mod/embed/views/default/embed/metatags.php
new file mode 100644
index 000000000..3c7ab87a9
--- /dev/null
+++ b/mod/embed/views/default/embed/metatags.php
@@ -0,0 +1,5 @@
+		<script type="text/javascript">
+		 jQuery(document).ready(function($) {
+		  $('a[rel*=facebox]').facebox()
+		});
+		</script>
diff --git a/mod/embed/views/default/embed/pagination.php b/mod/embed/views/default/embed/pagination.php
new file mode 100644
index 000000000..d087fc12c
--- /dev/null
+++ b/mod/embed/views/default/embed/pagination.php
@@ -0,0 +1,131 @@
+<?php
+
+	/**
+	 * Elgg pagination
+	 *
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 *
+	 */
+
+	if (!isset($vars['offset'])) {
+		$offset = 0;
+	} else {
+		$offset = $vars['offset'];
+	}
+	if ((!isset($vars['limit'])) || (!$vars['limit'])) {
+		$limit = 10;
+	} else {
+		$limit = (int)$vars['limit'];
+	}
+	if (!isset($vars['count'])) {
+		$count = 0;
+	} else {
+		$count = $vars['count'];
+	}
+	if (!isset($vars['word'])) {
+		$word = "offset";
+	} else {
+		$word = $vars['word'];
+	}
+	if (isset($vars['nonefound'])) {
+		$nonefound = $vars['nonefound'];
+	} else {
+		$nonefound = true;
+	}
+
+	$totalpages = ceil($count / $limit);
+	$currentpage = ceil($offset / $limit) + 1;
+
+	//only display if there is content to paginate through or if we already have an offset
+	if (($count > $limit || $offset > 0) && get_context() != 'widget') {
+
+?>
+
+<div class="pagination">
+<?php
+
+	if ($offset > 0) {
+		$prevoffset = $offset - $limit;
+		if ($prevoffset < 0) {
+			$prevoffset = 0;
+		}
+
+		$prevurl = elgg_http_add_url_query_elements($baseurl, array($word => $prevoffset));
+
+		echo "<a onclick=\"javascript:$('.popup .content').load('{$prevurl}'); return false\" href=\"#\" class=\"pagination_previous\">&laquo; ". elgg_echo("previous") ."</a> ";
+
+	}
+
+	if ($offset > 0 || $offset < ($count - $limit)) {
+
+		$currentpage = round($offset / $limit) + 1;
+		$allpages = ceil($count / $limit);
+
+		$i = 1;
+		$pagesarray = array();
+		while ($i <= $allpages && $i <= 4) {
+			$pagesarray[] = $i;
+			$i++;
+		}
+		$i = $currentpage - 2;
+		while ($i <= $allpages && $i <= ($currentpage + 2)) {
+			if ($i > 0 && !in_array($i,$pagesarray))
+				$pagesarray[] = $i;
+			$i++;
+		}
+		$i = $allpages - 3;
+		while ($i <= $allpages) {
+			if ($i > 0 && !in_array($i,$pagesarray))
+				$pagesarray[] = $i;
+			$i++;
+		}
+
+		sort($pagesarray);
+
+		$prev = 0;
+		foreach($pagesarray as $i) {
+
+			if (($i - $prev) > 1) {
+
+				echo "<span class=\"pagination_more\">...</span>";
+
+			}
+
+			$curoffset = (($i - 1) * $limit);
+			$counturl = elgg_http_add_url_query_elements($base_url, array($word => $curoffset));
+
+			if ($curoffset != $offset) {
+				echo " <a onclick=\"javascript:$('.popup .content').load('{$counturl}'); return false\" href=\"#\" class=\"pagination_number\">{$i}</a> ";
+			} else {
+				echo "<span class=\"pagination_currentpage\"> {$i} </span>";
+			}
+			$prev = $i;
+
+		}
+
+	}
+
+	if ($offset < ($count - $limit)) {
+
+		$nextoffset = $offset + $limit;
+		if ($nextoffset >= $count) {
+			$nextoffset--;
+		}
+
+		$nexturl = elgg_http_add_url_query_elements($baseurl, array($word => $nextoffset));
+
+		echo " <a onclick=\"javascript:$('.popup .content').load('{$nexturl}'); return false\" href=\"#\" class=\"pagination_next\">" . elgg_echo("next") . " &raquo;</a>";
+
+	}
+
+?>
+<br class="clearfloat" />
+</div>
+<?php
+	} // end of pagination check if statement
+?>
diff --git a/mod/embed/views/default/embed/simpletype.php b/mod/embed/views/default/embed/simpletype.php
new file mode 100644
index 000000000..f92678f52
--- /dev/null
+++ b/mod/embed/views/default/embed/simpletype.php
@@ -0,0 +1,39 @@
+	<select name="simpletype" id="embed_simpletype_select">
+	
+<?php
+
+		$all = new stdClass;
+		$all->tag = "all";
+		$vars['simpletypes'][] = $all;
+		$vars['simpletypes'] = array_reverse($vars['simpletypes']);
+
+		if (isset($vars['simpletypes']) && is_array($vars['simpletypes']))
+			foreach($vars['simpletypes'] as $type) {
+				
+				if ($vars['simpletype'] == $type->tag || (empty($vars['simpletype']) && $type->tag == 'all')) {
+					$selected = 'selected = "selected"';
+				} else $selected = '';
+				$tag = $type->tag;
+				if ($tag != "all") {
+					$label = elgg_echo("file:type:" . $tag);
+				} else {
+					$tag = '';
+					$label = elgg_echo('all');
+				}
+				
+?>
+				<option <?php echo $selected; ?> value="<?php echo $tag; ?>"><?php echo $label; ?></option>
+<?php
+				
+			}
+
+?>
+	
+	</select>
+	<script type="text/javascript">
+		$('#embed_simpletype_select').change(function(){
+			var simpletype = $('#embed_simpletype_select').val();
+			var url = '<?php echo $vars['url']; ?>pg/embed/media?simpletype=' + simpletype + '&internalname=<?php echo $vars['internalname']; ?>';
+			$('.popup .content').load(url);
+		});
+	</script>
diff --git a/mod/embed/views/default/embed/tabs.php b/mod/embed/views/default/embed/tabs.php
new file mode 100644
index 000000000..8b2f5bde4
--- /dev/null
+++ b/mod/embed/views/default/embed/tabs.php
@@ -0,0 +1,23 @@
+<?php
+
+	$embedselected = '';
+	$uploadselected = '';
+	if ($vars['tab'] == 'media') { 
+		$embedselected = 'class="embed_tab_selected"'; 
+	} else {
+		$uploadselected = 'class="embed_tab_selected"';
+	}
+
+?>
+
+<div id="embed_media_tabs">
+	<ul>
+		<li>
+			<a href="#" <?php echo $embedselected; ?> onclick="javascript:$('.popup .content').load('<?php echo $vars['url'] . 'pg/embed/media'; ?>?internalname=<?php echo $vars['internalname']; ?>'); return false"><?php echo elgg_echo('embed:media'); ?></a>
+		</li>
+		<li>
+			<a href="#" <?php echo $uploadselected; ?> onclick="javascript:$('.popup .content').load('<?php echo $vars['url'] . 'pg/embed/upload'; ?>?internalname=<?php echo $vars['internalname']; ?>'); return false"><?php echo elgg_echo('upload:media'); ?></a>
+		</li>
+	</ul>
+</div>
+<div class="clearfloat"></div>
\ No newline at end of file
diff --git a/mod/embed/views/default/embed/upload.php b/mod/embed/views/default/embed/upload.php
new file mode 100644
index 000000000..a727501dd
--- /dev/null
+++ b/mod/embed/views/default/embed/upload.php
@@ -0,0 +1,88 @@
+<h1 class="mediaModalTitle">Embed / Upload Media</h1>
+<?php
+
+	echo elgg_view('embed/tabs',array('tab' => 'upload', 'internalname'=>get_input('internalname')));
+
+	if (!elgg_view_exists('file/upload')) {
+		echo "<p>" . elgg_echo('embed:file:required') . "</p>";
+	} else {
+		$action = 'file/upload';
+		
+?>
+	<form id="mediaUpload" action="<?php echo $vars['url']; ?>action/file/upload" method="post" enctype="multipart/form-data">
+		<p>
+			<label for="upload"><?php echo elgg_echo("file:file"); ?><br />
+		<?php
+			echo elgg_view('input/securitytoken');
+			echo elgg_view("input/file",array('internalname' => 'upload', 'js' => 'id="upload"'));
+			
+		?>
+		</label></p>
+		<p>
+			<label><?php echo elgg_echo("title"); ?><br />
+			<?php
+
+				echo elgg_view("input/text", array(
+									"internalname" => "title",
+									"value" => $title,
+													));
+			
+			?>
+			</label>
+		</p>
+		<p>
+		<label for="filedescription"><?php echo elgg_echo("description"); ?><br />
+		<textarea class="input-textarea" name="description" id="filedescription"></textarea>
+		</label></p>
+		
+		<p>
+			<label><?php echo elgg_echo("tags"); ?><br />
+			<?php
+				echo elgg_view("input/tags", array(
+									"internalname" => "tags",
+									"value" => $tags,
+													));
+	
+			?>
+			</label>
+		</p>
+		<p>
+			<label>
+				<?php echo elgg_echo('access'); ?><br />
+				<?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => ACCESS_DEFAULT)); ?>
+			</label>
+		</p>
+	
+		<p>
+			<?php
+
+				if (isset($vars['container_guid']))
+					echo "<input type=\"hidden\" name=\"container_guid\" value=\"{$vars['container_guid']}\" />";
+				if (isset($vars['entity']))
+					echo "<input type=\"hidden\" name=\"file_guid\" value=\"{$vars['entity']->getGUID()}\" />";
+			
+			?>
+			<input type="submit" value="<?php echo elgg_echo("save"); ?>" />
+		</p>
+	</form>
+	<script type="text/javascript"> 
+        // wait for the DOM to be loaded 
+        //$(document).ready(function() { 
+            // bind 'myForm' and provide a simple callback function 
+            $('#mediaUpload').submit(function() { 
+	            var options = {  
+				    success:    function() { 
+				        $('.popup .content').load('<?php echo $vars['url'] . 'pg/embed/media'; ?>?internalname=<?php echo $vars['internalname']; ?>'); 
+				    } 
+				}; 
+            	$(this).ajaxSubmit(options);
+                return false; 
+            }); 
+        //}); 
+    </script> 
+
+<?php
+		
+	}
+	
+?>
diff --git a/mod/embed/views/default/group/default/embed.php b/mod/embed/views/default/group/default/embed.php
new file mode 100644
index 000000000..c5bf905a0
--- /dev/null
+++ b/mod/embed/views/default/group/default/embed.php
@@ -0,0 +1,9 @@
+<?php
+
+	if ($vars['entity'] instanceof ElggGroup) {
+		
+		echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->title . '</a>';
+		
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/embed/views/default/object/default/embed.php b/mod/embed/views/default/object/default/embed.php
new file mode 100644
index 000000000..c97dbd48a
--- /dev/null
+++ b/mod/embed/views/default/object/default/embed.php
@@ -0,0 +1,9 @@
+<?php
+
+	if ($vars['entity'] instanceof ElggObject) {
+		
+		echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->title . '</a>';
+		
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/embed/views/default/object/file/embed.php b/mod/embed/views/default/object/file/embed.php
new file mode 100644
index 000000000..01f3904ac
--- /dev/null
+++ b/mod/embed/views/default/object/file/embed.php
@@ -0,0 +1,17 @@
+<?php
+
+	$mime = $vars['entity']->mimetype;
+	
+	if (elgg_view_exists('file/specialcontent/' . $mime)) {
+		$content = elgg_view('file/specialcontent/' . $mime, $vars);
+	} else if (elgg_view_exists("file/specialcontent/" . substr($mime,0,strpos($mime,'/')) . "/default")) {
+		$content = elgg_view("file/specialcontent/" . substr($mime,0,strpos($mime,'/')) . "/default", $vars);
+	}
+	
+	if (empty($content) || substr_count(strtolower($content),'<embed') || substr_count(strtolower($content),'<object') || substr_count(strtolower($content),'<script')) {
+		echo elgg_view('object/default/embed',$vars);
+	} else {
+		echo $content;
+	}
+	
+?>
\ No newline at end of file
diff --git a/mod/embed/views/default/object/file/embedlist.php b/mod/embed/views/default/object/file/embedlist.php
new file mode 100644
index 000000000..71e84f265
--- /dev/null
+++ b/mod/embed/views/default/object/file/embedlist.php
@@ -0,0 +1,20 @@
+<?php
+
+	$file = $vars['entity'];
+	$friendlytime = friendly_time($vars['entity']->time_created);
+	
+	$info = "<p> <a href=\"{$file->getURL()}\">{$file->title}</a></p>";
+	$info .= "<p class=\"owner_timestamp\">{$friendlytime}";	
+	$icon = "<a href=\"{$file->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $file->mimetype, 'thumbnail' => $file->thumbnail, 'file_guid' => $file->guid, 'size' => 'small')) . "</a>";
+	
+?>
+<div id="embedFile<?php echo $file->guid; ?>">
+	<div class="search_listing">
+		<div class="search_listing_icon">
+			<?php echo $icon; ?>
+		</div>
+		<div class="search_listing_info">
+			<?php echo $info; ?>
+		</div>
+	</div>
+</div>
diff --git a/mod/embed/views/default/site/default/embed.php b/mod/embed/views/default/site/default/embed.php
new file mode 100644
index 000000000..2d0c52214
--- /dev/null
+++ b/mod/embed/views/default/site/default/embed.php
@@ -0,0 +1,9 @@
+<?php
+
+	if ($vars['entity'] instanceof ElggSite) {
+		
+		echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->name . '</a>';
+		
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/embed/views/default/user/default/embed.php b/mod/embed/views/default/user/default/embed.php
new file mode 100644
index 000000000..1c3dae072
--- /dev/null
+++ b/mod/embed/views/default/user/default/embed.php
@@ -0,0 +1,9 @@
+<?php
+
+	if ($vars['entity'] instanceof ElggUser) {
+		
+		echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->name . '</a>';
+		
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/externalpages/actions/add.php b/mod/externalpages/actions/add.php
new file mode 100644
index 000000000..f8746312c
--- /dev/null
+++ b/mod/externalpages/actions/add.php
@@ -0,0 +1,77 @@
+<?php
+
+	/**
+	 * Elgg external pages: add/edit
+	 * 
+	 * @package ElggExPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged as admin
+		admin_gatekeeper();
+
+	// Get input data
+		$contents = get_input('expagescontent', '', false);
+		$type = get_input('content_type');
+		$tags = get_input('expagestags');
+		$previous_guid = get_input('expage_guid');
+
+	// Cache to the session
+		$_SESSION['expages_content'] = $contents;
+		$_SESSION['expagestype'] = $type;
+		$_SESSION['expagestags'] = $tags;
+		
+	// Convert string of tags into a preformatted array
+		$tagarray = string_to_tag_array($tags);
+		
+	// Make sure the content exists
+		if (empty($contents)) {
+			register_error(elgg_echo("expages:blank"));
+			forward("mod/expages/add.php");
+			
+	// Otherwise, save the new external page
+		} else {
+			
+	//remove the old external page
+		if(get_entity($previous_guid)){
+			delete_entity($previous_guid);
+		}	
+		
+		// Initialise a new ElggObject
+			$expages = new ElggObject();
+		// Tell the system what type of external page it is
+			$expages->subtype = $type;
+		// Set its owner to the current user
+			$expages->owner_guid = $_SESSION['user']->getGUID();
+		// For now, set its access to public
+			$expages->access_id = 2;
+		// Set its title and description appropriately
+			$expages->title = $type;
+			$expages->description = $contents;
+		// Before we can set metadata, save
+			if (!$expages->save()) {
+				register_error(elgg_echo("expages:error"));
+				forward("mod/expages/add.php");
+			}
+		// Now let's add tags. We can pass an array directly to the object property! Easy.
+			if (is_array($tagarray)) {
+				$expages->tags = $tagarray;
+			}
+						
+		// Success message
+			system_message(elgg_echo("expages:posted"));
+		// add to river
+		    add_to_river('river/expages/create','create',$_SESSION['user']->guid,$expages->guid);
+		// Remove the cache
+			unset($_SESSION['expages_content']); unset($_SESSION['expagestitle']); unset($_SESSION['expagestags']);
+						
+		
+	// Forward back to the page
+			forward("pg/expages/index.php?type={$type}");
+				
+		}
+		
+?>
diff --git a/mod/externalpages/actions/addfront.php b/mod/externalpages/actions/addfront.php
new file mode 100644
index 000000000..e7dc167c6
--- /dev/null
+++ b/mod/externalpages/actions/addfront.php
@@ -0,0 +1,52 @@
+<?php
+
+	/**
+	 * Elgg front pages: add/edit
+	 * Here we use the title field for the lefthand side and the description for the righthand side
+	 * 
+	 * @package ElggExPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged as admin
+		admin_gatekeeper();
+
+	// Get input data
+		$contents_left = get_input('front_left', '', false);
+		$contents_right = get_input('front_right', '', false);
+		$previous_guid = get_input('front_guid');
+		
+		//remove the old front page
+		if(get_entity($previous_guid)){
+			delete_entity($previous_guid);
+		}
+			
+		// Initialise a new ElggObject
+			$frontpage = new ElggObject();
+		// Tell the system what type of external page it is
+			$frontpage->subtype = "front";
+		// Set its owner to the current user
+			$frontpage->owner_guid = $_SESSION['user']->getGUID();
+		// For now, set its access to public
+			$frontpage->access_id = 2;
+		// Set its title and description appropriately
+			$frontpage->title = $contents_left;
+			$frontpage->description = $contents_right;
+			
+		// Before we can set metadata, save
+			if (!$frontpage->save()) {
+				register_error(elgg_echo("expages:error"));
+				forward("pg/expages/index.php?type=front");
+			}
+		
+		// Success message
+			system_message(elgg_echo("expages:posted"));
+		
+		
+	// Forward back to the page
+			forward("pg/expages/index.php?type=front");
+		
+?>
diff --git a/mod/externalpages/index.php b/mod/externalpages/index.php
new file mode 100644
index 000000000..f0b5187d5
--- /dev/null
+++ b/mod/externalpages/index.php
@@ -0,0 +1,37 @@
+<?php
+	/**
+	 * Elgg External pages
+	 * 
+	 * @package ElggExpages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	admin_gatekeeper();
+	set_context('admin');
+	$type = get_input('type'); //the type of page e.g about, terms etc
+	if(!$type)
+		$type = "front"; //default to the frontpage
+	
+	// Set admin user for user block
+	set_page_owner($_SESSION['guid']);
+	
+	//display the title
+	$title = elgg_view_title(elgg_echo('expages'));
+	
+	// Display the correct form
+	if($type == "front")
+		$edit = elgg_view('expages/forms/editfront');
+	else
+		$edit = elgg_view('expages/forms/edit', array('type' => $type));
+		
+		// Display the menu
+	$body = elgg_view('page_elements/contentwrapper',array('body' => elgg_view('expages/menu', array('type' => $type)).$edit));
+		
+	// Display
+	page_draw(elgg_echo('expages'),elgg_view_layout("two_column_left_sidebar", '', $title . $body));
+?>
\ No newline at end of file
diff --git a/mod/externalpages/languages/en.php b/mod/externalpages/languages/en.php
new file mode 100644
index 000000000..5deb70191
--- /dev/null
+++ b/mod/externalpages/languages/en.php
@@ -0,0 +1,42 @@
+<?php
+
+	$english = array(
+	
+		/**
+		 * Menu items and titles
+		 */
+	
+			'expages' => "External pages",
+			'expages:frontpage' => "Frontpage",
+			'expages:about' => "About",
+			'expages:terms' => "Terms",
+			'expages:privacy' => "Privacy",
+			'expages:analytics' => "Analytics",
+			'expages:contact' => "Contact",
+			'expages:nopreview' => "No preview yet available",
+			'expages:preview' => "Preview",
+			'expages:notset' => "This page has not been set up yet.",
+			'expages:lefthand' => "The lefthand information pane",
+			'expages:righthand' => "The righthand information pane",
+			'expages:addcontent' => "You can add content here via your admin tools. Look for the external pages link under admin.",
+			'item:object:front' => 'Front page items',
+	
+		/**
+		 * Status messages
+		 */
+	
+			'expages:posted' => "Your page post was successfully posted.",
+			'expages:deleted' => "Your page post was successfully deleted.",
+	
+		/**
+		 * Error messages
+		 */
+	
+			'expages:deleteerror' => "There was a problem deleting the old page",
+			'expages:error' => "There has been an error, please try again and if the problem persists, contact the administrator",
+	
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/externalpages/manifest.xml b/mod/externalpages/manifest.xml
new file mode 100644
index 000000000..3793d7803
--- /dev/null
+++ b/mod/externalpages/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider" />
+        <field key="version" value="1.7" />
+        <field key="description" value="This is a very simple plugin that lets site admin populate an about page, terms, privacy and contact. You can also edit the frontpage text." />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+        <field key="licence" value="GNU Public License version 2" />
+        <field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/externalpages/read.php b/mod/externalpages/read.php
new file mode 100644
index 000000000..503efbb03
--- /dev/null
+++ b/mod/externalpages/read.php
@@ -0,0 +1,39 @@
+<?php
+
+	/**
+	 * Elgg read external page
+	 * 
+	 * @package ElggExpages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		define('externalpage',true);
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// set some variables
+		$type = get_input('expages');
+											
+	// Set the title appropriately
+		$area1 = elgg_view_title(elgg_echo("expages:". strtolower($type)));
+		
+		//get contents
+		$contents = elgg_get_entities(array('type' => 'object', 'subtype' => $type, 'limit' => 1));
+		
+		if($contents){
+			foreach($contents as $c){
+				$area1 .= elgg_view('page_elements/contentwrapper',array('body' => $c->description));
+			}
+		}else
+			$area1 .= elgg_view('page_elements/contentwrapper',array('body' => elgg_echo("expages:notset")));
+
+	// Display through the correct canvas area
+		$body = elgg_view_layout("one_column", $area1);
+		
+	// Display page
+		page_draw($title,$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php
new file mode 100644
index 000000000..6ce69c74d
--- /dev/null
+++ b/mod/externalpages/start.php
@@ -0,0 +1,78 @@
+<?php
+	/**
+	 * Elgg Simple editing of external pages frontpage/about/term/contact and privacy
+	 * 
+	 * @package ElggExPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	function expages_init() {
+		
+		global $CONFIG;
+		
+		// Register a page handler, so we can have nice URLs
+		register_page_handler('expages','expages_page_handler');
+		
+		// Register a URL handler for external pages
+		register_entity_url_handler('expages_url','object','expages');
+		
+		// extend views
+		elgg_extend_view('footer/links', 'expages/footer_menu');
+		elgg_extend_view('index/righthandside', 'expages/front_right');
+		elgg_extend_view('index/lefthandside', 'expages/front_left');
+		
+	}
+	
+	/**
+	 * Page setup. Adds admin controls to the admin panel.
+	 *
+	 */
+	function expages_pagesetup()
+	{
+		if (get_context() == 'admin' && isadminloggedin()) {
+			global $CONFIG;
+			add_submenu_item(elgg_echo('expages'), $CONFIG->wwwroot . 'pg/expages/');
+		}
+	}
+	
+	function expages_url($expage) {
+			
+			global $CONFIG;
+			return $CONFIG->url . "pg/expages/";
+			
+	}
+	
+	
+	function expages_page_handler($page) 
+	{
+		global $CONFIG;
+		
+		if ($page[0])
+		{
+			switch ($page[0])
+			{
+				case "read":		set_input('expages',$page[1]);
+										include(dirname(__FILE__) . "/read.php");
+										break;
+				default : include($CONFIG->pluginspath . "externalpages/index.php"); 
+			}
+		}
+		else
+			include($CONFIG->pluginspath . "externalpages/index.php"); 
+	}
+	
+	// Initialise log browser
+	register_elgg_event_handler('init','system','expages_init');
+	register_elgg_event_handler('pagesetup','system','expages_pagesetup');
+	
+	// Register actions
+		global $CONFIG;
+		register_action("expages/add",false,$CONFIG->pluginspath . "externalpages/actions/add.php");
+		register_action("expages/addfront",false,$CONFIG->pluginspath . "externalpages/actions/addfront.php");
+		register_action("expages/edit",false,$CONFIG->pluginspath . "externalpages/actions/edit.php");
+		register_action("expages/delete",false,$CONFIG->pluginspath . "externalpages/actions/delete.php");
+			
+?>
\ No newline at end of file
diff --git a/mod/externalpages/views/default/expages/analytics.php b/mod/externalpages/views/default/expages/analytics.php
new file mode 100644
index 000000000..8aac0e9d9
--- /dev/null
+++ b/mod/externalpages/views/default/expages/analytics.php
@@ -0,0 +1,25 @@
+<?php
+
+	/**
+	 * Elgg Analytics view
+	 * 
+	 * @package ElggExpages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 */
+
+	 
+	 //get analytics content 
+		$contents = elgg_get_entities(array('type' => 'object', 'subtype' => 'analytics', 'limit' => 1));
+		
+		if($contents){
+			foreach($contents as $c){
+				echo $c->description;
+			}
+		}
+
+?>
+
diff --git a/mod/externalpages/views/default/expages/css.php b/mod/externalpages/views/default/expages/css.php
new file mode 100644
index 000000000..c511a45db
--- /dev/null
+++ b/mod/externalpages/views/default/expages/css.php
@@ -0,0 +1,17 @@
+<?php
+
+	/**
+	 * Elgg externalpages CSS
+	 * 
+	 * @package externalpages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+?>
+
+/* IE6 */
+* html #front_left_tbl { width:676px !important; }
+* html #front_right_tbl { width:676px !important; }
\ No newline at end of file
diff --git a/mod/externalpages/views/default/expages/footer_menu.php b/mod/externalpages/views/default/expages/footer_menu.php
new file mode 100644
index 000000000..0e7b40b56
--- /dev/null
+++ b/mod/externalpages/views/default/expages/footer_menu.php
@@ -0,0 +1,21 @@
+<?php
+
+	/**
+	 * Elgg External pages footer menu
+	 * 
+	 * @package ElggExpages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 */
+	 
+	
+?>
+
+<div class="footer_toolbar_links">| 
+<a href="<?php echo $vars['url']; ?>pg/expages/read/About/"><?php echo elgg_echo('expages:about'); ?></a> |
+<a href="<?php echo $vars['url']; ?>pg/expages/read/Terms/"><?php echo elgg_echo('expages:terms'); ?></a> |
+<a href="<?php echo $vars['url']; ?>pg/expages/read/Privacy/"><?php echo elgg_echo('expages:privacy'); ?></a> |
+</div>
\ No newline at end of file
diff --git a/mod/externalpages/views/default/expages/forms/edit.php b/mod/externalpages/views/default/expages/forms/edit.php
new file mode 100644
index 000000000..2f638d549
--- /dev/null
+++ b/mod/externalpages/views/default/expages/forms/edit.php
@@ -0,0 +1,92 @@
+<?php
+
+	/**
+	 * Elgg External pages edit
+	 * 
+	 * @package ElggExpages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 */
+	 
+	 //get the page type
+	 $type = $vars['type'];
+	 
+	 //action
+	 $action = "expages/add";
+	 
+	 //grab the required entity
+	 $page_contents = elgg_get_entities(array('type' => 'object', 'subtype' => $type, 'limit' => 1));
+	 
+	if($page_contents){
+		 foreach($page_contents as $pc){
+			 $description = $pc->description;
+			 $tags = $pc->tags;
+			 $guid = $pc->guid;
+		 }
+	}else {		
+		$tags = "";
+		$description = "";
+	}
+		
+	// set the required form variables
+		$input_area = elgg_view('input/longtext', array('internalname' => 'expagescontent', 'value' => $description));
+		$tag_input = elgg_view('input/tags', array('internalname' => 'expagestags', 'value' => $tags));
+        $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
+		$hidden_value = elgg_view('input/hidden', array('internalname' => 'content_type', 'value' => $type));
+		$hidden_guid = elgg_view('input/hidden', array('internalname' => 'expage_guid', 'value' => $guid));
+		$tag_label = elgg_echo('tags') . "<br/>";  
+		
+		//type
+		$type = $vars['type'];
+		//set the url
+		$url = $vars['url'] . "pg/expages/index.php?type=";
+		
+		if($type == 'about') { 
+			$external_page_title = elgg_echo('expages:about');
+		}
+		else if($type == 'terms') {
+			$external_page_title = elgg_echo('expages:terms');
+		}
+		else if($type == 'privacy') {
+			$external_page_title = elgg_echo('expages:privacy');     
+		}
+	//preview link
+	//	echo "<div class=\"page_preview\"><a href=\"#preview\">" . elgg_echo('expages:preview') . "</a></div>";
+		
+	//construct the form
+		$form_body = <<<EOT
+
+		<h3 class='settings'>$external_page_title</h3>
+		<p class='longtext_editarea'>$input_area</p>
+		<p>
+			$tag_label
+			$tag_input
+		</p>
+			$hidden_value
+			$hidden_guid
+			<br />
+			$submit_input
+
+EOT;
+?>
+<?php
+	//display the form
+	echo elgg_view('input/form', array('action' => "{$vars['url']}action/$action", 'body' => $form_body));
+?>
+
+<!-- preview page contents -->
+<!--
+<div class="expage_preview">
+<a name="preview"></a>
+<h2>Preview</h2>
+<?php 
+	if($description)
+		echo $description;
+	else
+		echo elgg_echo('expages:nopreview');
+?>
+</div>
+-->
\ No newline at end of file
diff --git a/mod/externalpages/views/default/expages/forms/editfront.php b/mod/externalpages/views/default/expages/forms/editfront.php
new file mode 100644
index 000000000..ee4c89989
--- /dev/null
+++ b/mod/externalpages/views/default/expages/forms/editfront.php
@@ -0,0 +1,78 @@
+<?php
+
+	/**
+	 * Elgg edit frontpage
+	 * 
+	 * @package ElggExpages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 */
+	 
+	 //action
+	 $action = "expages/addfront";
+	 
+	 //grab the required entity
+	 $page_contents = elgg_get_entities(array('type' => 'object', 'subtype' => 'front', 'limit' => 1));
+	 
+	if($page_contents){
+		 foreach($page_contents as $pc){
+			 $description_right = $pc->description;
+			 $description_left = $pc->title;
+			 $guid = $pc->guid;
+		 }
+	}else {		
+		$tags = "";
+		$description = "";
+	}
+		
+	// set the required form variables
+		$input_area_left = elgg_view('input/longtext', array('internalname' => 'front_left', 'value' => $description_left));
+		$input_area_right = elgg_view('input/longtext', array('internalname' => 'front_right', 'value' => $description_right));
+		$submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
+		$hidden_guid = elgg_view('input/hidden', array('internalname' => 'front_guid', 'value' => $guid));
+		$lefthand = elgg_echo("expages:lefthand");
+		$righthand = elgg_echo("expages:righthand");
+		
+	//preview link
+	//	echo "<div class=\"page_preview\"><a href=\"#preview\">" . elgg_echo('expages:preview') . "</a></div>";
+		
+	//construct the form
+		$form_body = <<<EOT
+
+		<h3 class='settings'>$lefthand</h3>
+		<p class='longtext_editarea'>$input_area_left</p><br />
+		<h3 class='settings'>$righthand</h3>
+		<p class='longtext_editarea'>$input_area_right</p>
+		
+			$hidden_guid
+			<br />
+			$submit_input
+
+EOT;
+?>
+<?php
+	//display the form
+	echo elgg_view('input/form', array('action' => "{$vars['url']}action/$action", 'body' => $form_body));
+?>
+
+<!-- preview page contents -->
+<!--
+<div class="expage_preview">
+<a name="preview"></a>
+<h2>Preview</h2>
+<?php 
+	if($description_left){
+		echo "The left column header space<br />";
+		echo $description_left;
+	}
+	if($description_right){
+		echo "The right column header space<br />";
+		echo $description_right;
+	}else
+		echo elgg_echo('expages:nopreview');
+?>
+</div>
+-->
\ No newline at end of file
diff --git a/mod/externalpages/views/default/expages/front_left.php b/mod/externalpages/views/default/expages/front_left.php
new file mode 100644
index 000000000..1c6c2442e
--- /dev/null
+++ b/mod/externalpages/views/default/expages/front_left.php
@@ -0,0 +1,27 @@
+<?php
+
+	/**
+	 * Elgg Frontpage left
+	 * 
+	 * @package ElggExpages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 */
+
+	 
+	 //get frontpage right code
+		$contents = elgg_get_entities(array('type' => 'object', 'subtype' => 'front', 'limit' => 1));
+		
+		if($contents){
+			foreach($contents as $c){
+				echo $c->title; // title is the left hand content
+			}
+		}else{
+			echo "<p>" . elgg_echo("expages:addcontent") . "</p>";
+		}
+		
+?>
+
diff --git a/mod/externalpages/views/default/expages/front_right.php b/mod/externalpages/views/default/expages/front_right.php
new file mode 100644
index 000000000..a28b5748c
--- /dev/null
+++ b/mod/externalpages/views/default/expages/front_right.php
@@ -0,0 +1,35 @@
+<?php
+
+	/**
+	 * Elgg Frontpage right
+	 * 
+	 * @package ElggExpages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 */
+	 
+	 //get frontpage right code
+		$contents = elgg_get_entities(array('type' => 'object', 'subtype' => 'front', 'limit' => 1));
+
+		$show = '';
+		foreach($contents as $cont){
+			$show = $cont->description;
+		}
+
+		if($show != ''){
+			echo "<div id=\"index_welcome\">";
+
+			if($contents){
+				foreach($contents as $c){
+					echo $c->description;
+				}
+			}else{
+				echo elgg_echo("expages:addcontent");
+			}
+			echo "</div>";
+		}
+
+?>
\ No newline at end of file
diff --git a/mod/externalpages/views/default/expages/menu.php b/mod/externalpages/views/default/expages/menu.php
new file mode 100644
index 000000000..10c07397b
--- /dev/null
+++ b/mod/externalpages/views/default/expages/menu.php
@@ -0,0 +1,29 @@
+<?php
+
+	/**
+	 * Elgg External pages menu
+	 * 
+	 * @package ElggExpages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 */
+	 
+	 //type
+	 $type = $vars['type'];
+	 
+	 //set the url
+	 $url = $vars['url'] . "pg/expages/index.php?type=";
+
+?>
+
+<div id="elgg_horizontal_tabbed_nav">
+<ul>
+	<li <?php if($type == 'front') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>front"><?php echo elgg_echo('expages:frontpage'); ?></a></li>
+	<li <?php if($type == 'about') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>about"><?php echo elgg_echo('expages:about'); ?></a></li>
+	<li <?php if($type == 'terms') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>terms"><?php echo elgg_echo('expages:terms'); ?></a></li>
+	<li <?php if($type == 'privacy') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>privacy"><?php echo elgg_echo('expages:privacy'); ?></a></li>
+</ul>
+</div>
\ No newline at end of file
diff --git a/mod/externalpages/views/default/object/expages.php b/mod/externalpages/views/default/object/expages.php
new file mode 100644
index 000000000..e7f0385b1
--- /dev/null
+++ b/mod/externalpages/views/default/object/expages.php
@@ -0,0 +1,14 @@
+<?php
+
+	/**
+	 * Elgg expages view
+	 * 
+	 * @package ElggExPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 */
+
+?>
\ No newline at end of file
diff --git a/mod/file/actions/delete.php b/mod/file/actions/delete.php
new file mode 100644
index 000000000..ee6dab91e
--- /dev/null
+++ b/mod/file/actions/delete.php
@@ -0,0 +1,68 @@
+<?php
+
+	/**
+	 * Elgg file delete
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+		$guid = (int) get_input('file');
+		if ($file = get_entity($guid)) {
+
+			if ($file->canEdit()) {
+
+				$container = get_entity($file->container_guid);
+				
+				$thumbnail = $file->thumbnail;
+				$smallthumb = $file->smallthumb;
+				$largethumb = $file->largethumb;
+				if ($thumbnail) {
+
+					$delfile = new ElggFile();
+					$delfile->owner_guid = $file->owner_guid;
+					$delfile->setFilename($thumbnail);
+					$delfile->delete();
+
+				}
+				if ($smallthumb) {
+
+					$delfile = new ElggFile();
+					$delfile->owner_guid = $file->owner_guid;
+					$delfile->setFilename($smallthumb);
+					$delfile->delete();
+
+				}
+				if ($largethumb) {
+
+					$delfile = new ElggFile();
+					$delfile->owner_guid = $file->owner_guid;
+					$delfile->setFilename($largethumb);
+					$delfile->delete();
+
+				}
+				
+				if (!$file->delete()) {
+					register_error(elgg_echo("file:deletefailed"));
+				} else {
+					system_message(elgg_echo("file:deleted"));
+				}
+
+			} else {
+				
+				$container = $_SESSION['user'];
+				register_error(elgg_echo("file:deletefailed"));
+				
+			}
+
+		} else {
+			
+			register_error(elgg_echo("file:deletefailed"));
+			
+		}
+		
+		forward("pg/file/" . $_SESSION['user']->username);
+
+?>
\ No newline at end of file
diff --git a/mod/file/actions/download.php b/mod/file/actions/download.php
new file mode 100644
index 000000000..ef5f24964
--- /dev/null
+++ b/mod/file/actions/download.php
@@ -0,0 +1,40 @@
+<?php
+	/**
+	 * Elgg file browser download action.
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Get the guid
+	$file_guid = get_input("file_guid");
+	
+	// Get the file
+	$file = get_entity($file_guid);
+	
+	if ($file)
+	{
+		$mime = $file->getMimeType();
+		if (!$mime) $mime = "application/octet-stream";
+		
+		$filename = $file->originalfilename;
+		
+		// fix for IE https issue 
+		header("Pragma: public"); 
+		header("Content-type: $mime");
+		if (strpos($mime, "image/")!==false)
+			header("Content-Disposition: inline; filename=\"$filename\"");
+		else
+			header("Content-Disposition: attachment; filename=\"$filename\"");
+
+		$contents = $file->grabFile();
+		$splitString = str_split($contents, 8192);
+		foreach($splitString as $chunk)
+			echo $chunk;
+		exit;
+	}
+	else
+		register_error(elgg_echo("file:downloadfailed"));
+?>
\ No newline at end of file
diff --git a/mod/file/actions/save.php b/mod/file/actions/save.php
new file mode 100644
index 000000000..038e61d83
--- /dev/null
+++ b/mod/file/actions/save.php
@@ -0,0 +1,51 @@
+<?php
+	/**
+	 * Elgg file browser save action
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	global $CONFIG;
+	
+	// Get variables
+	$title = get_input("title");
+	$desc = get_input("description");
+	$tags = get_input("tags");
+	$access_id = (int) get_input("access_id");
+	
+	$guid = (int) get_input('file_guid');
+	
+	if (!$file = get_entity($guid)) {
+		register_error(elgg_echo("file:uploadfailed"));
+		forward($CONFIG->wwwroot . "pg/file/" . $_SESSION['user']->username);
+		exit;
+	}
+	
+	$result = false;
+	
+	$container_guid = $file->container_guid;
+	$container = get_entity($container_guid);
+	
+	if ($file->canEdit()) {
+	
+		$file->access_id = $access_id;
+		$file->title = $title;
+		$file->description = $desc;
+	
+		// Save tags
+			$tags = explode(",", $tags);
+			$file->tags = $tags;
+
+			$result = $file->save();
+	}
+	
+	if ($result)
+		system_message(elgg_echo("file:saved"));
+	else
+		register_error(elgg_echo("file:uploadfailed"));
+	
+	forward($CONFIG->wwwroot . "pg/file/" . $container->username);
+?>
\ No newline at end of file
diff --git a/mod/file/actions/upload.php b/mod/file/actions/upload.php
new file mode 100644
index 000000000..e515c73e0
--- /dev/null
+++ b/mod/file/actions/upload.php
@@ -0,0 +1,171 @@
+<?php
+	/**
+	 * Elgg file browser uploader/edit action
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	global $CONFIG;
+	
+	gatekeeper();
+	
+	// Get variables
+	$title = get_input("title");
+	$desc = get_input("description");
+	$access_id = (int) get_input("access_id");
+	$container_guid = (int) get_input('container_guid', 0);
+	if ($container_guid == 0) {
+		$container_guid = get_loggedin_userid();
+	}
+	$guid = (int) get_input('file_guid');
+	$tags = get_input("tags");
+	
+	// check whether this is a new file or an edit
+	$new_file = true;
+	if ($guid > 0) {
+		$new_file = false;
+	}
+	
+	if ($new_file) {
+		// must have a file if a new file upload
+		if (empty($_FILES['upload']['name'])) {
+			// cache information in session
+			$_SESSION['uploadtitle'] = $title;
+			$_SESSION['uploaddesc'] = $desc;
+			$_SESSION['uploadtags'] = $tags;
+			$_SESSION['uploadaccessid'] = $access_id;
+			
+			register_error(elgg_echo('file:nofile'));
+			forward($_SERVER['HTTP_REFERER']);
+		}
+		
+		$file = new FilePluginFile();
+		$file->subtype = "file";
+		
+		// if no title on new upload, grab filename
+		if (empty($title)) {
+			$title = $_FILES['upload']['name'];
+		}
+	
+	} else {
+		// load original file object
+		$file = get_entity($guid);
+		if (!$file) {
+			register_error(elgg_echo('file:cannotload'));
+			forward($_SERVER['HTTP_REFERER']);
+		}
+		
+		// user must be able to edit file
+		if (!$file->canEdit()) {
+			register_error(elgg_echo('file:noaccess'));
+			forward($_SERVER['HTTP_REFERER']);
+		}
+	}
+	
+	$file->title = $title;
+	$file->description = $desc;
+	$file->access_id = $access_id;
+	$file->container_guid = $container_guid;
+	
+	$tags = explode(",", $tags);
+	$file->tags = $tags;
+	
+	// we have a file upload, so process it
+	if (isset($_FILES['upload']['name']) && !empty($_FILES['upload']['name'])) {
+		
+		$prefix = "file/";
+		
+		// if previous file, delete it
+		if ($new_file == false) {
+			$filename = $file->getFilenameOnFilestore();
+			if (file_exists($filename)) {
+				unlink($filename);
+			}
+
+			// use same filename on the disk - ensures thumbnails are overwritten
+			$filestorename = $file->getFilename();
+			$filestorename = substr($filestorename, strlen($prefix));
+		} else {
+			$filestorename = strtolower(time().$_FILES['upload']['name']);
+		}
+		
+		$file->setFilename($prefix.$filestorename);
+		$file->setMimeType($_FILES['upload']['type']);
+		$file->originalfilename = $_FILES['upload']['name'];
+		$file->simpletype = get_general_file_type($_FILES['upload']['type']);
+	
+		$file->open("write");
+		$file->write(get_uploaded_file('upload'));
+		$file->close();
+		
+		$guid = $file->save();
+		
+		// if image, we need to create thumbnails (this should be moved into a function)
+		if ($guid && $file->simpletype == "image") {
+			$thumbnail = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),60,60, true);
+			if ($thumbnail) {
+				$thumb = new ElggFile();
+				$thumb->setMimeType($_FILES['upload']['type']);
+				
+				$thumb->setFilename($prefix."thumb".$filestorename);
+				$thumb->open("write");
+				$thumb->write($thumbnail);
+				$thumb->close();
+				
+				$file->thumbnail = $prefix."thumb".$filestorename;
+				unset($thumbnail);
+			}
+			
+			$thumbsmall = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),153,153, true);
+			if ($thumbsmall) {
+				$thumb->setFilename($prefix."smallthumb".$filestorename);
+				$thumb->open("write");
+				$thumb->write($thumbsmall);
+				$thumb->close();
+				$file->smallthumb = $prefix."smallthumb".$filestorename;
+				unset($thumbsmall);
+			}
+			
+			$thumblarge = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),600,600, false);
+			if ($thumblarge) {
+				$thumb->setFilename($prefix."largethumb".$filestorename);
+				$thumb->open("write");
+				$thumb->write($thumblarge);
+				$thumb->close();
+				$file->largethumb = $prefix."largethumb".$filestorename;
+				unset($thumblarge);
+			}
+		}
+	}
+	
+	// make sure session cache is cleared
+	unset($_SESSION['uploadtitle']);
+	unset($_SESSION['uploaddesc']);
+	unset($_SESSION['uploadtags']);
+	unset($_SESSION['uploadaccessid']);
+	
+	// handle results differently for new files and file updates
+	if ($new_file) {
+		if ($guid) {
+			system_message(elgg_echo("file:saved"));
+			add_to_river('river/object/file/create', 'create', get_loggedin_userid(), $file->guid);
+		} else {
+			// failed to save file object - nothing we can do about this
+			register_error(elgg_echo("file:uploadfailed"));
+		}
+	
+		$container_user = get_entity($container_guid);
+		forward($CONFIG->wwwroot . "pg/file/" . $container_user->username);
+	
+	} else {
+		if ($guid) {
+			system_message(elgg_echo("file:saved"));
+		} else {
+			register_error(elgg_echo("file:uploadfailed"));
+		}
+		
+		forward($file->getURL());
+	}	
diff --git a/mod/file/download.php b/mod/file/download.php
new file mode 100644
index 000000000..6ef8719b3
--- /dev/null
+++ b/mod/file/download.php
@@ -0,0 +1,44 @@
+<?php
+	/**
+	 * Elgg file download.
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	// Get the guid
+	$file_guid = get_input("file_guid");
+	
+	// Get the file
+	$file = get_entity($file_guid);
+	
+	if ($file) {
+		$mime = $file->getMimeType();
+		if (!$mime) {
+			$mime = "application/octet-stream";			
+		} 
+		
+		$filename = $file->originalfilename;
+		
+		// fix for IE https issue 
+		header("Pragma: public");
+		
+		header("Content-type: $mime");
+		if (strpos($mime, "image/")!==false)
+			header("Content-Disposition: inline; filename=\"$filename\"");
+		else
+			header("Content-Disposition: attachment; filename=\"$filename\"");
+
+		$contents = $file->grabFile();
+		$splitString = str_split($contents, 8192);
+		foreach($splitString as $chunk)
+			echo $chunk;
+		exit;
+	} else {
+		register_error(elgg_echo("file:downloadfailed"));
+		forward();
+	}
\ No newline at end of file
diff --git a/mod/file/edit.php b/mod/file/edit.php
new file mode 100644
index 000000000..9dfc12eea
--- /dev/null
+++ b/mod/file/edit.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Elgg file saver
+ *
+ * @package ElggFile
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+gatekeeper();
+
+// Render the file upload page
+
+$file_guid = (int) get_input('file_guid');
+$file = get_entity($file_guid);
+if (!$file) {
+	forward();
+}
+
+// Set the page owner
+$page_owner = page_owner_entity();
+if (!$page_owner) {
+	$container_guid = $file->container_guid;
+	if ($container_guid) {
+		set_page_owner($container_guid);
+	}
+}
+
+if (!$file->canEdit()) {
+	forward();
+}
+
+$title = elgg_echo('file:edit');
+$area2 = elgg_view_title($title);
+$area2 .= elgg_view("file/upload", array('entity' => $file));
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+page_draw($title, $body);
diff --git a/mod/file/friends.php b/mod/file/friends.php
new file mode 100644
index 000000000..0693991d9
--- /dev/null
+++ b/mod/file/friends.php
@@ -0,0 +1,38 @@
+<?php
+	/**
+	 * Elgg file browser
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	
+	if (is_callable('group_gatekeeper')) {
+		group_gatekeeper();
+	}
+	
+	$owner = page_owner_entity();
+	
+	$title = sprintf(elgg_echo("file:friends"),$owner->name);
+	
+	$area2 = elgg_view_title($title);
+	
+	set_context('search');
+	$content = list_user_friends_objects($owner->guid, 'file', 10, false);
+	set_context('file');
+	$area1 = get_filetype_cloud($owner->guid, true);
+	
+	// handle case where friends don't have any files
+	if (empty($content)) {
+		$area2 .= elgg_view('page_elements/contentwrapper',array('body' => elgg_echo("file:none")));
+	} else {
+		$area2 .= $content;
+	}
+
+	$body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+	
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/file/graphics/icons/application.gif b/mod/file/graphics/icons/application.gif
new file mode 100644
index 000000000..f78903c0a
--- /dev/null
+++ b/mod/file/graphics/icons/application.gif
diff --git a/mod/file/graphics/icons/application_lrg.gif b/mod/file/graphics/icons/application_lrg.gif
new file mode 100644
index 000000000..c6955f749
--- /dev/null
+++ b/mod/file/graphics/icons/application_lrg.gif
diff --git a/mod/file/graphics/icons/archive.gif b/mod/file/graphics/icons/archive.gif
new file mode 100644
index 000000000..044cd042a
--- /dev/null
+++ b/mod/file/graphics/icons/archive.gif
diff --git a/mod/file/graphics/icons/archive_lrg.gif b/mod/file/graphics/icons/archive_lrg.gif
new file mode 100644
index 000000000..0d0856cdd
--- /dev/null
+++ b/mod/file/graphics/icons/archive_lrg.gif
diff --git a/mod/file/graphics/icons/excel.gif b/mod/file/graphics/icons/excel.gif
new file mode 100644
index 000000000..f74f74fd7
--- /dev/null
+++ b/mod/file/graphics/icons/excel.gif
diff --git a/mod/file/graphics/icons/excel_lrg.gif b/mod/file/graphics/icons/excel_lrg.gif
new file mode 100644
index 000000000..9b53d6dc7
--- /dev/null
+++ b/mod/file/graphics/icons/excel_lrg.gif
diff --git a/mod/file/graphics/icons/general.gif b/mod/file/graphics/icons/general.gif
new file mode 100644
index 000000000..cd5cf467a
--- /dev/null
+++ b/mod/file/graphics/icons/general.gif
diff --git a/mod/file/graphics/icons/general_lrg.gif b/mod/file/graphics/icons/general_lrg.gif
new file mode 100644
index 000000000..7c7a3c80a
--- /dev/null
+++ b/mod/file/graphics/icons/general_lrg.gif
diff --git a/mod/file/graphics/icons/music.gif b/mod/file/graphics/icons/music.gif
new file mode 100644
index 000000000..c44d7c987
--- /dev/null
+++ b/mod/file/graphics/icons/music.gif
diff --git a/mod/file/graphics/icons/music_lrg.gif b/mod/file/graphics/icons/music_lrg.gif
new file mode 100644
index 000000000..780a252d6
--- /dev/null
+++ b/mod/file/graphics/icons/music_lrg.gif
diff --git a/mod/file/graphics/icons/openoffice.gif b/mod/file/graphics/icons/openoffice.gif
new file mode 100644
index 000000000..3cfdc7196
--- /dev/null
+++ b/mod/file/graphics/icons/openoffice.gif
diff --git a/mod/file/graphics/icons/openoffice_lrg.gif b/mod/file/graphics/icons/openoffice_lrg.gif
new file mode 100644
index 000000000..5cdb13353
--- /dev/null
+++ b/mod/file/graphics/icons/openoffice_lrg.gif
diff --git a/mod/file/graphics/icons/pages.gif b/mod/file/graphics/icons/pages.gif
new file mode 100644
index 000000000..2e4ee761a
--- /dev/null
+++ b/mod/file/graphics/icons/pages.gif
diff --git a/mod/file/graphics/icons/pages_lrg.gif b/mod/file/graphics/icons/pages_lrg.gif
new file mode 100644
index 000000000..2e41e4739
--- /dev/null
+++ b/mod/file/graphics/icons/pages_lrg.gif
diff --git a/mod/file/graphics/icons/pdf.gif b/mod/file/graphics/icons/pdf.gif
new file mode 100644
index 000000000..e7854b1e0
--- /dev/null
+++ b/mod/file/graphics/icons/pdf.gif
diff --git a/mod/file/graphics/icons/pdf_lrg.gif b/mod/file/graphics/icons/pdf_lrg.gif
new file mode 100644
index 000000000..5cd62b69c
--- /dev/null
+++ b/mod/file/graphics/icons/pdf_lrg.gif
diff --git a/mod/file/graphics/icons/ppt.gif b/mod/file/graphics/icons/ppt.gif
new file mode 100644
index 000000000..44aef679b
--- /dev/null
+++ b/mod/file/graphics/icons/ppt.gif
diff --git a/mod/file/graphics/icons/ppt_lrg.gif b/mod/file/graphics/icons/ppt_lrg.gif
new file mode 100644
index 000000000..71965711d
--- /dev/null
+++ b/mod/file/graphics/icons/ppt_lrg.gif
diff --git a/mod/file/graphics/icons/text.gif b/mod/file/graphics/icons/text.gif
new file mode 100644
index 000000000..107e7ca37
--- /dev/null
+++ b/mod/file/graphics/icons/text.gif
diff --git a/mod/file/graphics/icons/text_lrg.gif b/mod/file/graphics/icons/text_lrg.gif
new file mode 100644
index 000000000..5f7c95519
--- /dev/null
+++ b/mod/file/graphics/icons/text_lrg.gif
diff --git a/mod/file/graphics/icons/vcard.gif b/mod/file/graphics/icons/vcard.gif
new file mode 100644
index 000000000..f7fdda9c0
--- /dev/null
+++ b/mod/file/graphics/icons/vcard.gif
diff --git a/mod/file/graphics/icons/vcard_lrg.gif b/mod/file/graphics/icons/vcard_lrg.gif
new file mode 100644
index 000000000..6cd4c45e0
--- /dev/null
+++ b/mod/file/graphics/icons/vcard_lrg.gif
diff --git a/mod/file/graphics/icons/video.gif b/mod/file/graphics/icons/video.gif
new file mode 100644
index 000000000..09abfad3b
--- /dev/null
+++ b/mod/file/graphics/icons/video.gif
diff --git a/mod/file/graphics/icons/video_lrg.gif b/mod/file/graphics/icons/video_lrg.gif
new file mode 100644
index 000000000..b23dbad91
--- /dev/null
+++ b/mod/file/graphics/icons/video_lrg.gif
diff --git a/mod/file/graphics/icons/word.gif b/mod/file/graphics/icons/word.gif
new file mode 100644
index 000000000..f906c75bd
--- /dev/null
+++ b/mod/file/graphics/icons/word.gif
diff --git a/mod/file/graphics/icons/word_lrg.gif b/mod/file/graphics/icons/word_lrg.gif
new file mode 100644
index 000000000..018c8e334
--- /dev/null
+++ b/mod/file/graphics/icons/word_lrg.gif
diff --git a/mod/file/index.php b/mod/file/index.php
new file mode 100644
index 000000000..e76583f0f
--- /dev/null
+++ b/mod/file/index.php
@@ -0,0 +1,43 @@
+<?php
+	/**
+	 * Elgg file browser
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * 
+	 * TODO: File icons, download & mime types
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	if (is_callable('group_gatekeeper')) {
+		group_gatekeeper();
+	}
+	
+	//set the title
+	if (page_owner() == get_loggedin_userid()) {
+		$title = elgg_echo('file:yours');
+	} else {
+		$title = sprintf(elgg_echo("file:user"),page_owner_entity()->name);
+	}
+			
+	$area2 = elgg_view_title($title);
+		
+	// Get objects
+	set_context('search');
+	$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'container_guid' => page_owner(), 'limit' => 10, 'full_view' => FALSE));
+	set_context('file');
+	$get_filter = get_filetype_cloud(page_owner());
+	if ($get_filter) {
+		$area1 = $get_filter;
+	} else {
+		$area2 .= elgg_view('page_elements/contentwrapper',array('body' => elgg_echo("file:none")));
+	}
+
+	$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+	
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php
new file mode 100644
index 000000000..ac3795cfb
--- /dev/null
+++ b/mod/file/languages/en.php
@@ -0,0 +1,109 @@
+<?php
+	/**
+	 * Elgg file plugin language pack
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$english = array(
+	
+		/**
+		 * Menu items and titles
+		 */
+	
+			'file' => "Files",
+			'files' => "Files",
+			'file:yours' => "Your files",
+			'file:yours:friends' => "Your friends' files",
+			'file:user' => "%s's files",
+			'file:friends' => "%s's friends' files",
+			'file:all' => "All site files",
+			'file:edit' => "Edit file",
+			'file:more' => "More files",
+			'file:list' => "list view",
+			'file:group' => "Group files",
+			'file:gallery' => "gallery view",
+			'file:gallery_list' => "Gallery or list view",
+			'file:num_files' => "Number of files to display",
+			'file:user:gallery'=>'View %s gallery', 
+	        'file:via' => 'via files',
+			'file:upload' => "Upload a file",
+			'file:replace' => 'Replace file content (leave blank to not change file)',
+	
+			'file:newupload' => 'New file upload',
+			
+			'file:file' => "File",
+			'file:title' => "Title",
+			'file:desc' => "Description",
+			'file:tags' => "Tags",
+	
+			'file:types' => "Uploaded file types",
+	
+			'file:type:all' => "All files",
+			'file:type:video' => "Videos",
+			'file:type:document' => "Documents",
+			'file:type:audio' => "Audio",
+			'file:type:image' => "Pictures",
+			'file:type:general' => "General",
+	
+			'file:user:type:video' => "%s's videos",
+			'file:user:type:document' => "%s's documents",
+			'file:user:type:audio' => "%s's audio",
+			'file:user:type:image' => "%s's pictures",
+			'file:user:type:general' => "%s's general files",
+	
+			'file:friends:type:video' => "Your friends' videos",
+			'file:friends:type:document' => "Your friends' documents",
+			'file:friends:type:audio' => "Your friends' audio",
+			'file:friends:type:image' => "Your friends' pictures",
+			'file:friends:type:general' => "Your friends' general files",
+	
+			'file:widget' => "File widget",
+			'file:widget:description' => "Showcase your latest files",
+	
+			'file:download' => "Download this",
+	
+			'file:delete:confirm' => "Are you sure you want to delete this file?",
+			
+			'file:tagcloud' => "Tag cloud",
+	
+			'file:display:number' => "Number of files to display",
+	
+			'file:river:created' => "%s uploaded",
+			'file:river:item' => "a file",
+			'file:river:annotate' => "a comment on this file",
+
+			'item:object:file' => 'Files',
+			
+	    /**
+		 * Embed media
+		 **/
+		 
+		    'file:embed' => "Embed media",
+		    'file:embedall' => "All",
+	
+		/**
+		 * Status messages
+		 */
+	
+			'file:saved' => "Your file was successfully saved.",
+			'file:deleted' => "Your file was successfully deleted.",
+	
+		/**
+		 * Error messages
+		 */
+	
+			'file:none' => "No files uploaded.",
+			'file:uploadfailed' => "Sorry; we could not save your file.",
+			'file:downloadfailed' => "Sorry; this file is not available at this time.",
+			'file:deletefailed' => "Your file could not be deleted at this time.",
+			'file:noaccess' => "You do not have permissions to change this file",
+			'file:cannotload' => "There was an error loading the file",
+			'file:nofile' => "You must select a file",
+	);
+					
+	add_translation("en",$english);
+?>
\ No newline at end of file
diff --git a/mod/file/manifest.xml b/mod/file/manifest.xml
new file mode 100644
index 000000000..f3f44d3bf
--- /dev/null
+++ b/mod/file/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider" />
+        <field key="version" value="1.7" />
+        <field key="description" value="File browser plugin" />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+        <field key="licence" value="GNU Public License version 2" />
+        <field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/file/search.php b/mod/file/search.php
new file mode 100644
index 000000000..ed8846514
--- /dev/null
+++ b/mod/file/search.php
@@ -0,0 +1,88 @@
+<?php
+
+	/**
+	 * Elgg file search
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+		
+	// Get input
+		$md_type = 'simpletype';
+		$tag = get_input('tag');
+		$search_viewtype = get_input('search_viewtype');
+
+		$friends = (int) get_input('friends_guid',0);
+		if ($friends) {
+			if ($owner_guid = get_user_friends($user_guid, "", 999999, 0)) {
+				foreach($owner_guid as $key => $friend)
+					$owner_guid[$key] = (int) $friend->getGUID();
+			} else {
+				$owner_guid = array();
+			}
+		} else {
+			$owner_guid = get_input('owner_guid',0);
+			if (substr_count($owner_guid,',')) {
+				$owner_guid = explode(",",$owner_guid);
+			}
+		}
+		$page_owner = get_input('page_owner',0);
+		if ($page_owner) { 
+			set_page_owner($page_owner);
+		} else {
+			if ($friends) {
+				set_page_owner($friends);				
+			} else {
+				if ($owner_guid > 0 && !is_array($owner_guid))
+					set_page_owner($owner_guid);
+			}
+		}
+		
+		if (is_callable('group_gatekeeper')) group_gatekeeper();
+
+		if (empty($tag)) {
+			$title = elgg_echo('file:type:all');
+			$area2 = elgg_view_title(elgg_echo('file:type:all'));
+		} else {
+			$title = sprintf(elgg_echo('searchtitle'),$tag);
+			if (is_array($owner_guid)) {
+				$area2 = elgg_view_title(elgg_echo("file:friends:type:" . $tag));
+			} else if (page_owner() && page_owner() != $_SESSION['guid']) {
+				$area2 = elgg_view_title(sprintf(elgg_echo("file:user:type:" . $tag),page_owner_entity()->name));
+			} else{
+				$area2 = elgg_view_title(elgg_echo("file:type:" . $tag));
+			}
+		}
+		if ($friends) {
+			$area1 = get_filetype_cloud($friends,true);
+		} else if ($owner_guid) {
+			$area1 = get_filetype_cloud($owner_guid);
+		} else {
+			$area1 = get_filetype_cloud();
+		}
+		
+		// Set context
+		set_context('search');
+		
+		$limit = 10;
+		if ($search_viewtype == "gallery") $limit = 12;
+		if (!empty($tag)) {
+			$area2 .= list_entities_from_metadata($md_type, $tag, 'object', 'file', $owner_guid, $limit);
+		} else {
+			$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'owner_guid' => $owner_guid, 'limit' => $limit));
+		}
+		
+		set_context("file");
+		
+		$body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+		
+		page_draw($title, $body);
+
+?>
\ No newline at end of file
diff --git a/mod/file/start.php b/mod/file/start.php
new file mode 100644
index 000000000..b6af2fb18
--- /dev/null
+++ b/mod/file/start.php
@@ -0,0 +1,272 @@
+<?php
+	/**
+	 * Elgg file browser
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	/**
+	 * Override the ElggFile so that 
+	 */
+	class FilePluginFile extends ElggFile
+	{
+		protected function initialise_attributes()
+		{
+			parent::initialise_attributes();
+			
+			$this->attributes['subtype'] = "file";
+		}
+		
+		public function __construct($guid = null) 
+		{			
+			parent::__construct($guid);
+		}
+	}
+	
+
+	/**
+	 * File plugin initialisation functions.
+	 */
+	function file_init() 
+	{
+		global $CONFIG;
+				
+		// Set up menu (tools dropdown or other uses as defined by theme)
+		if (isloggedin()) {
+			add_menu(elgg_echo('file'), $CONFIG->wwwroot . "pg/file/" . get_loggedin_user()->username);
+		} else {
+			add_menu(elgg_echo('file'), $CONFIG->wwwroot . "pg/file/world/world/" );
+		}
+				
+		// Extend CSS
+		elgg_extend_view('css', 'file/css');
+		
+		// Extend hover-over and profile menu	
+		elgg_extend_view('profile/menu/links','file/menu');
+		
+	    // extend group main page
+		elgg_extend_view('groups/left_column','file/groupprofile_files');
+		
+		// Register a page handler, so we can have nice URLs
+		register_page_handler('file','file_page_handler');
+			
+		// Add a new file widget
+		add_widget_type('filerepo',elgg_echo("file:widget"),elgg_echo("file:widget:description"));
+		
+		// Register a URL handler for files
+		register_entity_url_handler('file_url','object','file');
+		
+		// Register granular notification for this object type
+		if (is_callable('register_notification_object')) {
+			register_notification_object('object', 'file', elgg_echo('file:newupload'));
+		}
+
+		// Listen to notification events and supply a more useful message
+		register_plugin_hook('notify:entity:message', 'object', 'file_notify_message');
+		
+		// add the group files tool option     
+		add_group_tool_option('files',elgg_echo('groups:enablefiles'),true);
+
+		// Register entity type
+		register_entity_type('object','file');
+	}
+	
+	/**
+	 * Sets up submenus for the file system.  Triggered on pagesetup.
+	 *
+	 */
+	function file_submenus() {
+		
+		global $CONFIG;
+		
+		$page_owner = page_owner_entity();
+		
+		// Group submenu option	
+			if ($page_owner instanceof ElggGroup && get_context() == "groups") {
+    			if($page_owner->files_enable != "no"){ 
+				    add_submenu_item(sprintf(elgg_echo("file:group"),$page_owner->name), $CONFIG->wwwroot . "pg/file/" . $page_owner->username);
+			    }
+			}
+			
+		// General submenu options
+		
+			if (get_context() == "file") {
+				if ((page_owner() == $_SESSION['guid'] || !page_owner()) && isloggedin()) {
+					add_submenu_item(sprintf(elgg_echo("file:yours"),$page_owner->name), $CONFIG->wwwroot . "pg/file/" . $page_owner->username);
+					add_submenu_item(sprintf(elgg_echo('file:yours:friends'),$page_owner->name), $CONFIG->wwwroot . "pg/file/". $page_owner->username . "/friends/");
+				} else if (page_owner()) {
+					add_submenu_item(sprintf(elgg_echo("file:user"),$page_owner->name), $CONFIG->wwwroot . "pg/file/" . $page_owner->username);
+					if ($page_owner instanceof ElggUser) // This one's for users, not groups
+						add_submenu_item(sprintf(elgg_echo('file:friends'),$page_owner->name), $CONFIG->wwwroot . "pg/file/". $page_owner->username . "/friends/");
+				}
+				add_submenu_item(elgg_echo('file:all'), $CONFIG->wwwroot . "pg/file/world/world/");
+				if (can_write_to_container($_SESSION['guid'], page_owner()) && isloggedin())
+					add_submenu_item(elgg_echo('file:upload'), $CONFIG->wwwroot . "pg/file/". $page_owner->username . "/new/");
+			}
+		
+	}
+
+	/**
+	 * File page handler
+	 *
+	 * @param array $page Array of page elements, forwarded by the page handling mechanism
+	 */
+	function file_page_handler($page) {
+		
+		global $CONFIG;
+		
+		// The username should be the file we're getting
+		if (isset($page[0])) {
+			set_input('username',$page[0]);
+		}
+		
+		if (isset($page[1])) 
+		{
+    		switch($page[1]) 
+    		{
+    			case "read":
+    				set_input('guid',$page[2]);
+					include(dirname(dirname(dirname(__FILE__))) . "/entities/index.php");
+				break;
+    			case "friends":  
+    				include($CONFIG->pluginspath . "file/friends.php");
+          		break;
+   				case "world":  
+   					include($CONFIG->pluginspath . "file/world.php");
+          		break;
+    			case "new":  
+    				include($CONFIG->pluginspath . "file/upload.php");
+          		break;
+    		}
+		}
+		else
+		{
+			// Include the standard profile index
+			include($CONFIG->pluginspath . "file/index.php");
+		}
+		
+	}
+	
+	/**
+		 * Returns a more meaningful message
+		 *
+		 * @param unknown_type $hook
+		 * @param unknown_type $entity_type
+		 * @param unknown_type $returnvalue
+		 * @param unknown_type $params
+    */
+		function file_notify_message($hook, $entity_type, $returnvalue, $params)
+		{
+			$entity = $params['entity'];
+			$to_entity = $params['to_entity'];
+			$method = $params['method'];
+			if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'file'))
+			{
+				$descr = $entity->description;
+				$title = $entity->title;
+				global $CONFIG;
+				$url = $CONFIG->wwwroot . "pg/view/" . $entity->guid;
+				if ($method == 'sms') {
+					$owner = $entity->getOwnerEntity();
+					return $owner->name . ' ' . elgg_echo("file:via") . ': ' . $url . ' (' . $title . ')';
+				}
+				if ($method == 'email') {
+					$owner = $entity->getOwnerEntity();
+					return $owner->name . ' ' . elgg_echo("file:via") . ': ' . $entity->title . "\n\n" . $descr . "\n\n" . $entity->getURL();
+				}
+				if ($method == 'web') {
+					$owner = $entity->getOwnerEntity();
+					return $owner->name . ' ' . elgg_echo("file:via") . ': ' . $entity->title . "\n\n" . $descr . "\n\n" . $entity->getURL();
+				}
+			}
+			return null;
+		}
+
+	/**
+	 * Returns an overall file type from the mimetype
+	 *
+	 * @param string $mimetype The MIME type
+	 * @return string The overall type
+	 */
+	function get_general_file_type($mimetype) {
+		
+		switch($mimetype) {
+			case "application/msword":
+				return "document";
+				break;
+			case "application/pdf":
+				return "document";
+				break;
+		}
+		
+		if (substr_count($mimetype,'text/'))
+			return "document";
+			
+		if (substr_count($mimetype,'audio/'))
+			return "audio";
+			
+		if (substr_count($mimetype,'image/'))
+			return "image";
+			
+		if (substr_count($mimetype,'video/'))
+			return "video";
+
+		if (substr_count($mimetype,'opendocument'))
+			return "document";	
+			
+		return "general";	
+	}
+	
+	/**
+	 * Returns a list of filetypes to search specifically on
+	 *
+	 * @param int|array $owner_guid The GUID(s) of the owner(s) of the files 
+	 * @param true|false $friends Whether we're looking at the owner or the owner's friends
+	 * @return string The typecloud
+	 */
+	function get_filetype_cloud($owner_guid = "", $friends = false) {
+		
+		if ($friends) {
+			if ($friendslist = get_user_friends($user_guid, "", 999999, 0)) {
+				$friendguids = array();
+				foreach($friendslist as $friend) {
+					$friendguids[] = $friend->getGUID();
+				}
+			}
+			$friendofguid = $owner_guid;
+			$owner_guid = $friendguids;
+		} else {
+			$friendofguid = false;
+		}
+		return elgg_view('file/typecloud',array('owner_guid' => $owner_guid, 'friend_guid' => $friendofguid, 'types' => get_tags(0,10,'simpletype','object','file',$owner_guid)));
+
+	}
+	
+	/**
+	 * Populates the ->getUrl() method for file objects
+	 *
+	 * @param ElggEntity $entity File entity
+	 * @return string File URL
+	 */
+		function file_url($entity) {
+			
+			global $CONFIG;
+			$title = $entity->title;
+			$title = friendly_title($title);
+			return $CONFIG->url . "pg/file/" . $entity->getOwnerEntity()->username . "/read/" . $entity->getGUID() . "/" . $title;
+			
+		}
+	
+	// Make sure test_init is called on initialisation
+	register_elgg_event_handler('init','system','file_init');
+	register_elgg_event_handler('pagesetup','system','file_submenus');
+	
+	// Register actions
+	register_action("file/upload", false, $CONFIG->pluginspath . "file/actions/upload.php");
+	register_action("file/save", false, $CONFIG->pluginspath . "file/actions/save.php");
+	register_action("file/delete", false, $CONFIG->pluginspath. "file/actions/delete.php");
+	
+?>
diff --git a/mod/file/thumbnail.php b/mod/file/thumbnail.php
new file mode 100644
index 000000000..a150cce5a
--- /dev/null
+++ b/mod/file/thumbnail.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * Elgg file thumbnail
+ *
+ * @package ElggFile
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+// Get engine
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+// Get file GUID
+$file_guid = (int) get_input('file_guid',0);
+
+// Get file thumbnail size
+$size = get_input('size','small');
+
+// Get file entity
+if ($file = get_entity($file_guid)) {
+		
+	if ($file->getSubtype() == "file") {
+
+		$simpletype = $file->simpletype;
+		if ($simpletype == "image") {
+				
+			// Get file thumbnail
+			switch ($size) {
+				case "small":
+					$thumbfile = $file->thumbnail;
+					break;
+				case "medium":
+					$thumbfile = $file->smallthumb;
+					break;
+				case "large":
+				default:
+					$thumbfile = $file->largethumb;
+					break;
+			}
+
+			// Grab the file
+			if ($thumbfile && !empty($thumbfile)) {
+				$readfile = new ElggFile();
+				$readfile->owner_guid = $file->owner_guid;
+				$readfile->setFilename($thumbfile);
+				$mime = $file->getMimeType();
+				$contents = $readfile->grabFile();
+				
+				// caching images for 10 days
+				header("Content-type: $mime");
+				header('Expires: ' . date('r',time() + 864000));
+				header("Pragma: public", true);
+				header("Cache-Control: public", true);
+				header("Content-Length: " . strlen($contents));
+				
+				echo $contents;
+				exit;
+					
+			}
+				
+		}
+
+	}
+		
+}
+
+?>
\ No newline at end of file
diff --git a/mod/file/upload.php b/mod/file/upload.php
new file mode 100644
index 000000000..d0b503e0c
--- /dev/null
+++ b/mod/file/upload.php
@@ -0,0 +1,27 @@
+<?php
+	/**
+	 * Elgg file browser uploader
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	gatekeeper();
+	if (is_callable('group_gatekeeper')) {
+		group_gatekeeper();
+	}
+
+	// Render the file upload page
+
+	$container_guid = page_owner();
+	$area2 = elgg_view_title($title = elgg_echo('file:upload'));
+	$area2 .= elgg_view("file/upload", array('container_guid' => $container_guid));
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	
+	page_draw(elgg_echo("file:upload"), $body);
+	
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/css.php b/mod/file/views/default/file/css.php
new file mode 100644
index 000000000..64642d9de
--- /dev/null
+++ b/mod/file/views/default/file/css.php
@@ -0,0 +1,224 @@
+<?php
+	/**
+	 * File CSS extender 
+	 * 
+	 * @package Elgg File Repository
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+?>
+
+
+p.filerepo_owner {
+	margin:0;
+	padding:0;
+}
+.filerepo_owner_details {
+	margin:0;
+	padding:0;
+	line-height: 1.2em;
+}
+.filerepo_owner_details small {
+	color:#666666;
+}
+.filerepo_owner .usericon {
+	margin: 3px 5px 5px 0;
+	float: left;
+}
+
+.filerepo_download a {
+	font: 12px/100% Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	color: white;
+	background:#4690d6;
+	border:none;
+	-webkit-border-radius: 5px; 
+	-moz-border-radius: 5px;
+	width: auto;
+	height: 25px;
+	padding: 3px 6px 3px 6px;
+	margin:10px 0 10px 0;
+	cursor: pointer;
+}
+.filerepo_download a:hover {
+	background: black;
+	color:white;
+	text-decoration: none;
+}
+
+/* FILE REPRO WIDGET VIEW */
+.filerepo_widget_singleitem {
+	margin:0 0 5px 0;
+	padding:5px;
+	min-height:60px;
+	display:block;
+	background:white;
+   	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+}
+.filerepo_widget_singleitem_more {
+	margin:0;
+	padding:5px;
+	display:block;
+	background:white;
+   	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;	
+}
+.filerepo_listview_icon {
+	float: left;
+	margin-right: 10px;
+}
+.filerepo_timestamp {
+	color:#666666;
+	margin:0;
+}
+.filerepo_listview_desc {
+	display:none;
+	padding:0 10px 10px 0;
+	line-height: 1.2em;
+}
+.filerepo_listview_desc p {
+	color:#333333;
+}
+.filerepo_widget_content {
+	margin-left: 70px;
+}
+.filerepo_title {
+	margin:0;
+	padding:6px 5px 0 0;
+	line-height: 1.2em;
+	color:#666666;
+	font-weight: bold;
+}
+
+.collapsable_box #filerepo_widget_layout {
+	margin:0 10px 0 10px;
+	background: none;
+}
+
+/* widget gallery view */
+#filerepo_widget_layout .filerepo_widget_galleryview {
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	background: white;
+	margin:0 0 5px 0;	
+}
+.filerepo_widget_galleryview img {
+	padding:0;
+    border:1px solid white;
+    margin:4px;
+}
+.filerepo_widget_galleryview img:hover {
+	border:1px solid #333333;
+}
+
+/* SINGLE ITEM VIEW */
+.filerepo_file {
+	background:white;
+	margin:10px 10px 0 10px;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+}
+.filerepo_file .filerepo_title_owner_wrapper {
+	min-height:60px;
+
+}
+.filerepo_title_owner_wrapper .filerepo_title,
+.filerepo_title_owner_wrapper .filerepo_owner {
+	margin-left: 70px !important;
+}
+.filerepo_file .filerepo_maincontent {
+	padding:0 20px 0 0;
+}
+.filerepo_file .filerepo_icon {
+	width: 70px;
+	position: absolute;
+	margin:10px 0 10px 10px;
+}
+.filerepo_file .filerepo_title {
+	margin:0;
+	padding:7px 4px 10px 10px;
+	line-height: 1.2em;
+}
+.filerepo_file .filerepo_owner {
+	padding:0 0 0 10px;
+}
+.filerepo_file .filerepo_description {
+	margin:10px 0 0 0;
+	padding:0 0 0 10px;
+}
+.filerepo_download,
+.filerepo_controls {
+	padding:0 0 1px 10px;
+	margin:0 0 10px 0;
+}
+.filerepo_file .filerepo_description p {
+	padding:0 0 5px 0;
+	margin:0;
+}
+.filerepo_file .filerepo_specialcontent img {
+	padding:10px;
+	margin:0 0 0 10px;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	background: black; 
+}
+/* zaudio player */
+.filerepo_maincontent .filerepo_specialcontent {
+	margin:0 0 20px 0;
+}
+.filerepo_tags {
+	padding:0 0 10px 10px;
+	margin:0;
+}
+
+/* file repro gallery items */
+.search_gallery .filerepo_controls {
+	padding:0;
+}
+.search_gallery .filerepo_title {
+	font-weight: bold;
+	line-height: 1.1em;
+	margin:0 0 10px 0;
+}
+.filerepo_gallery_item {
+	margin:0;
+	padding:0;
+	text-align:center;
+
+}
+.filerepo_gallery_item p {
+	margin:0;
+	padding:0;
+}
+.filerepo_gallery_item .filerepo_controls {
+	margin-top:10px;
+}
+.filerepo_gallery_item .filerepo_controls a {
+	padding-right:10px;
+	padding-left:10px;
+}
+.search_gallery .filerepo_comments {
+	font-size:90%;
+}
+
+.filerepo_user_gallery_link {
+	float:right;
+	margin:5px 5px 5px 50px;
+}
+.filerepo_user_gallery_link a {
+	padding:2px 25px 5px 0;
+	background: transparent url(<?php echo $vars['url']; ?>_graphics/icon_gallery.gif) no-repeat right top;
+	display:block;
+}
+.filerepo_user_gallery_link a:hover {
+	background-position: right -40px;
+}
+
+/* IE6 */
+* html #description_tbl { width:676px !important;}
+
+
+
diff --git a/mod/file/views/default/file/groupprofile_files.php b/mod/file/views/default/file/groupprofile_files.php
new file mode 100644
index 000000000..778de3301
--- /dev/null
+++ b/mod/file/views/default/file/groupprofile_files.php
@@ -0,0 +1,74 @@
+<?php
+ 
+    // Latest forum discussion for the group home page
+
+    //check to make sure this group forum has been activated
+    if($vars['entity']->files_enable != 'no'){
+
+?>
+
+<script type="text/javascript">
+$(document).ready(function () {
+
+$('a.show_file_desc').click(function () {
+	$(this.parentNode).children("[class=filerepo_listview_desc]").slideToggle("fast");
+	return false;
+});
+
+}); /* end document ready function */
+</script>
+
+<div id="filerepo_widget_layout"> 
+<h2><?php echo elgg_echo("file:group"); ?></h2>
+
+<?php
+
+	//the number of files to display
+	$number = (int) $vars['entity']->num_display;
+	if (!$number)
+		$number = 10;
+	
+	//get the group's files
+	$files = elgg_get_entities(array('type' => 'object',
+									'subtype' => 'file',
+									'container_guid' => $vars['entity']->guid,
+									'limit' => $number,
+	));
+	
+	//if there are some files, go get them
+	if ($files) {
+    	       	    
+            //display in list mode
+            foreach($files as $f){
+            	
+                $mime = $f->mimetype;
+                echo "<div class=\"filerepo_widget_singleitem\">";
+            	echo "<div class=\"filerepo_listview_icon\"><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
+            	echo "<div class=\"filerepo_widget_content\">";
+            	echo "<div class=\"filerepo_listview_title\"><p class=\"filerepo_title\">" . $f->title . "</p></div>";
+            	echo "<div class=\"filerepo_listview_date\"><p class=\"filerepo_timestamp\"><small>" . friendly_time($f->time_created) . "</small></p></div>";
+		        $description = $f->description;
+		        if (!empty($description)) echo "<a href=\"javascript:void(0);\" class=\"show_file_desc\">". elgg_echo('more') ."</a><br /><div class=\"filerepo_listview_desc\">" . $description . "</div>";
+		        echo "</div><div class=\"clearfloat\"></div></div>";
+            				
+        	}
+        	
+        	
+        //get a link to the users files
+        $users_file_url = $vars['url'] . "pg/file/" . page_owner_entity()->username;
+        	
+        echo "<div class=\"forum_latest\"><a href=\"{$users_file_url}\">" . elgg_echo('file:more') . "</a></div>";
+       
+	} else {
+		
+		echo "<div class=\"forum_latest\">" . elgg_echo("file:none") . "</div>";
+
+	}
+
+?>
+<div class="clearfloat" /></div>
+</div>
+
+<?php
+	}//end of activate check statement
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon.php b/mod/file/views/default/file/icon.php
new file mode 100644
index 000000000..f1bb3f8e1
--- /dev/null
+++ b/mod/file/views/default/file/icon.php
@@ -0,0 +1,65 @@
+<?php
+	/**
+	 * Elgg file icons.
+	 * Displays an icon, depending on its mime type, for a file. 
+	 * Optionally you can specify a size.
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	global $CONFIG;
+	
+	$mime = $vars['mimetype'];
+	
+	// is this request for an image thumbnail
+	if (isset($vars['thumbnail'])) {
+		$thumbnail = $vars['thumbnail'];
+	} else {
+		$thumbnail = false;
+	}
+
+	// default size is small for thumbnails
+	if (isset($vars['size'])) {
+		$size = $vars['size'];
+	} else {
+		$size = 'small';
+	}
+	
+	// Handle 
+	switch ($mime)
+	{
+		case 'image/jpg' 	:
+		case 'image/jpeg' 	:
+		case 'image/pjpeg' 	:
+		case 'image/png' 	:
+		case 'image/x-png'	:
+		case 'image/gif' 	:
+		case 'image/bmp' 	: 
+			if ($thumbnail) {
+				echo "<img src=\"{$vars['url']}mod/file/thumbnail.php?file_guid={$vars['file_guid']}&size={$size}\" border=\"0\" />";				
+			} else {
+				if (!empty($mime) && elgg_view_exists("file/icon/{$mime}")) {
+					echo elgg_view("file/icon/{$mime}", $vars);
+				} else if (!empty($mime) && elgg_view_exists("file/icon/" . substr($mime,0,strpos($mime,'/')) . "/default")) {
+					echo elgg_view("file/icon/" . substr($mime,0,strpos($mime,'/')) . "/default", $vars);
+				} else {
+					echo "<img src=\"". elgg_view('file/icon/default',$vars) ."\" border=\"0\" />";
+				}	
+			}
+			
+		break;
+		default :
+			if (!empty($mime) && elgg_view_exists("file/icon/{$mime}")) {
+				echo elgg_view("file/icon/{$mime}", $vars);
+			} else if (!empty($mime) && elgg_view_exists("file/icon/" . substr($mime,0,strpos($mime,'/')) . "/default")) {
+				echo elgg_view("file/icon/" . substr($mime,0,strpos($mime,'/')) . "/default", $vars);
+			} else {
+				echo "<img src=\"". elgg_view('file/icon/default',$vars) ."\" border=\"0\" />";
+			} 
+		break;
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/default.php b/mod/file/views/default/file/icon/application/default.php
new file mode 100644
index 000000000..eea8cbafe
--- /dev/null
+++ b/mod/file/views/default/file/icon/application/default.php
@@ -0,0 +1,10 @@
+<?php
+
+	if ($vars['size'] == 'large') {
+		$ext = '_lrg';
+	} else {
+		$ext = '';
+	}
+	echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/application{$ext}.gif\" border=\"0\" />";
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/excel.php b/mod/file/views/default/file/icon/application/excel.php
new file mode 100644
index 000000000..ba2460fec
--- /dev/null
+++ b/mod/file/views/default/file/icon/application/excel.php
@@ -0,0 +1,10 @@
+<?php
+
+	if ($vars['size'] == 'large') {
+		$ext = '_lrg';
+	} else {
+		$ext = '';
+	}
+	echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/excel{$ext}.gif\" border=\"0\" />";
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/msword.php b/mod/file/views/default/file/icon/application/msword.php
new file mode 100644
index 000000000..20efb1069
--- /dev/null
+++ b/mod/file/views/default/file/icon/application/msword.php
@@ -0,0 +1,10 @@
+<?php
+
+	if ($vars['size'] == 'large') {
+		$ext = '_lrg';
+	} else {
+		$ext = '';
+	}
+	echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/word{$ext}.gif\" border=\"0\" />";
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/pdf.php b/mod/file/views/default/file/icon/application/pdf.php
new file mode 100644
index 000000000..6a5a7369c
--- /dev/null
+++ b/mod/file/views/default/file/icon/application/pdf.php
@@ -0,0 +1,10 @@
+<?php
+
+	if ($vars['size'] == 'large') {
+		$ext = '_lrg';
+	} else {
+		$ext = '';
+	}
+	echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/pdf{$ext}.gif\" border=\"0\" />";
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/powerpoint.php b/mod/file/views/default/file/icon/application/powerpoint.php
new file mode 100644
index 000000000..1857d513f
--- /dev/null
+++ b/mod/file/views/default/file/icon/application/powerpoint.php
@@ -0,0 +1,10 @@
+<?php
+
+	if ($vars['size'] == 'large') {
+		$ext = '_lrg';
+	} else {
+		$ext = '';
+	}
+	echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/ppt{$ext}.gif\" border=\"0\" />";
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/vnd.ms-excel.php b/mod/file/views/default/file/icon/application/vnd.ms-excel.php
new file mode 100644
index 000000000..ba2460fec
--- /dev/null
+++ b/mod/file/views/default/file/icon/application/vnd.ms-excel.php
@@ -0,0 +1,10 @@
+<?php
+
+	if ($vars['size'] == 'large') {
+		$ext = '_lrg';
+	} else {
+		$ext = '';
+	}
+	echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/excel{$ext}.gif\" border=\"0\" />";
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php b/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php
new file mode 100644
index 000000000..1857d513f
--- /dev/null
+++ b/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php
@@ -0,0 +1,10 @@
+<?php
+
+	if ($vars['size'] == 'large') {
+		$ext = '_lrg';
+	} else {
+		$ext = '';
+	}
+	echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/ppt{$ext}.gif\" border=\"0\" />";
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php b/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php
new file mode 100644
index 000000000..d0bde81df
--- /dev/null
+++ b/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php
@@ -0,0 +1,10 @@
+<?php
+
+	if ($vars['size'] == 'large') {
+		$ext = '_lrg';
+	} else {
+		$ext = '';
+	}
+	echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/openoffice{$ext}.gif\" border=\"0\" />";
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/x-gzip.php b/mod/file/views/default/file/icon/application/x-gzip.php
new file mode 100644
index 000000000..72f839732
--- /dev/null
+++ b/mod/file/views/default/file/icon/application/x-gzip.php
@@ -0,0 +1,5 @@
+<?php
+
+	echo elgg_view('file/icon/archive',$vars);
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/x-rar-compressed.php b/mod/file/views/default/file/icon/application/x-rar-compressed.php
new file mode 100644
index 000000000..72f839732
--- /dev/null
+++ b/mod/file/views/default/file/icon/application/x-rar-compressed.php
@@ -0,0 +1,5 @@
+<?php
+
+	echo elgg_view('file/icon/archive',$vars);
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/x-stuffit.php b/mod/file/views/default/file/icon/application/x-stuffit.php
new file mode 100644
index 000000000..72f839732
--- /dev/null
+++ b/mod/file/views/default/file/icon/application/x-stuffit.php
@@ -0,0 +1,5 @@
+<?php
+
+	echo elgg_view('file/icon/archive',$vars);
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/zip.php b/mod/file/views/default/file/icon/application/zip.php
new file mode 100644
index 000000000..72f839732
--- /dev/null
+++ b/mod/file/views/default/file/icon/application/zip.php
@@ -0,0 +1,5 @@
+<?php
+
+	echo elgg_view('file/icon/archive',$vars);
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/archive.php b/mod/file/views/default/file/icon/archive.php
new file mode 100644
index 000000000..4fffd9346
--- /dev/null
+++ b/mod/file/views/default/file/icon/archive.php
@@ -0,0 +1,10 @@
+<?php
+
+	if ($vars['size'] == 'large') {
+		$ext = '_lrg';
+	} else {
+		$ext = '';
+	}
+	echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/archive{$ext}.gif\" border=\"0\" />";
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/audio.php b/mod/file/views/default/file/icon/audio.php
new file mode 100644
index 000000000..73c55be7b
--- /dev/null
+++ b/mod/file/views/default/file/icon/audio.php
@@ -0,0 +1,10 @@
+<?php
+
+	if ($vars['size'] == 'large') {
+		$ext = '_lrg';
+	} else {
+		$ext = '';
+	}
+	echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/music{$ext}.gif\" border=\"0\" />";
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/audio/default.php b/mod/file/views/default/file/icon/audio/default.php
new file mode 100644
index 000000000..2bd1498b2
--- /dev/null
+++ b/mod/file/views/default/file/icon/audio/default.php
@@ -0,0 +1,5 @@
+<?php
+
+	echo elgg_view('file/icon/audio',$vars);
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/default.php b/mod/file/views/default/file/icon/default.php
new file mode 100644
index 000000000..844ee312c
--- /dev/null
+++ b/mod/file/views/default/file/icon/default.php
@@ -0,0 +1,10 @@
+<?php
+
+	if ($vars['size'] == 'large') {
+		$ext = '_lrg';
+	} else {
+		$ext = '';
+	}
+	echo "{$CONFIG->wwwroot}mod/file/graphics/icons/general{$ext}.gif";
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/document.php b/mod/file/views/default/file/icon/document.php
new file mode 100644
index 000000000..8823514b8
--- /dev/null
+++ b/mod/file/views/default/file/icon/document.php
@@ -0,0 +1,10 @@
+<?php
+
+	if ($vars['size'] == 'large') {
+		$ext = '_lrg';
+	} else {
+		$ext = '';
+	}
+	echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/text{$ext}.gif\" border=\"0\" />";
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/text/default.php b/mod/file/views/default/file/icon/text/default.php
new file mode 100644
index 000000000..bf5da852d
--- /dev/null
+++ b/mod/file/views/default/file/icon/text/default.php
@@ -0,0 +1,5 @@
+<?php
+
+	echo elgg_view('file/icon/document',$vars);
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/text/directory.php b/mod/file/views/default/file/icon/text/directory.php
new file mode 100644
index 000000000..a08e098c6
--- /dev/null
+++ b/mod/file/views/default/file/icon/text/directory.php
@@ -0,0 +1,10 @@
+<?php
+
+	if ($vars['size'] == 'large') {
+		$ext = '_lrg';
+	} else {
+		$ext = '';
+	}
+	echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/vcard{$ext}.gif\" border=\"0\" />";
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/text/v-card.php b/mod/file/views/default/file/icon/text/v-card.php
new file mode 100644
index 000000000..5c8ecd855
--- /dev/null
+++ b/mod/file/views/default/file/icon/text/v-card.php
@@ -0,0 +1,5 @@
+<?php
+
+	echo elgg_view('file/icon/text/directory',$vars);
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/video.php b/mod/file/views/default/file/icon/video.php
new file mode 100644
index 000000000..94617abff
--- /dev/null
+++ b/mod/file/views/default/file/icon/video.php
@@ -0,0 +1,10 @@
+<?php
+
+	if ($vars['size'] == 'large') {
+		$ext = '_lrg';
+	} else {
+		$ext = '';
+	}
+	echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/video{$ext}.gif\" border=\"0\" />";
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/video/default.php b/mod/file/views/default/file/icon/video/default.php
new file mode 100644
index 000000000..0ff2db791
--- /dev/null
+++ b/mod/file/views/default/file/icon/video/default.php
@@ -0,0 +1,5 @@
+<?php
+
+	echo elgg_view('file/icon/video',$vars);
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/menu.php b/mod/file/views/default/file/menu.php
new file mode 100644
index 000000000..a9c79a85c
--- /dev/null
+++ b/mod/file/views/default/file/menu.php
@@ -0,0 +1,16 @@
+<?php
+
+	/**
+	 * Elgg hoverover extender for file
+	 * 
+	 * @package ElggFile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+
+	<p class="user_menu_file">
+		<a href="<?php echo $vars['url']; ?>pg/file/<?php echo $vars['entity']->username; ?>"><?php echo elgg_echo("file"); ?></a>	
+	</p>
\ No newline at end of file
diff --git a/mod/file/views/default/file/specialcontent/audio/mid.php b/mod/file/views/default/file/specialcontent/audio/mid.php
new file mode 100644
index 000000000..cf216a3b3
--- /dev/null
+++ b/mod/file/views/default/file/specialcontent/audio/mid.php
@@ -0,0 +1,4 @@
+<object type="audio/midi" data="<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" width="200" height="20">
+  <param name="autoplay" value="false">
+  <param name="autoStart" value="0">
+</object>
\ No newline at end of file
diff --git a/mod/file/views/default/file/specialcontent/audio/mp3.php b/mod/file/views/default/file/specialcontent/audio/mp3.php
new file mode 100644
index 000000000..83b77c391
--- /dev/null
+++ b/mod/file/views/default/file/specialcontent/audio/mp3.php
@@ -0,0 +1,4 @@
+<object type="audio/mpeg" data="<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" width="200" height="20">
+  <param name="autoplay" value="false">
+  <param name="autoStart" value="0">
+</object>
\ No newline at end of file
diff --git a/mod/file/views/default/file/specialcontent/audio/mpeg.php b/mod/file/views/default/file/specialcontent/audio/mpeg.php
new file mode 100644
index 000000000..83b77c391
--- /dev/null
+++ b/mod/file/views/default/file/specialcontent/audio/mpeg.php
@@ -0,0 +1,4 @@
+<object type="audio/mpeg" data="<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" width="200" height="20">
+  <param name="autoplay" value="false">
+  <param name="autoStart" value="0">
+</object>
\ No newline at end of file
diff --git a/mod/file/views/default/file/specialcontent/audio/x-wav.php b/mod/file/views/default/file/specialcontent/audio/x-wav.php
new file mode 100644
index 000000000..21af956c2
--- /dev/null
+++ b/mod/file/views/default/file/specialcontent/audio/x-wav.php
@@ -0,0 +1,4 @@
+<object type="audio/x-wav" data="<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" width="200" height="20">
+  <param name="autoplay" value="false">
+  <param name="autoStart" value="0">
+</object>
\ No newline at end of file
diff --git a/mod/file/views/default/file/specialcontent/image/default.php b/mod/file/views/default/file/specialcontent/image/default.php
new file mode 100644
index 000000000..b034857c2
--- /dev/null
+++ b/mod/file/views/default/file/specialcontent/image/default.php
@@ -0,0 +1,9 @@
+<?php
+
+	if ($vars['full'] && $smallthumb = $vars['entity']->smallthumb) {
+ 
+		echo "<p><a href=\"{$vars['url']}mod/file/download.php?file_guid={$vars['entity']->getGUID()}\"><img src=\"{$vars['url']}mod/file/thumbnail.php?file_guid={$vars['entity']->getGUID()}&size=large\" border=\"0\" /></a></p>";
+		
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/typecloud.php b/mod/file/views/default/file/typecloud.php
new file mode 100644
index 000000000..b85960849
--- /dev/null
+++ b/mod/file/views/default/file/typecloud.php
@@ -0,0 +1,70 @@
+<?php
+
+	$types = $vars['types'];
+	
+	if (is_array($vars['types']) && sizeof($vars['types'])) {
+		
+?>
+	
+		<!--  <div class="filerepo_types"> -->
+			<!-- <p><b><?php echo elgg_echo('file:types'); ?>:</b> -->
+			
+		<div id="canvas_header_submenu">
+			<ul>
+<?php
+
+		$all = new stdClass;
+		$all->tag = "all";
+		$vars['types'][] = $all;
+		$vars['types'] = array_reverse($vars['types']);
+		foreach($vars['types'] as $type) {
+
+			$tag = $type->tag;
+			if ($tag != "all") {
+				$label = elgg_echo("file:type:" . $tag);
+			} else {
+				$label = elgg_echo('all');
+			}
+			
+			$url = $vars['url'] . "mod/file/search.php?subtype=file";
+			if ($tag != "all")
+				$url .= "&md_type=simpletype&tag=" . urlencode($tag);
+			if (isset($vars['friend_guid']) && $vars['friend_guid'] != false) {
+				$url .= "&friends_guid={$vars['friend_guid']}";
+			} else if ($vars['owner_guid'] != "") {
+				if (is_array($vars['owner_guid'])) {
+					$owner_guid = implode(",",$vars['owner_guid']);
+				} else {
+					$owner_guid = $vars['owner_guid'];
+				}
+				$url .= "&owner_guid={$owner_guid}";
+			}
+			if ($tag == "image")
+				$url .= "&search_viewtype=gallery";
+			
+			$url .= "&page_owner=" . page_owner();
+				
+			$inputtag = get_input('tag');
+			if ($inputtag == $tag || (empty($inputtag) && $tag == "all")) {
+				// $class = "class=\"filerepo_types_current\"";
+				$class = " class=\"selected\" ";
+			} else {
+				$class = "";
+			}
+				
+			add_submenu_item($label, $url, 'filetypes');
+			
+			//echo "<li {$class} ><a href=\"{$url}\">{$label}</a></li>";
+			
+		}
+		
+?>
+			<!-- </p> -->
+			</ul>
+		</div>
+
+<?php
+		
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/file/upload.php b/mod/file/views/default/file/upload.php
new file mode 100644
index 000000000..5a1f5c927
--- /dev/null
+++ b/mod/file/views/default/file/upload.php
@@ -0,0 +1,134 @@
+<?php
+	/**
+	 * Elgg file browser uploader
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	global $CONFIG;
+
+	if (isset($vars['entity'])) {
+		$action_type = "update";
+		$action = "file/upload";
+		$title = $vars['entity']->title;
+		$description = $vars['entity']->description;
+		$tags = $vars['entity']->tags;
+		$access_id = $vars['entity']->access_id;
+		$container_guid = $vars['entity']->container_guid;
+	} else  {
+		$action_type = "new";
+		$action = "file/upload";
+		$title = isset($_SESSION['uploadtitle']) ? $_SESSION['uploadtitle'] : '';
+		$description = isset($_SESSION['uploaddesc']) ? $_SESSION['uploaddesc'] : '';
+		$tags = isset($_SESSION['uploadtags']) ? $_SESSION['uploadtags'] : '';
+		if (defined('ACCESS_DEFAULT')) {
+			$access_id = ACCESS_DEFAULT;
+		} else {
+			$access_id = 0;
+		}
+		$access_id = isset($_SESSION['uploadaccessid']) ? $_SESSION['uploadaccessid'] : $access_id;
+		$container_guid = page_owner_entity()->guid;
+	}
+		
+	// make sure session cache is cleared
+	unset($_SESSION['uploadtitle']);
+	unset($_SESSION['uploaddesc']);
+	unset($_SESSION['uploadtags']);
+	unset($_SESSION['uploadaccessid']);
+	
+	
+?>
+<div class="contentWrapper">
+<form action="<?php echo $vars['url']; ?>action/<?php echo $action; ?>" enctype="multipart/form-data" method="post">
+<p>
+	<label>
+<?php
+	echo elgg_view('input/securitytoken');
+	if ($action_type == "new") {
+		echo elgg_echo("file:file");
+	} else {
+		echo elgg_echo("file:replace");
+	}
+?>
+<br />
+<?php
+
+	echo elgg_view("input/file",array('internalname' => 'upload'));
+			
+?>
+	</label>
+</p>
+<p>
+	<label><?php echo elgg_echo("title"); ?><br />
+<?php
+
+	echo elgg_view("input/text", array(
+									"internalname" => "title",
+									"value" => $title,
+													));
+			
+?>
+	</label>
+</p>
+<p class="longtext_editarea">
+	<label><?php echo elgg_echo("description"); ?><br />
+<?php
+
+	echo elgg_view("input/longtext",array(
+									"internalname" => "description",
+									"value" => $description,
+													));
+?>
+	</label>
+</p>
+<p>
+	<label><?php echo elgg_echo("tags"); ?><br />
+<?php
+
+	echo elgg_view("input/tags", array(
+									"internalname" => "tags",
+									"value" => $tags,
+													));
+			
+?>
+	</label>
+</p>
+<?php
+
+	$categories = elgg_view('categories',$vars);
+	if (!empty($categories)) {
+?>
+
+		<p>
+			<?php echo $categories; ?>
+		</p>
+
+<?php
+		}
+
+?>
+<p>
+	<label>
+		<?php echo elgg_echo('access'); ?><br />
+		<?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => $access_id)); ?>
+	</label>
+</p>
+	
+<p>
+<?php
+
+	echo "<input type=\"hidden\" name=\"container_guid\" value=\"{$container_guid}\" />";
+	
+	if (isset($vars['entity'])) {
+		echo "<input type=\"hidden\" name=\"file_guid\" value=\"{$vars['entity']->getGUID()}\" />";
+	}
+	
+?>
+	<input type="submit" value="<?php echo elgg_echo("save"); ?>" />
+</p>
+
+</form>
+</div>
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
new file mode 100644
index 000000000..9568074b2
--- /dev/null
+++ b/mod/file/views/default/object/file.php
@@ -0,0 +1,205 @@
+<?php
+	/**
+	 * Elgg file browser.
+	 * File renderer.
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	global $CONFIG;
+	
+	$file = $vars['entity'];
+	
+	$file_guid = $file->getGUID();
+	$tags = $file->tags;
+	$title = $file->title;
+	$desc = $file->description;
+	$owner = $vars['entity']->getOwnerEntity();
+	$friendlytime = friendly_time($vars['entity']->time_created);
+	$mime = $file->mimetype;
+	
+	if (!$title) {
+		$title = elgg_echo('untitled');
+	}
+	
+	if (get_context() == "search") { 	// Start search listing version 
+		
+		if (get_input('search_viewtype') == "gallery") {
+			echo "<div class=\"filerepo_gallery_item\">";
+			if ($vars['entity']->smallthumb) {
+				echo "<p class=\"filerepo_title\">" . $file->title . "</p>";
+				echo "<p><a href=\"{$file->getURL()}\"><img src=\"{$vars['url']}mod/file/thumbnail.php?size=medium&file_guid={$vars['entity']->getGUID()}\" border=\"0\" /></a></p>";
+				echo "<p class=\"filerepo_timestamp\"><small><a href=\"{$vars['url']}pg/file/{$owner->username}\">{$owner->username}</a> {$friendlytime}</small></p>";
+
+				//get the number of comments
+				$numcomments = elgg_count_comments($vars['entity']);
+				if ($numcomments)
+					echo "<p class=\"filerepo_comments\"><a href=\"{$file->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a></p>";
+
+				
+				//if the user can edit, display edit and delete links
+				if ($file->canEdit()) {
+					echo "<div class=\"filerepo_controls\"><p>";
+					echo "<a href=\"{$vars['url']}mod/file/edit.php?file_guid={$file->getGUID()}\">" . elgg_echo('edit') . "</a>&nbsp;";
+					echo elgg_view('output/confirmlink',array(
+						
+							'href' => $vars['url'] . "action/file/delete?file=" . $file->getGUID(),
+							'text' => elgg_echo("delete"),
+							'confirm' => elgg_echo("file:delete:confirm"),
+							'is_action' => true,
+						
+						));
+					echo "</p></div>";
+				}
+					
+			
+			} else {
+				echo "<p class=\"filerepo_title\">{$title}</p>";
+				echo "<a href=\"{$file->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid, 'size' => 'large')) . "</a>";
+				echo "<p class=\"filerepo_timestamp\"><small><a href=\"{$vars['url']}pg/file/{$owner->username}\">{$owner->name}</a> {$friendlytime}</small></p>";
+				//get the number of comments
+				$numcomments = elgg_count_comments($file);
+				if ($numcomments)
+					echo "<p class=\"filerepo_comments\"><a href=\"{$file->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a></p>";
+
+
+			}
+			echo "</div>";
+			// echo elgg_view("search/gallery",array('info' => $info, 'icon' => $icon));
+			
+		} else {
+		
+			$info = "<p> <a href=\"{$file->getURL()}\">{$title}</a></p>";
+			$info .= "<p class=\"owner_timestamp\"><a href=\"{$vars['url']}pg/file/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
+			$numcomments = elgg_count_comments($file);
+			if ($numcomments)
+				$info .= ", <a href=\"{$file->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a>";
+			$info .= "</p>";
+			
+			// $icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'small'));
+			$icon = "<a href=\"{$file->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid, 'size' => 'small')) . "</a>";
+			
+			echo elgg_view_listing($icon, $info);
+		
+		}
+		
+	} else {							// Start main version
+	
+?>
+	<div class="filerepo_file">
+		<div class="filerepo_icon">
+					<a href="<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $file_guid; ?>"><?php 
+						
+						echo elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid)); 
+						
+					?></a>					
+		</div>
+		
+		<div class="filerepo_title_owner_wrapper">
+		<?php
+			//get the user and a link to their gallery
+			$user_gallery = $vars['url'] . "mod/file/search.php?md_type=simpletype&subtype=file&tag=image&owner_guid=" . $owner->guid . "&search_viewtype=gallery";
+		?>
+		<div class="filerepo_user_gallery_link"><a href="<?php echo $user_gallery; ?>"><?php echo sprintf(elgg_echo("file:user:gallery"),''); ?></a></div>
+		<div class="filerepo_title"><h2><a href="<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $file_guid; ?>"><?php echo $title; ?></a></h2></div>
+		<div class="filerepo_owner">
+				<?php
+
+					echo elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
+				
+				?>
+				<p class="filerepo_owner_details"><b><a href="<?php echo $vars['url']; ?>pg/file/<?php echo $owner->username; ?>"><?php echo $owner->name; ?></a></b><br />
+				<small><?php echo $friendlytime; ?></small></p>
+		</div>
+		</div>
+
+		
+		<div class="filerepo_maincontent">
+		
+				<div class="filerepo_description"><?php echo elgg_view('output/longtext', array('value' => $desc)); ?></div>
+				<div class="filerepo_tags">
+<?php
+
+		if (!empty($tags)) {
+
+?>
+		<div class="object_tag_string"><?php
+
+					echo elgg_view('output/tags',array('value' => $tags));
+				
+				?></div>
+<?php
+		}
+
+		$categories = elgg_view('categories/view',$vars);
+		if (!empty($categories)) {
+?>
+		<div class="filerepo_categories">
+			<?php
+
+				echo $categories;
+			
+			?>
+		</div>
+<?php
+		}
+
+?>
+				</div>
+		<?php 
+			if (elgg_view_exists('file/specialcontent/' . $mime)) {
+				echo "<div class=\"filerepo_specialcontent\">".elgg_view('file/specialcontent/' . $mime, $vars)."</div>";
+			} else if (elgg_view_exists("file/specialcontent/" . substr($mime,0,strpos($mime,'/')) . "/default")) {
+				echo "<div class=\"filerepo_specialcontent\">".elgg_view("file/specialcontent/" . substr($mime,0,strpos($mime,'/')) . "/default", $vars)."</div>";
+			}
+		
+		?>
+		
+		<div class="filerepo_download"><p><a href="<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $file_guid; ?>"><?php echo elgg_echo("file:download"); ?></a></p></div>
+		
+<?php
+
+	if ($file->canEdit()) {
+?>
+
+	<div class="filerepo_controls">
+				<p>
+					<a href="<?php echo $vars['url']; ?>mod/file/edit.php?file_guid=<?php echo $file->getGUID(); ?>"><?php echo elgg_echo('edit'); ?></a>&nbsp; 
+					<?php 
+						echo elgg_view('output/confirmlink',array(
+						
+							'href' => $vars['url'] . "action/file/delete?file=" . $file->getGUID(),
+							'text' => elgg_echo("delete"),
+							'confirm' => elgg_echo("file:delete:confirm"),
+							'is_action' => true,
+						
+						));  
+					?>
+				</p>
+	</div>
+
+<?php		
+	}
+
+?>
+	</div>
+</div>
+
+<?php
+
+	if ($vars['full']) {
+		
+		echo elgg_view_comments($file);
+		
+	}
+
+?>
+
+<?php
+
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/river/object/file/create.php b/mod/file/views/default/river/object/file/create.php
new file mode 100644
index 000000000..b0e2ca07b
--- /dev/null
+++ b/mod/file/views/default/river/object/file/create.php
@@ -0,0 +1,17 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid);
+	$object = get_entity($vars['item']->object_guid);
+	$url = $object->getURL();
+	$container = get_entity($object->container_guid);
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("file:river:created"),$url) . " " . elgg_echo("file:river:item");
+	$string .= " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+	if ($container && $container instanceof ElggGroup) {
+		$string .= ' ' . elgg_echo('groups:river:togroup') . " <a href=\"" . $container->getURL() ."\">". $container->name . "</a>";
+	}
+
+	echo $string;
+	
+?>
\ No newline at end of file
diff --git a/mod/file/views/default/widgets/filerepo/edit.php b/mod/file/views/default/widgets/filerepo/edit.php
new file mode 100644
index 000000000..35d633058
--- /dev/null
+++ b/mod/file/views/default/widgets/filerepo/edit.php
@@ -0,0 +1,25 @@
+<p>
+		<?php echo elgg_echo("file:num_files"); ?>:
+		<select name="params[num_display]">
+		    <option value="1" <?php if($vars['entity']->num_display == 1) echo "SELECTED"; ?>>1</option>
+		    <option value="2" <?php if($vars['entity']->num_display == 2) echo "SELECTED"; ?>>2</option>
+		    <option value="3" <?php if($vars['entity']->num_display == 3) echo "SELECTED"; ?>>3</option>
+		    <option value="4" <?php if($vars['entity']->num_display == 4) echo "SELECTED"; ?>>4</option>
+		    <option value="5" <?php if($vars['entity']->num_display == 5) echo "SELECTED"; ?>>5</option>
+		    <option value="6" <?php if($vars['entity']->num_display == 6) echo "SELECTED"; ?>>6</option>
+		    <option value="7" <?php if($vars['entity']->num_display == 7) echo "SELECTED"; ?>>7</option>
+		    <option value="8" <?php if($vars['entity']->num_display == 8) echo "SELECTED"; ?>>8</option>
+		    <option value="9" <?php if($vars['entity']->num_display == 9) echo "SELECTED"; ?>>9</option>
+		    <option value="10" <?php if($vars['entity']->num_display == 10) echo "SELECTED"; ?>>10</option>
+		    <option value="15" <?php if($vars['entity']->num_display == 15) echo "SELECTED"; ?>>15</option>
+		    <option value="20" <?php if($vars['entity']->num_display == 20) echo "SELECTED"; ?>>20</option>
+		</select>
+</p>
+
+<p>
+    <?php echo elgg_echo("file:gallery_list"); ?>?
+    <select name="params[gallery_list]">
+        <option value="1" <?php if($vars['entity']->gallery_list == 1) echo "SELECTED"; ?>><?php echo elgg_echo("file:list"); ?></option>
+	    <option value="2" <?php if($vars['entity']->gallery_list == 2) echo "SELECTED"; ?>><?php echo elgg_echo("file:gallery"); ?></option>
+    </select>
+</p>
\ No newline at end of file
diff --git a/mod/file/views/default/widgets/filerepo/view.php b/mod/file/views/default/widgets/filerepo/view.php
new file mode 100644
index 000000000..8113ea45a
--- /dev/null
+++ b/mod/file/views/default/widgets/filerepo/view.php
@@ -0,0 +1,86 @@
+<script type="text/javascript">
+$(document).ready(function () {
+
+$('a.show_file_desc').click(function () {
+	$(this.parentNode).children("[class=filerepo_listview_desc]").slideToggle("fast");
+	return false;
+});
+
+}); /* end document ready function */
+</script>
+
+
+<?php
+
+    //the page owner
+	$owner = $vars['entity']->owner_guid;
+	
+	//the number of files to display
+	$number = (int) $vars['entity']->num_display;
+	if (!$number)
+		$number = 1;
+	
+	//get the layout view which is set by the user in the edit panel
+	$get_view = (int) $vars['entity']->gallery_list;
+	if (!$get_view || $get_view == 1) {
+	    $view = "list";
+    }else{
+        $view = "gallery";
+    }
+
+	//get the user's files
+	$files = get_user_objects($vars['entity']->owner_guid, "file", $number, 0);
+	
+	//if there are some files, go get them
+	if ($files) {
+    	
+    	echo "<div id=\"filerepo_widget_layout\">";
+        
+        if($view == "gallery"){
+        
+        echo "<div class=\"filerepo_widget_galleryview\">";
+        	
+            //display in gallery mode
+            foreach($files as $f){
+            	
+                $mime = $f->mimetype;
+                echo "<a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a>";
+            				
+            }
+            
+            echo "</div>";
+            
+        }else{
+        	    
+            //display in list mode
+            foreach($files as $f){
+            	
+                $mime = $f->mimetype;
+                echo "<div class=\"filerepo_widget_singleitem\">";
+            	echo "<div class=\"filerepo_listview_icon\"><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
+            	echo "<div class=\"filerepo_widget_content\">";
+            	echo "<div class=\"filerepo_listview_title\"><p class=\"filerepo_title\">" . $f->title . "</p></div>";
+            	echo "<div class=\"filerepo_listview_date\"><p class=\"filerepo_timestamp\"><small>" . friendly_time($f->time_created) . "</small></p></div>";
+            	$description = $f->description;
+		        if (!empty($description)) echo "<a href=\"javascript:void(0);\" class=\"show_file_desc\">". elgg_echo('more') ."</a><br /><div class=\"filerepo_listview_desc\">" . $description . "</div>";
+		        echo "</div><div class=\"clearfloat\"></div></div>";
+            				
+        	}
+        	    
+        }
+        	
+        	
+        //get a link to the users files
+        $users_file_url = $vars['url'] . "pg/file/" . get_user($f->owner_guid)->username;
+        	
+        echo "<div class=\"filerepo_widget_singleitem_more\"><a href=\"{$users_file_url}\">" . elgg_echo('file:more') . "</a></div>";
+        echo "</div>";
+        	
+				
+	} else {
+		
+		echo "<div class=\"contentWrapper\">" . elgg_echo("file:none") . "</div>";
+		
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/file/views/rss/object/file.php b/mod/file/views/rss/object/file.php
new file mode 100644
index 000000000..fdefb4069
--- /dev/null
+++ b/mod/file/views/rss/object/file.php
@@ -0,0 +1,30 @@
+<?php
+
+	/**
+	 * Elgg RSS file object view
+	 * 
+	 * @package ElggFile
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	$title = $vars['entity']->title;
+	if (empty($title)) {
+		$title = substr($vars['entity']->description,0,32);
+		if (strlen($vars['entity']->description) > 32)
+			$title .= " ...";
+	}
+
+?>
+
+	<item>
+	  <guid isPermaLink='true'><?php echo $vars['entity']->getURL(); ?></guid>
+	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>
+	  <link><?php echo $vars['entity']->getURL(); ?></link>
+	  <title><![CDATA[<?php echo $title; ?>]]></title>
+	  <description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
+	  <enclosure url="<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" length="<?php echo $vars['entity']->size(); ?>" type="<?php echo $vars['entity']->getMimeType(); ?>" />
+	</item>
diff --git a/mod/file/world.php b/mod/file/world.php
new file mode 100644
index 000000000..8b5e2cb0c
--- /dev/null
+++ b/mod/file/world.php
@@ -0,0 +1,40 @@
+<?php
+	/**
+	 * Elgg file browser
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010 - 2009
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	
+	$limit = get_input("limit", 10);
+	$offset = get_input("offset", 0);
+	$tag = get_input("tag");
+	
+	// Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($_SESSION['guid']);
+		}
+	
+	$title = elgg_echo('file:all');
+	
+	// Get objects
+	$area2 = elgg_view_title($title);
+	$area1 = get_filetype_cloud(); // the filter
+	set_context('search');
+	if ($tag != "")
+		$area2 .= list_entities_from_metadata('tags',$tag,'object','file',0,10,false);
+	else
+		$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'limit' => 10, 'full_view' => FALSE));
+	set_context('file');
+		
+	$body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+
+	// Finally draw the page
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/friends/add.php b/mod/friends/add.php
new file mode 100644
index 000000000..aec720811
--- /dev/null
+++ b/mod/friends/add.php
@@ -0,0 +1,29 @@
+<?php
+
+	/**
+	 * Elgg add a collection of friends
+	 * 
+	 * @package ElggFriends
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Start engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// You need to be logged in for this one
+		gatekeeper();
+		
+		$area1 = elgg_view_title(elgg_echo('friends:new'));
+		
+	    $area2 = elgg_view('friends/forms/edit', array('friends' => get_user_friends($_SESSION['user']->getGUID(),"",9999)));
+		
+	// Format page
+		$body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+		
+	// Draw it
+		page_draw(elgg_echo('friends:add'),$body);
+
+?>
\ No newline at end of file
diff --git a/mod/friends/collections.php b/mod/friends/collections.php
new file mode 100644
index 000000000..f80eea55c
--- /dev/null
+++ b/mod/friends/collections.php
@@ -0,0 +1,29 @@
+<?php
+
+	/**
+	 * Elgg collections of friends
+	 * 
+	 * @package ElggFriends
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Start engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// You need to be logged in for this one
+		gatekeeper();
+		
+		$area1 = elgg_view_title(elgg_echo('friends:new'));
+	    
+		$area2 = elgg_view_access_collections($_SESSION['user']->getGUID());
+		
+	// Format page
+		$body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+		
+	// Draw it
+		page_draw(elgg_echo('friends:add'),$body);
+
+?>
\ No newline at end of file
diff --git a/mod/friends/edit.php b/mod/friends/edit.php
new file mode 100644
index 000000000..6be47f4d1
--- /dev/null
+++ b/mod/friends/edit.php
@@ -0,0 +1,38 @@
+<?php
+
+	/**
+	 * Elgg add a collection of friends
+	 * 
+	 * @package ElggFriends
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Start engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// You need to be logged in for this one
+		gatekeeper();
+		
+		//set the title
+		$area1 = elgg_view_title(elgg_echo('friends:collectionedit'), false);
+		
+		//grab the collection id passed to the edit form
+		$collection_id = get_input('collection');
+		
+		//get the full collection
+		$collection = get_access_collection($collection_id);
+		//get all members of the collection
+		$collection_members = get_members_of_access_collection($collection_id);
+		
+	    $area2 = elgg_view('friends/forms/edit', array('collection' => $collection, 'collection_members' => $collection_members));
+		
+	// Format page
+		$body = elgg_view_layout('two_column_left_sidebar',$area1. $area2);
+		
+	// Draw it
+		page_draw(elgg_echo('friends:add'),$body);
+
+?>
\ No newline at end of file
diff --git a/mod/friends/languages/en.php b/mod/friends/languages/en.php
new file mode 100644
index 000000000..aa0945656
--- /dev/null
+++ b/mod/friends/languages/en.php
@@ -0,0 +1,15 @@
+<?php
+
+	$english = array(
+	
+		/**
+		 * Friends widget
+		 */
+			'friends:widget:description' => "Displays some of your friends.",
+	        
+		
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/friends/manifest.xml b/mod/friends/manifest.xml
new file mode 100644
index 000000000..faed8ce63
--- /dev/null
+++ b/mod/friends/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+	<field key="author" value="Curverider ltd" />
+	<field key="version" value="1.7" />
+	<field key="description" value="Provides friend widgets for your profile" />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(c) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/friends/start.php b/mod/friends/start.php
new file mode 100644
index 000000000..631b54c1d
--- /dev/null
+++ b/mod/friends/start.php
@@ -0,0 +1,26 @@
+<?php
+
+	/**
+	 * Elgg Friends widget
+	 * This plugin allows users to put a list of their friends, on their profile
+	 * 
+	 * @package ElggFriends
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	
+		function friends_init() {
+    		
+    		// Load system configuration
+				global $CONFIG;
+    		
+    		//add a widget
+			    add_widget_type('friends',elgg_echo("friends"),elgg_echo('friends:widget:description'));
+			
+		}
+		
+		register_elgg_event_handler('init','system','friends_init');
+        
+?>
\ No newline at end of file
diff --git a/mod/friends/views/default/widgets/friends/edit.php b/mod/friends/views/default/widgets/friends/edit.php
new file mode 100644
index 000000000..0d9d44136
--- /dev/null
+++ b/mod/friends/views/default/widgets/friends/edit.php
@@ -0,0 +1,44 @@
+<?php
+
+    /**
+	 * Elgg Friends
+	 * Friend widget options
+	 * 
+	 * @package ElggFriends
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+	 
+?>
+
+<p>
+		<?php echo elgg_echo("friends:num_display"); ?>:
+		<select name="params[num_display]">
+			<option value="1" <?php if($vars['entity']->num_display == 1) echo "SELECTED"; ?>>1</option>
+			<option value="2" <?php if($vars['entity']->num_display == 2) echo "SELECTED"; ?>>2</option>
+			<option value="3" <?php if($vars['entity']->num_display == 3) echo "SELECTED"; ?>>3</option>
+			<option value="4" <?php if($vars['entity']->num_display == 4) echo "SELECTED"; ?>>4</option>
+			<option value="5" <?php if($vars['entity']->num_display == 5) echo "SELECTED"; ?>>5</option>
+			<option value="6" <?php if($vars['entity']->num_display == 6) echo "SELECTED"; ?>>6</option>
+			<option value="7" <?php if($vars['entity']->num_display == 7) echo "SELECTED"; ?>>7</option>
+			<option value="8" <?php if($vars['entity']->num_display == 8) echo "SELECTED"; ?>>8</option>
+			<option value="9" <?php if($vars['entity']->num_display == 9) echo "SELECTED"; ?>>9</option>
+			<option value="10" <?php if($vars['entity']->num_display == 10) echo "SELECTED"; ?>>10</option>
+			<option value="15" <?php if($vars['entity']->num_display == 15) echo "SELECTED"; ?>>15</option>
+			<option value="20" <?php if($vars['entity']->num_display == 20) echo "SELECTED"; ?>>20</option>
+			<option value="30" <?php if($vars['entity']->num_display == 30) echo "SELECTED"; ?>>30</option>
+			<option value="50" <?php if($vars['entity']->num_display == 50) echo "SELECTED"; ?>>50</option>
+			<option value="100" <?php if($vars['entity']->num_display == 100) echo "SELECTED"; ?>>100</option>
+		</select>
+</p>
+
+<p>
+    <?php echo elgg_echo("friends:icon_size"); ?>
+    <select name="params[icon_size]">
+        <option value="1" <?php if($vars['entity']->icon_size == 1) echo "SELECTED"; ?>><?php echo elgg_echo("friends:small"); ?></option>
+	    <option value="2" <?php if($vars['entity']->icon_size == 2) echo "SELECTED"; ?>><?php echo elgg_echo("friends:tiny"); ?></option>
+    </select>
+</p>
\ No newline at end of file
diff --git a/mod/friends/views/default/widgets/friends/view.php b/mod/friends/views/default/widgets/friends/view.php
new file mode 100644
index 000000000..ab702399a
--- /dev/null
+++ b/mod/friends/views/default/widgets/friends/view.php
@@ -0,0 +1,50 @@
+<?php
+
+    /**
+	 * Elgg Friends
+	 * Friend widget options
+	 * 
+	 * @package ElggFriends
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+	
+
+    //the page owner
+	$owner = get_user($vars['entity']->owner_guid);
+
+    //the number of files to display
+	$num = (int) $vars['entity']->num_display;
+	if (!$num)
+		$num = 8;
+		
+	//get the correct size
+	$size = (int) $vars['entity']->icon_size;
+	if (!$size || $size == 1){
+		$size_value = "small";
+	}else{
+    	$size_value = "tiny";
+	}
+		
+    // Get the users friends
+	$friends = $owner->getFriends("", $num, $offset = 0);
+		
+	// If there are any $friend to view, view them
+	if (is_array($friends) && sizeof($friends) > 0) {
+
+		echo "<div id=\"widget_friends_list\">";
+
+		foreach($friends as $friend) {
+			echo "<div class=\"widget_friends_singlefriend\" >";
+			echo elgg_view("profile/icon",array('entity' => get_user($friend->guid), 'size' => $size_value));
+			echo "</div>";
+		}
+
+		echo "</div>";
+			
+    }
+	
+?>
\ No newline at end of file
diff --git a/mod/groups/actions/addtogroup.php b/mod/groups/actions/addtogroup.php
new file mode 100644
index 000000000..0b99ea917
--- /dev/null
+++ b/mod/groups/actions/addtogroup.php
@@ -0,0 +1,96 @@
+<?php
+
+	/**
+	 * Add a user to a group
+	 *
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load configuration
+	global $CONFIG;
+
+	gatekeeper();
+
+	$logged_in_user = get_loggedin_user();
+
+	$user_guid = get_input('user_guid');
+	if (!is_array($user_guid))
+		$user_guid = array($user_guid);
+	$group_guid = get_input('group_guid');
+
+	if (sizeof($user_guid))
+	{
+		foreach ($user_guid as $u_id)
+		{
+			$user = get_entity($u_id);
+			$group = get_entity($group_guid);
+
+			if ( $user && $group) {
+
+				//if (get_loggedin_userid() == $group->owner_guid)
+				if ($group->canEdit())
+				{
+
+					// If the group is open or the user has requested membership
+					if (
+						(check_entity_relationship($user->guid, 'membership_request', $group->guid)) ||
+						($group->isPublicMembership())
+						)
+					{
+
+						if (!$group->isMember($user))
+						{
+							// Remove relationships
+							remove_entity_relationship($group->guid, 'invited', $user->guid);
+							remove_entity_relationship($user->guid, 'membership_request', $group->guid);
+
+							//add_entity_relationship($user->guid, 'member', $group->guid);
+							$group->join($user);
+
+							// send welcome email
+							notify_user($user->getGUID(), $group->owner_guid,
+								sprintf(elgg_echo('groups:welcome:subject'), $group->name),
+								sprintf(elgg_echo('groups:welcome:body'), $user->name, $logged_in_user->name, $group->name, $group->getURL()),
+								NULL);
+
+							system_message(elgg_echo('groups:addedtogroup'));
+						}
+						else
+							register_error(elgg_echo("groups:cantjoin"));
+					}
+					else
+					{
+						if ($user->isFriend())
+						{
+
+							// Create relationship
+							add_entity_relationship($group->guid, 'invited', $user->guid);
+
+							// Send email
+							$url = "{$CONFIG->url}pg/groups/invited?user_guid={$user->guid}&group_guid={$group->guid}";
+							if (notify_user($user->getGUID(), $group->owner_guid,
+									sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->name),
+									sprintf(elgg_echo('groups:invite:body'), $user->name, $logged_in_user->name, $group->name, $url),
+									NULL))
+								system_message(elgg_echo("groups:userinvited"));
+							else
+								register_error(elgg_echo("groups:usernotinvited"));
+
+						}
+						else
+							register_error(elgg_echo("groups:usernotinvited"));
+					}
+				}
+				else
+					register_error(elgg_echo("groups:notowner"));
+			}
+		}
+	}
+
+	forward($_SERVER['HTTP_REFERER']);
+
+?>
diff --git a/mod/groups/actions/delete.php b/mod/groups/actions/delete.php
new file mode 100644
index 000000000..b4bc71838
--- /dev/null
+++ b/mod/groups/actions/delete.php
@@ -0,0 +1,19 @@
+<?php
+	global $CONFIG;
+		
+	$guid = (int)get_input('group_guid');
+	$entity = get_entity($guid);
+	
+	if (($entity) && ($entity instanceof ElggGroup))
+	{
+		if ($entity->delete())
+			system_message(elgg_echo('group:deleted'));
+		else
+			register_error(elgg_echo('group:notdeleted'));
+	}
+	else
+		register_error(elgg_echo('group:notdeleted'));
+		
+	$url_name = $_SESSION['user']->username;
+	forward("{$vars['url']}pg/groups/member/{$url_name}");
+?>
\ No newline at end of file
diff --git a/mod/groups/actions/edit.php b/mod/groups/actions/edit.php
new file mode 100644
index 000000000..b6eb3eb71
--- /dev/null
+++ b/mod/groups/actions/edit.php
@@ -0,0 +1,153 @@
+<?php
+	/**
+	 * Elgg groups plugin edit action.
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load configuration
+	global $CONFIG;
+	
+	// Get group fields
+	$input = array();
+	foreach($CONFIG->group as $shortname => $valuetype) {
+		$input[$shortname] = get_input($shortname);
+		if ($valuetype == 'tags')
+			$input[$shortname] = string_to_tag_array($input[$shortname]);
+	}
+	
+	$user_guid = get_input('user_guid');
+	$user = NULL;
+	if (!$user_guid) $user = $_SESSION['user'];
+	else
+		$user = get_entity($user_guid);
+		
+	$group_guid = get_input('group_guid');
+	
+	$group = new ElggGroup($group_guid); // load if present, if not create a new group
+	if (($group_guid) && (!$group->canEdit()))
+	{
+		register_error(elgg_echo("groups:cantedit"));
+		
+		forward($_SERVER['HTTP_REFERER']);
+		exit;
+	}
+	
+	// Assume we can edit or this is a new group
+	if (sizeof($input) > 0)
+	{
+		foreach($input as $shortname => $value) {
+			$group->$shortname = $value;
+		}
+	}
+	
+	// Validate create
+	if (!$group->name)
+	{
+		register_error(elgg_echo("groups:notitle"));
+		
+		forward($_SERVER['HTTP_REFERER']);
+		exit;
+	}
+	
+	// Group membership - should these be treated with same constants as access permissions?
+	switch (get_input('membership'))
+	{
+		case ACCESS_PUBLIC: 
+			$group->membership = ACCESS_PUBLIC; 
+			break;
+		default: 
+			$group->membership = ACCESS_PRIVATE; 
+	}
+	
+	// Set access - all groups are public from elgg's point of view, unless the override is in place
+
+	if (get_plugin_setting('hidden_groups', 'groups') == 'yes')
+	{
+		$visibility = (int)get_input('vis','',false);
+		
+		$group->access_id = $visibility;
+	}
+	else
+		$group->access_id = ACCESS_PUBLIC;
+	
+	// Set group tool options
+	//$group->files_enable = get_input('files_enable', 'yes');
+	//$group->pages_enable = get_input('pages_enable', 'yes');
+	//$group->forum_enable = get_input('forum_enable', 'yes');
+	
+	// Set group tool options
+	if (isset($CONFIG->group_tool_options)) {
+		foreach($CONFIG->group_tool_options as $group_option) {
+			$group_option_toggle_name = $group_option->name."_enable";
+			if ($group_option->default_on) {
+				$group_option_default_value = 'yes';
+			} else {
+				$group_option_default_value = 'no';
+			}
+			$group->$group_option_toggle_name = get_input($group_option_toggle_name, $group_option_default_value);
+		}
+	}	
+
+	$group->save();
+	
+	if (!$group->isMember($user))
+		$group->join($user); // Creator always a member
+	
+	
+	// Now see if we have a file icon
+	if ((isset($_FILES['icon'])) && (substr_count($_FILES['icon']['type'],'image/')))
+	{
+		$prefix = "groups/".$group->guid;
+		
+		$filehandler = new ElggFile();
+		$filehandler->owner_guid = $group->owner_guid;
+		$filehandler->setFilename($prefix . ".jpg");
+		$filehandler->open("write");
+		$filehandler->write(get_uploaded_file('icon'));
+		$filehandler->close();
+		
+		$thumbtiny = get_resized_image_from_existing_file($filehandler->getFilenameOnFilestore(),25,25, true);
+		$thumbsmall = get_resized_image_from_existing_file($filehandler->getFilenameOnFilestore(),40,40, true);
+		$thumbmedium = get_resized_image_from_existing_file($filehandler->getFilenameOnFilestore(),100,100, true);
+		$thumblarge = get_resized_image_from_existing_file($filehandler->getFilenameOnFilestore(),200,200, false);
+		if ($thumbtiny) {
+			
+			$thumb = new ElggFile();
+			$thumb->owner_guid = $group->owner_guid;
+			$thumb->setMimeType('image/jpeg');
+			
+			$thumb->setFilename($prefix."tiny.jpg");
+			$thumb->open("write");
+			$thumb->write($thumbtiny);
+			$thumb->close();
+			
+			$thumb->setFilename($prefix."small.jpg");
+			$thumb->open("write");
+			$thumb->write($thumbsmall);
+			$thumb->close();
+			
+			$thumb->setFilename($prefix."medium.jpg");
+			$thumb->open("write");
+			$thumb->write($thumbmedium);
+			$thumb->close();
+			
+			$thumb->setFilename($prefix."large.jpg");
+			$thumb->open("write");
+			$thumb->write($thumblarge);
+			$thumb->close();
+			
+			$group->icontime = time();
+		}
+	}
+	
+	system_message(elgg_echo("groups:saved"));
+	
+	// Forward to the user's profile
+	forward($group->getUrl());
+	exit;
+?>
diff --git a/mod/groups/actions/featured.php b/mod/groups/actions/featured.php
new file mode 100644
index 000000000..2d16113df
--- /dev/null
+++ b/mod/groups/actions/featured.php
@@ -0,0 +1,44 @@
+<?php
+	
+	/**
+	 * Join a group action.
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load configuration
+	global $CONFIG;
+	
+	admin_gatekeeper();
+	
+	$group_guid = get_input('group_guid');
+	$action = get_input('action');
+	
+	$group = get_entity($group_guid);
+	
+	if($group){
+		
+		//get the action, is it to feature or unfeature
+		if($action == "feature"){
+		
+			$group->featured_group = "yes";
+			system_message(elgg_echo('groups:featuredon'));
+			
+		}
+		
+		if($action == "unfeature"){
+			
+			$group->featured_group = "no";
+			system_message(elgg_echo('groups:unfeatured'));
+			
+		}
+		
+	}
+	
+	forward("pg/groups/world/");
+	
+?>
\ No newline at end of file
diff --git a/mod/groups/actions/forums/addpost.php b/mod/groups/actions/forums/addpost.php
new file mode 100644
index 000000000..c277b795d
--- /dev/null
+++ b/mod/groups/actions/forums/addpost.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Elgg groups: add post to a topic 
+ *
+ * @package ElggGroups
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
+
+// Make sure we're logged in and have a CSRF token
+gatekeeper();
+
+// Get input
+$topic_guid = (int) get_input('topic_guid');
+$group_guid = (int) get_input('group_guid');
+$post = get_input('topic_post');
+
+
+// make sure we have text in the post
+if (!$post) {
+	register_error(elgg_echo("grouppost:nopost"));
+	forward($_SERVER['HTTP_REFERER']);
+}
+
+
+// Check that user is a group member
+$group = get_entity($group_guid);
+$user = get_loggedin_user();
+if (!$group->isMember($user)) {
+	register_error(elgg_echo("groups:notmember"));
+	forward($_SERVER['HTTP_REFERER']);
+}
+
+
+// Let's see if we can get an form topic with the specified GUID, and that it's a group forum topic
+$topic = get_entity($topic_guid);
+if (!$topic || $topic->getSubtype() != "groupforumtopic") {
+	register_error(elgg_echo("grouptopic:notfound"));
+	forward($_SERVER['HTTP_REFERER']);
+}
+
+
+// add the post to the forum topic
+$post_id = $topic->annotate('group_topic_post', $post, $topic->access_id, $user->guid);
+if ($post_id == false) {
+	system_message(elgg_echo("groupspost:failure"));
+	forward($_SERVER['HTTP_REFERER']);
+}
+
+// add to river
+add_to_river('river/forum/create', 'create', $user->guid, $topic_guid, "", 0, $post_id);
+
+system_message(elgg_echo("groupspost:success"));
+
+forward($_SERVER['HTTP_REFERER']);
diff --git a/mod/groups/actions/forums/addtopic.php b/mod/groups/actions/forums/addtopic.php
new file mode 100644
index 000000000..740ea17aa
--- /dev/null
+++ b/mod/groups/actions/forums/addtopic.php
@@ -0,0 +1,81 @@
+<?php
+
+    /**
+	 * Elgg groups plugin add topic action.
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Make sure we're logged in; forward to the front page if not
+		if (!isloggedin()) forward();
+		
+	// Check the user is a group member
+	    $group_entity =  get_entity(get_input('group_guid'));
+	    if (!$group_entity->isMember($vars['user'])) forward();
+	    
+	// Get input data
+	    $title = get_input('topictitle');
+		$message = get_input('topicmessage');
+		$tags = get_input('topictags');
+		$access = get_input('access_id');
+		$group_guid = (int) get_input('group_guid');
+		$user = $_SESSION['user']->getGUID(); // you need to be logged in to comment on a group forum
+		$status = get_input('status'); // sticky, resolved, closed
+		
+	// Convert string of tags into a preformatted array
+		 $tagarray = string_to_tag_array($tags);
+		
+	// Make sure the title / message aren't blank
+		if (empty($title) || empty($message)) {
+			register_error(elgg_echo("grouptopic:blank"));
+			forward("pg/groups/forum/{$group_guid}/");
+			
+	// Otherwise, save the topic
+		} else {
+			
+	// Initialise a new ElggObject
+			$grouptopic = new ElggObject();
+	// Tell the system it's a group forum topic
+			$grouptopic->subtype = "groupforumtopic";
+	// Set its owner to the current user
+			$grouptopic->owner_guid = $user;
+	// Set the group it belongs to
+			$grouptopic->container_guid = $group_guid;
+	// For now, set its access to public (we'll add an access dropdown shortly)
+			$grouptopic->access_id = $access;
+	// Set its title and description appropriately
+			$grouptopic->title = $title;
+	// Before we can set metadata, we need to save the topic
+			if (!$grouptopic->save()) {
+				register_error(elgg_echo("grouptopic:error"));
+				forward("pg/groups/forum/{$group_guid}/");
+			}
+	// Now let's add tags. We can pass an array directly to the object property! Easy.
+			if (is_array($tagarray)) {
+				$grouptopic->tags = $tagarray;
+			}
+	// add metadata
+	        $grouptopic->status = $status; // the current status i.e sticky, closed, resolved, open
+	           
+    // now add the topic message as an annotation
+        	$grouptopic->annotate('group_topic_post',$message,$access, $user);   
+        	
+    // add to river
+	        add_to_river('river/forum/topic/create','create',$_SESSION['user']->guid,$grouptopic->guid);
+	        
+	// Success message
+			system_message(elgg_echo("grouptopic:created"));
+			
+	// Forward to the group forum page
+	        global $CONFIG;
+	        $url = $CONFIG->wwwroot . "pg/groups/forum/{$group_guid}/";
+			forward($url);
+				
+		}
+		
+?>
+
diff --git a/mod/groups/actions/forums/deletepost.php b/mod/groups/actions/forums/deletepost.php
new file mode 100644
index 000000000..4066b7456
--- /dev/null
+++ b/mod/groups/actions/forums/deletepost.php
@@ -0,0 +1,44 @@
+<?php
+
+	/**
+	 * Elgg Groups: delete topic comment action
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Ensure we're logged in
+		if (!isloggedin()) forward();
+		
+  
+	// Make sure we can get the comment in question
+		$post_id = (int) get_input('post');
+		$group_guid = (int) get_input('group');
+		$topic_guid = (int) get_input('topic');
+		
+		if ($post = get_annotation($post_id)) {
+			
+			//check that the user can edit as well as admin
+			if ($post->canEdit() || ($post->owner_guid == $_SESSION['user']->guid)) {
+    			
+    			//delete
+				$post->delete();
+				//display confirmation message
+				system_message(elgg_echo("grouppost:deleted"));
+				
+			}
+			
+		} else {
+			$url = "";
+			system_message(elgg_echo("grouppost:notdeleted"));
+		}
+		
+    // Forward to the group forum page
+    global $CONFIG;
+	$url = $CONFIG->wwwroot . "mod/groups/topicposts.php?topic={$topic_guid}&group_guid={$group_guid}";
+	forward($url);
+
+?>
\ No newline at end of file
diff --git a/mod/groups/actions/forums/deletetopic.php b/mod/groups/actions/forums/deletetopic.php
new file mode 100644
index 000000000..1095fc44a
--- /dev/null
+++ b/mod/groups/actions/forums/deletetopic.php
@@ -0,0 +1,45 @@
+<?php
+
+	/**
+	 * Elgg Groups: delete topic action
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in; forward to the front page if not
+		if (!isloggedin()) forward();
+		
+	// Check the user is a group member
+	    $group_entity =  get_entity(get_input('group'));
+	    if (!$group_entity->isMember($vars['user'])) forward();
+
+	// Get input data
+		$topic_guid = (int) get_input('topic');
+		$group_guid = (int) get_input('group');
+		
+	// Make sure we actually have permission to edit
+		$topic = get_entity($topic_guid);
+		if ($topic->getSubtype() == "groupforumtopic") {
+	
+		// Get owning user
+			//	$owner = get_entity($topic->getOwner());
+		// Delete it!
+				$rowsaffected = $topic->delete();
+				if ($rowsaffected > 0) {
+		// Success message
+					system_message(elgg_echo("groupstopic:deleted"));
+				} else {
+					system_message(elgg_echo("groupstopic:notdeleted"));
+				}
+		// Forward to the group forum page
+	        global $CONFIG;
+	        $url = $CONFIG->wwwroot . "pg/groups/forum/{$group_guid}/";
+			forward($url);
+		
+		}
+		
+?>
\ No newline at end of file
diff --git a/mod/groups/actions/forums/editpost.php b/mod/groups/actions/forums/editpost.php
new file mode 100644
index 000000000..d30fad31f
--- /dev/null
+++ b/mod/groups/actions/forums/editpost.php
@@ -0,0 +1,53 @@
+<?php
+
+    /**
+	 * Elgg groups plugin edit post action.
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+    // Make sure we're logged in (send us to the front page if not)
+		if (!isloggedin()) forward();
+		
+	// Check the user is a group member
+		$group_guid = get_input('group');
+	    $group_entity =  get_entity($group_guid);
+	    if (!$group_entity->isMember($vars['user'])) forward();
+	    
+	//get the required variables
+		$post = get_input("post");
+		$field_num = get_input("field_num");
+		$post_comment = get_input("postComment{$field_num}");
+		$annotation = get_annotation($post);
+		$commentOwner = $annotation->owner_guid;
+		$access_id = $annotation->access_id;
+		$topic = get_input("topic");
+		
+		if($annotation){
+			
+			//can edit? Either the comment owner or admin can
+			if(groups_can_edit_discussion($annotation, page_owner_entity()->owner_guid)){
+				
+				update_annotation($post, "group_topic_post", $post_comment, "",$commentOwner, $access_id);
+			    system_message(elgg_echo("groups:forumpost:edited"));
+				   
+			}else{
+				system_message(elgg_echo("groups:forumpost:error"));
+			}
+			
+		}else{
+			
+				system_message(elgg_echo("groups:forumpost:error"));
+		}
+		
+		// Forward to the group forum page
+	    global $CONFIG;
+	    $url = $CONFIG->wwwroot . "mod/groups/topicposts.php?topic={$topic}&group_guid={$group_guid}/";
+		forward($url);
+  
+		
+?>
\ No newline at end of file
diff --git a/mod/groups/actions/forums/edittopic.php b/mod/groups/actions/forums/edittopic.php
new file mode 100644
index 000000000..2898c31dc
--- /dev/null
+++ b/mod/groups/actions/forums/edittopic.php
@@ -0,0 +1,87 @@
+<?php
+
+    /**
+	 * Elgg groups plugin edit topic action.
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+    // Make sure we're logged in (send us to the front page if not)
+		if (!isloggedin()) forward();
+		
+	// Check the user is a group member
+	    $group_entity =  get_entity(get_input('group_guid'));
+	    if (!$group_entity->isMember($vars['user'])) forward();
+     
+
+	// Get input data
+	    $title = get_input('topictitle');
+		$message = get_input('topicmessage');
+		$message_id = get_input('message_id');
+		$tags = get_input('topictags');
+		$topic_guid = get_input('topic');
+		$access = get_input('access_id');
+		$group_guid = get_input('group_guid');
+		//$user = $_SESSION['user']->getGUID(); // you need to be logged in to comment on a group forum
+		$status = get_input('status'); // sticky, resolved, closed
+		
+	// Convert string of tags into a preformatted array
+		 $tagarray = string_to_tag_array($tags);
+		
+	// Make sure we actually have permission to edit
+		$topic = get_entity($topic_guid);
+		if ($topic)
+		{
+		
+			$user = $topic->getOwner(); 
+			
+			if ($topic->getSubtype() == "groupforumtopic") {
+		
+			// Convert string of tags into a preformatted array
+				$tagarray = string_to_tag_array($tags);
+				
+			// Make sure the title isn't blank
+				if (empty($title) || empty($message)) {
+					register_error(elgg_echo("groupstopic:blank"));
+			
+			// Otherwise, save the forum
+				} else {
+					
+			        $topic->access_id = $access;
+					
+			// Set its title
+					$topic->title = $title;
+					
+			// if no tags are present, clear existing ones
+					if (is_array($tagarray)) {
+						$topic->tags = $tagarray;
+					} else $topic->clearMetadata('tags');
+					
+			// edit metadata
+			       $topic->status = $status; // the current status i.e sticky, closed, resolved
+			       
+	        // now let's edit the message annotation
+				   update_annotation($message_id, "group_topic_post", $message, "",$user, $access);
+			       
+			// save the changes
+	            if (!$topic->save()) {
+				//		register_error(elgg_echo("forumtopic:error"));
+				}
+				
+	           // Success message
+					system_message(elgg_echo("groups:forumtopic:edited"));
+					
+			    }
+	        }
+		}
+		// Forward to the group forum page
+	        global $CONFIG;
+	        $url = $CONFIG->wwwroot . "pg/groups/forum/{$group_guid}/";
+			forward($url);
+		
+?>
+
diff --git a/mod/groups/actions/groupskillinvitation.php b/mod/groups/actions/groupskillinvitation.php
new file mode 100644
index 000000000..78c920df0
--- /dev/null
+++ b/mod/groups/actions/groupskillinvitation.php
@@ -0,0 +1,32 @@
+<?php
+	/**
+	 * Delete an invitation to join a closed group.
+	 *
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load configuration
+	global $CONFIG;
+
+	gatekeeper();
+
+	$user_guid = get_input('user_guid', get_loggedin_userid());
+	$group_guid = get_input('group_guid');
+
+	$user = get_entity($user_guid);
+	$group = get_entity($group_guid);
+
+	// If join request made
+			if (check_entity_relationship($group->guid, 'invited', $user->guid))
+			{
+				remove_entity_relationship($group->guid, 'invited', $user->guid);
+				system_message(elgg_echo("groups:joinrequestkilled"));
+			}
+
+	forward($_SERVER['HTTP_REFERER']);
+
+?>
\ No newline at end of file
diff --git a/mod/groups/actions/groupskillrequest.php b/mod/groups/actions/groupskillrequest.php
new file mode 100644
index 000000000..03a318e4a
--- /dev/null
+++ b/mod/groups/actions/groupskillrequest.php
@@ -0,0 +1,32 @@
+<?php
+	/**
+	 * Delete a user request to join a closed group.
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load configuration
+	global $CONFIG;
+	
+	gatekeeper();
+	
+	$user_guid = get_input('user_guid', get_loggedin_userid());
+	$group_guid = get_input('group_guid');
+	
+	$user = get_entity($user_guid);
+	$group = get_entity($group_guid);
+	
+	// If join request made
+			if (check_entity_relationship($user->guid, 'membership_request', $group->guid))
+			{
+				remove_entity_relationship($user->guid, 'membership_request', $group->guid);
+				system_message(elgg_echo("groups:joinrequestkilled"));
+			}
+	
+	forward($_SERVER['HTTP_REFERER']);
+	
+?>
\ No newline at end of file
diff --git a/mod/groups/actions/invite.php b/mod/groups/actions/invite.php
new file mode 100644
index 000000000..d2fd75c28
--- /dev/null
+++ b/mod/groups/actions/invite.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * Invite a user to join a group
+ *
+ * @package ElggGroups
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+// Load configuration
+global $CONFIG;
+
+gatekeeper();
+
+$logged_in_user = get_loggedin_user();
+
+$user_guid = get_input('user_guid');
+if (!is_array($user_guid))
+	$user_guid = array($user_guid);
+$group_guid = get_input('group_guid');
+
+if (sizeof($user_guid))
+{
+	foreach ($user_guid as $u_id)
+	{
+		$user = get_entity($u_id);
+		$group = get_entity($group_guid);
+
+		if ( $user && $group) {
+
+			if (get_loggedin_userid() == $group->owner_guid)
+			{
+				if (!check_entity_relationship($group->guid, 'invited', $user->guid))
+				{
+					if ($user->isFriend())
+					{
+
+						// Create relationship
+						add_entity_relationship($group->guid, 'invited', $user->guid);
+
+						// Send email
+						$url = "{$CONFIG->url}pg/groups/invitations/{$user->username}";
+						if (notify_user($user->getGUID(), $group->owner_guid,
+								sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->name),
+								sprintf(elgg_echo('groups:invite:body'), $user->name, $logged_in_user->name, $group->name, $url),
+								NULL))
+							system_message(elgg_echo("groups:userinvited"));
+						else
+							register_error(elgg_echo("groups:usernotinvited"));
+
+					}
+					else
+						register_error(elgg_echo("groups:usernotinvited"));
+				}
+				else
+					register_error(elgg_echo("groups:useralreadyinvited"));
+			}
+			else
+				register_error(elgg_echo("groups:notowner"));
+		}
+	}
+}
+
+forward($_SERVER['HTTP_REFERER']);
+
+?>
diff --git a/mod/groups/actions/join.php b/mod/groups/actions/join.php
new file mode 100644
index 000000000..3947f8efc
--- /dev/null
+++ b/mod/groups/actions/join.php
@@ -0,0 +1,65 @@
+<?php
+	/**
+	 * Join a group action.
+	 *
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load configuration
+	global $CONFIG;
+
+	gatekeeper();
+
+	$user_guid = get_input('user_guid', get_loggedin_userid());
+	$group_guid = get_input('group_guid');
+
+	// @todo fix for #287
+	// disable access to get entity.
+	$invitations = groups_get_invited_groups($user_guid, TRUE);
+
+	if (in_array($group_guid, $invitations)) {
+		$ia = elgg_set_ignore_access(TRUE);
+	}
+
+	$user = get_entity($user_guid);
+	$group = get_entity($group_guid);
+
+	if (($user instanceof ElggUser) && ($group instanceof ElggGroup))
+	{
+		if ($group->isPublicMembership())
+		{
+			if ($group->join($user))
+			{
+				system_message(elgg_echo("groups:joined"));
+
+				// Remove any invite or join request flags
+				remove_entity_relationship($group->guid, 'invited', $user->guid);
+				remove_entity_relationship($user->guid, 'membership_request', $group->guid);
+
+				// add to river
+				add_to_river('river/group/create','join',$user->guid,$group->guid);
+
+				forward($group->getURL());
+				exit;
+			}
+			else
+				register_error(elgg_echo("groups:cantjoin"));
+		}
+		else
+		{
+			// Closed group, request membership
+			system_message(elgg_echo('groups:privategroup'));
+			forward(elgg_add_action_tokens_to_url($CONFIG->url . "action/groups/joinrequest?user_guid=$user_guid&group_guid=$group_guid"));
+			exit;
+		}
+	}
+	else
+		register_error(elgg_echo("groups:cantjoin"));
+
+	forward($_SERVER['HTTP_REFERER']);
+	exit;
+?>
diff --git a/mod/groups/actions/joinrequest.php b/mod/groups/actions/joinrequest.php
new file mode 100644
index 000000000..51c400223
--- /dev/null
+++ b/mod/groups/actions/joinrequest.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * User requests to join a closed group.
+ *
+ * @package ElggGroups
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+// Load configuration
+global $CONFIG;
+
+gatekeeper();
+
+$user_guid = get_input('user_guid', get_loggedin_userid());
+$group_guid = get_input('group_guid');
+
+
+// @todo fix for #287
+// disable access to get entity.
+$invitations = groups_get_invited_groups($user_guid, TRUE);
+
+if (in_array($group_guid, $invitations)) {
+	$ia = elgg_set_ignore_access(TRUE);
+}
+
+
+$user = get_entity($user_guid);
+$group = get_entity($group_guid);
+
+// If not a member of this group
+if (($group) && ($user) && (!$group->isMember($user)))
+{
+	// If open group or invite exists
+	if (
+		($group->isPublicMembership()) ||
+		(check_entity_relationship($group->guid, 'invited', $user->guid))
+	)
+	{
+		//$ia = elgg_set_ignore_access(TRUE);
+		if ($group->join($user))
+		{
+			// Remove relationships
+			remove_entity_relationship($group->guid, 'invited', $user->guid);
+			remove_entity_relationship($user->guid, 'membership_request', $group->guid);
+
+			// Group joined
+			system_message(elgg_echo('groups:joined'));
+			elgg_set_ignore_access($ia);
+
+			forward($group->getURL());
+			exit;
+		}
+		else {
+			elgg_set_ignore_access($ia);
+			system_message(elgg_echo('groups:cantjoin'));
+		}
+	}
+	else
+	{
+		// If join request not already made
+		if (!check_entity_relationship($user->guid, 'membership_request', $group->guid))
+		{
+			// Add membership requested
+			add_entity_relationship($user->guid, 'membership_request', $group->guid);
+
+			// Send email
+			$url = "{$CONFIG->url}mod/groups/membershipreq.php?group_guid={$group->guid}";
+			if (notify_user($group->owner_guid, $user->getGUID(),
+					sprintf(elgg_echo('groups:request:subject'), $user->name, $group->name),
+					sprintf(elgg_echo('groups:request:body'), $group->getOwnerEntity()->name, $user->name, $group->name, $user->getURL(), $url),
+					NULL))
+				system_message(elgg_echo("groups:joinrequestmade"));
+			else
+				register_error(elgg_echo("groups:joinrequestnotmade"));
+		}
+		else
+			system_message(elgg_echo("groups:joinrequestmade"));
+	}
+}
+
+forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file
diff --git a/mod/groups/actions/leave.php b/mod/groups/actions/leave.php
new file mode 100644
index 000000000..b68eb7607
--- /dev/null
+++ b/mod/groups/actions/leave.php
@@ -0,0 +1,43 @@
+<?php
+	/**
+	 * Leave a group action.
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load configuration
+	global $CONFIG;
+	
+	gatekeeper();
+	
+	$user_guid = get_input('user_guid');
+	$group_guid = get_input('group_guid');
+	
+	$user = NULL;
+	if (!$user_guid) $user = $_SESSION['user'];
+	else
+		$user = get_entity($user_guid);
+		
+	$group = get_entity($group_guid);
+	
+	if (($user instanceof ElggUser) && ($group instanceof ElggGroup))
+	{
+		if ($group->getOwner() != $_SESSION['guid']) {
+			if ($group->leave($user))
+				system_message(elgg_echo("groups:left"));
+			else
+				register_error(elgg_echo("groups:cantleave"));
+		} else {
+			register_error(elgg_echo("groups:cantleave"));
+		}
+	}
+	else
+		register_error(elgg_echo("groups:cantleave"));
+		
+	forward($_SERVER['HTTP_REFERER']);
+	exit;
+?>
\ No newline at end of file
diff --git a/mod/groups/addtopic.php b/mod/groups/addtopic.php
new file mode 100644
index 000000000..39ef62eec
--- /dev/null
+++ b/mod/groups/addtopic.php
@@ -0,0 +1,29 @@
+<?php
+
+	/**
+	 * Elgg Groups add a forum topic page
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+		gatekeeper();
+		
+		$page_owner = set_page_owner((int) get_input('group_guid'));
+		
+		if (!(page_owner_entity() instanceof ElggGroup)) forward();
+		
+	// sort the display
+	    $area2 = elgg_view("forms/forums/addtopic");
+	    $body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+		
+	// Display page
+		page_draw(elgg_echo('groups:addtopic'),$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/groups/all.php b/mod/groups/all.php
new file mode 100644
index 000000000..fd60ce90a
--- /dev/null
+++ b/mod/groups/all.php
@@ -0,0 +1,71 @@
+<?php
+	/**
+	 * Elgg groups plugin
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	$limit = get_input("limit", 10);
+	$offset = get_input("offset", 0);
+	$tag = get_input("tag");
+	$filter = get_input("filter");
+	if(!$filter)
+		$filter = "active";
+	
+	
+	// Get objects
+	$context = get_context();
+	
+	set_context('search');
+	if ($tag != "")
+		$objects = list_entities_from_metadata('tags',$tag,'group',"","", $limit, false);
+	else{
+		switch($filter){
+			case "newest":
+			$objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => 0, 'limit' => $limit, 'full_view' => false));
+			break;
+			case "pop":
+			$objects = list_entities_by_relationship_count('member', true, "", "", 0, $limit, false);
+			break;
+			case "active":
+			$objects = list_entities_from_annotations("object", "groupforumtopic", "group_topic_post", "", 40, 0, 0, false, true);
+			break;
+			case 'default':
+			$objects = elgg_list_entities(array('types' => 'group', 'limit' => $limit, 'full_view' => FALSE));
+			break;
+		}
+	}
+	
+	//get a group count
+	$group_count = elgg_get_entities(array('types' => 'group', 'limit' => 10, 'count' => TRUE));
+		
+	//find groups
+	$area1 = elgg_view("groups/find");
+	
+	//menu options
+	$area1 .= elgg_view("groups/side_menu");
+	
+	//featured groups
+	$featured_groups = elgg_get_entities_from_metadata(array('metadata_name' => 'featured_group', 'metadata_value' => 'yes', 'types' => 'group', 'limit' => 10));
+	$area1 .= elgg_view("groups/featured", array("featured" => $featured_groups));
+		
+		
+	set_context($context);
+	
+	$title = sprintf(elgg_echo("groups:all"),page_owner_entity()->name);
+	$area2 = elgg_view_title($title);
+	$area2 .= elgg_view('groups/contentwrapper', array('body' => elgg_view("groups/group_sort_menu", array("count" => $group_count, "filter" => $filter)) . $objects));
+	$body = elgg_view_layout('sidebar_boxes',$area1, $area2);
+	
+	// Finally draw the page
+	page_draw($title, $body);
+
+
+
+?>
\ No newline at end of file
diff --git a/mod/groups/discussions.php b/mod/groups/discussions.php
new file mode 100644
index 000000000..64b73cd2b
--- /dev/null
+++ b/mod/groups/discussions.php
@@ -0,0 +1,32 @@
+<?php
+
+	/**
+	 * Elgg all group forum discussions page
+	 * This page will show all topic dicussions ordered by last comment, regardless of which group 
+	 * they are part of
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+		group_gatekeeper();
+		
+	// Display them
+	    $area2 = elgg_view_title(elgg_echo("groups:latestdiscussion"));
+		set_context('search');
+	    $area2 .= list_entities_from_annotations("object", "groupforumtopic", "group_topic_post", "", 40, 0, 0, false, true);
+	    set_context('groups');
+	    
+	    $body = elgg_view_layout("two_column_left_sidebar", '', $area2);
+        
+    // Display page
+		page_draw(elgg_echo('groups:latestdiscussion'),$body);
+		
+		
+?>
\ No newline at end of file
diff --git a/mod/groups/edit.php b/mod/groups/edit.php
new file mode 100644
index 000000000..2e99b578c
--- /dev/null
+++ b/mod/groups/edit.php
@@ -0,0 +1,33 @@
+<?php
+	/**
+	 * Elgg groups plugin
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	gatekeeper();
+
+	$group_guid = get_input('group_guid');
+	$group = get_entity($group_guid);
+	set_page_owner($group_guid);
+
+	$title = elgg_echo("groups:edit");
+	$body = elgg_view_title($title);
+	
+	if (($group) && ($group->canEdit()))
+	{
+		$body .= elgg_view("forms/groups/edit", array('entity' => $group));
+			 
+	} else {
+		$body .= elgg_view('groups/contentwrapper',array('body' => elgg_echo('groups:noaccess')));
+	}
+	
+	$body = elgg_view_layout('two_column_left_sidebar', '', $body);
+	
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/groups/edittopic.php b/mod/groups/edittopic.php
new file mode 100644
index 000000000..494c94ab9
--- /dev/null
+++ b/mod/groups/edittopic.php
@@ -0,0 +1,36 @@
+<?php
+
+	/**
+	 * Elgg Groups edit a forum topic page
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+		gatekeeper();
+		
+	get_input('group');
+	$page_owner = set_page_owner((int)get_input('group'));
+	
+	// check the user is a member of the group
+	//if (!$page_owner->isMember($_SESSION['user'])) forward();
+	
+	if (!(page_owner_entity() instanceof ElggGroup)) forward();
+	
+	//get the topic
+	$topic = get_entity((int) get_input('topic'));
+		
+	// sort the display
+	    $area2 = elgg_view("forms/forums/edittopic", array('entity' => $topic));
+	    $body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+		
+	// Display page
+		page_draw(elgg_echo('groups:edittopic'),$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/groups/forum.php b/mod/groups/forum.php
new file mode 100644
index 000000000..91a592373
--- /dev/null
+++ b/mod/groups/forum.php
@@ -0,0 +1,35 @@
+<?php
+	/**
+	 * Elgg groups forum
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	
+	set_page_owner((int)get_input('group_guid'));
+	if (!(page_owner_entity() instanceof ElggGroup)) forward();
+	
+	group_gatekeeper();
+	
+	//get any forum topics
+	//get any forum topics
+	$topics = list_entities_from_annotations("object", "groupforumtopic", "group_topic_post", "", 20, 0, get_input('group_guid'), false, false, false);
+	set_context('search');	
+	$area2 = elgg_view("forum/topics", array('topics' => $topics));
+	set_context('groups');
+	
+	$body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+	
+	$title = elgg_echo('item:object:groupforumtopic');
+	
+	// Finally draw the page
+	page_draw($title, $body);
+
+
+
+?>
\ No newline at end of file
diff --git a/mod/groups/graphics/defaultlarge.gif b/mod/groups/graphics/defaultlarge.gif
new file mode 100644
index 000000000..b0921b8d8
--- /dev/null
+++ b/mod/groups/graphics/defaultlarge.gif
diff --git a/mod/groups/graphics/defaultmedium.gif b/mod/groups/graphics/defaultmedium.gif
new file mode 100644
index 000000000..ae230a3d7
--- /dev/null
+++ b/mod/groups/graphics/defaultmedium.gif
diff --git a/mod/groups/graphics/defaultsmall.gif b/mod/groups/graphics/defaultsmall.gif
new file mode 100644
index 000000000..81d89110d
--- /dev/null
+++ b/mod/groups/graphics/defaultsmall.gif
diff --git a/mod/groups/graphics/defaulttiny.gif b/mod/groups/graphics/defaulttiny.gif
new file mode 100644
index 000000000..86dc96ae4
--- /dev/null
+++ b/mod/groups/graphics/defaulttiny.gif
diff --git a/mod/groups/graphics/icon.php b/mod/groups/graphics/icon.php
new file mode 100644
index 000000000..8c596d53b
--- /dev/null
+++ b/mod/groups/graphics/icon.php
@@ -0,0 +1,45 @@
+<?php
+	/**
+	 * Icon display
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	global $CONFIG;
+	require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
+
+	$group_guid = get_input('group_guid');
+	$group = get_entity($group_guid);
+	
+	$size = strtolower(get_input('size'));
+	if (!in_array($size,array('large','medium','small','tiny','master','topbar')))
+		$size = "medium";
+	
+	$success = false;
+	
+	$filehandler = new ElggFile();
+	$filehandler->owner_guid = $group->owner_guid;
+	$filehandler->setFilename("groups/" . $group->guid . $size . ".jpg");
+	
+	$success = false;
+	if ($filehandler->open("read")) {
+		if ($contents = $filehandler->read($filehandler->size())) {
+			$success = true;
+		} 
+	}
+	
+	if (!$success) {
+		$contents = @file_get_contents($CONFIG->pluginspath . "groups/graphics/default{$size}.jpg");
+	}
+	
+	header("Content-type: image/jpeg");
+	header('Expires: ' . date('r',time() + 864000));
+	header("Pragma: public");
+	header("Cache-Control: public");
+	header("Content-Length: " . strlen($contents));
+	echo $contents;
+?>
\ No newline at end of file
diff --git a/mod/groups/groupprofile.php b/mod/groups/groupprofile.php
new file mode 100644
index 000000000..80cbd41ee
--- /dev/null
+++ b/mod/groups/groupprofile.php
@@ -0,0 +1,60 @@
+<?php
+	/**
+	 * Full group profile
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$group_guid = get_input('group_guid');
+	set_context('groups');
+	
+	global $autofeed;
+	$autofeed = true;
+	
+	$group = get_entity($group_guid);
+	if ($group) {
+		set_page_owner($group_guid);
+		
+		$title = $group->name;
+		
+		// Hide some items from closed groups when the user is not logged in.
+		$view_all = true;
+		
+		$groupaccess = group_gatekeeper(false);
+		if (!$groupaccess)
+			$view_all = false;
+		
+		
+		$area2 = elgg_view_title($title);
+		$area2 .= elgg_view('group/group', array('entity' => $group, 'user' => $_SESSION['user'], 'full' => true));
+		
+		if ($view_all) {
+			//group profile 'items' - these are not real widgets, just contents to display
+			$area2 .= elgg_view('groups/profileitems',array('entity' => $group));
+			
+			//group members
+			$area3 = elgg_view('groups/members',array('entity' => $group));
+		}
+		else
+		{
+			$area2 .= elgg_view('groups/closedmembership', array('entity' => $group, 'user' => $_SESSION['user'], 'full' => true));
+
+		}
+		
+		$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2, $area3);
+	} else {
+		$title = elgg_echo('groups:notfound');
+		
+		$area2 = elgg_view_title($title);
+		$area2 .= elgg_view('groups/contentwrapper',array('body' => elgg_echo('groups:notfound:details')));
+		
+		$body = elgg_view_layout('two_column_left_sidebar', "", $area2,"");
+	}
+		
+	// Finally draw the page
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/groups/index.php b/mod/groups/index.php
new file mode 100644
index 000000000..b21d5962b
--- /dev/null
+++ b/mod/groups/index.php
@@ -0,0 +1,31 @@
+<?php
+	/**
+	 * Elgg groups plugin
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	
+	$limit = get_input("limit", 10);
+	$offset = get_input("offset", 0);
+	
+	$title = sprintf(elgg_echo("groups:owned"),page_owner_entity()->name);
+
+	// Get objects
+	$area2 = elgg_view_title($title);
+	
+	set_context('search');
+	$objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => page_owner(), 'limit' => $limit, 'full_view' => FALSE));
+	set_context('groups');
+	
+	$area2 .= $objects;
+	$body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+	
+	// Finally draw the page
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/groups/invitations.php b/mod/groups/invitations.php
new file mode 100644
index 000000000..fa2156b35
--- /dev/null
+++ b/mod/groups/invitations.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Manage group invitation requests.
+ *
+ * @package ElggGroups
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+gatekeeper();
+
+$user = get_loggedin_user();
+
+$title = elgg_echo('groups:invitations');
+
+$area2 = elgg_view_title($title);
+
+if ($user) {
+	// @todo temporary workaround for exts #287.
+	$invitations = groups_get_invited_groups($user->getGUID());
+
+	$area2 .= elgg_view('groups/invitationrequests',array('invitations' => $invitations));
+	elgg_set_ignore_access($ia);
+} else {
+	$area2 .= elgg_echo("groups:noaccess");
+}
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+
+page_draw($title, $body);
\ No newline at end of file
diff --git a/mod/groups/invite.php b/mod/groups/invite.php
new file mode 100644
index 000000000..3791b9b50
--- /dev/null
+++ b/mod/groups/invite.php
@@ -0,0 +1,34 @@
+<?php
+	/**
+	 * Invite users to groups
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	gatekeeper();
+	
+	$group_guid = (int) get_input('group_guid');
+	$group = get_entity($group_guid);
+	set_page_owner($group_guid);
+
+	$title = elgg_echo("groups:invite");
+
+	$area2 = elgg_view_title($title);
+	
+	if (($group) && ($group->canEdit()))
+	{	
+		$area2 .= elgg_view("forms/groups/invite", array('entity' => $group));
+			 
+	} else {
+		$area2 .= elgg_echo("groups:noaccess");
+	}
+	
+	$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+	
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
new file mode 100644
index 000000000..6c0d8ef26
--- /dev/null
+++ b/mod/groups/languages/en.php
@@ -0,0 +1,228 @@
+<?php
+	/**
+	 * Elgg groups plugin language pack
+	 *
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$english = array(
+
+		/**
+		 * Menu items and titles
+		 */
+
+			'groups' => "Groups",
+			'groups:owned' => "Groups you own",
+			'groups:yours' => "Your groups",
+			'groups:user' => "%s's groups",
+			'groups:all' => "All site groups",
+			'groups:new' => "Create a new group",
+			'groups:edit' => "Edit group",
+			'groups:delete' => 'Delete group',
+			'groups:membershiprequests' => 'Manage join requests',
+			'groups:invitations' => 'Group invitations',
+
+			'groups:icon' => 'Group icon (leave blank to leave unchanged)',
+			'groups:name' => 'Group name',
+			'groups:username' => 'Group short name (displayed in URLs, alphanumeric characters only)',
+			'groups:description' => 'Description',
+			'groups:briefdescription' => 'Brief description',
+			'groups:interests' => 'Tags',
+			'groups:website' => 'Website',
+			'groups:members' => 'Group members',
+			'groups:membership' => "Group membership permissions",
+			'groups:access' => "Access permissions",
+			'groups:owner' => "Owner",
+			'groups:widget:num_display' => 'Number of groups to display',
+			'groups:widget:membership' => 'Group membership',
+			'groups:widgets:description' => 'Display the groups you are a member of on your profile',
+			'groups:noaccess' => 'No access to group',
+			'groups:cantedit' => 'You can not edit this group',
+			'groups:saved' => 'Group saved',
+			'groups:featured' => 'Featured groups',
+			'groups:makeunfeatured' => 'Unfeature',
+			'groups:makefeatured' => 'Make featured',
+			'groups:featuredon' => 'You have made this group a featured one.',
+			'groups:unfeature' => 'You have removed this group from the featured list',
+			'groups:joinrequest' => 'Request membership',
+			'groups:join' => 'Join group',
+			'groups:leave' => 'Leave group',
+			'groups:invite' => 'Invite friends',
+			'groups:inviteto' => "Invite friends to '%s'",
+			'groups:nofriends' => "You have no friends left who have not been invited to this group.",
+			'groups:viagroups' => "via groups",
+			'groups:group' => "Group",
+			'groups:search:tags' => "tag",
+
+			'groups:notfound' => "Group not found",
+			'groups:notfound:details' => "The requested group either does not exist or you do not have access to it",
+
+			'groups:requests:none' => 'There are no outstanding membership requests at this time.',
+
+			'groups:invitations:none' => 'There are no oustanding invitations at this time.',
+
+			'item:object:groupforumtopic' => "Discussion topics",
+
+			'groupforumtopic:new' => "New discussion post",
+
+			'groups:count' => "groups created",
+			'groups:open' => "open group",
+			'groups:closed' => "closed group",
+			'groups:member' => "members",
+			'groups:searchtag' => "Search for groups by tag",
+
+
+			/*
+			 * Access
+			 */
+			'groups:access:private' => 'Closed - Users must be invited',
+			'groups:access:public' => 'Open - Any user may join',
+			'groups:closedgroup' => 'This group has a closed membership. To ask to be added, click the "request membership" menu link.',
+			'groups:visibility' => 'Who can see this group?',
+
+			/*
+			Group tools
+			*/
+			'groups:enablepages' => 'Enable group pages',
+			'groups:enableforum' => 'Enable group discussion',
+			'groups:enablefiles' => 'Enable group files',
+			'groups:yes' => 'yes',
+			'groups:no' => 'no',
+
+			'group:created' => 'Created %s with %d posts',
+			'groups:lastupdated' => 'Last updated %s by %s',
+			'groups:pages' => 'Group pages',
+			'groups:files' => 'Group files',
+
+			/*
+			Group forum strings
+			*/
+
+			'group:replies' => 'Replies',
+			'groups:forum' => 'Group discussion',
+			'groups:addtopic' => 'Add a topic',
+			'groups:forumlatest' => 'Latest discussion',
+			'groups:latestdiscussion' => 'Latest discussion',
+			'groups:newest' => 'Newest',
+			'groups:popular' => 'Popular',
+			'groupspost:success' => 'Your comment was succesfully posted',
+			'groups:alldiscussion' => 'Latest discussion',
+			'groups:edittopic' => 'Edit topic',
+			'groups:topicmessage' => 'Topic message',
+			'groups:topicstatus' => 'Topic status',
+			'groups:reply' => 'Post a comment',
+			'groups:topic' => 'Topic',
+			'groups:posts' => 'Posts',
+			'groups:lastperson' => 'Last person',
+			'groups:when' => 'When',
+			'grouptopic:notcreated' => 'No topics have been created.',
+			'groups:topicopen' => 'Open',
+			'groups:topicclosed' => 'Closed',
+			'groups:topicresolved' => 'Resolved',
+			'grouptopic:created' => 'Your topic was created.',
+			'groupstopic:deleted' => 'The topic has been deleted.',
+			'groups:topicsticky' => 'Sticky',
+			'groups:topicisclosed' => 'This topic is closed.',
+			'groups:topiccloseddesc' => 'This topic has now been closed and is not accepting new comments.',
+			'grouptopic:error' => 'Your group topic could not be created. Please try again or contact a system administrator.',
+			'groups:forumpost:edited' => "You have successfully edited the forum post.",
+			'groups:forumpost:error' => "There was a problem editing the forum post.",
+			'groups:privategroup' => 'This group is private, requesting membership.',
+			'groups:notitle' => 'Groups must have a title',
+			'groups:cantjoin' => 'Can not join group',
+			'groups:cantleave' => 'Could not leave group',
+			'groups:addedtogroup' => 'Successfully added the user to the group',
+			'groups:joinrequestnotmade' => 'Could not request to join group',
+			'groups:joinrequestmade' => 'Requested to join group',
+			'groups:joined' => 'Successfully joined group!',
+			'groups:left' => 'Successfully left group',
+			'groups:notowner' => 'Sorry, you are not the owner of this group.',
+			'groups:notmember' => 'Sorry, you are not a member of this group.',
+			'groups:alreadymember' => 'You are already a member of this group!',
+			'groups:userinvited' => 'User has been invited.',
+			'groups:usernotinvited' => 'User could not be invited.',
+			'groups:useralreadyinvited' => 'User has already been invited',
+			'groups:updated' => "Last comment",
+			'groups:invite:subject' => "%s you have been invited to join %s!",
+			'groups:started' => "Started by",
+			'groups:joinrequest:remove:check' => 'Are you sure you want to remove this join request?',
+			'groups:invite:body' => "Hi %s,
+
+%s invited you to join the '%s' group, click below to confirm:
+
+%s",
+
+			'groups:welcome:subject' => "Welcome to the %s group!",
+			'groups:welcome:body' => "Hi %s!
+
+You are now a member of the '%s' group! Click below to begin posting!
+
+%s",
+
+			'groups:request:subject' => "%s has requested to join %s",
+			'groups:request:body' => "Hi %s,
+
+%s has requested to join the '%s' group, click below to view their profile:
+
+%s
+
+or click below to confirm request:
+
+%s",
+
+			/*
+				Forum river items
+			*/
+
+			'groups:river:member' => 'is now a member of',
+			'groupforum:river:updated' => '%s has updated',
+			'groupforum:river:update' => 'this discussion topic',
+			'groupforum:river:created' => '%s has created',
+			'groupforum:river:create' => 'a new discussion topic titled',
+			'groupforum:river:posted' => '%s has posted a new comment',
+			'groupforum:river:annotate:create' => 'on this discussion topic',
+			'groupforum:river:postedtopic' => '%s has started a new discussion topic titled',
+			'groups:river:member' => '%s is now a member of',
+			'groups:river:togroup' => 'to the group',
+
+			'groups:nowidgets' => 'No widgets have been defined for this group.',
+
+
+			'groups:widgets:members:title' => 'Group members',
+			'groups:widgets:members:description' => 'List the members of a group.',
+			'groups:widgets:members:label:displaynum' => 'List the members of a group.',
+			'groups:widgets:members:label:pleaseedit' => 'Please configure this widget.',
+
+			'groups:widgets:entities:title' => "Objects in group",
+			'groups:widgets:entities:description' => "List the objects saved in this group",
+			'groups:widgets:entities:label:displaynum' => 'List the objects of a group.',
+			'groups:widgets:entities:label:pleaseedit' => 'Please configure this widget.',
+
+			'groups:forumtopic:edited' => 'Forum topic successfully edited.',
+
+			'groups:allowhiddengroups' => 'Do you want to allow private (invisible) groups?',
+
+			/**
+			 * Action messages
+			 */
+			'group:deleted' => 'Group and group contents deleted',
+			'group:notdeleted' => 'Group could not be deleted',
+
+			'grouppost:deleted' => 'Group posting successfully deleted',
+			'grouppost:notdeleted' => 'Group posting could not be deleted',
+			'groupstopic:deleted' => 'Topic deleted',
+			'groupstopic:notdeleted' => 'Topic not deleted',
+			'grouptopic:blank' => 'No topic',
+			'grouptopic:notfound' => 'Could not find the topic',
+			'grouppost:nopost' => 'Empty post',
+			'groups:deletewarning' => "Are you sure you want to delete this group? There is no undo!",
+
+			'groups:joinrequestkilled' => 'The join request has been deleted.',
+	);
+
+	add_translation("en",$english);
+?>
diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml
new file mode 100644
index 000000000..e2c36f92f
--- /dev/null
+++ b/mod/groups/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+	<field key="author" value="Curverider ltd" />
+	<field key="version" value="1.7" />
+	<field key="description" value="Provides group support for elgg" />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/groups/membership.php b/mod/groups/membership.php
new file mode 100644
index 000000000..9226a56d5
--- /dev/null
+++ b/mod/groups/membership.php
@@ -0,0 +1,38 @@
+<?php
+
+	/**
+	 * Elgg groups 'member of' page
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	
+	gatekeeper();
+	group_gatekeeper();
+	
+	$limit = get_input("limit", 10);
+	$offset = get_input("offset", 0);
+	
+	if (page_owner() == $_SESSION['user']->guid) {
+		$title = elgg_echo("groups:yours");
+	} else $title = sprintf(elgg_echo("groups:owned"),page_owner_entity()->name);
+
+	// Get objects
+	$area2 = elgg_view_title($title);
+	
+	set_context('search');
+	//$objects = list_entities("group", "", page_owner(), $limit, false);
+	$objects = list_entities_from_relationship('member',page_owner(),false,'group','',0, $limit,false, false);
+	set_context('groups');
+	
+	$area2 .= $objects;
+	$body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+	
+	// Finally draw the page
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/groups/membershipreq.php b/mod/groups/membershipreq.php
new file mode 100644
index 000000000..368057711
--- /dev/null
+++ b/mod/groups/membershipreq.php
@@ -0,0 +1,36 @@
+<?php
+	/**
+	 * Manage group invite requests.
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	gatekeeper();
+	
+	$group_guid = (int) get_input('group_guid');
+	$group = get_entity($group_guid);
+	set_page_owner($group_guid);
+
+	$title = elgg_echo('groups:membershiprequests');
+
+	$area2 = elgg_view_title($title);
+	
+	if (($group) && ($group->canEdit()))
+	{	
+		
+		$requests = elgg_get_entities_from_relationship(array('relationship' => 'membership_request', 'relationship_guid' => $group_guid, 'inverse_relationship' => TRUE, 'limit' => 9999));
+		$area2 .= elgg_view('groups/membershiprequests',array('requests' => $requests, 'entity' => $group));
+			 
+	} else {
+		$area2 .= elgg_echo("groups:noaccess");
+	}
+	
+	$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+	
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/groups/new.php b/mod/groups/new.php
new file mode 100644
index 000000000..b2a24f80f
--- /dev/null
+++ b/mod/groups/new.php
@@ -0,0 +1,22 @@
+<?php
+	/**
+	 * Elgg groups plugin
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	gatekeeper();
+
+	// Render the file upload page
+	$title = elgg_echo("groups:new");
+	$area2 = elgg_view_title($title);
+	$area2 .= elgg_view("forms/groups/edit");
+	
+	$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+	
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/groups/start.php b/mod/groups/start.php
new file mode 100644
index 000000000..b9dde5d10
--- /dev/null
+++ b/mod/groups/start.php
@@ -0,0 +1,613 @@
+<?php
+	/**
+	 * Elgg groups plugin
+	 *
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	/**
+	 * Initialise the groups plugin.
+	 * Register actions, set up menus
+	 */
+	function groups_init()
+	{
+
+		global $CONFIG;
+
+		// Set up the menu for logged in users
+		if (isloggedin())
+		{
+			add_menu(elgg_echo('groups'), $CONFIG->wwwroot . "pg/groups/world/");
+			//add_menu(elgg_echo('groups:alldiscussion'),$CONFIG->wwwroot."mod/groups/discussions.php");
+		}
+		else
+		{
+			add_menu(elgg_echo('groups'), $CONFIG->wwwroot . "pg/groups/world/");
+		}
+
+		// Register a page handler, so we can have nice URLs
+		register_page_handler('groups','groups_page_handler');
+
+		// Register a URL handler for groups and forum topics
+		register_entity_url_handler('groups_url','group','all');
+		register_entity_url_handler('groups_groupforumtopic_url','object','groupforumtopic');
+
+		// Register an icon handler for groups
+		register_page_handler('groupicon','groups_icon_handler');
+
+		// Register some actions
+		register_action("groups/edit",false, $CONFIG->pluginspath . "groups/actions/edit.php");
+		register_action("groups/delete",false, $CONFIG->pluginspath . "groups/actions/delete.php");
+		register_action("groups/join",false, $CONFIG->pluginspath . "groups/actions/join.php");
+		register_action("groups/leave",false, $CONFIG->pluginspath . "groups/actions/leave.php");
+		register_action("groups/joinrequest",false, $CONFIG->pluginspath . "groups/actions/joinrequest.php");
+		register_action("groups/killrequest",false,$CONFIG->pluginspath . "groups/actions/groupskillrequest.php");
+		register_action("groups/killinvitation",false,$CONFIG->pluginspath . "groups/actions/groupskillinvitation.php");
+		register_action("groups/addtogroup",false, $CONFIG->pluginspath . "groups/actions/addtogroup.php");
+		register_action("groups/invite",false, $CONFIG->pluginspath . "groups/actions/invite.php");
+
+		// Use group widgets
+		use_widgets('groups');
+
+		// Add a page owner handler
+		add_page_owner_handler('groups_page_owner_handler');
+
+		// Add some widgets
+		add_widget_type('a_users_groups',elgg_echo('groups:widget:membership'), elgg_echo('groups:widgets:description'));
+
+
+		//extend some views
+		elgg_extend_view('profile/icon','groups/icon');
+		elgg_extend_view('css','groups/css');
+
+		// Access permissions
+		register_plugin_hook('access:collections:write', 'all', 'groups_write_acl_plugin_hook');
+		//register_plugin_hook('access:collections:read', 'all', 'groups_read_acl_plugin_hook');
+
+		// Notification hooks
+		if (is_callable('register_notification_object'))
+			register_notification_object('object', 'groupforumtopic', elgg_echo('groupforumtopic:new'));
+		register_plugin_hook('object:notifications','object','group_object_notifications_intercept');
+
+		// Listen to notification events and supply a more useful message
+		register_plugin_hook('notify:entity:message', 'object', 'groupforumtopic_notify_message');
+
+		// add the forum tool option
+		add_group_tool_option('forum',elgg_echo('groups:enableforum'),true);
+
+		// Now override icons
+		register_plugin_hook('entity:icon:url', 'group', 'groups_groupicon_hook');
+	}
+
+	/**
+	 * Event handler for group forum posts
+	 *
+	 */
+	function group_object_notifications($event, $object_type, $object) {
+
+		static $flag;
+		if (!isset($flag)) $flag = 0;
+
+		if (is_callable('object_notifications'))
+		if ($object instanceof ElggObject) {
+			if ($object->getSubtype() == 'groupforumtopic') {
+				//if ($object->countAnnotations('group_topic_post') > 0) {
+				if ($flag == 0) {
+					$flag = 1;
+					object_notifications($event, $object_type, $object);
+				}
+				//}
+			}
+		}
+
+	}
+
+	/**
+	 * Intercepts the notification on group topic creation and prevents a notification from going out
+	 * (because one will be sent on the annotation)
+	 *
+	 * @param unknown_type $hook
+	 * @param unknown_type $entity_type
+	 * @param unknown_type $returnvalue
+	 * @param unknown_type $params
+	 * @return unknown
+	 */
+		function group_object_notifications_intercept($hook, $entity_type, $returnvalue, $params) {
+			if (isset($params)) {
+				if ($params['event'] == 'create' && $params['object'] instanceof ElggObject) {
+					if ($params['object']->getSubtype() == 'groupforumtopic') {
+						return true;
+					}
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * Returns a more meaningful message
+		 *
+		 * @param unknown_type $hook
+		 * @param unknown_type $entity_type
+		 * @param unknown_type $returnvalue
+		 * @param unknown_type $params
+		 */
+		function groupforumtopic_notify_message($hook, $entity_type, $returnvalue, $params)
+		{
+			$entity = $params['entity'];
+			$to_entity = $params['to_entity'];
+			$method = $params['method'];
+			if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'groupforumtopic'))
+			{
+
+				$descr = $entity->description;
+				$title = $entity->title;
+				global $CONFIG;
+				$url = $entity->getURL();
+
+				$msg = get_input('topicmessage');
+				if (empty($msg)) $msg = get_input('topic_post');
+				if (!empty($msg)) $msg = $msg . "\n\n"; else $msg = '';
+
+				$owner = get_entity($entity->container_guid);
+				if ($method == 'sms') {
+					return elgg_echo("groupforumtopic:new") . ': ' . $url . " ({$owner->name}: {$title})";
+				} else {
+					return $_SESSION['user']->name . ' ' . elgg_echo("groups:viagroups") . ': ' . $title . "\n\n" . $msg . "\n\n" . $entity->getURL();
+				}
+
+			}
+			return null;
+		}
+
+	/**
+	 * This function loads a set of default fields into the profile, then triggers a hook letting other plugins to edit
+	 * add and delete fields.
+	 *
+	 * Note: This is a secondary system:init call and is run at a super low priority to guarantee that it is called after all
+	 * other plugins have initialised.
+	 */
+	function groups_fields_setup()
+	{
+		global $CONFIG;
+
+		$profile_defaults = array(
+
+			'name' => 'text',
+			'description' => 'longtext',
+			'briefdescription' => 'text',
+			'interests' => 'tags',
+			'website' => 'url',
+
+		);
+
+		$CONFIG->group = trigger_plugin_hook('profile:fields', 'group', NULL, $profile_defaults);
+
+		// register any tag metadata names
+		foreach ($CONFIG->group as $name => $type) {
+			if ($type == 'tags') {
+				elgg_register_tag_metadata_name($name);
+
+				// register a tag name translation
+				add_translation(get_current_language(), array("tag_names:$name" => elgg_echo("groups:$name")));
+			}
+		}
+	}
+
+	/**
+	 * Sets up submenus for the groups system.  Triggered on pagesetup.
+	 *
+	 */
+	function groups_submenus() {
+
+		global $CONFIG;
+
+		// Get the page owner entity
+			$page_owner = page_owner_entity();
+
+		// Submenu items for all group pages
+			if ($page_owner instanceof ElggGroup && get_context() == 'groups') {
+				if (isloggedin()) {
+					if ($page_owner->canEdit()) {
+						add_submenu_item(elgg_echo('groups:edit'),$CONFIG->wwwroot . "mod/groups/edit.php?group_guid=" . $page_owner->getGUID(), '1groupsactions');
+						add_submenu_item(elgg_echo('groups:invite'),$CONFIG->wwwroot . "mod/groups/invite.php?group_guid={$page_owner->getGUID()}", '1groupsactions');
+						if (!$page_owner->isPublicMembership())
+							add_submenu_item(elgg_echo('groups:membershiprequests'),$CONFIG->wwwroot . "mod/groups/membershipreq.php?group_guid={$page_owner->getGUID()}", '1groupsactions');
+					}
+					if ($page_owner->isMember($_SESSION['user'])) {
+						if ($page_owner->getOwner() != $_SESSION['guid']) {
+							$url = elgg_add_action_tokens_to_url($CONFIG->wwwroot . "action/groups/leave?group_guid=" . $page_owner->getGUID());
+							add_submenu_item(elgg_echo('groups:leave'), $url, '1groupsactions');
+						}
+					} else {
+						if ($page_owner->isPublicMembership()) {
+							$url = elgg_add_action_tokens_to_url($CONFIG->wwwroot . "action/groups/join?group_guid={$page_owner->getGUID()}");
+							add_submenu_item(elgg_echo('groups:join'), $url, '1groupsactions');
+						} else {
+							$url = elgg_add_action_tokens_to_url($CONFIG->wwwroot . "action/groups/joinrequest?group_guid={$page_owner->getGUID()}");
+							add_submenu_item(elgg_echo('groups:joinrequest'), $url, '1groupsactions');
+						}
+					}
+				}
+
+				if($page_owner->forum_enable != "no"){
+					add_submenu_item(elgg_echo('groups:forum'),$CONFIG->wwwroot . "pg/groups/forum/{$page_owner->getGUID()}/", '1groupslinks');
+				}
+
+			}
+
+		// Add submenu options
+			if (get_context() == 'groups' && !($page_owner instanceof ElggGroup)) {
+				if (isloggedin()) {
+					add_submenu_item(elgg_echo('groups:new'), $CONFIG->wwwroot."pg/groups/new/", '1groupslinks');
+					add_submenu_item(elgg_echo('groups:owned'), $CONFIG->wwwroot . "pg/groups/owned/" . $_SESSION['user']->username, '1groupslinks');
+					add_submenu_item(elgg_echo('groups:yours'), $CONFIG->wwwroot . "pg/groups/member/" . $_SESSION['user']->username, '1groupslinks');
+					add_submenu_item(elgg_echo('groups:invitations'), $CONFIG->wwwroot . "pg/groups/invitations/" . $_SESSION['user']->username, '1groupslinks');
+				}
+				add_submenu_item(elgg_echo('groups:all'), $CONFIG->wwwroot . "pg/groups/world/", '1groupslinks');
+			}
+
+	}
+
+	/**
+	 * Set a page owner handler.
+	 *
+	 */
+	function groups_page_owner_handler()
+	{
+		$group_guid = get_input('group_guid');
+		if ($group_guid)
+		{
+			$group = get_entity($group_guid);
+			if ($group instanceof ElggGroup)
+				return $group->owner_guid;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Group page handler
+	 *
+	 * @param array $page Array of page elements, forwarded by the page handling mechanism
+	 */
+	function groups_page_handler($page)
+	{
+		global $CONFIG;
+
+
+		if (isset($page[0]))
+		{
+			// See what context we're using
+			switch($page[0])
+			{
+				case 'invitations':
+					include($CONFIG->pluginspath . "groups/invitations.php");
+					$user_guid = get_loggedin_userid();
+
+					$invitations = elgg_get_entities_from_relationship(array(
+						'relationship' => 'membership_request',
+						'guid' => $user_guid
+					));
+
+					break;
+
+				case "new" :
+					include($CONFIG->pluginspath . "groups/new.php");
+				break;
+				case "world":
+					set_context('groups');
+					set_page_owner(0);
+					include($CONFIG->pluginspath . "groups/all.php");
+				break;
+				case "forum":
+					set_input('group_guid', $page[1]);
+					include($CONFIG->pluginspath . "groups/forum.php");
+				break;
+				case "owned" :
+					// Owned by a user
+					if (isset($page[1]))
+						set_input('username',$page[1]);
+
+					include($CONFIG->pluginspath . "groups/index.php");
+				break;
+				case "member" :
+					// User is a member of
+					if (isset($page[1]))
+						set_input('username',$page[1]);
+
+					include($CONFIG->pluginspath . "groups/membership.php");
+				break;
+				default:
+					set_input('group_guid', $page[0]);
+					include($CONFIG->pluginspath . "groups/groupprofile.php");
+				break;
+			}
+		}
+
+	}
+
+	/**
+	 * Handle group icons.
+	 *
+	 * @param unknown_type $page
+	 */
+	function groups_icon_handler($page) {
+
+		global $CONFIG;
+
+		// The username should be the file we're getting
+		if (isset($page[0])) {
+			set_input('group_guid',$page[0]);
+		}
+		if (isset($page[1])) {
+			set_input('size',$page[1]);
+		}
+		// Include the standard profile index
+		include($CONFIG->pluginspath . "groups/graphics/icon.php");
+
+	}
+
+	/**
+	 * Populates the ->getUrl() method for group objects
+	 *
+	 * @param ElggEntity $entity File entity
+	 * @return string File URL
+	 */
+	function groups_url($entity) {
+
+		global $CONFIG;
+
+		$title = friendly_title($entity->name);
+
+		return $CONFIG->url . "pg/groups/{$entity->guid}/$title/";
+
+	}
+
+	function groups_groupforumtopic_url($entity) {
+
+		global $CONFIG;
+		return $CONFIG->url . 'mod/groups/topicposts.php?topic='. $entity->guid .'&group_guid=' . $entity->container_guid;
+
+	}
+
+	/**
+	 * Groups created, so add users to access lists.
+	 */
+	function groups_create_event_listener($event, $object_type, $object)
+	{
+		//if (($event == 'create') && ($object_type == 'group') && ($object instanceof ElggGroup))
+		//{
+			$group_id = create_access_collection(elgg_echo('groups:group') . ": " . $object->name);
+			if ($group_id)
+			{
+				$object->group_acl = $group_id;
+			}
+			else
+				return false;
+		//}
+
+		return true;
+	}
+
+	/**
+	 * Hook to listen to read access control requests and return all the groups you are a member of.
+	 */
+	function groups_read_acl_plugin_hook($hook, $entity_type, $returnvalue, $params)
+	{
+		//error_log("READ: " . var_export($returnvalue));
+		$user = $_SESSION['user'];
+		if ($user)
+		{
+			// Not using this because of recursion.
+			// Joining a group automatically add user to ACL,
+			// So just see if they're a member of the ACL.
+			//$membership = get_users_membership($user->guid);
+
+			$members = get_members_of_access_collection($group->group_acl);
+			print_r($members);
+			exit;
+
+			if ($membership)
+			{
+				foreach ($membership as $group)
+					$returnvalue[$user->guid][$group->group_acl] = elgg_echo('groups:group') . ": " . $group->name;
+				return $returnvalue;
+			}
+		}
+	}
+
+	/**
+	 * Return the write access for the current group if the user has write access to it.
+	 */
+	function groups_write_acl_plugin_hook($hook, $entity_type, $returnvalue, $params)
+	{
+		$page_owner = page_owner_entity();
+		// get all groups if logged in
+		if ($loggedin = get_loggedin_user()) {
+			$groups = elgg_get_entities_from_relationship(array('relationship' => 'member', 'relationship_guid' => $loggedin->getGUID(), 'inverse_relationship' => FALSE, 'limit' => 999));
+			if (is_array($groups)) {
+				foreach ($groups as $group) {
+					$returnvalue[$group->group_acl] = elgg_echo('groups:group') . ': ' . $group->name;
+				}
+			}
+		}
+
+		// This doesn't seem to do anything.
+		// There are no hooks to override container permissions for groups
+//
+//		if ($page_owner instanceof ElggGroup)
+//		{
+//			if (can_write_to_container())
+//			{
+//				$returnvalue[$page_owner->group_acl] = elgg_echo('groups:group') . ": " . $page_owner->name;
+//			}
+//		}
+		return $returnvalue;
+	}
+
+	/**
+	 * Groups deleted, so remove access lists.
+	 */
+	function groups_delete_event_listener($event, $object_type, $object)
+	{
+		delete_access_collection($object->group_acl);
+
+		return true;
+	}
+
+	/**
+	 * Listens to a group join event and adds a user to the group's access control
+	 *
+	 */
+	function groups_user_join_event_listener($event, $object_type, $object) {
+
+		$group = $object['group'];
+		$user = $object['user'];
+		$acl = $group->group_acl;
+
+		add_user_to_access_collection($user->guid, $acl);
+
+		return true;
+
+	}
+
+	/**
+	 * Listens to a group leave event and removes a user from the group's access control
+	 *
+	 */
+	function groups_user_leave_event_listener($event, $object_type, $object) {
+
+		$group = $object['group'];
+		$user = $object['user'];
+		$acl = $group->group_acl;
+
+		remove_user_from_access_collection($user->guid, $acl);
+
+		return true;
+
+	}
+
+	/**
+	 * This hooks into the getIcon API and provides nice user icons for users where possible.
+	 *
+	 * @param unknown_type $hook
+	 * @param unknown_type $entity_type
+	 * @param unknown_type $returnvalue
+	 * @param unknown_type $params
+	 * @return unknown
+	 */
+	function groups_groupicon_hook($hook, $entity_type, $returnvalue, $params)
+	{
+		global $CONFIG;
+
+		if ((!$returnvalue) && ($hook == 'entity:icon:url') && ($params['entity'] instanceof ElggGroup))
+		{
+			$entity = $params['entity'];
+			$type = $entity->type;
+			$viewtype = $params['viewtype'];
+			$size = $params['size'];
+
+			if ($icontime = $entity->icontime) {
+				$icontime = "{$icontime}";
+			} else {
+				$icontime = "default";
+			}
+
+			$filehandler = new ElggFile();
+			$filehandler->owner_guid = $entity->owner_guid;
+			$filehandler->setFilename("groups/" . $entity->guid . $size . ".jpg");
+
+			if ($filehandler->exists()) {
+				$url = $CONFIG->url . "pg/groupicon/{$entity->guid}/$size/$icontime.jpg";
+
+				return $url;
+			}
+		}
+	}
+
+	/**
+	 * A simple function to see who can edit a group discussion post
+	 * @param the comment $entity
+	 * @param user who owns the group $group_owner
+	 * @return boolean
+	 */
+	function groups_can_edit_discussion($entity, $group_owner)
+	{
+
+		//logged in user
+		$user = $_SESSION['user']->guid;
+
+		if (($entity->owner_guid == $user) || $group_owner == $user || isadminloggedin()) {
+			return true;
+		}else{
+			return false;
+		}
+
+	}
+
+	/**
+	 * Overrides topic post getURL() value.
+	 *
+	 */
+	function group_topicpost_url($annotation) {
+		if ($parent = get_entity($annotation->entity_guid)) {
+			global $CONFIG;
+			return $CONFIG->wwwroot . 'mod/groups/topicposts.php?topic='.$parent->guid.'&amp;group_guid='.$parent->container_guid.'#' . $annotation->id;
+		}
+	}
+
+	/**
+	 * Grabs groups by invitations
+	 * Have to override all access until there's a way override access to getter functions.
+	 *
+	 * @param $user_guid
+	 * @return unknown_type
+	 */
+	function groups_get_invited_groups($user_guid, $return_guids = FALSE) {
+		$ia = elgg_set_ignore_access(TRUE);
+		$invitations = elgg_get_entities_from_relationship(array('relationship' => 'invited', 'relationship_guid' => $user_guid, 'inverse_relationship' => TRUE, 'limit' => 9999));
+		elgg_set_ignore_access($ia);
+
+		if ($return_guids) {
+			$guids = array();
+			foreach ($invitations as $invitation) {
+				$guids[] = $invitation->getGUID();
+			}
+
+			return $guids;
+		}
+
+		return $invitations;
+	}
+
+	register_extender_url_handler('group_topicpost_url','annotation', 'group_topic_post');
+
+	// Register a handler for create groups
+	register_elgg_event_handler('create', 'group', 'groups_create_event_listener');
+
+	// Register a handler for delete groups
+	register_elgg_event_handler('delete', 'group', 'groups_delete_event_listener');
+
+	// Make sure the groups initialisation function is called on initialisation
+	register_elgg_event_handler('init','system','groups_init');
+	register_elgg_event_handler('init','system','groups_fields_setup', 10000); // Ensure this runs after other plugins
+	register_elgg_event_handler('join','group','groups_user_join_event_listener');
+	register_elgg_event_handler('leave','group','groups_user_leave_event_listener');
+	register_elgg_event_handler('pagesetup','system','groups_submenus');
+	register_elgg_event_handler('annotate','all','group_object_notifications');
+
+	// Register actions
+	global $CONFIG;
+	register_action("groups/addtopic",false,$CONFIG->pluginspath . "groups/actions/forums/addtopic.php");
+	register_action("groups/deletetopic",false,$CONFIG->pluginspath . "groups/actions/forums/deletetopic.php");
+	register_action("groups/addpost",false,$CONFIG->pluginspath . "groups/actions/forums/addpost.php");
+	register_action("groups/edittopic",false,$CONFIG->pluginspath . "groups/actions/forums/edittopic.php");
+	register_action("groups/deletepost",false,$CONFIG->pluginspath . "groups/actions/forums/deletepost.php");
+	register_action("groups/featured",false,$CONFIG->pluginspath . "groups/actions/featured.php");
+	register_action("groups/editpost",false,$CONFIG->pluginspath . "groups/actions/forums/editpost.php");
+
+?>
diff --git a/mod/groups/topicposts.php b/mod/groups/topicposts.php
new file mode 100644
index 000000000..bd2d3b1ed
--- /dev/null
+++ b/mod/groups/topicposts.php
@@ -0,0 +1,37 @@
+<?php
+
+	/**
+	 * Elgg Groups topic posts page
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// We now have RSS on topics
+		global $autofeed;
+		$autofeed = true;
+		
+	//get_input('group_guid');
+		set_page_owner(get_input('group_guid'));
+		if (!(page_owner_entity() instanceof ElggGroup)) forward();
+		
+		group_gatekeeper();
+		
+    // get the entity from id
+        $topic = get_entity(get_input('topic'));
+        if (!$topic) forward();
+         
+    // Display them
+	    $area2 = elgg_view("forum/viewposts", array('entity' => $topic));
+	    $body = elgg_view_layout("two_column_left_sidebar", '' , $area2);
+		
+	// Display page
+		page_draw($topic->title,$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/forms/forums/addpost.php b/mod/groups/views/default/forms/forums/addpost.php
new file mode 100644
index 000000000..004638f33
--- /dev/null
+++ b/mod/groups/views/default/forms/forums/addpost.php
@@ -0,0 +1,40 @@
+<?php
+
+	/**
+	 * Elgg group forum post edit/add page
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] Optionally, the post to edit
+	 */
+	    
+?>
+	<form action="<?php echo $vars['url']; ?>action/groups/addpost" method="post">
+		<p class="longtext_editarea">
+			<label><?php echo elgg_echo("groups:reply"); ?><br />
+			<?php
+
+				echo elgg_view("input/longtext",array(
+									"internalname" => "topic_post",
+									"value" => $body,
+													));
+			?>
+			</label>
+		</p>
+		<p>
+		    <!-- pass across the topic guid -->
+			<input type="hidden" name="topic_guid" value="<?php echo $vars['entity']->guid; ?>" />
+			<input type="hidden" name="group_guid" value="<?php echo $vars['entity']->container_guid; ?>" />
+			
+<?php 
+		echo elgg_view('input/securitytoken');
+?>
+			<!-- display the save button -->
+			<input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" />
+		</p>
+	
+	</form>
\ No newline at end of file
diff --git a/mod/groups/views/default/forms/forums/addtopic.php b/mod/groups/views/default/forms/forums/addtopic.php
new file mode 100644
index 000000000..d002b110a
--- /dev/null
+++ b/mod/groups/views/default/forms/forums/addtopic.php
@@ -0,0 +1,101 @@
+<?php
+
+	/**
+	 * Elgg Groups topic edit/add page
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['object'] Optionally, the topic to edit
+	 */
+
+	// Set title, form destination
+			$title = elgg_echo("groups:addtopic");
+			$action = "groups/addtopic";
+			$tags = "";
+			$title = "";
+			$message = "";
+			$message_id = "";
+			$status = "";
+			$access_id = ACCESS_DEFAULT;
+	    
+    // get the group guid
+        $group_guid = (int) get_input('group_guid');
+        
+	// set the title
+	    echo elgg_view_title(elgg_echo("groups:addtopic"));
+	    
+?>
+<div class="contentWrapper">
+	<!-- display the input form -->
+	<form action="<?php echo $vars['url']; ?>action/<?php echo $action; ?>" method="post">
+	<?php echo elgg_view('input/securitytoken'); ?>
+	
+		<p>
+			<label><?php echo elgg_echo("title"); ?><br />
+			<?php
+                //display the topic title input
+				echo elgg_view("input/text", array(
+									"internalname" => "topictitle",
+									"value" => $title,
+													));
+			?>
+			</label>
+		</p>
+		
+		<!-- display the tag input -->
+		<p>
+			<label><?php echo elgg_echo("tags"); ?><br />
+			<?php
+
+				echo elgg_view("input/tags", array(
+									"internalname" => "topictags",
+									"value" => $tags,
+													));
+			
+			?>
+			</label>
+		</p>
+		
+		<!-- topic message input -->
+		<p class="longtext_editarea">
+			<label><?php echo elgg_echo("groups:topicmessage"); ?><br />
+			<?php
+
+				echo elgg_view("input/longtext",array(
+									"internalname" => "topicmessage",
+									"value" => $message,
+													));
+			?>
+			</label>
+		</p>
+		
+		<!-- set the topic status -->
+		<p>
+		    <label><?php echo elgg_echo("groups:topicstatus"); ?><br />
+		    <select name="status">
+		        <option value="open" <?php if($status == "") echo "SELECTED";?>><?php echo elgg_echo('groups:topicopen'); ?></option>
+		        <option value="closed" <?php if($status == "closed") echo "SELECTED";?>><?php echo elgg_echo('groups:topicclosed'); ?></option>
+		    </select>
+		    </label>
+		</p>
+		
+		<!-- access -->
+		<p>
+			<label>
+				<?php echo elgg_echo('access'); ?><br />
+				<?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => $access_id)); ?>
+			</label>
+		</p>
+		
+		<!-- required hidden info and submit button -->
+		<p>
+			<input type="hidden" name="group_guid" value="<?php echo $group_guid; ?>" />
+			<input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" />
+		</p>
+	
+	</form>
+</div>
diff --git a/mod/groups/views/default/forms/forums/edittopic.php b/mod/groups/views/default/forms/forums/edittopic.php
new file mode 100644
index 000000000..b88dfd866
--- /dev/null
+++ b/mod/groups/views/default/forms/forums/edittopic.php
@@ -0,0 +1,109 @@
+<?php
+
+    /**
+	 * Elgg Groups topic edit/add page
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] Optionally, the topic to edit
+	 */
+	 
+	 //users can edit the access and status for now
+	    $access_id = $vars['entity']->access_id;
+	    $status = $vars['entity']->status;
+	    $tags = $vars['entity']->tags;
+	    $title = $vars['entity']->title;
+	    $message = $vars['entity']->getAnnotations('group_topic_post', 1, 0, "asc");
+	    
+	    foreach($message as $mes){
+			$messsage_content = $mes->value;
+		    $message_id = $mes->id;
+	    }		    
+		    
+	 // get the group GUID
+	    $group_guid = get_input("group");
+	    
+	// topic guid
+	    $topic_guid = $vars['entity']->guid;
+	    
+	// set the title
+	    echo elgg_view_title(elgg_echo("groups:edittopic"));
+	 
+?>
+
+<!-- display the input form -->
+	<form action="<?php echo $vars['url']; ?>action/groups/edittopic" method="post">
+	<?php echo elgg_view('input/securitytoken'); ?>
+	
+		<p>
+			<label><?php echo elgg_echo("title"); ?><br />
+			<?php
+                //display the topic title input
+				echo elgg_view("input/text", array(
+									"internalname" => "topictitle",
+									"value" => $title,
+													));
+			?>
+			</label>
+		</p>
+		
+		<!-- display the tag input -->
+		<p>
+			<label><?php echo elgg_echo("tags"); ?><br />
+			<?php
+
+				echo elgg_view("input/tags", array(
+									"internalname" => "topictags",
+									"value" => $tags,
+													));
+			
+			?>
+			</label>
+		</p>
+		
+		<!-- topic message input -->
+		<p class="longtext_editarea">
+			<label><?php echo elgg_echo("groups:topicmessage"); ?><br />
+			<?php
+
+				echo elgg_view("input/longtext",array(
+									"internalname" => "topicmessage",
+									"value" => $messsage_content,
+													));
+			?>
+			</label>
+		</p>
+		
+		<!-- set the topic status -->
+		<p>
+		    <label><?php echo elgg_echo("groups:topicstatus"); ?><br />
+		    <select name="status">
+		        <option value="open" <?php if($status == "") echo "SELECTED";?>><?php echo elgg_echo('groups:topicopen'); ?></option>
+		        <option value="sticky" <?php if($status == "sticky") echo "SELECTED";?>><?php echo elgg_echo('groups:topicsticky'); ?></option>
+		        <option value="resolved" <?php if($status == "resolved") echo "SELECTED";?>><?php echo elgg_echo('groups:topicresolved'); ?></option>
+		        <option value="closed" <?php if($status == "closed") echo "SELECTED";?>><?php echo elgg_echo('groups:topicclosed'); ?></option>
+		    </select>
+		    </label>
+		</p>
+		
+		<!-- access -->
+		<p>
+			<label>
+				<?php echo elgg_echo('access'); ?><br />
+				<?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => $access_id)); ?>
+			</label>
+		</p>
+		
+		<!-- required hidden info and submit button -->
+		<p>
+			<input type="hidden" name="group_guid" value="<?php echo $group_guid; ?>" />
+			<input type="hidden" name="topic" value="<?php echo $topic_guid; ?>" />
+			<input type="hidden" name="message_id" value="<?php echo $message_id; ?>" />
+			<input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" />
+		</p>
+	
+	</form>
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
new file mode 100644
index 000000000..1c5cb9b6e
--- /dev/null
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -0,0 +1,162 @@
+<?php
+	/**
+	 * Elgg groups plugin
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// new groups default to open membership
+	if (isset($vars['entity'])) {
+		$membership = $vars['entity']->membership;
+	} else {
+		$membership = ACCESS_PUBLIC;
+	}
+	
+?>
+<div class="contentWrapper">
+<form action="<?php echo $vars['url']; ?>action/groups/edit" enctype="multipart/form-data" method="post">
+
+	<?php echo elgg_view('input/securitytoken'); ?>
+
+	<p>
+		<label><?php echo elgg_echo("groups:icon"); ?><br />
+		<?php
+
+			echo elgg_view("input/file",array('internalname' => 'icon'));
+		
+		?>
+		</label>
+	</p>
+<?php
+
+	//var_export($vars['profile']);
+	if (is_array($vars['config']->group) && sizeof($vars['config']->group) > 0)
+		foreach($vars['config']->group as $shortname => $valtype) {
+			
+?>
+
+	<p>
+		<label>
+			<?php echo elgg_echo("groups:{$shortname}") ?><br />
+			<?php echo elgg_view("input/{$valtype}",array(
+															'internalname' => $shortname,
+															'value' => $vars['entity']->$shortname,
+															)); ?>
+		</label>
+	</p>
+
+<?php
+			
+		}
+
+?>
+
+	<p>
+		<label>
+			<?php echo elgg_echo('groups:membership'); ?><br />
+			<?php echo elgg_view('input/access', array('internalname' => 'membership','value' => $membership, 'options' => array( ACCESS_PRIVATE => elgg_echo('groups:access:private'), ACCESS_PUBLIC => elgg_echo('groups:access:public')))); ?>
+		</label>
+	</p>
+	
+	<?php
+
+	if (get_plugin_setting('hidden_groups', 'groups') == 'yes')
+	{
+?>
+
+	<p>
+		<label>
+			<?php echo elgg_echo('groups:visibility'); ?><br />
+			<?php 
+			
+			$this_owner = $vars['entity']->owner_guid;
+			if (!$this_owner) $this_owner = get_loggedin_userid();
+			
+			$access = array(ACCESS_FRIENDS => elgg_echo("access:friends:label"), 1 => elgg_echo("LOGGED_IN"), 2 => elgg_echo("PUBLIC"));
+			$collections = get_user_access_collections($this_owner);
+			if (is_array($collections))
+			{
+				foreach ($collections as $c)
+					$access[$c->id] = $c->name;
+			}
+			
+			echo elgg_view('input/access', array('internalname' => 'vis', 'value' =>  ($vars['entity']->access_id ? $vars['entity']->access_id : ACCESS_PUBLIC), 'options' => $access)); 
+			
+			
+			?>
+		</label>
+	</p>
+
+<?php 	
+	}
+	
+	?>
+	
+    <?php
+		if (isset($vars['config']->group_tool_options)) {
+			foreach($vars['config']->group_tool_options as $group_option) {
+				$group_option_toggle_name = $group_option->name."_enable";
+				if ($group_option->default_on) {
+					$group_option_default_value = 'yes';
+				} else {
+					$group_option_default_value = 'no';
+				}
+?>	
+    <p>
+			<label>
+				<?php echo $group_option->label; ?><br />
+				<?php
+
+					echo elgg_view("input/radio",array(
+									"internalname" => $group_option_toggle_name,
+									"value" => $vars['entity']->$group_option_toggle_name ? $vars['entity']->$group_option_toggle_name : $group_option_default_value,
+									'options' => array(
+														elgg_echo('groups:yes') => 'yes',
+														elgg_echo('groups:no') => 'no',
+													   ),
+													));
+				?>
+			</label>
+	</p>
+	<?php
+		}
+	}
+	?>
+	<p>
+		<?php
+			if ($vars['entity'])
+			{ 
+			?><input type="hidden" name="group_guid" value="<?php echo $vars['entity']->getGUID(); ?>" /><?php 
+			}
+		?>
+		<input type="hidden" name="user_guid" value="<?php echo page_owner_entity()->guid; ?>" />
+		<input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" />
+		
+	</p>
+
+</form>
+</div>
+
+<div class="contentWrapper">
+<div id="delete_group_option">
+	<form action="<?php echo $vars['url'] . "action/groups/delete"; ?>">
+		<?php
+			echo elgg_view('input/securitytoken');
+			if ($vars['entity'])
+			{ 
+				$warning = elgg_echo("groups:deletewarning");
+			?>
+			<input type="hidden" name="group_guid" value="<?php echo $vars['entity']->getGUID(); ?>" />
+			<input type="submit" name="delete" value="<?php echo elgg_echo('groups:delete'); ?>" onclick="javascript:return confirm('<?php echo $warning; ?>')"/><?php 
+			}
+		?>
+	</form>
+</div><div class="clearfloat"></div>
+</div>
+
+
+
diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php
new file mode 100644
index 000000000..ebe184c53
--- /dev/null
+++ b/mod/groups/views/default/forms/groups/invite.php
@@ -0,0 +1,34 @@
+<?php
+	/**
+	 * Elgg groups plugin
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$group = $vars['entity'];
+	$owner = get_entity($vars['entity']->owner_guid);
+	$forward_url = $group->getURL();
+	
+	
+?>
+<div class="contentWrapper">
+<form action="<?php echo $vars['url']; ?>action/groups/invite" method="post">
+
+	<?php
+	echo elgg_view('input/securitytoken');
+
+	if ($friends = get_entities_from_relationship('friend',$_SESSION['guid'],false,'user','',0,'',9999)) {
+		echo elgg_view('friends/picker',array('entities' => $friends, 'internalname' => 'user_guid', 'highlight' => 'all'));	
+	}
+		// echo elgg_view('sharing/invite',array('shares' => $shares, 'owner' => $owner, 'group' => $group));
+	
+	?>
+	<input type="hidden" name="forward_url" value="<?php echo $forward_url; ?>" />
+	<input type="hidden" name="group_guid" value="<?php echo $group->guid; ?>" />
+	<input type="submit" value="<?php echo elgg_echo('invite'); ?>" />
+</form>
+</div>
diff --git a/mod/groups/views/default/forum/topicposts.php b/mod/groups/views/default/forum/topicposts.php
new file mode 100644
index 000000000..20a545eec
--- /dev/null
+++ b/mod/groups/views/default/forum/topicposts.php
@@ -0,0 +1,106 @@
+<?php
+
+	/**
+	 * Elgg Topic individual post view. This is all the follow up posts on a particular topic
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The posted comment to view
+	 */
+	 
+	
+?>
+
+	<div class="topic_post"><!-- start the topic_post -->
+	
+	    <table width="100%">
+            <tr>
+                <td>
+                	<a name="<?php echo $vars['entity']->id; ?>"></a>
+                    <?php
+                        //get infomation about the owner of the comment
+                        if ($post_owner = get_user($vars['entity']->owner_guid)) {
+	                        
+	                        //display the user icon
+	                        echo "<div class=\"post_icon\">" . elgg_view("profile/icon",array('entity' => $post_owner, 'size' => 'small')) . "</div>";
+	                        
+	                        //display the user name
+	                        echo "<p><b>" . $post_owner->name . "</b><br />";
+	                        
+                        } else {
+                        	echo "<div class=\"post_icon\"><img src=\"" . elgg_view('icon/user/default/small') . "\" /></div>";
+                        	echo "<p><b>" . elgg_echo('profile:deleteduser') . "</b><br />";
+                        }
+                        
+                        //display the date of the comment
+                        echo "<small>" . friendly_time($vars['entity']->time_created) . "</small></p>";
+                    ?>
+                </td>
+                <td width="70%">       
+                    <?php
+                        //display the actual message posted
+                       echo parse_urls(elgg_view("output/longtext",array("value" => $vars['entity']->value)));
+                    ?>
+                </td>
+            </tr>
+        </table>
+		<?php
+
+		    //if the comment owner is looking at it, or admin, or group owner they can edit
+		    if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {
+        ?>
+		        <p class="topic-post-menu">
+		        <?php
+             				
+			        echo elgg_view("output/confirmlink",array(
+														'href' => $vars['url'] . "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'),
+                										'text' => elgg_echo('delete'),
+														'confirm' => elgg_echo('deleteconfirm'),
+													));
+						
+					//display an edit link that will open up an edit area							
+					echo " <a class=\"collapsibleboxlink\">".elgg_echo('edit')."</a>";
+					echo "<div class=\"collapsible_box\">";
+					//get the edit form and details
+					$submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
+					$text_textarea = elgg_view('input/longtext', array('internalname' => 'postComment'.$vars['entity']->id, 'value' => $vars['entity']->value));
+                	$post = elgg_view('input/hidden', array('internalname' => 'post', 'value' => $vars['entity']->id));
+		  			$field = elgg_view('input/hidden', array('internalname' => 'field_num', 'value' => $vars['entity']->id));
+                	$topic = elgg_view('input/hidden', array('internalname' => 'topic', 'value' => get_input('topic')));
+		  			$group = elgg_view('input/hidden', array('internalname' => 'group', 'value' => get_input('group_guid')));
+		  			
+					$form_body = <<<EOT
+					
+					<div class='edit_forum_comments'>
+					<p class='longtext_editarea'>	
+						$text_textarea
+					</p>
+					$post
+					$topic
+					$group
+					$field
+					<p>
+						$submit_input
+					</p>
+						
+					</div>
+					
+EOT;
+				
+?>
+
+				<?php
+					echo elgg_view('input/form', array('action' => "{$vars['url']}action/groups/editpost", 'body' => $form_body, 'internalid' => 'editforumpostForm'));
+				?>
+					</div>
+		        </p>
+		
+        <?php
+            }
+	    ?>
+		
+	</div><!-- end the topic_post -->
\ No newline at end of file
diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php
new file mode 100644
index 000000000..c4cd9becf
--- /dev/null
+++ b/mod/groups/views/default/forum/topics.php
@@ -0,0 +1,33 @@
+<?php
+	/**
+	 * Elgg groups plugin
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+?>
+
+<div id="content_area_group_title"><h2><?php echo elgg_echo("groups:forum"); ?></h2></div>
+
+<?php
+    //only show the add link if the user is a member
+    if(page_owner_entity()->isMember($vars['user'])){
+     
+?>
+        <!-- display the add a topic link -->
+        <div class="add_topic"><a href="<?php echo $vars['url']; ?>mod/groups/addtopic.php?group_guid=<?php echo get_input('group_guid'); ?>" class="add_topic_button"><?php echo elgg_echo("groups:addtopic"); ?></a></div>
+
+<?php
+    }
+?>    
+<?php
+	if($vars['topics'])
+		echo $vars['topics'];
+	else
+		echo "<div class='contentWrapper'>". elgg_echo("grouptopic:notcreated") . "</div>";
+
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/forum/viewposts.php b/mod/groups/views/default/forum/viewposts.php
new file mode 100644
index 000000000..e7e194691
--- /dev/null
+++ b/mod/groups/views/default/forum/viewposts.php
@@ -0,0 +1,58 @@
+<?php
+
+    /**
+	 * Elgg groups plugin display topic posts
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+
+<div id="topic_posts"><!-- open the topic_posts div -->
+<div id="pages_breadcrumbs"><b><a href="<?php echo $vars['url']; ?>pg/groups/forum/<?php echo $vars['entity']->container_guid; ?>/"><?php echo elgg_echo("groups:forum"); ?></a></b> > <?php echo $vars['entity']->title; ?></div>
+  
+<?php
+    //display follow up comments
+    $count = $vars['entity']->countAnnotations('group_topic_post');
+    $offset = (int) get_input('offset',0);
+    
+    $baseurl = $vars['url'] . "mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$vars['entity']->container_guid}";
+    echo elgg_view('navigation/pagination',array(
+    												'limit' => 50,
+    												'offset' => $offset,
+    												'baseurl' => $baseurl,
+    												'count' => $count,
+    											));
+
+?>
+    <!-- grab the topic title -->
+        <div id="content_area_group_title"><h2><?php echo $vars['entity']->title; ?></h2></div>
+<?php
+    											
+    foreach($vars['entity']->getAnnotations('group_topic_post', 50, $offset, "asc") as $post) {
+    		    
+	     echo elgg_view("forum/topicposts",array('entity' => $post));
+		
+	}
+	
+	// check to find out the status of the topic and act
+    if($vars['entity']->status != "closed" && page_owner_entity()->isMember($vars['user'])){
+        
+        //display the add comment form, this will appear after all the existing comments
+	    echo elgg_view("forms/forums/addpost", array('entity' => $vars['entity']));
+	    
+    } elseif($vars['entity']->status == "closed") {
+        
+        //this topic has been closed by the owner
+        echo "<h2>" . elgg_echo("groups:topicisclosed") . "</h2>";
+        echo "<p>" . elgg_echo("groups:topiccloseddesc") . "</p>";
+        
+    } else {
+    }
+
+?>
+</div>
\ No newline at end of file
diff --git a/mod/groups/views/default/group/group.php b/mod/groups/views/default/group/group.php
new file mode 100644
index 000000000..96f70d36a
--- /dev/null
+++ b/mod/groups/views/default/group/group.php
@@ -0,0 +1,21 @@
+<?php 
+	/**
+	 * Elgg groups profile display
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	if ($vars['full']) {
+		echo elgg_view("groups/groupprofile",$vars);
+	} else {
+		if (get_input('search_viewtype') == "gallery") {
+			echo elgg_view('groups/groupgallery',$vars); 				
+		} else {
+			echo elgg_view("groups/grouplisting",$vars);
+		}
+	}
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/closedmembership.php b/mod/groups/views/default/groups/closedmembership.php
new file mode 100644
index 000000000..34e4169eb
--- /dev/null
+++ b/mod/groups/views/default/groups/closedmembership.php
@@ -0,0 +1,15 @@
+<?php
+	/**
+	 * Elgg groups plugin full profile view (for a closed group you haven't joined).
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+<div id="groups_closed_membership">
+	<p><?php echo elgg_echo('groups:closedgroup'); ?></p>
+</div>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/contentwrapper.php b/mod/groups/views/default/groups/contentwrapper.php
new file mode 100644
index 000000000..e11d3d09a
--- /dev/null
+++ b/mod/groups/views/default/groups/contentwrapper.php
@@ -0,0 +1,5 @@
+<div class='contentWrapper groups'><?php
+
+	echo $vars['body'];
+
+?></div>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
new file mode 100644
index 000000000..bc8d2bfc0
--- /dev/null
+++ b/mod/groups/views/default/groups/css.php
@@ -0,0 +1,401 @@
+<?php
+
+	/**
+	 * Elgg Groups css
+	 * 
+	 * @package groups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+
+#content_area_group_title h2 {
+	color:#0054A7;
+	font-size:1.35em;
+	line-height:1.2em;
+	margin:0 0 0 8px;
+	padding:5px;
+}
+#topic_posts #content_area_group_title h2 {
+	margin:0 0 0 0;
+}
+
+#two_column_left_sidebar_maincontent #owner_block_content {
+	margin:0 0 10px 0 !important;
+}
+
+#groups_info_column_left {
+	width:435px;
+	margin-left:230px;
+	margin-right:10px;
+}
+
+#groups_info_column_left .odd {
+	background:#E9E9E9;
+	-webkit-border-radius: 5px; 
+	-moz-border-radius: 5px;
+}
+#groups_info_column_left .even {
+	background:#E9E9E9;
+	-webkit-border-radius: 5px; 
+	-moz-border-radius: 5px;
+}
+#groups_info_column_left p {
+	margin:0 0 7px 0;
+	padding:2px 4px;
+}
+
+#groups_info_column_right {
+	float:left;
+	width:230px;
+	margin:0 0 0 10px;
+}
+#groups_info_wide p {
+	text-align: right;
+	padding-right:10px;
+}
+#group_stats {
+	width:190px;
+	background: #e9e9e9;
+	padding:5px;
+	margin:10px 0 20px 0;
+	-webkit-border-radius: 5px; 
+	-moz-border-radius: 5px;
+}
+#group_stats p {
+	margin:0;
+}
+#group_members {
+	margin:10px;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	background: white;
+}
+
+#right_column {
+	clear:left;
+	float:right;
+	width:340px;
+	margin:0 10px 0 0;
+}
+#left_column {
+	width:340px;
+	float:left;
+	margin:0 10px 0 10px;
+
+}
+/* IE 6 fixes */
+* html #left_column { 
+	margin:0 0 0 5px;
+}
+* html #right_column { 
+	margin:0 5px 0 0;
+}
+
+#group_members h2,
+#right_column h2,
+#left_column h2,
+#fullcolumn h2 {
+	margin:0 0 10px 0;
+	padding:5px;
+	color:#0054A7;
+	font-size:1.25em;
+	line-height:1.2em;
+}
+#fullcolumn .contentWrapper {
+	margin:0 10px 20px 10px;
+	padding:0 0 5px;
+}
+
+.member_icon {
+	margin:0 0 6px 6px;
+	float:left;
+}
+
+/* IE6 */
+* html #topic_post_tbl { width:676px !important;}
+
+/* all browsers - force tinyMCE on edit comments to be full-width */
+.edit_forum_comments .defaultSkin table.mceLayout {
+	width: 636px !important;
+}
+
+/* topics overview page */
+#forum_topics {
+    padding:10px;
+    margin:0 10px 0 10px;
+    background:white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;    
+}
+/* topics individual view page */
+#topic_posts {
+	margin:0 10px 5px 10px;
+}
+#topic_posts #pages_breadcrumbs {
+	margin:2px 0 0 0px;
+}
+#topic_posts form {
+    padding:10px;
+    margin:30px 0 0 0;
+    background:white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px; 
+}
+.topic_post {
+	padding:10px;
+    margin:0 0 5px 0;
+    background:white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;  
+}
+.topic_post .post_icon {
+    float:left;
+    margin:0 8px 4px 0;
+}
+.topic_post h2 {
+    margin-bottom:20px;
+}
+.topic_post p.topic-post-menu {
+	margin:0;
+}
+.topic_post p.topic-post-menu a.collapsibleboxlink {
+	padding-left:10px;
+}
+.topic_post table, .topic_post td {
+    border:none;
+}
+
+/* group latest discussions widget */
+#latest_discussion_widget {
+	margin:0 0 20px 0;
+	background:white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+}
+/* group files widget */
+#filerepo_widget_layout {
+	margin:0 0 20px 0;
+	padding: 0 0 5px 0;
+	background:white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+}
+/* group pages widget */
+#group_pages_widget {
+	margin:0 0 20px 0;
+	padding: 0 0 5px 0;
+	background:white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+}
+#group_pages_widget .search_listing {
+	border: 2px solid #cccccc;
+}
+#right_column .filerepo_widget_singleitem {
+	background: #dedede !important;
+	margin:0 10px 5px 10px;
+}
+#left_column .filerepo_widget_singleitem {
+	background: #dedede !important;
+	margin:0 10px 5px 10px;
+}
+.forum_latest {
+	margin:0 10px 5px 10px;
+	background: #dedede;
+	padding:5px;
+   	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+}
+.forum_latest:hover {
+
+}
+.forum_latest .topic_owner_icon {
+	float:left;
+}
+.forum_latest .topic_title {
+	margin-left:35px;
+}
+.forum_latest .topic_title p {
+	line-height: 1.0em;
+    padding:0;
+    margin:0;
+    font-weight: bold;
+}
+.forum_latest p.topic_replies {
+    padding:3px 0 0 0;
+    margin:0;
+    color:#666666;
+}
+.add_topic {
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	background:white;
+	margin:5px 10px;
+	padding:10px 10px 10px 6px;
+}
+
+a.add_topic_button {
+	font: 12px/100% Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	color: white;
+	background:#4690d6;
+	border:none;
+	-webkit-border-radius: 5px; 
+	-moz-border-radius: 5px;
+	width: auto;
+	height: auto;
+	padding: 3px 6px 3px 6px;
+	margin:0;
+	cursor: pointer;
+}
+a.add_topic_button:hover {
+	background: #0054a7;
+	color:white;
+	text-decoration: none;
+}
+
+
+
+/* latest discussion listing */
+.latest_discussion_info {
+	float:right;
+	width:300px;
+	text-align: right;
+	margin-left: 10px;
+}
+.groups .search_listing br {
+	height:0;
+	line-height:0;
+}
+span.timestamp {
+	color:#666666;
+	font-size: 90%;
+}
+.latest_discussion_info .timestamp {
+	font-size: 0.85em;
+}
+/* new groups page */
+.groups .search_listing {
+	border:2px solid #cccccc;
+	margin:0 0 5px 0;
+}
+.groups .search_listing:hover {
+	background:#dedede;
+}
+.groups .group_count {
+	font-weight: bold;
+	color: #666666;
+	margin:0 0 5px 4px;
+}
+.groups .search_listing_info {
+	color:#666666;
+}
+.groupdetails {
+	float:right;
+}
+.groupdetails p {
+	margin:0;
+	padding:0;
+	line-height: 1.1em;
+	text-align: right;
+}
+#groups_closed_membership {
+	margin:0 10px 20px 10px;
+	padding: 3px 5px 5px 5px;
+	background:#bbdaf7;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;	
+}
+#groups_closed_membership p {
+	margin:0;
+}
+
+/* groups membership widget */
+.groupmembershipwidget .contentWrapper {
+	margin:0 10px 5px 10px;
+}
+.groupmembershipwidget .contentWrapper .groupicon {
+	float:left;
+	margin:0 10px 0 0;
+}
+.groupmembershipwidget .search_listing_info p {
+	color: #666666;
+}
+.groupmembershipwidget .search_listing_info span {
+	font-weight: bold;
+}
+
+/* groups sidebar */
+.featuredgroups .contentWrapper {
+	margin:0 0 10px 0;
+}
+.featuredgroups .contentWrapper .groupicon {
+	float:left;
+	margin:0 10px 0 0;
+}
+.featuredgroups .contentWrapper p {
+	margin: 0;
+	line-height: 1.2em;
+	color:#666666;
+}
+.featuredgroups .contentWrapper span {
+	font-weight: bold;
+}
+#groupssearchform {
+	border-bottom: 1px solid #cccccc;
+	margin-bottom: 10px;
+}
+#groupssearchform input[type="submit"] {
+	padding:2px;
+	height:auto;
+	margin:4px 0 5px 0;
+}
+.sidebarBox #owner_block_submenu {
+	margin:5px 0 0 0;
+}
+
+/* delete post */
+.delete_discussion {
+	
+}
+.delete_discussion a {
+	display:block;
+	float:right;
+	cursor: pointer;
+	width:14px;
+	height:14px;
+	margin:0;
+	background: url("<?php echo $vars['url']; ?>_graphics/icon_customise_remove.png") no-repeat 0 0;
+}
+.delete_discussion a:hover {
+	background-position: 0 -16px;
+	text-decoration: none;
+}
+/* IE6 */
+* html .delete_discussion a { font-size: 1px; }
+/* IE7 */
+*:first-child+html .delete_discussion a { font-size: 1px; }
+
+/* delete group button */
+#delete_group_option input[type="submit"] {
+	background:#dedede;
+	border-color:#dedede;
+	color:#333333; 
+	margin:0;
+	float:right;
+	clear:both;
+}
+#delete_group_option input[type="submit"]:hover {
+	background:red;
+	border-color:red;
+	color:white;
+}
+
+#groupsearchform .search_input {
+	width:176px;
+}
+
diff --git a/mod/groups/views/default/groups/featured.php b/mod/groups/views/default/groups/featured.php
new file mode 100644
index 000000000..6e85bf5d8
--- /dev/null
+++ b/mod/groups/views/default/groups/featured.php
@@ -0,0 +1,29 @@
+<?php
+
+	/**
+	 * This view will display featured groups - these are set by admin
+	 **/
+	 
+	
+?>
+<div class="sidebarBox featuredgroups">
+<h3><?php echo elgg_echo("groups:featured"); ?></h3>
+
+<?php
+	if($vars['featured']){
+		
+		foreach($vars['featured'] as $group){
+			$icon = elgg_view(
+				"groups/icon", array(
+									'entity' => $group,
+									'size' => 'small',
+								  )
+				);
+				
+			echo "<div class=\"contentWrapper\">" . $icon . " <p><span>" . $group->name . "</span><br />";
+			echo $group->briefdescription . "</p><div class=\"clearfloat\"></div></div>";
+			
+		}
+	}
+?>
+</div>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/find.php b/mod/groups/views/default/groups/find.php
new file mode 100644
index 000000000..671d618bc
--- /dev/null
+++ b/mod/groups/views/default/groups/find.php
@@ -0,0 +1,20 @@
+<?php
+
+	/**
+	 * A simple group search by tag view
+	 **/
+
+$tag_string = elgg_echo('groups:search:tags');
+	 
+?>
+<div class="sidebarBox">
+<h3><?php echo elgg_echo('groups:searchtag'); ?></h3>
+<form id="groupsearchform" action="<?php echo $vars['url']; ?>pg/search/" method="get">
+	<input type="text" name="tag" value="<?php echo $tag_string; ?>" onclick="if (this.value=='<?php echo $tag_string; ?>') { this.value='' }" class="search_input" />
+	<input type="hidden" name="entity_type" value="group" />
+	<input type="hidden" name="subtype" value="" />
+	<input type="hidden" name="tagtype" value="" />
+	<input type="hidden" name="owner_guid" value="0" />
+	<input type="submit" value="<?php echo elgg_echo('go'); ?>" />
+</form>
+</div>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/forum_latest.php b/mod/groups/views/default/groups/forum_latest.php
new file mode 100644
index 000000000..6baa8a575
--- /dev/null
+++ b/mod/groups/views/default/groups/forum_latest.php
@@ -0,0 +1,38 @@
+<?php
+ 
+    // Latest forum discussion for the group home page
+
+    //check to make sure this group forum has been activated
+    if($vars['entity']->forum_enable != 'no'){
+
+?>
+
+<div class="contentWrapper">
+<h2><?php echo elgg_echo('groups:latestdiscussion'); ?></h2>
+<?php
+	
+    $forum = elgg_get_entities_from_annotations(array('types' => 'object', 'subtypes' => 'groupforumtopic', 'annotation_names' => 'group_topic_post', 'container_guid' => $vars['entity']->guid, 'limit' => 4, 'order_by' => 'maxtime desc'));
+	
+    if($forum){
+        foreach($forum as $f){
+        	    
+                $count_annotations = $f->countAnnotations("group_topic_post");
+                 
+        	    echo "<div class=\"forum_latest\">";
+        	    echo "<div class=\"topic_owner_icon\">" . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny', 'override' => true)) . "</div>";
+    	        echo "<div class=\"topic_title\"><p><a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$f->guid}&group_guid={$vars['entity']->guid}\">" . $f->title . "</a></p> <p class=\"topic_replies\"><small>".elgg_echo('groups:posts').": " . $count_annotations . "</small></p></div>";
+    	        	
+    	        echo "</div>";
+    	        
+        }
+    } else {
+		echo "<div class=\"forum_latest\">";
+		echo elgg_echo("grouptopic:notcreated");
+		echo "</div>";
+    }
+?>
+<div class="clearfloat" /></div>
+</div>
+<?php
+	}//end of forum active check
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/group_sort_menu.php b/mod/groups/views/default/groups/group_sort_menu.php
new file mode 100644
index 000000000..7314507e0
--- /dev/null
+++ b/mod/groups/views/default/groups/group_sort_menu.php
@@ -0,0 +1,28 @@
+<?php
+
+	/**
+	 * A simple view to provide the user with group filters and the number of group on the site
+	 **/
+	 
+	 $num_groups = $vars['count'];
+	 if(!$num_groups)
+	 	$num_groups = 0;
+	 	
+	 $filter = $vars['filter'];
+	 
+	 //url
+	 $url = $vars['url'] . "pg/groups/world/";
+
+?>
+<div id="elgg_horizontal_tabbed_nav">
+<ul>
+	<li <?php if($filter == "active") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=active"><?php echo elgg_echo('groups:latestdiscussion'); ?></a></li>
+	<li <?php if($filter == "newest") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=newest"><?php echo elgg_echo('groups:newest'); ?></a></li>
+	<li <?php if($filter == "pop") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=pop"><?php echo elgg_echo('groups:popular'); ?></a></li>
+</ul>
+</div>
+<div class="group_count">
+	<?php
+		echo $num_groups . " " . elgg_echo("groups:count");
+	?>
+</div>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/groupgallery.php b/mod/groups/views/default/groups/groupgallery.php
new file mode 100644
index 000000000..7122dc098
--- /dev/null
+++ b/mod/groups/views/default/groups/groupgallery.php
@@ -0,0 +1,25 @@
+<?php
+	/**
+	 * Elgg groups plugin gallery view
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$icon = elgg_view(
+			"groups/icon", array(
+									'entity' => $vars['entity'],
+									'size' => 'large',
+								  )
+		);
+
+	$info .= "<p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></b></p>";
+	
+	// num users, last activity, owner etc
+	
+	
+	echo elgg_view('search/gallery_listing',array('icon' => $icon, 'info' => $info));
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/grouplisting.php b/mod/groups/views/default/groups/grouplisting.php
new file mode 100644
index 000000000..d25eaff56
--- /dev/null
+++ b/mod/groups/views/default/groups/grouplisting.php
@@ -0,0 +1,49 @@
+<?php
+	/**
+	 * Elgg user display (small)
+	 *
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 *
+	 * @uses $vars['entity'] The user entity
+	 */
+
+	$icon = elgg_view(
+			"groups/icon", array(
+									'entity' => $vars['entity'],
+									'size' => 'small',
+								)
+		);
+
+	//get the membership type
+	$membership = $vars['entity']->membership;
+	if($membership == 2)
+		$mem = elgg_echo("groups:open");
+	else
+		$mem = elgg_echo("groups:closed");
+
+	//for admins display the feature or unfeature option
+	if($vars['entity']->featured_group == "yes"){
+		$url = elgg_add_action_tokens_to_url($vars['url'] . "action/groups/featured?group_guid=" . $vars['entity']->guid . "&action=unfeature");
+		$wording = elgg_echo("groups:makeunfeatured");
+	}else{
+		$url = elgg_add_action_tokens_to_url($vars['url'] . "action/groups/featured?group_guid=" . $vars['entity']->guid . "&action=feature");
+		$wording = elgg_echo("groups:makefeatured");
+	}
+
+	$info .= "<div class=\"groupdetails\"><p>" . $mem . " / <b>" . get_group_members($vars['entity']->guid, 10, 0, 0, true) ."</b> " . elgg_echo("groups:member") . "</p>";
+	//if admin, show make featured option
+	if(isadminloggedin())
+		$info .= "<p><a href=\"{$url}\">{$wording}</a></p>";
+	$info .= "</div>";
+	$info .= "<p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></b></p>";
+	$info .= "<p class=\"owner_timestamp\">" . $vars['entity']->briefdescription . "</p>";
+
+	// num users, last activity, owner etc
+
+	echo elgg_view_listing($icon, $info);
+
+?>
diff --git a/mod/groups/views/default/groups/groupprofile.php b/mod/groups/views/default/groups/groupprofile.php
new file mode 100644
index 000000000..1c989c9a8
--- /dev/null
+++ b/mod/groups/views/default/groups/groupprofile.php
@@ -0,0 +1,102 @@
+<?php
+	/**
+	 * Elgg groups plugin full profile view.
+	 *
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	if ($vars['full'] == true) {
+		$iconsize = "large";
+	} else {
+		$iconsize = "medium";
+	}
+
+?>
+
+<div id="groups_info_column_right"><!-- start of groups_info_column_right -->
+	<div id="groups_icon_wrapper"><!-- start of groups_icon_wrapper -->
+
+		<?php
+			echo elgg_view(
+					"groups/icon", array(
+												'entity' => $vars['entity'],
+												//'align' => "left",
+												'size' => $iconsize,
+											)
+					);
+		?>
+
+	</div><!-- end of groups_icon_wrapper -->
+	<div id="group_stats"><!-- start of group_stats -->
+		<?php
+
+			echo "<p><b>" . elgg_echo("groups:owner") . ": </b><a href=\"" . get_user($vars['entity']->owner_guid)->getURL() . "\">" . get_user($vars['entity']->owner_guid)->name . "</a></p>";
+
+		?>
+		<p><?php echo elgg_echo('groups:members') . ": " . get_entities_from_relationship('member', $vars['entity']->guid, true, 'user', '', 0, '', 9999, 0, true); ?></p>
+	</div><!-- end of group_stats -->
+</div><!-- end of groups_info_column_right -->
+
+<div id="groups_info_column_left"><!-- start of groups_info_column_left -->
+	<?php
+		if ($vars['full'] == true) {
+			if (is_array($vars['config']->group) && sizeof($vars['config']->group) > 0){
+
+				foreach($vars['config']->group as $shortname => $valtype) {
+					if ($shortname != "name") {
+						$value = $vars['entity']->$shortname;
+
+						if (!empty($value)) {
+							//This function controls the alternating class
+							$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
+						}
+
+						echo "<p class=\"{$even_odd}\">";
+						echo "<b>";
+						echo elgg_echo("groups:{$shortname}");
+						echo ": </b>";
+
+						$options = array(
+							'value' => $vars['entity']->$shortname
+						);
+
+						if ($valtype == 'tags') {
+							$options['tag_names'] = $shortname;
+						}
+
+						echo elgg_view("output/{$valtype}", $options);
+
+						echo "</p>";
+					}
+				}
+			}
+		}
+	?>
+</div><!-- end of groups_info_column_left -->
+
+<div id="groups_info_wide">
+
+	<p class="groups_info_edit_buttons">
+
+<?php
+	if ($vars['entity']->canEdit())
+	{
+
+?>
+
+		<a href="<?php echo $vars['url']; ?>mod/groups/edit.php?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("edit"); ?></a>
+
+
+<?php
+
+	}
+
+?>
+
+	</p>
+</div>
+<div class="clearfloat"></div>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/icon.php b/mod/groups/views/default/groups/icon.php
new file mode 100644
index 000000000..7390200d9
--- /dev/null
+++ b/mod/groups/views/default/groups/icon.php
@@ -0,0 +1,48 @@
+<?php
+
+	/**
+	 * Elgg group icon
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The user entity. If none specified, the current user is assumed.
+	 * @uses $vars['size'] The size - small, medium or large. If none specified, medium is assumed. 
+	 */
+
+	$group = $vars['entity'];
+	
+	if ($group instanceof ElggGroup) {
+	
+	// Get size
+	if (!in_array($vars['size'],array('small','medium','large','tiny','master','topbar')))
+		$vars['size'] = "medium";
+			
+	// Get any align and js
+	if (!empty($vars['align'])) {
+		$align = " align=\"{$vars['align']}\" ";
+	} else {
+		$align = "";
+	}
+	
+	if ($icontime = $vars['entity']->icontime) {
+		$icontime = "{$icontime}";
+	} else {
+		$icontime = "default";
+	}
+	
+	
+?>
+
+<div class="groupicon">
+<a href="<?php echo $vars['entity']->getURL(); ?>" class="icon" ><img src="<?php echo $vars['entity']->getIcon($vars['size']); ?>" border="0" <?php echo $align; ?> title="<?php echo $name; ?>" <?php echo $vars['js']; ?> /></a>
+</div>
+
+<?php
+
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php
new file mode 100644
index 000000000..fbbbafb22
--- /dev/null
+++ b/mod/groups/views/default/groups/invitationrequests.php
@@ -0,0 +1,44 @@
+<div class="contentWrapper">
+
+<?php
+
+	if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
+		$user = get_loggedin_user();
+		foreach($vars['invitations'] as $group)
+			if ($group instanceof ElggGroup) {
+
+?>
+	<div class="reportedcontent_content active_report">
+		<div class="groups_membershiprequest_buttons">
+			<?php
+				echo "<div class=\"member_icon\"><a href=\"" . $group->getURL() . "\">";
+				echo elgg_view("profile/icon", array(
+					'entity' => $group,
+					'size' => 'small',
+					'override' => 'true'
+				));
+				echo "</a></div>{$group->name}<br />";
+
+				echo str_replace('<a', '<a class="delete_report_button" ', elgg_view('output/confirmlink',array(
+					'href' => $vars['url'] . "action/groups/killinvitation?user_guid={$user->getGUID()}&group_guid={$group->getGUID()}",
+					'confirm' => elgg_echo('groups:joinrequest:remove:check'),
+					'text' => elgg_echo('delete'),
+				)));
+			$url = elgg_add_action_tokens_to_url("{$vars['url']}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}");
+			?>
+			<a href="<?php echo $url; ?>" class="archive_report_button"><?php echo elgg_echo('accept'); ?></a>
+			<br /><br />
+		</div>
+	</div>
+<?php
+
+			}
+
+	} else {
+
+		echo "<p>" . elgg_echo('groups:invitations:none') . "</p>";
+
+	}
+
+?>
+</div>
diff --git a/mod/groups/views/default/groups/members.php b/mod/groups/views/default/groups/members.php
new file mode 100644
index 000000000..66f2604c0
--- /dev/null
+++ b/mod/groups/views/default/groups/members.php
@@ -0,0 +1,30 @@
+<?php
+	/**
+	 * Elgg groups items view.
+	 * This is the messageboard, members, pages and latest forums posts. Each plugin will extend the views
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	 //var_export($vars['entity']);
+?>
+
+<div id="group_members">
+<h2><?php echo elgg_echo("groups:members"); ?></h2>
+
+<?php
+
+    $members = $vars['entity']->getMembers(10);
+    foreach($members as $mem){
+           
+        echo "<div class=\"member_icon\"><a href=\"".$mem->getURL()."\">" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny', 'override' => 'true')) . "</a></div>";   
+           
+    }
+    
+?>
+<div class="clearfloat" /></div>
+</div>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php
new file mode 100644
index 000000000..9ac37990a
--- /dev/null
+++ b/mod/groups/views/default/groups/membershiprequests.php
@@ -0,0 +1,44 @@
+<div class="contentWrapper">
+
+<?php
+
+	if (!empty($vars['requests']) && is_array($vars['requests'])) {
+
+		foreach($vars['requests'] as $request)
+			if ($request instanceof ElggUser) {
+
+?>
+	<div class="reportedcontent_content active_report">
+		<div class="groups_membershiprequest_buttons">
+			<?php
+				echo "<div class=\"member_icon\"><a href=\"" . $request->getURL() . "\">";
+				echo elgg_view("profile/icon", array(
+					'entity' => $request,
+					'size' => 'small',
+					'override' => 'true'
+				));
+				echo "</a></div>{$request->name}<br />";
+
+				echo str_replace('<a', '<a class="delete_report_button" ', elgg_view('output/confirmlink',array(
+					'href' => $vars['url'] . 'action/groups/killrequest?user_guid='.$request->guid.'&group_guid=' . $vars['entity']->guid,
+					'confirm' => elgg_echo('groups:joinrequest:remove:check'),
+					'text' => elgg_echo('delete'),
+				)));
+			$url = elgg_add_action_tokens_to_url("{$vars['url']}action/groups/addtogroup?user_guid={$request->guid}&group_guid={$vars['entity']->guid}");
+			?>
+			<a href="<?php echo $url; ?>" class="archive_report_button"><?php echo elgg_echo('accept'); ?></a>
+			<br /><br />
+		</div>
+	</div>
+<?php
+
+			}
+
+	} else {
+
+		echo "<p>" . elgg_echo('groups:requests:none') . "</p>";
+
+	}
+
+?>
+</div>
diff --git a/mod/groups/views/default/groups/profileitems.php b/mod/groups/views/default/groups/profileitems.php
new file mode 100644
index 000000000..7309c8a71
--- /dev/null
+++ b/mod/groups/views/default/groups/profileitems.php
@@ -0,0 +1,28 @@
+<?php
+	/**
+	 * Elgg groups items view.
+	 * This is the messageboard, members, pages and latest forums posts. Each plugin will extend the views
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	 //forum 
+	 echo "<div class=\"clearfloat\"></div><div id=\"fullcolumn\">";
+	 echo elgg_view("groups/forum_latest",array('entity' => $vars['entity']));
+	 echo "</div>";
+	 
+	 //right column
+	 echo "<div id=\"right_column\">";
+	 echo elgg_view("groups/right_column",array('entity' => $vars['entity']));
+	 echo "</div>";
+	 
+	 //left column
+	 echo "<div id=\"left_column\">";
+	 echo elgg_view("groups/left_column",array('entity' => $vars['entity']));
+	 echo "</div>";	 
+	 
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/side_menu.php b/mod/groups/views/default/groups/side_menu.php
new file mode 100644
index 000000000..7de921ed0
--- /dev/null
+++ b/mod/groups/views/default/groups/side_menu.php
@@ -0,0 +1,10 @@
+<div class="sidebarBox">
+<div id="owner_block_submenu"><ul>
+<?php
+	if(isloggedin()){
+		echo "<li><a href=\"{$vars['url']}pg/groups/member/{$_SESSION['user']->username}\">". elgg_echo('groups:yours') ."</a></li>";
+		echo "<li><a href=\"{$vars['url']}pg/groups/invitations/{$_SESSION['user']->username}\">". elgg_echo('groups:invitations') ."</a></li>";
+		echo "<li><a href=\"{$vars['url']}pg/groups/new/\">". elgg_echo('groups:new') ."</a></li>";
+	}
+?>
+</ul></div></div>
\ No newline at end of file
diff --git a/mod/groups/views/default/icon/group/default/large.php b/mod/groups/views/default/icon/group/default/large.php
new file mode 100644
index 000000000..a9d69a691
--- /dev/null
+++ b/mod/groups/views/default/icon/group/default/large.php
@@ -0,0 +1,3 @@
+<?php
+	echo $vars['url'] . "mod/groups/graphics/defaultlarge.gif";
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/icon/group/default/medium.php b/mod/groups/views/default/icon/group/default/medium.php
new file mode 100644
index 000000000..47cf328b8
--- /dev/null
+++ b/mod/groups/views/default/icon/group/default/medium.php
@@ -0,0 +1,3 @@
+<?php
+	echo $vars['url'] . "mod/groups/graphics/defaultmedium.gif";
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/icon/group/default/small.php b/mod/groups/views/default/icon/group/default/small.php
new file mode 100644
index 000000000..b052c1cc3
--- /dev/null
+++ b/mod/groups/views/default/icon/group/default/small.php
@@ -0,0 +1,3 @@
+<?php
+	echo $vars['url'] . "mod/groups/graphics/defaultsmall.gif";
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/icon/group/default/tiny.php b/mod/groups/views/default/icon/group/default/tiny.php
new file mode 100644
index 000000000..1023d06e2
--- /dev/null
+++ b/mod/groups/views/default/icon/group/default/tiny.php
@@ -0,0 +1,3 @@
+<?php
+	echo $vars['url'] . "mod/groups/graphics/defaulttiny.gif";
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
new file mode 100644
index 000000000..1dd57c859
--- /dev/null
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -0,0 +1,77 @@
+<?php
+
+	/**
+	 * Elgg Groups latest discussion listing
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+    //get the required variables
+    $title = htmlentities($vars['entity']->title, ENT_QUOTES, 'UTF-8');
+    //$description = get_entity($vars['entity']->description);
+    $topic_owner = get_user($vars['entity']->owner_guid);
+    $group = get_entity($vars['entity']->container_guid);
+    $forum_created = friendly_time($vars['entity']->time_created);
+    $counter = $vars['entity']->countAnnotations("group_topic_post");
+	$last_post = $vars['entity']->getAnnotations("group_topic_post", 1, 0, "desc");
+ 
+    //get the time and user
+    if ($last_post) {
+		foreach($last_post as $last)
+		{
+			$last_time = $last->time_created;
+			$last_user = $last->owner_guid;
+		}
+	}
+
+	$u = get_user($last_user);
+
+	//select the correct output depending on where you are
+	if(get_context() == "search"){
+	
+	    $info = "<p class=\"latest_discussion_info\">" . sprintf(elgg_echo('group:created'), $forum_created, $counter) .  "<br /><span class=\"timestamp\">";
+	    if (($last_time) && ($u)) $info.= sprintf(elgg_echo('groups:lastupdated'), friendly_time($last_time), " <a href=\"" . $u->getURL() . "\">" . $u->name . "</a>");
+	    $info .= '</span></p>';
+		//get the group avatar
+		$icon = elgg_view("profile/icon",array('entity' => $group, 'size' => 'small'));
+	    //get the group and topic title
+	    if ($group instanceof ElggGroup)
+	    	$info .= "<p>" . elgg_echo('group') . ": <a href=\"{$group->getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."</a></p>";
+	    
+		$info .= "<p>" . elgg_echo('topic') . ": <a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
+		//get the forum description
+		//$info .= $description;
+		
+	}else{
+		
+		$info = "<span class=\"latest_discussion_info\"><span class=\"timestamp\">" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "</span>";
+		if (($last_time) && ($u)) $info.= "<br /><span class='timestamp'>" . elgg_echo('groups:updated') . " " . friendly_time($last_time) . " by <a href=\"" . $u->getURL() . "\">" . $u->name . "</a></span>";
+
+		    if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {
+	
+	                	// display the delete link to those allowed to delete
+	                	$info .= "<br /><span class=\"delete_discussion\">" . elgg_view("output/confirmlink", array(
+	                																'href' => $vars['url'] . "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid,
+	                																'text' => " ",
+	                																'confirm' => elgg_echo('deleteconfirm'),
+	                															)) . "</span>";
+	                				
+	           }		
+		
+		$info .= "</span>";
+		
+	    //get the user avatar
+		$icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'small'));
+	    $info .= "<p>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
+		$info .= "<div class='clearfloat'></div>";
+		
+	}
+		
+		//display
+		echo elgg_view_listing($icon, $info);
+		
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php
new file mode 100644
index 000000000..fb6cd707c
--- /dev/null
+++ b/mod/groups/views/default/river/forum/create.php
@@ -0,0 +1,27 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	//$url = $object->getURL();
+	$forumtopic = $object->guid;
+	$group_guid = $object->container_guid;
+	//grab the annotation, if one exists
+	if($vars['item']->annotation_id != 0)
+		$comment = get_annotation($vars['item']->annotation_id)->value; 
+	$contents = strip_tags($contents);//this is so we don't get large images etc in the activity river
+	$url = $vars['url'] . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
+	$url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("groupforum:river:posted"),$url_user) . " ";
+	$string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a>";
+	$string .= "<div class=\"river_content_display\">";
+	if($comment){
+		$contents = strip_tags($comment);//this is so we don't get large images etc in the activity river
+		if(strlen($contents) > 200)
+	        	$string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
+	    else
+		    $string .= $contents;
+    }
+	$string .= "</div>";
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php
new file mode 100644
index 000000000..f4c4aadfd
--- /dev/null
+++ b/mod/groups/views/default/river/forum/topic/create.php
@@ -0,0 +1,27 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	//$url = $object->getURL();
+	$forumtopic = $object->guid;
+	$group_guid = $object->container_guid;
+	$url = $vars['url'] . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
+	$comment = $object->getAnnotations("group_topic_post", 1, 0, "asc"); 
+	foreach($comment as $c){
+		$contents = $c->value;
+	}
+	$contents = strip_tags($contents);//this is so we don't get large images etc in the activity river
+	$url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("groupforum:river:postedtopic"),$url_user) . ": ";
+	$string .= "<a href=\"" . $url . "\">" . $object->title . "</a>";
+	$string .= "<div class=\"river_content_display\">";
+	if(strlen($contents) > 200) {
+        	$string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
+    	}else{
+	    	$string .= $contents;
+    	}
+	$string .= "</div>";
+	
+?>
+
+<?php echo $string; ?>
\ 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
new file mode 100644
index 000000000..e96bb9b34
--- /dev/null
+++ b/mod/groups/views/default/river/group/create.php
@@ -0,0 +1,13 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	$objecturl = $object->getURL();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("groups:river:member"),$url) . " ";
+	$string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>";
+	
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/river/object/group/create.php b/mod/groups/views/default/river/object/group/create.php
new file mode 100644
index 000000000..94903fd66
--- /dev/null
+++ b/mod/groups/views/default/river/object/group/create.php
@@ -0,0 +1,13 @@
+<?php
+
+	$statement = $vars['statement'];
+	$performed_by = $statement->getSubject();
+	$object = $statement->getObject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("group:river:created"),$url) . " ";
+	$string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("group:river:create") . "</a>";
+
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/river/object/groupforumtopic/annotate.php b/mod/groups/views/default/river/object/groupforumtopic/annotate.php
new file mode 100644
index 000000000..c6aa1e5ab
--- /dev/null
+++ b/mod/groups/views/default/river/object/groupforumtopic/annotate.php
@@ -0,0 +1,14 @@
+<?php
+
+	$statement = $vars['statement'];
+	$performed_by = $statement->getSubject();
+	$object = $statement->getObject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("groupforum:river:posted"),$url) . " ";
+	$string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+	//$string .= "<div class=\"river_content\">Title: " . $object->title . "</div>";
+
+?>
+
+<?php echo $string; ?>
\ 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
new file mode 100644
index 000000000..7c7d89bad
--- /dev/null
+++ b/mod/groups/views/default/river/object/groupforumtopic/create.php
@@ -0,0 +1,14 @@
+<?php
+
+	$statement = $vars['statement'];
+	$performed_by = $statement->getSubject();
+	$object = $statement->getObject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("groupforum:river:created"),$url) . " ";
+	$string .= elgg_echo("groupforum:river:create") . " | <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+	//$string .= "<div class=\"river_content\">Discussion topic: " . $object->title . "</div>";
+
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/river/object/groupforumtopic/update.php b/mod/groups/views/default/river/object/groupforumtopic/update.php
new file mode 100644
index 000000000..d13c2b61f
--- /dev/null
+++ b/mod/groups/views/default/river/object/groupforumtopic/update.php
@@ -0,0 +1,13 @@
+<?php
+
+	$statement = $vars['statement'];
+	$performed_by = $statement->getSubject();
+	$object = $statement->getObject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("groupforum:river:updated"),$url) . " ";
+    $string .= elgg_echo("groupforum:river:update") . " | <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+    
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/river/relationship/member/create.php b/mod/groups/views/default/river/relationship/member/create.php
new file mode 100644
index 000000000..e5e318ce0
--- /dev/null
+++ b/mod/groups/views/default/river/relationship/member/create.php
@@ -0,0 +1,40 @@
+<?php
+	/**
+	 * Elgg relationship create event for groups
+	 * Display something in the river when a group is joined
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$statement = $vars['statement'];
+	
+	$performed_by = $statement->getSubject();
+	$event = $statement->getEvent();
+	$object = $statement->getObject();
+	
+	if (is_array($object))
+	{
+		switch ($object['relationship'])
+		{
+			// Friending
+			case 'member' :
+				$user = $object['subject'];
+				$group = $object['object'];
+			
+				if (($user instanceof ElggUser) && ($group instanceof ElggGroup))
+				{
+					echo "<a href=\"{$user->getURL()}\">{$user->name}</a> ";
+					echo elgg_echo("groups:river:member");
+					echo " '<a href=\"{$group->getURL()}\">{$group->name}</a>'";
+				}
+		
+			break;
+		}
+	}
+	
+		
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/settings/groups/edit.php b/mod/groups/views/default/settings/groups/edit.php
new file mode 100644
index 000000000..311e58dee
--- /dev/null
+++ b/mod/groups/views/default/settings/groups/edit.php
@@ -0,0 +1,18 @@
+<?php
+	$hidden_groups = $vars['entity']->hidden_groups;
+	if (!$hidden_groups) $hidden_groups = 'no';
+?>	
+<p>
+	<?php echo elgg_echo('groups:allowhiddengroups'); ?>
+	
+	<?php
+		echo elgg_view('input/pulldown', array(
+			'internalname' => 'params[hidden_groups]',
+			'options_values' => array(
+				'no' => elgg_echo('option:no'),
+				'yes' => elgg_echo('option:yes')
+			),
+			'value' => $hidden_groups
+		));
+	?>
+</p>
\ No newline at end of file
diff --git a/mod/groups/views/default/sharing/invite.php b/mod/groups/views/default/sharing/invite.php
new file mode 100644
index 000000000..5c3d6b316
--- /dev/null
+++ b/mod/groups/views/default/sharing/invite.php
@@ -0,0 +1,41 @@
+<?php
+	/**
+	 * Elgg groups plugin
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$owner = $vars['owner'];
+	$group = $vars['group'];
+	
+	if ($friends = get_entities_from_relationship('friend',$owner->getGUID(),false,'user','')) {
+		
+		foreach($friends as $friend) {
+			
+			if (!$group->isMember($friend))
+			{
+				$label = elgg_view("profile/icon",array('entity' => $friend, 'size' => 'tiny'));
+				$label .= "{$friend->name}"; 
+				$options[$label] = $friend->getGUID();
+			}
+		}
+		
+		if ($options)
+		{
+			echo elgg_view('input/checkboxes',array(
+			
+				'internalname' => 'user_guid',
+				'options' => $options,
+			
+			));
+		}
+		else
+		{
+			echo elgg_echo('groups:nofriends');
+		}
+	}
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/widgets/a_users_groups/edit.php b/mod/groups/views/default/widgets/a_users_groups/edit.php
new file mode 100644
index 000000000..fa47cdd62
--- /dev/null
+++ b/mod/groups/views/default/widgets/a_users_groups/edit.php
@@ -0,0 +1,14 @@
+<p>
+		<?php echo elgg_echo("groups:widget:num_display"); ?>:
+		<select name="params[num_display]">
+		    <option value="1" <?php if($vars['entity']->num_display == 1) echo "SELECTED"; ?>>1</option>
+		    <option value="2" <?php if($vars['entity']->num_display == 2) echo "SELECTED"; ?>>2</option>
+		    <option value="3" <?php if($vars['entity']->num_display == 3) echo "SELECTED"; ?>>3</option>
+		    <option value="4" <?php if($vars['entity']->num_display == 4) echo "SELECTED"; ?>>4</option>
+		    <option value="5" <?php if($vars['entity']->num_display == 5) echo "SELECTED"; ?>>5</option>
+		    <option value="6" <?php if($vars['entity']->num_display == 6) echo "SELECTED"; ?>>6</option>
+		    <option value="7" <?php if($vars['entity']->num_display == 7) echo "SELECTED"; ?>>7</option>
+		    <option value="8" <?php if($vars['entity']->num_display == 8) echo "SELECTED"; ?>>8</option>
+		    <option value="9" <?php if($vars['entity']->num_display == 9) echo "SELECTED"; ?>>9</option>
+		</select>
+</p>
\ No newline at end of file
diff --git a/mod/groups/views/default/widgets/a_users_groups/view.php b/mod/groups/views/default/widgets/a_users_groups/view.php
new file mode 100644
index 000000000..3328a8778
--- /dev/null
+++ b/mod/groups/views/default/widgets/a_users_groups/view.php
@@ -0,0 +1,42 @@
+<?php
+
+    /** 
+      *  Group profile widget - this displays a users groups on their profile
+      **/
+      
+    //the number of groups to display
+	$number = (int) $vars['entity']->num_display;
+	if (!$number)
+		$number = 4;
+		
+    //the page owner
+	$owner = $vars['entity']->owner_guid;
+      
+    //$groups = get_users_membership($owner);
+    //$groups = list_entities_from_relationship('member',$owner,false,'group','',0,$number,false,false,false);
+	$groups = get_entities_from_relationship('member', $owner, false, "group", "", 0, "", $number, 0, false, 0);
+	
+
+    if($groups){
+		
+		echo "<div class=\"groupmembershipwidget\">";
+
+		foreach($groups as $group){
+			$icon = elgg_view(
+				"groups/icon", array(
+									'entity' => $group,
+									'size' => 'small',
+								  )
+				);
+				
+			echo "<div class=\"contentWrapper\">" . $icon . " <div class='search_listing_info'><p><span>" . $group->name . "</span><br />";
+			echo $group->briefdescription . "</p></div><div class=\"clearfloat\"></div></div>";
+			
+		}
+		echo "</div>";
+    }
+
+
+   // echo $groups;
+      
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/widgets/group_entities_widget/edit.php b/mod/groups/views/default/widgets/group_entities_widget/edit.php
new file mode 100644
index 000000000..dbf82b2ec
--- /dev/null
+++ b/mod/groups/views/default/widgets/group_entities_widget/edit.php
@@ -0,0 +1,23 @@
+<?php
+	/**
+	 * Edit the widget
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+?>
+<p>
+	<?php echo elgg_echo('groups:widgets:entities:label:displaynum'); ?>
+	
+	<select name="params[limit]">
+		<option value="5" <?php if ($vars['entity']->limit == 5) echo " selected=\"yes\" "; ?>>5</option>
+		<option value="8" <?php if ((!$vars['entity']->limit) || ($vars['entity']->limit == 8)) echo " selected=\"yes\" "; ?>>8</option>
+		<option value="12" <?php if ($vars['entity']->limit == 12) echo " selected=\"yes\" "; ?>>12</option>
+		<option value="15" <?php if ($vars['entity']->limit == 15) echo " selected=\"yes\" "; ?>>15</option>
+	</select>
+	
+	<input type="hidden" name="params[group_guid]" value="<?php echo get_input('group_guid'); ?>" />
+</p>
\ No newline at end of file
diff --git a/mod/groups/views/default/widgets/group_entities_widget/view.php b/mod/groups/views/default/widgets/group_entities_widget/view.php
new file mode 100644
index 000000000..edba53cb5
--- /dev/null
+++ b/mod/groups/views/default/widgets/group_entities_widget/view.php
@@ -0,0 +1,35 @@
+<?php
+	/**
+	 * View the widget
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$group_guid = get_input('group_guid');
+	$limit = get_input('limit', 8);
+	$offset = 0;
+	
+	if ($vars['entity']->limit)
+		$limit = $vars['entity']->limit;
+		
+	$group_guid = $vars['entity']->group_guid;
+
+	if ($group_guid)
+	{	
+		$group = get_entity($group_guid);	
+		$members = $group->getMembers($limit, $offset);
+		$count = $group->getMembers($limit, $offset, true);
+		
+		$result = list_entities_groups("", 0, $group_guid, $limit);
+	}
+	else
+	{
+		$result = elgg_echo('groups:widgets:entities:label:pleaseedit');
+	}
+	
+	echo $result;
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/widgets/group_members_widget/edit.php b/mod/groups/views/default/widgets/group_members_widget/edit.php
new file mode 100644
index 000000000..6d385c204
--- /dev/null
+++ b/mod/groups/views/default/widgets/group_members_widget/edit.php
@@ -0,0 +1,23 @@
+<?php
+	/**
+	 * Edit the widget
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+?>
+<p>
+	<?php echo elgg_echo('groups:widgets:members:label:displaynum'); ?>
+	
+	<select name="params[limit]">
+		<option value="5" <?php if ($vars['entity']->limit == 5) echo " selected=\"yes\" "; ?>>5</option>
+		<option value="8" <?php if ((!$vars['entity']->limit) || ($vars['entity']->limit == 8)) echo " selected=\"yes\" "; ?>>8</option>
+		<option value="12" <?php if ($vars['entity']->limit == 12) echo " selected=\"yes\" "; ?>>12</option>
+		<option value="15" <?php if ($vars['entity']->limit == 15) echo " selected=\"yes\" "; ?>>15</option>
+	</select>
+	
+	<input type="hidden" name="params[group_guid]" value="<?php echo get_input('group_guid'); ?>" />
+</p>
\ No newline at end of file
diff --git a/mod/groups/views/default/widgets/group_members_widget/view.php b/mod/groups/views/default/widgets/group_members_widget/view.php
new file mode 100644
index 000000000..502affd12
--- /dev/null
+++ b/mod/groups/views/default/widgets/group_members_widget/view.php
@@ -0,0 +1,35 @@
+<?php
+	/**
+	 * View the widget
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$group_guid = get_input('group_guid');
+	$limit = get_input('limit', 8);
+	$offset = 0;
+	
+	if ($vars['entity']->limit)
+		$limit = $vars['entity']->limit;
+		
+	$group_guid = $vars['entity']->group_guid;
+
+	if ($group_guid)
+	{	
+		$group = get_entity($group_guid);	
+		$members = $group->getMembers($limit, $offset);
+		$count = $group->getMembers($limit, $offset, true);
+		
+		$result = elgg_view_entity_list($members, $count, $offset, $limit, false, false, false);
+	}
+	else
+	{
+		$result = elgg_echo('groups:widgets:members:label:pleaseedit');
+	}
+	
+	echo $result;
+?>
\ No newline at end of file
diff --git a/mod/groups/views/rss/forum/topicposts.php b/mod/groups/views/rss/forum/topicposts.php
new file mode 100644
index 000000000..15c5adc7f
--- /dev/null
+++ b/mod/groups/views/rss/forum/topicposts.php
@@ -0,0 +1,3 @@
+<?php
+
+?>
\ No newline at end of file
diff --git a/mod/groups/views/rss/forum/topics.php b/mod/groups/views/rss/forum/topics.php
new file mode 100644
index 000000000..6f3ca34f1
--- /dev/null
+++ b/mod/groups/views/rss/forum/topics.php
@@ -0,0 +1,14 @@
+<?php
+	/**
+	 * Elgg groups plugin
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	// If there are any topics to view, view them
+		echo $vars['topics'];
+?>
\ No newline at end of file
diff --git a/mod/groups/views/rss/forum/viewposts.php b/mod/groups/views/rss/forum/viewposts.php
new file mode 100644
index 000000000..464ca1a7b
--- /dev/null
+++ b/mod/groups/views/rss/forum/viewposts.php
@@ -0,0 +1,26 @@
+<?php
+
+    /**
+	 * Elgg groups plugin display topic posts
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+    //display follow up comments
+    $count = $vars['entity']->countAnnotations('group_topic_post');
+    $offset = (int) get_input('offset',0);
+    
+    foreach($vars['entity']->getAnnotations('group_topic_post', 50, $offset, "asc") as $post) {
+
+    	$post->title = '';
+    	$post->description = $post->value;
+    	echo elgg_view('object/default', array('entity' => $post));
+	    // echo elgg_view("forum/topicposts",array('entity' => $post));
+		
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/groups/views/rss/groups/contentwrapper.php b/mod/groups/views/rss/groups/contentwrapper.php
new file mode 100644
index 000000000..15397d552
--- /dev/null
+++ b/mod/groups/views/rss/groups/contentwrapper.php
@@ -0,0 +1,5 @@
+<?php
+
+	echo $vars['body'];
+
+?>
\ No newline at end of file
diff --git a/mod/groups/views/rss/groups/profileitems.php b/mod/groups/views/rss/groups/profileitems.php
new file mode 100644
index 000000000..bae449a4c
--- /dev/null
+++ b/mod/groups/views/rss/groups/profileitems.php
@@ -0,0 +1,20 @@
+<?php
+	/**
+	 * Elgg groups items view.
+	 * This is the messageboard, members, pages and latest forums posts. Each plugin will extend the views
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	 //right column
+	 if ($forae = elgg_get_entities(array('types' => 'object', 'owner_guid' => $vars['entity']->guid))) {
+	 //if ($forae = get_entities_from_annotations("object", "groupforumtopic", "group_topic_post", "", 0, $vars['entity']->guid, 20, 0, "desc", false)) {
+	 	foreach($forae as $forum)
+	 		echo elgg_view_entity($forum);
+	 }
+	 
+?>
\ No newline at end of file
diff --git a/mod/invitefriends/actions/invite.php b/mod/invitefriends/actions/invite.php
new file mode 100644
index 000000000..7e0bd54b8
--- /dev/null
+++ b/mod/invitefriends/actions/invite.php
@@ -0,0 +1,117 @@
+<?php
+
+	/**
+	 * Elgg invite action
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @link http://elgg.org/
+	 */
+
+	global $CONFIG;
+	
+	gatekeeper();
+	
+	$emails = get_input('emails');
+	$emailmessage = get_input('emailmessage');
+
+	$emails = trim($emails);
+	if (strlen($emails) > 0) {
+		$emails = preg_split('/\\s+/', $emails, -1, PREG_SPLIT_NO_EMPTY);
+	}
+	
+	if (!is_array($emails) || count($emails) == 0) {
+		register_error(elgg_echo('invitefriends:failure'));
+		forward($_SERVER['HTTP_REFERER']);
+	}
+	
+	$error = FALSE;
+	$bad_emails = array();
+	foreach($emails as $email) {
+				
+		$email = trim($email);
+		if (empty($email)) {
+			continue;
+		}
+	
+		// send out other email addresses	
+		if (!is_email_address($email)) {
+			$error = TRUE;
+			$bad_emails[] = $email;
+			continue;
+		}
+		
+		$link = $CONFIG->wwwroot . 'pg/register?friend_guid=' . $_SESSION['guid'] . '&invitecode=' . generate_invite_code($_SESSION['user']->username);
+		$message = sprintf(elgg_echo('invitefriends:email'),
+							$CONFIG->site->name,
+							$_SESSION['user']->name,
+							$emailmessage,
+							$link
+						);
+
+		// **** this should be replaced by a core function for sending emails to people who are not members
+		$site = get_entity($CONFIG->site_guid);
+		// If there's an email address, use it - but only if its not from a user.
+		if (($site) && (isset($site->email))) {
+			// Has the current site got a from email address?
+			$from = $site->email;
+		} else if (isset($from->url))  {
+			// If we have a url then try and use that.
+			$breakdown = parse_url($from->url);
+			$from = 'noreply@' . $breakdown['host']; // Handle anything with a url
+		} else {
+			// If all else fails, use the domain of the site.
+			$from = 'noreply@' . get_site_domain($CONFIG->site_guid);
+		}
+	
+		if (is_callable('mb_internal_encoding')) {
+			mb_internal_encoding('UTF-8');
+		}
+		$site = get_entity($CONFIG->site_guid);
+		$sitename = $site->name;
+		if (is_callable('mb_encode_mimeheader')) {
+			$sitename = mb_encode_mimeheader($site->name,"UTF-8", "B");
+		}
+	
+		$header_eol = "\r\n";
+		if ((isset($CONFIG->broken_mta)) && ($CONFIG->broken_mta)) {
+			// Allow non-RFC 2822 mail headers to support some broken MTAs
+			$header_eol = "\n";
+		}
+	
+		$from_email = "\"$sitename\" <$from>";
+		if (strtolower(substr(PHP_OS, 0 , 3)) == 'win') {
+			// Windows is somewhat broken, so we use a different format from header
+			$from_email = "$from";
+		}
+	
+		$headers = "From: $from_email{$header_eol}"
+			. "Content-Type: text/plain; charset=UTF-8; format=flowed{$header_eol}"
+			. "MIME-Version: 1.0{$header_eol}"
+			. "Content-Transfer-Encoding: 8bit{$header_eol}";
+	
+		$subject = sprintf(elgg_echo('invitefriends:subject'), $CONFIG->site->name);
+		if (is_callable('mb_encode_mimeheader')) {
+			$subject = mb_encode_mimeheader($subject,"UTF-8", "B");
+		}
+	
+		// Format message
+		$message = html_entity_decode($message, ENT_COMPAT, 'UTF-8'); // Decode any html entities
+		$message = strip_tags($message); // Strip tags from message
+		$message = preg_replace("/(\r\n|\r)/", "\n", $message); // Convert to unix line endings in body
+		$message = preg_replace("/^From/", ">From", $message); // Change lines starting with From to >From
+
+		mail($email, $subject, wordwrap($message), $headers);							
+	}
+
+	if ($error) {
+		register_error(sprintf(elgg_echo('invitefriends:email_error'), implode(', ', $bad_emails)));
+	} else {	
+		system_message(elgg_echo('invitefriends:success'));
+	}
+
+	forward($_SERVER['HTTP_REFERER']);
+
+?>
diff --git a/mod/invitefriends/index.php b/mod/invitefriends/index.php
new file mode 100644
index 000000000..19471bbed
--- /dev/null
+++ b/mod/invitefriends/index.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+	 * Elgg invite page
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @link http://elgg.org/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
+	
+	gatekeeper();
+	
+	set_context('friends');
+	set_page_owner($_SESSION['guid']);
+	
+	$body = elgg_view('invitefriends/form');
+	$body = elgg_view_layout('two_column_left_sidebar','',$body);
+
+	page_draw(elgg_echo('friends:invite'),$body);
+	
+?>
\ No newline at end of file
diff --git a/mod/invitefriends/languages/en.php b/mod/invitefriends/languages/en.php
new file mode 100644
index 000000000..357ceeeea
--- /dev/null
+++ b/mod/invitefriends/languages/en.php
@@ -0,0 +1,42 @@
+<?php
+
+	/**
+	 * Elgg invite page
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @link http://elgg.org/
+	 */
+
+	$english = array(
+
+		'friends:invite' => 'Invite friends',
+		'invitefriends:introduction' => 'To invite friends to join you on this network, enter their email addresses below (one per line):',
+		'invitefriends:message' => 'Enter a message they will receive with your invitation:',
+		'invitefriends:subject' => 'Invitation to join %s',
+	
+		'invitefriends:success' => 'Your friends were invited.',
+		'invitefriends:email_error' => 'Invitations were sent, but the following addresses are not valid: %s',
+		'invitefriends:failure' => 'Your friends could not be invited.',
+	
+		'invitefriends:message:default' => '
+Hi,
+
+I want to invite you to join my network here on %s.',
+		'invitefriends:email' => '
+You have been invited to join %s by %s. They included the following message:
+
+%s
+
+To join, click the following link:
+
+%s
+
+You will automatically add them as a friend when you create your account.',
+	
+	);
+					
+	add_translation("en",$english);
+?>
diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml
new file mode 100644
index 000000000..1228edd58
--- /dev/null
+++ b/mod/invitefriends/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider" />
+        <field key="version" value="1.7" />
+        <field key="description" value="Friend invite page" />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+        <field key="licence" value="GNU Public License version 2" />
+        <field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/invitefriends/start.php b/mod/invitefriends/start.php
new file mode 100644
index 000000000..b7cd9868d
--- /dev/null
+++ b/mod/invitefriends/start.php
@@ -0,0 +1,31 @@
+<?php
+
+	/**
+	 * Elgg invite page
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @link http://elgg.org/
+	 */
+
+	function invitefriends_pagesetup() {
+		
+		// Menu options
+			global $CONFIG;
+			if (get_context() == "friends" || 
+				get_context() == "friendsof" || 
+				get_context() == "collections") {
+					
+					add_submenu_item(elgg_echo('friends:invite'),$CONFIG->wwwroot."mod/invitefriends/",'invite');
+					
+				}
+		
+	}
+
+	global $CONFIG;
+	register_action('invitefriends/invite', false, $CONFIG->pluginspath . 'invitefriends/actions/invite.php');
+	register_elgg_event_handler('pagesetup','system','invitefriends_pagesetup',1000);
+
+?>
\ No newline at end of file
diff --git a/mod/invitefriends/views/default/invitefriends/form.php b/mod/invitefriends/views/default/invitefriends/form.php
new file mode 100644
index 000000000..ef66c1e84
--- /dev/null
+++ b/mod/invitefriends/views/default/invitefriends/form.php
@@ -0,0 +1,18 @@
+<?php
+	/**
+	 * Elgg invite page
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @link http://elgg.org/
+	 */
+	echo elgg_view('input/form', array(
+			'action' => $vars['url'] . 'action/invitefriends/invite',
+			'body' => elgg_view('invitefriends/formitems'),
+			'method' => 'post'
+		)
+	);
+
+?>
diff --git a/mod/invitefriends/views/default/invitefriends/formitems.php b/mod/invitefriends/views/default/invitefriends/formitems.php
new file mode 100644
index 000000000..0db562d50
--- /dev/null
+++ b/mod/invitefriends/views/default/invitefriends/formitems.php
@@ -0,0 +1,33 @@
+<?php
+
+	/**
+	 * Elgg invite page
+	 * 
+	 * @package ElggFile
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @link http://elgg.org/
+	 */
+
+?>
+
+<div class="contentWrapper notitle">
+<p><label>
+	<?php echo elgg_echo('invitefriends:introduction'); ?>
+</label>
+<textarea class="input-textarea" name="emails" ></textarea></p>
+<p><label>
+	<?php echo elgg_echo('invitefriends:message'); ?>
+</label>
+<textarea class="input-textarea" name="emailmessage" ><?php
+
+	echo sprintf(elgg_echo('invitefriends:message:default'),$CONFIG->site->name);
+
+?></textarea></p>
+<?php
+
+	echo elgg_view('input/submit', array('value' => elgg_echo('send')));
+
+?>
+</div>
\ No newline at end of file
diff --git a/mod/logbrowser/index.php b/mod/logbrowser/index.php
index d3901726c..f3c9e4d41 100644
--- a/mod/logbrowser/index.php
+++ b/mod/logbrowser/index.php
@@ -55,9 +55,10 @@
 	
 	set_context('search');
 	$result = elgg_view_entity_list($log_entries, $count, $offset, $limit, false, false);
+	$result = "<div class='admin_settings log_browser radius8 clearfloat'>".$result."</div>";
 	set_context('admin');
 		
 // Display main admin menu
-	page_draw(elgg_echo('logbrowser'),elgg_view_layout("two_column_left_sidebar", '', $title . $form . $result));
+	page_draw(elgg_echo('logbrowser'),elgg_view_layout("one_column_with_sidebar", '', $title . $form . $result));
 
 ?>
diff --git a/mod/logbrowser/views/default/logbrowser/css.php b/mod/logbrowser/views/default/logbrowser/css.php
index 960f63c44..653bbce3e 100644
--- a/mod/logbrowser/views/default/logbrowser/css.php
+++ b/mod/logbrowser/views/default/logbrowser/css.php
@@ -9,39 +9,43 @@
 	 */
 
 ?>
-
-#logbrowserSearchform {
+#logbrowser_search_area {
+	margin-top:10px;
+	margin-bottom:10px;
+}
+#log_browser_search_form {
 	padding: 10px;
-	background-color: #dedede;
-	-webkit-border-radius: 8px; 
-	-moz-border-radius: 8px;
+	margin-bottom:10px;
+	background-color: #eeeeee;
+}
+.admin_settings.log_browser {
+	background-color: #eeeeee;
+	padding-top:7px;
+	padding-bottom:7px;
 }
-
 .log_entry {
-	width: 699px;
+	width: 710px;
 	font-size: 80%;
 	background:white;
 	margin:0 10px 5px 10px;
-	-webkit-border-radius: 4px; 
-	-moz-border-radius: 4px;
 	border:1px solid white;
 }
+.log_entry:hover {
+	background-color: #eeeeee;
+	border:1px solid #666666;
+}
 .log_entry td {
 }
-
 .log_entry_user {
 	width: 120px;
 }
-
 .log_entry_time {
 	width: 210px;
 	padding:2px;
 }
-
 .log_entry_item {
 	
 }
-
 .log_entry_action {
 	width: 75px;
 }
\ No newline at end of file
diff --git a/mod/logbrowser/views/default/logbrowser/form.php b/mod/logbrowser/views/default/logbrowser/form.php
index 4a1e40d6a..326265643 100644
--- a/mod/logbrowser/views/default/logbrowser/form.php
+++ b/mod/logbrowser/views/default/logbrowser/form.php
@@ -49,18 +49,11 @@
 														'body' => $form,
 														'method' => 'get',
 														'action' => $vars['url'] . "mod/logbrowser/"
-										));
-
-		if ($upperval || $lowerval || $userval) {
-			$hidden = "";
-		} else {
-			$hidden = "style=\"display:none\"";
-		}
-										
+										));										
 ?>
 
-		<div id="logbrowserSearchform" <?php echo $hidden; ?>><?php echo $wrappedform; ?></div>
-		<p>
-			<a href="#" onclick="$('#logbrowserSearchform').toggle()"><?php echo elgg_echo('logbrowser:search'); ?></a>
-		</p>
-	</div>
\ No newline at end of file
+	<div id="log_browser_search_form" class="hidden radius8"><?php echo $wrappedform; ?></div>
+	<p>
+		<a href="#" onclick="elgg_slide_toggle(this,'#logbrowser_search_area','#log_browser_search_form');"><?php echo elgg_echo('logbrowser:search'); ?></a>
+	</p>
+</div>
\ No newline at end of file
diff --git a/mod/members/index.php b/mod/members/index.php
new file mode 100644
index 000000000..ecfcabb1c
--- /dev/null
+++ b/mod/members/index.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Elgg members index page - called from filter or search
+ * 
+ * @package ElggMembers
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+// get filter parameters
+$limit = get_input('limit', 10);
+$offset = get_input('offset', 0);
+$filter = get_input("filter", "newest");
+
+// search options
+$tag = get_input('tag');
+
+
+//search members
+$sidebar = elgg_view("members/search");
+	    
+// get the correct content based on filter/search
+switch ($filter) {
+	case "pop":
+		$filter_content = list_entities_by_relationship_count('friend', true, '', '', 0, 10, false);
+	break;
+	case "active":
+		$filter_content = elgg_view("members/online");
+	break;
+	// search based on name
+	case "search":
+		set_context('search');
+		$filter_content = list_user_search($tag);
+	break;
+	// search based on tags
+	case "search_tags":
+		$filter_content = trigger_plugin_hook('search','',$tag,"");
+		$filter_content .= list_entities_from_metadata("", $tag, "user", "", "", 10, false, false);
+	break;
+	case "newest":
+	case 'default':
+		$filter_content = elgg_list_entities(array('type' => 'user', 'offset' => $offset, 'full_view' => FALSE));
+	break;
+}
+
+// create the members navigation/filtering
+$members = get_number_users();
+$members_nav = elgg_view("members/members_sort_menu", array("count" => $members, "filter" => $filter));
+
+$content = $members_nav . $filter_content;
+
+// title
+$main_content = elgg_view_title(elgg_echo("members:members"));
+
+$main_content .= elgg_view('page_elements/contentwrapper', array('body' => $content, 'subclass' => 'members'));
+
+$body = elgg_view_layout("sidebar_boxes", $sidebar, $main_content);
+
+page_draw(elgg_echo('members:members'), $body);
diff --git a/mod/members/languages/en.php b/mod/members/languages/en.php
new file mode 100644
index 000000000..a6c4d0079
--- /dev/null
+++ b/mod/members/languages/en.php
@@ -0,0 +1,21 @@
+<?php
+
+	$english = array(
+			
+		'members:members' => "Members",
+	    'members:online' => "Users active now",
+	    'members:active' => "site users",
+	    'members:searchtag' => "User search via tag",
+	    'members:searchname' => "User search via name",
+	   
+		'members:label:newest' => 'Newest',
+		'members:label:popular' => 'Popular',
+		'members:label:active' => 'Active',
+		'members:search:name' => 'Users name',
+		'members:search:tags' => 'Tags',
+		
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/members/manifest.xml b/mod/members/manifest.xml
new file mode 100644
index 000000000..2248f8853
--- /dev/null
+++ b/mod/members/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider" />
+        <field key="version" value="1.7" />
+        <field key="description" value="A simple plugin to let users browser other members." />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+        <field key="licence" value="GNU Public License version 2" />
+        <field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/members/start.php b/mod/members/start.php
new file mode 100644
index 000000000..fa6810157
--- /dev/null
+++ b/mod/members/start.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Elgg members plugin
+ * This plugin has some interesting options for users; see who is online, site members, 
+ * 
+ * @package Elggmembers
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+	
+function members_init() {
+    		
+	global $CONFIG;
+								
+	elgg_extend_view('css','members/css');
+	
+	
+	// Set up menu for logged in users
+	if (isloggedin()) {
+		add_menu(elgg_echo('members:members'), $CONFIG->wwwroot . "mod/members/index.php");
+	}
+	
+}
+
+// @todo - use page handler for members index
+register_elgg_event_handler('pagesetup','system','members_pagesetup');
+
+register_elgg_event_handler('init','system','members_init');
diff --git a/mod/members/views/default/members/css.php b/mod/members/views/default/members/css.php
new file mode 100644
index 000000000..048d71bad
--- /dev/null
+++ b/mod/members/views/default/members/css.php
@@ -0,0 +1,64 @@
+<?php
+
+	/**
+	 * Elgg Members 
+	 * 
+	 * @package Members
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+
+/* new members page */
+.members .search_listing {
+	border:2px solid #cccccc;
+	margin:0 0 5px 0;
+}
+.members .search_listing:hover {
+	background:#dedede;
+}
+.members .group_count {
+	font-weight: bold;
+	color: #666666;
+	margin:0 0 5px 4px;
+}
+.members .search_listing_info {
+	color:#666666;
+}
+
+.members .profile_status {
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+	background:#bbdaf7;
+	line-height:1.2em;
+	padding:2px 4px;
+}
+.members .profile_status span {
+	font-size:90%;
+	color:#666666;
+}
+.members  p.owner_timestamp {
+	padding-left:3px;
+}
+.members .pagination {
+	border:2px solid #cccccc;
+	margin:5px 0 5px 0;
+}
+
+
+#memberssearchform {
+	border-bottom: 1px solid #cccccc;
+	margin-bottom: 10px;
+}
+#memberssearchform input[type="submit"] {
+	padding:2px;
+	height:auto;
+	margin:4px 0 5px 0;
+}
+#memberssearchform .search_input {
+	width:176px;
+}
+
diff --git a/mod/members/views/default/members/members_sort_menu.php b/mod/members/views/default/members/members_sort_menu.php
new file mode 100644
index 000000000..e9ad96039
--- /dev/null
+++ b/mod/members/views/default/members/members_sort_menu.php
@@ -0,0 +1,29 @@
+<?php
+
+	/**
+	 * A simple view to provide the user with group filters and the number of group on the site
+	 **/
+	 
+	 $members = $vars['count'];
+	 if(!$num_groups)
+	 	$num_groups = 0;
+	 	
+	 $filter = $vars['filter'];
+	 
+	 //url
+	 $url = $vars['url'] . "mod/members/index.php";
+
+?>
+<div id="elgg_horizontal_tabbed_nav">
+<ul>
+	<li <?php if($filter == "newest") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=newest"><?php echo elgg_echo('members:label:newest'); ?></a></li>
+	<li <?php if($filter == "pop") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=pop"><?php echo elgg_echo('members:label:popular'); ?></a></li>
+	<li <?php if($filter == "active") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=active"><?php echo elgg_echo('members:label:active'); ?></a></li>
+</ul>
+</div>
+
+<div class="group_count">
+	<?php
+		echo $members . " " . elgg_echo("members:active");
+	?>
+</div>
\ No newline at end of file
diff --git a/mod/members/views/default/members/online.php b/mod/members/views/default/members/online.php
new file mode 100644
index 000000000..cfbe062b4
--- /dev/null
+++ b/mod/members/views/default/members/online.php
@@ -0,0 +1,11 @@
+<?php
+
+	/**
+	 * Show members online
+	 **/
+	 
+	 echo "<div class=\"members_online\">";
+	 echo get_online_users();
+	 echo "</div>";
+	 
+?>
\ No newline at end of file
diff --git a/mod/members/views/default/members/search.php b/mod/members/views/default/members/search.php
new file mode 100644
index 000000000..69d8c06bf
--- /dev/null
+++ b/mod/members/views/default/members/search.php
@@ -0,0 +1,32 @@
+<?php
+
+	/**
+	 * Simple member search
+	 **/
+
+$tag_string = elgg_echo('members:search:tags');
+$name_string = elgg_echo('members:search:name');
+
+?>
+
+<div class="sidebarBox">
+
+<h3><?php echo elgg_echo('members:searchtag'); ?></h3>
+<form id="memberssearchform" action="<?php echo $vars['url']; ?>mod/members/index.php?" method="get">
+	<input type="text" name="tag" value="<?php echo $tag_string; ?>" onclick="if (this.value=='<?php echo $tag_string; ?>') { this.value='' }" class="search_input" />
+	<input type="hidden" name="subtype" value="" />
+	<input type="hidden" name="object" value="user" />
+	<input type="hidden" name="filter" value="search_tags" />	
+	<input type="submit" value="<?php echo elgg_echo('go'); ?>" />
+</form>
+
+<h3><?php echo elgg_echo('members:searchname'); ?></h3>
+<form id="memberssearchform" action="<?php echo $vars['url']; ?>mod/members/index.php?" method="get">
+	<input type="text" name="tag" value="<?php echo $name_string; ?>" onclick="if (this.value=='<?php echo $name_string; ?>') { this.value='' }" class="search_input" />
+	<input type="hidden" name="subtype" value="" />
+	<input type="hidden" name="object" value="user" />
+	<input type="hidden" name="filter" value="search" />	
+	<input type="submit" value="<?php echo elgg_echo('go'); ?>" />
+</form>
+
+</div>
\ No newline at end of file
diff --git a/mod/messageboard/actions/add.php b/mod/messageboard/actions/add.php
new file mode 100644
index 000000000..98ffe4b47
--- /dev/null
+++ b/mod/messageboard/actions/add.php
@@ -0,0 +1,68 @@
+<?php
+
+	/**
+	 * Elgg Message board: add message action
+	 * 
+	 * @package ElggMessageBoard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in; forward to the front page if not
+		if (!isloggedin()) forward();
+		
+	// Get input
+		$message_content = get_input('message_content'); // the actual message
+		$page_owner = get_input("pageOwner"); // the message board owner
+		$message_owner = get_input("guid"); // the user posting the message
+		$user = get_entity($page_owner); // the message board owner's details
+		
+	// Let's see if we can get a user entity from the specified page_owner
+		if ($user && !empty($message_content)) {
+    		
+	        // If posting the comment was successful, say so
+				if ($user->annotate('messageboard',$message_content,$user->access_id, $_SESSION['user']->getGUID())) {
+					
+					global $CONFIG;
+					
+					if ($user->getGUID() != $_SESSION['user']->getGUID())
+					notify_user($user->getGUID(), $_SESSION['user']->getGUID(), elgg_echo('messageboard:email:subject'), 
+						sprintf(
+									elgg_echo('messageboard:email:body'),
+									$_SESSION['user']->name,
+									$message_content,
+									$CONFIG->wwwroot . "pg/messageboard/" . $user->username,
+									$_SESSION['user']->name,
+									$_SESSION['user']->getURL()
+								)
+					); 
+					
+    				system_message(elgg_echo("messageboard:posted"));
+    				// add to river
+				    add_to_river('river/object/messageboard/create','messageboard',$_SESSION['user']->guid,$user->guid);
+
+					
+				} else {
+    				
+					register_error(elgg_echo("messageboard:failure"));
+					
+				}
+				
+				//set the url to return the user to the correct message board
+				$url = "pg/messageboard/" . $user->username;
+				
+		} else {
+		
+			register_error(elgg_echo("messageboard:blank"));
+			
+			//set the url to return the user to the correct message board
+			$url = "pg/messageboard/" . $user->username;
+			
+		}
+		
+	// Forward back to the messageboard
+	    forward($url);
+
+?>
\ No newline at end of file
diff --git a/mod/messageboard/actions/delete.php b/mod/messageboard/actions/delete.php
new file mode 100644
index 000000000..9c17f1fcd
--- /dev/null
+++ b/mod/messageboard/actions/delete.php
@@ -0,0 +1,44 @@
+<?php
+
+	/**
+	 * Elgg Message board: delete message action
+	 * 
+	 * @package ElggMessageBoard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Ensure we're logged in
+		if (!isloggedin()) forward();
+		
+	// Make sure we can get the comment in question
+		$annotation_id = (int) get_input('annotation_id');
+		
+		//make sure that there is a message on the message board matching the passed id
+		if ($message = get_annotation($annotation_id)) {
+    		
+    		//grab the user or group entity
+    		$entity = get_entity($message->entity_guid);
+    		
+            //check to make sure the current user can actually edit the message board
+			if ($message->canEdit()) {
+    			//delete the comment
+				$message->delete();
+				//display message
+				system_message(elgg_echo("messageboard:deleted"));
+				//generate the url to forward to 
+				$url = "pg/messageboard/" . $entity->username;
+				//forward the user back to their message board
+				forward($url);
+			}
+			
+		} else {
+			$url = "";
+			system_message(elgg_echo("messageboard:notdeleted"));
+		}
+		
+		forward($url);
+
+?>
\ No newline at end of file
diff --git a/mod/messageboard/ajax_endpoint/load.php b/mod/messageboard/ajax_endpoint/load.php
new file mode 100644
index 000000000..5bba34681
--- /dev/null
+++ b/mod/messageboard/ajax_endpoint/load.php
@@ -0,0 +1,73 @@
+<?php
+
+    /**
+	 * Elgg message board widget ajax logic page
+	 *
+	 * @package ElggMessageBoard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010 - 2009
+	 * @link http://elgg.com/
+	 */
+
+    // Load Elgg engine will not include plugins
+     require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
+    
+    //get the required info
+    
+    //the actual message
+    $message = get_input('messageboard_content');
+    //the number of messages to display
+    $numToDisplay = get_input('numToDisplay');    
+    //get the full page owner entity
+    $user = get_entity($_POST['pageOwner']);
+    
+    //stage one - if a message was posted, add it as an annotation    
+    if($message){
+        
+       // If posting the comment was successful, send message
+	   	if ($user->annotate('messageboard',$message,$user->access_id, $_SESSION['user']->getGUID())) {
+					
+			global $CONFIG;
+					
+			if ($user->getGUID() != $_SESSION['user']->getGUID())
+				notify_user($user->getGUID(), $_SESSION['user']->getGUID(), elgg_echo('messageboard:email:subject'), 
+				sprintf(
+					elgg_echo('messageboard:email:body'),
+					$_SESSION['user']->name,
+					$message,
+					$CONFIG->wwwroot . "pg/messageboard/" . $user->username,
+					$_SESSION['user']->name,
+					$_SESSION['user']->getURL()
+					)
+				); 
+       		
+			// add to river
+	    	add_to_river('river/object/messageboard/create','messageboard',$_SESSION['user']->guid,$user->guid);
+   		}else{
+	   		register_error(elgg_echo("messageboard:failure"));
+		}
+        
+    } else {
+        
+        echo elgg_echo('messageboard:somethingwentwrong');
+        
+    }
+    
+    //step two - grab the latest messageboard contents, this will include the message above, unless an issue 
+    //has occurred.
+    $contents = $user->getAnnotations('messageboard', $numToDisplay, 0, 'desc'); 
+    
+    //step three - display the latest results
+    if($contents){
+        
+        foreach($contents as $content) {
+				
+			echo elgg_view("messageboard/messageboard_content", array('annotation' => $content));
+				
+		}
+        
+    }
+
+    
+?>
\ No newline at end of file
diff --git a/mod/messageboard/history.php b/mod/messageboard/history.php
new file mode 100644
index 000000000..1f7ecd0e4
--- /dev/null
+++ b/mod/messageboard/history.php
@@ -0,0 +1,43 @@
+<?php
+
+    /**
+	 * Elgg Message board history page
+	 * 
+	 * @package ElggMessageBoard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	 
+	 // Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// Get the user who is the owner of the message board
+	    $current_user = $_SESSION['user']->getGUID(); //history is only available for your own wall
+	    $history_user = get_input('user'); // this is the user how has posted on your messageboard that you want to display your history with
+	    
+	    
+    // Get any annotations for their message board
+	//	$contents = $entity->getAnnotations('messageboard', 50, 0, 'desc');
+	
+	    $users_array = array($current_user, $history_user);
+		
+		$contents = get_annotations($users_array, "user", "", "messageboard", $value = "", $users_array, $limit = 10, $offset = 0, $order_by = "desc");
+	
+    // Get the content to display	
+		$area2 = elgg_view_title(elgg_echo('messageboard:history:title'));
+		$area2 .= elgg_view("messageboard/messageboard", array('annotation' => $contents));
+	
+	//$area1 = "<h2>Profile owner: " . $current_user . "</h2>";
+	//$area1 .= "<h2>User guid: " . $history_user . "</h2>";
+	    
+		
+    //select the correct canvas area
+	    $body = elgg_view_layout("two_column_left_sidebar", '', $area2);
+		
+	// Display page
+		page_draw(elgg_echo('messageboard:history:title'),$body);
+	 
+?>
\ No newline at end of file
diff --git a/mod/messageboard/index.php b/mod/messageboard/index.php
new file mode 100644
index 000000000..5c73bf168
--- /dev/null
+++ b/mod/messageboard/index.php
@@ -0,0 +1,39 @@
+<?php
+
+    /**
+	 * Elgg Message board index page
+	 * 
+	 * @package ElggMessageBoard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	 
+	 // Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// Get the user who is the owner of the message board
+	    $entity = get_entity(page_owner());
+	    
+    // Get any annotations for their message board
+		$contents = $entity->getAnnotations('messageboard', 50, 0, 'desc');
+	
+    // Get the content to display
+        $area2 = elgg_view_title(elgg_echo('messageboard:board'));
+    
+    // only display the add form and board to logged in users
+    	if(isloggedin()){
+			$area2 .= elgg_view("messageboard/forms/add");
+			$area2 .= elgg_view("messageboard/messageboard", array('annotation' => $contents));
+		}
+	    
+		
+    //select the correct canvas area
+	    $body = elgg_view_layout("two_column_left_sidebar", '', $area2);
+		
+	// Display page
+		page_draw(sprintf(elgg_echo('messageboard:user'),$entity->name),$body);
+	 
+?>
\ No newline at end of file
diff --git a/mod/messageboard/languages/en.php b/mod/messageboard/languages/en.php
new file mode 100644
index 000000000..ebe2cd50c
--- /dev/null
+++ b/mod/messageboard/languages/en.php
@@ -0,0 +1,77 @@
+<?php
+
+	$english = array(
+	
+		/**
+		 * Menu items and titles
+		 */
+	
+			'messageboard:board' => "Message board",
+			'messageboard:messageboard' => "message board",
+			'messageboard:viewall' => "View all",
+			'messageboard:postit' => "Post it",
+			'messageboard:history:title' => "History",
+			'messageboard:none' => "There is nothing on this message board yet",
+			'messageboard:num_display' => "Number of messages to display",
+			'messageboard:desc' => "This is a message board that you can put on your profile where other users can comment.",
+	
+			'messageboard:user' => "%s's message board",
+	
+			'messageboard:replyon' => 'reply on',
+			'messageboard:history' => "history",
+	
+         /**
+	     * Message board widget river
+	     **/
+	        
+	        'messageboard:river:annotate' => "%s has had a new comment posted on their message board.",
+	        'messageboard:river:create' => "%s added the message board widget.",
+	        'messageboard:river:update' => "%s updated their message board widget.",
+	        'messageboard:river:added' => "%s posted on",
+		    'messageboard:river:messageboard' => "message board",
+
+			
+		/**
+		 * Status messages
+		 */
+	
+			'messageboard:posted' => "You successfully posted on the message board.",
+			'messageboard:deleted' => "You successfully deleted the message.",
+	
+		/**
+		 * Email messages
+		 */
+	
+			'messageboard:email:subject' => 'You have a new message board comment!',
+			'messageboard:email:body' => "You have a new message board comment from %s. It reads:
+
+			
+%s
+
+
+To view your message board comments, click here:
+
+	%s
+
+To view %s's profile, click here:
+
+	%s
+
+You cannot reply to this email.",
+	
+		/**
+		 * Error messages
+		 */
+	
+			'messageboard:blank' => "Sorry; you need to actually put something in the message area before we can save it.",
+			'messageboard:notfound' => "Sorry; we could not find the specified item.",
+			'messageboard:notdeleted' => "Sorry; we could not delete this message.",
+			'messageboard:somethingwentwrong' => "Something went wrong when trying to save your message, make sure you actually wrote a message.",
+	     
+			'messageboard:failure' => "An unexpected error occurred when adding your message. Please try again.",
+	
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/messageboard/manifest.xml b/mod/messageboard/manifest.xml
new file mode 100644
index 000000000..4c89bdc40
--- /dev/null
+++ b/mod/messageboard/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider" />
+        <field key="version" value="1.7" />
+        <field key="description" value="This plugin allows users to put a message board on their profile for other users to post comments." />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+        <field key="licence" value="GNU Public License version 2" />
+        <field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/messageboard/readme.txt b/mod/messageboard/readme.txt
new file mode 100644
index 000000000..feffd6651
--- /dev/null
+++ b/mod/messageboard/readme.txt
@@ -0,0 +1,13 @@
+/**
+	 * Elgg message board
+	 * 
+	 * @package ElggMessageBoard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Dave Tosh <dave@elgg.com>
+	 * @copyright Curverider Ltd 2008-2009
+	 * @link http://elgg.com/
+*/
+
+This plugin provides Elgg profiles, both users and groups, with a basic message board for comments and media.
+
+Install: Just drop it into the mod directory and that should be it.
diff --git a/mod/messageboard/start.php b/mod/messageboard/start.php
new file mode 100644
index 000000000..0d9033a82
--- /dev/null
+++ b/mod/messageboard/start.php
@@ -0,0 +1,71 @@
+<?php
+
+	/**
+	 * Elgg Message board
+	 * This plugin allows users and groups to attach a message board to their profile for other users
+	 * to post comments and media.
+	 *
+	 * @todo allow users to attach media such as photos and videos as well as other resources such as bookmarked content
+	 * 
+	 * @package ElggMessageBoard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	/**
+	 * MessageBoard initialisation
+	 *
+	 * These parameters are required for the event API, but we won't use them:
+	 * 
+	 * @param unknown_type $event
+	 * @param unknown_type $object_type
+	 * @param unknown_type $object
+	 */
+	 
+    function messageboard_init() {
+        
+        // Load system configuration
+			global $CONFIG;
+				
+        // Extend system CSS with our own styles, which are defined in the messageboard/css view
+			elgg_extend_view('css','messageboard/css');
+        
+        // Register a page handler, so we can have nice URLs
+			register_page_handler('messageboard','messageboard_page_handler');
+        
+	    // add a messageboard widget
+            add_widget_type('messageboard',"". elgg_echo("messageboard:board") . "","" . elgg_echo("messageboard:desc") . ".", "profile");
+            
+    
+    }
+    
+    /**
+	 * Messageboard page handler
+	 *
+	 * @param array $page Array of page elements, forwarded by the page handling mechanism
+	 */
+		function messageboard_page_handler($page) {
+			
+			global $CONFIG;
+			
+			// The username should be the file we're getting
+			if (isset($page[0])) {
+				set_input('username',$page[0]);
+			}
+			// Include the standard messageboard index
+			include($CONFIG->pluginspath . "messageboard/index.php");
+			
+		}
+   
+
+    // Make sure the shouts initialisation function is called on initialisation
+		    register_elgg_event_handler('init','system','messageboard_init');
+
+    // Register actions
+		global $CONFIG;
+		register_action("messageboard/add",false,$CONFIG->pluginspath . "messageboard/actions/add.php");
+		register_action("messageboard/delete",false,$CONFIG->pluginspath . "messageboard/actions/delete.php");
+		
+?>
\ No newline at end of file
diff --git a/mod/messageboard/views/default/messageboard/css.php b/mod/messageboard/views/default/messageboard/css.php
new file mode 100644
index 000000000..0bf150bc2
--- /dev/null
+++ b/mod/messageboard/views/default/messageboard/css.php
@@ -0,0 +1,95 @@
+<?php
+
+	/**
+	 * Elgg Messageboard CSS extender 
+	 * 
+	 * @package ElggMessageBoard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+
+/* input msg area */
+#mb_input_wrapper {
+	margin:0 10px 5px 10px;
+	padding:5px;
+	background: white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+}
+
+#mb_input_wrapper .input_textarea {
+	width:675px;
+}
+.collapsable_box_content #mb_input_wrapper .input_textarea {
+	width:259px;
+}
+.message_item_timestamp {
+	font-size:90%;
+	padding:10px 0 0 0;
+}
+p.message_item_timestamp {
+	margin-bottom: 10px;
+}
+/* wraps each message */
+.messageboard {
+	margin:0 10px 5px 10px;
+	padding:0;
+	background: white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+}
+.messageboard .message_sender {
+	float:left;
+	margin: 5px 10px 0 5px;
+}
+/* IE6 */
+* html .messageboard { width: 280px; } 
+* html #two_column_left_sidebar_maincontent .messageboard { width: 667px; }
+* html .messageboard .message_sender { margin: 5px 10px 0 2px; }
+* html #mb_input_wrapper .input_textarea { width:645px; }
+/* IE7 */
+*:first-child+html .messageboard { width: 280px; } 
+*:first-child+html #two_column_left_sidebar_maincontent .messageboard { width: 698px; }
+*:first-child+html .messageboard .message_sender { margin: 5px 10px 0 2px; }
+
+.messageboard .message p {
+	line-height: 1.2em;
+	background:#dedede;
+	margin:0 6px 4px 6px;
+	padding:4px;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+	overflow-y:hidden;
+	overflow-x:auto;
+	color:#333333;
+}
+
+.message_buttons {
+	padding:0 0 3px 4px;
+	margin:0;
+	font-size: 90%;
+	color:#666666;
+}
+
+.messageboard .delete_message a {
+	display:block;
+	float:right;
+	cursor: pointer;
+	width:14px;
+	height:14px;
+	margin:0 3px 3px 0;
+	background: url("<?php echo $vars['url']; ?>_graphics/icon_customise_remove.png") no-repeat 0 0;
+	text-indent: -9000px;
+}
+.messageboard .delete_message a:hover {
+	background-position: 0 -16px;
+}
+
+
+
+
+
diff --git a/mod/messageboard/views/default/messageboard/forms/add.php b/mod/messageboard/views/default/messageboard/forms/add.php
new file mode 100644
index 000000000..91337fdc9
--- /dev/null
+++ b/mod/messageboard/views/default/messageboard/forms/add.php
@@ -0,0 +1,32 @@
+<?php
+
+    /**
+	 * Elgg Message board add form
+	 * 
+	 * @package ElggMessageBoard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+?>
+<div id="mb_input_wrapper">
+<form action="<?php echo $vars['url']; ?>action/messageboard/add" method="post" name="messageboardForm">
+   
+    <!-- textarea for the contents -->
+    <textarea name="message_content" value="" class="input_textarea"></textarea><br />
+   
+    <!-- the person posting an item on the message board -->
+    <input type="hidden" name="guid" value="<?php echo $_SESSION['guid']; ?>"  />
+   
+    <!-- the page owner, this will be the profile owner -->
+    <input type="hidden" name="pageOwner" value="<?php echo page_owner(); ?>"  />
+
+    <?php echo elgg_view('input/securitytoken'); ?>
+   
+    <!-- submit messages input -->
+    <input type="submit" id="postit" value="<?php echo elgg_echo('messageboard:postit'); ?>">
+    
+</form>
+</div>
diff --git a/mod/messageboard/views/default/messageboard/group_messageboard.php b/mod/messageboard/views/default/messageboard/group_messageboard.php
new file mode 100644
index 000000000..8662d45ac
--- /dev/null
+++ b/mod/messageboard/views/default/messageboard/group_messageboard.php
@@ -0,0 +1,96 @@
+<?php
+
+     /**
+	 * Elgg messageboard group profile view
+	 *
+	 * @package ElggMessageBoard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	 // get the groups passed over here
+	 
+	 //get the full page owner entity
+	 $entity = $vars['entity'];
+     
+     $num_display = 10;
+	 
+?>
+<script type="text/JavaScript">
+$(document).ready(function(){
+     
+    $("#postit").click(function(){
+        
+        //display the ajax loading gif at the start of the function call
+        //$('#loader').html('<img src="<?php echo $vars['url']; ?>_graphics/ajax_loader.gif" />');
+        $('#loader').html('<?php echo elgg_view('ajax/loader',array('slashes' => true)); ?>');
+        
+        
+        //load the results back into the message board contents and remove the loading gif
+        //remember that the actual div being populated is determined on views/default/messageboard/messageboard.php     
+        $("#messageboard_wrapper").load("<?php echo $vars['url']; ?>mod/messageboard/ajax_endpoint/load.php", {messageboard_content:$("[name=message_content]").val(), pageOwner:$("[name=pageOwner]").val(), numToDisplay:<?php echo $num_display; ?>}, function(){
+                    $('#loader').empty(); // remove the loading gif
+                    $('[name=message_content]').val(''); // clear the input textarea
+                }); //end 
+                 
+    }); // end of the main click function
+        
+}); //end of the document .ready function   
+</script>
+
+<div id="mb_input_wrapper"><!-- start of mb_input_wrapper div -->
+
+    <h2><?php echo elgg_echo("messageboard:board"); ?></h2>
+  
+<?php 
+    //if not a member don't display the add comment to messageboard
+    if(is_group_member($entity->guid, $_SESSION['guid'])){
+?>
+
+    <!-- message textarea -->
+    <textarea name="message_content" id="testing" value="" class="input_textarea"></textarea>
+   
+    <!-- the person posting an item on the message board -->
+    <input type="hidden" name="guid" value="<?php echo $_SESSION['guid']; ?>" class="guid"  />
+   
+    <!-- the page owner, this will be the profile owner -->
+    <input type="hidden" name="pageOwner" value="<?php echo page_owner(); ?>" class="pageOwner"  />
+   
+    <!-- submit button -->
+    <input type="submit" id="postit" value="<?php echo elgg_echo('messageboard:postit'); ?>">
+    
+    <!-- menu options -->
+    <div id="messageboard_widget_menu">
+        <a href="<?php echo $vars['url']; ?>pg/messageboard/<?php echo get_entity(page_owner())->username; ?>"><?php echo elgg_echo("messageboard:viewall"); ?></a>
+    </div>
+    
+    <!-- loading graphic -->
+    <div id="loader" class="loading">  </div>
+    
+<?php
+    }
+?>
+
+</div><!-- end of mb_input_wrapper div -->
+
+
+	<?php
+    
+        //this for the first time the page loads, grab the latest 5 messages.
+		$contents = $entity->getAnnotations('messageboard', $num_display, 0, 'desc');
+		
+		//as long as there is some content to display, display it
+		if (!empty($contents)) {
+    		
+    		echo elgg_view('messageboard/messageboard',array('annotation' => $contents));
+		
+		} else {
+    		
+    		//put the required div on the page for the first message
+    		echo "<div id=\"messageboard_wrapper\" /></div>";
+	
+    	}
+	
+	?>
diff --git a/mod/messageboard/views/default/messageboard/messageboard.php b/mod/messageboard/views/default/messageboard/messageboard.php
new file mode 100644
index 000000000..bb563d7fb
--- /dev/null
+++ b/mod/messageboard/views/default/messageboard/messageboard.php
@@ -0,0 +1,37 @@
+<?php
+
+    /**
+	 * Elgg Message board display page
+	 * 
+	 * @package ElggMessageBoard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+
+	 // If there is any content to view, view it
+		if (is_array($vars['annotation']) && sizeof($vars['annotation']) > 0) {
+    		
+    		//start the div which will wrap all the message board contents
+    		echo "<div id=\"messageboard_wrapper\">";
+			
+    		//loop through all annotations and display
+			foreach($vars['annotation'] as $content) {
+				
+				echo elgg_view("messageboard/messageboard_content", array('annotation' => $content));
+				
+			}
+			
+			//close the wrapper div
+			echo "</div>";
+			
+		} else {
+    		
+    		echo "<div class='contentWrapper'>" . elgg_echo("messageboard:none") . "</div>";
+    		
+		}
+			
+	 
+?>
\ No newline at end of file
diff --git a/mod/messageboard/views/default/messageboard/messageboard_content.php b/mod/messageboard/views/default/messageboard/messageboard_content.php
new file mode 100644
index 000000000..86240e910
--- /dev/null
+++ b/mod/messageboard/views/default/messageboard/messageboard_content.php
@@ -0,0 +1,65 @@
+<?php
+
+     /**
+	 * Elgg Message board individual item display page
+	 * 
+	 * @package ElggMessageBoard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+?>
+
+<div class="messageboard"><!-- start of messageboard div -->
+	
+    <!-- display the user icon of the user that posted the message -->
+    <div class="message_sender">	        
+        <?php
+            echo elgg_view("profile/icon",array('entity' => get_entity($vars['annotation']->owner_guid), 'size' => 'tiny'));
+        ?>
+    </div>
+    
+    <!-- display the user's name who posted and the date/time -->
+    <p class="message_item_timestamp">
+        <?php echo get_entity($vars['annotation']->owner_guid)->name . " " . friendly_time($vars['annotation']->time_created); ?>
+    </p>
+    		
+	<!-- output the actual comment -->
+	<div class="message"><?php echo elgg_view("output/longtext",array("value" => parse_urls($vars['annotation']->value))); ?></div>
+	<div class="message_buttons">
+		    
+	<?php
+               
+        // if the user looking at the comment can edit, show the delete link
+	    if ($vars['annotation']->canEdit()) {
+    			    
+  
+			       echo "<div class='delete_message'>" . elgg_view("output/confirmlink",array(
+							'href' => $vars['url'] . "action/messageboard/delete?annotation_id=" . $vars['annotation']->id,
+								'text' => elgg_echo('delete'),
+								'confirm' => elgg_echo('deleteconfirm'),
+							)) . "</div>";
+		
+	    } //end of can edit if statement
+	?>
+<?php
+		            // If the message being looked at is owned by the current user, don't show the reply
+		            // Also do not show if the user is not logged in  
+		            if (isloggedin() && $vars['annotation']->owner_guid != get_loggedin_userid()){
+    		            
+    		            //get the message owner
+    		            $msg_owner = get_entity($vars['annotation']->owner_guid);
+    		            //create the url to their messageboard
+    		            $user_mb = "pg/messageboard/" . $msg_owner->username;
+    		            
+    		            echo "<a href=\"" . $vars['url'] . $user_mb . "\">".elgg_echo('messageboard:replyon')." " . $msg_owner->name . "'s " . elgg_echo('messageboard:messageboard') . "</a> | ";
+    		            
+    		            echo "<a href=\"" . $vars['url'] . "mod/messageboard/history.php?user=" . $msg_owner->guid ."\">" . elgg_echo('messageboard:history') . "</a>"; 
+		            }
+?>
+		        
+		  </div>
+	<div class="clearfloat"></div>
+</div><!-- end of messageboard div -->
diff --git a/mod/messageboard/views/default/river/object/messageboard/create.php b/mod/messageboard/views/default/river/object/messageboard/create.php
new file mode 100644
index 000000000..9f65122d0
--- /dev/null
+++ b/mod/messageboard/views/default/river/object/messageboard/create.php
@@ -0,0 +1,12 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$performed_on = get_entity($vars['item']->object_guid);
+
+    $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+    $string = sprintf(elgg_echo("messageboard:river:added"),$url)  . " <a href=\"{$performed_on->getURL()}\">" . $performed_on->name . "'s</a> " . elgg_echo("messageboard:river:messageboard");
+	    
+	
+    echo $string; 
+
+?>
\ No newline at end of file
diff --git a/mod/messageboard/views/default/widgets/messageboard/edit.php b/mod/messageboard/views/default/widgets/messageboard/edit.php
new file mode 100644
index 000000000..cf0741a36
--- /dev/null
+++ b/mod/messageboard/views/default/widgets/messageboard/edit.php
@@ -0,0 +1,28 @@
+<?php
+
+    /**
+	 * Elgg message board edit page
+	 *
+	 * @package ElggMessageBoard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+<p>
+    <?php echo elgg_echo("messageboard:num_display"); ?>:
+        <select name="params[num_display]">
+		    <option value="1" <?php if($vars['entity']->num_display == 1) echo "SELECTED"; ?>>1</option>
+		    <option value="2" <?php if($vars['entity']->num_display == 2) echo "SELECTED"; ?>>2</option>
+		    <option value="3" <?php if($vars['entity']->num_display == 3) echo "SELECTED"; ?>>3</option>
+		    <option value="4" <?php if($vars['entity']->num_display == 4) echo "SELECTED"; ?>>4</option>
+		    <option value="5" <?php if($vars['entity']->num_display == 5) echo "SELECTED"; ?>>5</option>
+		    <option value="6" <?php if($vars['entity']->num_display == 6) echo "SELECTED"; ?>>6</option>
+		    <option value="7" <?php if($vars['entity']->num_display == 7) echo "SELECTED"; ?>>7</option>
+		    <option value="8" <?php if($vars['entity']->num_display == 8) echo "SELECTED"; ?>>8</option>
+		    <option value="9" <?php if($vars['entity']->num_display == 9) echo "SELECTED"; ?>>9</option>
+		    <option value="10" <?php if($vars['entity']->num_display == 10) echo "SELECTED"; ?>>10</option>
+		</select>
+</p>
\ No newline at end of file
diff --git a/mod/messageboard/views/default/widgets/messageboard/view.php b/mod/messageboard/views/default/widgets/messageboard/view.php
new file mode 100644
index 000000000..9a0d8e251
--- /dev/null
+++ b/mod/messageboard/views/default/widgets/messageboard/view.php
@@ -0,0 +1,93 @@
+<?php
+
+     /**
+	 * Elgg messageboard plugin view page
+	 *
+	 * @todo let users choose how many messages they want displayed
+	 *
+	 * @package ElggMessageBoard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	 // a couple of required variables
+	 
+	 //get the full page owner entity
+     $entity = get_entity(page_owner());
+     
+     //the number of message to display
+     $num_display = $vars['entity']->num_display;
+     
+     //if no num set, set to one
+     if(!$num_display)
+        $num_display = 5;
+
+//Just the loggedin user can send messages        
+if(isloggedin()){        
+?>
+	<script type="text/JavaScript">
+	$(document).ready(function(){
+	     
+	    $("#postit").click(function(){
+	        
+	        //display the ajax loading gif at the start of the function call
+	        //$('#loader').html('<img src="<?php echo $vars['url']; ?>_graphics/ajax_loader.gif" />');
+	        $('#loader').html('<?php echo elgg_view('ajax/loader',array('slashes' => true)); ?>');
+	        
+	        //load the results back into the message board contents and remove the loading gif
+	        //remember that the actual div being populated is determined on views/default/messageboard/messageboard.php     
+	        $("#messageboard_wrapper").load("<?php echo $vars['url']; ?>mod/messageboard/ajax_endpoint/load.php", {messageboard_content:$("[name=message_content]").val(), pageOwner:$("[name=pageOwner]").val(), numToDisplay:<?php echo $num_display; ?>}, function(){
+	                    $('#loader').empty(); // remove the loading gif
+	                    $('[name=message_content]').val(''); // clear the input textarea
+	                }); //end 
+	                 
+	    }); // end of the main click function
+	        
+	}); //end of the document .ready function   
+	</script>
+	
+	<div id="mb_input_wrapper"><!-- start of mb_input_wrapper div -->
+	
+	    <!-- message textarea -->
+	    <textarea name="message_content" id="testing" value="" class="input_textarea"></textarea>
+	   
+	    <!-- the person posting an item on the message board -->
+	    <input type="hidden" name="guid" value="<?php echo $_SESSION['guid']; ?>" class="guid"  />
+	   
+	    <!-- the page owner, this will be the profile owner -->
+	    <input type="hidden" name="pageOwner" value="<?php echo page_owner(); ?>" class="pageOwner"  />
+	   
+	    <!-- submit button -->
+	    <input type="submit" id="postit" value="<?php echo elgg_echo('messageboard:postit'); ?>">
+	    
+	    <!-- menu options -->
+	    <div id="messageboard_widget_menu">
+	        <a href="<?php echo $vars['url']; ?>pg/messageboard/<?php echo get_entity(page_owner())->username; ?>"><?php echo elgg_echo("messageboard:viewall"); ?></a>
+	    </div>
+	    
+	    <!-- loading graphic -->
+	    <div id="loader" class="loading">  </div>
+	
+	</div><!-- end of mb_input_wrapper div -->
+
+<?php
+} //	if(isloggedin())
+    
+        //this for the first time the page loads, grab the latest 5 messages.
+		$contents = $entity->getAnnotations('messageboard', $num_display, 0, 'desc');
+		
+		//as long as there is some content to display, display it
+		if (!empty($contents)) {
+    		
+    		echo elgg_view('messageboard/messageboard',array('annotation' => $contents));
+		
+		} else {
+    		
+    		//put the required div on the page for the first message
+    		echo "<div id=\"messageboard_wrapper\"></div>";
+	
+    	}
+	
+?>
\ No newline at end of file
diff --git a/mod/messages/actions/delete.php b/mod/messages/actions/delete.php
new file mode 100644
index 000000000..17bae2808
--- /dev/null
+++ b/mod/messages/actions/delete.php
@@ -0,0 +1,73 @@
+<?php
+
+    /**
+	 * Elgg delete a message action page
+	 * It is worth noting that due to the nature of a messaging system and the fact 2 people access
+	 * the same message, messages don't actually delete, they are just removed from view for the user who deletes
+	 * 
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	// Need to be logged in to do this
+	    gatekeeper();
+ 
+    // grab details sent from the form
+        $message_id_array = get_input('message_id');
+        if (!is_array($message_id_array)) $message_id_array = array($message_id_array);
+        $type = get_input('type'); // sent message or inbox
+        $success = true;
+        $submit = get_input('submit');
+        $offset = get_input('offset');
+        
+        foreach($message_id_array as $message_id) {
+        
+	    // get the message object
+	        $message = get_entity($message_id);
+	        
+	    // Make sure we actually have permission to edit and that the object is of sub-type messages
+			if ($message && $message->getSubtype() == "messages") {
+	    		
+				if ($submit == elgg_echo('delete')) {
+					if ($message->delete()) {
+					} else {
+						$success = false;
+					}
+				} else {
+					if ($message->readYet = 1) {
+					} else {
+						$success = false;
+					}
+				}
+	            
+	        }else{
+	            
+	            // display the error message
+	            $success = false;
+				
+			}
+		
+        }
+        
+        if ($success) {
+        	if ($submit == elgg_echo('delete')) {
+        		system_message(elgg_echo("messages:deleted"));
+        	} else {
+        		system_message(elgg_echo("messages:markedread"));
+        	}
+			// check to see if it is a sent message to be deleted
+		    if($type == 'sent'){
+			    forward("mod/messages/sent.php?offset={$offset}");
+		    }else{
+    		    forward("mod/messages/?username=" . $_SESSION['user']->username . "&offset={$offset}");
+		    }
+        } else {
+        	register_error(elgg_echo("messages:notfound"));
+        	forward($_SERVER['HTTP_REFERER']);
+        }
+                 
+    
+?>
\ No newline at end of file
diff --git a/mod/messages/actions/send.php b/mod/messages/actions/send.php
new file mode 100644
index 000000000..e48703e5a
--- /dev/null
+++ b/mod/messages/actions/send.php
@@ -0,0 +1,64 @@
+<?php
+
+	/**
+	 * Elgg send a message action page
+	 * 
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	 // Make sure we're logged in (send us to the front page if not)
+		if (!isloggedin()) forward();
+
+	// Get input data
+		$title = get_input('title'); // message title
+		$message_contents = get_input('message'); // the message
+		$send_to = get_input('send_to'); // this is the user guid to whom the message is going to be sent
+		$reply = get_input('reply',0); // this is the guid of the message replying to
+		
+	// Cache to the session to make form sticky
+		$_SESSION['msg_to'] = $send_to;
+		$_SESSION['msg_title'] = $title;
+		$_SESSION['msg_contents'] = $message_contents;
+
+		if (empty($send_to)) {
+			register_error(elgg_echo("messages:user:blank"));
+			forward("mod/messages/send.php");
+		}
+		
+		$user = get_user($send_to);
+		if (!$user) {
+			register_error(elgg_echo("messages:user:nonexist"));
+			forward("mod/messages/send.php");
+		}
+
+	// Make sure the message field, send to field and title are not blank
+		if (empty($message_contents) || empty($title)) {
+			register_error(elgg_echo("messages:blank"));
+			forward("mod/messages/send.php");
+		}
+		
+	// Otherwise, 'send' the message 
+		$result = messages_send($title,$message_contents,$send_to,0,$reply);
+			
+	// Save 'send' the message
+		if (!$result) {
+			register_error(elgg_echo("messages:error"));
+			forward("mod/messages/send.php");
+		}
+
+	// successful so uncache form values
+		unset($_SESSION['msg_to']);
+		unset($_SESSION['msg_title']);
+		unset($_SESSION['msg_contents']);
+			
+	// Success message
+		system_message(elgg_echo("messages:posted"));
+	
+	// Forward to the users inbox
+		forward('mod/messages/sent.php');	
+
+?>
diff --git a/mod/messages/graphics/icon_notifications_site.gif b/mod/messages/graphics/icon_notifications_site.gif
new file mode 100644
index 000000000..ca243a116
--- /dev/null
+++ b/mod/messages/graphics/icon_notifications_site.gif
diff --git a/mod/messages/index.php b/mod/messages/index.php
new file mode 100644
index 000000000..b9cfd1097
--- /dev/null
+++ b/mod/messages/index.php
@@ -0,0 +1,55 @@
+<?php
+
+	/**
+	 * Elgg messages inbox page
+	 *
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	// You need to be logged in!
+		gatekeeper();
+
+	// Get offset
+		$offset = get_input('offset',0);
+
+	// Set limit
+		$limit = 10;
+
+	// Get the logged in user, you can't see other peoples messages so use session id
+		$page_owner = $_SESSION['user'];
+		set_page_owner($page_owner->getGUID());
+
+	// Get the user's inbox, this will be all messages where the 'toId' field matches their guid
+		$messages = elgg_get_entities_from_metadata(array(
+			'type' => 'object',
+			'subtype' => 'messages',
+			'metadata_name' => 'toId',
+			'metadata_value' => $page_owner->getGUID(),
+			'owner_guid' => $page_owner->guid,
+			'limit' => $limit + 1,
+			'offset' => $offset
+		));
+
+	// Set the page title
+		$area2 = elgg_view_title(elgg_echo("messages:inbox"));
+
+	// Display them. The last variable 'page_view' is to allow the view page to know where this data is coming from,
+	// in this case it is the inbox, this is necessary to ensure the correct display
+		// $area2 .= elgg_view("messages/view",array('entity' => $messages, 'page_view' => "inbox", 'limit' => $limit, 'offset' => $offset));
+		$area2 .= elgg_view("messages/forms/view",array('entity' => $messages, 'page_view' => "inbox", 'limit' => $limit, 'offset' => $offset));
+
+	// format
+		$body = elgg_view_layout("two_column_left_sidebar", '', $area2);
+
+
+	// Draw page
+		page_draw(sprintf(elgg_echo('messages:user'),$page_owner->name),$body);
+
+?>
diff --git a/mod/messages/languages/en.php b/mod/messages/languages/en.php
new file mode 100644
index 000000000..ab83eedf2
--- /dev/null
+++ b/mod/messages/languages/en.php
@@ -0,0 +1,87 @@
+<?php
+
+	$english = array(
+	
+		/**
+		 * Menu items and titles
+		 */
+	
+			'messages' => "Messages",
+            'messages:back' => "back to messages",
+			'messages:user' => "Your inbox",
+			'messages:sentMessages' => "Sent messages",
+			'messages:posttitle' => "%s's messages: %s",
+			'messages:inbox' => "Inbox",
+			'messages:send' => "Send a message",
+			'messages:sent' => "Sent messages",
+			'messages:message' => "Message",
+			'messages:title' => "Title",
+			'messages:to' => "To",
+            'messages:from' => "From",
+			'messages:fly' => "Send",
+			'messages:replying' => "Message replying to",
+			'messages:inbox' => "Inbox",
+			'messages:sendmessage' => "Send a message",
+			'messages:compose' => "Compose a message",
+			'messages:sentmessages' => "Sent messages",
+			'messages:recent' => "Recent messages",
+            'messages:original' => "Original message",
+            'messages:yours' => "Your message",
+            'messages:answer' => "Reply",
+			'messages:toggle' => 'Toggle all',
+			'messages:markread' => 'Mark read',
+			
+			'messages:new' => 'New message',
+	
+			'notification:method:site' => 'Site',
+	
+			'messages:error' => 'There was a problem saving your message. Please try again.',
+	
+			'item:object:messages' => 'Messages',
+	
+		/**
+		 * Status messages
+		 */
+	
+			'messages:posted' => "Your message was successfully sent.",
+			'messages:deleted' => "Your messages were successfully deleted.",
+			'messages:markedread' => "Your messages were successfully marked as read.",
+	
+		/**
+		 * Email messages
+		 */
+	
+			'messages:email:subject' => 'You have a new message!',
+			'messages:email:body' => "You have a new message from %s. It reads:
+
+			
+%s
+
+
+To view your messages, click here:
+
+	%s
+
+To send %s a message, click here:
+
+	%s
+
+You cannot reply to this email.",
+	
+		/**
+		 * Error messages
+		 */
+	
+			'messages:blank' => "Sorry; you need to actually put something in the message body before we can save it.",
+			'messages:notfound' => "Sorry; we could not find the specified message.",
+			'messages:notdeleted' => "Sorry; we could not delete this message.",
+			'messages:nopermission' => "You do not have permission to alter that message.",
+			'messages:nomessages' => "There are no messages to display.",
+			'messages:user:nonexist' => "We could not find the recipient in the user database.",
+			'messages:user:blank' => "You did not select someone to send this to.",
+	
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/messages/manifest.xml b/mod/messages/manifest.xml
new file mode 100644
index 000000000..c903c7658
--- /dev/null
+++ b/mod/messages/manifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="version" value="1.7" />
+        <field key="description" value="Elgg internal messages plugin. This plugin lets user send each other messages." />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="licence" value="GNU Public License version 2" />
+        <field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/messages/read.php b/mod/messages/read.php
new file mode 100644
index 000000000..f09bd116f
--- /dev/null
+++ b/mod/messages/read.php
@@ -0,0 +1,64 @@
+<?php
+
+	/**
+	 * Elgg read a message page
+	 *
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	// If we're not logged in, forward to the front page
+		gatekeeper();
+
+		$mbox_type = get_input('type', 'inbox');
+
+	// Get the full message object to read
+		$message = get_entity(get_input("message"));
+
+	// If no message, must have been deleted, send user to inbox/sent mail
+	if (!$message) {
+		$owner = get_loggedin_user();
+		if ($mbox_type == 'sent') {
+			forward("mod/messages/sent.php");
+		} else {
+			forward("pg/messages/{$owner->username}");
+		}
+	}
+
+	// If the message is being read from the inbox, mark it as read, otherwise don't.
+	// This stops a user who checks out a message they have sent having it being marked
+	// as read for the recipient
+		if(get_input('type') != "sent"){
+
+			// Mark the message as being read now
+			if ($message->getSubtype() == "messages") {
+
+				//set the message metadata to 1 which equals read
+				$message->readYet = 1;
+
+			}
+
+		}
+
+	// Get the logged in user
+		$page_owner = $_SESSION['user'];
+		set_page_owner($page_owner->getGUID());
+
+	// Display it
+		$area2 = elgg_view("messages/messages",array(
+											'entity' => $message,
+											'entity_owner' => $page_owner,
+											'full' => true
+											));
+		$body = elgg_view_layout("two_column_left_sidebar", '', $area2);
+
+	// Display page
+		page_draw(sprintf(elgg_echo('messages:message')),$body);
+
+?>
\ No newline at end of file
diff --git a/mod/messages/readme.txt b/mod/messages/readme.txt
new file mode 100644
index 000000000..52d7e6b4a
--- /dev/null
+++ b/mod/messages/readme.txt
@@ -0,0 +1,24 @@
+/**
+	 * Elgg readme
+	 * 
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Dave Tosh <dave@elgg.com>
+	 * @copyright Curverider Ltd 2008-2009
+	 * @link http://elgg.com/
+*/
+
+Install: drop the plugin into your mod folder, that is it.
+
+Notes:
+
+Each message has a series of metadata which is used to control how the message displays.
+
+The metadata toggles are:
+
+hiddenFrom - used to 'delete' from the sentbox
+hiddenTo - used to 'delete' from the inbox
+readYet - 0 means no, 1 means yes it has been read
+
+This is actually a tricky little plugin as there is only ever one instance of a message, how it is viewed 
+depends on who is looked at and in what context.
\ No newline at end of file
diff --git a/mod/messages/send.php b/mod/messages/send.php
new file mode 100644
index 000000000..61e0c162d
--- /dev/null
+++ b/mod/messages/send.php
@@ -0,0 +1,41 @@
+<?php
+
+	/**
+	 * Elgg send a message page
+	 *
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	// If we're not logged in, forward to the front page
+		gatekeeper(); // if (!isloggedin()) forward();
+
+	// Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($page_owner->getGUID());
+		}
+
+	// Get the users friends; this is used in the drop down to select who to send the message to
+		$friends = $_SESSION['user']->getFriends('', 9999);
+
+	// Set the page title
+		$area2 = elgg_view_title(elgg_echo("messages:sendmessage"));
+
+	// Get the send form
+		$area2 .= elgg_view("messages/forms/message",array('friends' => $friends));
+
+	// Format
+		$body = elgg_view_layout("two_column_left_sidebar", '', $area2);
+
+	// Draw page
+		page_draw(sprintf(elgg_echo('messages:send'),$page_owner->name),$body);
+
+?>
\ No newline at end of file
diff --git a/mod/messages/sent.php b/mod/messages/sent.php
new file mode 100644
index 000000000..c6213de2c
--- /dev/null
+++ b/mod/messages/sent.php
@@ -0,0 +1,46 @@
+<?php
+
+	/**
+	 * Elgg sent messages page
+	 * 
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// If we're not logged in, forward to the front page
+		if (!isloggedin()) forward(); 
+		
+	// Get the logged in user
+		$page_owner = $_SESSION['user'];
+		set_page_owner($page_owner->guid);
+		
+	// Get offset
+		$offset = get_input('offset',0);
+	
+	// Set limit
+		$limit = 10;
+		
+    // Display all the messages a user owns, these will make up the sentbox
+		$messages = elgg_get_entities_from_metadata(array('metadata_name' => 'fromId', 'metadata_value' => $_SESSION['user']->guid, 'types' => 'object', 'subtypes' => 'messages', 'owner_guid' => $page_owner->guid, 'limit' => $limit, 'offset' => $offset)); 
+		//$page_owner->getObjects('messages');
+		
+    // Set the page title
+	    $area2 = elgg_view_title(elgg_echo("messages:sentmessages"));
+		
+	// Set content
+		// $area2 .= elgg_view("messages/view",array('entity' => $messages, 'page_view' => "sent", 'limit' => $limit, 'offset' => $offset));
+		$area2 .= elgg_view("messages/forms/view",array('entity' => $messages, 'page_view' => "sent", 'limit' => $limit, 'offset' => $offset));
+
+	// Format
+		$body = elgg_view_layout("two_column_left_sidebar", '', $area2);
+		
+	// Draw page
+		page_draw(sprintf(elgg_echo('messages:sentMessages'),$page_owner->name),$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/messages/start.php b/mod/messages/start.php
new file mode 100644
index 000000000..992d60901
--- /dev/null
+++ b/mod/messages/start.php
@@ -0,0 +1,338 @@
+<?php
+
+	/**
+	 * Elgg internal messages plugin
+	 * This plugin lets user send each other messages.
+	 * 
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	/**
+	 * Messages initialisation
+	 *
+	 * These parameters are required for the event API, but we won't use them:
+	 * 
+	 * @param unknown_type $event
+	 * @param unknown_type $object_type
+	 * @param unknown_type $object
+	 */
+	 
+	    function messages_init() {
+    	    
+    	    // Load system configuration
+				global $CONFIG;
+				
+			//add submenu options
+				if (get_context() == "messages") {
+					add_submenu_item(elgg_echo('messages:compose'), $CONFIG->wwwroot . "mod/messages/send.php");
+					add_submenu_item(elgg_echo('messages:inbox'), $CONFIG->wwwroot . "pg/messages/" . $_SESSION['user']->username);
+					add_submenu_item(elgg_echo('messages:sentmessages'), $CONFIG->wwwroot . "mod/messages/sent.php");
+				}
+				
+			// Extend system CSS with our own styles, which are defined in the shouts/css view
+				elgg_extend_view('css','messages/css');
+				
+			// Extend the elgg topbar
+				elgg_extend_view('elgg_topbar/extend','messages/topbar');
+			
+			// Register a page handler, so we can have nice URLs
+				register_page_handler('messages','messages_page_handler');
+				
+			// Register a URL handler for shouts posts
+				register_entity_url_handler('messages_url','object','messages');
+				
+	        // Extend hover-over and profile menu	
+				elgg_extend_view('profile/menu/links','messages/menu');
+				
+			// Register a notification handler for site messages
+				register_notification_handler("site", "messages_site_notify_handler");
+				register_plugin_hook('notify:entity:message','object','messages_notification_msg');
+				if (is_callable('register_notification_object'))
+					register_notification_object('object','messages',elgg_echo('messages:new'));
+				
+		    // Shares widget
+			  //  add_widget_type('messages',elgg_echo("messages:recent"),elgg_echo("messages:widget:description"));
+			    
+			// Override metadata permissions
+			    register_plugin_hook('permissions_check:metadata','object','messages_can_edit_metadata');
+		}
+		
+		/**
+		 * Override the canEditMetadata function to return true for messages
+		 *
+		 */
+		function messages_can_edit_metadata($hook_name, $entity_type, $return_value, $parameters) {
+
+			global $messagesendflag;
+			
+			if ($messagesendflag == 1) {
+				$entity = $parameters['entity'];
+				if ($entity->getSubtype() == "messages") {
+					return true;
+				}
+			}
+			
+			return $return_value;
+			
+		}
+		
+		/**
+		 * Override the canEdit function to return true for messages within a particular context.
+		 *
+		 */
+		function messages_can_edit($hook_name, $entity_type, $return_value, $parameters) {
+			
+			global $messagesendflag;
+			
+			if ($messagesendflag == 1) {
+				$entity = $parameters['entity'];
+				if ($entity->getSubtype() == "messages") {
+					return true;
+				}
+			}
+			
+			return $return_value;
+			
+		}
+		
+		/**
+		 * We really don't want to send a notification message when a message is sent, if the method is messages ...
+		 *
+		 */
+		function messages_notification_msg($hook_name, $entity_type, $return_value, $parameters) {
+
+			global $CONFIG, $messages_pm;
+			
+			if ($parameters['entity'] instanceof ElggEntity) {
+				
+				if ($parameters['entity']->getSubtype() == 'messages') {
+					
+					return false;
+					/*if (!$messages_pm) return false;
+					if ($parameters['method'] == 'email') {
+						return sprintf(
+									elgg_echo('messages:email:body'),
+									get_loggedin_user()->name,
+									strip_tags($parameters['entity']->description),
+									$CONFIG->wwwroot . "pg/messages/" . $user->username,
+									get_loggedin_user()->name,
+									$CONFIG->wwwroot . "mod/messages/send.php?send_to=" . get_loggedin_user()->guid
+								);
+					} else if ($parameters['method'] == 'site') return false;*/
+				}
+			}
+			return null;
+			
+		}
+		
+		/**
+		 * Override the canEdit function to return true for messages within a particular context.
+		 *
+		 */
+		function messages_can_edit_container($hook_name, $entity_type, $return_value, $parameters) {
+			
+			global $messagesendflag;
+			
+			if ($messagesendflag == 1) {
+				return true;
+			}
+			
+			return $return_value;
+			
+		}
+		
+		/**
+		 * Send an internal message
+		 *
+		 * @param string $subject The subject line of the message
+		 * @param string $body The body of the mesage
+		 * @param int $send_to The GUID of the user to send to
+		 * @param int $from Optionally, the GUID of the user to send from
+		 * @param int $reply The GUID of the message to reply from (default: none)
+		 * @param true|false $notify Send a notification (default: true)
+		 * @param true|false $add_to_sent If true (default), will add a message to the sender's 'sent' tray
+		 * @return true|false Depending on success
+		 */
+		function messages_send($subject, $body, $send_to, $from = 0, $reply = 0, $notify = true, $add_to_sent = true) {
+			
+				global $messagesendflag;
+				$messagesendflag = 1;
+				
+				global $messages_pm;
+				if ($notify) {
+					$messages_pm = 1;
+				} else {
+					$messages_pm = 0;
+				}
+				
+			// If $from == 0, set to current user
+					if ($from == 0)
+						$from = (int) get_loggedin_user()->guid;
+						
+		    // Initialise a new ElggObject
+					$message_to = new ElggObject();
+					$message_sent = new ElggObject();
+			// Tell the system it's a message
+					$message_to->subtype = "messages";
+					$message_sent->subtype = "messages";
+			// Set its owner to the current user
+					// $message_to->owner_guid = $_SESSION['user']->getGUID();
+					$message_to->owner_guid = $send_to;
+					$message_to->container_guid = $send_to;
+					$message_sent->owner_guid = $from;
+					$message_sent->container_guid = $from;
+			// For now, set its access to public (we'll add an access dropdown shortly)
+					$message_to->access_id = ACCESS_PUBLIC;
+					$message_sent->access_id = ACCESS_PUBLIC;
+			// Set its description appropriately
+					$message_to->title = $subject;
+					$message_to->description = $body;
+					$message_sent->title = $subject;
+					$message_sent->description = $body;
+		    // set the metadata
+		            $message_to->toId = $send_to; // the user receiving the message
+		            $message_to->fromId = $from; // the user receiving the message
+		            $message_to->readYet = 0; // this is a toggle between 0 / 1 (1 = read)
+		            $message_to->hiddenFrom = 0; // this is used when a user deletes a message in their sentbox, it is a flag
+		            $message_to->hiddenTo = 0; // this is used when a user deletes a message in their inbox
+		            $message_sent->toId = $send_to; // the user receiving the message
+		            $message_sent->fromId = $from; // the user receiving the message
+		            $message_sent->readYet = 0; // this is a toggle between 0 / 1 (1 = read)
+		            $message_sent->hiddenFrom = 0; // this is used when a user deletes a message in their sentbox, it is a flag
+		            $message_sent->hiddenTo = 0; // this is used when a user deletes a message in their inbox
+		            
+		            $message_to->msg = 1;
+		            $message_sent->msg = 1;
+		            
+			    // Save the copy of the message that goes to the recipient
+					$success = $message_to->save();
+					
+				// Save the copy of the message that goes to the sender
+					if ($add_to_sent) $success2 = $message_sent->save();
+					
+					$message_to->access_id = ACCESS_PRIVATE;
+					$message_to->save();
+					
+					if ($add_to_sent) {
+						$message_sent->access_id = ACCESS_PRIVATE;
+						$message_sent->save();
+					}
+					
+			    // if the new message is a reply then create a relationship link between the new message
+			    // and the message it is in reply to
+			        if($reply && $success){
+		    	        $create_relationship = add_entity_relationship($message_sent->guid, "reply", $reply);		    	        
+			        }
+			        
+			        
+			        global $CONFIG;
+					$message_contents = strip_tags($body);
+					if ($send_to != get_loggedin_user() && $notify)
+					notify_user($send_to, get_loggedin_user()->guid, elgg_echo('messages:email:subject'), 
+						sprintf(
+									elgg_echo('messages:email:body'),
+									get_loggedin_user()->name,
+									$message_contents,
+									$CONFIG->wwwroot . "pg/messages/" . $user->username,
+									get_loggedin_user()->name,
+									$CONFIG->wwwroot . "mod/messages/send.php?send_to=" . get_loggedin_user()->guid
+								)
+					);
+					
+			    	$messagesendflag = 0;    
+			        return $success;
+			
+		}
+		
+		/**
+		 * messages page handler; allows the use of fancy URLs
+		 *
+		 * @param array $page From the page_handler function
+		 * @return true|false Depending on success
+		 */
+		function messages_page_handler($page) {
+			
+			// The first component of a messages URL is the username
+			if (isset($page[0])) {
+				set_input('username',$page[0]);
+			}
+			
+			// The second part dictates what we're doing
+			if (isset($page[1])) {
+				switch($page[1]) {
+					case "read":		set_input('message',$page[2]);
+										include(dirname(__FILE__) . "/read.php");
+										return true;
+										break;
+				}
+			// If the URL is just 'messages/username', or just 'messages/', load the standard messages index
+			} else {
+				include(dirname(__FILE__) . "/index.php");
+				return true;
+			}
+			
+			return false;
+			
+		}
+
+		function messages_url($message) {
+			
+			global $CONFIG;
+			return $CONFIG->url . "pg/messages/" . $message->getOwnerEntity()->username . "/read/" . $message->getGUID();
+			
+		}
+		
+    // A simple function to count the number of messages that are unread in a user's inbox
+        function count_unread_messages() {
+            
+            //get the users inbox messages
+		    //$num_messages = get_entities_from_metadata("toId", $_SESSION['user']->getGUID(), "object", "messages", 0, 10, 0, "", 0, false);
+		    $num_messages = elgg_get_entities_from_metadata(array('metadata_name_value_pairs' => array(
+		    							'toId' => $_SESSION['user']->guid,
+		    							'readYet' => 0,
+		    							'msg' => 1
+		    									   ), 'types' => 'object', 'subtypes' => 'messages', 'owner_guid' => $_SESSION['user']->guid, 'limit' => 9999));
+		
+			if (is_array($num_messages))
+				$counter = sizeof($num_messages);
+			else
+				$counter = 0;
+				
+		    return $counter;
+            
+        }
+        
+        function messages_site_notify_handler(ElggEntity $from, ElggUser $to, $subject, $message, array $params = NULL)
+		{
+			global $CONFIG;
+			
+			if (!$from)
+				throw new NotificationException(sprintf(elgg_echo('NotificationException:MissingParameter'), 'from'));
+				 
+			if (!$to)
+				throw new NotificationException(sprintf(elgg_echo('NotificationException:MissingParameter'), 'to'));
+				
+			global $messages_pm;
+			if (!$messages_pm)
+				return messages_send($subject,$message,$to->guid,$from->guid,0,false,false);
+			else return true;
+			
+		}
+	
+		
+	// Make sure the messages initialisation function is called on initialisation
+		register_elgg_event_handler('init','system','messages_init');
+		
+		register_plugin_hook('permissions_check','object','messages_can_edit');
+		register_plugin_hook('container_permissions_check','object','messages_can_edit_container');
+		
+	// Register actions
+		global $CONFIG;
+		register_action("messages/send",false,$CONFIG->pluginspath . "messages/actions/send.php");
+		register_action("messages/delete",false,$CONFIG->pluginspath . "messages/actions/delete.php");
+	 
+?>
\ No newline at end of file
diff --git a/mod/messages/views/default/messages/css.php b/mod/messages/views/default/messages/css.php
new file mode 100644
index 000000000..6a8a6ed30
--- /dev/null
+++ b/mod/messages/views/default/messages/css.php
@@ -0,0 +1,234 @@
+<?php
+
+	/**
+	 * Elgg Messages CSS extender
+	 * 
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+
+/*-------------------------------
+MESSAGING PLUGIN
+-------------------------------*/
+#messages {
+	margin:0 10px 0 10px;
+}
+.actiontitle {
+	font-weight: bold;
+	font-size: 110%;
+	margin: 0 0 10px 0;
+}
+#messages .pagination {
+	margin:5px 0 5px 0;
+}
+#messages input[type="checkbox"] {
+	margin:0;
+	padding:0;
+	border:none;
+}
+.messages_buttonbank {
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	background:white;
+	margin:5px 10px;
+	padding:5px;
+	text-align: right;
+}
+.messages_buttonbank input {
+	margin:0 0 0 10px;
+}
+.messages_buttonbank input[type="button"] {
+	font: 12px/100% Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	color: #4690D6;
+	background:#dddddd;
+	border: 1px solid #999999;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+	width: auto;
+	height: 25px;
+	padding: 2px 6px 2px 6px;
+	margin:0 0 0 10px;
+	cursor: pointer;
+}
+.messages_buttonbank input[type="button"]:hover {
+	background: #0054a7;
+	border: 1px solid #0054a7;
+	color:white;
+}
+
+#messages td {
+	text-align: left;
+	vertical-align:middle;
+	padding: 5px;
+}
+#messages .message_sent {
+	-webkit-border-radius: 5px; 
+	-moz-border-radius: 5px;
+	margin-bottom: 5px;
+	background: white;
+	border:1px solid #cccccc; 	
+}
+#messages .message_notread {
+	-webkit-border-radius: 5px; 
+	-moz-border-radius: 5px;
+	margin-bottom: 5px;
+	background: #F7DAD8;
+	border:1px solid #ff6c7c; 
+}
+#messages .message_read {
+	-webkit-border-radius: 5px; 
+	-moz-border-radius: 5px;
+	margin-bottom: 5px;
+	background: white;
+	border:1px solid #cccccc; 
+}
+#messages .message_notread td {
+
+}
+#messages .message_read td {
+
+}
+
+#messages .delete_msg a {
+	display:block;
+	cursor: pointer;
+	width:14px;
+	height:14px;
+	margin:0;
+	background: url("<?php echo $vars['url']; ?>_graphics/icon_customise_remove.png") no-repeat right 0;
+	text-indent: -9000px;
+	float:right;
+}
+#messages .delete_msg a:hover {
+	background-position: right -16px;
+}
+/* IE6 */
+* html #messages .delete_msg a { background-position: right 4px; }
+* html #messages .delete_msg a:hover { background-position: right 4px; } 
+
+#messages .usericon,
+#messages .groupicon {
+	float: left;
+	margin: 0 15px 0 0;
+}
+
+#messages .msgsender {
+	color:#666666;
+	line-height: 1em;
+	margin:0;
+	padding:0;
+	float:left;
+}
+#messages .msgsender small {
+	color:#AAAAAA;
+}
+
+
+#messages .msgsubject {
+	font-size: 120%;
+	line-height: 100%;
+}
+
+.msgsubject {
+	font-weight:bold;
+}
+
+.messages_single_icon  {
+	float: left;
+	width:110px;
+}
+
+.messages_single_icon .usericon,
+.messages_single_icon .groupicon {
+	float: left;
+	margin: 0 10px 10px 0;
+}
+
+/* view and reply to message view */
+.message_body {
+	margin-left: 120px;
+}
+.message_body .messagebody {
+	padding:0;
+	margin:10px 0 10px 0;
+	font-size: 120%;
+	border-bottom:1px solid #cccccc;
+}
+
+/* drop down message reply form */
+#message_reply_form { display:none; }
+
+.new_messages_count {
+	color:#666666;
+}
+/* tinyMCE container */
+#message_reply_editor #message_tbl {
+	width:680px !important;
+}
+/* IE6 */
+* html #message_reply_editor #message_tbl { width:676px !important;}
+
+#messages_return {
+	margin:4px 0 4px 10px;
+}
+#messages_return p {
+	margin:0;
+}
+.messages_single {
+	background: white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	margin:0 10px 10px 10px;
+	padding:10px;	
+}
+/* when displaying original msg in reply view */
+.previous_message {
+    background:#dedede;
+	-webkit-border-radius: 5px; 
+	-moz-border-radius: 5px;
+    padding:10px;
+    margin:0 0 20px 0;
+}
+.previous_message p {
+    padding:0;
+    margin:0 0 5px 0;
+    font-size: 100%;
+}
+
+
+
+
+#notificationstable td.sitetogglefield {
+	width:50px;
+	text-align: center;
+	vertical-align: middle;
+}
+#notificationstable td.sitetogglefield input {
+	margin-right:36px;
+	margin-top:5px;
+}
+#notificationstable td.sitetogglefield a {
+	width:46px;
+	height:24px;
+	cursor: pointer;
+	display: block;
+	outline: none;
+}
+#notificationstable td.sitetogglefield a.sitetoggleOff {
+	background: url(<?php echo $vars['url']; ?>mod/messages/graphics/icon_notifications_site.gif) no-repeat right 2px;
+}
+#notificationstable td.sitetogglefield a.sitetoggleOn {
+	background: url(<?php echo $vars['url']; ?>mod/messages/graphics/icon_notifications_site.gif) no-repeat right -36px;
+}
+
+
+
+
+
+
diff --git a/mod/messages/views/default/messages/forms/message.php b/mod/messages/views/default/messages/forms/message.php
new file mode 100644
index 000000000..3a926b0d3
--- /dev/null
+++ b/mod/messages/views/default/messages/forms/message.php
@@ -0,0 +1,94 @@
+<?php
+
+    /**
+	 * Elgg send a message page
+	 *
+	 * 
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 *
+	 * @uses $vars['friends'] This is an array of a user's friends and is used to populate the list of
+	 * people the user can message
+	 *
+	 */
+	 
+	//grab the user id to send a message to. This will only happen if a user clicks on the 'send a message'
+	//link on a user's profile or hover-over menu
+	$send_to = get_input('send_to');
+	if ($send_to === "")
+		$send_to = $_SESSION['msg_to'];
+
+	$msg_title = $_SESSION['msg_title'];
+	$msg_content = $_SESSION['msg_contents'];
+	
+	// clear sticky form cache in case user browses away from page and comes back 
+	unset($_SESSION['msg_to']);
+	unset($_SESSION['msg_title']);
+	unset($_SESSION['msg_contents']);
+		
+	
+	 
+?>
+	<div class="contentWrapper">
+	<form action="<?php echo $vars['url']; ?>action/messages/send" method="post" name="messageForm">
+			
+	    <?php
+		// security tokens.
+		echo elgg_view('input/securitytoken');
+			    
+	        //check to see if the message recipient has already been selected
+			if($send_to){
+    			
+    			//get the user object  
+    	        $user = get_user($send_to);
+    	        
+    	        //draw it
+    			echo "<label>" . elgg_echo("messages:to") . ":</label><div class=\"messages_single_icon\">" . elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny')) . $user->username;
+    			echo "</div><br class=\"clearfloat\" />";
+    			//set the hidden input field to the recipients guid
+    	        echo "<input type=\"hidden\" name=\"send_to\" value=\"{$send_to}\" />";
+    	        
+    			    
+	        }else{
+    	            
+        ?>
+    	   		
+            <p><label><?php echo elgg_echo("messages:to"); ?>: </label>
+    	    <select name='send_to'>
+    	    <?php 
+    			//make the first option blank
+    	    	echo "<option value=''></option>";
+    	        foreach($vars['friends'] as $friend){
+        			   
+        	        //populate the send to box with a user's friends
+    			    echo "<option value='{$friend->guid}'>" . $friend->name . "</option>";
+    			        
+    		    }
+    		        
+            ?>
+    		</select></p>
+    		    
+        <?php
+    		
+	        }//end send_to if statement
+		        
+	    ?>
+	    
+		<p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' value='<?php echo $msg_title; ?>' class="input-text" /></label></p>
+		<p class="longtext_editarea"><label><?php echo elgg_echo("messages:message"); ?>: <br />
+		<?php
+
+				    echo elgg_view("input/longtext", array(
+									"internalname" => "message",
+									"value" => $msg_content,
+													));
+			
+		?>
+		</label></p>
+		<p><input type="submit" class="submit_button" value="<?php echo elgg_echo("messages:fly"); ?>" /></p>
+	
+	</form>
+	</div>
diff --git a/mod/messages/views/default/messages/forms/reply.php b/mod/messages/views/default/messages/forms/reply.php
new file mode 100644
index 000000000..7b949ec36
--- /dev/null
+++ b/mod/messages/views/default/messages/forms/reply.php
@@ -0,0 +1,53 @@
+<?php
+
+    /**
+	 * Elgg reply to a message form
+	 * 
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 *
+	 * @uses $vars['entity'] This is the message being replied to
+	 *
+	 */
+	
+	// fix for RE: RE: RE: that builds on replies
+	$reply_title = $vars['entity']->title;
+	if (strncmp($reply_title, "RE:", 3) != 0) {
+		$reply_title = "RE: " . $reply_title;
+	}
+exit;
+	$reply_title = str_replace("'", "\\'", $reply_title);
+?>
+
+<form action="<?php echo $vars['url']; ?>action/messages/send" method="post" name="messageForm">
+
+    <!-- populate the title space with the orginal message title, inserting re: before it -->						        
+	<p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="input-text" value='<?php echo $reply_title; ?>' /></label></p>
+	<p><label><?php echo elgg_echo("messages:message"); ?>: <br /><textarea name='message' value='' class="input-textarea" /></textarea></label></p>
+		
+	<p>
+	    <?php
+               echo elgg_view('input/securitytoken'); 
+	        //pass across the guid of the message being replied to
+    	    echo "<input type='hidden' name='reply' value='" . $vars['entity']->getGUID() . "' />";
+    	    //pass along the owner of the message being replied to
+    	    echo "<input type='hidden' name='send_to' value='BAAA" . $vars['entity']->fromId . "' />";
+	
+	    ?>
+	    <input type="submit" class="submit_button" value="<?php echo elgg_echo("messages:fly"); ?>" />
+	</p>
+	
+</form>
+	
+	<?php
+        //display the message you are replying to
+		if (isset($vars['entity'])) {
+    		
+    		echo "<h3>" . elgg_echo("messages:replying") . "</h3>";
+    		echo $vars['entity']->description;
+    		
+		}
+    ?>
diff --git a/mod/messages/views/default/messages/forms/view.php b/mod/messages/views/default/messages/forms/view.php
new file mode 100644
index 000000000..adcd3a589
--- /dev/null
+++ b/mod/messages/views/default/messages/forms/view.php
@@ -0,0 +1,15 @@
+<?php
+
+	$body = elgg_view("messages/view",$vars);
+	
+	$body .= '<div class="messages_buttonbank">';
+	$body .= '<input type="hidden" name="type" value="'.$vars['page_view'].'" />';
+	$body .= '<input type="hidden" name="offset" value="'.$vars['offset'].'" />';
+	$body .= '<input type="submit" name="submit" value="'.elgg_echo('delete').'" /> ';
+	$body .= '<input type="submit" name="submit" value="'.elgg_echo('messages:markread').'" /> ';
+	$body .= '<input type="button" onclick="javascript:$(\'input[type=checkbox]\').click();" value="'.elgg_echo('messages:toggle').'" />';
+	$body .= '</div>';
+	
+	echo elgg_view('input/form',array('body' => $body, 'action' => $vars['url'] . 'action/messages/delete', 'method' => 'post'));
+
+?>
\ No newline at end of file
diff --git a/mod/messages/views/default/messages/menu.php b/mod/messages/views/default/messages/menu.php
new file mode 100644
index 000000000..9f8da1fb1
--- /dev/null
+++ b/mod/messages/views/default/messages/menu.php
@@ -0,0 +1,26 @@
+<?php
+
+	/**
+	 * Elgg hoverover extender for messages
+	 * 
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	 //need to be logged in to send a message
+	 if (isloggedin()) {
+
+?>
+
+	<p class="user_menu_messages">
+		<a href="<?php echo $vars['url']; ?>mod/messages/send.php?send_to=<?php echo $vars['entity']->guid; ?>"><?php echo elgg_echo("messages:sendmessage"); ?></a>	
+	</p>
+	
+<?php
+
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/messages/views/default/messages/messages.php b/mod/messages/views/default/messages/messages.php
new file mode 100644
index 000000000..cdc6e4483
--- /dev/null
+++ b/mod/messages/views/default/messages/messages.php
@@ -0,0 +1,165 @@
+<?php
+
+	/**
+	 * Elgg messages individual view
+	 *
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 *
+	 *
+	 * @uses $vars['entity'] Optionally, the message to view
+	 * @uses get_input('type') If the user accesses the message from their sentbox, this variable is passed
+	 * and used to make sure the correct icon and name is displayed
+	 */
+	// set some variables to use below
+	if(get_input("type") == "sent"){
+
+		// send back to the users sentbox
+		$url = $vars['url'] . "mod/messages/sent.php";
+
+		//this is used on the delete link so we know which type of message it is
+		$type = "sent";
+
+	} else {
+
+		//send back to the users inbox
+		$url = $vars['url'] . "pg/messages/" . $vars['user']->username;
+
+		//this is used on the delete link so we know which type of message it is
+		$type = "inbox";
+
+	}
+
+	// fix for RE: RE: RE: that builds on replies
+	$reply_title = $vars['entity']->title;
+	if (strncmp($reply_title, "RE:", 3) != 0) {
+		$reply_title = "RE: " . $reply_title;
+	}
+
+	if (isloggedin())
+	if (isset($vars['entity'])) {
+		if ($vars['entity']->toId == $vars['user']->guid
+			|| $vars['entity']->owner_guid == $vars['user']->guid) {
+
+?>
+	<!-- get the correct return url -->
+	<div id="messages_return"><!-- start of messages_return div -->
+		<p><a href="<?php echo $url; ?>">&laquo; <?php echo elgg_echo('messages:back'); ?></a></p>
+	</div><!-- end of messages_return div -->
+
+	<div class="messages_single"><!-- start of the message div -->
+
+		<div class="messages_single_icon"><!-- start of the message_user_icon div -->
+			<!-- get the user icon, name and date -->
+			<?php
+				// we need a different user icon and name depending on whether the user is reading the message
+				// from their inbox or sentbox. If it is the inbox, then the icon and name will be the person who sent
+				// the message. If it is the sentbox, the icon and name will be the user the message was sent to
+				if ($type == "sent") {
+					//get an instance of the user who the message has been sent to so we can access the name and icon
+					$user_object = get_entity($vars['entity']->toId);
+					echo " " . elgg_view("profile/icon",array('entity' => $user_object, 'size' => 'tiny'));
+					echo "<br class=\"clearfloat\" /><p>".elgg_echo('messages:to').": <b>" . $user_object->name . "</b><br />";
+				} else {
+					echo " " . elgg_view("profile/icon",array('entity' => get_entity($vars['entity']->fromId), 'size' => 'tiny'));
+					echo "<br class=\"clearfloat\" /><p>".elgg_echo('messages:from').": <b>" . get_entity($vars['entity']->fromId)->name . "</b><br />";
+				}
+			?>
+			<!-- get the time the message was sent -->
+			<small><?php echo friendly_time($vars['entity']->time_created); ?></small>
+			</p>
+		</div><!-- end of the message_user_icon div -->
+
+		<div class="message_body"><!-- start of div message_body -->
+
+		<?php
+			//if the message is a reply, display the message the reply was for
+			//I need to figure out how to get the description out using -> (anyone?)
+			if($main_message = $vars['entity']->getEntitiesFromRelationship("reply")){
+
+				if($type == "sent"){
+					echo "<div class='previous_message'><h3>".elgg_echo('messages:original').":</h3><p>";
+				}else{
+					echo "<div class='previous_message'><h3>".elgg_echo('messages:yours').":</h3><p>";
+				}
+
+				echo $main_message[0][description] . "</p></div>";
+
+			}
+		?>
+
+		<!-- display the title -->
+		<div class="actiontitle">
+		<h3><?php echo $vars['entity']->title; ?></h3>
+		</div>
+
+		<!-- display the message -->
+		<div class="messagebody">
+		<p><?php echo elgg_view('output/longtext',array('value' => $vars['entity']->description)); ?></p>
+		</div>
+
+		<!-- display the edit options, reply and delete -->
+		<div class="message_options"><!-- start of the message_options div -->
+
+		<script type="text/javascript">
+		$(document).ready(function () {
+			// click function to toggle reply panel
+			$('a.message_reply').click(function () {
+				$('div#message_reply_form').slideToggle("medium");
+				return false;
+			});
+		});
+		</script>
+
+
+			<p><?php if($type != "sent")echo "<a href=\"javascript:void(0);\" class='message_reply'>".elgg_echo('messages:answer')."</a> &nbsp; "; ?> <?php echo elgg_view("output/confirmlink", array(
+																'href' => $vars['url'] . "action/messages/delete?message_id=" . $vars['entity']->getGUID() . "&type={$type}&submit=" . elgg_echo('delete'),
+																'text' => elgg_echo('delete'),
+																'confirm' => elgg_echo('deleteconfirm'),
+															)); ?>
+			</p>
+		</div><!-- end of the message_options div -->
+
+		</div><!-- end of div message_body -->
+
+		<!-- display the reply form -->
+		<div id="message_reply_form">
+			<form action="<?php echo $vars['url']; ?>action/messages/send" method="post" name="messageForm">
+				<!-- populate the title space with the orginal message title, inserting re: before it -->
+				<p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="input-text" value="<?php echo htmlentities($reply_title); ?>" /></label></p>
+				<p class="longtext_editarea"><label><?php echo elgg_echo("messages:message"); ?>:</label></p>
+				<div id="message_reply_editor">
+				<?php
+
+					echo elgg_view("input/longtext", array(
+									"internalname" => "message",
+									"value" => '',
+													));
+
+				?></div>
+
+				<p>
+						<?php
+						// security tokens required.
+						echo elgg_view('input/securitytoken');
+
+								//pass across the guid of the message being replied to
+								echo "<input type='hidden' name='reply' value='" . $vars['entity']->getGUID() . "' />";
+								//pass along the owner of the message being replied to
+								echo "<input type='hidden' name='send_to' value='" . $vars['entity']->fromId . "' />";
+
+						?>
+						<input type="submit" class="submit_button" value="<?php echo elgg_echo("messages:fly"); ?>" />
+				</p>
+			</form>
+		</div><!-- end of div reply_form -->
+
+	</div><!-- end of the message div -->
+
+<?php
+			}
+	}
+?>
diff --git a/mod/messages/views/default/messages/topbar.php b/mod/messages/views/default/messages/topbar.php
new file mode 100644
index 000000000..179167561
--- /dev/null
+++ b/mod/messages/views/default/messages/topbar.php
@@ -0,0 +1,38 @@
+<?php
+
+	/**
+	 * Elgg messages topbar extender
+	 * 
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	 //need to be logged in to send a message
+	 gatekeeper();
+
+	//get unread messages
+	$num_messages = count_unread_messages();
+	if($num_messages){
+		$num = $num_messages;
+	} else {
+		$num = 0;
+	}
+
+	if($num == 0){
+
+?>
+
+	<a href="<?php echo $vars['url']; ?>pg/messages/<?php echo $_SESSION['user']->username; ?>" class="privatemessages" >&nbsp;</a>
+	
+<?php
+    }else{
+?>
+
+    <a href="<?php echo $vars['url']; ?>pg/messages/<?php echo $_SESSION['user']->username; ?>" class="privatemessages_new" >[<?php echo $num; ?>]</a>
+	
+<?php
+    }
+?>
\ No newline at end of file
diff --git a/mod/messages/views/default/messages/view.php b/mod/messages/views/default/messages/view.php
new file mode 100644
index 000000000..501be8bb3
--- /dev/null
+++ b/mod/messages/views/default/messages/view.php
@@ -0,0 +1,150 @@
+<?php
+
+	/**
+	 * Elgg messages view page
+	 *
+	 * @package ElggMessages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 *
+	 * @uses $vars['entity'] An array of messages to view
+	 * @uses $vars['page_view'] This is the page the messages are being accessed from; inbox or sentbox
+	 *
+	 */
+
+	$limit = $vars['limit']; if (empty($limit)) $limit = 10;
+	$offset = $vars['offset']; if (!isset($offset)) $offset = 0;
+
+	// If there are any messages to view, view them
+	if (isloggedin())
+	if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
+
+?>
+	<div id="messages" /><!-- start the main messages wrapper div -->
+
+<?php
+
+			// get the correct display for the inbox view
+			if($vars['page_view'] == "inbox") {
+
+				$counter = 0;
+
+				foreach($vars['entity'] as $message) {
+					if ($message->owner_guid == $vars['user']->guid
+						|| $message->toId == $vars['user']->guid) {
+
+					//make sure to only display the messages that have not been 'deleted' (1 = deleted)
+					if($message->hiddenFrom != 1){
+
+						// check to see if the message has been read, if so, get the correct background color
+						if($message->readYet == 1){
+							echo "<div class=\"message_read\" />";
+						}else{
+							echo "<div class=\"message_notread\" />";
+						}
+
+						//set the table
+						echo "<table width=\"100%\" cellspacing='0'><tr>";
+						//get the icon of the user who owns the message
+						$from = get_entity($message->fromId);
+						echo "<td width='200px'>" . elgg_view("profile/icon",array('entity' => $from, 'size' => 'tiny')) . "<div class='msgsender'><b>" . $from->name . "</b><br /><small>" . friendly_time($message->time_created) . "</small></div></td>";
+						//display the message title
+						echo "<td><div class='msgsubject'>";
+						echo "<input type=\"checkbox\" name=\"message_id[]\" value=\"{$message->guid}\" /> ";
+						echo "<a href=\"{$message->getURL()}\">" . $message->title . "</a></div></td>";
+						//display the link to 'delete'
+
+						echo "<td width='70px'>";
+						echo "<div class='delete_msg'>" . elgg_view("output/confirmlink", array(
+																'href' => $vars['url'] . "action/messages/delete?message_id=" . $message->getGUID() . "&type=inbox&submit=" . urlencode(elgg_echo('delete')),
+																'text' => elgg_echo('delete'),
+																'confirm' => elgg_echo('deleteconfirm'),
+															)) . "</div>";
+
+						echo "</td></tr></table>";
+						echo "</div>"; // close the message background div
+
+					}//end of hiddenFrom if statement
+					} // end of user check
+
+					$counter++;
+					if ($counter == $limit) break;
+
+				}//end of for each loop
+
+			}//end of inbox if statement
+
+			// get the correct display for the sentbox view
+			if($vars['page_view'] == "sent") {
+
+				$counter = 0;
+
+				foreach($vars['entity'] as $message) {
+
+					//make sure to only display the messages that have not been 'deleted' (1 = deleted)
+					if($message->hiddenTo != 1){
+
+						//get the correct user entity
+						$user = get_entity($message->toId);
+						echo "<div class=\"message_sent\" />";
+						echo "<table width=\"100%\" cellspacing='0'><tr>";
+
+						//get the icon for the user the message was sent to
+						echo "<tr><td width='200px'>" . elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny')) . "<div class='msgsender'><b>" . $user->name . "</b><br /><small>" . friendly_time($message->time_created) . "</small></div></td>";
+						//display the message title
+						echo "<td><div class='msgsubject'>";
+						echo "<input type=\"checkbox\" name=\"message_id[]\" value=\"{$message->guid}\" /> ";
+						echo "<a href=\"{$message->getURL()}?type=sent\">" . $message->title . "</a></div></td>";
+						//display the link to 'delete'
+
+						echo "<td width='70px'>";
+							echo "<div class='delete_msg'>" . elgg_view("output/confirmlink", array(
+							'href' => $vars['url'] . "action/messages/delete?message_id=" . $message->getGUID() . "&type=sent&submit=" . urlencode(elgg_echo('delete')),
+							'text' => elgg_echo('delete'),
+							'confirm' => elgg_echo('deleteconfirm'),
+						)) . "</div>";
+						echo "</td></tr></table></div>";
+
+					}//close hiddeTo if statement
+
+					$counter++;
+					if ($counter == $limit) break;
+
+				}//close foreach
+
+			}//close page_view sent if statement
+
+			$baseurl = $_SERVER['REQUEST_URI'];
+			$nav = '';
+
+			if (sizeof($vars['entity']) > $limit) {
+				$newoffset = $offset + $limit;
+				$nexturl = elgg_http_add_url_query_elements($baseurl, array('offset' => $newoffset));
+
+				$nav .= '<a class="pagination_previous" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
+			}
+
+			if ($offset > 0) {
+				$newoffset = $offset - $limit;
+				if ($newoffset < 0) $newoffset = 0;
+
+				$prevurl = elgg_http_add_url_query_elements($baseurl, array('offset' => $newoffset));
+
+				$nav .= '<a class="pagination_next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
+			}
+
+
+			if (!empty($nav)) {
+				echo '<div class="pagination"><p>'.$nav.'</p><div class="clearfloat"></div></div>';
+			}
+
+			echo "</div>"; // close the main messages wrapper div
+
+	} else {
+
+		echo "<div class=\"contentWrapper\"><p class='messages_nomessage_message'>" . elgg_echo("messages:nomessages") . "</p></div>";
+
+	}//end of the first if statement
+?>
diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/mod/messages/views/default/object/messages.php
diff --git a/mod/messages/views/default/widgets/messages/edit.php b/mod/messages/views/default/widgets/messages/edit.php
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/mod/messages/views/default/widgets/messages/edit.php
diff --git a/mod/messages/views/default/widgets/messages/view.php b/mod/messages/views/default/widgets/messages/view.php
new file mode 100644
index 000000000..e4d138562
--- /dev/null
+++ b/mod/messages/views/default/widgets/messages/view.php
@@ -0,0 +1,13 @@
+
+	<?php
+	
+	    $num_messages = count_unread_messages();
+	    
+        if($num_messages  == 0)
+		    echo "<h3 class=\"new_messages_count\">You have no new messages.</h3>";
+		else {
+		    echo "<h3 class=\"new_messages_count\">" . $num_messages . " new message(s).</h3>";
+		    echo "<a href=\"" . $vars['url'] . "pg/messages/" . $_SESSION['user']->username ."\">check them out</a>";
+	    }
+
+	?>
diff --git a/mod/notifications/actions/groupsave.php b/mod/notifications/actions/groupsave.php
new file mode 100644
index 000000000..ca250c7fd
--- /dev/null
+++ b/mod/notifications/actions/groupsave.php
@@ -0,0 +1,44 @@
+<?php
+
+	/**
+	 * Elgg notifications group save
+	 * 
+	 * @package ElggNotifications
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Restrict to logged in users
+		gatekeeper();
+		
+	// Load important global vars
+		global $SESSION;
+		global $NOTIFICATION_HANDLERS;
+
+	// Get group memberships and condense them down to an array of guids
+		$groups = array();
+		if ($groupmemberships = elgg_get_entities_from_relationship(array('relationship' => 'member', 'relationship_guid' => $_SESSION['user']->guid, 'types' => 'group', 'limit' => 9999))) {
+			foreach($groupmemberships as $groupmembership)
+				$groups[] = $groupmembership->guid;
+		}		
+		
+		foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+			$subscriptions[$method] = get_input($method.'subscriptions');
+			$personal[$method] = get_input($method.'personal');
+			$collections[$method] = get_input($method.'collections');
+			if (!empty($groups))
+				foreach($groups as $group)
+					if (in_array($group,$subscriptions[$method])) {
+						add_entity_relationship($SESSION['user']->guid,'notify'.$method,$group);
+					} else {
+						remove_entity_relationship($SESSION['user']->guid,'notify'.$method,$group);
+					}
+		}
+				
+		system_message(elgg_echo('notifications:subscriptions:success'));
+		
+		forward($_SERVER['HTTP_REFERER']);
+
+?>
\ No newline at end of file
diff --git a/mod/notifications/actions/save.php b/mod/notifications/actions/save.php
new file mode 100644
index 000000000..a4a5903f9
--- /dev/null
+++ b/mod/notifications/actions/save.php
@@ -0,0 +1,42 @@
+<?php
+
+	/**
+	 * Elgg notifications
+	 * 
+	 * @package ElggNotifications
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Restrict to logged in users
+		gatekeeper();
+		
+		global $SESSION;
+		
+		global $NOTIFICATION_HANDLERS;
+		foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+			$subscriptions[$method] = get_input($method.'subscriptions');
+			$personal[$method] = get_input($method.'personal');
+			$collections[$method] = get_input($method.'collections');
+			
+			$metaname = 'collections_notifications_preferences_' . $method;
+			$_SESSION['user']->$metaname = $collections[$method];
+			set_user_notification_setting($_SESSION['user']->guid, $method, ($personal[$method] == '1') ? true : false);
+			remove_entity_relationships($SESSION['user']->guid,'notify' . $method, false, 'user');
+		}
+		
+	// Add new ones
+		foreach($subscriptions as $key => $subscription)
+		if (is_array($subscription) && !empty($subscription)) {
+			foreach($subscription as $subscriptionperson) {
+				add_entity_relationship($_SESSION['user']->guid, 'notify' . $key, $subscriptionperson);
+			}
+		}
+		
+		system_message(elgg_echo('notifications:subscriptions:success'));
+		
+		forward($_SERVER['HTTP_REFERER']);
+
+?>
\ No newline at end of file
diff --git a/mod/notifications/graphics/icon_notifications_email.gif b/mod/notifications/graphics/icon_notifications_email.gif
new file mode 100644
index 000000000..038d6e651
--- /dev/null
+++ b/mod/notifications/graphics/icon_notifications_email.gif
diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php
new file mode 100644
index 000000000..a425845cf
--- /dev/null
+++ b/mod/notifications/groups.php
@@ -0,0 +1,42 @@
+<?php
+
+	/**
+	 * Elgg notifications plugin group index
+	 * 
+	 * @package ElggNotifications
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg framework
+		require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
+		
+	// Ensure only logged-in users can see this page
+		gatekeeper();
+		
+	// Set the context to settings
+		set_context('settings');
+		
+	// Get the form
+		global $SESSION, $CONFIG;
+		$people = array();
+		
+		$groupmemberships = elgg_get_entities_from_relationship(array('relationship' => 'member', 'relationship_guid' => $_SESSION['user']->guid, 'types' => 'group', 'limit' => 9999));
+		
+		$body = elgg_view('input/form',array(
+			'body' => elgg_view('notifications/subscriptions/groupsform',array(
+							'groups' => $groupmemberships
+						)),
+			'method' => 'post',
+			'action' => $CONFIG->wwwroot . 'action/notificationsettings/groupsave'
+		));
+		
+	// Insert it into the correct canvas layout
+		$body = elgg_view_layout('two_column_left_sidebar','',$body);
+		
+	// Draw the page
+		page_draw(elgg_echo('notifications:subscriptions:changesettings:groups'),$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/notifications/index.php b/mod/notifications/index.php
new file mode 100644
index 000000000..79365842c
--- /dev/null
+++ b/mod/notifications/index.php
@@ -0,0 +1,39 @@
+<?php
+
+	/**
+	 * Elgg notifications plugin index
+	 * 
+	 * @package ElggNotifications
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg framework
+		require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
+		
+	// Ensure only logged-in users can see this page
+		gatekeeper();
+		
+	// Set the context to settings
+		set_context('settings');
+		
+	// Get the form
+		global $SESSION;
+		$people = array();
+		if ($people_ents = elgg_get_entities_from_relationship(array('relationship' => 'notify', 'relationship_guid' => $SESSION['user']->guid, 'types' => 'user', 'limit' => 99999))) {
+			foreach($people_ents as $ent)
+				$people[] = $ent->guid;
+		}
+		$body = elgg_view('notifications/subscriptions/form',array(
+							'people' => $people
+						));
+		
+	// Insert it into the correct canvas layout
+		$body = elgg_view_layout('two_column_left_sidebar','',$body);
+		
+	// Draw the page
+		page_draw(elgg_echo('notifications:subscriptions:changesettings'),$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/notifications/languages/en.php b/mod/notifications/languages/en.php
new file mode 100644
index 000000000..05c7da86a
--- /dev/null
+++ b/mod/notifications/languages/en.php
@@ -0,0 +1,29 @@
+<?php
+
+	$english = array(
+	
+		'friends:all' => 'All friends',
+	
+		'notifications:subscriptions:personal:description' => 'Receive notifications when actions are performed on your content',
+		'notifications:subscriptions:personal:title' => 'Personal notifications',
+	
+		'notifications:subscriptions:collections:title' => 'Toggle friends collections',
+		'notifications:subscriptions:collections:description' => 'To toggle settings for members of your friends collections, use the icons below. This will affect the corresponding users in the main notification settings panel at the bottom of the page. ',
+		'notifications:subscriptions:collections:edit' => 'To edit your friends collections, click here.',
+	
+		'notifications:subscriptions:changesettings' => 'Notifications',
+		'notifications:subscriptions:changesettings:groups' => 'Group notifications',
+		'notification:method:email' => 'Email',	
+	
+		'notifications:subscriptions:title' => 'Notifications per user',
+		'notifications:subscriptions:description' => 'To receive notifications from your friends when they create new content, find them below and select the notification method you would like to use.',
+	
+		'notifications:subscriptions:groups:description' => 'To receive notifications when new content is added to a group you are a member of, find it below and select the notification method you would like to use.',
+	
+		'notifications:subscriptions:success' => 'Your notifications settings have been saved.',
+	
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/notifications/manifest.xml b/mod/notifications/manifest.xml
new file mode 100644
index 000000000..d76abc6ae
--- /dev/null
+++ b/mod/notifications/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider" />
+        <field key="version" value="1.7" />
+        <field key="description" value="Elgg notifications plugin" />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+        <field key="licence" value="GNU Public License version 2" />
+        <field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/notifications/start.php b/mod/notifications/start.php
new file mode 100644
index 000000000..a08fe68f5
--- /dev/null
+++ b/mod/notifications/start.php
@@ -0,0 +1,47 @@
+<?php
+
+	/**
+	 * Elgg notifications plugin
+	 * 
+	 * @package ElggNotifications
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+
+	/**
+	 * Notification settings page setup function
+	 *
+	 */
+		function notifications_plugin_pagesetup() {
+			global $CONFIG;
+			if (get_context() == 'settings') {
+				add_submenu_item(elgg_echo('notifications:subscriptions:changesettings'), $CONFIG->wwwroot . "mod/notifications/");
+				if (is_plugin_enabled('groups'))
+					add_submenu_item(elgg_echo('notifications:subscriptions:changesettings:groups'), $CONFIG->wwwroot . "mod/notifications/groups.php");
+			}
+		}
+		
+		function notifications_plugin_init() {
+			elgg_extend_view('css','notifications/css');
+			global $CONFIG;
+			
+			// Unset the default user settings hook
+			if (isset($CONFIG->hooks['usersettings:save']['user']))
+				foreach($CONFIG->hooks['usersettings:save']['user'] as $key => $function) {
+					if ($function == 'notification_user_settings_save')
+						unset($CONFIG->hooks['usersettings:save']['user'][$key]); 
+				}
+		}
+
+		register_elgg_event_handler('pagesetup','system','notifications_plugin_pagesetup',1000);
+		register_elgg_event_handler('init','system','notifications_plugin_init',1000);
+
+	// Register action
+		global $CONFIG;
+		register_action("notificationsettings/save",false,$CONFIG->pluginspath . "notifications/actions/save.php");
+		register_action("notificationsettings/groupsave",false,$CONFIG->pluginspath . "notifications/actions/groupsave.php");
+		
+?>
\ No newline at end of file
diff --git a/mod/notifications/views/default/notifications/css.php b/mod/notifications/views/default/notifications/css.php
new file mode 100644
index 000000000..be1ef922c
--- /dev/null
+++ b/mod/notifications/views/default/notifications/css.php
@@ -0,0 +1,78 @@
+<?php
+
+	/**
+	 * Elgg notifications CSS
+	 * 
+	 * @package notifications
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+?>
+
+#notificationstable td.namefield {
+	width:250px;
+	text-align: left;
+	vertical-align: middle;
+}
+#notificationstable td.namefield p {
+	margin:0;
+	vertical-align: middle;
+	line-height: 1.1em;
+	padding:5px 0 5px 0;
+}
+#notificationstable td.namefield img {
+	padding:6px 10px 6px 3px;
+	float:left;
+}
+#notificationstable td.namefield p.namefieldlink {
+	margin:9px 0 0 0;
+}
+#notificationstable td.emailtogglefield,
+#notificationstable td.smstogglefield {
+	width:50px;
+	text-align: center;
+	vertical-align: middle;
+}
+#notificationstable td.spacercolumn {
+	width:30px;
+}
+#notificationstable td {
+	border-bottom: 1px solid silver;
+}
+#notificationstable td.emailtogglefield input {
+	margin-right:36px;
+	margin-top:5px;
+}
+#notificationstable td.emailtogglefield a {
+	width:46px;
+	height:24px;
+	cursor: pointer;
+	display: block;
+	outline: none;
+}
+#notificationstable td.emailtogglefield a.emailtoggleOff {
+	background: url(<?php echo $vars['url']; ?>mod/notifications/graphics/icon_notifications_email.gif) no-repeat right 2px;
+}
+#notificationstable td.emailtogglefield a.emailtoggleOn {
+	background: url(<?php echo $vars['url']; ?>mod/notifications/graphics/icon_notifications_email.gif) no-repeat right -36px;
+}
+
+.notification_collections,
+.notification_personal {
+	margin-bottom: 25px;
+}
+
+.settings_form .friendsPicker_container h3 {
+	color:#999999;
+	font-size:3em;
+	margin:0 0 20px;
+	text-align:left;
+	background: none;
+	border-bottom: none;
+}
+
+
+
diff --git a/mod/notifications/views/default/notifications/settings/usersettings.php b/mod/notifications/views/default/notifications/settings/usersettings.php
new file mode 100644
index 000000000..15c5adc7f
--- /dev/null
+++ b/mod/notifications/views/default/notifications/settings/usersettings.php
@@ -0,0 +1,3 @@
+<?php
+
+?>
\ No newline at end of file
diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php
new file mode 100644
index 000000000..8fe49e672
--- /dev/null
+++ b/mod/notifications/views/default/notifications/subscriptions/collections.php
@@ -0,0 +1,141 @@
+
+<script type="text/javascript">
+	
+	function setCollection(members, method, id) {
+		for ( var i in members ) {
+			var checked = $('#' + method + 'collections' + id).children("INPUT[type='checkbox']").attr('checked');
+			if ($("#"+method+members[i]).children("INPUT[type='checkbox']").attr('checked') != checked) {  
+    			$("#"+method+members[i]).children("INPUT[type='checkbox']").attr('checked', checked);
+    			functioncall = 'adjust' + method + '_alt("'+method+members[i]+'");';
+    			eval(functioncall);
+    		}
+		} 
+	}
+	
+</script>
+
+<h3>
+	<?php echo elgg_echo('notifications:subscriptions:collections:title'); ?>
+</h3>
+<div class="notification_personal">
+<p>
+	<?php echo elgg_echo('notifications:subscriptions:collections:description'); ?>
+	<a href="<?php echo $vars['url']; ?>pg/collections/<?php echo $vars['user']->username; ?>"><?php echo elgg_echo('notifications:subscriptions:collections:edit') ?></a>
+</p>
+<table id="notificationstable" cellspacing="0" cellpadding="4" border="1" width="100%">
+  <tr>
+    <td>&nbsp;</td>
+<?php
+	$i = 0; 
+	global $NOTIFICATION_HANDLERS;
+	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+		if ($i > 0)
+			echo "<td class=\"spacercolumn\">&nbsp;</td>";
+?>
+	<td class="<?php echo $method; ?>togglefield"><?php echo elgg_echo('notification:method:'.$method); ?></td>
+<?php
+		$i++;
+	}
+?>
+    <td>&nbsp;</td>
+  </tr>
+<?php
+		$members = array();
+		if ($friends = get_user_friends($vars['user']->guid,'',9999,0)) {
+			foreach($friends as $friend)
+				$members[] = $friend->guid;
+		}
+		$memberno = sizeof($members);
+		$members = implode(',',$members);
+
+?>
+  <tr>
+    <td class="namefield">
+    	<p>
+    		<?php echo elgg_echo('friends:all'); ?> (<?php echo $memberno; ?>)
+    	</p>
+    </td>
+<?php
+
+		$fields = '';
+		$i = 0;
+		foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+			$metaname = 'collections_notifications_preferences_' . $method;
+			if ($collections_preferences = $vars['user']->$metaname) {
+				if (!empty($collections_preferences) && !is_array($collections_preferences))
+					$collections_preferences = array($collections_preferences);
+				if (is_array($collections_preferences))
+				if (in_array(-1,$collections_preferences)) {
+					$collectionschecked[$method] = 'checked="checked"';
+				} else {
+					$collectionschecked[$method] = '';
+				}
+			}
+			if ($i > 0) $fields .= "<td class=\"spacercolumn\">&nbsp;</td>";
+			$fields .= <<< END
+			    <td class="{$method}togglefield">
+			    <a border="0" id="{$method}collections-1" class="{$method}toggleOff" onclick="adjust{$method}_alt('{$method}collections-1'); setCollection([{$members}],'{$method}',-1);">
+			    <input type="checkbox" name="{$method}collections[]" id="{$method}checkbox" onclick="adjust{$method}('{$method}collections-1');" value="-1" {$collectionschecked[$method]} /></a></td>
+END;
+			$i++;
+		}
+		echo $fields;
+
+?>
+	<td>&nbsp;</td>
+  </tr>
+<?php
+
+	if ($collections = get_user_access_collections($vars['user']->guid)) {
+	foreach($collections as $collection) {
+		$members = get_members_of_access_collection($collection->id, true);
+		$memberno = sizeof($members);
+		$members = implode(',',$members);
+
+?>
+  <tr>
+    <td class="namefield">
+    	<p>
+    		<?php echo $collection->name; ?> (<?php echo $memberno; ?>)
+    	</p>
+    	
+    </td>
+    
+<?php
+
+		$fields = '';
+		$i = 0;
+		foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+			$metaname = 'collections_notifications_preferences_' . $method;
+			if ($collections_preferences = $vars['user']->$metaname) {
+				if (!empty($collections_preferences) && !is_array($collections_preferences))
+					$collections_preferences = array($collections_preferences);
+				if (is_array($collections_preferences))
+				if (in_array($collection->id,$collections_preferences)) {
+					$collectionschecked[$method] = 'checked="checked"';
+				} else {
+					$collectionschecked[$method] = '';
+				}
+			}
+			if ($i > 0) $fields .= "<td class=\"spacercolumn\">&nbsp;</td>";
+			$fields .= <<< END
+			    <td class="{$method}togglefield">
+			    <a border="0" id="{$method}collections{$collection->id}" class="{$method}toggleOff" onclick="adjust{$method}_alt('{$method}collections{$collection->id}'); setCollection([{$members}],'{$method}',{$collection->id});">
+			    <input type="checkbox" name="{$method}collections[]" id="{$method}checkbox" onclick="adjust{$method}('{$method}collections{$collection->id}');" value="{$collection->id}" {$collectionschecked[$method]} /></a></td>
+END;
+			$i++;
+		}
+		echo $fields;
+
+?>
+  
+    <td>&nbsp;</td>
+  </tr>
+<?php
+
+	}
+}
+
+?>
+</table>
+</div>
diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php
new file mode 100644
index 000000000..d96d6b7a7
--- /dev/null
+++ b/mod/notifications/views/default/notifications/subscriptions/form.php
@@ -0,0 +1,35 @@
+<?php
+
+	/**
+	 * Elgg SMS Client
+	 * 
+	 * @package ElggSMS
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+
+	// Echo title
+		echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings'));
+		
+		echo elgg_view('subscriptions/form/additions',$vars);
+		
+	// Display a description
+?>
+<div class="contentWrapper">
+<div class="notification_methods">
+<?php
+
+	echo elgg_view('input/form',array(
+			'body' => 	elgg_view('notifications/subscriptions/personal') .
+						elgg_view('notifications/subscriptions/collections') .
+						elgg_view('notifications/subscriptions/forminternals'),
+			'method' => 'post',
+			'action' => $vars['url'] . 'action/notificationsettings/save',
+		));
+
+?>
+</div>
+</div>
\ No newline at end of file
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
new file mode 100644
index 000000000..673e30cc3
--- /dev/null
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -0,0 +1,315 @@
+	<h3>
+		<?php echo elgg_echo('notifications:subscriptions:title'); ?>
+	</h3>
+	<p class="notification_methods_intro">
+		<?php echo elgg_echo('notifications:subscriptions:description'); ?>
+	</p>
+<?php
+
+	// Get friends and subscriptions
+		$friends = get_user_friends($vars['user']->guid,'',9999,0);
+		
+		global $NOTIFICATION_HANDLERS;
+		foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+			$subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => $vars['user']->guid, 'types' => 'user', 'limit' => 99999));
+		}
+		
+		$subs = array();
+		foreach($subsbig as $method => $big) {
+			if (is_array($subsbig[$method]) && sizeof($subsbig[$method])) {
+				foreach($subsbig[$method] as $u) { $subs[$method][] = $u->guid; }
+			}
+		}
+
+	// Let the system know that the friends picker is in use
+		global $pickerinuse;
+		$pickerinuse = true;
+		$chararray = elgg_echo('friendspicker:chararray');
+
+	// Initialise internalname
+		if (!isset($vars['internalname'])) {
+			$internalname = "friend";
+		} else {
+			$internalname = $vars['internalname'];
+		}
+		
+	// Initialise values
+		if (!isset($vars['value'])) {
+			$vars['value'] = array();
+		} else {
+			if (!is_array($vars['value'])) {
+				$vars['value'] = (int) $vars['value'];
+				$vars['value'] = array($vars['value']);
+			}
+		}
+
+	// Initialise whether we're calling back or not
+		if (isset($vars['callback'])) {
+			$callback = $vars['callback'];
+		} else {
+			$callback = false;
+		}
+		
+	// We need to count the number of friends pickers on the page.
+		if (!isset($vars['friendspicker'])) {
+			global $friendspicker;
+			if (!isset($friendspicker)) $friendspicker = 0;
+			$friendspicker++;
+		} else {
+			$friendspicker = $vars['friendspicker'];
+		}
+
+		$users = array();
+		$activeletters = array();
+		
+	// Are we displaying form tags and submit buttons?
+	// (If we've been given a target, then yes! Otherwise, no.)
+		if (isset($vars['formtarget'])) {
+			$formtarget = $vars['formtarget'];
+		} else {
+			$formtarget = false;
+		}
+		
+	// Sort users by letter
+		if (is_array($friends) && sizeof($friends))
+			foreach($friends as $user) {
+				
+				if (is_callable('mb_substr'))
+					$letter = strtoupper(mb_substr($user->name,0,1));
+				else
+					$letter = strtoupper(substr($user->name,0,1));
+				if (!substr_count($chararray,$letter)) {
+					$letter = "*";
+				}
+				if (!isset($users[$letter])) {
+					$users[$letter] = array();
+				}
+				$users[$letter][$user->name] = $user;
+				
+			}
+		
+	if (!$callback) {
+			
+?>
+
+<div class="friends_picker">
+
+<?php
+
+	if (isset($vars['content'])) echo $vars['content'];
+
+	
+?>
+
+	<div id="friends_picker_placeholder<?php echo $friendspicker; ?>">
+
+<?php
+	
+	}
+	
+	if (!isset($vars['replacement'])) {
+	
+		if ($formtarget) {
+?>
+
+	<script language="text/javascript">
+		$(function() { // onload...do
+		$('#collectionMembersForm<?php echo $friendspicker; ?>').submit(function() {
+			var inputs = [];
+			$(':input', this).each(function() {
+				if (this.type != 'checkbox' || (this.type == 'checkbox' && this.checked != false)) {
+					inputs.push(this.name + '=' + escape(this.value));
+				}
+			});
+			jQuery.ajax({
+				type: "POST",
+				data: inputs.join('&'),
+				url: this.action,
+				success: function(){
+     				$('a.collectionmembers<?php echo $friendspicker; ?>').click();
+   				}
+
+			});
+			return false;
+        })
+      })
+
+	</script>
+
+<?php
+
+		}
+
+		echo elgg_view('notifications/subscriptions/jsfuncs',$vars);
+		
+?>
+
+
+	<div class="friendsPicker_wrapper">
+	<div id="friendsPicker<?php echo $friendspicker; ?>">
+		<div class="friendsPicker_container">
+<?php
+
+	// Initialise letters
+		if (is_callable('mb_substr'))
+			$letter = mb_substr($chararray,0,1);
+		else
+			$letter = substr($chararray,0,1);
+		$letpos = 0;
+		$chararray .= '*';
+		while (1 == 1) {
+?>
+			<div class="panel" title="<?php echo $letter; ?>">
+				<div class="wrapper">
+					<h3><?php echo $letter; ?></h3>					
+					
+<?php
+
+			if (isset($users[$letter])) {
+				ksort($users[$letter]);
+?>
+
+<table id="notificationstable" cellspacing="0" cellpadding="4" border="1" width="100%">
+  <tr>
+    <td>&nbsp;</td>
+<?php
+	$i = 0; 
+	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+		if ($i > 0)
+			echo "<td class=\"spacercolumn\">&nbsp;</td>";
+?>
+	<td class="<?php echo $method; ?>togglefield"><?php echo elgg_echo('notification:method:'.$method); ?></td>
+<?php
+		$i++;
+	}
+?>
+    <td>&nbsp;</td>
+  </tr>
+
+<?php
+
+		if (is_array($users[$letter]) && sizeof($users[$letter]) > 0)
+		foreach($users[$letter] as $friend) {
+			if ($friend instanceof ElggUser ) {
+				
+				if (!in_array($letter,$activeletters))
+					$activeletters[] = $letter;
+				
+				$method = array();
+				$fields = '';
+				$i = 0;
+				
+				foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+					if (in_array($friend->guid,$subs[$method])) {
+						$checked[$method] = 'checked="checked"';
+					} else {
+						$checked[$method] = '';
+					}
+					if ($i > 0) $fields .= "<td class=\"spacercolumn\">&nbsp;</td>";
+					$fields .= <<< END
+					    <td class="{$method}togglefield">
+					    <a border="0" id="{$method}{$friend->guid}" class="{$method}toggleOff" onclick="adjust{$method}_alt('{$method}{$friend->guid}');">
+					    <input type="checkbox" name="{$method}subscriptions[]" id="{$method}checkbox" onclick="adjust{$method}('{$method}{$friend->guid}');" value="{$friend->guid}" {$checked[$method]} /></a></td>
+END;
+					$i++;
+				}
+?>
+
+  <tr>
+    <td class="namefield"><a href="<?php echo $friend->getURL(); ?>">
+<?php
+	echo elgg_view("profile/icon",array('entity' => $friend, 'size' => 'tiny', 'override' => true));		
+?>
+    </a><p class="namefieldlink"><a href="<?php echo $friend->getURL(); ?>"><?php echo $friend->name ?></p></td>
+    
+<?php echo $fields; ?>
+  
+  <td>&nbsp;</td>
+  </tr>
+
+
+<?php
+			}
+		}
+
+?>
+</table>
+
+<?php
+			}
+
+?>
+			
+				</div>
+			</div>
+<?php			
+			$letpos++;
+			if ($letpos == strlen($chararray)) break;
+			if (is_callable('mb_substr'))
+				$letter = mb_substr($chararray,$letpos,1);
+			else
+				$letter = substr($chararray,$letpos,1);
+		}
+		
+?>
+		</div>		
+	</div>
+	</div>
+	
+<?php
+	} else {
+		echo $vars['replacement']; 
+	}
+	if (!$callback) {
+
+?>
+			
+	</div>
+</div>
+
+
+<?php
+
+	}
+
+?>
+<?php
+	if (!isset($vars['replacement'])) {
+?>
+
+<script type="text/javascript">
+		// initialise picker
+		$("div#friendsPicker<?php echo $friendspicker; ?>").friendsPicker(<?php echo $friendspicker; ?>);
+</script>
+<script>
+	$(document).ready(function () {
+	// manually add class to corresponding tab for panels that have content
+<?php
+	if (sizeof($activeletters) > 0)
+		$chararray = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+		foreach($activeletters as $letter) {
+			$tab = strpos($chararray, $letter) + 1;
+?>
+	$("div#friendsPickerNavigation<?php echo $friendspicker; ?> li.tab<?php echo $tab; ?> a").addClass("tabHasContent");
+<?php
+		}
+
+?>
+	});
+</script>
+
+<?php
+
+	}
+
+?>
+
+
+
+<div class="clearfloat"></div>
+<div class="friendspicker_savebuttons">
+	<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
+<br /></div>	
+	
+	
+	
\ No newline at end of file
diff --git a/mod/notifications/views/default/notifications/subscriptions/groupsform.php b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
new file mode 100644
index 000000000..cf7f44906
--- /dev/null
+++ b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
@@ -0,0 +1,99 @@
+<?php
+
+	global $NOTIFICATION_HANDLERS;
+	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+		$subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => $vars['user']->guid, 'types' => 'group', 'limit' => 99999));
+		$tmparray = array();
+		if ($subsbig[$method]) {
+			foreach($subsbig[$method] as $tmpent) {
+				$tmparray[] = $tmpent->guid;
+			}
+		}
+		$subsbig[$method] = $tmparray;
+	}
+
+?>
+<?php echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings:groups')); ?>
+<div class="contentWrapper">
+	<div class="notification_methods">
+
+		<?php
+			echo elgg_view('notifications/subscriptions/jsfuncs',$vars);
+		?>
+		
+		<p>
+			<?php
+
+				echo elgg_echo('notifications:subscriptions:groups:description');
+			
+			?>
+		</p>
+<?php
+
+		if (isset($vars['groups']) && !empty($vars['groups'])) {
+			
+?>
+<table id="notificationstable" cellspacing="0" cellpadding="4" border="1" width="100%">
+  <tr>
+    <td>&nbsp;</td>
+<?php
+	global $NOTIFICATION_HANDLERS;
+	$i = 0; 
+	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+		if ($i > 0)
+			echo "<td class=\"spacercolumn\">&nbsp;</td>";
+?>
+	<td class="<?php echo $method; ?>togglefield"><?php echo elgg_echo('notification:method:'.$method); ?></td>
+<?php
+		$i++;
+	}
+?>
+    <td>&nbsp;</td>
+  </tr>
+<?php	
+			foreach($vars['groups'] as $group) {
+				
+				$fields = '';
+				$i = 0;
+				
+				foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+					if (in_array($group->guid,$subsbig[$method])) {
+						$checked[$method] = 'checked="checked"';
+					} else {
+						$checked[$method] = '';
+					}
+					if ($i > 0) $fields .= "<td class=\"spacercolumn\">&nbsp;</td>";
+					$fields .= <<< END
+					    <td class="{$method}togglefield">
+					    <a border="0" id="{$method}{$group->guid}" class="{$method}toggleOff" onclick="adjust{$method}_alt('{$method}{$group->guid}');">
+					    <input type="checkbox" name="{$method}subscriptions[]" id="{$method}checkbox" onclick="adjust{$method}('{$method}{$group->guid}');" value="{$group->guid}" {$checked[$method]} /></a></td>
+END;
+					$i++;
+				}
+				
+?>
+	<tr>
+		<td class="namefield">
+	    	<p>
+	    		<?php echo $group->name; ?>
+	    	</p>
+	    </td>
+<?php
+				echo $fields;
+?>
+		<td>&nbsp;</td>
+	</tr>
+<?php
+	
+				
+			}
+?>
+</table>
+<?php
+		}
+
+?>
+
+		<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
+	</div>
+</div>
\ No newline at end of file
diff --git a/mod/notifications/views/default/notifications/subscriptions/jsfuncs.php b/mod/notifications/views/default/notifications/subscriptions/jsfuncs.php
new file mode 100644
index 000000000..da1598dae
--- /dev/null
+++ b/mod/notifications/views/default/notifications/subscriptions/jsfuncs.php
@@ -0,0 +1,54 @@
+<?php
+
+	global $NOTIFICATION_HANDLERS;
+
+?> 
+
+<script type="text/javascript">
+
+$(document).ready(function () {
+<?php 
+	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+?>
+	$('input[type=checkbox]:checked').parent("a.<?php echo $method; ?>toggleOff").each(function(){
+		$(this).removeClass('<?php echo $method; ?>toggleOff').addClass('<?php echo $method; ?>toggleOn');
+	});
+	
+<?php
+	}
+?>
+
+});
+
+	clickflag = 0;
+
+<?php 
+	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+?>
+function adjust<?php echo $method; ?>(linkId) {
+	var obj = $(this).prev("a");
+	
+	if (obj.className == "<?php echo $method; ?>toggleOff") {
+		obj.className = "<?php echo $method; ?>toggleOn";
+	} else {
+		obj.className = "<?php echo $method; ?>toggleOff";
+	}
+	return false;
+}
+function adjust<?php echo $method; ?>_alt(linkId) {
+	var obj = document.getElementById(linkId);
+	
+	if (obj.className == "<?php echo $method; ?>toggleOff") {
+		obj.className = "<?php echo $method; ?>toggleOn";
+		$('#' + linkId).children("input[type='checkbox']").attr('checked', true);
+	} else {
+		obj.className = "<?php echo $method; ?>toggleOff";
+		$('#' + linkId).children("input[type='checkbox']").attr('checked', false);
+	}
+	return false;
+}
+<?php
+	}
+?>
+
+</script>
\ No newline at end of file
diff --git a/mod/notifications/views/default/notifications/subscriptions/personal.php b/mod/notifications/views/default/notifications/subscriptions/personal.php
new file mode 100644
index 000000000..6779fde73
--- /dev/null
+++ b/mod/notifications/views/default/notifications/subscriptions/personal.php
@@ -0,0 +1,63 @@
+<?php
+
+	global $NOTIFICATION_HANDLERS;
+
+?>
+<div class="notification_personal">
+<div class="notification_methods">
+	<h3>
+		<?php echo elgg_echo('notifications:subscriptions:personal:title'); ?>
+	</h3>
+</div>
+<table id="notificationstable" cellspacing="0" cellpadding="4" border="1" width="100%">
+  <tr>
+    <td>&nbsp;</td>
+<?php
+	$i = 0; 
+	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+		if ($i > 0)
+			echo "<td class=\"spacercolumn\">&nbsp;</td>";
+?>
+	<td class="<?php echo $method; ?>togglefield"><?php echo elgg_echo('notification:method:'.$method); ?></td>
+<?php
+		$i++;
+	}
+?>
+    <td>&nbsp;</td>
+  </tr>
+  <tr>
+    <td class="namefield">
+    	<p>
+    		<?php echo elgg_echo('notifications:subscriptions:personal:description') ?>
+    	</p>
+    	
+    </td>
+    
+<?php
+
+		$fields = '';
+		$i = 0;
+		foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+			if ($notification_settings = get_user_notification_settings($vars['user']->guid)) {
+				if ($notification_settings->$method) {
+					$personalchecked[$method] = 'checked="checked"';
+				} else {
+					$personalchecked[$method] = '';
+				}
+			}
+			if ($i > 0) $fields .= "<td class=\"spacercolumn\">&nbsp;</td>";
+			$fields .= <<< END
+			    <td class="{$method}togglefield">
+			    <a  border="0" id="{$method}personal" class="{$method}toggleOff" onclick="adjust{$method}_alt('{$method}personal');">
+			    <input type="checkbox" name="{$method}personal" id="{$method}checkbox" onclick="adjust{$method}('{$method}personal');" value="1" {$personalchecked[$method]} /></a></td>
+END;
+			$i++;
+		}
+		echo $fields;
+
+?>
+  
+    <td>&nbsp;</td>
+  </tr>
+</table>
+</div>
\ No newline at end of file
diff --git a/mod/pages/actions/pages/delete.php b/mod/pages/actions/pages/delete.php
new file mode 100644
index 000000000..740f1f6eb
--- /dev/null
+++ b/mod/pages/actions/pages/delete.php
@@ -0,0 +1,35 @@
+<?php
+
+	$page = get_input('page');
+	
+	if ($page = get_entity($page)) {
+		
+		if ($page->canEdit()) {
+			
+			// Bring all child elements forward
+				$parent = $page->parent_guid;
+				if ($children = elgg_get_entities_from_metadata(array('metadata_name' => 'parent_guid', 'metadata_value' => $page->getGUID()))) {
+					foreach($children as $child) {
+						$child->parent_guid = $parent;
+					}
+				}
+				if ($page->delete()) {
+					system_message(elgg_echo('pages:delete:success'));
+					if ($parent) {
+						if ($parent = get_entity($parent)) {
+							forward($parent->getURL());
+							exit;
+						}
+					}
+					forward('pg/pages/owned/' . $_SESSION['user']->username);
+					exit;
+				}
+			
+		}
+		
+	}
+	
+	register_error(elgg_echo('pages:delete:failure'));
+	forward($_SERVER['HTTP_REFERER']);
+
+?>
\ No newline at end of file
diff --git a/mod/pages/actions/pages/edit.php b/mod/pages/actions/pages/edit.php
new file mode 100644
index 000000000..84aed61d6
--- /dev/null
+++ b/mod/pages/actions/pages/edit.php
@@ -0,0 +1,126 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load configuration
+	global $CONFIG;
+	
+	gatekeeper();
+	set_context('pages');
+	
+	//boolean to select correct add to river. It will be new or edit
+	$which_river = 'new';
+
+	// Get group fields
+	$input = array();
+	foreach($CONFIG->pages as $shortname => $valuetype) {
+		$input[$shortname] = get_input($shortname);
+		if ($valuetype == 'tags')
+			$input[$shortname] = string_to_tag_array($input[$shortname]);
+	}
+	
+	// Get parent
+	$parent_guid = (int)get_input('parent_guid', 0);
+	
+	// New or old?
+	$page = NULL;
+	$pages_guid = (int)get_input('pages_guid');
+	if ($pages_guid)
+	{
+		$page = get_entity($pages_guid);
+		if (!$page->canEdit())
+			$page = NULL; // if we can't edit it, go no further.
+			
+		//select river boolean to edit
+		$which_river = 'edit';
+	}
+	else
+	{
+		$page = new ElggObject();
+		if (!$parent_guid)
+			$page->subtype = 'page_top';
+		else
+			$page->subtype = 'page';
+			
+		// New instance, so set container_guid
+		$container_guid = get_input('container_guid', $_SESSION['user']->getGUID());
+		$page->container_guid = $container_guid;
+	}
+	
+	// Have we got it? Can we edit it?
+	if ($page instanceof ElggObject)
+	{
+		// Yes we have, and yes we can.
+		
+		// Save fields - note we always save latest description as both description and annotation
+		if (sizeof($input) > 0)
+		{
+			foreach($input as $shortname => $value) {
+				if ((!$pages_guid) || (($pages_guid) && ($shortname != 'title')))
+					$page->$shortname = $value;
+			}
+		}
+		
+	
+		// Validate create
+		if (!$page->title)
+		{
+			register_error(elgg_echo("pages:notitle"));
+			
+			forward($_SERVER['HTTP_REFERER']);
+			exit;
+		}
+		
+		// Access ids
+		$page->access_id = (int)get_input('access_id', ACCESS_PRIVATE);
+		
+		// Write access id
+		$page->write_access_id = (int)get_input('write_access_id', ACCESS_PRIVATE);
+		
+		// Set parent
+		$page->parent_guid = $parent_guid;
+		
+		// Ensure ultimate owner
+		$page->owner_guid = ($page->owner_guid ? $page->owner_guid : $_SESSION['user']->guid); 
+		
+		// finally save
+		if ($page->save())
+		{
+			
+			// Now save description as an annotation
+			$page->annotate('page', $page->description, $page->access_id);
+				
+		
+			system_message(elgg_echo("pages:saved"));
+			
+			//add to river
+			if($which_river == 'new')
+				add_to_river('river/object/page/create','create',$_SESSION['user']->guid,$page->guid);
+			else
+				add_to_river('river/object/page/update','update',$_SESSION['user']->guid,$page->guid);
+		
+			// Forward to the user's profile
+			forward($page->getUrl());
+			exit;
+		}
+		else
+			register_error(elgg_echo('pages:notsaved'));
+
+	}
+	else
+	{
+		register_error(elgg_echo("pages:noaccess"));
+	}
+	
+
+	// Forward to the user's profile
+	forward($page->getUrl());
+	exit;
+?>
diff --git a/mod/pages/actions/pages/editwelcome.php b/mod/pages/actions/pages/editwelcome.php
new file mode 100644
index 000000000..85d6e6138
--- /dev/null
+++ b/mod/pages/actions/pages/editwelcome.php
@@ -0,0 +1,77 @@
+<?php
+	/**
+	 * Elgg Pages Edit welcome message
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load configuration
+	global $CONFIG;
+	
+	gatekeeper();
+
+	// Get group fields
+	$message = get_input("pages_welcome");
+	$owner_guid = get_input("owner_guid");
+	$object_guid = get_input("object_guid");
+	$access_id = (int) get_input("access_id");
+	
+	//check to see if this is an edit or new welcome message
+	if($object_guid){
+    	
+    	//it is an edit so grab the object
+    	$welcome = get_entity($object_guid);
+		if ($welcome->getSubtype() == "pages_welcome" && $welcome->canEdit()) {
+    		
+    		$welcome->description = $message;
+    		$welcome->access_id = $access_id; 
+    		$welcome->save();
+    		system_message(elgg_echo("pages:welcomeposted"));
+    		
+		} else {
+    		
+    		register_error(elgg_echo("pages:welcomeerror"));
+    		
+		}
+    	
+    	
+	}else{
+	
+        //it is a new welcome object
+    	if ($owner_guid){
+        	
+    		$welcome = new ElggObject();
+    		// Tell the system it's a pages welcome message
+    		$welcome->subtype = "pages_welcome";
+    		$welcome->title = "Welcome";
+    		$welcome->description = $message;
+    		$welcome->access_id = $access_id;
+    		
+    		// Set the owner
+    		$welcome->owner_guid = $owner_guid;
+    		
+    	    // save
+    		if (!$welcome->save()){
+    			register_error(elgg_echo("pages:welcomeerror"));
+    		} else {
+        		system_message(elgg_echo("pages:welcomeposted"));
+    		}
+    
+    		
+    	} else {
+        	
+        	register_error(elgg_echo("pages:welcomeerror"));
+        	
+    	}
+    	
+	}//end of first if statement
+    	
+	// Forward to the main blog page
+	forward("pg/pages/owned/" . get_user($owner_guid)->username);
+	exit;
+	
+?>
\ No newline at end of file
diff --git a/mod/pages/edit.php b/mod/pages/edit.php
new file mode 100644
index 000000000..085bb8ee7
--- /dev/null
+++ b/mod/pages/edit.php
@@ -0,0 +1,42 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	gatekeeper();
+		
+	$page_guid = get_input('page_guid');
+	$pages = get_entity($page_guid);
+	
+	// Get the current page's owner
+		if ($container = $pages->container_guid) {
+			set_page_owner($container);
+		}
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($page_owner->getGUID());
+		}
+	
+	$title = elgg_echo("pages:edit");
+	$body = elgg_view_title($title);
+	
+	if (($pages) && ($pages->canEdit()))
+	{
+		$body .= elgg_view("forms/pages/edit", array('entity' => $pages));
+			 
+	} else {
+		$body .= elgg_echo("pages:noaccess");
+	}
+	
+	$body = elgg_view_layout('two_column_left_sidebar', '', $body);
+	
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/pages/history.php b/mod/pages/history.php
new file mode 100644
index 000000000..c3bd67154
--- /dev/null
+++ b/mod/pages/history.php
@@ -0,0 +1,52 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	gatekeeper();
+		
+	$page_guid = get_input('page_guid');
+		
+    $pages = get_entity($page_guid);
+	if ($pages->container_guid) {
+		set_page_owner($pages->container_guid);
+	} else {
+		set_page_owner($pages->owner_guid);
+	}
+	
+	if (is_callable('group_gatekeeper')) group_gatekeeper();
+
+	$limit = (int)get_input('limit', 20);
+	$offset = (int)get_input('offset');
+	
+	$page_guid = get_input('page_guid');
+	$pages = get_entity($page_guid);
+	
+	add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
+					 
+	$title = $pages->title . ": " . elgg_echo("pages:history");
+	$area2 = elgg_view_title($title);
+	
+	$context = get_context();
+	
+	set_context('search');
+	
+	$area2 .= list_annotations($page_guid, 'page', $limit, false);
+	
+	set_context($context);
+	
+	
+	pages_set_navigation_parent($pages);
+	$area3 = elgg_view('pages/sidebar/tree');
+	
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2, $area3);
+	
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/pages/images/application.png b/mod/pages/images/application.png
new file mode 100644
index 000000000..1dee9e366
--- /dev/null
+++ b/mod/pages/images/application.png
diff --git a/mod/pages/images/code.png b/mod/pages/images/code.png
new file mode 100644
index 000000000..0c76bd129
--- /dev/null
+++ b/mod/pages/images/code.png
diff --git a/mod/pages/images/css.png b/mod/pages/images/css.png
new file mode 100644
index 000000000..f907e44b3
--- /dev/null
+++ b/mod/pages/images/css.png
diff --git a/mod/pages/images/db.png b/mod/pages/images/db.png
new file mode 100644
index 000000000..bddba1f98
--- /dev/null
+++ b/mod/pages/images/db.png
diff --git a/mod/pages/images/directory.png b/mod/pages/images/directory.png
new file mode 100644
index 000000000..784e8fa48
--- /dev/null
+++ b/mod/pages/images/directory.png
diff --git a/mod/pages/images/doc.png b/mod/pages/images/doc.png
new file mode 100644
index 000000000..ae8ecbf47
--- /dev/null
+++ b/mod/pages/images/doc.png
diff --git a/mod/pages/images/file.gif b/mod/pages/images/file.gif
new file mode 100644
index 000000000..7e6216798
--- /dev/null
+++ b/mod/pages/images/file.gif
diff --git a/mod/pages/images/file.png b/mod/pages/images/file.png
new file mode 100644
index 000000000..8b8b1ca00
--- /dev/null
+++ b/mod/pages/images/file.png
diff --git a/mod/pages/images/film.png b/mod/pages/images/film.png
new file mode 100644
index 000000000..b0ce7bb19
--- /dev/null
+++ b/mod/pages/images/film.png
diff --git a/mod/pages/images/flash.png b/mod/pages/images/flash.png
new file mode 100644
index 000000000..5769120b1
--- /dev/null
+++ b/mod/pages/images/flash.png
diff --git a/mod/pages/images/folder-closed.gif b/mod/pages/images/folder-closed.gif
new file mode 100644
index 000000000..541107888
--- /dev/null
+++ b/mod/pages/images/folder-closed.gif
diff --git a/mod/pages/images/folder.gif b/mod/pages/images/folder.gif
new file mode 100644
index 000000000..2b31631ca
--- /dev/null
+++ b/mod/pages/images/folder.gif
diff --git a/mod/pages/images/folder_open.png b/mod/pages/images/folder_open.png
new file mode 100644
index 000000000..4e3548352
--- /dev/null
+++ b/mod/pages/images/folder_open.png
diff --git a/mod/pages/images/html.png b/mod/pages/images/html.png
new file mode 100644
index 000000000..6ed2490ed
--- /dev/null
+++ b/mod/pages/images/html.png
diff --git a/mod/pages/images/java.png b/mod/pages/images/java.png
new file mode 100644
index 000000000..b7bfcd15f
--- /dev/null
+++ b/mod/pages/images/java.png
diff --git a/mod/pages/images/linux.png b/mod/pages/images/linux.png
new file mode 100644
index 000000000..52699bfee
--- /dev/null
+++ b/mod/pages/images/linux.png
diff --git a/mod/pages/images/minus.gif b/mod/pages/images/minus.gif
new file mode 100644
index 000000000..47fb7b767
--- /dev/null
+++ b/mod/pages/images/minus.gif
diff --git a/mod/pages/images/music.png b/mod/pages/images/music.png
new file mode 100644
index 000000000..a8b3ede3d
--- /dev/null
+++ b/mod/pages/images/music.png
diff --git a/mod/pages/images/pages.gif b/mod/pages/images/pages.gif
new file mode 100644
index 000000000..2e4ee761a
--- /dev/null
+++ b/mod/pages/images/pages.gif
diff --git a/mod/pages/images/pages_lrg.gif b/mod/pages/images/pages_lrg.gif
new file mode 100644
index 000000000..2e41e4739
--- /dev/null
+++ b/mod/pages/images/pages_lrg.gif
diff --git a/mod/pages/images/pdf.png b/mod/pages/images/pdf.png
new file mode 100644
index 000000000..8f8095e46
--- /dev/null
+++ b/mod/pages/images/pdf.png
diff --git a/mod/pages/images/php.png b/mod/pages/images/php.png
new file mode 100644
index 000000000..7868a2594
--- /dev/null
+++ b/mod/pages/images/php.png
diff --git a/mod/pages/images/picture.png b/mod/pages/images/picture.png
new file mode 100644
index 000000000..4a158fef7
--- /dev/null
+++ b/mod/pages/images/picture.png
diff --git a/mod/pages/images/plus.gif b/mod/pages/images/plus.gif
new file mode 100644
index 000000000..690662162
--- /dev/null
+++ b/mod/pages/images/plus.gif
diff --git a/mod/pages/images/ppt.png b/mod/pages/images/ppt.png
new file mode 100644
index 000000000..c4eff0387
--- /dev/null
+++ b/mod/pages/images/ppt.png
diff --git a/mod/pages/images/psd.png b/mod/pages/images/psd.png
new file mode 100644
index 000000000..73c5b3f24
--- /dev/null
+++ b/mod/pages/images/psd.png
diff --git a/mod/pages/images/ruby.png b/mod/pages/images/ruby.png
new file mode 100644
index 000000000..f59b7c436
--- /dev/null
+++ b/mod/pages/images/ruby.png
diff --git a/mod/pages/images/script.png b/mod/pages/images/script.png
new file mode 100644
index 000000000..63fe6ceff
--- /dev/null
+++ b/mod/pages/images/script.png
diff --git a/mod/pages/images/spinner.gif b/mod/pages/images/spinner.gif
new file mode 100644
index 000000000..85b99d46b
--- /dev/null
+++ b/mod/pages/images/spinner.gif
diff --git a/mod/pages/images/treeview-black-line.gif b/mod/pages/images/treeview-black-line.gif
new file mode 100644
index 000000000..e5496877a
--- /dev/null
+++ b/mod/pages/images/treeview-black-line.gif
diff --git a/mod/pages/images/treeview-black.gif b/mod/pages/images/treeview-black.gif
new file mode 100644
index 000000000..d549b9fc5
--- /dev/null
+++ b/mod/pages/images/treeview-black.gif
diff --git a/mod/pages/images/treeview-default-line.gif b/mod/pages/images/treeview-default-line.gif
new file mode 100644
index 000000000..37114d306
--- /dev/null
+++ b/mod/pages/images/treeview-default-line.gif
diff --git a/mod/pages/images/treeview-default.gif b/mod/pages/images/treeview-default.gif
new file mode 100644
index 000000000..a12ac52ff
--- /dev/null
+++ b/mod/pages/images/treeview-default.gif
diff --git a/mod/pages/images/treeview-famfamfam-line.gif b/mod/pages/images/treeview-famfamfam-line.gif
new file mode 100644
index 000000000..6e289cecc
--- /dev/null
+++ b/mod/pages/images/treeview-famfamfam-line.gif
diff --git a/mod/pages/images/treeview-famfamfam.gif b/mod/pages/images/treeview-famfamfam.gif
new file mode 100644
index 000000000..0cb178e89
--- /dev/null
+++ b/mod/pages/images/treeview-famfamfam.gif
diff --git a/mod/pages/images/treeview-gray-line.gif b/mod/pages/images/treeview-gray-line.gif
new file mode 100644
index 000000000..37600447d
--- /dev/null
+++ b/mod/pages/images/treeview-gray-line.gif
diff --git a/mod/pages/images/treeview-gray.gif b/mod/pages/images/treeview-gray.gif
new file mode 100644
index 000000000..cfb8a2f09
--- /dev/null
+++ b/mod/pages/images/treeview-gray.gif
diff --git a/mod/pages/images/treeview-red-line.gif b/mod/pages/images/treeview-red-line.gif
new file mode 100644
index 000000000..df9e749a8
--- /dev/null
+++ b/mod/pages/images/treeview-red-line.gif
diff --git a/mod/pages/images/treeview-red.gif b/mod/pages/images/treeview-red.gif
new file mode 100644
index 000000000..3bbb3a157
--- /dev/null
+++ b/mod/pages/images/treeview-red.gif
diff --git a/mod/pages/images/txt.png b/mod/pages/images/txt.png
new file mode 100644
index 000000000..813f712f7
--- /dev/null
+++ b/mod/pages/images/txt.png
diff --git a/mod/pages/images/xls.png b/mod/pages/images/xls.png
new file mode 100644
index 000000000..b977d7e52
--- /dev/null
+++ b/mod/pages/images/xls.png
diff --git a/mod/pages/images/zip.png b/mod/pages/images/zip.png
new file mode 100644
index 000000000..fd4bbccdf
--- /dev/null
+++ b/mod/pages/images/zip.png
diff --git a/mod/pages/index.php b/mod/pages/index.php
new file mode 100644
index 000000000..0e4601cef
--- /dev/null
+++ b/mod/pages/index.php
@@ -0,0 +1,58 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	global $CONFIG;
+	
+	// Add menus
+	$owner = page_owner_entity();
+	if (!($owner instanceof ElggGroup)) {
+    		add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
+    		add_submenu_item(elgg_echo('pages:all'),$CONFIG->wwwroot."mod/pages/world.php", 'pageslinksgeneral');
+	}
+    if (($owner instanceof ElggEntity) && (can_write_to_container(0,$owner->guid))){
+        add_submenu_item(elgg_echo('pages:new'), $CONFIG->url . "pg/pages/new/?container_guid=" . page_owner(), 'pagesactions');
+        if ($owner instanceof ElggUser) add_submenu_item(elgg_echo('pages:welcome'), $CONFIG->url . "pg/pages/welcome/", 'pagesactions');
+    }
+    
+    if (is_callable('group_gatekeeper')) group_gatekeeper();
+	
+	$limit = get_input("limit", 10);
+	$offset = get_input("offset", 0);
+	
+	if($owner instanceof ElggGroup){
+		$title = sprintf(elgg_echo("pages:group"),$owner->name);
+	}else{
+		$title = sprintf(elgg_echo("pages:user"),$owner->name);
+	}
+
+	
+	// Get objects
+	$context = get_context();
+	
+	set_context('search');
+	
+	$objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => $limit, 'full_view' => FALSE));
+	
+	set_context($context);
+	
+	//get the owners latest welcome message
+	$welcome_message = elgg_get_entities(array('types' => 'object', 'subtypes' => 'pages_welcome', 'owner_guid' => $owner->guid, 'limit' => 1));
+	
+	$body = elgg_view_title($title);
+	$body .= elgg_view("pages/welcome", array('entity' => $welcome_message));
+	$body .= $objects;
+	$body = elgg_view_layout('two_column_left_sidebar', '', $body);
+	
+	// Finally draw the page
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/pages/javascript/jquery.treeview.async.js b/mod/pages/javascript/jquery.treeview.async.js
new file mode 100644
index 000000000..e37f98ee9
--- /dev/null
+++ b/mod/pages/javascript/jquery.treeview.async.js
@@ -0,0 +1,72 @@
+/*
+ * Async Treeview 0.1 - Lazy-loading extension for Treeview
+ * 
+ * http://bassistance.de/jquery-plugins/jquery-plugin-treeview/
+ *
+ * Copyright (c) 2007 Jörn Zaefferer
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ * Revision: $Id$
+ *
+ */
+
+;(function($) {
+
+function load(settings, root, child, container) {
+	$.getJSON(settings.url, {root: root, currentpage: settings.currentpage}, function(response) {
+		function createNode(parent) {
+			var current = $("<li/>").attr("id", this.id || "").html("<span>" + this.text + "</span>").appendTo(parent);
+			if (this.classes) {
+				current.children("span").addClass(this.classes);
+			}
+			if (this.expanded) {
+				current.addClass("open");
+			}
+			if (this.hasChildren || this.children && this.children.length) {
+				var branch = $("<ul/>").appendTo(current);
+				if (this.hasChildren) {
+					current.addClass("hasChildren");
+					createNode.call({
+						text:"placeholder",
+						id:"placeholder",
+						children:[]
+					}, branch);
+				}
+				if (this.children && this.children.length) {
+					$.each(this.children, createNode, [branch])
+				}
+			}
+		}
+		$.each(response, createNode, [child]);
+        $(container).treeview({add: child}, root);
+    });
+}
+
+var proxied = $.fn.treeview;
+$.fn.treeview = function(settings, source) {
+	if (!settings.url) {
+		return proxied.apply(this, arguments);
+	}
+	var container = this;
+	load(settings, source, this, container);
+	var userToggle = settings.toggle;
+	return proxied.call(this, $.extend({}, settings, {
+		collapsed: true,
+		toggle: function() {
+			var $this = $(this);
+			if ($this.hasClass("hasChildren")) {
+				var childList = $this.removeClass("hasChildren").find("ul");
+				childList.empty();
+				load(settings, this.id, childList, container);
+			}
+			if (userToggle) {
+				userToggle.apply(this, arguments);
+			}
+		}
+	}));
+};
+
+})(jQuery);
\ No newline at end of file
diff --git a/mod/pages/javascript/jquery.treeview.js b/mod/pages/javascript/jquery.treeview.js
new file mode 100644
index 000000000..bc5d9e46b
--- /dev/null
+++ b/mod/pages/javascript/jquery.treeview.js
@@ -0,0 +1,251 @@
+/*
+ * Treeview 1.4 - jQuery plugin to hide and show branches of a tree
+ * 
+ * http://bassistance.de/jquery-plugins/jquery-plugin-treeview/
+ * http://docs.jquery.com/Plugins/Treeview
+ *
+ * Copyright (c) 2007 Jörn Zaefferer
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ * Revision: $Id: jquery.treeview.js 4684 2008-02-07 19:08:06Z joern.zaefferer $
+ *
+ */
+
+;(function($) {
+
+	$.extend($.fn, {
+		swapClass: function(c1, c2) {
+			var c1Elements = this.filter('.' + c1);
+			this.filter('.' + c2).removeClass(c2).addClass(c1);
+			c1Elements.removeClass(c1).addClass(c2);
+			return this;
+		},
+		replaceClass: function(c1, c2) {
+			return this.filter('.' + c1).removeClass(c1).addClass(c2).end();
+		},
+		hoverClass: function(className) {
+			className = className || "hover";
+			return this.hover(function() {
+				$(this).addClass(className);
+			}, function() {
+				$(this).removeClass(className);
+			});
+		},
+		heightToggle: function(animated, callback) {
+			animated ?
+				this.animate({ height: "toggle" }, animated, callback) :
+				this.each(function(){
+					jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
+					if(callback)
+						callback.apply(this, arguments);
+				});
+		},
+		heightHide: function(animated, callback) {
+			if (animated) {
+				this.animate({ height: "hide" }, animated, callback);
+			} else {
+				this.hide();
+				if (callback)
+					this.each(callback);				
+			}
+		},
+		prepareBranches: function(settings) {
+			if (!settings.prerendered) {
+				// mark last tree items
+				this.filter(":last-child:not(ul)").addClass(CLASSES.last);
+				// collapse whole tree, or only those marked as closed, anyway except those marked as open
+				this.filter((settings.collapsed ? "" : "." + CLASSES.closed) + ":not(." + CLASSES.open + ")").find(">ul").hide();
+			}
+			// return all items with sublists
+			return this.filter(":has(>ul)");
+		},
+		applyClasses: function(settings, toggler) {
+			this.filter(":has(>ul):not(:has(>a))").find(">span").click(function(event) {
+				toggler.apply($(this).next());
+			}).add( $("a", this) ).hoverClass();
+			
+			if (!settings.prerendered) {
+				// handle closed ones first
+				this.filter(":has(>ul:hidden)")
+						.addClass(CLASSES.expandable)
+						.replaceClass(CLASSES.last, CLASSES.lastExpandable);
+						
+				// handle open ones
+				this.not(":has(>ul:hidden)")
+						.addClass(CLASSES.collapsable)
+						.replaceClass(CLASSES.last, CLASSES.lastCollapsable);
+						
+	            // create hitarea
+				this.prepend("<div class=\"" + CLASSES.hitarea + "\"/>").find("div." + CLASSES.hitarea).each(function() {
+					var classes = "";
+					$.each($(this).parent().attr("class").split(" "), function() {
+						classes += this + "-hitarea ";
+					});
+					$(this).addClass( classes );
+				});
+			}
+			
+			// apply event to hitarea
+			this.find("div." + CLASSES.hitarea).click( toggler );
+		},
+		treeview: function(settings) {
+			
+			settings = $.extend({
+				cookieId: "treeview"
+			}, settings);
+			
+			if (settings.add) {
+				return this.trigger("add", [settings.add]);
+			}
+			
+			if ( settings.toggle ) {
+				var callback = settings.toggle;
+				settings.toggle = function() {
+					return callback.apply($(this).parent()[0], arguments);
+				};
+			}
+		
+			// factory for treecontroller
+			function treeController(tree, control) {
+				// factory for click handlers
+				function handler(filter) {
+					return function() {
+						// reuse toggle event handler, applying the elements to toggle
+						// start searching for all hitareas
+						toggler.apply( $("div." + CLASSES.hitarea, tree).filter(function() {
+							// for plain toggle, no filter is provided, otherwise we need to check the parent element
+							return filter ? $(this).parent("." + filter).length : true;
+						}) );
+						return false;
+					};
+				}
+				// click on first element to collapse tree
+				$("a:eq(0)", control).click( handler(CLASSES.collapsable) );
+				// click on second to expand tree
+				$("a:eq(1)", control).click( handler(CLASSES.expandable) );
+				// click on third to toggle tree
+				$("a:eq(2)", control).click( handler() ); 
+			}
+		
+			// handle toggle event
+			function toggler() {
+				$(this)
+					.parent()
+					// swap classes for hitarea
+					.find(">.hitarea")
+						.swapClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea )
+						.swapClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea )
+					.end()
+					// swap classes for parent li
+					.swapClass( CLASSES.collapsable, CLASSES.expandable )
+					.swapClass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
+					// find child lists
+					.find( ">ul" )
+					// toggle them
+					.heightToggle( settings.animated, settings.toggle );
+				if ( settings.unique ) {
+					$(this).parent()
+						.siblings()
+						// swap classes for hitarea
+						.find(">.hitarea")
+							.replaceClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea )
+							.replaceClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea )
+						.end()
+						.replaceClass( CLASSES.collapsable, CLASSES.expandable )
+						.replaceClass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
+						.find( ">ul" )
+						.heightHide( settings.animated, settings.toggle );
+				}
+			}
+			
+			function serialize() {
+				function binary(arg) {
+					return arg ? 1 : 0;
+				}
+				var data = [];
+				branches.each(function(i, e) {
+					data[i] = $(e).is(":has(>ul:visible)") ? 1 : 0;
+				});
+				$.cookie(settings.cookieId, data.join("") );
+			}
+			
+			function deserialize() {
+				var stored = $.cookie(settings.cookieId);
+				if ( stored ) {
+					var data = stored.split("");
+					branches.each(function(i, e) {
+						$(e).find(">ul")[ parseInt(data[i]) ? "show" : "hide" ]();
+					});
+				}
+			}
+			
+			// add treeview class to activate styles
+			this.addClass("treeview");
+			
+			// prepare branches and find all tree items with child lists
+			var branches = this.find("li").prepareBranches(settings);
+			
+			switch(settings.persist) {
+			case "cookie":
+				var toggleCallback = settings.toggle;
+				settings.toggle = function() {
+					serialize();
+					if (toggleCallback) {
+						toggleCallback.apply(this, arguments);
+					}
+				};
+				deserialize();
+				break;
+			case "location":
+				var current = this.find("a").filter(function() { return this.href.toLowerCase() == location.href.toLowerCase(); });
+				if ( current.length ) {
+					current.addClass("selected").parents("ul, li").add( current.next() ).show();
+				}
+				break;
+			}
+			
+			branches.applyClasses(settings, toggler);
+				
+			// if control option is set, create the treecontroller and show it
+			if ( settings.control ) {
+				treeController(this, settings.control);
+				$(settings.control).show();
+			}
+			
+			return this.bind("add", function(event, branches) {
+				$(branches).prev()
+					.removeClass(CLASSES.last)
+					.removeClass(CLASSES.lastCollapsable)
+					.removeClass(CLASSES.lastExpandable)
+				.find(">.hitarea")
+					.removeClass(CLASSES.lastCollapsableHitarea)
+					.removeClass(CLASSES.lastExpandableHitarea);
+				$(branches).find("li").andSelf().prepareBranches(settings).applyClasses(settings, toggler);
+			});
+		}
+	});
+	
+	// classes used by the plugin
+	// need to be styled via external stylesheet, see first example
+	var CLASSES = $.fn.treeview.classes = {
+		open: "open",
+		closed: "closed",
+		expandable: "expandable",
+		expandableHitarea: "expandable-hitarea",
+		lastExpandableHitarea: "lastExpandable-hitarea",
+		collapsable: "collapsable",
+		collapsableHitarea: "collapsable-hitarea",
+		lastCollapsableHitarea: "lastCollapsable-hitarea",
+		lastCollapsable: "lastCollapsable",
+		lastExpandable: "lastExpandable",
+		last: "last",
+		hitarea: "hitarea"
+	};
+	
+	// provide backwards compability
+	$.fn.Treeview = $.fn.treeview;
+	
+})(jQuery);
\ No newline at end of file
diff --git a/mod/pages/languages/en.php b/mod/pages/languages/en.php
new file mode 100644
index 000000000..d94ca8431
--- /dev/null
+++ b/mod/pages/languages/en.php
@@ -0,0 +1,111 @@
+<?php
+	/**
+	 * Elgg pages plugin language pack
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$english = array(
+	
+		/**
+		 * Menu items and titles
+		 */
+			
+			'pages' => "Pages",
+			'pages:yours' => "Your pages",
+			'pages:user' => "Pages home",
+			'pages:group' => "Group pages",
+			'pages:all' => "All site pages",
+			'pages:new' => "New page",
+			'pages:groupprofile' => "Group pages",
+			'pages:edit' => "Edit this page",
+			'pages:delete' => "Delete this page",
+			'pages:history' => "Page history",
+			'pages:view' => "View page",
+			'pages:welcome' => "Edit welcome message",
+			'pages:welcomemessage' => "Welcome to this Elgg pages plugin. This feature allows you to create pages on any topic and select who can view them and edit them.",
+			'pages:welcomeerror' => "There was a problem saving your welcome message",
+			'pages:welcomeposted' => "Your welcome message has been posted",
+			'pages:navigation' => "Page navigation",
+	        'pages:via' => "via pages",
+			'item:object:page_top' => 'Top-level pages',
+			'item:object:page' => 'Pages',
+			'item:object:pages_welcome' => 'Pages welcome blocks',
+			'pages:nogroup' => 'This group does not have any pages yet',
+			'pages:more' => 'More pages',
+			
+		/**
+		* River
+		**/
+		
+		    'pages:river:annotate' => "a comment on this page",
+		    'pages:river:created' => "%s wrote",
+	        'pages:river:updated' => "%s updated",
+	        'pages:river:posted' => "%s posted",
+			'pages:river:create' => "a new page titled",
+	        'pages:river:update' => "a page titled",
+	        'page:river:annotate' => "a comment on this page",
+	        'page_top:river:annotate' => "a comment on this page",
+	
+		/**
+		 * Form fields
+		 */
+	
+			'pages:title' => 'Pages Title',
+			'pages:description' => 'Your page entry',
+			'pages:tags' => 'Tags',	
+			'pages:access_id' => 'Access',
+			'pages:write_access_id' => 'Write access',
+		
+		/**
+		 * Status and error messages
+		 */
+			'pages:noaccess' => 'No access to page',
+			'pages:cantedit' => 'You can not edit this page',
+			'pages:saved' => 'Pages saved',
+			'pages:notsaved' => 'Page could not be saved',
+			'pages:notitle' => 'You must specify a title for your page.',
+			'pages:delete:success' => 'Your page was successfully deleted.',
+			'pages:delete:failure' => 'The page could not be deleted.',
+	
+		/**
+		 * Page
+		 */
+			'pages:strapline' => 'Last updated %s by %s',
+	
+		/**
+		 * History
+		 */
+			'pages:revision' => 'Revision created %s by %s',
+			
+		/**
+		 * Widget
+		 **/
+		 
+		    'pages:num' => 'Number of pages to display',
+			'pages:widget:description' => "This is a list of your pages.",
+	
+		/**
+		 * Submenu items
+		 */
+			'pages:label:view' => "View page",
+			'pages:label:edit' => "Edit page",
+			'pages:label:history' => "Page history",
+	
+		/**
+		 * Sidebar items
+		 */
+			'pages:sidebar:this' => "This page",
+			'pages:sidebar:children' => "Sub-pages",
+			'pages:sidebar:parent' => "Parent",
+	
+			'pages:newchild' => "Create a sub-page",
+			'pages:backtoparent' => "Back to '%s'",
+	);
+					
+	add_translation("en",$english);
+?>
\ No newline at end of file
diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml
new file mode 100644
index 000000000..7e9b2c5e4
--- /dev/null
+++ b/mod/pages/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="Elgg Pages" />
+	<field key="website" value="http://www.elgg.org" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/pages/new.php b/mod/pages/new.php
new file mode 100644
index 000000000..75ed61732
--- /dev/null
+++ b/mod/pages/new.php
@@ -0,0 +1,44 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	gatekeeper();
+	global $CONFIG;
+	
+	// Get the current page's owner
+		if ($container = (int) get_input('container_guid')) {
+			set_page_owner($container);
+		}
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($page_owner->getGUID());
+		}
+
+	//if it is a sub page, provide a link back to parent
+	if(get_input('parent_guid')){
+	    $parent = get_entity(get_input('parent_guid'));
+	    
+	    // Breadcrumbs
+	    $area2 .= elgg_view('pages/breadcrumbs', array('page_owner' => $page_owner, 'parent' => $parent, 'add' => true));
+    }
+    
+    global $CONFIG;
+	add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
+    
+	$title = elgg_echo("pages:new");
+	$area2 .= elgg_view_title($title);
+	$area2 .= elgg_view("forms/pages/edit");
+	
+	$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+	
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/pages/pagesTree.php b/mod/pages/pagesTree.php
new file mode 100644
index 000000000..b44640d7a
--- /dev/null
+++ b/mod/pages/pagesTree.php
@@ -0,0 +1,14 @@
+<?php
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	
+	if (is_callable('group_gatekeeper')) group_gatekeeper();
+	
+	$page = (int) get_input('root',get_input('source'));
+	
+	if (!$page = get_entity($page)) {
+		exit;
+	}
+	
+	// View tree
+		echo pages_get_entity_sidebar($page, $fulltree);
+?>
\ No newline at end of file
diff --git a/mod/pages/start.php b/mod/pages/start.php
new file mode 100644
index 000000000..a849807e8
--- /dev/null
+++ b/mod/pages/start.php
@@ -0,0 +1,345 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	/**
+	 * Initialise the pages plugin.
+	 *
+	 */
+	function pages_init()
+	{
+		global $CONFIG;
+		
+		// Set up the menu for logged in users
+		if (isloggedin()) 
+		{
+			add_menu(elgg_echo('pages'), $CONFIG->wwwroot . "pg/pages/owned/" . $_SESSION['user']->username,'pages');
+		}
+		else
+		{
+			add_menu(elgg_echo('pages'), $CONFIG->wwwroot . "mod/pages/world.php");
+		}
+		
+		// Extend hover-over menu	
+		elgg_extend_view('profile/menu/links','pages/menu');
+		
+		// Register a page handler, so we can have nice URLs
+		register_page_handler('pages','pages_page_handler');
+		
+		// Register a url handler
+		register_entity_url_handler('pages_url','object', 'page_top');
+		register_entity_url_handler('pages_url','object', 'page');
+		
+		// Register some actions
+		register_action("pages/edit",false, $CONFIG->pluginspath . "pages/actions/pages/edit.php");
+		register_action("pages/editwelcome",false, $CONFIG->pluginspath . "pages/actions/pages/editwelcome.php");
+		register_action("pages/delete",false, $CONFIG->pluginspath . "pages/actions/pages/delete.php");
+		
+		// Extend some views
+		elgg_extend_view('css','pages/css');
+		elgg_extend_view('groups/menu/links', 'pages/menu'); // Add to groups context
+		elgg_extend_view('groups/right_column', 'pages/groupprofile_pages'); // Add to groups context
+		
+		// Register entity type
+		register_entity_type('object','page');
+		register_entity_type('object','page_top');
+		
+		// Register granular notification for this type
+			if (is_callable('register_notification_object')) {
+				register_notification_object('object', 'page', elgg_echo('pages:new'));
+				register_notification_object('object', 'page_top', elgg_echo('pages:new'));
+			}
+
+		// Listen to notification events and supply a more useful message
+			register_plugin_hook('notify:entity:message', 'object', 'page_notify_message');
+			
+		// add the group pages tool option     
+            add_group_tool_option('pages',elgg_echo('groups:enablepages'),true);
+
+		
+		//add a widget
+	    add_widget_type('pages',elgg_echo('pages'),elgg_echo('pages:widget:description'));
+		
+		// For now, we'll hard code the groups profile items as follows:
+		// TODO make this user configurable
+		
+		// Language short codes must be of the form "pages:key"
+		// where key is the array key below
+		$CONFIG->pages = array(
+			'title' => 'text',
+			'description' => 'longtext',
+			'tags' => 'tags',	
+			'access_id' => 'access',
+			'write_access_id' => 'access',
+		);
+	}
+	
+	function pages_url($entity) {
+		
+		global $CONFIG;
+		
+		
+		return $CONFIG->url . "pg/pages/view/{$entity->guid}/";
+		
+	}
+	
+	/**
+	 * Sets up submenus for the pages system.  Triggered on pagesetup.
+	 *
+	 */
+	function pages_submenus() {
+		
+		global $CONFIG;
+		
+		$page_owner = page_owner_entity();
+		
+		// Group submenu option	
+			if ($page_owner instanceof ElggGroup && get_context() == 'groups') {
+    			if($page_owner->pages_enable != "no"){
+				    add_submenu_item(sprintf(elgg_echo("pages:group"),$page_owner->name), $CONFIG->wwwroot . "pg/pages/owned/" . $page_owner->username);
+			    }
+			}
+			
+			
+    }
+	
+	/**
+	 * Pages page handler.
+	 *
+	 * @param array $page
+	 */
+	function pages_page_handler($page)
+	{
+		global $CONFIG;
+		
+		if (isset($page[0]))
+		{
+			// See what context we're using
+			switch($page[0])
+			{
+				case "new" :
+					include($CONFIG->pluginspath . "pages/new.php");
+          		break;
+          		case "welcome" :
+					include($CONFIG->pluginspath . "pages/welcome.php");
+          		break;
+    			case "world":  
+   					include($CONFIG->pluginspath . "pages/world.php");
+          		break;
+    			case "owned" :
+    				// Owned by a user
+    				if (isset($page[1]))
+    					set_input('username',$page[1]);
+    					
+    				include($CONFIG->pluginspath . "pages/index.php");	
+    			break;
+    			case "edit" :
+    				if (isset($page[1]))
+    					set_input('page_guid', $page[1]);
+    					
+    				 $entity = get_entity($page[1]);
+    				 add_submenu_item(elgg_echo('pages:label:view'), $CONFIG->url . "pg/pages/view/{$page[1]}", 'pageslinks');
+    				 // add_submenu_item(elgg_echo('pages:user'), $CONFIG->wwwroot . "pg/pages/owned/" . $_SESSION['user']->username, 'pageslinksgeneral');
+    				 if (($entity) && ($entity->canEdit())) add_submenu_item(elgg_echo('pages:label:edit'), $CONFIG->url . "pg/pages/edit/{$page[1]}", 'pagesactions');
+    				 add_submenu_item(elgg_echo('pages:label:history'), $CONFIG->url . "pg/pages/history/{$page[1]}", 'pageslinks');
+
+    				include($CONFIG->pluginspath . "pages/edit.php");
+    			break;
+    			case "view" :
+    				
+    				if (isset($page[1]))
+    					set_input('page_guid', $page[1]);
+    					
+    				 elgg_extend_view('metatags','pages/metatags');
+    					
+    				 $entity = get_entity($page[1]);
+    				 //add_submenu_item(elgg_echo('pages:label:view'), $CONFIG->url . "pg/pages/view/{$page[1]}", 'pageslinks');
+    				 if (($entity) && ($entity->canEdit())) add_submenu_item(elgg_echo('pages:label:edit'), $CONFIG->url . "pg/pages/edit/{$page[1]}", 'pagesactions');
+    				 add_submenu_item(elgg_echo('pages:label:history'), $CONFIG->url . "pg/pages/history/{$page[1]}", 'pageslinks');
+    					
+    				include($CONFIG->pluginspath . "pages/view.php");
+    			break;   
+    			case "history" :
+    				if (isset($page[1]))
+    					set_input('page_guid', $page[1]);
+    					
+    				 elgg_extend_view('metatags','pages/metatags');
+    					
+    				 $entity = get_entity($page[1]);
+    				 add_submenu_item(elgg_echo('pages:label:view'), $CONFIG->url . "pg/pages/view/{$page[1]}", 'pageslinks');
+    				 if (($entity) && ($entity->canEdit())) add_submenu_item(elgg_echo('pages:label:edit'), $CONFIG->url . "pg/pages/edit/{$page[1]}", 'pagesactions');
+    				 add_submenu_item(elgg_echo('pages:label:history'), $CONFIG->url . "pg/pages/history/{$page[1]}", 'pageslinks');
+    					
+    				include($CONFIG->pluginspath . "pages/history.php");
+    			break; 				
+    			default:
+    				include($CONFIG->pluginspath . "pages/new.php");
+    			break;
+			}
+		}
+		
+	}
+	
+	/**
+	* Returns a more meaningful message
+	*
+	* @param unknown_type $hook
+	* @param unknown_type $entity_type
+	* @param unknown_type $returnvalue
+	* @param unknown_type $params
+	*/
+		function page_notify_message($hook, $entity_type, $returnvalue, $params)
+		{
+			$entity = $params['entity'];
+			$to_entity = $params['to_entity'];
+			$method = $params['method'];
+			if (($entity instanceof ElggEntity) && (($entity->getSubtype() == 'page_top') || ($entity->getSubtype() == 'page')))
+			{
+				$descr = $entity->description;
+				$title = $entity->title;
+				global $CONFIG;
+				$url = $CONFIG->wwwroot . "pg/view/" . $entity->guid;
+				if ($method == 'sms') {
+					$owner = $entity->getOwnerEntity();
+					return $owner->name . ' ' . elgg_echo("pages:via") . ': ' . $url . ' (' . $title . ')';
+				}
+				if ($method == 'email') {
+					$owner = $entity->getOwnerEntity();
+					return $owner->name . ' ' . elgg_echo("pages:via") . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
+				}
+				if ($method == 'web') {
+					$owner = $entity->getOwnerEntity();
+					return $owner->name . ' ' . elgg_echo("pages:via") . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
+				}
+			}
+			return null;
+		}
+
+	
+	/**
+	 * Sets the parent of the current page, for navigation purposes
+	 *
+	 * @param ElggObject $entity
+	 */
+	function pages_set_navigation_parent(ElggObject $entity) {
+		
+		$guid = $entity->getGUID();
+		
+		while ($parent_guid = $entity->parent_guid) {
+			$entity = get_entity($parent_guid);
+			if ($entity) {
+				$guid = $entity->getGUID();
+			}
+		}
+			
+		set_input('treeguid',$guid);
+	}
+	
+	function pages_get_path($guid) {
+		
+		if (!$entity = get_entity($guid)) return array();
+		
+		$path = array($guid);
+		
+		while ($parent_guid = $entity->parent_guid) {
+			$entity = get_entity($parent_guid);
+			if ($entity) {
+				$path[] = $entity->getGUID();
+			}
+		}
+			
+		return $path;
+	}
+	
+	/**
+	 * Return the correct sidebar for a given entity
+	 *
+	 * @param ElggObject $entity
+	 */
+	function pages_get_entity_sidebar(ElggObject $entity, $fulltree = 0)
+	{
+		$body = "";
+		
+		$children = elgg_get_entities_from_metadata(array('metadata_names' => 'parent_guid', 'metadata_values' => $entity->guid, 'limit' => 9999));
+		$body .= elgg_view('pages/sidebar/sidebarthis', array('entity' => $entity, 
+															  'children' => $children,
+															  'fulltree' => $fulltree));
+		//$body = elgg_view('pages/sidebar/wrapper', array('body' => $body));
+			
+		return $body;
+	}
+	
+	/**
+	 * Extend permissions checking to extend can-edit for write users.
+	 *
+	 * @param unknown_type $hook
+	 * @param unknown_type $entity_type
+	 * @param unknown_type $returnvalue
+	 * @param unknown_type $params
+	 */
+	function pages_write_permission_check($hook, $entity_type, $returnvalue, $params)
+	{
+		if ($params['entity']->getSubtype() == 'page'
+			|| $params['entity']->getSubtype() == 'page_top') {
+		
+			$write_permission = $params['entity']->write_access_id;
+			$user = $params['user'];
+
+			if (($write_permission) && ($user))
+			{
+				// $list = get_write_access_array($user->guid);
+				$list = get_access_array($user->guid); // get_access_list($user->guid);
+					
+				if (($write_permission!=0) && (in_array($write_permission,$list)))
+					return true;
+				
+			}
+		}
+	}
+	
+	/**
+	 * Extend container permissions checking to extend can_write_to_container for write users.
+	 *
+	 * @param unknown_type $hook
+	 * @param unknown_type $entity_type
+	 * @param unknown_type $returnvalue
+	 * @param unknown_type $params
+	 */
+	function pages_container_permission_check($hook, $entity_type, $returnvalue, $params) {
+		
+		if (get_context() == "pages") {
+			if (page_owner()) {
+				if (can_write_to_container($_SESSION['user']->guid, page_owner())) return true;
+			}
+			if ($page_guid = get_input('page_guid',0)) {
+				$entity = get_entity($page_guid);
+			} else if ($parent_guid = get_input('parent_guid',0)) {
+				$entity = get_entity($parent_guid);
+			}
+			if ($entity instanceof ElggObject) {
+				if (
+						can_write_to_container($_SESSION['user']->guid, $entity->container_guid)
+						|| in_array($entity->write_access_id,get_access_list())
+					) {
+						return true;
+				}
+			}
+		}
+		
+	}
+	
+	// write permission plugin hooks
+	register_plugin_hook('permissions_check', 'object', 'pages_write_permission_check');
+	register_plugin_hook('container_permissions_check', 'object', 'pages_container_permission_check');
+	
+	// Make sure the pages initialisation function is called on initialisation
+	register_elgg_event_handler('init','system','pages_init');
+	register_elgg_event_handler('pagesetup','system','pages_submenus');
+?>
\ No newline at end of file
diff --git a/mod/pages/view.php b/mod/pages/view.php
new file mode 100644
index 000000000..24552b8c3
--- /dev/null
+++ b/mod/pages/view.php
@@ -0,0 +1,62 @@
+<?php
+	/**
+	 * Elgg Pages
+	 *
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	$page_guid = get_input('page_guid');
+	set_context('pages');
+
+	if (is_callable('group_gatekeeper')) group_gatekeeper();
+
+	$pages = get_entity($page_guid);
+	if (!$pages) forward();
+
+	$container = $pages->container_guid;
+
+	if ($container) {
+		set_page_owner($container);
+	} else {
+		set_page_owner($pages->owner_guid);
+	}
+
+	global $CONFIG;
+	// add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
+
+	if ($pages->canEdit()) {
+		add_submenu_item(elgg_echo('pages:newchild'),"{$CONFIG->wwwroot}pg/pages/new/?parent_guid={$pages->getGUID()}&container_guid=" . page_owner(), 'pagesactions');
+		$delete_url = elgg_add_action_tokens_to_url("{$CONFIG->wwwroot}action/pages/delete?page={$pages->getGUID()}");
+		add_submenu_item(elgg_echo('pages:delete'), $delete_url, 'pagesactions', true);
+	}
+
+	//if the page has a parent, get it
+	if($parent_page = get_entity(get_input("page_guid")))
+		$parent = $parent_page;
+
+	$title = $pages->title;
+
+	// Breadcrumbs
+	$body = elgg_view('pages/breadcrumbs', array('page_owner' => page_owner_entity(), 'parent' => $parent));
+
+	$body .= elgg_view_title($pages->title);
+	$body .= elgg_view_entity($pages, true);
+
+	//add comments
+	$body .= elgg_view_comments($pages);
+
+	pages_set_navigation_parent($pages);
+	$sidebar = elgg_view('pages/sidebar/tree');
+
+	$body = elgg_view_layout('two_column_left_sidebar', '', $body, $sidebar);
+
+	// Finally draw the page
+	page_draw($title, $body);
+
+?>
diff --git a/mod/pages/views/default/annotation/icon.php b/mod/pages/views/default/annotation/icon.php
new file mode 100644
index 000000000..5f943f8ce
--- /dev/null
+++ b/mod/pages/views/default/annotation/icon.php
@@ -0,0 +1,32 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+
+	$annotation = $vars['annotation'];
+	$entity = get_entity($annotation->entity_guid);
+	
+	// Get size
+	if (!in_array($vars['size'],array('small','medium','large','tiny','master','topbar')))
+		$vars['size'] = "medium";
+			
+	// Get any align and js
+	if (!empty($vars['align'])) {
+		$align = " align=\"{$vars['align']}\" ";
+	} else {
+		$align = "";
+	}
+	
+	
+?>
+
+<div class="groupicon">
+<a href="<?php echo $entity->getURL() . "?rev=" . $annotation->id; ?>"><img src="<?php echo $entity->getIcon($vars['size']); ?>" border="0" <?php echo $align; ?> <?php echo $vars['js']; ?> /></a>
+</div>
\ No newline at end of file
diff --git a/mod/pages/views/default/annotation/page.php b/mod/pages/views/default/annotation/page.php
new file mode 100644
index 000000000..27135b30d
--- /dev/null
+++ b/mod/pages/views/default/annotation/page.php
@@ -0,0 +1,40 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$annotation = $vars['annotation'];
+	$entity = get_entity($annotation->entity_guid);
+	
+	$icon = elgg_view(
+		"annotation/icon", array(
+		'annotation' => $vars['annotation'],
+		'size' => 'small',
+	  )
+	);
+	
+	$owner_guid = $annotation->owner_guid;
+	$owner = get_entity($owner_guid);
+			
+	$rev = sprintf(elgg_echo('pages:revision'), 
+		friendly_time($annotation->time_created),
+		
+		"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
+	);
+	
+	$link = $entity->getURL() . "?rev=" . $annotation->id;
+	
+	$info = <<< END
+	
+<div><a href="$link">{$entity->title}</a></div>
+<div>$rev</div>
+END;
+
+	echo elgg_view_listing($icon, $info);
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php
new file mode 100644
index 000000000..2b57fe814
--- /dev/null
+++ b/mod/pages/views/default/forms/pages/edit.php
@@ -0,0 +1,92 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$parent_guid = get_input('parent_guid');
+	$container_guid = get_input('container_guid');
+	if (!$container_guid) $container_guid = page_owner();
+	
+	$new_page = false;
+	if (!$vars['entity']) {
+		$new_page = true;
+		
+		// bootstrap the access permissions in the entity array so we can use defaults
+		if (defined('ACCESS_DEFAULT')) {
+			$vars['entity']->access_id = ACCESS_DEFAULT;
+			$vars['entity']->write_access_id = ACCESS_DEFAULT;
+		} else {
+			$vars['entity']->access_id = 0;
+			$vars['entity']->write_access_id = 0;
+		}
+	}
+?>
+<div class="contentWrapper">
+<form action="<?php echo $vars['url']; ?>action/pages/edit" method="post">
+<?php
+	echo elgg_view('input/securitytoken'); 
+	if (is_array($vars['config']->pages) && sizeof($vars['config']->pages) > 0)
+		foreach($vars['config']->pages as $shortname => $valtype) {
+			
+			$disabled = "";
+			
+			if (!$new_page && ($shortname == 'title'))
+			{
+				$disabled = true;
+			}
+?>
+
+	<p>
+		<label>
+			<?php echo elgg_echo("pages:{$shortname}") ?><br />
+			<?php echo elgg_view("input/{$valtype}",array(
+				'internalname' => $shortname,
+				'value' => $vars['entity']->$shortname,
+				'disabled' => $disabled
+			)); ?>
+		</label>
+	</p>
+
+<?php
+			
+		}
+		$cats = elgg_view('categories',$vars);
+		if (!empty($cats)) {
+			
+?>
+	<p>
+		<?php 
+			echo $cats;
+		?>
+	</p>
+<?php
+			
+		}
+
+?>
+	<p>
+		<?php
+			if (!$new_page)
+			{ 
+			?><input type="hidden" name="pages_guid" value="<?php echo $vars['entity']->getGUID(); ?>" /><?php 
+			}
+		?>
+		<?php
+			if ($container_guid)
+			{
+				?><input type="hidden" name="container_guid" value="<?php echo $container_guid; ?>" /><?php 
+			}
+		?>
+		<input type="hidden" name="parent_guid" value="<?php if (!$new_page) echo $vars['entity']->parent_guid; else echo $parent_guid; ?>" />
+		<input type="hidden" name="owner_guid" value="<?php if (!$new_page) echo $vars['entity']->owner_guid; else echo page_owner(); ?>" />
+		<input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" />
+	</p>
+
+</form>
+</div>
diff --git a/mod/pages/views/default/forms/pages/editwelcome.php b/mod/pages/views/default/forms/pages/editwelcome.php
new file mode 100644
index 000000000..996c3a58a
--- /dev/null
+++ b/mod/pages/views/default/forms/pages/editwelcome.php
@@ -0,0 +1,61 @@
+<?php
+	/**
+	 * Elgg Pages Edit welcome page
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	 //set some variables
+	 if($vars['entity']){
+    	 foreach($vars['entity'] as $welcome){
+    	    $current_message = $welcome->description;
+    	    $object_guid = $welcome->guid;
+    	    $access_id = $welcome->access_id;
+	    }
+	 }else{
+    	 $current_message = '';
+    	 $object_guid = '';
+    	 $access_id = ACCESS_PRIVATE;
+	 }
+	 
+	 $page_owner = $vars['owner']->guid;
+	 
+?>
+<div class="contentWrapper">
+<form action="<?php echo $vars['url']; ?>action/pages/editwelcome" method="post">
+
+    <p class="longtext_editarea">
+		<label>
+			<?php echo elgg_view("input/longtext",array(
+				'internalname' => "pages_welcome",
+				'value' => $current_message,
+				'disabled' => $disabled
+			)); ?>
+		</label>
+	</p>
+	<p>
+		<label>
+			<?php echo elgg_echo('access'); ?><br />
+			<?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => $access_id)); ?>
+		</label>
+	</p>
+	<input type="hidden" name="owner_guid" value="<?php echo $page_owner; ?>" />
+	
+	<?php
+		echo elgg_view('input/securitytoken');
+
+	    //if it is editing, include the object guid
+	    if($object_guid != ''){
+    ?>
+	    <input type="hidden" name="object_guid" value="<?php echo $object_guid; ?>" />
+	<?php
+        }
+    ?>
+    
+	<input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" />
+</form>
+</div>
diff --git a/mod/pages/views/default/icon/object/page/medium.php b/mod/pages/views/default/icon/object/page/medium.php
new file mode 100644
index 000000000..3822ae7a2
--- /dev/null
+++ b/mod/pages/views/default/icon/object/page/medium.php
@@ -0,0 +1,3 @@
+<?php
+	echo $vars['url'] . "mod/pages/images/pages_lrg.gif";
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/icon/object/page/small.php b/mod/pages/views/default/icon/object/page/small.php
new file mode 100644
index 000000000..81d83523f
--- /dev/null
+++ b/mod/pages/views/default/icon/object/page/small.php
@@ -0,0 +1,3 @@
+<?php
+	echo $vars['url'] . "mod/pages/images/pages.gif";
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/icon/object/page_top/medium.php b/mod/pages/views/default/icon/object/page_top/medium.php
new file mode 100644
index 000000000..3822ae7a2
--- /dev/null
+++ b/mod/pages/views/default/icon/object/page_top/medium.php
@@ -0,0 +1,3 @@
+<?php
+	echo $vars['url'] . "mod/pages/images/pages_lrg.gif";
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/icon/object/page_top/small.php b/mod/pages/views/default/icon/object/page_top/small.php
new file mode 100644
index 000000000..81d83523f
--- /dev/null
+++ b/mod/pages/views/default/icon/object/page_top/small.php
@@ -0,0 +1,3 @@
+<?php
+	echo $vars['url'] . "mod/pages/images/pages.gif";
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/object/page.php b/mod/pages/views/default/object/page.php
new file mode 100644
index 000000000..09c1852e1
--- /dev/null
+++ b/mod/pages/views/default/object/page.php
@@ -0,0 +1,21 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	if ($vars['full']) {
+		echo elgg_view("pages/pageprofile",$vars);
+	} else {
+		if (get_input('search_viewtype') == "gallery") {
+			echo elgg_view('pages/pagegallery',$vars); 				
+		} else {
+			echo elgg_view("pages/pagelisting",$vars);
+		}
+	}
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
new file mode 100644
index 000000000..09c1852e1
--- /dev/null
+++ b/mod/pages/views/default/object/page_top.php
@@ -0,0 +1,21 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	if ($vars['full']) {
+		echo elgg_view("pages/pageprofile",$vars);
+	} else {
+		if (get_input('search_viewtype') == "gallery") {
+			echo elgg_view('pages/pagegallery',$vars); 				
+		} else {
+			echo elgg_view("pages/pagelisting",$vars);
+		}
+	}
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/breadcrumbs.php b/mod/pages/views/default/pages/breadcrumbs.php
new file mode 100644
index 000000000..c7e1bfb83
--- /dev/null
+++ b/mod/pages/views/default/pages/breadcrumbs.php
@@ -0,0 +1,28 @@
+<?php
+
+		$page_owner = $vars['page_owner'];
+		$parent = $vars['parent'];
+
+		$breadcrumbs = '';
+	    
+	    $owner_url = $CONFIG->wwwroot . "pg/pages/owned/" . get_entity($page_owner)->username;
+	    echo "<div id=\"pages_breadcrumbs\"><b><a href=\"{$owner_url}\">" . elgg_echo('pages:user') . "</a></b>";
+	    
+	    //see if the new page's parent has a parent
+        $getparent = get_entity($parent->parent_guid);
+        while ($getparent instanceof ElggObject){
+             
+             $breadcrumbs = " &gt; <a href=\"{$getparent->getURL()}\">$getparent->title</a>" . $breadcrumbs;
+             $getparent = get_entity($getparent->parent_guid);
+             
+        }
+        
+        echo $breadcrumbs;
+        //if it is adding a page, make the last page a link, otherwise, don't
+        if($vars['add']){
+	        echo " &gt; <a href=\"{$parent->getURL()}\">$parent->title</a></div>";
+        }else{
+            echo " &gt; $parent->title</div>";
+        }
+
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/css.php b/mod/pages/views/default/pages/css.php
new file mode 100644
index 000000000..c396d45f7
--- /dev/null
+++ b/mod/pages/views/default/pages/css.php
@@ -0,0 +1,146 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+?>
+
+.treeview, .treeview ul { 
+	padding: 0;
+	margin: 0;
+	list-style: none;
+}
+
+.treeview ul {
+	background-color: white;
+	margin-top: 4px;
+}
+
+.treeview .hitarea {
+	background: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-default.gif) -64px -25px no-repeat;
+	height: 16px;
+	width: 16px;
+	margin-left: -16px;
+	float: left;
+	cursor: pointer;
+}
+/* fix for IE6 */
+* html .hitarea {
+	display: inline;
+	float:none;
+}
+
+.treeview li { 
+	margin: 0;
+	padding: 3px 0pt 3px 16px;
+}
+
+.treeview a.selected {
+	background-color: #eee;
+}
+
+#treecontrol { margin: 1em 0; display: none; }
+
+.treeview .hover { color: red; cursor: pointer; }
+
+.treeview li { background: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-default-line.gif) 0 0 no-repeat; }
+.treeview li.collapsable, .treeview li.expandable { background-position: 0 -176px; }
+
+.treeview .expandable-hitarea { background-position: -80px -3px; }
+
+.treeview li.last { background-position: 0 -1766px }
+.treeview li.lastCollapsable, .treeview li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-default.gif); }  
+.treeview li.lastCollapsable { background-position: 0 -111px }
+.treeview li.lastExpandable { background-position: -32px -67px }
+
+.treeview div.lastCollapsable-hitarea, .treeview div.lastExpandable-hitarea { background-position: 0; }
+
+.treeview-red li { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-red-line.gif); }
+.treeview-red .hitarea, .treeview-red li.lastCollapsable, .treeview-red li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-red.gif); } 
+
+.treeview-black li { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-black-line.gif); }
+.treeview-black .hitarea, .treeview-black li.lastCollapsable, .treeview-black li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-black.gif); }  
+
+.treeview-gray li { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-gray-line.gif); }
+.treeview-gray .hitarea, .treeview-gray li.lastCollapsable, .treeview-gray li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-gray.gif); } 
+
+.treeview-famfamfam li { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-famfamfam-line.gif); }
+.treeview-famfamfam .hitarea, .treeview-famfamfam li.lastCollapsable, .treeview-famfamfam li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-famfamfam.gif); } 
+
+
+.filetree li { padding: 3px 0 2px 16px; }
+.filetree span.folder, .filetree span.file { padding: 1px 0 1px 16px; display: block; }
+.filetree span.folder { background: url(<?php echo $vars['url']; ?>mod/pages/images/folder.gif) 0 0 no-repeat; }
+.filetree li.expandable span.folder { background: url(<?php echo $vars['url']; ?>mod/pages/images/folder-closed.gif) 0 0 no-repeat; }
+.filetree span.file { background: url(<?php echo $vars['url']; ?>mod/pages/images/file.gif) 0 0 no-repeat; }
+
+.pagesTreeContainer {
+		margin:0;
+		min-height: 200px;
+}
+
+#pages_page .strapline {
+    text-align:right;
+    border-top:1px solid #efefef;
+    margin:10px 0 10px 0;
+    color:#666666;
+}
+#pages_page .categories {
+    border:none !important;
+    padding:0 !important;
+}
+
+#pages_page .tags {
+    padding:0 0 0 16px;
+    margin:10px 0 4px 0;
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/icon_tag.gif) no-repeat scroll left 2px;
+}
+
+#pages_page img[align="left"] {
+	margin: 10px 20px 10px 0;
+	float:left;
+}
+#pages_page img[align="right"] {
+	margin: 10px 0 10px 10px;
+	float:right;
+}
+
+.pageswelcome p {
+	margin:0 0 5px 0;
+}
+
+#sidebar_page_tree {
+	background:white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+    padding:10px;
+    margin:0 10px 10px 10px;
+}
+#sidebar_page_tree h3 {
+	background: none;
+	border-top: none;
+	border-bottom: 1px solid #cccccc;
+	font-size:1.25em;
+	line-height:1.2em;
+	margin:0 0 5px 0;
+	padding:0 0 5px 5px;
+	color:#0054A7;
+}
+
+/* IE6 */
+* html #pages_welcome_tbl { width:676px !important;}
+
+.pages_widget_singleitem_more {
+	margin:0 10px 0 10px;
+	padding:5px;
+	display:block;
+	background:white;
+   	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;	
+}
+
+
diff --git a/mod/pages/views/default/pages/groupprofile_pages.php b/mod/pages/views/default/pages/groupprofile_pages.php
new file mode 100644
index 000000000..a1da4bd6b
--- /dev/null
+++ b/mod/pages/views/default/pages/groupprofile_pages.php
@@ -0,0 +1,27 @@
+<?php
+ 
+    // pages on the group index page
+
+    //check to make sure this group forum has been activated
+    if($vars['entity']->pages_enable != 'no'){
+
+?>
+
+<div id="group_pages_widget">
+<h2><?php echo elgg_echo("pages:groupprofile"); ?></h2>
+<?php
+
+    $objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => 5, 'full_view' => FALSE));
+	
+    if($objects)
+		echo $objects;
+	else
+		echo "<div class=\"forum_latest\">" . elgg_echo("pages:nogroup") . "</div>";
+	
+?>
+<br class="clearfloat" />
+</div>
+
+<?php
+    }
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/menu.php b/mod/pages/views/default/pages/menu.php
new file mode 100644
index 000000000..7b2df4c90
--- /dev/null
+++ b/mod/pages/views/default/pages/menu.php
@@ -0,0 +1,14 @@
+<?php
+	/**
+	 * Elgg Pages: Add group menu
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+?>
+<p class="user_menu_pages">
+		<a href="<?php echo $vars['url']; ?>pg/pages/owned/<?php echo $vars['entity']->username; ?>"><?php echo elgg_echo("pages"); ?></a>	
+	</p>
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/metatags.php b/mod/pages/views/default/pages/metatags.php
new file mode 100644
index 000000000..82b291e2c
--- /dev/null
+++ b/mod/pages/views/default/pages/metatags.php
@@ -0,0 +1,22 @@
+<?php
+
+		$treeguid = get_input('treeguid');
+		if (empty($treeguid)) {
+			$treeguid = get_input('page_guid');
+		}
+
+?>
+
+		<script type="text/javascript" src="<?php echo $vars['url']; ?>mod/pages/javascript/jquery.treeview.js" ></script>
+		<script type="text/javascript" src="<?php echo $vars['url']; ?>mod/pages/javascript/jquery.treeview.async.js" ></script>
+		<script type="text/javascript">
+			
+			$(document).ready( function() {
+				
+				$("#pagesTree").treeview({
+					url: "<?php echo $vars['url']; ?>mod/pages/pagesTree.php",
+					currentpage: "<?php echo get_input('page_guid'); ?>"
+				}, "<?php echo $treeguid; ?>")
+				
+			});
+		</script>
diff --git a/mod/pages/views/default/pages/pagegallery.php b/mod/pages/views/default/pages/pagegallery.php
new file mode 100644
index 000000000..84d95b53b
--- /dev/null
+++ b/mod/pages/views/default/pages/pagegallery.php
@@ -0,0 +1,37 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$icon = elgg_view(
+			"graphics/icon", array(
+			'entity' => $vars['entity'],
+			'size' => 'medium',
+		  )
+		);
+
+	$info = "<div><p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->title . "</a></b></p></div>";
+
+	
+	$latest = $vars['entity']->getAnnotations('page', 1, 0, 'desc');
+	if ($latest) {
+		$latest = $latest[0];
+	
+		$time_updated = $latest->time_created;
+		$owner_guid = $latest->owner_guid;
+		$owner = get_entity($owner_guid);
+		
+			
+		$info .= "<br /><div>".
+			strip_tags(substr($latest->value, 0, 100))
+		 . "</div>";
+	}
+
+	echo elgg_view_listing($icon, $info);
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/pagelisting.php b/mod/pages/views/default/pages/pagelisting.php
new file mode 100644
index 000000000..806f60c9b
--- /dev/null
+++ b/mod/pages/views/default/pages/pagelisting.php
@@ -0,0 +1,38 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$icon = elgg_view(
+			"graphics/icon", array(
+			'entity' => $vars['entity'],
+			'size' => 'small',
+		  )
+		);
+
+	$info .= "<p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->title . "</a></b></p>";
+
+	
+	$latest = $vars['entity']->getAnnotations('page', 1, 0, 'desc');
+	if ($latest) {
+		$latest = $latest[0];
+	
+		$time_updated = $latest->time_created;
+		$owner_guid = $latest->owner_guid;
+		$owner = get_entity($owner_guid);
+		
+			
+		$info .= "<p class=\"owner_timestamp\">".sprintf(elgg_echo("pages:strapline"),
+						friendly_time($time_updated),
+						"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
+		) . "</p>";
+	}
+	
+	echo elgg_view_listing($icon, $info);
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/pageprofile.php b/mod/pages/views/default/pages/pageprofile.php
new file mode 100644
index 000000000..b879ca7a2
--- /dev/null
+++ b/mod/pages/views/default/pages/pageprofile.php
@@ -0,0 +1,83 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Output body
+	$entity = $vars['entity'];
+	
+	$rev = (int)get_input('rev');
+	
+	if ($rev)
+	{	
+		$latest = get_annotation($rev);	
+	}
+	else
+	{
+		$latest = $entity->getAnnotations('page', 1, 0, 'desc');
+		if ($latest) $latest = $latest[0];
+	}
+	
+?>	
+	<div class="contentWrapper">	
+	<div id="pages_page">
+	
+<?php	
+	if ($entity)
+	{
+		echo elgg_view('output/longtext', array('value' => /*$entity->description*/ $latest->value));
+		
+		$tags = $vars['entity']->tags;
+		if (!empty($tags)) {
+		
+?>
+		<!-- display tags -->
+		<p class="tags">
+			<?php
+
+				echo elgg_view('output/tags', array('tags' => $tags));
+			
+			?>
+		</p>
+		
+<?php
+
+		}
+		$cats = elgg_view('categories/view',$vars);
+		if (!empty($cats)) {
+			
+?>
+		<p class="categories">
+			<?php echo $cats; ?>
+		</p>
+<?php
+			
+		}
+	}
+
+	// last edit & by whome
+?>
+
+	<p class="strapline">
+		<?php
+                
+			$time_updated = $latest->time_created;
+			$owner_guid = $latest->owner_guid;
+			$owner = get_entity($owner_guid);
+		
+			echo sprintf(elgg_echo("pages:strapline"),
+							friendly_time($time_updated),
+							"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
+			);
+		
+		?>
+	</p>
+</div>
+
+</div>
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/sidebar/sidebarthis.php b/mod/pages/views/default/pages/sidebar/sidebarthis.php
new file mode 100644
index 000000000..47a262501
--- /dev/null
+++ b/mod/pages/views/default/pages/sidebar/sidebarthis.php
@@ -0,0 +1,92 @@
+[<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	global $CONFIG;
+	$entity = $vars['entity'];
+	$parent = $vars['entity']->parent_guid;
+	
+	$currentpage = (int) get_input('currentpage');
+	if ($currentpage) {
+		
+		$path = pages_get_path($currentpage);
+		$pathstring = implode(',',$path);
+		
+	} else {
+		$path = array();
+	}
+	
+	function pages_draw_child($childentity, $path) {
+		
+				$child = "\n\t\t{\n";
+				$child .= "\t\t\t\"text\": \"<a href=\\\"{$childentity->getURL()}\\\">" . addslashes($childentity->title) . "</a>\"\n";
+				
+				$extras = "";
+				$haschild = elgg_get_entities_from_metadata(array('metadata_name' => 'parent_guid', 'metadata_value' => $childentity->guid, 'limit' => 9999));
+				if ($haschild) {
+					if (in_array($childentity->guid,$path)) {
+						$extras .= "\t\t\t,\"expanded\": true";
+						$extras .= "\t\t\t,\"children\": [\n";
+						
+						$childstring = "";
+						foreach($haschild as $subchild) {
+							$childstringtemp = pages_draw_child($subchild,$path);
+							if (!empty($childstringtemp)) {
+								if (!empty($childstring)) $childstring .= ", ";
+								$childstring .= $childstringtemp;
+							}
+						}
+						
+						$extras .= $childstring . "\n\t\t\t]\n";
+					} else {
+						$extras .= ",\t\t\t\"id\": \"{$childentity->getGUID()}\",\n\t\t\t\"hasChildren\": true\n";
+					}
+					
+				}				
+				$child .= $extras . "\t\t}"; 
+		return $child;
+	}
+	
+	if (!$parent) {
+		echo "{\n";
+		echo "\t\"text\": \"<a href=\\\"{$vars['entity']->getURL()}\\\">" . addslashes($vars['entity']->title) . "</a>\"\n";
+	}
+	
+		$children = "";
+		$temp = "";
+		if (isset($vars['children']) && is_array($vars['children']) && (!isset($vars['fulltree']) || $vars['fulltree'] == 0)) {
+			if (!$parent) $temp .= "\t" . '"expanded": true,' . "\n";
+			if (!$parent) $temp .= "\t" . '"children": [' . "\n";		
+			foreach($vars['children'] as $child) {
+				$childrentemp = pages_draw_child($child,$path);
+				if (!empty($childrentemp)) {
+					if (!empty($children)) $children .= ", \n";
+					$children .= $childrentemp;
+				}
+				/*
+				 $children .= "\n\t\t{\n";
+				$children .= "\t\t\t\"text\": \"<a href=\\\"{$child->getURL()}\\\">{$child->title}</a>\",\n";
+				
+				$haschild = get_entities_from_metadata('parent_guid',$child->guid,'','',0,10,0,'',0,true);
+				if ($haschild) {
+					$children .= "\t\t\t\"id\": \"{$child->getGUID()}\",\n\t\t\t\"hasChildren\": true\n";
+				}				
+				$children .= "\t\t}";
+				*/ 
+			}
+			if (!empty($temp)) echo ',' . $temp;
+			echo $children;
+			if (!$parent) echo "\t\t" . ']' . "\n";
+		
+		}
+		
+	if (!$parent) echo "}";
+
+?>]
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/sidebar/starter.php b/mod/pages/views/default/pages/sidebar/starter.php
new file mode 100644
index 000000000..4734ca929
--- /dev/null
+++ b/mod/pages/views/default/pages/sidebar/starter.php
@@ -0,0 +1,21 @@
+<?php
+
+	if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) {
+
+?>
+
+<script type="text/javascript">
+			
+			$(document).ready( function() {
+			
+				$("#pagetree<?php echo $vars['entity']->getGUID(); ?>").click();
+			
+			});
+			
+</script>
+
+<?php
+
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/sidebar/tree.php b/mod/pages/views/default/pages/sidebar/tree.php
new file mode 100644
index 000000000..c83e3f682
--- /dev/null
+++ b/mod/pages/views/default/pages/sidebar/tree.php
@@ -0,0 +1,8 @@
+<?php
+
+?>
+<div id="sidebar_page_tree">
+	    <h3><?php echo elgg_echo("pages:navigation"); ?></h3>	
+		<div id="pagesTree" class="pagesTreeContainer"></div>
+</div>
+<br class="clearfloat" />
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/sidebar/wrapper.php b/mod/pages/views/default/pages/sidebar/wrapper.php
new file mode 100644
index 000000000..ed21b4dd6
--- /dev/null
+++ b/mod/pages/views/default/pages/sidebar/wrapper.php
@@ -0,0 +1,7 @@
+<?php
+
+	echo "[";
+	echo $vars['body'];
+	echo "]";
+
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/welcome.php b/mod/pages/views/default/pages/welcome.php
new file mode 100644
index 000000000..deefdba30
--- /dev/null
+++ b/mod/pages/views/default/pages/welcome.php
@@ -0,0 +1,29 @@
+<?php
+
+    /**
+	 * Elgg Pages welcome message
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	 if($vars['entity']){
+    	 
+    	 foreach($vars['entity'] as $welcome){
+    	 
+    	    echo "<div class=\"contentWrapper pageswelcome\">" . $welcome->description . "</div>";
+    	    
+	    }
+    	 
+	 } else {
+
+?>
+
+<div class="contentWrapper pageswelcome"><p><?php elgg_echo('pages:welcomemessage'); ?></p></div>
+    
+<?php
+    }
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/river/object/page/annotate.php b/mod/pages/views/default/river/object/page/annotate.php
new file mode 100644
index 000000000..e26671623
--- /dev/null
+++ b/mod/pages/views/default/river/object/page/annotate.php
@@ -0,0 +1,14 @@
+<?php
+
+	$statement = $vars['statement'];
+	$performed_by = $statement->getSubject();
+	$object = $statement->getObject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("pages:river:posted"),$url) . " ";
+	$string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("pages:river:annotate:create") . "</a> " . $object->title;
+	//$string .= "<div class=\"river_content\">" . $object->title . "</div>";
+
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/pages/views/default/river/object/page/create.php b/mod/pages/views/default/river/object/page/create.php
new file mode 100644
index 000000000..27352cef6
--- /dev/null
+++ b/mod/pages/views/default/river/object/page/create.php
@@ -0,0 +1,22 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	$url = $object->getURL();
+
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$contents = strip_tags($object->description); //strip tags from the contents to stop large images etc blowing out the river view
+	$string = sprintf(elgg_echo("pages:river:created"),$url) . " ";
+	$string .= elgg_echo("pages:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+	$string .= "<div class=\"river_content_display\">";
+	if(strlen($contents) > 200) {
+        	$string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
+    }else{
+	    $string .= $contents;
+    }
+	$string .= "</div>";
+
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/pages/views/default/river/object/page/update.php b/mod/pages/views/default/river/object/page/update.php
new file mode 100644
index 000000000..ff16e0af8
--- /dev/null
+++ b/mod/pages/views/default/river/object/page/update.php
@@ -0,0 +1,14 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	$url = $object->getURL();
+
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("pages:river:updated"),$url) . " ";
+	$string .= elgg_echo("pages:river:update") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+    
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/pages/views/default/river/object/page_top/annotate.php b/mod/pages/views/default/river/object/page_top/annotate.php
new file mode 100644
index 000000000..fea3e570b
--- /dev/null
+++ b/mod/pages/views/default/river/object/page_top/annotate.php
@@ -0,0 +1,14 @@
+<?php
+
+	$statement = $vars['statement'];
+	$performed_by = $statement->getSubject();
+	$object = $statement->getObject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("pages:river:posted"),$url) . " "; 
+	$string .= elgg_echo("pages:river:annotate:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+	//$string .= "<div class=\"river_content\">" . $object->title . "</div>";
+
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/pages/views/default/river/object/page_top/create.php b/mod/pages/views/default/river/object/page_top/create.php
new file mode 100644
index 000000000..5ff28dfaf
--- /dev/null
+++ b/mod/pages/views/default/river/object/page_top/create.php
@@ -0,0 +1,14 @@
+<?php
+
+	$statement = $vars['statement'];
+	$performed_by = $statement->getSubject();
+	$object = $statement->getObject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("pages:river:created"),$url) . " ";
+	$string .= elgg_echo("pages:river:create") . "<a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+	//$string .= "<div class=\"river_content\">Page title: " . $object->title . "</div>";
+
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/pages/views/default/river/object/page_top/update.php b/mod/pages/views/default/river/object/page_top/update.php
new file mode 100644
index 000000000..cf4dfbe7d
--- /dev/null
+++ b/mod/pages/views/default/river/object/page_top/update.php
@@ -0,0 +1,14 @@
+<?php
+
+	$statement = $vars['statement'];
+	$performed_by = $statement->getSubject();
+	$object = $statement->getObject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("pages:river:updated"),$url) . " ";
+    $string .= elgg_echo("pages:river:update") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+	//$string .= "<div class=\"river_content\">Title: " . $object->title . "</div>";
+    
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/pages/views/default/widgets/pages/edit.php b/mod/pages/views/default/widgets/pages/edit.php
new file mode 100644
index 000000000..8fb2511f7
--- /dev/null
+++ b/mod/pages/views/default/widgets/pages/edit.php
@@ -0,0 +1,17 @@
+<?php
+
+    /**
+	 * Elgg pages widget edit
+	 *
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+	<p>
+		<?php echo elgg_echo("pages:num"); ?>
+		<input type="text" name="params[pages_num]" value="<?php echo htmlentities($vars['entity']->pages_num); ?>" />	
+    </p>
\ No newline at end of file
diff --git a/mod/pages/views/default/widgets/pages/view.php b/mod/pages/views/default/widgets/pages/view.php
new file mode 100644
index 000000000..2ca32b284
--- /dev/null
+++ b/mod/pages/views/default/widgets/pages/view.php
@@ -0,0 +1,26 @@
+<style type="text/css">
+#pages_widget .pagination {
+    display:none;
+}
+</style>
+<?php
+
+     /**
+	 * Elgg pages widget edit
+	 *
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+     
+     $num_display = (int) $vars['entity']->pages_num;
+     
+     $pages = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => $num_display, 'full_view' => FALSE));
+	 $pagesurl = $vars['url'] . "pg/pages/owned/" . page_owner_entity()->username;
+     $pages .= "<div class=\"pages_widget_singleitem_more\"><a href=\"{$pagesurl}\">" . elgg_echo('pages:more') . "</a></div>";
+     
+     echo "<div id=\"pages_widget\">" . $pages . "</div>";
+     
+?>
\ No newline at end of file
diff --git a/mod/pages/welcome.php b/mod/pages/welcome.php
new file mode 100644
index 000000000..dfc998f39
--- /dev/null
+++ b/mod/pages/welcome.php
@@ -0,0 +1,39 @@
+<?php
+	/**
+	 * Elgg Pages welcome intro
+	 * The user or group owner can set an introduction to their wiki pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010 - 2009
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	gatekeeper();
+	global $CONFIG;
+	
+	// Get the current page's owner
+		if ($container = (int) get_input('container_guid')) {
+			set_page_owner($container);
+		}
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($page_owner->getGUID());
+		}
+    
+	//get the owners welcome message if it exists
+	$welcome_message = elgg_get_entities(array('types' => 'object', 'subtypes' => 'pages_welcome', 'owner_guid' => $page_owner->getGUID(), 'limit' => 1));
+	global $CONFIG;
+	add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
+    
+	$title = elgg_echo("pages:welcome");
+	$area2 .= elgg_view_title($title);
+	$area2 .= elgg_view("forms/pages/editwelcome", array('entity' => $welcome_message, 'owner' => $page_owner));
+	
+	$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+	
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/pages/world.php b/mod/pages/world.php
new file mode 100644
index 000000000..d47212f27
--- /dev/null
+++ b/mod/pages/world.php
@@ -0,0 +1,54 @@
+<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	global $CONFIG;
+	
+	// Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($_SESSION['guid']);
+		}
+		
+    if (($page_owner instanceof ElggEntity) && ($page_owner->canWriteToContainer())){
+        add_submenu_item(elgg_echo('pages:new'), $CONFIG->url . "pg/pages/new/", 'pagesactions');
+        add_submenu_item(elgg_echo('pages:welcome'), $CONFIG->url . "pg/pages/welcome/", 'pagesactions');
+    }
+    
+    if(isloggedin())
+    	add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
+    
+    add_submenu_item(elgg_echo('pages:all'),$CONFIG->wwwroot."mod/pages/world.php", 'pageslinksgeneral');
+    
+	$limit = get_input("limit", 10);
+	$offset = get_input("offset", 0);
+	
+	$title = sprintf(elgg_echo("pages:all"),page_owner_entity()->name);
+	
+
+	// Get objects
+	$context = get_context();
+	
+	set_context('search');
+	
+	$objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'limit' => $limit, 'full_view' => FALSE));
+	
+	set_context($context);
+	
+	$body = elgg_view_title($title);
+	$body .= $objects;
+	$body = elgg_view_layout('two_column_left_sidebar','',$body);
+	
+	// Finally draw the page
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mod/profile/actions/cropicon.php b/mod/profile/actions/cropicon.php
new file mode 100644
index 000000000..f86799ccf
--- /dev/null
+++ b/mod/profile/actions/cropicon.php
@@ -0,0 +1,80 @@
+<?php
+
+	/**
+	 * Elgg profile plugin upload new user icon action
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	gatekeeper();
+
+	$x1 = (int) get_input('x_1',0);
+	$y1 = (int) get_input('y_1',0);
+	$x2 = (int) get_input('x_2',0);
+	$y2 = (int) get_input('y_2',0);
+	
+	// username is set in form which ensures the page owner is set
+	$user = page_owner_entity();
+	
+	if (!$user || !$user->canEdit()) {
+		register_error(elgg_echo("profile:icon:noaccess"));
+		forward();
+	}
+		
+	$filehandler = new ElggFile();
+	$filehandler->owner_guid = $user->getGUID();
+	$filehandler->setFilename("profile/" . $user->username . "master" . ".jpg");
+	$filename = $filehandler->getFilenameOnFilestore();
+	
+	$topbar = get_resized_image_from_existing_file($filename,16,16, true, $x1, $y1, $x2, $y2);
+	$tiny = get_resized_image_from_existing_file($filename,25,25, true, $x1, $y1, $x2, $y2);
+	$small = get_resized_image_from_existing_file($filename,40,40, true, $x1, $y1, $x2, $y2);
+	$medium = get_resized_image_from_existing_file($filename,100,100, true, $x1, $y1, $x2, $y2);
+	
+	if ($small !== false
+				&& $medium !== false
+				&& $tiny !== false) {
+			
+				$filehandler = new ElggFile();
+				$filehandler->owner_guid = $user->getGUID();
+				$filehandler->setFilename("profile/" .  $user->username . "medium.jpg");
+				$filehandler->open("write");
+				$filehandler->write($medium);
+				$filehandler->close();
+				$filehandler->setFilename("profile/" .  $user->username . "small.jpg");
+				$filehandler->open("write");
+				$filehandler->write($small);
+				$filehandler->close();
+				$filehandler->setFilename("profile/" .  $user->username . "tiny.jpg");
+				$filehandler->open("write");
+				$filehandler->write($tiny);
+				$filehandler->close();
+				$filehandler->setFilename("profile/" .  $user->username . "topbar.jpg");
+				$filehandler->open("write");
+				$filehandler->write($topbar);
+				$filehandler->close();
+				
+				$user->x1 = $x1;
+				$user->x2 = $x2;
+				$user->y1 = $y1;
+				$user->y2 = $y2;
+				
+				 $user->icontime = time();
+				
+				system_message(elgg_echo("profile:icon:uploaded"));
+			
+			} else {
+				register_error(elgg_echo("profile:icon:notfound"));
+			}
+		
+    //forward the user back to the upload page to crop
+    
+    $url = $vars['url'] . "pg/profile/{$user->username}/editicon/";
+		
+	if (isloggedin()) forward($url);
+
+?>
diff --git a/mod/profile/actions/deletedefaultprofileitem.php b/mod/profile/actions/deletedefaultprofileitem.php
new file mode 100644
index 000000000..309816035
--- /dev/null
+++ b/mod/profile/actions/deletedefaultprofileitem.php
@@ -0,0 +1,25 @@
+<?php
+	/**
+	 * Elgg profile plugin edit default profile action removal
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+		
+	global $CONFIG;
+	
+	admin_gatekeeper();
+	
+	$id = (int)get_input('id');
+	
+	if ( ($id) && (set_plugin_setting("admin_defined_profile_$id", '', 'profile')) && 
+			(set_plugin_setting("admin_defined_profile_type_$id", '', 'profile')))
+			system_message(elgg_echo('profile:editdefault:delete:success'));
+		else
+			register_error(elgg_echo('profile:editdefault:delete:fail'));
+	
+	forward($_SERVER['HTTP_REFERER']);
+?>
diff --git a/mod/profile/actions/edit.php b/mod/profile/actions/edit.php
new file mode 100644
index 000000000..bc14cd6e6
--- /dev/null
+++ b/mod/profile/actions/edit.php
@@ -0,0 +1,95 @@
+<?php
+
+	/**
+	 * Elgg profile plugin edit action
+	 *
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load configuration
+		global $CONFIG;
+
+		gatekeeper();
+
+	// Get profile fields
+		$input = array();
+		$accesslevel = get_input('accesslevel');
+		if (!is_array($accesslevel)) $accesslevel = array();
+
+		foreach($CONFIG->profile as $shortname => $valuetype) {
+			// the decoding is a stop gag to prevent &amp;&amp; showing up in profile fields
+			// because it is escaped on both input (get_input()) and output (view:output/text). see #561 and #1405.
+			// must decode in utf8 or string corruption occurs. see #1567.
+			$value = html_entity_decode(get_input($shortname), ENT_COMPAT, 'UTF-8');
+
+			// limit to reasonable sizes.
+			if ($valuetype != 'longtext' && elgg_strlen($value) > 250) {
+				$error = sprintf(elgg_echo('profile:field_too_long'), elgg_echo("profile:{$shortname}"));
+				register_error($error);
+				forward($_SERVER['HTTP_REFERER']);
+			}
+
+			if ($valuetype == 'tags') {
+				$value = string_to_tag_array($value);
+			}
+
+			$input[$shortname] = $value;
+		}
+
+	// Get the page owner to see if the currently logged in user canEdit() the page owner.
+
+		$user = page_owner_entity();
+		if (!$user) {
+			$user = $_SESSION['user'];
+
+			// @todo this doesn't make sense...???
+			set_page_owner($user->getGUID());
+		}
+		if ($user->canEdit()) {
+
+			// Save stuff
+			if (sizeof($input) > 0)
+				foreach($input as $shortname => $value) {
+					//$user->$shortname = $value;
+					remove_metadata($user->guid, $shortname);
+					if (isset($accesslevel[$shortname])) {
+						$access_id = (int) $accesslevel[$shortname];
+					} else {
+						// this should never be executed since the access level should always be set
+						$access_id = ACCESS_PRIVATE;
+					}
+					if (is_array($value)) {
+						$i = 0;
+						foreach($value as $interval) {
+							$i++;
+							if ($i == 1) { $multiple = false; } else { $multiple = true; }
+							create_metadata($user->guid, $shortname, $interval, 'text', $user->guid, $access_id, $multiple);
+						}
+					} else {
+						create_metadata($user->guid, $shortname, $value, 'text', $user->guid, $access_id);
+					}
+				}
+			$user->save();
+
+			// Notify of profile update
+			trigger_elgg_event('profileupdate',$user->type,$user);
+
+			//add to river
+			add_to_river('river/user/default/profileupdate','update',$_SESSION['user']->guid,$_SESSION['user']->guid,get_default_access($_SESSION['user']));
+
+			system_message(elgg_echo("profile:saved"));
+
+			// Forward to the user's profile
+			forward($user->getUrl());
+
+		} else {
+	// If we can't, display an error
+
+			system_message(elgg_echo("profile:noaccess"));
+		}
+
+?>
diff --git a/mod/profile/actions/editdefault.php b/mod/profile/actions/editdefault.php
new file mode 100644
index 000000000..cf662e9b2
--- /dev/null
+++ b/mod/profile/actions/editdefault.php
@@ -0,0 +1,39 @@
+<?php
+
+	/**
+	 * Elgg profile plugin edit default profile action
+	 *
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load configuration
+	global $CONFIG;
+
+	admin_gatekeeper();
+
+	$label = sanitise_string(get_input('label'));
+	$type = sanitise_string(get_input('type'));
+
+	if (($label) && ($type))
+	{
+		$n = 0;
+		while (get_plugin_setting("admin_defined_profile_$n", 'profile')) {$n++;} // find free space
+
+		if ( (set_plugin_setting("admin_defined_profile_$n", $label, 'profile')) &&
+			(set_plugin_setting("admin_defined_profile_type_$n", $type, 'profile'))) {
+				set_plugin_setting('user_defined_fields', TRUE, 'profile');
+				system_message(elgg_echo('profile:editdefault:success'));
+		} else {
+			register_error(elgg_echo('profile:editdefault:fail'));
+		}
+
+	}
+	else
+		register_error(elgg_echo('profile:editdefault:fail'));
+
+	forward($_SERVER['HTTP_REFERER']);
+?>
diff --git a/mod/profile/actions/iconupload.php b/mod/profile/actions/iconupload.php
new file mode 100644
index 000000000..f1d290694
--- /dev/null
+++ b/mod/profile/actions/iconupload.php
@@ -0,0 +1,91 @@
+<?php
+
+	/**
+	 * Elgg profile plugin upload new user icon action
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	gatekeeper();
+	
+	$user = page_owner_entity();
+	if (!$user)
+		$user = $_SESSION['user'];
+		
+	// If we were given a correct icon
+		if (
+				(isloggedin()) &&
+				($user) &&
+				($user->canEdit())
+			) {
+				
+				
+				$topbar = get_resized_image_from_uploaded_file('profileicon',16,16, true);
+				$tiny = get_resized_image_from_uploaded_file('profileicon',25,25, true);
+				$small = get_resized_image_from_uploaded_file('profileicon',40,40, true);
+				$medium = get_resized_image_from_uploaded_file('profileicon',100,100, true);
+				$large = get_resized_image_from_uploaded_file('profileicon',200,200);
+				$master = get_resized_image_from_uploaded_file('profileicon',550,550);
+				
+				if ($small !== false
+					&& $medium !== false
+					&& $large !== false
+					&& $tiny !== false) {
+				
+					$filehandler = new ElggFile();
+					$filehandler->owner_guid = $user->getGUID();
+					$filehandler->setFilename("profile/" . $user->username . "large.jpg");
+					$filehandler->open("write");
+					$filehandler->write($large);
+					$filehandler->close();
+					$filehandler->setFilename("profile/" . $user->username . "medium.jpg");
+					$filehandler->open("write");
+					$filehandler->write($medium);
+					$filehandler->close();
+					$filehandler->setFilename("profile/" . $user->username . "small.jpg");
+					$filehandler->open("write");
+					$filehandler->write($small);
+					$filehandler->close();
+					$filehandler->setFilename("profile/" . $user->username . "tiny.jpg");
+					$filehandler->open("write");
+					$filehandler->write($tiny);
+					$filehandler->close();
+					$filehandler->setFilename("profile/" . $user->username . "topbar.jpg");
+					$filehandler->open("write");
+					$filehandler->write($topbar);
+					$filehandler->close();
+					$filehandler->setFilename("profile/" . $user->username . "master.jpg");
+					$filehandler->open("write");
+                    $filehandler->write($master);
+					$filehandler->close();
+					
+					$user->icontime = time();
+					
+					system_message(elgg_echo("profile:icon:uploaded"));
+					
+					trigger_elgg_event('profileiconupdate',$user->type,$user);
+					
+					//add to river
+					add_to_river('river/user/default/profileiconupdate','update',$user->guid,$user->guid);
+				
+				} else {
+					system_message(elgg_echo("profile:icon:notfound"));					
+				}
+				
+			} else {
+				
+				system_message(elgg_echo("profile:icon:notfound"));
+				
+			}
+			
+	    //forward the user back to the upload page to crop
+	    
+	    $url = "pg/profile/{$user->username}/editicon/";
+			
+		if (isloggedin()) forward($url);
+
+?>
diff --git a/mod/profile/actions/resetdefaultprofile.php b/mod/profile/actions/resetdefaultprofile.php
new file mode 100644
index 000000000..2100c95c2
--- /dev/null
+++ b/mod/profile/actions/resetdefaultprofile.php
@@ -0,0 +1,30 @@
+<?php
+	/**
+	 * Elgg profile plugin edit default profile action
+	 *
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load configuration
+	global $CONFIG;
+
+	admin_gatekeeper();
+
+	$n = 0;
+	while (get_plugin_setting("admin_defined_profile_$n", 'profile')) {
+		set_plugin_setting("admin_defined_profile_$n", '', 'profile');
+		set_plugin_setting("admin_defined_profile_type_$n", '', 'profile');
+
+		$n++;
+	}
+
+	set_plugin_setting('user_defined_fields', FALSE, 'profile');
+
+	system_message(elgg_echo('profile:defaultprofile:reset'));
+
+	forward($_SERVER['HTTP_REFERER']);
+?>
diff --git a/mod/profile/defaultprofile.php b/mod/profile/defaultprofile.php
new file mode 100644
index 000000000..9272a7363
--- /dev/null
+++ b/mod/profile/defaultprofile.php
@@ -0,0 +1,55 @@
+<?php
+	/**
+	 * Elgg profile index
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	admin_gatekeeper();
+	set_context('admin');
+	
+	$title = elgg_view_title(elgg_echo('profile:edit:default'));
+	$form = elgg_view('profile/editdefaultprofile');
+	
+	
+	set_context('search');
+	
+	
+	// List form elements
+	$n = 0;
+	$loaded_defaults = array();
+	$listing .= "<div class=\"contentWrapper\">";
+	while ($translation = get_plugin_setting("admin_defined_profile_$n", 'profile'))
+	{
+		$type = get_plugin_setting("admin_defined_profile_type_$n", 'profile');
+		$listing .= elgg_view("profile/", array('value' => $translation));	
+		
+		$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';					
+	
+		$listing .= "<p class=\"{$even_odd}\"><b>$translation: </b>";
+		$listing .= elgg_view("output/{$type}",array('value' => " [$type]"));
+		$listing .= "</p>";
+		
+		$n++;
+	}
+	$listing .= "</div>";
+	
+	$listing .= "<div class=\"contentWrapper resetdefaultprofile\">" . elgg_view('input/form', 
+		array(
+			'body' => elgg_view('input/submit', array('value' => elgg_echo('profile:resetdefault'))), 
+			'action' => $CONFIG->wwwroot . 'action/profile/editdefault/reset'
+		)
+	) . "</div>";
+	
+	set_context('admin');
+	
+	
+	page_draw(elgg_echo('profile:edit:default'),elgg_view_layout("two_column_left_sidebar", '', $title . $form . $listing));
+	
+?>
diff --git a/mod/profile/edit.php b/mod/profile/edit.php
new file mode 100644
index 000000000..a11faf4f6
--- /dev/null
+++ b/mod/profile/edit.php
@@ -0,0 +1,44 @@
+<?php
+
+	/**
+	 * Elgg profile editor
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Get the Elgg engine
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	// If we're not logged on, forward the user elsewhere
+	if (!isloggedin()) {
+		forward();
+	}
+	
+	// Get owner of profile - set in page handler
+	$user = page_owner_entity();
+	if (!$user) {
+		register_error(elgg_echo("profile:notfound"));
+		forward();
+	}
+
+	// check if logged in user can edit this profile
+	if (!$user->canEdit()) {
+		register_error(elgg_echo("profile:noaccess"));
+		forward();
+	}
+	
+	// Get edit form
+	$area2 = elgg_view_title(elgg_echo('profile:edit'));
+	$area2 .= elgg_view("profile/edit",array('entity' => $user)); 
+	
+	$area1 = "";
+	
+	// get the required canvas area
+	$body = elgg_view_layout("two_column_left_sidebar", $area1, $area2);
+	
+	// Draw the page
+	page_draw(elgg_echo("profile:edit"),$body);
diff --git a/mod/profile/editicon.php b/mod/profile/editicon.php
new file mode 100644
index 000000000..97df6d56e
--- /dev/null
+++ b/mod/profile/editicon.php
@@ -0,0 +1,42 @@
+<?php
+
+	/**
+	 * Elgg upload new profile icon
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load the Elgg framework
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	
+	// Make sure we're logged in
+	if (!isloggedin()) {
+		forward();
+	}
+
+	// Get owner of profile - set in page handler
+	$user = page_owner_entity();
+	if (!$user) {
+		register_error(elgg_echo("profile:notfound"));
+		forward();
+	}
+
+	// check if logged in user can edit this profile icon
+	if (!$user->canEdit()) {
+		register_error(elgg_echo("profile:icon:noaccess"));
+		forward();
+	}
+	
+	// set title
+	$area2 = elgg_view_title(elgg_echo('profile:createicon:header'));
+	$area2 .= elgg_view("profile/editicon", array('user' => $user));
+	
+	// Get the form and correct canvas area
+	$body = elgg_view_layout("two_column_left_sidebar", '', $area2);
+	
+	// Draw the page
+	page_draw(elgg_echo("profile:editicon"), $body);
diff --git a/mod/profile/graphics/defaultlarge.gif b/mod/profile/graphics/defaultlarge.gif
new file mode 100644
index 000000000..6ea3bd4cd
--- /dev/null
+++ b/mod/profile/graphics/defaultlarge.gif
diff --git a/mod/profile/graphics/defaultmaster.gif b/mod/profile/graphics/defaultmaster.gif
new file mode 100644
index 000000000..5bfd67a2d
--- /dev/null
+++ b/mod/profile/graphics/defaultmaster.gif
diff --git a/mod/profile/graphics/defaultmedium.gif b/mod/profile/graphics/defaultmedium.gif
new file mode 100644
index 000000000..c6b2e6a6d
--- /dev/null
+++ b/mod/profile/graphics/defaultmedium.gif
diff --git a/mod/profile/graphics/defaultsmall.gif b/mod/profile/graphics/defaultsmall.gif
new file mode 100644
index 000000000..661d72f04
--- /dev/null
+++ b/mod/profile/graphics/defaultsmall.gif
diff --git a/mod/profile/graphics/defaulttiny.gif b/mod/profile/graphics/defaulttiny.gif
new file mode 100644
index 000000000..1775346bc
--- /dev/null
+++ b/mod/profile/graphics/defaulttiny.gif
diff --git a/mod/profile/graphics/defaulttopbar.gif b/mod/profile/graphics/defaulttopbar.gif
new file mode 100644
index 000000000..c3616aeb5
--- /dev/null
+++ b/mod/profile/graphics/defaulttopbar.gif
diff --git a/mod/profile/icon.php b/mod/profile/icon.php
new file mode 100644
index 000000000..802cc3756
--- /dev/null
+++ b/mod/profile/icon.php
@@ -0,0 +1,58 @@
+<?php
+
+	/**
+	 * Elgg profile icon
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load the Elgg framework
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	// Get the owning user
+
+		$user = page_owner_entity(); // page_owner_entity();
+		$username = $user->username;
+		
+	// Get the size
+		$size = strtolower(get_input('size'));
+		if (!in_array($size,array('large','medium','small','tiny','master','topbar')))
+			$size = "medium";
+		
+	// Try and get the icon
+	
+		$filehandler = new ElggFile();
+		$filehandler->owner_guid = $user->getGUID();
+		$filehandler->setFilename("profile/" . $username . $size . ".jpg");
+		
+		$success = false;
+		if ($filehandler->open("read")) {
+			if ($contents = $filehandler->read($filehandler->size())) {
+				$success = true;
+			} 
+		}
+		
+		if (!$success) {
+			
+			global $CONFIG;
+			$path = elgg_view('icon/user/default/'.$size);
+			header("Location: {$path}");
+			exit;
+			//$contents = @file_get_contents($CONFIG-pluginspath . "profile/graphics/default{$size}.jpg");
+			
+		}
+		
+		header("Content-type: image/jpeg");
+		header('Expires: ' . date('r',time() + 864000));
+		header("Pragma: public");
+		header("Cache-Control: public");
+		header("Content-Length: " . strlen($contents));
+		$splitString = str_split($contents, 1024);
+		foreach($splitString as $chunk)
+			echo $chunk;
+
+?>
\ No newline at end of file
diff --git a/mod/profile/icondirect.php b/mod/profile/icondirect.php
new file mode 100644
index 000000000..ec4227217
--- /dev/null
+++ b/mod/profile/icondirect.php
@@ -0,0 +1,136 @@
+<?php
+
+	/**
+	 * Elgg profile icon
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Get DB settings, connect
+		require_once(dirname(dirname(dirname(__FILE__))). '/engine/settings.php');
+
+		/**
+		 * UTF safe str_split.
+		 * This is only used here since we don't have access to the file store code.
+		 * TODO: This is a horrible hack, so clean this up!
+		 */
+		function __id_mb_str_split($string, $charset = 'UTF8')
+		{
+			if (is_callable('mb_substr'))
+			{
+				$length = mb_strlen($string);
+				$array = array();
+				
+				while ($length)
+				{
+					$array[] = mb_substr($string, 0, 1, $charset);
+					$string = mb_substr($string, 1, $length, $charset);
+					
+					$length = mb_strlen($string);
+				}
+				
+				return $array;
+			}
+			else
+				return str_split($string);
+			
+			return false;
+		}
+		
+		global $CONFIG;
+			
+		$contents = '';
+		
+		if ($mysql_dblink = @mysql_connect($CONFIG->dbhost,$CONFIG->dbuser,$CONFIG->dbpass, true)) {
+
+			
+			$username = $_GET['username'];
+			//$username = preg_replace('/[^A-Za-z0-9\_\-]/i','',$username);
+			$blacklist = '/[' .
+			'\x{0080}-\x{009f}' . # iso-8859-1 control chars
+			'\x{00a0}' .          # non-breaking space
+			'\x{2000}-\x{200f}' . # various whitespace
+			'\x{2028}-\x{202f}' . # breaks and control chars
+			'\x{3000}' .          # ideographic space
+			'\x{e000}-\x{f8ff}' . # private use
+			']/u';
+			if (
+				preg_match($blacklist, $username) ||	
+
+				(strpos($username, '/')!==false) ||
+				(strpos($username, '\\')!==false) ||
+				(strpos($username, '"')!==false) ||
+				(strpos($username, '\'')!==false) ||
+				(strpos($username, '*')!==false) ||
+				(strpos($username, '&')!==false) ||
+				(strpos($username, ' ')!==false)
+			) exit;
+			
+			$userarray = __id_mb_str_split($username);
+				
+			$matrix = '';
+			$length = 5;
+			if (sizeof($userarray) < $length) $length = sizeof($userarray);
+			for ($n = 0; $n < $length; $n++) {
+				$matrix .= $userarray[$n] . "/";
+			}	
+		
+		// Get the size
+			$size = strtolower($_GET['size']);
+			if (!in_array($size,array('large','medium','small','tiny','master','topbar')))
+				$size = "medium";
+			
+		// Try and get the icon
+			if (@mysql_select_db($CONFIG->dbname,$mysql_dblink)) {
+				// get dataroot and simplecache_enabled in one select for efficiency
+				if ($result = mysql_query("select name, value from {$CONFIG->dbprefix}datalists where name in ('dataroot','simplecache_enabled')",$mysql_dblink)) {
+					$simplecache_enabled = true;
+					$row = mysql_fetch_object($result);
+					while ($row) {
+						if ($row->name == 'dataroot') {
+							$dataroot = $row->value;
+						} else if ($row->name == 'simplecache_enabled') {
+							$simplecache_enabled = $row->value;
+						}
+						$row = mysql_fetch_object($result);
+					}
+				}
+			}
+		}
+		//@todo forcing through the framework to ensure the matrix
+		// is created the same way.
+		//if ($simplecache_enabled) {
+		if (false) {
+			$filename = $dataroot . $matrix . "{$username}/profile/" . $username . $size . ".jpg";
+			$contents = @file_get_contents($filename);
+			if (empty($contents)) {			
+				global $viewinput;
+				$viewinput['view'] = 'icon/user/default/'.$size;
+				ob_start();
+				include(dirname(dirname(dirname(__FILE__))).'/simplecache/view.php');
+				$loc = ob_get_clean();
+				header('Location: ' . $loc);
+				exit;
+				//$contents = @file_get_contents(dirname(__FILE__) . "/graphics/default{$size}.jpg");
+			}	else {		
+				header("Content-type: image/jpeg");
+				header('Expires: ' . date('r',time() + 864000));
+				header("Pragma: public");
+				header("Cache-Control: public");
+				header("Content-Length: " . strlen($contents));
+				$splitString = str_split($contents, 1024);
+				foreach($splitString as $chunk)
+					echo $chunk;
+			}
+		} else {
+				mysql_close($mysql_dblink);
+				require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+				set_input('username',$username);
+				set_input('size',$size);
+				require_once(dirname(__FILE__).'/icon.php');
+		}
+?>
diff --git a/mod/profile/index.php b/mod/profile/index.php
new file mode 100644
index 000000000..ae67dd566
--- /dev/null
+++ b/mod/profile/index.php
@@ -0,0 +1,41 @@
+<?php
+
+	/**
+	 * Elgg profile index
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Get the Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	// Get the username
+		$username = get_input('username');
+		
+		$body = "";
+		
+	// Try and get the user from the username and set the page body accordingly
+		if ($user = get_user_by_username($username)) {
+			
+			if ($user->isBanned() && !isadminloggedin()) {
+				forward(); exit;
+			}
+			$body = elgg_view_entity($user,true);
+			$title = $user->name;
+
+			$body = elgg_view_layout('widgets',$body);
+			
+		} else {
+			
+			$body = elgg_echo("profile:notfound");
+			$title = elgg_echo("profile");
+			
+		}
+
+		page_draw($title, $body);
+		
+?>
\ No newline at end of file
diff --git a/mod/profile/javascript.php b/mod/profile/javascript.php
new file mode 100644
index 000000000..c2c9f8217
--- /dev/null
+++ b/mod/profile/javascript.php
@@ -0,0 +1,22 @@
+<?php
+
+	/**
+	 * Elgg profile JS
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Get engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+		header("Content-type: text/javascript");
+		header('Expires: ' . date('r',time() + 864000));
+		header("Pragma: public");
+		header("Cache-Control: public");
+		echo elgg_view('profile/javascript');
+
+?>
\ No newline at end of file
diff --git a/mod/profile/languages/en.php b/mod/profile/languages/en.php
new file mode 100644
index 000000000..7a9ec3f9d
--- /dev/null
+++ b/mod/profile/languages/en.php
@@ -0,0 +1,93 @@
+<?php
+	/**
+	 * Elgg profile plugin language pack
+	 *
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$english = array(
+
+	/**
+	 * Profile
+	 */
+
+		'profile' => "Profile",
+		'profile:edit:default' => 'Replace profile fields',
+		'profile:preview' => 'Preview',
+
+	/**
+	 * Profile menu items and titles
+	 */
+
+		'profile:yours' => "Your profile",
+		'profile:user' => "%s's profile",
+
+		'profile:edit' => "Edit profile",
+		'profile:profilepictureinstructions' => "The profile picture is the image that's displayed on your profile page. <br /> You can change it as often as you'd like. (File formats accepted: GIF, JPG or PNG)",
+		'profile:icon' => "Profile picture",
+		'profile:createicon' => "Create your avatar",
+		'profile:currentavatar' => "Current avatar",
+		'profile:createicon:header' => "Profile picture",
+		'profile:profilepicturecroppingtool' => "Profile picture cropping tool",
+		'profile:createicon:instructions' => "Click and drag a square below to match how you want your picture cropped.  A preview of your cropped picture will appear in the box on the right.  When you are happy with the preview, click 'Create your avatar'. This cropped image will be used throughout the site as your avatar. ",
+
+		'profile:editdetails' => "Edit details",
+		'profile:editicon' => "Edit profile icon",
+
+		'profile:aboutme' => "About me",
+		'profile:description' => "About me",
+		'profile:briefdescription' => "Brief description",
+		'profile:location' => "Location",
+		'profile:skills' => "Skills",
+		'profile:interests' => "Interests",
+		'profile:contactemail' => "Contact email",
+		'profile:phone' => "Telephone",
+		'profile:mobile' => "Mobile phone",
+		'profile:website' => "Website",
+
+		'profile:banned' => 'This user account has been suspended.',
+		'profile:deleteduser' => 'Deleted user',
+
+		'profile:river:update' => "%s updated their profile",
+		'profile:river:iconupdate' => "%s updated their profile icon",
+
+		'profile:label' => "Profile label",
+		'profile:type' => "Profile type",
+
+		'profile:editdefault:fail' => 'Default profile could not be saved',
+		'profile:editdefault:success' => 'Item successfully added to default profile',
+
+
+		'profile:editdefault:delete:fail' => 'Removed default profile item field failed',
+		'profile:editdefault:delete:success' => 'Default profile item deleted!',
+
+		'profile:defaultprofile:reset' => 'Default system profile reset',
+
+		'profile:resetdefault' => 'Reset default profile',
+		'profile:explainchangefields' => 'You can replace the existing profile fields with your own using the form below. First you give the new profile field a label, for example, \'Favourite team\'. Next you need to select the field type, for example, tags, url, text and so on. At any time you can revert back to the default profile set up.',
+
+
+	/**
+	 * Profile status messages
+	 */
+
+		'profile:saved' => "Your profile was successfully saved.",
+		'profile:icon:uploaded' => "Your profile picture was successfully uploaded.",
+
+	/**
+	 * Profile error messages
+	 */
+
+		'profile:noaccess' => "You do not have permission to edit this profile.",
+		'profile:notfound' => "Sorry, we could not find the specified profile.",
+		'profile:icon:notfound' => "Sorry, there was a problem uploading your profile picture.",
+		'profile:icon:noaccess' => 'You cannot change this profile icon',
+		'profile:field_too_long' => 'Cannot save your profile information because the "%s" section is too long.',
+
+	);
+
+	add_translation("en",$english);
\ No newline at end of file
diff --git a/mod/profile/manifest.xml b/mod/profile/manifest.xml
new file mode 100644
index 000000000..2f53eae0d
--- /dev/null
+++ b/mod/profile/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider ltd" />
+        <field key="version" value="1.7" />
+        <field key="description" value="Elgg profile plugin." />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+		<field key="licence" value="GNU Public License version 2" />
+		<field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/profile/start.php b/mod/profile/start.php
new file mode 100644
index 000000000..168d0b013
--- /dev/null
+++ b/mod/profile/start.php
@@ -0,0 +1,319 @@
+<?php
+
+	/**
+	 * Elgg profile plugin
+	 *
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	/**
+	 * Profile init function; sets up the profile functions
+	 *
+	 */
+		function profile_init() {
+
+			// Get config
+				global $CONFIG;
+
+			// Register a URL handler for users - this means that profile_url()
+			// will dictate the URL for all ElggUser objects
+				register_entity_url_handler('profile_url','user','all');
+
+			// Metadata on users needs to be independent
+				register_metadata_as_independent('user');
+
+				elgg_view_register_simplecache('icon/user/default/tiny');
+				elgg_view_register_simplecache('icon/user/default/topbar');
+				elgg_view_register_simplecache('icon/user/default/small');
+				elgg_view_register_simplecache('icon/user/default/medium');
+				elgg_view_register_simplecache('icon/user/default/large');
+				elgg_view_register_simplecache('icon/user/default/master');
+
+			// For now, we'll hard code the profile items as follows:
+			// TODO make this user configurable
+
+
+
+				/*$CONFIG->profile = array(
+
+					// Language short codes must be of the form "profile:key"
+					// where key is the array key below
+					'description' => 'longtext',
+					'briefdescription' => 'text',
+					'location' => 'tags',
+					'interests' => 'tags',
+					'skills' => 'tags',
+					'contactemail' => 'email',
+					'phone' => 'text',
+					'mobile' => 'text',
+					'website' => 'url',
+
+				);*/
+
+			// Register a page handler, so we can have nice URLs
+				register_page_handler('profile','profile_page_handler');
+				register_page_handler('defaultprofile','profileedit_page_handler');
+				register_page_handler('icon','profile_icon_handler');
+				register_page_handler('iconjs','profile_iconjs_handler');
+
+			// Add Javascript reference to the page header
+				elgg_extend_view('metatags','profile/metatags');
+				elgg_extend_view('css','profile/css');
+				elgg_extend_view('js/initialise_elgg','profile/javascript');
+				if (get_context() == "profile") {
+					elgg_extend_view('canvas_header/submenu','profile/submenu');
+				}
+
+
+
+			// Extend context menu with admin links
+			if (isadminloggedin())
+			{
+					elgg_extend_view('profile/menu/links','profile/menu/adminwrapper',10000);
+			}
+
+			// Now override icons
+			register_plugin_hook('entity:icon:url', 'user', 'profile_usericon_hook');
+
+		}
+
+	/**
+	 * This function loads a set of default fields into the profile, then triggers a hook letting other plugins to edit
+	 * add and delete fields.
+	 *
+	 * Note: This is a secondary system:init call and is run at a super low priority to guarantee that it is called after all
+	 * other plugins have initialised.
+	 */
+		function profile_fields_setup()
+		{
+			global $CONFIG;
+
+			$profile_defaults = array (
+				'description' => 'longtext',
+				'briefdescription' => 'text',
+				'location' => 'tags',
+				'interests' => 'tags',
+				'skills' => 'tags',
+				'contactemail' => 'email',
+				'phone' => 'text',
+				'mobile' => 'text',
+				'website' => 'url',
+			);
+
+			// TODO: Have an admin interface for this
+
+			$n = 0;
+			$loaded_defaults = array();
+			while ($translation = get_plugin_setting("admin_defined_profile_$n", 'profile'))
+			{
+				// Add a translation
+				add_translation(get_current_language(), array("profile:admin_defined_profile_$n" => $translation));
+
+				// Detect type
+				$type = get_plugin_setting("admin_defined_profile_type_$n", 'profile');
+				if (!$type) $type = 'text';
+
+				// Set array
+				$loaded_defaults["admin_defined_profile_$n"] = $type;
+
+				$n++;
+			}
+			if (count($loaded_defaults)) {
+				$CONFIG->profile_using_custom = true;
+				$profile_defaults = $loaded_defaults;
+			}
+
+			$CONFIG->profile = trigger_plugin_hook('profile:fields', 'profile', NULL, $profile_defaults);
+
+			// register any tag metadata names
+			foreach ($CONFIG->profile as $name => $type) {
+				if ($type == 'tags') {
+					elgg_register_tag_metadata_name($name);
+					// register a tag name translation
+					add_translation(get_current_language(), array("tag_names:$name" => elgg_echo("profile:$name")));
+				}
+			}
+		}
+
+	/**
+	 * Profile page handler
+	 *
+	 * @param array $page Array of page elements, forwarded by the page handling mechanism
+	 */
+		function profile_page_handler($page) {
+
+			global $CONFIG;
+
+			// The username should be the file we're getting
+			if (isset($page[0])) {
+				set_input('username',$page[0]);
+			}
+			// Any sub pages?
+			if (isset($page[1])) {
+
+				switch ($page[1])
+				{
+					case 'edit' : include($CONFIG->pluginspath . "profile/edit.php"); break;
+					case 'editicon' : include($CONFIG->pluginspath . "profile/editicon.php"); break;
+
+				}
+			}
+			else
+			{
+				// Include the standard profile index
+				include($CONFIG->pluginspath . "profile/index.php");
+			}
+		}
+
+	/**
+	 * Profile edit page handler
+	 *
+	 * @param array $page Array of page elements, forwarded by the page handling mechanism
+	 */
+		function profileedit_page_handler($page) {
+
+			global $CONFIG;
+
+			// The username should be the file we're getting
+			if (isset($page[0])) {
+				switch ($page[0])
+				{
+					default: include($CONFIG->pluginspath . "profile/defaultprofile.php");
+				}
+			}
+
+		}
+
+	/**
+	 * Pagesetup function
+	 *
+	 */
+		function profile_pagesetup()
+		{
+			global $CONFIG;
+			if (get_context() == 'admin' && isadminloggedin()) {
+
+				add_submenu_item(elgg_echo('profile:edit:default'), $CONFIG->wwwroot . 'pg/defaultprofile/edit/');
+			}
+
+			//add submenu options
+			if (get_context() == "profile") {
+				$page_owner = page_owner_entity();
+
+				add_submenu_item(elgg_echo('profile:editdetails'), $CONFIG->wwwroot . "pg/profile/{$page_owner->username}/edit/");
+				add_submenu_item(elgg_echo('profile:editicon'), $CONFIG->wwwroot . "pg/profile/{$page_owner->username}/editicon/");
+			}
+		}
+
+	/**
+	 * Profile icon page handler
+	 *
+	 * @param array $page Array of page elements, forwarded by the page handling mechanism
+	 */
+		function profile_icon_handler($page) {
+
+			global $CONFIG;
+
+			// The username should be the file we're getting
+			if (isset($page[0])) {
+				set_input('username',$page[0]);
+			}
+			if (isset($page[1])) {
+				set_input('size',$page[1]);
+			}
+			// Include the standard profile index
+			include($CONFIG->pluginspath . "profile/icon.php");
+
+		}
+
+	/**
+	 * Icon JS
+	 */
+		function profile_iconjs_handler($page) {
+
+			global $CONFIG;
+
+			include($CONFIG->pluginspath . "profile/javascript.php");
+
+		}
+
+	/**
+	 * Profile URL generator for $user->getUrl();
+	 *
+	 * @param ElggUser $user
+	 * @return string User URL
+	 */
+		function profile_url($user) {
+			global $CONFIG;
+			return $CONFIG->wwwroot . "pg/profile/" . $user->username;
+		}
+
+	/**
+	 * This hooks into the getIcon API and provides nice user icons for users where possible.
+	 *
+	 * @param unknown_type $hook
+	 * @param unknown_type $entity_type
+	 * @param unknown_type $returnvalue
+	 * @param unknown_type $params
+	 * @return unknown
+	 */
+		function profile_usericon_hook($hook, $entity_type, $returnvalue, $params)
+		{
+			global $CONFIG;
+
+			if ((!$returnvalue) && ($hook == 'entity:icon:url') && ($params['entity'] instanceof ElggUser))
+			{
+
+				$entity = $params['entity'];
+				$type = $entity->type;
+				$subtype = get_subtype_from_id($entity->subtype);
+				$viewtype = $params['viewtype'];
+				$size = $params['size'];
+				$username = $entity->username;
+
+				if ($icontime = $entity->icontime) {
+					$icontime = "{$icontime}";
+				} else {
+					$icontime = "default";
+				}
+
+				if ($entity->isBanned()) {
+					return elgg_view('icon/user/default/'.$size);
+				}
+
+				$filehandler = new ElggFile();
+				$filehandler->owner_guid = $entity->getGUID();
+				$filehandler->setFilename("profile/" . $username . $size . ".jpg");
+
+				if ($filehandler->exists()) {
+					//$url = $CONFIG->url . "pg/icon/$username/$size/$icontime.jpg";
+					return $CONFIG->wwwroot . 'mod/profile/icondirect.php?lastcache='.$icontime.'&amp;username='.$entity->username.'&amp;size='.$size;
+				}
+			}
+		}
+
+	// Make sure the profile initialisation function is called on initialisation
+		register_elgg_event_handler('init','system','profile_init',1);
+		register_elgg_event_handler('init','system','profile_fields_setup', 10000); // Ensure this runs after other plugins
+
+		register_elgg_event_handler('pagesetup','system','profile_pagesetup');
+		register_elgg_event_handler('profileupdate','all','object_notifications');
+
+
+	// Register actions
+		global $CONFIG;
+		register_action("profile/edit",false,$CONFIG->pluginspath . "profile/actions/edit.php");
+		register_action("profile/iconupload",false,$CONFIG->pluginspath . "profile/actions/iconupload.php");
+		register_action("profile/cropicon",false,$CONFIG->pluginspath . "profile/actions/cropicon.php");
+		register_action("profile/editdefault",false,$CONFIG->pluginspath . "profile/actions/editdefault.php", true);
+		register_action("profile/editdefault/delete",false,$CONFIG->pluginspath . "profile/actions/deletedefaultprofileitem.php", true);
+		register_action("profile/editdefault/reset",false,$CONFIG->pluginspath . "profile/actions/resetdefaultprofile.php", true);
+
+
+	// Define widgets for use in this context
+		use_widgets('profile');
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/icon/user/default/large.php b/mod/profile/views/default/icon/user/default/large.php
new file mode 100644
index 000000000..3ce382532
--- /dev/null
+++ b/mod/profile/views/default/icon/user/default/large.php
@@ -0,0 +1,3 @@
+<?php
+	echo $vars['url'] . "mod/profile/graphics/defaultlarge.gif";
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/icon/user/default/master.php b/mod/profile/views/default/icon/user/default/master.php
new file mode 100644
index 000000000..7c5ea847c
--- /dev/null
+++ b/mod/profile/views/default/icon/user/default/master.php
@@ -0,0 +1,3 @@
+<?php
+	echo $vars['url'] . "mod/profile/graphics/defaultmaster.gif";
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/icon/user/default/medium.php b/mod/profile/views/default/icon/user/default/medium.php
new file mode 100644
index 000000000..d5f6db343
--- /dev/null
+++ b/mod/profile/views/default/icon/user/default/medium.php
@@ -0,0 +1,3 @@
+<?php
+	echo $vars['url'] . "mod/profile/graphics/defaultmedium.gif";
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/icon/user/default/small.php b/mod/profile/views/default/icon/user/default/small.php
new file mode 100644
index 000000000..55f113c41
--- /dev/null
+++ b/mod/profile/views/default/icon/user/default/small.php
@@ -0,0 +1,3 @@
+<?php
+	echo $vars['url'] . "mod/profile/graphics/defaultsmall.gif";
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/icon/user/default/tiny.php b/mod/profile/views/default/icon/user/default/tiny.php
new file mode 100644
index 000000000..e47cdd3da
--- /dev/null
+++ b/mod/profile/views/default/icon/user/default/tiny.php
@@ -0,0 +1,3 @@
+<?php
+	echo $vars['url'] . "mod/profile/graphics/defaulttiny.gif";
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/icon/user/default/topbar.php b/mod/profile/views/default/icon/user/default/topbar.php
new file mode 100644
index 000000000..ad11588fa
--- /dev/null
+++ b/mod/profile/views/default/icon/user/default/topbar.php
@@ -0,0 +1,3 @@
+<?php
+	echo $vars['url'] . "mod/profile/graphics/defaulttopbar.gif";
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/js/jquery.imgareaselect-0.8.js b/mod/profile/views/default/js/jquery.imgareaselect-0.8.js
new file mode 100644
index 000000000..456114755
--- /dev/null
+++ b/mod/profile/views/default/js/jquery.imgareaselect-0.8.js
@@ -0,0 +1,635 @@
+/*
+ * imgAreaSelect jQuery plugin
+ * version 0.8
+ *
+ * Copyright (c) 2008-2009 Michal Wojciechowski (odyniec.net)
+ *
+ * Dual licensed under the MIT (MIT-LICENSE.txt) 
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://odyniec.net/projects/imgareaselect/
+ *
+ */
+
+(function($) {
+
+$.imgAreaSelect = { onKeyPress: null };
+
+$.imgAreaSelect.init = function (img, options) {
+    var $img = $(img), imgLoaded, $box = $('<div />'), $area = $('<div />'),
+        $border1 = $('<div />'), $border2 = $('<div />'), $areaOpera,
+        $outLeft = $('<div />'), $outTop = $('<div />'),
+        $outRight = $('<div />'), $outBottom = $('<div />'),
+        $handles = $([]), handleWidth, handles = [ ], left, top, M = Math,
+        imgOfs, imgWidth, imgHeight, $parent, parOfs,
+        zIndex = 0, position = 'absolute', $p, startX, startY,
+        scaleX = 1, scaleY = 1, resizeMargin = 10, resize = [ ], V = 0, H = 1,
+        d, aspectRatio, x1, x2, y1, y2, x, y, adjusted, shown, i,
+        selection = { x1: 0, y1: 0, x2: 0, y2: 0, width: 0, height: 0 };
+
+    var $o = $outLeft.add($outTop).add($outRight).add($outBottom);
+
+    function viewX(x)
+    {
+        return x + imgOfs.left - parOfs.left;
+    }
+
+    function viewY(y)
+    {
+        return y + imgOfs.top - parOfs.top;
+    }
+
+    function selX(x)
+    {
+        return x - imgOfs.left + parOfs.left;
+    }
+
+    function selY(y)
+    {
+        return y - imgOfs.top + parOfs.top;
+    }
+
+    function evX(event)
+    {
+        return event.pageX - parOfs.left;
+    }
+
+    function evY(event)
+    {
+        return event.pageY - parOfs.top;
+    }
+
+    function trueSelection()
+    {
+        return { x1: M.round(selection.x1 * scaleX),
+            y1: M.round(selection.y1 * scaleY),
+            x2: M.round(selection.x2 * scaleX),
+            y2: M.round(selection.y2 * scaleY),
+            width: M.round(selection.x2 * scaleX) - M.round(selection.x1 * scaleX),
+            height: M.round(selection.y2 * scaleY) - M.round(selection.y1 * scaleY) };
+    }
+
+    function getZIndex()
+    {
+        $p = $img;
+
+        while ($p.length && !$p.is('body')) {
+            if (!isNaN($p.css('z-index')) && $p.css('z-index') > zIndex)
+                zIndex = $p.css('z-index');
+            if ($p.css('position') == 'fixed')
+                position = 'fixed';
+
+            $p = $p.parent();
+        }
+
+        if (!isNaN(options.zIndex))
+            zIndex = options.zIndex;
+    }
+
+    function adjust()
+    {
+        imgOfs = { left: M.round($img.offset().left), top: M.round($img.offset().top) };
+        imgWidth = $img.width();
+        imgHeight = $img.height();
+
+        if ($().jquery == '1.3.2' && $.browser.safari && position == 'fixed') {
+            imgOfs.top += M.max(document.documentElement.scrollTop, $('body').scrollTop()); 
+            imgOfs.left += M.max(document.documentElement.scrollLeft, $('body').scrollLeft());
+        }
+
+        parOfs = $.inArray($parent.css('position'), ['absolute', 'relative']) != -1 ? 
+            { left: M.round($parent.offset().left) - $parent.scrollLeft(),
+                top: M.round($parent.offset().top) - $parent.scrollTop() } :
+            position == 'fixed' ?
+                { left: $(document).scrollLeft(), top: $(document).scrollTop() } :
+                { left: 0, top: 0 };
+
+        left = viewX(0);
+        top = viewY(0);
+    }
+
+    function update(resetKeyPress)
+    {
+        if (!shown) return;
+
+        $box.css({
+            left: viewX(selection.x1) + 'px', top: viewY(selection.y1) + 'px',
+            width: selection.width + 'px', height: selection.height + 'px'
+        });
+        $area.add($border1).add($border2).css({
+            left: '0px', top: '0px',
+            width: M.max(selection.width - options.borderWidth * 2, 0) + 'px',
+            height: M.max(selection.height - options.borderWidth * 2, 0) + 'px'
+        });
+        $border1.css({ borderStyle: 'solid', borderColor: options.borderColor1 });
+        $border2.css({ borderStyle: 'dashed', borderColor: options.borderColor2 });
+        $border1.add($border2).css({ opacity: options.borderOpacity });
+        $outLeft.css({ left: left + 'px', top: top + 'px',
+            width: selection.x1 + 'px', height: imgHeight + 'px' });
+        $outTop.css({ left: left + selection.x1 + 'px', top: top + 'px',
+            width: selection.width + 'px', height: selection.y1 + 'px' });
+        $outRight.css({ left: left + selection.x2 + 'px', top: top + 'px',
+            width: imgWidth - selection.x2 + 'px', height: imgHeight + 'px' });
+        $outBottom.css({ left: left + selection.x1 + 'px', top: top + selection.y2 + 'px',
+            width: selection.width + 'px', height: imgHeight - selection.y2 + 'px' });
+
+        if (handles.length) {
+            handles[1].css({ left: selection.width - handleWidth + 'px' });
+            handles[2].css({ left: selection.width - handleWidth + 'px',
+                top: selection.height - handleWidth + 'px' });
+            handles[3].css({ top: selection.height - handleWidth + 'px' });
+
+            if (handles.length == 8) {
+                handles[4].css({ left: (selection.width - handleWidth) / 2 + 'px' });
+                handles[5].css({ left: selection.width - handleWidth + 'px',
+                    top: (selection.height - handleWidth) / 2 + 'px' });
+                handles[6].css({ left: (selection.width - handleWidth) / 2 + 'px',
+                    top: selection.height - handleWidth + 'px' });
+                handles[7].css({ top: (selection.height - handleWidth) / 2 + 'px' });
+            }
+        }
+
+        if (resetKeyPress !== false) {
+            if ($.imgAreaSelect.keyPress != docKeyPress)
+                $(document).unbind($.imgAreaSelect.keyPress,
+                    $.imgAreaSelect.onKeyPress);
+
+            if (options.keys)
+                $(document).bind($.imgAreaSelect.keyPress,
+                    $.imgAreaSelect.onKeyPress = docKeyPress);
+        }
+
+        if ($.browser.msie && options.borderWidth == 1 && options.borderOpacity < 1) {
+            $border1.add($border2).css('margin', '0');
+            setTimeout(function () { $border1.add($border2).css('margin', 'auto'); }, 0);
+        }
+    }
+
+    function areaMouseMove(event)
+    {
+        if (!adjusted) {
+            adjust();
+            adjusted = true;
+
+            $box.one('mouseout', function () { adjusted = false; });
+        }
+
+        x = selX(evX(event)) - selection.x1;
+        y = selY(evY(event)) - selection.y1;
+
+        resize = [ ];
+
+        if (options.resizable) {
+            if (y <= resizeMargin)
+                resize[V] = 'n';
+            else if (y >= selection.height - resizeMargin)
+                resize[V] = 's';
+            if (x <= resizeMargin)
+                resize[H] = 'w';
+            else if (x >= selection.width - resizeMargin)
+                resize[H] = 'e';
+        }
+
+        $box.css('cursor', resize.length ? resize.join('') + '-resize' :
+            options.movable ? 'move' : '');
+        if ($areaOpera)
+            $areaOpera.toggle();
+    }
+
+    function docMouseUp(event)
+    {
+        resize = [ ];
+
+        $('body').css('cursor', '');
+
+        if (options.autoHide || selection.width * selection.height == 0)
+            $box.add($o).hide();
+
+        options.onSelectEnd(img, trueSelection());
+
+        $(document).unbind('mousemove', selectingMouseMove);
+        $box.mousemove(areaMouseMove);
+    }
+
+    function areaMouseDown(event)
+    {
+        if (event.which != 1) return false;
+
+        adjust();
+
+        if (options.resizable && resize.length > 0) {
+            $('body').css('cursor', resize.join('') + '-resize');
+
+            x1 = viewX(selection[resize[H] == 'w' ? 'x2' : 'x1']);
+            y1 = viewY(selection[resize[V] == 'n' ? 'y2' : 'y1']);
+
+            $(document).mousemove(selectingMouseMove)
+                .one('mouseup', docMouseUp);
+            $box.unbind('mousemove', areaMouseMove);
+        }
+        else if (options.movable) {
+            startX = left + selection.x1 - evX(event);
+            startY = top + selection.y1 - evY(event);
+
+            $box.unbind('mousemove', areaMouseMove);
+
+            $(document).mousemove(movingMouseMove)
+                .one('mouseup', function () {
+                    options.onSelectEnd(img, trueSelection());
+
+                    $(document).unbind('mousemove', movingMouseMove);
+                    $box.mousemove(areaMouseMove);
+                });
+        }
+        else
+            $img.mousedown(event);
+
+        return false;
+    }
+
+    function aspectRatioXY()
+    {
+        x2 = M.max(left, M.min(left + imgWidth,
+            x1 + M.abs(y2 - y1) * aspectRatio * (x2 < x1 ? -1 : 1)));
+        y2 = M.round(M.max(top, M.min(top + imgHeight,
+            y1 + M.abs(x2 - x1) / aspectRatio * (y2 < y1 ? -1 : 1))));
+        x2 = M.round(x2);
+    }
+
+    function aspectRatioYX()
+    {
+        y2 = M.max(top, M.min(top + imgHeight,
+            y1 + M.abs(x2 - x1) / aspectRatio * (y2 < y1 ? -1 : 1)));
+        x2 = M.round(M.max(left, M.min(left + imgWidth,
+            x1 + M.abs(y2 - y1) * aspectRatio * (x2 < x1 ? -1 : 1))));
+        y2 = M.round(y2);
+    }
+
+    function doResize()
+    {
+        if (options.minWidth && M.abs(x2 - x1) < options.minWidth) {
+            x2 = x1 - options.minWidth * (x2 < x1 ? 1 : -1);
+
+            if (x2 < left)
+                x1 = left + options.minWidth;
+            else if (x2 > left + imgWidth)
+                x1 = left + imgWidth - options.minWidth;
+        }
+
+        if (options.minHeight && M.abs(y2 - y1) < options.minHeight) {
+            y2 = y1 - options.minHeight * (y2 < y1 ? 1 : -1);
+
+            if (y2 < top)
+                y1 = top + options.minHeight;
+            else if (y2 > top + imgHeight)
+                y1 = top + imgHeight - options.minHeight;
+        }
+
+        x2 = M.max(left, M.min(x2, left + imgWidth));
+        y2 = M.max(top, M.min(y2, top + imgHeight));
+
+        if (aspectRatio)
+            if (M.abs(x2 - x1) / aspectRatio > M.abs(y2 - y1))
+                aspectRatioYX();
+            else
+                aspectRatioXY();
+
+        if (options.maxWidth && M.abs(x2 - x1) > options.maxWidth) {
+            x2 = x1 - options.maxWidth * (x2 < x1 ? 1 : -1);
+            if (aspectRatio) aspectRatioYX();
+        }
+
+        if (options.maxHeight && M.abs(y2 - y1) > options.maxHeight) {
+            y2 = y1 - options.maxHeight * (y2 < y1 ? 1 : -1);
+            if (aspectRatio) aspectRatioXY();
+        }
+
+        selection = { x1: selX(M.min(x1, x2)), x2: selX(M.max(x1, x2)),
+            y1: selY(M.min(y1, y2)), y2: selY(M.max(y1, y2)),
+            width: M.abs(x2 - x1), height: M.abs(y2 - y1) };
+
+        update();
+
+        options.onSelectChange(img, trueSelection());
+    }
+
+    function selectingMouseMove(event)
+    {
+        x2 = !resize.length || resize[H] || aspectRatio ? evX(event) : viewX(selection.x2);
+        y2 = !resize.length || resize[V] || aspectRatio ? evY(event) : viewY(selection.y2);
+
+        doResize();
+
+        return false;        
+    }
+
+    function doMove(newX1, newY1)
+    {
+        x2 = (x1 = newX1) + selection.width;
+        y2 = (y1 = newY1) + selection.height;
+
+        selection = $.extend(selection, { x1: selX(x1), y1: selY(y1),
+            x2: selX(x2), y2: selY(y2) });
+
+        update();
+
+        options.onSelectChange(img, trueSelection());
+    }
+
+    function movingMouseMove(event)
+    {
+        x1 = M.max(left, M.min(startX + evX(event), left + imgWidth - selection.width));
+        y1 = M.max(top, M.min(startY + evY(event), top + imgHeight - selection.height));
+
+        doMove(x1, y1);
+
+        event.preventDefault();     
+        return false;
+    }
+
+    function startSelection(event)
+    {
+        adjust();
+
+        x2 = x1;
+        y2 = y1;       
+        doResize();
+
+        resize = [ ];
+
+        $box.add($o.is(':visible') ? null : $o).show();
+        shown = true;
+
+        $(document).unbind('mouseup', cancelSelection)
+            .mousemove(selectingMouseMove).one('mouseup', docMouseUp);
+        $box.unbind('mousemove', areaMouseMove);
+
+        options.onSelectStart(img, trueSelection());
+    }
+
+    function cancelSelection()
+    {
+        $(document).unbind('mousemove', startSelection);
+        $box.add($o).hide();
+
+        selection = { x1: 0, y1: 0, x2: 0, y2: 0, width: 0, height: 0 };
+
+        options.onSelectChange(img, selection);
+        options.onSelectEnd(img, selection);
+    }
+
+    function imgMouseDown(event)
+    {
+        if (event.which != 1) return false;
+
+        adjust();
+        startX = x1 = evX(event);
+        startY = y1 = evY(event);
+
+        $(document).one('mousemove', startSelection)
+            .one('mouseup', cancelSelection);
+
+        return false;
+    }
+
+    function parentScroll()
+    {
+        adjust();
+        update(false);
+        x1 = viewX(selection.x1); y1 = viewY(selection.y1);
+        x2 = viewX(selection.x2); y2 = viewY(selection.y2);
+    }
+
+    function imgLoad()
+    {
+        imgLoaded = true;
+
+        if (options.show) {
+            shown = true;
+            adjust();
+            update();
+            $box.add($o).show();
+        }
+
+        $box.add($o).css({ visibility: '' });
+    }
+
+    var docKeyPress = function(event) {
+        var k = options.keys, d, t, key = event.keyCode || event.which;
+
+        d = !isNaN(k.alt) && (event.altKey || event.originalEvent.altKey) ? k.alt :
+            !isNaN(k.ctrl) && event.ctrlKey ? k.ctrl :
+            !isNaN(k.shift) && event.shiftKey ? k.shift :
+            !isNaN(k.arrows) ? k.arrows : 10;
+
+        if (k.arrows == 'resize' || (k.shift == 'resize' && event.shiftKey) ||
+            (k.ctrl == 'resize' && event.ctrlKey) ||
+            (k.alt == 'resize' && (event.altKey || event.originalEvent.altKey)))
+        {
+            switch (key) {
+            case 37:
+                d = -d;
+            case 39:
+                t = M.max(x1, x2);
+                x1 = M.min(x1, x2);
+                x2 = M.max(t + d, x1);
+                if (aspectRatio) aspectRatioYX();
+                break;
+            case 38:
+                d = -d;
+            case 40:
+                t = M.max(y1, y2);
+                y1 = M.min(y1, y2);
+                y2 = M.max(t + d, y1);
+                if (aspectRatio) aspectRatioXY();
+                break;
+            default:
+                return;
+            }
+
+            doResize();
+        }
+        else {
+            x1 = M.min(x1, x2);
+            y1 = M.min(y1, y2);
+
+            switch (key) {
+            case 37:
+                doMove(M.max(x1 - d, left), y1);
+                break;
+            case 38:
+                doMove(x1, M.max(y1 - d, top));
+                break;
+            case 39:
+                doMove(x1 + M.min(d, imgWidth - selX(x2)), y1);
+                break;
+            case 40:
+                doMove(x1, y1 + M.min(d, imgHeight - selY(y2)));
+                break;
+            default:
+                return;
+            }
+        }
+
+        return false;
+    };
+
+    this.setOptions = function(newOptions)
+    {
+        if (newOptions.parent)
+            ($parent = $(newOptions.parent)).append($box.add($o));
+
+        adjust();
+        getZIndex();
+
+        if (newOptions.x1 != null) {
+            selection = { x1: newOptions.x1, y1: newOptions.y1,
+                x2: newOptions.x2, y2: newOptions.y2 };
+            newOptions.show = !newOptions.hide;
+
+            x1 = viewX(selection.x1); y1 = viewY(selection.y1);
+            x2 = viewX(selection.x2); y2 = viewY(selection.y2);
+            selection.width = x2 - x1;
+            selection.height = y2 - y1;
+        }
+
+        if (newOptions.handles != null) {
+            $handles.remove();
+            $handles = $(handles = [ ]);
+
+            i = newOptions.handles ? newOptions.handles == 'corners' ? 4 : 8 : 0;
+
+            while (i--)
+                $handles = $handles.add(handles[i] = $('<div />'));
+
+            handleWidth = 4 + options.borderWidth;
+
+            $handles.css({ position: 'absolute', borderWidth: options.borderWidth + 'px',
+                borderStyle: 'solid', borderColor: options.borderColor1, 
+                opacity: options.borderOpacity, backgroundColor: options.borderColor2,
+                width: handleWidth + 'px', height: handleWidth + 'px',
+                fontSize: '0px', zIndex: zIndex > 0 ? zIndex + 1 : '1' })
+                .addClass(options.classPrefix + '-handle');
+
+            handleWidth += options.borderWidth * 2;
+        }
+
+        update();
+
+        options = $.extend(options, newOptions);
+
+        if (options.imageWidth || options.imageHeight) {
+            scaleX = (parseInt(options.imageWidth) || imgWidth) / imgWidth;
+            scaleY = (parseInt(options.imageHeight) || imgHeight) / imgHeight;
+        }
+
+        if (newOptions.keys)
+            options.keys = $.extend({ shift: 1, ctrl: 'resize' },
+                newOptions.keys === true ? { } : newOptions.keys);
+
+        $o.addClass(options.classPrefix + '-outer');
+        $area.addClass(options.classPrefix + '-selection');
+        $border1.addClass(options.classPrefix + '-border1');
+        $border2.addClass(options.classPrefix + '-border2');
+
+        $box.add($area).add($border1).add($border2).css({ borderWidth: options.borderWidth + 'px' });
+        $area.css({ backgroundColor: options.selectionColor, opacity: options.selectionOpacity });       
+        $border1.css({ borderStyle: 'solid', borderColor: options.borderColor1 });
+        $border2.css({ borderStyle: 'dashed', borderColor: options.borderColor2 });
+        $border1.add($border2).css({ opacity: options.borderOpacity });
+        $o.css({ opacity: options.outerOpacity, backgroundColor: options.outerColor });
+
+        $box.append($area.add($border1).add($border2).add($handles).add($areaOpera));
+
+        if (newOptions.hide)
+            $box.add($o).hide();
+        else if (newOptions.show && imgLoaded) {
+            shown = true;
+            update();
+            $box.add($o).show();
+        }
+
+        aspectRatio = options.aspectRatio && (d = options.aspectRatio.split(/:/)) ?
+            d[0] / d[1] : null;
+
+        if (aspectRatio)
+            if (options.minWidth)
+                options.minHeight = parseInt(options.minWidth / aspectRatio);
+            else if (options.minHeight)
+                options.minWidth = parseInt(options.minHeight * aspectRatio);
+
+        if (options.disable || options.enable === false) {
+            $box.unbind('mousemove', areaMouseMove).unbind('mousedown', areaMouseDown);
+            $img.add($o).unbind('mousedown', imgMouseDown);
+            $(window).unbind('resize', parentScroll);
+            $img.add($img.parents()).unbind('scroll', parentScroll);
+        }
+        else if (options.enable || options.disable === false) {
+            if (options.resizable || options.movable)
+                $box.mousemove(areaMouseMove).mousedown(areaMouseDown);
+
+            if (!options.persistent)
+                $img.add($o).mousedown(imgMouseDown);
+            $(window).resize(parentScroll);
+            $img.add($img.parents()).scroll(parentScroll);
+        }
+
+        options.enable = options.disable = undefined;
+    };
+
+    if ($.browser.msie)
+        $img.attr('unselectable', 'on');
+
+    $.imgAreaSelect.keyPress = $.browser.msie ||
+        $.browser.safari ? 'keydown' : 'keypress';
+
+    if ($.browser.opera)
+        ($areaOpera = $('<div style="width: 100%; height: 100%; position: absolute;" />'))
+            .css({ zIndex: zIndex > 0 ? zIndex + 2 : '2' });
+
+    this.setOptions(options = $.extend({
+        borderColor1: '#000',
+        borderColor2: '#fff',
+        borderWidth: 1,
+        borderOpacity: .5,
+        classPrefix: 'imgareaselect',
+        movable: true,
+        resizable: true,
+        selectionColor: '#fff',
+        selectionOpacity: 0,
+        outerColor: '#000',
+        outerOpacity: .4,
+        parent: 'body',
+        onSelectStart: function () {},
+        onSelectChange: function () {},
+        onSelectEnd: function () {}
+    }, options));
+
+    $box.add($o).css({ visibility: 'hidden', position: position,
+        overflow: 'hidden', zIndex: zIndex > 0 ? zIndex : '0' });
+    $area.css({ borderStyle: 'solid' });
+    $box.css({ position: position, zIndex: zIndex > 0 ? zIndex + 2 : '2' });
+    $area.add($border1).add($border2).css({ position: 'absolute' });
+
+    img.complete || img.readyState == 'complete' || !$img.is('img') ?
+        imgLoad() : $img.one('load', imgLoad);
+};
+
+$.fn.imgAreaSelect = function (options) {
+    options = options || {};
+
+    this.each(function () {
+        if ($(this).data('imgAreaSelect'))
+            $(this).data('imgAreaSelect').setOptions(options);
+        else {
+            if (options.enable === undefined && options.disable === undefined)
+                options.enable = true;
+
+            $(this).data('imgAreaSelect', new $.imgAreaSelect.init(this, options));
+        }
+    });
+
+    return this;
+};
+
+})(jQuery);
diff --git a/mod/profile/views/default/js/jquery.imgareaselect-0.8.min.js b/mod/profile/views/default/js/jquery.imgareaselect-0.8.min.js
new file mode 100644
index 000000000..d9605de1d
--- /dev/null
+++ b/mod/profile/views/default/js/jquery.imgareaselect-0.8.min.js
@@ -0,0 +1 @@
+(function($){$.imgAreaSelect={onKeyPress:null};$.imgAreaSelect.init=function(img,options){var $img=$(img),imgLoaded,$box=$('<div />'),$area=$('<div />'),$border1=$('<div />'),$border2=$('<div />'),$areaOpera,$outLeft=$('<div />'),$outTop=$('<div />'),$outRight=$('<div />'),$outBottom=$('<div />'),$handles=$([]),handleWidth,handles=[],left,top,M=Math,imgOfs,imgWidth,imgHeight,$parent,parOfs,zIndex=0,position='absolute',$p,startX,startY,scaleX=1,scaleY=1,resizeMargin=10,resize=[],V=0,H=1,d,aspectRatio,x1,x2,y1,y2,x,y,adjusted,shown,i,selection={x1:0,y1:0,x2:0,y2:0,width:0,height:0};var $o=$outLeft.add($outTop).add($outRight).add($outBottom);function viewX(x){return x+imgOfs.left-parOfs.left}function viewY(y){return y+imgOfs.top-parOfs.top}function selX(x){return x-imgOfs.left+parOfs.left}function selY(y){return y-imgOfs.top+parOfs.top}function evX(event){return event.pageX-parOfs.left}function evY(event){return event.pageY-parOfs.top}function trueSelection(){return{x1:M.round(selection.x1*scaleX),y1:M.round(selection.y1*scaleY),x2:M.round(selection.x2*scaleX),y2:M.round(selection.y2*scaleY),width:M.round(selection.x2*scaleX)-M.round(selection.x1*scaleX),height:M.round(selection.y2*scaleY)-M.round(selection.y1*scaleY)}}function getZIndex(){$p=$img;while($p.length&&!$p.is('body')){if(!isNaN($p.css('z-index'))&&$p.css('z-index')>zIndex)zIndex=$p.css('z-index');if($p.css('position')=='fixed')position='fixed';$p=$p.parent()}if(!isNaN(options.zIndex))zIndex=options.zIndex}function adjust(){imgOfs={left:M.round($img.offset().left),top:M.round($img.offset().top)};imgWidth=$img.width();imgHeight=$img.height();if($().jquery=='1.3.2'&&$.browser.safari&&position=='fixed'){imgOfs.top+=M.max(document.documentElement.scrollTop,$('body').scrollTop());imgOfs.left+=M.max(document.documentElement.scrollLeft,$('body').scrollLeft())}parOfs=$.inArray($parent.css('position'),['absolute','relative'])!=-1?{left:M.round($parent.offset().left)-$parent.scrollLeft(),top:M.round($parent.offset().top)-$parent.scrollTop()}:position=='fixed'?{left:$(document).scrollLeft(),top:$(document).scrollTop()}:{left:0,top:0};left=viewX(0);top=viewY(0)}function update(resetKeyPress){if(!shown)return;$box.css({left:viewX(selection.x1)+'px',top:viewY(selection.y1)+'px',width:selection.width+'px',height:selection.height+'px'});$area.add($border1).add($border2).css({left:'0px',top:'0px',width:M.max(selection.width-options.borderWidth*2,0)+'px',height:M.max(selection.height-options.borderWidth*2,0)+'px'});$border1.css({borderStyle:'solid',borderColor:options.borderColor1});$border2.css({borderStyle:'dashed',borderColor:options.borderColor2});$border1.add($border2).css({opacity:options.borderOpacity});$outLeft.css({left:left+'px',top:top+'px',width:selection.x1+'px',height:imgHeight+'px'});$outTop.css({left:left+selection.x1+'px',top:top+'px',width:selection.width+'px',height:selection.y1+'px'});$outRight.css({left:left+selection.x2+'px',top:top+'px',width:imgWidth-selection.x2+'px',height:imgHeight+'px'});$outBottom.css({left:left+selection.x1+'px',top:top+selection.y2+'px',width:selection.width+'px',height:imgHeight-selection.y2+'px'});if(handles.length){handles[1].css({left:selection.width-handleWidth+'px'});handles[2].css({left:selection.width-handleWidth+'px',top:selection.height-handleWidth+'px'});handles[3].css({top:selection.height-handleWidth+'px'});if(handles.length==8){handles[4].css({left:(selection.width-handleWidth)/2+'px'});handles[5].css({left:selection.width-handleWidth+'px',top:(selection.height-handleWidth)/2+'px'});handles[6].css({left:(selection.width-handleWidth)/2+'px',top:selection.height-handleWidth+'px'});handles[7].css({top:(selection.height-handleWidth)/2+'px'})}}if(resetKeyPress!==false){if($.imgAreaSelect.keyPress!=docKeyPress)$(document).unbind($.imgAreaSelect.keyPress,$.imgAreaSelect.onKeyPress);if(options.keys)$(document).bind($.imgAreaSelect.keyPress,$.imgAreaSelect.onKeyPress=docKeyPress)}if($.browser.msie&&options.borderWidth==1&&options.borderOpacity<1){$border1.add($border2).css('margin','0');setTimeout(function(){$border1.add($border2).css('margin','auto')},0)}}function areaMouseMove(event){if(!adjusted){adjust();adjusted=true;$box.one('mouseout',function(){adjusted=false})}x=selX(evX(event))-selection.x1;y=selY(evY(event))-selection.y1;resize=[];if(options.resizable){if(y<=resizeMargin)resize[V]='n';else if(y>=selection.height-resizeMargin)resize[V]='s';if(x<=resizeMargin)resize[H]='w';else if(x>=selection.width-resizeMargin)resize[H]='e'}$box.css('cursor',resize.length?resize.join('')+'-resize':options.movable?'move':'');if($areaOpera)$areaOpera.toggle()}function docMouseUp(event){resize=[];$('body').css('cursor','');if(options.autoHide||selection.width*selection.height==0)$box.add($o).hide();options.onSelectEnd(img,trueSelection());$(document).unbind('mousemove',selectingMouseMove);$box.mousemove(areaMouseMove)}function areaMouseDown(event){if(event.which!=1)return false;adjust();if(options.resizable&&resize.length>0){$('body').css('cursor',resize.join('')+'-resize');x1=viewX(selection[resize[H]=='w'?'x2':'x1']);y1=viewY(selection[resize[V]=='n'?'y2':'y1']);$(document).mousemove(selectingMouseMove).one('mouseup',docMouseUp);$box.unbind('mousemove',areaMouseMove)}else if(options.movable){startX=left+selection.x1-evX(event);startY=top+selection.y1-evY(event);$box.unbind('mousemove',areaMouseMove);$(document).mousemove(movingMouseMove).one('mouseup',function(){options.onSelectEnd(img,trueSelection());$(document).unbind('mousemove',movingMouseMove);$box.mousemove(areaMouseMove)})}else $img.mousedown(event);return false}function aspectRatioXY(){x2=M.max(left,M.min(left+imgWidth,x1+M.abs(y2-y1)*aspectRatio*(x2<x1?-1:1)));y2=M.round(M.max(top,M.min(top+imgHeight,y1+M.abs(x2-x1)/aspectRatio*(y2<y1?-1:1))));x2=M.round(x2)}function aspectRatioYX(){y2=M.max(top,M.min(top+imgHeight,y1+M.abs(x2-x1)/aspectRatio*(y2<y1?-1:1)));x2=M.round(M.max(left,M.min(left+imgWidth,x1+M.abs(y2-y1)*aspectRatio*(x2<x1?-1:1))));y2=M.round(y2)}function doResize(){if(options.minWidth&&M.abs(x2-x1)<options.minWidth){x2=x1-options.minWidth*(x2<x1?1:-1);if(x2<left)x1=left+options.minWidth;else if(x2>left+imgWidth)x1=left+imgWidth-options.minWidth}if(options.minHeight&&M.abs(y2-y1)<options.minHeight){y2=y1-options.minHeight*(y2<y1?1:-1);if(y2<top)y1=top+options.minHeight;else if(y2>top+imgHeight)y1=top+imgHeight-options.minHeight}x2=M.max(left,M.min(x2,left+imgWidth));y2=M.max(top,M.min(y2,top+imgHeight));if(aspectRatio)if(M.abs(x2-x1)/aspectRatio>M.abs(y2-y1))aspectRatioYX();else aspectRatioXY();if(options.maxWidth&&M.abs(x2-x1)>options.maxWidth){x2=x1-options.maxWidth*(x2<x1?1:-1);if(aspectRatio)aspectRatioYX()}if(options.maxHeight&&M.abs(y2-y1)>options.maxHeight){y2=y1-options.maxHeight*(y2<y1?1:-1);if(aspectRatio)aspectRatioXY()}selection={x1:selX(M.min(x1,x2)),x2:selX(M.max(x1,x2)),y1:selY(M.min(y1,y2)),y2:selY(M.max(y1,y2)),width:M.abs(x2-x1),height:M.abs(y2-y1)};update();options.onSelectChange(img,trueSelection())}function selectingMouseMove(event){x2=!resize.length||resize[H]||aspectRatio?evX(event):viewX(selection.x2);y2=!resize.length||resize[V]||aspectRatio?evY(event):viewY(selection.y2);doResize();return false}function doMove(newX1,newY1){x2=(x1=newX1)+selection.width;y2=(y1=newY1)+selection.height;selection=$.extend(selection,{x1:selX(x1),y1:selY(y1),x2:selX(x2),y2:selY(y2)});update();options.onSelectChange(img,trueSelection())}function movingMouseMove(event){x1=M.max(left,M.min(startX+evX(event),left+imgWidth-selection.width));y1=M.max(top,M.min(startY+evY(event),top+imgHeight-selection.height));doMove(x1,y1);event.preventDefault();return false}function startSelection(event){adjust();x2=x1;y2=y1;doResize();resize=[];$box.add($o.is(':visible')?null:$o).show();shown=true;$(document).unbind('mouseup',cancelSelection).mousemove(selectingMouseMove).one('mouseup',docMouseUp);$box.unbind('mousemove',areaMouseMove);options.onSelectStart(img,trueSelection())}function cancelSelection(){$(document).unbind('mousemove',startSelection);$box.add($o).hide();selection={x1:0,y1:0,x2:0,y2:0,width:0,height:0};options.onSelectChange(img,selection);options.onSelectEnd(img,selection)}function imgMouseDown(event){if(event.which!=1)return false;adjust();startX=x1=evX(event);startY=y1=evY(event);$(document).one('mousemove',startSelection).one('mouseup',cancelSelection);return false}function parentScroll(){adjust();update(false);x1=viewX(selection.x1);y1=viewY(selection.y1);x2=viewX(selection.x2);y2=viewY(selection.y2)}function imgLoad(){imgLoaded=true;if(options.show){shown=true;adjust();update();$box.add($o).show()}$box.add($o).css({visibility:''})}var docKeyPress=function(event){var k=options.keys,d,t,key=event.keyCode||event.which;d=!isNaN(k.alt)&&(event.altKey||event.originalEvent.altKey)?k.alt:!isNaN(k.ctrl)&&event.ctrlKey?k.ctrl:!isNaN(k.shift)&&event.shiftKey?k.shift:!isNaN(k.arrows)?k.arrows:10;if(k.arrows=='resize'||(k.shift=='resize'&&event.shiftKey)||(k.ctrl=='resize'&&event.ctrlKey)||(k.alt=='resize'&&(event.altKey||event.originalEvent.altKey))){switch(key){case 37:d=-d;case 39:t=M.max(x1,x2);x1=M.min(x1,x2);x2=M.max(t+d,x1);if(aspectRatio)aspectRatioYX();break;case 38:d=-d;case 40:t=M.max(y1,y2);y1=M.min(y1,y2);y2=M.max(t+d,y1);if(aspectRatio)aspectRatioXY();break;default:return}doResize()}else{x1=M.min(x1,x2);y1=M.min(y1,y2);switch(key){case 37:doMove(M.max(x1-d,left),y1);break;case 38:doMove(x1,M.max(y1-d,top));break;case 39:doMove(x1+M.min(d,imgWidth-selX(x2)),y1);break;case 40:doMove(x1,y1+M.min(d,imgHeight-selY(y2)));break;default:return}}return false};this.setOptions=function(newOptions){if(newOptions.parent)($parent=$(newOptions.parent)).append($box.add($o));adjust();getZIndex();if(newOptions.x1!=null){selection={x1:newOptions.x1,y1:newOptions.y1,x2:newOptions.x2,y2:newOptions.y2};newOptions.show=!newOptions.hide;x1=viewX(selection.x1);y1=viewY(selection.y1);x2=viewX(selection.x2);y2=viewY(selection.y2);selection.width=x2-x1;selection.height=y2-y1}if(newOptions.handles!=null){$handles.remove();$handles=$(handles=[]);i=newOptions.handles?newOptions.handles=='corners'?4:8:0;while(i--)$handles=$handles.add(handles[i]=$('<div />'));handleWidth=4+options.borderWidth;$handles.css({position:'absolute',borderWidth:options.borderWidth+'px',borderStyle:'solid',borderColor:options.borderColor1,opacity:options.borderOpacity,backgroundColor:options.borderColor2,width:handleWidth+'px',height:handleWidth+'px',fontSize:'0px',zIndex:zIndex>0?zIndex+1:'1'}).addClass(options.classPrefix+'-handle');handleWidth+=options.borderWidth*2}update();options=$.extend(options,newOptions);if(options.imageWidth||options.imageHeight){scaleX=(parseInt(options.imageWidth)||imgWidth)/imgWidth;scaleY=(parseInt(options.imageHeight)||imgHeight)/imgHeight}if(newOptions.keys)options.keys=$.extend({shift:1,ctrl:'resize'},newOptions.keys===true?{}:newOptions.keys);$o.addClass(options.classPrefix+'-outer');$area.addClass(options.classPrefix+'-selection');$border1.addClass(options.classPrefix+'-border1');$border2.addClass(options.classPrefix+'-border2');$box.add($area).add($border1).add($border2).css({borderWidth:options.borderWidth+'px'});$area.css({backgroundColor:options.selectionColor,opacity:options.selectionOpacity});$border1.css({borderStyle:'solid',borderColor:options.borderColor1});$border2.css({borderStyle:'dashed',borderColor:options.borderColor2});$border1.add($border2).css({opacity:options.borderOpacity});$o.css({opacity:options.outerOpacity,backgroundColor:options.outerColor});$box.append($area.add($border1).add($border2).add($handles).add($areaOpera));if(newOptions.hide)$box.add($o).hide();else if(newOptions.show&&imgLoaded){shown=true;update();$box.add($o).show()}aspectRatio=options.aspectRatio&&(d=options.aspectRatio.split(/:/))?d[0]/d[1]:null;if(aspectRatio)if(options.minWidth)options.minHeight=parseInt(options.minWidth/aspectRatio);else if(options.minHeight)options.minWidth=parseInt(options.minHeight*aspectRatio);if(options.disable||options.enable===false){$box.unbind('mousemove',areaMouseMove).unbind('mousedown',areaMouseDown);$img.add($o).unbind('mousedown',imgMouseDown);$(window).unbind('resize',parentScroll);$img.add($img.parents()).unbind('scroll',parentScroll)}else if(options.enable||options.disable===false){if(options.resizable||options.movable)$box.mousemove(areaMouseMove).mousedown(areaMouseDown);if(!options.persistent)$img.add($o).mousedown(imgMouseDown);$(window).resize(parentScroll);$img.add($img.parents()).scroll(parentScroll)}options.enable=options.disable=undefined};if($.browser.msie)$img.attr('unselectable','on');$.imgAreaSelect.keyPress=$.browser.msie||$.browser.safari?'keydown':'keypress';if($.browser.opera)($areaOpera=$('<div style="width: 100%; height: 100%; position: absolute;" />')).css({zIndex:zIndex>0?zIndex+2:'2'});this.setOptions(options=$.extend({borderColor1:'#000',borderColor2:'#fff',borderWidth:1,borderOpacity:.5,classPrefix:'imgareaselect',movable:true,resizable:true,selectionColor:'#fff',selectionOpacity:0,outerColor:'#000',outerOpacity:.4,parent:'body',onSelectStart:function(){},onSelectChange:function(){},onSelectEnd:function(){}},options));$box.add($o).css({visibility:'hidden',position:position,overflow:'hidden',zIndex:zIndex>0?zIndex:'0'});$area.css({borderStyle:'solid'});$box.css({position:position,zIndex:zIndex>0?zIndex+2:'2'});$area.add($border1).add($border2).css({position:'absolute'});img.complete||img.readyState=='complete'||!$img.is('img')?imgLoad():$img.one('load',imgLoad)};$.fn.imgAreaSelect=function(options){options=options||{};this.each(function(){if($(this).data('imgAreaSelect'))$(this).data('imgAreaSelect').setOptions(options);else{if(options.enable===undefined&&options.disable===undefined)options.enable=true;$(this).data('imgAreaSelect',new $.imgAreaSelect.init(this,options))}});return this}})(jQuery);
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
new file mode 100644
index 000000000..cf95d9bdb
--- /dev/null
+++ b/mod/profile/views/default/profile/css.php
@@ -0,0 +1,124 @@
+<?php
+
+	/**
+	 * Elgg Profile 
+	 * 
+	 * @package Profile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+?>
+
+#profile_icon_wrapper {
+	float:left;
+}
+	
+.usericon {
+	position:relative;
+}
+
+.avatar_menu_button {
+	width:15px;
+	height:15px;
+	position:absolute;
+	cursor:pointer;
+	display:none;
+	right:0;
+	bottom:0;
+}
+.avatar_menu_arrow {
+	background: url(<?php echo $vars['url']; ?>_graphics/avatar_menu_arrows.gif) no-repeat left top;
+	width:15px;
+	height:15px;
+}
+.avatar_menu_arrow_on {
+	background: url(<?php echo $vars['url']; ?>_graphics/avatar_menu_arrows.gif) no-repeat left -16px;
+	width:15px;
+	height:15px;
+}
+.avatar_menu_arrow_hover {
+	background: url(<?php echo $vars['url']; ?>_graphics/avatar_menu_arrows.gif) no-repeat left -32px;
+	width:15px;
+	height:15px;
+}
+.usericon div.sub_menu { 
+	display:none; 
+	position:absolute; 
+	padding:2px; 
+	margin:0; 
+	border-top:solid 1px #E5E5E5; 
+	border-left:solid 1px #E5E5E5; 
+	border-right:solid 1px #999999; 
+	border-bottom:solid 1px #999999;  
+	width:160px; 
+	background:#FFFFFF; 
+	text-align:left;
+}
+div.usericon a.icon img {
+	z-index:10;
+}
+
+.usericon div.sub_menu a {margin:0;padding:2px;}
+.usericon div.sub_menu a:link, 
+.usericon div.sub_menu a:visited, 
+.usericon div.sub_menu a:hover{ display:block;}	
+.usericon div.sub_menu a:hover{ background:#cccccc; text-decoration:none;}
+
+.usericon div.sub_menu h3 {
+	font-size:1.2em;
+	padding-bottom:3px;
+	border-bottom:solid 1px #dddddd;
+	color: #4690d6;
+	margin:0 !important;
+}
+.usericon div.sub_menu h3:hover {
+
+}
+
+.user_menu_addfriend,
+.user_menu_removefriend,
+.user_menu_profile,
+.user_menu_friends,
+.user_menu_friends_of,
+.user_menu_blog,
+.user_menu_file,
+.user_menu_messages,
+.user_menu_admin,
+.user_menu_pages {
+	margin:0;
+	padding:0;
+}
+.user_menu_admin {
+	border-top:solid 1px #dddddd;
+}
+.user_menu_admin a {
+	color:red;
+}
+.user_menu_admin a:hover {
+	color:white !important;
+	background:red !important;
+}
+
+.resetdefaultprofile {
+	padding:0 10px 0 10px;
+}
+.resetdefaultprofile input[type="submit"] {
+	background: #dedede;
+	border-color: #dedede;
+	color:#333333;
+}
+.resetdefaultprofile input[type="submit"]:hover {
+	background: red;
+	border-color: red;
+	color:white;
+}
+
+/* Banned user */
+#profile_banned {
+	background-color:#FF8888;
+	border:3px solid #FF0000;
+	padding:2px;
+}
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/edit.php b/mod/profile/views/default/profile/edit.php
new file mode 100644
index 000000000..11e3c2997
--- /dev/null
+++ b/mod/profile/views/default/profile/edit.php
@@ -0,0 +1,67 @@
+<?php
+
+	/**
+	 * Elgg profile edit form
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The user entity
+	 * @uses $vars['profile'] Profile items from $CONFIG->profile, defined in profile/start.php for now 
+	 */
+
+?>
+<div class="contentWrapper">
+<form action="<?php echo $vars['url']; ?>action/profile/edit" method="post">
+<?php echo elgg_view('input/securitytoken') ?>
+<?php
+
+	//var_export($vars['profile']);
+	if (is_array($vars['config']->profile) && sizeof($vars['config']->profile) > 0)
+		foreach($vars['config']->profile as $shortname => $valtype) {
+			if ($metadata = get_metadata_byname($vars['entity']->guid, $shortname)) {
+				if (is_array($metadata)) {
+					$value = '';
+					foreach($metadata as $md) {
+						if (!empty($value)) $value .= ', ';
+						$value .= $md->value;
+						$access_id = $md->access_id;
+					}
+				} else {
+					$value = $metadata->value;
+					$access_id = $metadata->access_id;
+				}
+			} else {
+				$value = '';
+				$access_id = ACCESS_DEFAULT;
+			}
+
+?>
+
+	<p>
+		<label>
+			<?php echo elgg_echo("profile:{$shortname}") ?><br />
+			<?php echo elgg_view("input/{$valtype}",array(
+															'internalname' => $shortname,
+															'value' => $value,
+															)); ?>
+		</label>
+			<?php echo elgg_view('input/access',array('internalname' => 'accesslevel['.$shortname.']', 'value' => $access_id)); ?>
+	</p>
+
+<?php
+
+		}
+
+?>
+
+	<p>
+		<input type="hidden" name="username" value="<?php echo page_owner_entity()->username; ?>" />
+		<input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" />
+	</p>
+
+</form>
+</div>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/editdefaultprofile.php b/mod/profile/views/default/profile/editdefaultprofile.php
new file mode 100644
index 000000000..73f0a8783
--- /dev/null
+++ b/mod/profile/views/default/profile/editdefaultprofile.php
@@ -0,0 +1,35 @@
+<?php
+	/**
+	 * Elgg profile index
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$label_text = elgg_echo('profile:label');
+	$type_text = elgg_echo('profile:type');
+
+	$label_control = elgg_view('input/text', array('internalname' => 'label'));
+	$type_control = elgg_view('input/pulldown', array('internalname' => 'type', 'options_values' => array(
+		'text' => elgg_echo('text'),
+		'longtext' => elgg_echo('longtext'),
+		'tags' => elgg_echo('tags'),
+		'url' => elgg_echo('url'),
+		'email' => elgg_echo('email')
+	)));
+	
+	$submit_control = elgg_view('input/submit', array('internalname' => elgg_echo('save'), 'value' => elgg_echo('save')));
+	
+	$formbody = <<< END
+			<p>$label_text: $label_control
+			$type_text: $type_control
+			$submit_control</p>
+END;
+	echo "<div class=\"contentWrapper\">";
+	echo "<p>" . elgg_echo('profile:explainchangefields') . "</p>";
+	echo elgg_view('input/form', array('body' => $formbody, 'action' => $vars['url'] . 'action/profile/editdefault'));
+	echo "</div>";
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/editicon.php b/mod/profile/views/default/profile/editicon.php
new file mode 100644
index 000000000..7731d9899
--- /dev/null
+++ b/mod/profile/views/default/profile/editicon.php
@@ -0,0 +1,149 @@
+<?php
+
+	/**
+	 * Elgg profile icon edit form
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The user entity
+	 * @uses $vars['profile'] Profile items from $CONFIG->profile, defined in profile/start.php for now 
+	 */
+
+	// user is passed to view and set by caller (normally the page editicon)
+	$currentuser = $vars['user'];
+
+?>
+<!-- grab the required js for icon cropping -->
+<div class="contentWrapper">
+<script type="text/javascript" src="<?php echo $vars['url']; ?>mod/profile/views/default/js/jquery.imgareaselect-0.8.min.js"></script>
+
+<p><?php echo elgg_echo('profile:profilepictureinstructions'); ?></p>
+
+<div id="current_user_avatar">
+
+	<label><?php echo elgg_echo('profile:currentavatar'); ?></label>
+	<?php 
+		
+		$user_avatar = $currentuser->getIcon('medium');
+		echo "<img src=\"{$user_avatar}\" alt=\"avatar\" />";
+
+	?>
+
+</div>
+
+<div id="profile_picture_form">
+	<form action="<?php echo $vars['url']; ?>action/profile/iconupload" method="post" enctype="multipart/form-data">
+	<?php echo elgg_view('input/securitytoken'); ?>
+	<input type="hidden" name="username" value="<?php echo $currentuser->username; ?>" />
+	<p><label><?php echo elgg_echo("profile:editicon"); ?></label><br />
+	
+		<?php
+			
+			echo elgg_view("input/file",array('internalname' => 'profileicon'));
+		?>
+		<br /><input type="submit" class="submit_button" value="<?php echo elgg_echo("upload"); ?>" />
+	</p>
+	</form>
+</div>
+	
+<div id="profile_picture_croppingtool">	
+<label><?php echo elgg_echo('profile:profilepicturecroppingtool'); ?></label><br />
+<p>	
+<?php
+
+    echo elgg_echo("profile:createicon:instructions");
+    
+    //display the current user photo
+     
+    $user_master_image = $currentuser->getIcon('master');
+    
+?>
+</p>
+<script type="text/javascript">
+
+    //function to display a preview of the users cropped section
+    function preview(img, selection) {
+		// catch for the first click on the image
+		if (selection.width == 0 || selection.height == 0) {
+			return;
+		}
+		
+        var origWidth = $("#user_avatar").width(); //get the width of the users master photo
+        var origHeight = $("#user_avatar").height(); //get the height of the users master photo
+        var scaleX = 100 / selection.width; 
+        var scaleY = 100 / selection.height; 
+        $('#user_avatar_preview > img').css({ 
+            width: Math.round(scaleX * origWidth) + 'px', 
+            height: Math.round(scaleY * origHeight) + 'px', 
+            marginLeft: '-' + Math.round(scaleX * selection.x1) + 'px', 
+            marginTop: '-' + Math.round(scaleY * selection.y1) + 'px' 
+         }); 
+    } 
+        
+    //variables for the newly cropped avatar
+    //var $x1, $y1, $x2, $y2, $w, $h;
+        
+        function selectChange(img, selection){
+           
+           //populate the form with the correct coordinates once a user has cropped their image
+           $('#x_1').val(selection.x1);
+           $('#x_2').val(selection.x2);
+           $('#y_1').val(selection.y1);
+           $('#y_2').val(selection.y2);
+           
+         }     
+         
+        $(document).ready(function () {
+            
+            //get the coordinates from the form
+            /*
+            var x_1 = $('#x_1').val();
+            var x_2 = $('#x_2').val();
+            var y_1 = $('#y_1').val();
+            var y_2 = $('#y_2').val();
+            var w = x_2 - x_1;
+            var h = y_2 - y_1;
+            selection = { x1: x_1, y1: y_1, x2: x_2, y2: y_2, width: w, height: h };
+            */
+            
+            $('<div id="user_avatar_preview"><img src="<?php echo $user_master_image; ?>" /></div>') 
+            .insertAfter($('#user_avatar'));
+            
+            $('<div id="user_avatar_preview_title"><label><?php echo elgg_echo('profile:preview'); ?></label></div>').insertBefore($('#user_avatar_preview'));
+        }); 
+        
+        $(window).load(function () { 
+            
+            //this produces the coordinates
+            $('#user_avatar').imgAreaSelect({ selectionOpacity: 0, onSelectEnd: selectChange });
+            //show the preview
+            $('#user_avatar').imgAreaSelect({ aspectRatio: '1:1', onSelectChange: preview });
+  
+        });
+ 
+</script>
+
+<p>
+<img id="user_avatar" src="<?php echo $user_master_image; ?>" alt="<?php echo elgg_echo("profile:icon"); ?>" />
+</p>
+
+<div class="clearfloat"></div>
+
+<form action="<?php echo $vars['url']; ?>action/profile/cropicon" method="post" />
+	<?php echo elgg_view('input/securitytoken'); ?>
+	<input type="hidden" name="username" value="<?php echo $vars['user']->username; ?>" />
+	<input type="hidden" name="x_1" value="<?php echo $vars['user']->x1; ?>" id="x_1" />
+    <input type="hidden" name="x_2" value="<?php echo $vars['user']->x2; ?>" id="x_2" />
+    <input type="hidden" name="y_1" value="<?php echo $vars['user']->y1; ?>" id="y_1" />
+    <input type="hidden" name="y_2" value="<?php echo $vars['user']->y2; ?>" id="y_2" />
+	<input type="submit" name="submit" value="<?php echo elgg_echo("profile:createicon"); ?>" />
+</form>
+
+</div>
+<div class="clearfloat"></div>
+
+</div>
diff --git a/mod/profile/views/default/profile/gallery.php b/mod/profile/views/default/profile/gallery.php
new file mode 100644
index 000000000..ffbabfc7d
--- /dev/null
+++ b/mod/profile/views/default/profile/gallery.php
@@ -0,0 +1,47 @@
+<?php
+
+	/**
+	 * Elgg user display (gallery)
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The user entity
+	 */
+	 
+	    //grab the users status message with metadata 'state' set to current if it exists
+/*		if($get_status = get_entities_from_metadata("state", "current", "object", "status", $vars['entity']->guid)){
+    		    
+            foreach($get_status as $s) {
+	            $info = elgg_view("status/friends_view", array('entity' => $s));
+            }
+    		    
+		} */
+
+		$icon = elgg_view(
+				"profile/icon", array(
+										'entity' => $vars['entity'],
+										'size' => 'medium',
+									  )
+			);
+			
+		$banned = $vars['entity']->isBanned();
+	
+		$rel = "";
+		if (page_owner() == $vars['entity']->guid)
+			$rel = 'me';
+		else if (check_entity_relationship(page_owner(), 'friend', $vars['entity']->guid))
+			$rel = 'friend';
+		
+		if (!$banned)
+			$info .= "<p><b><a href=\"" . $vars['entity']->getUrl() . "\" rel=\"$rel\">" . $vars['entity']->name . "</a></b></p>";
+		else
+			$info .= "<p><b><strike>" . $vars['entity']->name . "</b></strike><br />".elgg_echo('profile:banned')."</p>";
+		
+		// echo elgg_view_listing($icon, $info);
+		echo elgg_view('search/gallery_listing',array('icon' => $icon, 'info' => $info));
+			
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/hoverover.php b/mod/profile/views/default/profile/hoverover.php
new file mode 100644
index 000000000..678fbbada
--- /dev/null
+++ b/mod/profile/views/default/profile/hoverover.php
@@ -0,0 +1,26 @@
+<?php
+
+	/**
+	 * Elgg profile icon hover over
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. 
+	 */
+
+?>
+
+	<p class="user_menu_name">
+		<b><?php echo $vars['entity']->name; ?></b>
+	</p>
+
+<?php
+
+	echo elgg_view("profile/hoverover/actions",$vars);
+	echo elgg_view("profile/hoverover/links",$vars);
+
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/icon.php b/mod/profile/views/default/profile/icon.php
new file mode 100644
index 000000000..3fd6ab87b
--- /dev/null
+++ b/mod/profile/views/default/profile/icon.php
@@ -0,0 +1,92 @@
+<?php
+
+	/**
+	 * Elgg profile icon
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The user entity. If none specified, the current user is assumed.
+	 * @uses $vars['size'] The size - small, medium or large. If none specified, medium is assumed. 
+	 */
+
+	// Get entity
+		if (empty($vars['entity']))
+			$vars['entity'] = $vars['user'];
+
+		if ($vars['entity'] instanceof ElggUser) {
+			
+		$name = htmlentities($vars['entity']->name, ENT_QUOTES, 'UTF-8');
+		$username = $vars['entity']->username;
+		
+		if ($icontime = $vars['entity']->icontime) {
+			$icontime = "{$icontime}";
+		} else {
+			$icontime = "default";
+		}
+			
+	// Get size
+		if (!in_array($vars['size'],array('small','medium','large','tiny','master','topbar')))
+			$vars['size'] = "medium";
+			
+	// Get any align and js
+		if (!empty($vars['align'])) {
+			$align = " align=\"{$vars['align']}\" ";
+		} else {
+			$align = "";
+		}
+
+	// Override
+		if (isset($vars['override']) && $vars['override'] == true) {
+			$override = true;
+		} else $override = false;
+		
+		if (!$override) {
+		
+?>
+<div class="usericon">
+<div class="avatar_menu_button"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" border="0" width="15px" height="15px" /></div>
+
+	<div class="sub_menu">
+		<h3><a href="<?php echo $vars['entity']->getURL(); ?>"><?php echo $vars['entity']->name; ?></a></h3>
+		<?php
+			if (isloggedin()) {
+				$actions = elgg_view('profile/menu/actions',$vars);
+				if (!empty($actions)) {
+					
+					echo "<div class=\"item_line\">{$actions}</div>";
+					
+				}
+				if ($vars['entity']->getGUID() == $vars['user']->getGUID()) {
+					echo elgg_view('profile/menu/linksownpage',$vars);
+				} else {
+					echo elgg_view('profile/menu/links',$vars);
+				}					
+			} else {
+				echo elgg_view('profile/menu/links',$vars);
+			}
+		?>
+	</div>	
+	<?php
+		if ((isadminloggedin()) || (!$vars['entity']->isBanned())) {
+	 ?><a href="<?php echo $vars['entity']->getURL(); ?>" class="icon" ><?php 
+		}
+		
+	} 
+	
+	?><img src="<?php echo $vars['entity']->getIcon($vars['size']); ?>" border="0" <?php echo $align; ?> alt="<?php echo htmlentities($vars['entity']->name, ENT_QUOTES, 'UTF-8'); ?>" title="<?php echo htmlentities($vars['entity']->name, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $vars['js']; ?> /><?php
+
+		if (!$override) {
+	
+	?></a>
+</div>
+
+<?php
+
+	}
+		}
+
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/javascript.php b/mod/profile/views/default/profile/javascript.php
new file mode 100644
index 000000000..f2ad4b74b
--- /dev/null
+++ b/mod/profile/views/default/profile/javascript.php
@@ -0,0 +1,138 @@
+<?php
+
+	/**
+	 * Elgg profile image Javascript
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The user entity
+	 */
+
+//		header("Content-type: text/javascript");
+//		header("Pragma: public");
+//		header("Cache-Control: public");
+
+?>
+
+var submenuLayer = 1000;
+
+function setup_avatar_menu() {
+
+	// avatar image menu link
+	$("div.usericon img").mouseover(function() {
+		// find nested avatar_menu_button and show
+		$(this.parentNode.parentNode).children(".avatar_menu_button").show();
+		$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow");
+		//$(this.parentNode.parentNode).css("z-index", submenuLayer);
+	})
+	.mouseout(function() { 
+		if($(this).parent().parent().find("div.sub_menu").css('display')!="block") {
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow");
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_on");
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover");
+			$(this.parentNode.parentNode).children(".avatar_menu_button").hide();
+		}
+		else {
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow");
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_on");
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover");
+			$(this.parentNode.parentNode).children(".avatar_menu_button").show();
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow");
+		}
+	});
+
+
+	// avatar contextual menu
+	$(".avatar_menu_button img").click(function(e) { 
+		
+		var submenu = $(this).parent().parent().find("div.sub_menu");
+		
+		// close submenu if arrow is clicked & menu already open
+		if(submenu.css('display') == "block") {
+			//submenu.hide(); 		
+		}
+		else {
+			// get avatar dimensions
+			var avatar = $(this).parent().parent().parent().find("div.usericon");
+			//alert( "avatarWidth: " + avatar.width() + ", avatarHeight: " + avatar.height() );
+			
+			// move submenu position so it aligns with arrow graphic
+			if (e.pageX < 840) { // popup menu to left of arrow if we're at edge of page
+			submenu.css("top",(avatar.height()) + "px")
+					.css("left",(avatar.width()-15) + "px")
+					.fadeIn('normal');	
+			}	
+			else {
+			submenu.css("top",(avatar.height()) + "px")
+					.css("left",(avatar.width()-166) + "px")
+					.fadeIn('normal');		
+			}	
+			
+			// force z-index - workaround for IE z-index bug			
+			avatar.css("z-index",  submenuLayer);
+			avatar.find("a.icon img").css("z-index",  submenuLayer);
+			submenu.css("z-index", submenuLayer+1);
+						
+			submenuLayer++;
+			
+			// change arrow to 'on' state
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow");
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover");
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow_on");
+		}
+		
+		// hide any other open submenus and reset arrows
+		$("div.sub_menu:visible").not(submenu).hide();
+		$(".avatar_menu_button").removeClass("avatar_menu_arrow");
+		$(".avatar_menu_button").removeClass("avatar_menu_arrow_on");
+		$(".avatar_menu_button").removeClass("avatar_menu_arrow_hover");
+		$(".avatar_menu_button").hide();
+		$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow_on");
+		$(this.parentNode.parentNode).children("div.avatar_menu_button").show();
+		//alert("submenuLayer = " +submenu.css("z-index"));
+	})
+	// hover arrow each time mouseover enters arrow graphic (eg. when menu is already shown)
+	.mouseover(function() {
+		$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_on");
+		$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow");
+		$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow_hover");
+	})
+	// if menu not shown revert arrow, else show 'menu open' arrow
+	.mouseout(function() { 
+		if($(this).parent().parent().find("div.sub_menu").css('display')!="block"){
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover");
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow");
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow");
+		}
+		else {
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover");
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow");
+			$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow_on");
+		}
+	});
+	
+	// hide avatar menu if click occurs outside of menu	
+	// and hide arrow button						
+	$(document).click(function(event) { 		
+			var target = $(event.target);
+			if (target.parents(".usericon").length == 0) {				
+				$(".usericon div.sub_menu").fadeOut();
+				$(".avatar_menu_button").removeClass("avatar_menu_arrow");
+				$(".avatar_menu_button").removeClass("avatar_menu_arrow_on");
+				$(".avatar_menu_button").removeClass("avatar_menu_arrow_hover");
+				$(".avatar_menu_button").hide();
+			}
+	});			   
+	
+
+}
+
+$(document).ready(function() {
+
+	setup_avatar_menu();						   
+								   
+});
diff --git a/mod/profile/views/default/profile/listing.php b/mod/profile/views/default/profile/listing.php
new file mode 100644
index 000000000..cb65c93a6
--- /dev/null
+++ b/mod/profile/views/default/profile/listing.php
@@ -0,0 +1,57 @@
+<?php
+
+	/**
+	 * Elgg user display (small)
+	 *
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 *
+	 * @uses $vars['entity'] The user entity
+	 */
+
+		$icon = elgg_view(
+				"profile/icon", array(
+										'entity' => $vars['entity'],
+										'size' => 'small',
+									)
+			);
+
+		$banned = $vars['entity']->isBanned();
+
+		// Simple XFN
+		$rel = "";
+		if (page_owner() == $vars['entity']->guid)
+			$rel = 'me';
+		else if (check_entity_relationship(page_owner(), 'friend', $vars['entity']->guid))
+			$rel = 'friend';
+
+		if (!$banned) {
+			$info .= "<p><b><a href=\"" . $vars['entity']->getUrl() . "\" rel=\"$rel\">" . $vars['entity']->name . "</a></b></p>";
+			//create a view that a status plugin could extend - in the default case, this is the wire
+			$info .= elgg_view("profile/status", array("entity" => $vars['entity']));
+
+			$location = $vars['entity']->location;
+			if (!empty($location)) {
+				$info .= "<p class=\"owner_timestamp\">" . elgg_echo("profile:location") . ": " . elgg_view("output/tags",array('value' => $vars['entity']->location)) . "</p>";
+			}
+		}
+		else
+		{
+			$info .= "<p><b><strike>";
+			if (isadminloggedin())
+				$info .= "<a href=\"" . $vars['entity']->getUrl() . "\">";
+			$info .= $vars['entity']->name;
+			if (isadminloggedin())
+				$info .= "</a>";
+			$info .= "</strike></b></p>";
+
+			//$info .= "<p class=\"owner_timestamp\">" . elgg_echo('profile:banned') . "</p>";
+
+		}
+
+		echo elgg_view_listing($icon, $info);
+
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/menu/actions.php b/mod/profile/views/default/profile/menu/actions.php
new file mode 100644
index 000000000..7ca1d84d5
--- /dev/null
+++ b/mod/profile/views/default/profile/menu/actions.php
@@ -0,0 +1,29 @@
+<?php
+
+	/**
+	 * Elgg profile icon hover over: actions
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. 
+	 */
+
+	if (isloggedin()) {
+		if ($_SESSION['user']->getGUID() != $vars['entity']->getGUID()) {
+			
+			$ts = time();
+			$token = generate_action_token($ts);
+					
+			if ($vars['entity']->isFriend()) {
+				echo "<p class=\"user_menu_removefriend\"><a href=\"{$vars['url']}action/friends/remove?friend={$vars['entity']->getGUID()}&__elgg_token=$token&__elgg_ts=$ts\">" . elgg_echo("friend:remove") . "</a></p>";
+			} else {
+				echo "<p class=\"user_menu_addfriend\"><a href=\"{$vars['url']}action/friends/add?friend={$vars['entity']->getGUID()}&__elgg_token=$token&__elgg_ts=$ts\">" . elgg_echo("friend:add") . "</a></p>";
+			}
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/menu/adminlinks.php b/mod/profile/views/default/profile/menu/adminlinks.php
new file mode 100644
index 000000000..7d0c24cb4
--- /dev/null
+++ b/mod/profile/views/default/profile/menu/adminlinks.php
@@ -0,0 +1,40 @@
+<?php
+	/**
+	 * Profile admin context links
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The user entity
+	 */
+
+			if (isadminloggedin()){
+				if ($_SESSION['id']!=$vars['entity']->guid){
+					
+					$ts = time();
+					$token = generate_action_token($ts);
+					
+?>
+				<a href="<?php echo $vars['url']; ?>pg/settings/user/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo('profile:editdetails'); ?></a>
+				<?php 
+				if (!$vars['entity']->isBanned()) {
+					echo elgg_view('output/confirmlink', array('text' => elgg_echo("ban"), 'href' => "{$vars['url']}action/admin/user/ban?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts"));
+				} else {
+					echo elgg_view('output/confirmlink', array('text' => elgg_echo("unban"), 'href' => "{$vars['url']}action/admin/user/unban?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); 
+				}
+				
+				echo elgg_view('output/confirmlink', array('text' => elgg_echo("delete"), 'href' => "{$vars['url']}action/admin/user/delete?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts"));
+
+				echo elgg_view('output/confirmlink', array('text' => elgg_echo("resetpassword"), 'href' => "{$vars['url']}action/admin/user/resetpassword?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts"));
+				
+				if (!$vars['entity']->admin) { 
+					echo elgg_view('output/confirmlink', array('text' => elgg_echo("makeadmin"), 'href' => "{$vars['url']}action/admin/user/makeadmin?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts"));
+				} else {
+					echo elgg_view('output/confirmlink', array('text' => elgg_echo("removeadmin"), 'href' => "{$vars['url']}action/admin/user/removeadmin?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts"));
+				}
+			}
+		}
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/menu/adminwrapper.php b/mod/profile/views/default/profile/menu/adminwrapper.php
new file mode 100644
index 000000000..2acbb35e8
--- /dev/null
+++ b/mod/profile/views/default/profile/menu/adminwrapper.php
@@ -0,0 +1,11 @@
+<?php
+
+	$adminlinks = elgg_view('profile/menu/adminlinks',$vars);
+
+	if (!empty($adminlinks)) {
+
+		echo "<p class=\"user_menu_admin\">{$adminlinks}</p>";
+		
+	}
+	
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/menu/links.php b/mod/profile/views/default/profile/menu/links.php
new file mode 100644
index 000000000..8aa5e1a1a
--- /dev/null
+++ b/mod/profile/views/default/profile/menu/links.php
@@ -0,0 +1,36 @@
+<?php
+
+	/**
+	 * Elgg profile icon hover over: passive links
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. 
+	 */
+
+?>
+
+	<p class="user_menu_profile">
+		<a href="<?php echo $vars['entity']->getURL(); ?>"><?php echo elgg_echo("profile"); ?></a>
+	</p>
+	<?php
+		if ($vars['entity']->canEdit())
+		{
+	?>
+		<p class="user_menu_profile">
+			<a href="<?php echo $vars['url']?>pg/profile/<?php echo $vars['entity']->username; ?>/editicon/"><?php echo elgg_echo("profile:editicon"); ?></a>
+		</p>
+	<?php
+		}
+	
+	?>
+	<p class="user_menu_friends">
+		<a href="<?php echo $vars['url']; ?>pg/friends/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo("friends"); ?></a>	
+	</p>
+	<p class="user_menu_friends_of">
+		<a href="<?php echo $vars['url']; ?>pg/friendsof/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo("friends:of"); ?></a>	
+	</p>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/menu/linksownpage.php b/mod/profile/views/default/profile/menu/linksownpage.php
new file mode 100644
index 000000000..08aece082
--- /dev/null
+++ b/mod/profile/views/default/profile/menu/linksownpage.php
@@ -0,0 +1,33 @@
+<?php
+
+	/**
+	 * Elgg profile icon / profile links: passive links when looking at your own icon / profile
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. 
+	 */
+
+?>
+	<?php
+		if ($vars['entity']->canEdit())
+		{
+	?>
+		<p class="user_menu_profile">
+			<a href="<?php echo $vars['url']?>pg/profile/<?php echo $vars['entity']->username; ?>/editicon/"><?php echo elgg_echo("profile:editicon"); ?></a>
+		</p>
+	<?php
+		}
+	
+	?>
+	<p class="user_menu_friends">
+		<a href="<?php echo $vars['url']; ?>pg/friends/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo("friends"); ?></a>	
+	</p>
+	<p class="user_menu_friends_of">
+		<a href="<?php echo $vars['url']; ?>pg/friendsof/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo("friends:of"); ?></a>	
+	</p>
+	
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/metatags.php b/mod/profile/views/default/profile/metatags.php
new file mode 100644
index 000000000..a6981c4c9
--- /dev/null
+++ b/mod/profile/views/default/profile/metatags.php
@@ -0,0 +1,21 @@
+<?php
+
+	/**
+	 * Adds metatags to load Javascript required for the profile
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 */
+
+	/*
+	 * <script type="text/javascript" src="<?php echo $vars['url']; ?>pg/iconjs/profile.js" ></script>
+	 */
+
+?>
+
+	<?php if ($owner = page_owner_entity()) { ?><link rel="meta" type="application/rdf+xml" title="FOAF" href="<?php echo full_url(); ?>?view=foaf" /><?php } ?>
+	
diff --git a/mod/profile/views/default/profile/profilelinks.php b/mod/profile/views/default/profile/profilelinks.php
new file mode 100644
index 000000000..6f35620c6
--- /dev/null
+++ b/mod/profile/views/default/profile/profilelinks.php
@@ -0,0 +1,50 @@
+<?php
+
+	/**
+	 * Elgg profile links
+	 * We need to make sure that the correct links display depending on whether you are looking at your own 
+	 * profile or someone else's
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. 
+	 */
+
+?>
+
+<?php
+
+	$banned = false;
+	$owner = page_owner_entity();
+	if ($owner) $banned = $owner->isBanned();
+
+	// Allow menus if not banned or admin logged in
+	if ((!$banned) || (isadminloggedin()))
+	{
+	    //check to see if the user is looking at their own profile
+	    if ($_SESSION['user']->guid == page_owner()){
+	
+	        echo "<div id=\"profile_menu_wrapper\">"; //start the wrapper div
+		    echo elgg_view("profile/menu/actions",$vars);//grab action links such as make friend
+		    echo elgg_view("profile/menu/linksownpage",$vars); // an different view for user's own profile
+		    echo "</div>"; //close wrapper div 
+		    
+	    } else {
+	        
+	        echo "<div id=\"profile_menu_wrapper\">"; //start the wrapper div
+	        echo elgg_view("profile/menu/actions",$vars); //grab action links such as make friend
+		    echo elgg_view("profile/menu/links",$vars); //passive links to items such as user blog etc
+		    echo "</div>"; //close wrapper div 
+		    
+	    }
+	}
+	else
+	{ 	// Some nice spacing
+		echo "<div id=\"profile_menu_wrapper\">"; //start the wrapper div
+	    echo "</div>"; //close wrapper div 
+	}
+?>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/submenu.php b/mod/profile/views/default/profile/submenu.php
new file mode 100644
index 000000000..906200a00
--- /dev/null
+++ b/mod/profile/views/default/profile/submenu.php
@@ -0,0 +1,22 @@
+<?php
+
+	/**
+	 * Elgg profile submenu links
+	 * These sit in the submenu when the profile editing is on view
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 * 
+	 */
+	 
+?>
+
+<ul>
+    <li><a href="<?php echo $CONFIG->wwwroot . "mod/profile/edit.php"; ?>"><?php echo elgg_echo('profile:details'); ?></a></li>
+    <li><a href="<?php echo $CONFIG->wwwroot."mod/profile/editicon.php"; ?>"><?php echo elgg_echo('profile:editicon'); ?></a></li>
+    <li><a href="<?php echo $CONFIG->wwwroot."pg/profile/" . $_SESSION['user']->username; ?>"><?php echo elgg_echo('profile:back'); ?></a></li>
+</ul>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/userdetails.php b/mod/profile/views/default/profile/userdetails.php
new file mode 100644
index 000000000..eb22a704a
--- /dev/null
+++ b/mod/profile/views/default/profile/userdetails.php
@@ -0,0 +1,174 @@
+<?php
+
+	/**
+	 * Elgg user display (details)
+	 *
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 *
+	 * @uses $vars['entity'] The user entity
+	 */
+
+	if ($vars['full'] == true) {
+		$iconsize = "large";
+	} else {
+		$iconsize = "medium";
+	}
+
+	// wrap all profile info
+	echo "<div id=\"profile_info\">";
+
+?>
+
+<table cellspacing="0">
+<tr>
+<td>
+
+<?php
+
+	// wrap the icon and links in a div
+	echo "<div id=\"profile_info_column_left\">";
+
+	echo "<div id=\"profile_icon_wrapper\">";
+	// get the user's main profile picture
+	echo elgg_view(
+						"profile/icon", array(
+												'entity' => $vars['entity'],
+												//'align' => "left",
+												'size' => $iconsize,
+												'override' => true,
+											)
+					);
+
+
+	echo "</div>";
+	echo "<div class=\"clearfloat\"></div>";
+	// display relevant links
+	echo elgg_view("profile/profilelinks", array("entity" => $vars['entity']));
+
+	// close profile_info_column_left
+	echo "</div>";
+
+?>
+</td>
+<td>
+
+	<div id="profile_info_column_middle" >
+			<?php
+
+		if ($vars['entity']->canEdit()) {
+
+	?>
+		<p class="profile_info_edit_buttons">
+			<a href="<?php echo $vars['url']; ?>pg/profile/<?php echo $vars['entity']->username; ?>/edit/"><?php echo elgg_echo("profile:edit"); ?></a>
+		</p>
+	<?php
+
+		}
+
+	?>
+
+
+
+	<?php
+
+	// Simple XFN
+	$rel = "";
+	if (page_owner() == $vars['entity']->guid)
+		$rel = 'me';
+	else if (check_entity_relationship(page_owner(), 'friend', $vars['entity']->guid))
+		$rel = 'friend';
+
+	// display the users name
+	echo "<h2><a href=\"" . $vars['entity']->getUrl() . "\" rel=\"$rel\">" . $vars['entity']->name . "</a></h2>";
+
+	//insert a view that can be extended
+	echo elgg_view("profile/status", array("entity" => $vars['entity']));
+
+		if ($vars['full'] == true) {
+
+	?>
+	<?php
+		$even_odd = null;
+
+		if (is_array($vars['config']->profile) && sizeof($vars['config']->profile) > 0)
+			foreach($vars['config']->profile as $shortname => $valtype) {
+				if ($shortname != "description") {
+					$value = $vars['entity']->$shortname;
+					if (!empty($value)) {
+
+						//This function controls the alternating class
+						$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
+
+						?>
+						<p class="<?php echo $even_odd; ?>">
+							<b><?php
+
+							echo elgg_echo("profile:{$shortname}");
+
+							?>: </b>
+							<?php
+							$options = array(
+								'value' => $vars['entity']->$shortname
+							);
+
+							if ($valtype == 'tags') {
+								$options['tag_names'] = $shortname;
+							}
+
+							echo elgg_view("output/{$valtype}", $options);
+
+							?>
+
+						</p>
+
+						<?php
+					}
+				}
+			}
+		}
+
+	?>
+	</div><!-- /#profile_info_column_middle -->
+
+</td>
+</tr>
+<?php if (!get_plugin_setting('user_defined_fields', 'profile')) {?>
+<tr>
+<td colspan="2">
+	<div id="profile_info_column_right">
+	<p class="profile_aboutme_title"><b><?php echo elgg_echo("profile:aboutme"); ?></b></p>
+
+	<?php if ($vars['entity']->isBanned()) { ?>
+		<div id="profile_banned">
+		<?php
+			echo elgg_echo('profile:banned');
+		?>
+		</div><!-- /#profile_info_column_right -->
+
+	<?php } else { ?>
+
+		<?php
+		echo elgg_view('output/longtext', array('value' => $vars['entity']->description));
+		//echo autop(filter_tags($vars['entity']->description));
+		?>
+
+	<?php } ?>
+
+	</div><!-- /#profile_info_column_right -->
+
+</td>
+
+
+
+</tr>
+<?php } ?>
+
+</table>
+
+
+
+</div><!-- /#profile_info -->
diff --git a/mod/profile/views/default/river/user/default/profileiconupdate.php b/mod/profile/views/default/river/user/default/profileiconupdate.php
new file mode 100644
index 000000000..2aa0933b6
--- /dev/null
+++ b/mod/profile/views/default/river/user/default/profileiconupdate.php
@@ -0,0 +1,12 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("profile:river:iconupdate"),$url);
+	$string .= "<div class=\"river_content_display\">";
+	$string .= elgg_view("profile/icon",array('entity' => $performed_by, 'size' => 'small', 'override' => 'true'));		
+	$string .= "</div>";
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/profile/views/default/river/user/default/profileupdate.php b/mod/profile/views/default/river/user/default/profileupdate.php
new file mode 100644
index 000000000..9b87d829f
--- /dev/null
+++ b/mod/profile/views/default/river/user/default/profileupdate.php
@@ -0,0 +1,10 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("profile:river:update"),$url);
+	
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/reportedcontent/actions/add.php b/mod/reportedcontent/actions/add.php
new file mode 100644
index 000000000..76cefa4c8
--- /dev/null
+++ b/mod/reportedcontent/actions/add.php
@@ -0,0 +1,49 @@
+<?php
+
+	/**
+	 * Elgg report action
+	 * 
+	 * @package ElggReportContent
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+		$title = get_input('title');
+		$description = get_input('description');
+		$address = get_input('address');
+		$access = ACCESS_PRIVATE; //this is private and only admins can see it
+		
+		if ($title && $address) {
+			
+			$entity = new ElggObject;
+			$entity->subtype = "reported_content";
+			$entity->owner_guid = $_SESSION['user']->getGUID();
+		    $entity->title = $title;
+		    $entity->address = $address;
+		    $entity->description = $description;
+		    $entity->access_id = $access;
+		
+    		if ($entity->save()) {
+     			if (!trigger_plugin_hook('reportedcontent:add', $reported->type, array('entity'=>$reported), true)) {
+     				$entity->delete();
+     				register_error(elgg_echo('reportedcontent:failed'));
+     			} else {
+	    			system_message(elgg_echo('reportedcontent:success'));
+	    			$entity->state = "active";
+     			}
+    			forward($address);
+    		} else {
+    			register_error(elgg_echo('reportedcontent:failed'));
+    			forward($address);
+    		}
+    		
+		} else {
+    		
+    		register_error(elgg_echo('reportedcontent:failed'));
+    	    forward($address);
+    	    
+	    }
+
+?>
\ No newline at end of file
diff --git a/mod/reportedcontent/actions/archive.php b/mod/reportedcontent/actions/archive.php
new file mode 100644
index 000000000..a550abc2a
--- /dev/null
+++ b/mod/reportedcontent/actions/archive.php
@@ -0,0 +1,38 @@
+<?php
+
+	/**
+	 * Elgg reported content: archive action
+	 * 
+	 * @package ElggReportedContent
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in and are admin
+	    admin_gatekeeper();
+
+	// Get input data
+		$guid = (int) get_input('item');
+		
+	// Make sure we actually have permission to edit
+		$reported = get_entity($guid);
+		if ($reported->getSubtype() == "reported_content" && $reported->canEdit()) {
+	
+		// change the state
+				if (!trigger_plugin_hook('reportedcontent:archive', $reported->type, array('entity'=>$reported), true)) {
+ 					system_message(elgg_echo("reportedcontent:notarchived"));
+ 					forward("pg/reportedcontent/");
+		 		}
+		        $reported->state = "archived";
+				
+		// Success message
+				system_message(elgg_echo("reportedcontent:archived"));
+				
+		// Forward back to the reported content page
+				forward("pg/reportedcontent/");
+		
+		}
+		
+?>
\ No newline at end of file
diff --git a/mod/reportedcontent/actions/delete.php b/mod/reportedcontent/actions/delete.php
new file mode 100644
index 000000000..cff42b025
--- /dev/null
+++ b/mod/reportedcontent/actions/delete.php
@@ -0,0 +1,41 @@
+<?php
+
+	/**
+	 * Elgg reported content: delete action
+	 * 
+	 * @package ElggReportedCOntent
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in and are admin
+	    admin_gatekeeper();
+
+	// Get input data
+		$guid = (int) get_input('item');
+		
+	// Make sure we actually have permission to edit
+		$reported = get_entity($guid);
+		if ($reported->getSubtype() == "reported_content" && $reported->canEdit()) {
+	
+		// Delete it!
+				if (!trigger_plugin_hook('reportedcontent:delete', $reported->type, array('entity'=>$reported), true)) {
+	 				register_error(elgg_echo("reportedcontent:notdeleted"));
+	 				forward("pg/reportedcontent/");
+	 			}
+				$rowsaffected = $reported->delete();
+				if ($rowsaffected > 0) {
+		// Success message
+					system_message(elgg_echo("reportedcontent:deleted"));
+				} else {
+					register_error(elgg_echo("reportedcontent:notdeleted"));
+				}
+				
+		// Forward back to the reported content page
+				forward("pg/reportedcontent/");
+		
+		}
+		
+?>
\ No newline at end of file
diff --git a/mod/reportedcontent/add.php b/mod/reportedcontent/add.php
new file mode 100644
index 000000000..02892b4eb
--- /dev/null
+++ b/mod/reportedcontent/add.php
@@ -0,0 +1,36 @@
+<?php
+
+	/**
+	 * Elgg reported content send report page
+	 * 
+	 * @package ElggReportedContent
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Start engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// You need to be logged in for this one
+		gatekeeper();
+		
+	// Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($page_owner->getGUID());
+		}
+			
+		$area2 .= elgg_view_title(elgg_echo('reportedcontent:this'), false);
+		
+	    $area2 .= elgg_view('reportedcontent/form');
+		
+	// Format page
+		$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+		
+	// Draw it
+		page_draw(elgg_echo('reportedcontent:add'),$body);
+
+?>
\ No newline at end of file
diff --git a/mod/reportedcontent/index.php b/mod/reportedcontent/index.php
new file mode 100644
index 000000000..45c49866b
--- /dev/null
+++ b/mod/reportedcontent/index.php
@@ -0,0 +1,32 @@
+<?php
+	/**
+	 * Elgg Reported content
+	 * 
+	 * @package ElggReportedContent
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	admin_gatekeeper();
+	set_context('admin');
+	// Set admin user for user block
+		set_page_owner($_SESSION['guid']);
+
+		
+	$title = elgg_view_title(elgg_echo('reportedcontent'));
+	
+	$reported = elgg_get_entities(array('types' => 'object', 'subtypes' => 'reported_content', 'limit' => 9999));
+	
+	$area2 = elgg_view("reportedcontent/listing", array('entity' => $reported));
+	
+	if(!$reported)  
+	    $reported = elgg_echo("reportedcontent:none");
+		
+// Display main admin menu
+	page_draw(elgg_echo('reportedcontent'),elgg_view_layout("two_column_left_sidebar", '', $title . $area2));
+
+?>
\ No newline at end of file
diff --git a/mod/reportedcontent/languages/en.php b/mod/reportedcontent/languages/en.php
new file mode 100644
index 000000000..00cc73e0e
--- /dev/null
+++ b/mod/reportedcontent/languages/en.php
@@ -0,0 +1,47 @@
+<?php
+	/**
+	 * Elgg reported content plugin language pack
+	 * 
+	 * @package ElggReportedContent
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$english = array(
+	
+		/**
+		 * Menu items and titles
+		 */
+	
+			'item:object:reported_content' => 'Reported items',
+			'reportedcontent' => 'Reported content',
+			'reportedcontent:this' => 'Report this',
+			'reportedcontent:none' => 'There is no reported content',
+			'reportedcontent:report' => 'Report to admin',
+			'reportedcontent:title' => 'Page title',
+			'reportedcontent:deleted' => 'The reported content has been deleted',
+			'reportedcontent:notdeleted' => 'We were not able to delete that report',
+			'reportedcontent:delete' => 'Delete it',
+			'reportedcontent:areyousure' => 'Are you sure you want to delete?',
+			'reportedcontent:archive' => 'Archive it',
+			'reportedcontent:archived' => 'The report has been archived',
+			'reportedcontent:visit' => 'Visit reported item',
+			'reportedcontent:by' => 'Report by',
+			'reportedcontent:objecttitle' => 'Object title',
+			'reportedcontent:objecturl' => 'Object url',
+			'reportedcontent:reason' => 'Reason for report',
+			'reportedcontent:description' => 'Why are you reporting this?',
+			'reportedcontent:address' => 'Location of the item',
+			'reportedcontent:success' => 'Your report has been sent to the site admin',
+			'reportedcontent:failing' => 'Your report could not be sent',
+			'reportedcontent:report' => 'Report this', 
+			'reportedcontent:moreinfo' => 'More info',
+	
+			'reportedcontent:failed' => 'Sorry, the attempt to report this content has failed.',
+			'reportedcontent:notarchived' => 'We were not able to archive that report',
+	);
+					
+	add_translation("en",$english);
+?>
\ No newline at end of file
diff --git a/mod/reportedcontent/manifest.xml b/mod/reportedcontent/manifest.xml
new file mode 100644
index 000000000..1d127cde3
--- /dev/null
+++ b/mod/reportedcontent/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="Adds the option for users to report content and for admins to check it out." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/reportedcontent/start.php b/mod/reportedcontent/start.php
new file mode 100644
index 000000000..d8ee7369e
--- /dev/null
+++ b/mod/reportedcontent/start.php
@@ -0,0 +1,69 @@
+<?php
+	/**
+	 * Elgg Reported content.
+	 * 
+	 * @package ElggReportedContent
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	/**
+	 * Initialise the Reported content and set up the menus.
+	 *
+	 */
+	function reportedcontent_init()
+	{
+		global $CONFIG;
+		
+		// Register a page handler, so we can have nice URLs
+		register_page_handler('reportedcontent','reportedcontent_page_handler');
+		
+		// Extend CSS
+		elgg_extend_view('css','reportedcontent/css');
+				
+		// Extend context menu and owner_block with report content link
+		if (isloggedin()) {
+		    elgg_extend_view('profile/menu/links','reportedcontent/user_report');
+			elgg_extend_view('owner_block/extend', 'reportedcontent/owner_block');
+		}
+	}
+	
+	/**
+	 * Adding the reported content to the admin menu
+	 *
+	 */
+	function reportedcontent_pagesetup()
+	{
+		if (get_context() == 'admin' && isadminloggedin()) {
+			global $CONFIG;
+			add_submenu_item(elgg_echo('reportedcontent'), $CONFIG->wwwroot . 'pg/reportedcontent/');
+		}
+	}
+	
+	/**
+	 * Reported content page handler
+	 *
+	 * @param array $page Array of page elements, forwarded by the page handling mechanism
+	 */
+	function reportedcontent_page_handler($page) 
+	{
+		global $CONFIG;
+		
+		// only interested in one page for now
+		include($CONFIG->pluginspath . "reportedcontent/index.php"); 
+	}
+	
+	
+	
+	// Initialise Reported Content
+	register_elgg_event_handler('init','system','reportedcontent_init');
+	register_elgg_event_handler('pagesetup','system','reportedcontent_pagesetup');
+	
+	//register action
+	register_action('reportedcontent/add',false,$CONFIG->pluginspath . "reportedcontent/actions/add.php");
+	register_action('reportedcontent/delete',false,$CONFIG->pluginspath . "reportedcontent/actions/delete.php");
+	register_action('reportedcontent/archive',false,$CONFIG->pluginspath . "reportedcontent/actions/archive.php");
+	
+?>
\ No newline at end of file
diff --git a/mod/reportedcontent/views/default/reportedcontent/css.php b/mod/reportedcontent/views/default/reportedcontent/css.php
new file mode 100644
index 000000000..061a5e5f6
--- /dev/null
+++ b/mod/reportedcontent/views/default/reportedcontent/css.php
@@ -0,0 +1,91 @@
+<?php
+
+	/**
+	 * Elgg reported content CSS
+	 * 
+	 * @package reportedcontent
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+?>
+/* ***************************************
+PAGE-OWNER BLOCK
+*************************************** */
+#owner_block_report_this {
+	padding:5px 0 0 0;
+}
+#owner_block_report_this a {
+	font-size: 90%;
+	color:#999999;
+	padding:0 0 4px 20px;
+	background: url(<?php echo $vars['url']; ?>_graphics/icon_reportthis.gif) no-repeat left top;
+}
+#owner_block_report_this a:hover {
+	color: #0054a7;
+}
+
+/* ***************************************
+	ADMIN AREA - REPORTED CONTENT
+*************************************** */
+.reportedcontent_content {
+	margin:0 0 5px 0;
+	padding:0 7px 4px 10px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+}
+.reportedcontent_content p.reportedcontent_detail,
+.reportedcontent_content p {
+	margin:0;
+}
+.active_report {
+	border:1px solid #D3322A;
+	background:#F7DAD8;
+}
+.archived_report {
+	border:1px solid #666666;
+	background:#dedede;
+}
+a.archive_report_button {
+	float:right;
+	font: 12px/100% Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	color: #ffffff;
+	background:#4690d6;
+	border: 1px solid #4690d6;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	width: auto;
+	padding: 4px;
+	margin:15px 0 0 20px;
+	cursor: pointer;
+}
+a.archive_report_button:hover {
+	background: #0054a7;
+	border: 1px solid #0054a7;
+	text-decoration: none;
+}
+a.delete_report_button {
+	float:right;
+	font: 12px/100% Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	color: #ffffff;
+	background:#999999;
+	border: 1px solid #999999;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	width: auto;
+	padding: 4px;
+	margin:15px 0 0 20px;
+	cursor: pointer;
+}
+a.delete_report_button:hover {
+	background: #333333;
+	border: 1px solid #333333;
+	text-decoration:none;
+}
+.reportedcontent_content .collapsible_box {
+	background: white;
+}
diff --git a/mod/reportedcontent/views/default/reportedcontent/form.php b/mod/reportedcontent/views/default/reportedcontent/form.php
new file mode 100644
index 000000000..73fbd5c93
--- /dev/null
+++ b/mod/reportedcontent/views/default/reportedcontent/form.php
@@ -0,0 +1,74 @@
+<?php
+
+	/**
+	 * Elgg report content plugin form
+	 * 
+	 * @package ElggReportContent
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+			
+			$guid = 0;
+			$title = get_input('title',"");
+			$description = "";
+			$address = get_input('address',"");
+			if ($address == "previous")
+				$address = $_SERVER['HTTP_REFERER'];
+			$tags = array();
+			$access_id = ACCESS_PRIVATE;
+			$shares = array();
+			$owner = $vars['user'];
+
+?>
+<div class="contentWrapper">
+	<form action="<?php echo $vars['url']; ?>action/reportedcontent/add" method="post">
+	<?php echo elgg_view('input/securitytoken'); ?>
+	
+		<p>
+			<label>
+				<?php 	echo elgg_echo('reportedcontent:title'); ?>
+				<?php
+
+						echo elgg_view('input/text',array(
+								'internalname' => 'title',
+								'value' => $title,
+						)); 
+				
+				?>
+			</label>
+		</p>
+		<p>
+			<label>
+				<?php 	echo elgg_echo('reportedcontent:address'); ?>
+				<?php
+
+						echo elgg_view('input/url',array(
+								'internalname' => 'address',
+								'value' => $address,
+						)); 
+				
+				?>
+			</label>
+		</p>
+		<p class="longtext_editarea">
+			<label>
+				<?php 	echo elgg_echo('reportedcontent:description'); ?>
+				<br />
+				<?php
+
+						echo elgg_view('input/longtext',array(
+								'internalname' => 'description',
+								'value' => $description,
+						)); 
+				
+				?>
+			</label>
+		</p>
+		<p>
+			<input type="submit" value="<?php echo elgg_echo('reportedcontent:report'); ?>" />
+		</p>
+	
+	</form>
+</div>
diff --git a/mod/reportedcontent/views/default/reportedcontent/listing.php b/mod/reportedcontent/views/default/reportedcontent/listing.php
new file mode 100644
index 000000000..5d3d3d997
--- /dev/null
+++ b/mod/reportedcontent/views/default/reportedcontent/listing.php
@@ -0,0 +1,43 @@
+
+<?php
+
+	echo "<div class=\"contentWrapper\">";
+
+	if($vars['entity']){
+
+		foreach($vars['entity'] as $report){
+
+			//get the user making the report
+			$user = get_user($report->owner_guid)->name;
+			$user_url = get_user($report->owner_guid)->getURL();
+
+			//find out if the report is current or archive
+			if($report->state == 'archived'){
+				$reportedcontent_background = "archived_report";
+			}else{
+				$reportedcontent_background = "active_report";
+			}
+
+			echo "<div class=\"reportedcontent_content {$reportedcontent_background}\">";
+			echo "<p class=\"reportedcontent_detail\">";
+			if($report->state != 'archived') {
+			  $url =  elgg_add_action_tokens_to_url($vars['url'] . "action/reportedcontent/archive?item=" . $report->guid );
+				  echo "<a class=\"archive_report_button\" href=\"$url\">" . elgg_echo('reportedcontent:archive') . "</a>";
+			}
+		$url = elgg_add_action_tokens_to_url($vars['url'] . "action/reportedcontent/delete?item=" . $report->guid);
+			echo "<a class=\"delete_report_button\" href=\"$url\" onclick=\"return confirm('" . elgg_echo('reportedcontent:areyousure') . "')\">" . elgg_echo('reportedcontent:delete') . "</a></p>";
+
+			echo "<p class=\"reportedcontent_detail\"><b>" . elgg_echo('reportedcontent:by') . ": </b><a href=\"{$user_url}\">" . $user . "</a>, " . friendly_time($report->time_created) . "</p>";
+			echo "<p class=\"reportedcontent_detail\"><b>" . elgg_echo('reportedcontent:objecttitle') . ": </b>" . $report->title . "</p>";
+			echo "<p class=\"reportedcontent_detail\"><b>" . elgg_echo('reportedcontent:objecturl') . ": </b><a href=\"{$report->address}\">" . elgg_echo('reportedcontent:visit')  . "</a></p>";
+			echo "<p><a class=\"collapsibleboxlink\">" . elgg_echo('reportedcontent:moreinfo') . "</a></p>";
+			echo "<div class=\"collapsible_box\">";
+			echo "<p class=\"reportedcontent_detail\"><b>" . elgg_echo('reportedcontent:reason') . ": </b>" .$report->description . "</p>";
+			echo "</div></div>";
+
+
+		}
+
+	}
+	echo "</div>";
+?>
diff --git a/mod/reportedcontent/views/default/reportedcontent/owner_block.php b/mod/reportedcontent/views/default/reportedcontent/owner_block.php
new file mode 100644
index 000000000..3624a86d2
--- /dev/null
+++ b/mod/reportedcontent/views/default/reportedcontent/owner_block.php
@@ -0,0 +1,9 @@
+<?php
+
+$label = elgg_echo('reportedcontent:report');
+$url = "'" . $vars['url'] . "mod/reportedcontent/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)";
+
+?>
+<div id="owner_block_report_this">
+<a href="javascript:location.href=<?php echo $url; ?>"><?php echo $label ?></a>
+</div>
diff --git a/mod/reportedcontent/views/default/reportedcontent/user_report.php b/mod/reportedcontent/views/default/reportedcontent/user_report.php
new file mode 100644
index 000000000..ee6c7cbf8
--- /dev/null
+++ b/mod/reportedcontent/views/default/reportedcontent/user_report.php
@@ -0,0 +1,6 @@
+
+<p class="user_menu_profile">
+<?php
+	echo "<a href=\"javascript:location.href='". $CONFIG->wwwroot . "mod/reportedcontent/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">" . elgg_echo('reportedcontent:report') . "</a>";
+?>
+</p>
\ No newline at end of file
diff --git a/mod/riverdashboard/actions/add.php b/mod/riverdashboard/actions/add.php
new file mode 100644
index 000000000..fc98664ae
--- /dev/null
+++ b/mod/riverdashboard/actions/add.php
@@ -0,0 +1,56 @@
+<?php
+
+	/**
+	 * Elgg site message: add
+	 * 
+	 * @package ElggSiteMessage
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 **/
+
+	// Make sure we're logged in and are admin (send us to the front page if not)
+		admin_gatekeeper();
+
+	// Get input data
+		$message = get_input('sitemessage');
+		//$access = 1; //it is for all logged in users
+				
+	// Make sure the message isn't blank
+		if (empty($message)) {
+			register_error(elgg_echo("sitemessages:blank"));
+			forward("mod/riverdashboard/");
+			
+	// Otherwise, save the message
+		} else {
+			
+	// Initialise a new ElggObject
+			$sitemessage = new ElggObject();
+	// Tell the system it's a site wide message
+			$sitemessage->subtype = "sitemessage";
+	// Set its owner to the current user
+			$sitemessage->owner_guid = $_SESSION['user']->getGUID();
+	// For now, set its access to logged in users
+			$sitemessage->access_id = 1; // this is for all logged in users
+	// Set description appropriately
+			$sitemessage->title = '';
+			$sitemessage->description = $message;
+	// Before we can set metadata, we need to save the message
+			if (!$sitemessage->save()) {
+				register_error(elgg_echo("sitemessage:error"));
+				forward("mod/riverdashboard/");
+			}
+	// Success message
+			system_message(elgg_echo("sitemessages:posted"));
+
+	// add to river
+		add_to_river('river/sitemessage/create','create',$_SESSION['user']->guid,$sitemessage->guid);
+
+	// Forward to the activity page
+			forward("mod/riverdashboard/");
+				
+		}
+
+		
+?>
diff --git a/mod/riverdashboard/actions/delete.php b/mod/riverdashboard/actions/delete.php
new file mode 100644
index 000000000..db9196f01
--- /dev/null
+++ b/mod/riverdashboard/actions/delete.php
@@ -0,0 +1,36 @@
+<?php
+
+	/**
+	 * Elgg site message: delete
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in (send us to the front page if not)
+		gatekeeper();
+
+	// Get input data
+		$guid = (int) get_input('message');
+		
+	// Make sure we actually have permission to edit
+		$message = get_entity($guid);
+		if ($message->getSubtype() == "sitemessage" && $message->canEdit()) {
+	
+		// Delete it!
+				$rowsaffected = $message->delete();
+				if ($rowsaffected > 0) {
+		// Success message
+					system_message(elgg_echo("sitemessage:deleted"));
+				} else {
+					register_error(elgg_echo("sitemessage:notdeleted"));
+				}
+		// Forward to the river
+				forward("mod/riverdashboard/");
+		
+		}
+		
+?>
\ No newline at end of file
diff --git a/mod/riverdashboard/graphics/follow_icon.png b/mod/riverdashboard/graphics/follow_icon.png
new file mode 100644
index 000000000..56fa8b1f5
--- /dev/null
+++ b/mod/riverdashboard/graphics/follow_icon.png
diff --git a/mod/riverdashboard/index.php b/mod/riverdashboard/index.php
new file mode 100644
index 000000000..2312da945
--- /dev/null
+++ b/mod/riverdashboard/index.php
@@ -0,0 +1,78 @@
+<?php
+
+	/**
+	 * Elgg river dashboard plugin index page
+	 *
+	 * @package ElggRiverDash
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+		require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
+
+		gatekeeper();
+
+		$content = get_input('content','');
+		$content = explode(',',$content);
+		$type = $content[0];
+		if (isset($content[1])) {
+			$subtype = $content[1];
+		} else {
+			$subtype = '';
+		}
+		$orient = get_input('display');
+		$callback = get_input('callback');
+
+		if ($type == 'all') {
+			$type = '';
+			$subtype = '';
+		}
+
+		$body = '';
+		if (empty($callback)) {
+
+			//set a view for the wire to extend
+			$area1 = elgg_view("riverdashboard/sitemessage");
+
+			//set a view to display newest members
+			$area1 .= elgg_view("riverdashboard/newestmembers");
+
+			//set a view to display a welcome message
+			$body .= elgg_view("riverdashboard/welcome");
+
+		}
+
+		switch($orient) {
+			case 'mine':
+							$subject_guid = $_SESSION['user']->guid;
+							$relationship_type = '';
+							break;
+			case 'friends':	$subject_guid = $_SESSION['user']->guid;
+							$relationship_type = 'friend';
+							break;
+			default:		$subject_guid = 0;
+							$relationship_type = '';
+							break;
+		}
+
+		$river = elgg_view_river_items($subject_guid, 0, $relationship_type, $type, $subtype, '') . "</div>";
+
+		// Replacing callback calls in the nav with something meaningless
+		$river = str_replace('callback=true','replaced=88,334',$river);
+
+		$nav = elgg_view('riverdashboard/nav',array(
+															'type' => $type,
+															'subtype' => $subtype,
+															'orient' => $orient
+														));
+		if (empty($callback)) {
+			$body .= elgg_view('riverdashboard/container', array('body' => $nav . $river . elgg_view('riverdashboard/js')));
+			page_draw(elgg_echo('dashboard'),elgg_view_layout('sidebar_boxes',$area1,$body));
+		} else {
+			header("Content-type: text/html; charset=UTF-8");
+			echo $nav . $river . elgg_view('riverdashboard/js');
+		}
+
+?>
diff --git a/mod/riverdashboard/languages/en.php b/mod/riverdashboard/languages/en.php
new file mode 100644
index 000000000..7875f863c
--- /dev/null
+++ b/mod/riverdashboard/languages/en.php
@@ -0,0 +1,40 @@
+<?php
+
+	$english = array(
+
+		'mine' => 'Mine',
+		'filter' => 'Filter',
+		'riverdashboard:useasdashboard' => "Replace the default dashboard with this activity river?",
+		'activity' => 'Activity',
+		'riverdashboard:recentmembers' => 'Recent members',
+	
+	    /**
+	     * Site messages
+           **/
+
+		'sitemessages:announcements' => "Site announcements",
+		'sitemessages:posted' => "Posted",
+		'sitemessages:river:created' => "Site admin, %s,",
+		'sitemessages:river:create' => "posted a new site wide message",
+		'sitemessages:add' => "Add a site-wide message to the river page",
+		'sitemessage:deleted' => "Site message deleted",
+		'sitemessage:error' => "Failed to save site message.",
+		
+		'river:widget:noactivity' => 'We could not find any activity.',
+		'river:widget:title' => "Activity",
+		'river:widget:description' => "Show your latest activity.",
+		'river:widget:title:friends' => "Friends' activity",
+		'river:widget:description:friends' => "Show what your friends are up to.",
+		'river:widgets:friends' => "Friends",
+		'river:widgets:mine' => "Mine",
+		'river:widget:label:displaynum' => "Number of entries to display:",
+		'river:widget:type' => "Which river would you like to display? One that shows your activity or one that shows your friends activity?",
+		'item:object:sitemessage' => "Site messages",
+		'riverdashboard:avataricon' => "Would you like to use user avatars or icons on your site activity stream?",
+		'option:icon' => 'Icons',
+		'option:avatar' => 'Avatars',
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/riverdashboard/manifest.xml b/mod/riverdashboard/manifest.xml
new file mode 100644
index 000000000..28e254288
--- /dev/null
+++ b/mod/riverdashboard/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+	<field key="author" value="Curverider Ltd" />
+	<field key="version" value="1.7" />
+	<field key="description" value="Alternative replacement for the standard Elgg dashboard." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/riverdashboard/start.php b/mod/riverdashboard/start.php
new file mode 100644
index 000000000..17bfdf8dd
--- /dev/null
+++ b/mod/riverdashboard/start.php
@@ -0,0 +1,64 @@
+<?php
+
+	/**
+	 * Elgg river dashboard plugin
+	 * 
+	 * @package ElggRiverDash
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+		function riverdashboard_init() {
+		
+			global $CONFIG;
+			
+			// Register and optionally replace the dashboard
+			if (get_plugin_setting('useasdashboard', 'riverdashboard') == 'yes') {
+				register_page_handler('dashboard','riverdashboard_page_handler');
+			} else {
+				// Activity main menu
+				if (isloggedin())
+				{
+					add_menu(elgg_echo('activity'), $CONFIG->wwwroot . "mod/riverdashboard/");
+				}
+			}
+		
+			// Page handler
+			register_page_handler('riverdashboard','riverdashboard_page_handler');
+			
+			elgg_extend_view('css','riverdashboard/css');
+			
+			add_widget_type('river_widget',elgg_echo('river:widget:title'), elgg_echo('river:widget:description'));
+			
+		}
+		
+		/**
+		 * Page handler for riverdash
+		 *
+		 * @param unknown_type $page
+		 */
+		function riverdashboard_page_handler($page)
+		{
+			global $CONFIG;
+			
+			include(dirname(__FILE__) . "/index.php");
+			return true;
+		}
+		
+		function riverdashboard_dashboard() {
+			
+			include(dirname(__FILE__) . '/index.php');
+			
+		}
+
+		register_elgg_event_handler('init','system','riverdashboard_init');
+		
+	// Register actions
+		global $CONFIG;
+		register_action("riverdashboard/add",false,$CONFIG->pluginspath . "riverdashboard/actions/add.php");
+		register_action("riverdashboard/delete",false,$CONFIG->pluginspath . "riverdashboard/actions/delete.php");
+
+
+?>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/river/sitemessage/create.php b/mod/riverdashboard/views/default/river/sitemessage/create.php
new file mode 100644
index 000000000..eaceb1a2e
--- /dev/null
+++ b/mod/riverdashboard/views/default/river/sitemessage/create.php
@@ -0,0 +1,18 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	$url = $object->getURL();
+
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("sitemessages:river:created"),$url) . " ";
+	$string .= elgg_echo("sitemessages:river:create");
+	$string .= "<div class=\"river_content_display\">";
+	$string .= $object->description;
+	$string .= "</div>";
+
+?>
+
+<?php 
+	echo $string; 
+?>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/riverdashboard/container.php b/mod/riverdashboard/views/default/riverdashboard/container.php
new file mode 100644
index 000000000..f4bfd7f83
--- /dev/null
+++ b/mod/riverdashboard/views/default/riverdashboard/container.php
@@ -0,0 +1,5 @@
+<?php
+
+?>
+
+<div id="river_container"><?php echo $vars['body']; ?></div>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php
new file mode 100644
index 000000000..d9c36f048
--- /dev/null
+++ b/mod/riverdashboard/views/default/riverdashboard/css.php
@@ -0,0 +1,148 @@
+<?php
+
+	/**
+	 * Elgg riverdashboard CSS
+	 * 
+	 * @package riverdashboard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+?>
+.sidebarBox #thewire_sidebarInputBox {
+	width:178px;
+}
+.sidebarBox .last_wirepost {
+	margin:20px 0 20px 0;
+}
+.sidebarBox .last_wirepost .thewire-singlepage {
+	margin:0;
+}
+.sidebarBox .last_wirepost .thewire-singlepage .thewire_options {
+	display:none;
+}
+.sidebarBox .last_wirepost .thewire-singlepage .note_date {
+	line-height: 1em;
+	padding:3px 0 0 0;
+	width:142px;
+}
+.sidebarBox .last_wirepost .thewire-singlepage .note_body {
+	color:#666666;
+	line-height: 1.2em;
+}
+.sidebarBox .last_wirepost .thewire-singlepage .thewire-post {
+	background-position: 130px bottom;
+}
+.sidebarBox .thewire_characters_remaining {
+	float:right;
+}
+.sidebarBox input.thewire_characters_remaining_field {
+	background: #dedede;
+}
+.sidebarBox input.thewire_characters_remaining_field:focus {
+	background: #dedede;
+	border:none;
+}
+.sidebarBox input#thewire_submit_button {
+	margin:2px 0 0 0;
+	padding:2px 2px 1px 2px;
+	height:auto;
+}
+.sidebarBox .membersWrapper {
+	background: white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	padding:7px;	
+}
+.sidebarBox .membersWrapper .recentMember {
+	margin:2px;
+	float:left;
+}
+.sidebarBox .membersWrapper .recentMember .usericon img {
+	width:25px;
+	height:25px;
+}
+/* br necessary for ie6 & 7 */
+.sidebarBox .membersWrapper br {
+	height:0;
+	line-height:0;
+}
+.welcomemessage {
+	background:white;
+}
+.riverdashboard_filtermenu {
+	margin:10px 0 10px 0;
+}
+
+.river_pagination .forward,
+.river_pagination .back {
+	display:block;
+	float:left;
+	border:1px solid #cccccc;
+	color:#4690d6;
+	text-align: center;
+	font-size: 12px;
+	font-weight: normal;
+	margin:0 6px 0 0;
+	padding:0 4px 1px 4px;
+	cursor: pointer;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+}
+.river_pagination .forward:hover,
+.river_pagination .back:hover {
+	background:#4690d6;
+	color:white;
+	text-decoration: none;
+	border:1px solid #4690d6;
+}
+.river_pagination .back {
+	margin:0 20px 0 0;
+}
+/* IE6 */
+* html .river_pagination { margin-top:17px; }
+/* IE7 */
+*:first-child+html .river_pagination { margin-top:17px; }
+
+/* activity widget */
+.collapsable_box_content .river_item p {
+	color:#333333;
+}
+
+.collapsable_box_content .content_area_user_title h2 {
+	font-size:1.25em;
+	line-height:1.2em;
+	margin:0;
+	padding:0 0 2px 0;
+	color:#4690d6;
+}
+.river_content img {
+	margin:2px 0 2px 20px;
+}
+
+.river_content_display {
+	border-left:1px solid #ddd;
+	padding:2px 10px 0 10px;
+	font-size:90%;
+	margin:4px 0 2px 30px;
+}
+
+.river_content_display p {
+	padding:0;
+	margin:0;
+}
+
+.following_icon {
+	width:20px;
+	height:40px;
+	margin:0 2px 0 2px;
+	background: url(<?php echo $vars['url']; ?>mod/riverdashboard/graphics/follow_icon.png) no-repeat left top;
+}
+.river_content_display div.usericon a.icon img {
+	width:40px;
+	height:40px;
+}
+
+
diff --git a/mod/riverdashboard/views/default/riverdashboard/js.php b/mod/riverdashboard/views/default/riverdashboard/js.php
new file mode 100644
index 000000000..01adec77c
--- /dev/null
+++ b/mod/riverdashboard/views/default/riverdashboard/js.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+<script type="text/javascript">
+	$(document).ready(function() {
+	
+		var href = $("div.river_pagination a").attr('href');
+		href = href.replace("callback=true","callback=");
+		$("div.river_pagination a").attr('href',href);
+	
+	});
+</script>
+
+*/
+
+?>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/riverdashboard/nav.php b/mod/riverdashboard/views/default/riverdashboard/nav.php
new file mode 100644
index 000000000..43d5723ca
--- /dev/null
+++ b/mod/riverdashboard/views/default/riverdashboard/nav.php
@@ -0,0 +1,54 @@
+<?php
+
+	$contents = array();
+	$contents['all'] = 'all';
+	if (!empty($vars['config']->registered_entities)) {
+		foreach ($vars['config']->registered_entities as $type => $ar) {
+			foreach ($vars['config']->registered_entities[$type] as $object) {
+				if (!empty($object )) {
+					$keyname = 'item:'.$type.':'.$object;
+				} else $keyname = 'item:'.$type; 
+				$contents[$keyname] = "{$type},{$object}";
+			}
+		}
+	}
+	
+	$allselect = ''; $friendsselect = ''; $mineselect = '';
+	switch($vars['orient']) {
+		case '':		$allselect = 'class="selected"';
+						break;
+		case 'friends':		$friendsselect = 'class="selected"';
+						break;
+		case 'mine':		$mineselect = 'class="selected"';
+						break;
+	}
+
+?>
+
+<div class="contentWrapper">
+	<div id="elgg_horizontal_tabbed_nav">
+		<ul>
+			<li <?php echo $allselect; ?> ><a onclick="javascript:$('#river_container').load('<?php echo $vars['url']; ?>mod/riverdashboard/?content=<?php echo $vars['type']; ?>,<?php echo $vars['subtype']; ?>&amp;callback=true'); return false;" href="?display="><?php echo elgg_echo('all'); ?></a></li>
+			<li <?php echo $friendsselect; ?> ><a onclick="javascript:$('#river_container').load('<?php echo $vars['url']; ?>mod/riverdashboard/?display=friends&amp;content=<?php echo $vars['type']; ?>,<?php echo $vars['subtype']; ?>&amp;callback=true'); return false;" href="?display=friends"><?php echo elgg_echo('friends'); ?></a></li>
+			<li <?php echo $mineselect; ?> ><a onclick="javascript:$('#river_container').load('<?php echo $vars['url']; ?>mod/riverdashboard/?display=mine&amp;content=<?php echo $vars['type']; ?>,<?php echo $vars['subtype']; ?>&amp;callback=true'); return false;" href="?display=mine"><?php echo elgg_echo('mine'); ?></a></li>
+		</ul>
+	</div>
+	
+	<div class="riverdashboard_filtermenu">
+		<select name="content" id="content" onchange="javascript:$('#river_container').load('<?php echo $vars['url']; ?>mod/riverdashboard/?callback=true&amp;display='+$('input#display').val() + '&amp;content=' + $('select#content').val());">
+			<?php
+	
+				foreach($contents as $label => $content) {
+					if (("{$vars['type']},{$vars['subtype']}" == $content) ||
+						(empty($vars['subtype']) && $content == 'all')) {
+						$selected = 'selected="selected"';
+					} else $selected = '';
+					echo "<option value=\"{$content}\" {$selected}>".elgg_echo($label)."</option>";
+				}
+			
+			?>
+		</select>
+		<input type="hidden" name="display" id="display" value="<?php echo htmlentities($vars['orient']); ?>" />
+		<!-- <input type="submit" value="<?php echo elgg_echo('filter'); ?>" /> -->
+	</div>
+<!-- </div> -->
diff --git a/mod/riverdashboard/views/default/riverdashboard/newestmembers.php b/mod/riverdashboard/views/default/riverdashboard/newestmembers.php
new file mode 100644
index 000000000..562f4b114
--- /dev/null
+++ b/mod/riverdashboard/views/default/riverdashboard/newestmembers.php
@@ -0,0 +1,28 @@
+<?php
+
+	/**
+	 * Elgg thewire view page
+	 * 
+	 * @package ElggTheWire
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 */
+
+	$newest_members = elgg_get_entities_from_metadata(array('metadata_names' => 'icontime', 'types' => 'user', 'limit' => 18));
+	
+?>
+
+<div class="sidebarBox">
+<h3><?php echo elgg_echo('riverdashboard:recentmembers') ?></h3>
+<div class="membersWrapper"><br />
+<?php 
+	foreach($newest_members as $mem){
+		echo "<div class=\"recentMember\">" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny')) . "</div>";
+	}
+?>
+<div class="clearfloat"></div>
+</div>
+</div>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
new file mode 100644
index 000000000..6cc2bc60d
--- /dev/null
+++ b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
@@ -0,0 +1,98 @@
+<?php
+
+	/**
+	 * Elgg thewire view page
+	 * 
+	 * @package ElggTheWire
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 */
+
+	//grab the current site message
+	$site_message = elgg_get_entities(array('types' => 'object', 'subtypes' => 'sitemessage', 'limit' => 1));
+	if ($site_message) {
+		$mes = $site_message[0];
+		$message = $mes->description;
+		$dateStamp = friendly_time($mes->time_created);
+		$delete = elgg_view("output/confirmlink",array(
+			'href' => $vars['url'] . "action/riverdashboard/delete?message=" . $mes->guid,
+			'text' => elgg_echo('delete'),
+			'confirm' => elgg_echo('deleteconfirm'),
+		));
+	}
+	
+?>
+
+	<div class="sidebarBox">
+	
+<?php
+
+	//if there is a site message
+	if($site_message){
+	 
+?>
+
+	<?php
+
+		echo "<h3>" . elgg_echo("sitemessages:announcements") . "</h3>";
+		echo "<p><small>" . elgg_echo("sitemessages:posted") . ": " . $dateStamp;
+		//if admin display the delete link
+		if(isadminloggedin())
+			echo " " . $delete . " ";	
+		echo "</small></p>";
+		//display the message
+		echo "<p>" . $message . "</p>";
+	
+		//display the input form to add a new message
+		if(isadminloggedin()){
+			//action
+			$action = "riverdashboard/add";
+			$link = elgg_echo("sitemessages:add");
+			$input_area = elgg_view('input/plaintext', array('internalname' => 'sitemessage', 'value' => ''));
+			$submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
+			$form_body = <<<EOT
+	
+			<p><a class="collapsibleboxlink">{$link}</a></p>
+			<div class="collapsible_box">
+				{$input_area}<br />{$submit_input}
+			</div>
+	
+EOT;
+?>
+
+<?php
+			//display the form
+			echo elgg_view('input/form', array('action' => "{$vars['url']}action/$action", 'body' => $form_body));
+
+		}//end of admin if statement
+?>
+<?php
+	//if there is no message, add a form to create one
+	}else{
+
+		if(isadminloggedin()){
+		
+			//action
+			$action = "riverdashboard/add";
+			$link = elgg_echo("sitemessages:add");
+			$input_area = elgg_view('input/text', array('internalname' => 'sitemessage', 'value' => ''));
+			$submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
+			$form_body = <<<EOT
+	
+			<p><a class="collapsibleboxlink">{$link}</a></p>
+			<div class="collapsible_box">
+				{$input_area}<br />{$submit_input}
+			</div>
+EOT;
+?>
+<?php
+		//display the form
+		echo elgg_view('input/form', array('action' => "{$vars['url']}action/$action", 'body' => $form_body));
+
+	}//end of admin check
+	}//end of main if
+?>
+</div>
diff --git a/mod/riverdashboard/views/default/riverdashboard/welcome.php b/mod/riverdashboard/views/default/riverdashboard/welcome.php
new file mode 100644
index 000000000..23541c0ac
--- /dev/null
+++ b/mod/riverdashboard/views/default/riverdashboard/welcome.php
@@ -0,0 +1,17 @@
+<?php
+
+	/**
+	 * Elgg thewire view page
+	 * 
+	 * @package ElggTheWire
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 */
+	 
+?>
+<div id="content_area_user_title">
+<h2><?php echo sprintf(elgg_echo('welcome:user'), $_SESSION['user']->name); ?></h2>
+</div>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/settings/riverdashboard/edit.php b/mod/riverdashboard/views/default/settings/riverdashboard/edit.php
new file mode 100644
index 000000000..2e0a434fb
--- /dev/null
+++ b/mod/riverdashboard/views/default/settings/riverdashboard/edit.php
@@ -0,0 +1,16 @@
+<?php
+?>
+<p>
+	<?php echo elgg_echo('riverdashboard:useasdashboard'); ?>
+	<select name="params[useasdashboard]">
+		<option value="yes" <?php if ($vars['entity']->useasdashboard == 'yes') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:yes'); ?></option>
+		<option value="no" <?php if ($vars['entity']->useasdashboard != 'yes') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:no'); ?></option>
+	</select>
+</p>
+<p>
+	<?php echo elgg_echo('riverdashboard:avataricon'); ?>
+	<select name="params[avatar_icon]">
+		<option value="icon" <?php if ($vars['entity']->avatar_icon == 'icon') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:icon'); ?></option>
+		<option value="avatar" <?php if ($vars['entity']->avatar_icon == 'avatar') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:avatar'); ?></option>
+	</select>
+</p>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/widgets/river_widget/edit.php b/mod/riverdashboard/views/default/widgets/river_widget/edit.php
new file mode 100644
index 000000000..3f3c9d625
--- /dev/null
+++ b/mod/riverdashboard/views/default/widgets/river_widget/edit.php
@@ -0,0 +1,36 @@
+<?php
+	/**
+	 * Edit the widget
+	 * 
+	 * @package ElggRiver
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	if(!$vars['entity']->content_type)
+		$content_type = 'mine';
+	else
+		$content_type = $vars['entity']->content_type;
+
+		
+?>
+<p>
+	<?php echo elgg_echo('river:widget:label:displaynum'); ?>
+	
+	<select name="params[num_display]">
+		<option value="5" <?php if ($vars['entity']->num_display == 5) echo " selected=\"yes\" "; ?>>5</option>
+		<option value="8" <?php if (($vars['entity']->num_display == 8)) echo " selected=\"yes\" "; ?>>8</option>
+		<option value="12" <?php if ($vars['entity']->num_display == 12) echo " selected=\"yes\" "; ?>>12</option>
+		<option value="15" <?php if ($vars['entity']->num_display == 15) echo " selected=\"yes\" "; ?>>15</option>
+	</select>
+</p>
+<p>	
+	<?php echo elgg_echo('river:widget:type'); ?>
+	
+	<select name="params[content_type]">
+		<option value="mine" <?php if ($content_type == 'mine') echo " selected=\"yes\" "; ?>><?php echo elgg_echo("river:widgets:mine");?></option>
+		<option value="friends" <?php if ($content_type != 'mine') echo " selected=\"yes\" "; ?>><?php echo elgg_echo("river:widgets:friends");?></option>
+	</select>
+</p>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/widgets/river_widget/view.php b/mod/riverdashboard/views/default/widgets/river_widget/view.php
new file mode 100644
index 000000000..039962c27
--- /dev/null
+++ b/mod/riverdashboard/views/default/widgets/river_widget/view.php
@@ -0,0 +1,40 @@
+<?php
+	/**
+	 * View the widget
+	 * 
+	 * @package ElggRiver
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$owner = page_owner_entity();
+	
+	//get the type - mine or friends
+	$type = $vars['entity']->content_type;
+	if(!$type)
+		$type = "mine";
+		
+	//based on type grab the correct content type
+	if($type == "mine")
+		$content_type = '';
+	else
+		$content_type = 'friend';
+		
+	//get the number of items to display
+	$limit = $vars['entity']->num_display;
+	if(!$limit)
+		$limit = 4;
+	
+	//grab the river
+	$river = elgg_view_river_items($owner->getGuid(), 0, $content_type, $content[0], $content[1], '', $limit,0,0,false);
+	
+	//display
+	echo "<div class=\"contentWrapper\">";
+	if($type != 'mine')
+		echo "<div class='content_area_user_title'><h2>" . elgg_echo("friends") . "</h2></div>";
+	echo $river;
+	echo "</div>";
+	
+?>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/json/riverdashboard/container.php b/mod/riverdashboard/views/json/riverdashboard/container.php
new file mode 100644
index 000000000..871a6cc7e
--- /dev/null
+++ b/mod/riverdashboard/views/json/riverdashboard/container.php
@@ -0,0 +1 @@
+<?php echo $vars['body']; ?>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/rss/riverdashboard/container.php b/mod/riverdashboard/views/rss/riverdashboard/container.php
new file mode 100644
index 000000000..871a6cc7e
--- /dev/null
+++ b/mod/riverdashboard/views/rss/riverdashboard/container.php
@@ -0,0 +1 @@
+<?php echo $vars['body']; ?>
\ No newline at end of file
diff --git a/mod/search/views/default/search/css.php b/mod/search/views/default/search/css.php
index 19cca02e8..fdc402199 100644
--- a/mod/search/views/default/search/css.php
+++ b/mod/search/views/default/search/css.php
@@ -1,47 +1,37 @@
 .searchtype {
-background: #FFFACD;
-color: black;
+	background: #FFFACD;
+	color: black;
 }
-
 .searchtypes {
-border: 1px #EEEEEE solid;
-padding: 4px;
-margin: 6px;
+	border: 1px #EEEEEE solid;
+	padding: 4px;
+	margin: 6px;
 }
-
 .searchListing {
 	display: block;
 	margin-bottom: 2em;
 }
-
 .searchMatch {
 	background-color: #FFFF66;
 }
-
 .searchMatchColor1 {
 	background-color: #FFFF66;
 }
-
 .searchMatchColor2 {
 	background-color: #A0FFFF;
 }
-
 .searchMatchColor3 {
 	background-color: #FF9999;
 }
-
 .searchMatchColor4 {
 	background-color: #FF66FF;
 }
-
 .searchMatchColor5 {
 	background-color: #99FF99;
 }
-
 .searchTitle {
 	text-decoration: underline;
 }
-
 #searchform input.search_input {
 	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
@@ -73,8 +63,7 @@ margin: 6px;
 	color:#ffffff;
 	background: #4690d6;
 }
-
-
+/*
 .search_listing {
 	display: block;
 	-webkit-border-radius: 8px;
@@ -88,8 +77,9 @@ margin: 6px;
 	background: none;
 	text-align: center;
 }
+*/
 
-/* override the entity container piece */
+/* override the entity container piece 
 .search_listing .search_listing {
 	-webkit-border-radius: 0px;
 	-moz-border-radius: 0px;
@@ -97,4 +87,4 @@ margin: 6px;
 	margin: 0;
 	padding: 0;
 }
-
+*/
diff --git a/mod/thewire/actions/add.php b/mod/thewire/actions/add.php
new file mode 100644
index 000000000..58589dc9a
--- /dev/null
+++ b/mod/thewire/actions/add.php
@@ -0,0 +1,63 @@
+<?php
+
+	/**
+	 * Elgg thewire: add shout action
+	 * 
+	 * @package Elggthewire
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in (send us to the front page if not)
+		if (!isloggedin()) forward();
+
+	// Get input data
+		$body = get_input('note');
+		$tags = get_input('thewiretags');
+		$access_id = (int)get_default_access();
+		if ($access_id == ACCESS_PRIVATE)
+			$access_id = ACCESS_LOGGED_IN; // Private wire messages are pointless
+		$location = get_input('location');
+		$method = get_input('method');
+		$parent = (int)get_input('parent', 0);
+		if(!$parent)   
+		    $parent = 0;
+	
+	// convert the shout body into tags
+	    $tagarray = filter_string($body);
+		
+	// Make sure the title / description aren't blank
+		if (empty($body)) {
+			register_error(elgg_echo("thewire:blank"));
+			forward("mod/thewire/add.php");
+			
+	// Otherwise, save the thewire post 
+		} else {
+			
+			if (!thewire_save_post($body, $access_id, $parent, $method)) {
+				register_error(elgg_echo("thewire:error"));
+				if($location == "activity")
+					forward("mod/riverdashboard/");
+				else
+					forward("mod/thewire/add.php");
+			}
+	        
+	// Now let's add tags. We can pass an array directly to the object property! Easy.
+			if (is_array($tagarray)) {
+				$thewire->tags = $tagarray;
+			}
+	        
+	// Success message
+			system_message(elgg_echo("thewire:posted"));
+	
+	// Forward 
+			if($location == "activity")
+					forward("mod/riverdashboard/");
+			else
+					forward("mod/thewire/everyone.php");
+				
+		}
+		
+?>
\ No newline at end of file
diff --git a/mod/thewire/actions/delete.php b/mod/thewire/actions/delete.php
new file mode 100644
index 000000000..60f69d4e7
--- /dev/null
+++ b/mod/thewire/actions/delete.php
@@ -0,0 +1,38 @@
+<?php
+
+	/**
+	 * Elgg thewire: delete note action
+	 * 
+	 * @package ElggTheWire
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in (send us to the front page if not)
+		if (!isloggedin()) forward();
+
+	// Get input data
+		$guid = (int) get_input('thewirepost');
+		
+	// Make sure we actually have permission to edit
+		$thewire = get_entity($guid);
+		if ($thewire->getSubtype() == "thewire" && $thewire->canEdit()) {
+	
+		// Get owning user
+				$owner = get_entity($thewire->getOwner());
+		// Delete it!
+				$rowsaffected = $thewire->delete();
+				if ($rowsaffected > 0) {
+		// Success message
+					system_message(elgg_echo("thewire:deleted"));
+				} else {
+					register_error(elgg_echo("thewire:notdeleted"));
+				}
+		// Forward to the main wire page
+				forward("mod/thewire/?username=" . $owner->username);
+		
+		}
+		
+?>
\ No newline at end of file
diff --git a/mod/thewire/add.php b/mod/thewire/add.php
new file mode 100644
index 000000000..4702c9aa5
--- /dev/null
+++ b/mod/thewire/add.php
@@ -0,0 +1,28 @@
+<?php
+
+	/**
+	 * Elgg thewire add entry page
+	 * 
+	 * @package ElggTheWire
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 *
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// If we're not logged in, forward to the front page
+		if (!isloggedin()) forward(); 
+		
+	// choose the required canvas layout and items to display
+	    $area2 = elgg_view_title(elgg_echo('thewire:add'));
+	    $area2 .= elgg_view("thewire/forms/add");
+	    $body = elgg_view_layout("two_column_left_sidebar", '',$area2);
+		
+	// Display page
+		page_draw(elgg_echo('thewire:addpost'),$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/thewire/everyone.php b/mod/thewire/everyone.php
new file mode 100644
index 000000000..a5214a212
--- /dev/null
+++ b/mod/thewire/everyone.php
@@ -0,0 +1,27 @@
+<?php
+
+	/**
+	 * Elgg view all thewire posts from all users page
+	 * 
+	 * @package ElggTheWire
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+		$area2 = elgg_view_title(elgg_echo("thewire:everyone"));
+		
+		//add form
+		$area2 .= elgg_view("thewire/forms/add");
+
+		$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'thewire')); // elgg_view("thewire/view",array('entity' => $thewireposts));
+	    $body = elgg_view_layout("two_column_left_sidebar", '', $area2);
+		
+	// Display page
+		page_draw(elgg_echo('thewire:everyone'),$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/thewire/graphics/river_icon_thewire.gif b/mod/thewire/graphics/river_icon_thewire.gif
new file mode 100644
index 000000000..59cc6bfaa
--- /dev/null
+++ b/mod/thewire/graphics/river_icon_thewire.gif
diff --git a/mod/thewire/graphics/thewire_speech_bubble.gif b/mod/thewire/graphics/thewire_speech_bubble.gif
new file mode 100644
index 000000000..d0e8606a1
--- /dev/null
+++ b/mod/thewire/graphics/thewire_speech_bubble.gif
diff --git a/mod/thewire/index.php b/mod/thewire/index.php
new file mode 100644
index 000000000..2514d7452
--- /dev/null
+++ b/mod/thewire/index.php
@@ -0,0 +1,38 @@
+<?php
+
+	/**
+	 * Elgg thewire index page
+	 * 
+	 * @package Elggthewire
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	// Load Elgg engine
+		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+	// Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($page_owner->getGUID());
+		}
+		
+	// title
+	    $area2 = elgg_view_title(elgg_echo("thewire:read"));
+	    
+	//add form
+		$area2 .= elgg_view("thewire/forms/add");
+	    
+	// Display the user's wire
+		$area2 .= list_user_objects($page_owner->getGUID(),'thewire'); // elgg_view("thewire/view",array('entity' => $thewire));
+    
+    //select the correct canvas area
+	    $body = elgg_view_layout("two_column_left_sidebar", '', $area2);
+		
+	// Display page
+		page_draw(sprintf(elgg_echo('thewire:user'),$page_owner->name),$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php
new file mode 100644
index 000000000..da0fc222f
--- /dev/null
+++ b/mod/thewire/languages/en.php
@@ -0,0 +1,79 @@
+<?php
+
+	$english = array(
+	
+		/**
+		 * Menu items and titles
+		 */
+	
+			'thewire' => "The wire",
+			'thewire:user' => "%s's wire",
+			'thewire:posttitle' => "%s's notes on the wire: %s",
+			'thewire:everyone' => "All wire posts",
+	
+			'thewire:read' => "Wire posts",
+			
+			'thewire:strapline' => "%s",
+	
+			'thewire:add' => "Post to the wire",
+		    'thewire:text' => "A note on the wire",
+			'thewire:reply' => "Reply",
+			'thewire:via' => "via",
+			'thewire:wired' => "Posted to the wire",
+			'thewire:charleft' => "characters left",
+			'item:object:thewire' => "Wire posts",
+			'thewire:notedeleted' => "note deleted",
+			'thewire:doing' => "What are you doing? Tell everyone on the wire:",
+			'thewire:newpost' => 'New wire post',
+			'thewire:addpost' => 'Post to the wire',
+
+	
+        /**
+	     * The wire river
+	     **/
+	        
+	        //generic terms to use
+	        'thewire:river:created' => "%s posted",
+	        
+	        //these get inserted into the river links to take the user to the entity
+	        'thewire:river:create' => "on the wire.",
+	        
+	    /**
+	     * Wire widget
+	     **/
+	     
+	        'thewire:sitedesc' => 'This widget shows the latest site notes posted to the wire',
+	        'thewire:yourdesc' => 'This widget shows your latest notes posted to the wire',
+	        'thewire:friendsdesc' => 'This widget will show the latest from your friends on the wire',
+	        'thewire:friends' => 'Your friends on the wire',
+	        'thewire:num' => 'Number of items to display',
+	        
+	        
+	
+		/**
+		 * Status messages
+		 */
+	
+			'thewire:posted' => "Your message was successfully posted to the wire.",
+			'thewire:deleted' => "Your wire post was successfully deleted.",
+	
+		/**
+		 * Error messages
+		 */
+	
+			'thewire:blank' => "Sorry; you need to actually put something in the textbox before we can save it.",
+			'thewire:notfound' => "Sorry; we could not find the specified wire post.",
+			'thewire:notdeleted' => "Sorry; we could not delete this wire post.",
+	
+	
+		/**
+		 * Settings
+		 */
+			'thewire:smsnumber' => "Your SMS number if different from your mobile number (mobile number must be set to public for the wire to be able to use it). All phone numbers must be in international format.",
+			'thewire:channelsms' => "The number to send SMS messages to is <b>%s</b>",
+			
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/thewire/manifest.xml b/mod/thewire/manifest.xml
new file mode 100644
index 000000000..080b69b73
--- /dev/null
+++ b/mod/thewire/manifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider" />
+        <field key="version" value="1.7" />
+        <field key="description" value="Provides a microblogging service for your Elgg site." />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+        <field key="licence" value="GNU Public License version 2" />
+        <field key="recommends" value="smsclient" />
+        <field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/thewire/readme.txt b/mod/thewire/readme.txt
new file mode 100644
index 000000000..0971ee4a8
--- /dev/null
+++ b/mod/thewire/readme.txt
@@ -0,0 +1,13 @@
+/**
+	 * Elgg the wire
+	 * 
+	 * @package ElggTheWire
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2009
+	 * @link http://elgg.com/
+*/
+
+This is a twitter style, short message service that allows users to post notes to the wire.
+
+Install: Just drop it into the mod directory and that should be it.
\ No newline at end of file
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
new file mode 100644
index 000000000..dfa57bd17
--- /dev/null
+++ b/mod/thewire/start.php
@@ -0,0 +1,221 @@
+<?php
+
+	/**
+	 * Elgg wire plugin
+	 * The wire is simple twitter like plugin that allows users to post notes to the wire
+	 * 
+	 * @package ElggTheWire
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	/**
+	 * thewire initialisation
+	 *
+	 * These parameters are required for the event API, but we won't use them:
+	 * 
+	 * @param unknown_type $event
+	 * @param unknown_type $object_type
+	 * @param unknown_type $object
+	 */
+
+		function thewire_init() {
+			
+			// Load system configuration
+				global $CONFIG;
+				
+			// Set up menu for logged in users
+				if (isloggedin()) {
+		
+					add_menu(elgg_echo('thewire'), $CONFIG->wwwroot . "mod/thewire/everyone.php");
+			
+				} 
+				
+			// Extend system CSS with our own styles, which are defined in the thewire/css view
+				elgg_extend_view('css','thewire/css');
+				
+		    //extend views
+				elgg_extend_view('activity/thewire', 'thewire/activity_view');
+				elgg_extend_view('profile/status', 'thewire/profile_status');
+				
+			// Register a page handler, so we can have nice URLs
+				register_page_handler('thewire','thewire_page_handler');
+				
+			// Register a URL handler for thewire posts
+				register_entity_url_handler('thewire_url','object','thewire');
+				
+			// Your thewire widget
+			    add_widget_type('thewire',elgg_echo("thewire:read"),elgg_echo("thewire:yourdesc"));
+			    
+			// Register entity type
+				register_entity_type('object','thewire');
+				
+			// Listen for SMS create event
+			register_elgg_event_handler('create','object','thewire_incoming_sms');
+			
+			// Register granular notification for this type
+			if (is_callable('register_notification_object'))
+				register_notification_object('object', 'thewire', elgg_echo('thewire:newpost'));
+			
+			// Listen to notification events and supply a more useful message for SMS'
+			register_plugin_hook('notify:entity:message', 'object', 'thewire_notify_message');
+		}
+		
+		function thewire_pagesetup() {
+			
+			global $CONFIG;
+
+			//add submenu options
+				if (get_context() == "thewire") {
+					if ((page_owner() == $_SESSION['guid'] || !page_owner()) && isloggedin()) {
+						add_submenu_item(elgg_echo('thewire:read'),$CONFIG->wwwroot."pg/thewire/" . $_SESSION['user']->username);
+						add_submenu_item(elgg_echo('thewire:everyone'),$CONFIG->wwwroot."mod/thewire/everyone.php");
+						//add_submenu_item(elgg_echo('thewire:add'),$CONFIG->wwwroot."mod/thewire/add.php");
+					} 
+				}
+			
+		}
+		
+		/**
+		 * thewire page handler; allows the use of fancy URLs
+		 *
+		 * @param array $page From the page_handler function
+		 * @return true|false Depending on success
+		 */
+		function thewire_page_handler($page) {
+			
+			// The first component of a thewire URL is the username
+			if (isset($page[0])) {
+				set_input('username',$page[0]);
+			}
+			
+			// The second part dictates what we're doing
+			if (isset($page[1])) {
+				switch($page[1]) {
+					case "friends":		// TODO: add friends thewire page here
+										break;
+				}
+			// If the URL is just 'thewire/username', or just 'thewire/', load the standard thewire index
+			} else {
+				@include(dirname(__FILE__) . "/index.php");
+				return true;
+			}
+			
+			return false;
+			
+		}
+
+		function thewire_url($thewirepost) {
+			
+			global $CONFIG;
+			return $CONFIG->url . "pg/thewire/" . $thewirepost->getOwnerEntity()->username;
+			
+		}
+		
+		/**
+		 * Returns a more meaningful message for SMS messages.
+		 *
+		 * @param unknown_type $hook
+		 * @param unknown_type $entity_type
+		 * @param unknown_type $returnvalue
+		 * @param unknown_type $params
+		 */
+		function thewire_notify_message($hook, $entity_type, $returnvalue, $params)
+		{
+			$entity = $params['entity'];
+			$to_entity = $params['to_entity'];
+			$method = $params['method'];
+			if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'thewire'))
+			{
+				$descr = $entity->description;
+				if ($method == 'sms') {
+					$owner = $entity->getOwnerEntity();
+					return $owner->username . ': ' . $descr;
+				}
+				if ($method == 'email') {
+					$owner = $entity->getOwnerEntity();
+					return $owner->username . ': ' . $descr . "\n\n" . $entity->getURL();
+				}
+			}
+			return null;
+		}
+		
+		/**
+		 * Create a new wire post.
+		 *
+		 * @param string $post The post
+		 * @param int $access_id Public/private etc
+		 * @param int $parent Parent post (if any)
+		 * @param string $method The method (default: 'site')
+		 * @return bool
+		 */
+		function thewire_save_post($post, $access_id, $parent=0, $method = "site")
+		{
+			
+			global $SESSION; 
+			
+			// Initialise a new ElggObject
+			$thewire = new ElggObject();
+			
+			// Tell the system it's a thewire post
+			$thewire->subtype = "thewire";
+			
+			// Set its owner to the current user
+			$thewire->owner_guid = get_loggedin_userid();
+			
+			// For now, set its access to public (we'll add an access dropdown shortly)
+			$thewire->access_id = $access_id;
+			
+			// Set its description appropriately
+			$thewire->description = elgg_substr(strip_tags($post), 0, 160);
+			/*if (is_callable('mb_substr'))
+				$thewire->description = mb_substr(strip_tags($post), 0, 160);
+			else
+				$thewire->description = substr(strip_tags($post), 0, 160);*/
+			
+		    // add some metadata
+	        $thewire->method = $method; //method, e.g. via site, sms etc
+	        $thewire->parent = $parent; //used if the note is a reply
+	        
+	        //save
+			$save = $thewire->save();
+
+			if($save)
+				add_to_river('river/object/thewire/create','create',$SESSION['user']->guid,$thewire->guid);
+	        
+	        return $save;
+
+		}
+		
+		/**
+		 * Listen and process incoming SMS'
+		 */
+		function thewire_incoming_sms($event, $object_type, $object)
+		{
+			if (($object) && ($object->subtype == get_subtype_id('object', 'sms')))
+			{
+				// Get user from phone number
+				if ((is_plugin_enabled('smsclient')) && (is_plugin_enabled('smslogin')))
+				{
+					// By this stage the owner should be logged in (requires SMS Login)
+					if (thewire_save_post($object->description, get_default_access(), 0, 'sms'))
+						return false;
+					
+				}
+			}
+					
+			return true; // always create the shout even if it can't be sent
+		}
+	
+	// Make sure the thewire initialisation function is called on initialisation
+		register_elgg_event_handler('init','system','thewire_init');
+		register_elgg_event_handler('pagesetup','system','thewire_pagesetup');
+		
+	// Register actions
+		global $CONFIG;
+		register_action("thewire/add",false,$CONFIG->pluginspath . "thewire/actions/add.php");
+		register_action("thewire/delete",false,$CONFIG->pluginspath . "thewire/actions/delete.php");
+		
+?>
\ No newline at end of file
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
new file mode 100644
index 000000000..3e8e53124
--- /dev/null
+++ b/mod/thewire/views/default/object/thewire.php
@@ -0,0 +1,102 @@
+<?php
+
+	/**
+	 * Elgg thewire note view
+	 * 
+	 * @package ElggTheWire
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 *
+	 * @question - do we want users to be able to edit thewire?
+	 * 
+	 * @uses $vars['entity'] Optionally, the note to view
+	 */
+
+	if (isset($vars['entity'])) {
+    		
+    		$user_name = $vars['entity']->getOwnerEntity()->name;
+    		
+    		//if the note is a reply, we need some more info
+    		
+			$note_url = '';
+			$note_owner = elgg_echo("thewire:notedeleted");
+    		
+?>
+<div class="thewire-singlepage">
+	<div class="thewire-post">
+			    
+	    <!-- the actual shout -->
+		<div class="note_body">
+
+	    <div class="thewire_icon">
+	    <?php
+		        echo elgg_view("profile/icon",array('entity' => $vars['entity']->getOwnerEntity(), 'size' => 'small'));
+	    ?>
+	    </div>
+
+			<div class="thewire_options">
+			
+			<a href="<?php echo $vars['url']; ?>mod/thewire/add.php?wire_username=<?php echo $vars['entity']->getOwnerEntity()->username; ?>" class="reply"><?php echo elgg_echo('thewire:reply'); ?></a>
+		<?php
+/*		    //only have a reply option for main notes, not other replies
+		    if($vars['entity']->parent == 0){
+        ?>
+		<a href="<?php echo $vars['url']; ?>mod/thewire/reply.php?note_id=<?php echo $vars['entity']->guid; ?>" class="reply">reply</a>
+		<?php
+	        }
+*/
+	    ?>
+	    <div class="clearfloat"></div>
+	    		<?php
+				   
+			// if the user looking at thewire post can edit, show the delete link
+			if ($vars['entity']->canEdit()) {
+						
+	  
+					   echo "<div class='delete_note'>" . elgg_view("output/confirmlink",array(
+															'href' => $vars['url'] . "action/thewire/delete?thewirepost=" . $vars['entity']->getGUID(),
+															'text' => elgg_echo('delete'),
+															'confirm' => elgg_echo('deleteconfirm'),
+														)) . "</div>";
+			
+			} //end of can edit if statement
+		?>
+	    </div>
+	    
+		
+		<?php
+		    echo "<b>{$user_name}: </b>";
+		    
+
+		    $desc = $vars['entity']->description;
+
+		    $desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
+			echo parse_urls($desc);
+		?>
+		
+		
+		<div class="clearfloat"></div>
+		</div>
+		<div class="note_date">
+		
+		<?php
+			
+				echo elgg_echo("thewire:wired") . " " . sprintf(elgg_echo("thewire:strapline"),
+								friendly_time($vars['entity']->time_created)
+				);
+				
+				echo " via " . elgg_echo($vars['entity']->method) . ".";
+			
+		?>
+		</div>
+		
+		
+	</div>
+</div>
+<?php
+
+		}
+
+?>
\ No newline at end of file
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
new file mode 100644
index 000000000..9984e99e7
--- /dev/null
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -0,0 +1,17 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	$url = $object->getURL();
+
+	$string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}:</a> ";
+	$desc .= $object->description;
+	$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
+	$string .= parse_urls($desc);
+
+	$string .= " <span class=\"river_item_time\"><a href=\"{$vars['url']}mod/thewire/add.php?wire_username={$object->getOwnerEntity()->username}\" class=\"reply\">" . elgg_echo('thewire:reply') . "</a></span>";
+?>
+
+<?php 
+	echo $string; 
+?>
\ No newline at end of file
diff --git a/mod/thewire/views/default/thewire/activity_view.php b/mod/thewire/views/default/thewire/activity_view.php
new file mode 100644
index 000000000..7edd64680
--- /dev/null
+++ b/mod/thewire/views/default/thewire/activity_view.php
@@ -0,0 +1,48 @@
+<?php
+
+	/**
+	 * New wire post view for the activity stream
+	 */
+
+	//grab the users latest from the wire
+	$latest_wire = elgg_list_entities(array('types' => 'object', 'subtypes' => 'thewire', 'owner_guid' => $_SESSION['user']->getGUID(), 'limit' => 1, 'full_view' => TRUE, 'view_type_toggle' => FALSE, 'pagination' => FALSE));
+
+?>
+
+<script>
+function textCounter(field,cntfield,maxlimit) {
+    // if too long...trim it!
+    if (field.value.length > maxlimit) {
+        field.value = field.value.substring(0, maxlimit);
+    } else {
+        // otherwise, update 'characters left' counter
+        cntfield.value = maxlimit - field.value.length;
+    }
+}
+</script>
+
+<div class="sidebarBox">
+
+	<form action="<?php echo $vars['url']; ?>action/thewire/add" method="post" name="noteForm">
+			
+		<?php
+			$display .= "<h3>" . elgg_echo('thewire:newpost') . "</h3><textarea name='note' value='' onKeyDown=\"textCounter(document.noteForm.note,document.noteForm.remLen1,140)\" onKeyUp=\"textCounter(document.noteForm.note,document.noteForm.remLen1,140)\" id=\"thewire_sidebarInputBox\">{$msg}</textarea><br />";
+			$display .= "<div class='thewire_characters_remaining'><input readonly type=\"text\" name=\"remLen1\" size=\"3\" maxlength=\"3\" value=\"140\" class=\"thewire_characters_remaining_field\">";
+			echo $display;
+			echo elgg_echo("thewire:charleft") . "</div>";
+		?>
+			<input type="hidden" name="method" value="site" />
+			<input type="hidden" name="location" value="activity" />
+			<input type="hidden" name="access_id" value="2" />
+			<input type="submit" value="<?php echo elgg_echo('save'); ?>" id="thewire_submit_button" />
+	</form>
+
+	<div class="last_wirepost">
+		<?php
+			echo $latest_wire;
+		?>
+	</div>
+	
+	<img src="<?php echo $vars['url']; ?>mod/thewire/graphics/river_icon_thewire.gif" alt="the wire" align="left" style="margin-right:5px;"/><a href="<?php echo $vars['url']; ?>mod/thewire/everyone.php" />Read the wire</a>
+
+</div>
\ No newline at end of file
diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php
new file mode 100644
index 000000000..6491af2ed
--- /dev/null
+++ b/mod/thewire/views/default/thewire/css.php
@@ -0,0 +1,136 @@
+<?php
+
+	/**
+	 * Elgg thewire CSS extender
+	 * 
+	 * @package ElggTheWire
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+/* widget */
+.thewire-singlepage {
+	margin:0 10px 0 10px;
+}
+.thewire-singlepage .note_body {
+	background: white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+}
+.collapsable_box_content .note_body {
+	line-height:1.2em;
+}
+.thewire-singlepage .thewire-post {
+	margin-bottom:5px;
+	background:transparent url(<?php echo $vars['url']; ?>mod/thewire/graphics/thewire_speech_bubble.gif) no-repeat right bottom; 
+}
+.thewire-post {
+	background:#cccccc;
+	margin-bottom:10px;
+}
+.thewire-post .note_date {
+	font-size:90%;
+	color:#666666;
+	padding:0;
+}
+.thewire_icon {
+    float:left;
+    margin:0 8px 4px 2px;
+}
+.note_body {
+	margin:0;
+	padding:6px 4px 4px 4px;
+	min-height: 40px;
+	line-height: 1.4em;
+}
+.thewire_options {
+	float:right;
+	width:65px;
+}
+.thewire-post .reply {
+	font: 11px/100% Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	color: #ffffff;
+	background:#999999;
+	border: 2px solid #999999;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+	width: auto;
+	padding: 0 3px 2px 3px;
+	margin:0 0 5px 5px;
+	cursor: pointer;
+	float:right;
+}
+.thewire-post .reply:hover {
+	background: #4690d6;
+	border: 2px solid #4690d6;
+	color:white;
+	text-decoration: none;
+}
+.thewire-post .delete_note {
+	width:14px;
+	height:14px;
+	margin:3px 0 0 0;
+	float:right;
+}
+.thewire-post .delete_note a {
+	display:block;
+	cursor: pointer;
+	width:14px;
+	height:14px;
+	background: url("<?php echo $vars['url']; ?>_graphics/icon_customise_remove.png") no-repeat 0 0;
+	text-indent: -9000px;
+}
+.thewire-post .delete_note a:hover {
+	background-position: 0 -16px;
+}
+/* IE 6 fix */
+* html .thewire-post .delete_note a { background-position-y: 2px; }
+* html .thewire-post .delete_note a:hover { background-position-y: -14px; }
+
+.post_to_wire {
+	background: white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	margin:0 10px 10px 10px;
+	padding:10px;	
+}
+.post_to_wire input[type="submit"] {
+	margin:0;
+}
+
+/* reply form */
+textarea#thewire_large-textarea {
+	width: 664px;
+	height: 40px;
+	padding: 6px;
+	font-family: Arial, 'Trebuchet MS','Lucida Grande', sans-serif;
+	font-size: 100%;
+	color:#666666;
+}
+/* IE 6 fix */
+* html textarea#thewire_large-textarea { 
+	width: 642px;
+}
+
+input.thewire_characters_remaining_field { 
+	color:#333333;
+	border:none;
+	font-size: 100%;
+	font-weight: bold;
+	padding:0 2px 0 0;
+	margin:0;
+	text-align: right;
+	background: white;
+}
+input.thewire_characters_remaining_field:focus {
+	border:none;
+	background:white;
+}
+.thewire_characters_remaining {
+	text-align: right;
+}
+
diff --git a/mod/thewire/views/default/thewire/forms/add.php b/mod/thewire/views/default/thewire/forms/add.php
new file mode 100644
index 000000000..cf9ff15e6
--- /dev/null
+++ b/mod/thewire/views/default/thewire/forms/add.php
@@ -0,0 +1,44 @@
+<?php
+
+	/**
+	 * Elgg thewire edit/add page
+	 * 
+	 * @package ElggTheWire
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 */
+
+		$wire_user = get_input('wire_username');
+		if (!empty($wire_user)) { $msg = '@' . $wire_user . ' '; } else { $msg = ''; }
+
+?>
+<div class="post_to_wire">
+<h3><?php echo elgg_echo("thewire:doing"); ?></h3>
+<script>
+function textCounter(field,cntfield,maxlimit) {
+    // if too long...trim it!
+    if (field.value.length > maxlimit) {
+        field.value = field.value.substring(0, maxlimit);
+    } else {
+        // otherwise, update 'characters left' counter
+        cntfield.value = maxlimit - field.value.length;
+    }
+}
+</script>
+
+	<form action="<?php echo $vars['url']; ?>action/thewire/add" method="post" name="noteForm">
+			<?php
+			    $display .= "<textarea name='note' value='' onKeyDown=\"textCounter(document.noteForm.note,document.noteForm.remLen1,140)\" onKeyUp=\"textCounter(document.noteForm.note,document.noteForm.remLen1,140)\" id=\"thewire_large-textarea\">{$msg}</textarea>";
+                $display .= "<div class='thewire_characters_remaining'><input readonly type=\"text\" name=\"remLen1\" size=\"3\" maxlength=\"3\" value=\"140\" class=\"thewire_characters_remaining_field\">";
+                echo $display;
+                echo elgg_echo("thewire:charleft") . "</div>";
+				echo elgg_view('input/securitytoken');
+			?>
+			<input type="hidden" name="method" value="site" />
+			<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
+	</form>
+</div>
+<?php echo elgg_view('input/urlshortener'); ?>
\ No newline at end of file
diff --git a/mod/thewire/views/default/thewire/notfound.php b/mod/thewire/views/default/thewire/notfound.php
new file mode 100644
index 000000000..bc53815fb
--- /dev/null
+++ b/mod/thewire/views/default/thewire/notfound.php
@@ -0,0 +1,21 @@
+<?php
+
+	/**
+	 * Elgg shout not found page
+	 * 
+	 * @package ElggShouts
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+
+	<p>
+		<?php
+
+			echo elgg_echo("thewire:notfound");
+		
+		?>
+	</p>
\ No newline at end of file
diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php
new file mode 100644
index 000000000..890b8b9c3
--- /dev/null
+++ b/mod/thewire/views/default/thewire/profile_status.php
@@ -0,0 +1,28 @@
+<?php
+
+	/**
+	 * New wire post view for the activity stream
+	 */
+	 
+	$owner = $vars['entity']->guid;
+	$url_to_wire = $vars['url'] . "pg/thewire/" . $vars['entity']->username;
+	
+	//grab the users latest from the wire
+	$latest_wire = elgg_get_entities(array('types' => 'object', 'subtypes' => 'thewire', 'owner_guid' => $owner, 'limit' => 1)); 
+
+	if($latest_wire){
+		foreach($latest_wire as $lw){
+			$content = $lw->description;
+			$time = "<span> (" . friendly_time($lw->time_created) . ")</span>";
+		}
+	}
+	
+	if($latest_wire){
+		echo "<div class=\"profile_status\">";
+		echo $content;
+		if($owner == $_SESSION['user']->guid)
+			echo " <a class=\"status_update\" href=\"{$url_to_wire}\">update</a>";
+		echo $time;
+		echo "</div>";
+	}
+?>
\ No newline at end of file
diff --git a/mod/thewire/views/default/thewire/scripts/counter.js b/mod/thewire/views/default/thewire/scripts/counter.js
new file mode 100644
index 000000000..3a1ebdbc5
--- /dev/null
+++ b/mod/thewire/views/default/thewire/scripts/counter.js
@@ -0,0 +1,19 @@
+// I need to move this into a JS folder for the plugin
+
+/*
+<!-- Dynamic Version by: Nannette Thacker -->
+<!-- http://www.shiningstar.net -->
+<!-- Original by :  Ronnie T. Moore -->
+<!-- Web Site:  The JavaScript Source -->
+<!-- Limit the number of characters per textarea -->
+*/
+
+function textCounter(field,cntfield,maxlimit) {
+    // if too long...trim it!
+    if (field.value.length > maxlimit) {
+        field.value = field.value.substring(0, maxlimit);
+    } else {
+        // otherwise, update 'characters left' counter
+        cntfield.value = maxlimit - field.value.length;
+    }
+}
diff --git a/mod/thewire/views/default/thewire/view.php b/mod/thewire/views/default/thewire/view.php
new file mode 100644
index 000000000..e63f88fc6
--- /dev/null
+++ b/mod/thewire/views/default/thewire/view.php
@@ -0,0 +1,27 @@
+<?php
+
+	/**
+	 * Elgg thewire view page
+	 * 
+	 * @package ElggTheWire
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] An array of wire notes to view
+	 * 
+	 */
+	 
+	// If there are any wire notes to view, view them
+		if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
+			
+			foreach($vars['entity'] as $shout) {
+				
+				echo elgg_view_entity($shout);
+				
+			}
+			
+		}
+
+?>
\ No newline at end of file
diff --git a/mod/thewire/views/default/widgets/thewire/edit.php b/mod/thewire/views/default/widgets/thewire/edit.php
new file mode 100644
index 000000000..32a5c8bf7
--- /dev/null
+++ b/mod/thewire/views/default/widgets/thewire/edit.php
@@ -0,0 +1,14 @@
+<?php
+
+?>
+	<p>
+		<?php echo elgg_echo("thewire:num"); ?>
+		<select name="params[num_display]">
+		    <option value="1" <?php if($vars['entity']->num_display == 1) echo "SELECTED"; ?>>1</option>
+		    <option value="2" <?php if($vars['entity']->num_display == 2) echo "SELECTED"; ?>>2</option>
+		    <option value="3" <?php if($vars['entity']->num_display == 3) echo "SELECTED"; ?>>3</option>
+		    <option value="4" <?php if($vars['entity']->num_display == 4) echo "SELECTED"; ?>>4</option>
+		    <option value="5" <?php if($vars['entity']->num_display == 5) echo "SELECTED"; ?>>5</option>
+		    <option value="6" <?php if($vars['entity']->num_display == 6) echo "SELECTED"; ?>>6</option>
+		</select>
+	</p>
\ No newline at end of file
diff --git a/mod/thewire/views/default/widgets/thewire/view.php b/mod/thewire/views/default/widgets/thewire/view.php
new file mode 100644
index 000000000..4821b854b
--- /dev/null
+++ b/mod/thewire/views/default/widgets/thewire/view.php
@@ -0,0 +1,29 @@
+
+	<?php
+
+		// Get any wire notes to display
+		// Get the current page's owner
+		$page_owner = page_owner_entity();
+		if ($page_owner === false || is_null($page_owner)) {
+			$page_owner = $_SESSION['user'];
+			set_page_owner($page_owner->getGUID());
+		}
+		
+		$num = $vars['entity']->num_display;
+		if(!$num)
+			$num = 4;
+		
+		$thewire = $page_owner->getObjects('thewire', $num);
+		
+		// If there are any thewire to view, view them
+		if (is_array($thewire) && sizeof($thewire) > 0) {
+			
+			foreach($thewire as $shout) {
+				
+				echo elgg_view_entity($shout);
+				
+			}
+			
+		}
+	
+	?>
diff --git a/mod/tinymce/languages/en.php b/mod/tinymce/languages/en.php
new file mode 100644
index 000000000..9d1396da4
--- /dev/null
+++ b/mod/tinymce/languages/en.php
@@ -0,0 +1,15 @@
+<?php
+
+	$english = array(
+	
+		/**
+		 * Menu items and titles
+		 */
+	
+		'tinymce:remove' => "Add/Remove editor",
+	
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/tinymce/manifest.xml b/mod/tinymce/manifest.xml
new file mode 100644
index 000000000..db4f21d2f
--- /dev/null
+++ b/mod/tinymce/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider" />
+        <field key="version" value="1.7" />
+        <field key="description" value="TinyMCE plugin." />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+        <field key="licence" value="GNU Public License version 2" />
+        <field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/tinymce/readme.txt b/mod/tinymce/readme.txt
new file mode 100644
index 000000000..3f11518b0
--- /dev/null
+++ b/mod/tinymce/readme.txt
@@ -0,0 +1,7 @@
+Notes:
+
+* A simple tinymce plugin
+
+Instructions:
+
+Drop into mod, enable in the admin planel and use.
\ No newline at end of file
diff --git a/mod/tinymce/start.php b/mod/tinymce/start.php
new file mode 100644
index 000000000..3eb12811c
--- /dev/null
+++ b/mod/tinymce/start.php
@@ -0,0 +1,25 @@
+<?php
+
+    /**
+     * TinyMCE wysiwyg editor
+     * @package ElggTinyMCE
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+     **/
+  
+    function tinymce_init() {
+			
+	    // Load system configuration
+		    global $CONFIG;
+		    
+         // Add our CSS
+				elgg_extend_view('css','tinymce/css');
+				set_view_location('embed/addcontentjs',$CONFIG->pluginspath . 'tinymce/views/');
+     }
+     
+     // Make sure the status initialisation function is called on initialisation
+		register_elgg_event_handler('init','system','tinymce_init',9999);
+       
+?>
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/changelog.txt b/mod/tinymce/tinymce/changelog.txt
new file mode 100644
index 000000000..29d08109e
--- /dev/null
+++ b/mod/tinymce/tinymce/changelog.txt
@@ -0,0 +1,640 @@
+Version 3.1.0.1 (2008-06-18)
+	Fixed bug where the Opera line break fix didn't work correctly on Mac OS X and Unix.
+	Fixed bug where IE was producing the default value the maxlength attribute of input elements.
+Version 3.1.0 (2008-06-17)
+	Fixed bug where the paste as text didn't work correctly it encoded produced paragraphs and br elements.
+	Fixed bug where embed element in XHTML style didn't work correctly in the media plugin.
+	Fixed bug where style elements was forced empty in IE. The will now be wrapped in a comment just like script elements.
+	Fixed bug where some script elements wrapped in CDATA could fail to be serialized correctly.
+	Fixed bug where FF 3 produced -moz- internal styles in some style attributes.
+	Fixed bug where query strings and external URLs didn't work correctly in style attributes.
+	Fixed bug where shape attribute of area elements got serialized as rect regardless of it's initial value in IE 6.
+	Fixed bug where selection of elements inside layers would fail in IE since focus was moved to the document body.
+	Fixed bug where pressing enter/return in an editable select box would produce an __mce_add_custom__ class value.
+	Fixed bug where changing font size of text placed inside a colored text chunk would remove the parent node.
+	Fixed bug where Opera 9.5 final produced a strange line break behavior due to a workaround for previous Opera versions.
+	Fixed bug where text/background color would produce a strange focus problem when you tried to click on the body in IE.
+	Fixed issue where selecting the title of an listbox equals the old 2.x behavior of changing the value to an empty string.
+	Fixed issue where it was common for the media plugin to break if the _value attribute wasn't added for the param element.
+	Fixed issue where the wrong parent editor instance might be updated if you use fullscreen mode in an incorrect way.
+	Fixed issue where Safari was producing a warning about the base element not being closed correctly.
+	Removed redundant form element name matching from regexp in the DOMUtils class.
+Version 3.0.9 (2008-06-02)
+	Added new contextmenu_offset_x/contextmenu_offset_y options for the contextmenu plugin.
+	Added cite attribute to the default rule for the blockquote element.
+	Added support for using arrow keys for selection of items in listboxes.
+	Added support for using arrow keys for selection of items in dropmenus.
+	Fixed bug where blockformat change on elements with BR inside them didn't change correctly on Firefox.
+	Fixed bug where removing table rows inside thead or tfoot would remove the whole table if it was the last one.
+	Fixed bug where XHR synchronous mode didn't execute the callback handlers synchronously.
+	Fixed bug where setting border to 0 didn't add border: 0 to the style attribute when using the advimage dialog.
+	Fixed bug where the selection of images and table cells didn't work correctly when the editor is placed in a frame and running on IE.
+	Fixed bug where the store/restore of a selection didn't work correctly in non IE browsers.
+	Fixed bug where only the first element would be invalid for the invalid_elements option.
+	Fixed bug where paste as plain text didn't encode the characters correctly when they where inserted.
+	Fixed bug where HTML source window couldn't be maximized on Gecko when the maximizable feature was enabled.
+	Fixed bug where color selection using the color picker could produce exception in IE.
+	Fixed bug where font size changes could produce produce extra redundant elements.
+	Fixed bug where IE could produce unknown runtime error if you replaced a image with another image from a separate frame.
+	Fixed bug where the domLoaded state for the Event class wasn't set correctly if the editor was loaded dynamically using the gzip compressor.
+	Fixed bug where handling of the base element for a page would produce incorrect urls. Based on a patch contributed by John LeSueur.
+	Fixed bug where table constraint alert boxes was presented with an empty value and wasn't the skinned inline ones.
+	Fixed bug where the onChange event wasn't fired when the form was submitted. It's now also triggered when the save method is called.
+	Fixed bug where encoding set to xml didn't work as expected. It now encodes the contents into XML entities.
+	Fixed bug where numrows didn't work correctly for the merge cells dialog of the table plugin.
+	Fixed bug where the onGetContent event was fired even when the no_events flag was set.
+	Fixed bug where the preview panels for the advimage and the media plugin could overflow on Safari and FF 3.
+	Fixed bug where the editing and removal of abbr elements using the xhtmlxtras plugin working correctly on IE.
+	Fixed bug where save button in the save plugin didn't work correctly on IE.
+	Fixed bug where dragging layers didn't work as expected since it would snap back to it's original location if you saved.
+	Fixed bug where the description of the template plugin dialog wasn't updated correctly.
+	Fixed bug where the values for frame and rules in the table dialogs where swapped.
+	Fixed bug where the elements like ins, del, cite, acronym and abbr didn't have the default editing style as the old 2.x branch.
+	Fixed bug where ask mode would lock the focused textarea if you pressed cancel in the confirm dialog on FF 3.
+	Fixed bug where ask mode would produce contents for empty textareas if you reloaded the page.
+	Fixed so the onGetContent event gets the full pass through object just like the other events.
+	Fixed so attributes for block elements remains the same when you change format of a element.
+Version 3.0.8 (2008-04-30)
+	Fixed bug where IE would produce an error if textareas without names where converted.
+	Fixed bug where editor wasn't forced empty when there was only a single br or empty paragraph left.
+	Fixed bug where IE would produce an warning message if object elements where produced in the media plugins preview running on https.
+	Fixed bug where new addVer function didn't handle hash items correctly. Patch contributed by Mirek Burkon.
+	Fixed bug where font_size_style_values option wasn't applied correctly to fonts inside the editor.
+	Fixed bug where image selection could be lost if a image was edited using context menu on IE.
+	Fixed bug where style values wasn't updated properly due to an invalid regexp.
+	Fixed bug where IE 6 where displaying warning message about insecure items when inserting an image while using https. Patch contributed by Norifumi Sunaoka.
+	Fixed bug where IE was producing an auto save message if you selected a color from the color split button.
+	Fixed bug where backspace sometimes would move the caret to the end of the previous block in Gecko.
+	Fixed bug where the rowlayout manager didn't work as described in the documentation.
+	Fixed bug where the default options for the fullpage plugin wasn't applied correctly.
+	Fixed bug where selection would jump one character if you applied a styles to a words in non IE browsers.
+	Fixed bug where undo levels wasn't added correctly if you went back in undo history and added a new event.
+	Fixed bug where font size dropdown didn't mark the selected size in IE.
+	Fixed bug where the size of the editor was determined using clientWidth instead of offsetWidth.
+	Fixed so the onchange event doesn't fire on the initial undo level, it will also fire when the editor is blurred.
+	Fixed so the advhr plugin produces XHTML valid output instead of non standard attributes.
+	Fixed so blockquote gets converted into [quote] in when the bbcode plugin is enabled.
+	Fixed so theme_advanced_font_sizes can be named for example Font 1=1, Font 2=2 etc.
+	Fixed so editor_selector/editor_deselector can be regexps. By default only strings are allowed not part regexps like before.
+	Fixed so that the version suffix is optional. It still requires the build process so you need to export it manually.
+	Fixed so it's possible to tab to table cells in non Gecko browsers and also produce new rows if you tab at the end of a table. Contributed by Josh Peek.
+Version 3.0.7 (2008-04-14)
+	Added new version suffix to all internal GET requests to make sure that the users cache gets cleared correctly.
+	Fixed issue with isDirty returning true event if it wasn't dirty on IE due to changes in tables during initialization.
+	Fixed memory leak in IE where if a page was unloaded before all images on the page was loaded it would leak.
+	Fixed bug in IE where underline and strikethrough could produce an exception error message.
+	Fixed bug where inserting paragraphs in totally empty table cells would produce odd effects.
+	Fixed bug where layer style data wasn't updated correctly due to some performance enhancements with the DOM serializer.
+	Fixed bug where it would convert the wrong element if there was two elements with the same name and id on the page.
+	Fixed bug where it was possible to add style information to the body element using the style plugin.
+	Fixed bug where Gecko would add an extra undo level some times due to the blur event.
+	Fixed bug where the underline icon would get active if the caret was inside a link element.
+	Fixed bug where merging th cells not working correctly. Patch contributed by André R.
+	Fixed bug where forecolorpicker and backcolorpicker buttons where rendered incorrectly when the o2k7 skin was used.
+	Fixed bug where comment couldn't contain -- since it's invalid markup. It will now at least not break on those invalid comments.
+	Fixed bug where apos wasn't handled correctly in IE. It will now convert apos to &#39; on IE since that browser doesn't support that entity.
+	Fixed bug where entities wasn't encoded correctly inside pre elements since they where protected from whitespace removal.
+	Fixed bug where color split buttons where rendered incorrectly on IE6 when using the non default theme.
+	Fixed so caret is placed after links ones they are created, to improve usability of the editor.
+	Fixed so you can select tables by clicking on it's borders in non IE browsers to normalize the behavior.
+	Fixed so the menus can be toggled by clicking once more on the icon in listboxes, menubuttons and splitbuttons based on code contributed by Josh Peek.
+	Fixed so buttons can be labeled, currently only works with the default skin, so it's kind of experimental. Patch contributed by Daniel Insley.
+	Fixed so forecolorpicker and backcolorpicker remembers the last selected color. Patch contributed by Shane Tomlinson.
+	Fixed so that you can only execute the mceAddEditor command once for the same instance name.
+	Fixed so command functions added with addCommand can pass though the call to default handles if it returns true.
+Version 3.0.6.2 (2008-04-07)
+	Fixed bug where empty tables couldn't be edited correctly on non IE browsers if they where loaded into the editor.
+	Fixed bug where it was impossible to resize layers correctly in IE since it thought it was an image.
+	Fixed bug where an editor instance was stealing focus in IE resulting in a scroll to the editor on page reloads.
+	Fixed bug where Safari was crashing on Mac OS X if you closed dialogs using the Esc key.
+Version 3.0.6.1 (2008-04-04)
+	Added support for the missing mceAddFrameControl command. The input for this command has changed so consult the Wiki.
+	Fixed bug where sub menus for the drop menus would leave an empty element behind.
+	Fixed memory leak in IE if the editor was placed in a frame or iframe.
+Version 3.0.6 (2008-04-03)
+	Added elements to the default value of valid_elements option. It now contains all XHTML strict elements and a few transitional.
+	Added more accessibility fixes, it's now possible to navigate and close list boxes and split button menus with the keyboard.
+	Added missing getInfo method to the contextmenu and safari plugin, this caused problems for the Drupal module.
+	Added new inlinepopups_zindex option to the inlinepopups plugin so that you can configure the default start z-index.
+	Added new setControlType method to the tinymce.ControlManager class. This method enables you to override the default classes.
+	Added ability to specific an optional control class to use instead of the default one for the ControlManager methods. Based on concept by Josh Peek.
+	Fixed bug where attribute rules for the DOM Serializer couldn't contain - or _ characters in their names.
+	Fixed bug where inlinepopups event blocker and modal dialog blocker elements produced vertical scrollbars.
+	Fixed bug where there was a rendering issue with quirks mode in Safari moving the resize handle to an incorrect position.
+	Fixed bug with forecolor/backcolor controls on IE. Sometimes elements positioned relative will generate display errors.
+	Fixed bug where a p2 was leaking out in the global name space when you selected a color from the forecolor/backcolor controls.
+	Fixed bug where empty paragraphs didn't work as expected in browsers other than IE.
+	Fixed bug where the load method of the tinymce.dom.ScriptLoader didn't check if the file was already loaded.
+	Fixed bug where the load method for the PluginManager and ThemeManager didn't check if a plugin/theme by a specific name was all ready loaded.
+	Fixed bug where the theme_advanced_link_targets option didn't work correctly with the advanced themes link dialog. Patch contributed by Arnold B.
+	Fixed bug where the style command would merge classes into empty span elements.
+	Fixed bug where the style command would remove empty span elements outside the current selection.
+	Fixed bug where the fix for the Safari backspace bug removed all editor contents if it was filled with empty paragraphs.
+	Fixed bug where alert and confirm boxes opened by the inlinepopups plugin would produce an exception if domain relaxing was used.
+	Fixed bug where Safari was adding style attributes to all elements when you paste them into the editor.
+	Fixed bug where the spellchecker menus was visually incorrect since the space for the non existing icon was still there.
+	Fixed bug where remove_linebreaks option didn't remove line breaks inside the text contents of a element.
+	Fixed bug where Safari 3.1 was introducing _mc_tmp into paragraphs due to the new querySelectorAll and a TinyMCE specific workaround.
+	Fixed bug where getParam method in the Editor class was returning incorrect objects and would mess up the font drop down. Patch contributed by speednet.
+	Fixed bug where the table dialog would produce an exception in IE when you edited tables since it tried to place focus in a disabled field.
+	Fixed bug where class attribute on some span elements was removed on cleanup.
+	Fixed bug where resizing the editor in IE could produce an exception if the editor width/height got to be a negative value.
+	Fixed bug where wmv files wouldn't play since the src param was used instead of the url param.
+	Fixed bug where br elements would be added here and there in Gecko. Geckos internal _moz_dirty br elements where serialized as well.
+	Fixed bug where editing named anchors would produce two anchors instead of one updated one.
+	Fixed bug where arrow and function keys didn't work when an noneditable element was focused within the editor.
+	Fixed bug where the dispatcher could produce an exception if the listener list was altered inside an event callback.
+	Fixed bug where it was impossible to totally empty the editor contents on Safari due to an mistreatment of nbsp as whitespace. Patch contributed by Andrew Ozz.
+	Fixed bug where TinyMCE would not convert textareas with the same name attribute value. It will now generate an unique id for those textareas.
+	Fixed bug where backspace/delete key was deleting td elements inside tables while running on Gecko.
+	Fixed bug where Firefox 3.0b4 and Opera 9.26 where scrolling to the top of document when pressing return/enter.
+	Fixed bug where the template plugin wasn't just inserting the mceTmpl tagged element.
+	Fixed bug where the alert method of the default WindowManager implementation didn't translate input language strings like the inlinepopups dialog does.
+	Fixed bugs with the backspace behavior in Gecko. The caret was placed on incorrect locations in the DOM sometimes.
+	Fixed so advimage dialog and table dialogs has support for editable select boxes for the class value.
+	Fixed so the media, pagebreak and spellchecker doesn't load it's default content.css file if the content_css option is set to false.
+	Fixed so the paste_use_dialog option works again it's enabled by default but can be disabled on IE. Patch contributed by Speednet.
+	Fixed so that the fullscreen editor is focused when switching fullscreen editing on.
+	Fixed so it's possible to edit images and links inside tables using the context menu.
+	Fixed so table dialogs and the advanced image dialog doesn't loose selection in IE if the dialogs where navigated/submitted with the keyboard.
+	Fixed so the theme_advanced_blockformats options can have named items for example title 1=h1;title 2=h2.
+	Fixed so it's possible to add a custom editor_css for the simple theme.
+	Fixed quirks with directionality rtl, patch contributed by Andrew Ozz.
+	Fixed so the inlinepopups default start zIndex is 300000.
+	Fixed typo in media plugin Shockware is now replaced with Shockwave.
+	Fixed psuedo memory leak in IE with the replaceChild method inside the DOMUtils.replace method.
+	Fixed so memory is released when an editor instance is removed from page.
+	Optimized the color split button menus so that they use less event handlers.
+	Removed the util/mclayer.js file since it's no longer used by any of the TinyMCE dialogs and is considered deprecated.
+Version 3.0.5 (2008-03-12)
+	Added new black skin variant to the o2k7 skin contributed by Stefan Moonen.
+	Added new explode method to the tinymce core class. This does a split but removed whitespace it also defaults to a , delimiter.
+	Added new detection logic for IE 8 standards mode into the DOMUtils class strMode can now be checked to see if that mode is on/off.
+	Added new noscale option value for the scale select box for Flash in the media plugin.
+	Fixed bug where the menu for the ColorSplitButton wasn't removed when the editor was removed.
+	Fixed bug where font colors couldn't be edited correctly since the style of the element didn't get updated correctly.
+	Fixed bug where class of elements would get lost when TinyMCE was fixing incorrect HTML markup.
+	Fixed bug where table editing would produce double height values.
+	Fixed bug where width style value wouldn't be removed if you switched width unit from cm/em to pixels or percent.
+	Fixed bug where the search/replace input box wasn't auto focused like the other dialogs.
+	Fixed bug where the old mceAddControl command would use the fullscreen settings next time it created an instance.
+	Fixed bug where multiple lines where added to the target cell if you merged multiple empty cells.
+	Fixed bug where drop down menus would be incorrectly positioned inside scrollable divs.
+	Fixed bug where the separators of the silver skin variant didn't display correctly in IE 6.
+	Fixed bug where createStyleSheet seems to load scripts at opposite order in some IE versions.
+	Fixed bug where directionality could produce odd results for the UI and the dialogs.
+	Fixed bug where the DOM serializer wouldn't serialize custom namespaced attributes in IE 6 using the *[*] valid elements rule.
+	Fixed bug where table caption would be inserted after the thead element if you swapped a tr to be inside the thead.
+	Fixed bug where the youtube detection logic for the media plugin was to generic.
+	Fixed so the deprecated and undocumented theme_advanced_path_location set to none won't hide the whole statusbar.
+	Fixed so most input lists can have whitespace in them they are now split using the new tinymce.explode method.
+	Fixed so the popup_css and popup_css_add URLs are relative to where the current document is located.
+	Fixed various bugs and quirks with the store/restore selection logic.
+	Fixed so the editor starts in IE 8 standards mode but still that browser is very very buggy.
+	Fixed so dialog_type set to modal will block the background and other inline windows and only give access to the front most window.
+Version 3.0.4.1 (2008-03-08)
+	Fixed critical bug where it was impossible to edit images when inlinepopups where used due to lost selection in IE.
+Version 3.0.4 (2008-03-07)
+	Added new option constrain_menus, this enables you to force view port constraints on all menus. Contributed by Shane Tomlinson.
+	Fixed bug where table background wasn't visible inside the editor due to a default CSS rule overriding the style attribute.
+	Fixed bug where links would get a null class added if no styles was used in IE.
+	Fixed bug where spellchecker was auto focusing the editor in IE.
+	Fixed bug where document.domain would produce invalid argument if the editor was loaded in IE6 over a network UNC path.
+	Fixed bug where table height attribute was used, this is deprecated in XHTML so it now adds it as an style.
+	Fixed bug where textareas with style values would produce error in IE.
+	Fixed so the first element in each dialog is focused by default to enhance keyboard usage.
+	Fixed so you can add a mceFocus class to elements to make it auto focused.
+	Fixed so you can close dialogs using the esc key.
+	Fixed so you can press return/enter to submit the action of each dialog.
+	Fixed so tabbing inside an inline popups wont focus the resize anchor elements.
+	Fixed so you can press ok in inline alert messages using the return/enter key.
+	Fixed so textareas can be set to non px or % sizes for example em, cm, pt etc.
+	Fixed so non pixel values can be used in width/height properties for tables.
+	Fixed so the custom context menu can be disabled by holding down ctrl key while clicking.
+	Fixed so the layout for the o2k7 skin looks better if you don't have separators before and after list boxes.
+	Fixed so the sub classes get a copy of the super class constructor function to ease up type checking.
+	Fixed so font sizes for the format block previews are normalized according to http://www.w3.org/TR/CSS21/sample.html (it can be overridden).
+	Fixed so font sizes for h1-h6 in the default content.css is normalized according to http://www.w3.org/TR/CSS21/sample.html (it can be overridden).
+Version 3.0.3 (2008-03-03)
+	Fixed bug where an error about document.domain would be thrown if TinyMCE was loaded using a different port.
+	Fixed bug where mode exact would convert textareas without id or name if the elements option was omitted.
+	Fixed bug where the caret could be placed at an incorrect location when backspace was used in Gecko.
+	Fixed bug where local file:// URLs where converted into absolute domain URLs.
+	Fixed bug where an error was produced if a editor was removed inside an editor command.
+	Fixed bug where force_p_newlines didn't effect the paste plugin correctly.
+	Fixed bug where the paste plugin was producing an exception on IE if you pasted contents with middots.
+	Fixed bug where delete key could produce exceptions in Gecko sometimes due to the fix for the table cell bug.
+	Fixed bug where the layer plugin would produce an visual add class called mceVisualAid this one is now renamed to mceItemVisualAid to mark it internal.
+	Fixed bug where TinyMCE wouldn't initialize properly if ActiveX controls was disabled in IE.
+	Fixed bug where tables and other elements that had visual aids on them would produce an extra space after any custom class names.
+	Fixed bug where search with an empty string would produce some odd "invalid pointer" error in IE.
+	Fixed bug where elements like menus where placed at incorrect positions in Opera 9.26.
+	Fixed bug where IE was loosing focus of the editor when you clicked some dropmenu and if it was placed in a frame or iframe.
+	Fixed bug where focus of images could be lost in IE if you focused the accessibility confirm dialog in the advimage plugin.
+	Fixed bug where nestled font elements would produce odd output like missing font elements.
+	Fixed bug where text colors and styles got removed if invalid_elements included the font element.
+	Fixed bug where text-decoration set to underline or line-through would remove other styles from span elements.
+	Fixed bug where editor contents like \n\n would be incorrectly handled and processed as real line feeds.
+	Fixed bug where incorrectly encoded urls with ampersands in them would be decoded incorrectly.
+	Optimized the DOMUtils decode method to be a lot faster if the string doesn't have any entities to decode.
+Version 3.0.2.1 (2008-02-26)
+	Fixed alert/confirm dialogs so they display correctly.
+Version 3.0.2 (2008-02-26)
+	Added new body_id option that enables you to specify the id of the body inside the editor iframe based on ideas by David Bildström (ChronoZ).
+	Added new body_class option that enables you to set the class for the body of the editor iframe based on ideas by David Bildström (ChronoZ).
+	Added new CSS class to the default content.css files mceForceColors that forces white background and black text can be used with the body_class option.
+	Added new type parameter to the Editor.getParam function to reduce redundant logic for parsing hash tables.
+	Added new isDone method to the ScriptLoaded class, this enables you to check if a script has been loaded or not.
+	Added new resizeTo and resizeBy methods for the advanced theme. Can be called using tinyMCE.activeEditor.theme.resizeTo(w, h);
+	Added new skin_variant option this can be used to extend existing skins with slight modifications like color.
+	Added new variant of the o2k7 skin called "silver" based on a contribution made by Stefan Moonen.
+	Fixed bug where the template plugin might produce errors if the template_mdate_classes wasn't configured.
+	Fixed bug where the media plugin didn't convert the URLs for movies once they where inserted.
+	Fixed bug where the style field for the advlink dialog didn't work correctly if you edited an existing link.
+	Fixed bug where alignment of toolbars would fail in editor was uses in a quirks mode on IE, fix contributed by Peter Wood & Art Lawry.
+	Fixed bug where initialization of multiple editors at the same time using the mceAddControl method would produce errors.
+	Fixed bug where initialization of editors using mceAddControl command or new tinymce.Editor calls would fail during page load.
+	Fixed bug where the check for domain relaxing could fail if the document.domain property was changed by another script.
+	Fixed bug where textareas couldn't be named description or any other name that matches the meta elements in IE and Opera.
+	Fixed bug where the element path would fail sometimes in IE due to "unknown runtime error" on innerHTML.
+	Fixed bug where Safari would crash if you was hiding the editor before serializing the contents.
+	Fixed bug where the editor wasn't scaled propertly in fullscreen mode using the old fullscreen_new_window option.
+	Fixed bug where render method didn't load language packs in IE and Opera if you rendered an editor during page load.
+	Fixed bug where resizing the browser window in fullscreen didn't resize the editor.
+	Fixed bug where the blockquote command didn't move the caret inside the new empty blockquote if you used it on an empty document.
+	Fixed bug where auto in a style width/height for the textarea would produce an editor with the size value of 100. Fix contributed by Shane Tomlinson.
+	Fixed bug where restoration of selection at the beginning of an element could fail in Gecko.
+	Fixed bug where caret restoration after a cleanup could place the it at an incorrect location.
+	Fixed bug where delete key inside td elements would delete the cell in Gecko.
+	Fixed so the blockquote button toggles individual lines. This behavior is a bit more like the old indentation behavior in the 2.x branch.
+	Fixed so the dialog language packs only gets loaded the first time you open a dialog.
+	Fixed so all classes in the whole UI is prefixed with "mce" to avoid collisions, use the skin converter to update your existing skins.
+	Fixed so all classes in the inlinepopups logic is prefixed with "mce" to avoid collisions, use the skin converter to update your existing skins.
+	Fixed so that the window in fullscreen mode can be resized when fullscreen_new_window option is enabled.
+	Fixed so blockquote elements are formatted in the source output with an linefeed before and after it.
+	Optimized the editor initialization by reducing the number of calls to getBookmark/moveToBookmark.
+Version 3.0.1 (2008-02-21)
+	Added spellchecker plugin into the main package, but without any backend can be specified with the spellchecker_rpc_url option.
+	Added src attribute for script elements to the default valid_elements option value.
+	Added extra parameter to the class_filter callback it can now also filter out classes based on the whole CSS rule.
+	Added support for domain relaxing, TinyMCE can now be loaded from an remote domain as long as they are on the same root domain.
+	Added support for custom elements the new custom_elements option enables you to add non HTML elements to the editor.
+	Added support for the W3C Selectors API that was added to latest nightly build of WebKit.
+	Fixed bug where some object param element wasn't stored correctly using the media plugin.
+	Fixed bug where Opera was scrolling to top of page is drop menus on list boxes where displayed.
+	Fixed bug where IE6 was crashing if a format block was used on a container with anchor elements.
+	Fixed bug where spans with font sizes wasn't handled correctly when editor was loading contents.
+	Fixed bug where mode exact couldn't convert editors with name only. Id is no longer required but recommended.
+	Fixed bug where the mceInsertRawHTML command produced an extra undo level.
+	Fixed bug where the specific_textareas mode didn't work correctly this is the same thing as textareas now.
+	Fixed bug where the values of input elements in the HTML page of dialogs pages where changed in IE.
+	Fixed bug where fullscreen and fullpage plugins didn't work well together.
+	Fixed bug where embed elements wasn't handled properly in the media plugin.
+	Fixed bug where style information on span elements gets munged when fonts are converted to spans.
+	Fixed bug where some entities in element attributes where encoded incorrectly in the latest WebKit build.
+	Fixed bug where initialization would fail in IE if there where two input elements with the name submit in the form.
+	Fixed bug where fullscreen mode didn't work correctly in IE when the fullscreen_new_window option was used.
+	Fixed bug where invalid contents like an ul inside a p element would produce odd results in IE.
+	Fixed bug where Opera 9.2x was placing the drop menus at incorrect locations if the editor was placed in a table.
+	Fixed bug where Opera was producing odd results if enter/return was pressed while having forced_root_blocks disabled.
+	Fixed bug where layer plugin was stealing focus in IE on initialization.
+	Fixed bug where body attributes wasn't set properly in the fullpage plugin, fix contributed by Hiroaki Kawai.
+	Fixed bug where insert image and insert link dialogs where producing an extra level in the undo history.
+	Fixed bug where Gecko would produce an error if empty elements like <div></div> where inserted using mceInsertContent.
+	Fixed bug where center alignment of images produced odd results inside table cells.
+	Fixed bug where center alignment of images couldn't be toggled correctly.
+	Fixed bug where alignment of images inside tables would produce double float style items in IE if the fix_table_elements option was enabled.
+	Fixed bug where a variable called 'v' was polluting the global namespace. Objects tinymce and tinyMCE are the only ones allowed to be global.
+	Fixed bug where insert table from context menu couldn't insert new tables inside existing tables.
+	Fixed bug where Safari wouldn't produce br elements on enter when the force_br_newlines option was enabled.
+	Fixed bug where switching cell type in table cell dialog would produce odd attributes in IE.
+	Fixed bug where Gecko was outputting internal attributes if valid_elements where set to "*[*]".
+	Fixed bug where the style plugin would produce non hex colors inside the dialog when running on Gecko.
+	Fixed bug where an empty src value for insert image would remove the currently selected image if it wasn't and image element.
+	Fixed bug where hidden input elements would break the logic for the tab_focus option.
+	Fixed bug where save button wasn't working correctly in fullscreen mode.
+	Fixed bug where the editor was forced to be placed in a form element if the save_onsavecallback option was used.
+	Fixed bug where upper case param attributes wasn't parsed correctly in the media plugin.
+	Fixed bug where render method of tinymce.Editor class would produce an exception if the strict_loading_mode option was omitted.
+	Fixed bug where nodeChanged event could be fired while the editor was loading and there for produce an exception in FF.
+	Fixed bug where no undo levels where added if the user created new table rows using the tab key on Gecko.
+	Fixed bug where tables would be broken if you selected a different block format for contents withing an table cell.
+	Fixed bug where the render method of the tinymce.Editor class didn't setup the tinymce.EditorManager.settings object correctly.
+	Fixed bug where the advanced image dialog would go to the first tab if the alternative image was changed using the file browser link.
+	Fixed bug where the forced_root_block option would produce BR elements inside empty blocks if the block wasn't a paragraph.
+	Fixed bug where the forced_root_block doesn't work correctly on IE if the specified element was something else than paragraphs.
+	Fixed bug where selection of images would get lost if user selected something from the context menu in IE.
+	Fixed bug where the context menu plugin would pollute the global namespace with two variables p1 and p2.
+	Fixed compatibility issue with Mootools, it is destroying document.getElementById on unload in IE. (Mantra: You don't own the internal objects).
+	Fixed bugs where dialogs/tabs and other UI elements where rendered incorrectly in Firefox 3.
+	Fixed so the auto CSS class importer is compatible with 2.x.
+	Fixed so the editor UI and inlinedialogs works correctly with the YUI CSS reset package.
+	Fixed so header and footer elements are forced to lower case when the fullpage plugin is used.
+	Fixed so load prefixes "-" for plugins and themes isn't required if the plugin/theme was loaded by the ThemeManager/PluginManager.
+	Fixed so the JSONRequest uses application/json content type to make Ruby on rails happy.
+	Fixed so the CSS rule is more exact for the body in the default content.css files. Body is now defined as "body.mceContentBody" instead of just "body".
+	Fixed so the tiny_mce_dev.js uses XHR instead of document.write to load scripts to resolve an issue with Opera 9.50.
+	Fixed so language pack loading can be disabled by setting the language option to false. Can be useful for systems with their own language pack management.
+Version 3.0 (2008-01-30)
+	Added map and area elements to the default valid_elements list and also some indentation rules.
+	Fixed bug where empty paragraphs wasn't padded when loading contents.
+	Fixed bug where the RowLayout manager didn't work at all.
+	Fixed bug where style attribute data would get messed up in advimage dialog.
+	Fixed bug where the table dialogs class select wasn't updated correctly.
+	Fixed bug where elements would get extra whitespace around on insert when body was present in valid_elements.
+	Fixed bug where coords attribute of the area element wasn't handled properly in IE.
+	Fixed bug where Safari didn't produce BR elements on shift+return.
+	Fixed bug where force blocks would cast odd invalid attribute exception in IE.
+	Fixed bug where media plugin would produce extra whitespace before and after objects.
+	Fixed bug where cleanup_callback could break the contents of the editor. But use the new event system instead of this option.
+	Fixed bug where the tab_focus option didn't work between editor instanced. You can now tab between editors.
+	Fixed bug where the load function of the ScriptLoader class didn't load single files without the load que as it was supposed to.
+	Fixed bug where the execcommand_callback parameter order was incorrect. Recommendation use the new addCommand method.
+	Fixed bug where range.select calls sometimes failed on some IE versions.
+	Fixed bug where Safari was scrolling to top of document when enter/returned was pressed.
+	Fixed bug where fullscreen_new_window option didn't work correctly.
+	Fixed bug where the nonbreaking plugin inserted an space instead of an non breaking space the first time.
+	Fixed bug where the visualization of non breaking spaces where visual in element path.
+	Fixed so the focus is restored to the editor after inserting an custom character.
+	Fixed so the isNotDirty state is set to false if a new undo level is added.
+	Fixed so pointless style information for borders gets removed in IE.
+	Fixed so the resize button has a se-resize cursor css value.
+Version 3.0rc2 (2008-01-18)
+	Added new fix_nesting option to fix bug #1867292, this is disabled by default.
+	Added new indentation option enables you to specify how much each indent/outdent call will add/remove.
+	Added easier support for enabling/disabling icon columns on drop menues.
+	Added new menu button control class. This control is very similar to the splitbutton but without any onclick action.
+	Added support for previous tab focus (shift+tab). The tab_focus setting now takes two items next and previous element.
+	Fixed bug where iframes inside the editor got removed in Firefox on initial load.
+	Fixed bug where the CSS for abbr elements wasn't applied correctly in IE.
+	Fixed bug where mceAddControl on element inside a hidden container produced errors.
+	Fixed bug where closed anchors like <a /> produced strange results.
+	Fixed bug where caret would jump to the top of the editor if enter was pressed a the end of a list.
+	Fixed bug where remove editor failed if the editor wasn't properly initialized.
+	Fixed bug where render call on for a non existing element produced exception.
+	Fixed bug where parent window was hidden when the color picker was used in a non inlinepopups setup.
+	Fixed bug where onchange event wasn't fired correctly on IE when color picker was used in dialogs.
+	Fixed bug where save plugin could not save contents if the converted element wasn't an textarea.
+	Fixed bug where events might be fired even after an editor instance was removed such as blur events.
+	Fixed bug where an exception about undefined undo levels could be throwed sometimes.
+	Fixed bug where the plugin_preview_pageurl option didn't work.
+	Fixed bug where adding/removing an editor instance very fast could produce problems.
+	Fixed bug where the link button was highlighted when an anchor element was selected.
+	Fixed bug where the selected contents where removed if a new anchor element was added.
+	Fixed bug where splitbuttons where rendered one pixel down in the default theme.
+	Fixed bug where some buttons where placed at incorrect positions in the o2k7 theme.
+	Fixed bug that made it impossible to visually disable a custom button that used an image instead of CSS sprites.
+	Fixed bug where it wasn't possible to press delete/backspace if the editor was added+removed and re-added due to a FF bug.
+	Fixed bug where an entities option with only 38,amp,60,lt,62,gt would fail in IE.
+	Fixed bug where innerHTML sometimes generated unknown runtime error on IE.
+	Fixed bug where content_css files wasn't loaded in the template preview iframe.
+	Fixed bug where scroll position was incorrect when toggling fullscreen mode.
+	Fixed bug where restoration of overflow didn't work correctly when disabling fullscreen mode in Opera.
+	Fixed bug where drop menus where places at incorrect locations if the editor was placed in a scrollable container element.
+	Fixed bug where hideMenu didn't hide sub menus correctly. It will now hide all menus recursively.
+	Fixed so theme_advanced_path_location can be used in init options for compatibility reasons.
+	Fixed so the drop menu colors matches the rest of o2k7 theme.
+	Fixed so the preview example.html file is updated to the new 3.x API.
+	Fixed so the margins are the same by default inside the editable area between IE and other browsers.
+	Fixed so editor contents gets stored before it the onSubmit event is fired.
+Version 3.0rc1 (2008-01-08)
+	Added new classes for toolbar rows in advanced theme mceToolbarRow1..n enabled you to change appearance of individual rows.
+	Added auto detection for the strict_loading_mode option when running in application/xhtml+xml mode on Gecko.
+	Optimized the HTML serializer by bundling some post process methods together.
+	Fixed so that the toolbars have unique IDs, enables you to alter the toolbars using the ControlManager and the DOM.
+	Fixed bug where delta values for dialog sizes in language packs didn't work correctly due to missing string to number casting.
+	Fixed bug where paragraph generation logic didn't handle hr or table elements correctly if they where the only element.
+	Fixed bug where some elements got extra linebreaks added after or before it in HTML output.
+	Fixed bug where it was hard to modify existing style data on table rows and table cells.
+	Fixed bug where the dom.getRect method didn't handle non pixel values correctly.
+	Fixed bug where strikethrough and underline couldn't be toggled on existing span elements.
+	Fixed bug where the postprocessor searched for nsbp instead of nbsp entities.
+	Fixed bug where it was impossible to edit links that had child elements within them.
+	Fixed bug where it was possible to click on the parent item of a submenu.
+	Fixed bug where mouseover/mouseout images couldn't be removed in advimage dialog.
+	Fixed bug where drop menus didn't work when running in application/xhtml+xml mode.
+	Fixed bug where Opera added doctype to output in application/xhtml+xml mode.
+	Fixed bug where some DOM methods didn't work correctly in the application/xhtml+xml mode.
+	Fixed bug where the inlinepopups didn't work correctly in the application/xhtml+xml mode.
+	Fixed bug where the ColorSplitButton didn't display correctly in the application/xhtml+xml mode.
+	Fixed bug where the UI layout was incorrect on Gecko browsers when running in application/xhtml+xml mode.
+	Fixed bug where the word paste plugin produced exception while running in application/xhtml+xml mode.
+	Fixed bug where there wasn't any hidden input element generated for divs while running in application/xhtml+xml mode.
+	Fixed bug where indentation of script/style/pre elements where incorrect.
+	Fixed bug where script element contents was removed in IE.
+	Fixed bug where script element contents got entity encoded.
+	Fixed bug where you couldn't edit existing element styles using the styles plugin.
+	Fixed bug where styles wasn't updated properly sometimes due to an performance enhancement.
+	Fixed bug where font sizes couldn't be changed using the style plugin.
+	Fixed bug where an error was produced in Gecko browsers when switching back from fullscreen mode.
+	Fixed bug where Opera was producing br elements after elements like h3.
+	Fixed bug where TinyMCE couldn't be loaded on a page using - characters in it's URL.
+	Fixed bug where the editor container element was forced to have a specific name.
+	Fixed bug with force_br_newlines option on Firefox, even though it should never be used (Read FAQ).
+	Fixed bug where onclick event had an return true; prefix added when creating an popup.
+	Fixed bug where the theme_advanced_statusbar_location option couldn't handle the value "none".
+	Fixed issue with URLs with multiple at characters for example an Zope URI.
+	Fixed so simple and advanced themes doesn't collide.
+	Fixed so a elements gets removed when the href field is left empty, the href attribute is required in a link after all.
+	Fixed so img elements gets removed when the src field is left empty, the src attribute is required for all images after all.
+	Removed the indent and encode methods from the tinymce.dom.Serializer class due to performance enhancement and reduction of the API size.
+Version 3.0b3 (2007-12-14)
+	Added new getElement method to Editor class, returns the element that was replaced with the editor instance.
+	Added new unavailable prefix for disabled controls for accessibility reasons.
+	Fixed bug where regexp patterns couldn't be used for the editor_selector/editor_deselector options.
+	Fixed bug where the DOM wasn't properly initialized before the onInit event was executed in popups.
+	Fixed bug where font sizes where reduced by font size actions on previous spans in Safari.
+	Fixed bug where HR elements got places at the wrong location in IE.
+	Fixed bug where align/justify didn't work correctly on multiple paragraphs.
+	Fixed bug with missing translation for cell scope settings.
+	Fixed bug where selection/caret position was lost on some table actions.
+	Fixed bug where editor instances couldn't be added to hidden div elements.
+	Fixed bug where list elements in Safari would get an odd ID attribute.
+	Fixed bug where IE would return <html/> when the editor was completely empty.
+	Fixed bug where accessibility title attribute for access keys wasn't setup properly.
+	Fixed bug where forecolorpicker and backcolorpicker control names wasn't working.
+	Fixed bug where inserting template content didn't work in Safari due to selection exception.
+	Fixed bug where absolute URLs to remote hosts couldn't be used for background images.
+	Fixed bug where mysterious span elements where produced in Safari when injecting HTML contents.
+	Fixed bug where the media plugin didn't work correctly on the latest Opera 9.24.
+	Fixed bug where indentation of HTML output wasn't applied to all block elements.
+	Fixed bug where Safari was production DOM exception if you pressed enter in an empty editor.
+	Fixed bug where media plugin didn't parse script tags correctly patch contributed by Mathieu Campagna.
+	Fixed bug where the drop menus of list boxes like blockformat could produce scrolling of the page.
+	Fixed bug where the drop menus where placed at an incorrect location if TinyMCE was placed in a scrollable div.
+	Fixed bug where submit buttons couldn't be named submit, it's not recommended to name submit buttons submit anyway.
+	Fixed bug where the stylelistbox produced an exception if there was only one class in the list box.
+	Fixed bug where the stylelistbox wasn't updated correctly when the current class was removed.
+	Fixed bug where the formatblock command sometimes removed the body element.
+	Fixed bug where fullscreen switching in IE sometimes produced an exception when the spellchecker plugin was enabled.
+	Fixed issue where FF produced an empty paragraph when the editor was completely empty.
+	Fixed issue with size of image dialog in the advanced theme.
+	Fixed issues with the bbcode plugin it now also handles spans and the [font] rule.
+	Fixed so the style compression feature is a bit smarter to resolve issues with Opera.
+	Reintroduced the remove_linebreaks option, this is enabled by default.
+Version 3.0b2 (2007-11-29)
+	Added type and compact attributes to the default valid_elements list for the ul and ol elements.
+	Added missing accessibility support to native list boxes in both the toolbar and dialogs.
+	Added missing access key for the element path for accessibility reasons.
+	Fixed support for loading themes from external URLs.
+	Fixed bug where setOuterHTML didn't work correctly when multiple elements where passed to it.
+	Fixed bug with visualchars plugin was moving elements around in the DOM.
+	Fixed bug with DIV elements that got converted into editors on IE.
+	Fixed bug with paste plugin using the old event API.
+	Fixed bug where the spellchecker was removing the word when it was ignored.
+	Fixed bug where fullscreen wasn't working properly.
+	Fixed bug where the base href element and attribute was ignored.
+	Fixed bug where redo function didn't work in IE.
+	Fixed bug where content_css didn't work as previous 2.x branch.
+	Fixed bug where preview dialog was throwing errors if the content_css wasn't defined.
+	Fixed bug where the theme_advanced_path option didn't work like the 2.x branch.
+	Fixed bug where the theme_advanced_statusbar_location was called theme_advanced_status_location.
+	Fixed bug where the strict_loading_mode option didn't work if you created editors dynamically without using the EditorManager.
+	Fixed bug where some language values wasn't translated such as insert and update in dialogs.
+	Fixed bug where some image attributes wasn't stored correctly when inserting an image.
+	Fixed bug where fullscreen mode didn't restore scrollbars when disabled.
+	Fixed bug where there was no visual representation for tab focus in toolbars on IE.
+	Fixed bug where HR elements wasn't treated as block elements so forced_root_block would fail on these.
+	Fixed bug where autosave presented warning message even when the form was submitted normally.
+	Fixed typo of openBrower it's now openBrowser in form_utils.js.
+	Fixed various HTML problems like missing TD elements and duplicated doctypes.
+	Fixed default values for theme_advanced_resize_horizontal, theme_advanced_resizing_use_cookie to be 2.x compatible.
+	Moved spellchecker JS files into the development package.
+	Removed support for theme_advanced_path_location since the theme_advanced_statusbar_location is the correct option name.
+Version 3.0b1 (2007-11-21)
+	Added new tab_focus option, that enables you to specify a element id or that the next element to be focused on tab key down.
+	Added new addQueryValueHandler method to the tinymce.Editor class.
+	Added new class_filter option, this enables you to specify a function that can filter out CSS classes for the styles list box.
+	Added support form [url=url]title[/url] to the bbcode plugin.
+	Renamed the addCommandQueryState method in the tinymce.Editor class to addQueryStateHandler.
+	Renamed loadQue to loadQueue, to correct spelling.
+	Removed the createDOM method from the window manager and replace it with a createInstance method.
+	Removed the add to beginning of class attribute parameter of the DOMUtils.addClass method.
+	Fixed bug with the forced_root_block option, didn't work correctly with multiple inline elements.
+	Fixed bug where image dialogs replaced the current image element with a new one even when it was updated.
+	Fixed bug where the submit trigger wasn't executed when divs where converted into editor instances.
+	Fixed bug where div elements that got converted into editors didn't get a hidden input element generated for them.
+	Fixed bug where the the media_use_script option for the media plugin wasn't working correctly.
+	Fixed bug where the font size and font family listboxes wasn't updated correctly on Safari.
+	Fixed bug where the height of the fieldset in default image dialog for the advanced theme was to small.
+	Fixed bug where the font sizes behaved incorrectly after a cleanup on Safari.
+	Fixed bug where formatblock didn't work correctly in Safari on some elements.
+	Fixed bug where template plugin didn't insert content correctly unless some options where specified.
+	Fixed bug where charmap on Safari produced scrollbars.
+	Fixed bug where there was white artifacts in some dialogs due to missing background color.
+	Fixed bug where port was added to all external URLs if the editor was loaded from a custom port.
+	Fixed bug where the context menus got duplicated on Safari 3.0.4 on Mac OS X.
+	Fixed bug where dialogs like paste from word was huge on Firefox.
+	Fixed bug with media plugin not working with windows media objects.
+	Fixed bug where a forever loop was created if multiple instances where submitted using form.submit.
+	Fixed bug with editing a table produce error in IE when inlinepopups where used.
+	Fixed bug where the style plugin generated ugly looking style information in IE.
+	Fixed bug where the inline dialogs that got opened while in fullscreen mode wasn't visible.
+	Fixed bug where it was difficult to place the caret inside the word paste dialog.
+	Fixed bug where Opera produced strange border in the word paste dialog.
+	Fixed bug where viewport constraints could move a inlinepopup to a negative x, y position if the viewport was to small.
+	Fixed bug where template plugin was producing an error due to a deprecated API call.
+	Fixed bug where drag drop of images failed in Gecko if a document_base_url was specified.
+	Fixed bug where Firefox 3 failed to apply block formats like H1-H6 it still breaks on DIVs this has been reported to bugzilla.
+	Fixed bug where IE was producing a warning dialog about non secure items when running TinyMCE over HTTPS.
+	Fixed bug where the onbeforeunload event was triggered when menus or dialogs where opened.
+	Fixed bug where the fullscreen mode of the HTML view source box threw an error.
+	Fixed bug where the mceFocus command didn't work correctly.
+	Fixed bug where the selection could get lost in IE using inlinepopups.
+	Fixed so the body of the editor area has the mceContentBody class just like the 2.x branch. 
+	Fixed so the media icon gets active when a media element is selected.
+Version 3.0a3 (2007-11-13)
+	Added new experimental jQuery and Prototype framework adapters to the development package.
+	Added new translation.html file for the development package. Helps with the internationalization of TinyMCE.
+	Added new setup callback option, use this callback to add events to TinyMCE. This method is recommended over the old callbacks.
+	Added new API documetation to all classes, functions, events, properties to the Wiki with examples etc.
+	Added new init method to all plugins and themes, since it's shorter to write and it mimics interface capable languages better.
+	Fixed various CSS issues in the default skin such as alignment of split buttons and separators.
+	Fixed issues with mod_security. It didn't like that a content type of text/javascript was forced in a XHR.
+	Fixed all events so that they now pass the sender object as it's first argument.
+	Fixed some DOM methods so they now can take an array as input.
+	Fixed so addButton and the methods of the ControlManager uses less arguments and it now uses a settings object instead.
+	Fixed various issues with the tinymce.util.URI class.
+	Fixed bug in IE and Safari and the on demand gzip loading feature.
+	Fixed bug with moving inline windows sometimes failed in IE6.
+	Fixed bug where save_callback function wasn't executed at all.
+	Fixed bug where inlinepopups produces scrollbars if windows where moved to the corners of the browser.
+	Fixed bug where view HTML source failed when inserting a embedded media object.
+	Fixed bug where the listbox menus didn't display correctly on IE6.
+	Fixed bug where undo level wasn't added when editor was blurred.
+	Fixed bug where spellchecker wasn't disabled when fullscreen mode was enabled.
+	Fixed bug where Firefox could crash some times when the user switched to fullscreen mode.
+	Fixed bug where tinymce.ui.DropMenu didn't remove all item data when an item was removed from the menu.
+	Fixed bug where anchor list in advlink dialog wasn't populated correctly in Safari.
+	Fixed bug where it wasn't possible to edit tables in IE when inlinepopups was enabled.
+	Fixed bug where it wasn't possible to change the table width of an existing table.
+	Fixed bug where xhtmlxtras like abbr didn't work correctly on IE.
+	Fixed bug where IE6 had some graphics rendering issues with the inlinepopups.
+	Fixed bug where inlinepopup windows where moved incorrectly when they were boundary checked for min width.
+	Fixed bug where textareas without id or name couldn't be converted into editor instances.
+	Fixed bug where TinyMCE was stealing element focus on IE.
+	Fixed bug where the getParam method didn't handle false values correctly.
+	Fixed bug where inlinepopups was clipped by other TinyMCE instances or relative elements in IE.
+	Fixed bug where the contextmenu was clipped by other TinyMCE instances or relative elements in IE.
+	Fixed bug where listbox menus was clipped by other TinyMCE instances or relative elements in IE.
+	Fixed bug where listboxes wasn't updated correctly when the a value wasn't found by select.
+	Fixed various CSS issues that produced odd rendering bugs in IE.
+	Fixed issues with tinymce.ui.DropMenu class, it required some optional settings to be specified.
+	Fixed so multiple blockquotes can be removed with a easier method than before.
+	Optimized some of the core API to boost performance.
+	Removed some functions from the core API that wasn't needed.
+Version 3.0a2 (2007-11-02)
+	Fixed critical bug where IE generaded an error on a hasAttribute call in the serialization engine.
+	Fixed critical bug where some dialogs didn't open in the non dev package.
+	Fixed bug when using the theme_advanced_styles option. Error was thrown in some dialogs.
+	Fixed bug where the close buttons produced an error when native windows where used.
+	Fixed bug in default skin so that split buttons gets activated correctly.
+	Fixed so plugins can be loaded from external urls outsite the plugins directory.
+Version 3.0a1 (2007-11-01)
+	Rewrote the core and most of the plugins and themes from scratch.
+	Added new and improved serialization engine, faster and more powerful.
+	Added new internal event system, things like editor.onClick.add(func).
+	Added new inlinepopups plugin, the dialogs are now skinnable and uses clearlooks2 as default.
+	Added new contextmenu plugin, context menus can now have submenus and plugins can add items on the fly.
+	Added new skin support for the simple and advanced themes you can alter the whole UI using CSS.
+	Added new o2k7 skin for the simple and advanced themes.
+	Added new custom list boxes for font size/format/style etc with preview support.
+	Added new UI management, enabled plugins to create controls like splitbuttons or menus easier.
+	Added new JSON parser/serializer and JSON-RPC class to the core API.
+	Added new cookie utility class to the core API.
+	Added new Unit testing class to the core API only available in dev mode.
+	Added new firebug lite integration when loading the dev version of TinyMCE.
+	Added new Safari plugin, fixes lots compatibility of issues with Safari 3.x.
+	Added new URI/URL parsing it now handles the hole RFC and even some exceptions.
+	Added new pagebreak plugin, enables you to insert pagebreak comments like <!-- pagebreak -->
+	Added new on demand loading of plugins and themes. Enables you to load and init TinyMCE at any time.
+	Added new throbber/progress visualization a plugin can show/hide this when it's needed.
+	Added new blockquote button. Enables you to wrap paragraphs in blockquotes.
+	Added new compat2x plugin. Will provide a TinyMCE 2.x API for older plugins.
+	Added new theme_advanced_resizing_min_width, theme_advanced_resizing_min_height options.
+	Added new theme_advanced_resizing_max_height, theme_advanced_resizing_max_height options.
+	Added new use_native_selects option. Enables you to toggle native listboxes on and off.
+	Added new docs_url option enables you to specify where the TinyMCE user documentation is located.
+	Added new frame and rules options for the table dialog.
+	Added new global rule for valid_elements/extended_valid_elements enables you to specify global attributes for all elements.
+	Added new deny attribute rule characher so it's possible to deny global attribute rules on specific elements.
+	Added new unit tests in the dev package of TinyMCE. Runs tests on the core API, commands and settings of the editor.
+	Readded the inline_styles option and enabled it by default so deprecated attributes are no longer used.
+	Removed all button images and replaced them with CSS sprite images. Reduces the number of requests needed.
+	Removed lots of language files and merged them into the base language files. Reduces the number of requests needed.
+	Removed lots of unnecessary files and merged many of them together to reduce requests and improve loading speed.
+	Reduced the over all script size by 33% and the number of files/requests by 75% so it loads a lot faster.
+	Fixed so convert_fonts_to_spans are enabled by default. So no more font tags.
+	Fixed so underline and strikethrough uses spans instread of deprecated U and STRIKE elements.
+	Fixed so indent/outdent adds/removed margin-left instead of blockquotes.
+	Fixed so alignment of paragraphs results in a text-align style value instead of the deprecated align attribute.
+	Fixed so alignment of images uses float or vertical-align style values instead of the deprecated align attribute.
+	Fixed so all classes from @import stylesheets gets imported into the editor.
+	Fixed so the directionality can toggle the dir attribute on and off.
+	Fixed so the fullscreen_settings can be used for all types of fullscreen modes.
+	Fixed so the advanced HR dialog gets displayed when inserting a HR not only on edit.
+	Fixed bug where word wrap didn't work in the source editor on Safari.
+	Fixed so non HTML elements can be used within the editor such as <myns:tag>
+	Fixed various memory leaks in IE and reduced the unload cleanups needed.
+	Fixed so the preformatted option adds an invisible container pre tag inside the editor.
+	Renamed the _template plugin to example and updated it to use the new 3.x API.
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/langs/en.js b/mod/tinymce/tinymce/jscripts/tiny_mce/langs/en.js
new file mode 100644
index 000000000..ef3e18afe
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/langs/en.js
@@ -0,0 +1,154 @@
+tinyMCE.addI18n({en:{
+common:{
+edit_confirm:"Do you want to use the WYSIWYG mode for this textarea?",
+apply:"Apply",
+insert:"Insert",
+update:"Update",
+cancel:"Cancel",
+close:"Close",
+browse:"Browse",
+class_name:"Class",
+not_set:"-- Not set --",
+clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",
+clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",
+popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",
+invalid_data:"Error: Invalid values entered, these are marked in red.",
+more_colors:"More colors"
+},
+contextmenu:{
+align:"Alignment",
+left:"Left",
+center:"Center",
+right:"Right",
+full:"Full"
+},
+insertdatetime:{
+date_fmt:"%Y-%m-%d",
+time_fmt:"%H:%M:%S",
+insertdate_desc:"Insert date",
+inserttime_desc:"Insert time",
+months_long:"January,February,March,April,May,June,July,August,September,October,November,December",
+months_short:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec",
+day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday",
+day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"
+},
+print:{
+print_desc:"Print"
+},
+preview:{
+preview_desc:"Preview"
+},
+directionality:{
+ltr_desc:"Direction left to right",
+rtl_desc:"Direction right to left"
+},
+layer:{
+insertlayer_desc:"Insert new layer",
+forward_desc:"Move forward",
+backward_desc:"Move backward",
+absolute_desc:"Toggle absolute positioning",
+content:"New layer..."
+},
+save:{
+save_desc:"Save",
+cancel_desc:"Cancel all changes"
+},
+nonbreaking:{
+nonbreaking_desc:"Insert non-breaking space character"
+},
+iespell:{
+iespell_desc:"Run spell checking",
+download:"ieSpell not detected. Do you want to install it now?"
+},
+advhr:{
+advhr_desc:"Horizontal rule"
+},
+emotions:{
+emotions_desc:"Emotions"
+},
+searchreplace:{
+search_desc:"Find",
+replace_desc:"Find/Replace"
+},
+advimage:{
+image_desc:"Insert/edit image"
+},
+advlink:{
+link_desc:"Insert/edit link"
+},
+xhtmlxtras:{
+cite_desc:"Citation",
+abbr_desc:"Abbreviation",
+acronym_desc:"Acronym",
+del_desc:"Deletion",
+ins_desc:"Insertion",
+attribs_desc:"Insert/Edit Attributes"
+},
+style:{
+desc:"Edit CSS Style"
+},
+paste:{
+paste_text_desc:"Paste as Plain Text",
+paste_word_desc:"Paste from Word",
+selectall_desc:"Select All"
+},
+paste_dlg:{
+text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
+text_linebreaks:"Keep linebreaks",
+word_title:"Use CTRL+V on your keyboard to paste the text into the window."
+},
+table:{
+desc:"Inserts a new table",
+row_before_desc:"Insert row before",
+row_after_desc:"Insert row after",
+delete_row_desc:"Delete row",
+col_before_desc:"Insert column before",
+col_after_desc:"Insert column after",
+delete_col_desc:"Remove column",
+split_cells_desc:"Split merged table cells",
+merge_cells_desc:"Merge table cells",
+row_desc:"Table row properties",
+cell_desc:"Table cell properties",
+props_desc:"Table properties",
+paste_row_before_desc:"Paste table row before",
+paste_row_after_desc:"Paste table row after",
+cut_row_desc:"Cut table row",
+copy_row_desc:"Copy table row",
+del:"Delete table",
+row:"Row",
+col:"Column",
+cell:"Cell"
+},
+autosave:{
+unload_msg:"The changes you made will be lost if you navigate away from this page."
+},
+fullscreen:{
+desc:"Toggle fullscreen mode"
+},
+media:{
+desc:"Insert / edit embedded media",
+edit:"Edit embedded media"
+},
+fullpage:{
+desc:"Document properties"
+},
+template:{
+desc:"Insert predefined template content"
+},
+visualchars:{
+desc:"Visual control characters on/off."
+},
+spellchecker:{
+desc:"Toggle spellchecker",
+menu:"Spellchecker settings",
+ignore_word:"Ignore word",
+ignore_words:"Ignore all",
+langs:"Languages",
+wait:"Please wait...",
+sug:"Suggestions",
+no_sug:"No suggestions",
+no_mpell:"No misspellings found."
+},
+pagebreak:{
+desc:"Insert page break."
+}}});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/license.txt b/mod/tinymce/tinymce/jscripts/tiny_mce/license.txt
new file mode 100644
index 000000000..1837b0acb
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/license.txt
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css
new file mode 100644
index 000000000..3fe369cb0
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css
@@ -0,0 +1,5 @@
+input.radio {border:1px none #000; background:transparent; vertical-align:middle;}
+.panel_wrapper div.current {height:80px;}
+#width {width:50px; vertical-align:middle;}
+#width2 {width:50px; vertical-align:middle;}
+#size {width:100px;}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js
new file mode 100644
index 000000000..f3350043f
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.AdvancedHRPlugin',{init:function(ed,url){ed.addCommand('mceAdvancedHr',function(){ed.windowManager.open({file:url+'/rule.htm',width:250+parseInt(ed.getLang('advhr.delta_width',0)),height:160+parseInt(ed.getLang('advhr.delta_height',0)),inline:1},{plugin_url:url});});ed.addButton('advhr',{title:'advhr.advhr_desc',cmd:'mceAdvancedHr'});ed.onNodeChange.add(function(ed,cm,n){cm.setActive('advhr',n.nodeName=='HR');});ed.onClick.add(function(ed,e){e=e.target;if(e.nodeName==='HR')ed.selection.select(e);});},getInfo:function(){return{longname:'Advanced HR',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('advhr',tinymce.plugins.AdvancedHRPlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js
new file mode 100644
index 000000000..bd0adf1ab
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js
@@ -0,0 +1,54 @@
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.AdvancedHRPlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceAdvancedHr', function() {
+				ed.windowManager.open({
+					file : url + '/rule.htm',
+					width : 250 + parseInt(ed.getLang('advhr.delta_width', 0)),
+					height : 160 + parseInt(ed.getLang('advhr.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.addButton('advhr', {
+				title : 'advhr.advhr_desc',
+				cmd : 'mceAdvancedHr'
+			});
+
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setActive('advhr', n.nodeName == 'HR');
+			});
+
+			ed.onClick.add(function(ed, e) {
+				e = e.target;
+
+				if (e.nodeName === 'HR')
+					ed.selection.select(e);
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Advanced HR',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('advhr', tinymce.plugins.AdvancedHRPlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js
new file mode 100644
index 000000000..a60c35fc3
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js
@@ -0,0 +1,43 @@
+var AdvHRDialog = {
+	init : function(ed) {
+		var dom = ed.dom, f = document.forms[0], n = ed.selection.getNode(), w;
+
+		w = dom.getAttrib(n, 'width');
+		f.width.value = w ? parseInt(w) : (dom.getStyle('width') || '');
+		f.size.value = dom.getAttrib(n, 'size') || parseInt(dom.getStyle('height')) || '';
+		f.noshade.checked = !!dom.getAttrib(n, 'noshade') || !!dom.getStyle('border-width');
+		selectByValue(f, 'width2', w.indexOf('%') != -1 ? '%' : 'px');
+	},
+
+	update : function() {
+		var ed = tinyMCEPopup.editor, h, f = document.forms[0], st = '';
+
+		h = '<hr';
+
+		if (f.size.value) {
+			h += ' size="' + f.size.value + '"';
+			st += ' height:' + f.size.value + 'px;';
+		}
+
+		if (f.width.value) {
+			h += ' width="' + f.width.value + (f.width2.value == '%' ? '%' : '') + '"';
+			st += ' width:' + f.width.value + (f.width2.value == '%' ? '%' : 'px') + ';';
+		}
+
+		if (f.noshade.checked) {
+			h += ' noshade="noshade"';
+			st += ' border-width: 1px; border-style: solid; border-color: #CCCCCC; color: #ffffff;';
+		}
+
+		if (ed.settings.inline_styles)
+			h += ' style="' + tinymce.trim(st) + '"';
+
+		h += ' />';
+
+		ed.execCommand("mceInsertContent", false, h);
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.requireLangPack();
+tinyMCEPopup.onInit.add(AdvHRDialog.init, AdvHRDialog);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
new file mode 100644
index 000000000..eec74dbd4
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('en.advhr_dlg',{
+width:"Width",
+size:"Height",
+noshade:"No shadow"
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
new file mode 100644
index 000000000..8f20f7fa8
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advhr.advhr_desc}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/rule.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<link href="css/advhr.css" rel="stylesheet" type="text/css" />

+	<base target="_self" />

+</head>

+<body>

+<form onsubmit="AdvHRDialog.update();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advhr.advhr_desc}</a></span></li>

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+			<table border="0" cellpadding="4" cellspacing="0">

+                    <tr>

+                        <td><label for="width">{#advhr_dlg.width}</label></td>

+                        <td nowrap="nowrap">

+                            <input id="width" name="width" type="text" value="" class="mceFocus" />

+                            <select name="width2" id="width2">

+                                <option value="">px</option>

+                                <option value="%">%</option>

+                            </select>

+                        </td>

+                    </tr>

+                    <tr>

+                        <td><label for="size">{#advhr_dlg.size}</label></td>

+                        <td><select id="size" name="size">

+                            <option value="">Normal</option>

+                            <option value="1">1</option>

+                            <option value="2">2</option>

+                            <option value="3">3</option>

+                            <option value="4">4</option>

+                            <option value="5">5</option>

+                        </select></td>

+                    </tr>

+                    <tr>

+                        <td><label for="noshade">{#advhr_dlg.noshade}</label></td>

+                        <td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>

+                    </tr>

+            </table>

+		</div>

+	</div>

+

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="submit" id="insert" name="insert" value="{#insert}" />

+		</div>

+

+		<div style="float: right">

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</div>

+</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css
new file mode 100644
index 000000000..228530f9e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css
@@ -0,0 +1,13 @@
+#src_list, #over_list, #out_list {width:280px;}
+.mceActionPanel {margin-top:7px;}
+.alignPreview {border:1px solid #000; width:140px; height:140px; overflow:hidden; padding:5px;}
+.checkbox {border:0;}
+.panel_wrapper div.current {height:305px;}
+#prev {margin:0; border:1px solid #000; width:428px; height:150px; overflow:auto;}
+#align, #classlist {width:150px;}
+#width, #height {vertical-align:middle; width:50px; text-align:center;}
+#vspace, #hspace, #border {vertical-align:middle; width:30px; text-align:center;}
+#class_list {width:180px;}
+input {width: 280px;}
+#constrain, #onmousemovecheck {width:auto;}
+#id, #dir, #lang, #usemap, #longdesc {width:200px;}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
new file mode 100644
index 000000000..3af50573e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.AdvancedImagePlugin',{init:function(ed,url){ed.addCommand('mceAdvImage',function(){if(ed.dom.getAttrib(ed.selection.getNode(),'class').indexOf('mceItem')!=-1)return;ed.windowManager.open({file:url+'/image.htm',width:480+parseInt(ed.getLang('advimage.delta_width',0)),height:385+parseInt(ed.getLang('advimage.delta_height',0)),inline:1},{plugin_url:url});});ed.addButton('image',{title:'advimage.image_desc',cmd:'mceAdvImage'});},getInfo:function(){return{longname:'Advanced image',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('advimage',tinymce.plugins.AdvancedImagePlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js
new file mode 100644
index 000000000..259a076d8
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js
@@ -0,0 +1,47 @@
+/**
+ * $Id: editor_plugin_src.js 677 2008-03-07 13:52:41Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.AdvancedImagePlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceAdvImage', function() {
+				// Internal image object like a flash placeholder
+				if (ed.dom.getAttrib(ed.selection.getNode(), 'class').indexOf('mceItem') != -1)
+					return;
+
+				ed.windowManager.open({
+					file : url + '/image.htm',
+					width : 480 + parseInt(ed.getLang('advimage.delta_width', 0)),
+					height : 385 + parseInt(ed.getLang('advimage.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.addButton('image', {
+				title : 'advimage.image_desc',
+				cmd : 'mceAdvImage'
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Advanced image',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('advimage', tinymce.plugins.AdvancedImagePlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
new file mode 100644
index 000000000..dd84083f4
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
@@ -0,0 +1,238 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advimage_dlg.dialog_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/validate.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/image.js"></script>

+	<link href="css/advimage.css" rel="stylesheet" type="text/css" />

+	<base target="_self" />

+</head>

+<body id="advimage" style="display: none">

+    <form onsubmit="ImageDialog.insert();return false;" action="#"> 

+		<div class="tabs">

+			<ul>

+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advimage_dlg.tab_general}</a></span></li>

+				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#advimage_dlg.tab_appearance}</a></span></li>

+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advimage_dlg.tab_advanced}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="general_panel" class="panel current">

+				<fieldset>

+						<legend>{#advimage_dlg.general}</legend>

+

+						<table class="properties">

+							<tr>

+								<td class="column1"><label id="srclabel" for="src">{#advimage_dlg.src}</label></td>

+								<td colspan="2"><table border="0" cellspacing="0" cellpadding="0">

+									<tr> 

+									  <td><input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /></td> 

+									  <td id="srcbrowsercontainer">&nbsp;</td>

+									</tr>

+								  </table></td>

+							</tr>

+							<tr>

+								<td><label for="src_list">{#advimage_dlg.image_list}</label></td>

+								<td><select id="src_list" name="src_list" onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;document.getElementById('title').value=this.options[this.selectedIndex].text;ImageDialog.showPreviewImage(this.options[this.selectedIndex].value);"></select></td>

+							</tr>

+							<tr> 

+								<td class="column1"><label id="altlabel" for="alt">{#advimage_dlg.alt}</label></td> 

+								<td colspan="2"><input id="alt" name="alt" type="text" value="" /></td> 

+							</tr> 

+							<tr> 

+								<td class="column1"><label id="titlelabel" for="title">{#advimage_dlg.title}</label></td> 

+								<td colspan="2"><input id="title" name="title" type="text" value="" /></td> 

+							</tr>

+						</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#advimage_dlg.preview}</legend>

+					<div id="prev"></div>

+				</fieldset>

+			</div>

+

+			<div id="appearance_panel" class="panel">

+				<fieldset>

+					<legend>{#advimage_dlg.tab_appearance}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr> 

+							<td class="column1"><label id="alignlabel" for="align">{#advimage_dlg.align}</label></td> 

+							<td><select id="align" name="align" onchange="ImageDialog.updateStyle('align');ImageDialog.changeAppearance();"> 

+									<option value="">{#not_set}</option> 

+									<option value="baseline">{#advimage_dlg.align_baseline}</option>

+									<option value="top">{#advimage_dlg.align_top}</option>

+									<option value="middle">{#advimage_dlg.align_middle}</option>

+									<option value="bottom">{#advimage_dlg.align_bottom}</option>

+									<option value="text-top">{#advimage_dlg.align_texttop}</option>

+									<option value="text-bottom">{#advimage_dlg.align_textbottom}</option>

+									<option value="left">{#advimage_dlg.align_left}</option>

+									<option value="right">{#advimage_dlg.align_right}</option>

+								</select> 

+							</td>

+							<td rowspan="6" valign="top">

+								<div class="alignPreview">

+									<img id="alignSampleImg" src="img/sample.gif" alt="{#advimage_dlg.example_img}" />

+									Lorem ipsum, Dolor sit amet, consectetuer adipiscing loreum ipsum edipiscing elit, sed diam

+									nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.Loreum ipsum

+									edipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam

+									erat volutpat.

+								</div>

+							</td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="widthlabel" for="width">{#advimage_dlg.dimensions}</label></td>

+							<td nowrap="nowrap">

+								<input name="width" type="text" id="width" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeHeight();" /> x 

+								<input name="height" type="text" id="height" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeWidth();" /> px

+							</td>

+						</tr>

+

+						<tr>

+							<td>&nbsp;</td>

+							<td><table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>

+										<td><label id="constrainlabel" for="constrain">{#advimage_dlg.constrain_proportions}</label></td>

+									</tr>

+								</table></td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="vspacelabel" for="vspace">{#advimage_dlg.vspace}</label></td> 

+							<td><input name="vspace" type="text" id="vspace" value="" size="3" maxlength="3" class="number" onchange="ImageDialog.updateStyle('vspace');ImageDialog.changeAppearance();" onblur="ImageDialog.updateStyle('vspace');ImageDialog.changeAppearance();" />

+							</td>

+						</tr>

+

+						<tr> 

+							<td class="column1"><label id="hspacelabel" for="hspace">{#advimage_dlg.hspace}</label></td> 

+							<td><input name="hspace" type="text" id="hspace" value="" size="3" maxlength="3" class="number" onchange="ImageDialog.updateStyle('hspace');ImageDialog.changeAppearance();" onblur="ImageDialog.updateStyle('hspace');ImageDialog.changeAppearance();" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="borderlabel" for="border">{#advimage_dlg.border}</label></td> 

+							<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" class="number" onchange="ImageDialog.updateStyle('border');ImageDialog.changeAppearance();" onblur="ImageDialog.updateStyle('border');ImageDialog.changeAppearance();" /></td> 

+						</tr>

+

+						<tr>

+							<td><label for="class_list">{#class_name}</label></td>

+							<td colspan="2"><select id="class_list" name="class_list" class="mceEditableSelect"></select></td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="stylelabel" for="style">{#advimage_dlg.style}</label></td> 

+							<td colspan="2"><input id="style" name="style" type="text" value="" onchange="ImageDialog.changeAppearance();" /></td> 

+						</tr>

+

+						<!-- <tr>

+							<td class="column1"><label id="classeslabel" for="classes">{#advimage_dlg.classes}</label></td> 

+							<td colspan="2"><input id="classes" name="classes" type="text" value="" onchange="selectByValue(this.form,'classlist',this.value,true);" /></td> 

+						</tr> -->

+					</table>

+				</fieldset>

+			</div>

+

+			<div id="advanced_panel" class="panel">

+				<fieldset>

+					<legend>{#advimage_dlg.swap_image}</legend>

+

+					<input type="checkbox" id="onmousemovecheck" name="onmousemovecheck" class="checkbox" onclick="ImageDialog.setSwapImage(this.checked);" />

+					<label id="onmousemovechecklabel" for="onmousemovecheck">{#advimage_dlg.alt_image}</label>

+

+					<table border="0" cellpadding="4" cellspacing="0" width="100%">

+							<tr>

+								<td class="column1"><label id="onmouseoversrclabel" for="onmouseoversrc">{#advimage_dlg.mouseover}</label></td> 

+								<td><table border="0" cellspacing="0" cellpadding="0"> 

+									<tr> 

+									  <td><input id="onmouseoversrc" name="onmouseoversrc" type="text" value="" /></td> 

+									  <td id="onmouseoversrccontainer">&nbsp;</td>

+									</tr>

+								  </table></td>

+							</tr>

+							<tr>

+								<td><label for="over_list">{#advimage_dlg.image_list}</label></td>

+								<td><select id="over_list" name="over_list" onchange="document.getElementById('onmouseoversrc').value=this.options[this.selectedIndex].value;"></select></td>

+							</tr>

+							<tr> 

+								<td class="column1"><label id="onmouseoutsrclabel" for="onmouseoutsrc">{#advimage_dlg.mouseout}</label></td> 

+								<td class="column2"><table border="0" cellspacing="0" cellpadding="0"> 

+									<tr> 

+									  <td><input id="onmouseoutsrc" name="onmouseoutsrc" type="text" value="" /></td> 

+									  <td id="onmouseoutsrccontainer">&nbsp;</td>

+									</tr> 

+								  </table></td> 

+							</tr>

+							<tr>

+								<td><label for="out_list">{#advimage_dlg.image_list}</label></td>

+								<td><select id="out_list" name="out_list" onchange="document.getElementById('onmouseoutsrc').value=this.options[this.selectedIndex].value;"></select></td>

+							</tr>

+					</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#advimage_dlg.misc}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label id="idlabel" for="id">{#advimage_dlg.id}</label></td> 

+							<td><input id="id" name="id" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="dirlabel" for="dir">{#advimage_dlg.langdir}</label></td> 

+							<td>

+								<select id="dir" name="dir" onchange="ImageDialog.changeAppearance();"> 

+										<option value="">{#not_set}</option> 

+										<option value="ltr">{#advimage_dlg.ltr}</option> 

+										<option value="rtl">{#advimage_dlg.rtl}</option> 

+								</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="langlabel" for="lang">{#advimage_dlg.langcode}</label></td> 

+							<td>

+								<input id="lang" name="lang" type="text" value="" />

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="usemaplabel" for="usemap">{#advimage_dlg.map}</label></td> 

+							<td>

+								<input id="usemap" name="usemap" type="text" value="" />

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="longdesclabel" for="longdesc">{#advimage_dlg.long_desc}</label></td>

+							<td><table border="0" cellspacing="0" cellpadding="0">

+									<tr>

+									  <td><input id="longdesc" name="longdesc" type="text" value="" /></td>

+									  <td id="longdesccontainer">&nbsp;</td>

+									</tr>

+								</table></td> 

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<div style="float: left">

+				<input type="submit" id="insert" name="insert" value="{#insert}" />

+			</div>

+

+			<div style="float: right">

+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+			</div>

+		</div>

+    </form>

+</body> 

+</html> 

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/img/sample.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/img/sample.gif
new file mode 100644
index 000000000..53bf6890b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/img/sample.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
new file mode 100644
index 000000000..1d19ce81b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
@@ -0,0 +1,441 @@
+var ImageDialog = {
+	preInit : function() {
+		var url;
+
+		tinyMCEPopup.requireLangPack();
+
+		if (url = tinyMCEPopup.getParam("external_image_list_url"))
+			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+	},
+
+	init : function(ed) {
+		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode();
+
+		tinyMCEPopup.resizeToInnerSize();
+		this.fillClassList('class_list');
+		this.fillFileList('src_list', 'tinyMCEImageList');
+		this.fillFileList('over_list', 'tinyMCEImageList');
+		this.fillFileList('out_list', 'tinyMCEImageList');
+		TinyMCE_EditableSelects.init();
+
+		if (n.nodeName == 'IMG') {
+			nl.src.value = dom.getAttrib(n, 'src');
+			nl.width.value = dom.getAttrib(n, 'width');
+			nl.height.value = dom.getAttrib(n, 'height');
+			nl.alt.value = dom.getAttrib(n, 'alt');
+			nl.title.value = dom.getAttrib(n, 'title');
+			nl.vspace.value = this.getAttrib(n, 'vspace');
+			nl.hspace.value = this.getAttrib(n, 'hspace');
+			nl.border.value = this.getAttrib(n, 'border');
+			selectByValue(f, 'align', this.getAttrib(n, 'align'));
+			selectByValue(f, 'class_list', dom.getAttrib(n, 'class'), true, true);
+			nl.style.value = dom.getAttrib(n, 'style');
+			nl.id.value = dom.getAttrib(n, 'id');
+			nl.dir.value = dom.getAttrib(n, 'dir');
+			nl.lang.value = dom.getAttrib(n, 'lang');
+			nl.usemap.value = dom.getAttrib(n, 'usemap');
+			nl.longdesc.value = dom.getAttrib(n, 'longdesc');
+			nl.insert.value = ed.getLang('update');
+
+			if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseover')))
+				nl.onmouseoversrc.value = dom.getAttrib(n, 'onmouseover').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1');
+
+			if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseout')))
+				nl.onmouseoutsrc.value = dom.getAttrib(n, 'onmouseout').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1');
+
+			if (ed.settings.inline_styles) {
+				// Move attribs to styles
+				if (dom.getAttrib(n, 'align'))
+					this.updateStyle('align');
+
+				if (dom.getAttrib(n, 'hspace'))
+					this.updateStyle('hspace');
+
+				if (dom.getAttrib(n, 'border'))
+					this.updateStyle('border');
+
+				if (dom.getAttrib(n, 'vspace'))
+					this.updateStyle('vspace');
+			}
+		}
+
+		// Setup browse button
+		document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');
+		if (isVisible('srcbrowser'))
+			document.getElementById('src').style.width = '260px';
+
+		// Setup browse button
+		document.getElementById('onmouseoversrccontainer').innerHTML = getBrowserHTML('overbrowser','onmouseoversrc','image','theme_advanced_image');
+		if (isVisible('overbrowser'))
+			document.getElementById('onmouseoversrc').style.width = '260px';
+
+		// Setup browse button
+		document.getElementById('onmouseoutsrccontainer').innerHTML = getBrowserHTML('outbrowser','onmouseoutsrc','image','theme_advanced_image');
+		if (isVisible('outbrowser'))
+			document.getElementById('onmouseoutsrc').style.width = '260px';
+
+		// If option enabled default contrain proportions to checked
+		if (ed.getParam("advimage_constrain_proportions", true))
+			f.constrain.checked = true;
+
+		// Check swap image if valid data
+		if (nl.onmouseoversrc.value || nl.onmouseoutsrc.value)
+			this.setSwapImage(true);
+		else
+			this.setSwapImage(false);
+
+		this.changeAppearance();
+		this.showPreviewImage(nl.src.value, 1);
+	},
+
+	insert : function(file, title) {
+		var ed = tinyMCEPopup.editor, t = this, f = document.forms[0];
+
+		if (f.src.value === '') {
+			if (ed.selection.getNode().nodeName == 'IMG') {
+				ed.dom.remove(ed.selection.getNode());
+				ed.execCommand('mceRepaint');
+			}
+
+			tinyMCEPopup.close();
+			return;
+		}
+
+		if (tinyMCEPopup.getParam("accessibility_warnings", 1)) {
+			if (!f.alt.value) {
+				tinyMCEPopup.editor.windowManager.confirm(tinyMCEPopup.getLang('advimage_dlg.missing_alt'), function(s) {
+					if (s)
+						t.insertAndClose();
+				});
+
+				return;
+			}
+		}
+
+		t.insertAndClose();
+	},
+
+	insertAndClose : function() {
+		var ed = tinyMCEPopup.editor, f = document.forms[0], nl = f.elements, v, args = {}, el;
+
+		tinyMCEPopup.restoreSelection();
+
+		// Fixes crash in Safari
+		if (tinymce.isWebKit)
+			ed.getWin().focus();
+
+		if (!ed.settings.inline_styles) {
+			args = {
+				vspace : nl.vspace.value,
+				hspace : nl.hspace.value,
+				border : nl.border.value,
+				align : getSelectValue(f, 'align')
+			};
+		} else {
+			// Remove deprecated values
+			args = {
+				vspace : '',
+				hspace : '',
+				border : '',
+				align : ''
+			};
+		}
+
+		tinymce.extend(args, {
+			src : nl.src.value,
+			width : nl.width.value,
+			height : nl.height.value,
+			alt : nl.alt.value,
+			title : nl.title.value,
+			'class' : getSelectValue(f, 'class_list'),
+			style : nl.style.value,
+			id : nl.id.value,
+			dir : nl.dir.value,
+			lang : nl.lang.value,
+			usemap : nl.usemap.value,
+			longdesc : nl.longdesc.value
+		});
+
+		args.onmouseover = args.onmouseout = '';
+
+		if (f.onmousemovecheck.checked) {
+			if (nl.onmouseoversrc.value)
+				args.onmouseover = "this.src='" + nl.onmouseoversrc.value + "';";
+
+			if (nl.onmouseoutsrc.value)
+				args.onmouseout = "this.src='" + nl.onmouseoutsrc.value + "';";
+		}
+
+		el = ed.selection.getNode();
+
+		if (el && el.nodeName == 'IMG') {
+			ed.dom.setAttribs(el, args);
+		} else {
+			ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});
+			ed.dom.setAttribs('__mce_tmp', args);
+			ed.dom.setAttrib('__mce_tmp', 'id', '');
+			ed.undoManager.add();
+		}
+
+		tinyMCEPopup.close();
+	},
+
+	getAttrib : function(e, at) {
+		var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;
+
+		if (ed.settings.inline_styles) {
+			switch (at) {
+				case 'align':
+					if (v = dom.getStyle(e, 'float'))
+						return v;
+
+					if (v = dom.getStyle(e, 'vertical-align'))
+						return v;
+
+					break;
+
+				case 'hspace':
+					v = dom.getStyle(e, 'margin-left')
+					v2 = dom.getStyle(e, 'margin-right');
+
+					if (v && v == v2)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+
+				case 'vspace':
+					v = dom.getStyle(e, 'margin-top')
+					v2 = dom.getStyle(e, 'margin-bottom');
+					if (v && v == v2)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+
+				case 'border':
+					v = 0;
+
+					tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {
+						sv = dom.getStyle(e, 'border-' + sv + '-width');
+
+						// False or not the same as prev
+						if (!sv || (sv != v && v !== 0)) {
+							v = 0;
+							return false;
+						}
+
+						if (sv)
+							v = sv;
+					});
+
+					if (v)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+			}
+		}
+
+		if (v = dom.getAttrib(e, at))
+			return v;
+
+		return '';
+	},
+
+	setSwapImage : function(st) {
+		var f = document.forms[0];
+
+		f.onmousemovecheck.checked = st;
+		setBrowserDisabled('overbrowser', !st);
+		setBrowserDisabled('outbrowser', !st);
+
+		if (f.over_list)
+			f.over_list.disabled = !st;
+
+		if (f.out_list)
+			f.out_list.disabled = !st;
+
+		f.onmouseoversrc.disabled = !st;
+		f.onmouseoutsrc.disabled  = !st;
+	},
+
+	fillClassList : function(id) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		if (v = tinyMCEPopup.getParam('theme_advanced_styles')) {
+			cl = [];
+
+			tinymce.each(v.split(';'), function(v) {
+				var p = v.split('=');
+
+				cl.push({'title' : p[0], 'class' : p[1]});
+			});
+		} else
+			cl = tinyMCEPopup.editor.dom.getClasses();
+
+		if (cl.length > 0) {
+			lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');
+
+			tinymce.each(cl, function(o) {
+				lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	fillFileList : function(id, l) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		l = window[l];
+
+		if (l && l.length > 0) {
+			lst.options[lst.options.length] = new Option('', '');
+
+			tinymce.each(l, function(o) {
+				lst.options[lst.options.length] = new Option(o[0], o[1]);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	resetImageData : function() {
+		var f = document.forms[0];
+
+		f.elements.width.value = f.elements.height.value = '';
+	},
+
+	updateImageData : function(img, st) {
+		var f = document.forms[0];
+
+		if (!st) {
+			f.elements.width.value = img.width;
+			f.elements.height.value = img.height;
+		}
+
+		this.preloadImg = img;
+	},
+
+	changeAppearance : function() {
+		var ed = tinyMCEPopup.editor, f = document.forms[0], img = document.getElementById('alignSampleImg');
+
+		if (img) {
+			if (ed.getParam('inline_styles')) {
+				ed.dom.setAttrib(img, 'style', f.style.value);
+			} else {
+				img.align = f.align.value;
+				img.border = f.border.value;
+				img.hspace = f.hspace.value;
+				img.vspace = f.vspace.value;
+			}
+		}
+	},
+
+	changeHeight : function() {
+		var f = document.forms[0], tp, t = this;
+
+		if (!f.constrain.checked || !t.preloadImg) {
+			return;
+		}
+
+		if (f.width.value == "" || f.height.value == "")
+			return;
+
+		tp = (parseInt(f.width.value) / parseInt(t.preloadImg.width)) * t.preloadImg.height;
+		f.height.value = tp.toFixed(0);
+	},
+
+	changeWidth : function() {
+		var f = document.forms[0], tp, t = this;
+
+		if (!f.constrain.checked || !t.preloadImg) {
+			return;
+		}
+
+		if (f.width.value == "" || f.height.value == "")
+			return;
+
+		tp = (parseInt(f.height.value) / parseInt(t.preloadImg.height)) * t.preloadImg.width;
+		f.width.value = tp.toFixed(0);
+	},
+
+	updateStyle : function(ty) {
+		var dom = tinyMCEPopup.dom, st, v, f = document.forms[0], img = dom.create('img', {style : dom.get('style').value});
+
+		if (tinyMCEPopup.editor.settings.inline_styles) {
+			// Handle align
+			if (ty == 'align') {
+				dom.setStyle(img, 'float', '');
+				dom.setStyle(img, 'vertical-align', '');
+
+				v = getSelectValue(f, 'align');
+				if (v) {
+					if (v == 'left' || v == 'right')
+						dom.setStyle(img, 'float', v);
+					else
+						img.style.verticalAlign = v;
+				}
+			}
+
+			// Handle border
+			if (ty == 'border') {
+				dom.setStyle(img, 'border', '');
+
+				v = f.border.value;
+				if (v || v == '0') {
+					if (v == '0')
+						img.style.border = '0';
+					else
+						img.style.border = v + 'px solid black';
+				}
+			}
+
+			// Handle hspace
+			if (ty == 'hspace') {
+				dom.setStyle(img, 'marginLeft', '');
+				dom.setStyle(img, 'marginRight', '');
+
+				v = f.hspace.value;
+				if (v) {
+					img.style.marginLeft = v + 'px';
+					img.style.marginRight = v + 'px';
+				}
+			}
+
+			// Handle vspace
+			if (ty == 'vspace') {
+				dom.setStyle(img, 'marginTop', '');
+				dom.setStyle(img, 'marginBottom', '');
+
+				v = f.vspace.value;
+				if (v) {
+					img.style.marginTop = v + 'px';
+					img.style.marginBottom = v + 'px';
+				}
+			}
+
+			// Merge
+			dom.get('style').value = dom.serializeStyle(dom.parseStyle(img.style.cssText));
+		}
+	},
+
+	changeMouseMove : function() {
+	},
+
+	showPreviewImage : function(u, st) {
+		if (!u) {
+			tinyMCEPopup.dom.setHTML('prev', '');
+			return;
+		}
+
+		if (!st && tinyMCEPopup.getParam("advimage_update_dimensions_onchange", true))
+			this.resetImageData();
+
+		u = tinyMCEPopup.editor.documentBaseURI.toAbsolute(u);
+
+		if (!st)
+			tinyMCEPopup.dom.setHTML('prev', '<img id="previewImg" src="' + u + '" border="0" onload="ImageDialog.updateImageData(this);" onerror="ImageDialog.resetImageData();" />');
+		else
+			tinyMCEPopup.dom.setHTML('prev', '<img id="previewImg" src="' + u + '" border="0" onload="ImageDialog.updateImageData(this, 1);" />');
+	}
+};
+
+ImageDialog.preInit();
+tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
new file mode 100644
index 000000000..ef81f78b4
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
@@ -0,0 +1,43 @@
+tinyMCE.addI18n('en.advimage_dlg',{
+tab_general:"General",
+tab_appearance:"Appearance",
+tab_advanced:"Advanced",
+general:"General",
+title:"Title",
+preview:"Preview",
+constrain_proportions:"Constrain proportions",
+langdir:"Language direction",
+langcode:"Language code",
+long_desc:"Long description link",
+style:"Style",
+classes:"Classes",
+ltr:"Left to right",
+rtl:"Right to left",
+id:"Id",
+map:"Image map",
+swap_image:"Swap image",
+alt_image:"Alternative image",
+mouseover:"for mouse over",
+mouseout:"for mouse out",
+misc:"Miscellaneous",
+example_img:"Appearance preview image",
+missing_alt:"Are you sure you want to continue without including an Image Description? Without it the image may not be accessible to some users with disabilities, or to those using a text browser, or browsing the Web with images turned off.",
+dialog_title:"Insert/edit image",
+src:"Image URL",
+alt:"Image description",
+list:"Image list",
+border:"Border",
+dimensions:"Dimensions",
+vspace:"Vertical space",
+hspace:"Horizontal space",
+align:"Alignment",
+align_baseline:"Baseline",
+align_top:"Top",
+align_middle:"Middle",
+align_bottom:"Bottom",
+align_texttop:"Text top",
+align_textbottom:"Text bottom",
+align_left:"Left",
+align_right:"Right",
+image_list:"Image list"
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css
new file mode 100644
index 000000000..66c654935
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css
@@ -0,0 +1,8 @@
+.mceLinkList, .mceAnchorList, #targetlist {width:280px;}
+.mceActionPanel {margin-top:7px;}
+.panel_wrapper div.current {height:320px;}
+#classlist, #title, #href {width:280px;}
+#popupurl, #popupname {width:200px;}
+#popupwidth, #popupheight, #popupleft, #popuptop {width:30px;vertical-align:middle;text-align:center;}
+#id, #style, #classes, #target, #dir, #hreflang, #lang, #charset, #type, #rel, #rev, #tabindex, #accesskey {width:200px;}
+#events_panel input {width:200px;}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js
new file mode 100644
index 000000000..4899f7b8c
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.AdvancedLinkPlugin',{init:function(ed,url){this.editor=ed;ed.addCommand('mceAdvLink',function(){var se=ed.selection;if(se.isCollapsed()&&!ed.dom.getParent(se.getNode(),'A'))return;ed.windowManager.open({file:url+'/link.htm',width:480+parseInt(ed.getLang('advlink.delta_width',0)),height:400+parseInt(ed.getLang('advlink.delta_height',0)),inline:1},{plugin_url:url});});ed.addButton('link',{title:'advlink.link_desc',cmd:'mceAdvLink'});ed.addShortcut('ctrl+k','advlink.advlink_desc','mceAdvLink');ed.onNodeChange.add(function(ed,cm,n,co){cm.setDisabled('link',co&&n.nodeName!='A');cm.setActive('link',n.nodeName=='A'&&!n.name);});},getInfo:function(){return{longname:'Advanced link',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('advlink',tinymce.plugins.AdvancedLinkPlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js
new file mode 100644
index 000000000..7081e7242
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js
@@ -0,0 +1,58 @@
+/**
+ * $Id: editor_plugin_src.js 539 2008-01-14 19:08:58Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.AdvancedLinkPlugin', {
+		init : function(ed, url) {
+			this.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceAdvLink', function() {
+				var se = ed.selection;
+
+				// No selection and not in link
+				if (se.isCollapsed() && !ed.dom.getParent(se.getNode(), 'A'))
+					return;
+
+				ed.windowManager.open({
+					file : url + '/link.htm',
+					width : 480 + parseInt(ed.getLang('advlink.delta_width', 0)),
+					height : 400 + parseInt(ed.getLang('advlink.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.addButton('link', {
+				title : 'advlink.link_desc',
+				cmd : 'mceAdvLink'
+			});
+
+			ed.addShortcut('ctrl+k', 'advlink.advlink_desc', 'mceAdvLink');
+
+			ed.onNodeChange.add(function(ed, cm, n, co) {
+				cm.setDisabled('link', co && n.nodeName != 'A');
+				cm.setActive('link', n.nodeName == 'A' && !n.name);
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Advanced link',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('advlink', tinymce.plugins.AdvancedLinkPlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
new file mode 100644
index 000000000..6ca8fc69f
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
@@ -0,0 +1,528 @@
+/* Functions for the advlink plugin popup */
+
+tinyMCEPopup.requireLangPack();
+
+var templates = {
+	"window.open" : "window.open('${url}','${target}','${options}')"
+};
+
+function preinit() {
+	var url;
+
+	if (url = tinyMCEPopup.getParam("external_link_list_url"))
+		document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+}
+
+function changeClass() {
+	var f = document.forms[0];
+
+	f.classes.value = getSelectValue(f, 'classlist');
+}
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	var formObj = document.forms[0];
+	var inst = tinyMCEPopup.editor;
+	var elm = inst.selection.getNode();
+	var action = "insert";
+	var html;
+
+	document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','advlink');
+	document.getElementById('popupurlbrowsercontainer').innerHTML = getBrowserHTML('popupurlbrowser','popupurl','file','advlink');
+	document.getElementById('linklisthrefcontainer').innerHTML = getLinkListHTML('linklisthref','href');
+	document.getElementById('anchorlistcontainer').innerHTML = getAnchorListHTML('anchorlist','href');
+	document.getElementById('targetlistcontainer').innerHTML = getTargetListHTML('targetlist','target');
+
+	// Link list
+	html = getLinkListHTML('linklisthref','href');
+	if (html == "")
+		document.getElementById("linklisthrefrow").style.display = 'none';
+	else
+		document.getElementById("linklisthrefcontainer").innerHTML = html;
+
+	// Resize some elements
+	if (isVisible('hrefbrowser'))
+		document.getElementById('href').style.width = '260px';
+
+	if (isVisible('popupurlbrowser'))
+		document.getElementById('popupurl').style.width = '180px';
+
+	elm = inst.dom.getParent(elm, "A");
+	if (elm != null && elm.nodeName == "A")
+		action = "update";
+
+	formObj.insert.value = tinyMCEPopup.getLang(action, 'Insert', true); 
+
+	setPopupControlsDisabled(true);
+
+	if (action == "update") {
+		var href = inst.dom.getAttrib(elm, 'href');
+		var onclick = inst.dom.getAttrib(elm, 'onclick');
+
+		// Setup form data
+		setFormValue('href', href);
+		setFormValue('title', inst.dom.getAttrib(elm, 'title'));
+		setFormValue('id', inst.dom.getAttrib(elm, 'id'));
+		setFormValue('style', inst.dom.getAttrib(elm, "style"));
+		setFormValue('rel', inst.dom.getAttrib(elm, 'rel'));
+		setFormValue('rev', inst.dom.getAttrib(elm, 'rev'));
+		setFormValue('charset', inst.dom.getAttrib(elm, 'charset'));
+		setFormValue('hreflang', inst.dom.getAttrib(elm, 'hreflang'));
+		setFormValue('dir', inst.dom.getAttrib(elm, 'dir'));
+		setFormValue('lang', inst.dom.getAttrib(elm, 'lang'));
+		setFormValue('tabindex', inst.dom.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : ""));
+		setFormValue('accesskey', inst.dom.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : ""));
+		setFormValue('type', inst.dom.getAttrib(elm, 'type'));
+		setFormValue('onfocus', inst.dom.getAttrib(elm, 'onfocus'));
+		setFormValue('onblur', inst.dom.getAttrib(elm, 'onblur'));
+		setFormValue('onclick', onclick);
+		setFormValue('ondblclick', inst.dom.getAttrib(elm, 'ondblclick'));
+		setFormValue('onmousedown', inst.dom.getAttrib(elm, 'onmousedown'));
+		setFormValue('onmouseup', inst.dom.getAttrib(elm, 'onmouseup'));
+		setFormValue('onmouseover', inst.dom.getAttrib(elm, 'onmouseover'));
+		setFormValue('onmousemove', inst.dom.getAttrib(elm, 'onmousemove'));
+		setFormValue('onmouseout', inst.dom.getAttrib(elm, 'onmouseout'));
+		setFormValue('onkeypress', inst.dom.getAttrib(elm, 'onkeypress'));
+		setFormValue('onkeydown', inst.dom.getAttrib(elm, 'onkeydown'));
+		setFormValue('onkeyup', inst.dom.getAttrib(elm, 'onkeyup'));
+		setFormValue('target', inst.dom.getAttrib(elm, 'target'));
+		setFormValue('classes', inst.dom.getAttrib(elm, 'class'));
+
+		// Parse onclick data
+		if (onclick != null && onclick.indexOf('window.open') != -1)
+			parseWindowOpen(onclick);
+		else
+			parseFunction(onclick);
+
+		// Select by the values
+		selectByValue(formObj, 'dir', inst.dom.getAttrib(elm, 'dir'));
+		selectByValue(formObj, 'rel', inst.dom.getAttrib(elm, 'rel'));
+		selectByValue(formObj, 'rev', inst.dom.getAttrib(elm, 'rev'));
+		selectByValue(formObj, 'linklisthref', href);
+
+		if (href.charAt(0) == '#')
+			selectByValue(formObj, 'anchorlist', href);
+
+		addClassesToList('classlist', 'advlink_styles');
+
+		selectByValue(formObj, 'classlist', inst.dom.getAttrib(elm, 'class'), true);
+		selectByValue(formObj, 'targetlist', inst.dom.getAttrib(elm, 'target'), true);
+	} else
+		addClassesToList('classlist', 'advlink_styles');
+}
+
+function checkPrefix(n) {
+	if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_email')))
+		n.value = 'mailto:' + n.value;
+
+	if (/^\s*www./i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_external')))
+		n.value = 'http://' + n.value;
+}
+
+function setFormValue(name, value) {
+	document.forms[0].elements[name].value = value;
+}
+
+function parseWindowOpen(onclick) {
+	var formObj = document.forms[0];
+
+	// Preprocess center code
+	if (onclick.indexOf('return false;') != -1) {
+		formObj.popupreturn.checked = true;
+		onclick = onclick.replace('return false;', '');
+	} else
+		formObj.popupreturn.checked = false;
+
+	var onClickData = parseLink(onclick);
+
+	if (onClickData != null) {
+		formObj.ispopup.checked = true;
+		setPopupControlsDisabled(false);
+
+		var onClickWindowOptions = parseOptions(onClickData['options']);
+		var url = onClickData['url'];
+
+		formObj.popupname.value = onClickData['target'];
+		formObj.popupurl.value = url;
+		formObj.popupwidth.value = getOption(onClickWindowOptions, 'width');
+		formObj.popupheight.value = getOption(onClickWindowOptions, 'height');
+
+		formObj.popupleft.value = getOption(onClickWindowOptions, 'left');
+		formObj.popuptop.value = getOption(onClickWindowOptions, 'top');
+
+		if (formObj.popupleft.value.indexOf('screen') != -1)
+			formObj.popupleft.value = "c";
+
+		if (formObj.popuptop.value.indexOf('screen') != -1)
+			formObj.popuptop.value = "c";
+
+		formObj.popuplocation.checked = getOption(onClickWindowOptions, 'location') == "yes";
+		formObj.popupscrollbars.checked = getOption(onClickWindowOptions, 'scrollbars') == "yes";
+		formObj.popupmenubar.checked = getOption(onClickWindowOptions, 'menubar') == "yes";
+		formObj.popupresizable.checked = getOption(onClickWindowOptions, 'resizable') == "yes";
+		formObj.popuptoolbar.checked = getOption(onClickWindowOptions, 'toolbar') == "yes";
+		formObj.popupstatus.checked = getOption(onClickWindowOptions, 'status') == "yes";
+		formObj.popupdependent.checked = getOption(onClickWindowOptions, 'dependent') == "yes";
+
+		buildOnClick();
+	}
+}
+
+function parseFunction(onclick) {
+	var formObj = document.forms[0];
+	var onClickData = parseLink(onclick);
+
+	// TODO: Add stuff here
+}
+
+function getOption(opts, name) {
+	return typeof(opts[name]) == "undefined" ? "" : opts[name];
+}
+
+function setPopupControlsDisabled(state) {
+	var formObj = document.forms[0];
+
+	formObj.popupname.disabled = state;
+	formObj.popupurl.disabled = state;
+	formObj.popupwidth.disabled = state;
+	formObj.popupheight.disabled = state;
+	formObj.popupleft.disabled = state;
+	formObj.popuptop.disabled = state;
+	formObj.popuplocation.disabled = state;
+	formObj.popupscrollbars.disabled = state;
+	formObj.popupmenubar.disabled = state;
+	formObj.popupresizable.disabled = state;
+	formObj.popuptoolbar.disabled = state;
+	formObj.popupstatus.disabled = state;
+	formObj.popupreturn.disabled = state;
+	formObj.popupdependent.disabled = state;
+
+	setBrowserDisabled('popupurlbrowser', state);
+}
+
+function parseLink(link) {
+	link = link.replace(new RegExp('&#39;', 'g'), "'");
+
+	var fnName = link.replace(new RegExp("\\s*([A-Za-z0-9\.]*)\\s*\\(.*", "gi"), "$1");
+
+	// Is function name a template function
+	var template = templates[fnName];
+	if (template) {
+		// Build regexp
+		var variableNames = template.match(new RegExp("'?\\$\\{[A-Za-z0-9\.]*\\}'?", "gi"));
+		var regExp = "\\s*[A-Za-z0-9\.]*\\s*\\(";
+		var replaceStr = "";
+		for (var i=0; i<variableNames.length; i++) {
+			// Is string value
+			if (variableNames[i].indexOf("'${") != -1)
+				regExp += "'(.*)'";
+			else // Number value
+				regExp += "([0-9]*)";
+
+			replaceStr += "$" + (i+1);
+
+			// Cleanup variable name
+			variableNames[i] = variableNames[i].replace(new RegExp("[^A-Za-z0-9]", "gi"), "");
+
+			if (i != variableNames.length-1) {
+				regExp += "\\s*,\\s*";
+				replaceStr += "<delim>";
+			} else
+				regExp += ".*";
+		}
+
+		regExp += "\\);?";
+
+		// Build variable array
+		var variables = [];
+		variables["_function"] = fnName;
+		var variableValues = link.replace(new RegExp(regExp, "gi"), replaceStr).split('<delim>');
+		for (var i=0; i<variableNames.length; i++)
+			variables[variableNames[i]] = variableValues[i];
+
+		return variables;
+	}
+
+	return null;
+}
+
+function parseOptions(opts) {
+	if (opts == null || opts == "")
+		return [];
+
+	// Cleanup the options
+	opts = opts.toLowerCase();
+	opts = opts.replace(/;/g, ",");
+	opts = opts.replace(/[^0-9a-z=,]/g, "");
+
+	var optionChunks = opts.split(',');
+	var options = [];
+
+	for (var i=0; i<optionChunks.length; i++) {
+		var parts = optionChunks[i].split('=');
+
+		if (parts.length == 2)
+			options[parts[0]] = parts[1];
+	}
+
+	return options;
+}
+
+function buildOnClick() {
+	var formObj = document.forms[0];
+
+	if (!formObj.ispopup.checked) {
+		formObj.onclick.value = "";
+		return;
+	}
+
+	var onclick = "window.open('";
+	var url = formObj.popupurl.value;
+
+	onclick += url + "','";
+	onclick += formObj.popupname.value + "','";
+
+	if (formObj.popuplocation.checked)
+		onclick += "location=yes,";
+
+	if (formObj.popupscrollbars.checked)
+		onclick += "scrollbars=yes,";
+
+	if (formObj.popupmenubar.checked)
+		onclick += "menubar=yes,";
+
+	if (formObj.popupresizable.checked)
+		onclick += "resizable=yes,";
+
+	if (formObj.popuptoolbar.checked)
+		onclick += "toolbar=yes,";
+
+	if (formObj.popupstatus.checked)
+		onclick += "status=yes,";
+
+	if (formObj.popupdependent.checked)
+		onclick += "dependent=yes,";
+
+	if (formObj.popupwidth.value != "")
+		onclick += "width=" + formObj.popupwidth.value + ",";
+
+	if (formObj.popupheight.value != "")
+		onclick += "height=" + formObj.popupheight.value + ",";
+
+	if (formObj.popupleft.value != "") {
+		if (formObj.popupleft.value != "c")
+			onclick += "left=" + formObj.popupleft.value + ",";
+		else
+			onclick += "left='+(screen.availWidth/2-" + (formObj.popupwidth.value/2) + ")+',";
+	}
+
+	if (formObj.popuptop.value != "") {
+		if (formObj.popuptop.value != "c")
+			onclick += "top=" + formObj.popuptop.value + ",";
+		else
+			onclick += "top='+(screen.availHeight/2-" + (formObj.popupheight.value/2) + ")+',";
+	}
+
+	if (onclick.charAt(onclick.length-1) == ',')
+		onclick = onclick.substring(0, onclick.length-1);
+
+	onclick += "');";
+
+	if (formObj.popupreturn.checked)
+		onclick += "return false;";
+
+	// tinyMCE.debug(onclick);
+
+	formObj.onclick.value = onclick;
+
+	if (formObj.href.value == "")
+		formObj.href.value = url;
+}
+
+function setAttrib(elm, attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib.toLowerCase()];
+	var dom = tinyMCEPopup.editor.dom;
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	// Clean up the style
+	if (attrib == 'style')
+		value = dom.serializeStyle(dom.parseStyle(value));
+
+	dom.setAttrib(elm, attrib, value);
+}
+
+function getAnchorListHTML(id, target) {
+	var inst = tinyMCEPopup.editor;
+	var nodes = inst.dom.select('a.mceItemAnchor,img.mceItemAnchor'), name, i;
+	var html = "";
+
+	html += '<select id="' + id + '" name="' + id + '" class="mceAnchorList" o2nfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target + '.value=';
+	html += 'this.options[this.selectedIndex].value;">';
+	html += '<option value="">---</option>';
+
+	for (i=0; i<nodes.length; i++) {
+		if ((name = inst.dom.getAttrib(nodes[i], "name")) != "")
+			html += '<option value="#' + name + '">' + name + '</option>';
+	}
+
+	html += '</select>';
+
+	return html;
+}
+
+function insertAction() {
+	var inst = tinyMCEPopup.editor;
+	var elm, elementArray, i;
+
+	elm = inst.selection.getNode();
+	checkPrefix(document.forms[0].href);
+
+	elm = inst.dom.getParent(elm, "A");
+
+	// Remove element if there is no href
+	if (!document.forms[0].href.value) {
+		tinyMCEPopup.execCommand("mceBeginUndoLevel");
+		i = inst.selection.getBookmark();
+		inst.dom.remove(elm, 1);
+		inst.selection.moveToBookmark(i);
+		tinyMCEPopup.execCommand("mceEndUndoLevel");
+		tinyMCEPopup.close();
+		return;
+	}
+
+	tinyMCEPopup.execCommand("mceBeginUndoLevel");
+
+	// Create new anchor elements
+	if (elm == null) {
+		tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
+
+		elementArray = tinymce.grep(inst.dom.select("a"), function(n) {return inst.dom.getAttrib(n, 'href') == '#mce_temp_url#';});
+		for (i=0; i<elementArray.length; i++)
+			setAllAttribs(elm = elementArray[i]);
+	} else
+		setAllAttribs(elm);
+
+	// Don't move caret if selection was image
+	if (elm.childNodes.length != 1 || elm.firstChild.nodeName != 'IMG') {
+		inst.focus();
+		inst.selection.select(elm);
+		inst.selection.collapse(0);
+		tinyMCEPopup.storeSelection();
+	}
+
+	tinyMCEPopup.execCommand("mceEndUndoLevel");
+	tinyMCEPopup.close();
+}
+
+function setAllAttribs(elm) {
+	var formObj = document.forms[0];
+	var href = formObj.href.value;
+	var target = getSelectValue(formObj, 'targetlist');
+
+	setAttrib(elm, 'href', href);
+	setAttrib(elm, 'mce_href', href);
+	setAttrib(elm, 'title');
+	setAttrib(elm, 'target', target == '_self' ? '' : target);
+	setAttrib(elm, 'id');
+	setAttrib(elm, 'style');
+	setAttrib(elm, 'class', getSelectValue(formObj, 'classlist'));
+	setAttrib(elm, 'rel');
+	setAttrib(elm, 'rev');
+	setAttrib(elm, 'charset');
+	setAttrib(elm, 'hreflang');
+	setAttrib(elm, 'dir');
+	setAttrib(elm, 'lang');
+	setAttrib(elm, 'tabindex');
+	setAttrib(elm, 'accesskey');
+	setAttrib(elm, 'type');
+	setAttrib(elm, 'onfocus');
+	setAttrib(elm, 'onblur');
+	setAttrib(elm, 'onclick');
+	setAttrib(elm, 'ondblclick');
+	setAttrib(elm, 'onmousedown');
+	setAttrib(elm, 'onmouseup');
+	setAttrib(elm, 'onmouseover');
+	setAttrib(elm, 'onmousemove');
+	setAttrib(elm, 'onmouseout');
+	setAttrib(elm, 'onkeypress');
+	setAttrib(elm, 'onkeydown');
+	setAttrib(elm, 'onkeyup');
+
+	// Refresh in old MSIE
+	if (tinyMCE.isMSIE5)
+		elm.outerHTML = elm.outerHTML;
+}
+
+function getSelectValue(form_obj, field_name) {
+	var elm = form_obj.elements[field_name];
+
+	if (elm == null || elm.options == null)
+		return "";
+
+	return elm.options[elm.selectedIndex].value;
+}
+
+function getLinkListHTML(elm_id, target_form_element, onchange_func) {
+	if (typeof(tinyMCELinkList) == "undefined" || tinyMCELinkList.length == 0)
+		return "";
+
+	var html = "";
+
+	html += '<select id="' + elm_id + '" name="' + elm_id + '"';
+	html += ' class="mceLinkList" onfoc2us="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
+	html += 'this.options[this.selectedIndex].value;';
+
+	if (typeof(onchange_func) != "undefined")
+		html += onchange_func + '(\'' + target_form_element + '\',this.options[this.selectedIndex].text,this.options[this.selectedIndex].value);';
+
+	html += '"><option value="">---</option>';
+
+	for (var i=0; i<tinyMCELinkList.length; i++)
+		html += '<option value="' + tinyMCELinkList[i][1] + '">' + tinyMCELinkList[i][0] + '</option>';
+
+	html += '</select>';
+
+	return html;
+
+	// tinyMCE.debug('-- image list start --', html, '-- image list end --');
+}
+
+function getTargetListHTML(elm_id, target_form_element) {
+	var targets = tinyMCEPopup.getParam('theme_advanced_link_targets', '').split(';');
+	var html = '';
+
+	html += '<select id="' + elm_id + '" name="' + elm_id + '" onf2ocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
+	html += 'this.options[this.selectedIndex].value;">';
+	html += '<option value="_self">' + tinyMCEPopup.getLang('advlink_dlg.target_same') + '</option>';
+	html += '<option value="_blank">' + tinyMCEPopup.getLang('advlink_dlg.target_blank') + ' (_blank)</option>';
+	html += '<option value="_parent">' + tinyMCEPopup.getLang('advlink_dlg.target_parent') + ' (_parent)</option>';
+	html += '<option value="_top">' + tinyMCEPopup.getLang('advlink_dlg.target_top') + ' (_top)</option>';
+
+	for (var i=0; i<targets.length; i++) {
+		var key, value;
+
+		if (targets[i] == "")
+			continue;
+
+		key = targets[i].split('=')[0];
+		value = targets[i].split('=')[1];
+
+		html += '<option value="' + key + '">' + value + ' (' + key + ')</option>';
+	}
+
+	html += '</select>';
+
+	return html;
+}
+
+// While loading
+preinit();
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
new file mode 100644
index 000000000..8ef9c792b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
@@ -0,0 +1,52 @@
+tinyMCE.addI18n('en.advlink_dlg',{
+title:"Insert/edit link",
+url:"Link URL",
+target:"Target",
+titlefield:"Title",
+is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",
+is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",
+list:"Link list",
+general_tab:"General",
+popup_tab:"Popup",
+events_tab:"Events",
+advanced_tab:"Advanced",
+general_props:"General properties",
+popup_props:"Popup properties",
+event_props:"Events",
+advanced_props:"Advanced properties",
+popup_opts:"Options",
+anchor_names:"Anchors",
+target_same:"Open in this window / frame",
+target_parent:"Open in parent window / frame",
+target_top:"Open in top frame (replaces all frames)",
+target_blank:"Open in new window",
+popup:"Javascript popup",
+popup_url:"Popup URL",
+popup_name:"Window name",
+popup_return:"Insert 'return false'",
+popup_scrollbars:"Show scrollbars",
+popup_statusbar:"Show status bar",
+popup_toolbar:"Show toolbars",
+popup_menubar:"Show menu bar",
+popup_location:"Show location bar",
+popup_resizable:"Make window resizable",
+popup_dependent:"Dependent (Mozilla/Firefox only)",
+popup_size:"Size",
+popup_position:"Position (X/Y)",
+id:"Id",
+style:"Style",
+classes:"Classes",
+target_name:"Target name",
+langdir:"Language direction",
+target_langcode:"Target language",
+langcode:"Language code",
+encoding:"Target character encoding",
+mime:"Target MIME type",
+rel:"Relationship page to target",
+rev:"Relationship target to page",
+tabindex:"Tabindex",
+accesskey:"Accesskey",
+ltr:"Left to right",
+rtl:"Right to left",
+link_list:"Link list"
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm
new file mode 100644
index 000000000..f46e8f832
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm
@@ -0,0 +1,339 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advlink_dlg.title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/validate.js"></script>

+	<script type="text/javascript" src="js/advlink.js"></script>

+	<link href="css/advlink.css" rel="stylesheet" type="text/css" />

+	<base target="_self" />

+</head>

+<body id="advlink" style="display: none">

+    <form onsubmit="insertAction();return false;" action="#">

+		<div class="tabs">

+			<ul>

+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advlink_dlg.general_tab}</a></span></li>

+				<li id="popup_tab"><span><a href="javascript:mcTabs.displayTab('popup_tab','popup_panel');" onmousedown="return false;">{#advlink_dlg.popup_tab}</a></span></li>

+				<li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#advlink_dlg.events_tab}</a></span></li>

+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advlink_dlg.advanced_tab}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="general_panel" class="panel current">

+				<fieldset>

+					<legend>{#advlink_dlg.general_props}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+						  <td nowrap="nowrap"><label id="hreflabel" for="href">{#advlink_dlg.url}</label></td>

+						  <td><table border="0" cellspacing="0" cellpadding="0">

+								<tr>

+								  <td><input id="href" name="href" type="text" class="mceFocus" value="" onchange="selectByValue(this.form,'linklisthref',this.value);" /></td>

+								  <td id="hrefbrowsercontainer">&nbsp;</td>

+								</tr>

+							  </table></td>

+						</tr>

+						<tr id="linklisthrefrow">

+							<td class="column1"><label for="linklisthref">{#advlink_dlg.list}</label></td>

+							<td colspan="2" id="linklisthrefcontainer">&nbsp;</td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="anchorlist">{#advlink_dlg.anchor_names}</label></td>

+							<td colspan="2" id="anchorlistcontainer">&nbsp;</td>

+						</tr>

+						<tr>

+							<td><label id="targetlistlabel" for="targetlist">{#advlink_dlg.target}</label></td>

+							<td id="targetlistcontainer">&nbsp;</td>

+						</tr>

+						<tr>

+							<td nowrap="nowrap"><label id="titlelabel" for="title">{#advlink_dlg.titlefield}</label></td>

+							<td><input id="title" name="title" type="text" value="" /></td>

+						</tr>

+						<tr>

+							<td><label id="classlabel" for="classlist">{#class_name}</label></td>

+							<td>

+								 <select id="classlist" name="classlist" onchange="changeClass();">

+									<option value="" selected>{#not_set}</option>

+								 </select>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+

+			<div id="popup_panel" class="panel">

+				<fieldset>

+					<legend>{#advlink_dlg.popup_props}</legend>

+

+					<input type="checkbox" id="ispopup" name="ispopup" class="radio" onclick="setPopupControlsDisabled(!this.checked);buildOnClick();" />

+					<label id="ispopuplabel" for="ispopup">{#advlink_dlg.popup}</label>

+

+					<table border="0" cellpadding="0" cellspacing="4">

+						<tr>

+							<td nowrap="nowrap"><label for="popupurl">{#advlink_dlg.popup_url}</label>&nbsp;</td>

+							<td>

+								<table border="0" cellspacing="0" cellpadding="0">

+									<tr>

+										<td><input type="text" name="popupurl" id="popupurl" value="" onchange="buildOnClick();" /></td>

+										<td id="popupurlbrowsercontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+						<tr>

+							<td nowrap="nowrap"><label for="popupname">{#advlink_dlg.popup_name}</label>&nbsp;</td>

+							<td><input type="text" name="popupname" id="popupname" value="" onchange="buildOnClick();" /></td>

+						</tr>

+						<tr>

+							<td nowrap="nowrap"><label>{#advlink_dlg.popup_size}</label>&nbsp;</td>

+							<td nowrap="nowrap">

+								<input type="text" id="popupwidth" name="popupwidth" value="" onchange="buildOnClick();" /> x

+								<input type="text" id="popupheight" name="popupheight" value="" onchange="buildOnClick();" /> px

+							</td>

+						</tr>

+						<tr>

+							<td nowrap="nowrap" id="labelleft"><label>{#advlink_dlg.popup_position}</label>&nbsp;</td>

+							<td nowrap="nowrap">

+								<input type="text" id="popupleft" name="popupleft" value="" onchange="buildOnClick();" /> /                                

+								<input type="text" id="popuptop" name="popuptop" value="" onchange="buildOnClick();" /> (c /c = center)

+							</td>

+						</tr>

+					</table>

+

+					<fieldset>

+						<legend>{#advlink_dlg.popup_opts}</legend>

+

+						<table border="0" cellpadding="0" cellspacing="4">

+							<tr>

+								<td><input type="checkbox" id="popuplocation" name="popuplocation" class="checkbox" onchange="buildOnClick();" /></td>

+								<td nowrap="nowrap"><label id="popuplocationlabel" for="popuplocation">{#advlink_dlg.popup_location}</label></td>

+								<td><input type="checkbox" id="popupscrollbars" name="popupscrollbars" class="checkbox" onchange="buildOnClick();" /></td>

+								<td nowrap="nowrap"><label id="popupscrollbarslabel" for="popupscrollbars">{#advlink_dlg.popup_scrollbars}</label></td>

+							</tr>

+							<tr>

+								<td><input type="checkbox" id="popupmenubar" name="popupmenubar" class="checkbox" onchange="buildOnClick();" /></td>

+								<td nowrap="nowrap"><label id="popupmenubarlabel" for="popupmenubar">{#advlink_dlg.popup_menubar}</label></td>

+								<td><input type="checkbox" id="popupresizable" name="popupresizable" class="checkbox" onchange="buildOnClick();" /></td>

+								<td nowrap="nowrap"><label id="popupresizablelabel" for="popupresizable">{#advlink_dlg.popup_resizable}</label></td>

+							</tr>

+							<tr>

+								<td><input type="checkbox" id="popuptoolbar" name="popuptoolbar" class="checkbox" onchange="buildOnClick();" /></td>

+								<td nowrap="nowrap"><label id="popuptoolbarlabel" for="popuptoolbar">{#advlink_dlg.popup_toolbar}</label></td>

+								<td><input type="checkbox" id="popupdependent" name="popupdependent" class="checkbox" onchange="buildOnClick();" /></td>

+								<td nowrap="nowrap"><label id="popupdependentlabel" for="popupdependent">{#advlink_dlg.popup_dependent}</label></td>

+							</tr>

+							<tr>

+								<td><input type="checkbox" id="popupstatus" name="popupstatus" class="checkbox" onchange="buildOnClick();" /></td>

+								<td nowrap="nowrap"><label id="popupstatuslabel" for="popupstatus">{#advlink_dlg.popup_statusbar}</label></td>

+								<td><input type="checkbox" id="popupreturn" name="popupreturn" class="checkbox" onchange="buildOnClick();" checked="checked" /></td>

+								<td nowrap="nowrap"><label id="popupreturnlabel" for="popupreturn">{#advlink_dlg.popup_return}</label></td>

+							</tr>

+						</table>

+					</fieldset>

+				</fieldset>

+			</div>

+

+			<div id="advanced_panel" class="panel">

+			<fieldset>

+					<legend>{#advlink_dlg.advanced_props}</legend>

+

+					<table border="0" cellpadding="0" cellspacing="4">

+						<tr>

+							<td class="column1"><label id="idlabel" for="id">{#advlink_dlg.id}</label></td> 

+							<td><input id="id" name="id" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td><label id="stylelabel" for="style">{#advlink_dlg.style}</label></td>

+							<td><input type="text" id="style" name="style" value="" /></td>

+						</tr>

+

+						<tr>

+							<td><label id="classeslabel" for="classes">{#advlink_dlg.classes}</label></td>

+							<td><input type="text" id="classes" name="classes" value="" onchange="selectByValue(this.form,'classlist',this.value,true);" /></td>

+						</tr>

+

+						<tr>

+							<td><label id="targetlabel" for="target">{#advlink_dlg.target_name}</label></td>

+							<td><input type="text" id="target" name="target" value="" onchange="selectByValue(this.form,'targetlist',this.value,true);" /></td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="dirlabel" for="dir">{#advlink_dlg.langdir}</label></td> 

+							<td>

+								<select id="dir" name="dir"> 

+										<option value="">{#not_set}</option> 

+										<option value="ltr">{#advlink_dlg.ltr}</option> 

+										<option value="rtl">{#advlink_dlg.rtl}</option> 

+								</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td><label id="hreflanglabel" for="hreflang">{#advlink_dlg.target_langcode}</label></td>

+							<td><input type="text" id="hreflang" name="hreflang" value="" /></td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="langlabel" for="lang">{#advlink_dlg.langcode}</label></td> 

+							<td>

+								<input id="lang" name="lang" type="text" value="" />

+							</td> 

+						</tr>

+

+						<tr>

+							<td><label id="charsetlabel" for="charset">{#advlink_dlg.encoding}</label></td>

+							<td><input type="text" id="charset" name="charset" value="" /></td>

+						</tr>

+

+						<tr>

+							<td><label id="typelabel" for="type">{#advlink_dlg.mime}</label></td>

+							<td><input type="text" id="type" name="type" value="" /></td>

+						</tr>

+

+						<tr>

+							<td><label id="rellabel" for="rel">{#advlink_dlg.rel}</label></td>

+							<td><select id="rel" name="rel"> 

+									<option value="">{#not_set}</option> 

+									<option value="lightbox">Lightbox</option> 

+									<option value="alternate">Alternate</option> 

+									<option value="designates">Designates</option> 

+									<option value="stylesheet">Stylesheet</option> 

+									<option value="start">Start</option> 

+									<option value="next">Next</option> 

+									<option value="prev">Prev</option> 

+									<option value="contents">Contents</option> 

+									<option value="index">Index</option> 

+									<option value="glossary">Glossary</option> 

+									<option value="copyright">Copyright</option> 

+									<option value="chapter">Chapter</option> 

+									<option value="subsection">Subsection</option> 

+									<option value="appendix">Appendix</option> 

+									<option value="help">Help</option> 

+									<option value="bookmark">Bookmark</option>

+									<option value="nofollow">No Follow</option>

+									<option value="tag">Tag</option>

+								</select> 

+							</td>

+						</tr>

+

+						<tr>

+							<td><label id="revlabel" for="rev">{#advlink_dlg.rev}</label></td>

+							<td><select id="rev" name="rev"> 

+									<option value="">{#not_set}</option> 

+									<option value="alternate">Alternate</option> 

+									<option value="designates">Designates</option> 

+									<option value="stylesheet">Stylesheet</option> 

+									<option value="start">Start</option> 

+									<option value="next">Next</option> 

+									<option value="prev">Prev</option> 

+									<option value="contents">Contents</option> 

+									<option value="index">Index</option> 

+									<option value="glossary">Glossary</option> 

+									<option value="copyright">Copyright</option> 

+									<option value="chapter">Chapter</option> 

+									<option value="subsection">Subsection</option> 

+									<option value="appendix">Appendix</option> 

+									<option value="help">Help</option> 

+									<option value="bookmark">Bookmark</option> 

+								</select> 

+							</td>

+						</tr>

+

+						<tr>

+							<td><label id="tabindexlabel" for="tabindex">{#advlink_dlg.tabindex}</label></td>

+							<td><input type="text" id="tabindex" name="tabindex" value="" /></td>

+						</tr>

+

+						<tr>

+							<td><label id="accesskeylabel" for="accesskey">{#advlink_dlg.accesskey}</label></td>

+							<td><input type="text" id="accesskey" name="accesskey" value="" /></td>

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+

+			<div id="events_panel" class="panel">

+			<fieldset>

+					<legend>{#advlink_dlg.event_props}</legend>

+

+					<table border="0" cellpadding="0" cellspacing="4">

+						<tr>

+							<td class="column1"><label for="onfocus">onfocus</label></td> 

+							<td><input id="onfocus" name="onfocus" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onblur">onblur</label></td> 

+							<td><input id="onblur" name="onblur" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onclick">onclick</label></td> 

+							<td><input id="onclick" name="onclick" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="ondblclick">ondblclick</label></td> 

+							<td><input id="ondblclick" name="ondblclick" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onmousedown">onmousedown</label></td> 

+							<td><input id="onmousedown" name="onmousedown" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onmouseup">onmouseup</label></td> 

+							<td><input id="onmouseup" name="onmouseup" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onmouseover">onmouseover</label></td> 

+							<td><input id="onmouseover" name="onmouseover" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onmousemove">onmousemove</label></td> 

+							<td><input id="onmousemove" name="onmousemove" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onmouseout">onmouseout</label></td> 

+							<td><input id="onmouseout" name="onmouseout" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onkeypress">onkeypress</label></td> 

+							<td><input id="onkeypress" name="onkeypress" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onkeydown">onkeydown</label></td> 

+							<td><input id="onkeydown" name="onkeydown" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onkeyup">onkeyup</label></td> 

+							<td><input id="onkeyup" name="onkeyup" type="text" value="" /></td> 

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<div style="float: left">

+				<input type="submit" id="insert" name="insert" value="{#insert}" />

+			</div>

+

+			<div style="float: right">

+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+			</div>

+		</div>

+    </form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
new file mode 100644
index 000000000..01a994ee5
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.AutoSavePlugin',{init:function(ed,url){var t=this;t.editor=ed;window.onbeforeunload=tinymce.plugins.AutoSavePlugin._beforeUnloadHandler;},getInfo:function(){return{longname:'Auto save',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave',version:tinymce.majorVersion+"."+tinymce.minorVersion};},'static':{_beforeUnloadHandler:function(){var msg;tinymce.each(tinyMCE.editors,function(ed){if(ed.getParam("fullscreen_is_enabled"))return;if(ed.isDirty()){msg=ed.getLang("autosave.unload_msg");return false;}});return msg;}}});tinymce.PluginManager.add('autosave',tinymce.plugins.AutoSavePlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
new file mode 100644
index 000000000..2e9cd0a55
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
@@ -0,0 +1,51 @@
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.AutoSavePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			window.onbeforeunload = tinymce.plugins.AutoSavePlugin._beforeUnloadHandler;
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Auto save',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private plugin internal methods
+
+		'static' : {
+			_beforeUnloadHandler : function() {
+				var msg;
+
+				tinymce.each(tinyMCE.editors, function(ed) {
+					if (ed.getParam("fullscreen_is_enabled"))
+						return;
+
+					if (ed.isDirty()) {
+						msg = ed.getLang("autosave.unload_msg");
+						return false;
+					}
+				});
+
+				return msg;
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('autosave', tinymce.plugins.AutoSavePlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
new file mode 100644
index 000000000..88f7ea650
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.BBCodePlugin',{init:function(ed,url){var t=this,dialect=ed.getParam('bbcode_dialect','punbb').toLowerCase();ed.onBeforeSetContent.add(function(ed,o){o.content=t['_'+dialect+'_bbcode2html'](o.content);});ed.onPostProcess.add(function(ed,o){if(o.set)o.content=t['_'+dialect+'_bbcode2html'](o.content);if(o.get)o.content=t['_'+dialect+'_html2bbcode'](o.content);});},getInfo:function(){return{longname:'BBCode Plugin',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_punbb_html2bbcode:function(s){s=tinymce.trim(s);function rep(re,str){s=s.replace(re,str);};rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");rep(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");rep(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");rep(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");rep(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");rep(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");rep(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");rep(/<font>(.*?)<\/font>/gi,"$1");rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");rep(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");rep(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");rep(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");rep(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");rep(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");rep(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");rep(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");rep(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");rep(/<\/(strong|b)>/gi,"[/b]");rep(/<(strong|b)>/gi,"[b]");rep(/<\/(em|i)>/gi,"[/i]");rep(/<(em|i)>/gi,"[i]");rep(/<\/u>/gi,"[/u]");rep(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");rep(/<u>/gi,"[u]");rep(/<blockquote[^>]*>/gi,"[quote]");rep(/<\/blockquote>/gi,"[/quote]");rep(/<br \/>/gi,"\n");rep(/<br\/>/gi,"\n");rep(/<br>/gi,"\n");rep(/<p>/gi,"");rep(/<\/p>/gi,"\n");rep(/&nbsp;/gi," ");rep(/&quot;/gi,"\"");rep(/&lt;/gi,"<");rep(/&gt;/gi,">");rep(/&amp;/gi,"&");return s;},_punbb_bbcode2html:function(s){s=tinymce.trim(s);function rep(re,str){s=s.replace(re,str);};rep(/\n/gi,"<br />");rep(/\[b\]/gi,"<strong>");rep(/\[\/b\]/gi,"</strong>");rep(/\[i\]/gi,"<em>");rep(/\[\/i\]/gi,"</em>");rep(/\[u\]/gi,"<u>");rep(/\[\/u\]/gi,"</u>");rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<font color=\"$1\">$2</font>");rep(/\[code\](.*?)\[\/code\]/gi,"<span class=\"codeStyle\">$1</span>&nbsp;");rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<span class=\"quoteStyle\">$1</span>&nbsp;");return s;}});tinymce.PluginManager.add('bbcode',tinymce.plugins.BBCodePlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
new file mode 100644
index 000000000..55afbd0b2
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -0,0 +1,117 @@
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.BBCodePlugin', {
+		init : function(ed, url) {
+			var t = this, dialect = ed.getParam('bbcode_dialect', 'punbb').toLowerCase();
+
+			ed.onBeforeSetContent.add(function(ed, o) {
+				o.content = t['_' + dialect + '_bbcode2html'](o.content);
+			});
+
+			ed.onPostProcess.add(function(ed, o) {
+				if (o.set)
+					o.content = t['_' + dialect + '_bbcode2html'](o.content);
+
+				if (o.get)
+					o.content = t['_' + dialect + '_html2bbcode'](o.content);
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'BBCode Plugin',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		// HTML -> BBCode in PunBB dialect
+		_punbb_html2bbcode : function(s) {
+			s = tinymce.trim(s);
+
+			function rep(re, str) {
+				s = s.replace(re, str);
+			};
+
+			// example: <strong> to [b]
+			rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");
+			rep(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");
+			rep(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");
+			rep(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");
+			rep(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");
+			rep(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");
+			rep(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");
+			rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");
+			rep(/<font>(.*?)<\/font>/gi,"$1");
+			rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");
+			rep(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");
+			rep(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");
+			rep(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");
+			rep(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");
+			rep(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");
+			rep(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");
+			rep(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");
+			rep(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");
+			rep(/<\/(strong|b)>/gi,"[/b]");
+			rep(/<(strong|b)>/gi,"[b]");
+			rep(/<\/(em|i)>/gi,"[/i]");
+			rep(/<(em|i)>/gi,"[i]");
+			rep(/<\/u>/gi,"[/u]");
+			rep(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");
+			rep(/<u>/gi,"[u]");
+			rep(/<blockquote[^>]*>/gi,"[quote]");
+			rep(/<\/blockquote>/gi,"[/quote]");
+			rep(/<br \/>/gi,"\n");
+			rep(/<br\/>/gi,"\n");
+			rep(/<br>/gi,"\n");
+			rep(/<p>/gi,"");
+			rep(/<\/p>/gi,"\n");
+			rep(/&nbsp;/gi," ");
+			rep(/&quot;/gi,"\"");
+			rep(/&lt;/gi,"<");
+			rep(/&gt;/gi,">");
+			rep(/&amp;/gi,"&");
+
+			return s; 
+		},
+
+		// BBCode -> HTML from PunBB dialect
+		_punbb_bbcode2html : function(s) {
+			s = tinymce.trim(s);
+
+			function rep(re, str) {
+				s = s.replace(re, str);
+			};
+
+			// example: [b] to <strong>
+			rep(/\n/gi,"<br />");
+			rep(/\[b\]/gi,"<strong>");
+			rep(/\[\/b\]/gi,"</strong>");
+			rep(/\[i\]/gi,"<em>");
+			rep(/\[\/i\]/gi,"</em>");
+			rep(/\[u\]/gi,"<u>");
+			rep(/\[\/u\]/gi,"</u>");
+			rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");
+			rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");
+			rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");
+			rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<font color=\"$1\">$2</font>");
+			rep(/\[code\](.*?)\[\/code\]/gi,"<span class=\"codeStyle\">$1</span>&nbsp;");
+			rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<span class=\"quoteStyle\">$1</span>&nbsp;");
+
+			return s; 
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('bbcode', tinymce.plugins.BBCodePlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin.js
new file mode 100644
index 000000000..02a1da8b4
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var DOM=tinymce.DOM,Event=tinymce.dom.Event,each=tinymce.each,is=tinymce.is;tinymce.create('tinymce.plugins.Compat2x',{getInfo:function(){return{longname:'Compat2x',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/compat2x',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};}});(function(){tinymce.extend(tinyMCE,{addToLang:function(p,l){each(l,function(v,k){tinyMCE.i18n[(tinyMCE.settings.language||'en')+'.'+(p?p+'_':'')+k]=v;});},getInstanceById:function(n){return this.get(n);}});})();(function(){var EditorManager=tinymce.EditorManager;tinyMCE.instances={};tinyMCE.plugins={};tinymce.PluginManager.onAdd.add(function(pm,n,p){tinyMCE.plugins[n]=p;});tinyMCE.majorVersion=tinymce.majorVersion;tinyMCE.minorVersion=tinymce.minorVersion;tinyMCE.releaseDate=tinymce.releaseDate;tinyMCE.baseURL=tinymce.baseURL;tinyMCE.isIE=tinyMCE.isMSIE=tinymce.isIE||tinymce.isOpera;tinyMCE.isMSIE5=tinymce.isIE;tinyMCE.isMSIE5_0=tinymce.isIE;tinyMCE.isMSIE7=tinymce.isIE;tinyMCE.isGecko=tinymce.isGecko;tinyMCE.isSafari=tinymce.isWebKit;tinyMCE.isOpera=tinymce.isOpera;tinyMCE.isMac=false;tinyMCE.isNS7=false;tinyMCE.isNS71=false;tinyMCE.compat=true;TinyMCE_Engine=tinyMCE;tinymce.extend(tinyMCE,{getParam:function(n,dv){return this.activeEditor.getParam(n,dv);},addEvent:function(e,na,f,sc){tinymce.dom.Event.add(e,na,f,sc||this);},getControlHTML:function(n){return EditorManager.activeEditor.controlManager.createControl(n);},loadCSS:function(u){tinymce.DOM.loadCSS(u);},importCSS:function(doc,u){if(doc==document)this.loadCSS(u);else new tinymce.dom.DOMUtils(doc).loadCSS(u);},log:function(){console.debug.apply(console,arguments);},getLang:function(n,dv){var v=EditorManager.activeEditor.getLang(n.replace(/^lang_/g,''),dv);if(/^[0-9\-.]+$/g.test(v))return parseInt(v);return v;},isInstance:function(o){return o!=null&&typeof(o)=="object"&&o.execCommand;},triggerNodeChange:function(){EditorManager.activeEditor.nodeChanged();},regexpReplace:function(in_str,reg_exp,replace_str,opts){var re;if(in_str==null)return in_str;if(typeof(opts)=="undefined")opts='g';re=new RegExp(reg_exp,opts);return in_str.replace(re,replace_str);},trim:function(s){return tinymce.trim(s);},xmlEncode:function(s){return tinymce.DOM.encode(s);},explode:function(s,d){var o=[];tinymce.each(s.split(d),function(v){if(v!='')o.push(v);});return o;},switchClass:function(id,cls){var b;if(/^mceButton/.test(cls)){b=EditorManager.activeEditor.controlManager.get(id);if(!b)return;switch(cls){case"mceButtonNormal":b.setDisabled(false);b.setActive(false);return;case"mceButtonDisabled":b.setDisabled(true);return;case"mceButtonSelected":b.setActive(true);b.setDisabled(false);return;}}},addCSSClass:function(e,n,b){return tinymce.DOM.addClass(e,n,b);},hasCSSClass:function(e,n){return tinymce.DOM.hasClass(e,n);},removeCSSClass:function(e,n){return tinymce.DOM.removeClass(e,n);},getCSSClasses:function(){var cl=EditorManager.activeEditor.dom.getClasses(),o=[];each(cl,function(c){o.push(c['class']);});return o;},setWindowArg:function(n,v){EditorManager.activeEditor.windowManager.params[n]=v;},getWindowArg:function(n,dv){var wm=EditorManager.activeEditor.windowManager,v;v=wm.getParam(n);if(v==='')return'';return v||wm.getFeature(n)||dv;},getParentNode:function(n,f){return this._getDOM().getParent(n,f);},selectElements:function(n,na,f){var i,a=[],nl,x;for(x=0,na=na.split(',');x<na.length;x++)for(i=0,nl=n.getElementsByTagName(na[x]);i<nl.length;i++)(!f||f(nl[i]))&&a.push(nl[i]);return a;},getNodeTree:function(n,na,t,nn){return this.selectNodes(n,function(n){return(!t||n.nodeType==t)&&(!nn||n.nodeName==nn);},na?na:[]);},getAttrib:function(e,n,dv){return this._getDOM().getAttrib(e,n,dv);},setAttrib:function(e,n,v){return this._getDOM().setAttrib(e,n,v);},getElementsByAttributeValue:function(n,e,a,v){var i,nl=n.getElementsByTagName(e),o=[];for(i=0;i<nl.length;i++){if(tinyMCE.getAttrib(nl[i],a).indexOf(v)!=-1)o[o.length]=nl[i];}return o;},selectNodes:function(n,f,a){var i;if(!a)a=[];if(f(n))a[a.length]=n;if(n.hasChildNodes()){for(i=0;i<n.childNodes.length;i++)tinyMCE.selectNodes(n.childNodes[i],f,a);}return a;},getContent:function(){return EditorManager.activeEditor.getContent();},getParentElement:function(n,na,f){if(na)na=new RegExp('^('+na.toUpperCase().replace(/,/g,'|')+')$','g');return this._getDOM().getParent(n,function(n){return n.nodeType==1&&(!na||na.test(n.nodeName))&&(!f||f(n));},this.activeEditor.getBody());},importPluginLanguagePack:function(n){tinymce.PluginManager.requireLangPack(n);},getButtonHTML:function(cn,lang,img,c,u,v){var ed=EditorManager.activeEditor;img=img.replace(/\{\$pluginurl\}/g,tinyMCE.pluginURL);img=img.replace(/\{\$themeurl\}/g,tinyMCE.themeURL);lang=lang.replace(/^lang_/g,'');return ed.controlManager.createButton(cn,{title:lang,command:c,ui:u,value:v,scope:this,'class':'compat',image:img});},addSelectAccessibility:function(e,s,w){if(!s._isAccessible){s.onkeydown=tinyMCE.accessibleEventHandler;s.onblur=tinyMCE.accessibleEventHandler;s._isAccessible=true;s._win=w;}return false;},accessibleEventHandler:function(e){var elm,win=this._win;e=tinymce.isIE?win.event:e;elm=tinymce.isIE?e.srcElement:e.target;if(e.type=="blur"){if(elm.oldonchange){elm.onchange=elm.oldonchange;elm.oldonchange=null;}return true;}if(elm.nodeName=="SELECT"&&!elm.oldonchange){elm.oldonchange=elm.onchange;elm.onchange=null;}if(e.keyCode==13||e.keyCode==32){elm.onchange=elm.oldonchange;elm.onchange();elm.oldonchange=null;tinyMCE.cancelEvent(e);return false;}return true;},cancelEvent:function(e){return tinymce.dom.Event.cancel(e);},handleVisualAid:function(e){EditorManager.activeEditor.addVisual(e);},getAbsPosition:function(n,r){return tinymce.DOM.getPos(n,r);},cleanupEventStr:function(s){s=""+s;s=s.replace('function anonymous()\n{\n','');s=s.replace('\n}','');s=s.replace(/^return true;/gi,'');return s;},getVisualAidClass:function(s){return s;},parseStyle:function(s){return this._getDOM().parseStyle(s);},serializeStyle:function(s){return this._getDOM().serializeStyle(s);},openWindow:function(tpl,args){var ed=EditorManager.activeEditor,o={},n;for(n in tpl)o[n]=tpl[n];tpl=o;args=args||{};tpl.url=new tinymce.util.URI(tinymce.ThemeManager.themeURLs[ed.settings.theme]).toAbsolute(tpl.file);tpl.inline=tpl.inline||args.inline;ed.windowManager.open(tpl,args);},closeWindow:function(win){EditorManager.activeEditor.windowManager.close(win);},getOuterHTML:function(e){return tinymce.DOM.getOuterHTML(e);},setOuterHTML:function(e,h,d){return tinymce.DOM.setOuterHTML(e,h,d);},hasPlugin:function(n){return tinymce.PluginManager.get(n)!=null;},_setEventsEnabled:function(){},addPlugin:function(pn,f){var t=this;function PluginWrapper(ed){tinyMCE.selectedInstance=ed;ed.onInit.add(function(){t.settings=ed.settings;t.settings['base_href']=tinyMCE.documentBasePath;tinyMCE.settings=t.settings;tinyMCE.documentBasePath=ed.documentBasePath;if(f.initInstance)f.initInstance(ed);ed.contentDocument=ed.getDoc();ed.contentWindow=ed.getWin();ed.undoRedo=ed.undoManager;ed.startContent=ed.getContent({format:'raw'});tinyMCE.instances[ed.id]=ed;tinyMCE.loadedFiles=[];});ed.onActivate.add(function(){tinyMCE.settings=ed.settings;tinyMCE.selectedInstance=ed;});if(f.handleNodeChange){ed.onNodeChange.add(function(ed,cm,n){f.handleNodeChange(ed.id,n,0,0,false,!ed.selection.isCollapsed());});}if(f.onChange){ed.onChange.add(function(ed,n){return f.onChange(ed);});}if(f.cleanup){ed.onGetContent.add(function(){});}this.getInfo=function(){return f.getInfo();};this.createControl=function(n){tinyMCE.pluginURL=tinymce.baseURL+'/plugins/'+pn;tinyMCE.themeURL=tinymce.baseURL+'/themes/'+tinyMCE.activeEditor.settings.theme;if(f.getControlHTML)return f.getControlHTML(n);return null;};this.execCommand=function(cmd,ui,val){if(f.execCommand)return f.execCommand(ed.id,ed.getBody(),cmd,ui,val);return false;};};tinymce.PluginManager.add(pn,PluginWrapper);},_getDOM:function(){return tinyMCE.activeEditor?tinyMCE.activeEditor.dom:tinymce.DOM;},convertRelativeToAbsoluteURL:function(b,u){return new tinymce.util.URI(b).toAbsolute(u);},convertAbsoluteURLToRelativeURL:function(b,u){return new tinymce.util.URI(b).toRelative(u);}});tinymce.extend(tinymce.Editor.prototype,{getFocusElement:function(){return this.selection.getNode();},getData:function(n){if(!this.data)this.data=[];if(!this.data[n])this.data[n]=[];return this.data[n];},hasPlugin:function(n){return this.plugins[n]!=null;},getContainerWin:function(){return window;},getHTML:function(raw){return this.getContent({format:raw?'raw':'html'});},setHTML:function(h){this.setContent(h);},getSel:function(){return this.selection.getSel();},getRng:function(){return this.selection.getRng();},isHidden:function(){var s;if(!tinymce.isGecko)return false;s=this.getSel();return(!s||!s.rangeCount||s.rangeCount==0);},translate:function(s){var c=this.settings.language,o;if(!s)return s;o=tinymce.EditorManager.i18n[c+'.'+s]||s.replace(/{\#([^}]+)\}/g,function(a,b){return tinymce.EditorManager.i18n[c+'.'+b]||'{#'+b+'}';});o=o.replace(/{\$lang_([^}]+)\}/g,function(a,b){return tinymce.EditorManager.i18n[c+'.'+b]||'{$lang_'+b+'}';});return o;},repaint:function(){this.execCommand('mceRepaint');}});tinymce.extend(tinymce.dom.Selection.prototype,{getSelectedText:function(){return this.getContent({format:'text'});},getSelectedHTML:function(){return this.getContent({format:'html'});},getFocusElement:function(){return this.getNode();},selectNode:function(node,collapse,select_text_node,to_start){var t=this;t.select(node,select_text_node||0);if(!is(collapse))collapse=true;if(collapse){if(!is(to_start))to_start=true;t.collapse(to_start);}}});}).call(this);tinymce.PluginManager.add('compat2x',tinymce.plugins.Compat2x);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin_src.js
new file mode 100644
index 000000000..8f6e02ff3
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin_src.js
@@ -0,0 +1,616 @@
+/**
+ * $Id: editor_plugin_src.js 264 2007-04-26 20:53:09Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, is = tinymce.is;
+
+	tinymce.create('tinymce.plugins.Compat2x', {
+		getInfo : function() {
+			return {
+				longname : 'Compat2x',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/compat2x',
+				version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+			};
+		}
+	});
+
+	(function() {
+		// Extend tinyMCE/EditorManager
+		tinymce.extend(tinyMCE, {
+			addToLang : function(p, l) {
+				each(l, function(v, k) {
+					tinyMCE.i18n[(tinyMCE.settings.language || 'en') + '.' + (p ? p + '_' : '') + k] = v;
+				});
+			},
+
+			getInstanceById : function(n) {
+				return this.get(n);
+			}
+		});
+	})();
+
+	(function() {
+		var EditorManager = tinymce.EditorManager;
+
+		tinyMCE.instances = {};
+		tinyMCE.plugins = {};
+		tinymce.PluginManager.onAdd.add(function(pm, n, p) {
+			tinyMCE.plugins[n] = p;
+		});
+
+		tinyMCE.majorVersion = tinymce.majorVersion;
+		tinyMCE.minorVersion = tinymce.minorVersion;
+		tinyMCE.releaseDate = tinymce.releaseDate;
+		tinyMCE.baseURL = tinymce.baseURL;
+		tinyMCE.isIE = tinyMCE.isMSIE = tinymce.isIE || tinymce.isOpera;
+		tinyMCE.isMSIE5 = tinymce.isIE;
+		tinyMCE.isMSIE5_0 = tinymce.isIE;
+		tinyMCE.isMSIE7 = tinymce.isIE;
+		tinyMCE.isGecko = tinymce.isGecko;
+		tinyMCE.isSafari = tinymce.isWebKit;
+		tinyMCE.isOpera = tinymce.isOpera;
+		tinyMCE.isMac = false;
+		tinyMCE.isNS7 = false;
+		tinyMCE.isNS71 = false;
+		tinyMCE.compat = true;
+
+		// Extend tinyMCE class
+		TinyMCE_Engine = tinyMCE;
+		tinymce.extend(tinyMCE, {
+			getParam : function(n, dv) {
+				return this.activeEditor.getParam(n, dv);
+			},
+
+			addEvent : function(e, na, f, sc) {
+				tinymce.dom.Event.add(e, na, f, sc || this);
+			},
+
+			getControlHTML : function(n) {
+				return EditorManager.activeEditor.controlManager.createControl(n);
+			},
+
+			loadCSS : function(u) {
+				tinymce.DOM.loadCSS(u);
+			},
+
+			importCSS : function(doc, u) {
+				if (doc == document)
+					this.loadCSS(u);
+				else
+					new tinymce.dom.DOMUtils(doc).loadCSS(u);
+			},
+
+			log : function() {
+				console.debug.apply(console, arguments);
+			},
+
+			getLang : function(n, dv) {
+				var v = EditorManager.activeEditor.getLang(n.replace(/^lang_/g, ''), dv);
+
+				// Is number
+				if (/^[0-9\-.]+$/g.test(v))
+					return parseInt(v);
+
+				return v;
+			},
+
+			isInstance : function(o) {
+				return o != null && typeof(o) == "object" && o.execCommand;
+			},
+
+			triggerNodeChange : function() {
+				EditorManager.activeEditor.nodeChanged();
+			},
+
+			regexpReplace : function(in_str, reg_exp, replace_str, opts) {
+				var re;
+
+				if (in_str == null)
+					return in_str;
+
+				if (typeof(opts) == "undefined")
+					opts = 'g';
+
+				re = new RegExp(reg_exp, opts);
+
+				return in_str.replace(re, replace_str);
+			},
+
+			trim : function(s) {
+				return tinymce.trim(s);
+			},
+
+			xmlEncode : function(s) {
+				return tinymce.DOM.encode(s);
+			},
+
+			explode : function(s, d) {
+				var o = [];
+
+				tinymce.each(s.split(d), function(v) {
+					if (v != '')
+						o.push(v);
+				});
+
+				return o;
+			},
+
+			switchClass : function(id, cls) {
+				var b;
+
+				if (/^mceButton/.test(cls)) {
+					b = EditorManager.activeEditor.controlManager.get(id);
+
+					if (!b)
+						return;
+
+					switch (cls) {
+						case "mceButtonNormal":
+							b.setDisabled(false);
+							b.setActive(false);
+							return;
+
+						case "mceButtonDisabled":
+							b.setDisabled(true);
+							return;
+
+						case "mceButtonSelected":
+							b.setActive(true);
+							b.setDisabled(false);
+							return;
+					}
+				}
+			},
+
+			addCSSClass : function(e, n, b) {
+				return tinymce.DOM.addClass(e, n, b);
+			},
+
+			hasCSSClass : function(e, n) {
+				return tinymce.DOM.hasClass(e, n);
+			},
+
+			removeCSSClass : function(e, n) {
+				return tinymce.DOM.removeClass(e, n);
+			},
+
+			getCSSClasses : function() {
+				var cl = EditorManager.activeEditor.dom.getClasses(), o = [];
+
+				each(cl, function(c) {
+					o.push(c['class']);
+				});
+
+				return o;
+			},
+
+			setWindowArg : function(n, v) {
+				EditorManager.activeEditor.windowManager.params[n] = v;
+			},
+
+			getWindowArg : function(n, dv) {
+				var wm = EditorManager.activeEditor.windowManager, v;
+
+				v = wm.getParam(n);
+				if (v === '')
+					return '';
+
+				return v || wm.getFeature(n) || dv;
+			},
+
+			getParentNode : function(n, f) {
+				return this._getDOM().getParent(n, f);
+			},
+
+			selectElements : function(n, na, f) {
+				var i, a = [], nl, x;
+
+				for (x=0, na = na.split(','); x<na.length; x++)
+					for (i=0, nl = n.getElementsByTagName(na[x]); i<nl.length; i++)
+						(!f || f(nl[i])) && a.push(nl[i]);
+
+				return a;
+			},
+
+			getNodeTree : function(n, na, t, nn) {
+				return this.selectNodes(n, function(n) {
+					return (!t || n.nodeType == t) && (!nn || n.nodeName == nn);
+				}, na ? na : []);
+			},
+
+			getAttrib : function(e, n, dv) {
+				return this._getDOM().getAttrib(e, n, dv);
+			},
+
+			setAttrib : function(e, n, v) {
+				return this._getDOM().setAttrib(e, n, v);
+			},
+
+			getElementsByAttributeValue : function(n, e, a, v) {
+				var i, nl = n.getElementsByTagName(e), o = [];
+
+				for (i=0; i<nl.length; i++) {
+					if (tinyMCE.getAttrib(nl[i], a).indexOf(v) != -1)
+						o[o.length] = nl[i];
+				}
+
+				return o;
+			},
+
+			selectNodes : function(n, f, a) {
+				var i;
+
+				if (!a)
+					a = [];
+
+				if (f(n))
+					a[a.length] = n;
+
+				if (n.hasChildNodes()) {
+					for (i=0; i<n.childNodes.length; i++)
+						tinyMCE.selectNodes(n.childNodes[i], f, a);
+				}
+
+				return a;
+			},
+
+			getContent : function() {
+				return EditorManager.activeEditor.getContent();
+			},
+
+			getParentElement : function(n, na, f) {
+				if (na)
+					na = new RegExp('^(' + na.toUpperCase().replace(/,/g, '|') + ')$', 'g');
+
+				return this._getDOM().getParent(n, function(n) {
+					return n.nodeType == 1 && (!na || na.test(n.nodeName)) && (!f || f(n));
+				}, this.activeEditor.getBody());
+			},
+
+			importPluginLanguagePack : function(n) {
+				tinymce.PluginManager.requireLangPack(n);
+			},
+
+			getButtonHTML : function(cn, lang, img, c, u, v) {
+				var ed = EditorManager.activeEditor;
+
+				img = img.replace(/\{\$pluginurl\}/g, tinyMCE.pluginURL);
+				img = img.replace(/\{\$themeurl\}/g, tinyMCE.themeURL);
+				lang = lang.replace(/^lang_/g, '');
+
+				return ed.controlManager.createButton(cn, {
+					title : lang,
+					command : c,
+					ui : u,
+					value : v,
+					scope : this,
+					'class' : 'compat',
+					image : img
+				});
+			},
+
+			addSelectAccessibility : function(e, s, w) {
+				// Add event handlers 
+				if (!s._isAccessible) {
+					s.onkeydown = tinyMCE.accessibleEventHandler;
+					s.onblur = tinyMCE.accessibleEventHandler;
+					s._isAccessible = true;
+					s._win = w;
+				}
+
+				return false;
+			},
+
+			accessibleEventHandler : function(e) {
+				var elm, win = this._win;
+
+				e = tinymce.isIE ? win.event : e;
+				elm = tinymce.isIE ? e.srcElement : e.target;
+
+				// Unpiggyback onchange on blur
+				if (e.type == "blur") {
+					if (elm.oldonchange) {
+						elm.onchange = elm.oldonchange;
+						elm.oldonchange = null;
+					}
+
+					return true;
+				}
+
+				// Piggyback onchange
+				if (elm.nodeName == "SELECT" && !elm.oldonchange) {
+					elm.oldonchange = elm.onchange;
+					elm.onchange = null;
+				}
+
+				// Execute onchange and remove piggyback
+				if (e.keyCode == 13 || e.keyCode == 32) {
+					elm.onchange = elm.oldonchange;
+					elm.onchange();
+					elm.oldonchange = null;
+
+					tinyMCE.cancelEvent(e);
+					return false;
+				}
+
+				return true;
+			},
+
+			cancelEvent : function(e) {
+				return tinymce.dom.Event.cancel(e);
+			},
+
+			handleVisualAid : function(e) {
+				EditorManager.activeEditor.addVisual(e);
+			},
+
+			getAbsPosition : function(n, r) {
+				return tinymce.DOM.getPos(n, r);
+			},
+
+			cleanupEventStr : function(s) {
+				s = "" + s;
+				s = s.replace('function anonymous()\n{\n', '');
+				s = s.replace('\n}', '');
+				s = s.replace(/^return true;/gi, ''); // Remove event blocker
+
+				return s;
+			},
+
+			getVisualAidClass : function(s) {
+				// TODO: Implement
+				return s;
+			},
+
+			parseStyle : function(s) {
+				return this._getDOM().parseStyle(s);
+			},
+
+			serializeStyle : function(s) {
+				return this._getDOM().serializeStyle(s);
+			},
+
+			openWindow : function(tpl, args) {
+				var ed = EditorManager.activeEditor, o = {}, n;
+
+				// Convert name/value array to object
+				for (n in tpl)
+					o[n] = tpl[n];
+
+				tpl = o;
+
+				args = args || {};
+				tpl.url = new tinymce.util.URI(tinymce.ThemeManager.themeURLs[ed.settings.theme]).toAbsolute(tpl.file);
+				tpl.inline = tpl.inline || args.inline;
+
+				ed.windowManager.open(tpl, args);
+			},
+
+			closeWindow : function(win) {
+				EditorManager.activeEditor.windowManager.close(win);
+			},
+
+			getOuterHTML : function(e) {
+				return tinymce.DOM.getOuterHTML(e);
+			},
+
+			setOuterHTML : function(e, h, d) {
+				return tinymce.DOM.setOuterHTML(e, h, d);
+			},
+
+			hasPlugin : function(n) {
+				return tinymce.PluginManager.get(n) != null;
+			},
+
+			_setEventsEnabled : function() {
+				// Ignore it!!
+			},
+
+			addPlugin : function(pn, f) {
+				var t = this;
+
+				function PluginWrapper(ed) {
+					tinyMCE.selectedInstance = ed;
+
+					ed.onInit.add(function() {
+						t.settings = ed.settings;
+						t.settings['base_href'] = tinyMCE.documentBasePath;
+						tinyMCE.settings = t.settings;
+						tinyMCE.documentBasePath = ed.documentBasePath;
+						//ed.formElement = DOM.get(ed.id);
+
+						if (f.initInstance)
+							f.initInstance(ed);
+
+						ed.contentDocument = ed.getDoc();
+						ed.contentWindow = ed.getWin();
+						ed.undoRedo = ed.undoManager;
+						ed.startContent = ed.getContent({format : 'raw'});
+
+						tinyMCE.instances[ed.id] = ed;
+						tinyMCE.loadedFiles = [];
+					});
+
+					ed.onActivate.add(function() {
+						tinyMCE.settings = ed.settings;
+						tinyMCE.selectedInstance = ed;
+					});
+
+				/*	if (f.removeInstance) {
+						ed.onDestroy.add(function() {
+							return f.removeInstance(ed.id);
+						});
+					}*/
+
+					if (f.handleNodeChange) {
+						ed.onNodeChange.add(function(ed, cm, n) {
+							f.handleNodeChange(ed.id, n, 0, 0, false, !ed.selection.isCollapsed());
+						});
+					}
+
+					if (f.onChange) {
+						ed.onChange.add(function(ed, n) {
+							return f.onChange(ed);
+						});
+					}
+
+					if (f.cleanup) {
+						ed.onGetContent.add(function() {
+							//f.cleanup(type, content, inst);
+						});
+					}
+
+					this.getInfo = function() {
+						return f.getInfo();
+					};
+
+					this.createControl = function(n) {
+						tinyMCE.pluginURL = tinymce.baseURL + '/plugins/' + pn;
+						tinyMCE.themeURL = tinymce.baseURL + '/themes/' + tinyMCE.activeEditor.settings.theme;
+
+						if (f.getControlHTML)
+							return f.getControlHTML(n);
+
+						return null;
+					};
+
+					this.execCommand = function(cmd, ui, val) {
+						if (f.execCommand)
+							return f.execCommand(ed.id, ed.getBody(), cmd, ui, val);
+
+						return false;
+					};
+				};
+
+				tinymce.PluginManager.add(pn, PluginWrapper);
+			},
+
+			_getDOM : function() {
+				return tinyMCE.activeEditor ? tinyMCE.activeEditor.dom : tinymce.DOM;
+			},
+
+			convertRelativeToAbsoluteURL : function(b, u) {
+				return new tinymce.util.URI(b).toAbsolute(u);
+			},
+
+			convertAbsoluteURLToRelativeURL : function(b, u) {
+				return new tinymce.util.URI(b).toRelative(u);
+			}
+		});
+
+		// Extend Editor class
+		tinymce.extend(tinymce.Editor.prototype, {
+			getFocusElement : function() {
+				return this.selection.getNode();
+			},
+
+			getData : function(n) {
+				if (!this.data)
+					this.data = [];
+
+				if (!this.data[n])
+					this.data[n] = [];
+
+				return this.data[n];
+			},
+
+			hasPlugin : function(n) {
+				return this.plugins[n] != null;
+			},
+
+			getContainerWin : function() {
+				return window;
+			},
+
+			getHTML : function(raw) {
+				return this.getContent({ format : raw ? 'raw' : 'html'});
+			},
+
+			setHTML : function(h) {
+				this.setContent(h);
+			},
+
+			getSel : function() {
+				return this.selection.getSel();
+			},
+
+			getRng : function() {
+				return this.selection.getRng();
+			},
+
+			isHidden : function() {
+				var s;
+
+				if (!tinymce.isGecko)
+					return false;
+
+				s = this.getSel();
+
+				// Weird, wheres that cursor selection?
+				return (!s || !s.rangeCount || s.rangeCount == 0);
+			},
+
+			translate : function(s) {
+				var c = this.settings.language, o;
+
+				if (!s)
+					return s;
+
+				o = tinymce.EditorManager.i18n[c + '.' + s] || s.replace(/{\#([^}]+)\}/g, function(a, b) {
+					return tinymce.EditorManager.i18n[c + '.' + b] || '{#' + b + '}';
+				});
+
+				o = o.replace(/{\$lang_([^}]+)\}/g, function(a, b) {
+					return tinymce.EditorManager.i18n[c + '.' + b] || '{$lang_' + b + '}';
+				});
+
+				return o;
+			},
+
+			repaint : function() {
+				this.execCommand('mceRepaint');
+			}
+		});
+
+		// Extend selection
+		tinymce.extend(tinymce.dom.Selection.prototype, {
+			getSelectedText : function() {
+				return this.getContent({format : 'text'});
+			},
+
+			getSelectedHTML : function() {
+				return this.getContent({format : 'html'});
+			},
+
+			getFocusElement : function() {
+				return this.getNode();
+			},
+
+			selectNode : function(node, collapse, select_text_node, to_start) {
+				var t = this;
+
+				t.select(node, select_text_node || 0);
+
+				if (!is(collapse))
+					collapse = true;
+
+				if (collapse) {
+					if (!is(to_start))
+						to_start = true;
+
+					t.collapse(to_start);
+				}
+			}
+		});
+	}).call(this);
+
+	// Register plugin
+	tinymce.PluginManager.add('compat2x', tinymce.plugins.Compat2x);
+})();
+
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
new file mode 100644
index 000000000..f68744d07
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var Event=tinymce.dom.Event,each=tinymce.each,DOM=tinymce.DOM;tinymce.create('tinymce.plugins.ContextMenu',{init:function(ed){var t=this;t.editor=ed;t.onContextMenu=new tinymce.util.Dispatcher(this);ed.onContextMenu.add(function(ed,e){if(!e.ctrlKey){t._getMenu(ed).showMenu(e.clientX,e.clientY);Event.add(ed.getDoc(),'click',hide);Event.cancel(e);}});function hide(){if(t._menu){t._menu.removeAll();t._menu.destroy();Event.remove(ed.getDoc(),'click',hide);}};ed.onMouseDown.add(hide);ed.onKeyDown.add(hide);},getInfo:function(){return{longname:'Contextmenu',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_getMenu:function(ed){var t=this,m=t._menu,se=ed.selection,col=se.isCollapsed(),el=se.getNode()||ed.getBody(),am,p1,p2;if(m){m.removeAll();m.destroy();}p1=DOM.getPos(ed.getContentAreaContainer());p2=DOM.getPos(ed.getContainer());m=ed.controlManager.createDropMenu('contextmenu',{offset_x:p1.x+ed.getParam('contextmenu_offset_x',0),offset_y:p1.y+ed.getParam('contextmenu_offset_y',0),constrain:1});t._menu=m;m.add({title:'advanced.cut_desc',icon:'cut',cmd:'Cut'}).setDisabled(col);m.add({title:'advanced.copy_desc',icon:'copy',cmd:'Copy'}).setDisabled(col);m.add({title:'advanced.paste_desc',icon:'paste',cmd:'Paste'});if((el.nodeName=='A'&&!ed.dom.getAttrib(el,'name'))||!col){m.addSeparator();m.add({title:'advanced.link_desc',icon:'link',cmd:ed.plugins.advlink?'mceAdvLink':'mceLink',ui:true});m.add({title:'advanced.unlink_desc',icon:'unlink',cmd:'UnLink'});}m.addSeparator();m.add({title:'advanced.image_desc',icon:'image',cmd:ed.plugins.advimage?'mceAdvImage':'mceImage',ui:true});m.addSeparator();am=m.addMenu({title:'contextmenu.align'});am.add({title:'contextmenu.left',icon:'justifyleft',cmd:'JustifyLeft'});am.add({title:'contextmenu.center',icon:'justifycenter',cmd:'JustifyCenter'});am.add({title:'contextmenu.right',icon:'justifyright',cmd:'JustifyRight'});am.add({title:'contextmenu.full',icon:'justifyfull',cmd:'JustifyFull'});t.onContextMenu.dispatch(t,m,el,col);return m;}});tinymce.PluginManager.add('contextmenu',tinymce.plugins.ContextMenu);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
new file mode 100644
index 000000000..c0961cd81
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
@@ -0,0 +1,95 @@
+/**
+ * $Id: editor_plugin_src.js 848 2008-05-15 11:54:40Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var Event = tinymce.dom.Event, each = tinymce.each, DOM = tinymce.DOM;
+
+	tinymce.create('tinymce.plugins.ContextMenu', {
+		init : function(ed) {
+			var t = this;
+
+			t.editor = ed;
+			t.onContextMenu = new tinymce.util.Dispatcher(this);
+
+			ed.onContextMenu.add(function(ed, e) {
+				if (!e.ctrlKey) {
+					t._getMenu(ed).showMenu(e.clientX, e.clientY);
+					Event.add(ed.getDoc(), 'click', hide);
+					Event.cancel(e);
+				}
+			});
+
+			function hide() {
+				if (t._menu) {
+					t._menu.removeAll();
+					t._menu.destroy();
+					Event.remove(ed.getDoc(), 'click', hide);
+				}
+			};
+
+			ed.onMouseDown.add(hide);
+			ed.onKeyDown.add(hide);
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Contextmenu',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		_getMenu : function(ed) {
+			var t = this, m = t._menu, se = ed.selection, col = se.isCollapsed(), el = se.getNode() || ed.getBody(), am, p1, p2;
+
+			if (m) {
+				m.removeAll();
+				m.destroy();
+			}
+
+			p1 = DOM.getPos(ed.getContentAreaContainer());
+			p2 = DOM.getPos(ed.getContainer());
+
+			m = ed.controlManager.createDropMenu('contextmenu', {
+				offset_x : p1.x + ed.getParam('contextmenu_offset_x', 0),
+				offset_y : p1.y + ed.getParam('contextmenu_offset_y', 0),
+				constrain : 1
+			});
+
+			t._menu = m;
+
+			m.add({title : 'advanced.cut_desc', icon : 'cut', cmd : 'Cut'}).setDisabled(col);
+			m.add({title : 'advanced.copy_desc', icon : 'copy', cmd : 'Copy'}).setDisabled(col);
+			m.add({title : 'advanced.paste_desc', icon : 'paste', cmd : 'Paste'});
+
+			if ((el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) || !col) {
+				m.addSeparator();
+				m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});
+				m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});
+			}
+
+			m.addSeparator();
+			m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});
+
+			m.addSeparator();
+			am = m.addMenu({title : 'contextmenu.align'});
+			am.add({title : 'contextmenu.left', icon : 'justifyleft', cmd : 'JustifyLeft'});
+			am.add({title : 'contextmenu.center', icon : 'justifycenter', cmd : 'JustifyCenter'});
+			am.add({title : 'contextmenu.right', icon : 'justifyright', cmd : 'JustifyRight'});
+			am.add({title : 'contextmenu.full', icon : 'justifyfull', cmd : 'JustifyFull'});
+
+			t.onContextMenu.dispatch(t, m, el, col);
+
+			return m;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('contextmenu', tinymce.plugins.ContextMenu);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js
new file mode 100644
index 000000000..6966d80af
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.Directionality',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mceDirectionLTR',function(){var e=ed.dom.getParent(ed.selection.getNode(),ed.dom.isBlock);if(e){if(ed.dom.getAttrib(e,"dir")!="ltr")ed.dom.setAttrib(e,"dir","ltr");else ed.dom.setAttrib(e,"dir","");}ed.nodeChanged();});ed.addCommand('mceDirectionRTL',function(){var e=ed.dom.getParent(ed.selection.getNode(),ed.dom.isBlock);if(e){if(ed.dom.getAttrib(e,"dir")!="rtl")ed.dom.setAttrib(e,"dir","rtl");else ed.dom.setAttrib(e,"dir","");}ed.nodeChanged();});ed.addButton('ltr',{title:'directionality.ltr_desc',cmd:'mceDirectionLTR'});ed.addButton('rtl',{title:'directionality.rtl_desc',cmd:'mceDirectionRTL'});ed.onNodeChange.add(t._nodeChange,t);},getInfo:function(){return{longname:'Directionality',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_nodeChange:function(ed,cm,n){var dom=ed.dom,dir;n=dom.getParent(n,dom.isBlock);if(!n){cm.setDisabled('ltr',1);cm.setDisabled('rtl',1);return;}dir=dom.getAttrib(n,'dir');cm.setActive('ltr',dir=="ltr");cm.setDisabled('ltr',0);cm.setActive('rtl',dir=="rtl");cm.setDisabled('rtl',0);}});tinymce.PluginManager.add('directionality',tinymce.plugins.Directionality);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js
new file mode 100644
index 000000000..7572bed21
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js
@@ -0,0 +1,79 @@
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Directionality', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			ed.addCommand('mceDirectionLTR', function() {
+				var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock);
+
+				if (e) {
+					if (ed.dom.getAttrib(e, "dir") != "ltr")
+						ed.dom.setAttrib(e, "dir", "ltr");
+					else
+						ed.dom.setAttrib(e, "dir", "");
+				}
+
+				ed.nodeChanged();
+			});
+
+			ed.addCommand('mceDirectionRTL', function() {
+				var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock);
+
+				if (e) {
+					if (ed.dom.getAttrib(e, "dir") != "rtl")
+						ed.dom.setAttrib(e, "dir", "rtl");
+					else
+						ed.dom.setAttrib(e, "dir", "");
+				}
+
+				ed.nodeChanged();
+			});
+
+			ed.addButton('ltr', {title : 'directionality.ltr_desc', cmd : 'mceDirectionLTR'});
+			ed.addButton('rtl', {title : 'directionality.rtl_desc', cmd : 'mceDirectionRTL'});
+
+			ed.onNodeChange.add(t._nodeChange, t);
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Directionality',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_nodeChange : function(ed, cm, n) {
+			var dom = ed.dom, dir;
+
+			n = dom.getParent(n, dom.isBlock);
+			if (!n) {
+				cm.setDisabled('ltr', 1);
+				cm.setDisabled('rtl', 1);
+				return;
+			}
+
+			dir = dom.getAttrib(n, 'dir');
+			cm.setActive('ltr', dir == "ltr");
+			cm.setDisabled('ltr', 0);
+			cm.setActive('rtl', dir == "rtl");
+			cm.setDisabled('rtl', 0);
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('directionality', tinymce.plugins.Directionality);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js
new file mode 100644
index 000000000..87fac106d
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.EmotionsPlugin',{init:function(ed,url){ed.addCommand('mceEmotion',function(){ed.windowManager.open({file:url+'/emotions.htm',width:250+parseInt(ed.getLang('emotions.delta_width',0)),height:160+parseInt(ed.getLang('emotions.delta_height',0)),inline:1},{plugin_url:url});});ed.addButton('emotions',{title:'emotions.emotions_desc',cmd:'mceEmotion'});},getInfo:function(){return{longname:'Emotions',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('emotions',tinymce.plugins.EmotionsPlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js
new file mode 100644
index 000000000..86269edb7
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js
@@ -0,0 +1,40 @@
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.EmotionsPlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceEmotion', function() {
+				ed.windowManager.open({
+					file : url + '/emotions.htm',
+					width : 250 + parseInt(ed.getLang('emotions.delta_width', 0)),
+					height : 160 + parseInt(ed.getLang('emotions.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.addButton('emotions', {title : 'emotions.emotions_desc', cmd : 'mceEmotion'});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Emotions',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('emotions', tinymce.plugins.EmotionsPlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
new file mode 100644
index 000000000..8110ee029
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#emotions_dlg.title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/emotions.js"></script>

+	<base target="_self" />

+</head>

+<body style="display: none">

+	<div align="center">

+		<div class="title">{#emotions_dlg.title}:<br /><br /></div>

+

+		<table border="0" cellspacing="0" cellpadding="4">

+		  <tr>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-cool.gif','emotions_dlg.cool');"><img src="img/smiley-cool.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cool}" title="{#emotions_dlg.cool}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-cry.gif','emotions_dlg.cry');"><img src="img/smiley-cry.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cry}" title="{#emotions_dlg.cry}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-embarassed.gif','emotions_dlg.embarassed');"><img src="img/smiley-embarassed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.embarassed}" title="{#emotions_dlg.embarassed}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-foot-in-mouth.gif','emotions_dlg.foot_in_mouth');"><img src="img/smiley-foot-in-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.foot_in_mouth}" title="{#emotions_dlg.foot_in_mouth}" /></a></td>

+		  </tr>

+		  <tr>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-frown.gif','emotions_dlg.frown');"><img src="img/smiley-frown.gif" width="18" height="18" border="0" alt="{#emotions_dlg.frown}" title="{#emotions_dlg.frown}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-innocent.gif','emotions_dlg.innocent');"><img src="img/smiley-innocent.gif" width="18" height="18" border="0" alt="{#emotions_dlg.innocent}" title="{#emotions_dlg.innocent}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-kiss.gif','emotions_dlg.kiss');"><img src="img/smiley-kiss.gif" width="18" height="18" border="0" alt="{#emotions_dlg.kiss}" title="{#emotions_dlg.kiss}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-laughing.gif','emotions_dlg.laughing');"><img src="img/smiley-laughing.gif" width="18" height="18" border="0" alt="{#emotions_dlg.laughing}" title="{#emotions_dlg.laughing}" /></a></td>

+		  </tr>

+		  <tr>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-money-mouth.gif','emotions_dlg.money_mouth');"><img src="img/smiley-money-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.money_mouth}" title="{#emotions_dlg.money_mouth}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-sealed.gif','emotions_dlg.sealed');"><img src="img/smiley-sealed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.sealed}" title="{#emotions_dlg.sealed}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-smile.gif','emotions_dlg.smile');"><img src="img/smiley-smile.gif" width="18" height="18" border="0" alt="{#emotions_dlg.smile}" title="{#emotions_dlg.smile}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-surprised.gif','emotions_dlg.surprised');"><img src="img/smiley-surprised.gif" width="18" height="18" border="0" alt="{#emotions_dlg.surprised}" title="{#emotions_dlg.surprised}" /></a></td>

+		  </tr>

+		  <tr>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-tongue-out.gif','emotions_dlg.tongue_out');"><img src="img/smiley-tongue-out.gif" width="18" height="18" border="0" alt="{#emotions_dlg.tongue-out}" title="{#emotions_dlg.tongue_out}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-undecided.gif','emotions_dlg.undecided');"><img src="img/smiley-undecided.gif" width="18" height="18" border="0" alt="{#emotions_dlg.undecided}" title="{#emotions_dlg.undecided}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-wink.gif','emotions_dlg.wink');"><img src="img/smiley-wink.gif" width="18" height="18" border="0" alt="{#emotions_dlg.wink}" title="{#emotions_dlg.wink}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-yell.gif','emotions_dlg.yell');"><img src="img/smiley-yell.gif" width="18" height="18" border="0" alt="{#emotions_dlg.yell}" title="{#emotions_dlg.yell}" /></a></td>

+		  </tr>

+		</table>

+	</div>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif
new file mode 100644
index 000000000..ba90cc36f
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif
new file mode 100644
index 000000000..74d897a4f
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
new file mode 100644
index 000000000..963a96b8a
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
new file mode 100644
index 000000000..16f68cc1e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif
new file mode 100644
index 000000000..716f55e16
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif
new file mode 100644
index 000000000..334d49e0e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif
new file mode 100644
index 000000000..4efd549ed
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
new file mode 100644
index 000000000..1606c119e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
new file mode 100644
index 000000000..ca2451e10
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
new file mode 100644
index 000000000..b33d3cca1
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
new file mode 100644
index 000000000..e6a9e60d5
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
new file mode 100644
index 000000000..cb99cdd91
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
new file mode 100644
index 000000000..2075dc160
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif
new file mode 100644
index 000000000..bef7e2573
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
new file mode 100644
index 000000000..9faf1aff8
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif
new file mode 100644
index 000000000..648e6e879
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
new file mode 100644
index 000000000..e5c950fc4
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
@@ -0,0 +1,22 @@
+tinyMCEPopup.requireLangPack();
+
+var EmotionsDialog = {
+	init : function(ed) {
+		tinyMCEPopup.resizeToInnerSize();
+	},
+
+	insert : function(file, title) {
+		var ed = tinyMCEPopup.editor, dom = ed.dom;
+
+		tinyMCEPopup.execCommand('mceInsertContent', false, dom.createHTML('img', {
+			src : tinyMCEPopup.getWindowArg('plugin_url') + '/img/' + file,
+			alt : ed.getLang(title),
+			title : ed.getLang(title),
+			border : 0
+		}));
+
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.onInit.add(EmotionsDialog.init, EmotionsDialog);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
new file mode 100644
index 000000000..f6d5f4ba8
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
@@ -0,0 +1,20 @@
+tinyMCE.addI18n('en.emotions_dlg',{
+title:"Insert emotion",
+desc:"Emotions",
+cool:"Cool",
+cry:"Cry",
+embarassed:"Embarassed",
+foot_in_mouth:"Foot in mouth",
+frown:"Frown",
+innocent:"Innocent",
+kiss:"Kiss",
+laughing:"Laughing",
+money_mouth:"Money mouth",
+sealed:"Sealed",
+smile:"Smile",
+surprised:"Surprised",
+tongue_out:"Tongue out",
+undecided:"Undecided",
+wink:"Wink",
+yell:"Yell"
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm
new file mode 100644
index 000000000..b4c62840e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#example_dlg.title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/dialog.js"></script>

+</head>

+<body>

+

+<form onsubmit="ExampleDialog.insert();return false;" action="#">

+	<p>Here is a example dialog.</p>

+	<p>Selected text: <input id="someval" name="someval" type="text" class="text" /></p>

+	<p>Custom arg: <input id="somearg" name="somearg" type="text" class="text" /></p>

+

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="button" id="insert" name="insert" value="{#insert}" onclick="ExampleDialog.insert();" />

+		</div>

+

+		<div style="float: right">

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</div>

+</form>

+

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin.js
new file mode 100644
index 000000000..cb7010d18
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.PluginManager.requireLangPack('example');tinymce.create('tinymce.plugins.ExamplePlugin',{init:function(ed,url){ed.addCommand('mceExample',function(){ed.windowManager.open({file:url+'/dialog.htm',width:320+parseInt(ed.getLang('example.delta_width',0)),height:120+parseInt(ed.getLang('example.delta_height',0)),inline:1},{plugin_url:url,some_custom_arg:'custom arg'});});ed.addButton('example',{title:'example.desc',cmd:'mceExample',image:url+'/img/example.gif'});ed.onNodeChange.add(function(ed,cm,n){cm.setActive('example',n.nodeName=='IMG');});},createControl:function(n,cm){return null;},getInfo:function(){return{longname:'Example plugin',author:'Some author',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example',version:"1.0"};}});tinymce.PluginManager.add('example',tinymce.plugins.ExamplePlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js
new file mode 100644
index 000000000..d0b5ff2f4
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js
@@ -0,0 +1,81 @@
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	// Load plugin specific language pack
+	tinymce.PluginManager.requireLangPack('example');
+
+	tinymce.create('tinymce.plugins.ExamplePlugin', {
+		/**
+		 * Initializes the plugin, this will be executed after the plugin has been created.
+		 * This call is done before the editor instance has finished it's initialization so use the onInit event
+		 * of the editor instance to intercept that event.
+		 *
+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+		 * @param {string} url Absolute URL to where the plugin is located.
+		 */
+		init : function(ed, url) {
+			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
+			ed.addCommand('mceExample', function() {
+				ed.windowManager.open({
+					file : url + '/dialog.htm',
+					width : 320 + parseInt(ed.getLang('example.delta_width', 0)),
+					height : 120 + parseInt(ed.getLang('example.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url, // Plugin absolute URL
+					some_custom_arg : 'custom arg' // Custom argument
+				});
+			});
+
+			// Register example button
+			ed.addButton('example', {
+				title : 'example.desc',
+				cmd : 'mceExample',
+				image : url + '/img/example.gif'
+			});
+
+			// Add a node change handler, selects the button in the UI when a image is selected
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setActive('example', n.nodeName == 'IMG');
+			});
+		},
+
+		/**
+		 * Creates control instances based in the incomming name. This method is normally not
+		 * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons
+		 * but you sometimes need to create more complex controls like listboxes, split buttons etc then this
+		 * method can be used to create those.
+		 *
+		 * @param {String} n Name of the control to create.
+		 * @param {tinymce.ControlManager} cm Control manager to use inorder to create new control.
+		 * @return {tinymce.ui.Control} New control instance or null if no control was created.
+		 */
+		createControl : function(n, cm) {
+			return null;
+		},
+
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @return {Object} Name/value array containing information about the plugin.
+		 */
+		getInfo : function() {
+			return {
+				longname : 'Example plugin',
+				author : 'Some author',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example',
+				version : "1.0"
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('example', tinymce.plugins.ExamplePlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/img/example.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/img/example.gif
new file mode 100644
index 000000000..1ab5da446
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/img/example.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js
new file mode 100644
index 000000000..a7ee507e0
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js
@@ -0,0 +1,19 @@
+tinyMCEPopup.requireLangPack();
+
+var ExampleDialog = {
+	init : function() {
+		var f = document.forms[0];
+
+		// Get the selected contents as text and place it in the input
+		f.someval.value = tinyMCEPopup.editor.selection.getContent({format : 'text'});
+		f.somearg.value = tinyMCEPopup.getWindowArg('some_custom_arg');
+	},
+
+	insert : function() {
+		// Insert the contents from the input into the document
+		tinyMCEPopup.editor.execCommand('mceInsertContent', false, document.forms[0].someval.value);
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.onInit.add(ExampleDialog.init, ExampleDialog);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js
new file mode 100644
index 000000000..f3721d3a3
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js
@@ -0,0 +1,3 @@
+tinyMCE.addI18n('en.example',{
+	desc : 'This is just a template button'
+});
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js
new file mode 100644
index 000000000..a9cd65f8c
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js
@@ -0,0 +1,3 @@
+tinyMCE.addI18n('en.example_dlg',{
+	title : 'This is just a example title'
+});
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css
new file mode 100644
index 000000000..1854eca94
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css
@@ -0,0 +1,182 @@
+/* Hide the advanced tab */
+#advanced_tab {
+	display: none;
+}
+
+#metatitle, #metakeywords, #metadescription, #metaauthor, #metacopyright {
+	width: 280px;
+}
+
+#doctype, #docencoding {
+	width: 200px;
+}
+
+#langcode {
+	width: 30px;
+}
+
+#bgimage {
+	width: 220px;	
+}
+
+#fontface {
+	width: 240px;
+}
+
+#leftmargin, #rightmargin, #topmargin, #bottommargin {
+	width: 50px;
+}
+
+.panel_wrapper div.current {
+	height: 400px;
+}
+
+#stylesheet, #style {
+	width: 240px;
+}
+
+/* Head list classes */
+
+.headlistwrapper {
+	width: 100%;
+}
+
+.addbutton, .removebutton, .moveupbutton, .movedownbutton {
+	border-top: 1px solid;
+	border-left: 1px solid;
+	border-bottom: 1px solid;
+	border-right: 1px solid;
+	border-color: #F0F0EE;
+	cursor: default;
+	display: block;
+	width: 20px;
+	height: 20px;
+}
+
+#doctypes {
+	width: 200px;
+}
+
+.addbutton:hover, .removebutton:hover, .moveupbutton:hover, .movedownbutton:hover {
+	border: 1px solid #0A246A;
+	background-color: #B6BDD2;
+}
+
+.addbutton {
+	background-image: url('../images/add.gif');
+	float: left;
+	margin-right: 3px;
+}
+
+.removebutton {
+	background-image: url('../images/remove.gif');
+	float: left;
+}
+
+.moveupbutton {
+	background-image: url('../images/move_up.gif');
+	float: left;
+	margin-right: 3px;
+}
+
+.movedownbutton {
+	background-image: url('../images/move_down.gif');
+	float: left;
+}
+
+.selected {
+	border: 1px solid #0A246A;
+	background-color: #B6BDD2;
+}
+
+.toolbar {
+	width: 100%;
+}
+
+#headlist {
+	width: 100%;
+	margin-top: 3px;
+	font-size: 11px;
+}
+
+#info, #title_element, #meta_element, #script_element, #style_element, #base_element, #link_element, #comment_element, #unknown_element {
+	display: none;
+}
+
+#addmenu {
+	position: absolute;
+	border: 1px solid gray;
+	display: none;
+	z-index: 100;
+	background-color: white;
+}
+
+#addmenu a {
+	display: block;
+	width: 100%;
+	line-height: 20px;
+	text-decoration: none;
+	background-color: white;
+}
+
+#addmenu a:hover {
+	background-color: #B6BDD2;
+	color: black;
+}
+
+#addmenu span {
+	padding-left: 10px;
+	padding-right: 10px;
+}
+
+#updateElementPanel {
+	display: none;
+}
+
+#script_element .panel_wrapper div.current {
+	height: 108px;
+}
+
+#style_element .panel_wrapper div.current {
+	height: 108px;
+}
+
+#link_element  .panel_wrapper div.current {
+	height: 140px;
+}
+
+#element_script_value {
+	width: 100%;
+	height: 100px;
+}
+
+#element_comment_value {
+	width: 100%;
+	height: 120px;
+}
+
+#element_style_value {
+	width: 100%;
+	height: 100px;
+}
+
+#element_title, #element_script_src, #element_meta_name, #element_meta_content, #element_base_href, #element_link_href, #element_link_title {
+	width: 250px;
+}
+
+.updateElementButton {
+	margin-top: 3px;
+}
+
+/* MSIE specific styles */
+
+* html .addbutton, * html .removebutton, * html .moveupbutton, * html .movedownbutton {
+	width: 22px;
+	height: 22px;
+}
+
+textarea {
+	height: 55px;
+}
+
+.panel_wrapper div.current {height:420px;}
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
new file mode 100644
index 000000000..31423da17
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.FullPagePlugin',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mceFullPageProperties',function(){ed.windowManager.open({file:url+'/fullpage.htm',width:430+parseInt(ed.getLang('fullpage.delta_width',0)),height:495+parseInt(ed.getLang('fullpage.delta_height',0)),inline:1},{plugin_url:url,head_html:t.head});});ed.addButton('fullpage',{title:'fullpage.desc',cmd:'mceFullPageProperties'});ed.onBeforeSetContent.add(t._setContent,t);ed.onSetContent.add(t._setBodyAttribs,t);ed.onGetContent.add(t._getContent,t);},getInfo:function(){return{longname:'Fullpage',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_setBodyAttribs:function(ed,o){var bdattr,i,len,kv,k,v,t,attr=this.head.match(/body(.*?)>/i);if(attr&&attr[1]){bdattr=attr[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);for(i=0,len=bdattr.length;i<len;i++){kv=bdattr[i].split('=');k=kv[0].replace(/\s/,'');v=kv[1];if(v){v=v.replace(/^\s+/,'').replace(/\s+$/,'');t=v.match(/^["'](.*)["']$/);if(t)v=t[1];}else v=k;ed.dom.setAttrib(ed.getBody(),'style',v);}}},_createSerializer:function(){return new tinymce.dom.Serializer({dom:this.editor.dom,apply_source_formatting:true});},_setContent:function(ed,o){var t=this,sp,ep,c=o.content,v,st='';c=c.replace(/<(\/?)BODY/gi,'<$1body');sp=c.indexOf('<body');if(sp!=-1){sp=c.indexOf('>',sp);t.head=c.substring(0,sp+1);ep=c.indexOf('</body',sp);if(ep==-1)ep=c.indexOf('</body',ep);o.content=c.substring(sp+1,ep);t.foot=c.substring(ep);function low(s){return s.replace(/<\/?[A-Z]+/g,function(a){return a.toLowerCase();})};t.head=low(t.head);t.foot=low(t.foot);}else{t.head='';if(ed.getParam('fullpage_default_xml_pi'))t.head+='<?xml version="1.0" encoding="'+ed.getParam('fullpage_default_encoding','ISO-8859-1')+'" ?>\n';t.head+=ed.getParam('fullpage_default_doctype','<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');t.head+='\n<html>\n<head>\n<title>'+ed.getParam('fullpage_default_title','Untitled document')+'</title>\n';if(v=ed.getParam('fullpage_default_encoding'))t.head+='<meta http-equiv="Content-Type" content="'+v+'" />\n';if(v=ed.getParam('fullpage_default_font_family'))st+='font-family: '+v+';';if(v=ed.getParam('fullpage_default_font_size'))st+='font-size: '+v+';';if(v=ed.getParam('fullpage_default_text_color'))st+='color: '+v+';';t.head+='</head>\n<body'+(st?' style="'+st+'"':'')+'>\n';t.foot='\n</body>\n</html>';}},_getContent:function(ed,o){var t=this;o.content=tinymce.trim(t.head)+'\n'+tinymce.trim(o.content)+'\n'+tinymce.trim(t.foot);}});tinymce.PluginManager.add('fullpage',tinymce.plugins.FullPagePlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
new file mode 100644
index 000000000..b0d720c98
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
@@ -0,0 +1,140 @@
+/**
+ * $Id: editor_plugin_src.js 827 2008-04-29 15:02:42Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.FullPagePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceFullPageProperties', function() {
+				ed.windowManager.open({
+					file : url + '/fullpage.htm',
+					width : 430 + parseInt(ed.getLang('fullpage.delta_width', 0)),
+					height : 495 + parseInt(ed.getLang('fullpage.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url,
+					head_html : t.head
+				});
+			});
+
+			// Register buttons
+			ed.addButton('fullpage', {title : 'fullpage.desc', cmd : 'mceFullPageProperties'});
+
+			ed.onBeforeSetContent.add(t._setContent, t);
+			ed.onSetContent.add(t._setBodyAttribs, t);
+			ed.onGetContent.add(t._getContent, t);
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Fullpage',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private plugin internal methods
+
+		_setBodyAttribs : function(ed, o) {
+			var bdattr, i, len, kv, k, v, t, attr = this.head.match(/body(.*?)>/i);
+
+			if (attr && attr[1]) {
+				bdattr = attr[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);
+
+				for(i = 0, len = bdattr.length; i < len; i++) {
+					kv = bdattr[i].split('=');
+					k = kv[0].replace(/\s/,'');
+					v = kv[1];
+
+					if (v) {
+						v = v.replace(/^\s+/,'').replace(/\s+$/,'');
+						t = v.match(/^["'](.*)["']$/);
+
+						if (t)
+							v = t[1];
+					} else
+						v = k;
+
+					ed.dom.setAttrib(ed.getBody(), 'style', v);
+				}
+			}
+		},
+
+		_createSerializer : function() {
+			return new tinymce.dom.Serializer({
+				dom : this.editor.dom,
+				apply_source_formatting : true
+			});
+		},
+
+		_setContent : function(ed, o) {
+			var t = this, sp, ep, c = o.content, v, st = '';
+
+			// Parse out head, body and footer
+			c = c.replace(/<(\/?)BODY/gi, '<$1body');
+			sp = c.indexOf('<body');
+
+			if (sp != -1) {
+				sp = c.indexOf('>', sp);
+				t.head = c.substring(0, sp + 1);
+
+				ep = c.indexOf('</body', sp);
+				if (ep == -1)
+					ep = c.indexOf('</body', ep);
+
+				o.content = c.substring(sp + 1, ep);
+				t.foot = c.substring(ep);
+
+				function low(s) {
+					return s.replace(/<\/?[A-Z]+/g, function(a) {
+						return a.toLowerCase();
+					})
+				};
+
+				t.head = low(t.head);
+				t.foot = low(t.foot);
+			} else {
+				t.head = '';
+				if (ed.getParam('fullpage_default_xml_pi'))
+					t.head += '<?xml version="1.0" encoding="' + ed.getParam('fullpage_default_encoding', 'ISO-8859-1') + '" ?>\n';
+
+				t.head += ed.getParam('fullpage_default_doctype', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');
+				t.head += '\n<html>\n<head>\n<title>' + ed.getParam('fullpage_default_title', 'Untitled document') + '</title>\n';
+
+				if (v = ed.getParam('fullpage_default_encoding'))
+					t.head += '<meta http-equiv="Content-Type" content="' + v + '" />\n';
+
+				if (v = ed.getParam('fullpage_default_font_family'))
+					st += 'font-family: ' + v + ';';
+
+				if (v = ed.getParam('fullpage_default_font_size'))
+					st += 'font-size: ' + v + ';';
+
+				if (v = ed.getParam('fullpage_default_text_color'))
+					st += 'color: ' + v + ';';
+
+				t.head += '</head>\n<body' + (st ? ' style="' + st + '"' : '') + '>\n';
+				t.foot = '\n</body>\n</html>';
+			}
+		},
+
+		_getContent : function(ed, o) {
+			var t = this;
+
+			o.content = tinymce.trim(t.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(t.foot);
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('fullpage', tinymce.plugins.FullPagePlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm
new file mode 100644
index 000000000..d74da0d76
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm
@@ -0,0 +1,577 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#fullpage_dlg.title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="js/fullpage.js"></script>

+	<link href="css/fullpage.css" rel="stylesheet" type="text/css" />

+	<base target="_self" />

+</head>

+<body id="advlink" style="display: none">

+    <form onsubmit="updateAction();return false;" name="fullpage" action="#">

+		<div class="tabs">

+			<ul>

+				<li id="meta_tab" class="current"><span><a href="javascript:mcTabs.displayTab('meta_tab','meta_panel');" onmousedown="return false;">{#fullpage_dlg.meta_tab}</a></span></li>

+				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#fullpage_dlg.appearance_tab}</a></span></li>

+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#fullpage_dlg.advanced_tab}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="meta_panel" class="panel current">

+				<fieldset>

+					<legend>{#fullpage_dlg.meta_props}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td nowrap="nowrap"><label for="metatitle">{#fullpage_dlg.meta_title}</label>&nbsp;</td>

+							<td><input type="text" id="metatitle" name="metatitle" value="" class="mceFocus" /></td>

+						</tr>

+						<tr>

+							<td nowrap="nowrap"><label for="metakeywords">{#fullpage_dlg.meta_keywords}</label>&nbsp;</td>

+							<td><textarea id="metakeywords" name="metakeywords" rows="4"></textarea></td>

+						</tr>

+						<tr>

+							<td nowrap="nowrap"><label for="metadescription">{#fullpage_dlg.meta_description}</label>&nbsp;</td>

+							<td><textarea id="metadescription" name="metadescription" rows="4"></textarea></td>

+						</tr>

+						<tr>

+							<td nowrap="nowrap"><label for="metaauthor">{#fullpage_dlg.author}</label>&nbsp;</td>

+							<td><input type="text" id="metaauthor" name="metaauthor" value="" /></td>

+						</tr>

+						<tr>

+							<td nowrap="nowrap"><label for="metacopyright">{#fullpage_dlg.copyright}</label>&nbsp;</td>

+							<td><input type="text" id="metacopyright" name="metacopyright" value="" /></td>

+						</tr>

+						<tr>

+							<td nowrap="nowrap"><label for="metarobots">{#fullpage_dlg.meta_robots}</label>&nbsp;</td>

+							<td>

+								<select id="metarobots" name="metarobots">

+											<option value="">{#not_set}</option> 

+											<option value="index,follow">{#fullpage_dlg.meta_index_follow}</option>

+											<option value="index,nofollow">{#fullpage_dlg.meta_index_nofollow}</option>

+											<option value="noindex,follow">{#fullpage_dlg.meta_noindex_follow}</option>

+											<option value="noindex,nofollow">{#fullpage_dlg.meta_noindex_nofollow}</option>

+								</select>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#fullpage_dlg.langprops}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="docencoding">{#fullpage_dlg.encoding}</label></td> 

+							<td>

+								<select id="docencoding" name="docencoding"> 

+										<option value="">{#not_set}</option>

+								</select>

+							</td> 

+						</tr>

+						<tr>

+							<td nowrap="nowrap"><label for="doctypes">{#fullpage_dlg.doctypes}</label>&nbsp;</td>

+							<td>

+								<select id="doctypes" name="doctypes">

+										<option value="">{#not_set}</option>

+								</select>

+							</td>

+						</tr>

+						<tr>

+							<td nowrap="nowrap"><label for="langcode">{#fullpage_dlg.langcode}</label>&nbsp;</td>

+							<td><input type="text" id="langcode" name="langcode" value="" /></td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="langdir">{#fullpage_dlg.langdir}</label></td> 

+							<td>

+								<select id="langdir" name="langdir"> 

+										<option value="">{#not_set}</option> 

+										<option value="ltr">{#fullpage_dlg.ltr}</option> 

+										<option value="rtl">{#fullpage_dlg.rtl}</option> 

+								</select>

+							</td> 

+						</tr>

+						<tr>

+							<td nowrap="nowrap"><label for="xml_pi">{#fullpage_dlg.xml_pi}</label>&nbsp;</td>

+							<td><input type="checkbox" id="xml_pi" name="xml_pi" class="checkbox" /></td>

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+

+			<div id="appearance_panel" class="panel">

+				<fieldset>

+					<legend>{#fullpage_dlg.appearance_textprops}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="fontface">{#fullpage_dlg.fontface}</label></td> 

+							<td>

+								<select id="fontface" name="fontface" onchange="changedStyleField(this);">

+										<option value="">{#not_set}</option>

+								</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="fontsize">{#fullpage_dlg.fontsize}</label></td> 

+							<td>

+								<select id="fontsize" name="fontsize" onchange="changedStyleField(this);">

+										<option value="">{#not_set}</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="textcolor">{#fullpage_dlg.textcolor}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="textcolor" name="textcolor" type="text" value="" size="9" onchange="updateColor('textcolor_pick','textcolor');changedStyleField(this);" /></td>

+										<td id="textcolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#fullpage_dlg.appearance_bgprops}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="bgimage">{#fullpage_dlg.bgimage}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bgimage" name="bgimage" type="text" value="" onchange="changedStyleField(this);" /></td>

+										<td id="bgimage_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="bgcolor">{#fullpage_dlg.bgcolor}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedStyleField(this);" /></td>

+										<td id="bgcolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#fullpage_dlg.appearance_marginprops}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="leftmargin">{#fullpage_dlg.left_margin}</label></td> 

+							<td><input id="leftmargin" name="leftmargin" type="text" value="" onchange="changedStyleField(this);" /></td>

+							<td class="column1"><label for="rightmargin">{#fullpage_dlg.right_margin}</label></td> 

+							<td><input id="rightmargin" name="rightmargin" type="text" value="" onchange="changedStyleField(this);" /></td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="topmargin">{#fullpage_dlg.top_margin}</label></td> 

+							<td><input id="topmargin" name="topmargin" type="text" value="" onchange="changedStyleField(this);" /></td>

+							<td class="column1"><label for="bottommargin">{#fullpage_dlg.bottom_margin}</label></td> 

+							<td><input id="bottommargin" name="bottommargin" type="text" value="" onchange="changedStyleField(this);" /></td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#fullpage_dlg.appearance_linkprops}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="link_color">{#fullpage_dlg.link_color}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="link_color" name="link_color" type="text" value="" size="9" onchange="updateColor('link_color_pick','link_color');changedStyleField(this);" /></td>

+										<td id="link_color_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+

+							<td class="column1"><label for="visited_color">{#fullpage_dlg.visited_color}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="visited_color" name="visited_color" type="text" value="" size="9" onchange="updateColor('visited_color_pick','visited_color');changedStyleField(this);" /></td>

+										<td id="visited_color_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="active_color">{#fullpage_dlg.active_color}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="active_color" name="active_color" type="text" value="" size="9" onchange="updateColor('active_color_pick','active_color');changedStyleField(this);" /></td>

+										<td id="active_color_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+

+							<td>&nbsp;</td>

+							<td>&nbsp;</td>

+

+<!--							<td class="column1"><label for="hover_color">{#fullpage_dlg.hover_color}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="hover_color" name="hover_color" type="text" value="" size="9" onchange="changedStyleField(this);" /></td>

+										<td id="hover_color_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> -->

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#fullpage_dlg.appearance_style}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="stylesheet">{#fullpage_dlg.stylesheet}</label></td> 

+							<td><table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="stylesheet" name="stylesheet" type="text" value="" /></td>

+										<td id="stylesheet_browsercontainer">&nbsp;</td>

+									</tr>

+								</table></td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="style">{#fullpage_dlg.style}</label></td> 

+							<td><input id="style" name="style" type="text" value="" onchange="changedStyleField(this);" /></td>

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+

+			<div id="advanced_panel" class="panel">

+				<div id="addmenu">

+					<table border="0" cellpadding="0" cellspacing="0">

+						<tr><td><a href="javascript:addHeadElm('title');" onmousedown="return false;"><span>{#fullpage_dlg.add_title}</span></a></td></tr>

+						<tr><td><a href="javascript:addHeadElm('meta');" onmousedown="return false;"><span>{#fullpage_dlg.add_meta}</span></a></td></tr>

+						<tr><td><a href="javascript:addHeadElm('script');" onmousedown="return false;"><span>{#fullpage_dlg.add_script}</span></a></td></tr>

+						<tr><td><a href="javascript:addHeadElm('style');" onmousedown="return false;"><span>{#fullpage_dlg.add_style}</span></a></td></tr>

+						<tr><td><a href="javascript:addHeadElm('link');" onmousedown="return false;"><span>{#fullpage_dlg.add_link}</span></a></td></tr>

+						<tr><td><a href="javascript:addHeadElm('base');" onmousedown="return false;"><span>{#fullpage_dlg.add_base}</span></a></td></tr>

+						<tr><td><a href="javascript:addHeadElm('comment');" onmousedown="return false;"><span>{#fullpage_dlg.add_comment}</span></a></td></tr>

+					</table>

+				</div>

+

+				<fieldset>

+					<legend>{#fullpage_dlg.head_elements}</legend>

+

+					<div class="headlistwrapper">

+						<div class="toolbar">

+							<div style="float: left">

+								<a id="addbutton" href="javascript:showAddMenu();" onmousedown="return false;" class="addbutton" title="{#fullpage_dlg.add}"></a>

+								<a href="#" onmousedown="return false;" class="removebutton" title="{#fullpage_dlg.remove}"></a>

+							</div>

+							<div style="float: right">

+								<a href="#" onmousedown="return false;" class="moveupbutton" title="{#fullpage_dlg.moveup}"></a>

+								<a href="#" onmousedown="return false;" class="movedownbutton" title="{#fullpage_dlg.movedown}"></a>

+							</div>

+							<br style="clear: both" />

+						</div>

+						<select id="headlist" size="26" onchange="updateHeadElm(this.options[this.selectedIndex].value);">

+							<option value="title_0">&lt;title&gt;Some title bla bla bla&lt;/title&gt;</option>

+							<option value="meta_1">&lt;meta name="keywords"&gt;Some bla bla bla&lt;/meta&gt;</option>

+							<option value="meta_2">&lt;meta name="description"&gt;Some bla bla bla bla bla bla bla bla bla&lt;/meta&gt;</option>

+							<option value="script_3">&lt;script language=&quot;javascript&quot;&gt;...&lt;/script&gt;</option>

+							<option value="style_4">&lt;style&gt;...&lt;/style&gt;</option>

+							<option value="base_5">&lt;base href="." /&gt;</option>

+							<option value="comment_6">&lt;!-- ... --&gt;</option>

+							<option value="link_7">&lt;link href="." /&gt;</option>

+						</select>

+					</div>

+				</fieldset>

+

+				<fieldset id="meta_element">

+					<legend>{#fullpage_dlg.meta_element}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="element_meta_type">{#fullpage_dlg.type}</label></td> 

+							<td><select id="element_meta_type">

+										<option value="name">name</option>

+										<option value="http-equiv">http-equiv</option>

+								</select></td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="element_meta_name">{#fullpage_dlg.name}</label></td> 

+							<td><input id="element_meta_name" name="element_meta_name" type="text" value="" /></td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="element_meta_content">{#fullpage_dlg.content}</label></td> 

+							<td><input id="element_meta_content" name="element_meta_content" type="text" value="" /></td>

+						</tr>

+					</table>

+

+					<input type="button" id="meta_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

+				</fieldset>

+

+				<fieldset id="title_element">

+					<legend>{#fullpage_dlg.title_element}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="element_title">{#fullpage_dlg.meta_title}</label></td> 

+							<td><input id="element_title" name="element_title" type="text" value="" /></td>

+						</tr>

+					</table>

+

+					<input type="button" id="title_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

+				</fieldset>

+

+				<fieldset id="script_element">

+					<legend>{#fullpage_dlg.script_element}</legend>

+

+					<div class="tabs">

+						<ul>

+							<li id="script_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('script_props_tab','script_props_panel');" onmousedown="return false;">{#fullpage_dlg.properties}</a></span></li>

+							<li id="script_value_tab"><span><a href="javascript:mcTabs.displayTab('script_value_tab','script_value_panel');" onmousedown="return false;">{#fullpage_dlg.value}</a></span></li>

+						</ul>

+					</div>

+

+					<br style="clear: both" />

+

+					<div class="panel_wrapper">

+						<div id="script_props_panel" class="panel current">

+							<table border="0" cellpadding="4" cellspacing="0">

+								<tr>

+									<td class="column1"><label for="element_script_type">{#fullpage_dlg.type}</label></td> 

+									<td><select id="element_script_type">

+										<option value="text/javascript">text/javascript</option>

+										<option value="text/jscript">text/jscript</option>

+										<option value="text/vbscript">text/vbscript</option>

+										<option value="text/vbs">text/vbs</option>

+										<option value="text/ecmascript">text/ecmascript</option>

+										<option value="text/xml">text/xml</option>

+									</select></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_script_src">{#fullpage_dlg.src}</label></td> 

+									<td><table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="element_script_src" name="element_script_src" type="text" value="" /></td>

+										<td id="script_src_pickcontainer">&nbsp;</td>

+									</tr>

+								</table></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_script_charset">{#fullpage_dlg.charset}</label></td> 

+									<td><select id="element_script_charset"><option value="">{#not_set}</option></select></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_script_defer">{#fullpage_dlg.defer}</label></td> 

+									<td><input type="checkbox" id="element_script_defer" name="element_script_defer" class="checkbox" /></td>

+								</tr>

+							</table>

+						</div>

+

+						<div id="script_value_panel" class="panel">

+							<textarea id="element_script_value"></textarea>

+						</div>

+					</div>

+

+					<input type="button" id="script_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

+				</fieldset>

+

+				<fieldset id="style_element">

+					<legend>{#fullpage_dlg.style_element}</legend>

+

+					<div class="tabs">

+						<ul>

+							<li id="style_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('style_props_tab','style_props_panel');" onmousedown="return false;">{#fullpage_dlg.properties}</a></span></li>

+							<li id="style_value_tab"><span><a href="javascript:mcTabs.displayTab('style_value_tab','style_value_panel');" onmousedown="return false;">{#fullpage_dlg.value}</a></span></li>

+						</ul>

+					</div>

+

+					<br style="clear: both" />

+

+					<div class="panel_wrapper">

+						<div id="style_props_panel" class="panel current">

+							<table border="0" cellpadding="4" cellspacing="0">

+								<tr>

+									<td class="column1"><label for="element_style_type">{#fullpage_dlg.type}</label></td> 

+									<td><select id="element_style_type">

+										<option value="text/css">text/css</option>

+									</select></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_style_media">{#fullpage_dlg.media}</label></td> 

+									<td><select id="element_style_media"></select></td>

+								</tr>

+							</table>

+						</div>

+

+						<div id="style_value_panel" class="panel">

+							<textarea id="element_style_value"></textarea>

+						</div>

+					</div>

+

+					<input type="button" id="style_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

+				</fieldset>

+

+				<fieldset id="base_element">

+					<legend>{#fullpage_dlg.base_element}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="element_base_href">{#fullpage_dlg.href}</label></td> 

+							<td><input id="element_base_href" name="element_base_href" type="text" value="" /></td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="element_base_target">{#fullpage_dlg.target}</label></td> 

+							<td><input id="element_base_target" name="element_base_target" type="text" value="" /></td>

+						</tr>

+					</table>

+

+					<input type="button" id="base_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

+				</fieldset>

+

+				<fieldset id="link_element">

+					<legend>{#fullpage_dlg.link_element}</legend>

+

+					<div class="tabs">

+						<ul>

+							<li id="link_general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('link_general_tab','link_general_panel');" onmousedown="return false;">{#fullpage_dlg.general_props}</a></span></li>

+							<li id="link_advanced_tab"><span><a href="javascript:mcTabs.displayTab('link_advanced_tab','link_advanced_panel');" onmousedown="return false;">{#fullpage_dlg.advanced_props}</a></span></li>

+						</ul>

+					</div>

+

+					<br style="clear: both" />

+

+					<div class="panel_wrapper">

+						<div id="link_general_panel" class="panel current">

+							<table border="0" cellpadding="4" cellspacing="0">

+								<tr>

+									<td class="column1"><label for="element_link_href">{#fullpage_dlg.href}</label></td> 

+									<td><table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="element_link_href" name="element_link_href" type="text" value="" /></td>

+										<td id="link_href_pickcontainer">&nbsp;</td>

+									</tr>

+								</table></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_link_title">{#fullpage_dlg.meta_title}</label></td> 

+									<td><input id="element_link_title" name="element_link_title" type="text" value="" /></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_link_type">{#fullpage_dlg.type}</label></td> 

+									<td><select id="element_link_type" name="element_link_type">

+										<option value="text/css">text/css</option>

+										<option value="text/javascript">text/javascript</option>

+									</select></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_link_media">{#fullpage_dlg.media}</label></td> 

+									<td><select id="element_link_media" name="element_link_media"></select></td>

+								</tr>

+								<tr>

+									<td><label for="element_style_rel">{#fullpage_dlg.rel}</label></td>

+									<td><select id="element_style_rel" name="element_style_rel"> 

+											<option value="">{#not_set}</option> 

+											<option value="stylesheet">Stylesheet</option>

+											<option value="alternate">Alternate</option>

+											<option value="designates">Designates</option>

+											<option value="start">Start</option>

+											<option value="next">Next</option>

+											<option value="prev">Prev</option>

+											<option value="contents">Contents</option>

+											<option value="index">Index</option>

+											<option value="glossary">Glossary</option>

+											<option value="copyright">Copyright</option>

+											<option value="chapter">Chapter</option>

+											<option value="subsection">Subsection</option>

+											<option value="appendix">Appendix</option>

+											<option value="help">Help</option>

+											<option value="bookmark">Bookmark</option>

+										</select> 

+									</td>

+								</tr>

+							</table>

+						</div>

+

+						<div id="link_advanced_panel" class="panel">

+							<table border="0" cellpadding="4" cellspacing="0">

+								<tr>

+									<td class="column1"><label for="element_link_charset">{#fullpage_dlg.charset}</label></td> 

+									<td><select id="element_link_charset"><option value="">{#not_set}</option></select></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_link_hreflang">{#fullpage_dlg.hreflang}</label></td> 

+									<td><input id="element_link_hreflang" name="element_link_hreflang" type="text" value="" /></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_link_target">{#fullpage_dlg.target}</label></td> 

+									<td><input id="element_link_target" name="element_link_target" type="text" value="" /></td>

+								</tr>

+								<tr>

+									<td><label for="element_style_rev">{#fullpage_dlg.rev}</label></td>

+									<td><select id="element_style_rev" name="element_style_rev"> 

+											<option value="">{#not_set}</option> 

+											<option value="alternate">Alternate</option> 

+											<option value="designates">Designates</option> 

+											<option value="stylesheet">Stylesheet</option> 

+											<option value="start">Start</option> 

+											<option value="next">Next</option> 

+											<option value="prev">Prev</option> 

+											<option value="contents">Contents</option> 

+											<option value="index">Index</option> 

+											<option value="glossary">Glossary</option> 

+											<option value="copyright">Copyright</option> 

+											<option value="chapter">Chapter</option> 

+											<option value="subsection">Subsection</option> 

+											<option value="appendix">Appendix</option> 

+											<option value="help">Help</option> 

+											<option value="bookmark">Bookmark</option> 

+										</select> 

+									</td>

+								</tr>

+							</table>

+						</div>

+					</div>

+

+					<input type="button" id="link_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

+				</fieldset>

+

+				<fieldset id="comment_element">

+					<legend>{#fullpage_dlg.comment_element}</legend>

+

+					<textarea id="element_comment_value"></textarea>

+

+					<input type="button" id="comment_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

+				</fieldset>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<div style="float: left">

+				<input type="submit" id="insert" name="update" value="{#update}" />

+			</div>

+

+			<div style="float: right">

+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+			</div>

+		</div>

+    </form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js
new file mode 100644
index 000000000..d87af1ee4
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js
@@ -0,0 +1,462 @@
+tinyMCEPopup.requireLangPack();
+
+var doc;
+
+var defaultDocTypes = 
+	'XHTML 1.0 Transitional=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">,' +
+	'XHTML 1.0 Frameset=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">,' +
+	'XHTML 1.0 Strict=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">,' +
+	'XHTML 1.1=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">,' +
+	'HTML 4.01 Transitional=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">,' +
+	'HTML 4.01 Strict=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">,' +
+	'HTML 4.01 Frameset=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">';
+
+var defaultEncodings = 
+	'Western european (iso-8859-1)=iso-8859-1,' +
+	'Central European (iso-8859-2)=iso-8859-2,' +
+	'Unicode (UTF-8)=utf-8,' +
+	'Chinese traditional (Big5)=big5,' +
+	'Cyrillic (iso-8859-5)=iso-8859-5,' +
+	'Japanese (iso-2022-jp)=iso-2022-jp,' +
+	'Greek (iso-8859-7)=iso-8859-7,' +
+	'Korean (iso-2022-kr)=iso-2022-kr,' +
+	'ASCII (us-ascii)=us-ascii';
+
+var defaultMediaTypes = 
+	'all=all,' +
+	'screen=screen,' +
+	'print=print,' +
+	'tty=tty,' +
+	'tv=tv,' +
+	'projection=projection,' +
+	'handheld=handheld,' +
+	'braille=braille,' +
+	'aural=aural';
+
+var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';
+var defaultFontSizes = '10px,11px,12px,13px,14px,15px,16px';
+
+function init() {
+	var f = document.forms['fullpage'], el = f.elements, e, i, p, doctypes, encodings, mediaTypes, fonts, ed = tinyMCEPopup.editor, dom = tinyMCEPopup.dom, style;
+
+	// Setup doctype select box
+	doctypes = ed.getParam("fullpage_doctypes", defaultDocTypes).split(',');
+	for (i=0; i<doctypes.length; i++) {
+		p = doctypes[i].split('=');
+
+		if (p.length > 1)
+			addSelectValue(f, 'doctypes', p[0], p[1]);
+	}
+
+	// Setup fonts select box
+	fonts = ed.getParam("fullpage_fonts", defaultFontNames).split(';');
+	for (i=0; i<fonts.length; i++) {
+		p = fonts[i].split('=');
+
+		if (p.length > 1)
+			addSelectValue(f, 'fontface', p[0], p[1]);
+	}
+
+	// Setup fontsize select box
+	fonts = ed.getParam("fullpage_fontsizes", defaultFontSizes).split(',');
+	for (i=0; i<fonts.length; i++)
+		addSelectValue(f, 'fontsize', fonts[i], fonts[i]);
+
+	// Setup mediatype select boxs
+	mediaTypes = ed.getParam("fullpage_media_types", defaultMediaTypes).split(',');
+	for (i=0; i<mediaTypes.length; i++) {
+		p = mediaTypes[i].split('=');
+
+		if (p.length > 1) {
+			addSelectValue(f, 'element_style_media', p[0], p[1]);
+			addSelectValue(f, 'element_link_media', p[0], p[1]);
+		}
+	}
+
+	// Setup encodings select box
+	encodings = ed.getParam("fullpage_encodings", defaultEncodings).split(',');
+	for (i=0; i<encodings.length; i++) {
+		p = encodings[i].split('=');
+
+		if (p.length > 1) {
+			addSelectValue(f, 'docencoding', p[0], p[1]);
+			addSelectValue(f, 'element_script_charset', p[0], p[1]);
+			addSelectValue(f, 'element_link_charset', p[0], p[1]);
+		}
+	}
+
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+	document.getElementById('link_color_pickcontainer').innerHTML = getColorPickerHTML('link_color_pick','link_color');
+	//document.getElementById('hover_color_pickcontainer').innerHTML = getColorPickerHTML('hover_color_pick','hover_color');
+	document.getElementById('visited_color_pickcontainer').innerHTML = getColorPickerHTML('visited_color_pick','visited_color');
+	document.getElementById('active_color_pickcontainer').innerHTML = getColorPickerHTML('active_color_pick','active_color');
+	document.getElementById('textcolor_pickcontainer').innerHTML = getColorPickerHTML('textcolor_pick','textcolor');
+	document.getElementById('stylesheet_browsercontainer').innerHTML = getBrowserHTML('stylesheetbrowser','stylesheet','file','fullpage');
+	document.getElementById('link_href_pickcontainer').innerHTML = getBrowserHTML('link_href_browser','element_link_href','file','fullpage');
+	document.getElementById('script_src_pickcontainer').innerHTML = getBrowserHTML('script_src_browser','element_script_src','file','fullpage');
+	document.getElementById('bgimage_pickcontainer').innerHTML = getBrowserHTML('bgimage_browser','bgimage','image','fullpage');
+
+	// Resize some elements
+	if (isVisible('stylesheetbrowser'))
+		document.getElementById('stylesheet').style.width = '220px';
+
+	if (isVisible('link_href_browser'))
+		document.getElementById('element_link_href').style.width = '230px';
+
+	if (isVisible('bgimage_browser'))
+		document.getElementById('bgimage').style.width = '210px';
+
+	// Add iframe
+	dom.add(document.body, 'iframe', {id : 'documentIframe', src : 'javascript:""', style : {display : 'none'}});
+	doc = dom.get('documentIframe').contentWindow.document;
+	h = tinyMCEPopup.getWindowArg('head_html');
+
+	// Preprocess the HTML disable scripts and urls
+	h = h.replace(/<script>/gi, '<script type="text/javascript">');
+	h = h.replace(/type=([\"\'])?/gi, 'type=$1-mce-');
+	h = h.replace(/(src=|href=)/g, 'mce_$1');
+
+	// Write in the content in the iframe
+	doc.write(h + '</body></html>');
+	doc.close();
+
+	// Parse xml and doctype
+	xmlVer = getReItem(/<\?\s*?xml.*?version\s*?=\s*?"(.*?)".*?\?>/gi, h, 1);
+	xmlEnc = getReItem(/<\?\s*?xml.*?encoding\s*?=\s*?"(.*?)".*?\?>/gi, h, 1);
+	docType = getReItem(/<\!DOCTYPE.*?>/gi, h, 0);
+	f.langcode.value = getReItem(/lang="(.*?)"/gi, h, 1);
+
+	// Parse title
+	if (e = doc.getElementsByTagName('title')[0])
+		el.metatitle.value = e.textContent || e.text;
+
+	// Parse meta
+	tinymce.each(doc.getElementsByTagName('meta'), function(n) {
+		var na = (n.getAttribute('name', 2) || '').toLowerCase(), va = n.getAttribute('content', 2), eq = n.getAttribute('httpEquiv', 2) || '';
+
+		e = el['meta' + na];
+
+		if (na == 'robots') {
+			selectByValue(f, 'metarobots', tinymce.trim(va), true, true);
+			return;
+		}
+
+		switch (eq.toLowerCase()) {
+			case "content-type":
+				tmp = getReItem(/charset\s*=\s*(.*)\s*/gi, value, 1);
+
+				// Override XML encoding
+				if (tmp != "")
+					xmlEnc = tmp;
+
+				return;
+		}
+
+		if (e)
+			e.value = va;
+	});
+
+	selectByValue(f, 'doctypes', docType, true, true);
+	selectByValue(f, 'docencoding', xmlEnc, true, true);
+	selectByValue(f, 'langdir', doc.body.getAttribute('dir', 2) || '', true, true);
+
+	if (xmlVer != '')
+		el.xml_pi.checked = true;
+
+	// Parse appearance
+
+	// Parse primary stylesheet
+	tinymce.each(doc.getElementsByTagName("link"), function(l) {
+		var m = l.getAttribute('media', 2) || '', t = l.getAttribute('type', 2) || '';
+
+		if (t == "-mce-text/css" && (m == "" || m == "screen" || m == "all") && (l.getAttribute('rel', 2) || '') == "stylesheet") {
+			f.stylesheet.value = l.getAttribute('mce_href', 2) || '';
+			return false;
+		}
+	});
+
+	// Get from style elements
+	tinymce.each(doc.getElementsByTagName("style"), function(st) {
+		var tmp = parseStyleElement(st);
+
+		for (x=0; x<tmp.length; x++) {
+			if (tmp[x].rule.indexOf('a:visited') != -1 && tmp[x].data['color'])
+				f.visited_color.value = tmp[x].data['color'];
+
+			if (tmp[x].rule.indexOf('a:link') != -1 && tmp[x].data['color'])
+				f.link_color.value = tmp[x].data['color'];
+
+			if (tmp[x].rule.indexOf('a:active') != -1 && tmp[x].data['color'])
+				f.active_color.value = tmp[x].data['color'];
+		}
+	});
+
+	f.textcolor.value = tinyMCEPopup.dom.getAttrib(doc.body, "text");
+	f.active_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "alink");
+	f.link_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "link");
+	f.visited_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "vlink");
+	f.bgcolor.value = tinyMCEPopup.dom.getAttrib(doc.body, "bgcolor");
+	f.bgimage.value = tinyMCEPopup.dom.getAttrib(doc.body, "background");
+
+	// Get from style info
+	style = tinyMCEPopup.dom.parseStyle(tinyMCEPopup.dom.getAttrib(doc.body, 'style'));
+
+	if (style['font-family'])
+		selectByValue(f, 'fontface', style['font-family'], true, true);
+	else
+		selectByValue(f, 'fontface', ed.getParam("fullpage_default_fontface", ""), true, true);
+
+	if (style['font-size'])
+		selectByValue(f, 'fontsize', style['font-size'], true, true);
+	else
+		selectByValue(f, 'fontsize', ed.getParam("fullpage_default_fontsize", ""), true, true);
+
+	if (style['color'])
+		f.textcolor.value = convertRGBToHex(style['color']);
+
+	if (style['background-image'])
+		f.bgimage.value = style['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+
+	if (style['background-color'])
+		f.bgcolor.value = style['background-color'];
+
+	if (style['margin']) {
+		tmp = style['margin'].replace(/[^0-9 ]/g, '');
+		tmp = tmp.split(/ +/);
+		f.topmargin.value = tmp.length > 0 ? tmp[0] : '';
+		f.rightmargin.value = tmp.length > 1 ? tmp[1] : tmp[0];
+		f.bottommargin.value = tmp.length > 2 ? tmp[2] : tmp[0];
+		f.leftmargin.value = tmp.length > 3 ? tmp[3] : tmp[0];
+	}
+
+	if (style['margin-left'])
+		f.leftmargin.value = style['margin-left'].replace(/[^0-9]/g, '');
+
+	if (style['margin-right'])
+		f.rightmargin.value = style['margin-right'].replace(/[^0-9]/g, '');
+
+	if (style['margin-top'])
+		f.topmargin.value = style['margin-top'].replace(/[^0-9]/g, '');
+
+	if (style['margin-bottom'])
+		f.bottommargin.value = style['margin-bottom'].replace(/[^0-9]/g, '');
+
+	f.style.value = tinyMCEPopup.dom.serializeStyle(style);
+
+	// Update colors
+	updateColor('textcolor_pick', 'textcolor');
+	updateColor('bgcolor_pick', 'bgcolor');
+	updateColor('visited_color_pick', 'visited_color');
+	updateColor('active_color_pick', 'active_color');
+	updateColor('link_color_pick', 'link_color');
+}
+
+function getReItem(r, s, i) {
+	var c = r.exec(s);
+
+	if (c && c.length > i)
+		return c[i];
+
+	return '';
+}
+
+function updateAction() {
+	var f = document.forms[0], nl, i, h, v, s, head, html, l, tmp, addlink = true, ser;
+
+	head = doc.getElementsByTagName('head')[0];
+
+	// Fix scripts without a type
+	nl = doc.getElementsByTagName('script');
+	for (i=0; i<nl.length; i++) {
+		if (tinyMCEPopup.dom.getAttrib(nl[i], 'mce_type') == '')
+			nl[i].setAttribute('mce_type', 'text/javascript');
+	}
+
+	// Get primary stylesheet
+	nl = doc.getElementsByTagName("link");
+	for (i=0; i<nl.length; i++) {
+		l = nl[i];
+
+		tmp = tinyMCEPopup.dom.getAttrib(l, 'media');
+
+		if (tinyMCEPopup.dom.getAttrib(l, 'mce_type') == "text/css" && (tmp == "" || tmp == "screen" || tmp == "all") && tinyMCEPopup.dom.getAttrib(l, 'rel') == "stylesheet") {
+			addlink = false;
+
+			if (f.stylesheet.value == '')
+				l.parentNode.removeChild(l);
+			else
+				l.setAttribute('mce_href', f.stylesheet.value);
+
+			break;
+		}
+	}
+
+	// Add new link
+	if (f.stylesheet.value != '') {
+		l = doc.createElement('link');
+
+		l.setAttribute('type', 'text/css');
+		l.setAttribute('mce_href', f.stylesheet.value);
+		l.setAttribute('rel', 'stylesheet');
+
+		head.appendChild(l);
+	}
+
+	setMeta(head, 'keywords', f.metakeywords.value);
+	setMeta(head, 'description', f.metadescription.value);
+	setMeta(head, 'author', f.metaauthor.value);
+	setMeta(head, 'copyright', f.metacopyright.value);
+	setMeta(head, 'robots', getSelectValue(f, 'metarobots'));
+	setMeta(head, 'Content-Type', getSelectValue(f, 'docencoding'));
+
+	doc.body.dir = getSelectValue(f, 'langdir');
+	doc.body.style.cssText = f.style.value;
+
+	doc.body.setAttribute('vLink', f.visited_color.value);
+	doc.body.setAttribute('link', f.link_color.value);
+	doc.body.setAttribute('text', f.textcolor.value);
+	doc.body.setAttribute('aLink', f.active_color.value);
+
+	doc.body.style.fontFamily = getSelectValue(f, 'fontface');
+	doc.body.style.fontSize = getSelectValue(f, 'fontsize');
+	doc.body.style.backgroundColor = f.bgcolor.value;
+
+	if (f.leftmargin.value != '')
+		doc.body.style.marginLeft = f.leftmargin.value + 'px';
+
+	if (f.rightmargin.value != '')
+		doc.body.style.marginRight = f.rightmargin.value + 'px';
+
+	if (f.bottommargin.value != '')
+		doc.body.style.marginBottom = f.bottommargin.value + 'px';
+
+	if (f.topmargin.value != '')
+		doc.body.style.marginTop = f.topmargin.value + 'px';
+
+	html = doc.getElementsByTagName('html')[0];
+	html.setAttribute('lang', f.langcode.value);
+	html.setAttribute('xml:lang', f.langcode.value);
+
+	if (f.bgimage.value != '')
+		doc.body.style.backgroundImage = "url('" + f.bgimage.value + "')";
+	else
+		doc.body.style.backgroundImage = '';
+
+	ser = tinyMCEPopup.editor.plugins.fullpage._createSerializer();
+	ser.setRules('-title,meta[http-equiv|name|content],base[href|target],link[href|rel|type|title|media],style[type],script[type|language|src],html[lang|xml::lang|xmlns],body[style|dir|vlink|link|text|alink],head');
+
+	h = ser.serialize(doc.documentElement);
+	h = h.substring(0, h.lastIndexOf('</body>'));
+
+	if (h.indexOf('<title>') == -1)
+		h = h.replace(/<head.*?>/, '$&\n' + '<title>' + tinyMCEPopup.dom.encode(f.metatitle.value) + '</title>');
+	else
+		h = h.replace(/<title>(.*?)<\/title>/, '<title>' + tinyMCEPopup.dom.encode(f.metatitle.value) + '</title>');
+
+	if ((v = getSelectValue(f, 'doctypes')) != '')
+		h = v + '\n' + h;
+
+	if (f.xml_pi.checked) {
+		s = '<?xml version="1.0"';
+
+		if ((v = getSelectValue(f, 'docencoding')) != '')
+			s += ' encoding="' + v + '"';
+
+		s += '?>\n';
+		h = s + h;
+	}
+
+	h = h.replace(/type=\"\-mce\-/gi, 'type="');
+
+	tinyMCEPopup.editor.plugins.fullpage.head = h;
+	tinyMCEPopup.editor.plugins.fullpage._setBodyAttribs(tinyMCEPopup.editor, {});
+	tinyMCEPopup.close();
+}
+
+function changedStyleField(field) {
+	//alert(field.id);
+}
+
+function setMeta(he, k, v) {
+	var nl, i, m;
+
+	nl = he.getElementsByTagName('meta');
+	for (i=0; i<nl.length; i++) {
+		if (k == 'Content-Type' && tinyMCEPopup.dom.getAttrib(nl[i], 'http-equiv') == k) {
+			if (v == '')
+				nl[i].parentNode.removeChild(nl[i]);
+			else
+				nl[i].setAttribute('content', "text/html; charset=" + v);
+
+			return;
+		}
+
+		if (tinyMCEPopup.dom.getAttrib(nl[i], 'name') == k) {
+			if (v == '')
+				nl[i].parentNode.removeChild(nl[i]);
+			else
+				nl[i].setAttribute('content', v);
+			return;
+		}
+	}
+
+	if (v == '')
+		return;
+
+	m = doc.createElement('meta');
+
+	if (k == 'Content-Type')
+		m.httpEquiv = k;
+	else
+		m.setAttribute('name', k);
+
+	m.setAttribute('content', v);
+	he.appendChild(m);
+}
+
+function parseStyleElement(e) {
+	var v = e.innerHTML;
+	var p, i, r;
+
+	v = v.replace(/<!--/gi, '');
+	v = v.replace(/-->/gi, '');
+	v = v.replace(/[\n\r]/gi, '');
+	v = v.replace(/\s+/gi, ' ');
+
+	r = [];
+	p = v.split(/{|}/);
+
+	for (i=0; i<p.length; i+=2) {
+		if (p[i] != "")
+			r[r.length] = {rule : tinymce.trim(p[i]), data : tinyMCEPopup.dom.parseStyle(p[i+1])};
+	}
+
+	return r;
+}
+
+function serializeStyleElement(d) {
+	var i, s, st;
+
+	s = '<!--\n';
+
+	for (i=0; i<d.length; i++) {
+		s += d[i].rule + ' {\n';
+
+		st = tinyMCE.serializeStyle(d[i].data);
+
+		if (st != '')
+			st += ';';
+
+		s += st.replace(/;/g, ';\n');
+		s += '}\n';
+
+		if (i != d.length - 1)
+			s += '\n';
+	}
+
+	s += '\n-->';
+
+	return s;
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js
new file mode 100644
index 000000000..d1cd21955
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js
@@ -0,0 +1,85 @@
+tinyMCE.addI18n('en.fullpage_dlg',{
+title:"Document properties",
+meta_tab:"General",
+appearance_tab:"Appearance",
+advanced_tab:"Advanced",
+meta_props:"Meta information",
+langprops:"Language and encoding",
+meta_title:"Title",
+meta_keywords:"Keywords",
+meta_description:"Description",
+meta_robots:"Robots",
+doctypes:"Doctype",
+langcode:"Language code",
+langdir:"Language direction",
+ltr:"Left to right",
+rtl:"Right to left",
+xml_pi:"XML declaration",
+encoding:"Character encoding",
+appearance_bgprops:"Background properties",
+appearance_marginprops:"Body margins",
+appearance_linkprops:"Link colors",
+appearance_textprops:"Text properties",
+bgcolor:"Background color",
+bgimage:"Background image",
+left_margin:"Left margin",
+right_margin:"Right margin",
+top_margin:"Top margin",
+bottom_margin:"Bottom margin",
+text_color:"Text color",
+font_size:"Font size",
+font_face:"Font face",
+link_color:"Link color",
+hover_color:"Hover color",
+visited_color:"Visited color",
+active_color:"Active color",
+textcolor:"Color",
+fontsize:"Font size",
+fontface:"Font family",
+meta_index_follow:"Index and follow the links",
+meta_index_nofollow:"Index and don't follow the links",
+meta_noindex_follow:"Do not index but follow the links",
+meta_noindex_nofollow:"Do not index and don\'t follow the links",
+appearance_style:"Stylesheet and style properties",
+stylesheet:"Stylesheet",
+style:"Style",
+author:"Author",
+copyright:"Copyright",
+add:"Add new element",
+remove:"Remove selected element",
+moveup:"Move selected element up",
+movedown:"Move selected element down",
+head_elements:"Head elements",
+info:"Information",
+add_title:"Title element",
+add_meta:"Meta element",
+add_script:"Script element",
+add_style:"Style element",
+add_link:"Link element",
+add_base:"Base element",
+add_comment:"Comment node",
+title_element:"Title element",
+script_element:"Script element",
+style_element:"Style element",
+base_element:"Base element",
+link_element:"Link element",
+meta_element:"Meta element",
+comment_element:"Comment",
+src:"Src",
+language:"Language",
+href:"Href",
+target:"Target",
+type:"Type",
+charset:"Charset",
+defer:"Defer",
+media:"Media",
+properties:"Properties",
+name:"Name",
+value:"Value",
+content:"Content",
+rel:"Rel",
+rev:"Rev",
+hreflang:"Href lang",
+general_props:"General",
+advanced_props:"Advanced"
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
new file mode 100644
index 000000000..7b848f1e9
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var DOM=tinymce.DOM;tinymce.create('tinymce.plugins.FullScreenPlugin',{init:function(ed,url){var t=this,s={},vp;t.editor=ed;ed.addCommand('mceFullScreen',function(){var win,de=DOM.doc.documentElement;if(ed.getParam('fullscreen_is_enabled')){if(ed.getParam('fullscreen_new_window'))closeFullscreen();else{DOM.win.setTimeout(function(){tinymce.dom.Event.remove(DOM.win,'resize',t.resizeFunc);tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent({format:'raw'}),{format:'raw'});tinyMCE.remove(ed);DOM.remove('mce_fullscreen_container');de.style.overflow=ed.getParam('fullscreen_html_overflow');DOM.setStyle(DOM.doc.body,'overflow',ed.getParam('fullscreen_overflow'));DOM.win.scrollTo(ed.getParam('fullscreen_scrollx'),ed.getParam('fullscreen_scrolly'));tinyMCE.settings=tinyMCE.oldSettings;},10);}return;}if(ed.getParam('fullscreen_new_window')){win=DOM.win.open(url+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{win.resizeTo(screen.availWidth,screen.availHeight);}catch(e){}}else{tinyMCE.oldSettings=tinyMCE.settings;s.fullscreen_overflow=DOM.getStyle(DOM.doc.body,'overflow',1)||'auto';s.fullscreen_html_overflow=DOM.getStyle(de,'overflow',1);vp=DOM.getViewPort();s.fullscreen_scrollx=vp.x;s.fullscreen_scrolly=vp.y;if(tinymce.isOpera&&s.fullscreen_overflow=='visible')s.fullscreen_overflow='auto';if(tinymce.isIE&&s.fullscreen_overflow=='scroll')s.fullscreen_overflow='auto';if(s.fullscreen_overflow=='0px')s.fullscreen_overflow='';DOM.setStyle(DOM.doc.body,'overflow','hidden');de.style.overflow='hidden';vp=DOM.getViewPort();DOM.win.scrollTo(0,0);if(tinymce.isIE)vp.h-=1;n=DOM.add(DOM.doc.body,'div',{id:'mce_fullscreen_container',style:'position:absolute;top:0;left:0;width:'+vp.w+'px;height:'+vp.h+'px;z-index:200000;'});DOM.add(n,'div',{id:'mce_fullscreen'});tinymce.each(ed.settings,function(v,n){s[n]=v;});s.id='mce_fullscreen';s.width=n.clientWidth;s.height=n.clientHeight-15;s.fullscreen_is_enabled=true;s.fullscreen_editor_id=ed.id;s.theme_advanced_resizing=false;s.save_onsavecallback=function(){ed.setContent(tinyMCE.get(s.id).getContent({format:'raw'}),{format:'raw'});ed.execCommand('mceSave');};tinymce.each(ed.getParam('fullscreen_settings'),function(v,k){s[k]=v;});if(s.theme_advanced_toolbar_location==='external')s.theme_advanced_toolbar_location='top';t.fullscreenEditor=new tinymce.Editor('mce_fullscreen',s);t.fullscreenEditor.onInit.add(function(){t.fullscreenEditor.setContent(ed.getContent());t.fullscreenEditor.focus();});t.fullscreenEditor.render();tinyMCE.add(t.fullscreenEditor);t.fullscreenElement=new tinymce.dom.Element('mce_fullscreen_container');t.fullscreenElement.update();t.resizeFunc=tinymce.dom.Event.add(DOM.win,'resize',function(){var vp=tinymce.DOM.getViewPort();t.fullscreenEditor.theme.resizeTo(vp.w,vp.h);});}});ed.addButton('fullscreen',{title:'fullscreen.desc',cmd:'mceFullScreen'});ed.onNodeChange.add(function(ed,cm){cm.setActive('fullscreen',ed.getParam('fullscreen_is_enabled'));});},getInfo:function(){return{longname:'Fullscreen',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('fullscreen',tinymce.plugins.FullScreenPlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
new file mode 100644
index 000000000..6b2aaa115
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
@@ -0,0 +1,141 @@
+/**
+ * $Id: editor_plugin_src.js 766 2008-04-03 20:37:06Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var DOM = tinymce.DOM;
+
+	tinymce.create('tinymce.plugins.FullScreenPlugin', {
+		init : function(ed, url) {
+			var t = this, s = {}, vp;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceFullScreen', function() {
+				var win, de = DOM.doc.documentElement;
+
+				if (ed.getParam('fullscreen_is_enabled')) {
+					if (ed.getParam('fullscreen_new_window'))
+						closeFullscreen(); // Call to close in new window
+					else {
+						DOM.win.setTimeout(function() {
+							tinymce.dom.Event.remove(DOM.win, 'resize', t.resizeFunc);
+							tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent({format : 'raw'}), {format : 'raw'});
+							tinyMCE.remove(ed);
+							DOM.remove('mce_fullscreen_container');
+							de.style.overflow = ed.getParam('fullscreen_html_overflow');
+							DOM.setStyle(DOM.doc.body, 'overflow', ed.getParam('fullscreen_overflow'));
+							DOM.win.scrollTo(ed.getParam('fullscreen_scrollx'), ed.getParam('fullscreen_scrolly'));
+							tinyMCE.settings = tinyMCE.oldSettings; // Restore old settings
+						}, 10);
+					}
+
+					return;
+				}
+
+				if (ed.getParam('fullscreen_new_window')) {
+					win = DOM.win.open(url + "/fullscreen.htm", "mceFullScreenPopup", "fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width=" + screen.availWidth + ",height=" + screen.availHeight);
+					try {
+						win.resizeTo(screen.availWidth, screen.availHeight);
+					} catch (e) {
+						// Ignore
+					}
+				} else {
+					tinyMCE.oldSettings = tinyMCE.settings; // Store old settings
+					s.fullscreen_overflow = DOM.getStyle(DOM.doc.body, 'overflow', 1) || 'auto';
+					s.fullscreen_html_overflow = DOM.getStyle(de, 'overflow', 1);
+					vp = DOM.getViewPort();
+					s.fullscreen_scrollx = vp.x;
+					s.fullscreen_scrolly = vp.y;
+
+					// Fixes an Opera bug where the scrollbars doesn't reappear
+					if (tinymce.isOpera && s.fullscreen_overflow == 'visible')
+						s.fullscreen_overflow = 'auto';
+
+					// Fixes an IE bug where horizontal scrollbars would appear
+					if (tinymce.isIE && s.fullscreen_overflow == 'scroll')
+						s.fullscreen_overflow = 'auto';
+
+					if (s.fullscreen_overflow == '0px')
+						s.fullscreen_overflow = '';
+
+					DOM.setStyle(DOM.doc.body, 'overflow', 'hidden');
+					de.style.overflow = 'hidden'; //Fix for IE6/7
+					vp = DOM.getViewPort();
+					DOM.win.scrollTo(0, 0);
+
+					if (tinymce.isIE)
+						vp.h -= 1;
+
+					n = DOM.add(DOM.doc.body, 'div', {id : 'mce_fullscreen_container', style : 'position:absolute;top:0;left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});
+					DOM.add(n, 'div', {id : 'mce_fullscreen'});
+
+					tinymce.each(ed.settings, function(v, n) {
+						s[n] = v;
+					});
+
+					s.id = 'mce_fullscreen';
+					s.width = n.clientWidth;
+					s.height = n.clientHeight - 15;
+					s.fullscreen_is_enabled = true;
+					s.fullscreen_editor_id = ed.id;
+					s.theme_advanced_resizing = false;
+					s.save_onsavecallback = function() {
+						ed.setContent(tinyMCE.get(s.id).getContent({format : 'raw'}), {format : 'raw'});
+						ed.execCommand('mceSave');
+					};
+
+					tinymce.each(ed.getParam('fullscreen_settings'), function(v, k) {
+						s[k] = v;
+					});
+
+					if (s.theme_advanced_toolbar_location === 'external')
+						s.theme_advanced_toolbar_location = 'top';
+
+					t.fullscreenEditor = new tinymce.Editor('mce_fullscreen', s);
+					t.fullscreenEditor.onInit.add(function() {
+						t.fullscreenEditor.setContent(ed.getContent());
+						t.fullscreenEditor.focus();
+					});
+
+					t.fullscreenEditor.render();
+					tinyMCE.add(t.fullscreenEditor);
+
+					t.fullscreenElement = new tinymce.dom.Element('mce_fullscreen_container');
+					t.fullscreenElement.update();
+					//document.body.overflow = 'hidden';
+
+					t.resizeFunc = tinymce.dom.Event.add(DOM.win, 'resize', function() {
+						var vp = tinymce.DOM.getViewPort();
+
+						t.fullscreenEditor.theme.resizeTo(vp.w, vp.h);
+					});
+				}
+			});
+
+			// Register buttons
+			ed.addButton('fullscreen', {title : 'fullscreen.desc', cmd : 'mceFullScreen'});
+
+			ed.onNodeChange.add(function(ed, cm) {
+				cm.setActive('fullscreen', ed.getParam('fullscreen_is_enabled'));
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Fullscreen',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('fullscreen', tinymce.plugins.FullScreenPlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
new file mode 100644
index 000000000..4b081cac1
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title></title>

+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

+	<script type="text/javascript" src="../../tiny_mce.js"></script>

+	<script type="text/javascript">

+		function patchCallback(settings, key) {

+			if (settings[key])

+				settings[key] = "window.opener." + settings[key];

+		}

+

+		var settings = {}, paSe = window.opener.tinyMCE.activeEditor.settings, oeID = window.opener.tinyMCE.activeEditor.id;

+

+		// Clone array

+		for (var n in paSe)

+			settings[n] = paSe[n];

+

+		// Override options for fullscreen

+		for (var n in paSe.fullscreen_settings)

+			settings[n] = paSe.fullscreen_settings[n];

+

+		// Patch callbacks, make them point to window.opener

+		patchCallback(settings, 'urlconverter_callback');

+		patchCallback(settings, 'insertlink_callback');

+		patchCallback(settings, 'insertimage_callback');

+		patchCallback(settings, 'setupcontent_callback');

+		patchCallback(settings, 'save_callback');

+		patchCallback(settings, 'onchange_callback');

+		patchCallback(settings, 'init_instance_callback');

+		patchCallback(settings, 'file_browser_callback');

+		patchCallback(settings, 'cleanup_callback');

+		patchCallback(settings, 'execcommand_callback');

+		patchCallback(settings, 'oninit');

+

+		// Set options

+		delete settings.id;

+		settings['mode'] = 'exact';

+		settings['elements'] = 'fullscreenarea';

+		settings['add_unload_trigger'] = false;

+		settings['ask'] = false;

+		settings['document_base_url'] = window.opener.tinyMCE.activeEditor.documentBaseURI.getURI();

+		settings['fullscreen_is_enabled'] = true;

+		settings['fullscreen_editor_id'] = oeID;

+		settings['theme_advanced_resizing'] = false;

+		settings['strict_loading_mode'] = true;

+

+		settings.save_onsavecallback = function() {

+			window.opener.tinyMCE.get(oeID).setContent(tinyMCE.get('fullscreenarea').getContent({format : 'raw'}), {format : 'raw'});

+			window.opener.tinyMCE.get(oeID).execCommand('mceSave');

+			window.close();

+		};

+

+		function unloadHandler(e) {

+			moveContent();

+		}

+

+		function moveContent() {

+			window.opener.tinyMCE.get(oeID).setContent(tinyMCE.activeEditor.getContent());

+		}

+

+		function closeFullscreen() {

+			moveContent();

+			window.close();

+		}

+

+		function doParentSubmit() {

+			moveContent();

+

+			if (window.opener.tinyMCE.selectedInstance.formElement.form)

+				window.opener.tinyMCE.selectedInstance.formElement.form.submit();

+

+			window.close();

+

+			return false;

+		}

+

+		function render() {

+			var e = document.getElementById('fullscreenarea'), vp, ed, ow, oh, dom = tinymce.DOM;

+

+			e.value = window.opener.tinyMCE.get(oeID).getContent();

+

+			vp = dom.getViewPort();

+			settings.width = vp.w;

+			settings.height = vp.h - 15;

+

+			tinymce.dom.Event.add(window, 'resize', function() {

+				var vp = dom.getViewPort();

+

+				tinyMCE.activeEditor.theme.resizeTo(vp.w, vp.h);

+			});

+

+			tinyMCE.init(settings);

+		}

+

+		// Add onunload

+		tinymce.dom.Event.add(window, "beforeunload", unloadHandler);

+	</script>

+	<base target="_self" />

+</head>

+<body style="margin:0;overflow:hidden;width:100%;height:100%" scrolling="no" scroll="no">

+<form onsubmit="doParentSubmit();">

+<textarea id="fullscreenarea" style="width:100%; height:100%"></textarea>

+</form>

+

+<script type="text/javascript">

+	render();

+</script>

+

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js
new file mode 100644
index 000000000..06dae75df
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.IESpell',{init:function(ed,url){var t=this,sp;if(!tinymce.isIE)return;t.editor=ed;ed.addCommand('mceIESpell',function(){try{sp=new ActiveXObject("ieSpell.ieSpellExtension");sp.CheckDocumentNode(ed.getDoc().documentElement);}catch(e){if(e.number==-2146827859){ed.windowManager.confirm(ed.getLang("iespell.download"),function(s){if(s)window.open('http://www.iespell.com/download.php','ieSpellDownload','');});}else ed.windowManager.alert("Error Loading ieSpell: Exception "+e.number);}});ed.addButton('iespell',{title:'iespell.iespell_desc',cmd:'mceIESpell'});},getInfo:function(){return{longname:'IESpell (IE Only)',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/iespell',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('iespell',tinymce.plugins.IESpell);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js
new file mode 100644
index 000000000..2bdd3195f
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js
@@ -0,0 +1,51 @@
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.IESpell', {
+		init : function(ed, url) {
+			var t = this, sp;
+
+			if (!tinymce.isIE)
+				return;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceIESpell', function() {
+				try {
+					sp = new ActiveXObject("ieSpell.ieSpellExtension");
+					sp.CheckDocumentNode(ed.getDoc().documentElement);
+				} catch (e) {
+					if (e.number == -2146827859) {
+						ed.windowManager.confirm(ed.getLang("iespell.download"), function(s) {
+							if (s)
+								window.open('http://www.iespell.com/download.php', 'ieSpellDownload', '');
+						});
+					} else
+						ed.windowManager.alert("Error Loading ieSpell: Exception " + e.number);
+				}
+			});
+
+			// Register buttons
+			ed.addButton('iespell', {title : 'iespell.iespell_desc', cmd : 'mceIESpell'});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'IESpell (IE Only)',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/iespell',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('iespell', tinymce.plugins.IESpell);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
new file mode 100644
index 000000000..2ddf43ba9
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var DOM=tinymce.DOM,Element=tinymce.dom.Element,Event=tinymce.dom.Event,each=tinymce.each,is=tinymce.is;tinymce.create('tinymce.plugins.InlinePopups',{init:function(ed,url){ed.onBeforeRenderUI.add(function(){ed.windowManager=new tinymce.InlineWindowManager(ed);DOM.loadCSS(url+'/skins/'+(ed.settings.inlinepopups_skin||'clearlooks2')+"/window.css");});},getInfo:function(){return{longname:'InlinePopups',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.create('tinymce.InlineWindowManager:tinymce.WindowManager',{InlineWindowManager:function(ed){var t=this;t.parent(ed);t.zIndex=300000;t.count=0;},open:function(f,p){var t=this,id,opt='',ed=t.editor,dw=0,dh=0,vp,po,mdf,clf,we,w,u;f=f||{};p=p||{};if(!f.inline)return t.parent(f,p);if(!f.type)t.bookmark=ed.selection.getBookmark('simple');id=DOM.uniqueId();vp=DOM.getViewPort();f.width=parseInt(f.width||320);f.height=parseInt(f.height||240)+(tinymce.isIE?8:0);f.min_width=parseInt(f.min_width||150);f.min_height=parseInt(f.min_height||100);f.max_width=parseInt(f.max_width||2000);f.max_height=parseInt(f.max_height||2000);f.left=f.left||Math.round(Math.max(vp.x,vp.x+(vp.w/ 2.0) - (f.width /2.0)));f.top=f.top||Math.round(Math.max(vp.y,vp.y+(vp.h/ 2.0) - (f.height /2.0)));f.movable=f.resizable=true;p.mce_width=f.width;p.mce_height=f.height;p.mce_inline=true;p.mce_window_id=id;p.mce_auto_focus=f.auto_focus;t.features=f;t.params=p;t.onOpen.dispatch(t,f,p);if(f.type){opt+=' mceModal';if(f.type)opt+=' mce'+f.type.substring(0,1).toUpperCase()+f.type.substring(1);f.resizable=false;}if(f.statusbar)opt+=' mceStatusbar';if(f.resizable)opt+=' mceResizable';if(f.minimizable)opt+=' mceMinimizable';if(f.maximizable)opt+=' mceMaximizable';if(f.movable)opt+=' mceMovable';t._addAll(DOM.doc.body,['div',{id:id,'class':ed.settings.inlinepopups_skin||'clearlooks2',style:'width:100px;height:100px'},['div',{id:id+'_wrapper','class':'mceWrapper'+opt},['div',{id:id+'_top','class':'mceTop'},['div',{'class':'mceLeft'}],['div',{'class':'mceCenter'}],['div',{'class':'mceRight'}],['span',{id:id+'_title'},f.title||'']],['div',{id:id+'_middle','class':'mceMiddle'},['div',{id:id+'_left','class':'mceLeft'}],['span',{id:id+'_content'}],['div',{id:id+'_right','class':'mceRight'}]],['div',{id:id+'_bottom','class':'mceBottom'},['div',{'class':'mceLeft'}],['div',{'class':'mceCenter'}],['div',{'class':'mceRight'}],['span',{id:id+'_status'},'Content']],['a',{'class':'mceMove',tabindex:'-1',href:'javascript:;'}],['a',{'class':'mceMin',tabindex:'-1',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'mceMax',tabindex:'-1',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'mceMed',tabindex:'-1',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'mceClose',tabindex:'-1',href:'javascript:;',onmousedown:'return false;'}],['a',{id:id+'_resize_n','class':'mceResize mceResizeN',tabindex:'-1',href:'javascript:;'}],['a',{id:id+'_resize_s','class':'mceResize mceResizeS',tabindex:'-1',href:'javascript:;'}],['a',{id:id+'_resize_w','class':'mceResize mceResizeW',tabindex:'-1',href:'javascript:;'}],['a',{id:id+'_resize_e','class':'mceResize mceResizeE',tabindex:'-1',href:'javascript:;'}],['a',{id:id+'_resize_nw','class':'mceResize mceResizeNW',tabindex:'-1',href:'javascript:;'}],['a',{id:id+'_resize_ne','class':'mceResize mceResizeNE',tabindex:'-1',href:'javascript:;'}],['a',{id:id+'_resize_sw','class':'mceResize mceResizeSW',tabindex:'-1',href:'javascript:;'}],['a',{id:id+'_resize_se','class':'mceResize mceResizeSE',tabindex:'-1',href:'javascript:;'}]]]);DOM.setStyles(id,{top:-10000,left:-10000});if(tinymce.isGecko)DOM.setStyle(id,'overflow','auto');if(!f.type){dw+=DOM.get(id+'_left').clientWidth;dw+=DOM.get(id+'_right').clientWidth;dh+=DOM.get(id+'_top').clientHeight;dh+=DOM.get(id+'_bottom').clientHeight;}DOM.setStyles(id,{top:f.top,left:f.left,width:f.width+dw,height:f.height+dh});u=f.url||f.file;if(u){if(tinymce.relaxedDomain)u+=(u.indexOf('?')==-1?'?':'&')+'mce_rdomain='+tinymce.relaxedDomain;u=tinymce._addVer(u);}if(!f.type){DOM.add(id+'_content','iframe',{id:id+'_ifr',src:'javascript:""',frameBorder:0,style:'border:0;width:10px;height:10px'});DOM.setStyles(id+'_ifr',{width:f.width,height:f.height});DOM.setAttrib(id+'_ifr','src',u);}else{DOM.add(id+'_wrapper','a',{id:id+'_ok','class':'mceButton mceOk',href:'javascript:;',onmousedown:'return false;'},'Ok');if(f.type=='confirm')DOM.add(id+'_wrapper','a',{'class':'mceButton mceCancel',href:'javascript:;',onmousedown:'return false;'},'Cancel');DOM.add(id+'_middle','div',{'class':'mceIcon'});DOM.setHTML(id+'_content',f.content.replace('\n','<br />'));}mdf=Event.add(id,'mousedown',function(e){var n=e.target,w,vp;w=t.windows[id];t.focus(id);if(n.nodeName=='A'||n.nodeName=='a'){if(n.className=='mceMax'){w.oldPos=w.element.getXY();w.oldSize=w.element.getSize();vp=DOM.getViewPort();vp.w-=2;vp.h-=2;w.element.moveTo(vp.x,vp.y);w.element.resizeTo(vp.w,vp.h);DOM.setStyles(id+'_ifr',{width:vp.w-w.deltaWidth,height:vp.h-w.deltaHeight});DOM.addClass(id+'_wrapper','mceMaximized');}else if(n.className=='mceMed'){w.element.moveTo(w.oldPos.x,w.oldPos.y);w.element.resizeTo(w.oldSize.w,w.oldSize.h);w.iframeElement.resizeTo(w.oldSize.w-w.deltaWidth,w.oldSize.h-w.deltaHeight);DOM.removeClass(id+'_wrapper','mceMaximized');}else if(n.className=='mceMove')return t._startDrag(id,e,n.className);else if(DOM.hasClass(n,'mceResize'))return t._startDrag(id,e,n.className.substring(13));}});clf=Event.add(id,'click',function(e){var n=e.target;t.focus(id);if(n.nodeName=='A'||n.nodeName=='a'){switch(n.className){case'mceClose':t.close(null,id);return Event.cancel(e);case'mceButton mceOk':case'mceButton mceCancel':f.button_func(n.className=='mceButton mceOk');return Event.cancel(e);}}});t.windows=t.windows||{};w=t.windows[id]={id:id,mousedown_func:mdf,click_func:clf,element:new Element(id,{blocker:1,container:ed.getContainer()}),iframeElement:new Element(id+'_ifr'),features:f,deltaWidth:dw,deltaHeight:dh};w.iframeElement.on('focus',function(){t.focus(id);});if(t.count==0&&t.editor.getParam('dialog_type')=='modal'){DOM.add(DOM.doc.body,'div',{id:'mceModalBlocker','class':(t.editor.settings.inlinepopups_skin||'clearlooks2')+'_modalBlocker',style:{left:vp.x,top:vp.y,zIndex:t.zIndex-1}});DOM.show('mceModalBlocker');}else DOM.setStyle('mceModalBlocker','z-index',t.zIndex-1);t.focus(id);t._fixIELayout(id,1);if(DOM.get(id+'_ok'))DOM.get(id+'_ok').focus();t.count++;return w;},focus:function(id){var t=this,w=t.windows[id];w.zIndex=this.zIndex++;w.element.setStyle('zIndex',w.zIndex);w.element.update();id=id+'_wrapper';DOM.removeClass(t.lastId,'mceFocus');DOM.addClass(id,'mceFocus');t.lastId=id;},_addAll:function(te,ne){var i,n,t=this,dom=tinymce.DOM;if(is(ne,'string'))te.appendChild(dom.doc.createTextNode(ne));else if(ne.length){te=te.appendChild(dom.create(ne[0],ne[1]));for(i=2;i<ne.length;i++)t._addAll(te,ne[i]);}},_startDrag:function(id,se,ac){var t=this,mu,mm,d=DOM.doc,eb,w=t.windows[id],we=w.element,sp=we.getXY(),p,sz,ph,cp,vp,sx,sy,sex,sey,dx,dy,dw,dh;cp={x:0,y:0};vp=DOM.getViewPort();vp.w-=2;vp.h-=2;sex=se.screenX;sey=se.screenY;dx=dy=dw=dh=0;mu=Event.add(d,'mouseup',function(e){Event.remove(d,'mouseup',mu);Event.remove(d,'mousemove',mm);if(eb)eb.remove();we.moveBy(dx,dy);we.resizeBy(dw,dh);sz=we.getSize();DOM.setStyles(id+'_ifr',{width:sz.w-w.deltaWidth,height:sz.h-w.deltaHeight});t._fixIELayout(id,1);return Event.cancel(e);});if(ac!='Move')startMove();function startMove(){if(eb)return;t._fixIELayout(id,0);DOM.add(d.body,'div',{id:'mceEventBlocker','class':'mceEventBlocker '+(t.editor.settings.inlinepopups_skin||'clearlooks2'),style:{left:vp.x,top:vp.y,zIndex:t.zIndex+1}});eb=new Element('mceEventBlocker');eb.update();p=we.getXY();sz=we.getSize();sx=cp.x+p.x-vp.x;sy=cp.y+p.y-vp.y;DOM.add(eb.get(),'div',{id:'mcePlaceHolder','class':'mcePlaceHolder',style:{left:sx,top:sy,width:sz.w,height:sz.h}});ph=new Element('mcePlaceHolder');};mm=Event.add(d,'mousemove',function(e){var x,y,v;startMove();x=e.screenX-sex;y=e.screenY-sey;switch(ac){case'ResizeW':dx=x;dw=0-x;break;case'ResizeE':dw=x;break;case'ResizeN':case'ResizeNW':case'ResizeNE':if(ac=="ResizeNW"){dx=x;dw=0-x;}else if(ac=="ResizeNE")dw=x;dy=y;dh=0-y;break;case'ResizeS':case'ResizeSW':case'ResizeSE':if(ac=="ResizeSW"){dx=x;dw=0-x;}else if(ac=="ResizeSE")dw=x;dh=y;break;case'mceMove':dx=x;dy=y;break;}if(dw<(v=w.features.min_width-sz.w)){if(dx!==0)dx+=dw-v;dw=v;}if(dh<(v=w.features.min_height-sz.h)){if(dy!==0)dy+=dh-v;dh=v;}dw=Math.min(dw,w.features.max_width-sz.w);dh=Math.min(dh,w.features.max_height-sz.h);dx=Math.max(dx,vp.x-(sx+vp.x));dy=Math.max(dy,vp.y-(sy+vp.y));dx=Math.min(dx,(vp.w+vp.x)-(sx+sz.w+vp.x));dy=Math.min(dy,(vp.h+vp.y)-(sy+sz.h+vp.y));if(dx+dy!==0){if(sx+dx<0)dx=0;if(sy+dy<0)dy=0;ph.moveTo(sx+dx,sy+dy);}if(dw+dh!==0)ph.resizeTo(sz.w+dw,sz.h+dh);return Event.cancel(e);});return Event.cancel(se);},resizeBy:function(dw,dh,id){var w=this.windows[id];if(w){w.element.resizeBy(dw,dh);w.iframeElement.resizeBy(dw,dh);}},close:function(win,id){var t=this,w,d=DOM.doc,ix=0,fw,id;id=t._findId(id||win);t.count--;if(t.count==0)DOM.remove('mceModalBlocker');if(!id&&win){t.parent(win);return;}if(w=t.windows[id]){t.onClose.dispatch(t);Event.remove(d,'mousedown',w.mousedownFunc);Event.remove(d,'click',w.clickFunc);Event.clear(id);Event.clear(id+'_ifr');DOM.setAttrib(id+'_ifr','src','javascript:""');w.element.remove();delete t.windows[id];each(t.windows,function(w){if(w.zIndex>ix){fw=w;ix=w.zIndex;}});if(fw)t.focus(fw.id);}},setTitle:function(w,ti){var e;w=this._findId(w);if(e=DOM.get(w+'_title'))e.innerHTML=DOM.encode(ti);},alert:function(txt,cb,s){var t=this,w;w=t.open({title:t,type:'alert',button_func:function(s){if(cb)cb.call(s||t,s);t.close(null,w.id);},content:DOM.encode(t.editor.getLang(txt,txt)),inline:1,width:400,height:130});},confirm:function(txt,cb,s){var t=this,w;w=t.open({title:t,type:'confirm',button_func:function(s){if(cb)cb.call(s||t,s);t.close(null,w.id);},content:DOM.encode(t.editor.getLang(txt,txt)),inline:1,width:400,height:130});},_findId:function(w){var t=this;if(typeof(w)=='string')return w;each(t.windows,function(wo){var ifr=DOM.get(wo.id+'_ifr');if(ifr&&w==ifr.contentWindow){w=wo.id;return false;}});return w;},_fixIELayout:function(id,s){var w,img;if(!tinymce.isIE6)return;each(['n','s','w','e','nw','ne','sw','se'],function(v){var e=DOM.get(id+'_resize_'+v);DOM.setStyles(e,{width:s?e.clientWidth:'',height:s?e.clientHeight:'',cursor:DOM.getStyle(e,'cursor',1)});DOM.setStyle(id+"_bottom",'bottom','-1px');e=0;});if(w=this.windows[id]){w.element.hide();w.element.show();each(DOM.select('div,a',id),function(e,i){if(e.currentStyle.backgroundImage!='none'){img=new Image();img.src=e.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,'$1');}});DOM.get(id).style.filter='';}}});tinymce.PluginManager.add('inlinepopups',tinymce.plugins.InlinePopups);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
new file mode 100644
index 000000000..c83078f8f
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
@@ -0,0 +1,623 @@
+/**
+ * $Id: editor_plugin_src.js 809 2008-04-17 14:41:31Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var DOM = tinymce.DOM, Element = tinymce.dom.Element, Event = tinymce.dom.Event, each = tinymce.each, is = tinymce.is;
+
+	tinymce.create('tinymce.plugins.InlinePopups', {
+		init : function(ed, url) {
+			// Replace window manager
+			ed.onBeforeRenderUI.add(function() {
+				ed.windowManager = new tinymce.InlineWindowManager(ed);
+				DOM.loadCSS(url + '/skins/' + (ed.settings.inlinepopups_skin || 'clearlooks2') + "/window.css");
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'InlinePopups',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	tinymce.create('tinymce.InlineWindowManager:tinymce.WindowManager', {
+		InlineWindowManager : function(ed) {
+			var t = this;
+
+			t.parent(ed);
+			t.zIndex = 300000;
+			t.count = 0;
+		},
+
+		open : function(f, p) {
+			var t = this, id, opt = '', ed = t.editor, dw = 0, dh = 0, vp, po, mdf, clf, we, w, u;
+
+			f = f || {};
+			p = p || {};
+
+			// Run native windows
+			if (!f.inline)
+				return t.parent(f, p);
+
+			// Only store selection if the type is a normal window
+			if (!f.type)
+				t.bookmark = ed.selection.getBookmark('simple');
+
+			id = DOM.uniqueId();
+			vp = DOM.getViewPort();
+			f.width = parseInt(f.width || 320);
+			f.height = parseInt(f.height || 240) + (tinymce.isIE ? 8 : 0);
+			f.min_width = parseInt(f.min_width || 150);
+			f.min_height = parseInt(f.min_height || 100);
+			f.max_width = parseInt(f.max_width || 2000);
+			f.max_height = parseInt(f.max_height || 2000);
+			f.left = f.left || Math.round(Math.max(vp.x, vp.x + (vp.w / 2.0) - (f.width / 2.0)));
+			f.top = f.top || Math.round(Math.max(vp.y, vp.y + (vp.h / 2.0) - (f.height / 2.0)));
+			f.movable = f.resizable = true;
+			p.mce_width = f.width;
+			p.mce_height = f.height;
+			p.mce_inline = true;
+			p.mce_window_id = id;
+			p.mce_auto_focus = f.auto_focus;
+
+			// Transpose
+//			po = DOM.getPos(ed.getContainer());
+//			f.left -= po.x;
+//			f.top -= po.y;
+
+			t.features = f;
+			t.params = p;
+			t.onOpen.dispatch(t, f, p);
+
+			if (f.type) {
+				opt += ' mceModal';
+
+				if (f.type)
+					opt += ' mce' + f.type.substring(0, 1).toUpperCase() + f.type.substring(1);
+
+				f.resizable = false;
+			}
+
+			if (f.statusbar)
+				opt += ' mceStatusbar';
+
+			if (f.resizable)
+				opt += ' mceResizable';
+
+			if (f.minimizable)
+				opt += ' mceMinimizable';
+
+			if (f.maximizable)
+				opt += ' mceMaximizable';
+
+			if (f.movable)
+				opt += ' mceMovable';
+
+			// Create DOM objects
+			t._addAll(DOM.doc.body, 
+				['div', {id : id, 'class' : ed.settings.inlinepopups_skin || 'clearlooks2', style : 'width:100px;height:100px'}, 
+					['div', {id : id + '_wrapper', 'class' : 'mceWrapper' + opt},
+						['div', {id : id + '_top', 'class' : 'mceTop'}, 
+							['div', {'class' : 'mceLeft'}],
+							['div', {'class' : 'mceCenter'}],
+							['div', {'class' : 'mceRight'}],
+							['span', {id : id + '_title'}, f.title || '']
+						],
+
+						['div', {id : id + '_middle', 'class' : 'mceMiddle'}, 
+							['div', {id : id + '_left', 'class' : 'mceLeft'}],
+							['span', {id : id + '_content'}],
+							['div', {id : id + '_right', 'class' : 'mceRight'}]
+						],
+
+						['div', {id : id + '_bottom', 'class' : 'mceBottom'},
+							['div', {'class' : 'mceLeft'}],
+							['div', {'class' : 'mceCenter'}],
+							['div', {'class' : 'mceRight'}],
+							['span', {id : id + '_status'}, 'Content']
+						],
+
+						['a', {'class' : 'mceMove', tabindex : '-1', href : 'javascript:;'}],
+						['a', {'class' : 'mceMin', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],
+						['a', {'class' : 'mceMax', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],
+						['a', {'class' : 'mceMed', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],
+						['a', {'class' : 'mceClose', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],
+						['a', {id : id + '_resize_n', 'class' : 'mceResize mceResizeN', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_s', 'class' : 'mceResize mceResizeS', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_w', 'class' : 'mceResize mceResizeW', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_e', 'class' : 'mceResize mceResizeE', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_nw', 'class' : 'mceResize mceResizeNW', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_ne', 'class' : 'mceResize mceResizeNE', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_sw', 'class' : 'mceResize mceResizeSW', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_se', 'class' : 'mceResize mceResizeSE', tabindex : '-1', href : 'javascript:;'}]
+					]
+				]
+			);
+
+			DOM.setStyles(id, {top : -10000, left : -10000});
+
+			// Fix gecko rendering bug, where the editors iframe messed with window contents
+			if (tinymce.isGecko)
+				DOM.setStyle(id, 'overflow', 'auto');
+
+			// Measure borders
+			if (!f.type) {
+				dw += DOM.get(id + '_left').clientWidth;
+				dw += DOM.get(id + '_right').clientWidth;
+				dh += DOM.get(id + '_top').clientHeight;
+				dh += DOM.get(id + '_bottom').clientHeight;
+			}
+
+			// Resize window
+			DOM.setStyles(id, {top : f.top, left : f.left, width : f.width + dw, height : f.height + dh});
+
+			u = f.url || f.file;
+			if (u) {
+				if (tinymce.relaxedDomain)
+					u += (u.indexOf('?') == -1 ? '?' : '&') + 'mce_rdomain=' + tinymce.relaxedDomain;
+
+				u = tinymce._addVer(u);
+			}
+
+			if (!f.type) {
+				DOM.add(id + '_content', 'iframe', {id : id + '_ifr', src : 'javascript:""', frameBorder : 0, style : 'border:0;width:10px;height:10px'});
+				DOM.setStyles(id + '_ifr', {width : f.width, height : f.height});
+				DOM.setAttrib(id + '_ifr', 'src', u);
+			} else {
+				DOM.add(id + '_wrapper', 'a', {id : id + '_ok', 'class' : 'mceButton mceOk', href : 'javascript:;', onmousedown : 'return false;'}, 'Ok');
+
+				if (f.type == 'confirm')
+					DOM.add(id + '_wrapper', 'a', {'class' : 'mceButton mceCancel', href : 'javascript:;', onmousedown : 'return false;'}, 'Cancel');
+
+				DOM.add(id + '_middle', 'div', {'class' : 'mceIcon'});
+				DOM.setHTML(id + '_content', f.content.replace('\n', '<br />'));
+			}
+
+			// Register events
+			mdf = Event.add(id, 'mousedown', function(e) {
+				var n = e.target, w, vp;
+
+				w = t.windows[id];
+				t.focus(id);
+
+				if (n.nodeName == 'A' || n.nodeName == 'a') {
+					if (n.className == 'mceMax') {
+						w.oldPos = w.element.getXY();
+						w.oldSize = w.element.getSize();
+
+						vp = DOM.getViewPort();
+
+						// Reduce viewport size to avoid scrollbars
+						vp.w -= 2;
+						vp.h -= 2;
+
+						w.element.moveTo(vp.x, vp.y);
+						w.element.resizeTo(vp.w, vp.h);
+						DOM.setStyles(id + '_ifr', {width : vp.w - w.deltaWidth, height : vp.h - w.deltaHeight});
+						DOM.addClass(id + '_wrapper', 'mceMaximized');
+					} else if (n.className == 'mceMed') {
+						// Reset to old size
+						w.element.moveTo(w.oldPos.x, w.oldPos.y);
+						w.element.resizeTo(w.oldSize.w, w.oldSize.h);
+						w.iframeElement.resizeTo(w.oldSize.w - w.deltaWidth, w.oldSize.h - w.deltaHeight);
+
+						DOM.removeClass(id + '_wrapper', 'mceMaximized');
+					} else if (n.className == 'mceMove')
+						return t._startDrag(id, e, n.className);
+					else if (DOM.hasClass(n, 'mceResize'))
+						return t._startDrag(id, e, n.className.substring(13));
+				}
+			});
+
+			clf = Event.add(id, 'click', function(e) {
+				var n = e.target;
+
+				t.focus(id);
+
+				if (n.nodeName == 'A' || n.nodeName == 'a') {
+					switch (n.className) {
+						case 'mceClose':
+							t.close(null, id);
+							return Event.cancel(e);
+
+						case 'mceButton mceOk':
+						case 'mceButton mceCancel':
+							f.button_func(n.className == 'mceButton mceOk');
+							return Event.cancel(e);
+					}
+				}
+			});
+
+			// Add window
+			t.windows = t.windows || {};
+			w = t.windows[id] = {
+				id : id,
+				mousedown_func : mdf,
+				click_func : clf,
+				element : new Element(id, {blocker : 1, container : ed.getContainer()}),
+				iframeElement : new Element(id + '_ifr'),
+				features : f,
+				deltaWidth : dw,
+				deltaHeight : dh
+			};
+
+			w.iframeElement.on('focus', function() {
+				t.focus(id);
+			});
+
+			// Setup blocker
+			if (t.count == 0 && t.editor.getParam('dialog_type') == 'modal') {
+				DOM.add(DOM.doc.body, 'div', {
+					id : 'mceModalBlocker',
+					'class' : (t.editor.settings.inlinepopups_skin || 'clearlooks2') + '_modalBlocker',
+					style : {left : vp.x, top : vp.y, zIndex : t.zIndex - 1}
+				});
+
+				DOM.show('mceModalBlocker'); // Reduces flicker in IE
+			} else
+				DOM.setStyle('mceModalBlocker', 'z-index', t.zIndex - 1);
+
+			t.focus(id);
+			t._fixIELayout(id, 1);
+
+			// Focus ok button
+			if (DOM.get(id + '_ok'))
+				DOM.get(id + '_ok').focus();
+
+			t.count++;
+
+			return w;
+		},
+
+		focus : function(id) {
+			var t = this, w = t.windows[id];
+
+			w.zIndex = this.zIndex++;
+			w.element.setStyle('zIndex', w.zIndex);
+			w.element.update();
+
+			id = id + '_wrapper';
+			DOM.removeClass(t.lastId, 'mceFocus');
+			DOM.addClass(id, 'mceFocus');
+			t.lastId = id;
+		},
+
+		_addAll : function(te, ne) {
+			var i, n, t = this, dom = tinymce.DOM;
+
+			if (is(ne, 'string'))
+				te.appendChild(dom.doc.createTextNode(ne));
+			else if (ne.length) {
+				te = te.appendChild(dom.create(ne[0], ne[1]));
+
+				for (i=2; i<ne.length; i++)
+					t._addAll(te, ne[i]);
+			}
+		},
+
+		_startDrag : function(id, se, ac) {
+			var t = this, mu, mm, d = DOM.doc, eb, w = t.windows[id], we = w.element, sp = we.getXY(), p, sz, ph, cp, vp, sx, sy, sex, sey, dx, dy, dw, dh;
+
+			// Get positons and sizes
+//			cp = DOM.getPos(t.editor.getContainer());
+			cp = {x : 0, y : 0};
+			vp = DOM.getViewPort();
+
+			// Reduce viewport size to avoid scrollbars while dragging
+			vp.w -= 2;
+			vp.h -= 2;
+
+			sex = se.screenX;
+			sey = se.screenY;
+			dx = dy = dw = dh = 0;
+
+			// Handle mouse up
+			mu = Event.add(d, 'mouseup', function(e) {
+				Event.remove(d, 'mouseup', mu);
+				Event.remove(d, 'mousemove', mm);
+
+				if (eb)
+					eb.remove();
+
+				we.moveBy(dx, dy);
+				we.resizeBy(dw, dh);
+				sz = we.getSize();
+				DOM.setStyles(id + '_ifr', {width : sz.w - w.deltaWidth, height : sz.h - w.deltaHeight});
+				t._fixIELayout(id, 1);
+
+				return Event.cancel(e);
+			});
+
+			if (ac != 'Move')
+				startMove();
+
+			function startMove() {
+				if (eb)
+					return;
+
+				t._fixIELayout(id, 0);
+
+				// Setup event blocker
+				DOM.add(d.body, 'div', {
+					id : 'mceEventBlocker',
+					'class' : 'mceEventBlocker ' + (t.editor.settings.inlinepopups_skin || 'clearlooks2'),
+					style : {left : vp.x, top : vp.y, zIndex : t.zIndex + 1}
+				});
+				eb = new Element('mceEventBlocker');
+				eb.update();
+
+				// Setup placeholder
+				p = we.getXY();
+				sz = we.getSize();
+				sx = cp.x + p.x - vp.x;
+				sy = cp.y + p.y - vp.y;
+				DOM.add(eb.get(), 'div', {id : 'mcePlaceHolder', 'class' : 'mcePlaceHolder', style : {left : sx, top : sy, width : sz.w, height : sz.h}});
+				ph = new Element('mcePlaceHolder');
+			};
+
+			// Handle mouse move/drag
+			mm = Event.add(d, 'mousemove', function(e) {
+				var x, y, v;
+
+				startMove();
+
+				x = e.screenX - sex;
+				y = e.screenY - sey;
+
+				switch (ac) {
+					case 'ResizeW':
+						dx = x;
+						dw = 0 - x;
+						break;
+
+					case 'ResizeE':
+						dw = x;
+						break;
+
+					case 'ResizeN':
+					case 'ResizeNW':
+					case 'ResizeNE':
+						if (ac == "ResizeNW") {
+							dx = x;
+							dw = 0 - x;
+						} else if (ac == "ResizeNE")
+							dw = x;
+
+						dy = y;
+						dh = 0 - y;
+						break;
+
+					case 'ResizeS':
+					case 'ResizeSW':
+					case 'ResizeSE':
+						if (ac == "ResizeSW") {
+							dx = x;
+							dw = 0 - x;
+						} else if (ac == "ResizeSE")
+							dw = x;
+
+						dh = y;
+						break;
+
+					case 'mceMove':
+						dx = x;
+						dy = y;
+						break;
+				}
+
+				// Boundary check
+				if (dw < (v = w.features.min_width - sz.w)) {
+					if (dx !== 0)
+						dx += dw - v;
+
+					dw = v;
+				}
+	
+				if (dh < (v = w.features.min_height - sz.h)) {
+					if (dy !== 0)
+						dy += dh - v;
+
+					dh = v;
+				}
+
+				dw = Math.min(dw, w.features.max_width - sz.w);
+				dh = Math.min(dh, w.features.max_height - sz.h);
+				dx = Math.max(dx, vp.x - (sx + vp.x));
+				dy = Math.max(dy, vp.y - (sy + vp.y));
+				dx = Math.min(dx, (vp.w + vp.x) - (sx + sz.w + vp.x));
+				dy = Math.min(dy, (vp.h + vp.y) - (sy + sz.h + vp.y));
+
+				// Move if needed
+				if (dx + dy !== 0) {
+					if (sx + dx < 0)
+						dx = 0;
+	
+					if (sy + dy < 0)
+						dy = 0;
+
+					ph.moveTo(sx + dx, sy + dy);
+				}
+
+				// Resize if needed
+				if (dw + dh !== 0)
+					ph.resizeTo(sz.w + dw, sz.h + dh);
+
+				return Event.cancel(e);
+			});
+
+			return Event.cancel(se);
+		},
+
+		resizeBy : function(dw, dh, id) {
+			var w = this.windows[id];
+
+			if (w) {
+				w.element.resizeBy(dw, dh);
+				w.iframeElement.resizeBy(dw, dh);
+			}
+		},
+
+		close : function(win, id) {
+			var t = this, w, d = DOM.doc, ix = 0, fw, id;
+
+			id = t._findId(id || win);
+
+			t.count--;
+
+			if (t.count == 0)
+				DOM.remove('mceModalBlocker');
+
+			// Probably not inline
+			if (!id && win) {
+				t.parent(win);
+				return;
+			}
+
+			if (w = t.windows[id]) {
+				t.onClose.dispatch(t);
+				Event.remove(d, 'mousedown', w.mousedownFunc);
+				Event.remove(d, 'click', w.clickFunc);
+				Event.clear(id);
+				Event.clear(id + '_ifr');
+
+				DOM.setAttrib(id + '_ifr', 'src', 'javascript:""'); // Prevent leak
+				w.element.remove();
+				delete t.windows[id];
+
+				// Find front most window and focus that
+				each (t.windows, function(w) {
+					if (w.zIndex > ix) {
+						fw = w;
+						ix = w.zIndex;
+					}
+				});
+
+				if (fw)
+					t.focus(fw.id);
+			}
+		},
+
+		setTitle : function(w, ti) {
+			var e;
+
+			w = this._findId(w);
+
+			if (e = DOM.get(w + '_title'))
+				e.innerHTML = DOM.encode(ti);
+		},
+
+		alert : function(txt, cb, s) {
+			var t = this, w;
+
+			w = t.open({
+				title : t,
+				type : 'alert',
+				button_func : function(s) {
+					if (cb)
+						cb.call(s || t, s);
+
+					t.close(null, w.id);
+				},
+				content : DOM.encode(t.editor.getLang(txt, txt)),
+				inline : 1,
+				width : 400,
+				height : 130
+			});
+		},
+
+		confirm : function(txt, cb, s) {
+			var t = this, w;
+
+			w = t.open({
+				title : t,
+				type : 'confirm',
+				button_func : function(s) {
+					if (cb)
+						cb.call(s || t, s);
+
+					t.close(null, w.id);
+				},
+				content : DOM.encode(t.editor.getLang(txt, txt)),
+				inline : 1,
+				width : 400,
+				height : 130
+			});
+		},
+
+		// Internal functions
+
+		_findId : function(w) {
+			var t = this;
+
+			if (typeof(w) == 'string')
+				return w;
+
+			each(t.windows, function(wo) {
+				var ifr = DOM.get(wo.id + '_ifr');
+
+				if (ifr && w == ifr.contentWindow) {
+					w = wo.id;
+					return false;
+				}
+			});
+
+			return w;
+		},
+
+		_fixIELayout : function(id, s) {
+			var w, img;
+
+			if (!tinymce.isIE6)
+				return;
+
+			// Fixes the bug where hover flickers and does odd things in IE6
+			each(['n','s','w','e','nw','ne','sw','se'], function(v) {
+				var e = DOM.get(id + '_resize_' + v);
+
+				DOM.setStyles(e, {
+					width : s ? e.clientWidth : '',
+					height : s ? e.clientHeight : '',
+					cursor : DOM.getStyle(e, 'cursor', 1)
+				});
+
+				DOM.setStyle(id + "_bottom", 'bottom', '-1px');
+
+				e = 0;
+			});
+
+			// Fixes graphics glitch
+			if (w = this.windows[id]) {
+				// Fixes rendering bug after resize
+				w.element.hide();
+				w.element.show();
+
+				// Forced a repaint of the window
+				//DOM.get(id).style.filter = '';
+
+				// IE has a bug where images used in CSS won't get loaded
+				// sometimes when the cache in the browser is disabled
+				// This fix tries to solve it by loading the images using the image object
+				each(DOM.select('div,a', id), function(e, i) {
+					if (e.currentStyle.backgroundImage != 'none') {
+						img = new Image();
+						img.src = e.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/, '$1');
+					}
+				});
+
+				DOM.get(id).style.filter = '';
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('inlinepopups', tinymce.plugins.InlinePopups);
+})();
+
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
new file mode 100644
index 000000000..94abd0876
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
new file mode 100644
index 000000000..e671094cb
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
new file mode 100644
index 000000000..6baf64ad3
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
new file mode 100644
index 000000000..497307a85
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
new file mode 100644
index 000000000..c894b2e83
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
new file mode 100644
index 000000000..c2a2ad454
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
new file mode 100644
index 000000000..43a735f22
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
new file mode 100644
index 000000000..403692283
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
@@ -0,0 +1,90 @@
+/* Clearlooks 2 */
+
+/* Reset */
+.clearlooks2, .clearlooks2 div, .clearlooks2 span, .clearlooks2 a {vertical-align:baseline; text-align:left; position:absolute; border:0; padding:0; margin:0; background:transparent; font-family:Arial,Verdana; font-size:11px; color:#000; text-decoration:none; font-weight:normal; width:auto; height:auto; overflow:hidden; display:block}
+
+/* General */
+.clearlooks2 {position:absolute; direction:ltr}
+.clearlooks2 .mceWrapper {position:static}
+.mceEventBlocker {position:absolute; left:0; top:0; background:url(img/horizontal.gif) no-repeat 0 -75px; width:100%; height:100%}
+.clearlooks2 .mcePlaceHolder {border:1px solid #000; background:#888; top:0; left:0; opacity:0.5; filter:alpha(opacity=50)}
+.clearlooks2_modalBlocker {position:absolute; left:0; top:0; width:100%; height:100%; background:#FFF; opacity:0.6; filter:alpha(opacity=60); display:none}
+
+/* Top */
+.clearlooks2 .mceTop, .clearlooks2 .mceTop div {top:0; width:100%; height:23px}
+.clearlooks2 .mceTop .mceLeft {width:6px; background:url(img/corners.gif)}
+.clearlooks2 .mceTop .mceCenter {right:6px; width:100%; height:23px; background:url(img/horizontal.gif) 12px 0; clip:rect(auto auto auto 12px)}
+.clearlooks2 .mceTop .mceRight {right:0; width:6px; height:23px; background:url(img/corners.gif) -12px 0}
+.clearlooks2 .mceTop span {width:100%; text-align:center; vertical-align:middle; line-height:23px; font-weight:bold}
+.clearlooks2 .mceFocus .mceTop .mceLeft {background:url(img/corners.gif) -6px 0}
+.clearlooks2 .mceFocus .mceTop .mceCenter {background:url(img/horizontal.gif) 0 -23px}
+.clearlooks2 .mceFocus .mceTop .mceRight {background:url(img/corners.gif) -18px 0}
+.clearlooks2 .mceFocus .mceTop span {color:#FFF}
+
+/* Middle */
+.clearlooks2 .mceMiddle, .clearlooks2 .mceMiddle div {top:0}
+.clearlooks2 .mceMiddle {width:100%; height:100%; clip:rect(23px auto auto auto)}
+.clearlooks2 .mceMiddle .mceLeft {left:0; width:5px; height:100%; background:url(img/vertical.gif) -5px 0}
+.clearlooks2 .mceMiddle span {top:23px; left:5px; width:100%; height:100%; background:#FFF}
+.clearlooks2 .mceMiddle .mceRight {right:0; width:5px; height:100%; background:url(img/vertical.gif)}
+
+/* Bottom */
+.clearlooks2 .mceBottom, .clearlooks2 .mceBottom div {height:6px}
+.clearlooks2 .mceBottom {left:0; bottom:0; width:100%}
+.clearlooks2 .mceBottom div {top:0}
+.clearlooks2 .mceBottom .mceLeft {left:0; width:5px; background:url(img/corners.gif) -34px -6px}
+.clearlooks2 .mceBottom .mceCenter {left:5px; width:100%; background:url(img/horizontal.gif) 0 -46px}
+.clearlooks2 .mceBottom .mceRight {right:0; width:5px; background: url(img/corners.gif) -34px 0}
+.clearlooks2 .mceBottom span {display:none}
+.clearlooks2 .mceStatusbar .mceBottom, .clearlooks2 .mceStatusbar .mceBottom div {height:23px}
+.clearlooks2 .mceStatusbar .mceBottom .mceLeft {background:url(img/corners.gif) -29px 0}
+.clearlooks2 .mceStatusbar .mceBottom .mceCenter {background:url(img/horizontal.gif) 0 -52px}
+.clearlooks2 .mceStatusbar .mceBottom .mceRight {background:url(img/corners.gif) -24px 0}
+.clearlooks2 .mceStatusbar .mceBottom span {display:block; left:7px; font-family:Arial, Verdana; font-size:11px; line-height:23px}
+
+/* Actions */
+.clearlooks2 a {width:29px; height:16px; top:3px;}
+.clearlooks2 .mceClose {right:6px; background:url(img/buttons.gif) -87px 0}
+.clearlooks2 .mceMin {display:none; right:68px; background:url(img/buttons.gif) 0 0}
+.clearlooks2 .mceMed {display:none; right:37px; background:url(img/buttons.gif) -29px 0}
+.clearlooks2 .mceMax {display:none; right:37px; background:url(img/buttons.gif) -58px 0}
+.clearlooks2 .mceMove {display:none;width:100%;cursor:move;background:url(img/corners.gif) no-repeat -100px -100px}
+.clearlooks2 .mceMovable .mceMove {display:block}
+.clearlooks2 .mceFocus .mceClose {right:6px; background:url(img/buttons.gif) -87px -16px}
+.clearlooks2 .mceFocus .mceMin {right:68px; background:url(img/buttons.gif) 0 -16px}
+.clearlooks2 .mceFocus .mceMed {right:37px; background:url(img/buttons.gif) -29px -16px}
+.clearlooks2 .mceFocus .mceMax {right:37px; background:url(img/buttons.gif) -58px -16px}
+.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.gif) -87px -32px}
+.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.gif) -87px -32px}
+.clearlooks2 .mceFocus .mceMin:hover {right:68px; background:url(img/buttons.gif) 0 -32px}
+.clearlooks2 .mceFocus .mceMed:hover {right:37px; background:url(img/buttons.gif) -29px -32px}
+.clearlooks2 .mceFocus .mceMax:hover {right:37px; background:url(img/buttons.gif) -58px -32px}
+
+/* Resize */
+.clearlooks2 .mceResize {top:auto; left:auto; display:none; width:5px; height:5px; background:url(img/horizontal.gif) no-repeat 0 -75px}
+.clearlooks2 .mceResizable .mceResize {display:block}
+.clearlooks2 .mceResizable .mceMin, .clearlooks2 .mceMax {display:none}
+.clearlooks2 .mceMinimizable .mceMin {display:block}
+.clearlooks2 .mceMaximizable .mceMax {display:block}
+.clearlooks2 .mceMaximized .mceMed {display:block}
+.clearlooks2 .mceMaximized .mceMax {display:none}
+.clearlooks2 a.mceResizeN {top:0; left:0; width:100%; cursor:n-resize}
+.clearlooks2 a.mceResizeNW {top:0; left:0; cursor:nw-resize}
+.clearlooks2 a.mceResizeNE {top:0; right:0; cursor:ne-resize}
+.clearlooks2 a.mceResizeW {top:0; left:0; height:100%; cursor:w-resize;}
+.clearlooks2 a.mceResizeE {top:0; right:0; height:100%; cursor:e-resize}
+.clearlooks2 a.mceResizeS {bottom:0; left:0; width:100%; cursor:s-resize}
+.clearlooks2 a.mceResizeSW {bottom:0; left:0; cursor:sw-resize}
+.clearlooks2 a.mceResizeSE {bottom:0; right:0; cursor:se-resize}
+
+/* Alert/Confirm */
+.clearlooks2 .mceButton {font-weight:bold; bottom:10px; width:80px; height:30px; background:url(img/button.gif); line-height:30px; vertical-align:middle; text-align:center; outline:0}
+.clearlooks2 .mceMiddle .mceIcon {left:15px; top:35px; width:32px; height:32px}
+.clearlooks2 .mceAlert .mceMiddle span, .clearlooks2 .mceConfirm .mceMiddle span {background:transparent;left:60px; top:35px; width:320px; height:50px; font-weight:bold; overflow:auto; white-space:normal}
+.clearlooks2 a:hover {font-weight:bold;}
+.clearlooks2 .mceAlert .mceMiddle, .clearlooks2 .mceConfirm .mceMiddle {background:#D6D7D5}
+.clearlooks2 .mceAlert .mceOk {left:50%; top:auto; margin-left: -40px}
+.clearlooks2 .mceAlert .mceIcon {background:url(img/alert.gif)}
+.clearlooks2 .mceConfirm .mceOk {left:50%; top:auto; margin-left: -90px}
+.clearlooks2 .mceConfirm .mceCancel {left:50%; top:auto}
+.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.gif)} 
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm
new file mode 100644
index 000000000..f9ec64219
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm
@@ -0,0 +1,387 @@
+<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -->

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<title>Template for dialogs</title>

+<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css" />

+</head>

+<body>

+

+<div class="mceEditor">

+	<div class="clearlooks2" style="width:400px; height:100px; left:10px;">

+		<div class="mceWrapper">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Blured</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:100px; left:420px;">

+		<div class="mceWrapper mceMovable mceFocus">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Focused</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:120px;">

+		<div class="mceWrapper mceMovable mceFocus mceStatusbar">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:120px;">

+		<div class="mceWrapper mceMovable mceFocus mceStatusbar mceResizable">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar, Resizable</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:230px;">

+		<div class="mceWrapper mceMovable mceFocus mceResizable mceMaximizable">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Resizable, Maximizable</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:230px;">

+		<div class="mceWrapper mceMovable mceStatusbar mceResizable mceMaximizable">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Blurred, Maximizable, Statusbar, Resizable</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:340px;">

+		<div class="mceWrapper mceMovable mceFocus mceResizable mceMaximized mceMinimizable mceMaximizable">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Maximized, Maximizable, Minimizable</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:340px;">

+		<div class="mceWrapper mceMovable mceStatusbar mceResizable mceMaximized mceMinimizable mceMaximizable">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Blured</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:130px; left:10px; top:450px;">

+		<div class="mceWrapper mceMovable mceFocus mceModal mceAlert">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Alert</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+				</span>

+				<div class="mceRight"></div>

+				<div class="mceIcon"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceButton mceOk" href="#">Ok</a>

+			<a class="mceClose" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:130px; left:420px; top:450px;">

+		<div class="mceWrapper mceMovable mceFocus mceModal mceConfirm">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Confirm</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					</span>

+				<div class="mceRight"></div>

+				<div class="mceIcon"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceButton mceOk" href="#">Ok</a>

+			<a class="mceButton mceCancel" href="#">Cancel</a>

+			<a class="mceClose" href="#"></a>

+		</div>

+	</div>

+</div>

+

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js
new file mode 100644
index 000000000..34d4ceca5
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.InsertDateTime',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mceInsertDate',function(){var str=t._getDateTime(new Date(),ed.getParam("plugin_insertdate_dateFormat",ed.getLang('insertdatetime.date_fmt')));ed.execCommand('mceInsertContent',false,str);});ed.addCommand('mceInsertTime',function(){var str=t._getDateTime(new Date(),ed.getParam("plugin_insertdate_timeFormat",ed.getLang('insertdatetime.time_fmt')));ed.execCommand('mceInsertContent',false,str);});ed.addButton('insertdate',{title:'insertdatetime.insertdate_desc',cmd:'mceInsertDate'});ed.addButton('inserttime',{title:'insertdatetime.inserttime_desc',cmd:'mceInsertTime'});},getInfo:function(){return{longname:'Insert date/time',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_getDateTime:function(d,fmt){var ed=this.editor;function addZeros(value,len){value=""+value;if(value.length<len){for(var i=0;i<(len-value.length);i++)value="0"+value;}return value;};fmt=fmt.replace("%D","%m/%d/%y");fmt=fmt.replace("%r","%I:%M:%S %p");fmt=fmt.replace("%Y",""+d.getFullYear());fmt=fmt.replace("%y",""+d.getYear());fmt=fmt.replace("%m",addZeros(d.getMonth()+1,2));fmt=fmt.replace("%d",addZeros(d.getDate(),2));fmt=fmt.replace("%H",""+addZeros(d.getHours(),2));fmt=fmt.replace("%M",""+addZeros(d.getMinutes(),2));fmt=fmt.replace("%S",""+addZeros(d.getSeconds(),2));fmt=fmt.replace("%I",""+((d.getHours()+11)%12+1));fmt=fmt.replace("%p",""+(d.getHours()<12?"AM":"PM"));fmt=fmt.replace("%B",""+ed.getLang("insertdatetime.months_long").split(',')[d.getMonth()]);fmt=fmt.replace("%b",""+ed.getLang("insertdatetime.months_short").split(',')[d.getMonth()]);fmt=fmt.replace("%A",""+ed.getLang("insertdatetime.day_long").split(',')[d.getDay()]);fmt=fmt.replace("%a",""+ed.getLang("insertdatetime.day_short").split(',')[d.getDay()]);fmt=fmt.replace("%%","%");return fmt;}});tinymce.PluginManager.add('insertdatetime',tinymce.plugins.InsertDateTime);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
new file mode 100644
index 000000000..e80895cd3
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
@@ -0,0 +1,80 @@
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.InsertDateTime', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			ed.addCommand('mceInsertDate', function() {
+				var str = t._getDateTime(new Date(), ed.getParam("plugin_insertdate_dateFormat", ed.getLang('insertdatetime.date_fmt')));
+
+				ed.execCommand('mceInsertContent', false, str);
+			});
+
+			ed.addCommand('mceInsertTime', function() {
+				var str = t._getDateTime(new Date(), ed.getParam("plugin_insertdate_timeFormat", ed.getLang('insertdatetime.time_fmt')));
+
+				ed.execCommand('mceInsertContent', false, str);
+			});
+
+			ed.addButton('insertdate', {title : 'insertdatetime.insertdate_desc', cmd : 'mceInsertDate'});
+			ed.addButton('inserttime', {title : 'insertdatetime.inserttime_desc', cmd : 'mceInsertTime'});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Insert date/time',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_getDateTime : function(d, fmt) {
+			var ed = this.editor;
+
+			function addZeros(value, len) {
+				value = "" + value;
+
+				if (value.length < len) {
+					for (var i=0; i<(len-value.length); i++)
+						value = "0" + value;
+				}
+
+				return value;
+			};
+
+			fmt = fmt.replace("%D", "%m/%d/%y");
+			fmt = fmt.replace("%r", "%I:%M:%S %p");
+			fmt = fmt.replace("%Y", "" + d.getFullYear());
+			fmt = fmt.replace("%y", "" + d.getYear());
+			fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));
+			fmt = fmt.replace("%d", addZeros(d.getDate(), 2));
+			fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));
+			fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));
+			fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));
+			fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));
+			fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));
+			fmt = fmt.replace("%B", "" + ed.getLang("insertdatetime.months_long").split(',')[d.getMonth()]);
+			fmt = fmt.replace("%b", "" + ed.getLang("insertdatetime.months_short").split(',')[d.getMonth()]);
+			fmt = fmt.replace("%A", "" + ed.getLang("insertdatetime.day_long").split(',')[d.getDay()]);
+			fmt = fmt.replace("%a", "" + ed.getLang("insertdatetime.day_short").split(',')[d.getDay()]);
+			fmt = fmt.replace("%%", "%");
+
+			return fmt;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('insertdatetime', tinymce.plugins.InsertDateTime);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
new file mode 100644
index 000000000..4cd9427b4
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.Layer',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mceInsertLayer',t._insertLayer,t);ed.addCommand('mceMoveForward',function(){t._move(1);});ed.addCommand('mceMoveBackward',function(){t._move(-1);});ed.addCommand('mceMakeAbsolute',function(){t._toggleAbsolute();});ed.addButton('moveforward',{title:'layer.forward_desc',cmd:'mceMoveForward'});ed.addButton('movebackward',{title:'layer.backward_desc',cmd:'mceMoveBackward'});ed.addButton('absolute',{title:'layer.absolute_desc',cmd:'mceMakeAbsolute'});ed.addButton('insertlayer',{title:'layer.insertlayer_desc',cmd:'mceInsertLayer'});ed.onInit.add(function(){if(tinymce.isIE)ed.getDoc().execCommand('2D-Position',false,true);});ed.onNodeChange.add(t._nodeChange,t);ed.onVisualAid.add(t._visualAid,t);},getInfo:function(){return{longname:'Layer',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_nodeChange:function(ed,cm,n){var le,p;le=this._getParentLayer(n);p=ed.dom.getParent(n,'DIV,P,IMG');if(!p){cm.setDisabled('absolute',1);cm.setDisabled('moveforward',1);cm.setDisabled('movebackward',1);}else{cm.setDisabled('absolute',0);cm.setDisabled('moveforward',!le);cm.setDisabled('movebackward',!le);cm.setActive('absolute',le&&le.style.position.toLowerCase()=="absolute");}},_visualAid:function(ed,e,s){var dom=ed.dom;tinymce.each(dom.select('div,p',e),function(e){if(/^(absolute|relative|static)$/i.test(e.style.position)){if(s)dom.addClass(e,'mceItemVisualAid');else dom.removeClass(e,'mceItemVisualAid');}});},_move:function(d){var ed=this.editor,i,z=[],le=this._getParentLayer(ed.selection.getNode()),ci=-1,fi=-1,nl;nl=[];tinymce.walk(ed.getBody(),function(n){if(n.nodeType==1&&/^(absolute|relative|static)$/i.test(n.style.position))nl.push(n);},'childNodes');for(i=0;i<nl.length;i++){z[i]=nl[i].style.zIndex?parseInt(nl[i].style.zIndex):0;if(ci<0&&nl[i]==le)ci=i;}if(d<0){for(i=0;i<z.length;i++){if(z[i]<z[ci]){fi=i;break;}}if(fi>-1){nl[ci].style.zIndex=z[fi];nl[fi].style.zIndex=z[ci];}else{if(z[ci]>0)nl[ci].style.zIndex=z[ci]-1;}}else{for(i=0;i<z.length;i++){if(z[i]>z[ci]){fi=i;break;}}if(fi>-1){nl[ci].style.zIndex=z[fi];nl[fi].style.zIndex=z[ci];}else nl[ci].style.zIndex=z[ci]+1;}ed.execCommand('mceRepaint');},_getParentLayer:function(n){return this.editor.dom.getParent(n,function(n){return n.nodeType==1&&/^(absolute|relative|static)$/i.test(n.style.position);});},_insertLayer:function(){var ed=this.editor,p=ed.dom.getPos(ed.dom.getParent(ed.selection.getNode(),'*'));ed.dom.add(ed.getBody(),'div',{style:{position:'absolute',left:p.x,top:(p.y>20?p.y:20),width:100,height:100},'class':'mceItemVisualAid'},ed.selection.getContent()||ed.getLang('layer.content'));},_toggleAbsolute:function(){var ed=this.editor,le=this._getParentLayer(ed.selection.getNode());if(!le)le=ed.dom.getParent(ed.selection.getNode(),'DIV,P,IMG');if(le){if(le.style.position.toLowerCase()=="absolute"){ed.dom.setStyles(le,{position:'',left:'',top:'',width:'',height:''});ed.dom.removeClass(le,'mceItemVisualAid');}else{if(le.style.left=="")le.style.left=20+'px';if(le.style.top=="")le.style.top=20+'px';if(le.style.width=="")le.style.width=le.width?(le.width+'px'):'100px';if(le.style.height=="")le.style.height=le.height?(le.height+'px'):'100px';le.style.position="absolute";ed.addVisual(ed.getBody());}ed.execCommand('mceRepaint');ed.nodeChanged();}}});tinymce.PluginManager.add('layer',tinymce.plugins.Layer);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
new file mode 100644
index 000000000..c53143d0e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
@@ -0,0 +1,209 @@
+/**
+ * $Id: editor_plugin_src.js 652 2008-02-29 13:09:46Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Layer', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceInsertLayer', t._insertLayer, t);
+
+			ed.addCommand('mceMoveForward', function() {
+				t._move(1);
+			});
+
+			ed.addCommand('mceMoveBackward', function() {
+				t._move(-1);
+			});
+
+			ed.addCommand('mceMakeAbsolute', function() {
+				t._toggleAbsolute();
+			});
+
+			// Register buttons
+			ed.addButton('moveforward', {title : 'layer.forward_desc', cmd : 'mceMoveForward'});
+			ed.addButton('movebackward', {title : 'layer.backward_desc', cmd : 'mceMoveBackward'});
+			ed.addButton('absolute', {title : 'layer.absolute_desc', cmd : 'mceMakeAbsolute'});
+			ed.addButton('insertlayer', {title : 'layer.insertlayer_desc', cmd : 'mceInsertLayer'});
+
+			ed.onInit.add(function() {
+				if (tinymce.isIE)
+					ed.getDoc().execCommand('2D-Position', false, true);
+			});
+
+			ed.onNodeChange.add(t._nodeChange, t);
+			ed.onVisualAid.add(t._visualAid, t);
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Layer',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_nodeChange : function(ed, cm, n) {
+			var le, p;
+
+			le = this._getParentLayer(n);
+			p = ed.dom.getParent(n, 'DIV,P,IMG');
+
+			if (!p) {
+				cm.setDisabled('absolute', 1);
+				cm.setDisabled('moveforward', 1);
+				cm.setDisabled('movebackward', 1);
+			} else {
+				cm.setDisabled('absolute', 0);
+				cm.setDisabled('moveforward', !le);
+				cm.setDisabled('movebackward', !le);
+				cm.setActive('absolute', le && le.style.position.toLowerCase() == "absolute");
+			}
+		},
+
+		// Private methods
+
+		_visualAid : function(ed, e, s) {
+			var dom = ed.dom;
+
+			tinymce.each(dom.select('div,p', e), function(e) {
+				if (/^(absolute|relative|static)$/i.test(e.style.position)) {
+					if (s)
+						dom.addClass(e, 'mceItemVisualAid');
+					else
+						dom.removeClass(e, 'mceItemVisualAid');	
+				}
+			});
+		},
+
+		_move : function(d) {
+			var ed = this.editor, i, z = [], le = this._getParentLayer(ed.selection.getNode()), ci = -1, fi = -1, nl;
+
+			nl = [];
+			tinymce.walk(ed.getBody(), function(n) {
+				if (n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position))
+					nl.push(n); 
+			}, 'childNodes');
+
+			// Find z-indexes
+			for (i=0; i<nl.length; i++) {
+				z[i] = nl[i].style.zIndex ? parseInt(nl[i].style.zIndex) : 0;
+
+				if (ci < 0 && nl[i] == le)
+					ci = i;
+			}
+
+			if (d < 0) {
+				// Move back
+
+				// Try find a lower one
+				for (i=0; i<z.length; i++) {
+					if (z[i] < z[ci]) {
+						fi = i;
+						break;
+					}
+				}
+
+				if (fi > -1) {
+					nl[ci].style.zIndex = z[fi];
+					nl[fi].style.zIndex = z[ci];
+				} else {
+					if (z[ci] > 0)
+						nl[ci].style.zIndex = z[ci] - 1;
+				}
+			} else {
+				// Move forward
+
+				// Try find a higher one
+				for (i=0; i<z.length; i++) {
+					if (z[i] > z[ci]) {
+						fi = i;
+						break;
+					}
+				}
+
+				if (fi > -1) {
+					nl[ci].style.zIndex = z[fi];
+					nl[fi].style.zIndex = z[ci];
+				} else
+					nl[ci].style.zIndex = z[ci] + 1;
+			}
+
+			ed.execCommand('mceRepaint');
+		},
+
+		_getParentLayer : function(n) {
+			return this.editor.dom.getParent(n, function(n) {
+				return n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position);
+			});
+		},
+
+		_insertLayer : function() {
+			var ed = this.editor, p = ed.dom.getPos(ed.dom.getParent(ed.selection.getNode(), '*'));
+
+			ed.dom.add(ed.getBody(), 'div', {
+				style : {
+					position : 'absolute',
+					left : p.x,
+					top : (p.y > 20 ? p.y : 20),
+					width : 100,
+					height : 100
+				},
+				'class' : 'mceItemVisualAid'
+			}, ed.selection.getContent() || ed.getLang('layer.content'));
+		},
+
+		_toggleAbsolute : function() {
+			var ed = this.editor, le = this._getParentLayer(ed.selection.getNode());
+
+			if (!le)
+				le = ed.dom.getParent(ed.selection.getNode(), 'DIV,P,IMG');
+
+			if (le) {
+				if (le.style.position.toLowerCase() == "absolute") {
+					ed.dom.setStyles(le, {
+						position : '',
+						left : '',
+						top : '',
+						width : '',
+						height : ''
+					});
+
+					ed.dom.removeClass(le, 'mceItemVisualAid');
+				} else {
+					if (le.style.left == "")
+						le.style.left = 20 + 'px';
+
+					if (le.style.top == "")
+						le.style.top = 20 + 'px';
+
+					if (le.style.width == "")
+						le.style.width = le.width ? (le.width + 'px') : '100px';
+
+					if (le.style.height == "")
+						le.style.height = le.height ? (le.height + 'px') : '100px';
+
+					le.style.position = "absolute";
+					ed.addVisual(ed.getBody());
+				}
+
+				ed.execCommand('mceRepaint');
+				ed.nodeChanged();
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('layer', tinymce.plugins.Layer);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/css/content.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/css/content.css
new file mode 100644
index 000000000..7739381da
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/css/content.css
@@ -0,0 +1,6 @@
+.mceItemFlash, .mceItemShockWave, .mceItemQuickTime, .mceItemWindowsMedia, .mceItemRealMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc;}
+.mceItemShockWave {background-image: url(../img/shockwave.gif);}
+.mceItemFlash {background-image:url(../img/flash.gif);}
+.mceItemQuickTime {background-image:url(../img/quicktime.gif);}
+.mceItemWindowsMedia {background-image:url(../img/windowsmedia.gif);}
+.mceItemRealMedia {background-image:url(../img/realmedia.gif);}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/css/media.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
new file mode 100644
index 000000000..7b2253ba3
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
@@ -0,0 +1,16 @@
+#id, #name, #hspace, #vspace, #class_name, #align {	width: 100px }
+#hspace, #vspace { width: 50px }
+#flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px }
+#flash_base, #flash_flashvars { width: 240px }
+#width, #height { width: 40px }
+#src, #media_type { width: 250px }
+#class { width: 120px }
+#prev { margin: 0; border: 1px solid black; width: 380px; height: 230px; overflow: auto }
+.panel_wrapper div.current { height: 390px; overflow: auto }
+#flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none }
+.mceAddSelectValue { background-color: #DDDDDD }
+#qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px }
+#wmp_balance, #wmp_baseurl, #wmp_captioningid, #wmp_currentmarker, #wmp_currentposition, #wmp_defaultframe, #wmp_playcount, #wmp_rate, #wmp_uimode, #wmp_volume { width: 70px }
+#rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px }
+#shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px }
+#qt_qtsrc { width: 200px }
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
new file mode 100644
index 000000000..9c2c4bbf9
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var each=tinymce.each;tinymce.create('tinymce.plugins.MediaPlugin',{init:function(ed,url){var t=this;t.editor=ed;t.url=url;function isMediaElm(n){return/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className);};ed.onPreInit.add(function(){ed.serializer.addRules('param[name|value|_value]');});ed.addCommand('mceMedia',function(){ed.windowManager.open({file:url+'/media.htm',width:430+parseInt(ed.getLang('media.delta_width',0)),height:470+parseInt(ed.getLang('media.delta_height',0)),inline:1},{plugin_url:url});});ed.addButton('media',{title:'media.desc',cmd:'mceMedia'});ed.onNodeChange.add(function(ed,cm,n){cm.setActive('media',n.nodeName=='IMG'&&isMediaElm(n));});ed.onInit.add(function(){var lo={mceItemFlash:'flash',mceItemShockWave:'shockwave',mceItemWindowsMedia:'windowsmedia',mceItemQuickTime:'quicktime',mceItemRealMedia:'realmedia'};if(ed.settings.content_css!==false)ed.dom.loadCSS(url+"/css/content.css");if(ed.theme.onResolveName){ed.theme.onResolveName.add(function(th,o){if(o.name=='img'){each(lo,function(v,k){if(ed.dom.hasClass(o.node,k)){o.name=v;o.title=ed.dom.getAttrib(o.node,'title');return false;}});}});}if(ed&&ed.plugins.contextmenu){ed.plugins.contextmenu.onContextMenu.add(function(th,m,e){if(e.nodeName=='IMG'&&/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(e.className)){m.add({title:'media.edit',icon:'media',cmd:'mceMedia'});}});}});ed.onBeforeSetContent.add(function(ed,o){var h=o.content;h=h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi,function(a,b,c){var o=t._parse(c);return'<img class="mceItem'+b+'" title="'+ed.dom.encode(c)+'" src="'+url+'/img/trans.gif" width="'+o.width+'" height="'+o.height+'" />'});h=h.replace(/<object([^>]*)>/gi,'<span class="mceItemObject" $1>');h=h.replace(/<embed([^>]*)\/>/gi,'<span class="mceItemEmbed" $1>');h=h.replace(/<embed([^>]*)>/gi,'<span class="mceItemEmbed" $1>');h=h.replace(/<\/(object|embed)([^>]*)>/gi,'</span>');h=h.replace(/<param([^>]*)>/gi,function(a,b){return'<span '+b.replace(/value=/gi,'_value=')+' class="mceItemParam"></span>'});h=h.replace(/\/ class=\"mceItemParam\"><\/span>/gi,'class="mceItemParam"></span>');o.content=h;});ed.onSetContent.add(function(){t._spansToImgs(ed.getBody());});ed.onPreProcess.add(function(ed,o){var dom=ed.dom;if(o.set){t._spansToImgs(o.node);each(dom.select('IMG',o.node),function(n){var p;if(isMediaElm(n)){p=t._parse(n.title);dom.setAttrib(n,'width',dom.getAttrib(n,'width',p.width||100));dom.setAttrib(n,'height',dom.getAttrib(n,'height',p.height||100));}});}if(o.get){each(dom.select('IMG',o.node),function(n){var ci,cb,mt;if(ed.getParam('media_use_script')){if(isMediaElm(n))n.className=n.className.replace(/mceItem/g,'mceTemp');return;}switch(n.className){case'mceItemFlash':ci='d27cdb6e-ae6d-11cf-96b8-444553540000';cb='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';mt='application/x-shockwave-flash';break;case'mceItemShockWave':ci='166b1bca-3f9c-11cf-8075-444553540000';cb='http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';mt='application/x-director';break;case'mceItemWindowsMedia':ci=ed.getParam('media_wmp6_compatible')?'05589fa1-c356-11ce-bf01-00aa0055595a':'6bf52a52-394a-11d3-b153-00c04f79faa6';cb='http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';mt='application/x-mplayer2';break;case'mceItemQuickTime':ci='02bf25d5-8c17-4b23-bc80-d3488abddc6b';cb='http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';mt='video/quicktime';break;case'mceItemRealMedia':ci='cfcdaa03-8be4-11cf-b84b-0020afbbccfa';cb='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';mt='audio/x-pn-realaudio-plugin';break;}if(ci){dom.replace(t._buildObj({classid:ci,codebase:cb,type:mt},n),n);}});}});ed.onPostProcess.add(function(ed,o){o.content=o.content.replace(/_value=/g,'value=');});if(ed.getParam('media_use_script')){function getAttr(s,n){n=new RegExp(n+'=\"([^\"]+)\"','g').exec(s);return n?ed.dom.decode(n[1]):'';};ed.onPostProcess.add(function(ed,o){o.content=o.content.replace(/<img[^>]+>/g,function(im){var cl=getAttr(im,'class');if(/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(cl)){at=t._parse(getAttr(im,'title'));at.width=getAttr(im,'width');at.height=getAttr(im,'height');im='<script type="text/javascript">write'+cl.substring(7)+'({'+t._serialize(at)+'});</script>';}return im;});});}},getInfo:function(){return{longname:'Media',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_buildObj:function(o,n){var ob,ed=this.editor,dom=ed.dom,p=this._parse(n.title);p.width=o.width=dom.getAttrib(n,'width')||100;p.height=o.height=dom.getAttrib(n,'height')||100;ob=dom.create('span',{mce_name:'object',classid:"clsid:"+o.classid,codebase:o.codebase,width:o.width,height:o.height});if(p.src)p.src=ed.convertURL(p.src,'src',n);each(p,function(v,k){if(!/^(width|height|codebase|classid)$/.test(k)){if(o.type=='application/x-mplayer2'&&k=='src')k='url';dom.add(ob,'span',{mce_name:'param',name:k,'_value':v});}});dom.add(ob,'span',tinymce.extend({mce_name:'embed',type:o.type},p));return ob;},_spansToImgs:function(p){var t=this,dom=t.editor.dom,im,ci;each(dom.select('span',p),function(n){if(dom.getAttrib(n,'class')=='mceItemObject'){ci=dom.getAttrib(n,"classid").toLowerCase().replace(/\s+/g,'');switch(ci){case'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':dom.replace(t._createImg('mceItemFlash',n),n);break;case'clsid:166b1bca-3f9c-11cf-8075-444553540000':dom.replace(t._createImg('mceItemShockWave',n),n);break;case'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6':case'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95':case'clsid:05589fa1-c356-11ce-bf01-00aa0055595a':dom.replace(t._createImg('mceItemWindowsMedia',n),n);break;case'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':dom.replace(t._createImg('mceItemQuickTime',n),n);break;case'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':dom.replace(t._createImg('mceItemRealMedia',n),n);break;default:dom.replace(t._createImg('mceItemFlash',n),n);}return;}if(dom.getAttrib(n,'class')=='mceItemEmbed'){switch(dom.getAttrib(n,'type')){case'application/x-shockwave-flash':dom.replace(t._createImg('mceItemFlash',n),n);break;case'application/x-director':dom.replace(t._createImg('mceItemShockWave',n),n);break;case'application/x-mplayer2':dom.replace(t._createImg('mceItemWindowsMedia',n),n);break;case'video/quicktime':dom.replace(t._createImg('mceItemQuickTime',n),n);break;case'audio/x-pn-realaudio-plugin':dom.replace(t._createImg('mceItemRealMedia',n),n);break;default:dom.replace(t._createImg('mceItemFlash',n),n);}}});},_createImg:function(cl,n){var im,dom=this.editor.dom,pa={},ti='';im=dom.create('img',{src:this.url+'/img/trans.gif',width:dom.getAttrib(n,'width')||100,height:dom.getAttrib(n,'height')||100,'class':cl});each(['id','name','width','height','bgcolor','align','flashvars','src','wmode'],function(na){var v=dom.getAttrib(n,na);if(v)pa[na]=v;});each(dom.select('span',n),function(n){if(dom.hasClass(n,'mceItemParam'))pa[dom.getAttrib(n,'name')]=dom.getAttrib(n,'_value');});if(pa.movie){pa.src=pa.movie;delete pa.movie;}delete pa.width;delete pa.height;im.title=this._serialize(pa);return im;},_parse:function(s){return tinymce.util.JSON.parse('{'+s+'}');},_serialize:function(o){return tinymce.util.JSON.serialize(o).replace(/[{}]/g,'');}});tinymce.PluginManager.add('media',tinymce.plugins.MediaPlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
new file mode 100644
index 000000000..3e306c27b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
@@ -0,0 +1,365 @@
+/**
+ * $Id: editor_plugin_src.js 870 2008-06-13 09:25:41Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.plugins.MediaPlugin', {
+		init : function(ed, url) {
+			var t = this;
+			
+			t.editor = ed;
+			t.url = url;
+
+			function isMediaElm(n) {
+				return /^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className);
+			};
+
+			ed.onPreInit.add(function() {
+				// Force in _value parameter this extra parameter is required for older Opera versions
+				ed.serializer.addRules('param[name|value|_value]');
+			});
+
+			// Register commands
+			ed.addCommand('mceMedia', function() {
+				ed.windowManager.open({
+					file : url + '/media.htm',
+					width : 430 + parseInt(ed.getLang('media.delta_width', 0)),
+					height : 470 + parseInt(ed.getLang('media.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});
+
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setActive('media', n.nodeName == 'IMG' && isMediaElm(n));
+			});
+
+			ed.onInit.add(function() {
+				var lo = {
+					mceItemFlash : 'flash',
+					mceItemShockWave : 'shockwave',
+					mceItemWindowsMedia : 'windowsmedia',
+					mceItemQuickTime : 'quicktime',
+					mceItemRealMedia : 'realmedia'
+				};
+
+				if (ed.settings.content_css !== false)
+					ed.dom.loadCSS(url + "/css/content.css");
+
+				if (ed.theme.onResolveName) {
+					ed.theme.onResolveName.add(function(th, o) {
+						if (o.name == 'img') {
+							each(lo, function(v, k) {
+								if (ed.dom.hasClass(o.node, k)) {
+									o.name = v;
+									o.title = ed.dom.getAttrib(o.node, 'title');
+									return false;
+								}
+							});
+						}
+					});
+				}
+
+				if (ed && ed.plugins.contextmenu) {
+					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
+						if (e.nodeName == 'IMG' && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(e.className)) {
+							m.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});
+						}
+					});
+				}
+			});
+
+			ed.onBeforeSetContent.add(function(ed, o) {
+				var h = o.content;
+
+				h = h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) {
+					var o = t._parse(c);
+
+					return '<img class="mceItem' + b + '" title="' + ed.dom.encode(c) + '" src="' + url + '/img/trans.gif" width="' + o.width + '" height="' + o.height + '" />'
+				});
+
+				h = h.replace(/<object([^>]*)>/gi, '<span class="mceItemObject" $1>');
+				h = h.replace(/<embed([^>]*)\/>/gi, '<span class="mceItemEmbed" $1>');
+				h = h.replace(/<embed([^>]*)>/gi, '<span class="mceItemEmbed" $1>');
+				h = h.replace(/<\/(object|embed)([^>]*)>/gi, '</span>');
+				h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<span ' + b.replace(/value=/gi, '_value=') + ' class="mceItemParam"></span>'});
+				h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam"></span>');
+
+				o.content = h;
+			});
+
+			ed.onSetContent.add(function() {
+				t._spansToImgs(ed.getBody());
+			});
+
+			ed.onPreProcess.add(function(ed, o) {
+				var dom = ed.dom;
+
+				if (o.set) {
+					t._spansToImgs(o.node);
+
+					each(dom.select('IMG', o.node), function(n) {
+						var p;
+
+						if (isMediaElm(n)) {
+							p = t._parse(n.title);
+							dom.setAttrib(n, 'width', dom.getAttrib(n, 'width', p.width || 100));
+							dom.setAttrib(n, 'height', dom.getAttrib(n, 'height', p.height || 100));
+						}
+					});
+				}
+
+				if (o.get) {
+					each(dom.select('IMG', o.node), function(n) {
+						var ci, cb, mt;
+
+						if (ed.getParam('media_use_script')) {
+							if (isMediaElm(n))
+								n.className = n.className.replace(/mceItem/g, 'mceTemp');
+
+							return;
+						}
+
+						switch (n.className) {
+							case 'mceItemFlash':
+								ci = 'd27cdb6e-ae6d-11cf-96b8-444553540000';
+								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
+								mt = 'application/x-shockwave-flash';
+								break;
+
+							case 'mceItemShockWave':
+								ci = '166b1bca-3f9c-11cf-8075-444553540000';
+								cb = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
+								mt = 'application/x-director';
+								break;
+
+							case 'mceItemWindowsMedia':
+								ci = ed.getParam('media_wmp6_compatible') ? '05589fa1-c356-11ce-bf01-00aa0055595a' : '6bf52a52-394a-11d3-b153-00c04f79faa6';
+								cb = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
+								mt = 'application/x-mplayer2';
+								break;
+
+							case 'mceItemQuickTime':
+								ci = '02bf25d5-8c17-4b23-bc80-d3488abddc6b';
+								cb = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
+								mt = 'video/quicktime';
+								break;
+
+							case 'mceItemRealMedia':
+								ci = 'cfcdaa03-8be4-11cf-b84b-0020afbbccfa';
+								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
+								mt = 'audio/x-pn-realaudio-plugin';
+								break;
+						}
+
+						if (ci) {
+							dom.replace(t._buildObj({
+								classid : ci,
+								codebase : cb,
+								type : mt
+							}, n), n);
+						}
+					});
+				}
+			});
+
+			ed.onPostProcess.add(function(ed, o) {
+				o.content = o.content.replace(/_value=/g, 'value=');
+			});
+
+			if (ed.getParam('media_use_script')) {
+				function getAttr(s, n) {
+					n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);
+
+					return n ? ed.dom.decode(n[1]) : '';
+				};
+
+				ed.onPostProcess.add(function(ed, o) {
+					o.content = o.content.replace(/<img[^>]+>/g, function(im) {
+						var cl = getAttr(im, 'class');
+
+						if (/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(cl)) {
+							at = t._parse(getAttr(im, 'title'));
+							at.width = getAttr(im, 'width');
+							at.height = getAttr(im, 'height');
+							im = '<script type="text/javascript">write' + cl.substring(7) + '({' + t._serialize(at) + '});</script>';
+						}
+
+						return im;
+					});
+				});
+			}
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Media',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_buildObj : function(o, n) {
+			var ob, ed = this.editor, dom = ed.dom, p = this._parse(n.title);
+
+			p.width = o.width = dom.getAttrib(n, 'width') || 100;
+			p.height = o.height = dom.getAttrib(n, 'height') || 100;
+
+			ob = dom.create('span', {
+				mce_name : 'object',
+				classid : "clsid:" + o.classid,
+				codebase : o.codebase,
+				width : o.width,
+				height : o.height
+			});
+
+			if (p.src)
+				p.src = ed.convertURL(p.src, 'src', n);
+
+			each (p, function(v, k) {
+				if (!/^(width|height|codebase|classid)$/.test(k)) {
+					// Use url instead of src in IE for Windows media
+					if (o.type == 'application/x-mplayer2' && k == 'src')
+						k = 'url';
+
+					dom.add(ob, 'span', {mce_name : 'param', name : k, '_value' : v});
+				}
+			});
+
+			dom.add(ob, 'span', tinymce.extend({mce_name : 'embed', type : o.type}, p));
+
+			return ob;
+		},
+
+		_spansToImgs : function(p) {
+			var t = this, dom = t.editor.dom, im, ci;
+
+			each(dom.select('span', p), function(n) {
+				// Convert object into image
+				if (dom.getAttrib(n, 'class') == 'mceItemObject') {
+					ci = dom.getAttrib(n, "classid").toLowerCase().replace(/\s+/g, '');
+
+					switch (ci) {
+						case 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':
+							dom.replace(t._createImg('mceItemFlash', n), n);
+							break;
+
+						case 'clsid:166b1bca-3f9c-11cf-8075-444553540000':
+							dom.replace(t._createImg('mceItemShockWave', n), n);
+							break;
+
+						case 'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6':
+						case 'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95':
+						case 'clsid:05589fa1-c356-11ce-bf01-00aa0055595a':
+							dom.replace(t._createImg('mceItemWindowsMedia', n), n);
+							break;
+
+						case 'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':
+							dom.replace(t._createImg('mceItemQuickTime', n), n);
+							break;
+
+						case 'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':
+							dom.replace(t._createImg('mceItemRealMedia', n), n);
+							break;
+
+						default:
+							dom.replace(t._createImg('mceItemFlash', n), n);
+					}
+					
+					return;
+				}
+
+				// Convert embed into image
+				if (dom.getAttrib(n, 'class') == 'mceItemEmbed') {
+					switch (dom.getAttrib(n, 'type')) {
+						case 'application/x-shockwave-flash':
+							dom.replace(t._createImg('mceItemFlash', n), n);
+							break;
+
+						case 'application/x-director':
+							dom.replace(t._createImg('mceItemShockWave', n), n);
+							break;
+
+						case 'application/x-mplayer2':
+							dom.replace(t._createImg('mceItemWindowsMedia', n), n);
+							break;
+
+						case 'video/quicktime':
+							dom.replace(t._createImg('mceItemQuickTime', n), n);
+							break;
+
+						case 'audio/x-pn-realaudio-plugin':
+							dom.replace(t._createImg('mceItemRealMedia', n), n);
+							break;
+
+						default:
+							dom.replace(t._createImg('mceItemFlash', n), n);
+					}
+				}			
+			});
+		},
+
+		_createImg : function(cl, n) {
+			var im, dom = this.editor.dom, pa = {}, ti = '';
+
+			// Create image
+			im = dom.create('img', {
+				src : this.url + '/img/trans.gif',
+				width : dom.getAttrib(n, 'width') || 100,
+				height : dom.getAttrib(n, 'height') || 100,
+				'class' : cl
+			});
+
+			// Setup base parameters
+			each(['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode'], function(na) {
+				var v = dom.getAttrib(n, na);
+
+				if (v)
+					pa[na] = v;
+			});
+
+			// Add optional parameters
+			each(dom.select('span', n), function(n) {
+				if (dom.hasClass(n, 'mceItemParam'))
+					pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_value');
+			});
+
+			// Use src not movie
+			if (pa.movie) {
+				pa.src = pa.movie;
+				delete pa.movie;
+			}
+
+			delete pa.width;
+			delete pa.height;
+
+			im.title = this._serialize(pa);
+
+			return im;
+		},
+
+		_parse : function(s) {
+			return tinymce.util.JSON.parse('{' + s + '}');
+		},
+
+		_serialize : function(o) {
+			return tinymce.util.JSON.serialize(o).replace(/[{}]/g, '');
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('media', tinymce.plugins.MediaPlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif
new file mode 100644
index 000000000..cb192e6ce
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf
new file mode 100644
index 000000000..042c2ab96
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif
new file mode 100644
index 000000000..3b0499145
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/realmedia.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/realmedia.gif
new file mode 100644
index 000000000..fdfe0b9ac
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/realmedia.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif
new file mode 100644
index 000000000..5f235dfc7
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/trans.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/trans.gif
new file mode 100644
index 000000000..388486517
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/trans.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/windowsmedia.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/windowsmedia.gif
new file mode 100644
index 000000000..ab50f2d88
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/img/windowsmedia.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js
new file mode 100644
index 000000000..6fe25de09
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js
@@ -0,0 +1,73 @@
+/**
+ * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.
+ */
+
+function writeFlash(p) {
+	writeEmbed(
+		'D27CDB6E-AE6D-11cf-96B8-444553540000',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'application/x-shockwave-flash',
+		p
+	);
+}
+
+function writeShockWave(p) {
+	writeEmbed(
+	'166B1BCA-3F9C-11CF-8075-444553540000',
+	'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',
+	'application/x-director',
+		p
+	);
+}
+
+function writeQuickTime(p) {
+	writeEmbed(
+		'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',
+		'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',
+		'video/quicktime',
+		p
+	);
+}
+
+function writeRealMedia(p) {
+	writeEmbed(
+		'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'audio/x-pn-realaudio-plugin',
+		p
+	);
+}
+
+function writeWindowsMedia(p) {
+	p.url = p.src;
+	writeEmbed(
+		'6BF52A52-394A-11D3-B153-00C04F79FAA6',
+		'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',
+		'application/x-mplayer2',
+		p
+	);
+}
+
+function writeEmbed(cls, cb, mt, p) {
+	var h = '', n;
+
+	h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
+	h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';
+	h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';
+	h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';
+	h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';
+	h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';
+	h += '>';
+
+	for (n in p)
+		h += '<param name="' + n + '" value="' + p[n] + '">';
+
+	h += '<embed type="' + mt + '"';
+
+	for (n in p)
+		h += n + '="' + p[n] + '" ';
+
+	h += '></embed></object>';
+
+	document.write(h);
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/js/media.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
new file mode 100644
index 000000000..0f0cfd644
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
@@ -0,0 +1,628 @@
+tinyMCEPopup.requireLangPack();
+
+var oldWidth, oldHeight, ed, url;
+
+if (url = tinyMCEPopup.getParam("media_external_list_url"))
+	document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+
+function init() {
+	var pl = "", f, val;
+	var type = "flash", fe, i;
+
+	ed = tinyMCEPopup.editor;
+
+	tinyMCEPopup.resizeToInnerSize();
+	f = document.forms[0]
+
+	fe = ed.selection.getNode();
+	if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {
+		pl = fe.title;
+
+		switch (ed.dom.getAttrib(fe, 'class')) {
+			case 'mceItemFlash':
+				type = 'flash';
+				break;
+
+			case 'mceItemFlashVideo':
+				type = 'flv';
+				break;
+
+			case 'mceItemShockWave':
+				type = 'shockwave';
+				break;
+
+			case 'mceItemWindowsMedia':
+				type = 'wmp';
+				break;
+
+			case 'mceItemQuickTime':
+				type = 'qt';
+				break;
+
+			case 'mceItemRealMedia':
+				type = 'rmp';
+				break;
+		}
+
+		document.forms[0].insert.value = ed.getLang('update', 'Insert', true); 
+	}
+
+	document.getElementById('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
+	document.getElementById('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','qt_qtsrc','media','media');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+
+	var html = getMediaListHTML('medialist','src','media','media');
+	if (html == "")
+		document.getElementById("linklistrow").style.display = 'none';
+	else
+		document.getElementById("linklistcontainer").innerHTML = html;
+
+	// Resize some elements
+	if (isVisible('filebrowser'))
+		document.getElementById('src').style.width = '230px';
+
+	// Setup form
+	if (pl != "") {
+		pl = tinyMCEPopup.editor.plugins.media._parse(pl);
+
+		switch (type) {
+			case "flash":
+				setBool(pl, 'flash', 'play');
+				setBool(pl, 'flash', 'loop');
+				setBool(pl, 'flash', 'menu');
+				setBool(pl, 'flash', 'swliveconnect');
+				setStr(pl, 'flash', 'quality');
+				setStr(pl, 'flash', 'scale');
+				setStr(pl, 'flash', 'salign');
+				setStr(pl, 'flash', 'wmode');
+				setStr(pl, 'flash', 'base');
+				setStr(pl, 'flash', 'flashvars');
+			break;
+
+			case "qt":
+				setBool(pl, 'qt', 'loop');
+				setBool(pl, 'qt', 'autoplay');
+				setBool(pl, 'qt', 'cache');
+				setBool(pl, 'qt', 'controller');
+				setBool(pl, 'qt', 'correction');
+				setBool(pl, 'qt', 'enablejavascript');
+				setBool(pl, 'qt', 'kioskmode');
+				setBool(pl, 'qt', 'autohref');
+				setBool(pl, 'qt', 'playeveryframe');
+				setBool(pl, 'qt', 'tarsetcache');
+				setStr(pl, 'qt', 'scale');
+				setStr(pl, 'qt', 'starttime');
+				setStr(pl, 'qt', 'endtime');
+				setStr(pl, 'qt', 'tarset');
+				setStr(pl, 'qt', 'qtsrcchokespeed');
+				setStr(pl, 'qt', 'volume');
+				setStr(pl, 'qt', 'qtsrc');
+			break;
+
+			case "shockwave":
+				setBool(pl, 'shockwave', 'sound');
+				setBool(pl, 'shockwave', 'progress');
+				setBool(pl, 'shockwave', 'autostart');
+				setBool(pl, 'shockwave', 'swliveconnect');
+				setStr(pl, 'shockwave', 'swvolume');
+				setStr(pl, 'shockwave', 'swstretchstyle');
+				setStr(pl, 'shockwave', 'swstretchhalign');
+				setStr(pl, 'shockwave', 'swstretchvalign');
+			break;
+
+			case "wmp":
+				setBool(pl, 'wmp', 'autostart');
+				setBool(pl, 'wmp', 'enabled');
+				setBool(pl, 'wmp', 'enablecontextmenu');
+				setBool(pl, 'wmp', 'fullscreen');
+				setBool(pl, 'wmp', 'invokeurls');
+				setBool(pl, 'wmp', 'mute');
+				setBool(pl, 'wmp', 'stretchtofit');
+				setBool(pl, 'wmp', 'windowlessvideo');
+				setStr(pl, 'wmp', 'balance');
+				setStr(pl, 'wmp', 'baseurl');
+				setStr(pl, 'wmp', 'captioningid');
+				setStr(pl, 'wmp', 'currentmarker');
+				setStr(pl, 'wmp', 'currentposition');
+				setStr(pl, 'wmp', 'defaultframe');
+				setStr(pl, 'wmp', 'playcount');
+				setStr(pl, 'wmp', 'rate');
+				setStr(pl, 'wmp', 'uimode');
+				setStr(pl, 'wmp', 'volume');
+			break;
+
+			case "rmp":
+				setBool(pl, 'rmp', 'autostart');
+				setBool(pl, 'rmp', 'loop');
+				setBool(pl, 'rmp', 'autogotourl');
+				setBool(pl, 'rmp', 'center');
+				setBool(pl, 'rmp', 'imagestatus');
+				setBool(pl, 'rmp', 'maintainaspect');
+				setBool(pl, 'rmp', 'nojava');
+				setBool(pl, 'rmp', 'prefetch');
+				setBool(pl, 'rmp', 'shuffle');
+				setStr(pl, 'rmp', 'console');
+				setStr(pl, 'rmp', 'controls');
+				setStr(pl, 'rmp', 'numloop');
+				setStr(pl, 'rmp', 'scriptcallbacks');
+			break;
+		}
+
+		setStr(pl, null, 'src');
+		setStr(pl, null, 'id');
+		setStr(pl, null, 'name');
+		setStr(pl, null, 'vspace');
+		setStr(pl, null, 'hspace');
+		setStr(pl, null, 'bgcolor');
+		setStr(pl, null, 'align');
+		setStr(pl, null, 'width');
+		setStr(pl, null, 'height');
+
+		if ((val = ed.dom.getAttrib(fe, "width")) != "")
+			pl.width = f.width.value = val;
+
+		if ((val = ed.dom.getAttrib(fe, "height")) != "")
+			pl.height = f.height.value = val;
+
+		oldWidth = pl.width ? parseInt(pl.width) : 0;
+		oldHeight = pl.height ? parseInt(pl.height) : 0;
+	} else
+		oldWidth = oldHeight = 0;
+
+	selectByValue(f, 'media_type', type);
+	changedType(type);
+	updateColor('bgcolor_pick', 'bgcolor');
+
+	TinyMCE_EditableSelects.init();
+	generatePreview();
+}
+
+function insertMedia() {
+	var fe, f = document.forms[0], h;
+
+	tinyMCEPopup.restoreSelection();
+
+	if (!AutoValidator.validate(f)) {
+		alert(ed.getLang('invalid_data'));
+		return false;
+	}
+
+	f.width.value = f.width.value == "" ? 100 : f.width.value;
+	f.height.value = f.height.value == "" ? 100 : f.height.value;
+
+	fe = ed.selection.getNode();
+	if (fe != null && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {
+		switch (f.media_type.options[f.media_type.selectedIndex].value) {
+			case "flash":
+				fe.className = "mceItemFlash";
+				break;
+
+			case "flv":
+				fe.className = "mceItemFlashVideo";
+				break;
+
+			case "shockwave":
+				fe.className = "mceItemShockWave";
+				break;
+
+			case "qt":
+				fe.className = "mceItemQuickTime";
+				break;
+
+			case "wmp":
+				fe.className = "mceItemWindowsMedia";
+				break;
+
+			case "rmp":
+				fe.className = "mceItemRealMedia";
+				break;
+		}
+
+		if (fe.width != f.width.value || fe.height != f.height.height)
+			ed.execCommand('mceRepaint');
+
+		fe.title = serializeParameters();
+		fe.width = f.width.value;
+		fe.height = f.height.value;
+		fe.style.width = f.width.value + (f.width.value.indexOf('%') == -1 ? 'px' : '');
+		fe.style.height = f.height.value + (f.height.value.indexOf('%') == -1 ? 'px' : '');
+		fe.align = f.align.options[f.align.selectedIndex].value;
+	} else {
+		h = '<img src="' + tinyMCEPopup.getWindowArg("plugin_url") + '/img/trans.gif"' ;
+
+		switch (f.media_type.options[f.media_type.selectedIndex].value) {
+			case "flash":
+				h += ' class="mceItemFlash"';
+				break;
+
+			case "flv":
+				h += ' class="mceItemFlashVideo"';
+				break;
+
+			case "shockwave":
+				h += ' class="mceItemShockWave"';
+				break;
+
+			case "qt":
+				h += ' class="mceItemQuickTime"';
+				break;
+
+			case "wmp":
+				h += ' class="mceItemWindowsMedia"';
+				break;
+
+			case "rmp":
+				h += ' class="mceItemRealMedia"';
+				break;
+		}
+
+		h += ' title="' + serializeParameters() + '"';
+		h += ' width="' + f.width.value + '"';
+		h += ' height="' + f.height.value + '"';
+		h += ' align="' + f.align.options[f.align.selectedIndex].value + '"';
+
+		h += ' />';
+
+		ed.execCommand('mceInsertContent', false, h);
+	}
+
+	tinyMCEPopup.close();
+}
+
+function updatePreview() {
+	var f = document.forms[0], type;
+
+	f.width.value = f.width.value || '320';
+	f.height.value = f.height.value || '240';
+
+	type = getType(f.src.value);
+	selectByValue(f, 'media_type', type);
+	changedType(type);
+	generatePreview();
+}
+
+function getMediaListHTML() {
+	if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {
+		var html = "";
+
+		html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;updatePreview();">';
+		html += '<option value="">---</option>';
+
+		for (var i=0; i<tinyMCEMediaList.length; i++)
+			html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
+
+		html += '</select>';
+
+		return html;
+	}
+
+	return "";
+}
+
+function getType(v) {
+	var fo, i, c, el, x, f = document.forms[0];
+
+	fo = ed.getParam("media_types", "flash=swf;flv=flv;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';');
+
+	// YouTube
+	if (v.match(/watch\?v=(.+)(.*)/)) {
+		f.width.value = '425';
+		f.height.value = '350';
+		f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1];
+		return 'flash';
+	}
+
+	// Google video
+	if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) {
+		f.width.value = '425';
+		f.height.value = '326';
+		f.src.value = 'http://video.google.com/googleplayer.swf?docId=' + v.substring('http://video.google.com/videoplay?docid='.length) + '&hl=en';
+		return 'flash';
+	}
+
+	for (i=0; i<fo.length; i++) {
+		c = fo[i].split('=');
+
+		el = c[1].split(',');
+		for (x=0; x<el.length; x++)
+		if (v.indexOf('.' + el[x]) != -1)
+			return c[0];
+	}
+
+	return null;
+}
+
+function switchType(v) {
+	var t = getType(v), d = document, f = d.forms[0];
+
+	if (!t)
+		return;
+
+	selectByValue(d.forms[0], 'media_type', t);
+	changedType(t);
+
+	// Update qtsrc also
+	if (t == 'qt' && f.src.value.toLowerCase().indexOf('rtsp://') != -1) {
+		alert(ed.getLang("media_qt_stream_warn"));
+
+		if (f.qt_qtsrc.value == '')
+			f.qt_qtsrc.value = f.src.value;
+	}
+}
+
+function changedType(t) {
+	var d = document;
+
+	d.getElementById('flash_options').style.display = 'none';
+	d.getElementById('flv_options').style.display = 'none';
+	d.getElementById('qt_options').style.display = 'none';
+	d.getElementById('shockwave_options').style.display = 'none';
+	d.getElementById('wmp_options').style.display = 'none';
+	d.getElementById('rmp_options').style.display = 'none';
+	d.getElementById(t + '_options').style.display = 'block';
+}
+
+function serializeParameters() {
+	var d = document, f = d.forms[0], s = '';
+
+	switch (f.media_type.options[f.media_type.selectedIndex].value) {
+		case "flash":
+			s += getBool('flash', 'play', true);
+			s += getBool('flash', 'loop', true);
+			s += getBool('flash', 'menu', true);
+			s += getBool('flash', 'swliveconnect', false);
+			s += getStr('flash', 'quality');
+			s += getStr('flash', 'scale');
+			s += getStr('flash', 'salign');
+			s += getStr('flash', 'wmode');
+			s += getStr('flash', 'base');
+			s += getStr('flash', 'flashvars');
+		break;
+
+		case "qt":
+			s += getBool('qt', 'loop', false);
+			s += getBool('qt', 'autoplay', true);
+			s += getBool('qt', 'cache', false);
+			s += getBool('qt', 'controller', true);
+			s += getBool('qt', 'correction', false, 'none', 'full');
+			s += getBool('qt', 'enablejavascript', false);
+			s += getBool('qt', 'kioskmode', false);
+			s += getBool('qt', 'autohref', false);
+			s += getBool('qt', 'playeveryframe', false);
+			s += getBool('qt', 'targetcache', false);
+			s += getStr('qt', 'scale');
+			s += getStr('qt', 'starttime');
+			s += getStr('qt', 'endtime');
+			s += getStr('qt', 'target');
+			s += getStr('qt', 'qtsrcchokespeed');
+			s += getStr('qt', 'volume');
+			s += getStr('qt', 'qtsrc');
+		break;
+
+		case "shockwave":
+			s += getBool('shockwave', 'sound');
+			s += getBool('shockwave', 'progress');
+			s += getBool('shockwave', 'autostart');
+			s += getBool('shockwave', 'swliveconnect');
+			s += getStr('shockwave', 'swvolume');
+			s += getStr('shockwave', 'swstretchstyle');
+			s += getStr('shockwave', 'swstretchhalign');
+			s += getStr('shockwave', 'swstretchvalign');
+		break;
+
+		case "wmp":
+			s += getBool('wmp', 'autostart', true);
+			s += getBool('wmp', 'enabled', false);
+			s += getBool('wmp', 'enablecontextmenu', true);
+			s += getBool('wmp', 'fullscreen', false);
+			s += getBool('wmp', 'invokeurls', true);
+			s += getBool('wmp', 'mute', false);
+			s += getBool('wmp', 'stretchtofit', false);
+			s += getBool('wmp', 'windowlessvideo', false);
+			s += getStr('wmp', 'balance');
+			s += getStr('wmp', 'baseurl');
+			s += getStr('wmp', 'captioningid');
+			s += getStr('wmp', 'currentmarker');
+			s += getStr('wmp', 'currentposition');
+			s += getStr('wmp', 'defaultframe');
+			s += getStr('wmp', 'playcount');
+			s += getStr('wmp', 'rate');
+			s += getStr('wmp', 'uimode');
+			s += getStr('wmp', 'volume');
+		break;
+
+		case "rmp":
+			s += getBool('rmp', 'autostart', false);
+			s += getBool('rmp', 'loop', false);
+			s += getBool('rmp', 'autogotourl', true);
+			s += getBool('rmp', 'center', false);
+			s += getBool('rmp', 'imagestatus', true);
+			s += getBool('rmp', 'maintainaspect', false);
+			s += getBool('rmp', 'nojava', false);
+			s += getBool('rmp', 'prefetch', false);
+			s += getBool('rmp', 'shuffle', false);
+			s += getStr('rmp', 'console');
+			s += getStr('rmp', 'controls');
+			s += getStr('rmp', 'numloop');
+			s += getStr('rmp', 'scriptcallbacks');
+		break;
+	}
+
+	s += getStr(null, 'id');
+	s += getStr(null, 'name');
+	s += getStr(null, 'src');
+	s += getStr(null, 'align');
+	s += getStr(null, 'bgcolor');
+	s += getInt(null, 'vspace');
+	s += getInt(null, 'hspace');
+	s += getStr(null, 'width');
+	s += getStr(null, 'height');
+
+	s = s.length > 0 ? s.substring(0, s.length - 1) : s;
+
+	return s;
+}
+
+function setBool(pl, p, n) {
+	if (typeof(pl[n]) == "undefined")
+		return;
+
+	document.forms[0].elements[p + "_" + n].checked = pl[n];
+}
+
+function setStr(pl, p, n) {
+	var f = document.forms[0], e = f.elements[(p != null ? p + "_" : '') + n];
+
+	if (typeof(pl[n]) == "undefined")
+		return;
+
+	if (e.type == "text")
+		e.value = pl[n];
+	else
+		selectByValue(f, (p != null ? p + "_" : '') + n, pl[n]);
+}
+
+function getBool(p, n, d, tv, fv) {
+	var v = document.forms[0].elements[p + "_" + n].checked;
+
+	tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'";
+	fv = typeof(fv) == 'undefined' ? 'false' : "'" + jsEncode(fv) + "'";
+
+	return (v == d) ? '' : n + (v ? ':' + tv + ',' : ':' + fv + ',');
+}
+
+function getStr(p, n, d) {
+	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];
+	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;
+
+	if (n == 'src')
+		v = tinyMCEPopup.editor.convertURL(v, 'src', null);
+
+	return ((n == d || v == '') ? '' : n + ":'" + jsEncode(v) + "',");
+}
+
+function getInt(p, n, d) {
+	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];
+	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;
+
+	return ((n == d || v == '') ? '' : n + ":" + v.replace(/[^0-9]+/g, '') + ",");
+}
+
+function jsEncode(s) {
+	s = s.replace(new RegExp('\\\\', 'g'), '\\\\');
+	s = s.replace(new RegExp('"', 'g'), '\\"');
+	s = s.replace(new RegExp("'", 'g'), "\\'");
+
+	return s;
+}
+
+function generatePreview(c) {
+	var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh;
+
+	p.innerHTML = '<!-- x --->';
+
+	nw = parseInt(f.width.value);
+	nh = parseInt(f.height.value);
+
+	if (f.width.value != "" && f.height.value != "") {
+		if (f.constrain.checked) {
+			if (c == 'width' && oldWidth != 0) {
+				wp = nw / oldWidth;
+				nh = Math.round(wp * nh);
+				f.height.value = nh;
+			} else if (c == 'height' && oldHeight != 0) {
+				hp = nh / oldHeight;
+				nw = Math.round(hp * nw);
+				f.width.value = nw;
+			}
+		}
+	}
+
+	if (f.width.value != "")
+		oldWidth = nw;
+
+	if (f.height.value != "")
+		oldHeight = nh;
+
+	// After constrain
+	pl = serializeParameters();
+
+	switch (f.media_type.options[f.media_type.selectedIndex].value) {
+		case "flash":
+			cls = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
+			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
+			type = 'application/x-shockwave-flash';
+			break;
+
+		case "shockwave":
+			cls = 'clsid:166B1BCA-3F9C-11CF-8075-444553540000';
+			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
+			type = 'application/x-director';
+			break;
+
+		case "qt":
+			cls = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';
+			codebase = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
+			type = 'video/quicktime';
+			break;
+
+		case "wmp":
+			cls = ed.getParam('media_wmp6_compatible') ? 'clsid:05589FA1-C356-11CE-BF01-00AA0055595A' : 'clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6';
+			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
+			type = 'application/x-mplayer2';
+			break;
+
+		case "rmp":
+			cls = 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA';
+			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
+			type = 'audio/x-pn-realaudio-plugin';
+			break;
+	}
+
+	if (pl == '') {
+		p.innerHTML = '';
+		return;
+	}
+
+	pl = tinyMCEPopup.editor.plugins.media._parse(pl);
+
+	if (!pl.src) {
+		p.innerHTML = '';
+		return;
+	}
+
+	pl.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(pl.src);
+	pl.width = !pl.width ? 100 : pl.width;
+	pl.height = !pl.height ? 100 : pl.height;
+	pl.id = !pl.id ? 'obj' : pl.id;
+	pl.name = !pl.name ? 'eobj' : pl.name;
+	pl.align = !pl.align ? '' : pl.align;
+
+	// Avoid annoying warning about insecure items
+	if (!tinymce.isIE || document.location.protocol != 'https:') {
+		h += '<object classid="clsid:' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
+
+		for (n in pl) {
+			h += '<param name="' + n + '" value="' + pl[n] + '">';
+
+			// Add extra url parameter if it's an absolute URL
+			if (n == 'src' && pl[n].indexOf('://') != -1)
+				h += '<param name="url" value="' + pl[n] + '" />';
+		}
+	}
+
+	h += '<embed type="' + type + '" ';
+
+	for (n in pl)
+		h += n + '="' + pl[n] + '" ';
+
+	h += '></embed>';
+
+	// Avoid annoying warning about insecure items
+	if (!tinymce.isIE || document.location.protocol != 'https:')
+		h += '</object>';
+
+	p.innerHTML = "<!-- x --->" + h;
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
new file mode 100644
index 000000000..cb72e82a5
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
@@ -0,0 +1,103 @@
+tinyMCE.addI18n('en.media_dlg',{
+title:"Insert / edit embedded media",
+general:"General",
+advanced:"Advanced",
+file:"File/URL",
+list:"List",
+size:"Dimensions",
+preview:"Preview",
+constrain_proportions:"Constrain proportions",
+type:"Type",
+id:"Id",
+name:"Name",
+class_name:"Class",
+vspace:"V-Space",
+hspace:"H-Space",
+play:"Auto play",
+loop:"Loop",
+menu:"Show menu",
+quality:"Quality",
+scale:"Scale",
+align:"Align",
+salign:"SAlign",
+wmode:"WMode",
+bgcolor:"Background",
+base:"Base",
+flashvars:"Flashvars",
+liveconnect:"SWLiveConnect",
+autohref:"AutoHREF",
+cache:"Cache",
+hidden:"Hidden",
+controller:"Controller",
+kioskmode:"Kiosk mode",
+playeveryframe:"Play every frame",
+targetcache:"Target cache",
+correction:"No correction",
+enablejavascript:"Enable JavaScript",
+starttime:"Start time",
+endtime:"End time",
+href:"Href",
+qtsrcchokespeed:"Choke speed",
+target:"Target",
+volume:"Volume",
+autostart:"Auto start",
+enabled:"Enabled",
+fullscreen:"Fullscreen",
+invokeurls:"Invoke URLs",
+mute:"Mute",
+stretchtofit:"Stretch to fit",
+windowlessvideo:"Windowless video",
+balance:"Balance",
+baseurl:"Base URL",
+captioningid:"Captioning id",
+currentmarker:"Current marker",
+currentposition:"Current position",
+defaultframe:"Default frame",
+playcount:"Play count",
+rate:"Rate",
+uimode:"UI Mode",
+flash_options:"Flash options",
+qt_options:"Quicktime options",
+wmp_options:"Windows media player options",
+rmp_options:"Real media player options",
+shockwave_options:"Shockwave options",
+autogotourl:"Auto goto URL",
+center:"Center",
+imagestatus:"Image status",
+maintainaspect:"Maintain aspect",
+nojava:"No java",
+prefetch:"Prefetch",
+shuffle:"Shuffle",
+console:"Console",
+numloop:"Num loops",
+controls:"Controls",
+scriptcallbacks:"Script callbacks",
+swstretchstyle:"Stretch style",
+swstretchhalign:"Stretch H-Align",
+swstretchvalign:"Stretch V-Align",
+sound:"Sound",
+progress:"Progress",
+qtsrc:"QT Src",
+qt_stream_warn:"Streamed rtsp resources should be added to the QT Src field under the advanced tab.\nYou should also add a non streamed version to the Src field..",
+align_top:"Top",
+align_right:"Right",
+align_bottom:"Bottom",
+align_left:"Left",
+align_center:"Center",
+align_top_left:"Top left",
+align_top_right:"Top right",
+align_bottom_left:"Bottom left",
+align_bottom_right:"Bottom right",
+flv_options:"Flash video options",
+flv_scalemode:"Scale mode",
+flv_buffer:"Buffer",
+flv_startimage:"Start image",
+flv_starttime:"Start time",
+flv_defaultvolume:"Default volumne",
+flv_hiddengui:"Hidden GUI",
+flv_autostart:"Auto start",
+flv_loop:"Loop",
+flv_showscalemodes:"Show scale modes",
+flv_smoothvideo:"Smooth video",
+flv_jscallback:"JS Callback"
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/media.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/media.htm
new file mode 100644
index 000000000..8b3bc1d6b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/media/media.htm
@@ -0,0 +1,824 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#media_dlg.title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/media.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/validate.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<link href="css/media.css" rel="stylesheet" type="text/css" />

+	<base target="_self" />

+</head>

+<body style="display: none">

+    <form onsubmit="insertMedia();return false;" action="#">

+		<div class="tabs">

+			<ul>

+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');generatePreview();" onmousedown="return false;">{#media_dlg.general}</a></span></li>

+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#media_dlg.advanced}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="general_panel" class="panel current">

+				<fieldset>

+					<legend>{#media_dlg.general}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+							<tr>

+								<td><label for="media_type">{#media_dlg.type}</label></td>

+								<td>

+									<select id="media_type" name="media_type" onchange="changedType(this.value);generatePreview();">

+										<option value="flash">Flash</option>

+										<!-- <option value="flv">Flash video (FLV)</option> -->

+										<option value="qt">Quicktime</option>

+										<option value="shockwave">Shockwave</option>

+										<option value="wmp">Windows Media</option>

+										<option value="rmp">Real Media</option>

+									</select>

+								</td>

+							</tr>

+							<tr>

+							<td><label for="src">{#media_dlg.file}</label></td>

+							  <td>

+									<table border="0" cellspacing="0" cellpadding="0">

+									  <tr>

+										<td><input id="src" name="src" type="text" value="" class="mceFocus" onchange="switchType(this.value);generatePreview();" /></td>

+										<td id="filebrowsercontainer">&nbsp;</td>

+									  </tr>

+									</table>

+								</td>

+							</tr>

+							<tr id="linklistrow">

+								<td><label for="linklist">{#media_dlg.list}</label></td>

+								<td id="linklistcontainer">&nbsp;</td>

+							</tr>

+							<tr>

+								<td><label for="width">{#media_dlg.size}</label></td>

+								<td>

+									<table border="0" cellpadding="0" cellspacing="0">

+										<tr>

+											<td><input type="text" id="width" name="width" value="" class="size" onchange="generatePreview('width');" /> x <input type="text" id="height" name="height" value="" class="size"  onchange="generatePreview('height');" /></td>

+											<td>&nbsp;&nbsp;<input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>

+											<td><label id="constrainlabel" for="constrain">{#media_dlg.constrain_proportions}</label></td>

+										</tr>

+									</table>

+								</td>

+							</tr>

+					</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#media_dlg.preview}</legend>

+					<div id="prev"></div>

+				</fieldset>

+			</div>

+

+			<div id="advanced_panel" class="panel">

+				<fieldset>

+					<legend>{#media_dlg.advanced}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0" width="100%">

+						<tr>

+							<td><label for="id">{#media_dlg.id}</label></td>

+							<td><input type="text" id="id" name="id" onchange="generatePreview();" /></td>

+							<td><label for="name">{#media_dlg.name}</label></td>

+							<td><input type="text" id="name" name="name" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="align">{#media_dlg.align}</label></td>

+							<td>

+								<select id="align" name="align" onchange="generatePreview();">

+									<option value="">{#not_set}</option> 

+									<option value="top">{#media_dlg.align_top}</option>

+									<option value="right">{#media_dlg.align_right}</option>

+									<option value="bottom">{#media_dlg.align_bottom}</option>

+									<option value="left">{#media_dlg.align_left}</option>

+								</select>

+							</td>

+

+							<td><label for="bgcolor">{#media_dlg.bgcolor}</label></td>

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');generatePreview();" /></td>

+										<td id="bgcolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="vspace">{#media_dlg.vspace}</label></td>

+							<td><input type="text" id="vspace" name="vspace" class="number" onchange="generatePreview();" /></td>

+							<td><label for="hspace">{#media_dlg.hspace}</label></td>

+							<td><input type="text" id="hspace" name="hspace" class="number" onchange="generatePreview();" /></td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="flash_options">

+					<legend>{#media_dlg.flash_options}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td><label for="flash_quality">{#media_dlg.quality}</label></td>

+							<td>

+								<select id="flash_quality" name="flash_quality" onchange="generatePreview();">

+									<option value="">{#not_set}</option> 

+									<option value="high">high</option>

+									<option value="low">low</option>

+									<option value="autolow">autolow</option>

+									<option value="autohigh">autohigh</option>

+									<option value="best">best</option>

+								</select>

+							</td>

+

+							<td><label for="flash_scale">{#media_dlg.scale}</label></td>

+							<td>

+								<select id="flash_scale" name="flash_scale" onchange="generatePreview();">

+									<option value="">{#not_set}</option> 

+									<option value="showall">showall</option>

+									<option value="noborder">noborder</option>

+									<option value="exactfit">exactfit</option>

+									<option value="noscale">noscale</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="flash_wmode">{#media_dlg.wmode}</label></td>

+							<td>

+								<select id="flash_wmode" name="flash_wmode" onchange="generatePreview();">

+									<option value="">{#not_set}</option> 

+									<option value="window">window</option>

+									<option value="opaque">opaque</option>

+									<option value="transparent">transparent</option>

+								</select>

+							</td>

+

+							<td><label for="flash_salign">{#media_dlg.salign}</label></td>

+							<td>

+								<select id="flash_salign" name="flash_salign" onchange="generatePreview();">

+									<option value="">{#not_set}</option> 

+									<option value="l">{#media_dlg.align_left}</option>

+									<option value="t">{#media_dlg.align_top}</option>

+									<option value="r">{#media_dlg.align_right}</option>

+									<option value="b">{#media_dlg.align_bottom}</option>

+									<option value="tl">{#media_dlg.align_top_left}</option>

+									<option value="tr">{#media_dlg.align_top_right}</option>

+									<option value="bl">{#media_dlg.align_bottom_left}</option>

+									<option value="br">{#media_dlg.align_bottom_right}</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flash_play" name="flash_play" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="flash_play">{#media_dlg.play}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flash_loop" name="flash_loop" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="flash_loop">{#media_dlg.loop}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flash_menu" name="flash_menu" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="flash_menu">{#media_dlg.menu}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flash_swliveconnect" name="flash_swliveconnect" onchange="generatePreview();" /></td>

+										<td><label for="flash_swliveconnect">{#media_dlg.liveconnect}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+					</table>

+

+					<table>

+						<tr>

+							<td><label for="flash_base">{#media_dlg.base}</label></td>

+							<td><input type="text" id="flash_base" name="flash_base" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="flash_flashvars">{#media_dlg.flashvars}</label></td>

+							<td><input type="text" id="flash_flashvars" name="flash_flashvars" onchange="generatePreview();" /></td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="flv_options">

+					<legend>{#media_dlg.flv_options}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td><label for="flv_scalemode">{#media_dlg.flv_scalemode}</label></td>

+							<td>

+								<select id="flv_scalemode" name="flv_scalemode" onchange="generatePreview();">

+									<option value="">{#not_set}</option> 

+									<option value="none">none</option>

+									<option value="double">double</option>

+									<option value="full">full</option>

+								</select>

+							</td>

+

+							<td><label for="flv_buffer">{#media_dlg.flv_buffer}</label></td>

+							<td><input type="text" id="flv_buffer" name="flv_buffer" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="flv_startimage">{#media_dlg.flv_startimage}</label></td>

+							<td><input type="text" id="flv_startimage" name="flv_startimage" onchange="generatePreview();" /></td>

+

+							<td><label for="flv_starttime">{#media_dlg.flv_starttime}</label></td>

+							<td><input type="text" id="flv_starttime" name="flv_starttime" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="flv_defaultvolume">{#media_dlg.flv_defaultvolume}</label></td>

+							<td><input type="text" id="flv_defaultvolume" name="flv_defaultvolume" onchange="generatePreview();" /></td>

+

+							<td><label for="flv_starttime">{#media_dlg.flv_starttime}</label></td>

+							<td><input type="text" id="flv_starttime" name="flv_starttime" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flv_hiddengui" name="flv_hiddengui" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="flv_hiddengui">{#media_dlg.flv_hiddengui}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flv_autostart" name="flv_autostart" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="flv_autostart">{#media_dlg.flv_autostart}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flv_loop" name="flv_loop" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="flv_loop">{#media_dlg.flv_loop}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flv_showscalemodes" name="flv_showscalemodes" onchange="generatePreview();" /></td>

+										<td><label for="flv_showscalemodes">{#media_dlg.flv_showscalemodes}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flv_smoothvideo" name="flash_flv_flv_smoothvideosmoothvideo" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="flv_smoothvideo">{#media_dlg.flv_smoothvideo}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flv_jscallback" name="flv_jscallback" onchange="generatePreview();" /></td>

+										<td><label for="flv_jscallback">{#media_dlg.flv_jscallback}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="qt_options">

+					<legend>{#media_dlg.qt_options}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_loop" name="qt_loop" onchange="generatePreview();" /></td>

+										<td><label for="qt_loop">{#media_dlg.loop}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_autoplay" name="qt_autoplay" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="qt_autoplay">{#media_dlg.play}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_cache" name="qt_cache" onchange="generatePreview();" /></td>

+										<td><label for="qt_cache">{#media_dlg.cache}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_controller" name="qt_controller" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="qt_controller">{#media_dlg.controller}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_correction" name="qt_correction" onchange="generatePreview();" /></td>

+										<td><label for="qt_correction">{#media_dlg.correction}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_enablejavascript" name="qt_enablejavascript" onchange="generatePreview();" /></td>

+										<td><label for="qt_enablejavascript">{#media_dlg.enablejavascript}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_kioskmode" name="qt_kioskmode" onchange="generatePreview();" /></td>

+										<td><label for="qt_kioskmode">{#media_dlg.kioskmode}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_autohref" name="qt_autohref" onchange="generatePreview();" /></td>

+										<td><label for="qt_autohref">{#media_dlg.autohref}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_playeveryframe" name="qt_playeveryframe" onchange="generatePreview();" /></td>

+										<td><label for="qt_playeveryframe">{#media_dlg.playeveryframe}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_targetcache" name="qt_targetcache" onchange="generatePreview();" /></td>

+										<td><label for="qt_targetcache">{#media_dlg.targetcache}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="qt_scale">{#media_dlg.scale}</label></td>

+							<td><select id="qt_scale" name="qt_scale" class="mceEditableSelect" onchange="generatePreview();">

+									<option value="">{#not_set}</option> 

+									<option value="tofit">tofit</option>

+									<option value="aspect">aspect</option>

+								</select>

+							</td>

+

+							<td colspan="2">&nbsp;</td>

+						</tr>

+

+						<tr>

+							<td><label for="qt_starttime">{#media_dlg.starttime}</label></td>

+							<td><input type="text" id="qt_starttime" name="qt_starttime" onchange="generatePreview();" /></td>

+

+							<td><label for="qt_endtime">{#media_dlg.endtime}</label></td>

+							<td><input type="text" id="qt_endtime" name="qt_endtime" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="qt_target">{#media_dlg.target}</label></td>

+							<td><input type="text" id="qt_target" name="qt_target" onchange="generatePreview();" /></td>

+

+							<td><label for="qt_href">{#media_dlg.href}</label></td>

+							<td><input type="text" id="qt_href" name="qt_href" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="qt_qtsrcchokespeed">{#media_dlg.qtsrcchokespeed}</label></td>

+							<td><input type="text" id="qt_qtsrcchokespeed" name="qt_qtsrcchokespeed" onchange="generatePreview();" /></td>

+

+							<td><label for="qt_volume">{#media_dlg.volume}</label></td>

+							<td><input type="text" id="qt_volume" name="qt_volume" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="qt_qtsrc">{#media_dlg.qtsrc}</label></td>

+							<td colspan="4">

+							<table border="0" cellspacing="0" cellpadding="0">

+								  <tr>

+									<td><input type="text" id="qt_qtsrc" name="qt_qtsrc" onchange="generatePreview();" /></td>

+									<td id="qtsrcfilebrowsercontainer">&nbsp;</td>

+								  </tr>

+							</table>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="wmp_options">

+					<legend>{#media_dlg.wmp_options}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_autostart" name="wmp_autostart" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="wmp_autostart">{#media_dlg.autostart}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_enabled" name="wmp_enabled" onchange="generatePreview();" /></td>

+										<td><label for="wmp_enabled">{#media_dlg.enabled}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_enablecontextmenu" name="wmp_enablecontextmenu" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="wmp_enablecontextmenu">{#media_dlg.menu}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_fullscreen" name="wmp_fullscreen" onchange="generatePreview();" /></td>

+										<td><label for="wmp_fullscreen">{#media_dlg.fullscreen}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_invokeurls" name="wmp_invokeurls" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="wmp_invokeurls">{#media_dlg.invokeurls}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_mute" name="wmp_mute" onchange="generatePreview();" /></td>

+										<td><label for="wmp_mute">{#media_dlg.mute}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_stretchtofit" name="wmp_stretchtofit" onchange="generatePreview();" /></td>

+										<td><label for="wmp_stretchtofit">{#media_dlg.stretchtofit}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_windowlessvideo" name="wmp_windowlessvideo" onchange="generatePreview();" /></td>

+										<td><label for="wmp_windowlessvideo">{#media_dlg.windowlessvideo}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="wmp_balance">{#media_dlg.balance}</label></td>

+							<td><input type="text" id="wmp_balance" name="wmp_balance" onchange="generatePreview();" /></td>

+

+							<td><label for="wmp_baseurl">{#media_dlg.baseurl}</label></td>

+							<td><input type="text" id="wmp_baseurl" name="wmp_baseurl" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="wmp_captioningid">{#media_dlg.captioningid}</label></td>

+							<td><input type="text" id="wmp_captioningid" name="wmp_captioningid" onchange="generatePreview();" /></td>

+

+							<td><label for="wmp_currentmarker">{#media_dlg.currentmarker}</label></td>

+							<td><input type="text" id="wmp_currentmarker" name="wmp_currentmarker" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="wmp_currentposition">{#media_dlg.currentposition}</label></td>

+							<td><input type="text" id="wmp_currentposition" name="wmp_currentposition" onchange="generatePreview();" /></td>

+

+							<td><label for="wmp_defaultframe">{#media_dlg.defaultframe}</label></td>

+							<td><input type="text" id="wmp_defaultframe" name="wmp_defaultframe" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="wmp_playcount">{#media_dlg.playcount}</label></td>

+							<td><input type="text" id="wmp_playcount" name="wmp_playcount" onchange="generatePreview();" /></td>

+

+							<td><label for="wmp_rate">{#media_dlg.rate}</label></td>

+							<td><input type="text" id="wmp_rate" name="wmp_rate" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="wmp_uimode">{#media_dlg.uimode}</label></td>

+							<td><input type="text" id="wmp_uimode" name="wmp_uimode" onchange="generatePreview();" /></td>

+

+							<td><label for="wmp_volume">{#media_dlg.volume}</label></td>

+							<td><input type="text" id="wmp_volume" name="wmp_volume" onchange="generatePreview();" /></td>

+						</tr>

+

+					</table>

+				</fieldset>

+

+				<fieldset id="rmp_options">

+					<legend>{#media_dlg.rmp_options}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_autostart" name="rmp_autostart" onchange="generatePreview();" /></td>

+										<td><label for="rmp_autostart">{#media_dlg.autostart}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_loop" name="rmp_loop" onchange="generatePreview();" /></td>

+										<td><label for="rmp_loop">{#media_dlg.loop}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_autogotourl" name="rmp_autogotourl" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="rmp_autogotourl">{#media_dlg.autogotourl}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_center" name="rmp_center" onchange="generatePreview();" /></td>

+										<td><label for="rmp_center">{#media_dlg.center}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_imagestatus" name="rmp_imagestatus" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="rmp_imagestatus">{#media_dlg.imagestatus}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_maintainaspect" name="rmp_maintainaspect" onchange="generatePreview();" /></td>

+										<td><label for="rmp_maintainaspect">{#media_dlg.maintainaspect}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_nojava" name="rmp_nojava" onchange="generatePreview();" /></td>

+										<td><label for="rmp_nojava">{#media_dlg.nojava}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_prefetch" name="rmp_prefetch" onchange="generatePreview();" /></td>

+										<td><label for="rmp_prefetch">{#media_dlg.prefetch}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_shuffle" name="rmp_shuffle" onchange="generatePreview();" /></td>

+										<td><label for="rmp_shuffle">{#media_dlg.shuffle}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								&nbsp;

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="rmp_console">{#media_dlg.console}</label></td>

+							<td><input type="text" id="rmp_console" name="rmp_console" onchange="generatePreview();" /></td>

+

+							<td><label for="rmp_controls">{#media_dlg.controls}</label></td>

+							<td><input type="text" id="rmp_controls" name="rmp_controls" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="rmp_numloop">{#media_dlg.numloop}</label></td>

+							<td><input type="text" id="rmp_numloop" name="rmp_numloop" onchange="generatePreview();" /></td>

+

+							<td><label for="rmp_scriptcallbacks">{#media_dlg.scriptcallbacks}</label></td>

+							<td><input type="text" id="rmp_scriptcallbacks" name="rmp_scriptcallbacks" onchange="generatePreview();" /></td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="shockwave_options">

+					<legend>{#media_dlg.shockwave_options}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td><label for="shockwave_swstretchstyle">{#media_dlg.swstretchstyle}</label></td>

+							<td>

+								<select id="shockwave_swstretchstyle" name="shockwave_swstretchstyle" onchange="generatePreview();">

+									<option value="none">{#not_set}</option>

+									<option value="meet">Meet</option>

+									<option value="fill">Fill</option>

+									<option value="stage">Stage</option>

+								</select>

+							</td>

+

+							<td><label for="shockwave_swvolume">{#media_dlg.volume}</label></td>

+							<td><input type="text" id="shockwave_swvolume" name="shockwave_swvolume" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="shockwave_swstretchhalign">{#media_dlg.swstretchhalign}</label></td>

+							<td>

+								<select id="shockwave_swstretchhalign" name="shockwave_swstretchhalign" onchange="generatePreview();">

+									<option value="none">{#not_set}</option>

+									<option value="left">{#media_dlg.align_left}</option>

+									<option value="center">{#media_dlg.align_center}</option>

+									<option value="right">{#media_dlg.align_right}</option>

+								</select>

+							</td>

+

+							<td><label for="shockwave_swstretchvalign">{#media_dlg.swstretchvalign}</label></td>

+							<td>

+								<select id="shockwave_swstretchvalign" name="shockwave_swstretchvalign" onchange="generatePreview();">

+									<option value="none">{#not_set}</option>

+									<option value="meet">Meet</option>

+									<option value="fill">Fill</option>

+									<option value="stage">Stage</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="shockwave_autostart" name="shockwave_autostart" onchange="generatePreview();" checked="checked" /></td>

+										<td><label for="shockwave_autostart">{#media_dlg.autostart}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="shockwave_sound" name="shockwave_sound" onchange="generatePreview();" checked="checked" /></td>

+										<td><label for="shockwave_sound">{#media_dlg.sound}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="shockwave_swliveconnect" name="shockwave_swliveconnect" onchange="generatePreview();" /></td>

+										<td><label for="shockwave_swliveconnect">{#media_dlg.liveconnect}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="shockwave_progress" name="shockwave_progress" onchange="generatePreview();" checked="checked" /></td>

+										<td><label for="shockwave_progress">{#media_dlg.progress}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<div style="float: left">

+				<input type="submit" id="insert" name="insert" value="{#insert}" />

+			</div>

+

+			<div style="float: right">

+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+			</div>

+		</div>

+	</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
new file mode 100644
index 000000000..4fce503c1
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.Nonbreaking',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mceNonBreaking',function(){ed.execCommand('mceInsertContent',false,(ed.plugins.visualchars&&ed.plugins.visualchars.state)?'<span class="mceItemHidden mceVisualNbsp">&middot;</span>':'&nbsp;');});ed.addButton('nonbreaking',{title:'nonbreaking.nonbreaking_desc',cmd:'mceNonBreaking'});if(ed.getParam('nonbreaking_force_tab')){ed.onKeyDown.add(function(ed,e){if(tinymce.isIE&&e.keyCode==9){ed.execCommand('mceNonBreaking');ed.execCommand('mceNonBreaking');ed.execCommand('mceNonBreaking');tinymce.dom.Event.cancel(e);}});}},getInfo:function(){return{longname:'Nonbreaking space',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('nonbreaking',tinymce.plugins.Nonbreaking);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
new file mode 100644
index 000000000..b19255090
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
@@ -0,0 +1,50 @@
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Nonbreaking', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceNonBreaking', function() {
+				ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span class="mceItemHidden mceVisualNbsp">&middot;</span>' : '&nbsp;');
+			});
+
+			// Register buttons
+			ed.addButton('nonbreaking', {title : 'nonbreaking.nonbreaking_desc', cmd : 'mceNonBreaking'});
+
+			if (ed.getParam('nonbreaking_force_tab')) {
+				ed.onKeyDown.add(function(ed, e) {
+					if (tinymce.isIE && e.keyCode == 9) {
+						ed.execCommand('mceNonBreaking');
+						ed.execCommand('mceNonBreaking');
+						ed.execCommand('mceNonBreaking');
+						tinymce.dom.Event.cancel(e);
+					}
+				});
+			}
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Nonbreaking space',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+
+		// Private methods
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('nonbreaking', tinymce.plugins.Nonbreaking);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
new file mode 100644
index 000000000..8a1b8f075
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var Event=tinymce.dom.Event;tinymce.create('tinymce.plugins.NonEditablePlugin',{init:function(ed,url){var t=this,editClass,nonEditClass;t.editor=ed;editClass=ed.getParam("noneditable_editable_class","mceEditable");nonEditClass=ed.getParam("noneditable_noneditable_class","mceNonEditable");ed.onNodeChange.addToTop(function(ed,cm,n){var sc,ec;sc=ed.dom.getParent(ed.selection.getStart(),function(n){return ed.dom.hasClass(n,nonEditClass);});ec=ed.dom.getParent(ed.selection.getEnd(),function(n){return ed.dom.hasClass(n,nonEditClass);});if(sc||ec){t._setDisabled(1);return false;}else t._setDisabled(0);});},getInfo:function(){return{longname:'Non editable elements',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_block:function(ed,e){var k=e.keyCode;if((k>32&&k<41)||(k>111&&k<124))return;return Event.cancel(e);},_setDisabled:function(s){var t=this,ed=t.editor;tinymce.each(ed.controlManager.controls,function(c){c.setDisabled(s);});if(s!==t.disabled){if(s){ed.onKeyDown.addToTop(t._block);ed.onKeyPress.addToTop(t._block);ed.onKeyUp.addToTop(t._block);ed.onPaste.addToTop(t._block);}else{ed.onKeyDown.remove(t._block);ed.onKeyPress.remove(t._block);ed.onKeyUp.remove(t._block);ed.onPaste.remove(t._block);}t.disabled=s;}}});tinymce.PluginManager.add('noneditable',tinymce.plugins.NonEditablePlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
new file mode 100644
index 000000000..ff93b34ca
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
@@ -0,0 +1,87 @@
+/**
+ * $Id: editor_plugin_src.js 743 2008-03-23 17:47:33Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var Event = tinymce.dom.Event;
+
+	tinymce.create('tinymce.plugins.NonEditablePlugin', {
+		init : function(ed, url) {
+			var t = this, editClass, nonEditClass;
+
+			t.editor = ed;
+			editClass = ed.getParam("noneditable_editable_class", "mceEditable");
+			nonEditClass = ed.getParam("noneditable_noneditable_class", "mceNonEditable");
+
+			ed.onNodeChange.addToTop(function(ed, cm, n) {
+				var sc, ec;
+
+				// Block if start or end is inside a non editable element
+				sc = ed.dom.getParent(ed.selection.getStart(), function(n) {
+					return ed.dom.hasClass(n, nonEditClass);
+				});
+
+				ec = ed.dom.getParent(ed.selection.getEnd(), function(n) {
+					return ed.dom.hasClass(n, nonEditClass);
+				});
+
+				// Block or unblock
+				if (sc || ec) {
+					t._setDisabled(1);
+					return false;
+				} else
+					t._setDisabled(0);
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Non editable elements',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		_block : function(ed, e) {
+			var k = e.keyCode;
+
+			// Don't block arrow keys, pg up/down, and F1-F12
+			if ((k > 32 && k < 41) || (k > 111 && k < 124))
+				return;
+
+			return Event.cancel(e);
+		},
+
+		_setDisabled : function(s) {
+			var t = this, ed = t.editor;
+
+			tinymce.each(ed.controlManager.controls, function(c) {
+				c.setDisabled(s);
+			});
+
+			if (s !== t.disabled) {
+				if (s) {
+					ed.onKeyDown.addToTop(t._block);
+					ed.onKeyPress.addToTop(t._block);
+					ed.onKeyUp.addToTop(t._block);
+					ed.onPaste.addToTop(t._block);
+				} else {
+					ed.onKeyDown.remove(t._block);
+					ed.onKeyPress.remove(t._block);
+					ed.onKeyUp.remove(t._block);
+					ed.onPaste.remove(t._block);
+				}
+
+				t.disabled = s;
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('noneditable', tinymce.plugins.NonEditablePlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css
new file mode 100644
index 000000000..c949d58cc
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css
@@ -0,0 +1 @@
+.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../img/pagebreak.gif) no-repeat center top;}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js
new file mode 100644
index 000000000..177ea95ba
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.PageBreakPlugin',{init:function(ed,url){var pb='<img src="'+url+'/img/trans.gif" class="mcePageBreak mceItemNoResize" />',cls='mcePageBreak',sep=ed.getParam('pagebreak_separator','<!-- pagebreak -->'),pbRE;pbRE=new RegExp(sep.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(a){return'\\'+a;}),'g');ed.addCommand('mcePageBreak',function(){ed.execCommand('mceInsertContent',0,pb);});ed.addButton('pagebreak',{title:'pagebreak.desc',cmd:cls});ed.onInit.add(function(){if(ed.settings.content_css!==false)ed.dom.loadCSS(url+"/css/content.css");if(ed.theme.onResolveName){ed.theme.onResolveName.add(function(th,o){if(o.node.nodeName=='IMG'&&ed.dom.hasClass(o.node,cls))o.name='pagebreak';});}});ed.onClick.add(function(ed,e){e=e.target;if(e.nodeName==='IMG'&&ed.dom.hasClass(e,cls))ed.selection.select(e);});ed.onNodeChange.add(function(ed,cm,n){cm.setActive('pagebreak',n.nodeName==='IMG'&&ed.dom.hasClass(n,cls));});ed.onBeforeSetContent.add(function(ed,o){o.content=o.content.replace(pbRE,pb);});ed.onPostProcess.add(function(ed,o){if(o.get)o.content=o.content.replace(/<img[^>]+>/g,function(im){if(im.indexOf('class="mcePageBreak')!==-1)im=sep;return im;});});},getInfo:function(){return{longname:'PageBreak',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('pagebreak',tinymce.plugins.PageBreakPlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js
new file mode 100644
index 000000000..8f0a240db
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js
@@ -0,0 +1,74 @@
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.PageBreakPlugin', {
+		init : function(ed, url) {
+			var pb = '<img src="' + url + '/img/trans.gif" class="mcePageBreak mceItemNoResize" />', cls = 'mcePageBreak', sep = ed.getParam('pagebreak_separator', '<!-- pagebreak -->'), pbRE;
+
+			pbRE = new RegExp(sep.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g, function(a) {return '\\' + a;}), 'g');
+
+			// Register commands
+			ed.addCommand('mcePageBreak', function() {
+				ed.execCommand('mceInsertContent', 0, pb);
+			});
+
+			// Register buttons
+			ed.addButton('pagebreak', {title : 'pagebreak.desc', cmd : cls});
+
+			ed.onInit.add(function() {
+				if (ed.settings.content_css !== false)
+					ed.dom.loadCSS(url + "/css/content.css");
+
+				if (ed.theme.onResolveName) {
+					ed.theme.onResolveName.add(function(th, o) {
+						if (o.node.nodeName == 'IMG' && ed.dom.hasClass(o.node, cls))
+							o.name = 'pagebreak';
+					});
+				}
+			});
+
+			ed.onClick.add(function(ed, e) {
+				e = e.target;
+
+				if (e.nodeName === 'IMG' && ed.dom.hasClass(e, cls))
+					ed.selection.select(e);
+			});
+
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setActive('pagebreak', n.nodeName === 'IMG' && ed.dom.hasClass(n, cls));
+			});
+
+			ed.onBeforeSetContent.add(function(ed, o) {
+				o.content = o.content.replace(pbRE, pb);
+			});
+
+			ed.onPostProcess.add(function(ed, o) {
+				if (o.get)
+					o.content = o.content.replace(/<img[^>]+>/g, function(im) {
+						if (im.indexOf('class="mcePageBreak') !== -1)
+							im = sep;
+
+						return im;
+					});
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'PageBreak',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('pagebreak', tinymce.plugins.PageBreakPlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif
new file mode 100644
index 000000000..acdf4085f
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif
new file mode 100644
index 000000000..388486517
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/blank.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/blank.htm
new file mode 100644
index 000000000..7ba26bd65
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/blank.htm
@@ -0,0 +1,22 @@
+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<title>blank_page</title>

+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

+<link href="css/blank.css" rel="stylesheet" type="text/css" />

+<base target="_self" />

+<script type="text/javascript">

+function init() {

+	if (parent.tinymce.isIE)

+		document.body.contentEditable = true;

+	else

+		document.designMode = 'on';

+

+	parent.initIframe(document);

+	window.focus();

+}

+</script>

+</head>

+<body onload="init();">

+

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/css/blank.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/css/blank.css
new file mode 100644
index 000000000..f1ab11338
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/css/blank.css
@@ -0,0 +1,14 @@
+html, body {height:98%}
+body {
+background-color: #FFFFFF;
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 10px;
+scrollbar-3dlight-color: #F0F0EE;
+scrollbar-arrow-color: #676662;
+scrollbar-base-color: #F0F0EE;
+scrollbar-darkshadow-color: #DDDDDD;
+scrollbar-face-color: #E0E0DD;
+scrollbar-highlight-color: #F0F0EE;
+scrollbar-shadow-color: #F0F0EE;
+scrollbar-track-color: #F5F5F5;
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/css/pasteword.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/css/pasteword.css
new file mode 100644
index 000000000..77685fd2e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/css/pasteword.css
@@ -0,0 +1,3 @@
+.sourceIframe {
+	border: 1px solid #808080;
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
new file mode 100644
index 000000000..4a35002b4
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var Event=tinymce.dom.Event;tinymce.create('tinymce.plugins.PastePlugin',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mcePasteText',function(ui,v){if(ui){if((ed.getParam('paste_use_dialog',true))||(!tinymce.isIE)){ed.windowManager.open({file:url+'/pastetext.htm',width:450,height:400,inline:1},{plugin_url:url});}else t._insertText(clipboardData.getData("Text"),true);}else t._insertText(v.html,v.linebreaks);});ed.addCommand('mcePasteWord',function(ui,v){if(ui){if((ed.getParam('paste_use_dialog',true))||(!tinymce.isIE)){ed.windowManager.open({file:url+'/pasteword.htm',width:450,height:400,inline:1},{plugin_url:url});}else t._insertText(t._clipboardHTML());}else t._insertWordContent(v);});ed.addCommand('mceSelectAll',function(){ed.execCommand('selectall');});ed.addButton('pastetext',{title:'paste.paste_text_desc',cmd:'mcePasteText',ui:true});ed.addButton('pasteword',{title:'paste.paste_word_desc',cmd:'mcePasteWord',ui:true});ed.addButton('selectall',{title:'paste.selectall_desc',cmd:'mceSelectAll'});if(ed.getParam("paste_auto_cleanup_on_paste",false)){ed.onPaste.add(function(ed,e){return t._handlePasteEvent(e)});}if(!tinymce.isIE&&ed.getParam("paste_auto_cleanup_on_paste",false)){ed.onKeyDown.add(function(ed,e){if(e.ctrlKey&&e.keyCode==86){window.setTimeout(function(){ed.execCommand("mcePasteText",true);},1);Event.cancel(e);}});}},getInfo:function(){return{longname:'Paste text/word',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_handlePasteEvent:function(e){var html=this._clipboardHTML(),ed=this.editor,sel=ed.selection,r;if(ed&&(r=sel.getRng())&&r.text.length>0)ed.execCommand('delete');if(html&&html.length>0)ed.execCommand('mcePasteWord',false,html);return Event.cancel(e);},_insertText:function(content,bLinebreaks){content=this.editor.dom.encode(content);if(content&&content.length>0){if(bLinebreaks){if(this.editor.getParam("paste_create_paragraphs",true)){var rl=this.editor.getParam("paste_replace_list",'\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');for(var i=0;i<rl.length;i+=2)content=content.replace(new RegExp(rl[i],'gi'),rl[i+1]);content=content.replace(/\r\n\r\n/g,'</p><p>');content=content.replace(/\r\r/g,'</p><p>');content=content.replace(/\n\n/g,'</p><p>');if((pos=content.indexOf('</p><p>'))!=-1){this.editor.execCommand("Delete");var node=this.editor.selection.getNode();var breakElms=[];do{if(node.nodeType==1){if(node.nodeName=="TD"||node.nodeName=="BODY")break;breakElms[breakElms.length]=node;}}while(node=node.parentNode);var before="",after="</p>";before+=content.substring(0,pos);for(var i=0;i<breakElms.length;i++){before+="</"+breakElms[i].nodeName+">";after+="<"+breakElms[(breakElms.length-1)-i].nodeName+">";}before+="<p>";content=before+content.substring(pos+7)+after;}}if(this.editor.getParam("paste_create_linebreaks",true)){content=content.replace(/\r\n/g,'<br />');content=content.replace(/\r/g,'<br />');content=content.replace(/\n/g,'<br />');}}this.editor.execCommand("mceInsertRawHTML",false,content);}},_insertWordContent:function(content){var t=this,ed=t.editor;if(content&&content.length>0){var bull=String.fromCharCode(8226);var middot=String.fromCharCode(183);if(ed.getParam('paste_insert_word_content_callback'))content=ed.execCallback('paste_insert_word_content_callback','before',content);var rl=ed.getParam("paste_replace_list",'\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');for(var i=0;i<rl.length;i+=2)content=content.replace(new RegExp(rl[i],'gi'),rl[i+1]);if(this.editor.getParam("paste_convert_headers_to_strong",false)){content=content.replace(new RegExp('<p class=MsoHeading.*?>(.*?)<\/p>','gi'),'<p><b>$1</b></p>');}content=content.replace(new RegExp('tab-stops: list [0-9]+.0pt">','gi'),'">'+"--list--");content=content.replace(new RegExp(bull+"(.*?)<BR>","gi"),"<p>"+middot+"$1</p>");content=content.replace(new RegExp('<SPAN style="mso-list: Ignore">','gi'),"<span>"+bull);content=content.replace(/<o:p><\/o:p>/gi,"");content=content.replace(new RegExp('<br style="page-break-before: always;.*>','gi'),'-- page break --');content=content.replace(new RegExp('<(!--)([^>]*)(--)>','g'),"");if(this.editor.getParam("paste_remove_spans",true))content=content.replace(/<\/?span[^>]*>/gi,"");if(this.editor.getParam("paste_remove_styles",true))content=content.replace(new RegExp('<(\\w[^>]*) style="([^"]*)"([^>]*)','gi'),"<$1$3");content=content.replace(/<\/?font[^>]*>/gi,"");switch(this.editor.getParam("paste_strip_class_attributes","all")){case"all":content=content.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi,"<$1$3");break;case"mso":content=content.replace(new RegExp('<(\\w[^>]*) class="?mso([^ |>]*)([^>]*)','gi'),"<$1$3");break;}content=content.replace(new RegExp('href="?'+this._reEscape(""+document.location)+'','gi'),'href="'+this.editor.documentBaseURI.getURI());content=content.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi,"<$1$3");content=content.replace(/<\\?\?xml[^>]*>/gi,"");content=content.replace(/<\/?\w+:[^>]*>/gi,"");content=content.replace(/-- page break --\s*<p>&nbsp;<\/p>/gi,"");content=content.replace(/-- page break --/gi,"");if(!this.editor.getParam('force_p_newlines')){content=content.replace('','','gi');content=content.replace('</p>','<br /><br />','gi');}if(!tinymce.isIE&&!this.editor.getParam('force_p_newlines')){content=content.replace(/<\/?p[^>]*>/gi,"");}content=content.replace(/<\/?div[^>]*>/gi,"");if(this.editor.getParam("paste_convert_middot_lists",true)){var div=ed.dom.create("div",null,content);var className=this.editor.getParam("paste_unindented_list_class","unIndentedList");while(this._convertMiddots(div,"--list--"));while(this._convertMiddots(div,middot,className));while(this._convertMiddots(div,bull));content=div.innerHTML;}if(this.editor.getParam("paste_convert_headers_to_strong",false)){content=content.replace(/<h[1-6]>&nbsp;<\/h[1-6]>/gi,'<p>&nbsp;&nbsp;</p>');content=content.replace(/<h[1-6]>/gi,'<p><b>');content=content.replace(/<\/h[1-6]>/gi,'</b></p>');content=content.replace(/<b>&nbsp;<\/b>/gi,'<b>&nbsp;&nbsp;</b>');content=content.replace(/^(&nbsp;)*/gi,'');}content=content.replace(/--list--/gi,"");if(ed.getParam('paste_insert_word_content_callback'))content=ed.execCallback('paste_insert_word_content_callback','after',content);this.editor.execCommand("mceInsertContent",false,content);if(this.editor.getParam('paste_force_cleanup_wordpaste',true)){var ed=this.editor;window.setTimeout(function(){ed.execCommand("mceCleanup");},1);}}},_reEscape:function(s){var l="?.\\*[](){}+^$:";var o="";for(var i=0;i<s.length;i++){var c=s.charAt(i);if(l.indexOf(c)!=-1)o+='\\'+c;else o+=c;}return o;},_convertMiddots:function(div,search,class_name){var ed=this.editor,mdot=String.fromCharCode(183),bull=String.fromCharCode(8226);var nodes,prevul,i,p,ul,li,np,cp,li;nodes=div.getElementsByTagName("p");for(i=0;i<nodes.length;i++){p=nodes[i];if(p.innerHTML.indexOf(search)==0){ul=ed.dom.create("ul");if(class_name)ul.className=class_name;li=ed.dom.create("li");li.innerHTML=p.innerHTML.replace(new RegExp(''+mdot+'|'+bull+'|--list--|&nbsp;',"gi"),'');ul.appendChild(li);np=p.nextSibling;while(np){if(np.nodeType==3&&new RegExp('^\\s$','m').test(np.nodeValue)){np=np.nextSibling;continue;}if(search==mdot){if(np.nodeType==1&&new RegExp('^o(\\s+|&nbsp;)').test(np.innerHTML)){if(!prevul){prevul=ul;ul=ed.dom.create("ul");prevul.appendChild(ul);}np.innerHTML=np.innerHTML.replace(/^o/,'');}else{if(prevul){ul=prevul;prevul=null;}if(np.nodeType!=1||np.innerHTML.indexOf(search)!=0)break;}}else{if(np.nodeType!=1||np.innerHTML.indexOf(search)!=0)break;}cp=np.nextSibling;li=ed.dom.create("li");li.innerHTML=np.innerHTML.replace(new RegExp(''+mdot+'|'+bull+'|--list--|&nbsp;',"gi"),'');np.parentNode.removeChild(np);ul.appendChild(li);np=cp;}p.parentNode.replaceChild(ul,p);return true;}}return false;},_clipboardHTML:function(){var div=document.getElementById('_TinyMCE_clipboardHTML');if(!div){var div=document.createElement('DIV');div.id='_TinyMCE_clipboardHTML';with(div.style){visibility='hidden';overflow='hidden';position='absolute';width=1;height=1;}document.body.appendChild(div);}div.innerHTML='';var rng=document.body.createTextRange();rng.moveToElementText(div);rng.execCommand('Paste');var html=div.innerHTML;div.innerHTML='';return html;}});tinymce.PluginManager.add('paste',tinymce.plugins.PastePlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
new file mode 100644
index 000000000..54cdf57ef
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
@@ -0,0 +1,389 @@
+/**
+ * $Id: editor_plugin_src.js 862 2008-06-02 20:09:06Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var Event = tinymce.dom.Event;
+
+	tinymce.create('tinymce.plugins.PastePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed; 
+
+			// Register commands
+			ed.addCommand('mcePasteText', function(ui, v) {
+				if (ui) {
+					if ((ed.getParam('paste_use_dialog', true)) || (!tinymce.isIE)) {
+						ed.windowManager.open({
+							file : url + '/pastetext.htm',
+							width : 450,
+							height : 400,
+							inline : 1
+						}, {
+							plugin_url : url
+						});
+					} else
+						t._insertText(clipboardData.getData("Text"), true);
+				} else
+					t._insertText(v.html, v.linebreaks);
+			});
+
+			ed.addCommand('mcePasteWord', function(ui, v) {
+				if (ui) {
+					if ((ed.getParam('paste_use_dialog', true)) || (!tinymce.isIE)) {
+						ed.windowManager.open({
+							file : url + '/pasteword.htm',
+							width : 450,
+							height : 400,
+							inline : 1
+						}, {
+							plugin_url : url
+						});
+					} else
+						t._insertText(t._clipboardHTML());
+				} else
+					t._insertWordContent(v);
+			});
+
+			ed.addCommand('mceSelectAll', function() {
+				ed.execCommand('selectall'); 
+			});
+
+			// Register buttons
+			ed.addButton('pastetext', {title : 'paste.paste_text_desc', cmd : 'mcePasteText', ui : true});
+			ed.addButton('pasteword', {title : 'paste.paste_word_desc', cmd : 'mcePasteWord', ui : true});
+			ed.addButton('selectall', {title : 'paste.selectall_desc', cmd : 'mceSelectAll'});
+
+			if (ed.getParam("paste_auto_cleanup_on_paste", false)) {
+				ed.onPaste.add(function(ed, e) {
+					return t._handlePasteEvent(e)
+				});
+			}
+
+			if (!tinymce.isIE && ed.getParam("paste_auto_cleanup_on_paste", false)) {
+				// Force paste dialog if non IE browser
+				ed.onKeyDown.add(function(ed, e) {
+					if (e.ctrlKey && e.keyCode == 86) {
+						window.setTimeout(function() {
+							ed.execCommand("mcePasteText", true);
+						}, 1);
+
+						Event.cancel(e);
+					}
+				});
+			}
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Paste text/word',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_handlePasteEvent : function(e) {
+			var html = this._clipboardHTML(), ed = this.editor, sel = ed.selection, r;
+
+			// Removes italic, strong etc, the if was needed due to bug #1437114
+			if (ed && (r = sel.getRng()) && r.text.length > 0)
+				ed.execCommand('delete');
+
+			if (html && html.length > 0)
+				ed.execCommand('mcePasteWord', false, html);
+
+			return Event.cancel(e);
+		},
+
+		_insertText : function(content, bLinebreaks) {
+			content = this.editor.dom.encode(content);
+
+			if (content && content.length > 0) {
+				if (bLinebreaks) { 
+					// Special paragraph treatment 
+					if (this.editor.getParam("paste_create_paragraphs", true)) {
+						var rl = this.editor.getParam("paste_replace_list", '\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');
+						for (var i=0; i<rl.length; i+=2)
+							content = content.replace(new RegExp(rl[i], 'gi'), rl[i+1]);
+
+						content = content.replace(/\r\n\r\n/g, '</p><p>');
+						content = content.replace(/\r\r/g, '</p><p>');
+						content = content.replace(/\n\n/g, '</p><p>');
+
+						// Has paragraphs 
+						if ((pos = content.indexOf('</p><p>')) != -1) { 
+							this.editor.execCommand("Delete"); 
+
+							var node = this.editor.selection.getNode(); 
+
+							// Get list of elements to break 
+							var breakElms = [];
+
+							do { 
+								if (node.nodeType == 1) { 
+									// Don't break tables and break at body 
+									if (node.nodeName == "TD" || node.nodeName == "BODY") 
+										break; 
+			
+									breakElms[breakElms.length] = node; 
+								} 
+							} while(node = node.parentNode); 
+
+							var before = "", after = "</p>"; 
+							before += content.substring(0, pos); 
+
+							for (var i=0; i<breakElms.length; i++) { 
+								before += "</" + breakElms[i].nodeName + ">"; 
+								after += "<" + breakElms[(breakElms.length-1)-i].nodeName + ">"; 
+							} 
+
+							before += "<p>"; 
+							content = before + content.substring(pos+7) + after; 
+						} 
+					} 
+
+					if (this.editor.getParam("paste_create_linebreaks", true)) {
+						content = content.replace(/\r\n/g, '<br />');
+						content = content.replace(/\r/g, '<br />');
+						content = content.replace(/\n/g, '<br />');
+					}
+				} 
+
+				this.editor.execCommand("mceInsertRawHTML", false, content); 
+			}
+		},
+
+		_insertWordContent : function(content) { 
+			var t = this, ed = t.editor;
+
+			if (content && content.length > 0) {
+				// Cleanup Word content
+				var bull = String.fromCharCode(8226);
+				var middot = String.fromCharCode(183);
+
+				if (ed.getParam('paste_insert_word_content_callback'))
+					content = ed.execCallback('paste_insert_word_content_callback', 'before', content);
+
+				var rl = ed.getParam("paste_replace_list", '\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');
+				for (var i=0; i<rl.length; i+=2)
+					content = content.replace(new RegExp(rl[i], 'gi'), rl[i+1]);
+
+				if (this.editor.getParam("paste_convert_headers_to_strong", false)) {
+					content = content.replace(new RegExp('<p class=MsoHeading.*?>(.*?)<\/p>', 'gi'), '<p><b>$1</b></p>');
+				}
+
+				content = content.replace(new RegExp('tab-stops: list [0-9]+.0pt">', 'gi'), '">' + "--list--");
+				content = content.replace(new RegExp(bull + "(.*?)<BR>", "gi"), "<p>" + middot + "$1</p>");
+				content = content.replace(new RegExp('<SPAN style="mso-list: Ignore">', 'gi'), "<span>" + bull); // Covert to bull list
+				content = content.replace(/<o:p><\/o:p>/gi, "");
+				content = content.replace(new RegExp('<br style="page-break-before: always;.*>', 'gi'), '-- page break --'); // Replace pagebreaks
+				content = content.replace(new RegExp('<(!--)([^>]*)(--)>', 'g'), "");  // Word comments
+
+				if (this.editor.getParam("paste_remove_spans", true))
+					content = content.replace(/<\/?span[^>]*>/gi, "");
+
+				if (this.editor.getParam("paste_remove_styles", true))
+					content = content.replace(new RegExp('<(\\w[^>]*) style="([^"]*)"([^>]*)', 'gi'), "<$1$3");
+
+				content = content.replace(/<\/?font[^>]*>/gi, "");
+
+				// Strips class attributes.
+				switch (this.editor.getParam("paste_strip_class_attributes", "all")) {
+					case "all":
+						content = content.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "<$1$3");
+						break;
+
+					case "mso":
+						content = content.replace(new RegExp('<(\\w[^>]*) class="?mso([^ |>]*)([^>]*)', 'gi'), "<$1$3");
+						break;
+				}
+
+				content = content.replace(new RegExp('href="?' + this._reEscape("" + document.location) + '', 'gi'), 'href="' + this.editor.documentBaseURI.getURI());
+				content = content.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3");
+				content = content.replace(/<\\?\?xml[^>]*>/gi, "");
+				content = content.replace(/<\/?\w+:[^>]*>/gi, "");
+				content = content.replace(/-- page break --\s*<p>&nbsp;<\/p>/gi, ""); // Remove pagebreaks
+				content = content.replace(/-- page break --/gi, ""); // Remove pagebreaks
+
+		//		content = content.replace(/\/?&nbsp;*/gi, ""); &nbsp;
+		//		content = content.replace(/<p>&nbsp;<\/p>/gi, '');
+
+				if (!this.editor.getParam('force_p_newlines')) {
+					content = content.replace('', '' ,'gi');
+					content = content.replace('</p>', '<br /><br />' ,'gi');
+				}
+
+				if (!tinymce.isIE && !this.editor.getParam('force_p_newlines')) {
+					content = content.replace(/<\/?p[^>]*>/gi, "");
+				}
+
+				content = content.replace(/<\/?div[^>]*>/gi, "");
+
+				// Convert all middlot lists to UL lists
+				if (this.editor.getParam("paste_convert_middot_lists", true)) {
+					var div = ed.dom.create("div", null, content);
+
+					// Convert all middot paragraphs to li elements
+					var className = this.editor.getParam("paste_unindented_list_class", "unIndentedList");
+
+					while (this._convertMiddots(div, "--list--")) ; // bull
+					while (this._convertMiddots(div, middot, className)) ; // Middot
+					while (this._convertMiddots(div, bull)) ; // bull
+
+					content = div.innerHTML;
+				}
+
+				// Replace all headers with strong and fix some other issues
+				if (this.editor.getParam("paste_convert_headers_to_strong", false)) {
+					content = content.replace(/<h[1-6]>&nbsp;<\/h[1-6]>/gi, '<p>&nbsp;&nbsp;</p>');
+					content = content.replace(/<h[1-6]>/gi, '<p><b>');
+					content = content.replace(/<\/h[1-6]>/gi, '</b></p>');
+					content = content.replace(/<b>&nbsp;<\/b>/gi, '<b>&nbsp;&nbsp;</b>');
+					content = content.replace(/^(&nbsp;)*/gi, '');
+				}
+
+				content = content.replace(/--list--/gi, ""); // Remove --list--
+
+				if (ed.getParam('paste_insert_word_content_callback'))
+					content = ed.execCallback('paste_insert_word_content_callback', 'after', content);
+
+				// Insert cleaned content
+				this.editor.execCommand("mceInsertContent", false, content);
+
+				if (this.editor.getParam('paste_force_cleanup_wordpaste', true)) {
+					var ed = this.editor;
+
+					window.setTimeout(function() {
+						ed.execCommand("mceCleanup");
+					}, 1); // Do normal cleanup detached from this thread
+				}
+			}
+		},
+
+		_reEscape : function(s) {
+			var l = "?.\\*[](){}+^$:";
+			var o = "";
+
+			for (var i=0; i<s.length; i++) {
+				var c = s.charAt(i);
+
+				if (l.indexOf(c) != -1)
+					o += '\\' + c;
+				else
+					o += c;
+			}
+
+			return o;
+		},
+
+		_convertMiddots : function(div, search, class_name) {
+			var ed = this.editor, mdot = String.fromCharCode(183), bull = String.fromCharCode(8226);
+			var nodes, prevul, i, p, ul, li, np, cp, li;
+
+			nodes = div.getElementsByTagName("p");
+			for (i=0; i<nodes.length; i++) {
+				p = nodes[i];
+
+				// Is middot
+				if (p.innerHTML.indexOf(search) == 0) {
+					ul = ed.dom.create("ul");
+
+					if (class_name)
+						ul.className = class_name;
+
+					// Add the first one
+					li = ed.dom.create("li");
+					li.innerHTML = p.innerHTML.replace(new RegExp('' + mdot + '|' + bull + '|--list--|&nbsp;', "gi"), '');
+					ul.appendChild(li);
+
+					// Add the rest
+					np = p.nextSibling;
+					while (np) {
+						// If the node is whitespace, then
+						// ignore it and continue on.
+						if (np.nodeType == 3 && new RegExp('^\\s$', 'm').test(np.nodeValue)) {
+								np = np.nextSibling;
+								continue;
+						}
+
+						if (search == mdot) {
+								if (np.nodeType == 1 && new RegExp('^o(\\s+|&nbsp;)').test(np.innerHTML)) {
+										// Second level of nesting
+										if (!prevul) {
+												prevul = ul;
+												ul = ed.dom.create("ul");
+												prevul.appendChild(ul);
+										}
+										np.innerHTML = np.innerHTML.replace(/^o/, '');
+								} else {
+										// Pop the stack if we're going back up to the first level
+										if (prevul) {
+												ul = prevul;
+												prevul = null;
+										}
+										// Not element or middot paragraph
+										if (np.nodeType != 1 || np.innerHTML.indexOf(search) != 0)
+												break;
+								}
+						} else {
+								// Not element or middot paragraph
+								if (np.nodeType != 1 || np.innerHTML.indexOf(search) != 0)
+										break;
+							}
+
+						cp = np.nextSibling;
+						li = ed.dom.create("li");
+						li.innerHTML = np.innerHTML.replace(new RegExp('' + mdot + '|' + bull + '|--list--|&nbsp;', "gi"), '');
+						np.parentNode.removeChild(np);
+						ul.appendChild(li);
+						np = cp;
+					}
+
+					p.parentNode.replaceChild(ul, p);
+
+					return true;
+				}
+			}
+
+			return false;
+		},
+
+		_clipboardHTML : function() {
+			var div = document.getElementById('_TinyMCE_clipboardHTML');
+
+			if (!div) {
+				var div = document.createElement('DIV');
+				div.id = '_TinyMCE_clipboardHTML';
+
+				with (div.style) {
+					visibility = 'hidden';
+					overflow = 'hidden';
+					position = 'absolute';
+					width = 1;
+					height = 1;
+				}
+
+				document.body.appendChild(div);
+			}
+
+			div.innerHTML = '';
+			var rng = document.body.createTextRange();
+			rng.moveToElementText(div);
+			rng.execCommand('Paste');
+			var html = div.innerHTML;
+			div.innerHTML = '';
+			return html;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('paste', tinymce.plugins.PastePlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js
new file mode 100644
index 000000000..28073877e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js
@@ -0,0 +1,42 @@
+tinyMCEPopup.requireLangPack();
+
+function saveContent() {
+	if (document.forms[0].htmlSource.value == '') {
+		tinyMCEPopup.close();
+		return false;
+	}
+
+	tinyMCEPopup.execCommand('mcePasteText', false, {
+		html : document.forms[0].htmlSource.value,
+		linebreaks : document.forms[0].linebreaks.checked
+	});
+
+	tinyMCEPopup.close();
+}
+
+function onLoadInit() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	// Remove Gecko spellchecking
+	if (tinymce.isGecko)
+		document.body.spellcheck = tinyMCEPopup.getParam("gecko_spellcheck");
+
+	resizeInputs();
+}
+
+var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
+
+function resizeInputs() {
+	if (!tinymce.isIE) {
+		wHeight = self.innerHeight-80;
+		wWidth = self.innerWidth-17;
+	} else {
+		wHeight = document.body.clientHeight-80;
+		wWidth = document.body.clientWidth-17;
+	}
+
+	document.forms[0].htmlSource.style.height = Math.abs(wHeight) + 'px';
+	document.forms[0].htmlSource.style.width  = Math.abs(wWidth) + 'px';
+}
+
+tinyMCEPopup.onInit.add(onLoadInit);
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js
new file mode 100644
index 000000000..ea9c29c2b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js
@@ -0,0 +1,56 @@
+tinyMCEPopup.requireLangPack();
+
+function saveContent() {
+	var html = document.getElementById("frmData").contentWindow.document.body.innerHTML;
+
+	if (html == ''){
+		tinyMCEPopup.close();
+		return false;
+	}
+
+	tinyMCEPopup.execCommand('mcePasteWord', false, html);
+	tinyMCEPopup.close();
+}
+
+function onLoadInit() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	// Fix for endless reloading in FF
+	window.setTimeout(createIFrame, 10);
+}
+
+function createIFrame() {
+	document.getElementById('iframecontainer').innerHTML = '<iframe id="frmData" name="frmData" class="sourceIframe" src="blank.htm" height="280" width="400" frameborder="0" style="background-color:#FFFFFF; width:100%;" dir="ltr" wrap="soft"></iframe>';
+}
+
+var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
+
+function initIframe(doc) {
+	var dir = tinyMCEPopup.editor.settings.directionality;
+
+	doc.body.dir = dir;
+
+	// Remove Gecko spellchecking
+	if (tinymce.isGecko)
+		doc.body.spellcheck = tinyMCEPopup.getParam("gecko_spellcheck");
+
+	resizeInputs();
+}
+
+function resizeInputs() {
+	if (!tinymce.isIE) {
+		wHeight = self.innerHeight - 80;
+		wWidth = self.innerWidth - 18;
+	} else {
+		wHeight = document.body.clientHeight - 80;
+		wWidth = document.body.clientWidth - 18;
+	}
+
+	var elm = document.getElementById('frmData');
+	if (elm) {
+		elm.style.height = Math.abs(wHeight) + 'px';
+		elm.style.width  = Math.abs(wWidth) + 'px';
+	}
+}
+
+tinyMCEPopup.onInit.add(onLoadInit);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js
new file mode 100644
index 000000000..823eb16a7
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('en.paste_dlg',{
+text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
+text_linebreaks:"Keep linebreaks",
+word_title:"Use CTRL+V on your keyboard to paste the text into the window."
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm
new file mode 100644
index 000000000..2f2b341a1
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm
@@ -0,0 +1,34 @@
+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#paste.paste_text_desc}</title>

+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/pastetext.js"></script>

+	<base target="_self" />

+</head>

+<body onresize="resizeInputs();" style="display:none; overflow:hidden;">

+<form name="source" onsubmit="saveContent();return false;" action="#">

+	<div style="float: left" class="title">{#paste.paste_text_desc}</div>

+

+	<div style="float: right">

+		<input type="checkbox" name="linebreaks" id="linebreaks" class="wordWrapCode" checked="checked" /><label for="linebreaks">{#paste_dlg.text_linebreaks}</label>

+	</div>

+

+	<br style="clear: both" />

+

+	<div>{#paste_dlg.text_title}</div>

+

+	<textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,mono; font-size: 12px;" dir="ltr" wrap="soft" class="mceFocus"></textarea>

+

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="submit" name="insert" value="{#insert}" id="insert" />

+		</div>

+

+		<div style="float: right">

+			<input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />

+		</div>

+	</div>

+</form>

+</body> 

+</html>
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm
new file mode 100644
index 000000000..9e5ab1b5b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm
@@ -0,0 +1,29 @@
+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

+	<title>{#paste.paste_word_desc}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/pasteword.js"></script>

+	<link href="css/pasteword.css" rel="stylesheet" type="text/css" />

+	<base target="_self" />

+</head>

+<body onresize="resizeInputs();" style="display:none; overflow:hidden;">

+	<form name="source" onsubmit="saveContent();" action="#">

+		<div class="title">{#paste.paste_word_desc}</div>

+

+		<div>{#paste_dlg.word_title}</div>

+

+		<div id="iframecontainer"></div>

+

+		<div class="mceActionPanel">

+			<div style="float: left">

+				<input type="button" id="insert" name="insert" value="{#insert}" onclick="saveContent();" />

+			</div>

+

+			<div style="float: right">

+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+			</div>

+		</div>

+	</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin.js
new file mode 100644
index 000000000..766ebf8e8
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.Preview',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mcePreview',t._preview,t);ed.addButton('preview',{title:'preview.preview_desc',cmd:'mcePreview'});},getInfo:function(){return{longname:'Preview',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_preview:function(){var ed=this.editor,win,html,c,pos,pos2,css,i,page=ed.getParam("plugin_preview_pageurl",null),w=ed.getParam("plugin_preview_width","550"),h=ed.getParam("plugin_preview_height","600");if(page){ed.windowManager.open({file:ed.getParam("plugin_preview_pageurl",null),width:w,height:h},{resizable:"yes",scrollbars:"yes",inline:1});}else{win=window.open("","mcePreview","menubar=no,toolbar=no,scrollbars=yes,resizable=yes,left=20,top=20,width="+w+",height="+h);html="";c=ed.getContent();pos=c.indexOf('<body');css=ed.getParam("content_css",'').split(',');tinymce.map(css,function(u){return ed.documentBaseURI.toAbsolute(u);});if(pos!=-1){pos=c.indexOf('>',pos);pos2=c.lastIndexOf('</body>');c=c.substring(pos+1,pos2);}html+=ed.getParam('doctype');html+='<html xmlns="http://www.w3.org/1999/xhtml">';html+='<head>';html+='<title>'+ed.getLang('preview.preview_desc')+'</title>';html+='<base href="'+ed.documentBaseURI.getURI()+'" />';html+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';for(i=0;i<css.length;i++)html+='<link href="'+css[i]+'" rel="stylesheet" type="text/css" />';html+='</head>';html+='<body dir="'+ed.getParam("directionality")+'" onload="window.opener.tinymce.EditorManager.get(\''+ed.id+'\').plugins[\'preview\']._onLoad(window,document);">';html+=c;html+='</body>';html+='</html>';win.document.write(html);win.document.close();}},_onLoad:function(w,d){var t=this,nl,i,el=[],sv,ne;t._doc=d;w.writeFlash=t._writeFlash;w.writeShockWave=t._writeShockWave;w.writeQuickTime=t._writeQuickTime;w.writeRealMedia=t._writeRealMedia;w.writeWindowsMedia=t._writeWindowsMedia;w.writeEmbed=t._writeEmbed;nl=d.getElementsByTagName("script");for(i=0;i<nl.length;i++){sv=tinymce.isIE?nl[i].innerHTML:nl[i].firstChild.nodeValue;if(new RegExp('write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\\(.*','g').test(sv))el[el.length]=nl[i];}for(i=0;i<el.length;i++){ne=d.createElement("div");ne.innerHTML=d._embeds[i];el[i].parentNode.insertBefore(ne.firstChild,el[i]);}},_writeFlash:function(p){p.src=this.editor.documentBaseURI.toAbsolute(p.src);TinyMCE_PreviewPlugin._writeEmbed('D27CDB6E-AE6D-11cf-96B8-444553540000','http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0','application/x-shockwave-flash',p);},_writeShockWave:function(p){this.editor.documentBaseURI.toAbsolute(p.src);TinyMCE_PreviewPlugin._writeEmbed('166B1BCA-3F9C-11CF-8075-444553540000','http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0','application/x-director',p);},_writeQuickTime:function(p){this.editor.documentBaseURI.toAbsolute(p.src);TinyMCE_PreviewPlugin._writeEmbed('02BF25D5-8C17-4B23-BC80-D3488ABDDC6B','http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0','video/quicktime',p);},_writeRealMedia:function(p){this.editor.documentBaseURI.toAbsolute(p.src);TinyMCE_PreviewPlugin._writeEmbed('CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA','http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0','audio/x-pn-realaudio-plugin',p);},_writeWindowsMedia:function(p){this.editor.documentBaseURI.toAbsolute(p.src);p.url=p.src;TinyMCE_PreviewPlugin._writeEmbed('6BF52A52-394A-11D3-B153-00C04F79FAA6','http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701','application/x-mplayer2',p);},_writeEmbed:function(cls,cb,mt,p){var h='',n,d=t._doc,ne,c;h+='<object classid="clsid:'+cls+'" codebase="'+cb+'"';h+=typeof(p.id)!="undefined"?'id="'+p.id+'"':'';h+=typeof(p.name)!="undefined"?'name="'+p.name+'"':'';h+=typeof(p.width)!="undefined"?'width="'+p.width+'"':'';h+=typeof(p.height)!="undefined"?'height="'+p.height+'"':'';h+=typeof(p.align)!="undefined"?'align="'+p.align+'"':'';h+='>';for(n in p)h+='<param name="'+n+'" value="'+p[n]+'">';h+='<embed type="'+mt+'"';for(n in p)h+=n+'="'+p[n]+'" ';h+='></embed></object>';d._embeds[d._embeds.length]=h;}});tinymce.PluginManager.add('preview',tinymce.plugins.Preview);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js
new file mode 100644
index 000000000..881acdbaa
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js
@@ -0,0 +1,187 @@
+/**
+ * $Id: editor_plugin_src.js 537 2008-01-14 16:38:33Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Preview', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			ed.addCommand('mcePreview', t._preview, t);
+			ed.addButton('preview', {title : 'preview.preview_desc', cmd : 'mcePreview'});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Preview',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_preview : function() {
+			var ed = this.editor, win, html, c, pos, pos2, css, i, page = ed.getParam("plugin_preview_pageurl", null), w = ed.getParam("plugin_preview_width", "550"), h = ed.getParam("plugin_preview_height", "600");
+
+			// Use a custom preview page
+			if (page) {
+				ed.windowManager.open({
+					file : ed.getParam("plugin_preview_pageurl", null),
+					width : w,
+					height : h
+				}, {
+					resizable : "yes",
+					scrollbars : "yes",
+					inline : 1
+				});
+			} else {
+				win = window.open("", "mcePreview", "menubar=no,toolbar=no,scrollbars=yes,resizable=yes,left=20,top=20,width=" + w + ",height="  + h);
+				html = "";
+				c = ed.getContent();
+				pos = c.indexOf('<body');
+				css = ed.getParam("content_css", '').split(',');
+
+				tinymce.map(css, function(u) {
+					return ed.documentBaseURI.toAbsolute(u);
+				});
+
+				if (pos != -1) {
+					pos = c.indexOf('>', pos);
+					pos2 = c.lastIndexOf('</body>');
+					c = c.substring(pos + 1, pos2);
+				}
+
+				html += ed.getParam('doctype');
+				html += '<html xmlns="http://www.w3.org/1999/xhtml">';
+				html += '<head>';
+				html += '<title>' + ed.getLang('preview.preview_desc') + '</title>';
+				html += '<base href="' + ed.documentBaseURI.getURI() + '" />';
+				html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';
+
+				for (i=0; i<css.length; i++)
+					html += '<link href="' + css[i] + '" rel="stylesheet" type="text/css" />';
+
+				html += '</head>';
+				html += '<body dir="' + ed.getParam("directionality") + '" onload="window.opener.tinymce.EditorManager.get(\'' + ed.id + '\').plugins[\'preview\']._onLoad(window,document);">';
+				html += c;
+				html += '</body>';
+				html += '</html>';
+
+				win.document.write(html);
+				win.document.close();
+			}
+		},
+
+		_onLoad : function(w, d) {
+			var t = this, nl, i, el = [], sv, ne;
+
+			t._doc = d;
+			w.writeFlash = t._writeFlash;
+			w.writeShockWave = t._writeShockWave;
+			w.writeQuickTime = t._writeQuickTime;
+			w.writeRealMedia = t._writeRealMedia;
+			w.writeWindowsMedia = t._writeWindowsMedia;
+			w.writeEmbed = t._writeEmbed;
+
+			nl = d.getElementsByTagName("script");
+			for (i=0; i<nl.length; i++) {
+				sv = tinymce.isIE ? nl[i].innerHTML : nl[i].firstChild.nodeValue;
+
+				if (new RegExp('write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\\(.*', 'g').test(sv))
+					el[el.length] = nl[i];
+			}
+
+			for (i=0; i<el.length; i++) {
+				ne = d.createElement("div");
+				ne.innerHTML = d._embeds[i];
+				el[i].parentNode.insertBefore(ne.firstChild, el[i]);
+			}
+		},
+
+		_writeFlash : function(p) {
+			p.src = this.editor.documentBaseURI.toAbsolute(p.src);
+			TinyMCE_PreviewPlugin._writeEmbed(
+				'D27CDB6E-AE6D-11cf-96B8-444553540000',
+				'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+				'application/x-shockwave-flash',
+				p
+			);
+		},
+
+		_writeShockWave : function(p) {
+			this.editor.documentBaseURI.toAbsolute(p.src);
+			TinyMCE_PreviewPlugin._writeEmbed(
+				'166B1BCA-3F9C-11CF-8075-444553540000',
+				'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',
+				'application/x-director',
+				p
+			);
+		},
+
+		_writeQuickTime : function(p) {
+			this.editor.documentBaseURI.toAbsolute(p.src);
+			TinyMCE_PreviewPlugin._writeEmbed(
+				'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',
+				'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',
+				'video/quicktime',
+				p
+			);
+		},
+
+		_writeRealMedia : function(p) {
+			this.editor.documentBaseURI.toAbsolute(p.src);
+			TinyMCE_PreviewPlugin._writeEmbed(
+				'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',
+				'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+				'audio/x-pn-realaudio-plugin',
+				p
+			);
+		},
+
+		_writeWindowsMedia : function(p) {
+			this.editor.documentBaseURI.toAbsolute(p.src);
+			p.url = p.src;
+			TinyMCE_PreviewPlugin._writeEmbed(
+				'6BF52A52-394A-11D3-B153-00C04F79FAA6',
+				'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',
+				'application/x-mplayer2',
+				p
+			);
+		},
+
+		_writeEmbed : function(cls, cb, mt, p) {
+			var h = '', n, d = t._doc, ne, c;
+
+			h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
+			h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';
+			h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';
+			h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';
+			h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';
+			h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';
+			h += '>';
+
+			for (n in p)
+				h += '<param name="' + n + '" value="' + p[n] + '">';
+
+			h += '<embed type="' + mt + '"';
+
+			for (n in p)
+				h += n + '="' + p[n] + '" ';
+
+			h += '></embed></object>';
+
+			d._embeds[d._embeds.length] = h;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('preview', tinymce.plugins.Preview);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/example.html b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/example.html
new file mode 100644
index 000000000..b2c3d90ce
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/example.html
@@ -0,0 +1,28 @@
+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<script language="javascript" src="../../tiny_mce_popup.js"></script>

+<script type="text/javascript" src="jscripts/embed.js"></script>

+<script type="text/javascript">

+tinyMCEPopup.onInit.add(function(ed) {

+	var dom = tinyMCEPopup.dom;

+

+	// Load editor content_css

+	tinymce.each(ed.settings.content_css.split(','), function(u) {

+		dom.loadCSS(ed.documentBaseURI.toAbsolute(u));

+	});

+

+	// Place contents inside div container

+	dom.setHTML('content', ed.getContent());

+});

+</script>

+<title>Example of a custom preview page</title>

+</head>

+<body>

+

+Editor contents: <br />

+<div id="content">

+<!-- Gets filled with editor contents -->

+</div>

+

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js
new file mode 100644
index 000000000..6fe25de09
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js
@@ -0,0 +1,73 @@
+/**
+ * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.
+ */
+
+function writeFlash(p) {
+	writeEmbed(
+		'D27CDB6E-AE6D-11cf-96B8-444553540000',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'application/x-shockwave-flash',
+		p
+	);
+}
+
+function writeShockWave(p) {
+	writeEmbed(
+	'166B1BCA-3F9C-11CF-8075-444553540000',
+	'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',
+	'application/x-director',
+		p
+	);
+}
+
+function writeQuickTime(p) {
+	writeEmbed(
+		'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',
+		'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',
+		'video/quicktime',
+		p
+	);
+}
+
+function writeRealMedia(p) {
+	writeEmbed(
+		'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'audio/x-pn-realaudio-plugin',
+		p
+	);
+}
+
+function writeWindowsMedia(p) {
+	p.url = p.src;
+	writeEmbed(
+		'6BF52A52-394A-11D3-B153-00C04F79FAA6',
+		'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',
+		'application/x-mplayer2',
+		p
+	);
+}
+
+function writeEmbed(cls, cb, mt, p) {
+	var h = '', n;
+
+	h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
+	h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';
+	h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';
+	h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';
+	h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';
+	h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';
+	h += '>';
+
+	for (n in p)
+		h += '<param name="' + n + '" value="' + p[n] + '">';
+
+	h += '<embed type="' + mt + '"';
+
+	for (n in p)
+		h += n + '="' + p[n] + '" ';
+
+	h += '></embed></object>';
+
+	document.write(h);
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin.js
new file mode 100644
index 000000000..7d09a87c4
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.Print',{init:function(ed,url){ed.addCommand('mcePrint',function(){ed.getWin().print();});ed.addButton('print',{title:'print.print_desc',cmd:'mcePrint'});},getInfo:function(){return{longname:'Print',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('print',tinymce.plugins.Print);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js
new file mode 100644
index 000000000..cb37c1189
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js
@@ -0,0 +1,31 @@
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Print', {
+		init : function(ed, url) {
+			ed.addCommand('mcePrint', function() {
+				ed.getWin().print();
+			});
+
+			ed.addButton('print', {title : 'print.print_desc', cmd : 'mcePrint'});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Print',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('print', tinymce.plugins.Print);
+})();
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/safari/blank.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/safari/blank.htm
new file mode 100644
index 000000000..266808ce2
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/safari/blank.htm
@@ -0,0 +1 @@
+<!-- WebKit -->
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin.js
new file mode 100644
index 000000000..f722c2f14
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var Event=tinymce.dom.Event,grep=tinymce.grep,each=tinymce.each,inArray=tinymce.inArray,isOldWebKit=tinymce.isOldWebKit;tinymce.create('tinymce.plugins.Safari',{init:function(ed){var t=this,dom;if(!tinymce.isWebKit)return;t.editor=ed;t.webKitFontSizes=['x-small','small','medium','large','x-large','xx-large','-webkit-xxx-large'];t.namedFontSizes=['xx-small','x-small','small','medium','large','x-large','xx-large'];ed.onPaste.add(function(ed,e){function removeStyles(e){e=e.target;if(e.nodeType==1){e.style.cssText='';each(ed.dom.select('*',e),function(e){e.style.cssText='';});}};Event.add(ed.getDoc(),'DOMNodeInserted',removeStyles);window.setTimeout(function(){Event.remove(ed.getDoc(),'DOMNodeInserted',removeStyles);},0);});ed.onKeyUp.add(function(ed,e){var h,b;if(e.keyCode==46||e.keyCode==8){b=ed.getBody();h=b.innerHTML;if(b.childNodes.length==1&&!/<(img|hr)/.test(h)&&tinymce.trim(h.replace(/<[^>]+>/g,'')).length==0)ed.setContent('',{format:'raw'});}});ed.addCommand('FormatBlock',function(u,v){var dom=ed.dom,e=dom.getParent(ed.selection.getNode(),dom.isBlock);if(e)dom.replace(dom.create(v),e,1);else ed.getDoc().execCommand("FormatBlock",false,v);});ed.addCommand('mceInsertContent',function(u,v){ed.getDoc().execCommand("InsertText",false,'mce_marker');ed.getBody().innerHTML=ed.getBody().innerHTML.replace(/mce_marker/g,v+'<span id="_mce_tmp">XX</span>');ed.selection.select(ed.dom.get('_mce_tmp'));ed.getDoc().execCommand("Delete",false,' ');});ed.onKeyPress.add(function(ed,e){if(e.keyCode==13&&(e.shiftKey||ed.settings.force_br_newlines&&ed.selection.getNode().nodeName!='LI')){t._insertBR(ed);Event.cancel(e);}});ed.addQueryValueHandler('FontSize',function(u,v){var e,v;if((e=ed.dom.getParent(ed.selection.getStart(),'span'))&&(v=e.style.fontSize))return tinymce.inArray(t.namedFontSizes,v)+1;if((e=ed.dom.getParent(ed.selection.getEnd(),'span'))&&(v=e.style.fontSize))return tinymce.inArray(t.namedFontSizes,v)+1;return ed.getDoc().queryCommandValue('FontSize');});ed.addQueryValueHandler('FontName',function(u,v){var e,v;if((e=ed.dom.getParent(ed.selection.getStart(),'span'))&&(v=e.style.fontFamily))return v.replace(/, /g,',');if((e=ed.dom.getParent(ed.selection.getEnd(),'span'))&&(v=e.style.fontFamily))return v.replace(/, /g,',');return ed.getDoc().queryCommandValue('FontName');});ed.onClick.add(function(ed,e){e=e.target;if(e.nodeName=='IMG'){t.selElm=e;ed.selection.select(e);}else t.selElm=null;});ed.onInit.add(function(){t._fixWebKitSpans();if(isOldWebKit)t._patchSafari2x(ed);});ed.onSetContent.add(function(){dom=ed.dom;each(['strong','b','em','u','strike','sub','sup','a'],function(v){each(grep(dom.select(v)).reverse(),function(n){var nn=n.nodeName.toLowerCase(),st;if(nn=='a'){if(n.name)dom.replace(dom.create('img',{mce_name:'a',name:n.name,'class':'mceItemAnchor'}),n);return;}switch(nn){case'b':case'strong':if(nn=='b')nn='strong';st='font-weight: bold;';break;case'em':st='font-style: italic;';break;case'u':st='text-decoration: underline;';break;case'sub':st='vertical-align: sub;';break;case'sup':st='vertical-align: super;';break;case'strike':st='text-decoration: line-through;';break;}dom.replace(dom.create('span',{mce_name:nn,style:st,'class':'Apple-style-span'}),n,1);});});});ed.onPreProcess.add(function(ed,o){dom=ed.dom;each(grep(o.node.getElementsByTagName('span')).reverse(),function(n){var v,bg;if(o.get){if(dom.hasClass(n,'Apple-style-span')){bg=n.style.backgroundColor;switch(dom.getAttrib(n,'mce_name')){case'font':if(!ed.settings.convert_fonts_to_spans)dom.setAttrib(n,'style','');break;case'strong':case'em':case'sub':case'sup':dom.setAttrib(n,'style','');break;case'strike':case'u':if(!ed.settings.inline_styles)dom.setAttrib(n,'style','');else dom.setAttrib(n,'mce_name','');break;default:if(!ed.settings.inline_styles)dom.setAttrib(n,'style','');}if(bg)n.style.backgroundColor=bg;}}if(dom.hasClass(n,'mceItemRemoved'))dom.remove(n,1);});});ed.onPostProcess.add(function(ed,o){o.content=o.content.replace(/<br \/><\/(h[1-6]|div|p|address|pre)>/g,'</$1>');o.content=o.content.replace(/ id=\"undefined\"/g,'');});},getInfo:function(){return{longname:'Safari compatibility',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/safari',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_fixWebKitSpans:function(){var t=this,ed=t.editor;if(!isOldWebKit){Event.add(ed.getDoc(),'DOMNodeInserted',function(e){e=e.target;if(e&&e.nodeType==1)t._fixAppleSpan(e);});}else{ed.onExecCommand.add(function(){each(ed.dom.select('span'),function(n){t._fixAppleSpan(n);});ed.nodeChanged();});}},_fixAppleSpan:function(e){var ed=this.editor,dom=ed.dom,fz=this.webKitFontSizes,fzn=this.namedFontSizes,s=ed.settings,st,p;if(dom.getAttrib(e,'mce_fixed'))return;if(e.nodeName=='SPAN'&&e.className=='Apple-style-span'){st=e.style;if(!s.convert_fonts_to_spans){if(st.fontSize){dom.setAttrib(e,'mce_name','font');dom.setAttrib(e,'size',inArray(fz,st.fontSize)+1);}if(st.fontFamily){dom.setAttrib(e,'mce_name','font');dom.setAttrib(e,'face',st.fontFamily);}if(st.color){dom.setAttrib(e,'mce_name','font');dom.setAttrib(e,'color',dom.toHex(st.color));}if(st.backgroundColor){dom.setAttrib(e,'mce_name','font');dom.setStyle(e,'background-color',st.backgroundColor);}}else{if(st.fontSize)dom.setStyle(e,'fontSize',fzn[inArray(fz,st.fontSize)]);}if(st.fontWeight=='bold')dom.setAttrib(e,'mce_name','strong');if(st.fontStyle=='italic')dom.setAttrib(e,'mce_name','em');if(st.textDecoration=='underline')dom.setAttrib(e,'mce_name','u');if(st.textDecoration=='line-through')dom.setAttrib(e,'mce_name','strike');if(st.verticalAlign=='super')dom.setAttrib(e,'mce_name','sup');if(st.verticalAlign=='sub')dom.setAttrib(e,'mce_name','sub');dom.setAttrib(e,'mce_fixed','1');}},_patchSafari2x:function(ed){var t=this,setContent,getNode,dom=ed.dom,lr;if(ed.windowManager.onBeforeOpen){ed.windowManager.onBeforeOpen.add(function(){r=ed.selection.getRng();});}ed.selection.select=function(n){this.getSel().setBaseAndExtent(n,0,n,1);};getNode=ed.selection.getNode;ed.selection.getNode=function(){return t.selElm||getNode.call(this);};ed.selection.getRng=function(){var t=this,s=t.getSel(),d=ed.getDoc(),r,rb,ra,di;if(s.anchorNode){r=d.createRange();try{rb=d.createRange();rb.setStart(s.anchorNode,s.anchorOffset);rb.collapse(1);ra=d.createRange();ra.setStart(s.focusNode,s.focusOffset);ra.collapse(1);di=rb.compareBoundaryPoints(rb.START_TO_END,ra)<0;r.setStart(di?s.anchorNode:s.focusNode,di?s.anchorOffset:s.focusOffset);r.setEnd(di?s.focusNode:s.anchorNode,di?s.focusOffset:s.anchorOffset);lr=r;}catch(ex){}}return r||lr;};setContent=ed.selection.setContent;ed.selection.setContent=function(h,s){var r=this.getRng(),b;try{setContent.call(this,h,s);}catch(ex){b=dom.create('body');b.innerHTML=h;each(b.childNodes,function(n){r.insertNode(n.cloneNode(true));});}};},_insertBR:function(ed){var dom=ed.dom,s=ed.selection,r=s.getRng(),br;r.insertNode(br=dom.create('br'));r.setStartAfter(br);r.setEndAfter(br);s.setRng(r);if(s.getSel().focusNode==br.previousSibling){s.select(dom.insertAfter(dom.doc.createTextNode('\u00a0'),br));s.collapse(1);}ed.getWin().scrollTo(0,dom.getPos(s.getRng().startContainer).y);}});tinymce.PluginManager.add('safari',tinymce.plugins.Safari);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin_src.js
new file mode 100644
index 000000000..630d1a2e8
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin_src.js
@@ -0,0 +1,460 @@
+/**
+ * $Id: editor_plugin_src.js 264 2007-04-26 20:53:09Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var Event = tinymce.dom.Event, grep = tinymce.grep, each = tinymce.each, inArray = tinymce.inArray, isOldWebKit = tinymce.isOldWebKit;
+
+	tinymce.create('tinymce.plugins.Safari', {
+		init : function(ed) {
+			var t = this, dom;
+
+			// Ignore on non webkit
+			if (!tinymce.isWebKit)
+				return;
+
+			t.editor = ed;
+			t.webKitFontSizes = ['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large', '-webkit-xxx-large'];
+			t.namedFontSizes = ['xx-small', 'x-small','small','medium','large','x-large', 'xx-large'];
+
+			// Safari will crash if the build in createlink command is used
+/*			ed.addCommand('CreateLink', function(u, v) {
+				ed.execCommand("mceInsertContent", false, '<a href="' + dom.encode(v) + '">' + ed.selection.getContent() + '</a>');
+			});*/
+
+			ed.onPaste.add(function(ed, e) {
+				function removeStyles(e) {
+					e = e.target;
+
+					if (e.nodeType == 1) {
+						e.style.cssText = '';
+
+						each(ed.dom.select('*', e), function(e) {
+							e.style.cssText = '';
+						});
+					}
+				};
+
+				Event.add(ed.getDoc(), 'DOMNodeInserted', removeStyles);
+
+				window.setTimeout(function() {
+					Event.remove(ed.getDoc(), 'DOMNodeInserted', removeStyles);
+				}, 0);
+			});
+
+			ed.onKeyUp.add(function(ed, e) {
+				var h, b;
+
+				// If backspace or delete key
+				if (e.keyCode == 46 || e.keyCode == 8) {
+					b = ed.getBody();
+					h = b.innerHTML;
+
+					// If there is no text content or images or hr elements then remove everything
+					if (b.childNodes.length == 1 && !/<(img|hr)/.test(h) && tinymce.trim(h.replace(/<[^>]+>/g, '')).length == 0)
+						ed.setContent('', {format : 'raw'});
+				}
+			});
+
+			// Workaround for FormatBlock bug, http://bugs.webkit.org/show_bug.cgi?id=16004
+			ed.addCommand('FormatBlock', function(u, v) {
+				var dom = ed.dom, e = dom.getParent(ed.selection.getNode(), dom.isBlock);
+
+				if (e)
+					dom.replace(dom.create(v), e, 1);
+				else
+					ed.getDoc().execCommand("FormatBlock", false, v);
+			});
+
+			// Workaround for InsertHTML bug, http://bugs.webkit.org/show_bug.cgi?id=16382
+			ed.addCommand('mceInsertContent', function(u, v) {
+				ed.getDoc().execCommand("InsertText", false, 'mce_marker');
+				ed.getBody().innerHTML = ed.getBody().innerHTML.replace(/mce_marker/g, v + '<span id="_mce_tmp">XX</span>');
+				ed.selection.select(ed.dom.get('_mce_tmp'));
+				ed.getDoc().execCommand("Delete", false, ' ');
+			});
+
+			// Workaround for missing shift+enter support, http://bugs.webkit.org/show_bug.cgi?id=16973
+			ed.onKeyPress.add(function(ed, e) {
+				if (e.keyCode == 13 && (e.shiftKey || ed.settings.force_br_newlines && ed.selection.getNode().nodeName != 'LI')) {
+					t._insertBR(ed);
+					Event.cancel(e);
+				}
+			});
+
+			// Safari returns incorrect values
+			ed.addQueryValueHandler('FontSize', function(u, v) {
+				var e, v;
+
+				// Check for the real font size at the start of selection
+				if ((e = ed.dom.getParent(ed.selection.getStart(), 'span')) && (v = e.style.fontSize))
+					return tinymce.inArray(t.namedFontSizes, v) + 1;
+
+				// Check for the real font size at the end of selection
+				if ((e = ed.dom.getParent(ed.selection.getEnd(), 'span')) && (v = e.style.fontSize))
+					return tinymce.inArray(t.namedFontSizes, v) + 1;
+
+				// Return default value it's better than nothing right!
+				return ed.getDoc().queryCommandValue('FontSize');
+			});
+
+			// Safari returns incorrect values
+			ed.addQueryValueHandler('FontName', function(u, v) {
+				var e, v;
+
+				// Check for the real font name at the start of selection
+				if ((e = ed.dom.getParent(ed.selection.getStart(), 'span')) && (v = e.style.fontFamily))
+					return v.replace(/, /g, ',');
+
+				// Check for the real font name at the end of selection
+				if ((e = ed.dom.getParent(ed.selection.getEnd(), 'span')) && (v = e.style.fontFamily))
+					return v.replace(/, /g, ',');
+
+				// Return default value it's better than nothing right!
+				return ed.getDoc().queryCommandValue('FontName');
+			});
+
+			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
+			ed.onClick.add(function(ed, e) {
+				e = e.target;
+
+				if (e.nodeName == 'IMG') {
+					t.selElm = e;
+					ed.selection.select(e);
+				} else
+					t.selElm = null;
+			});
+
+/*			ed.onBeforeExecCommand.add(function(ed, c, b) {
+				var r = t.bookmarkRng;
+
+				// Restore selection
+				if (r) {
+					ed.selection.setRng(r);
+					t.bookmarkRng = null;
+					//console.debug('restore', r.startContainer, r.startOffset, r.endContainer, r.endOffset);
+				}
+			});*/
+
+			ed.onInit.add(function() {
+				t._fixWebKitSpans();
+
+/*				ed.windowManager.onOpen.add(function() {
+					var r = ed.selection.getRng();
+
+					// Store selection if valid
+					if (r.startContainer != ed.getDoc()) {
+						t.bookmarkRng = r.cloneRange();
+						//console.debug('store', r.startContainer, r.startOffset, r.endContainer, r.endOffset);
+					}
+				});
+
+				ed.windowManager.onClose.add(function() {
+					t.bookmarkRng = null;
+				});*/
+
+				if (isOldWebKit)
+					t._patchSafari2x(ed);
+			});
+
+			ed.onSetContent.add(function() {
+				dom = ed.dom;
+
+				// Convert strong,b,em,u,strike to spans
+				each(['strong','b','em','u','strike','sub','sup','a'], function(v) {
+					each(grep(dom.select(v)).reverse(), function(n) {
+						var nn = n.nodeName.toLowerCase(), st;
+
+						// Convert anchors into images
+						if (nn == 'a') {
+							if (n.name)
+								dom.replace(dom.create('img', {mce_name : 'a', name : n.name, 'class' : 'mceItemAnchor'}), n);
+
+							return;
+						}
+
+						switch (nn) {
+							case 'b':
+							case 'strong':
+								if (nn == 'b')
+									nn = 'strong';
+
+								st = 'font-weight: bold;';
+								break;
+
+							case 'em':
+								st = 'font-style: italic;';
+								break;
+
+							case 'u':
+								st = 'text-decoration: underline;';
+								break;
+
+							case 'sub':
+								st = 'vertical-align: sub;';
+								break;
+
+							case 'sup':
+								st = 'vertical-align: super;';
+								break;
+
+							case 'strike':
+								st = 'text-decoration: line-through;';
+								break;
+						}
+
+						dom.replace(dom.create('span', {mce_name : nn, style : st, 'class' : 'Apple-style-span'}), n, 1);
+					});
+				});
+			});
+
+			ed.onPreProcess.add(function(ed, o) {
+				dom = ed.dom;
+
+				each(grep(o.node.getElementsByTagName('span')).reverse(), function(n) {
+					var v, bg;
+
+					if (o.get) {
+						if (dom.hasClass(n, 'Apple-style-span')) {
+							bg = n.style.backgroundColor;
+
+							switch (dom.getAttrib(n, 'mce_name')) {
+								case 'font':
+									if (!ed.settings.convert_fonts_to_spans)
+										dom.setAttrib(n, 'style', '');
+									break;
+
+								case 'strong':
+								case 'em':
+								case 'sub':
+								case 'sup':
+									dom.setAttrib(n, 'style', '');
+									break;
+
+								case 'strike':
+								case 'u':
+									if (!ed.settings.inline_styles)
+										dom.setAttrib(n, 'style', '');
+									else
+										dom.setAttrib(n, 'mce_name', '');
+
+									break;
+
+								default:
+									if (!ed.settings.inline_styles)
+										dom.setAttrib(n, 'style', '');
+							}
+
+
+							if (bg)
+								n.style.backgroundColor = bg;
+						}
+					}
+
+					if (dom.hasClass(n, 'mceItemRemoved'))
+						dom.remove(n, 1);
+				});
+			});
+
+			ed.onPostProcess.add(function(ed, o) {
+				// Safari adds BR at end of all block elements
+				o.content = o.content.replace(/<br \/><\/(h[1-6]|div|p|address|pre)>/g, '</$1>');
+
+				// Safari adds id="undefined" to HR elements
+				o.content = o.content.replace(/ id=\"undefined\"/g, '');
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Safari compatibility',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/safari',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Internal methods
+
+		_fixWebKitSpans : function() {
+			var t = this, ed = t.editor;
+
+			if (!isOldWebKit) {
+				// Use mutator events on new WebKit
+				Event.add(ed.getDoc(), 'DOMNodeInserted', function(e) {
+					e = e.target;
+
+					if (e && e.nodeType == 1)
+						t._fixAppleSpan(e);
+				});
+			} else {
+				// Do post command processing in old WebKit since the browser crashes on Mutator events :(
+				ed.onExecCommand.add(function() {
+					each(ed.dom.select('span'), function(n) {
+						t._fixAppleSpan(n);
+					});
+
+					ed.nodeChanged();
+				});
+			}
+		},
+
+		_fixAppleSpan : function(e) {
+			var ed = this.editor, dom = ed.dom, fz = this.webKitFontSizes, fzn = this.namedFontSizes, s = ed.settings, st, p;
+
+			if (dom.getAttrib(e, 'mce_fixed'))
+				return;
+
+			// Handle Apple style spans
+			if (e.nodeName == 'SPAN' && e.className == 'Apple-style-span') {
+				st = e.style;
+
+				if (!s.convert_fonts_to_spans) {
+					if (st.fontSize) {
+						dom.setAttrib(e, 'mce_name', 'font');
+						dom.setAttrib(e, 'size', inArray(fz, st.fontSize) + 1);
+					}
+
+					if (st.fontFamily) {
+						dom.setAttrib(e, 'mce_name', 'font');
+						dom.setAttrib(e, 'face', st.fontFamily);
+					}
+
+					if (st.color) {
+						dom.setAttrib(e, 'mce_name', 'font');
+						dom.setAttrib(e, 'color', dom.toHex(st.color));
+					}
+
+					if (st.backgroundColor) {
+						dom.setAttrib(e, 'mce_name', 'font');
+						dom.setStyle(e, 'background-color', st.backgroundColor);
+					}
+				} else {
+					if (st.fontSize)
+						dom.setStyle(e, 'fontSize', fzn[inArray(fz, st.fontSize)]);
+				}
+
+				if (st.fontWeight == 'bold')
+					dom.setAttrib(e, 'mce_name', 'strong');
+
+				if (st.fontStyle == 'italic')
+					dom.setAttrib(e, 'mce_name', 'em');
+
+				if (st.textDecoration == 'underline')
+					dom.setAttrib(e, 'mce_name', 'u');
+
+				if (st.textDecoration == 'line-through')
+					dom.setAttrib(e, 'mce_name', 'strike');
+
+				if (st.verticalAlign == 'super')
+					dom.setAttrib(e, 'mce_name', 'sup');
+
+				if (st.verticalAlign == 'sub')
+					dom.setAttrib(e, 'mce_name', 'sub');
+
+				dom.setAttrib(e, 'mce_fixed', '1');
+			}
+		},
+
+		_patchSafari2x : function(ed) {
+			var t = this, setContent, getNode, dom = ed.dom, lr;
+
+			// Inline dialogs
+			if (ed.windowManager.onBeforeOpen) {
+				ed.windowManager.onBeforeOpen.add(function() {
+					r = ed.selection.getRng();
+				});
+			}
+
+			// Fake select on 2.x
+			ed.selection.select = function(n) {
+				this.getSel().setBaseAndExtent(n, 0, n, 1);
+			};
+
+			getNode = ed.selection.getNode;
+			ed.selection.getNode = function() {
+				return t.selElm || getNode.call(this);
+			};
+
+			// Fake range on Safari 2.x
+			ed.selection.getRng = function() {
+				var t = this, s = t.getSel(), d = ed.getDoc(), r, rb, ra, di;
+
+				// Fake range on Safari 2.x
+				if (s.anchorNode) {
+					r = d.createRange();
+
+					try {
+						// Setup before range
+						rb = d.createRange();
+						rb.setStart(s.anchorNode, s.anchorOffset);
+						rb.collapse(1);
+
+						// Setup after range
+						ra = d.createRange();
+						ra.setStart(s.focusNode, s.focusOffset);
+						ra.collapse(1);
+
+						// Setup start/end points by comparing locations
+						di = rb.compareBoundaryPoints(rb.START_TO_END, ra) < 0;
+						r.setStart(di ? s.anchorNode : s.focusNode, di ? s.anchorOffset : s.focusOffset);
+						r.setEnd(di ? s.focusNode : s.anchorNode, di ? s.focusOffset : s.anchorOffset);
+
+						lr = r;
+					} catch (ex) {
+						// Sometimes fails, at least we tried to do it by the book. I hope Safari 2.x will go disappear soooon!!!
+					}
+				}
+
+				return r || lr;
+			};
+
+			// Fix setContent so it works
+			setContent = ed.selection.setContent;
+			ed.selection.setContent = function(h, s) {
+				var r = this.getRng(), b;
+
+				try {
+					setContent.call(this, h, s);
+				} catch (ex) {
+					// Workaround for Safari 2.x
+					b = dom.create('body');
+					b.innerHTML = h;
+
+					each(b.childNodes, function(n) {
+						r.insertNode(n.cloneNode(true));
+					});
+				}
+			};
+		},
+
+		_insertBR : function(ed) {
+			var dom = ed.dom, s = ed.selection, r = s.getRng(), br;
+
+			// Insert BR element
+			r.insertNode(br = dom.create('br'));
+
+			// Place caret after BR
+			r.setStartAfter(br);
+			r.setEndAfter(br);
+			s.setRng(r);
+
+			// Could not place caret after BR then insert an nbsp entity and move the caret
+			if (s.getSel().focusNode == br.previousSibling) {
+				s.select(dom.insertAfter(dom.doc.createTextNode('\u00a0'), br));
+				s.collapse(1);
+			}
+
+			// Scroll to new position, scrollIntoView can't be used due to bug: http://bugs.webkit.org/show_bug.cgi?id=16117
+			ed.getWin().scrollTo(0, dom.getPos(s.getRng().startContainer).y);
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('safari', tinymce.plugins.Safari);
+})();
+
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin.js
new file mode 100644
index 000000000..8a13e7d35
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.Save',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mceSave',t._save,t);ed.addCommand('mceCancel',t._cancel,t);ed.addButton('save',{title:'save.save_desc',cmd:'mceSave'});ed.addButton('cancel',{title:'save.cancel_desc',cmd:'mceCancel'});ed.onNodeChange.add(t._nodeChange,t);ed.addShortcut('ctrl+s',ed.getLang('save.save_desc'),'mceSave');},getInfo:function(){return{longname:'Save',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/save',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_nodeChange:function(ed,cm,n){var ed=this.editor;if(ed.getParam('save_enablewhendirty')){cm.setDisabled('save',!ed.isDirty());cm.setDisabled('cancel',!ed.isDirty());}},_save:function(){var ed=this.editor,formObj,os,i,elementId;formObj=tinymce.DOM.get(ed.id).form||tinymce.DOM.getParent(ed.id,'form');if(ed.getParam("save_enablewhendirty")&&!ed.isDirty())return;tinyMCE.triggerSave();if(os=ed.getParam("save_onsavecallback")){if(ed.execCallback('save_onsavecallback',ed)){ed.startContent=tinymce.trim(ed.getContent({format:'raw'}));ed.nodeChanged();}return;}if(formObj){ed.isNotDirty=true;if(formObj.onsubmit==null||formObj.onsubmit()!=false)formObj.submit();ed.nodeChanged();}else ed.windowManager.alert("Error: No form element found.");},_cancel:function(){var ed=this.editor,os,h=tinymce.trim(ed.startContent);if(os=ed.getParam("save_oncancelcallback")){ed.execCallback('save_oncancelcallback',ed);return;}ed.setContent(h);ed.undoManager.clear();ed.nodeChanged();}});tinymce.PluginManager.add('save',tinymce.plugins.Save);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js
new file mode 100644
index 000000000..9ec04400c
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js
@@ -0,0 +1,98 @@
+/**
+ * $Id: editor_plugin_src.js 851 2008-05-26 15:38:49Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Save', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceSave', t._save, t);
+			ed.addCommand('mceCancel', t._cancel, t);
+
+			// Register buttons
+			ed.addButton('save', {title : 'save.save_desc', cmd : 'mceSave'});
+			ed.addButton('cancel', {title : 'save.cancel_desc', cmd : 'mceCancel'});
+
+			ed.onNodeChange.add(t._nodeChange, t);
+			ed.addShortcut('ctrl+s', ed.getLang('save.save_desc'), 'mceSave');
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Save',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/save',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_nodeChange : function(ed, cm, n) {
+			var ed = this.editor;
+
+			if (ed.getParam('save_enablewhendirty')) {
+				cm.setDisabled('save', !ed.isDirty());
+				cm.setDisabled('cancel', !ed.isDirty());
+			}
+		},
+
+		// Private methods
+
+		_save : function() {
+			var ed = this.editor, formObj, os, i, elementId;
+
+			formObj = tinymce.DOM.get(ed.id).form || tinymce.DOM.getParent(ed.id, 'form');
+
+			if (ed.getParam("save_enablewhendirty") && !ed.isDirty())
+				return;
+
+			tinyMCE.triggerSave();
+
+			// Use callback instead
+			if (os = ed.getParam("save_onsavecallback")) {
+				if (ed.execCallback('save_onsavecallback', ed)) {
+					ed.startContent = tinymce.trim(ed.getContent({format : 'raw'}));
+					ed.nodeChanged();
+				}
+
+				return;
+			}
+
+			if (formObj) {
+				ed.isNotDirty = true;
+
+				if (formObj.onsubmit == null || formObj.onsubmit() != false)
+					formObj.submit();
+
+				ed.nodeChanged();
+			} else
+				ed.windowManager.alert("Error: No form element found.");
+		},
+
+		_cancel : function() {
+			var ed = this.editor, os, h = tinymce.trim(ed.startContent);
+
+			// Use callback instead
+			if (os = ed.getParam("save_oncancelcallback")) {
+				ed.execCallback('save_oncancelcallback', ed);
+				return;
+			}
+
+			ed.setContent(h);
+			ed.undoManager.clear();
+			ed.nodeChanged();
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('save', tinymce.plugins.Save);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css
new file mode 100644
index 000000000..3e2eaf34b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css
@@ -0,0 +1,6 @@
+.panel_wrapper {height:85px;}
+.panel_wrapper div.current {height:85px;}
+
+/* IE */
+* html .panel_wrapper {height:100px;}
+* html .panel_wrapper div.current {height:100px;}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
new file mode 100644
index 000000000..7fd913b2b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.SearchReplacePlugin',{init:function(ed,url){function open(m){ed.windowManager.open({file:url+'/searchreplace.htm',width:420+parseInt(ed.getLang('searchreplace.delta_width',0)),height:160+parseInt(ed.getLang('searchreplace.delta_height',0)),inline:1,auto_focus:0},{mode:m,search_string:ed.selection.getContent({format:'text'}),plugin_url:url});};ed.addCommand('mceSearch',function(){open('search');});ed.addCommand('mceReplace',function(){open('replace');});ed.addButton('search',{title:'searchreplace.search_desc',cmd:'mceSearch'});ed.addButton('replace',{title:'searchreplace.replace_desc',cmd:'mceReplace'});ed.addShortcut('ctrl+f','searchreplace.search_desc','mceSearch');},getInfo:function(){return{longname:'Search/Replace',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('searchreplace',tinymce.plugins.SearchReplacePlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
new file mode 100644
index 000000000..078128673
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
@@ -0,0 +1,54 @@
+/**
+ * $Id: editor_plugin_src.js 686 2008-03-09 18:13:49Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.SearchReplacePlugin', {
+		init : function(ed, url) {
+			function open(m) {
+				ed.windowManager.open({
+					file : url + '/searchreplace.htm',
+					width : 420 + parseInt(ed.getLang('searchreplace.delta_width', 0)),
+					height : 160 + parseInt(ed.getLang('searchreplace.delta_height', 0)),
+					inline : 1,
+					auto_focus : 0
+				}, {
+					mode : m,
+					search_string : ed.selection.getContent({format : 'text'}),
+					plugin_url : url
+				});
+			};
+
+			// Register commands
+			ed.addCommand('mceSearch', function() {
+				open('search');
+			});
+
+			ed.addCommand('mceReplace', function() {
+				open('replace');
+			});
+
+			// Register buttons
+			ed.addButton('search', {title : 'searchreplace.search_desc', cmd : 'mceSearch'});
+			ed.addButton('replace', {title : 'searchreplace.replace_desc', cmd : 'mceReplace'});
+
+			ed.addShortcut('ctrl+f', 'searchreplace.search_desc', 'mceSearch');
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Search/Replace',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('searchreplace', tinymce.plugins.SearchReplacePlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
new file mode 100644
index 000000000..492298eb5
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
@@ -0,0 +1,117 @@
+tinyMCEPopup.requireLangPack();
+
+var SearchReplaceDialog = {
+	init : function(ed) {
+		var f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");
+
+		this.switchMode(m);
+
+		f[m + '_panel_searchstring'].value = tinyMCEPopup.getWindowArg("search_string");
+
+		// Focus input field
+		f[m + '_panel_searchstring'].focus();
+	},
+
+	switchMode : function(m) {
+		var f, lm = this.lastMode;
+
+		if (lm != m) {
+			f = document.forms[0];
+
+			if (lm) {
+				f[m + '_panel_searchstring'].value = f[lm + '_panel_searchstring'].value;
+				f[m + '_panel_backwardsu'].checked = f[lm + '_panel_backwardsu'].checked;
+				f[m + '_panel_backwardsd'].checked = f[lm + '_panel_backwardsd'].checked;
+				f[m + '_panel_casesensitivebox'].checked = f[lm + '_panel_casesensitivebox'].checked;
+			}
+
+			mcTabs.displayTab(m + '_tab',  m + '_panel');
+			document.getElementById("replaceBtn").style.display = (m == "replace") ? "inline" : "none";
+			document.getElementById("replaceAllBtn").style.display = (m == "replace") ? "inline" : "none";
+			this.lastMode = m;
+		}
+	},
+
+	searchNext : function(a) {
+		var ed = tinyMCEPopup.editor, se = ed.selection, r = se.getRng(), f, m = this.lastMode, s, b, fl = 0, w = ed.getWin(), wm = ed.windowManager, fo = 0;
+
+		// Get input
+		f = document.forms[0];
+		s = f[m + '_panel_searchstring'].value;
+		b = f[m + '_panel_backwardsu'].checked;
+		ca = f[m + '_panel_casesensitivebox'].checked;
+		rs = f['replace_panel_replacestring'].value;
+
+		function fix() {
+			// Correct Firefox graphics glitches
+			r = se.getRng().cloneRange();
+			ed.getDoc().execCommand('SelectAll', false, null);
+			se.setRng(r);
+		};
+
+		function replace() {
+			if (tinymce.isIE)
+				ed.selection.getRng().duplicate().pasteHTML(rs); // Needs to be duplicated due to selection bug in IE
+			else
+				ed.getDoc().execCommand('InsertHTML', false, rs);
+		};
+
+		// IE flags
+		if (ca)
+			fl = fl | 4;
+
+		switch (a) {
+			case 'all':
+				if (tinymce.isIE) {
+					while (r.findText(s, b ? -1 : 1, fl)) {
+						r.scrollIntoView();
+						r.select();
+						replace();
+						fo = 1;
+					}
+
+					tinyMCEPopup.storeSelection();
+				} else {
+					while (w.find(s, ca, b, false, false, false, false)) {
+						replace();
+						fo = 1;
+					}
+				}
+
+				if (fo)
+					wm.alert(ed.getLang('searchreplace_dlg.allreplaced'));
+				else
+					wm.alert(ed.getLang('searchreplace_dlg.notfound'));
+
+				return;
+
+			case 'current':
+				replace();
+				break;
+		}
+
+		se.collapse(b);
+		r = se.getRng();
+
+		// Whats the point
+		if (!s)
+			return;
+
+		if (tinymce.isIE) {
+			if (r.findText(s, b ? -1 : 1, fl)) {
+				r.scrollIntoView();
+				r.select();
+			} else
+				wm.alert(ed.getLang('searchreplace_dlg.notfound'));
+
+			tinyMCEPopup.storeSelection();
+		} else {
+			if (!w.find(s, ca, b, false, false, false, false))
+				wm.alert(ed.getLang('searchreplace_dlg.notfound'));
+			else
+				fix();
+		}
+	}
+};
+
+tinyMCEPopup.onInit.add(SearchReplaceDialog.init, SearchReplaceDialog);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
new file mode 100644
index 000000000..3dd3453dc
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
@@ -0,0 +1,16 @@
+tinyMCE.addI18n('en.searchreplace_dlg',{
+searchnext_desc:"Find again",
+notfound:"The search has been completed. The search string could not be found.",
+search_title:"Find",
+replace_title:"Find/Replace",
+allreplaced:"All occurrences of the search string were replaced.",
+findwhat:"Find what",
+replacewith:"Replace with",
+direction:"Direction",
+up:"Up",
+down:"Down",
+mcase:"Match case",
+findnext:"Find next",
+replace:"Replace",
+replaceall:"Replace all"
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
new file mode 100644
index 000000000..9c95a6a30
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
@@ -0,0 +1,105 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#searchreplace_dlg.replace_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="js/searchreplace.js"></script>

+	<link rel="stylesheet" type="text/css" href="css/searchreplace.css" />

+	<base target="_self" />

+</head>

+<body style="display:none;">

+<form onsubmit="SearchReplaceDialog.searchNext('none');return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="search_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('search');" onmousedown="return false;">{#searchreplace.search_desc}</a></span></li>

+			<li id="replace_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('replace');" onmousedown="return false;">{#searchreplace_dlg.replace}</a></span></li>

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="search_panel" class="panel">

+			<table border="0" cellspacing="0" cellpadding="2">

+				<tr>

+					<td><label for="search_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>

+					<td><input type="text" id="search_panel_searchstring" name="search_panel_searchstring" style="width: 200px" /></td>

+				</tr>

+				<tr>

+					<td colspan="2">

+						<table border="0" cellspacing="0" cellpadding="0" class="direction">

+							<tr>

+								<td><label>{#searchreplace_dlg.direction}</label></td>

+								<td><input id="search_panel_backwardsu" name="search_panel_backwards" class="radio" type="radio" /></td>

+								<td><label for="search_panel_backwardsu">{#searchreplace_dlg.up}</label></td>

+								<td><input id="search_panel_backwardsd" name="search_panel_backwards" class="radio" type="radio" checked="checked" /></td>

+								<td><label for="search_panel_backwardsd">{#searchreplace_dlg.down}</label></td>

+							</tr>

+						</table>

+					</td>

+				</tr>

+				<tr>

+					<td colspan="2">

+						<table border="0" cellspacing="0" cellpadding="0">

+							<tr>

+								<td><input id="search_panel_casesensitivebox" name="search_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>

+								<td><label for="search_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>

+							</tr>

+						</table>

+					</td>

+				</tr>

+			</table>

+		</div>

+

+		<div id="replace_panel" class="panel">

+			<table border="0" cellspacing="0" cellpadding="2">

+				<tr>

+					<td><label for="replace_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>

+					<td><input type="text" id="replace_panel_searchstring" name="replace_panel_searchstring" style="width: 200px" /></td>

+				</tr>

+				<tr>

+					<td><label for="replace_panel_replacestring">{#searchreplace_dlg.replacewith}</label></td>

+					<td><input type="text" id="replace_panel_replacestring" name="replace_panel_replacestring" style="width: 200px" /></td>

+				</tr>

+				<tr>

+					<td colspan="2">

+						<table border="0" cellspacing="0" cellpadding="0" class="direction">

+							<tr>

+								<td><label>{#searchreplace_dlg.direction}</label></td>

+								<td><input id="replace_panel_backwardsu" name="replace_panel_backwards" class="radio" type="radio" /></td>

+								<td><label for="replace_panel_backwardsu">{#searchreplace_dlg.up}</label></td>

+								<td><input id="replace_panel_backwardsd" name="replace_panel_backwards" class="radio" type="radio" checked="checked" /></td>

+								<td><label for="replace_panel_backwardsd">{#searchreplace_dlg.down}</label></td>

+							</tr>

+						</table>

+					</td>

+				</tr>

+				<tr>

+					<td colspan="2">

+						<table border="0" cellspacing="0" cellpadding="0">

+							<tr>

+								<td><input id="replace_panel_casesensitivebox" name="replace_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>

+								<td><label for="replace_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>

+							</tr>

+						</table>

+					</td>

+				</tr>

+			</table>

+		</div>

+

+	</div>

+

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="submit" id="insert" name="insert" value="{#searchreplace_dlg.findnext}" />

+			<input type="button" class="button" id="replaceBtn" name="replaceBtn" value="{#searchreplace_dlg.replace}" onclick="SearchReplaceDialog.searchNext('current');" />

+			<input type="button" class="button" id="replaceAllBtn" name="replaceAllBtn" value="{#searchreplace_dlg.replaceall}" onclick="SearchReplaceDialog.searchNext('all');" />

+		</div>

+

+		<div style="float: right">	

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</div>

+</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css
new file mode 100644
index 000000000..656ce1eee
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css
@@ -0,0 +1 @@
+.mceItemHiddenSpellWord {background:url(../img/wline.gif) repeat-x bottom left; cursor:default;}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
new file mode 100644
index 000000000..9cb679961
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var JSONRequest=tinymce.util.JSONRequest,each=tinymce.each,DOM=tinymce.DOM;tinymce.create('tinymce.plugins.SpellcheckerPlugin',{getInfo:function(){return{longname:'Spellchecker',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker',version:tinymce.majorVersion+"."+tinymce.minorVersion};},init:function(ed,url){var t=this,cm;t.url=url;t.editor=ed;ed.addCommand('mceSpellCheck',function(){if(!t.active){ed.setProgressState(1);t._sendRPC('checkWords',[t.selectedLang,t._getWords()],function(r){if(r.length>0){t.active=1;t._markWords(r);ed.setProgressState(0);ed.nodeChanged();}else{ed.setProgressState(0);ed.windowManager.alert('spellchecker.no_mpell');}});}else t._done();});ed.onInit.add(function(){if(ed.settings.content_css!==false)ed.dom.loadCSS(url+'/css/content.css');});ed.onClick.add(t._showMenu,t);ed.onContextMenu.add(t._showMenu,t);ed.onBeforeGetContent.add(function(){if(t.active)t._removeWords();});ed.onNodeChange.add(function(ed,cm){cm.setActive('spellchecker',t.active);});ed.onSetContent.add(function(){t._done();});ed.onBeforeGetContent.add(function(){t._done();});ed.onBeforeExecCommand.add(function(ed,cmd){if(cmd=='mceFullScreen')t._done();});t.languages={};each(ed.getParam('spellchecker_languages','+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv','hash'),function(v,k){if(k.indexOf('+')===0){k=k.substring(1);t.selectedLang=v;}t.languages[k]=v;});},createControl:function(n,cm){var t=this,c,ed=t.editor;if(n=='spellchecker'){c=cm.createSplitButton(n,{title:'spellchecker.desc',cmd:'mceSpellCheck',scope:t});c.onRenderMenu.add(function(c,m){m.add({title:'spellchecker.langs','class':'mceMenuItemTitle'}).setDisabled(1);each(t.languages,function(v,k){var o={icon:1},mi;o.onclick=function(){mi.setSelected(1);t.selectedItem.setSelected(0);t.selectedItem=mi;t.selectedLang=v;};o.title=k;mi=m.add(o);mi.setSelected(v==t.selectedLang);if(v==t.selectedLang)t.selectedItem=mi;})});return c;}},_walk:function(n,f){var d=this.editor.getDoc(),w;if(d.createTreeWalker){w=d.createTreeWalker(n,NodeFilter.SHOW_TEXT,null,false);while((n=w.nextNode())!=null)f.call(this,n);}else tinymce.walk(n,f,'childNodes');},_getSeparators:function(){var re='',i,str=this.editor.getParam('spellchecker_word_separator_chars','\\s!"#$%&()*+,-./:;<=>?@[\]^_{|}����������������\u201d\u201c');for(i=0;i<str.length;i++)re+='\\'+str.charAt(i);return re;},_getWords:function(){var ed=this.editor,wl=[],tx='',lo={};this._walk(ed.getBody(),function(n){if(n.nodeType==3)tx+=n.nodeValue+' ';});tx=tx.replace(new RegExp('([0-9]|['+this._getSeparators()+'])','g'),' ');tx=tinymce.trim(tx.replace(/(\s+)/g,' '));each(tx.split(' '),function(v){if(!lo[v]){wl.push(v);lo[v]=1;}});return wl;},_removeWords:function(w){var ed=this.editor,dom=ed.dom,se=ed.selection,b=se.getBookmark();each(dom.select('span').reverse(),function(n){if(n&&(dom.hasClass(n,'mceItemHiddenSpellWord')||dom.hasClass(n,'mceItemHidden'))){if(!w||dom.decode(n.innerHTML)==w)dom.remove(n,1);}});se.moveToBookmark(b);},_markWords:function(wl){var r1,r2,r3,r4,r5,w='',ed=this.editor,re=this._getSeparators(),dom=ed.dom,nl=[];var se=ed.selection,b=se.getBookmark();each(wl,function(v){w+=(w?'|':'')+v;});r1=new RegExp('(['+re+'])('+w+')(['+re+'])','g');r2=new RegExp('^('+w+')','g');r3=new RegExp('('+w+')(['+re+']?)$','g');r4=new RegExp('^('+w+')(['+re+']?)$','g');r5=new RegExp('('+w+')(['+re+'])','g');this._walk(this.editor.getBody(),function(n){if(n.nodeType==3){nl.push(n);}});each(nl,function(n){var v;if(n.nodeType==3){v=n.nodeValue;if(r1.test(v)||r2.test(v)||r3.test(v)||r4.test(v)){v=dom.encode(v);v=v.replace(r5,'<span class="mceItemHiddenSpellWord">$1</span>$2');v=v.replace(r3,'<span class="mceItemHiddenSpellWord">$1</span>$2');dom.replace(dom.create('span',{'class':'mceItemHidden'},v),n);}}});se.moveToBookmark(b);},_showMenu:function(ed,e){var t=this,ed=t.editor,m=t._menu,p1,dom=ed.dom,vp=dom.getViewPort(ed.getWin());if(!m){p1=DOM.getPos(ed.getContentAreaContainer());m=ed.controlManager.createDropMenu('spellcheckermenu',{offset_x:p1.x,offset_y:p1.y,'class':'mceNoIcons'});t._menu=m;}if(dom.hasClass(e.target,'mceItemHiddenSpellWord')){m.removeAll();m.add({title:'spellchecker.wait','class':'mceMenuItemTitle'}).setDisabled(1);t._sendRPC('getSuggestions',[t.selectedLang,dom.decode(e.target.innerHTML)],function(r){m.removeAll();if(r.length>0){m.add({title:'spellchecker.sug','class':'mceMenuItemTitle'}).setDisabled(1);each(r,function(v){m.add({title:v,onclick:function(){dom.replace(ed.getDoc().createTextNode(v),e.target);t._checkDone();}});});m.addSeparator();}else m.add({title:'spellchecker.no_sug','class':'mceMenuItemTitle'}).setDisabled(1);m.add({title:'spellchecker.ignore_word',onclick:function(){dom.remove(e.target,1);t._checkDone();}});m.add({title:'spellchecker.ignore_words',onclick:function(){t._removeWords(dom.decode(e.target.innerHTML));t._checkDone();}});m.update();});ed.selection.select(e.target);p1=dom.getPos(e.target);m.showMenu(p1.x,p1.y+e.target.offsetHeight-vp.y);return tinymce.dom.Event.cancel(e);}else m.hideMenu();},_checkDone:function(){var t=this,ed=t.editor,dom=ed.dom,o;each(dom.select('span'),function(n){if(n&&dom.hasClass(n,'mceItemHiddenSpellWord')){o=true;return false;}});if(!o)t._done();},_done:function(){var t=this,la=t.active;if(t.active){t.active=0;t._removeWords();if(t._menu)t._menu.hideMenu();if(la)t.editor.nodeChanged();}},_sendRPC:function(m,p,cb){var t=this,url=t.editor.getParam("spellchecker_rpc_url","{backend}");if(url=='{backend}'){t.editor.setProgressState(0);alert('Please specify: spellchecker_rpc_url');return;}JSONRequest.sendRPC({url:url,method:m,params:p,success:cb,error:function(e,x){t.editor.setProgressState(0);t.editor.windowManager.alert(e.errstr||('Error response: '+x.responseText));}});}});tinymce.PluginManager.add('spellchecker',tinymce.plugins.SpellcheckerPlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
new file mode 100644
index 000000000..ebcf475be
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
@@ -0,0 +1,338 @@
+/**
+ * $Id: editor_plugin_src.js 425 2007-11-21 15:17:39Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var JSONRequest = tinymce.util.JSONRequest, each = tinymce.each, DOM = tinymce.DOM;
+
+	tinymce.create('tinymce.plugins.SpellcheckerPlugin', {
+		getInfo : function() {
+			return {
+				longname : 'Spellchecker',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		init : function(ed, url) {
+			var t = this, cm;
+
+			t.url = url;
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceSpellCheck', function() {
+				if (!t.active) {
+					ed.setProgressState(1);
+					t._sendRPC('checkWords', [t.selectedLang, t._getWords()], function(r) {
+						if (r.length > 0) {
+							t.active = 1;
+							t._markWords(r);
+							ed.setProgressState(0);
+							ed.nodeChanged();
+						} else {
+							ed.setProgressState(0);
+							ed.windowManager.alert('spellchecker.no_mpell');
+						}
+					});
+				} else
+					t._done();
+			});
+
+			ed.onInit.add(function() {
+				if (ed.settings.content_css !== false)
+					ed.dom.loadCSS(url + '/css/content.css');
+			});
+
+			ed.onClick.add(t._showMenu, t);
+			ed.onContextMenu.add(t._showMenu, t);
+			ed.onBeforeGetContent.add(function() {
+				if (t.active)
+					t._removeWords();
+			});
+
+			ed.onNodeChange.add(function(ed, cm) {
+				cm.setActive('spellchecker', t.active);
+			});
+
+			ed.onSetContent.add(function() {
+				t._done();
+			});
+
+			ed.onBeforeGetContent.add(function() {
+				t._done();
+			});
+
+			ed.onBeforeExecCommand.add(function(ed, cmd) {
+				if (cmd == 'mceFullScreen')
+					t._done();
+			});
+
+			// Find selected language
+			t.languages = {};
+			each(ed.getParam('spellchecker_languages', '+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv', 'hash'), function(v, k) {
+				if (k.indexOf('+') === 0) {
+					k = k.substring(1);
+					t.selectedLang = v;
+				}
+
+				t.languages[k] = v;
+			});
+		},
+
+		createControl : function(n, cm) {
+			var t = this, c, ed = t.editor;
+
+			if (n == 'spellchecker') {
+				c = cm.createSplitButton(n, {title : 'spellchecker.desc', cmd : 'mceSpellCheck', scope : t});
+
+				c.onRenderMenu.add(function(c, m) {
+					m.add({title : 'spellchecker.langs', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
+					each(t.languages, function(v, k) {
+						var o = {icon : 1}, mi;
+
+						o.onclick = function() {
+							mi.setSelected(1);
+							t.selectedItem.setSelected(0);
+							t.selectedItem = mi;
+							t.selectedLang = v;
+						};
+
+						o.title = k;
+						mi = m.add(o);
+						mi.setSelected(v == t.selectedLang);
+
+						if (v == t.selectedLang)
+							t.selectedItem = mi;
+					})
+				});
+
+				return c;
+			}
+		},
+
+		// Internal functions
+
+		_walk : function(n, f) {
+			var d = this.editor.getDoc(), w;
+
+			if (d.createTreeWalker) {
+				w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
+
+				while ((n = w.nextNode()) != null)
+					f.call(this, n);
+			} else
+				tinymce.walk(n, f, 'childNodes');
+		},
+
+		_getSeparators : function() {
+			var re = '', i, str = this.editor.getParam('spellchecker_word_separator_chars', '\\s!"#$%&()*+,-./:;<=>?@[\]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');
+
+			// Build word separator regexp
+			for (i=0; i<str.length; i++)
+				re += '\\' + str.charAt(i);
+
+			return re;
+		},
+
+		_getWords : function() {
+			var ed = this.editor, wl = [], tx = '', lo = {};
+
+			// Get area text
+			this._walk(ed.getBody(), function(n) {
+				if (n.nodeType == 3)
+					tx += n.nodeValue + ' ';
+			});
+
+			// Split words by separator
+			tx = tx.replace(new RegExp('([0-9]|[' + this._getSeparators() + '])', 'g'), ' ');
+			tx = tinymce.trim(tx.replace(/(\s+)/g, ' '));
+
+			// Build word array and remove duplicates
+			each(tx.split(' '), function(v) {
+				if (!lo[v]) {
+					wl.push(v);
+					lo[v] = 1;
+				}
+			});
+
+			return wl;
+		},
+
+		_removeWords : function(w) {
+			var ed = this.editor, dom = ed.dom, se = ed.selection, b = se.getBookmark();
+
+			each(dom.select('span').reverse(), function(n) {
+				if (n && (dom.hasClass(n, 'mceItemHiddenSpellWord') || dom.hasClass(n, 'mceItemHidden'))) {
+					if (!w || dom.decode(n.innerHTML) == w)
+						dom.remove(n, 1);
+				}
+			});
+
+			se.moveToBookmark(b);
+		},
+
+		_markWords : function(wl) {
+			var r1, r2, r3, r4, r5, w = '', ed = this.editor, re = this._getSeparators(), dom = ed.dom, nl = [];
+			var se = ed.selection, b = se.getBookmark();
+
+			each(wl, function(v) {
+				w += (w ? '|' : '') + v;
+			});
+
+			r1 = new RegExp('([' + re + '])(' + w + ')([' + re + '])', 'g');
+			r2 = new RegExp('^(' + w + ')', 'g');
+			r3 = new RegExp('(' + w + ')([' + re + ']?)$', 'g');
+			r4 = new RegExp('^(' + w + ')([' + re + ']?)$', 'g');
+			r5 = new RegExp('(' + w + ')([' + re + '])', 'g');
+
+			// Collect all text nodes
+			this._walk(this.editor.getBody(), function(n) {
+				if (n.nodeType == 3) {
+					nl.push(n);
+				}
+			});
+
+			// Wrap incorrect words in spans
+			each(nl, function(n) {
+				var v;
+
+				if (n.nodeType == 3) {
+					v = n.nodeValue;
+
+					if (r1.test(v) || r2.test(v) || r3.test(v) || r4.test(v)) {
+						v = dom.encode(v);
+						v = v.replace(r5, '<span class="mceItemHiddenSpellWord">$1</span>$2');
+						v = v.replace(r3, '<span class="mceItemHiddenSpellWord">$1</span>$2');
+
+						dom.replace(dom.create('span', {'class' : 'mceItemHidden'}, v), n);
+					}
+				}
+			});
+
+			se.moveToBookmark(b);
+		},
+
+		_showMenu : function(ed, e) {
+			var t = this, ed = t.editor, m = t._menu, p1, dom = ed.dom, vp = dom.getViewPort(ed.getWin());
+
+			if (!m) {
+				p1 = DOM.getPos(ed.getContentAreaContainer());
+				//p2 = DOM.getPos(ed.getContainer());
+
+				m = ed.controlManager.createDropMenu('spellcheckermenu', {
+					offset_x : p1.x,
+					offset_y : p1.y,
+					'class' : 'mceNoIcons'
+				});
+
+				t._menu = m;
+			}
+
+			if (dom.hasClass(e.target, 'mceItemHiddenSpellWord')) {
+				m.removeAll();
+				m.add({title : 'spellchecker.wait', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
+
+				t._sendRPC('getSuggestions', [t.selectedLang, dom.decode(e.target.innerHTML)], function(r) {
+					m.removeAll();
+
+					if (r.length > 0) {
+						m.add({title : 'spellchecker.sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
+						each(r, function(v) {
+							m.add({title : v, onclick : function() {
+								dom.replace(ed.getDoc().createTextNode(v), e.target);
+								t._checkDone();
+							}});
+						});
+
+						m.addSeparator();
+					} else
+						m.add({title : 'spellchecker.no_sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
+
+					m.add({
+						title : 'spellchecker.ignore_word',
+						onclick : function() {
+							dom.remove(e.target, 1);
+							t._checkDone();
+						}
+					});
+
+					m.add({
+						title : 'spellchecker.ignore_words',
+						onclick : function() {
+							t._removeWords(dom.decode(e.target.innerHTML));
+							t._checkDone();
+						}
+					});
+
+					m.update();
+				});
+
+				ed.selection.select(e.target);
+				p1 = dom.getPos(e.target);
+				m.showMenu(p1.x, p1.y + e.target.offsetHeight - vp.y);
+
+				return tinymce.dom.Event.cancel(e);
+			} else
+				m.hideMenu();
+		},
+
+		_checkDone : function() {
+			var t = this, ed = t.editor, dom = ed.dom, o;
+
+			each(dom.select('span'), function(n) {
+				if (n && dom.hasClass(n, 'mceItemHiddenSpellWord')) {
+					o = true;
+					return false;
+				}
+			});
+
+			if (!o)
+				t._done();
+		},
+
+		_done : function() {
+			var t = this, la = t.active;
+
+			if (t.active) {
+				t.active = 0;
+				t._removeWords();
+
+				if (t._menu)
+					t._menu.hideMenu();
+
+				if (la)
+					t.editor.nodeChanged();
+			}
+		},
+
+		_sendRPC : function(m, p, cb) {
+			var t = this, url = t.editor.getParam("spellchecker_rpc_url", "{backend}");
+
+			if (url == '{backend}') {
+				t.editor.setProgressState(0);
+				alert('Please specify: spellchecker_rpc_url');
+				return;
+			}
+
+			JSONRequest.sendRPC({
+				url : url,
+				method : m,
+				params : p,
+				success : cb,
+				error : function(e, x) {
+					t.editor.setProgressState(0);
+					t.editor.windowManager.alert(e.errstr || ('Error response: ' + x.responseText));
+				}
+			});
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('spellchecker', tinymce.plugins.SpellcheckerPlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/wline.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/wline.gif
new file mode 100644
index 000000000..7d0a4dbca
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/wline.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/css/props.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
new file mode 100644
index 000000000..5550b093c
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
@@ -0,0 +1,13 @@
+#text_font {width:250px;}
+#text_size {width:70px;}
+.mceAddSelectValue {background:#DDD;}
+select, #block_text_indent, #box_width, #box_height, #box_padding_top, #box_padding_right, #box_padding_bottom, #box_padding_left {width:70px;}
+#box_margin_top, #box_margin_right, #box_margin_bottom, #box_margin_left, #positioning_width, #positioning_height, #positioning_zindex {width:70px;}
+#positioning_placement_top, #positioning_placement_right, #positioning_placement_bottom, #positioning_placement_left {width:70px;}
+#positioning_clip_top, #positioning_clip_right, #positioning_clip_bottom, #positioning_clip_left {width:70px;}
+.panel_wrapper div.current {padding-top:10px;height:230px;}
+.delim {border-left:1px solid gray;}
+.tdelim {border-bottom:1px solid gray;}
+#block_display {width:145px;}
+#list_type {width:115px;}
+.disabled {background:#EEE;}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
new file mode 100644
index 000000000..6ebaa91ca
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.StylePlugin',{init:function(ed,url){ed.addCommand('mceStyleProps',function(){ed.windowManager.open({file:url+'/props.htm',width:480+parseInt(ed.getLang('style.delta_width',0)),height:320+parseInt(ed.getLang('style.delta_height',0)),inline:1},{plugin_url:url,style_text:ed.selection.getNode().style.cssText});});ed.addCommand('mceSetElementStyle',function(ui,v){if(e=ed.selection.getNode()){ed.dom.setAttrib(e,'style',v);ed.execCommand('mceRepaint');}});ed.onNodeChange.add(function(ed,cm,n){cm.setDisabled('styleprops',n.nodeName==='BODY');});ed.addButton('styleprops',{title:'style.desc',cmd:'mceStyleProps'});},getInfo:function(){return{longname:'Style',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('style',tinymce.plugins.StylePlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
new file mode 100644
index 000000000..de2bd682b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
@@ -0,0 +1,52 @@
+/**
+ * $Id: editor_plugin_src.js 787 2008-04-10 11:40:57Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.StylePlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceStyleProps', function() {
+				ed.windowManager.open({
+					file : url + '/props.htm',
+					width : 480 + parseInt(ed.getLang('style.delta_width', 0)),
+					height : 320 + parseInt(ed.getLang('style.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url,
+					style_text : ed.selection.getNode().style.cssText
+				});
+			});
+
+			ed.addCommand('mceSetElementStyle', function(ui, v) {
+				if (e = ed.selection.getNode()) {
+					ed.dom.setAttrib(e, 'style', v);
+					ed.execCommand('mceRepaint');
+				}
+			});
+
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setDisabled('styleprops', n.nodeName === 'BODY');
+			});
+
+			// Register buttons
+			ed.addButton('styleprops', {title : 'style.desc', cmd : 'mceStyleProps'});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Style',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('style', tinymce.plugins.StylePlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/js/props.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
new file mode 100644
index 000000000..4fdfceb85
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
@@ -0,0 +1,641 @@
+tinyMCEPopup.requireLangPack();
+
+var defaultFonts = "" + 
+	"Arial, Helvetica, sans-serif=Arial, Helvetica, sans-serif;" + 
+	"Times New Roman, Times, serif=Times New Roman, Times, serif;" + 
+	"Courier New, Courier, mono=Courier New, Courier, mono;" + 
+	"Times New Roman, Times, serif=Times New Roman, Times, serif;" + 
+	"Georgia, Times New Roman, Times, serif=Georgia, Times New Roman, Times, serif;" + 
+	"Verdana, Arial, Helvetica, sans-serif=Verdana, Arial, Helvetica, sans-serif;" + 
+	"Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif";
+
+var defaultSizes = "9;10;12;14;16;18;24;xx-small;x-small;small;medium;large;x-large;xx-large;smaller;larger";
+var defaultMeasurement = "+pixels=px;points=pt;em;in;cm;mm;picas;ems;exs;%";
+var defaultSpacingMeasurement = "pixels=px;points=pt;in;cm;mm;picas;+ems;exs;%";
+var defaultIndentMeasurement = "pixels=px;+points=pt;in;cm;mm;picas;ems;exs;%";
+var defaultWeight = "normal;bold;bolder;lighter;100;200;300;400;500;600;700;800;900";
+var defaultTextStyle = "normal;italic;oblique";
+var defaultVariant = "normal;small-caps";
+var defaultLineHeight = "normal";
+var defaultAttachment = "fixed;scroll";
+var defaultRepeat = "no-repeat;repeat;repeat-x;repeat-y";
+var defaultPosH = "left;center;right";
+var defaultPosV = "top;center;bottom";
+var defaultVAlign = "baseline;sub;super;top;text-top;middle;bottom;text-bottom";
+var defaultDisplay = "inline;block;list-item;run-in;compact;marker;table;inline-table;table-row-group;table-header-group;table-footer-group;table-row;table-column-group;table-column;table-cell;table-caption;none";
+var defaultBorderStyle = "none;solid;dashed;dotted;double;groove;ridge;inset;outset";
+var defaultBorderWidth = "thin;medium;thick";
+var defaultListType = "disc;circle;square;decimal;lower-roman;upper-roman;lower-alpha;upper-alpha;none";
+
+function init() {
+	var ce = document.getElementById('container'), h;
+
+	ce.style.cssText = tinyMCEPopup.getWindowArg('style_text');
+
+	h = getBrowserHTML('background_image_browser','background_image','image','advimage');
+	document.getElementById("background_image_browser").innerHTML = h;
+
+	document.getElementById('text_color_pickcontainer').innerHTML = getColorPickerHTML('text_color_pick','text_color');
+	document.getElementById('background_color_pickcontainer').innerHTML = getColorPickerHTML('background_color_pick','background_color');
+	document.getElementById('border_color_top_pickcontainer').innerHTML = getColorPickerHTML('border_color_top_pick','border_color_top');
+	document.getElementById('border_color_right_pickcontainer').innerHTML = getColorPickerHTML('border_color_right_pick','border_color_right');
+	document.getElementById('border_color_bottom_pickcontainer').innerHTML = getColorPickerHTML('border_color_bottom_pick','border_color_bottom');
+	document.getElementById('border_color_left_pickcontainer').innerHTML = getColorPickerHTML('border_color_left_pick','border_color_left');
+
+	fillSelect(0, 'text_font', 'style_font', defaultFonts, ';', true);
+	fillSelect(0, 'text_size', 'style_font_size', defaultSizes, ';', true);
+	fillSelect(0, 'text_size_measurement', 'style_font_size_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'text_case', 'style_text_case', "capitalize;uppercase;lowercase", ';', true);
+	fillSelect(0, 'text_weight', 'style_font_weight', defaultWeight, ';', true);
+	fillSelect(0, 'text_style', 'style_font_style', defaultTextStyle, ';', true);
+	fillSelect(0, 'text_variant', 'style_font_variant', defaultVariant, ';', true);
+	fillSelect(0, 'text_lineheight', 'style_font_line_height', defaultLineHeight, ';', true);
+	fillSelect(0, 'text_lineheight_measurement', 'style_font_line_height_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'background_attachment', 'style_background_attachment', defaultAttachment, ';', true);
+	fillSelect(0, 'background_repeat', 'style_background_repeat', defaultRepeat, ';', true);
+
+	fillSelect(0, 'background_hpos_measurement', 'style_background_hpos_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'background_vpos_measurement', 'style_background_vpos_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'background_hpos', 'style_background_hpos', defaultPosH, ';', true);
+	fillSelect(0, 'background_vpos', 'style_background_vpos', defaultPosV, ';', true);
+
+	fillSelect(0, 'block_wordspacing', 'style_wordspacing', 'normal', ';', true);
+	fillSelect(0, 'block_wordspacing_measurement', 'style_wordspacing_measurement', defaultSpacingMeasurement, ';', true);
+	fillSelect(0, 'block_letterspacing', 'style_letterspacing', 'normal', ';', true);
+	fillSelect(0, 'block_letterspacing_measurement', 'style_letterspacing_measurement', defaultSpacingMeasurement, ';', true);
+	fillSelect(0, 'block_vertical_alignment', 'style_vertical_alignment', defaultVAlign, ';', true);
+	fillSelect(0, 'block_text_align', 'style_text_align', "left;right;center;justify", ';', true);
+	fillSelect(0, 'block_whitespace', 'style_whitespace', "normal;pre;nowrap", ';', true);
+	fillSelect(0, 'block_display', 'style_display', defaultDisplay, ';', true);
+	fillSelect(0, 'block_text_indent_measurement', 'style_text_indent_measurement', defaultIndentMeasurement, ';', true);
+
+	fillSelect(0, 'box_width_measurement', 'style_box_width_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_height_measurement', 'style_box_height_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_float', 'style_float', 'left;right;none', ';', true);
+	fillSelect(0, 'box_clear', 'style_clear', 'left;right;both;none', ';', true);
+	fillSelect(0, 'box_padding_left_measurement', 'style_padding_left_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_top_measurement', 'style_padding_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_bottom_measurement', 'style_padding_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_right_measurement', 'style_padding_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_left_measurement', 'style_margin_left_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_top_measurement', 'style_margin_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_bottom_measurement', 'style_margin_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_right_measurement', 'style_margin_right_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'border_style_top', 'style_border_style_top', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_right', 'style_border_style_right', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_bottom', 'style_border_style_bottom', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_left', 'style_border_style_left', defaultBorderStyle, ';', true);
+
+	fillSelect(0, 'border_width_top', 'style_border_width_top', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_right', 'style_border_width_right', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_bottom', 'style_border_width_bottom', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_left', 'style_border_width_left', defaultBorderWidth, ';', true);
+
+	fillSelect(0, 'border_width_top_measurement', 'style_border_width_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_right_measurement', 'style_border_width_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_bottom_measurement', 'style_border_width_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_left_measurement', 'style_border_width_left_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'list_type', 'style_list_type', defaultListType, ';', true);
+	fillSelect(0, 'list_position', 'style_list_position', "inside;outside", ';', true);
+
+	fillSelect(0, 'positioning_type', 'style_positioning_type', "absolute;relative;static", ';', true);
+	fillSelect(0, 'positioning_visibility', 'style_positioning_visibility', "inherit;visible;hidden", ';', true);
+
+	fillSelect(0, 'positioning_width_measurement', 'style_positioning_width_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_height_measurement', 'style_positioning_height_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_overflow', 'style_positioning_overflow', "visible;hidden;scroll;auto", ';', true);
+
+	fillSelect(0, 'positioning_placement_top_measurement', 'style_positioning_placement_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_right_measurement', 'style_positioning_placement_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_bottom_measurement', 'style_positioning_placement_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_left_measurement', 'style_positioning_placement_left_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'positioning_clip_top_measurement', 'style_positioning_clip_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_right_measurement', 'style_positioning_clip_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_bottom_measurement', 'style_positioning_clip_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_left_measurement', 'style_positioning_clip_left_measurement', defaultMeasurement, ';', true);
+
+	TinyMCE_EditableSelects.init();
+	setupFormData();
+	showDisabledControls();
+}
+
+function setupFormData() {
+	var ce = document.getElementById('container'), f = document.forms[0], s, b, i;
+
+	// Setup text fields
+
+	selectByValue(f, 'text_font', ce.style.fontFamily, true, true);
+	selectByValue(f, 'text_size', getNum(ce.style.fontSize), true, true);
+	selectByValue(f, 'text_size_measurement', getMeasurement(ce.style.fontSize));
+	selectByValue(f, 'text_weight', ce.style.fontWeight, true, true);
+	selectByValue(f, 'text_style', ce.style.fontStyle, true, true);
+	selectByValue(f, 'text_lineheight', getNum(ce.style.lineHeight), true, true);
+	selectByValue(f, 'text_lineheight_measurement', getMeasurement(ce.style.lineHeight));
+	selectByValue(f, 'text_case', ce.style.textTransform, true, true);
+	selectByValue(f, 'text_variant', ce.style.fontVariant, true, true);
+	f.text_color.value = tinyMCEPopup.editor.dom.toHex(ce.style.color);
+	updateColor('text_color_pick', 'text_color');
+	f.text_underline.checked = inStr(ce.style.textDecoration, 'underline');
+	f.text_overline.checked = inStr(ce.style.textDecoration, 'overline');
+	f.text_linethrough.checked = inStr(ce.style.textDecoration, 'line-through');
+	f.text_blink.checked = inStr(ce.style.textDecoration, 'blink');
+
+	// Setup background fields
+
+	f.background_color.value = tinyMCEPopup.editor.dom.toHex(ce.style.backgroundColor);
+	updateColor('background_color_pick', 'background_color');
+	f.background_image.value = ce.style.backgroundImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	selectByValue(f, 'background_repeat', ce.style.backgroundRepeat, true, true);
+	selectByValue(f, 'background_attachment', ce.style.backgroundAttachment, true, true);
+	selectByValue(f, 'background_hpos', getNum(getVal(ce.style.backgroundPosition, 0)), true, true);
+	selectByValue(f, 'background_hpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 0)));
+	selectByValue(f, 'background_vpos', getNum(getVal(ce.style.backgroundPosition, 1)), true, true);
+	selectByValue(f, 'background_vpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 1)));
+
+	// Setup block fields
+
+	selectByValue(f, 'block_wordspacing', getNum(ce.style.wordSpacing), true, true);
+	selectByValue(f, 'block_wordspacing_measurement', getMeasurement(ce.style.wordSpacing));
+	selectByValue(f, 'block_letterspacing', getNum(ce.style.letterSpacing), true, true);
+	selectByValue(f, 'block_letterspacing_measurement', getMeasurement(ce.style.letterSpacing));
+	selectByValue(f, 'block_vertical_alignment', ce.style.verticalAlign, true, true);
+	selectByValue(f, 'block_text_align', ce.style.textAlign, true, true);
+	f.block_text_indent.value = getNum(ce.style.textIndent);
+	selectByValue(f, 'block_text_indent_measurement', getMeasurement(ce.style.textIndent));
+	selectByValue(f, 'block_whitespace', ce.style.whiteSpace, true, true);
+	selectByValue(f, 'block_display', ce.style.display, true, true);
+
+	// Setup box fields
+
+	f.box_width.value = getNum(ce.style.width);
+	selectByValue(f, 'box_width_measurement', getMeasurement(ce.style.width));
+
+	f.box_height.value = getNum(ce.style.height);
+	selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height));
+
+	if (tinymce.isGecko)
+		selectByValue(f, 'box_float', ce.style.cssFloat, true, true);
+	else
+		selectByValue(f, 'box_float', ce.style.styleFloat, true, true);
+
+	selectByValue(f, 'box_clear', ce.style.clear, true, true);
+
+	setupBox(f, ce, 'box_padding', 'padding', '');
+	setupBox(f, ce, 'box_margin', 'margin', '');
+
+	// Setup border fields
+
+	setupBox(f, ce, 'border_style', 'border', 'Style');
+	setupBox(f, ce, 'border_width', 'border', 'Width');
+	setupBox(f, ce, 'border_color', 'border', 'Color');
+
+	updateColor('border_color_top_pick', 'border_color_top');
+	updateColor('border_color_right_pick', 'border_color_right');
+	updateColor('border_color_bottom_pick', 'border_color_bottom');
+	updateColor('border_color_left_pick', 'border_color_left');
+
+	f.elements.border_color_top.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_top.value);
+	f.elements.border_color_right.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_right.value);
+	f.elements.border_color_bottom.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_bottom.value);
+	f.elements.border_color_left.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_left.value);
+
+	// Setup list fields
+
+	selectByValue(f, 'list_type', ce.style.listStyleType, true, true);
+	selectByValue(f, 'list_position', ce.style.listStylePosition, true, true);
+	f.list_bullet_image.value = ce.style.listStyleImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+
+	// Setup box fields
+
+	selectByValue(f, 'positioning_type', ce.style.position, true, true);
+	selectByValue(f, 'positioning_visibility', ce.style.visibility, true, true);
+	selectByValue(f, 'positioning_overflow', ce.style.overflow, true, true);
+	f.positioning_zindex.value = ce.style.zIndex ? ce.style.zIndex : "";
+
+	f.positioning_width.value = getNum(ce.style.width);
+	selectByValue(f, 'positioning_width_measurement', getMeasurement(ce.style.width));
+
+	f.positioning_height.value = getNum(ce.style.height);
+	selectByValue(f, 'positioning_height_measurement', getMeasurement(ce.style.height));
+
+	setupBox(f, ce, 'positioning_placement', '', '', ['top', 'right', 'bottom', 'left']);
+
+	s = ce.style.clip.replace(new RegExp("rect\\('?([^']*)'?\\)", 'gi'), "$1");
+	s = s.replace(/,/g, ' ');
+
+	if (!hasEqualValues([getVal(s, 0), getVal(s, 1), getVal(s, 2), getVal(s, 3)])) {
+		f.positioning_clip_top.value = getNum(getVal(s, 0));
+		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));
+		f.positioning_clip_right.value = getNum(getVal(s, 1));
+		selectByValue(f, 'positioning_clip_right_measurement', getMeasurement(getVal(s, 1)));
+		f.positioning_clip_bottom.value = getNum(getVal(s, 2));
+		selectByValue(f, 'positioning_clip_bottom_measurement', getMeasurement(getVal(s, 2)));
+		f.positioning_clip_left.value = getNum(getVal(s, 3));
+		selectByValue(f, 'positioning_clip_left_measurement', getMeasurement(getVal(s, 3)));
+	} else {
+		f.positioning_clip_top.value = getNum(getVal(s, 0));
+		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));
+		f.positioning_clip_right.value = f.positioning_clip_bottom.value = f.positioning_clip_left.value;
+	}
+
+//	setupBox(f, ce, '', 'border', 'Color');
+}
+
+function getMeasurement(s) {
+	return s.replace(/^([0-9]+)(.*)$/, "$2");
+}
+
+function getNum(s) {
+	if (new RegExp('^[0-9]+[a-z%]+$', 'gi').test(s))
+		return s.replace(/[^0-9]/g, '');
+
+	return s;
+}
+
+function inStr(s, n) {
+	return new RegExp(n, 'gi').test(s);
+}
+
+function getVal(s, i) {
+	var a = s.split(' ');
+
+	if (a.length > 1)
+		return a[i];
+
+	return "";
+}
+
+function setValue(f, n, v) {
+	if (f.elements[n].type == "text")
+		f.elements[n].value = v;
+	else
+		selectByValue(f, n, v, true, true);
+}
+
+function setupBox(f, ce, fp, pr, sf, b) {
+	if (typeof(b) == "undefined")
+		b = ['Top', 'Right', 'Bottom', 'Left'];
+
+	if (isSame(ce, pr, sf, b)) {
+		f.elements[fp + "_same"].checked = true;
+
+		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));
+		f.elements[fp + "_top"].disabled = false;
+
+		f.elements[fp + "_right"].value = "";
+		f.elements[fp + "_right"].disabled = true;
+		f.elements[fp + "_bottom"].value = "";
+		f.elements[fp + "_bottom"].disabled = true;
+		f.elements[fp + "_left"].value = "";
+		f.elements[fp + "_left"].disabled = true;
+
+		if (f.elements[fp + "_top_measurement"]) {
+			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));
+			f.elements[fp + "_left_measurement"].disabled = true;
+			f.elements[fp + "_bottom_measurement"].disabled = true;
+			f.elements[fp + "_right_measurement"].disabled = true;
+		}
+	} else {
+		f.elements[fp + "_same"].checked = false;
+
+		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));
+		f.elements[fp + "_top"].disabled = false;
+
+		setValue(f, fp + "_right", getNum(ce.style[pr + b[1] + sf]));
+		f.elements[fp + "_right"].disabled = false;
+
+		setValue(f, fp + "_bottom", getNum(ce.style[pr + b[2] + sf]));
+		f.elements[fp + "_bottom"].disabled = false;
+
+		setValue(f, fp + "_left", getNum(ce.style[pr + b[3] + sf]));
+		f.elements[fp + "_left"].disabled = false;
+
+		if (f.elements[fp + "_top_measurement"]) {
+			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));
+			selectByValue(f, fp + '_right_measurement', getMeasurement(ce.style[pr + b[1] + sf]));
+			selectByValue(f, fp + '_bottom_measurement', getMeasurement(ce.style[pr + b[2] + sf]));
+			selectByValue(f, fp + '_left_measurement', getMeasurement(ce.style[pr + b[3] + sf]));
+			f.elements[fp + "_left_measurement"].disabled = false;
+			f.elements[fp + "_bottom_measurement"].disabled = false;
+			f.elements[fp + "_right_measurement"].disabled = false;
+		}
+	}
+}
+
+function isSame(e, pr, sf, b) {
+	var a = [], i, x;
+
+	if (typeof(b) == "undefined")
+		b = ['Top', 'Right', 'Bottom', 'Left'];
+
+	if (typeof(sf) == "undefined" || sf == null)
+		sf = "";
+
+	a[0] = e.style[pr + b[0] + sf];
+	a[1] = e.style[pr + b[1] + sf];
+	a[2] = e.style[pr + b[2] + sf];
+	a[3] = e.style[pr + b[3] + sf];
+
+	for (i=0; i<a.length; i++) {
+		if (a[i] == null)
+			return false;
+
+		for (x=0; x<a.length; x++) {
+			if (a[x] != a[i])
+				return false;
+		}
+	}
+
+	return true;
+};
+
+function hasEqualValues(a) {
+	var i, x;
+
+	for (i=0; i<a.length; i++) {
+		if (a[i] == null)
+			return false;
+
+		for (x=0; x<a.length; x++) {
+			if (a[x] != a[i])
+				return false;
+		}
+	}
+
+	return true;
+}
+
+function applyAction() {
+	var ce = document.getElementById('container'), ed = tinyMCEPopup.editor;
+
+	generateCSS();
+
+	tinyMCEPopup.restoreSelection();
+	ed.dom.setAttrib(ed.selection.getNode(), 'style', tinyMCEPopup.editor.dom.serializeStyle(tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText)));
+}
+
+function updateAction() {
+	applyAction();
+	tinyMCEPopup.close();
+}
+
+function generateCSS() {
+	var ce = document.getElementById('container'), f = document.forms[0], num = new RegExp('[0-9]+', 'g'), s, t;
+
+	ce.style.cssText = "";
+
+	// Build text styles
+	ce.style.fontFamily = f.text_font.value;
+	ce.style.fontSize = f.text_size.value + (isNum(f.text_size.value) ? (f.text_size_measurement.value || 'px') : "");
+	ce.style.fontStyle = f.text_style.value;
+	ce.style.lineHeight = f.text_lineheight.value + (isNum(f.text_lineheight.value) ? f.text_lineheight_measurement.value : "");
+	ce.style.textTransform = f.text_case.value;
+	ce.style.fontWeight = f.text_weight.value;
+	ce.style.fontVariant = f.text_variant.value;
+	ce.style.color = f.text_color.value;
+
+	s = "";
+	s += f.text_underline.checked ? " underline" : "";
+	s += f.text_overline.checked ? " overline" : "";
+	s += f.text_linethrough.checked ? " line-through" : "";
+	s += f.text_blink.checked ? " blink" : "";
+	s = s.length > 0 ? s.substring(1) : s;
+
+	if (f.text_none.checked)
+		s = "none";
+
+	ce.style.textDecoration = s;
+
+	// Build background styles
+
+	ce.style.backgroundColor = f.background_color.value;
+	ce.style.backgroundImage = f.background_image.value != "" ? "url(" + f.background_image.value + ")" : "";
+	ce.style.backgroundRepeat = f.background_repeat.value;
+	ce.style.backgroundAttachment = f.background_attachment.value;
+
+	if (f.background_hpos.value != "") {
+		s = "";
+		s += f.background_hpos.value + (isNum(f.background_hpos.value) ? f.background_hpos_measurement.value : "") + " ";
+		s += f.background_vpos.value + (isNum(f.background_vpos.value) ? f.background_vpos_measurement.value : "");
+		ce.style.backgroundPosition = s;
+	}
+
+	// Build block styles
+
+	ce.style.wordSpacing = f.block_wordspacing.value + (isNum(f.block_wordspacing.value) ? f.block_wordspacing_measurement.value : "");
+	ce.style.letterSpacing = f.block_letterspacing.value + (isNum(f.block_letterspacing.value) ? f.block_letterspacing_measurement.value : "");
+	ce.style.verticalAlign = f.block_vertical_alignment.value;
+	ce.style.textAlign = f.block_text_align.value;
+	ce.style.textIndent = f.block_text_indent.value + (isNum(f.block_text_indent.value) ? f.block_text_indent_measurement.value : "");
+	ce.style.whiteSpace = f.block_whitespace.value;
+	ce.style.display = f.block_display.value;
+
+	// Build box styles
+
+	ce.style.width = f.box_width.value + (isNum(f.box_width.value) ? f.box_width_measurement.value : "");
+	ce.style.height = f.box_height.value + (isNum(f.box_height.value) ? f.box_height_measurement.value : "");
+	ce.style.styleFloat = f.box_float.value;
+
+	if (tinymce.isGecko)
+		ce.style.cssFloat = f.box_float.value;
+
+	ce.style.clear = f.box_clear.value;
+
+	if (!f.box_padding_same.checked) {
+		ce.style.paddingTop = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");
+		ce.style.paddingRight = f.box_padding_right.value + (isNum(f.box_padding_right.value) ? f.box_padding_right_measurement.value : "");
+		ce.style.paddingBottom = f.box_padding_bottom.value + (isNum(f.box_padding_bottom.value) ? f.box_padding_bottom_measurement.value : "");
+		ce.style.paddingLeft = f.box_padding_left.value + (isNum(f.box_padding_left.value) ? f.box_padding_left_measurement.value : "");
+	} else
+		ce.style.padding = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");		
+
+	if (!f.box_margin_same.checked) {
+		ce.style.marginTop = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");
+		ce.style.marginRight = f.box_margin_right.value + (isNum(f.box_margin_right.value) ? f.box_margin_right_measurement.value : "");
+		ce.style.marginBottom = f.box_margin_bottom.value + (isNum(f.box_margin_bottom.value) ? f.box_margin_bottom_measurement.value : "");
+		ce.style.marginLeft = f.box_margin_left.value + (isNum(f.box_margin_left.value) ? f.box_margin_left_measurement.value : "");
+	} else
+		ce.style.margin = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");		
+
+	// Build border styles
+
+	if (!f.border_style_same.checked) {
+		ce.style.borderTopStyle = f.border_style_top.value;
+		ce.style.borderRightStyle = f.border_style_right.value;
+		ce.style.borderBottomStyle = f.border_style_bottom.value;
+		ce.style.borderLeftStyle = f.border_style_left.value;
+	} else
+		ce.style.borderStyle = f.border_style_top.value;
+
+	if (!f.border_width_same.checked) {
+		ce.style.borderTopWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : "");
+		ce.style.borderRightWidth = f.border_width_right.value + (isNum(f.border_width_right.value) ? f.border_width_right_measurement.value : "");
+		ce.style.borderBottomWidth = f.border_width_bottom.value + (isNum(f.border_width_bottom.value) ? f.border_width_bottom_measurement.value : "");
+		ce.style.borderLeftWidth = f.border_width_left.value + (isNum(f.border_width_left.value) ? f.border_width_left_measurement.value : "");
+	} else
+		ce.style.borderWidth = f.border_width_top.value;
+
+	if (!f.border_color_same.checked) {
+		ce.style.borderTopColor = f.border_color_top.value;
+		ce.style.borderRightColor = f.border_color_right.value;
+		ce.style.borderBottomColor = f.border_color_bottom.value;
+		ce.style.borderLeftColor = f.border_color_left.value;
+	} else
+		ce.style.borderColor = f.border_color_top.value;
+
+	// Build list styles
+
+	ce.style.listStyleType = f.list_type.value;
+	ce.style.listStylePosition = f.list_position.value;
+	ce.style.listStyleImage = f.list_bullet_image.value != "" ? "url(" + f.list_bullet_image.value + ")" : "";
+
+	// Build positioning styles
+
+	ce.style.position = f.positioning_type.value;
+	ce.style.visibility = f.positioning_visibility.value;
+
+	if (ce.style.width == "")
+		ce.style.width = f.positioning_width.value + (isNum(f.positioning_width.value) ? f.positioning_width_measurement.value : "");
+
+	if (ce.style.height == "")
+		ce.style.height = f.positioning_height.value + (isNum(f.positioning_height.value) ? f.positioning_height_measurement.value : "");
+
+	ce.style.zIndex = f.positioning_zindex.value;
+	ce.style.overflow = f.positioning_overflow.value;
+
+	if (!f.positioning_placement_same.checked) {
+		ce.style.top = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");
+		ce.style.right = f.positioning_placement_right.value + (isNum(f.positioning_placement_right.value) ? f.positioning_placement_right_measurement.value : "");
+		ce.style.bottom = f.positioning_placement_bottom.value + (isNum(f.positioning_placement_bottom.value) ? f.positioning_placement_bottom_measurement.value : "");
+		ce.style.left = f.positioning_placement_left.value + (isNum(f.positioning_placement_left.value) ? f.positioning_placement_left_measurement.value : "");
+	} else {
+		s = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");
+		ce.style.top = s;
+		ce.style.right = s;
+		ce.style.bottom = s;
+		ce.style.left = s;
+	}
+
+	if (!f.positioning_clip_same.checked) {
+		s = "rect(";
+		s += (isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_right.value) ? f.positioning_clip_right.value + f.positioning_clip_right_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_bottom.value) ? f.positioning_clip_bottom.value + f.positioning_clip_bottom_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_left.value) ? f.positioning_clip_left.value + f.positioning_clip_left_measurement.value : "auto");
+		s += ")";
+
+		if (s != "rect(auto auto auto auto)")
+			ce.style.clip = s;
+	} else {
+		s = "rect(";
+		t = isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto";
+		s += t + " ";
+		s += t + " ";
+		s += t + " ";
+		s += t + ")";
+
+		if (s != "rect(auto auto auto auto)")
+			ce.style.clip = s;
+	}
+
+	ce.style.cssText = ce.style.cssText;
+}
+
+function isNum(s) {
+	return new RegExp('[0-9]+', 'g').test(s);
+}
+
+function showDisabledControls() {
+	var f = document.forms, i, a;
+
+	for (i=0; i<f.length; i++) {
+		for (a=0; a<f[i].elements.length; a++) {
+			if (f[i].elements[a].disabled)
+				tinyMCEPopup.editor.dom.addClass(f[i].elements[a], "disabled");
+			else
+				tinyMCEPopup.editor.dom.removeClass(f[i].elements[a], "disabled");
+		}
+	}
+}
+
+function fillSelect(f, s, param, dval, sep, em) {
+	var i, ar, p, se;
+
+	f = document.forms[f];
+	sep = typeof(sep) == "undefined" ? ";" : sep;
+
+	if (em)
+		addSelectValue(f, s, "", "");
+
+	ar = tinyMCEPopup.getParam(param, dval).split(sep);
+	for (i=0; i<ar.length; i++) {
+		se = false;
+
+		if (ar[i].charAt(0) == '+') {
+			ar[i] = ar[i].substring(1);
+			se = true;
+		}
+
+		p = ar[i].split('=');
+
+		if (p.length > 1) {
+			addSelectValue(f, s, p[0], p[1]);
+
+			if (se)
+				selectByValue(f, s, p[1]);
+		} else {
+			addSelectValue(f, s, p[0], p[0]);
+
+			if (se)
+				selectByValue(f, s, p[0]);
+		}
+	}
+}
+
+function toggleSame(ce, pre) {
+	var el = document.forms[0].elements, i;
+
+	if (ce.checked) {
+		el[pre + "_top"].disabled = false;
+		el[pre + "_right"].disabled = true;
+		el[pre + "_bottom"].disabled = true;
+		el[pre + "_left"].disabled = true;
+
+		if (el[pre + "_top_measurement"]) {
+			el[pre + "_top_measurement"].disabled = false;
+			el[pre + "_right_measurement"].disabled = true;
+			el[pre + "_bottom_measurement"].disabled = true;
+			el[pre + "_left_measurement"].disabled = true;
+		}
+	} else {
+		el[pre + "_top"].disabled = false;
+		el[pre + "_right"].disabled = false;
+		el[pre + "_bottom"].disabled = false;
+		el[pre + "_left"].disabled = false;
+
+		if (el[pre + "_top_measurement"]) {
+			el[pre + "_top_measurement"].disabled = false;
+			el[pre + "_right_measurement"].disabled = false;
+			el[pre + "_bottom_measurement"].disabled = false;
+			el[pre + "_left_measurement"].disabled = false;
+		}
+	}
+
+	showDisabledControls();
+}
+
+function synch(fr, to) {
+	var f = document.forms[0];
+
+	f.elements[to].value = f.elements[fr].value;
+
+	if (f.elements[fr + "_measurement"])
+		selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value);
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
new file mode 100644
index 000000000..d9d77627b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
@@ -0,0 +1,63 @@
+tinyMCE.addI18n('en.style_dlg',{
+title:"Edit CSS Style",
+apply:"Apply",
+text_tab:"Text",
+background_tab:"Background",
+block_tab:"Block",
+box_tab:"Box",
+border_tab:"Border",
+list_tab:"List",
+positioning_tab:"Positioning",
+text_props:"Text",
+text_font:"Font",
+text_size:"Size",
+text_weight:"Weight",
+text_style:"Style",
+text_variant:"Variant",
+text_lineheight:"Line height",
+text_case:"Case",
+text_color:"Color",
+text_decoration:"Decoration",
+text_overline:"overline",
+text_underline:"underline",
+text_striketrough:"strikethrough",
+text_blink:"blink",
+text_none:"none",
+background_color:"Background color",
+background_image:"Background image",
+background_repeat:"Repeat",
+background_attachment:"Attachment",
+background_hpos:"Horizontal position",
+background_vpos:"Vertical position",
+block_wordspacing:"Word spacing",
+block_letterspacing:"Letter spacing",
+block_vertical_alignment:"Vertical alignment",
+block_text_align:"Text align",
+block_text_indent:"Text indent",
+block_whitespace:"Whitespace",
+block_display:"Display",
+box_width:"Width",
+box_height:"Height",
+box_float:"Float",
+box_clear:"Clear",
+padding:"Padding",
+same:"Same for all",
+top:"Top",
+right:"Right",
+bottom:"Bottom",
+left:"Left",
+margin:"Margin",
+style:"Style",
+width:"Width",
+height:"Height",
+color:"Color",
+list_type:"Type",
+bullet_image:"Bullet image",
+position:"Position",
+positioning_type:"Type",
+visibility:"Visibility",
+zindex:"Z-index",
+overflow:"Overflow",
+placement:"Placement",
+clip:"Clip"
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/props.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/props.htm
new file mode 100644
index 000000000..54538e357
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/style/props.htm
@@ -0,0 +1,731 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#style_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="js/props.js"></script>
+	<link href="css/props.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+
+<body id="styleprops" style="display: none">
+<form onsubmit="updateAction();return false;" action="#">
+<div class="tabs">
+	<ul>
+		<li id="text_tab" class="current"><span><a href="javascript:mcTabs.displayTab('text_tab','text_panel');" onMouseDown="return false;">{#style_dlg.text_tab}</a></span></li>
+		<li id="background_tab"><span><a href="javascript:mcTabs.displayTab('background_tab','background_panel');" onMouseDown="return false;">{#style_dlg.background_tab}</a></span></li>
+		<li id="block_tab"><span><a href="javascript:mcTabs.displayTab('block_tab','block_panel');" onMouseDown="return false;">{#style_dlg.block_tab}</a></span></li>
+		<li id="box_tab"><span><a href="javascript:mcTabs.displayTab('box_tab','box_panel');" onMouseDown="return false;">{#style_dlg.box_tab}</a></span></li>
+		<li id="border_tab"><span><a href="javascript:mcTabs.displayTab('border_tab','border_panel');" onMouseDown="return false;">{#style_dlg.border_tab}</a></span></li>
+		<li id="list_tab"><span><a href="javascript:mcTabs.displayTab('list_tab','list_panel');" onMouseDown="return false;">{#style_dlg.list_tab}</a></span></li>
+		<li id="positioning_tab"><span><a href="javascript:mcTabs.displayTab('positioning_tab','positioning_panel');" onMouseDown="return false;">{#style_dlg.positioning_tab}</a></span></li>
+	</ul>
+</div>
+
+<div class="panel_wrapper">
+<div id="text_panel" class="panel current">
+	<table border="0" width="100%">
+		<tr>
+			<td><label for="text_font">{#style_dlg.text_font}</label></td>
+			<td colspan="3">
+				<select id="text_font" name="text_font" class="mceEditableSelect mceFocus"></select>
+			</td>
+		</tr>
+		<tr>
+			<td><label for="text_size">{#style_dlg.text_size}</label></td>
+			<td>
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
+						<td>&nbsp;</td>
+      <td><select id="text_size_measurement" name="text_size_measurement"></select></td>
+					</tr>
+				</table>
+			</td>
+			<td><label for="text_weight">{#style_dlg.text_weight}</label></td>
+			<td>
+				<select id="text_weight" name="text_weight"></select>
+			</td>
+		</tr>
+		<tr>
+			<td><label for="text_style">{#style_dlg.text_style}</label></td>
+			<td>
+				<select id="text_style" name="text_style" class="mceEditableSelect"></select>
+			</td>
+			<td><label for="text_variant">{#style_dlg.text_variant}</label></td>
+			<td>
+				<select id="text_variant" name="text_variant"></select>
+			</td>
+		</tr>
+		<tr>
+			<td><label for="text_lineheight">{#style_dlg.text_lineheight}</label></td>
+			<td>
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td>
+							<select id="text_lineheight" name="text_lineheight" class="mceEditableSelect"></select>
+						</td>
+						<td>&nbsp;</td>
+						<td><select id="text_lineheight_measurement" name="text_lineheight_measurement"></select></td>
+					</tr>
+				</table>
+			</td>
+			<td><label for="text_case">{#style_dlg.text_case}</label></td>
+			<td>
+				<select id="text_case" name="text_case"></select>
+			</td>
+		</tr>
+		<tr>
+			<td><label for="text_color">{#style_dlg.text_color}</label></td>
+			<td colspan="2">
+				<table border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="text_color" name="text_color" type="text" value="" size="9" onChange="updateColor('text_color_pick','text_color');" /></td>
+						<td id="text_color_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" style="vertical-align: top; padding-top: 3px;">{#style_dlg.text_decoration}</td>
+			<td colspan="2">
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><input id="text_underline" name="text_underline" class="checkbox" type="checkbox" /></td>
+						<td><label for="text_underline">{#style_dlg.text_underline}</label></td>
+					</tr>
+					<tr>
+						<td><input id="text_overline" name="text_overline" class="checkbox" type="checkbox" /></td>
+						<td><label for="text_overline">{#style_dlg.text_overline}</label></td>
+					</tr>
+					<tr>
+						<td><input id="text_linethrough" name="text_linethrough" class="checkbox" type="checkbox" /></td>
+						<td><label for="text_linethrough">{#style_dlg.text_striketrough}</label></td>
+					</tr>
+					<tr>
+						<td><input id="text_blink" name="text_blink" class="checkbox" type="checkbox" /></td>
+						<td><label for="text_blink">{#style_dlg.text_blink}</label></td>
+					</tr>
+					<tr>
+						<td><input id="text_none" name="text_none" class="checkbox" type="checkbox" /></td>
+						<td><label for="text_none">{#style_dlg.text_none}</label></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</div>
+
+<div id="background_panel" class="panel">
+	<table border="0">
+		<tr>
+			<td><label for="background_color">{#style_dlg.background_color}</label></td>
+			<td>
+				<table border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="background_color" name="background_color" type="text" value="" size="9" onChange="updateColor('background_color_pick','background_color');" /></td>
+						<td id="background_color_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td><label for="background_image">{#style_dlg.background_image}</label></td>
+			<td><table border="0" cellspacing="0" cellpadding="0">
+				<tr> 
+				  <td><input id="background_image" name="background_image" type="text" /></td> 
+				  <td id="background_image_browser">&nbsp;</td>
+				</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td><label for="background_repeat">{#style_dlg.background_repeat}</label></td>
+			<td><select id="background_repeat" name="background_repeat" class="mceEditableSelect"></select></td>
+		</tr>
+
+		<tr>
+			<td><label for="background_attachment">{#style_dlg.background_attachment}</label></td>
+			<td><select id="background_attachment" name="background_attachment" class="mceEditableSelect"></select></td>
+		</tr>
+
+		<tr>
+			<td><label for="background_hpos">{#style_dlg.background_hpos}</label></td>
+			<td>
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="background_hpos" name="background_hpos" class="mceEditableSelect"></select></td>
+						<td>&nbsp;</td>
+						<td><select id="background_hpos_measurement" name="background_hpos_measurement"></select></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td><label for="background_vpos">{#style_dlg.background_vpos}</label></td>
+			<td>
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="background_vpos" name="background_vpos" class="mceEditableSelect"></select></td>
+						<td>&nbsp;</td>
+						<td><select id="background_vpos_measurement" name="background_vpos_measurement"></select></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</div>
+
+<div id="block_panel" class="panel">
+	<table border="0">
+		<tr>
+			<td><label for="block_wordspacing">{#style_dlg.block_wordspacing}</label></td>
+			<td>
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="block_wordspacing" name="block_wordspacing" class="mceEditableSelect"></select></td>
+						<td>&nbsp;</td>
+						<td><select id="block_wordspacing_measurement" name="block_wordspacing_measurement"></select></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td><label for="block_letterspacing">{#style_dlg.block_letterspacing}</label></td>
+			<td>
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="block_letterspacing" name="block_letterspacing" class="mceEditableSelect"></select></td>
+						<td>&nbsp;</td>
+						<td><select id="block_letterspacing_measurement" name="block_letterspacing_measurement"></select></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td><label for="block_vertical_alignment">{#style_dlg.block_vertical_alignment}</label></td>
+			<td><select id="block_vertical_alignment" name="block_vertical_alignment" class="mceEditableSelect"></select></td>
+		</tr>
+
+		<tr>
+			<td><label for="block_text_align">{#style_dlg.block_text_align}</label></td>
+			<td><select id="block_text_align" name="block_text_align" class="mceEditableSelect"></select></td>
+		</tr>
+
+		<tr>
+			<td><label for="block_text_indent">{#style_dlg.block_text_indent}</label></td>
+			<td>
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><input type="text" id="block_text_indent" name="block_text_indent" /></td>
+						<td>&nbsp;</td>
+						<td><select id="block_text_indent_measurement" name="block_text_indent_measurement"></select></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td><label for="block_whitespace">{#style_dlg.block_whitespace}</label></td>
+			<td><select id="block_whitespace" name="block_whitespace" class="mceEditableSelect"></select></td>
+		</tr>
+
+		<tr>
+			<td><label for="block_display">{#style_dlg.block_display}</label></td>
+			<td><select id="block_display" name="block_display" class="mceEditableSelect"></select></td>
+		</tr>
+	</table>
+</div>
+
+<div id="box_panel" class="panel">
+<table border="0">
+	<tr>
+		<td><label for="box_width">{#style_dlg.box_width}</label></td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td><input type="text" id="box_width" name="box_width" class="mceEditableSelect" onChange="synch('box_width','positioning_width');" /></td>
+					<td>&nbsp;</td>
+					<td><select id="box_width_measurement" name="box_width_measurement"></select></td>
+				</tr>
+			</table>
+		</td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="box_float">{#style_dlg.box_float}</label></td>
+		<td><select id="box_float" name="box_float" class="mceEditableSelect"></select></td>
+	</tr>
+
+	<tr>
+		<td><label for="box_height">{#style_dlg.box_height}</label></td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td><input type="text" id="box_height" name="box_height" class="mceEditableSelect" onChange="synch('box_height','positioning_height');" /></td>
+					<td>&nbsp;</td>
+					<td><select id="box_height_measurement" name="box_height_measurement"></select></td>
+				</tr>
+			</table>
+		</td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="box_clear">{#style_dlg.box_clear}</label></td>
+		<td><select id="box_clear" name="box_clear" class="mceEditableSelect"></select></td>
+	</tr>
+</table>
+<div style="float: left; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.padding}</legend>
+
+		<table border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="box_padding_same" name="box_padding_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_padding');" /> <label for="box_padding_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_top">{#style_dlg.top}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_top" name="box_padding_top" class="mceEditableSelect" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_padding_top_measurement" name="box_padding_top_measurement"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_right">{#style_dlg.right}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_right" name="box_padding_right" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_padding_right_measurement" name="box_padding_right_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_bottom">{#style_dlg.bottom}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_bottom" name="box_padding_bottom" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_padding_bottom_measurement" name="box_padding_bottom_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_left">{#style_dlg.left}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_left" name="box_padding_left" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_padding_left_measurement" name="box_padding_left_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div style="float: right; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.margin}</legend>
+
+		<table border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="box_margin_same" name="box_margin_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_margin');" /> <label for="box_margin_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_top">{#style_dlg.top}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_top" name="box_margin_top" class="mceEditableSelect" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_margin_top_measurement" name="box_margin_top_measurement"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_right">{#style_dlg.right}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_right" name="box_margin_right" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_margin_right_measurement" name="box_margin_right_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_bottom">{#style_dlg.bottom}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_bottom" name="box_margin_bottom" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_margin_bottom_measurement" name="box_margin_bottom_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_left">{#style_dlg.left}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_left" name="box_margin_left" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_margin_left_measurement" name="box_margin_left_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+<br style="clear: both" />
+</div>
+
+<div id="border_panel" class="panel">
+<table border="0" cellspacing="0" cellpadding="0" width="100%">
+<tr>
+	<td class="tdelim">&nbsp;</td>
+	<td class="tdelim delim">&nbsp;</td>
+	<td class="tdelim">{#style_dlg.style}</td>
+	<td class="tdelim delim">&nbsp;</td>
+	<td class="tdelim">{#style_dlg.width}</td>
+	<td class="tdelim delim">&nbsp;</td>
+	<td class="tdelim">{#style_dlg.color}</td>
+</tr>
+
+<tr>
+	<td>&nbsp;</td>
+	<td class="delim">&nbsp;</td>
+	<td><input type="checkbox" id="border_style_same" name="border_style_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_style');" /> <label for="border_style_same">{#style_dlg.same}</label></td>
+	<td class="delim">&nbsp;</td>
+	<td><input type="checkbox" id="border_width_same" name="border_width_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_width');" /> <label for="border_width_same">{#style_dlg.same}</label></td>
+	<td class="delim">&nbsp;</td>
+	<td><input type="checkbox" id="border_color_same" name="border_color_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_color');" /> <label for="border_color_same">{#style_dlg.same}</label></td>
+</tr>
+
+<tr>
+	<td>{#style_dlg.top}</td>
+	<td class="delim">&nbsp;</td>
+	<td><select id="border_style_top" name="border_style_top" class="mceEditableSelect"></select></td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<td><select id="border_width_top" name="border_width_top" class="mceEditableSelect"></select></td>
+				<td>&nbsp;</td>
+				<td><select id="border_width_top_measurement" name="border_width_top_measurement"></select></td>
+			</tr>
+		</table>
+	</td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellpadding="0" cellspacing="0">
+			<tr>
+				<td><input id="border_color_top" name="border_color_top" type="text" value="" size="9" onChange="updateColor('border_color_top_pick','border_color_top');" /></td>
+				<td id="border_color_top_pickcontainer">&nbsp;</td>
+			</tr>
+		</table>
+	</td>
+</tr>
+
+<tr>
+	<td>{#style_dlg.right}</td>
+	<td class="delim">&nbsp;</td>
+	<td><select id="border_style_right" name="border_style_right" class="mceEditableSelect" disabled="disabled"></select></td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<td><select id="border_width_right" name="border_width_right" class="mceEditableSelect" disabled="disabled"></select></td>
+				<td>&nbsp;</td>
+				<td><select id="border_width_right_measurement" name="border_width_right_measurement" disabled="disabled"></select></td>
+			</tr>
+		</table>
+	</td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellpadding="0" cellspacing="0">
+			<tr>
+				<td><input id="border_color_right" name="border_color_right" type="text" value="" size="9" onChange="updateColor('border_color_right_pick','border_color_right');" disabled="disabled" /></td>
+				<td id="border_color_right_pickcontainer">&nbsp;</td>
+			</tr>
+		</table>
+	</td>
+</tr>
+
+<tr>
+	<td>{#style_dlg.bottom}</td>
+	<td class="delim">&nbsp;</td>
+	<td><select id="border_style_bottom" name="border_style_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<td><select id="border_width_bottom" name="border_width_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
+				<td>&nbsp;</td>
+				<td><select id="border_width_bottom_measurement" name="border_width_bottom_measurement" disabled="disabled"></select></td>
+			</tr>
+		</table>
+	</td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellpadding="0" cellspacing="0">
+			<tr>
+				<td><input id="border_color_bottom" name="border_color_bottom" type="text" value="" size="9" onChange="updateColor('border_color_bottom_pick','border_color_bottom');" disabled="disabled" /></td>
+				<td id="border_color_bottom_pickcontainer">&nbsp;</td>
+			</tr>
+		</table>
+	</td>
+</tr>
+
+<tr>
+	<td>{#style_dlg.left}</td>
+	<td class="delim">&nbsp;</td>
+	<td><select id="border_style_left" name="border_style_left" class="mceEditableSelect" disabled="disabled"></select></td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<td><select id="border_width_left" name="border_width_left" class="mceEditableSelect" disabled="disabled"></select></td>
+				<td>&nbsp;</td>
+				<td><select id="border_width_left_measurement" name="border_width_left_measurement" disabled="disabled"></select></td>
+			</tr>
+		</table>
+	</td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellpadding="0" cellspacing="0">
+			<tr>
+				<td><input id="border_color_left" name="border_color_left" type="text" value="" size="9" onChange="updateColor('border_color_left_pick','border_color_left');" disabled="disabled" /></td>
+				<td id="border_color_left_pickcontainer">&nbsp;</td>
+			</tr>
+		</table>
+	</td>
+</tr>
+</table>
+</div>
+
+<div id="list_panel" class="panel">
+	<table border="0">
+		<tr>
+			<td><label for="list_type">{#style_dlg.list_type}</label></td>
+			<td><select id="list_type" name="list_type" class="mceEditableSelect"></select></td>
+		</tr>
+
+		<tr>
+			<td><label for="list_bullet_image">{#style_dlg.bullet_image}</label></td>
+			<td><input id="list_bullet_image" name="list_bullet_image" type="text" /></td>
+		</tr>
+
+		<tr>
+			<td><label for="list_position">{#style_dlg.position}</label></td>
+			<td><select id="list_position" name="list_position" class="mceEditableSelect"></select></td>
+		</tr>
+	</table>
+</div>
+
+<div id="positioning_panel" class="panel">
+<table border="0">
+	<tr>
+		<td><label for="positioning_type">{#style_dlg.positioning_type}</label></td>
+		<td><select id="positioning_type" name="positioning_type" class="mceEditableSelect"></select></td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_visibility">{#style_dlg.visibility}</label></td>
+		<td><select id="positioning_visibility" name="positioning_visibility" class="mceEditableSelect"></select></td>
+	</tr>
+
+	<tr>
+		<td><label for="positioning_width">{#style_dlg.width}</label></td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td><input type="text" id="positioning_width" name="positioning_width" onChange="synch('positioning_width','box_width');" /></td>
+					<td>&nbsp;</td>
+					<td><select id="positioning_width_measurement" name="positioning_width_measurement"></select></td>
+				</tr>
+			</table>
+		</td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_zindex">{#style_dlg.zindex}</label></td>
+		<td><input type="text" id="positioning_zindex" name="positioning_zindex" /></td>
+	</tr>
+
+	<tr>
+		<td><label for="positioning_height">{#style_dlg.height}</label></td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td><input type="text" id="positioning_height" name="positioning_height" onChange="synch('positioning_height','box_height');" /></td>
+					<td>&nbsp;</td>
+					<td><select id="positioning_height_measurement" name="positioning_height_measurement"></select></td>
+				</tr>
+			</table>
+		</td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_overflow">{#style_dlg.overflow}</label></td>
+		<td><select id="positioning_overflow" name="positioning_overflow" class="mceEditableSelect"></select></td>
+	</tr>
+</table>
+
+<div style="float: left; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.placement}</legend>
+
+		<table border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="positioning_placement_same" name="positioning_placement_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_placement');" /> <label for="positioning_placement_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.top}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_top" name="positioning_placement_top" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_placement_top_measurement" name="positioning_placement_top_measurement"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.right}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_right" name="positioning_placement_right" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_placement_right_measurement" name="positioning_placement_right_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.bottom}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_bottom" name="positioning_placement_bottom" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_placement_bottom_measurement" name="positioning_placement_bottom_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.left}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_left" name="positioning_placement_left" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_placement_left_measurement" name="positioning_placement_left_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div style="float: right; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.clip}</legend>
+
+		<table border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="positioning_clip_same" name="positioning_clip_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_clip');" /> <label for="positioning_clip_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.top}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_top" name="positioning_clip_top" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_clip_top_measurement" name="positioning_clip_top_measurement"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.right}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_right" name="positioning_clip_right" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_clip_right_measurement" name="positioning_clip_right_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.bottom}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_bottom" name="positioning_clip_bottom" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_clip_bottom_measurement" name="positioning_clip_bottom_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.left}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_left" name="positioning_clip_left" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_clip_left_measurement" name="positioning_clip_left_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+<br style="clear: both" />
+</div>
+</div>
+
+<div class="mceActionPanel">
+	<div style="float: left">
+		<div style="float: left"><input type="submit" id="insert" name="insert" value="{#update}" /></div>
+
+		<div style="float: left">&nbsp;<input type="button" class="button" id="apply" name="apply" value="{#style_dlg.apply}" onClick="applyAction();" /></div>
+		<br style="clear: both" />
+	</div>
+
+	<div style="float: right">
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onClick="tinyMCEPopup.close();" />
+	</div>
+</div>
+</form>
+
+<div style="display: none">
+	<div id="container"></div>
+</div>
+
+</body>
+</html>
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/cell.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
new file mode 100644
index 000000000..60264db8e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
@@ -0,0 +1,184 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#table_dlg.cell_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/cell.js"></script>

+	<link href="css/cell.css" rel="stylesheet" type="text/css" />

+	<base target="_self" />

+</head>

+<body id="tablecell" style="display: none">

+	<form onsubmit="updateAction();return false;" action="#">

+		<div class="tabs">

+			<ul>

+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>

+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="general_panel" class="panel current">

+				<fieldset>

+					<legend>{#table_dlg.general_props}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td><label for="align">{#table_dlg.align}</label></td>

+							<td>

+								<select id="align" name="align" class="mceFocus">

+									<option value="">{#not_set}</option>

+									<option value="center">{#table_dlg.align_middle}</option>

+									<option value="left">{#table_dlg.align_left}</option>

+									<option value="right">{#table_dlg.align_right}</option>

+								</select>

+							</td>

+		

+							<td><label for="celltype">{#table_dlg.cell_type}</label></td>

+							<td>

+								<select id="celltype" name="celltype">

+									<option value="td">{#table_dlg.td}</option>

+									<option value="th">{#table_dlg.th}</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="valign">{#table_dlg.valign}</label></td>

+							<td>

+								<select id="valign" name="valign">

+									<option value="">{#not_set}</option>

+									<option value="top">{#table_dlg.align_top}</option>

+									<option value="middle">{#table_dlg.align_middle}</option>

+									<option value="bottom">{#table_dlg.align_bottom}</option>

+								</select>

+							</td>

+

+							<td><label for="scope">{#table_dlg.scope}</label></td>

+							<td>

+								<select id="scope" name="scope">

+									<option value="">{#not_set}</option>

+									<option value="col">{#table.col}</option>

+									<option value="row">{#table.row}</option>

+									<option value="rowgroup">{#table_dlg.rowgroup}</option>

+									<option value="colgroup">{#table_dlg.colgroup}</option>

+								</select>

+							</td>

+

+						</tr>

+

+						<tr>

+							<td><label for="width">{#table_dlg.width}</label></td>

+							<td><input id="width" name="width" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>

+

+							<td><label for="height">{#table_dlg.height}</label></td>

+							<td><input id="height" name="height" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>

+						</tr>

+

+						<tr id="styleSelectRow">

+							<td><label for="class">{#class_name}</label></td>

+							<td colspan="3">

+								<select id="class" name="class" class="mceEditableSelect">

+									<option value="" selected="selected">{#not_set}</option>

+								</select>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+

+			<div id="advanced_panel" class="panel">

+				<fieldset>

+					<legend>{#table_dlg.advanced_props}</legend>

+

+					<table border="0" cellpadding="0" cellspacing="4">

+						<tr>

+							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 

+							<td><input id="id" name="id" type="text" value="" style="width: 200px" /></td> 

+						</tr>

+

+						<tr>

+							<td><label for="style">{#table_dlg.style}</label></td>

+							<td><input type="text" id="style" name="style" value="" style="width: 200px;" onchange="changedStyle();" /></td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="dir">{#table_dlg.langdir}</label></td> 

+							<td>

+								<select id="dir" name="dir" style="width: 200px"> 

+										<option value="">{#not_set}</option> 

+										<option value="ltr">{#table_dlg.ltr}</option> 

+										<option value="rtl">{#table_dlg.rtl}</option> 

+								</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="lang">{#table_dlg.langcode}</label></td> 

+							<td>

+								<input id="lang" name="lang" type="text" value="" style="width: 200px" />

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>

+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="bordercolor">{#table_dlg.bordercolor}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>

+										<td id="bordercolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>

+										<td id="bgcolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<div>

+				<select id="action" name="action">

+					<option value="cell">{#table_dlg.cell_cell}</option>

+					<option value="row">{#table_dlg.cell_row}</option>

+					<option value="all">{#table_dlg.cell_all}</option>

+				</select>

+			</div>

+

+			<div style="float: left">

+				<div><input type="submit" id="insert" name="insert" value="{#update}" /></div>

+			</div>

+

+			<div style="float: right">

+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+			</div>

+		</div>

+	</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css
new file mode 100644
index 000000000..a47cc1a1e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css
@@ -0,0 +1,17 @@
+/* CSS file for cell dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 200px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#action {
+	margin-bottom: 3px;
+}
+
+#class {
+	width: 150px;
+}
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/css/row.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/css/row.css
new file mode 100644
index 000000000..0e397db3e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/css/row.css
@@ -0,0 +1,25 @@
+/* CSS file for row dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 200px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#action {
+	margin-bottom: 3px;
+}
+
+#rowtype,#align,#valign,#class,#height {
+	width: 150px;
+}
+
+#height {
+	width: 50px;	
+}
+
+.col2 {
+	padding-left: 20px;
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/css/table.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/css/table.css
new file mode 100644
index 000000000..8f107831e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/css/table.css
@@ -0,0 +1,13 @@
+/* CSS file for table dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 245px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#class {
+	width: 150px;
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
new file mode 100644
index 000000000..085882a5b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var each=tinymce.each;tinymce.create('tinymce.plugins.TablePlugin',{init:function(ed,url){var t=this;t.editor=ed;t.url=url;each([['table','table.desc','mceInsertTable',true],['delete_table','table.del','mceTableDelete'],['delete_col','table.delete_col_desc','mceTableDeleteCol'],['delete_row','table.delete_row_desc','mceTableDeleteRow'],['col_after','table.col_after_desc','mceTableInsertColAfter'],['col_before','table.col_before_desc','mceTableInsertColBefore'],['row_after','table.row_after_desc','mceTableInsertRowAfter'],['row_before','table.row_before_desc','mceTableInsertRowBefore'],['row_props','table.row_desc','mceTableRowProps',true],['cell_props','table.cell_desc','mceTableCellProps',true],['split_cells','table.split_cells_desc','mceTableSplitCells',true],['merge_cells','table.merge_cells_desc','mceTableMergeCells',true]],function(c){ed.addButton(c[0],{title:c[1],cmd:c[2],ui:c[3]});});ed.onInit.add(function(){if(ed&&ed.plugins.contextmenu){ed.plugins.contextmenu.onContextMenu.add(function(th,m,e){var sm,se=ed.selection,el=se.getNode()||ed.getBody();if(ed.dom.getParent(e,'td')||ed.dom.getParent(e,'th')){m.removeAll();if(el.nodeName=='A'&&!ed.dom.getAttrib(el,'name')){m.add({title:'advanced.link_desc',icon:'link',cmd:ed.plugins.advlink?'mceAdvLink':'mceLink',ui:true});m.add({title:'advanced.unlink_desc',icon:'unlink',cmd:'UnLink'});m.addSeparator();}if(el.nodeName=='IMG'&&el.className.indexOf('mceItem')==-1){m.add({title:'advanced.image_desc',icon:'image',cmd:ed.plugins.advimage?'mceAdvImage':'mceImage',ui:true});m.addSeparator();}m.add({title:'table.desc',icon:'table',cmd:'mceInsertTable',ui:true,value:{action:'insert'}});m.add({title:'table.props_desc',icon:'table_props',cmd:'mceInsertTable',ui:true});m.add({title:'table.del',icon:'delete_table',cmd:'mceTableDelete',ui:true});m.addSeparator();sm=m.addMenu({title:'table.cell'});sm.add({title:'table.cell_desc',icon:'cell_props',cmd:'mceTableCellProps',ui:true});sm.add({title:'table.split_cells_desc',icon:'split_cells',cmd:'mceTableSplitCells',ui:true});sm.add({title:'table.merge_cells_desc',icon:'merge_cells',cmd:'mceTableMergeCells',ui:true});sm=m.addMenu({title:'table.row'});sm.add({title:'table.row_desc',icon:'row_props',cmd:'mceTableRowProps',ui:true});sm.add({title:'table.row_before_desc',icon:'row_before',cmd:'mceTableInsertRowBefore'});sm.add({title:'table.row_after_desc',icon:'row_after',cmd:'mceTableInsertRowAfter'});sm.add({title:'table.delete_row_desc',icon:'delete_row',cmd:'mceTableDeleteRow'});sm.addSeparator();sm.add({title:'table.cut_row_desc',icon:'cut',cmd:'mceTableCutRow'});sm.add({title:'table.copy_row_desc',icon:'copy',cmd:'mceTableCopyRow'});sm.add({title:'table.paste_row_before_desc',icon:'paste',cmd:'mceTablePasteRowBefore'});sm.add({title:'table.paste_row_after_desc',icon:'paste',cmd:'mceTablePasteRowAfter'});sm=m.addMenu({title:'table.col'});sm.add({title:'table.col_before_desc',icon:'col_before',cmd:'mceTableInsertColBefore'});sm.add({title:'table.col_after_desc',icon:'col_after',cmd:'mceTableInsertColAfter'});sm.add({title:'table.delete_col_desc',icon:'delete_col',cmd:'mceTableDeleteCol'});}else m.add({title:'table.desc',icon:'table',cmd:'mceInsertTable',ui:true});});}});ed.onKeyDown.add(function(ed,e){if(e.keyCode==9&&ed.dom.getParent(ed.selection.getNode(),'TABLE')){if(!tinymce.isGecko&&!tinymce.isOpera){tinyMCE.execInstanceCommand(ed.editorId,"mceTableMoveToNextRow",true);return tinymce.dom.Event.cancel(e);}ed.undoManager.add();}});if(!tinymce.isIE){if(ed.getParam('table_selection',true)){ed.onClick.add(function(ed,e){e=e.target;if(e.nodeName==='TABLE')ed.selection.select(e);});}}ed.onNodeChange.add(function(ed,cm,n){var p=ed.dom.getParent(n,'td,th,caption');cm.setActive('table',n.nodeName==='TABLE'||!!p);if(p&&p.nodeName==='CAPTION')p=null;cm.setDisabled('delete_table',!p);cm.setDisabled('delete_col',!p);cm.setDisabled('delete_table',!p);cm.setDisabled('delete_row',!p);cm.setDisabled('col_after',!p);cm.setDisabled('col_before',!p);cm.setDisabled('row_after',!p);cm.setDisabled('row_before',!p);cm.setDisabled('row_props',!p);cm.setDisabled('cell_props',!p);cm.setDisabled('split_cells',!p||(parseInt(ed.dom.getAttrib(p,'colspan','1'))<2&&parseInt(ed.dom.getAttrib(p,'rowspan','1'))<2));cm.setDisabled('merge_cells',!p);});if(!tinymce.isIE){ed.onBeforeSetContent.add(function(ed,o){if(o.initial)o.content=o.content.replace(/<(td|th)([^>]+|)>\s*<\/(td|th)>/g,tinymce.isOpera?'<$1$2>&nbsp;</$1>':'<$1$2><br mce_bogus="1" /></$1>');});}},execCommand:function(cmd,ui,val){var ed=this.editor,b;switch(cmd){case"mceTableMoveToNextRow":case"mceInsertTable":case"mceTableRowProps":case"mceTableCellProps":case"mceTableSplitCells":case"mceTableMergeCells":case"mceTableInsertRowBefore":case"mceTableInsertRowAfter":case"mceTableDeleteRow":case"mceTableInsertColBefore":case"mceTableInsertColAfter":case"mceTableDeleteCol":case"mceTableCutRow":case"mceTableCopyRow":case"mceTablePasteRowBefore":case"mceTablePasteRowAfter":case"mceTableDelete":ed.execCommand('mceBeginUndoLevel');this._doExecCommand(cmd,ui,val);ed.execCommand('mceEndUndoLevel');return true;}return false;},getInfo:function(){return{longname:'Tables',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_doExecCommand:function(command,user_interface,value){var inst=this.editor,ed=inst,url=this.url;var focusElm=inst.selection.getNode();var trElm=inst.dom.getParent(focusElm,"tr");var tdElm=inst.dom.getParent(focusElm,"td,th");var tableElm=inst.dom.getParent(focusElm,"table");var doc=inst.contentWindow.document;var tableBorder=tableElm?tableElm.getAttribute("border"):"";if(trElm&&tdElm==null)tdElm=trElm.cells[0];function inArray(ar,v){for(var i=0;i<ar.length;i++){if(ar[i].length>0&&inArray(ar[i],v))return true;if(ar[i]==v)return true;}return false;}function select(dx,dy){var td;grid=getTableGrid(tableElm);dx=dx||0;dy=dy||0;dx=Math.max(cpos.cellindex+dx,0);dy=Math.max(cpos.rowindex+dy,0);inst.execCommand('mceRepaint');td=getCell(grid,dy,dx);if(td){inst.selection.select(td.firstChild||td);inst.selection.collapse(1);}};function makeTD(){var newTD=doc.createElement("td");if(!tinymce.isIE)newTD.innerHTML='<br mce_bogus="1"/>';}function getColRowSpan(td){var colspan=inst.dom.getAttrib(td,"colspan");var rowspan=inst.dom.getAttrib(td,"rowspan");colspan=colspan==""?1:parseInt(colspan);rowspan=rowspan==""?1:parseInt(rowspan);return{colspan:colspan,rowspan:rowspan};}function getCellPos(grid,td){var x,y;for(y=0;y<grid.length;y++){for(x=0;x<grid[y].length;x++){if(grid[y][x]==td)return{cellindex:x,rowindex:y};}}return null;}function getCell(grid,row,col){if(grid[row]&&grid[row][col])return grid[row][col];return null;}function getNextCell(table,cell){var cells=[],x=0,i,j,cell,nextCell;for(i=0;i<table.rows.length;i++)for(j=0;j<table.rows[i].cells.length;j++,x++)cells[x]=table.rows[i].cells[j];for(i=0;i<cells.length;i++)if(cells[i]==cell)if(nextCell=cells[i+1])return nextCell;}function getTableGrid(table){var grid=[],rows=table.rows,x,y,td,sd,xstart,x2,y2;for(y=0;y<rows.length;y++){for(x=0;x<rows[y].cells.length;x++){td=rows[y].cells[x];sd=getColRowSpan(td);for(xstart=x;grid[y]&&grid[y][xstart];xstart++);for(y2=y;y2<y+sd['rowspan'];y2++){if(!grid[y2])grid[y2]=[];for(x2=xstart;x2<xstart+sd['colspan'];x2++)grid[y2][x2]=td;}}}return grid;}function trimRow(table,tr,td,new_tr){var grid=getTableGrid(table),cpos=getCellPos(grid,td);var cells,lastElm;if(new_tr.cells.length!=tr.childNodes.length){cells=tr.childNodes;lastElm=null;for(var x=0;td=getCell(grid,cpos.rowindex,x);x++){var remove=true;var sd=getColRowSpan(td);if(inArray(cells,td)){new_tr.childNodes[x]._delete=true;}else if((lastElm==null||td!=lastElm)&&sd.colspan>1){for(var i=x;i<x+td.colSpan;i++)new_tr.childNodes[i]._delete=true;}if((lastElm==null||td!=lastElm)&&sd.rowspan>1)td.rowSpan=sd.rowspan+1;lastElm=td;}deleteMarked(tableElm);}}function prevElm(node,name){while((node=node.previousSibling)!=null){if(node.nodeName==name)return node;}return null;}function nextElm(node,names){var namesAr=names.split(',');while((node=node.nextSibling)!=null){for(var i=0;i<namesAr.length;i++){if(node.nodeName.toLowerCase()==namesAr[i].toLowerCase())return node;}}return null;}function deleteMarked(tbl){if(tbl.rows==0)return;var tr=tbl.rows[0];do{var next=nextElm(tr,"TR");if(tr._delete){tr.parentNode.removeChild(tr);continue;}var td=tr.cells[0];if(td.cells>1){do{var nexttd=nextElm(td,"TD,TH");if(td._delete)td.parentNode.removeChild(td);}while((td=nexttd)!=null);}}while((tr=next)!=null);}function addRows(td_elm,tr_elm,rowspan){td_elm.rowSpan=1;var trNext=nextElm(tr_elm,"TR");for(var i=1;i<rowspan&&trNext;i++){var newTD=doc.createElement("td");if(!tinymce.isIE)newTD.innerHTML='<br mce_bogus="1"/>';if(tinymce.isIE)trNext.insertBefore(newTD,trNext.cells(td_elm.cellIndex));else trNext.insertBefore(newTD,trNext.cells[td_elm.cellIndex]);trNext=nextElm(trNext,"TR");}}function copyRow(doc,table,tr){var grid=getTableGrid(table);var newTR=tr.cloneNode(false);var cpos=getCellPos(grid,tr.cells[0]);var lastCell=null;var tableBorder=inst.dom.getAttrib(table,"border");var tdElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){var newTD=null;if(lastCell!=tdElm){for(var i=0;i<tr.cells.length;i++){if(tdElm==tr.cells[i]){newTD=tdElm.cloneNode(true);break;}}}if(newTD==null){newTD=doc.createElement("td");if(!tinymce.isIE)newTD.innerHTML='<br mce_bogus="1"/>';}newTD.colSpan=1;newTD.rowSpan=1;newTR.appendChild(newTD);lastCell=tdElm;}return newTR;}switch(command){case"mceTableMoveToNextRow":var nextCell=getNextCell(tableElm,tdElm);if(!nextCell){inst.execCommand("mceTableInsertRowAfter",tdElm);nextCell=getNextCell(tableElm,tdElm);}inst.selection.select(nextCell);inst.selection.collapse(true);return true;case"mceTableRowProps":if(trElm==null)return true;if(user_interface){inst.windowManager.open({url:url+'/row.htm',width:400+parseInt(inst.getLang('table.rowprops_delta_width',0)),height:295+parseInt(inst.getLang('table.rowprops_delta_height',0)),inline:1},{plugin_url:url});}return true;case"mceTableCellProps":if(tdElm==null)return true;if(user_interface){inst.windowManager.open({url:url+'/cell.htm',width:400+parseInt(inst.getLang('table.cellprops_delta_width',0)),height:295+parseInt(inst.getLang('table.cellprops_delta_height',0)),inline:1},{plugin_url:url});}return true;case"mceInsertTable":if(user_interface){inst.windowManager.open({url:url+'/table.htm',width:400+parseInt(inst.getLang('table.table_delta_width',0)),height:320+parseInt(inst.getLang('table.table_delta_height',0)),inline:1},{plugin_url:url,action:value?value.action:0});}return true;case"mceTableDelete":var table=inst.dom.getParent(inst.selection.getNode(),"table");if(table){table.parentNode.removeChild(table);inst.execCommand('mceRepaint');}return true;case"mceTableSplitCells":case"mceTableMergeCells":case"mceTableInsertRowBefore":case"mceTableInsertRowAfter":case"mceTableDeleteRow":case"mceTableInsertColBefore":case"mceTableInsertColAfter":case"mceTableDeleteCol":case"mceTableCutRow":case"mceTableCopyRow":case"mceTablePasteRowBefore":case"mceTablePasteRowAfter":if(!tableElm)return true;if(trElm&&tableElm!=trElm.parentNode)tableElm=trElm.parentNode;if(tableElm&&trElm){switch(command){case"mceTableCutRow":if(!trElm||!tdElm)return true;inst.tableRowClipboard=copyRow(doc,tableElm,trElm);inst.execCommand("mceTableDeleteRow");break;case"mceTableCopyRow":if(!trElm||!tdElm)return true;inst.tableRowClipboard=copyRow(doc,tableElm,trElm);break;case"mceTablePasteRowBefore":if(!trElm||!tdElm)return true;var newTR=inst.tableRowClipboard.cloneNode(true);var prevTR=prevElm(trElm,"TR");if(prevTR!=null)trimRow(tableElm,prevTR,prevTR.cells[0],newTR);trElm.parentNode.insertBefore(newTR,trElm);break;case"mceTablePasteRowAfter":if(!trElm||!tdElm)return true;var nextTR=nextElm(trElm,"TR");var newTR=inst.tableRowClipboard.cloneNode(true);trimRow(tableElm,trElm,tdElm,newTR);if(nextTR==null)trElm.parentNode.appendChild(newTR);else nextTR.parentNode.insertBefore(newTR,nextTR);break;case"mceTableInsertRowBefore":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var newTR=doc.createElement("tr");var lastTDElm=null;cpos.rowindex--;if(cpos.rowindex<0)cpos.rowindex=0;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['rowspan']==1){var newTD=doc.createElement("td");if(!tinymce.isIE)newTD.innerHTML='<br mce_bogus="1"/>';newTD.colSpan=tdElm.colSpan;newTR.appendChild(newTD);}else tdElm.rowSpan=sd['rowspan']+1;lastTDElm=tdElm;}}trElm.parentNode.insertBefore(newTR,trElm);select(0,1);break;case"mceTableInsertRowAfter":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var newTR=doc.createElement("tr");var lastTDElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['rowspan']==1){var newTD=doc.createElement("td");if(!tinymce.isIE)newTD.innerHTML='<br mce_bogus="1"/>';newTD.colSpan=tdElm.colSpan;newTR.appendChild(newTD);}else tdElm.rowSpan=sd['rowspan']+1;lastTDElm=tdElm;}}if(newTR.hasChildNodes()){var nextTR=nextElm(trElm,"TR");if(nextTR)nextTR.parentNode.insertBefore(newTR,nextTR);else tableElm.appendChild(newTR);}select(0,1);break;case"mceTableDeleteRow":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);if(grid.length==1&&tableElm.nodeName=='TBODY'){inst.dom.remove(inst.dom.getParent(tableElm,"table"));return true;}var cells=trElm.cells;var nextTR=nextElm(trElm,"TR");for(var x=0;x<cells.length;x++){if(cells[x].rowSpan>1){var newTD=cells[x].cloneNode(true);var sd=getColRowSpan(cells[x]);newTD.rowSpan=sd.rowspan-1;var nextTD=nextTR.cells[x];if(nextTD==null)nextTR.appendChild(newTD);else nextTR.insertBefore(newTD,nextTD);}}var lastTDElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd.rowspan>1){tdElm.rowSpan=sd.rowspan-1;}else{trElm=tdElm.parentNode;if(trElm.parentNode)trElm._delete=true;}lastTDElm=tdElm;}}deleteMarked(tableElm);select(0,-1);break;case"mceTableInsertColBefore":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']==1){var newTD=doc.createElement(tdElm.nodeName);if(!tinymce.isIE)newTD.innerHTML='<br mce_bogus="1"/>';newTD.rowSpan=tdElm.rowSpan;tdElm.parentNode.insertBefore(newTD,tdElm);}else tdElm.colSpan++;lastTDElm=tdElm;}}select();break;case"mceTableInsertColAfter":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']==1){var newTD=doc.createElement(tdElm.nodeName);if(!tinymce.isIE)newTD.innerHTML='<br mce_bogus="1"/>';newTD.rowSpan=tdElm.rowSpan;var nextTD=nextElm(tdElm,"TD,TH");if(nextTD==null)tdElm.parentNode.appendChild(newTD);else nextTD.parentNode.insertBefore(newTD,nextTD);}else tdElm.colSpan++;lastTDElm=tdElm;}}select(1);break;case"mceTableDeleteCol":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;if((grid.length>1&&grid[0].length<=1)&&tableElm.nodeName=='TBODY'){inst.dom.remove(inst.dom.getParent(tableElm,"table"));return true;}for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']>1)tdElm.colSpan=sd['colspan']-1;else{if(tdElm.parentNode)tdElm.parentNode.removeChild(tdElm);}lastTDElm=tdElm;}}select(-1);break;case"mceTableSplitCells":if(!trElm||!tdElm)return true;var spandata=getColRowSpan(tdElm);var colspan=spandata["colspan"];var rowspan=spandata["rowspan"];if(colspan>1||rowspan>1){tdElm.colSpan=1;for(var i=1;i<colspan;i++){var newTD=doc.createElement("td");if(!tinymce.isIE)newTD.innerHTML='<br mce_bogus="1"/>';trElm.insertBefore(newTD,nextElm(tdElm,"TD,TH"));if(rowspan>1)addRows(newTD,trElm,rowspan);}addRows(tdElm,trElm,rowspan);}tableElm=inst.dom.getParent(inst.selection.getNode(),"table");break;case"mceTableMergeCells":var rows=[];var sel=inst.selection.getSel();var grid=getTableGrid(tableElm);if(tinymce.isIE||sel.rangeCount==1){if(user_interface){var sp=getColRowSpan(tdElm);inst.windowManager.open({url:url+'/merge_cells.htm',width:240+parseInt(inst.getLang('table.merge_cells_delta_width',0)),height:110+parseInt(inst.getLang('table.merge_cells_delta_height',0)),inline:1},{action:"update",numcols:sp.colspan,numrows:sp.rowspan,plugin_url:url});return true;}else{var numRows=parseInt(value['numrows']);var numCols=parseInt(value['numcols']);var cpos=getCellPos(grid,tdElm);if((""+numRows)=="NaN")numRows=1;if((""+numCols)=="NaN")numCols=1;var tRows=tableElm.rows;for(var y=cpos.rowindex;y<grid.length;y++){var rowCells=[];for(var x=cpos.cellindex;x<grid[y].length;x++){var td=getCell(grid,y,x);if(td&&!inArray(rows,td)&&!inArray(rowCells,td)){var cp=getCellPos(grid,td);if(cp.cellindex<cpos.cellindex+numCols&&cp.rowindex<cpos.rowindex+numRows)rowCells[rowCells.length]=td;}}if(rowCells.length>0)rows[rows.length]=rowCells;var td=getCell(grid,cpos.rowindex,cpos.cellindex);each(ed.dom.select('br',td),function(e,i){if(i>0&&ed.dom.getAttrib('mce_bogus'))ed.dom.remove(e);});}}}else{var cells=[];var sel=inst.selection.getSel();var lastTR=null;var curRow=null;var x1=-1,y1=-1,x2,y2;if(sel.rangeCount<2)return true;for(var i=0;i<sel.rangeCount;i++){var rng=sel.getRangeAt(i);var tdElm=rng.startContainer.childNodes[rng.startOffset];if(!tdElm)break;if(tdElm.nodeName=="TD"||tdElm.nodeName=="TH")cells[cells.length]=tdElm;}var tRows=tableElm.rows;for(var y=0;y<tRows.length;y++){var rowCells=[];for(var x=0;x<tRows[y].cells.length;x++){var td=tRows[y].cells[x];for(var i=0;i<cells.length;i++){if(td==cells[i]){rowCells[rowCells.length]=td;}}}if(rowCells.length>0)rows[rows.length]=rowCells;}var curRow=[];var lastTR=null;for(var y=0;y<grid.length;y++){for(var x=0;x<grid[y].length;x++){grid[y][x]._selected=false;for(var i=0;i<cells.length;i++){if(grid[y][x]==cells[i]){if(x1==-1){x1=x;y1=y;}x2=x;y2=y;grid[y][x]._selected=true;}}}}for(var y=y1;y<=y2;y++){for(var x=x1;x<=x2;x++){if(!grid[y][x]._selected){alert("Invalid selection for merge.");return true;}}}}var rowSpan=1,colSpan=1;var lastRowSpan=-1;for(var y=0;y<rows.length;y++){var rowColSpan=0;for(var x=0;x<rows[y].length;x++){var sd=getColRowSpan(rows[y][x]);rowColSpan+=sd['colspan'];if(lastRowSpan!=-1&&sd['rowspan']!=lastRowSpan){alert("Invalid selection for merge.");return true;}lastRowSpan=sd['rowspan'];}if(rowColSpan>colSpan)colSpan=rowColSpan;lastRowSpan=-1;}var lastColSpan=-1;for(var x=0;x<rows[0].length;x++){var colRowSpan=0;for(var y=0;y<rows.length;y++){var sd=getColRowSpan(rows[y][x]);colRowSpan+=sd['rowspan'];if(lastColSpan!=-1&&sd['colspan']!=lastColSpan){alert("Invalid selection for merge.");return true;}lastColSpan=sd['colspan'];}if(colRowSpan>rowSpan)rowSpan=colRowSpan;lastColSpan=-1;}tdElm=rows[0][0];tdElm.rowSpan=rowSpan;tdElm.colSpan=colSpan;for(var y=0;y<rows.length;y++){for(var x=0;x<rows[y].length;x++){var html=rows[y][x].innerHTML;var chk=html.replace(/[ \t\r\n]/g,"");if(chk!="<br/>"&&chk!="<br>"&&chk!='<br mce_bogus="1"/>'&&(x+y>0))tdElm.innerHTML+=html;if(rows[y][x]!=tdElm&&!rows[y][x]._deleted){var cpos=getCellPos(grid,rows[y][x]);var tr=rows[y][x].parentNode;tr.removeChild(rows[y][x]);rows[y][x]._deleted=true;if(!tr.hasChildNodes()){tr.parentNode.removeChild(tr);var lastCell=null;for(var x=0;cellElm=getCell(grid,cpos.rowindex,x);x++){if(cellElm!=lastCell&&cellElm.rowSpan>1)cellElm.rowSpan--;lastCell=cellElm;}if(tdElm.rowSpan>1)tdElm.rowSpan--;}}}}each(ed.dom.select('br',tdElm),function(e,i){if(i>0&&ed.dom.getAttrib(e,'mce_bogus'))ed.dom.remove(e);});break;}tableElm=inst.dom.getParent(inst.selection.getNode(),"table");inst.addVisual(tableElm);inst.nodeChanged();}return true;}return false;}});tinymce.PluginManager.add('table',tinymce.plugins.TablePlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
new file mode 100644
index 000000000..9e4144ac9
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
@@ -0,0 +1,1115 @@
+/**
+ * $Id: editor_plugin_src.js 853 2008-05-27 08:05:35Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.plugins.TablePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+			t.url = url;
+
+			// Register buttons
+			each([
+				['table', 'table.desc', 'mceInsertTable', true],
+				['delete_table', 'table.del', 'mceTableDelete'],
+				['delete_col', 'table.delete_col_desc', 'mceTableDeleteCol'],
+				['delete_row', 'table.delete_row_desc', 'mceTableDeleteRow'],
+				['col_after', 'table.col_after_desc', 'mceTableInsertColAfter'],
+				['col_before', 'table.col_before_desc', 'mceTableInsertColBefore'],
+				['row_after', 'table.row_after_desc', 'mceTableInsertRowAfter'],
+				['row_before', 'table.row_before_desc', 'mceTableInsertRowBefore'],
+				['row_props', 'table.row_desc', 'mceTableRowProps', true],
+				['cell_props', 'table.cell_desc', 'mceTableCellProps', true],
+				['split_cells', 'table.split_cells_desc', 'mceTableSplitCells', true],
+				['merge_cells', 'table.merge_cells_desc', 'mceTableMergeCells', true]
+			], function(c) {
+				ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});
+			});
+
+			ed.onInit.add(function() {
+				if (ed && ed.plugins.contextmenu) {
+					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
+						var sm, se = ed.selection, el = se.getNode() || ed.getBody();
+
+						if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th')) {
+							m.removeAll();
+
+							if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {
+								m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});
+								m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});
+								m.addSeparator();
+							}
+
+							if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {
+								m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});
+								m.addSeparator();
+							}
+
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', ui : true, value : {action : 'insert'}});
+							m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable', ui : true});
+							m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete', ui : true});
+							m.addSeparator();
+
+							// Cell menu
+							sm = m.addMenu({title : 'table.cell'});
+							sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps', ui : true});
+							sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells', ui : true});
+							sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells', ui : true});
+
+							// Row menu
+							sm = m.addMenu({title : 'table.row'});
+							sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps', ui : true});
+							sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});
+							sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});
+							sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});
+							sm.addSeparator();
+							sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});
+							sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});
+							sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'});
+							sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'});
+
+							// Column menu
+							sm = m.addMenu({title : 'table.col'});
+							sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});
+							sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});
+							sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});
+						} else
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', ui : true});
+					});
+				}
+			});
+
+			// Add undo level when new rows are created using the tab key
+			ed.onKeyDown.add(function(ed, e) {
+				if (e.keyCode == 9 && ed.dom.getParent(ed.selection.getNode(), 'TABLE')) {
+					if (!tinymce.isGecko && !tinymce.isOpera) {
+						tinyMCE.execInstanceCommand(ed.editorId, "mceTableMoveToNextRow", true);
+						return tinymce.dom.Event.cancel(e);
+					}
+
+					ed.undoManager.add();
+				}
+			});
+
+			// Select whole table is a table border is clicked
+			if (!tinymce.isIE) {
+				if (ed.getParam('table_selection', true)) {
+					ed.onClick.add(function(ed, e) {
+						e = e.target;
+
+						if (e.nodeName === 'TABLE')
+							ed.selection.select(e);
+					});
+				}
+			}
+
+			ed.onNodeChange.add(function(ed, cm, n) {
+				var p = ed.dom.getParent(n, 'td,th,caption');
+
+				cm.setActive('table', n.nodeName === 'TABLE' || !!p);
+				if (p && p.nodeName === 'CAPTION')
+					p = null;
+
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_col', !p);
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_row', !p);
+				cm.setDisabled('col_after', !p);
+				cm.setDisabled('col_before', !p);
+				cm.setDisabled('row_after', !p);
+				cm.setDisabled('row_before', !p);
+				cm.setDisabled('row_props', !p);
+				cm.setDisabled('cell_props', !p);
+				cm.setDisabled('split_cells', !p || (parseInt(ed.dom.getAttrib(p, 'colspan', '1')) < 2 && parseInt(ed.dom.getAttrib(p, 'rowspan', '1')) < 2));
+				cm.setDisabled('merge_cells', !p);
+			});
+
+			// Padd empty table cells
+			if (!tinymce.isIE) {
+				ed.onBeforeSetContent.add(function(ed, o) {
+					if (o.initial)
+						o.content = o.content.replace(/<(td|th)([^>]+|)>\s*<\/(td|th)>/g, tinymce.isOpera ? '<$1$2>&nbsp;</$1>' : '<$1$2><br mce_bogus="1" /></$1>');
+				});
+			}
+		},
+
+		execCommand : function(cmd, ui, val) {
+			var ed = this.editor, b;
+
+			// Is table command
+			switch (cmd) {
+				case "mceTableMoveToNextRow":
+				case "mceInsertTable":
+				case "mceTableRowProps":
+				case "mceTableCellProps":
+				case "mceTableSplitCells":
+				case "mceTableMergeCells":
+				case "mceTableInsertRowBefore":
+				case "mceTableInsertRowAfter":
+				case "mceTableDeleteRow":
+				case "mceTableInsertColBefore":
+				case "mceTableInsertColAfter":
+				case "mceTableDeleteCol":
+				case "mceTableCutRow":
+				case "mceTableCopyRow":
+				case "mceTablePasteRowBefore":
+				case "mceTablePasteRowAfter":
+				case "mceTableDelete":
+					ed.execCommand('mceBeginUndoLevel');
+					this._doExecCommand(cmd, ui, val);
+					ed.execCommand('mceEndUndoLevel');
+
+					return true;
+			}
+
+			// Pass to next handler in chain
+			return false;
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Tables',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private plugin internal methods
+
+		/**
+		 * Executes the table commands.
+		 */
+		_doExecCommand : function(command, user_interface, value) {
+			var inst = this.editor, ed = inst, url = this.url;
+			var focusElm = inst.selection.getNode();
+			var trElm = inst.dom.getParent(focusElm, "tr");
+			var tdElm = inst.dom.getParent(focusElm, "td,th");
+			var tableElm = inst.dom.getParent(focusElm, "table");
+			var doc = inst.contentWindow.document;
+			var tableBorder = tableElm ? tableElm.getAttribute("border") : "";
+
+			// Get first TD if no TD found
+			if (trElm && tdElm == null)
+				tdElm = trElm.cells[0];
+
+			function inArray(ar, v) {
+				for (var i=0; i<ar.length; i++) {
+					// Is array
+					if (ar[i].length > 0 && inArray(ar[i], v))
+						return true;
+
+					// Found value
+					if (ar[i] == v)
+						return true;
+				}
+
+				return false;
+			}
+
+			function select(dx, dy) {
+				var td;
+
+				grid = getTableGrid(tableElm);
+				dx = dx || 0;
+				dy = dy || 0;
+				dx = Math.max(cpos.cellindex + dx, 0);
+				dy = Math.max(cpos.rowindex + dy, 0);
+
+				// Recalculate grid and select
+				inst.execCommand('mceRepaint');
+				td = getCell(grid, dy, dx);
+
+				if (td) {
+					inst.selection.select(td.firstChild || td);
+					inst.selection.collapse(1);
+				}
+			};
+
+			function makeTD() {
+				var newTD = doc.createElement("td");
+
+				if (!tinymce.isIE)
+					newTD.innerHTML = '<br mce_bogus="1"/>';
+			}
+
+			function getColRowSpan(td) {
+				var colspan = inst.dom.getAttrib(td, "colspan");
+				var rowspan = inst.dom.getAttrib(td, "rowspan");
+
+				colspan = colspan == "" ? 1 : parseInt(colspan);
+				rowspan = rowspan == "" ? 1 : parseInt(rowspan);
+
+				return {colspan : colspan, rowspan : rowspan};
+			}
+
+			function getCellPos(grid, td) {
+				var x, y;
+
+				for (y=0; y<grid.length; y++) {
+					for (x=0; x<grid[y].length; x++) {
+						if (grid[y][x] == td)
+							return {cellindex : x, rowindex : y};
+					}
+				}
+
+				return null;
+			}
+
+			function getCell(grid, row, col) {
+				if (grid[row] && grid[row][col])
+					return grid[row][col];
+
+				return null;
+			}
+
+			function getNextCell(table, cell) {
+				var cells = [], x = 0, i, j, cell, nextCell;
+
+				for (i = 0; i < table.rows.length; i++)
+					for (j = 0; j < table.rows[i].cells.length; j++, x++)
+						cells[x] = table.rows[i].cells[j];
+
+				for (i = 0; i < cells.length; i++)
+					if (cells[i] == cell)
+						if (nextCell = cells[i+1])
+							return nextCell;
+			}
+
+			function getTableGrid(table) {
+				var grid = [], rows = table.rows, x, y, td, sd, xstart, x2, y2;
+
+				for (y=0; y<rows.length; y++) {
+					for (x=0; x<rows[y].cells.length; x++) {
+						td = rows[y].cells[x];
+						sd = getColRowSpan(td);
+
+						// All ready filled
+						for (xstart = x; grid[y] && grid[y][xstart]; xstart++) ;
+
+						// Fill box
+						for (y2=y; y2<y+sd['rowspan']; y2++) {
+							if (!grid[y2])
+								grid[y2] = [];
+
+							for (x2=xstart; x2<xstart+sd['colspan']; x2++)
+								grid[y2][x2] = td;
+						}
+					}
+				}
+
+				return grid;
+			}
+
+			function trimRow(table, tr, td, new_tr) {
+				var grid = getTableGrid(table), cpos = getCellPos(grid, td);
+				var cells, lastElm;
+
+				// Time to crop away some
+				if (new_tr.cells.length != tr.childNodes.length) {
+					cells = tr.childNodes;
+					lastElm = null;
+
+					for (var x=0; td = getCell(grid, cpos.rowindex, x); x++) {
+						var remove = true;
+						var sd = getColRowSpan(td);
+
+						// Remove due to rowspan
+						if (inArray(cells, td)) {
+							new_tr.childNodes[x]._delete = true;
+						} else if ((lastElm == null || td != lastElm) && sd.colspan > 1) { // Remove due to colspan
+							for (var i=x; i<x+td.colSpan; i++)
+								new_tr.childNodes[i]._delete = true;
+						}
+
+						if ((lastElm == null || td != lastElm) && sd.rowspan > 1)
+							td.rowSpan = sd.rowspan + 1;
+
+						lastElm = td;
+					}
+
+					deleteMarked(tableElm);
+				}
+			}
+
+			function prevElm(node, name) {
+				while ((node = node.previousSibling) != null) {
+					if (node.nodeName == name)
+						return node;
+				}
+
+				return null;
+			}
+
+			function nextElm(node, names) {
+				var namesAr = names.split(',');
+
+				while ((node = node.nextSibling) != null) {
+					for (var i=0; i<namesAr.length; i++) {
+						if (node.nodeName.toLowerCase() == namesAr[i].toLowerCase() )
+							return node;
+					}
+				}
+
+				return null;
+			}
+
+			function deleteMarked(tbl) {
+				if (tbl.rows == 0)
+					return;
+
+				var tr = tbl.rows[0];
+				do {
+					var next = nextElm(tr, "TR");
+
+					// Delete row
+					if (tr._delete) {
+						tr.parentNode.removeChild(tr);
+						continue;
+					}
+
+					// Delete cells
+					var td = tr.cells[0];
+					if (td.cells > 1) {
+						do {
+							var nexttd = nextElm(td, "TD,TH");
+
+							if (td._delete)
+								td.parentNode.removeChild(td);
+						} while ((td = nexttd) != null);
+					}
+				} while ((tr = next) != null);
+			}
+
+			function addRows(td_elm, tr_elm, rowspan) {
+				// Add rows
+				td_elm.rowSpan = 1;
+				var trNext = nextElm(tr_elm, "TR");
+				for (var i=1; i<rowspan && trNext; i++) {
+					var newTD = doc.createElement("td");
+
+					if (!tinymce.isIE)
+						newTD.innerHTML = '<br mce_bogus="1"/>';
+
+					if (tinymce.isIE)
+						trNext.insertBefore(newTD, trNext.cells(td_elm.cellIndex));
+					else
+						trNext.insertBefore(newTD, trNext.cells[td_elm.cellIndex]);
+
+					trNext = nextElm(trNext, "TR");
+				}
+			}
+
+			function copyRow(doc, table, tr) {
+				var grid = getTableGrid(table);
+				var newTR = tr.cloneNode(false);
+				var cpos = getCellPos(grid, tr.cells[0]);
+				var lastCell = null;
+				var tableBorder = inst.dom.getAttrib(table, "border");
+				var tdElm = null;
+
+				for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+					var newTD = null;
+
+					if (lastCell != tdElm) {
+						for (var i=0; i<tr.cells.length; i++) {
+							if (tdElm == tr.cells[i]) {
+								newTD = tdElm.cloneNode(true);
+								break;
+							}
+						}
+					}
+
+					if (newTD == null) {
+						newTD = doc.createElement("td");
+
+						if (!tinymce.isIE)
+							newTD.innerHTML = '<br mce_bogus="1"/>';
+					}
+
+					// Reset col/row span
+					newTD.colSpan = 1;
+					newTD.rowSpan = 1;
+
+					newTR.appendChild(newTD);
+
+					lastCell = tdElm;
+				}
+
+				return newTR;
+			}
+
+			// ---- Commands -----
+
+			// Handle commands
+			switch (command) {
+				case "mceTableMoveToNextRow":
+					var nextCell = getNextCell(tableElm, tdElm);
+
+					if (!nextCell) {
+						inst.execCommand("mceTableInsertRowAfter", tdElm);
+						nextCell = getNextCell(tableElm, tdElm);
+					}
+
+					inst.selection.select(nextCell);
+					inst.selection.collapse(true);
+
+					return true;
+
+				case "mceTableRowProps":
+					if (trElm == null)
+						return true;
+
+					if (user_interface) {
+						inst.windowManager.open({
+							url : url + '/row.htm',
+							width : 400 + parseInt(inst.getLang('table.rowprops_delta_width', 0)),
+							height : 295 + parseInt(inst.getLang('table.rowprops_delta_height', 0)),
+							inline : 1
+						}, {
+							plugin_url : url
+						});
+					}
+
+					return true;
+
+				case "mceTableCellProps":
+					if (tdElm == null)
+						return true;
+
+					if (user_interface) {
+						inst.windowManager.open({
+							url : url + '/cell.htm',
+							width : 400 + parseInt(inst.getLang('table.cellprops_delta_width', 0)),
+							height : 295 + parseInt(inst.getLang('table.cellprops_delta_height', 0)),
+							inline : 1
+						}, {
+							plugin_url : url
+						});
+					}
+
+					return true;
+
+				case "mceInsertTable":
+					if (user_interface) {
+						inst.windowManager.open({
+							url : url + '/table.htm',
+							width : 400 + parseInt(inst.getLang('table.table_delta_width', 0)),
+							height : 320 + parseInt(inst.getLang('table.table_delta_height', 0)),
+							inline : 1
+						}, {
+							plugin_url : url,
+							action : value ? value.action : 0
+						});
+					}
+
+					return true;
+
+				case "mceTableDelete":
+					var table = inst.dom.getParent(inst.selection.getNode(), "table");
+					if (table) {
+						table.parentNode.removeChild(table);
+						inst.execCommand('mceRepaint');
+					}
+					return true;
+
+				case "mceTableSplitCells":
+				case "mceTableMergeCells":
+				case "mceTableInsertRowBefore":
+				case "mceTableInsertRowAfter":
+				case "mceTableDeleteRow":
+				case "mceTableInsertColBefore":
+				case "mceTableInsertColAfter":
+				case "mceTableDeleteCol":
+				case "mceTableCutRow":
+				case "mceTableCopyRow":
+				case "mceTablePasteRowBefore":
+				case "mceTablePasteRowAfter":
+					// No table just return (invalid command)
+					if (!tableElm)
+						return true;
+
+					// Table has a tbody use that reference
+					// Changed logic by ApTest 2005.07.12 (www.aptest.com)
+					// Now lookk at the focused element and take its parentNode.  That will be a tbody or a table.
+					if (trElm && tableElm != trElm.parentNode)
+						tableElm = trElm.parentNode;
+
+					if (tableElm && trElm) {
+						switch (command) {
+							case "mceTableCutRow":
+								if (!trElm || !tdElm)
+									return true;
+
+								inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
+								inst.execCommand("mceTableDeleteRow");
+								break;
+
+							case "mceTableCopyRow":
+								if (!trElm || !tdElm)
+									return true;
+
+								inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
+								break;
+
+							case "mceTablePasteRowBefore":
+								if (!trElm || !tdElm)
+									return true;
+
+								var newTR = inst.tableRowClipboard.cloneNode(true);
+
+								var prevTR = prevElm(trElm, "TR");
+								if (prevTR != null)
+									trimRow(tableElm, prevTR, prevTR.cells[0], newTR);
+
+								trElm.parentNode.insertBefore(newTR, trElm);
+								break;
+
+							case "mceTablePasteRowAfter":
+								if (!trElm || !tdElm)
+									return true;
+								
+								var nextTR = nextElm(trElm, "TR");
+								var newTR = inst.tableRowClipboard.cloneNode(true);
+
+								trimRow(tableElm, trElm, tdElm, newTR);
+
+								if (nextTR == null)
+									trElm.parentNode.appendChild(newTR);
+								else
+									nextTR.parentNode.insertBefore(newTR, nextTR);
+
+								break;
+
+							case "mceTableInsertRowBefore":
+								if (!trElm || !tdElm)
+									return true;
+
+								var grid = getTableGrid(tableElm);
+								var cpos = getCellPos(grid, tdElm);
+								var newTR = doc.createElement("tr");
+								var lastTDElm = null;
+
+								cpos.rowindex--;
+								if (cpos.rowindex < 0)
+									cpos.rowindex = 0;
+
+								// Create cells
+								for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+									if (tdElm != lastTDElm) {
+										var sd = getColRowSpan(tdElm);
+
+										if (sd['rowspan'] == 1) {
+											var newTD = doc.createElement("td");
+
+											if (!tinymce.isIE)
+												newTD.innerHTML = '<br mce_bogus="1"/>';
+
+											newTD.colSpan = tdElm.colSpan;
+
+											newTR.appendChild(newTD);
+										} else
+											tdElm.rowSpan = sd['rowspan'] + 1;
+
+										lastTDElm = tdElm;
+									}
+								}
+
+								trElm.parentNode.insertBefore(newTR, trElm);
+								select(0, 1);
+							break;
+
+							case "mceTableInsertRowAfter":
+								if (!trElm || !tdElm)
+									return true;
+
+								var grid = getTableGrid(tableElm);
+								var cpos = getCellPos(grid, tdElm);
+								var newTR = doc.createElement("tr");
+								var lastTDElm = null;
+
+								// Create cells
+								for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+									if (tdElm != lastTDElm) {
+										var sd = getColRowSpan(tdElm);
+
+										if (sd['rowspan'] == 1) {
+											var newTD = doc.createElement("td");
+
+											if (!tinymce.isIE)
+												newTD.innerHTML = '<br mce_bogus="1"/>';
+
+											newTD.colSpan = tdElm.colSpan;
+
+											newTR.appendChild(newTD);
+										} else
+											tdElm.rowSpan = sd['rowspan'] + 1;
+
+										lastTDElm = tdElm;
+									}
+								}
+
+								if (newTR.hasChildNodes()) {
+									var nextTR = nextElm(trElm, "TR");
+									if (nextTR)
+										nextTR.parentNode.insertBefore(newTR, nextTR);
+									else
+										tableElm.appendChild(newTR);
+								}
+
+								select(0, 1);
+							break;
+
+							case "mceTableDeleteRow":
+								if (!trElm || !tdElm)
+									return true;
+
+								var grid = getTableGrid(tableElm);
+								var cpos = getCellPos(grid, tdElm);
+
+								// Only one row, remove whole table
+								if (grid.length == 1 && tableElm.nodeName == 'TBODY') {
+									inst.dom.remove(inst.dom.getParent(tableElm, "table"));
+									return true;
+								}
+
+								// Move down row spanned cells
+								var cells = trElm.cells;
+								var nextTR = nextElm(trElm, "TR");
+								for (var x=0; x<cells.length; x++) {
+									if (cells[x].rowSpan > 1) {
+										var newTD = cells[x].cloneNode(true);
+										var sd = getColRowSpan(cells[x]);
+
+										newTD.rowSpan = sd.rowspan - 1;
+
+										var nextTD = nextTR.cells[x];
+
+										if (nextTD == null)
+											nextTR.appendChild(newTD);
+										else
+											nextTR.insertBefore(newTD, nextTD);
+									}
+								}
+
+								// Delete cells
+								var lastTDElm = null;
+								for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+									if (tdElm != lastTDElm) {
+										var sd = getColRowSpan(tdElm);
+
+										if (sd.rowspan > 1) {
+											tdElm.rowSpan = sd.rowspan - 1;
+										} else {
+											trElm = tdElm.parentNode;
+
+											if (trElm.parentNode)
+												trElm._delete = true;
+										}
+
+										lastTDElm = tdElm;
+									}
+								}
+
+								deleteMarked(tableElm);
+
+								select(0, -1);
+							break;
+
+							case "mceTableInsertColBefore":
+								if (!trElm || !tdElm)
+									return true;
+
+								var grid = getTableGrid(tableElm);
+								var cpos = getCellPos(grid, tdElm);
+								var lastTDElm = null;
+
+								for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+									if (tdElm != lastTDElm) {
+										var sd = getColRowSpan(tdElm);
+
+										if (sd['colspan'] == 1) {
+											var newTD = doc.createElement(tdElm.nodeName);
+
+											if (!tinymce.isIE)
+												newTD.innerHTML = '<br mce_bogus="1"/>';
+
+											newTD.rowSpan = tdElm.rowSpan;
+
+											tdElm.parentNode.insertBefore(newTD, tdElm);
+										} else
+											tdElm.colSpan++;
+
+										lastTDElm = tdElm;
+									}
+								}
+
+								select();
+							break;
+
+							case "mceTableInsertColAfter":
+								if (!trElm || !tdElm)
+									return true;
+
+								var grid = getTableGrid(tableElm);
+								var cpos = getCellPos(grid, tdElm);
+								var lastTDElm = null;
+
+								for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+									if (tdElm != lastTDElm) {
+										var sd = getColRowSpan(tdElm);
+
+										if (sd['colspan'] == 1) {
+											var newTD = doc.createElement(tdElm.nodeName);
+
+											if (!tinymce.isIE)
+												newTD.innerHTML = '<br mce_bogus="1"/>';
+
+											newTD.rowSpan = tdElm.rowSpan;
+
+											var nextTD = nextElm(tdElm, "TD,TH");
+											if (nextTD == null)
+												tdElm.parentNode.appendChild(newTD);
+											else
+												nextTD.parentNode.insertBefore(newTD, nextTD);
+										} else
+											tdElm.colSpan++;
+
+										lastTDElm = tdElm;
+									}
+								}
+
+								select(1);
+							break;
+
+							case "mceTableDeleteCol":
+								if (!trElm || !tdElm)
+									return true;
+
+								var grid = getTableGrid(tableElm);
+								var cpos = getCellPos(grid, tdElm);
+								var lastTDElm = null;
+
+								// Only one col, remove whole table
+								if ((grid.length > 1 && grid[0].length <= 1) && tableElm.nodeName == 'TBODY') {
+									inst.dom.remove(inst.dom.getParent(tableElm, "table"));
+									return true;
+								}
+
+								// Delete cells
+								for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+									if (tdElm != lastTDElm) {
+										var sd = getColRowSpan(tdElm);
+
+										if (sd['colspan'] > 1)
+											tdElm.colSpan = sd['colspan'] - 1;
+										else {
+											if (tdElm.parentNode)
+												tdElm.parentNode.removeChild(tdElm);
+										}
+
+										lastTDElm = tdElm;
+									}
+								}
+
+								select(-1);
+							break;
+
+						case "mceTableSplitCells":
+							if (!trElm || !tdElm)
+								return true;
+
+							var spandata = getColRowSpan(tdElm);
+
+							var colspan = spandata["colspan"];
+							var rowspan = spandata["rowspan"];
+
+							// Needs splitting
+							if (colspan > 1 || rowspan > 1) {
+								// Generate cols
+								tdElm.colSpan = 1;
+								for (var i=1; i<colspan; i++) {
+									var newTD = doc.createElement("td");
+
+									if (!tinymce.isIE)
+										newTD.innerHTML = '<br mce_bogus="1"/>';
+
+									trElm.insertBefore(newTD, nextElm(tdElm, "TD,TH"));
+
+									if (rowspan > 1)
+										addRows(newTD, trElm, rowspan);
+								}
+
+								addRows(tdElm, trElm, rowspan);
+							}
+
+							// Apply visual aids
+							tableElm = inst.dom.getParent(inst.selection.getNode(), "table");
+							break;
+
+						case "mceTableMergeCells":
+							var rows = [];
+							var sel = inst.selection.getSel();
+							var grid = getTableGrid(tableElm);
+
+							if (tinymce.isIE || sel.rangeCount == 1) {
+								if (user_interface) {
+									// Setup template
+									var sp = getColRowSpan(tdElm);
+
+									inst.windowManager.open({
+										url : url + '/merge_cells.htm',
+										width : 240 + parseInt(inst.getLang('table.merge_cells_delta_width', 0)),
+										height : 110 + parseInt(inst.getLang('table.merge_cells_delta_height', 0)),
+										inline : 1
+									}, {
+										action : "update",
+										numcols : sp.colspan,
+										numrows : sp.rowspan,
+										plugin_url : url
+									});
+
+									return true;
+								} else {
+									var numRows = parseInt(value['numrows']);
+									var numCols = parseInt(value['numcols']);
+									var cpos = getCellPos(grid, tdElm);
+
+									if (("" + numRows) == "NaN")
+										numRows = 1;
+
+									if (("" + numCols) == "NaN")
+										numCols = 1;
+
+									// Get rows and cells
+									var tRows = tableElm.rows;
+									for (var y=cpos.rowindex; y<grid.length; y++) {
+										var rowCells = [];
+
+										for (var x=cpos.cellindex; x<grid[y].length; x++) {
+											var td = getCell(grid, y, x);
+
+											if (td && !inArray(rows, td) && !inArray(rowCells, td)) {
+												var cp = getCellPos(grid, td);
+
+												// Within range
+												if (cp.cellindex < cpos.cellindex+numCols && cp.rowindex < cpos.rowindex+numRows)
+													rowCells[rowCells.length] = td;
+											}
+										}
+
+										if (rowCells.length > 0)
+											rows[rows.length] = rowCells;
+
+										var td = getCell(grid, cpos.rowindex, cpos.cellindex);
+										each(ed.dom.select('br', td), function(e, i) {
+											if (i > 0 && ed.dom.getAttrib('mce_bogus'))
+												ed.dom.remove(e);
+										});
+									}
+
+									//return true;
+								}
+							} else {
+								var cells = [];
+								var sel = inst.selection.getSel();
+								var lastTR = null;
+								var curRow = null;
+								var x1 = -1, y1 = -1, x2, y2;
+
+								// Only one cell selected, whats the point?
+								if (sel.rangeCount < 2)
+									return true;
+
+								// Get all selected cells
+								for (var i=0; i<sel.rangeCount; i++) {
+									var rng = sel.getRangeAt(i);
+									var tdElm = rng.startContainer.childNodes[rng.startOffset];
+
+									if (!tdElm)
+										break;
+
+									if (tdElm.nodeName == "TD" || tdElm.nodeName == "TH")
+										cells[cells.length] = tdElm;
+								}
+
+								// Get rows and cells
+								var tRows = tableElm.rows;
+								for (var y=0; y<tRows.length; y++) {
+									var rowCells = [];
+
+									for (var x=0; x<tRows[y].cells.length; x++) {
+										var td = tRows[y].cells[x];
+
+										for (var i=0; i<cells.length; i++) {
+											if (td == cells[i]) {
+												rowCells[rowCells.length] = td;
+											}
+										}
+									}
+
+									if (rowCells.length > 0)
+										rows[rows.length] = rowCells;
+								}
+
+								// Find selected cells in grid and box
+								var curRow = [];
+								var lastTR = null;
+								for (var y=0; y<grid.length; y++) {
+									for (var x=0; x<grid[y].length; x++) {
+										grid[y][x]._selected = false;
+
+										for (var i=0; i<cells.length; i++) {
+											if (grid[y][x] == cells[i]) {
+												// Get start pos
+												if (x1 == -1) {
+													x1 = x;
+													y1 = y;
+												}
+
+												// Get end pos
+												x2 = x;
+												y2 = y;
+
+												grid[y][x]._selected = true;
+											}
+										}
+									}
+								}
+
+								// Is there gaps, if so deny
+								for (var y=y1; y<=y2; y++) {
+									for (var x=x1; x<=x2; x++) {
+										if (!grid[y][x]._selected) {
+											alert("Invalid selection for merge.");
+											return true;
+										}
+									}
+								}
+							}
+
+							// Validate selection and get total rowspan and colspan
+							var rowSpan = 1, colSpan = 1;
+
+							// Validate horizontal and get total colspan
+							var lastRowSpan = -1;
+							for (var y=0; y<rows.length; y++) {
+								var rowColSpan = 0;
+
+								for (var x=0; x<rows[y].length; x++) {
+									var sd = getColRowSpan(rows[y][x]);
+
+									rowColSpan += sd['colspan'];
+
+									if (lastRowSpan != -1 && sd['rowspan'] != lastRowSpan) {
+										alert("Invalid selection for merge.");
+										return true;
+									}
+
+									lastRowSpan = sd['rowspan'];
+								}
+
+								if (rowColSpan > colSpan)
+									colSpan = rowColSpan;
+
+								lastRowSpan = -1;
+							}
+
+							// Validate vertical and get total rowspan
+							var lastColSpan = -1;
+							for (var x=0; x<rows[0].length; x++) {
+								var colRowSpan = 0;
+
+								for (var y=0; y<rows.length; y++) {
+									var sd = getColRowSpan(rows[y][x]);
+
+									colRowSpan += sd['rowspan'];
+
+									if (lastColSpan != -1 && sd['colspan'] != lastColSpan) {
+										alert("Invalid selection for merge.");
+										return true;
+									}
+
+									lastColSpan = sd['colspan'];
+								}
+
+								if (colRowSpan > rowSpan)
+									rowSpan = colRowSpan;
+
+								lastColSpan = -1;
+							}
+
+							// Setup td
+							tdElm = rows[0][0];
+							tdElm.rowSpan = rowSpan;
+							tdElm.colSpan = colSpan;
+
+							// Merge cells
+							for (var y=0; y<rows.length; y++) {
+								for (var x=0; x<rows[y].length; x++) {
+									var html = rows[y][x].innerHTML;
+									var chk = html.replace(/[ \t\r\n]/g, "");
+
+									if (chk != "<br/>" && chk != "<br>" && chk != '<br mce_bogus="1"/>' && (x+y > 0))
+										tdElm.innerHTML += html;
+
+									// Not current cell
+									if (rows[y][x] != tdElm && !rows[y][x]._deleted) {
+										var cpos = getCellPos(grid, rows[y][x]);
+										var tr = rows[y][x].parentNode;
+
+										tr.removeChild(rows[y][x]);
+										rows[y][x]._deleted = true;
+
+										// Empty TR, remove it
+										if (!tr.hasChildNodes()) {
+											tr.parentNode.removeChild(tr);
+
+											var lastCell = null;
+											for (var x=0; cellElm = getCell(grid, cpos.rowindex, x); x++) {
+												if (cellElm != lastCell && cellElm.rowSpan > 1)
+													cellElm.rowSpan--;
+
+												lastCell = cellElm;
+											}
+
+											if (tdElm.rowSpan > 1)
+												tdElm.rowSpan--;
+										}
+									}
+								}
+							}
+
+							// Remove all but one bogus br
+							each(ed.dom.select('br', tdElm), function(e, i) {
+								if (i > 0 && ed.dom.getAttrib(e, 'mce_bogus'))
+									ed.dom.remove(e);
+							});
+
+							break;
+						}
+
+						tableElm = inst.dom.getParent(inst.selection.getNode(), "table");
+						inst.addVisual(tableElm);
+						inst.nodeChanged();
+					}
+
+				return true;
+			}
+
+			// Pass to next handler in chain
+			return false;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('table', tinymce.plugins.TablePlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
new file mode 100644
index 000000000..feb70611a
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
@@ -0,0 +1,259 @@
+tinyMCEPopup.requireLangPack();
+
+var ed;
+
+function init() {
+	ed = tinyMCEPopup.editor;
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor')
+
+	var inst = ed;
+	var tdElm = ed.dom.getParent(ed.selection.getNode(), "td,th");
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(ed.dom.getAttrib(tdElm, "style"));
+
+	// Get table cell data
+	var celltype = tdElm.nodeName.toLowerCase();
+	var align = ed.dom.getAttrib(tdElm, 'align');
+	var valign = ed.dom.getAttrib(tdElm, 'valign');
+	var width = trimSize(getStyle(tdElm, 'width', 'width'));
+	var height = trimSize(getStyle(tdElm, 'height', 'height'));
+	var bordercolor = convertRGBToHex(getStyle(tdElm, 'bordercolor', 'borderLeftColor'));
+	var bgcolor = convertRGBToHex(getStyle(tdElm, 'bgcolor', 'backgroundColor'));
+	var className = ed.dom.getAttrib(tdElm, 'class');
+	var backgroundimage = getStyle(tdElm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");;
+	var id = ed.dom.getAttrib(tdElm, 'id');
+	var lang = ed.dom.getAttrib(tdElm, 'lang');
+	var dir = ed.dom.getAttrib(tdElm, 'dir');
+	var scope = ed.dom.getAttrib(tdElm, 'scope');
+
+	// Setup form
+	addClassesToList('class', 'table_cell_styles');
+	TinyMCE_EditableSelects.init();
+
+	formObj.bordercolor.value = bordercolor;
+	formObj.bgcolor.value = bgcolor;
+	formObj.backgroundimage.value = backgroundimage;
+	formObj.width.value = width;
+	formObj.height.value = height;
+	formObj.id.value = id;
+	formObj.lang.value = lang;
+	formObj.style.value = ed.dom.serializeStyle(st);
+	selectByValue(formObj, 'align', align);
+	selectByValue(formObj, 'valign', valign);
+	selectByValue(formObj, 'class', className, true, true);
+	selectByValue(formObj, 'celltype', celltype);
+	selectByValue(formObj, 'dir', dir);
+	selectByValue(formObj, 'scope', scope);
+
+	// Resize some elements
+	if (isVisible('backgroundimagebrowser'))
+		document.getElementById('backgroundimage').style.width = '180px';
+
+	updateColor('bordercolor_pick', 'bordercolor');
+	updateColor('bgcolor_pick', 'bgcolor');
+}
+
+function updateAction() {
+	var el, inst = ed, tdElm, trElm, tableElm, formObj = document.forms[0];
+
+	tinyMCEPopup.restoreSelection();
+	el = ed.selection.getNode();
+	tdElm = ed.dom.getParent(el, "td,th");
+	trElm = ed.dom.getParent(el, "tr");
+	tableElm = ed.dom.getParent(el, "table");
+
+	ed.execCommand('mceBeginUndoLevel');
+
+	switch (getSelectValue(formObj, 'action')) {
+		case "cell":
+			var celltype = getSelectValue(formObj, 'celltype');
+			var scope = getSelectValue(formObj, 'scope');
+
+			if (ed.getParam("accessibility_warnings")) {
+				if (celltype == "th" && scope == "")
+					var answer = confirm(ed.getLang('table_dlg.missing_scope', '', true));
+				else
+					var answer = true;
+
+				if (!answer)
+					return;
+			}
+
+			updateCell(tdElm);
+			break;
+
+		case "row":
+			var cell = trElm.firstChild;
+
+			if (cell.nodeName != "TD" && cell.nodeName != "TH")
+				cell = nextCell(cell);
+
+			do {
+				cell = updateCell(cell, true);
+			} while ((cell = nextCell(cell)) != null);
+
+			break;
+
+		case "all":
+			var rows = tableElm.getElementsByTagName("tr");
+
+			for (var i=0; i<rows.length; i++) {
+				var cell = rows[i].firstChild;
+
+				if (cell.nodeName != "TD" && cell.nodeName != "TH")
+					cell = nextCell(cell);
+
+				do {
+					cell = updateCell(cell, true);
+				} while ((cell = nextCell(cell)) != null);
+			}
+
+			break;
+	}
+
+	ed.addVisual();
+	ed.nodeChanged();
+	inst.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function nextCell(elm) {
+	while ((elm = elm.nextSibling) != null) {
+		if (elm.nodeName == "TD" || elm.nodeName == "TH")
+			return elm;
+	}
+
+	return null;
+}
+
+function updateCell(td, skip_id) {
+	var inst = ed;
+	var formObj = document.forms[0];
+	var curCellType = td.nodeName.toLowerCase();
+	var celltype = getSelectValue(formObj, 'celltype');
+	var doc = inst.getDoc();
+	var dom = ed.dom;
+
+	if (!skip_id)
+		td.setAttribute('id', formObj.id.value);
+
+	td.setAttribute('align', formObj.align.value);
+	td.setAttribute('vAlign', formObj.valign.value);
+	td.setAttribute('lang', formObj.lang.value);
+	td.setAttribute('dir', getSelectValue(formObj, 'dir'));
+	td.setAttribute('style', ed.dom.serializeStyle(ed.dom.parseStyle(formObj.style.value)));
+	td.setAttribute('scope', formObj.scope.value);
+	ed.dom.setAttrib(td, 'class', getSelectValue(formObj, 'class'));
+
+	// Clear deprecated attributes
+	ed.dom.setAttrib(td, 'width', '');
+	ed.dom.setAttrib(td, 'height', '');
+	ed.dom.setAttrib(td, 'bgColor', '');
+	ed.dom.setAttrib(td, 'borderColor', '');
+	ed.dom.setAttrib(td, 'background', '');
+
+	// Set styles
+	td.style.width = getCSSSize(formObj.width.value);
+	td.style.height = getCSSSize(formObj.height.value);
+	if (formObj.bordercolor.value != "") {
+		td.style.borderColor = formObj.bordercolor.value;
+		td.style.borderStyle = td.style.borderStyle == "" ? "solid" : td.style.borderStyle;
+		td.style.borderWidth = td.style.borderWidth == "" ? "1px" : td.style.borderWidth;
+	} else
+		td.style.borderColor = '';
+
+	td.style.backgroundColor = formObj.bgcolor.value;
+
+	if (formObj.backgroundimage.value != "")
+		td.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";
+	else
+		td.style.backgroundImage = '';
+
+	if (curCellType != celltype) {
+		// changing to a different node type
+		var newCell = doc.createElement(celltype);
+
+		for (var c=0; c<td.childNodes.length; c++)
+			newCell.appendChild(td.childNodes[c].cloneNode(1));
+
+		for (var a=0; a<td.attributes.length; a++)
+			ed.dom.setAttrib(newCell, td.attributes[a].name, ed.dom.getAttrib(td, td.attributes[a].name));
+
+		td.parentNode.replaceChild(newCell, td);
+		td = newCell;
+	}
+
+	dom.setAttrib(td, 'style', dom.serializeStyle(dom.parseStyle(td.style.cssText)));
+
+	return td;
+}
+
+function changedBackgroundImage() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+
+	formObj.style.value = ed.dom.serializeStyle(st);
+}
+
+function changedSize() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	var width = formObj.width.value;
+	if (width != "")
+		st['width'] = getCSSSize(width);
+	else
+		st['width'] = "";
+
+	var height = formObj.height.value;
+	if (height != "")
+		st['height'] = getCSSSize(height);
+	else
+		st['height'] = "";
+
+	formObj.style.value = ed.dom.serializeStyle(st);
+}
+
+function changedColor() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	st['background-color'] = formObj.bgcolor.value;
+	st['border-color'] = formObj.bordercolor.value;
+
+	formObj.style.value = ed.dom.serializeStyle(st);
+}
+
+function changedStyle() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	if (st['background-image'])
+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	else
+		formObj.backgroundimage.value = '';
+
+	if (st['width'])
+		formObj.width.value = trimSize(st['width']);
+
+	if (st['height'])
+		formObj.height.value = trimSize(st['height']);
+
+	if (st['background-color']) {
+		formObj.bgcolor.value = st['background-color'];
+		updateColor('bgcolor_pick','bgcolor');
+	}
+
+	if (st['border-color']) {
+		formObj.bordercolor.value = st['border-color'];
+		updateColor('bordercolor_pick','bordercolor');
+	}
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js
new file mode 100644
index 000000000..f223e92c3
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js
@@ -0,0 +1,29 @@
+tinyMCEPopup.requireLangPack();
+
+function init() {
+	var f = document.forms[0], v;
+
+	tinyMCEPopup.resizeToInnerSize();
+
+	f.numcols.value = tinyMCEPopup.getWindowArg('numcols', 1);
+	f.numrows.value = tinyMCEPopup.getWindowArg('numrows', 1);
+}
+
+function mergeCells() {
+	var args = [], f = document.forms[0];
+
+	tinyMCEPopup.restoreSelection();
+
+	if (!AutoValidator.validate(f)) {
+		alert(tinyMCEPopup.getLang('invalid_data'));
+		return false;
+	}
+
+	args["numcols"] = f.numcols.value;
+	args["numrows"] = f.numrows.value;
+
+	tinyMCEPopup.execCommand("mceTableMergeCells", false, args);
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/row.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
new file mode 100644
index 000000000..3a171624c
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
@@ -0,0 +1,212 @@
+tinyMCEPopup.requireLangPack();
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+
+	var inst = tinyMCEPopup.editor;
+	var dom = inst.dom;
+	var trElm = dom.getParent(inst.selection.getNode(), "tr");
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(dom.getAttrib(trElm, "style"));
+
+	// Get table row data
+	var rowtype = trElm.parentNode.nodeName.toLowerCase();
+	var align = dom.getAttrib(trElm, 'align');
+	var valign = dom.getAttrib(trElm, 'valign');
+	var height = trimSize(getStyle(trElm, 'height', 'height'));
+	var className = dom.getAttrib(trElm, 'class');
+	var bgcolor = convertRGBToHex(getStyle(trElm, 'bgcolor', 'backgroundColor'));
+	var backgroundimage = getStyle(trElm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");;
+	var id = dom.getAttrib(trElm, 'id');
+	var lang = dom.getAttrib(trElm, 'lang');
+	var dir = dom.getAttrib(trElm, 'dir');
+
+	// Setup form
+	addClassesToList('class', 'table_row_styles');
+	TinyMCE_EditableSelects.init();
+
+	formObj.bgcolor.value = bgcolor;
+	formObj.backgroundimage.value = backgroundimage;
+	formObj.height.value = height;
+	formObj.id.value = id;
+	formObj.lang.value = lang;
+	formObj.style.value = dom.serializeStyle(st);
+	selectByValue(formObj, 'align', align);
+	selectByValue(formObj, 'valign', valign);
+	selectByValue(formObj, 'class', className, true, true);
+	selectByValue(formObj, 'rowtype', rowtype);
+	selectByValue(formObj, 'dir', dir);
+
+	// Resize some elements
+	if (isVisible('backgroundimagebrowser'))
+		document.getElementById('backgroundimage').style.width = '180px';
+
+	updateColor('bgcolor_pick', 'bgcolor');
+}
+
+function updateAction() {
+	var inst = tinyMCEPopup.editor, dom = inst.dom, trElm, tableElm, formObj = document.forms[0];
+	var action = getSelectValue(formObj, 'action');
+
+	tinyMCEPopup.restoreSelection();
+	trElm = dom.getParent(inst.selection.getNode(), "tr");
+	tableElm = dom.getParent(inst.selection.getNode(), "table");
+
+	inst.execCommand('mceBeginUndoLevel');
+
+	switch (action) {
+		case "row":
+			updateRow(trElm);
+			break;
+
+		case "all":
+			var rows = tableElm.getElementsByTagName("tr");
+
+			for (var i=0; i<rows.length; i++)
+				updateRow(rows[i], true);
+
+			break;
+
+		case "odd":
+		case "even":
+			var rows = tableElm.getElementsByTagName("tr");
+
+			for (var i=0; i<rows.length; i++) {
+				if ((i % 2 == 0 && action == "odd") || (i % 2 != 0 && action == "even"))
+					updateRow(rows[i], true, true);
+			}
+
+			break;
+	}
+
+	inst.addVisual();
+	inst.nodeChanged();
+	inst.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function updateRow(tr_elm, skip_id, skip_parent) {
+	var inst = tinyMCEPopup.editor;
+	var formObj = document.forms[0];
+	var dom = inst.dom;
+	var curRowType = tr_elm.parentNode.nodeName.toLowerCase();
+	var rowtype = getSelectValue(formObj, 'rowtype');
+	var doc = inst.getDoc();
+
+	// Update row element
+	if (!skip_id)
+		tr_elm.setAttribute('id', formObj.id.value);
+
+	tr_elm.setAttribute('align', getSelectValue(formObj, 'align'));
+	tr_elm.setAttribute('vAlign', getSelectValue(formObj, 'valign'));
+	tr_elm.setAttribute('lang', formObj.lang.value);
+	tr_elm.setAttribute('dir', getSelectValue(formObj, 'dir'));
+	tr_elm.setAttribute('style', dom.serializeStyle(dom.parseStyle(formObj.style.value)));
+	dom.setAttrib(tr_elm, 'class', getSelectValue(formObj, 'class'));
+
+	// Clear deprecated attributes
+	tr_elm.setAttribute('background', '');
+	tr_elm.setAttribute('bgColor', '');
+	tr_elm.setAttribute('height', '');
+
+	// Set styles
+	tr_elm.style.height = getCSSSize(formObj.height.value);
+	tr_elm.style.backgroundColor = formObj.bgcolor.value;
+
+	if (formObj.backgroundimage.value != "")
+		tr_elm.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";
+	else
+		tr_elm.style.backgroundImage = '';
+
+	// Setup new rowtype
+	if (curRowType != rowtype && !skip_parent) {
+		// first, clone the node we are working on
+		var newRow = tr_elm.cloneNode(1);
+
+		// next, find the parent of its new destination (creating it if necessary)
+		var theTable = dom.getParent(tr_elm, "table");
+		var dest = rowtype;
+		var newParent = null;
+		for (var i = 0; i < theTable.childNodes.length; i++) {
+			if (theTable.childNodes[i].nodeName.toLowerCase() == dest)
+				newParent = theTable.childNodes[i];
+		}
+
+		if (newParent == null) {
+			newParent = doc.createElement(dest);
+
+			if (dest == "thead") {
+				if (theTable.firstChild.nodeName == 'CAPTION')
+					inst.dom.insertAfter(newParent, theTable.firstChild);
+				else
+					theTable.insertBefore(newParent, theTable.firstChild);
+			} else
+				theTable.appendChild(newParent);
+		}
+
+		// append the row to the new parent
+		newParent.appendChild(newRow);
+
+		// remove the original
+		tr_elm.parentNode.removeChild(tr_elm);
+
+		// set tr_elm to the new node
+		tr_elm = newRow;
+	}
+
+	dom.setAttrib(tr_elm, 'style', dom.serializeStyle(dom.parseStyle(tr_elm.style.cssText)));
+}
+
+function changedBackgroundImage() {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+	var st = dom.parseStyle(formObj.style.value);
+
+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedStyle() {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+	var st = dom.parseStyle(formObj.style.value);
+
+	if (st['background-image'])
+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	else
+		formObj.backgroundimage.value = '';
+
+	if (st['height'])
+		formObj.height.value = trimSize(st['height']);
+
+	if (st['background-color']) {
+		formObj.bgcolor.value = st['background-color'];
+		updateColor('bgcolor_pick','bgcolor');
+	}
+}
+
+function changedSize() {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+	var st = dom.parseStyle(formObj.style.value);
+
+	var height = formObj.height.value;
+	if (height != "")
+		st['height'] = getCSSSize(height);
+	else
+		st['height'] = "";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedColor() {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+	var st = dom.parseStyle(formObj.style.value);
+
+	st['background-color'] = formObj.bgcolor.value;
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/table.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
new file mode 100644
index 000000000..3303b9295
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
@@ -0,0 +1,410 @@
+tinyMCEPopup.requireLangPack();
+
+var action, orgTableWidth, orgTableHeight, dom = tinyMCEPopup.editor.dom;
+
+function insertTable() {
+	var formObj = document.forms[0];
+	var inst = tinyMCEPopup.editor, dom = inst.dom;
+	var cols = 2, rows = 2, border = 0, cellpadding = -1, cellspacing = -1, align, width, height, className, caption, frame, rules;
+	var html = '', capEl, elm;
+	var cellLimit, rowLimit, colLimit;
+
+	tinyMCEPopup.restoreSelection();
+
+	if (!AutoValidator.validate(formObj)) {
+		alert(inst.getLang('invalid_data'));
+		return false;
+	}
+
+	elm = dom.getParent(inst.selection.getNode(), 'table');
+
+	// Get form data
+	cols = formObj.elements['cols'].value;
+	rows = formObj.elements['rows'].value;
+	border = formObj.elements['border'].value != "" ? formObj.elements['border'].value  : 0;
+	cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : "";
+	cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : "";
+	align = formObj.elements['align'].options[formObj.elements['align'].selectedIndex].value;
+	frame = formObj.elements['frame'].options[formObj.elements['frame'].selectedIndex].value;
+	rules = formObj.elements['rules'].options[formObj.elements['rules'].selectedIndex].value;
+	width = formObj.elements['width'].value;
+	height = formObj.elements['height'].value;
+	bordercolor = formObj.elements['bordercolor'].value;
+	bgcolor = formObj.elements['bgcolor'].value;
+	className = formObj.elements['class'].options[formObj.elements['class'].selectedIndex].value;
+	id = formObj.elements['id'].value;
+	summary = formObj.elements['summary'].value;
+	style = formObj.elements['style'].value;
+	dir = formObj.elements['dir'].value;
+	lang = formObj.elements['lang'].value;
+	background = formObj.elements['backgroundimage'].value;
+	caption = formObj.elements['caption'].checked;
+
+	cellLimit = tinyMCEPopup.getParam('table_cell_limit', false);
+	rowLimit = tinyMCEPopup.getParam('table_row_limit', false);
+	colLimit = tinyMCEPopup.getParam('table_col_limit', false);
+
+	// Validate table size
+	if (colLimit && cols > colLimit) {
+		inst.windowManager.alert(inst.getLang('table_dlg.col_limit').replace(/\{\$cols\}/g, colLimit));
+		return false;
+	} else if (rowLimit && rows > rowLimit) {
+		inst.windowManager.alert(inst.getLang('table_dlg.row_limit').replace(/\{\$rows\}/g, rowLimit));
+		return false;
+	} else if (cellLimit && cols * rows > cellLimit) {
+		inst.windowManager.alert(inst.getLang('table_dlg.cell_limit').replace(/\{\$cells\}/g, cellLimit));
+		return false;
+	}
+
+	// Update table
+	if (action == "update") {
+		inst.execCommand('mceBeginUndoLevel');
+
+		dom.setAttrib(elm, 'cellPadding', cellpadding, true);
+		dom.setAttrib(elm, 'cellSpacing', cellspacing, true);
+		dom.setAttrib(elm, 'border', border);
+		dom.setAttrib(elm, 'align', align);
+		dom.setAttrib(elm, 'frame', frame);
+		dom.setAttrib(elm, 'rules', rules);
+		dom.setAttrib(elm, 'class', className);
+		dom.setAttrib(elm, 'style', style);
+		dom.setAttrib(elm, 'id', id);
+		dom.setAttrib(elm, 'summary', summary);
+		dom.setAttrib(elm, 'dir', dir);
+		dom.setAttrib(elm, 'lang', lang);
+
+		capEl = inst.dom.select('caption', elm)[0];
+
+		if (capEl && !caption)
+			capEl.parentNode.removeChild(capEl);
+
+		if (!capEl && caption) {
+			capEl = elm.ownerDocument.createElement('caption');
+
+			if (!tinymce.isIE)
+				capEl.innerHTML = '<br mce_bogus="1"/>';
+
+			elm.insertBefore(capEl, elm.firstChild);
+		}
+
+		if (width && /(pt|em|cm)$/.test(width)) {
+			dom.setStyle(elm, 'width', width);
+			dom.setAttrib(elm, 'width', '');
+		} else {
+			dom.setAttrib(elm, 'width', width, true);
+			dom.setStyle(elm, 'width', '');
+		}
+
+		// Remove these since they are not valid XHTML
+		dom.setAttrib(elm, 'borderColor', '');
+		dom.setAttrib(elm, 'bgColor', '');
+		dom.setAttrib(elm, 'background', '');
+
+		if (height) {
+			dom.setStyle(elm, 'height', height);
+			dom.setAttrib(elm, 'height', '');
+		}
+
+		if (background != '')
+			elm.style.backgroundImage = "url('" + background + "')";
+		else
+			elm.style.backgroundImage = '';
+
+/*		if (tinyMCEPopup.getParam("inline_styles")) {
+			if (width != '')
+				elm.style.width = getCSSSize(width);
+		}*/
+
+		if (bordercolor != "") {
+			elm.style.borderColor = bordercolor;
+			elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle;
+			elm.style.borderWidth = border == "" ? "1px" : border;
+		} else
+			elm.style.borderColor = '';
+
+		elm.style.backgroundColor = bgcolor;
+		elm.style.height = getCSSSize(height);
+
+		inst.addVisual();
+
+		// Fix for stange MSIE align bug
+		//elm.outerHTML = elm.outerHTML;
+
+		inst.nodeChanged();
+		inst.execCommand('mceEndUndoLevel');
+
+		// Repaint if dimensions changed
+		if (formObj.width.value != orgTableWidth || formObj.height.value != orgTableHeight)
+			inst.execCommand('mceRepaint');
+
+		tinyMCEPopup.close();
+		return true;
+	}
+
+	// Create new table
+	html += '<table';
+
+	html += makeAttrib('id', id);
+	html += makeAttrib('border', border);
+	html += makeAttrib('cellpadding', cellpadding);
+	html += makeAttrib('cellspacing', cellspacing);
+
+	if (width && /(pt|em|cm)$/.test(width)) {
+		if (style)
+			style += '; ';
+
+		style += 'width: ' + width;
+	} else
+		html += makeAttrib('width', width);
+
+/*	if (height) {
+		if (style)
+			style += '; ';
+
+		style += 'height: ' + height;
+	}*/
+
+	//html += makeAttrib('height', height);
+	//html += makeAttrib('bordercolor', bordercolor);
+	//html += makeAttrib('bgcolor', bgcolor);
+	html += makeAttrib('align', align);
+	html += makeAttrib('frame', frame);
+	html += makeAttrib('rules', rules);
+	html += makeAttrib('class', className);
+	html += makeAttrib('style', style);
+	html += makeAttrib('summary', summary);
+	html += makeAttrib('dir', dir);
+	html += makeAttrib('lang', lang);
+	html += '>';
+
+	if (caption) {
+		if (!tinymce.isIE)
+			html += '<caption><br mce_bogus="1"/></caption>';
+		else
+			html += '<caption></caption>';
+	}
+
+	for (var y=0; y<rows; y++) {
+		html += "<tr>";
+
+		for (var x=0; x<cols; x++) {
+			if (!tinymce.isIE)
+				html += '<td><br mce_bogus="1"/></td>';
+			else
+				html += '<td></td>';
+		}
+
+		html += "</tr>";
+	}
+
+	html += "</table>";
+
+	inst.execCommand('mceBeginUndoLevel');
+	inst.execCommand('mceInsertContent', false, html);
+	inst.addVisual();
+	inst.execCommand('mceEndUndoLevel');
+
+	tinyMCEPopup.close();
+}
+
+function makeAttrib(attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib];
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	if (value == "")
+		return "";
+
+	// XML encode it
+	value = value.replace(/&/g, '&amp;');
+	value = value.replace(/\"/g, '&quot;');
+	value = value.replace(/</g, '&lt;');
+	value = value.replace(/>/g, '&gt;');
+
+	return ' ' + attrib + '="' + value + '"';
+}
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+
+	var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', '0'), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', '');
+	var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";
+	var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules, frame;
+	var inst = tinyMCEPopup.editor, dom = inst.dom;
+	var formObj = document.forms[0];
+	var elm = dom.getParent(inst.selection.getNode(), "table");
+
+	action = tinyMCEPopup.getWindowArg('action');
+
+	if (!action)
+		action = elm ? "update" : "insert";
+
+	if (elm && action != "insert") {
+		var rowsAr = elm.rows;
+		var cols = 0;
+		for (var i=0; i<rowsAr.length; i++)
+			if (rowsAr[i].cells.length > cols)
+				cols = rowsAr[i].cells.length;
+
+		cols = cols;
+		rows = rowsAr.length;
+
+		st = dom.parseStyle(dom.getAttrib(elm, "style"));
+		border = trimSize(getStyle(elm, 'border', 'borderWidth'));
+		cellpadding = dom.getAttrib(elm, 'cellpadding', "");
+		cellspacing = dom.getAttrib(elm, 'cellspacing', "");
+		width = trimSize(getStyle(elm, 'width', 'width'));
+		height = trimSize(getStyle(elm, 'height', 'height'));
+		bordercolor = convertRGBToHex(getStyle(elm, 'bordercolor', 'borderLeftColor'));
+		bgcolor = convertRGBToHex(getStyle(elm, 'bgcolor', 'backgroundColor'));
+		align = dom.getAttrib(elm, 'align', align);
+		frame = dom.getAttrib(elm, 'frame');
+		rules = dom.getAttrib(elm, 'rules');
+		className = tinymce.trim(dom.getAttrib(elm, 'class').replace(/mceItem.+/g, ''));
+		id = dom.getAttrib(elm, 'id');
+		summary = dom.getAttrib(elm, 'summary');
+		style = dom.serializeStyle(st);
+		dir = dom.getAttrib(elm, 'dir');
+		lang = dom.getAttrib(elm, 'lang');
+		background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+		formObj.caption.checked = elm.getElementsByTagName('caption').length > 0;
+
+		orgTableWidth = width;
+		orgTableHeight = height;
+
+		action = "update";
+		formObj.insert.value = inst.getLang('update');
+	}
+
+	addClassesToList('class', "table_styles");
+	TinyMCE_EditableSelects.init();
+
+	// Update form
+	selectByValue(formObj, 'align', align);
+	selectByValue(formObj, 'frame', frame);
+	selectByValue(formObj, 'rules', rules);
+	selectByValue(formObj, 'class', className, true, true);
+	formObj.cols.value = cols;
+	formObj.rows.value = rows;
+	formObj.border.value = border;
+	formObj.cellpadding.value = cellpadding;
+	formObj.cellspacing.value = cellspacing;
+	formObj.width.value = width;
+	formObj.height.value = height;
+	formObj.bordercolor.value = bordercolor;
+	formObj.bgcolor.value = bgcolor;
+	formObj.id.value = id;
+	formObj.summary.value = summary;
+	formObj.style.value = style;
+	formObj.dir.value = dir;
+	formObj.lang.value = lang;
+	formObj.backgroundimage.value = background;
+
+	updateColor('bordercolor_pick', 'bordercolor');
+	updateColor('bgcolor_pick', 'bgcolor');
+
+	// Resize some elements
+	if (isVisible('backgroundimagebrowser'))
+		document.getElementById('backgroundimage').style.width = '180px';
+
+	// Disable some fields in update mode
+	if (action == "update") {
+		formObj.cols.disabled = true;
+		formObj.rows.disabled = true;
+	}
+}
+
+function changedSize() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+/*	var width = formObj.width.value;
+	if (width != "")
+		st['width'] = tinyMCEPopup.getParam("inline_styles") ? getCSSSize(width) : "";
+	else
+		st['width'] = "";*/
+
+	var height = formObj.height.value;
+	if (height != "")
+		st['height'] = getCSSSize(height);
+	else
+		st['height'] = "";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedBackgroundImage() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedBorder() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	// Update border width if the element has a color
+	if (formObj.border.value != "" && formObj.bordercolor.value != "")
+		st['border-width'] = formObj.border.value + "px";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedColor() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	st['background-color'] = formObj.bgcolor.value;
+
+	if (formObj.bordercolor.value != "") {
+		st['border-color'] = formObj.bordercolor.value;
+
+		// Add border-width if it's missing
+		if (!st['border-width'])
+			st['border-width'] = formObj.border.value == "" ? "1px" : formObj.border.value + "px";
+	}
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedStyle() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	if (st['background-image'])
+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	else
+		formObj.backgroundimage.value = '';
+
+	if (st['width'])
+		formObj.width.value = trimSize(st['width']);
+
+	if (st['height'])
+		formObj.height.value = trimSize(st['height']);
+
+	if (st['background-color']) {
+		formObj.bgcolor.value = st['background-color'];
+		updateColor('bgcolor_pick','bgcolor');
+	}
+
+	if (st['border-color']) {
+		formObj.bordercolor.value = st['border-color'];
+		updateColor('bordercolor_pick','bordercolor');
+	}
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
new file mode 100644
index 000000000..a33c987c0
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
@@ -0,0 +1,74 @@
+tinyMCE.addI18n('en.table_dlg',{
+general_tab:"General",
+advanced_tab:"Advanced",
+general_props:"General properties",
+advanced_props:"Advanced properties",
+rowtype:"Row in table part",
+title:"Insert/Modify table",
+width:"Width",
+height:"Height",
+cols:"Cols",
+rows:"Rows",
+cellspacing:"Cellspacing",
+cellpadding:"Cellpadding",
+border:"Border",
+align:"Alignment",
+align_default:"Default",
+align_left:"Left",
+align_right:"Right",
+align_middle:"Center",
+row_title:"Table row properties",
+cell_title:"Table cell properties",
+cell_type:"Cell type",
+valign:"Vertical alignment",
+align_top:"Top",
+align_bottom:"Bottom",
+bordercolor:"Border color",
+bgcolor:"Background color",
+merge_cells_title:"Merge table cells",
+id:"Id",
+style:"Style",
+langdir:"Language direction",
+langcode:"Language code",
+mime:"Target MIME type",
+ltr:"Left to right",
+rtl:"Right to left",
+bgimage:"Background image",
+summary:"Summary",
+td:"Data",
+th:"Header",
+cell_cell:"Update current cell",
+cell_row:"Update all cells in row",
+cell_all:"Update all cells in table",
+row_row:"Update current row",
+row_odd:"Update odd rows in table",
+row_even:"Update even rows in table",
+row_all:"Update all rows in table",
+thead:"Table Head",
+tbody:"Table Body",
+tfoot:"Table Foot",
+scope:"Scope",
+rowgroup:"Row Group",
+colgroup:"Col Group",
+col_limit:"You've exceeded the maximum number of columns of {$cols}.",
+row_limit:"You've exceeded the maximum number of rows of {$rows}.",
+cell_limit:"You've exceeded the maximum number of cells of {$cells}.",
+missing_scope:"Are you sure you want to continue without specifying a scope for this table header cell. Without it, it may be difficult for some users with disabilities to understand the content or data displayed of the table.",
+caption:"Table caption",
+frame:"Frame",
+frame_none:"none",
+frame_groups:"groups",
+frame_rows:"rows",
+frame_cols:"cols",
+frame_all:"all",
+rules:"Rules",
+rules_void:"void",
+rules_above:"above",
+rules_below:"below",
+rules_hsides:"hsides",
+rules_lhs:"lhs",
+rules_rhs:"rhs",
+rules_vsides:"vsides",
+rules_box:"box",
+rules_border:"border"
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm
new file mode 100644
index 000000000..9d34a886b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#table_dlg.merge_cells_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/validate.js"></script>

+	<script type="text/javascript" src="js/merge_cells.js"></script>

+	<base target="_self" />

+</head>

+<body style="margin: 8px" style="display: none">

+<form onsubmit="mergeCells();return false;" action="#">

+	<fieldset>

+		<legend>{#table_dlg.merge_cells_title}</legend>

+		  <table border="0" cellpadding="0" cellspacing="3" width="100%">

+			  <tr>

+				<td>{#table_dlg.cols}:</td>

+				<td align="right"><input type="text" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" /></td>

+			  </tr>

+			  <tr>

+				<td>{#table_dlg.rows}:</td>

+				<td align="right"><input type="text" name="numrows" value="" class="number min1" style="width: 30px" /></td>

+			  </tr>

+		  </table>

+	</fieldset>

+

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="submit" id="insert" name="insert" value="{#update}" />

+		</div>

+

+		<div style="float: right">

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</div>

+</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/row.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/row.htm
new file mode 100644
index 000000000..fe75bf607
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/row.htm
@@ -0,0 +1,161 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#table_dlg.row_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/row.js"></script>

+	<link href="css/row.css" rel="stylesheet" type="text/css" />

+	<base target="_self" />

+</head>

+<body id="tablerow" style="display: none">

+	<form onsubmit="updateAction();return false;">

+		<div class="tabs">

+			<ul>

+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>

+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="general_panel" class="panel current">

+				<fieldset>

+					<legend>{#table_dlg.general_props}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td><label for="rowtype">{#table_dlg.rowtype}</label></td>

+							<td class="col2">

+								<select id="rowtype" name="rowtype" class="mceFocus">

+									<option value="thead">{#table_dlg.thead}</option>

+									<option value="tbody">{#table_dlg.tbody}</option>

+									<option value="tfoot">{#table_dlg.tfoot}</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="align">{#table_dlg.align}</label></td>

+							<td class="col2">

+								<select id="align" name="align">

+									<option value="">{#not_set}</option>

+									<option value="center">{#table_dlg.align_middle}</option>

+									<option value="left">{#table_dlg.align_left}</option>

+									<option value="right">{#table_dlg.align_right}</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="valign">{#table_dlg.valign}</label></td>

+							<td class="col2">

+								<select id="valign" name="valign">

+									<option value="">{#not_set}</option>

+									<option value="top">{#table_dlg.align_top}</option>

+									<option value="middle">{#table_dlg.align_middle}</option>

+									<option value="bottom">{#table_dlg.align_bottom}</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr id="styleSelectRow">

+							<td><label for="class">{#class_name}</label></td>

+							<td class="col2">

+								<select id="class" name="class" class="mceEditableSelect">

+									<option value="" selected="selected">{#not_set}</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="height">{#table_dlg.height}</label></td>

+							<td class="col2"><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" /></td>

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+

+			<div id="advanced_panel" class="panel">

+				<fieldset>

+					<legend>{#table_dlg.advanced_props}</legend>

+

+					<table border="0" cellpadding="0" cellspacing="4">

+						<tr>

+							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 

+							<td><input id="id" name="id" type="text" value="" style="width: 200px" /></td> 

+						</tr>

+

+						<tr>

+							<td><label for="style">{#table_dlg.style}</label></td>

+							<td><input type="text" id="style" name="style" value="" style="width: 200px;" onchange="changedStyle();" /></td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="dir">{#table_dlg.langdir}</label></td> 

+							<td>

+								<select id="dir" name="dir" style="width: 200px"> 

+										<option value="">{#not_set}</option> 

+										<option value="ltr">{#table_dlg.ltr}</option> 

+										<option value="rtl">{#table_dlg.rtl}</option> 

+								</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="lang">{#table_dlg.langcode}</label></td> 

+							<td>

+								<input id="lang" name="lang" type="text" value="" style="width: 200px" />

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>

+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>

+										<td id="bgcolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<div>

+				<select id="action" name="action">

+					<option value="row">{#table_dlg.row_row}</option>

+					<option value="odd">{#table_dlg.row_odd}</option>

+					<option value="even">{#table_dlg.row_even}</option>

+					<option value="all">{#table_dlg.row_all}</option>

+				</select>

+			</div>

+

+			<div style="float: left">

+				<div><input type="submit" id="insert" name="insert" value="{#update}" /></div>

+			</div>

+

+			<div style="float: right">

+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+			</div>

+		</div>

+	</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/table.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/table.htm
new file mode 100644
index 000000000..75136e607
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/table/table.htm
@@ -0,0 +1,193 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#table_dlg.title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/validate.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/table.js"></script>

+	<link href="css/table.css" rel="stylesheet" type="text/css" />

+	<base target="_self" />

+</head>

+<body id="table" style="display: none">

+	<form onsubmit="insertTable();return false;" action="#">

+		<div class="tabs">

+			<ul>

+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>

+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="general_panel" class="panel current">

+				<fieldset>

+					<legend>{#table_dlg.general_props}</legend>

+					  <table border="0" cellpadding="4" cellspacing="0" width="100%">

+							  <tr>

+								<td><label id="colslabel" for="cols">{#table_dlg.cols}</label></td>

+								<td><input id="cols" name="cols" type="text" value="" size="3" maxlength="3" class="required number min1 mceFocus" /></td>

+								<td><label id="rowslabel" for="rows">{#table_dlg.rows}</label></td>

+								<td><input id="rows" name="rows" type="text" value="" size="3" maxlength="3" class="required number min1" /></td>

+							  </tr>

+							  <tr>

+								<td><label id="cellpaddinglabel" for="cellpadding">{#table_dlg.cellpadding}</label></td>

+								<td><input id="cellpadding" name="cellpadding" type="text" value="" size="3" maxlength="3" class="number" /></td>

+								<td><label id="cellspacinglabel" for="cellspacing">{#table_dlg.cellspacing}</label></td>

+								<td><input id="cellspacing" name="cellspacing" type="text" value="" size="3" maxlength="3" class="number" /></td>

+							  </tr>

+							  <tr>

+								<td><label id="alignlabel" for="align">{#table_dlg.align}</label></td>

+								<td><select id="align" name="align">

+									<option value="">{#not_set}</option>

+									<option value="center">{#table_dlg.align_middle}</option>

+									<option value="left">{#table_dlg.align_left}</option>

+									<option value="right">{#table_dlg.align_right}</option>

+								  </select></td>

+								<td><label id="borderlabel" for="border">{#table_dlg.border}</label></td>

+								<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="changedBorder();" class="number" /></td>

+							  </tr>

+							  <tr id="width_row">

+								<td><label id="widthlabel" for="width">{#table_dlg.width}</label></td>

+								<td><input name="width" type="text" id="width" value="" size="4" maxlength="4" onchange="changedSize();" class="size" /></td>

+								<td><label id="heightlabel" for="height">{#table_dlg.height}</label></td>

+								<td><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" class="size" /></td>

+							  </tr>

+							  <tr id="styleSelectRow">

+								<td><label id="classlabel" for="class">{#class_name}</label></td>

+								<td colspan="3">

+								 <select id="class" name="class" class="mceEditableSelect">

+									<option value="" selected>{#not_set}</option>

+								 </select></td>

+							  </tr>

+							  <tr>

+								<td class="column1"><label for="caption">{#table_dlg.caption}</label></td> 

+								<td><input id="caption" name="caption" type="checkbox" class="checkbox" value="true" /></td> 

+							  </tr>

+							</table>

+				</fieldset>

+			</div>

+

+			<div id="advanced_panel" class="panel">

+				<fieldset>

+					<legend>{#table_dlg.advanced_props}</legend>

+

+					<table border="0" cellpadding="0" cellspacing="4">

+						<tr>

+							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 

+							<td><input id="id" name="id" type="text" value="" class="advfield" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="summary">{#table_dlg.summary}</label></td> 

+							<td><input id="summary" name="summary" type="text" value="" class="advfield" /></td> 

+						</tr>

+

+						<tr>

+							<td><label for="style">{#table_dlg.style}</label></td>

+							<td><input type="text" id="style" name="style" value="" class="advfield" onchange="changedStyle();" /></td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="langlabel" for="lang">{#table_dlg.langcode}</label></td> 

+							<td>

+								<input id="lang" name="lang" type="text" value="" class="advfield" />

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" class="advfield" onchange="changedBackgroundImage();" /></td>

+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="frame">{#table_dlg.frame}</label></td> 

+							<td>

+								<select id="frame" name="frame" class="advfield"> 

+										<option value="">{#not_set}</option>

+										<option value="void">{#table_dlg.rules_void}</option>

+										<option value="above">{#table_dlg.rules_above}</option> 

+										<option value="below">{#table_dlg.rules_below}</option> 

+										<option value="hsides">{#table_dlg.rules_hsides}</option> 

+										<option value="lhs">{#table_dlg.rules_lhs}</option> 

+										<option value="rhs">{#table_dlg.rules_rhs}</option> 

+										<option value="vsides">{#table_dlg.rules_vsides}</option> 

+										<option value="box">{#table_dlg.rules_box}</option> 

+										<option value="border">{#table_dlg.rules_border}</option> 

+								</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="rules">{#table_dlg.rules}</label></td> 

+							<td>

+								<select id="rules" name="rules" class="advfield"> 

+										<option value="">{#not_set}</option> 

+										<option value="none">{#table_dlg.frame_none}</option>

+										<option value="groups">{#table_dlg.frame_groups}</option>

+										<option value="rows">{#table_dlg.frame_rows}</option>

+										<option value="cols">{#table_dlg.frame_cols}</option>

+										<option value="all">{#table_dlg.frame_all}</option>

+									</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="dir">{#table_dlg.langdir}</label></td> 

+							<td>

+								<select id="dir" name="dir" class="advfield"> 

+										<option value="">{#not_set}</option> 

+										<option value="ltr">{#table_dlg.ltr}</option> 

+										<option value="rtl">{#table_dlg.rtl}</option> 

+								</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="bordercolor">{#table_dlg.bordercolor}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>

+										<td id="bordercolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>

+										<td id="bgcolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<div style="float: left">

+				<input type="submit" id="insert" name="insert" value="{#insert}" />

+			</div>

+

+			<div style="float: right">

+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+			</div>

+		</div>

+	</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/blank.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/blank.htm
new file mode 100644
index 000000000..ecde53fae
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/blank.htm
@@ -0,0 +1,12 @@
+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>blank_page</title>

+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

+	<script type="text/javascript">

+		parent.TemplateDialog.loadCSSFiles(document);

+	</script>

+</head>

+<body id="mceTemplatePreview" class="mceContentBody">

+

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/css/template.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/css/template.css
new file mode 100644
index 000000000..0a03f2e5c
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/css/template.css
@@ -0,0 +1,23 @@
+#frmbody {
+	padding: 10px;
+	background-color: #FFF;
+	border: 1px solid #CCC;
+}
+
+.frmRow {
+	margin-bottom: 10px;
+}
+
+#templatesrc {
+	border: none;
+	width: 320px;
+	height: 240px;
+}
+
+.title {
+	padding-bottom: 5px;
+}
+
+.mceActionPanel {
+	padding-top: 5px;
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js
new file mode 100644
index 000000000..0f7fb0158
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var each=tinymce.each;tinymce.create('tinymce.plugins.TemplatePlugin',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mceTemplate',function(ui){ed.windowManager.open({file:url+'/template.htm',width:ed.getParam('template_popup_width',750),height:ed.getParam('template_popup_height',600),inline:1},{plugin_url:url});});ed.addCommand('mceInsertTemplate',t._insertTemplate,t);ed.addButton('template',{title:'template.desc',cmd:'mceTemplate'});ed.onPreProcess.add(function(ed,o){var dom=ed.dom;each(dom.select('div',o.node),function(e){if(dom.hasClass(e,'mceTmpl')){each(dom.select('*',e),function(e){if(dom.hasClass(e,ed.getParam('template_mdate_classes','mdate').replace(/\s+/g,'|')))e.innerHTML=t._getDateTime(new Date(),ed.getParam("template_mdate_format",ed.getLang("template.mdate_format")));});t._replaceVals(e);}});});},getInfo:function(){return{longname:'Template plugin',author:'Moxiecode Systems AB',authorurl:'http://www.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/template',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_insertTemplate:function(ui,v){var t=this,ed=t.editor,h,el,dom=ed.dom,sel=ed.selection.getContent();h=v.content;each(t.editor.getParam('template_replace_values'),function(v,k){if(typeof(v)!='function')h=h.replace(new RegExp('\\{\\$'+k+'\\}','g'),v);});el=dom.create('div',null,h);n=dom.select('.mceTmpl',el);if(n&&n.length>0){el=dom.create('div',null);el.appendChild(n[0].cloneNode(true));}function hasClass(n,c){return new RegExp('\\b'+c+'\\b','g').test(n.className);};each(dom.select('*',el),function(n){if(hasClass(n,ed.getParam('template_cdate_classes','cdate').replace(/\s+/g,'|')))n.innerHTML=t._getDateTime(new Date(),ed.getParam("template_cdate_format",ed.getLang("template.cdate_format")));if(hasClass(n,ed.getParam('template_mdate_classes','mdate').replace(/\s+/g,'|')))n.innerHTML=t._getDateTime(new Date(),ed.getParam("template_mdate_format",ed.getLang("template.mdate_format")));if(hasClass(n,ed.getParam('template_selected_content_classes','selcontent').replace(/\s+/g,'|')))n.innerHTML=sel;});t._replaceVals(el);ed.execCommand('mceInsertContent',false,el.innerHTML);ed.addVisual();},_replaceVals:function(e){var dom=this.editor.dom,vl=this.editor.getParam('template_replace_values');each(dom.select('*',e),function(e){each(vl,function(v,k){if(dom.hasClass(e,k)){if(typeof(vl[k])=='function')vl[k](e);}});});},_getDateTime:function(d,fmt){if(!fmt)return"";function addZeros(value,len){var i;value=""+value;if(value.length<len){for(i=0;i<(len-value.length);i++)value="0"+value;}return value;}fmt=fmt.replace("%D","%m/%d/%y");fmt=fmt.replace("%r","%I:%M:%S %p");fmt=fmt.replace("%Y",""+d.getFullYear());fmt=fmt.replace("%y",""+d.getYear());fmt=fmt.replace("%m",addZeros(d.getMonth()+1,2));fmt=fmt.replace("%d",addZeros(d.getDate(),2));fmt=fmt.replace("%H",""+addZeros(d.getHours(),2));fmt=fmt.replace("%M",""+addZeros(d.getMinutes(),2));fmt=fmt.replace("%S",""+addZeros(d.getSeconds(),2));fmt=fmt.replace("%I",""+((d.getHours()+11)%12+1));fmt=fmt.replace("%p",""+(d.getHours()<12?"AM":"PM"));fmt=fmt.replace("%B",""+tinyMCE.getLang("template_months_long").split(',')[d.getMonth()]);fmt=fmt.replace("%b",""+tinyMCE.getLang("template_months_short").split(',')[d.getMonth()]);fmt=fmt.replace("%A",""+tinyMCE.getLang("template_day_long").split(',')[d.getDay()]);fmt=fmt.replace("%a",""+tinyMCE.getLang("template_day_short").split(',')[d.getDay()]);fmt=fmt.replace("%%","%");return fmt;}});tinymce.PluginManager.add('template',tinymce.plugins.TemplatePlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js
new file mode 100644
index 000000000..a69a71982
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js
@@ -0,0 +1,156 @@
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.plugins.TemplatePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceTemplate', function(ui) {
+				ed.windowManager.open({
+					file : url + '/template.htm',
+					width : ed.getParam('template_popup_width', 750),
+					height : ed.getParam('template_popup_height', 600),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceInsertTemplate', t._insertTemplate, t);
+
+			// Register buttons
+			ed.addButton('template', {title : 'template.desc', cmd : 'mceTemplate'});
+
+			ed.onPreProcess.add(function(ed, o) {
+				var dom = ed.dom;
+
+				each(dom.select('div', o.node), function(e) {
+					if (dom.hasClass(e, 'mceTmpl')) {
+						each(dom.select('*', e), function(e) {
+							if (dom.hasClass(e, ed.getParam('template_mdate_classes', 'mdate').replace(/\s+/g, '|')))
+								e.innerHTML = t._getDateTime(new Date(), ed.getParam("template_mdate_format", ed.getLang("template.mdate_format")));
+						});
+
+						t._replaceVals(e);
+					}
+				});
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Template plugin',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://www.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/template',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		_insertTemplate : function(ui, v) {
+			var t = this, ed = t.editor, h, el, dom = ed.dom, sel = ed.selection.getContent();
+
+			h = v.content;
+
+			each(t.editor.getParam('template_replace_values'), function(v, k) {
+				if (typeof(v) != 'function')
+					h = h.replace(new RegExp('\\{\\$' + k + '\\}', 'g'), v);
+			});
+
+			el = dom.create('div', null, h);
+
+			// Find template element within div
+			n = dom.select('.mceTmpl', el);
+			if (n && n.length > 0) {
+				el = dom.create('div', null);
+				el.appendChild(n[0].cloneNode(true));
+			}
+
+			function hasClass(n, c) {
+				return new RegExp('\\b' + c + '\\b', 'g').test(n.className);
+			};
+
+			each(dom.select('*', el), function(n) {
+				// Replace cdate
+				if (hasClass(n, ed.getParam('template_cdate_classes', 'cdate').replace(/\s+/g, '|')))
+					n.innerHTML = t._getDateTime(new Date(), ed.getParam("template_cdate_format", ed.getLang("template.cdate_format")));
+
+				// Replace mdate
+				if (hasClass(n, ed.getParam('template_mdate_classes', 'mdate').replace(/\s+/g, '|')))
+					n.innerHTML = t._getDateTime(new Date(), ed.getParam("template_mdate_format", ed.getLang("template.mdate_format")));
+
+				// Replace selection
+				if (hasClass(n, ed.getParam('template_selected_content_classes', 'selcontent').replace(/\s+/g, '|')))
+					n.innerHTML = sel;
+			});
+
+			t._replaceVals(el);
+
+			ed.execCommand('mceInsertContent', false, el.innerHTML);
+			ed.addVisual();
+		},
+
+		_replaceVals : function(e) {
+			var dom = this.editor.dom, vl = this.editor.getParam('template_replace_values');
+
+			each(dom.select('*', e), function(e) {
+				each(vl, function(v, k) {
+					if (dom.hasClass(e, k)) {
+						if (typeof(vl[k]) == 'function')
+							vl[k](e);
+					}
+				});
+			});
+		},
+
+		_getDateTime : function(d, fmt) {
+				if (!fmt)
+					return "";
+
+				function addZeros(value, len) {
+					var i;
+
+					value = "" + value;
+
+					if (value.length < len) {
+						for (i=0; i<(len-value.length); i++)
+							value = "0" + value;
+					}
+
+					return value;
+				}
+
+				fmt = fmt.replace("%D", "%m/%d/%y");
+				fmt = fmt.replace("%r", "%I:%M:%S %p");
+				fmt = fmt.replace("%Y", "" + d.getFullYear());
+				fmt = fmt.replace("%y", "" + d.getYear());
+				fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));
+				fmt = fmt.replace("%d", addZeros(d.getDate(), 2));
+				fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));
+				fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));
+				fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));
+				fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));
+				fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));
+				fmt = fmt.replace("%B", "" + tinyMCE.getLang("template_months_long").split(',')[d.getMonth()]);
+				fmt = fmt.replace("%b", "" + tinyMCE.getLang("template_months_short").split(',')[d.getMonth()]);
+				fmt = fmt.replace("%A", "" + tinyMCE.getLang("template_day_long").split(',')[d.getDay()]);
+				fmt = fmt.replace("%a", "" + tinyMCE.getLang("template_day_short").split(',')[d.getDay()]);
+				fmt = fmt.replace("%%", "%");
+
+				return fmt;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('template', tinymce.plugins.TemplatePlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/js/template.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
new file mode 100644
index 000000000..7eab2ebbd
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
@@ -0,0 +1,106 @@
+tinyMCEPopup.requireLangPack();
+
+var TemplateDialog = {
+	preInit : function() {
+		var url = tinyMCEPopup.getParam("template_external_list_url");
+
+		if (url != null)
+			document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></sc'+'ript>');
+	},
+
+	init : function() {
+		var ed = tinyMCEPopup.editor, tsrc, sel, x, u;
+
+ 		tsrc = ed.getParam("template_templates", false);
+ 		sel = document.getElementById('tpath');
+
+		// Setup external template list
+		if (!tsrc && typeof(tinyMCETemplateList) != 'undefined') {
+			for (x=0, tsrc = []; x<tinyMCETemplateList.length; x++)
+				tsrc.push({title : tinyMCETemplateList[x][0], src : tinyMCETemplateList[x][1], description : tinyMCETemplateList[x][2]});
+		}
+
+		for (x=0; x<tsrc.length; x++)
+			sel.options[sel.options.length] = new Option(tsrc[x].title, tinyMCEPopup.editor.documentBaseURI.toAbsolute(tsrc[x].src));
+
+		this.resize();
+		this.tsrc = tsrc;
+	},
+
+	resize : function() {
+		var w, h, e;
+
+		if (!self.innerWidth) {
+			w = document.body.clientWidth - 50;
+			h = document.body.clientHeight - 160;
+		} else {
+			w = self.innerWidth - 50;
+			h = self.innerHeight - 170;
+		}
+
+		e = document.getElementById('templatesrc');
+
+		if (e) {
+			e.style.height = Math.abs(h) + 'px';
+			e.style.width  = Math.abs(w - 5) + 'px';
+		}
+	},
+
+	loadCSSFiles : function(d) {
+		var ed = tinyMCEPopup.editor;
+
+		tinymce.each(ed.getParam("content_css", '').split(','), function(u) {
+			d.write('<link href="' + ed.documentBaseURI.toAbsolute(u) + '" rel="stylesheet" type="text/css" />');
+		});
+	},
+
+	selectTemplate : function(u, ti) {
+		var d = window.frames['templatesrc'].document, x, tsrc = this.tsrc;
+
+		if (!u)
+			return;
+
+		d.body.innerHTML = this.templateHTML = this.getFileContents(u);
+
+		for (x=0; x<tsrc.length; x++) {
+			if (tsrc[x].title == ti)
+				document.getElementById('tmpldesc').innerHTML = tsrc[x].description || '';
+		}
+	},
+
+ 	insert : function() {
+		tinyMCEPopup.execCommand('mceInsertTemplate', false, {
+			content : this.templateHTML,
+			selection : tinyMCEPopup.editor.selection.getContent()
+		});
+
+		tinyMCEPopup.close();
+	},
+
+	getFileContents : function(u) {
+		var x, d, t = 'text/plain';
+
+		function g(s) {
+			x = 0;
+
+			try {
+				x = new ActiveXObject(s);
+			} catch (s) {
+			}
+
+			return x;
+		};
+
+		x = window.ActiveXObject ? g('Msxml2.XMLHTTP') || g('Microsoft.XMLHTTP') : new XMLHttpRequest();
+
+		// Synchronous AJAX load file
+		x.overrideMimeType && x.overrideMimeType(t);
+		x.open("GET", u, false);
+		x.send(null);
+
+		return x.responseText;
+	}
+};
+
+TemplateDialog.preInit();
+tinyMCEPopup.onInit.add(TemplateDialog.init, TemplateDialog);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js
new file mode 100644
index 000000000..1f7f74473
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js
@@ -0,0 +1,15 @@
+tinyMCE.addI18n('en.template_dlg',{
+title:"Templates",
+label:"Template",
+desc_label:"Description",
+desc:"Insert predefined template content",
+select:"Select a template",
+preview:"Preview",
+warning:"Warning: Updating a template with a different one may cause data loss.",
+mdate_format:"%Y-%m-%d %H:%M:%S",
+cdate_format:"%Y-%m-%d %H:%M:%S",
+months_long:"January,February,March,April,May,June,July,August,September,October,November,December",
+months_short:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec",
+day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday",
+day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/template.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/template.htm
new file mode 100644
index 000000000..2b71c6eb4
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/template/template.htm
@@ -0,0 +1,39 @@
+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#template_dlg.title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/template.js"></script>

+	<link href="css/template.css" rel="stylesheet" type="text/css" />

+	<base target="_self" />

+</head>

+<body onresize="TemplateDialog.resize();"> 

+	<form onsubmit="TemplateDialog.insert();return false;">

+		<div id="frmbody">

+			<div class="title">{#template_dlg.desc}</div>

+			<div class="frmRow"><label for="tpath" title="{#template_dlg.select}">{#template_dlg.label}:</label>

+			<select id="tpath" name="tpath" onchange="TemplateDialog.selectTemplate(this.options[this.selectedIndex].value, this.options[this.selectedIndex].text);" class="mceFocus">

+				<option value="">{#template_dlg.select}...</option>

+			</select>

+			<span id="warning"></span></div>

+			<div class="frmRow"><label for="tdesc">{#template_dlg.desc_label}:</label>

+			<span id="tmpldesc"></span></div>

+			<fieldset>

+				<legend>{#template_dlg.preview}</legend>

+				<iframe id="templatesrc" name="templatesrc" src="blank.htm" width="690" height="400" frameborder="0"></iframe>

+			</fieldset>

+		</div>

+		

+		<div class="mceActionPanel">

+			<div style="float: left">

+				<input type="submit" id="insert" name="insert" value="{#insert}" />

+			</div>

+

+			<div style="float: right">

+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+			</div>

+

+			<br style="clear:both" />

+		</div>

+	</form>

+</body> 

+</html> 

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js
new file mode 100644
index 000000000..e1e4238a3
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.VisualChars',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mceVisualChars',t._toggleVisualChars,t);ed.addButton('visualchars',{title:'visualchars.desc',cmd:'mceVisualChars'});ed.onBeforeGetContent.add(function(ed,o){if(t.state){t.state=true;t._toggleVisualChars();}});},getInfo:function(){return{longname:'Visual characters',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_toggleVisualChars:function(){var t=this,ed=t.editor,nl,i,h,d=ed.getDoc(),b=ed.getBody(),nv,s=ed.selection,bo;t.state=!t.state;ed.controlManager.setActive('visualchars',t.state);if(t.state){nl=[];tinymce.walk(b,function(n){if(n.nodeType==3&&n.nodeValue&&n.nodeValue.indexOf('\u00a0')!=-1)nl.push(n);},'childNodes');for(i=0;i<nl.length;i++){nv=nl[i].nodeValue;nv=nv.replace(/(\u00a0+)/g,'<span class="mceItemHidden mceVisualNbsp">$1</span>');nv=nv.replace(/\u00a0/g,'\u00b7');ed.dom.setOuterHTML(nl[i],nv,d);}}else{nl=tinymce.grep(ed.dom.select('span',b),function(n){return ed.dom.hasClass(n,'mceVisualNbsp');});for(i=0;i<nl.length;i++)ed.dom.setOuterHTML(nl[i],nl[i].innerHTML.replace(/(&middot;|\u00b7)/g,'&nbsp;'),d);}}});tinymce.PluginManager.add('visualchars',tinymce.plugins.VisualChars);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
new file mode 100644
index 000000000..cee79db0e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
@@ -0,0 +1,73 @@
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.VisualChars', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceVisualChars', t._toggleVisualChars, t);
+
+			// Register buttons
+			ed.addButton('visualchars', {title : 'visualchars.desc', cmd : 'mceVisualChars'});
+
+			ed.onBeforeGetContent.add(function(ed, o) {
+				if (t.state) {
+					t.state = true;
+					t._toggleVisualChars();
+				}
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Visual characters',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_toggleVisualChars : function() {
+			var t = this, ed = t.editor, nl, i, h, d = ed.getDoc(), b = ed.getBody(), nv, s = ed.selection, bo;
+
+			t.state = !t.state;
+			ed.controlManager.setActive('visualchars', t.state);
+
+			if (t.state) {
+				nl = [];
+				tinymce.walk(b, function(n) {
+					if (n.nodeType == 3 && n.nodeValue && n.nodeValue.indexOf('\u00a0') != -1)
+						nl.push(n);
+				}, 'childNodes');
+
+				for (i=0; i<nl.length; i++) {
+					nv = nl[i].nodeValue;
+					nv = nv.replace(/(\u00a0+)/g, '<span class="mceItemHidden mceVisualNbsp">$1</span>');
+					nv = nv.replace(/\u00a0/g, '\u00b7');
+					ed.dom.setOuterHTML(nl[i], nv, d);
+				}
+			} else {
+				nl = tinymce.grep(ed.dom.select('span', b), function(n) {
+					return ed.dom.hasClass(n, 'mceVisualNbsp');
+				});
+
+				for (i=0; i<nl.length; i++)
+					ed.dom.setOuterHTML(nl[i], nl[i].innerHTML.replace(/(&middot;|\u00b7)/g, '&nbsp;'), d);
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('visualchars', tinymce.plugins.VisualChars);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
new file mode 100644
index 000000000..580028432
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
@@ -0,0 +1,149 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#xhtmlxtras_dlg.title_abbr_element}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/element_common.js"></script>

+	<script type="text/javascript" src="js/abbr.js"></script>

+	<link rel="stylesheet" type="text/css" href="css/popup.css" />

+	<base target="_self" />

+</head>

+<body style="display: none">

+<form onsubmit="insertAbbr();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

+						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 

+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 

+						<td>

+							<select id="class" name="class" class="field mceEditableSelect">

+								<option value="">{#not_set}</option> 

+							</select>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 

+						<td>

+							<select id="dir" name="dir" class="field"> 

+								<option value="">{#not_set}</option> 

+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 

+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 

+							</select>

+						</td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 

+						<td>

+							<input id="lang" name="lang" type="text" value="" class="field" />

+						</td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+		<div id="events_panel" class="panel">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

+

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label for="onfocus">onfocus</label>:</td> 

+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onblur">onblur</label>:</td> 

+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onclick">onclick</label>:</td> 

+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 

+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 

+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 

+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 

+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 

+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 

+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 

+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 

+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 

+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+	</div>

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="submit" id="insert" name="insert" value="{#update}" />

+		</div>

+		<div style="float: left">

+			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeAbbr();" style="display: none;" />

+		</div>

+		<div style="float: right">

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</div>

+

+</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
new file mode 100644
index 000000000..54e4c9d9e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
@@ -0,0 +1,149 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#xhtmlxtras_dlg.title_acronym_element}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/element_common.js"></script>

+	<script type="text/javascript" src="js/acronym.js"></script>

+	<link rel="stylesheet" type="text/css" href="css/popup.css" />

+	<base target="_self" />

+</head>

+<body style="display: none">

+<form onsubmit="insertAcronym();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

+						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 

+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 

+						<td>

+							<select id="class" name="class" class="field mceEditableSelect">

+								<option value="">{#not_set}</option> 

+							</select>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 

+						<td>

+							<select id="dir" name="dir" class="field"> 

+								<option value="">{#not_set}</option> 

+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 

+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 

+							</select>

+						</td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 

+						<td>

+							<input id="lang" name="lang" type="text" value="" class="field" />

+						</td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+		<div id="events_panel" class="panel">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

+

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label for="onfocus">onfocus</label>:</td> 

+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onblur">onblur</label>:</td> 

+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onclick">onclick</label>:</td> 

+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 

+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 

+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 

+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 

+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 

+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 

+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 

+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 

+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 

+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+	</div>

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="submit" id="insert" name="insert" value="{#update}" />

+		</div>

+		<div style="float: left">

+			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeAcronym();" style="display: none;" />

+		</div>

+		<div style="float: right">

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</div>

+

+</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
new file mode 100644
index 000000000..cfbb409ab
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
@@ -0,0 +1,154 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#xhtmlxtras_dlg.attribs_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="js/attributes.js"></script>

+	<link rel="stylesheet" type="text/css" href="css/attributes.css" />

+	<base target="_self" />

+</head>

+<body style="display: none">

+<form onsubmit="insertAction();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_attrib_tab}</a></span></li>

+			<li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_events_tab}</a></span></li>

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.attribute_attrib_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

+						<td><input id="title" name="title" type="text" value="" class="mceFocus" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 

+						<td><input id="id" name="id" type="text" value="" /></td> 

+					</tr>

+					<tr>

+						<td><label id="classlabel" for="classlist">{#class_name}</label></td>

+						<td>

+							<select id="classlist" name="classlist" class="mceEditableSelect">

+								<option value="" selected>{#not_set}</option>

+							</select>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td><input id="style" name="style" type="text" value="" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 

+						<td>

+							<select id="dir" name="dir"> 

+								<option value="">{#not_set}</option> 

+								<option value="ltr">{#xhtmlxtras_dlg.option_ltr}</option> 

+								<option value="rtl">{#xhtmlxtras_dlg.option_rtl}</option> 

+							</select>

+						</td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 

+						<td>

+							<input id="lang" name="lang" type="text" value="" />

+						</td> 

+					</tr>

+					<tr>

+							<td><label id="tabindexlabel" for="tabindex">{#xhtmlxtras_dlg.attribute_label_tabindex}</label></td>

+							<td><input type="text" id="tabindex" name="tabindex" value="" /></td>

+						</tr>

+

+						<tr>

+							<td><label id="accesskeylabel" for="accesskey">{#xhtmlxtras_dlg.attribute_label_accesskey}</label></td>

+							<td><input type="text" id="accesskey" name="accesskey" value="" /></td>

+						</tr>

+				</table>

+			</fieldset>

+		</div>

+		<div id="events_panel" class="panel">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.attribute_events_tab}</legend>

+

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label for="onfocus">onfocus</label>:</td> 

+						<td><input id="onfocus" name="onfocus" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onblur">onblur</label>:</td> 

+						<td><input id="onblur" name="onblur" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onclick">onclick</label>:</td> 

+						<td><input id="onclick" name="onclick" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 

+						<td><input id="ondblclick" name="ondblclick" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 

+						<td><input id="onmousedown" name="onmousedown" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 

+						<td><input id="onmouseup" name="onmouseup" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 

+						<td><input id="onmouseover" name="onmouseover" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 

+						<td><input id="onmousemove" name="onmousemove" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 

+						<td><input id="onmouseout" name="onmouseout" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 

+						<td><input id="onkeypress" name="onkeypress" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 

+						<td><input id="onkeydown" name="onkeydown" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 

+						<td><input id="onkeyup" name="onkeyup" type="text" value="" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+	</div>

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="submit" id="insert" name="insert" value="{#insert}" />

+		</div>

+		<div style="float: right">

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</div>

+

+</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
new file mode 100644
index 000000000..7d9eaba4d
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
@@ -0,0 +1,149 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#xhtmlxtras_dlg.title_cite_element}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/element_common.js"></script>

+	<script type="text/javascript" src="js/cite.js"></script>

+	<link rel="stylesheet" type="text/css" href="css/popup.css" />

+	<base target="_self" />

+</head>

+<body style="display: none">

+<form onsubmit="insertCite();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

+						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 

+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 

+						<td>

+							<select id="class" name="class" class="field mceEditableSelect">

+								<option value="">{#not_set}</option> 

+							</select>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 

+						<td>

+							<select id="dir" name="dir" class="field"> 

+								<option value="">{#not_set}</option> 

+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 

+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 

+							</select>

+						</td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 

+						<td>

+							<input id="lang" name="lang" type="text" value="" class="field" />

+						</td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+		<div id="events_panel" class="panel">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

+

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label for="onfocus">onfocus</label>:</td> 

+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onblur">onblur</label>:</td> 

+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onclick">onclick</label>:</td> 

+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 

+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 

+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 

+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 

+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 

+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 

+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 

+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 

+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 

+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+	</div>

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="submit" id="insert" name="insert" value="{#update}" />

+		</div>

+		<div style="float: left">

+			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeCite();" style="display: none;" />

+		</div>

+		<div style="float: right">

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</div>

+

+</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css
new file mode 100644
index 000000000..85b1b376d
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css
@@ -0,0 +1,11 @@
+.panel_wrapper div.current {
+	height: 290px;
+}
+
+#id, #style, #title, #dir, #hreflang, #lang, #classlist, #tabindex, #accesskey {
+	width: 200px;
+}
+
+#events_panel input {
+	width: 200px;
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css
new file mode 100644
index 000000000..034b98527
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css
@@ -0,0 +1,9 @@
+input.field, select.field {width:200px;}
+input.picker {width:179px; margin-left: 5px;}
+input.disabled {border-color:#F2F2F2;}
+img.picker {vertical-align:text-bottom; cursor:pointer;}
+h1 {padding: 0 0 5px 0;}
+.panel_wrapper div.current {height:160px;}
+#xhtmlxtrasdel .panel_wrapper div.current, #xhtmlxtrasins .panel_wrapper div.current {height: 230px;}
+a.browse span {display:block; width:20px; height:20px; background:url('../../../themes/advanced/img/icons.gif') -140px -20px;}
+#datetime {width:180px;}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
new file mode 100644
index 000000000..d03c4568a
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
@@ -0,0 +1,170 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#xhtmlxtras_dlg.title_del_element}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/element_common.js"></script>

+	<script type="text/javascript" src="js/del.js"></script>

+	<link rel="stylesheet" type="text/css" href="css/popup.css" />

+	<base target="_self" />

+</head>

+<body id="xhtmlxtrasins" style="display: none">

+<form onsubmit="insertDel();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td>

+						<td>

+							<table border="0" cellspacing="0" cellpadding="0">

+								<tr> 

+									<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td> 

+									<td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse"><span class="datetime" alt="{#xhtmlxtras_dlg.insert_date}" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>

+								</tr>

+							</table>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="citelabel" for="cite">{#xhtmlxtras_dlg.attribute_label_cite}</label>:</td>

+						<td><input id="cite" name="cite" type="text" value="" class="field" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

+						<td><input id="title" name="title" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 

+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 

+						<td>

+							<select id="class" name="class" class="field mceEditableSelect">

+								<option value="">{#not_set}</option> 

+							</select>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 

+						<td>

+							<select id="dir" name="dir" class="field"> 

+								<option value="">{#not_set}</option> 

+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 

+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 

+							</select>

+						</td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 

+						<td>

+							<input id="lang" name="lang" type="text" value="" class="field" />

+						</td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+		<div id="events_panel" class="panel">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

+

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label for="onfocus">onfocus</label>:</td> 

+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onblur">onblur</label>:</td> 

+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onclick">onclick</label>:</td> 

+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 

+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 

+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 

+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 

+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 

+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 

+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 

+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 

+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 

+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+	</div>

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="submit" id="insert" name="insert" value="{#update}" />

+		</div>

+		<div style="float: left">

+			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeDel();" style="display: none;" />

+		</div>

+		<div style="float: right">

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</div>

+

+</form>

+

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
new file mode 100644
index 000000000..6a3270d35
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create('tinymce.plugins.XHTMLXtrasPlugin',{init:function(ed,url){ed.addCommand('mceCite',function(){ed.windowManager.open({file:url+'/cite.htm',width:350+parseInt(ed.getLang('xhtmlxtras.cite_delta_width',0)),height:250+parseInt(ed.getLang('xhtmlxtras.cite_delta_height',0)),inline:1},{plugin_url:url});});ed.addCommand('mceAcronym',function(){ed.windowManager.open({file:url+'/acronym.htm',width:350+parseInt(ed.getLang('xhtmlxtras.acronym_delta_width',0)),height:250+parseInt(ed.getLang('xhtmlxtras.acronym_delta_width',0)),inline:1},{plugin_url:url});});ed.addCommand('mceAbbr',function(){ed.windowManager.open({file:url+'/abbr.htm',width:350+parseInt(ed.getLang('xhtmlxtras.abbr_delta_width',0)),height:250+parseInt(ed.getLang('xhtmlxtras.abbr_delta_width',0)),inline:1},{plugin_url:url});});ed.addCommand('mceDel',function(){ed.windowManager.open({file:url+'/del.htm',width:340+parseInt(ed.getLang('xhtmlxtras.del_delta_width',0)),height:310+parseInt(ed.getLang('xhtmlxtras.del_delta_width',0)),inline:1},{plugin_url:url});});ed.addCommand('mceIns',function(){ed.windowManager.open({file:url+'/ins.htm',width:340+parseInt(ed.getLang('xhtmlxtras.ins_delta_width',0)),height:310+parseInt(ed.getLang('xhtmlxtras.ins_delta_width',0)),inline:1},{plugin_url:url});});ed.addCommand('mceAttributes',function(){ed.windowManager.open({file:url+'/attributes.htm',width:380,height:370,inline:1},{plugin_url:url});});ed.addButton('cite',{title:'xhtmlxtras.cite_desc',cmd:'mceCite'});ed.addButton('acronym',{title:'xhtmlxtras.acronym_desc',cmd:'mceAcronym'});ed.addButton('abbr',{title:'xhtmlxtras.abbr_desc',cmd:'mceAbbr'});ed.addButton('del',{title:'xhtmlxtras.del_desc',cmd:'mceDel'});ed.addButton('ins',{title:'xhtmlxtras.ins_desc',cmd:'mceIns'});ed.addButton('attribs',{title:'xhtmlxtras.attribs_desc',cmd:'mceAttributes'});if(tinymce.isIE){function fix(ed,o){if(o.set){o.content=o.content.replace(/<abbr([^>]+)>/gi,'<html:abbr $1>');o.content=o.content.replace(/<\/abbr>/gi,'</html:abbr>');}};ed.onBeforeSetContent.add(fix);ed.onPostProcess.add(fix);}ed.onNodeChange.add(function(ed,cm,n,co){n=ed.dom.getParent(n,'CITE,ACRONYM,ABBR,DEL,INS');cm.setDisabled('cite',co);cm.setDisabled('acronym',co);cm.setDisabled('abbr',co);cm.setDisabled('del',co);cm.setDisabled('ins',co);cm.setDisabled('attribs',n&&n.nodeName=='BODY');if(n){cm.setDisabled(n.nodeName.toLowerCase(),0);cm.setActive(n.nodeName.toLowerCase(),1);}else{cm.setActive('cite',0);cm.setActive('acronym',0);cm.setActive('abbr',0);cm.setActive('del',0);cm.setActive('ins',0);}});},getInfo:function(){return{longname:'XHTML Xtras Plugin',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('xhtmlxtras',tinymce.plugins.XHTMLXtrasPlugin);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
new file mode 100644
index 000000000..375c6e911
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
@@ -0,0 +1,134 @@
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.XHTMLXtrasPlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceCite', function() {
+				ed.windowManager.open({
+					file : url + '/cite.htm',
+					width : 350 + parseInt(ed.getLang('xhtmlxtras.cite_delta_width', 0)),
+					height : 250 + parseInt(ed.getLang('xhtmlxtras.cite_delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceAcronym', function() {
+				ed.windowManager.open({
+					file : url + '/acronym.htm',
+					width : 350 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),
+					height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceAbbr', function() {
+				ed.windowManager.open({
+					file : url + '/abbr.htm',
+					width : 350 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),
+					height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceDel', function() {
+				ed.windowManager.open({
+					file : url + '/del.htm',
+					width : 340 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),
+					height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceIns', function() {
+				ed.windowManager.open({
+					file : url + '/ins.htm',
+					width : 340 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),
+					height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceAttributes', function() {
+				ed.windowManager.open({
+					file : url + '/attributes.htm',
+					width : 380,
+					height : 370,
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.addButton('cite', {title : 'xhtmlxtras.cite_desc', cmd : 'mceCite'});
+			ed.addButton('acronym', {title : 'xhtmlxtras.acronym_desc', cmd : 'mceAcronym'});
+			ed.addButton('abbr', {title : 'xhtmlxtras.abbr_desc', cmd : 'mceAbbr'});
+			ed.addButton('del', {title : 'xhtmlxtras.del_desc', cmd : 'mceDel'});
+			ed.addButton('ins', {title : 'xhtmlxtras.ins_desc', cmd : 'mceIns'});
+			ed.addButton('attribs', {title : 'xhtmlxtras.attribs_desc', cmd : 'mceAttributes'});
+
+			if (tinymce.isIE) {
+				function fix(ed, o) {
+					if (o.set) {
+						o.content = o.content.replace(/<abbr([^>]+)>/gi, '<html:abbr $1>');
+						o.content = o.content.replace(/<\/abbr>/gi, '</html:abbr>');
+					}
+				};
+
+				ed.onBeforeSetContent.add(fix);
+				ed.onPostProcess.add(fix);
+			}
+
+			ed.onNodeChange.add(function(ed, cm, n, co) {
+				n = ed.dom.getParent(n, 'CITE,ACRONYM,ABBR,DEL,INS');
+
+				cm.setDisabled('cite', co);
+				cm.setDisabled('acronym', co);
+				cm.setDisabled('abbr', co);
+				cm.setDisabled('del', co);
+				cm.setDisabled('ins', co);
+				cm.setDisabled('attribs', n && n.nodeName == 'BODY');
+
+				if (n) {
+					cm.setDisabled(n.nodeName.toLowerCase(), 0);
+					cm.setActive(n.nodeName.toLowerCase(), 1);
+				} else {
+					cm.setActive('cite', 0);
+					cm.setActive('acronym', 0);
+					cm.setActive('abbr', 0);
+					cm.setActive('del', 0);
+					cm.setActive('ins', 0);
+				}
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'XHTML Xtras Plugin',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('xhtmlxtras', tinymce.plugins.XHTMLXtrasPlugin);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
new file mode 100644
index 000000000..c0f056ff3
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
@@ -0,0 +1,170 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#xhtmlxtras_dlg.title_ins_element}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/element_common.js"></script>

+	<script type="text/javascript" src="js/ins.js"></script>

+	<link rel="stylesheet" type="text/css" href="css/popup.css" />

+	<base target="_self" />

+</head>

+<body id="xhtmlxtrasins" style="display: none">

+<form onsubmit="insertIns();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td> 

+						<td>

+							<table border="0" cellspacing="0" cellpadding="0">

+								<tr> 

+									<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td> 

+									<td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse"><span class="datetime" alt="{#xhtmlxtras_dlg.insert_date}" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>

+								</tr>

+							</table>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="citelabel" for="cite">{#xhtmlxtras_dlg.attribute_label_cite}</label>:</td> 

+						<td><input id="cite" name="cite" type="text" value="" class="field" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

+						<td><input id="title" name="title" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 

+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 

+						<td>

+							<select id="class" name="class" class="field mceEditableSelect">

+								<option value="">{#not_set}</option> 

+							</select>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 

+						<td>

+							<select id="dir" name="dir" class="field"> 

+								<option value="">{#not_set}</option> 

+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 

+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 

+							</select>

+						</td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 

+						<td>

+							<input id="lang" name="lang" type="text" value="" class="field" />

+						</td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+		<div id="events_panel" class="panel">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

+

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label for="onfocus">onfocus</label>:</td> 

+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onblur">onblur</label>:</td> 

+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onclick">onclick</label>:</td> 

+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 

+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 

+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 

+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 

+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 

+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 

+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 

+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 

+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 

+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+	</div>

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="submit" id="insert" name="insert" value="{#update}" />

+		</div>

+		<div style="float: left">

+			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeIns();" style="display: none;" />

+		</div>

+		<div style="float: right">

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</div>

+

+</form>

+

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js
new file mode 100644
index 000000000..2f4ec11b8
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js
@@ -0,0 +1,25 @@
+ /**
+ * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+ *
+ * @author Moxiecode - based on work by Andrew Tetlaw
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+function init() {
+	SXE.initElementDialog('abbr');
+	if (SXE.currentAction == "update") {
+		SXE.showRemoveButton();
+	}
+}
+
+function insertAbbr() {
+	SXE.insertElement(tinymce.isIE ? 'html:abbr' : 'abbr');
+	tinyMCEPopup.close();
+}
+
+function removeAbbr() {
+	SXE.removeElement('abbr');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js
new file mode 100644
index 000000000..4a3215d3b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js
@@ -0,0 +1,25 @@
+ /**
+ * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+ *
+ * @author Moxiecode - based on work by Andrew Tetlaw
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+function init() {
+	SXE.initElementDialog('acronym');
+	if (SXE.currentAction == "update") {
+		SXE.showRemoveButton();
+	}
+}
+
+function insertAcronym() {
+	SXE.insertElement('acronym');
+	tinyMCEPopup.close();
+}
+
+function removeAcronym() {
+	SXE.removeElement('acronym');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
new file mode 100644
index 000000000..b336ce16b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
@@ -0,0 +1,123 @@
+ /**
+ * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+ *
+ * @author Moxiecode - based on work by Andrew Tetlaw
+ * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+	var inst = tinyMCEPopup.editor;
+	var dom = inst.dom;
+	var elm = inst.selection.getNode();
+	var f = document.forms[0];
+	var onclick = dom.getAttrib(elm, 'onclick');
+
+	setFormValue('title', dom.getAttrib(elm, 'title'));
+	setFormValue('id', dom.getAttrib(elm, 'id'));
+	setFormValue('style', dom.getAttrib(elm, "style"));
+	setFormValue('dir', dom.getAttrib(elm, 'dir'));
+	setFormValue('lang', dom.getAttrib(elm, 'lang'));
+	setFormValue('tabindex', dom.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : ""));
+	setFormValue('accesskey', dom.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : ""));
+	setFormValue('onfocus', dom.getAttrib(elm, 'onfocus'));
+	setFormValue('onblur', dom.getAttrib(elm, 'onblur'));
+	setFormValue('onclick', onclick);
+	setFormValue('ondblclick', dom.getAttrib(elm, 'ondblclick'));
+	setFormValue('onmousedown', dom.getAttrib(elm, 'onmousedown'));
+	setFormValue('onmouseup', dom.getAttrib(elm, 'onmouseup'));
+	setFormValue('onmouseover', dom.getAttrib(elm, 'onmouseover'));
+	setFormValue('onmousemove', dom.getAttrib(elm, 'onmousemove'));
+	setFormValue('onmouseout', dom.getAttrib(elm, 'onmouseout'));
+	setFormValue('onkeypress', dom.getAttrib(elm, 'onkeypress'));
+	setFormValue('onkeydown', dom.getAttrib(elm, 'onkeydown'));
+	setFormValue('onkeyup', dom.getAttrib(elm, 'onkeyup'));
+	className = dom.getAttrib(elm, 'class');
+
+	addClassesToList('classlist', 'advlink_styles');
+	selectByValue(f, 'classlist', className, true);
+
+	TinyMCE_EditableSelects.init();
+}
+
+function setFormValue(name, value) {
+	if(value && document.forms[0].elements[name]){
+		document.forms[0].elements[name].value = value;
+	}
+}
+
+function insertAction() {
+	var inst = tinyMCEPopup.editor;
+	var elm = inst.selection.getNode();
+
+	tinyMCEPopup.execCommand("mceBeginUndoLevel");	
+	setAllAttribs(elm);
+	tinyMCEPopup.execCommand("mceEndUndoLevel");
+	tinyMCEPopup.close();
+}
+
+function setAttrib(elm, attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib.toLowerCase()];
+	var inst = tinyMCEPopup.editor;
+	var dom = inst.dom;
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	if (value != "") {
+		dom.setAttrib(elm, attrib.toLowerCase(), value);
+
+		if (attrib == "style")
+			attrib = "style.cssText";
+
+		if (attrib.substring(0, 2) == 'on')
+			value = 'return true;' + value;
+
+		if (attrib == "class")
+			attrib = "className";
+
+		elm[attrib]=value;
+	} else
+		elm.removeAttribute(attrib);
+}
+
+function setAllAttribs(elm) {
+	var f = document.forms[0];
+
+	setAttrib(elm, 'title');
+	setAttrib(elm, 'id');
+	setAttrib(elm, 'style');
+	setAttrib(elm, 'class', getSelectValue(f, 'classlist'));
+	setAttrib(elm, 'dir');
+	setAttrib(elm, 'lang');
+	setAttrib(elm, 'tabindex');
+	setAttrib(elm, 'accesskey');
+	setAttrib(elm, 'onfocus');
+	setAttrib(elm, 'onblur');
+	setAttrib(elm, 'onclick');
+	setAttrib(elm, 'ondblclick');
+	setAttrib(elm, 'onmousedown');
+	setAttrib(elm, 'onmouseup');
+	setAttrib(elm, 'onmouseover');
+	setAttrib(elm, 'onmousemove');
+	setAttrib(elm, 'onmouseout');
+	setAttrib(elm, 'onkeypress');
+	setAttrib(elm, 'onkeydown');
+	setAttrib(elm, 'onkeyup');
+
+	// Refresh in old MSIE
+//	if (tinyMCE.isMSIE5)
+//		elm.outerHTML = elm.outerHTML;
+}
+
+function insertAttribute() {
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
+tinyMCEPopup.requireLangPack();
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js
new file mode 100644
index 000000000..b8b0ccd72
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js
@@ -0,0 +1,25 @@
+ /**
+ * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+ *
+ * @author Moxiecode - based on work by Andrew Tetlaw
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+function init() {
+	SXE.initElementDialog('cite');
+	if (SXE.currentAction == "update") {
+		SXE.showRemoveButton();
+	}
+}
+
+function insertCite() {
+	SXE.insertElement('cite');
+	tinyMCEPopup.close();
+}
+
+function removeCite() {
+	SXE.removeElement('cite');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
new file mode 100644
index 000000000..60d1e51ae
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
@@ -0,0 +1,50 @@
+ /**
+ * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+ *
+ * @author Moxiecode - based on work by Andrew Tetlaw
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+function init() {
+	SXE.initElementDialog('del');
+	if (SXE.currentAction == "update") {
+		setFormValue('datetime', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'datetime'));
+		setFormValue('cite', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'cite'));
+		SXE.showRemoveButton();
+	}
+}
+
+function setElementAttribs(elm) {
+	setAllCommonAttribs(elm);
+	setAttrib(elm, 'datetime');
+	setAttrib(elm, 'cite');
+}
+
+function insertDel() {
+	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'DEL');
+
+	tinyMCEPopup.execCommand('mceBeginUndoLevel');
+	if (elm == null) {
+		var s = SXE.inst.selection.getContent();
+		if(s.length > 0) {
+			tinyMCEPopup.execCommand('mceInsertContent', false, '<del id="#sxe_temp_del#">' + s + '</del>');
+			var elementArray = tinymce.grep(SXE.inst.dom.select('del'), function(n) {return n.id == '#sxe_temp_del#';});
+			for (var i=0; i<elementArray.length; i++) {
+				var elm = elementArray[i];
+				setElementAttribs(elm);
+			}
+		}
+	} else {
+		setElementAttribs(elm);
+	}
+	tinyMCEPopup.editor.nodeChanged();
+	tinyMCEPopup.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function removeDel() {
+	SXE.removeElement('del');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
new file mode 100644
index 000000000..b8e24e865
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
@@ -0,0 +1,221 @@
+ /**
+ * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+ *
+ * @author Moxiecode - based on work by Andrew Tetlaw
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+tinyMCEPopup.requireLangPack();
+
+function initCommonAttributes(elm) {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+
+	// Setup form data for common element attributes
+	setFormValue('title', dom.getAttrib(elm, 'title'));
+	setFormValue('id', dom.getAttrib(elm, 'id'));
+	selectByValue(formObj, 'class', dom.getAttrib(elm, 'class'), true);
+	setFormValue('style', dom.getAttrib(elm, 'style'));
+	selectByValue(formObj, 'dir', dom.getAttrib(elm, 'dir'));
+	setFormValue('lang', dom.getAttrib(elm, 'lang'));
+	setFormValue('onfocus', dom.getAttrib(elm, 'onfocus'));
+	setFormValue('onblur', dom.getAttrib(elm, 'onblur'));
+	setFormValue('onclick', dom.getAttrib(elm, 'onclick'));
+	setFormValue('ondblclick', dom.getAttrib(elm, 'ondblclick'));
+	setFormValue('onmousedown', dom.getAttrib(elm, 'onmousedown'));
+	setFormValue('onmouseup', dom.getAttrib(elm, 'onmouseup'));
+	setFormValue('onmouseover', dom.getAttrib(elm, 'onmouseover'));
+	setFormValue('onmousemove', dom.getAttrib(elm, 'onmousemove'));
+	setFormValue('onmouseout', dom.getAttrib(elm, 'onmouseout'));
+	setFormValue('onkeypress', dom.getAttrib(elm, 'onkeypress'));
+	setFormValue('onkeydown', dom.getAttrib(elm, 'onkeydown'));
+	setFormValue('onkeyup', dom.getAttrib(elm, 'onkeyup'));
+}
+
+function setFormValue(name, value) {
+	if(document.forms[0].elements[name]) document.forms[0].elements[name].value = value;
+}
+
+function insertDateTime(id) {
+	document.getElementById(id).value = getDateTime(new Date(), "%Y-%m-%dT%H:%M:%S");
+}
+
+function getDateTime(d, fmt) {
+	fmt = fmt.replace("%D", "%m/%d/%y");
+	fmt = fmt.replace("%r", "%I:%M:%S %p");
+	fmt = fmt.replace("%Y", "" + d.getFullYear());
+	fmt = fmt.replace("%y", "" + d.getYear());
+	fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));
+	fmt = fmt.replace("%d", addZeros(d.getDate(), 2));
+	fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));
+	fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));
+	fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));
+	fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));
+	fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));
+	fmt = fmt.replace("%%", "%");
+
+	return fmt;
+}
+
+function addZeros(value, len) {
+	var i;
+
+	value = "" + value;
+
+	if (value.length < len) {
+		for (i=0; i<(len-value.length); i++)
+			value = "0" + value;
+	}
+
+	return value;
+}
+
+function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
+	if (!form_obj || !form_obj.elements[field_name])
+		return;
+
+	var sel = form_obj.elements[field_name];
+
+	var found = false;
+	for (var i=0; i<sel.options.length; i++) {
+		var option = sel.options[i];
+
+		if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {
+			option.selected = true;
+			found = true;
+		} else
+			option.selected = false;
+	}
+
+	if (!found && add_custom && value != '') {
+		var option = new Option('Value: ' + value, value);
+		option.selected = true;
+		sel.options[sel.options.length] = option;
+	}
+
+	return found;
+}
+
+function setAttrib(elm, attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib.toLowerCase()];
+	tinyMCEPopup.editor.dom.setAttrib(elm, attrib, value || valueElm.value);
+}
+
+function setAllCommonAttribs(elm) {
+	setAttrib(elm, 'title');
+	setAttrib(elm, 'id');
+	setAttrib(elm, 'class');
+	setAttrib(elm, 'style');
+	setAttrib(elm, 'dir');
+	setAttrib(elm, 'lang');
+	/*setAttrib(elm, 'onfocus');
+	setAttrib(elm, 'onblur');
+	setAttrib(elm, 'onclick');
+	setAttrib(elm, 'ondblclick');
+	setAttrib(elm, 'onmousedown');
+	setAttrib(elm, 'onmouseup');
+	setAttrib(elm, 'onmouseover');
+	setAttrib(elm, 'onmousemove');
+	setAttrib(elm, 'onmouseout');
+	setAttrib(elm, 'onkeypress');
+	setAttrib(elm, 'onkeydown');
+	setAttrib(elm, 'onkeyup');*/
+}
+
+SXE = {
+	currentAction : "insert",
+	inst : tinyMCEPopup.editor,
+	updateElement : null
+}
+
+SXE.focusElement = SXE.inst.selection.getNode();
+
+SXE.initElementDialog = function(element_name) {
+	addClassesToList('class', 'xhtmlxtras_styles');
+	TinyMCE_EditableSelects.init();
+
+	element_name = element_name.toLowerCase();
+	var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());
+	if (elm != null && elm.nodeName.toUpperCase() == element_name.toUpperCase()) {
+		SXE.currentAction = "update";
+	}
+
+	if (SXE.currentAction == "update") {
+		initCommonAttributes(elm);
+		SXE.updateElement = elm;
+	}
+
+	document.forms[0].insert.value = tinyMCEPopup.getLang(SXE.currentAction, 'Insert', true); 
+}
+
+SXE.insertElement = function(element_name) {
+	var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase()), h, tagName;
+
+	tinyMCEPopup.execCommand('mceBeginUndoLevel');
+	if (elm == null) {
+		var s = SXE.inst.selection.getContent();
+		if(s.length > 0) {
+			tagName = element_name;
+
+			if (tinymce.isIE && element_name.indexOf('html:') == 0)
+				element_name = element_name.substring(5).toLowerCase();
+
+			h = '<' + tagName + ' id="#sxe_temp_' + element_name + '#">' + s + '</' + tagName + '>';
+
+			tinyMCEPopup.execCommand('mceInsertContent', false, h);
+
+			var elementArray = tinymce.grep(SXE.inst.dom.select(element_name), function(n) {return n.id == '#sxe_temp_' + element_name + '#';});
+			for (var i=0; i<elementArray.length; i++) {
+				var elm = elementArray[i];
+
+				elm.id = '';
+				elm.setAttribute('id', '');
+				elm.removeAttribute('id');
+
+				setAllCommonAttribs(elm);
+			}
+		}
+	} else {
+		setAllCommonAttribs(elm);
+	}
+	SXE.inst.nodeChanged();
+	tinyMCEPopup.execCommand('mceEndUndoLevel');
+}
+
+SXE.removeElement = function(element_name){
+	element_name = element_name.toLowerCase();
+	elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());
+	if(elm && elm.nodeName.toUpperCase() == element_name.toUpperCase()){
+		tinyMCEPopup.execCommand('mceBeginUndoLevel');
+		tinyMCE.execCommand('mceRemoveNode', false, elm);
+		SXE.inst.nodeChanged();
+		tinyMCEPopup.execCommand('mceEndUndoLevel');
+	}
+}
+
+SXE.showRemoveButton = function() {
+		document.getElementById("remove").style.display = 'block';
+}
+
+SXE.containsClass = function(elm,cl) {
+	return (elm.className.indexOf(cl) > -1) ? true : false;
+}
+
+SXE.removeClass = function(elm,cl) {
+	if(elm.className == null || elm.className == "" || !SXE.containsClass(elm,cl)) {
+		return true;
+	}
+	var classNames = elm.className.split(" ");
+	var newClassNames = "";
+	for (var x = 0, cnl = classNames.length; x < cnl; x++) {
+		if (classNames[x] != cl) {
+			newClassNames += (classNames[x] + " ");
+		}
+	}
+	elm.className = newClassNames.substring(0,newClassNames.length-1); //removes extra space at the end
+}
+
+SXE.addClass = function(elm,cl) {
+	if(!SXE.containsClass(elm,cl)) elm.className ? elm.className += " " + cl : elm.className = cl;
+	return true;
+}
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
new file mode 100644
index 000000000..2bd0dd518
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
@@ -0,0 +1,49 @@
+ /**
+ * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+ *
+ * @author Moxiecode - based on work by Andrew Tetlaw
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+function init() {
+	SXE.initElementDialog('ins');
+	if (SXE.currentAction == "update") {
+		setFormValue('datetime', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'datetime'));
+		setFormValue('cite', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'cite'));
+		SXE.showRemoveButton();
+	}
+}
+
+function setElementAttribs(elm) {
+	setAllCommonAttribs(elm);
+	setAttrib(elm, 'datetime');
+	setAttrib(elm, 'cite');
+}
+
+function insertIns() {
+	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'INS');
+	tinyMCEPopup.execCommand('mceBeginUndoLevel');
+	if (elm == null) {
+		var s = SXE.inst.selection.getContent();
+		if(s.length > 0) {
+			tinyMCEPopup.execCommand('mceInsertContent', false, '<ins id="#sxe_temp_ins#">' + s + '</ins>');
+			var elementArray = tinymce.grep(SXE.inst.dom.select('ins'), function(n) {return n.id == '#sxe_temp_ins#';});
+			for (var i=0; i<elementArray.length; i++) {
+				var elm = elementArray[i];
+				setElementAttribs(elm);
+			}
+		}
+	} else {
+		setElementAttribs(elm);
+	}
+	tinyMCEPopup.editor.nodeChanged();
+	tinyMCEPopup.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function removeIns() {
+	SXE.removeElement('ins');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
new file mode 100644
index 000000000..ee6016704
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
@@ -0,0 +1,32 @@
+tinyMCE.addI18n('en.xhtmlxtras_dlg',{
+attribute_label_title:"Title",
+attribute_label_id:"ID",
+attribute_label_class:"Class",
+attribute_label_style:"Style",
+attribute_label_cite:"Cite",
+attribute_label_datetime:"Date/Time",
+attribute_label_langdir:"Text Direction",
+attribute_option_ltr:"Left to right",
+attribute_option_rtl:"Right to left",
+attribute_label_langcode:"Language",
+attribute_label_tabindex:"TabIndex",
+attribute_label_accesskey:"AccessKey",
+attribute_events_tab:"Events",
+attribute_attrib_tab:"Attributes",
+general_tab:"General",
+attrib_tab:"Attributes",
+events_tab:"Events",
+fieldset_general_tab:"General Settings",
+fieldset_attrib_tab:"Element Attributes",
+fieldset_events_tab:"Element Events",
+title_ins_element:"Insertion Element",
+title_del_element:"Deletion Element",
+title_acronym_element:"Acronym Element",
+title_abbr_element:"Abbreviation Element",
+title_cite_element:"Citation Element",
+remove:"Remove",
+insert_date:"Insert current date/time",
+option_ltr:"Left to right",
+option_rtl:"Right to left",
+attribs_title:"Insert/Edit Attributes"
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/about.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/about.htm
new file mode 100644
index 000000000..4ef2a29c5
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/about.htm
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advanced_dlg.about_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="js/about.js"></script>

+</head>

+<body id="about" style="display: none">

+		<div class="tabs">

+			<ul>

+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.about_general}</a></span></li>

+				<li id="help_tab" style="display:none"><span><a href="javascript:mcTabs.displayTab('help_tab','help_panel');" onmousedown="return false;">{#advanced_dlg.about_help}</a></span></li>

+				<li id="plugins_tab"><span><a href="javascript:mcTabs.displayTab('plugins_tab','plugins_panel');" onmousedown="return false;">{#advanced_dlg.about_plugins}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="general_panel" class="panel current">

+				<h3>{#advanced_dlg.about_title}</h3>

+				<p>Version: <span id="version"></span> (<span id="date"></span>)</p>

+				<p>TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under <a href="../../license.txt" target="_blank">LGPL</a>

+				by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.</p>

+				<p>Copyright &copy; 2003-2008, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.</p>

+				<p>For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.</p>

+

+				<div id="buttoncontainer">

+					<a href="http://www.moxiecode.com" target="_blank"><img src="http://tinymce.moxiecode.com/images/gotmoxie.png" alt="Got Moxie?" border="0" /></a>

+					<a href="http://sourceforge.net/projects/tinymce/" target="_blank"><img src="http://sourceforge.net/sflogo.php?group_id=103281" alt="Hosted By Sourceforge" border="0" /></a>

+					<a href="http://www.freshmeat.net/projects/tinymce" target="_blank"><img src="http://tinymce.moxiecode.com/images/fm.gif" alt="Also on freshmeat" border="0" /></a>

+				</div>

+			</div>

+

+			<div id="plugins_panel" class="panel">

+				<div id="pluginscontainer">

+					<h3>{#advanced_dlg.about_loaded}</h3>

+

+					<div id="plugintablecontainer">

+					</div>

+

+					<p>&nbsp;</p>

+				</div>

+			</div>

+

+			<div id="help_panel" class="panel noscroll" style="overflow: visible;">

+				<div id="iframecontainer"></div>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<div style="float: right">

+				<input type="button" id="cancel" name="cancel" value="{#close}" onclick="tinyMCEPopup.close();" />

+			</div>

+		</div>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm
new file mode 100644
index 000000000..9e4c0b91a
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advanced_dlg.anchor_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/anchor.js"></script>

+	<base target="_self" />

+</head>

+<body style="display: none">

+<form onsubmit="AnchorDialog.update();return false;" action="#">

+	<table border="0" cellpadding="4" cellspacing="0">

+		<tr>

+			<td colspan="2" class="title">{#advanced_dlg.anchor_title}</td>

+		</tr>

+		<tr>

+			<td nowrap="nowrap">{#advanced_dlg.anchor_name}:</td>

+			<td><input name="anchorName" type="text" class="mceFocus" id="anchorName" value="" style="width: 200px" /></td>

+		</tr>

+	</table>

+

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="submit" id="insert" name="insert" value="{#update}" />

+		</div>

+

+		<div style="float: right">

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</div>

+</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
new file mode 100644
index 000000000..e4c734484
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advanced_dlg.charmap_title}</title>

+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/charmap.js"></script>

+	<base target="_self" />

+</head>

+<body id="charmap" style="display:none">

+<table align="center" border="0" cellspacing="0" cellpadding="2">

+    <tr>

+        <td colspan="2" class="title">{#advanced_dlg.charmap_title}</td>

+    </tr>

+    <tr>

+        <td id="charmapView" rowspan="2" align="left" valign="top">

+			<!-- Chars will be rendered here -->

+        </td>

+        <td width="100" align="center" valign="top">

+            <table border="0" cellpadding="0" cellspacing="0" width="100" style="height:100px">

+                <tr>

+                    <td id="codeV">&nbsp;</td>

+                </tr>

+                <tr>

+                    <td id="codeN">&nbsp;</td>

+                </tr>

+            </table>

+        </td>

+    </tr>

+    <tr>

+        <td valign="bottom" style="padding-bottom: 3px;">

+            <table width="100" align="center" border="0" cellpadding="2" cellspacing="0">

+                <tr>

+                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">HTML-Code</td>

+                </tr>

+                <tr>

+                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeA" align="center">&nbsp;</td>

+                </tr>

+                <tr>

+                    <td style="font-size: 1px;">&nbsp;</td>

+                </tr>

+                <tr>

+                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">NUM-Code</td>

+                </tr>

+                <tr>

+                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeB" align="center">&nbsp;</td>

+                </tr>

+            </table>

+        </td>

+    </tr>

+</table>

+

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
new file mode 100644
index 000000000..a8f297c60
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
@@ -0,0 +1,76 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advanced_dlg.colorpicker_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="js/color_picker.js"></script>

+	<base target="_self" />

+</head>

+<body id="colorpicker" style="display: none">

+<form onsubmit="insertAction();return false" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="picker_tab" class="current"><span><a href="javascript:mcTabs.displayTab('picker_tab','picker_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_picker_tab}</a></span></li>

+			<li id="rgb_tab"><span><a href="javascript:;" onclick="generateWebColors();mcTabs.displayTab('rgb_tab','rgb_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_palette_tab}</a></span></li>

+			<li id="named_tab"><span><a  href="javascript:;" onclick="generateNamedColors();javascript:mcTabs.displayTab('named_tab','named_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_named_tab}</a></span></li>

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="picker_panel" class="panel current">

+			<fieldset>

+				<legend>{#advanced_dlg.colorpicker_picker_title}</legend>

+				<div id="picker">

+					<img id="colors" src="img/colorpicker.jpg" onclick="computeColor(event)" onmousedown="isMouseDown = true;return false;" onmouseup="isMouseDown = false;" onmousemove="if (isMouseDown && isMouseOver) computeColor(event); return false;" onmouseover="isMouseOver=true;" onmouseout="isMouseOver=false;" />

+

+					<div id="light">

+						<!-- Will be filled with divs -->

+					</div>

+

+					<br style="clear: both" />

+				</div>

+			</fieldset>

+		</div>

+

+		<div id="rgb_panel" class="panel">

+			<fieldset>

+				<legend>{#advanced_dlg.colorpicker_palette_title}</legend>

+				<div id="webcolors">

+					<!-- Gets filled with web safe colors-->

+				</div>

+

+				<br style="clear: both" />

+			</fieldset>

+		</div>

+

+		<div id="named_panel" class="panel">

+			<fieldset>

+				<legend>{#advanced_dlg.colorpicker_named_title}</legend>

+				<div id="namedcolors">

+					<!-- Gets filled with named colors-->

+				</div>

+

+				<br style="clear: both" />

+

+				<div id="colornamecontainer">

+					{#advanced_dlg.colorpicker_name} <span id="colorname"></span>

+				</div>

+			</fieldset>

+		</div>

+	</div>

+

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="submit" id="insert" name="insert" value="{#apply}" />

+		</div>

+

+		<div id="preview"></div>

+

+		<div id="previewblock">

+			<label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" maxlength="8" class="text mceFocus" />

+		</div>

+	</div>

+</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
new file mode 100644
index 000000000..eea384f75
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
@@ -0,0 +1 @@
+(function(){var DOM=tinymce.DOM,Event=tinymce.dom.Event,extend=tinymce.extend,each=tinymce.each,Cookie=tinymce.util.Cookie,lastExtID,explode=tinymce.explode;tinymce.ThemeManager.requireLangPack('advanced');tinymce.create('tinymce.themes.AdvancedTheme',{controls:{bold:['bold_desc','Bold'],italic:['italic_desc','Italic'],underline:['underline_desc','Underline'],strikethrough:['striketrough_desc','Strikethrough'],justifyleft:['justifyleft_desc','JustifyLeft'],justifycenter:['justifycenter_desc','JustifyCenter'],justifyright:['justifyright_desc','JustifyRight'],justifyfull:['justifyfull_desc','JustifyFull'],bullist:['bullist_desc','InsertUnorderedList'],numlist:['numlist_desc','InsertOrderedList'],outdent:['outdent_desc','Outdent'],indent:['indent_desc','Indent'],cut:['cut_desc','Cut'],copy:['copy_desc','Copy'],paste:['paste_desc','Paste'],undo:['undo_desc','Undo'],redo:['redo_desc','Redo'],link:['link_desc','mceLink'],unlink:['unlink_desc','unlink'],image:['image_desc','mceImage'],cleanup:['cleanup_desc','mceCleanup'],help:['help_desc','mceHelp'],code:['code_desc','mceCodeEditor'],hr:['hr_desc','InsertHorizontalRule'],removeformat:['removeformat_desc','RemoveFormat'],sub:['sub_desc','subscript'],sup:['sup_desc','superscript'],forecolor:['forecolor_desc','ForeColor'],forecolorpicker:['forecolor_desc','mceForeColor'],backcolor:['backcolor_desc','HiliteColor'],backcolorpicker:['backcolor_desc','mceBackColor'],charmap:['charmap_desc','mceCharMap'],visualaid:['visualaid_desc','mceToggleVisualAid'],anchor:['anchor_desc','mceInsertAnchor'],newdocument:['newdocument_desc','mceNewDocument'],blockquote:['blockquote_desc','mceBlockQuote']},stateControls:['bold','italic','underline','strikethrough','bullist','numlist','justifyleft','justifycenter','justifyright','justifyfull','sub','sup','blockquote'],init:function(ed,url){var t=this,s,v;t.editor=ed;t.url=url;t.onResolveName=new tinymce.util.Dispatcher(this);t.settings=s=extend({theme_advanced_path:true,theme_advanced_toolbar_location:'bottom',theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"center",theme_advanced_fonts:"Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",theme_advanced_font_sizes:"1,2,3,4,5,6,7",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1},ed.settings);if((v=s.theme_advanced_path_location)&&v!='none')s.theme_advanced_statusbar_location=s.theme_advanced_path_location;if(s.theme_advanced_statusbar_location=='none')s.theme_advanced_statusbar_location=0;ed.onInit.add(function(){ed.onNodeChange.add(t._nodeChanged,t);if(ed.settings.content_css!==false)ed.dom.loadCSS(ed.baseURI.toAbsolute("themes/advanced/skins/"+ed.settings.skin+"/content.css"));});ed.onSetProgressState.add(function(ed,b,ti){var co,id=ed.id,tb;if(b){t.progressTimer=setTimeout(function(){co=ed.getContainer();co=co.insertBefore(DOM.create('DIV',{style:'position:relative'}),co.firstChild);tb=DOM.get(ed.id+'_tbl');DOM.add(co,'div',{id:id+'_blocker','class':'mceBlocker',style:{width:tb.clientWidth+2,height:tb.clientHeight+2}});DOM.add(co,'div',{id:id+'_progress','class':'mceProgress',style:{left:tb.clientWidth/ 2, top : tb.clientHeight /2}});},ti||0);}else{DOM.remove(id+'_blocker');DOM.remove(id+'_progress');clearTimeout(t.progressTimer);}});DOM.loadCSS(ed.baseURI.toAbsolute(s.editor_css||"themes/advanced/skins/"+ed.settings.skin+"/ui.css"));if(s.skin_variant)DOM.loadCSS(ed.baseURI.toAbsolute(s.editor_css||"themes/advanced/skins/"+ed.settings.skin+"/ui_"+s.skin_variant+".css"));},createControl:function(n,cf){var cd,c;if(c=cf.createControl(n))return c;switch(n){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu();}if((cd=this.controls[n]))return cf.createButton(n,{title:"advanced."+cd[0],cmd:cd[1],ui:cd[2],value:cd[3]});},execCommand:function(cmd,ui,val){var f=this['_'+cmd];if(f){f.call(this,ui,val);return true;}return false;},_importClasses:function(e){var ed=this.editor,c=ed.controlManager.get('styleselect');if(c.getLength()==0){each(ed.dom.getClasses(),function(o){c.add(o['class'],o['class']);});}},_createStyleSelect:function(n){var t=this,ed=t.editor,cf=ed.controlManager,c=cf.createListBox('styleselect',{title:'advanced.style_select',onselect:function(v){if(c.selectedValue===v){ed.execCommand('mceSetStyleInfo',0,{command:'removeformat'});c.select();return false;}else ed.execCommand('mceSetCSSClass',0,v);}});if(c){each(ed.getParam('theme_advanced_styles','','hash'),function(v,k){if(v)c.add(t.editor.translate(k),v);});c.onPostRender.add(function(ed,n){Event.add(n.id+'_text','focus',t._importClasses,t);Event.add(n.id+'_text','mousedown',t._importClasses,t);});}return c;},_createFontSelect:function(){var c,t=this,ed=t.editor;c=ed.controlManager.createListBox('fontselect',{title:'advanced.fontdefault',cmd:'FontName'});if(c){each(ed.getParam('theme_advanced_fonts',t.settings.theme_advanced_fonts,'hash'),function(v,k){c.add(ed.translate(k),v,{style:v.indexOf('dings')==-1?'font-family:'+v:''});});}return c;},_createFontSizeSelect:function(){var t=this,ed=t.editor,c,lo=["1 (8 pt)","2 (10 pt)","3 (12 pt)","4 (14 pt)","5 (18 pt)","6 (24 pt)","7 (36 pt)"],fz=[8,10,12,14,18,24,36];c=ed.controlManager.createListBox('fontsizeselect',{title:'advanced.font_size',cmd:'FontSize'});if(c){each(ed.getParam('theme_advanced_font_sizes',t.settings.theme_advanced_font_sizes,'hash'),function(v,k){c.add(k!=v?k:lo[parseInt(v)-1],v,{'style':'font-size:'+fz[v-1]+'pt','class':'mceFontSize'+v});});}return c;},_createBlockFormats:function(){var c,fmts={p:'advanced.paragraph',address:'advanced.address',pre:'advanced.pre',h1:'advanced.h1',h2:'advanced.h2',h3:'advanced.h3',h4:'advanced.h4',h5:'advanced.h5',h6:'advanced.h6',div:'advanced.div',blockquote:'advanced.blockquote',code:'advanced.code',dt:'advanced.dt',dd:'advanced.dd',samp:'advanced.samp'},t=this;c=t.editor.controlManager.createListBox('formatselect',{title:'advanced.block',cmd:'FormatBlock'});if(c){each(t.editor.getParam('theme_advanced_blockformats',t.settings.theme_advanced_blockformats,'hash'),function(v,k){c.add(t.editor.translate(k!=v?k:fmts[v]),v,{'class':'mce_formatPreview mce_'+v});});}return c;},_createForeColorMenu:function(){var c,t=this,s=t.settings,o={},v;if(s.theme_advanced_more_colors){o.more_colors_func=function(){t._mceColorPicker(0,{color:c.value,func:function(co){c.setColor(co);}});};}if(v=s.theme_advanced_text_colors)o.colors=v;o.title='advanced.forecolor_desc';o.cmd='ForeColor';o.scope=this;c=t.editor.controlManager.createColorSplitButton('forecolor',o);return c;},_createBackColorMenu:function(){var c,t=this,s=t.settings,o={},v;if(s.theme_advanced_more_colors){o.more_colors_func=function(){t._mceColorPicker(0,{color:c.value,func:function(co){c.setColor(co);}});};}if(v=s.theme_advanced_background_colors)o.colors=v;o.title='advanced.backcolor_desc';o.cmd='HiliteColor';o.scope=this;c=t.editor.controlManager.createColorSplitButton('backcolor',o);return c;},renderUI:function(o){var n,ic,tb,t=this,ed=t.editor,s=t.settings,sc,p,nl;n=p=DOM.create('span',{id:ed.id+'_parent','class':'mceEditor '+ed.settings.skin+'Skin'+(s.skin_variant?' '+ed.settings.skin+'Skin'+t._ufirst(s.skin_variant):'')});if(!DOM.boxModel)n=DOM.add(n,'div',{'class':'mceOldBoxModel'});n=sc=DOM.add(n,'table',{id:ed.id+'_tbl','class':'mceLayout',cellSpacing:0,cellPadding:0});n=tb=DOM.add(n,'tbody');switch((s.theme_advanced_layout_manager||'').toLowerCase()){case"rowlayout":ic=t._rowLayout(s,tb,o);break;case"customlayout":ic=ed.execCallback("theme_advanced_custom_layout",s,tb,o,p);break;default:ic=t._simpleLayout(s,tb,o,p);}n=o.targetNode;nl=DOM.stdMode?sc.getElementsByTagName('tr'):sc.rows;DOM.addClass(nl[0],'mceFirst');DOM.addClass(nl[nl.length-1],'mceLast');each(DOM.select('tr',tb),function(n){DOM.addClass(n.firstChild,'mceFirst');DOM.addClass(n.childNodes[n.childNodes.length-1],'mceLast');});if(DOM.get(s.theme_advanced_toolbar_container))DOM.get(s.theme_advanced_toolbar_container).appendChild(p);else DOM.insertAfter(p,n);Event.add(ed.id+'_path_row','click',function(e){e=e.target;if(e.nodeName=='A'){t._sel(e.className.replace(/^.*mcePath_([0-9]+).*$/,'$1'));return Event.cancel(e);}});if(!ed.getParam('accessibility_focus')||ed.getParam('tab_focus'))Event.add(DOM.add(p,'a',{href:'#'},'<!-- IE -->'),'focus',function(){tinyMCE.get(ed.id).focus();});if(s.theme_advanced_toolbar_location=='external')o.deltaHeight=0;t.deltaHeight=o.deltaHeight;o.targetNode=null;return{iframeContainer:ic,editorContainer:ed.id+'_parent',sizeContainer:sc,deltaHeight:o.deltaHeight};},getInfo:function(){return{longname:'Advanced theme',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',version:tinymce.majorVersion+"."+tinymce.minorVersion}},resizeBy:function(dw,dh){var e=DOM.get(this.editor.id+'_tbl');this.resizeTo(e.clientWidth+dw,e.clientHeight+dh);},resizeTo:function(w,h){var ed=this.editor,s=ed.settings,e=DOM.get(ed.id+'_tbl'),ifr=DOM.get(ed.id+'_ifr'),dh;w=Math.max(s.theme_advanced_resizing_min_width||100,w);h=Math.max(s.theme_advanced_resizing_min_height||100,h);w=Math.min(s.theme_advanced_resizing_max_width||0xFFFF,w);h=Math.min(s.theme_advanced_resizing_max_height||0xFFFF,h);dh=e.clientHeight-ifr.clientHeight;DOM.setStyle(ifr,'height',h-dh);DOM.setStyles(e,{width:w,height:h});},destroy:function(){var id=this.editor.id;Event.clear(id+'_resize');Event.clear(id+'_path_row');Event.clear(id+'_external_close');},_simpleLayout:function(s,tb,o,p){var t=this,ed=t.editor,lo=s.theme_advanced_toolbar_location,sl=s.theme_advanced_statusbar_location,n,ic,etb,c;if(lo=='top')t._addToolbars(tb,o);if(lo=='external'){n=c=DOM.create('div',{style:'position:relative'});n=DOM.add(n,'div',{id:ed.id+'_external','class':'mceExternalToolbar'});DOM.add(n,'a',{id:ed.id+'_external_close',href:'javascript:;','class':'mceExternalClose'});n=DOM.add(n,'table',{id:ed.id+'_tblext',cellSpacing:0,cellPadding:0});etb=DOM.add(n,'tbody');if(p.firstChild.className=='mceOldBoxModel')p.firstChild.appendChild(c);else p.insertBefore(c,p.firstChild);t._addToolbars(etb,o);ed.onMouseUp.add(function(){var e=DOM.get(ed.id+'_external');DOM.show(e);DOM.hide(lastExtID);var f=Event.add(ed.id+'_external_close','click',function(){DOM.hide(ed.id+'_external');Event.remove(ed.id+'_external_close','click',f);});DOM.show(e);DOM.setStyle(e,'top',0-DOM.getRect(ed.id+'_tblext').h-1);DOM.hide(e);DOM.show(e);e.style.filter='';lastExtID=ed.id+'_external';e=null;});}if(sl=='top')t._addStatusBar(tb,o);if(!s.theme_advanced_toolbar_container){n=DOM.add(tb,'tr');n=ic=DOM.add(n,'td',{'class':'mceIframeContainer'});}if(lo=='bottom')t._addToolbars(tb,o);if(sl=='bottom')t._addStatusBar(tb,o);return ic;},_rowLayout:function(s,tb,o){var t=this,ed=t.editor,dc,da,cf=ed.controlManager,n,ic,to,a;dc=s.theme_advanced_containers_default_class||'';da=s.theme_advanced_containers_default_align||'center';each(explode(s.theme_advanced_containers||''),function(c,i){var v=s['theme_advanced_container_'+c]||'';switch(v.toLowerCase()){case'mceeditor':n=DOM.add(tb,'tr');n=ic=DOM.add(n,'td',{'class':'mceIframeContainer'});break;case'mceelementpath':t._addStatusBar(tb,o);break;default:a=(s['theme_advanced_container_'+c+'_align']||da).toLowerCase();a='mce'+t._ufirst(a);n=DOM.add(DOM.add(tb,'tr'),'td',{'class':'mceToolbar '+(s['theme_advanced_container_'+c+'_class']||dc)+' '+a||da});to=cf.createToolbar("toolbar"+i);t._addControls(v,to);DOM.setHTML(n,to.renderHTML());o.deltaHeight-=s.theme_advanced_row_height;}});return ic;},_addControls:function(v,tb){var t=this,s=t.settings,di,cf=t.editor.controlManager;if(s.theme_advanced_disable&&!t._disabled){di={};each(explode(s.theme_advanced_disable),function(v){di[v]=1;});t._disabled=di;}else di=t._disabled;each(explode(v),function(n){var c;if(di&&di[n])return;if(n=='tablecontrols'){each(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(n){n=t.createControl(n,cf);if(n)tb.add(n);});return;}c=t.createControl(n,cf);if(c)tb.add(c);});},_addToolbars:function(c,o){var t=this,i,tb,ed=t.editor,s=t.settings,v,cf=ed.controlManager,di,n,h=[],a;a=s.theme_advanced_toolbar_align.toLowerCase();a='mce'+t._ufirst(a);n=DOM.add(DOM.add(c,'tr'),'td',{'class':'mceToolbar '+a});if(!ed.getParam('accessibility_focus')||ed.getParam('tab_focus'))h.push(DOM.createHTML('a',{href:'#',onfocus:'tinyMCE.get(\''+ed.id+'\').focus();'},'<!-- IE -->'));h.push(DOM.createHTML('a',{href:'#',accesskey:'q',title:ed.getLang("advanced.toolbar_focus")},'<!-- IE -->'));for(i=1;(v=s['theme_advanced_buttons'+i]);i++){tb=cf.createToolbar("toolbar"+i,{'class':'mceToolbarRow'+i});if(s['theme_advanced_buttons'+i+'_add'])v+=','+s['theme_advanced_buttons'+i+'_add'];if(s['theme_advanced_buttons'+i+'_add_before'])v=s['theme_advanced_buttons'+i+'_add_before']+','+v;t._addControls(v,tb);h.push(tb.renderHTML());o.deltaHeight-=s.theme_advanced_row_height;}h.push(DOM.createHTML('a',{href:'#',accesskey:'z',title:ed.getLang("advanced.toolbar_focus"),onfocus:'tinyMCE.getInstanceById(\''+ed.id+'\').focus();'},'<!-- IE -->'));DOM.setHTML(n,h.join(''));},_addStatusBar:function(tb,o){var n,t=this,ed=t.editor,s=t.settings,r,mf,me,td;n=DOM.add(tb,'tr');n=td=DOM.add(n,'td',{'class':'mceStatusbar'});n=DOM.add(n,'div',{id:ed.id+'_path_row'},s.theme_advanced_path?ed.translate('advanced.path')+': ':'&nbsp;');DOM.add(n,'a',{href:'#',accesskey:'x'});if(s.theme_advanced_resizing&&!tinymce.isOldWebKit){DOM.add(td,'a',{id:ed.id+'_resize',href:'javascript:;',onclick:"return false;",'class':'mceResize'});if(s.theme_advanced_resizing_use_cookie){ed.onPostRender.add(function(){var o=Cookie.getHash("TinyMCE_"+ed.id+"_size"),c=DOM.get(ed.id+'_tbl');if(!o)return;if(s.theme_advanced_resize_horizontal)c.style.width=Math.max(10,o.cw)+'px';c.style.height=Math.max(10,o.ch)+'px';DOM.get(ed.id+'_ifr').style.height=Math.max(10,parseInt(o.ch)+t.deltaHeight)+'px';});}ed.onPostRender.add(function(){Event.add(ed.id+'_resize','mousedown',function(e){var c,p,w,h,n,pa;c=DOM.get(ed.id+'_tbl');w=c.clientWidth;h=c.clientHeight;miw=s.theme_advanced_resizing_min_width||100;mih=s.theme_advanced_resizing_min_height||100;maw=s.theme_advanced_resizing_max_width||0xFFFF;mah=s.theme_advanced_resizing_max_height||0xFFFF;p=DOM.add(DOM.get(ed.id+'_parent'),'div',{'class':'mcePlaceHolder'});DOM.setStyles(p,{width:w,height:h});DOM.hide(c);DOM.show(p);r={x:e.screenX,y:e.screenY,w:w,h:h,dx:null,dy:null};mf=Event.add(DOM.doc,'mousemove',function(e){var w,h;r.dx=e.screenX-r.x;r.dy=e.screenY-r.y;w=Math.max(miw,r.w+r.dx);h=Math.max(mih,r.h+r.dy);w=Math.min(maw,w);h=Math.min(mah,h);if(s.theme_advanced_resize_horizontal)p.style.width=w+'px';p.style.height=h+'px';return Event.cancel(e);});me=Event.add(DOM.doc,'mouseup',function(e){var ifr;Event.remove(DOM.doc,'mousemove',mf);Event.remove(DOM.doc,'mouseup',me);c.style.display='';DOM.remove(p);if(r.dx===null)return;ifr=DOM.get(ed.id+'_ifr');if(s.theme_advanced_resize_horizontal)c.style.width=Math.max(10,r.w+r.dx)+'px';c.style.height=Math.max(10,r.h+r.dy)+'px';ifr.style.height=Math.max(10,ifr.clientHeight+r.dy)+'px';if(s.theme_advanced_resizing_use_cookie){Cookie.setHash("TinyMCE_"+ed.id+"_size",{cw:r.w+r.dx,ch:r.h+r.dy});}});return Event.cancel(e);});});}o.deltaHeight-=21;n=tb=null;},_nodeChanged:function(ed,cm,n,co){var t=this,p,de=0,v,c,s=t.settings;tinymce.each(t.stateControls,function(c){cm.setActive(c,ed.queryCommandState(t.controls[c][1]));});cm.setActive('visualaid',ed.hasVisual);cm.setDisabled('undo',!ed.undoManager.hasUndo()&&!ed.typing);cm.setDisabled('redo',!ed.undoManager.hasRedo());cm.setDisabled('outdent',!ed.queryCommandState('Outdent'));p=DOM.getParent(n,'A');if(c=cm.get('link')){if(!p||!p.name){c.setDisabled(!p&&co);c.setActive(!!p);}}if(c=cm.get('unlink')){c.setDisabled(!p&&co);c.setActive(!!p&&!p.name);}if(c=cm.get('anchor')){c.setActive(!!p&&p.name);if(tinymce.isWebKit){p=DOM.getParent(n,'IMG');c.setActive(!!p&&DOM.getAttrib(p,'mce_name')=='a');}}p=DOM.getParent(n,'IMG');if(c=cm.get('image'))c.setActive(!!p&&n.className.indexOf('mceItem')==-1);if(c=cm.get('styleselect')){if(n.className){t._importClasses();c.select(n.className);}else c.select();}if(c=cm.get('formatselect')){p=DOM.getParent(n,DOM.isBlock);if(p)c.select(p.nodeName.toLowerCase());}if(c=cm.get('fontselect'))c.select(ed.queryCommandValue('FontName'));if(c=cm.get('fontsizeselect'))c.select(''+ed.queryCommandValue('FontSize'));if(s.theme_advanced_path&&s.theme_advanced_statusbar_location){p=DOM.get(ed.id+'_path')||DOM.add(ed.id+'_path_row','span',{id:ed.id+'_path'});DOM.setHTML(p,'');ed.dom.getParent(n,function(n){var na=n.nodeName.toLowerCase(),u,pi,ti='';if(n.nodeType!=1||(DOM.hasClass(n,'mceItemHidden')||DOM.hasClass(n,'mceItemRemoved')))return;if(v=DOM.getAttrib(n,'mce_name'))na=v;if(tinymce.isIE&&n.scopeName!=='HTML')na=n.scopeName+':'+na;na=na.replace(/mce\:/g,'');switch(na){case'b':na='strong';break;case'i':na='em';break;case'img':if(v=DOM.getAttrib(n,'src'))ti+='src: '+v+' ';break;case'a':if(v=DOM.getAttrib(n,'name')){ti+='name: '+v+' ';na+='#'+v;}if(v=DOM.getAttrib(n,'href'))ti+='href: '+v+' ';break;case'font':if(s.convert_fonts_to_spans)na='span';if(v=DOM.getAttrib(n,'face'))ti+='font: '+v+' ';if(v=DOM.getAttrib(n,'size'))ti+='size: '+v+' ';if(v=DOM.getAttrib(n,'color'))ti+='color: '+v+' ';break;case'span':if(v=DOM.getAttrib(n,'style'))ti+='style: '+v+' ';break;}if(v=DOM.getAttrib(n,'id'))ti+='id: '+v+' ';if(v=n.className){v=v.replace(/(webkit-[\w\-]+|Apple-[\w\-]+|mceItem\w+|mceVisualAid)/g,'');if(v&&v.indexOf('mceItem')==-1){ti+='class: '+v+' ';if(DOM.isBlock(n)||na=='img'||na=='span')na+='.'+v;}}na=na.replace(/(html:)/g,'');na={name:na,node:n,title:ti};t.onResolveName.dispatch(t,na);ti=na.title;na=na.name;pi=DOM.create('a',{'href':"javascript:;",onmousedown:"return false;",title:ti,'class':'mcePath_'+(de++)},na);if(p.hasChildNodes()){p.insertBefore(DOM.doc.createTextNode(' \u00bb '),p.firstChild);p.insertBefore(pi,p.firstChild);}else p.appendChild(pi);},ed.getBody());}},_sel:function(v){this.editor.execCommand('mceSelectNodeDepth',false,v);},_mceInsertAnchor:function(ui,v){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/anchor.htm',width:320+parseInt(ed.getLang('advanced.anchor_delta_width',0)),height:90+parseInt(ed.getLang('advanced.anchor_delta_height',0)),inline:true},{theme_url:this.url});},_mceCharMap:function(){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/charmap.htm',width:550+parseInt(ed.getLang('advanced.charmap_delta_width',0)),height:250+parseInt(ed.getLang('advanced.charmap_delta_height',0)),inline:true},{theme_url:this.url});},_mceHelp:function(){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/about.htm',width:480,height:380,inline:true},{theme_url:this.url});},_mceColorPicker:function(u,v){var ed=this.editor;v=v||{};ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/color_picker.htm',width:375+parseInt(ed.getLang('advanced.colorpicker_delta_width',0)),height:250+parseInt(ed.getLang('advanced.colorpicker_delta_height',0)),close_previous:false,inline:true},{input_color:v.color,func:v.func,theme_url:this.url});},_mceCodeEditor:function(ui,val){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/source_editor.htm',width:parseInt(ed.getParam("theme_advanced_source_editor_width",720)),height:parseInt(ed.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url});},_mceImage:function(ui,val){var ed=this.editor;if(ed.dom.getAttrib(ed.selection.getNode(),'class').indexOf('mceItem')!=-1)return;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/image.htm',width:355+parseInt(ed.getLang('advanced.image_delta_width',0)),height:275+parseInt(ed.getLang('advanced.image_delta_height',0)),inline:true},{theme_url:this.url});},_mceLink:function(ui,val){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/link.htm',width:310+parseInt(ed.getLang('advanced.link_delta_width',0)),height:200+parseInt(ed.getLang('advanced.link_delta_height',0)),inline:true},{theme_url:this.url});},_mceNewDocument:function(){var ed=this.editor;ed.windowManager.confirm('advanced.newdocument',function(s){if(s)ed.execCommand('mceSetContent',false,'');});},_mceForeColor:function(){var t=this;this._mceColorPicker(0,{color:t.fgColor,func:function(co){t.fgColor=co;t.editor.execCommand('ForeColor',false,co);}});},_mceBackColor:function(){var t=this;this._mceColorPicker(0,{color:t.bgColor,func:function(co){t.bgColor=co;t.editor.execCommand('HiliteColor',false,co);}});},_ufirst:function(s){return s.substring(0,1).toUpperCase()+s.substring(1);}});tinymce.ThemeManager.add('advanced',tinymce.themes.AdvancedTheme);}());
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
new file mode 100644
index 000000000..9eefb1375
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
@@ -0,0 +1,1052 @@
+/**
+ * $Id: editor_template_src.js 852 2008-05-27 05:52:09Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend, each = tinymce.each, Cookie = tinymce.util.Cookie, lastExtID, explode = tinymce.explode;
+
+	// Tell it to load theme specific language pack(s)
+	tinymce.ThemeManager.requireLangPack('advanced');
+
+	tinymce.create('tinymce.themes.AdvancedTheme', {
+		// Control name lookup, format: title, command
+		controls : {
+			bold : ['bold_desc', 'Bold'],
+			italic : ['italic_desc', 'Italic'],
+			underline : ['underline_desc', 'Underline'],
+			strikethrough : ['striketrough_desc', 'Strikethrough'],
+			justifyleft : ['justifyleft_desc', 'JustifyLeft'],
+			justifycenter : ['justifycenter_desc', 'JustifyCenter'],
+			justifyright : ['justifyright_desc', 'JustifyRight'],
+			justifyfull : ['justifyfull_desc', 'JustifyFull'],
+			bullist : ['bullist_desc', 'InsertUnorderedList'],
+			numlist : ['numlist_desc', 'InsertOrderedList'],
+			outdent : ['outdent_desc', 'Outdent'],
+			indent : ['indent_desc', 'Indent'],
+			cut : ['cut_desc', 'Cut'],
+			copy : ['copy_desc', 'Copy'],
+			paste : ['paste_desc', 'Paste'],
+			undo : ['undo_desc', 'Undo'],
+			redo : ['redo_desc', 'Redo'],
+			link : ['link_desc', 'mceLink'],
+			unlink : ['unlink_desc', 'unlink'],
+			image : ['image_desc', 'mceImage'],
+			cleanup : ['cleanup_desc', 'mceCleanup'],
+			help : ['help_desc', 'mceHelp'],
+			code : ['code_desc', 'mceCodeEditor'],
+			hr : ['hr_desc', 'InsertHorizontalRule'],
+			removeformat : ['removeformat_desc', 'RemoveFormat'],
+			sub : ['sub_desc', 'subscript'],
+			sup : ['sup_desc', 'superscript'],
+			forecolor : ['forecolor_desc', 'ForeColor'],
+			forecolorpicker : ['forecolor_desc', 'mceForeColor'],
+			backcolor : ['backcolor_desc', 'HiliteColor'],
+			backcolorpicker : ['backcolor_desc', 'mceBackColor'],
+			charmap : ['charmap_desc', 'mceCharMap'],
+			visualaid : ['visualaid_desc', 'mceToggleVisualAid'],
+			anchor : ['anchor_desc', 'mceInsertAnchor'],
+			newdocument : ['newdocument_desc', 'mceNewDocument'],
+			blockquote : ['blockquote_desc', 'mceBlockQuote']
+		},
+
+		stateControls : ['bold', 'italic', 'underline', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'justifyfull', 'sub', 'sup', 'blockquote'],
+
+		init : function(ed, url) {
+			var t = this, s, v;
+	
+			t.editor = ed;
+			t.url = url;
+			t.onResolveName = new tinymce.util.Dispatcher(this);
+
+			// Default settings
+			t.settings = s = extend({
+				theme_advanced_path : true,
+				theme_advanced_toolbar_location : 'bottom',
+				theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",
+				theme_advanced_buttons2 : "bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",
+				theme_advanced_buttons3 : "hr,removeformat,visualaid,|,sub,sup,|,charmap",
+				theme_advanced_blockformats : "p,address,pre,h1,h2,h3,h4,h5,h6",
+				theme_advanced_toolbar_align : "center",
+				theme_advanced_fonts : "Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",
+				theme_advanced_font_sizes : "1,2,3,4,5,6,7",
+				theme_advanced_more_colors : 1,
+				theme_advanced_row_height : 23,
+				theme_advanced_resize_horizontal : 1,
+				theme_advanced_resizing_use_cookie : 1
+			}, ed.settings);
+
+			if ((v = s.theme_advanced_path_location) && v != 'none')
+				s.theme_advanced_statusbar_location = s.theme_advanced_path_location;
+
+			if (s.theme_advanced_statusbar_location == 'none')
+				s.theme_advanced_statusbar_location = 0;
+
+			// Init editor
+			ed.onInit.add(function() {
+				ed.onNodeChange.add(t._nodeChanged, t);
+
+				if (ed.settings.content_css !== false)
+					ed.dom.loadCSS(ed.baseURI.toAbsolute("themes/advanced/skins/" + ed.settings.skin + "/content.css"));
+			});
+
+			ed.onSetProgressState.add(function(ed, b, ti) {
+				var co, id = ed.id, tb;
+
+				if (b) {
+					t.progressTimer = setTimeout(function() {
+						co = ed.getContainer();
+						co = co.insertBefore(DOM.create('DIV', {style : 'position:relative'}), co.firstChild);
+						tb = DOM.get(ed.id + '_tbl');
+
+						DOM.add(co, 'div', {id : id + '_blocker', 'class' : 'mceBlocker', style : {width : tb.clientWidth + 2, height : tb.clientHeight + 2}});
+						DOM.add(co, 'div', {id : id + '_progress', 'class' : 'mceProgress', style : {left : tb.clientWidth / 2, top : tb.clientHeight / 2}});
+					}, ti || 0);
+				} else {
+					DOM.remove(id + '_blocker');
+					DOM.remove(id + '_progress');
+					clearTimeout(t.progressTimer);
+				}
+			});
+
+			DOM.loadCSS(ed.baseURI.toAbsolute(s.editor_css || "themes/advanced/skins/" + ed.settings.skin + "/ui.css"));
+
+			if (s.skin_variant)
+				DOM.loadCSS(ed.baseURI.toAbsolute(s.editor_css || "themes/advanced/skins/" + ed.settings.skin + "/ui_" + s.skin_variant + ".css"));
+		},
+
+		createControl : function(n, cf) {
+			var cd, c;
+
+			if (c = cf.createControl(n))
+				return c;
+
+			switch (n) {
+				case "styleselect":
+					return this._createStyleSelect();
+
+				case "formatselect":
+					return this._createBlockFormats();
+
+				case "fontselect":
+					return this._createFontSelect();
+
+				case "fontsizeselect":
+					return this._createFontSizeSelect();
+
+				case "forecolor":
+					return this._createForeColorMenu();
+
+				case "backcolor":
+					return this._createBackColorMenu();
+			}
+
+			if ((cd = this.controls[n]))
+				return cf.createButton(n, {title : "advanced." + cd[0], cmd : cd[1], ui : cd[2], value : cd[3]});
+		},
+
+		execCommand : function(cmd, ui, val) {
+			var f = this['_' + cmd];
+
+			if (f) {
+				f.call(this, ui, val);
+				return true;
+			}
+
+			return false;
+		},
+
+		_importClasses : function(e) {
+			var ed = this.editor, c = ed.controlManager.get('styleselect');
+
+			if (c.getLength() == 0) {
+				each(ed.dom.getClasses(), function(o) {
+					c.add(o['class'], o['class']);
+				});
+			}
+		},
+
+		_createStyleSelect : function(n) {
+			var t = this, ed = t.editor, cf = ed.controlManager, c = cf.createListBox('styleselect', {
+				title : 'advanced.style_select',
+				onselect : function(v) {
+					if (c.selectedValue === v) {
+						ed.execCommand('mceSetStyleInfo', 0, {command : 'removeformat'});
+						c.select();
+						return false;
+					} else
+						ed.execCommand('mceSetCSSClass', 0, v);
+				}
+			});
+
+			if (c) {
+				each(ed.getParam('theme_advanced_styles', '', 'hash'), function(v, k) {
+					if (v)
+						c.add(t.editor.translate(k), v);
+				});
+
+				c.onPostRender.add(function(ed, n) {
+					Event.add(n.id + '_text', 'focus', t._importClasses, t);
+					Event.add(n.id + '_text', 'mousedown', t._importClasses, t);
+				});
+			}
+
+			return c;
+		},
+
+		_createFontSelect : function() {
+			var c, t = this, ed = t.editor;
+
+			c = ed.controlManager.createListBox('fontselect', {title : 'advanced.fontdefault', cmd : 'FontName'});
+			if (c) {
+				each(ed.getParam('theme_advanced_fonts', t.settings.theme_advanced_fonts, 'hash'), function(v, k) {
+					c.add(ed.translate(k), v, {style : v.indexOf('dings') == -1 ? 'font-family:' + v : ''});
+				});
+			}
+
+			return c;
+		},
+
+		_createFontSizeSelect : function() {
+			var t = this, ed = t.editor, c, lo = [
+				"1 (8 pt)",
+				"2 (10 pt)",
+				"3 (12 pt)",
+				"4 (14 pt)",
+				"5 (18 pt)",
+				"6 (24 pt)",
+				"7 (36 pt)"
+			], fz = [8, 10, 12, 14, 18, 24, 36];
+
+			c = ed.controlManager.createListBox('fontsizeselect', {title : 'advanced.font_size', cmd : 'FontSize'});
+			if (c) {
+				each(ed.getParam('theme_advanced_font_sizes', t.settings.theme_advanced_font_sizes, 'hash'), function(v, k) {
+					c.add(k != v ? k : lo[parseInt(v) - 1], v, {'style' : 'font-size:' + fz[v - 1] + 'pt', 'class' : 'mceFontSize' + v});
+				});
+			}
+
+			return c;
+		},
+
+		_createBlockFormats : function() {
+			var c, fmts = {
+				p : 'advanced.paragraph',
+				address : 'advanced.address',
+				pre : 'advanced.pre',
+				h1 : 'advanced.h1',
+				h2 : 'advanced.h2',
+				h3 : 'advanced.h3',
+				h4 : 'advanced.h4',
+				h5 : 'advanced.h5',
+				h6 : 'advanced.h6',
+				div : 'advanced.div',
+				blockquote : 'advanced.blockquote',
+				code : 'advanced.code',
+				dt : 'advanced.dt',
+				dd : 'advanced.dd',
+				samp : 'advanced.samp'
+			}, t = this;
+
+			c = t.editor.controlManager.createListBox('formatselect', {title : 'advanced.block', cmd : 'FormatBlock'});
+			if (c) {
+				each(t.editor.getParam('theme_advanced_blockformats', t.settings.theme_advanced_blockformats, 'hash'), function(v, k) {
+					c.add(t.editor.translate(k != v ? k : fmts[v]), v, {'class' : 'mce_formatPreview mce_' + v});
+				});
+			}
+
+			return c;
+		},
+
+		_createForeColorMenu : function() {
+			var c, t = this, s = t.settings, o = {}, v;
+
+			if (s.theme_advanced_more_colors) {
+				o.more_colors_func = function() {
+					t._mceColorPicker(0, {
+						color : c.value,
+						func : function(co) {
+							c.setColor(co);
+						}
+					});
+				};
+			}
+
+			if (v = s.theme_advanced_text_colors)
+				o.colors = v;
+
+			o.title = 'advanced.forecolor_desc';
+			o.cmd = 'ForeColor';
+			o.scope = this;
+
+			c = t.editor.controlManager.createColorSplitButton('forecolor', o);
+
+			return c;
+		},
+
+		_createBackColorMenu : function() {
+			var c, t = this, s = t.settings, o = {}, v;
+
+			if (s.theme_advanced_more_colors) {
+				o.more_colors_func = function() {
+					t._mceColorPicker(0, {
+						color : c.value,
+						func : function(co) {
+							c.setColor(co);
+						}
+					});
+				};
+			}
+
+			if (v = s.theme_advanced_background_colors)
+				o.colors = v;
+
+			o.title = 'advanced.backcolor_desc';
+			o.cmd = 'HiliteColor';
+			o.scope = this;
+
+			c = t.editor.controlManager.createColorSplitButton('backcolor', o);
+
+			return c;
+		},
+
+		renderUI : function(o) {
+			var n, ic, tb, t = this, ed = t.editor, s = t.settings, sc, p, nl;
+
+			n = p = DOM.create('span', {id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '')});
+
+			if (!DOM.boxModel)
+				n = DOM.add(n, 'div', {'class' : 'mceOldBoxModel'});
+
+			n = sc = DOM.add(n, 'table', {id : ed.id + '_tbl', 'class' : 'mceLayout', cellSpacing : 0, cellPadding : 0});
+			n = tb = DOM.add(n, 'tbody');
+
+			switch ((s.theme_advanced_layout_manager || '').toLowerCase()) {
+				case "rowlayout":
+					ic = t._rowLayout(s, tb, o);
+					break;
+
+				case "customlayout":
+					ic = ed.execCallback("theme_advanced_custom_layout", s, tb, o, p);
+					break;
+
+				default:
+					ic = t._simpleLayout(s, tb, o, p);
+			}
+
+			n = o.targetNode;
+
+			// Add classes to first and last TRs
+			nl = DOM.stdMode ? sc.getElementsByTagName('tr') : sc.rows; // Quick fix for IE 8
+			DOM.addClass(nl[0], 'mceFirst');
+			DOM.addClass(nl[nl.length - 1], 'mceLast');
+
+			// Add classes to first and last TDs
+			each(DOM.select('tr', tb), function(n) {
+				DOM.addClass(n.firstChild, 'mceFirst');
+				DOM.addClass(n.childNodes[n.childNodes.length - 1], 'mceLast');
+			});
+
+			if (DOM.get(s.theme_advanced_toolbar_container))
+				DOM.get(s.theme_advanced_toolbar_container).appendChild(p);
+			else
+				DOM.insertAfter(p, n);
+
+			Event.add(ed.id + '_path_row', 'click', function(e) {
+				e = e.target;
+
+				if (e.nodeName == 'A') {
+					t._sel(e.className.replace(/^.*mcePath_([0-9]+).*$/, '$1'));
+
+					return Event.cancel(e);
+				}
+			});
+/*
+			if (DOM.get(ed.id + '_path_row')) {
+				Event.add(ed.id + '_tbl', 'mouseover', function(e) {
+					var re;
+	
+					e = e.target;
+
+					if (e.nodeName == 'SPAN' && DOM.hasClass(e.parentNode, 'mceButton')) {
+						re = DOM.get(ed.id + '_path_row');
+						t.lastPath = re.innerHTML;
+						DOM.setHTML(re, e.parentNode.title);
+					}
+				});
+
+				Event.add(ed.id + '_tbl', 'mouseout', function(e) {
+					if (t.lastPath) {
+						DOM.setHTML(ed.id + '_path_row', t.lastPath);
+						t.lastPath = 0;
+					}
+				});
+			}
+*/
+
+			if (!ed.getParam('accessibility_focus') || ed.getParam('tab_focus'))
+				Event.add(DOM.add(p, 'a', {href : '#'}, '<!-- IE -->'), 'focus', function() {tinyMCE.get(ed.id).focus();});
+
+			if (s.theme_advanced_toolbar_location == 'external')
+				o.deltaHeight = 0;
+
+			t.deltaHeight = o.deltaHeight;
+			o.targetNode = null;
+
+			return {
+				iframeContainer : ic,
+				editorContainer : ed.id + '_parent',
+				sizeContainer : sc,
+				deltaHeight : o.deltaHeight
+			};
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Advanced theme',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			}
+		},
+
+		resizeBy : function(dw, dh) {
+			var e = DOM.get(this.editor.id + '_tbl');
+
+			this.resizeTo(e.clientWidth + dw, e.clientHeight + dh);
+		},
+
+		resizeTo : function(w, h) {
+			var ed = this.editor, s = ed.settings, e = DOM.get(ed.id + '_tbl'), ifr = DOM.get(ed.id + '_ifr'), dh;
+
+			// Boundery fix box
+			w = Math.max(s.theme_advanced_resizing_min_width || 100, w);
+			h = Math.max(s.theme_advanced_resizing_min_height || 100, h);
+			w = Math.min(s.theme_advanced_resizing_max_width || 0xFFFF, w);
+			h = Math.min(s.theme_advanced_resizing_max_height || 0xFFFF, h);
+
+			// Calc difference between iframe and container
+			dh = e.clientHeight - ifr.clientHeight;
+
+			// Resize iframe and container
+			DOM.setStyle(ifr, 'height', h - dh);
+			DOM.setStyles(e, {width : w, height : h});
+		},
+
+		destroy : function() {
+			var id = this.editor.id;
+
+			Event.clear(id + '_resize');
+			Event.clear(id + '_path_row');
+			Event.clear(id + '_external_close');
+		},
+
+		// Internal functions
+
+		_simpleLayout : function(s, tb, o, p) {
+			var t = this, ed = t.editor, lo = s.theme_advanced_toolbar_location, sl = s.theme_advanced_statusbar_location, n, ic, etb, c;
+
+			// Create toolbar container at top
+			if (lo == 'top')
+				t._addToolbars(tb, o);
+
+			// Create external toolbar
+			if (lo == 'external') {
+				n = c = DOM.create('div', {style : 'position:relative'});
+				n = DOM.add(n, 'div', {id : ed.id + '_external', 'class' : 'mceExternalToolbar'});
+				DOM.add(n, 'a', {id : ed.id + '_external_close', href : 'javascript:;', 'class' : 'mceExternalClose'});
+				n = DOM.add(n, 'table', {id : ed.id + '_tblext', cellSpacing : 0, cellPadding : 0});
+				etb = DOM.add(n, 'tbody');
+
+				if (p.firstChild.className == 'mceOldBoxModel')
+					p.firstChild.appendChild(c);
+				else
+					p.insertBefore(c, p.firstChild);
+
+				t._addToolbars(etb, o);
+
+				ed.onMouseUp.add(function() {
+					var e = DOM.get(ed.id + '_external');
+					DOM.show(e);
+
+					DOM.hide(lastExtID);
+
+					var f = Event.add(ed.id + '_external_close', 'click', function() {
+						DOM.hide(ed.id + '_external');
+						Event.remove(ed.id + '_external_close', 'click', f);
+					});
+
+					DOM.show(e);
+					DOM.setStyle(e, 'top', 0 - DOM.getRect(ed.id + '_tblext').h - 1);
+
+					// Fixes IE rendering bug
+					DOM.hide(e);
+					DOM.show(e);
+					e.style.filter = '';
+
+					lastExtID = ed.id + '_external';
+
+					e = null;
+				});
+			}
+
+			if (sl == 'top')
+				t._addStatusBar(tb, o);
+
+			// Create iframe container
+			if (!s.theme_advanced_toolbar_container) {
+				n = DOM.add(tb, 'tr');
+				n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
+			}
+
+			// Create toolbar container at bottom
+			if (lo == 'bottom')
+				t._addToolbars(tb, o);
+
+			if (sl == 'bottom')
+				t._addStatusBar(tb, o);
+
+			return ic;
+		},
+
+		_rowLayout : function(s, tb, o) {
+			var t = this, ed = t.editor, dc, da, cf = ed.controlManager, n, ic, to, a;
+
+			dc = s.theme_advanced_containers_default_class || '';
+			da = s.theme_advanced_containers_default_align || 'center';
+
+			each(explode(s.theme_advanced_containers || ''), function(c, i) {
+				var v = s['theme_advanced_container_' + c] || '';
+
+				switch (v.toLowerCase()) {
+					case 'mceeditor':
+						n = DOM.add(tb, 'tr');
+						n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
+						break;
+
+					case 'mceelementpath':
+						t._addStatusBar(tb, o);
+						break;
+
+					default:
+						a = (s['theme_advanced_container_' + c + '_align'] || da).toLowerCase();
+						a = 'mce' + t._ufirst(a);
+
+						n = DOM.add(DOM.add(tb, 'tr'), 'td', {
+							'class' : 'mceToolbar ' + (s['theme_advanced_container_' + c + '_class'] || dc) + ' ' + a || da
+						});
+
+						to = cf.createToolbar("toolbar" + i);
+						t._addControls(v, to);
+						DOM.setHTML(n, to.renderHTML());
+						o.deltaHeight -= s.theme_advanced_row_height;
+				}
+			});
+
+			return ic;
+		},
+
+		_addControls : function(v, tb) {
+			var t = this, s = t.settings, di, cf = t.editor.controlManager;
+
+			if (s.theme_advanced_disable && !t._disabled) {
+				di = {};
+
+				each(explode(s.theme_advanced_disable), function(v) {
+					di[v] = 1;
+				});
+
+				t._disabled = di;
+			} else
+				di = t._disabled;
+
+			each(explode(v), function(n) {
+				var c;
+
+				if (di && di[n])
+					return;
+
+				// Compatiblity with 2.x
+				if (n == 'tablecontrols') {
+					each(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"], function(n) {
+						n = t.createControl(n, cf);
+
+						if (n)
+							tb.add(n);
+					});
+
+					return;
+				}
+
+				c = t.createControl(n, cf);
+
+				if (c)
+					tb.add(c);
+			});
+		},
+
+		_addToolbars : function(c, o) {
+			var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a;
+
+			a = s.theme_advanced_toolbar_align.toLowerCase();
+			a = 'mce' + t._ufirst(a);
+
+			n = DOM.add(DOM.add(c, 'tr'), 'td', {'class' : 'mceToolbar ' + a});
+
+			if (!ed.getParam('accessibility_focus') || ed.getParam('tab_focus'))
+				h.push(DOM.createHTML('a', {href : '#', onfocus : 'tinyMCE.get(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
+
+			h.push(DOM.createHTML('a', {href : '#', accesskey : 'q', title : ed.getLang("advanced.toolbar_focus")}, '<!-- IE -->'));
+
+			// Create toolbar and add the controls
+			for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {
+				tb = cf.createToolbar("toolbar" + i, {'class' : 'mceToolbarRow' + i});
+
+				if (s['theme_advanced_buttons' + i + '_add'])
+					v += ',' + s['theme_advanced_buttons' + i + '_add'];
+
+				if (s['theme_advanced_buttons' + i + '_add_before'])
+					v = s['theme_advanced_buttons' + i + '_add_before'] + ',' + v;
+
+				t._addControls(v, tb);
+
+				//n.appendChild(n = tb.render());
+				h.push(tb.renderHTML());
+
+				o.deltaHeight -= s.theme_advanced_row_height;
+			}
+
+			h.push(DOM.createHTML('a', {href : '#', accesskey : 'z', title : ed.getLang("advanced.toolbar_focus"), onfocus : 'tinyMCE.getInstanceById(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
+			DOM.setHTML(n, h.join(''));
+		},
+
+		_addStatusBar : function(tb, o) {
+			var n, t = this, ed = t.editor, s = t.settings, r, mf, me, td;
+
+			n = DOM.add(tb, 'tr');
+			n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'});
+			n = DOM.add(n, 'div', {id : ed.id + '_path_row'}, s.theme_advanced_path ? ed.translate('advanced.path') + ': ' : '&nbsp;');
+			DOM.add(n, 'a', {href : '#', accesskey : 'x'});
+
+			if (s.theme_advanced_resizing && !tinymce.isOldWebKit) {
+				DOM.add(td, 'a', {id : ed.id + '_resize', href : 'javascript:;', onclick : "return false;", 'class' : 'mceResize'});
+
+				if (s.theme_advanced_resizing_use_cookie) {
+					ed.onPostRender.add(function() {
+						var o = Cookie.getHash("TinyMCE_" + ed.id + "_size"), c = DOM.get(ed.id + '_tbl');
+
+						if (!o)
+							return;
+
+						if (s.theme_advanced_resize_horizontal)
+							c.style.width = Math.max(10, o.cw) + 'px';
+
+						c.style.height = Math.max(10, o.ch) + 'px';
+						DOM.get(ed.id + '_ifr').style.height = Math.max(10, parseInt(o.ch) + t.deltaHeight) + 'px';
+					});
+				}
+
+				ed.onPostRender.add(function() {
+					Event.add(ed.id + '_resize', 'mousedown', function(e) {
+						var c, p, w, h, n, pa;
+
+						// Measure container
+						c = DOM.get(ed.id + '_tbl');
+						w = c.clientWidth;
+						h = c.clientHeight;
+
+						miw = s.theme_advanced_resizing_min_width || 100;
+						mih = s.theme_advanced_resizing_min_height || 100;
+						maw = s.theme_advanced_resizing_max_width || 0xFFFF;
+						mah = s.theme_advanced_resizing_max_height || 0xFFFF;
+
+						// Setup placeholder
+						p = DOM.add(DOM.get(ed.id + '_parent'), 'div', {'class' : 'mcePlaceHolder'});
+						DOM.setStyles(p, {width : w, height : h});
+
+						// Replace with placeholder
+						DOM.hide(c);
+						DOM.show(p);
+
+						// Create internal resize obj
+						r = {
+							x : e.screenX,
+							y : e.screenY,
+							w : w,
+							h : h,
+							dx : null,
+							dy : null
+						};
+
+						// Start listening
+						mf = Event.add(DOM.doc, 'mousemove', function(e) {
+							var w, h;
+
+							// Calc delta values
+							r.dx = e.screenX - r.x;
+							r.dy = e.screenY - r.y;
+
+							// Boundery fix box
+							w = Math.max(miw, r.w + r.dx);
+							h = Math.max(mih, r.h + r.dy);
+							w = Math.min(maw, w);
+							h = Math.min(mah, h);
+
+							// Resize placeholder
+							if (s.theme_advanced_resize_horizontal)
+								p.style.width = w + 'px';
+
+							p.style.height = h + 'px';
+
+							return Event.cancel(e);
+						});
+
+						me = Event.add(DOM.doc, 'mouseup', function(e) {
+							var ifr;
+
+							// Stop listening
+							Event.remove(DOM.doc, 'mousemove', mf);
+							Event.remove(DOM.doc, 'mouseup', me);
+
+							c.style.display = '';
+							DOM.remove(p);
+
+							if (r.dx === null)
+								return;
+
+							ifr = DOM.get(ed.id + '_ifr');
+
+							if (s.theme_advanced_resize_horizontal)
+								c.style.width = Math.max(10, r.w + r.dx) + 'px';
+
+							c.style.height = Math.max(10, r.h + r.dy) + 'px';
+							ifr.style.height = Math.max(10, ifr.clientHeight + r.dy) + 'px';
+
+							if (s.theme_advanced_resizing_use_cookie) {
+								Cookie.setHash("TinyMCE_" + ed.id + "_size", {
+									cw : r.w + r.dx,
+									ch : r.h + r.dy
+								});
+							}
+						});
+
+						return Event.cancel(e);
+					});
+				});
+			}
+
+			o.deltaHeight -= 21;
+			n = tb = null;
+		},
+
+		_nodeChanged : function(ed, cm, n, co) {
+			var t = this, p, de = 0, v, c, s = t.settings;
+
+			tinymce.each(t.stateControls, function(c) {
+				cm.setActive(c, ed.queryCommandState(t.controls[c][1]));
+			});
+
+			cm.setActive('visualaid', ed.hasVisual);
+			cm.setDisabled('undo', !ed.undoManager.hasUndo() && !ed.typing);
+			cm.setDisabled('redo', !ed.undoManager.hasRedo());
+			cm.setDisabled('outdent', !ed.queryCommandState('Outdent'));
+
+			p = DOM.getParent(n, 'A');
+			if (c = cm.get('link')) {
+				if (!p || !p.name) {
+					c.setDisabled(!p && co);
+					c.setActive(!!p);
+				}
+			}
+
+			if (c = cm.get('unlink')) {
+				c.setDisabled(!p && co);
+				c.setActive(!!p && !p.name);
+			}
+
+			if (c = cm.get('anchor')) {
+				c.setActive(!!p && p.name);
+
+				if (tinymce.isWebKit) {
+					p = DOM.getParent(n, 'IMG');
+					c.setActive(!!p && DOM.getAttrib(p, 'mce_name') == 'a');
+				}
+			}
+
+			p = DOM.getParent(n, 'IMG');
+			if (c = cm.get('image'))
+				c.setActive(!!p && n.className.indexOf('mceItem') == -1);
+
+			if (c = cm.get('styleselect')) {
+				if (n.className) {
+					t._importClasses();
+					c.select(n.className);
+				} else
+					c.select();
+			}
+
+			if (c = cm.get('formatselect')) {
+				p = DOM.getParent(n, DOM.isBlock);
+
+				if (p)
+					c.select(p.nodeName.toLowerCase());
+			}
+
+			if (c = cm.get('fontselect'))
+				c.select(ed.queryCommandValue('FontName'));
+
+			if (c = cm.get('fontsizeselect'))
+				c.select('' + ed.queryCommandValue('FontSize'));
+
+			if (s.theme_advanced_path && s.theme_advanced_statusbar_location) {
+				p = DOM.get(ed.id + '_path') || DOM.add(ed.id + '_path_row', 'span', {id : ed.id + '_path'});
+				DOM.setHTML(p, '');
+
+				ed.dom.getParent(n, function(n) {
+					var na = n.nodeName.toLowerCase(), u, pi, ti = '';
+
+					// Ignore non element and hidden elements
+					if (n.nodeType != 1 || (DOM.hasClass(n, 'mceItemHidden') || DOM.hasClass(n, 'mceItemRemoved')))
+						return;
+
+					// Fake name
+					if (v = DOM.getAttrib(n, 'mce_name'))
+						na = v;
+	
+					// Handle prefix
+					if (tinymce.isIE && n.scopeName !== 'HTML')
+						na = n.scopeName + ':' + na;
+
+					// Remove internal prefix
+					na = na.replace(/mce\:/g, '');
+
+					// Handle node name
+					switch (na) {
+						case 'b':
+							na = 'strong';
+							break;
+
+						case 'i':
+							na = 'em';
+							break;
+
+						case 'img':
+							if (v = DOM.getAttrib(n, 'src'))
+								ti += 'src: ' + v + ' ';
+
+							break;
+
+						case 'a':
+							if (v = DOM.getAttrib(n, 'name')) {
+								ti += 'name: ' + v + ' ';
+								na += '#' + v;
+							}
+
+							if (v = DOM.getAttrib(n, 'href'))
+								ti += 'href: ' + v + ' ';
+
+							break;
+
+						case 'font':
+							if (s.convert_fonts_to_spans)
+								na = 'span';
+
+							if (v = DOM.getAttrib(n, 'face'))
+								ti += 'font: ' + v + ' ';
+
+							if (v = DOM.getAttrib(n, 'size'))
+								ti += 'size: ' + v + ' ';
+
+							if (v = DOM.getAttrib(n, 'color'))
+								ti += 'color: ' + v + ' ';
+
+							break;
+
+						case 'span':
+							if (v = DOM.getAttrib(n, 'style'))
+								ti += 'style: ' + v + ' ';
+
+							break;
+					}
+
+					if (v = DOM.getAttrib(n, 'id'))
+						ti += 'id: ' + v + ' ';
+
+					if (v = n.className) {
+						v = v.replace(/(webkit-[\w\-]+|Apple-[\w\-]+|mceItem\w+|mceVisualAid)/g, '');
+
+						if (v && v.indexOf('mceItem') == -1) {
+							ti += 'class: ' + v + ' ';
+
+							if (DOM.isBlock(n) || na == 'img' || na == 'span')
+								na += '.' + v;
+						}
+					}
+
+					na = na.replace(/(html:)/g, '');
+					na = {name : na, node : n, title : ti};
+					t.onResolveName.dispatch(t, na);
+					ti = na.title;
+					na = na.name;
+
+					//u = "javascript:tinymce.EditorManager.get('" + ed.id + "').theme._sel('" + (de++) + "');";
+					pi = DOM.create('a', {'href' : "javascript:;", onmousedown : "return false;", title : ti, 'class' : 'mcePath_' + (de++)}, na);
+
+					if (p.hasChildNodes()) {
+						p.insertBefore(DOM.doc.createTextNode(' \u00bb '), p.firstChild);
+						p.insertBefore(pi, p.firstChild);
+					} else
+						p.appendChild(pi);
+				}, ed.getBody());
+			}
+		},
+
+		// Commands gets called by execCommand
+
+		_sel : function(v) {
+			this.editor.execCommand('mceSelectNodeDepth', false, v);
+		},
+
+		_mceInsertAnchor : function(ui, v) {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : tinymce.baseURL + '/themes/advanced/anchor.htm',
+				width : 320 + parseInt(ed.getLang('advanced.anchor_delta_width', 0)),
+				height : 90 + parseInt(ed.getLang('advanced.anchor_delta_height', 0)),
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceCharMap : function() {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : tinymce.baseURL + '/themes/advanced/charmap.htm',
+				width : 550 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)),
+				height : 250 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceHelp : function() {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : tinymce.baseURL + '/themes/advanced/about.htm',
+				width : 480,
+				height : 380,
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceColorPicker : function(u, v) {
+			var ed = this.editor;
+
+			v = v || {};
+
+			ed.windowManager.open({
+				url : tinymce.baseURL + '/themes/advanced/color_picker.htm',
+				width : 375 + parseInt(ed.getLang('advanced.colorpicker_delta_width', 0)),
+				height : 250 + parseInt(ed.getLang('advanced.colorpicker_delta_height', 0)),
+				close_previous : false,
+				inline : true
+			}, {
+				input_color : v.color,
+				func : v.func,
+				theme_url : this.url
+			});
+		},
+
+		_mceCodeEditor : function(ui, val) {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : tinymce.baseURL + '/themes/advanced/source_editor.htm',
+				width : parseInt(ed.getParam("theme_advanced_source_editor_width", 720)),
+				height : parseInt(ed.getParam("theme_advanced_source_editor_height", 580)),
+				inline : true,
+				resizable : true,
+				maximizable : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceImage : function(ui, val) {
+			var ed = this.editor;
+
+			// Internal image object like a flash placeholder
+			if (ed.dom.getAttrib(ed.selection.getNode(), 'class').indexOf('mceItem') != -1)
+				return;
+
+			ed.windowManager.open({
+				url : tinymce.baseURL + '/themes/advanced/image.htm',
+				width : 355 + parseInt(ed.getLang('advanced.image_delta_width', 0)),
+				height : 275 + parseInt(ed.getLang('advanced.image_delta_height', 0)),
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceLink : function(ui, val) {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : tinymce.baseURL + '/themes/advanced/link.htm',
+				width : 310 + parseInt(ed.getLang('advanced.link_delta_width', 0)),
+				height : 200 + parseInt(ed.getLang('advanced.link_delta_height', 0)),
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceNewDocument : function() {
+			var ed = this.editor;
+
+			ed.windowManager.confirm('advanced.newdocument', function(s) {
+				if (s)
+					ed.execCommand('mceSetContent', false, '');
+			});
+		},
+
+		_mceForeColor : function() {
+			var t = this;
+
+			this._mceColorPicker(0, {
+				color: t.fgColor,
+				func : function(co) {
+					t.fgColor = co;
+					t.editor.execCommand('ForeColor', false, co);
+				}
+			});
+		},
+
+		_mceBackColor : function() {
+			var t = this;
+
+			this._mceColorPicker(0, {
+				color: t.bgColor,
+				func : function(co) {
+					t.bgColor = co;
+					t.editor.execCommand('HiliteColor', false, co);
+				}
+			});
+		},
+
+		_ufirst : function(s) {
+			return s.substring(0, 1).toUpperCase() + s.substring(1);
+		}
+	});
+
+	tinymce.ThemeManager.add('advanced', tinymce.themes.AdvancedTheme);
+}());
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/image.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/image.htm
new file mode 100644
index 000000000..6c366469c
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/image.htm
@@ -0,0 +1,86 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advanced_dlg.image_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="js/image.js"></script>

+	<base target="_self" />

+</head>

+<body id="image" style="display: none">

+<form onsubmit="ImageDialog.update();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.image_title}</a></span></li>

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+     <table border="0" cellpadding="4" cellspacing="0">

+          <tr>

+            <td nowrap="nowrap"><label for="src">{#advanced_dlg.image_src}</label></td>

+            <td><table border="0" cellspacing="0" cellpadding="0">

+                <tr>

+                  <td><input id="src" name="src" type="text" class="mceFocus" value="" style="width: 200px" onchange="ImageDialog.getImageData();" /></td>

+                  <td id="srcbrowsercontainer">&nbsp;</td>

+                </tr>

+              </table></td>

+          </tr>

+		  <tr>

+			<td><label for="image_list">{#advanced_dlg.image_list}</label></td>

+			<td><select id="image_list" name="image_list" onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;"></select></td>

+		  </tr>

+          <tr>

+            <td nowrap="nowrap"><label for="alt">{#advanced_dlg.image_alt}</label></td>

+            <td><input id="alt" name="alt" type="text" value="" style="width: 200px" /></td>

+          </tr>

+          <tr>

+            <td nowrap="nowrap"><label for="align">{#advanced_dlg.image_align}</label></td>

+            <td><select id="align" name="align" onchange="ImageDialog.updateStyle();">

+                <option value="">{#not_set}</option>

+                <option value="baseline">{#advanced_dlg.image_align_baseline}</option>

+                <option value="top">{#advanced_dlg.image_align_top}</option>

+                <option value="middle">{#advanced_dlg.image_align_middle}</option>

+                <option value="bottom">{#advanced_dlg.image_align_bottom}</option>

+                <option value="text-top">{#advanced_dlg.image_align_texttop}</option>

+                <option value="text-bottom">{#advanced_dlg.image_align_textbottom}</option>

+                <option value="left">{#advanced_dlg.image_align_left}</option>

+                <option value="right">{#advanced_dlg.image_align_right}</option>

+              </select></td>

+          </tr>

+          <tr>

+            <td nowrap="nowrap"><label for="width">{#advanced_dlg.image_dimensions}</label></td>

+            <td><input id="width" name="width" type="text" value="" size="3" maxlength="5" />

+              x

+              <input id="height" name="height" type="text" value="" size="3" maxlength="5" /></td>

+          </tr>

+          <tr>

+            <td nowrap="nowrap"><label for="border">{#advanced_dlg.image_border}</label></td>

+            <td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>

+          </tr>

+          <tr>

+            <td nowrap="nowrap"><label for="vspace">{#advanced_dlg.image_vspace}</label></td>

+            <td><input id="vspace" name="vspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>

+          </tr>

+          <tr>

+            <td nowrap="nowrap"><label for="hspace">{#advanced_dlg.image_hspace}</label></td>

+            <td><input id="hspace" name="hspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>

+          </tr>

+        </table>

+		</div>

+	</div>

+

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="submit" id="insert" name="insert" value="{#insert}" />

+		</div>

+

+		<div style="float: right">

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</div>

+</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg
new file mode 100644
index 000000000..b4c542d10
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif
new file mode 100644
index 000000000..ccac36f54
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js
new file mode 100644
index 000000000..277550fb5
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js
@@ -0,0 +1,72 @@
+tinyMCEPopup.requireLangPack();
+
+function init() {
+	var ed, tcont;
+
+	tinyMCEPopup.resizeToInnerSize();
+	ed = tinyMCEPopup.editor;
+
+	// Give FF some time
+	window.setTimeout('insertHelpIFrame();', 10);
+
+	tcont = document.getElementById('plugintablecontainer');
+	document.getElementById('plugins_tab').style.display = 'none';
+
+	var html = "";
+	html += '<table id="plugintable">';
+	html += '<thead>';
+	html += '<tr>';
+	html += '<td>' + ed.getLang('advanced_dlg.about_plugin') + '</td>';
+	html += '<td>' + ed.getLang('advanced_dlg.about_author') + '</td>';
+	html += '<td>' + ed.getLang('advanced_dlg.about_version') + '</td>';
+	html += '</tr>';
+	html += '</thead>';
+	html += '<tbody>';
+
+	tinymce.each(ed.plugins, function(p, n) {
+		var info;
+
+		if (!p.getInfo)
+			return;
+
+		html += '<tr>';
+
+		info = p.getInfo();
+
+		if (info.infourl != null && info.infourl != '')
+			html += '<td width="50%" title="' + n + '"><a href="' + info.infourl + '" target="_blank">' + info.longname + '</a></td>';
+		else
+			html += '<td width="50%" title="' + n + '">' + info.longname + '</td>';
+
+		if (info.authorurl != null && info.authorurl != '')
+			html += '<td width="35%"><a href="' + info.authorurl + '" target="_blank">' + info.author + '</a></td>';
+		else
+			html += '<td width="35%">' + info.author + '</td>';
+
+		html += '<td width="15%">' + info.version + '</td>';
+		html += '</tr>';
+
+		document.getElementById('plugins_tab').style.display = '';
+
+	});
+
+	html += '</tbody>';
+	html += '</table>';
+
+	tcont.innerHTML = html;
+
+	tinyMCEPopup.dom.get('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
+	tinyMCEPopup.dom.get('date').innerHTML = tinymce.releaseDate;
+}
+
+function insertHelpIFrame() {
+	var html;
+
+	if (tinyMCEPopup.getParam('docs_url')) {
+		html = '<iframe width="100%" height="300" src="' + tinyMCEPopup.editor.baseURI.toAbsolute(tinyMCEPopup.getParam('docs_url')) + '"></iframe>';
+		document.getElementById('iframecontainer').innerHTML = html;
+		document.getElementById('help_tab').style.display = 'block';
+	}
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
new file mode 100644
index 000000000..76f4f7dd2
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
@@ -0,0 +1,37 @@
+tinyMCEPopup.requireLangPack();
+
+var AnchorDialog = {
+	init : function(ed) {
+		var action, elm, f = document.forms[0];
+
+		this.editor = ed;
+		elm = ed.dom.getParent(ed.selection.getNode(), 'A,IMG');
+		v = ed.dom.getAttrib(elm, 'name');
+
+		if (v) {
+			this.action = 'update';
+			f.anchorName.value = v;
+		}
+
+		f.insert.value = ed.getLang(elm ? 'update' : 'insert');
+	},
+
+	update : function() {
+		var ed = this.editor;
+		
+		tinyMCEPopup.restoreSelection();
+
+		if (this.action != 'update')
+			ed.selection.collapse(1);
+
+		// Webkit acts weird if empty inline element is inserted so we need to use a image instead
+		if (tinymce.isWebKit)
+			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('img', {mce_name : 'a', name : document.forms[0].anchorName.value, 'class' : 'mceItemAnchor'}));
+		else
+			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', {name : document.forms[0].anchorName.value, 'class' : 'mceItemAnchor'}, ''));
+
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.onInit.add(AnchorDialog.init, AnchorDialog);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
new file mode 100644
index 000000000..d9fd8d327
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
@@ -0,0 +1,325 @@
+tinyMCEPopup.requireLangPack();
+
+var charmap = [
+	['&nbsp;',    '&#160;',  true, 'no-break space'],
+	['&amp;',     '&#38;',   true, 'ampersand'],
+	['&quot;',    '&#34;',   true, 'quotation mark'],
+// finance
+	['&cent;',    '&#162;',  true, 'cent sign'],
+	['&euro;',    '&#8364;', true, 'euro sign'],
+	['&pound;',   '&#163;',  true, 'pound sign'],
+	['&yen;',     '&#165;',  true, 'yen sign'],
+// signs
+	['&copy;',    '&#169;',  true, 'copyright sign'],
+	['&reg;',     '&#174;',  true, 'registered sign'],
+	['&trade;',   '&#8482;', true, 'trade mark sign'],
+	['&permil;',  '&#8240;', true, 'per mille sign'],
+	['&micro;',   '&#181;',  true, 'micro sign'],
+	['&middot;',  '&#183;',  true, 'middle dot'],
+	['&bull;',    '&#8226;', true, 'bullet'],
+	['&hellip;',  '&#8230;', true, 'three dot leader'],
+	['&prime;',   '&#8242;', true, 'minutes / feet'],
+	['&Prime;',   '&#8243;', true, 'seconds / inches'],
+	['&sect;',    '&#167;',  true, 'section sign'],
+	['&para;',    '&#182;',  true, 'paragraph sign'],
+	['&szlig;',   '&#223;',  true, 'sharp s / ess-zed'],
+// quotations
+	['&lsaquo;',  '&#8249;', true, 'single left-pointing angle quotation mark'],
+	['&rsaquo;',  '&#8250;', true, 'single right-pointing angle quotation mark'],
+	['&laquo;',   '&#171;',  true, 'left pointing guillemet'],
+	['&raquo;',   '&#187;',  true, 'right pointing guillemet'],
+	['&lsquo;',   '&#8216;', true, 'left single quotation mark'],
+	['&rsquo;',   '&#8217;', true, 'right single quotation mark'],
+	['&ldquo;',   '&#8220;', true, 'left double quotation mark'],
+	['&rdquo;',   '&#8221;', true, 'right double quotation mark'],
+	['&sbquo;',   '&#8218;', true, 'single low-9 quotation mark'],
+	['&bdquo;',   '&#8222;', true, 'double low-9 quotation mark'],
+	['&lt;',      '&#60;',   true, 'less-than sign'],
+	['&gt;',      '&#62;',   true, 'greater-than sign'],
+	['&le;',      '&#8804;', true, 'less-than or equal to'],
+	['&ge;',      '&#8805;', true, 'greater-than or equal to'],
+	['&ndash;',   '&#8211;', true, 'en dash'],
+	['&mdash;',   '&#8212;', true, 'em dash'],
+	['&macr;',    '&#175;',  true, 'macron'],
+	['&oline;',   '&#8254;', true, 'overline'],
+	['&curren;',  '&#164;',  true, 'currency sign'],
+	['&brvbar;',  '&#166;',  true, 'broken bar'],
+	['&uml;',     '&#168;',  true, 'diaeresis'],
+	['&iexcl;',   '&#161;',  true, 'inverted exclamation mark'],
+	['&iquest;',  '&#191;',  true, 'turned question mark'],
+	['&circ;',    '&#710;',  true, 'circumflex accent'],
+	['&tilde;',   '&#732;',  true, 'small tilde'],
+	['&deg;',     '&#176;',  true, 'degree sign'],
+	['&minus;',   '&#8722;', true, 'minus sign'],
+	['&plusmn;',  '&#177;',  true, 'plus-minus sign'],
+	['&divide;',  '&#247;',  true, 'division sign'],
+	['&frasl;',   '&#8260;', true, 'fraction slash'],
+	['&times;',   '&#215;',  true, 'multiplication sign'],
+	['&sup1;',    '&#185;',  true, 'superscript one'],
+	['&sup2;',    '&#178;',  true, 'superscript two'],
+	['&sup3;',    '&#179;',  true, 'superscript three'],
+	['&frac14;',  '&#188;',  true, 'fraction one quarter'],
+	['&frac12;',  '&#189;',  true, 'fraction one half'],
+	['&frac34;',  '&#190;',  true, 'fraction three quarters'],
+// math / logical
+	['&fnof;',    '&#402;',  true, 'function / florin'],
+	['&int;',     '&#8747;', true, 'integral'],
+	['&sum;',     '&#8721;', true, 'n-ary sumation'],
+	['&infin;',   '&#8734;', true, 'infinity'],
+	['&radic;',   '&#8730;', true, 'square root'],
+	['&sim;',     '&#8764;', false,'similar to'],
+	['&cong;',    '&#8773;', false,'approximately equal to'],
+	['&asymp;',   '&#8776;', true, 'almost equal to'],
+	['&ne;',      '&#8800;', true, 'not equal to'],
+	['&equiv;',   '&#8801;', true, 'identical to'],
+	['&isin;',    '&#8712;', false,'element of'],
+	['&notin;',   '&#8713;', false,'not an element of'],
+	['&ni;',      '&#8715;', false,'contains as member'],
+	['&prod;',    '&#8719;', true, 'n-ary product'],
+	['&and;',     '&#8743;', false,'logical and'],
+	['&or;',      '&#8744;', false,'logical or'],
+	['&not;',     '&#172;',  true, 'not sign'],
+	['&cap;',     '&#8745;', true, 'intersection'],
+	['&cup;',     '&#8746;', false,'union'],
+	['&part;',    '&#8706;', true, 'partial differential'],
+	['&forall;',  '&#8704;', false,'for all'],
+	['&exist;',   '&#8707;', false,'there exists'],
+	['&empty;',   '&#8709;', false,'diameter'],
+	['&nabla;',   '&#8711;', false,'backward difference'],
+	['&lowast;',  '&#8727;', false,'asterisk operator'],
+	['&prop;',    '&#8733;', false,'proportional to'],
+	['&ang;',     '&#8736;', false,'angle'],
+// undefined
+	['&acute;',   '&#180;',  true, 'acute accent'],
+	['&cedil;',   '&#184;',  true, 'cedilla'],
+	['&ordf;',    '&#170;',  true, 'feminine ordinal indicator'],
+	['&ordm;',    '&#186;',  true, 'masculine ordinal indicator'],
+	['&dagger;',  '&#8224;', true, 'dagger'],
+	['&Dagger;',  '&#8225;', true, 'double dagger'],
+// alphabetical special chars
+	['&Agrave;',  '&#192;',  true, 'A - grave'],
+	['&Aacute;',  '&#193;',  true, 'A - acute'],
+	['&Acirc;',   '&#194;',  true, 'A - circumflex'],
+	['&Atilde;',  '&#195;',  true, 'A - tilde'],
+	['&Auml;',    '&#196;',  true, 'A - diaeresis'],
+	['&Aring;',   '&#197;',  true, 'A - ring above'],
+	['&AElig;',   '&#198;',  true, 'ligature AE'],
+	['&Ccedil;',  '&#199;',  true, 'C - cedilla'],
+	['&Egrave;',  '&#200;',  true, 'E - grave'],
+	['&Eacute;',  '&#201;',  true, 'E - acute'],
+	['&Ecirc;',   '&#202;',  true, 'E - circumflex'],
+	['&Euml;',    '&#203;',  true, 'E - diaeresis'],
+	['&Igrave;',  '&#204;',  true, 'I - grave'],
+	['&Iacute;',  '&#205;',  true, 'I - acute'],
+	['&Icirc;',   '&#206;',  true, 'I - circumflex'],
+	['&Iuml;',    '&#207;',  true, 'I - diaeresis'],
+	['&ETH;',     '&#208;',  true, 'ETH'],
+	['&Ntilde;',  '&#209;',  true, 'N - tilde'],
+	['&Ograve;',  '&#210;',  true, 'O - grave'],
+	['&Oacute;',  '&#211;',  true, 'O - acute'],
+	['&Ocirc;',   '&#212;',  true, 'O - circumflex'],
+	['&Otilde;',  '&#213;',  true, 'O - tilde'],
+	['&Ouml;',    '&#214;',  true, 'O - diaeresis'],
+	['&Oslash;',  '&#216;',  true, 'O - slash'],
+	['&OElig;',   '&#338;',  true, 'ligature OE'],
+	['&Scaron;',  '&#352;',  true, 'S - caron'],
+	['&Ugrave;',  '&#217;',  true, 'U - grave'],
+	['&Uacute;',  '&#218;',  true, 'U - acute'],
+	['&Ucirc;',   '&#219;',  true, 'U - circumflex'],
+	['&Uuml;',    '&#220;',  true, 'U - diaeresis'],
+	['&Yacute;',  '&#221;',  true, 'Y - acute'],
+	['&Yuml;',    '&#376;',  true, 'Y - diaeresis'],
+	['&THORN;',   '&#222;',  true, 'THORN'],
+	['&agrave;',  '&#224;',  true, 'a - grave'],
+	['&aacute;',  '&#225;',  true, 'a - acute'],
+	['&acirc;',   '&#226;',  true, 'a - circumflex'],
+	['&atilde;',  '&#227;',  true, 'a - tilde'],
+	['&auml;',    '&#228;',  true, 'a - diaeresis'],
+	['&aring;',   '&#229;',  true, 'a - ring above'],
+	['&aelig;',   '&#230;',  true, 'ligature ae'],
+	['&ccedil;',  '&#231;',  true, 'c - cedilla'],
+	['&egrave;',  '&#232;',  true, 'e - grave'],
+	['&eacute;',  '&#233;',  true, 'e - acute'],
+	['&ecirc;',   '&#234;',  true, 'e - circumflex'],
+	['&euml;',    '&#235;',  true, 'e - diaeresis'],
+	['&igrave;',  '&#236;',  true, 'i - grave'],
+	['&iacute;',  '&#237;',  true, 'i - acute'],
+	['&icirc;',   '&#238;',  true, 'i - circumflex'],
+	['&iuml;',    '&#239;',  true, 'i - diaeresis'],
+	['&eth;',     '&#240;',  true, 'eth'],
+	['&ntilde;',  '&#241;',  true, 'n - tilde'],
+	['&ograve;',  '&#242;',  true, 'o - grave'],
+	['&oacute;',  '&#243;',  true, 'o - acute'],
+	['&ocirc;',   '&#244;',  true, 'o - circumflex'],
+	['&otilde;',  '&#245;',  true, 'o - tilde'],
+	['&ouml;',    '&#246;',  true, 'o - diaeresis'],
+	['&oslash;',  '&#248;',  true, 'o slash'],
+	['&oelig;',   '&#339;',  true, 'ligature oe'],
+	['&scaron;',  '&#353;',  true, 's - caron'],
+	['&ugrave;',  '&#249;',  true, 'u - grave'],
+	['&uacute;',  '&#250;',  true, 'u - acute'],
+	['&ucirc;',   '&#251;',  true, 'u - circumflex'],
+	['&uuml;',    '&#252;',  true, 'u - diaeresis'],
+	['&yacute;',  '&#253;',  true, 'y - acute'],
+	['&thorn;',   '&#254;',  true, 'thorn'],
+	['&yuml;',    '&#255;',  true, 'y - diaeresis'],
+    ['&Alpha;',   '&#913;',  true, 'Alpha'],
+	['&Beta;',    '&#914;',  true, 'Beta'],
+	['&Gamma;',   '&#915;',  true, 'Gamma'],
+	['&Delta;',   '&#916;',  true, 'Delta'],
+	['&Epsilon;', '&#917;',  true, 'Epsilon'],
+	['&Zeta;',    '&#918;',  true, 'Zeta'],
+	['&Eta;',     '&#919;',  true, 'Eta'],
+	['&Theta;',   '&#920;',  true, 'Theta'],
+	['&Iota;',    '&#921;',  true, 'Iota'],
+	['&Kappa;',   '&#922;',  true, 'Kappa'],
+	['&Lambda;',  '&#923;',  true, 'Lambda'],
+	['&Mu;',      '&#924;',  true, 'Mu'],
+	['&Nu;',      '&#925;',  true, 'Nu'],
+	['&Xi;',      '&#926;',  true, 'Xi'],
+	['&Omicron;', '&#927;',  true, 'Omicron'],
+	['&Pi;',      '&#928;',  true, 'Pi'],
+	['&Rho;',     '&#929;',  true, 'Rho'],
+	['&Sigma;',   '&#931;',  true, 'Sigma'],
+	['&Tau;',     '&#932;',  true, 'Tau'],
+	['&Upsilon;', '&#933;',  true, 'Upsilon'],
+	['&Phi;',     '&#934;',  true, 'Phi'],
+	['&Chi;',     '&#935;',  true, 'Chi'],
+	['&Psi;',     '&#936;',  true, 'Psi'],
+	['&Omega;',   '&#937;',  true, 'Omega'],
+	['&alpha;',   '&#945;',  true, 'alpha'],
+	['&beta;',    '&#946;',  true, 'beta'],
+	['&gamma;',   '&#947;',  true, 'gamma'],
+	['&delta;',   '&#948;',  true, 'delta'],
+	['&epsilon;', '&#949;',  true, 'epsilon'],
+	['&zeta;',    '&#950;',  true, 'zeta'],
+	['&eta;',     '&#951;',  true, 'eta'],
+	['&theta;',   '&#952;',  true, 'theta'],
+	['&iota;',    '&#953;',  true, 'iota'],
+	['&kappa;',   '&#954;',  true, 'kappa'],
+	['&lambda;',  '&#955;',  true, 'lambda'],
+	['&mu;',      '&#956;',  true, 'mu'],
+	['&nu;',      '&#957;',  true, 'nu'],
+	['&xi;',      '&#958;',  true, 'xi'],
+	['&omicron;', '&#959;',  true, 'omicron'],
+	['&pi;',      '&#960;',  true, 'pi'],
+	['&rho;',     '&#961;',  true, 'rho'],
+	['&sigmaf;',  '&#962;',  true, 'final sigma'],
+	['&sigma;',   '&#963;',  true, 'sigma'],
+	['&tau;',     '&#964;',  true, 'tau'],
+	['&upsilon;', '&#965;',  true, 'upsilon'],
+	['&phi;',     '&#966;',  true, 'phi'],
+	['&chi;',     '&#967;',  true, 'chi'],
+	['&psi;',     '&#968;',  true, 'psi'],
+	['&omega;',   '&#969;',  true, 'omega'],
+// symbols
+	['&alefsym;', '&#8501;', false,'alef symbol'],
+	['&piv;',     '&#982;',  false,'pi symbol'],
+	['&real;',    '&#8476;', false,'real part symbol'],
+	['&thetasym;','&#977;',  false,'theta symbol'],
+	['&upsih;',   '&#978;',  false,'upsilon - hook symbol'],
+	['&weierp;',  '&#8472;', false,'Weierstrass p'],
+	['&image;',   '&#8465;', false,'imaginary part'],
+// arrows
+	['&larr;',    '&#8592;', true, 'leftwards arrow'],
+	['&uarr;',    '&#8593;', true, 'upwards arrow'],
+	['&rarr;',    '&#8594;', true, 'rightwards arrow'],
+	['&darr;',    '&#8595;', true, 'downwards arrow'],
+	['&harr;',    '&#8596;', true, 'left right arrow'],
+	['&crarr;',   '&#8629;', false,'carriage return'],
+	['&lArr;',    '&#8656;', false,'leftwards double arrow'],
+	['&uArr;',    '&#8657;', false,'upwards double arrow'],
+	['&rArr;',    '&#8658;', false,'rightwards double arrow'],
+	['&dArr;',    '&#8659;', false,'downwards double arrow'],
+	['&hArr;',    '&#8660;', false,'left right double arrow'],
+	['&there4;',  '&#8756;', false,'therefore'],
+	['&sub;',     '&#8834;', false,'subset of'],
+	['&sup;',     '&#8835;', false,'superset of'],
+	['&nsub;',    '&#8836;', false,'not a subset of'],
+	['&sube;',    '&#8838;', false,'subset of or equal to'],
+	['&supe;',    '&#8839;', false,'superset of or equal to'],
+	['&oplus;',   '&#8853;', false,'circled plus'],
+	['&otimes;',  '&#8855;', false,'circled times'],
+	['&perp;',    '&#8869;', false,'perpendicular'],
+	['&sdot;',    '&#8901;', false,'dot operator'],
+	['&lceil;',   '&#8968;', false,'left ceiling'],
+	['&rceil;',   '&#8969;', false,'right ceiling'],
+	['&lfloor;',  '&#8970;', false,'left floor'],
+	['&rfloor;',  '&#8971;', false,'right floor'],
+	['&lang;',    '&#9001;', false,'left-pointing angle bracket'],
+	['&rang;',    '&#9002;', false,'right-pointing angle bracket'],
+	['&loz;',     '&#9674;', true,'lozenge'],
+	['&spades;',  '&#9824;', false,'black spade suit'],
+	['&clubs;',   '&#9827;', true, 'black club suit'],
+	['&hearts;',  '&#9829;', true, 'black heart suit'],
+	['&diams;',   '&#9830;', true, 'black diamond suit'],
+	['&ensp;',    '&#8194;', false,'en space'],
+	['&emsp;',    '&#8195;', false,'em space'],
+	['&thinsp;',  '&#8201;', false,'thin space'],
+	['&zwnj;',    '&#8204;', false,'zero width non-joiner'],
+	['&zwj;',     '&#8205;', false,'zero width joiner'],
+	['&lrm;',     '&#8206;', false,'left-to-right mark'],
+	['&rlm;',     '&#8207;', false,'right-to-left mark'],
+	['&shy;',     '&#173;',  false,'soft hyphen']
+];
+
+tinyMCEPopup.onInit.add(function() {
+	tinyMCEPopup.dom.setHTML('charmapView', renderCharMapHTML());
+});
+
+function renderCharMapHTML() {
+	var charsPerRow = 20, tdWidth=20, tdHeight=20, i;
+	var html = '<table border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + '"><tr height="' + tdHeight + '">';
+	var cols=-1;
+
+	for (i=0; i<charmap.length; i++) {
+		if (charmap[i][2]==true) {
+			cols++;
+			html += ''
+				+ '<td class="charmap">'
+				+ '<a onmouseover="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" onfocus="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'
+				+ charmap[i][1]
+				+ '</a></td>';
+			if ((cols+1) % charsPerRow == 0)
+				html += '</tr><tr height="' + tdHeight + '">';
+		}
+	 }
+
+	if (cols % charsPerRow > 0) {
+		var padd = charsPerRow - (cols % charsPerRow);
+		for (var i=0; i<padd-1; i++)
+			html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';
+	}
+
+	html += '</tr></table>';
+
+	return html;
+}
+
+function insertChar(chr) {
+	tinyMCEPopup.execCommand('mceInsertContent', false, '&#' + chr + ';');
+
+	// Refocus in window
+	if (tinyMCEPopup.isWindow)
+		window.focus();
+
+	tinyMCEPopup.editor.focus();
+	tinyMCEPopup.close();
+}
+
+function previewChar(codeA, codeB, codeN) {
+	var elmA = document.getElementById('codeA');
+	var elmB = document.getElementById('codeB');
+	var elmV = document.getElementById('codeV');
+	var elmN = document.getElementById('codeN');
+
+	if (codeA=='#160;') {
+		elmV.innerHTML = '__';
+	} else {
+		elmV.innerHTML = '&' + codeA;
+	}
+
+	elmB.innerHTML = '&amp;' + codeA;
+	elmA.innerHTML = '&amp;' + codeB;
+	elmN.innerHTML = codeN;
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
new file mode 100644
index 000000000..c1a65db2c
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
@@ -0,0 +1,253 @@
+tinyMCEPopup.requireLangPack();
+
+var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;
+
+var colors = [
+	"#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",
+	"#330066","#330099","#3300cc","#3300ff","#660000","#660033","#660066","#660099",
+	"#6600cc","#6600ff","#990000","#990033","#990066","#990099","#9900cc","#9900ff",
+	"#cc0000","#cc0033","#cc0066","#cc0099","#cc00cc","#cc00ff","#ff0000","#ff0033",
+	"#ff0066","#ff0099","#ff00cc","#ff00ff","#003300","#003333","#003366","#003399",
+	"#0033cc","#0033ff","#333300","#333333","#333366","#333399","#3333cc","#3333ff",
+	"#663300","#663333","#663366","#663399","#6633cc","#6633ff","#993300","#993333",
+	"#993366","#993399","#9933cc","#9933ff","#cc3300","#cc3333","#cc3366","#cc3399",
+	"#cc33cc","#cc33ff","#ff3300","#ff3333","#ff3366","#ff3399","#ff33cc","#ff33ff",
+	"#006600","#006633","#006666","#006699","#0066cc","#0066ff","#336600","#336633",
+	"#336666","#336699","#3366cc","#3366ff","#666600","#666633","#666666","#666699",
+	"#6666cc","#6666ff","#996600","#996633","#996666","#996699","#9966cc","#9966ff",
+	"#cc6600","#cc6633","#cc6666","#cc6699","#cc66cc","#cc66ff","#ff6600","#ff6633",
+	"#ff6666","#ff6699","#ff66cc","#ff66ff","#009900","#009933","#009966","#009999",
+	"#0099cc","#0099ff","#339900","#339933","#339966","#339999","#3399cc","#3399ff",
+	"#669900","#669933","#669966","#669999","#6699cc","#6699ff","#999900","#999933",
+	"#999966","#999999","#9999cc","#9999ff","#cc9900","#cc9933","#cc9966","#cc9999",
+	"#cc99cc","#cc99ff","#ff9900","#ff9933","#ff9966","#ff9999","#ff99cc","#ff99ff",
+	"#00cc00","#00cc33","#00cc66","#00cc99","#00cccc","#00ccff","#33cc00","#33cc33",
+	"#33cc66","#33cc99","#33cccc","#33ccff","#66cc00","#66cc33","#66cc66","#66cc99",
+	"#66cccc","#66ccff","#99cc00","#99cc33","#99cc66","#99cc99","#99cccc","#99ccff",
+	"#cccc00","#cccc33","#cccc66","#cccc99","#cccccc","#ccccff","#ffcc00","#ffcc33",
+	"#ffcc66","#ffcc99","#ffcccc","#ffccff","#00ff00","#00ff33","#00ff66","#00ff99",
+	"#00ffcc","#00ffff","#33ff00","#33ff33","#33ff66","#33ff99","#33ffcc","#33ffff",
+	"#66ff00","#66ff33","#66ff66","#66ff99","#66ffcc","#66ffff","#99ff00","#99ff33",
+	"#99ff66","#99ff99","#99ffcc","#99ffff","#ccff00","#ccff33","#ccff66","#ccff99",
+	"#ccffcc","#ccffff","#ffff00","#ffff33","#ffff66","#ffff99","#ffffcc","#ffffff"
+];
+
+var named = {
+	'#F0F8FF':'AliceBlue','#FAEBD7':'AntiqueWhite','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige',
+	'#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'BlanchedAlmond','#0000FF':'Blue','#8A2BE2':'BlueViolet','#A52A2A':'Brown',
+	'#DEB887':'BurlyWood','#5F9EA0':'CadetBlue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'CornflowerBlue',
+	'#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'DarkBlue','#008B8B':'DarkCyan','#B8860B':'DarkGoldenRod',
+	'#A9A9A9':'DarkGray','#A9A9A9':'DarkGrey','#006400':'DarkGreen','#BDB76B':'DarkKhaki','#8B008B':'DarkMagenta','#556B2F':'DarkOliveGreen',
+	'#FF8C00':'Darkorange','#9932CC':'DarkOrchid','#8B0000':'DarkRed','#E9967A':'DarkSalmon','#8FBC8F':'DarkSeaGreen','#483D8B':'DarkSlateBlue',
+	'#2F4F4F':'DarkSlateGray','#2F4F4F':'DarkSlateGrey','#00CED1':'DarkTurquoise','#9400D3':'DarkViolet','#FF1493':'DeepPink','#00BFFF':'DeepSkyBlue',
+	'#696969':'DimGray','#696969':'DimGrey','#1E90FF':'DodgerBlue','#B22222':'FireBrick','#FFFAF0':'FloralWhite','#228B22':'ForestGreen',
+	'#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'GhostWhite','#FFD700':'Gold','#DAA520':'GoldenRod','#808080':'Gray','#808080':'Grey',
+	'#008000':'Green','#ADFF2F':'GreenYellow','#F0FFF0':'HoneyDew','#FF69B4':'HotPink','#CD5C5C':'IndianRed','#4B0082':'Indigo','#FFFFF0':'Ivory',
+	'#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'LavenderBlush','#7CFC00':'LawnGreen','#FFFACD':'LemonChiffon','#ADD8E6':'LightBlue',
+	'#F08080':'LightCoral','#E0FFFF':'LightCyan','#FAFAD2':'LightGoldenRodYellow','#D3D3D3':'LightGray','#D3D3D3':'LightGrey','#90EE90':'LightGreen',
+	'#FFB6C1':'LightPink','#FFA07A':'LightSalmon','#20B2AA':'LightSeaGreen','#87CEFA':'LightSkyBlue','#778899':'LightSlateGray','#778899':'LightSlateGrey',
+	'#B0C4DE':'LightSteelBlue','#FFFFE0':'LightYellow','#00FF00':'Lime','#32CD32':'LimeGreen','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon',
+	'#66CDAA':'MediumAquaMarine','#0000CD':'MediumBlue','#BA55D3':'MediumOrchid','#9370D8':'MediumPurple','#3CB371':'MediumSeaGreen','#7B68EE':'MediumSlateBlue',
+	'#00FA9A':'MediumSpringGreen','#48D1CC':'MediumTurquoise','#C71585':'MediumVioletRed','#191970':'MidnightBlue','#F5FFFA':'MintCream','#FFE4E1':'MistyRose','#FFE4B5':'Moccasin',
+	'#FFDEAD':'NavajoWhite','#000080':'Navy','#FDF5E6':'OldLace','#808000':'Olive','#6B8E23':'OliveDrab','#FFA500':'Orange','#FF4500':'OrangeRed','#DA70D6':'Orchid',
+	'#EEE8AA':'PaleGoldenRod','#98FB98':'PaleGreen','#AFEEEE':'PaleTurquoise','#D87093':'PaleVioletRed','#FFEFD5':'PapayaWhip','#FFDAB9':'PeachPuff',
+	'#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'PowderBlue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'RosyBrown','#4169E1':'RoyalBlue',
+	'#8B4513':'SaddleBrown','#FA8072':'Salmon','#F4A460':'SandyBrown','#2E8B57':'SeaGreen','#FFF5EE':'SeaShell','#A0522D':'Sienna','#C0C0C0':'Silver',
+	'#87CEEB':'SkyBlue','#6A5ACD':'SlateBlue','#708090':'SlateGray','#708090':'SlateGrey','#FFFAFA':'Snow','#00FF7F':'SpringGreen',
+	'#4682B4':'SteelBlue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet',
+	'#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'WhiteSmoke','#FFFF00':'Yellow','#9ACD32':'YellowGreen'
+};
+
+function init() {
+	var inputColor = convertRGBToHex(tinyMCEPopup.getWindowArg('input_color'));
+
+	tinyMCEPopup.resizeToInnerSize();
+
+	generatePicker();
+
+	if (inputColor) {
+		changeFinalColor(inputColor);
+
+		col = convertHexToRGB(inputColor);
+
+		if (col)
+			updateLight(col.r, col.g, col.b);
+	}
+}
+
+function insertAction() {
+	var color = document.getElementById("color").value, f = tinyMCEPopup.getWindowArg('func');
+
+	tinyMCEPopup.restoreSelection();
+
+	if (f)
+		f(color);
+
+	tinyMCEPopup.close();
+}
+
+function showColor(color, name) {
+	if (name)
+		document.getElementById("colorname").innerHTML = name;
+
+	document.getElementById("preview").style.backgroundColor = color;
+	document.getElementById("color").value = color.toLowerCase();
+}
+
+function convertRGBToHex(col) {
+	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
+
+	if (!col)
+		return col;
+
+	var rgb = col.replace(re, "$1,$2,$3").split(',');
+	if (rgb.length == 3) {
+		r = parseInt(rgb[0]).toString(16);
+		g = parseInt(rgb[1]).toString(16);
+		b = parseInt(rgb[2]).toString(16);
+
+		r = r.length == 1 ? '0' + r : r;
+		g = g.length == 1 ? '0' + g : g;
+		b = b.length == 1 ? '0' + b : b;
+
+		return "#" + r + g + b;
+	}
+
+	return col;
+}
+
+function convertHexToRGB(col) {
+	if (col.indexOf('#') != -1) {
+		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
+
+		r = parseInt(col.substring(0, 2), 16);
+		g = parseInt(col.substring(2, 4), 16);
+		b = parseInt(col.substring(4, 6), 16);
+
+		return {r : r, g : g, b : b};
+	}
+
+	return null;
+}
+
+function generatePicker() {
+	var el = document.getElementById('light'), h = '', i;
+
+	for (i = 0; i < detail; i++){
+		h += '<div id="gs'+i+'" style="background-color:#000000; width:15px; height:3px; border-style:none; border-width:0px;"'
+		+ ' onclick="changeFinalColor(this.style.backgroundColor)"'
+		+ ' onmousedown="isMouseDown = true; return false;"'
+		+ ' onmouseup="isMouseDown = false;"'
+		+ ' onmousemove="if (isMouseDown && isMouseOver) changeFinalColor(this.style.backgroundColor); return false;"'
+		+ ' onmouseover="isMouseOver = true;"'
+		+ ' onmouseout="isMouseOver = false;"'
+		+ '></div>';
+	}
+
+	el.innerHTML = h;
+}
+
+function generateWebColors() {
+	var el = document.getElementById('webcolors'), h = '', i;
+
+	if (el.className == 'generated')
+		return;
+
+	h += '<table border="0" cellspacing="1" cellpadding="0">'
+		+ '<tr>';
+
+	for (i=0; i<colors.length; i++) {
+		h += '<td bgcolor="' + colors[i] + '" width="10" height="10">'
+			+ '<a href="javascript:insertAction();" onfocus="showColor(\'' + colors[i] +  '\');" onmouseover="showColor(\'' + colors[i] +  '\');" style="display:block;width:10px;height:10px;overflow:hidden;">'
+			+ '</a></td>';
+		if ((i+1) % 18 == 0)
+			h += '</tr><tr>';
+	}
+
+	h += '</table>';
+
+	el.innerHTML = h;
+	el.className = 'generated';
+}
+
+function generateNamedColors() {
+	var el = document.getElementById('namedcolors'), h = '', n, v, i = 0;
+
+	if (el.className == 'generated')
+		return;
+
+	for (n in named) {
+		v = named[n];
+		h += '<a href="javascript:insertAction();" onmouseover="showColor(\'' + n +  '\',\'' + v + '\');" style="background-color: ' + n + '"><!-- IE --></a>'
+	}
+
+	el.innerHTML = h;
+	el.className = 'generated';
+}
+
+function dechex(n) {
+	return strhex.charAt(Math.floor(n / 16)) + strhex.charAt(n % 16);
+}
+
+function computeColor(e) {
+	var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB;
+
+	x = e.offsetX ? e.offsetX : (e.target ? e.clientX - e.target.x : 0);
+	y = e.offsetY ? e.offsetY : (e.target ? e.clientY - e.target.y : 0);
+
+	partWidth = document.getElementById('colors').width / 6;
+	partDetail = detail / 2;
+	imHeight = document.getElementById('colors').height;
+
+	r = (x >= 0)*(x < partWidth)*255 + (x >= partWidth)*(x < 2*partWidth)*(2*255 - x * 255 / partWidth) + (x >= 4*partWidth)*(x < 5*partWidth)*(-4*255 + x * 255 / partWidth) + (x >= 5*partWidth)*(x < 6*partWidth)*255;
+	g = (x >= 0)*(x < partWidth)*(x * 255 / partWidth) + (x >= partWidth)*(x < 3*partWidth)*255	+ (x >= 3*partWidth)*(x < 4*partWidth)*(4*255 - x * 255 / partWidth);
+	b = (x >= 2*partWidth)*(x < 3*partWidth)*(-2*255 + x * 255 / partWidth) + (x >= 3*partWidth)*(x < 5*partWidth)*255 + (x >= 5*partWidth)*(x < 6*partWidth)*(6*255 - x * 255 / partWidth);
+
+	coef = (imHeight - y) / imHeight;
+	r = 128 + (r - 128) * coef;
+	g = 128 + (g - 128) * coef;
+	b = 128 + (b - 128) * coef;
+
+	changeFinalColor('#' + dechex(r) + dechex(g) + dechex(b));
+	updateLight(r, g, b);
+}
+
+function updateLight(r, g, b) {
+	var i, partDetail = detail / 2, finalCoef, finalR, finalG, finalB, color;
+
+	for (i=0; i<detail; i++) {
+		if ((i>=0) && (i<partDetail)) {
+			finalCoef = i / partDetail;
+			finalR = dechex(255 - (255 - r) * finalCoef);
+			finalG = dechex(255 - (255 - g) * finalCoef);
+			finalB = dechex(255 - (255 - b) * finalCoef);
+		} else {
+			finalCoef = 2 - i / partDetail;
+			finalR = dechex(r * finalCoef);
+			finalG = dechex(g * finalCoef);
+			finalB = dechex(b * finalCoef);
+		}
+
+		color = finalR + finalG + finalB;
+
+		setCol('gs' + i, '#'+color);
+	}
+}
+
+function changeFinalColor(color) {
+	if (color.indexOf('#') == -1)
+		color = convertRGBToHex(color);
+
+	setCol('preview', color);
+	document.getElementById('color').value = color;
+}
+
+function setCol(e, c) {
+	try {
+		document.getElementById(e).style.backgroundColor = c;
+	} catch (ex) {
+		// Ignore IE warning
+	}
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
new file mode 100644
index 000000000..7f07a86aa
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
@@ -0,0 +1,245 @@
+var ImageDialog = {
+	preInit : function() {
+		var url;
+
+		tinyMCEPopup.requireLangPack();
+
+		if (url = tinyMCEPopup.getParam("external_image_list_url"))
+			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+	},
+
+	init : function() {
+		var f = document.forms[0], ed = tinyMCEPopup.editor;
+
+		// Setup browse button
+		document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');
+		if (isVisible('srcbrowser'))
+			document.getElementById('src').style.width = '180px';
+
+		e = ed.selection.getNode();
+
+		this.fillFileList('image_list', 'tinyMCEImageList');
+
+		if (e.nodeName == 'IMG') {
+			f.src.value = ed.dom.getAttrib(e, 'src');
+			f.alt.value = ed.dom.getAttrib(e, 'alt');
+			f.border.value = this.getAttrib(e, 'border');
+			f.vspace.value = this.getAttrib(e, 'vspace');
+			f.hspace.value = this.getAttrib(e, 'hspace');
+			f.width.value = ed.dom.getAttrib(e, 'width');
+			f.height.value = ed.dom.getAttrib(e, 'height');
+			f.insert.value = ed.getLang('update');
+			this.styleVal = ed.dom.getAttrib(e, 'style');
+			selectByValue(f, 'image_list', f.src.value);
+			selectByValue(f, 'align', this.getAttrib(e, 'align'));
+			this.updateStyle();
+		}
+	},
+
+	fillFileList : function(id, l) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		l = window[l];
+
+		if (l && l.length > 0) {
+			lst.options[lst.options.length] = new Option('', '');
+
+			tinymce.each(l, function(o) {
+				lst.options[lst.options.length] = new Option(o[0], o[1]);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	update : function() {
+		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, args = {}, el;
+
+		tinyMCEPopup.restoreSelection();
+
+		if (f.src.value === '') {
+			if (ed.selection.getNode().nodeName == 'IMG') {
+				ed.dom.remove(ed.selection.getNode());
+				ed.execCommand('mceRepaint');
+			}
+
+			tinyMCEPopup.close();
+			return;
+		}
+
+		if (!ed.settings.inline_styles) {
+			args = tinymce.extend(args, {
+				vspace : nl.vspace.value,
+				hspace : nl.hspace.value,
+				border : nl.border.value,
+				align : getSelectValue(f, 'align')
+			});
+		} else
+			args.style = this.styleVal;
+
+		tinymce.extend(args, {
+			src : f.src.value,
+			alt : f.alt.value,
+			width : f.width.value,
+			height : f.height.value
+		});
+
+		el = ed.selection.getNode();
+
+		if (el && el.nodeName == 'IMG') {
+			ed.dom.setAttribs(el, args);
+		} else {
+			ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});
+			ed.dom.setAttribs('__mce_tmp', args);
+			ed.dom.setAttrib('__mce_tmp', 'id', '');
+			ed.undoManager.add();
+		}
+
+		tinyMCEPopup.close();
+	},
+
+	updateStyle : function() {
+		var dom = tinyMCEPopup.dom, st, v, f = document.forms[0];
+
+		if (tinyMCEPopup.editor.settings.inline_styles) {
+			st = tinyMCEPopup.dom.parseStyle(this.styleVal);
+
+			// Handle align
+			v = getSelectValue(f, 'align');
+			if (v) {
+				if (v == 'left' || v == 'right') {
+					st['float'] = v;
+					delete st['vertical-align'];
+				} else {
+					st['vertical-align'] = v;
+					delete st['float'];
+				}
+			} else {
+				delete st['float'];
+				delete st['vertical-align'];
+			}
+
+			// Handle border
+			v = f.border.value;
+			if (v || v == '0') {
+				if (v == '0')
+					st['border'] = '0';
+				else
+					st['border'] = v + 'px solid black';
+			} else
+				delete st['border'];
+
+			// Handle hspace
+			v = f.hspace.value;
+			if (v) {
+				delete st['margin'];
+				st['margin-left'] = v + 'px';
+				st['margin-right'] = v + 'px';
+			} else {
+				delete st['margin-left'];
+				delete st['margin-right'];
+			}
+
+			// Handle vspace
+			v = f.vspace.value;
+			if (v) {
+				delete st['margin'];
+				st['margin-top'] = v + 'px';
+				st['margin-bottom'] = v + 'px';
+			} else {
+				delete st['margin-top'];
+				delete st['margin-bottom'];
+			}
+
+			// Merge
+			st = tinyMCEPopup.dom.parseStyle(dom.serializeStyle(st));
+			this.styleVal = dom.serializeStyle(st);
+		}
+	},
+
+	getAttrib : function(e, at) {
+		var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;
+
+		if (ed.settings.inline_styles) {
+			switch (at) {
+				case 'align':
+					if (v = dom.getStyle(e, 'float'))
+						return v;
+
+					if (v = dom.getStyle(e, 'vertical-align'))
+						return v;
+
+					break;
+
+				case 'hspace':
+					v = dom.getStyle(e, 'margin-left')
+					v2 = dom.getStyle(e, 'margin-right');
+					if (v && v == v2)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+
+				case 'vspace':
+					v = dom.getStyle(e, 'margin-top')
+					v2 = dom.getStyle(e, 'margin-bottom');
+					if (v && v == v2)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+
+				case 'border':
+					v = 0;
+
+					tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {
+						sv = dom.getStyle(e, 'border-' + sv + '-width');
+
+						// False or not the same as prev
+						if (!sv || (sv != v && v !== 0)) {
+							v = 0;
+							return false;
+						}
+
+						if (sv)
+							v = sv;
+					});
+
+					if (v)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+			}
+		}
+
+		if (v = dom.getAttrib(e, at))
+			return v;
+
+		return '';
+	},
+
+	resetImageData : function() {
+		var f = document.forms[0];
+
+		f.width.value = f.height.value = "";	
+	},
+
+	updateImageData : function() {
+		var f = document.forms[0], t = ImageDialog;
+
+		if (f.width.value == "")
+			f.width.value = t.preloadImg.width;
+
+		if (f.height.value == "")
+			f.height.value = t.preloadImg.height;
+	},
+
+	getImageData : function() {
+		var f = document.forms[0];
+
+		this.preloadImg = new Image();
+		this.preloadImg.onload = this.updateImageData;
+		this.preloadImg.onerror = this.resetImageData;
+		this.preloadImg.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.src.value);
+	}
+};
+
+ImageDialog.preInit();
+tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
new file mode 100644
index 000000000..c8cb642a9
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
@@ -0,0 +1,155 @@
+tinyMCEPopup.requireLangPack();
+
+var LinkDialog = {
+	preInit : function() {
+		var url;
+
+		if (url = tinyMCEPopup.getParam("external_link_list_url"))
+			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+	},
+
+	init : function() {
+		var f = document.forms[0], ed = tinyMCEPopup.editor;
+
+		// Setup browse button
+		document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser', 'href', 'file', 'theme_advanced_link');
+		if (isVisible('hrefbrowser'))
+			document.getElementById('href').style.width = '180px';
+
+		this.fillClassList('class_list');
+		this.fillFileList('link_list', 'tinyMCELinkList');
+		this.fillTargetList('target_list');
+
+		if (e = ed.dom.getParent(ed.selection.getNode(), 'A')) {
+			f.href.value = ed.dom.getAttrib(e, 'href');
+			f.linktitle.value = ed.dom.getAttrib(e, 'title');
+			f.insert.value = ed.getLang('update');
+			selectByValue(f, 'link_list', f.href.value);
+			selectByValue(f, 'target_list', ed.dom.getAttrib(e, 'target'));
+			selectByValue(f, 'class_list', ed.dom.getAttrib(e, 'class'));
+		}
+	},
+
+	update : function() {
+		var f = document.forms[0], ed = tinyMCEPopup.editor, e, b;
+
+		tinyMCEPopup.restoreSelection();
+		e = ed.dom.getParent(ed.selection.getNode(), 'A');
+
+		// Remove element if there is no href
+		if (!f.href.value) {
+			if (e) {
+				tinyMCEPopup.execCommand("mceBeginUndoLevel");
+				b = ed.selection.getBookmark();
+				ed.dom.remove(e, 1);
+				ed.selection.moveToBookmark(b);
+				tinyMCEPopup.execCommand("mceEndUndoLevel");
+				tinyMCEPopup.close();
+				return;
+			}
+		}
+
+		tinyMCEPopup.execCommand("mceBeginUndoLevel");
+
+		// Create new anchor elements
+		if (e == null) {
+			tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
+
+			tinymce.each(ed.dom.select("a"), function(n) {
+				if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {
+					e = n;
+
+					ed.dom.setAttribs(e, {
+						href : f.href.value,
+						title : f.linktitle.value,
+						target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null,
+						'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null
+					});
+				}
+			});
+		} else {
+			ed.dom.setAttribs(e, {
+				href : f.href.value,
+				title : f.linktitle.value,
+				target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null,
+				'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null
+			});
+		}
+
+		// Don't move caret if selection was image
+		if (e.childNodes.length != 1 || e.firstChild.nodeName != 'IMG') {
+			ed.focus();
+			ed.selection.select(e);
+			ed.selection.collapse(0);
+			tinyMCEPopup.storeSelection();
+		}
+
+		tinyMCEPopup.execCommand("mceEndUndoLevel");
+		tinyMCEPopup.close();
+	},
+
+	checkPrefix : function(n) {
+		if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_email')))
+			n.value = 'mailto:' + n.value;
+
+		if (/^\s*www./i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_external')))
+			n.value = 'http://' + n.value;
+	},
+
+	fillFileList : function(id, l) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		l = window[l];
+
+		if (l && l.length > 0) {
+			lst.options[lst.options.length] = new Option('', '');
+
+			tinymce.each(l, function(o) {
+				lst.options[lst.options.length] = new Option(o[0], o[1]);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	fillClassList : function(id) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		if (v = tinyMCEPopup.getParam('theme_advanced_styles')) {
+			cl = [];
+
+			tinymce.each(v.split(';'), function(v) {
+				var p = v.split('=');
+
+				cl.push({'title' : p[0], 'class' : p[1]});
+			});
+		} else
+			cl = tinyMCEPopup.editor.dom.getClasses();
+
+		if (cl.length > 0) {
+			lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');
+
+			tinymce.each(cl, function(o) {
+				lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	fillTargetList : function(id) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v;
+
+		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');
+		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_same'), '_self');
+		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_blank'), '_blank');
+
+		if (v = tinyMCEPopup.getParam('theme_advanced_link_targets')) {
+			tinymce.each(v.split(','), function(v) {
+				v = v.split('=');
+				lst.options[lst.options.length] = new Option(v[0], v[1]);
+			});
+		}
+	}
+};
+
+LinkDialog.preInit();
+tinyMCEPopup.onInit.add(LinkDialog.init, LinkDialog);
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
new file mode 100644
index 000000000..a6235a381
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
@@ -0,0 +1,62 @@
+tinyMCEPopup.requireLangPack();
+tinyMCEPopup.onInit.add(onLoadInit);
+
+function saveContent() {
+	tinyMCEPopup.editor.setContent(document.getElementById('htmlSource').value);
+	tinyMCEPopup.close();
+}
+
+function onLoadInit() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	// Remove Gecko spellchecking
+	if (tinymce.isGecko)
+		document.body.spellcheck = tinyMCEPopup.editor.getParam("gecko_spellcheck");
+
+	document.getElementById('htmlSource').value = tinyMCEPopup.editor.getContent();
+
+	if (tinyMCEPopup.editor.getParam("theme_advanced_source_editor_wrap", true)) {
+		setWrap('soft');
+		document.getElementById('wraped').checked = true;
+	}
+
+	resizeInputs();
+}
+
+function setWrap(val) {
+	var v, n, s = document.getElementById('htmlSource');
+
+	s.wrap = val;
+
+	if (!tinymce.isIE) {
+		v = s.value;
+		n = s.cloneNode(false);
+		n.setAttribute("wrap", val);
+		s.parentNode.replaceChild(n, s);
+		n.value = v;
+	}
+}
+
+function toggleWordWrap(elm) {
+	if (elm.checked)
+		setWrap('soft');
+	else
+		setWrap('off');
+}
+
+var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
+
+function resizeInputs() {
+	var el = document.getElementById('htmlSource');
+
+	if (!tinymce.isIE) {
+		 wHeight = self.innerHeight - 65;
+		 wWidth = self.innerWidth - 16;
+	} else {
+		 wHeight = document.body.clientHeight - 70;
+		 wWidth = document.body.clientWidth - 16;
+	}
+
+	el.style.height = Math.abs(wHeight) + 'px';
+	el.style.width  = Math.abs(wWidth) + 'px';
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
new file mode 100644
index 000000000..52989e393
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
@@ -0,0 +1,62 @@
+tinyMCE.addI18n('en.advanced',{
+style_select:"Styles",
+font_size:"Font size",
+fontdefault:"Font family",
+block:"Format",
+paragraph:"Paragraph",
+div:"Div",
+address:"Address",
+pre:"Preformatted",
+h1:"Heading 1",
+h2:"Heading 2",
+h3:"Heading 3",
+h4:"Heading 4",
+h5:"Heading 5",
+h6:"Heading 6",
+blockquote:"Blockquote",
+code:"Code",
+samp:"Code sample",
+dt:"Definition term ",
+dd:"Definition description",
+bold_desc:"Bold (Ctrl+B)",
+italic_desc:"Italic (Ctrl+I)",
+underline_desc:"Underline (Ctrl+U)",
+striketrough_desc:"Strikethrough",
+justifyleft_desc:"Align left",
+justifycenter_desc:"Align center",
+justifyright_desc:"Align right",
+justifyfull_desc:"Align full",
+bullist_desc:"Unordered list",
+numlist_desc:"Ordered list",
+outdent_desc:"Outdent",
+indent_desc:"Indent",
+undo_desc:"Undo (Ctrl+Z)",
+redo_desc:"Redo (Ctrl+Y)",
+link_desc:"Insert/edit link",
+unlink_desc:"Unlink",
+image_desc:"Insert/edit image",
+cleanup_desc:"Cleanup messy code",
+code_desc:"Edit HTML Source",
+sub_desc:"Subscript",
+sup_desc:"Superscript",
+hr_desc:"Insert horizontal ruler",
+removeformat_desc:"Remove formatting",
+custom1_desc:"Your custom description here",
+forecolor_desc:"Select text color",
+backcolor_desc:"Select background color",
+charmap_desc:"Insert custom character",
+visualaid_desc:"Toggle guidelines/invisible elements",
+anchor_desc:"Insert/edit anchor",
+cut_desc:"Cut",
+copy_desc:"Copy",
+paste_desc:"Paste",
+image_props_desc:"Image properties",
+newdocument_desc:"New document",
+help_desc:"Help",
+blockquote_desc:"Blockquote",
+clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\r\nDo you want more information about this issue?",
+path:"Path",
+newdocument:"Are you sure you want clear all contents?",
+toolbar_focus:"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",
+more_colors:"More colors"
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
new file mode 100644
index 000000000..80e49419c
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
@@ -0,0 +1,51 @@
+tinyMCE.addI18n('en.advanced_dlg',{
+about_title:"About TinyMCE",
+about_general:"About",
+about_help:"Help",
+about_license:"License",
+about_plugins:"Plugins",
+about_plugin:"Plugin",
+about_author:"Author",
+about_version:"Version",
+about_loaded:"Loaded plugins",
+anchor_title:"Insert/edit anchor",
+anchor_name:"Anchor name",
+code_title:"HTML Source Editor",
+code_wordwrap:"Word wrap",
+colorpicker_title:"Select a color",
+colorpicker_picker_tab:"Picker",
+colorpicker_picker_title:"Color picker",
+colorpicker_palette_tab:"Palette",
+colorpicker_palette_title:"Palette colors",
+colorpicker_named_tab:"Named",
+colorpicker_named_title:"Named colors",
+colorpicker_color:"Color:",
+colorpicker_name:"Name:",
+charmap_title:"Select custom character",
+image_title:"Insert/edit image",
+image_src:"Image URL",
+image_alt:"Image description",
+image_list:"Image list",
+image_border:"Border",
+image_dimensions:"Dimensions",
+image_vspace:"Vertical space",
+image_hspace:"Horizontal space",
+image_align:"Alignment",
+image_align_baseline:"Baseline",
+image_align_top:"Top",
+image_align_middle:"Middle",
+image_align_bottom:"Bottom",
+image_align_texttop:"Text top",
+image_align_textbottom:"Text bottom",
+image_align_left:"Left",
+image_align_right:"Right",
+link_title:"Insert/edit link",
+link_url:"Link URL",
+link_target:"Target",
+link_target_same:"Open link in the same window",
+link_target_blank:"Open link in a new window",
+link_titlefield:"Title",
+link_is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",
+link_is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",
+link_list:"Link list"
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/link.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/link.htm
new file mode 100644
index 000000000..286cc9247
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/link.htm
@@ -0,0 +1,64 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advanced_dlg.link_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/validate.js"></script>

+	<script type="text/javascript" src="js/link.js"></script>

+	<base target="_self" />

+</head>

+<body id="link" style="display: none">

+<form onsubmit="LinkDialog.update();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.link_title}</a></span></li>

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+

+		<table border="0" cellpadding="4" cellspacing="0">

+          <tr>

+            <td nowrap="nowrap"><label for="href">{#advanced_dlg.link_url}</label></td>

+            <td><table border="0" cellspacing="0" cellpadding="0"> 

+				  <tr> 

+					<td><input id="href" name="href" type="text" class="mceFocus" value="" style="width: 200px" onchange="LinkDialog.checkPrefix(this);" /></td> 

+					<td id="hrefbrowsercontainer">&nbsp;</td>

+				  </tr> 

+				</table></td>

+          </tr>

+		  <tr>

+			<td><label for="link_list">{#advanced_dlg.link_list}</label></td>

+			<td><select id="link_list" name="link_list" onchange="document.getElementById('href').value=this.options[this.selectedIndex].value;"></select></td>

+		  </tr>

+		<tr>

+			<td><label id="targetlistlabel" for="targetlist">{#advanced_dlg.link_target}</label></td>

+			<td><select id="target_list" name="target_list"></select></td>

+		</tr>

+          <tr>

+            <td nowrap="nowrap"><label for="linktitle">{#advanced_dlg.link_titlefield}</label></td>

+            <td><input id="linktitle" name="linktitle" type="text" value="" style="width: 200px" /></td>

+          </tr>

+			<tr>

+				<td><label for="class_list">{#class_name}</label></td>

+				<td><select id="class_list" name="class_list"></select></td>

+			</tr>

+        </table>

+		</div>

+	</div>

+

+	<div class="mceActionPanel">

+		<div style="float: left">

+			<input type="submit" id="insert" name="insert" value="{#insert}" />

+		</div>

+

+		<div style="float: right">

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</div>

+</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
new file mode 100644
index 000000000..c4f618435
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
@@ -0,0 +1,103 @@
+body, td {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}
+body {background:#FFF;}
+body.mceForceColors {background:#FFF; color:#000;}
+h1 {font-size: 2em}
+h2 {font-size: 1.5em}
+h3 {font-size: 1.17em}
+h4 {font-size: 1em}
+h5 {font-size: .83em}
+h6 {font-size: .75em}
+.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
+a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(img/items.gif) no-repeat bottom left;}
+img.mceItemAnchor {width:12px; height:12px; background:url(img/items.gif) no-repeat;}
+img {border:0;}
+table {cursor:default}
+table td, table th {cursor:text}
+ins {border-bottom:1px solid green; text-decoration: none; color:green}
+del {color:red; text-decoration:line-through}
+cite {border-bottom:1px dashed blue}
+acronym {border-bottom:1px dotted #CCC; cursor:help}
+
+/* IE */
+* html body {
+scrollbar-3dlight-color:#F0F0EE;
+scrollbar-arrow-color:#676662;
+scrollbar-base-color:#F0F0EE;
+scrollbar-darkshadow-color:#DDD;
+scrollbar-face-color:#E0E0DD;
+scrollbar-highlight-color:#F0F0EE;
+scrollbar-shadow-color:#F0F0EE;
+scrollbar-track-color:#F5F5F5;
+}
+
+
+/* This file contains the CSS data for the editable area(iframe) of TinyMCE */
+
+.aligncenter,
+dl.aligncenter {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.alignleft {
+	float: left;
+}
+
+.alignright {
+	float: right;
+}
+
+body.mceContentBody {
+	background: #fff;
+	color: #000;
+	font: 13px/19px "Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif;
+	padding: 0.6em;
+	margin: 0;
+}
+
+body.mceForceColors {
+	background:#fff;
+	color:#000;
+}
+
+h1 {font-size: 2em}
+h2 {font-size: 1.5em}
+h3 {font-size: 1.17em}
+h4 {font-size: 1em}
+h5 {font-size: .83em}
+h6 {font-size: .75em}
+
+.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {
+	border: 1px dashed #BBB;
+}
+
+img {
+	border:0;
+}
+
+td {
+	font-size: 10px;
+}
+
+pre {
+	font: 12px/18px "Courier New", monospace;
+}
+
+img.mceItemAnchor {
+	width: 12px;
+	height: 12px;
+	background: url(img/items.gif) no-repeat;
+}
+
+a.mceItemAnchor {
+	width: 12px;
+	line-height: 6px;
+	overflow: hidden;
+	padding-left: 12px;
+	background: url(img/items.gif) no-repeat bottom left;
+}
+
+.mceIEcenter {
+	text-align: center;
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css
new file mode 100644
index 000000000..497dda30c
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css
@@ -0,0 +1,114 @@
+/* Generic */
+body {
+font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;
+scrollbar-3dlight-color:#F0F0EE;
+scrollbar-arrow-color:#676662;
+scrollbar-base-color:#F0F0EE;
+scrollbar-darkshadow-color:#DDDDDD;
+scrollbar-face-color:#E0E0DD;
+scrollbar-highlight-color:#F0F0EE;
+scrollbar-shadow-color:#F0F0EE;
+scrollbar-track-color:#F5F5F5;
+background:#F0F0EE;
+padding:0;
+margin:8px 8px 0 8px;
+}
+
+html {background:#F0F0EE;}
+td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+textarea {resize:none;outline:none;}
+a:link, a:visited {color:black;}
+a:hover {color:#2B6FB6;}
+
+/* Forms */
+fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;}
+legend {color:#2B6FB6; font-weight:bold;}
+label.msg {display:none;}
+label.invalid {color:#EE0000; display:inline;}
+input.invalid {border:1px solid #EE0000;}
+input {background:#FFF; border:1px solid #CCC;}
+input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+input, select, textarea {border:1px solid #808080;}
+input.radio {border:1px none #000000; background:transparent; vertical-align:middle;}
+input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;}
+.input_noborder {border:0;}
+
+/* Buttons */
+#insert, #cancel, input.button, .updateButton {
+border:0; margin:0; padding:0;
+font-weight:bold;
+width:94px; height:26px;
+background:url(img/buttons.png) 0 -26px;
+cursor:pointer;
+padding-bottom:2px;
+}
+
+#insert {background:url(img/buttons.png) 0 -52px;}
+#cancel {background:url(img/buttons.png) 0 0;}
+
+/* Browse */
+a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;}
+.mceOldBoxModel a.browse span {width:22px; height:20px;}
+a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;}
+a.browse span.disabled {border:1px solid white; -moz-opacity:0.3; opacity:0.3; filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);}
+a.browse:hover span.disabled {border:1px solid white; background-color:transparent;}
+a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;}
+.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}
+a.pickcolor:hover span {background-color:#B2BBD0;}
+a.pickcolor:hover span.disabled {}
+
+/* Charmap */
+table.charmap {border:1px solid #AAA; text-align:center}
+td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;}
+#charmap a {display:block; color:#000; text-decoration:none; border:0}
+#charmap a:hover {background:#CCC;color:#2B6FB6}
+#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center}
+#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center}
+
+/* Source */
+.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}
+.mceActionPanel {margin-top:5px;}
+
+/* Tabs classes */
+.tabs {width:100%; height:18px; line-height:normal; background:url(img/tabs.gif) repeat-x 0 -72px;}
+.tabs ul {margin:0; padding:0; list-style:none;}
+.tabs li {float:left; background:url(img/tabs.gif) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;}
+.tabs li.current {background:url(img/tabs.gif) no-repeat 0 -18px; margin-right:2px;}
+.tabs span {float:left; display:block; background:url(img/tabs.gif) no-repeat right -36px; padding:0px 10px 0 0;}
+.tabs .current span {background:url(img/tabs.gif) no-repeat right -54px;}
+.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;}
+.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;}
+
+/* Panels */
+.panel_wrapper div.panel {display:none;}
+.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;}
+.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;}
+
+/* Columns */
+.column {float:left;}
+.properties {width:100%;}
+.properties .column1 {}
+.properties .column2 {text-align:left;}
+
+/* Titles */
+h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}
+h3 {font-size:14px;}
+.title {font-size:12px; font-weight:bold; color:#2B6FB6;}
+
+/* Dialog specific */
+#link .panel_wrapper, #link div.current {height:125px;}
+#image .panel_wrapper, #image div.current {height:200px;}
+#plugintable thead {font-weight:bold; background:#DDD;}
+#plugintable, #about #plugintable td {border:1px solid #919B9C;}
+#plugintable {width:96%; margin-top:10px;}
+#pluginscontainer {height:290px; overflow:auto;}
+#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}
+#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
+#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
+#colorpicker #light div {overflow:hidden;}
+#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}
+#colorpicker .panel_wrapper div.current {height:175px;}
+#colorpicker #namedcolors {width:150px;}
+#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
+#colorpicker #colornamecontainer {margin-top:5px;}
+#colorpicker #picker_panel fieldset {margin:auto;width:325px;}
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png
new file mode 100644
index 000000000..7dd58418b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif
new file mode 100644
index 000000000..2eafd7954
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif
new file mode 100644
index 000000000..85e31dfb2
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif
new file mode 100644
index 000000000..adfdddccd
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/progress.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/progress.gif
new file mode 100644
index 000000000..5bb90fd6a
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/progress.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif
new file mode 100644
index 000000000..ce4be6355
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
new file mode 100644
index 000000000..ba8d30a5b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
@@ -0,0 +1,215 @@
+/* Reset */
+.defaultSkin table, .defaultSkin tbody, .defaultSkin a, .defaultSkin img, .defaultSkin tr, .defaultSkin div, .defaultSkin td, .defaultSkin iframe, .defaultSkin span, .defaultSkin *, .defaultSkin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}
+.defaultSkin a:hover, .defaultSkin a:link, .defaultSkin a:visited, .defaultSkin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}
+.defaultSkin table td {vertical-align:middle}
+
+/* Containers */
+.defaultSkin table {background:#F0F0EE}
+.defaultSkin iframe {display:block; background:#FFF}
+.defaultSkin .mceToolbar {height:26px}
+.defaultSkin .mceLeft {text-align:left}
+.defaultSkin .mceRight {text-align:right}
+
+/* External */
+.defaultSkin .mceExternalToolbar {position:absolute; border:1px solid #CCC; border-bottom:0; display:none;}
+.defaultSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
+.defaultSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}
+
+/* Layout */
+.defaultSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC}
+.defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC}
+.defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC}
+.defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;}
+.defaultSkin td.mceToolbar {padding-top:1px; vertical-align:top}
+.defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC}
+.defaultSkin .mceStatusbar {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}
+.defaultSkin .mceStatusbar div {float:left; margin:2px}
+.defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize}
+.defaultSkin .mceStatusbar a:hover {text-decoration:underline}
+.defaultSkin table.mceToolbar {margin-left:3px}
+.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {display:block; width:20px; height:20px}
+.defaultSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
+.defaultSkin td.mceCenter {text-align:center;}
+.defaultSkin td.mceCenter table {margin:0 auto; text-align:left;}
+.defaultSkin td.mceRight table {margin:0 0 0 auto;}
+
+/* Button */
+.defaultSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px; margin-right:1px}
+.defaultSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0}
+.defaultSkin a.mceButtonActive, .defaultSkin a.mceButtonSelected {border:1px solid #0A246A; background-color:#C2CBE0}
+.defaultSkin .mceButtonDisabled .mceIcon {opacity:0.3; filter:alpha(opacity=30)}
+.defaultSkin .mceButtonLabeled {width:auto}
+.defaultSkin .mceButtonLabeled span.mceIcon {float:left}
+.defaultSkin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica}
+.defaultSkin .mceButtonDisabled .mceButtonLabel {color:#888}
+
+/* Separator */
+.defaultSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:2px 2px 0 4px}
+
+/* ListBox */
+.defaultSkin .mceListBox {direction:ltr}
+.defaultSkin .mceListBox, .defaultSkin .mceListBox a {display:block}
+.defaultSkin .mceListBox .mceText {padding-left:4px; width:70px; text-align:left; border:1px solid #CCC; border-right:0; background:#FFF; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
+.defaultSkin .mceListBox .mceOpen {width:9px; height:20px; background:url(../../img/icons.gif) -741px 0; margin-right:2px; border:1px solid #CCC;}
+.defaultSkin table.mceListBoxEnabled:hover .mceText, .defaultSkin .mceListBoxHover .mceText, .defaultSkin .mceListBoxSelected .mceText {border:1px solid #A2ABC0; border-right:0; background:#FFF}
+.defaultSkin table.mceListBoxEnabled:hover .mceOpen, .defaultSkin .mceListBoxHover .mceOpen, .defaultSkin .mceListBoxSelected .mceOpen {background-color:#FFF; border:1px solid #A2ABC0}
+.defaultSkin .mceListBoxDisabled a.mceText {color:gray; background-color:transparent;}
+.defaultSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
+.defaultSkin .mceOldBoxModel .mceListBox .mceText {height:22px}
+.defaultSkin .mceOldBoxModel .mceListBox .mceOpen {width:11px; height:22px;}
+.defaultSkin select.mceNativeListBox {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:7pt; background:#F0F0EE; border:1px solid gray; margin-right:2px;}
+
+/* SplitButton */
+.defaultSkin .mceSplitButton {width:32px; height:20px; direction:ltr}
+.defaultSkin .mceSplitButton a, .defaultSkin .mceSplitButton span {height:20px; display:block}
+.defaultSkin .mceSplitButton a.mceAction {width:20px; border:1px solid #F0F0EE; border-right:0;}
+.defaultSkin .mceSplitButton span.mceAction {width:20px; background:url(../../img/icons.gif) 20px 20px;}
+.defaultSkin .mceSplitButton a.mceOpen {width:9px; border:1px solid #F0F0EE;}
+.defaultSkin .mceSplitButton span.mceOpen {width:9px; background:url(../../img/icons.gif) -741px 0;}
+.defaultSkin table.mceSplitButtonEnabled:hover a.mceAction, .defaultSkin .mceSplitButtonHover a.mceAction, .defaultSkin .mceSplitButtonSelected a.mceAction {border:1px solid #0A246A; border-right:0; background-color:#B2BBD0}
+.defaultSkin table.mceSplitButtonEnabled:hover a.mceOpen, .defaultSkin .mceSplitButtonHover a.mceOpen, .defaultSkin .mceSplitButtonSelected a.mceOpen {border:1px solid #0A246A;}
+.defaultSkin table.mceSplitButtonEnabled:hover span.mceOpen, .defaultSkin .mceSplitButtonHover span.mceOpen, .defaultSkin .mceSplitButtonSelected span.mceOpen {background-color:#B2BBD0}
+.defaultSkin .mceSplitButtonDisabled .mceAction, .defaultSkin .mceSplitButtonDisabled span.mceOpen {opacity:0.3; filter:alpha(opacity=30)}
+.defaultSkin .mceSplitButtonActive a.mceAction {border:1px solid #0A246A; background-color:#C2CBE0}
+.defaultSkin .mceSplitButtonActive a.mceOpen {border-left:0;}
+
+/* ColorSplitButton */
+.defaultSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray}
+.defaultSkin .mceColorSplitMenu td {padding:2px}
+.defaultSkin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080}
+.defaultSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
+.defaultSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}
+.defaultSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2}
+.defaultSkin a.mceMoreColors:hover {border:1px solid #0A246A}
+.defaultSkin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a}
+.defaultSkin .mce_forecolor span.mceAction, .defaultSkin .mce_backcolor span.mceAction {overflow:hidden; height:16px}
+
+/* Menu */
+.defaultSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #D4D0C8}
+.defaultSkin .mceNoIcons span.mceIcon {width:0;}
+.defaultSkin .mceNoIcons a .mceText {padding-left:10px}
+.defaultSkin .mceMenu table {background:#FFF}
+.defaultSkin .mceMenu a, .defaultSkin .mceMenu span, .defaultSkin .mceMenu {display:block}
+.defaultSkin .mceMenu td {height:20px}
+.defaultSkin .mceMenu a {position:relative;padding:3px 0 4px 0}
+.defaultSkin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block}
+.defaultSkin .mceMenu span.mceText, .defaultSkin .mceMenu .mcePreview {font-size:11px}
+.defaultSkin .mceMenu pre.mceText {font-family:Monospace}
+.defaultSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
+.defaultSkin .mceMenu .mceMenuItemEnabled a:hover, .defaultSkin .mceMenu .mceMenuItemActive {background-color:#dbecf3}
+.defaultSkin td.mceMenuItemSeparator {background:#DDD; height:1px}
+.defaultSkin .mceMenuItemTitle a {border:0; background:#EEE; border-bottom:1px solid #DDD}
+.defaultSkin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px}
+.defaultSkin .mceMenuItemDisabled .mceText {color:#888}
+.defaultSkin .mceMenuItemSelected .mceIcon {background:url(img/menu_check.gif)}
+.defaultSkin .mceNoIcons .mceMenuItemSelected a {background:url(img/menu_arrow.gif) no-repeat -6px center}
+.defaultSkin .mceMenu span.mceMenuLine {display:none}
+.defaultSkin .mceMenuItemSub a {background:url(img/menu_arrow.gif) no-repeat top right;}
+
+/* Progress,Resize */
+.defaultSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; filter:alpha(opacity=50); background:#FFF}
+.defaultSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
+.defaultSkin .mcePlaceHolder {border:1px dotted gray}
+
+/* Formats */
+.defaultSkin .mce_formatPreview a {font-size:10px}
+.defaultSkin .mce_p span.mceText {}
+.defaultSkin .mce_address span.mceText {font-style:italic}
+.defaultSkin .mce_pre span.mceText {font-family:monospace}
+.defaultSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
+.defaultSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
+.defaultSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
+.defaultSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
+.defaultSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
+.defaultSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
+
+/* Theme */
+.defaultSkin span.mce_bold {background-position:0 0}
+.defaultSkin span.mce_italic {background-position:-60px 0}
+.defaultSkin span.mce_underline {background-position:-140px 0}
+.defaultSkin span.mce_strikethrough {background-position:-120px 0}
+.defaultSkin span.mce_undo {background-position:-160px 0}
+.defaultSkin span.mce_redo {background-position:-100px 0}
+.defaultSkin span.mce_cleanup {background-position:-40px 0}
+.defaultSkin span.mce_bullist {background-position:-20px 0}
+.defaultSkin span.mce_numlist {background-position:-80px 0}
+.defaultSkin span.mce_justifyleft {background-position:-460px 0}
+.defaultSkin span.mce_justifyright {background-position:-480px 0}
+.defaultSkin span.mce_justifycenter {background-position:-420px 0}
+.defaultSkin span.mce_justifyfull {background-position:-440px 0}
+.defaultSkin span.mce_anchor {background-position:-200px 0}
+.defaultSkin span.mce_indent {background-position:-400px 0}
+.defaultSkin span.mce_outdent {background-position:-540px 0}
+.defaultSkin span.mce_link {background-position:-500px 0}
+.defaultSkin span.mce_unlink {background-position:-640px 0}
+.defaultSkin span.mce_sub {background-position:-600px 0}
+.defaultSkin span.mce_sup {background-position:-620px 0}
+.defaultSkin span.mce_removeformat {background-position:-580px 0}
+.defaultSkin span.mce_newdocument {background-position:-520px 0}
+.defaultSkin span.mce_image {background-position:-380px 0}
+.defaultSkin span.mce_help {background-position:-340px 0}
+.defaultSkin span.mce_code {background-position:-260px 0}
+.defaultSkin span.mce_hr {background-position:-360px 0}
+.defaultSkin span.mce_visualaid {background-position:-660px 0}
+.defaultSkin span.mce_charmap {background-position:-240px 0}
+.defaultSkin span.mce_paste {background-position:-560px 0}
+.defaultSkin span.mce_copy {background-position:-700px 0}
+.defaultSkin span.mce_cut {background-position:-680px 0}
+.defaultSkin span.mce_blockquote {background-position:-220px 0}
+.defaultSkin .mce_forecolor span.mceAction {background-position:-720px 0}
+.defaultSkin .mce_backcolor span.mceAction {background-position:-760px 0}
+.defaultSkin span.mce_forecolorpicker {background-position:-720px 0}
+.defaultSkin span.mce_backcolorpicker {background-position:-760px 0}
+
+/* Plugins */
+.defaultSkin span.mce_advhr {background-position:-0px -20px}
+.defaultSkin span.mce_ltr {background-position:-20px -20px}
+.defaultSkin span.mce_rtl {background-position:-40px -20px}
+.defaultSkin span.mce_emotions {background-position:-60px -20px}
+.defaultSkin span.mce_fullpage {background-position:-80px -20px}
+.defaultSkin span.mce_fullscreen {background-position:-100px -20px}
+.defaultSkin span.mce_iespell {background-position:-120px -20px}
+.defaultSkin span.mce_insertdate {background-position:-140px -20px}
+.defaultSkin span.mce_inserttime {background-position:-160px -20px}
+.defaultSkin span.mce_absolute {background-position:-180px -20px}
+.defaultSkin span.mce_backward {background-position:-200px -20px}
+.defaultSkin span.mce_forward {background-position:-220px -20px}
+.defaultSkin span.mce_insert_layer {background-position:-240px -20px}
+.defaultSkin span.mce_insertlayer {background-position:-260px -20px}
+.defaultSkin span.mce_movebackward {background-position:-280px -20px}
+.defaultSkin span.mce_moveforward {background-position:-300px -20px}
+.defaultSkin span.mce_media {background-position:-320px -20px}
+.defaultSkin span.mce_nonbreaking {background-position:-340px -20px}
+.defaultSkin span.mce_pastetext {background-position:-360px -20px}
+.defaultSkin span.mce_pasteword {background-position:-380px -20px}
+.defaultSkin span.mce_selectall {background-position:-400px -20px}
+.defaultSkin span.mce_preview {background-position:-420px -20px}
+.defaultSkin span.mce_print {background-position:-440px -20px}
+.defaultSkin span.mce_cancel {background-position:-460px -20px}
+.defaultSkin span.mce_save {background-position:-480px -20px}
+.defaultSkin span.mce_replace {background-position:-500px -20px}
+.defaultSkin span.mce_search {background-position:-520px -20px}
+.defaultSkin span.mce_styleprops {background-position:-560px -20px}
+.defaultSkin span.mce_table {background-position:-580px -20px}
+.defaultSkin span.mce_cell_props {background-position:-600px -20px}
+.defaultSkin span.mce_delete_table {background-position:-620px -20px}
+.defaultSkin span.mce_delete_col {background-position:-640px -20px}
+.defaultSkin span.mce_delete_row {background-position:-660px -20px}
+.defaultSkin span.mce_col_after {background-position:-680px -20px}
+.defaultSkin span.mce_col_before {background-position:-700px -20px}
+.defaultSkin span.mce_row_after {background-position:-720px -20px}
+.defaultSkin span.mce_row_before {background-position:-740px -20px}
+.defaultSkin span.mce_merge_cells {background-position:-760px -20px}
+.defaultSkin span.mce_table_props {background-position:-980px -20px}
+.defaultSkin span.mce_row_props {background-position:-780px -20px}
+.defaultSkin span.mce_split_cells {background-position:-800px -20px}
+.defaultSkin span.mce_template {background-position:-820px -20px}
+.defaultSkin span.mce_visualchars {background-position:-840px -20px}
+.defaultSkin span.mce_abbr {background-position:-860px -20px}
+.defaultSkin span.mce_acronym {background-position:-880px -20px}
+.defaultSkin span.mce_attribs {background-position:-900px -20px}
+.defaultSkin span.mce_cite {background-position:-920px -20px}
+.defaultSkin span.mce_del {background-position:-940px -20px}
+.defaultSkin span.mce_ins {background-position:-960px -20px}
+.defaultSkin span.mce_pagebreak {background-position:0 -40px}
+.defaultSkin .mce_spellchecker span.mceAction {background-position:-540px -20px}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
new file mode 100644
index 000000000..a40493175
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
@@ -0,0 +1,32 @@
+body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}
+body {background:#FFF;}
+body.mceForceColors {background:#FFF; color:#000;}
+h1 {font-size: 2em}
+h2 {font-size: 1.5em}
+h3 {font-size: 1.17em}
+h4 {font-size: 1em}
+h5 {font-size: .83em}
+h6 {font-size: .75em}
+.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
+a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(../default/img/items.gif) no-repeat bottom left;}
+img.mceItemAnchor {width:12px; height:12px; background:url(../default/img/items.gif) no-repeat;}
+img {border:0;}
+table {cursor:default}
+table td, table th {cursor:text}
+ins {border-bottom:1px solid green; text-decoration: none; color:green}
+del {color:red; text-decoration:line-through}
+cite {border-bottom:1px dashed blue}
+acronym {border-bottom:1px dotted #CCC; cursor:help}
+abbr, html\:abbr {border-bottom:1px dashed #CCC; cursor:help}
+
+/* IE */
+* html body {
+scrollbar-3dlight-color:#F0F0EE;
+scrollbar-arrow-color:#676662;
+scrollbar-base-color:#F0F0EE;
+scrollbar-darkshadow-color:#DDD;
+scrollbar-face-color:#E0E0DD;
+scrollbar-highlight-color:#F0F0EE;
+scrollbar-shadow-color:#F0F0EE;
+scrollbar-track-color:#F5F5F5;
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
new file mode 100644
index 000000000..e630fa7c4
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
@@ -0,0 +1,113 @@
+/* Generic */
+body {
+font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;
+scrollbar-3dlight-color:#F0F0EE;
+scrollbar-arrow-color:#676662;
+scrollbar-base-color:#F0F0EE;
+scrollbar-darkshadow-color:#DDDDDD;
+scrollbar-face-color:#E0E0DD;
+scrollbar-highlight-color:#F0F0EE;
+scrollbar-shadow-color:#F0F0EE;
+scrollbar-track-color:#F5F5F5;
+background:#F0F0EE;
+padding:0;
+margin:8px 8px 0 8px;
+}
+
+html {background:#F0F0EE;}
+td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+textarea {resize:none;outline:none;}
+a:link, a:visited {color:black;}
+a:hover {color:#2B6FB6;}
+
+/* Forms */
+fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;}
+legend {color:#2B6FB6; font-weight:bold;}
+label.msg {display:none;}
+label.invalid {color:#EE0000; display:inline;}
+input.invalid {border:1px solid #EE0000;}
+input {background:#FFF; border:1px solid #CCC;}
+input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+input, select, textarea {border:1px solid #808080;}
+input.radio {border:1px none #000000; background:transparent; vertical-align:middle;}
+input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;}
+.input_noborder {border:0;}
+
+/* Buttons */
+#insert, #cancel, input.button, .updateButton {
+border:0; margin:0; padding:0;
+font-weight:bold;
+width:94px; height:26px;
+background:url(../default/img/buttons.png) 0 -26px;
+cursor:pointer;
+padding-bottom:2px;
+}
+
+#insert {background:url(../default/img/buttons.png) 0 -52px;}
+#cancel {background:url(../default/img/buttons.png) 0 0;}
+
+/* Browse */
+a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;}
+.mceOldBoxModel a.browse span {width:22px; height:20px;}
+a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;}
+a.browse span.disabled {border:1px solid white; -moz-opacity:0.3; opacity:0.3; filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);}
+a.browse:hover span.disabled {border:1px solid white; background-color:transparent;}
+a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;}
+.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}
+a.pickcolor:hover span {background-color:#B2BBD0;}
+a.pickcolor:hover span.disabled {}
+
+/* Charmap */
+table.charmap {border:1px solid #AAA; text-align:center}
+td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;}
+#charmap a {display:block; color:#000; text-decoration:none; border:0}
+#charmap a:hover {background:#CCC;color:#2B6FB6}
+#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center}
+#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center}
+
+/* Source */
+.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}
+.mceActionPanel {margin-top:5px;}
+
+/* Tabs classes */
+.tabs {width:100%; height:18px; line-height:normal; background:url(../default/img/tabs.gif) repeat-x 0 -72px;}
+.tabs ul {margin:0; padding:0; list-style:none;}
+.tabs li {float:left; background:url(../default/img/tabs.gif) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;}
+.tabs li.current {background:url(../default/img/tabs.gif) no-repeat 0 -18px; margin-right:2px;}
+.tabs span {float:left; display:block; background:url(../default/img/tabs.gif) no-repeat right -36px; padding:0px 10px 0 0;}
+.tabs .current span {background:url(../default/img/tabs.gif) no-repeat right -54px;}
+.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;}
+.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;}
+
+/* Panels */
+.panel_wrapper div.panel {display:none;}
+.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;}
+.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;}
+
+/* Columns */
+.column {float:left;}
+.properties {width:100%;}
+.properties .column1 {}
+.properties .column2 {text-align:left;}
+
+/* Titles */
+h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}
+h3 {font-size:14px;}
+.title {font-size:12px; font-weight:bold; color:#2B6FB6;}
+
+/* Dialog specific */
+#link .panel_wrapper, #link div.current {height:125px;}
+#image .panel_wrapper, #image div.current {height:200px;}
+#plugintable thead {font-weight:bold; background:#DDD;}
+#plugintable, #about #plugintable td {border:1px solid #919B9C;}
+#plugintable {width:96%; margin-top:10px;}
+#pluginscontainer {height:290px; overflow:auto;}
+#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}
+#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
+#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
+#colorpicker #light div {overflow:hidden;}
+#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}
+#colorpicker .panel_wrapper div.current {height:175px;}
+#colorpicker #namedcolors {width:150px;}
+#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
+#colorpicker #colornamecontainer {margin-top:5px;}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
new file mode 100644
index 000000000..12cfb419b
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
new file mode 100644
index 000000000..8996c7493
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
new file mode 100644
index 000000000..bd5d2550c
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
new file mode 100644
index 000000000..8363da1d4
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
@@ -0,0 +1,215 @@
+/* Reset */
+.o2k7Skin table, .o2k7Skin tbody, .o2k7Skin a, .o2k7Skin img, .o2k7Skin tr, .o2k7Skin div, .o2k7Skin td, .o2k7Skin iframe, .o2k7Skin span, .o2k7Skin *, .o2k7Skin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}
+.o2k7Skin a:hover, .o2k7Skin a:link, .o2k7Skin a:visited, .o2k7Skin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}
+.o2k7Skin table td {vertical-align:middle}
+
+/* Containers */
+.o2k7Skin table {background:#E5EFFD}
+.o2k7Skin iframe {display:block; background:#FFF}
+.o2k7Skin .mceToolbar {height:26px}
+
+/* External */
+.o2k7Skin .mceExternalToolbar {position:absolute; border:1px solid #ABC6DD; border-bottom:0; display:none}
+.o2k7Skin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
+.o2k7Skin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}
+
+/* Layout */
+.o2k7Skin table.mceLayout {border:0; border-left:1px solid #ABC6DD; border-right:1px solid #ABC6DD}
+.o2k7Skin table.mceLayout tr.mceFirst td {border-top:1px solid #ABC6DD}
+.o2k7Skin table.mceLayout tr.mceLast td {border-bottom:1px solid #ABC6DD}
+.o2k7Skin table.mceToolbar, .o2k7Skin tr.mceFirst .mceToolbar tr td, .o2k7Skin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0}
+.o2k7Skin .mceIframeContainer {border-top:1px solid #ABC6DD; border-bottom:1px solid #ABC6DD}
+.o2k7Skin .mceStatusbar {display:block; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; height:20px}
+.o2k7Skin .mceStatusbar div {float:left; padding:2px}
+.o2k7Skin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize}
+.o2k7Skin .mceStatusbar a:hover {text-decoration:underline}
+.o2k7Skin table.mceToolbar {margin-left:3px}
+.o2k7Skin .mceToolbar .mceToolbarStart span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px; margin-left:3px;}
+.o2k7Skin .mceToolbar td.mceFirst span {margin:0}
+.o2k7Skin .mceToolbar .mceToolbarEnd span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px}
+.o2k7Skin .mceToolbar .mceToolbarEndListBox span, .o2k7Skin .mceToolbar .mceToolbarStartListBox span {display:none}
+.o2k7Skin span.mceIcon, .o2k7Skin img.mceIcon {display:block; width:20px; height:20px}
+.o2k7Skin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
+.o2k7Skin td.mceCenter {text-align:center;}
+.o2k7Skin td.mceCenter table {margin:0 auto; text-align:left;}
+.o2k7Skin td.mceRight table {margin:0 0 0 auto;}
+
+/* Button */
+.o2k7Skin .mceButton {display:block; background:url(img/button_bg.png); width:22px; height:22px}
+.o2k7Skin a.mceButton span, .o2k7Skin a.mceButton img {margin-left:1px}
+.o2k7Skin .mceOldBoxModel a.mceButton span, .o2k7Skin .mceOldBoxModel a.mceButton img {margin:0 0 0 1px}
+.o2k7Skin a.mceButtonEnabled:hover {background-color:#B2BBD0; background-position:0 -22px}
+.o2k7Skin a.mceButtonActive, .o2k7Skin a.mceButtonSelected {background-position:0 -44px}
+.o2k7Skin .mceButtonDisabled .mceIcon {opacity:0.3; filter:alpha(opacity=30)}
+.o2k7Skin .mceButtonLabeled {width:auto}
+.o2k7Skin .mceButtonLabeled span.mceIcon {float:left}
+.o2k7Skin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica}
+.o2k7Skin .mceButtonDisabled .mceButtonLabel {color:#888}
+
+/* Separator */
+.o2k7Skin .mceSeparator {display:block; background:url(img/button_bg.png) -22px 0; width:5px; height:22px}
+
+/* ListBox */
+.o2k7Skin .mceListBox {margin-left:3px}
+.o2k7Skin .mceListBox, .o2k7Skin .mceListBox a {display:block}
+.o2k7Skin .mceListBox .mceText {padding-left:4px; text-align:left; width:70px; border:1px solid #b3c7e1; border-right:0; background:#eaf2fb; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
+.o2k7Skin .mceListBox .mceOpen {width:14px; height:22px; background:url(img/button_bg.png) -66px 0}
+.o2k7Skin table.mceListBoxEnabled:hover .mceText, .o2k7Skin .mceListBoxHover .mceText, .o2k7Skin .mceListBoxSelected .mceText {background:#FFF}
+.o2k7Skin table.mceListBoxEnabled:hover .mceOpen, .o2k7Skin .mceListBoxHover .mceOpen, .o2k7Skin .mceListBoxSelected .mceOpen {background-position:-66px -22px}
+.o2k7Skin .mceListBoxDisabled .mceText {color:gray}
+.o2k7Skin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
+.o2k7Skin .mceOldBoxModel .mceListBox .mceText {height:22px}
+.o2k7Skin select.mceListBox {font-family:Tahoma,Verdana,Arial,Helvetica; font-size:12px; border:1px solid #b3c7e1; background:#FFF;}
+
+/* SplitButton */
+.o2k7Skin .mceSplitButton, .o2k7Skin .mceSplitButton a, .o2k7Skin .mceSplitButton span {display:block; height:22px}
+.o2k7Skin .mceSplitButton {background:url(img/button_bg.png)}
+.o2k7Skin .mceSplitButton a.mceAction {width:22px}
+.o2k7Skin .mceSplitButton span.mceAction {width:22px; background:url(../../img/icons.gif) 20px 20px}
+.o2k7Skin .mceSplitButton a.mceOpen {width:10px}
+.o2k7Skin .mceSplitButton span.mceOpen {width:10px; background:url(img/button_bg.png) -44px 0}
+.o2k7Skin table.mceSplitButtonEnabled:hover a.mceAction, .o2k7Skin .mceSplitButtonHover a.mceAction, .o2k7Skin .mceSplitButtonSelected {background:url(img/button_bg.png) 0 -22px}
+.o2k7Skin table.mceSplitButtonEnabled:hover span.mceOpen, .o2k7Skin .mceSplitButtonHover span.mceOpen, .o2k7Skin .mceSplitButtonSelected span.mceOpen {background-position:-44px -44px}
+.o2k7Skin .mceSplitButtonDisabled .mceAction {opacity:0.3; filter:alpha(opacity=30)}
+.o2k7Skin .mceSplitButtonActive {background-position:0 -44px}
+
+/* ColorSplitButton */
+.o2k7Skin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray}
+.o2k7Skin .mceColorSplitMenu td {padding:2px}
+.o2k7Skin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080}
+.o2k7Skin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
+.o2k7Skin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}
+.o2k7Skin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2}
+.o2k7Skin a.mceMoreColors:hover {border:1px solid #0A246A}
+.o2k7Skin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a;overflow:hidden}
+.o2k7Skin .mce_forecolor span.mceAction, .o2k7Skin .mce_backcolor span.mceAction {height:15px;overflow:hidden}
+
+/* Menu */
+.o2k7Skin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #ABC6DD}
+.o2k7Skin .mceNoIcons span.mceIcon {width:0;}
+.o2k7Skin .mceNoIcons a .mceText {padding-left:10px}
+.o2k7Skin .mceMenu table {background:#FFF}
+.o2k7Skin .mceMenu a, .o2k7Skin .mceMenu span, .o2k7Skin .mceMenu {display:block}
+.o2k7Skin .mceMenu td {height:20px}
+.o2k7Skin .mceMenu a {position:relative;padding:3px 0 4px 0}
+.o2k7Skin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block}
+.o2k7Skin .mceMenu span.mceText, .o2k7Skin .mceMenu .mcePreview {font-size:11px}
+.o2k7Skin .mceMenu pre.mceText {font-family:Monospace}
+.o2k7Skin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
+.o2k7Skin .mceMenu .mceMenuItemEnabled a:hover, .o2k7Skin .mceMenu .mceMenuItemActive {background-color:#dbecf3}
+.o2k7Skin td.mceMenuItemSeparator {background:#DDD; height:1px}
+.o2k7Skin .mceMenuItemTitle a {border:0; background:#E5EFFD; border-bottom:1px solid #ABC6DD}
+.o2k7Skin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px}
+.o2k7Skin .mceMenuItemDisabled .mceText {color:#888}
+.o2k7Skin .mceMenuItemSelected .mceIcon {background:url(../default/img/menu_check.gif)}
+.o2k7Skin .mceNoIcons .mceMenuItemSelected a {background:url(../default/img/menu_arrow.gif) no-repeat -6px center}
+.o2k7Skin .mceMenu span.mceMenuLine {display:none}
+.o2k7Skin .mceMenuItemSub a {background:url(../default/img/menu_arrow.gif) no-repeat top right;}
+
+/* Progress,Resize */
+.o2k7Skin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; filter:alpha(opacity=50); background:#FFF}
+.o2k7Skin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
+.o2k7Skin .mcePlaceHolder {border:1px dotted gray}
+
+/* Formats */
+.o2k7Skin .mce_formatPreview a {font-size:10px}
+.o2k7Skin .mce_p span.mceText {}
+.o2k7Skin .mce_address span.mceText {font-style:italic}
+.o2k7Skin .mce_pre span.mceText {font-family:monospace}
+.o2k7Skin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
+.o2k7Skin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
+.o2k7Skin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
+.o2k7Skin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
+.o2k7Skin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
+.o2k7Skin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
+
+/* Theme */
+.o2k7Skin span.mce_bold {background-position:0 0}
+.o2k7Skin span.mce_italic {background-position:-60px 0}
+.o2k7Skin span.mce_underline {background-position:-140px 0}
+.o2k7Skin span.mce_strikethrough {background-position:-120px 0}
+.o2k7Skin span.mce_undo {background-position:-160px 0}
+.o2k7Skin span.mce_redo {background-position:-100px 0}
+.o2k7Skin span.mce_cleanup {background-position:-40px 0}
+.o2k7Skin span.mce_bullist {background-position:-20px 0}
+.o2k7Skin span.mce_numlist {background-position:-80px 0}
+.o2k7Skin span.mce_justifyleft {background-position:-460px 0}
+.o2k7Skin span.mce_justifyright {background-position:-480px 0}
+.o2k7Skin span.mce_justifycenter {background-position:-420px 0}
+.o2k7Skin span.mce_justifyfull {background-position:-440px 0}
+.o2k7Skin span.mce_anchor {background-position:-200px 0}
+.o2k7Skin span.mce_indent {background-position:-400px 0}
+.o2k7Skin span.mce_outdent {background-position:-540px 0}
+.o2k7Skin span.mce_link {background-position:-500px 0}
+.o2k7Skin span.mce_unlink {background-position:-640px 0}
+.o2k7Skin span.mce_sub {background-position:-600px 0}
+.o2k7Skin span.mce_sup {background-position:-620px 0}
+.o2k7Skin span.mce_removeformat {background-position:-580px 0}
+.o2k7Skin span.mce_newdocument {background-position:-520px 0}
+.o2k7Skin span.mce_image {background-position:-380px 0}
+.o2k7Skin span.mce_help {background-position:-340px 0}
+.o2k7Skin span.mce_code {background-position:-260px 0}
+.o2k7Skin span.mce_hr {background-position:-360px 0}
+.o2k7Skin span.mce_visualaid {background-position:-660px 0}
+.o2k7Skin span.mce_charmap {background-position:-240px 0}
+.o2k7Skin span.mce_paste {background-position:-560px 0}
+.o2k7Skin span.mce_copy {background-position:-700px 0}
+.o2k7Skin span.mce_cut {background-position:-680px 0}
+.o2k7Skin span.mce_blockquote {background-position:-220px 0}
+.o2k7Skin .mce_forecolor span.mceAction {background-position:-720px 0}
+.o2k7Skin .mce_backcolor span.mceAction {background-position:-760px 0}
+.o2k7Skin span.mce_forecolorpicker {background-position:-720px 0}
+.o2k7Skin span.mce_backcolorpicker {background-position:-760px 0}
+
+/* Plugins */
+.o2k7Skin span.mce_advhr {background-position:-0px -20px}
+.o2k7Skin span.mce_ltr {background-position:-20px -20px}
+.o2k7Skin span.mce_rtl {background-position:-40px -20px}
+.o2k7Skin span.mce_emotions {background-position:-60px -20px}
+.o2k7Skin span.mce_fullpage {background-position:-80px -20px}
+.o2k7Skin span.mce_fullscreen {background-position:-100px -20px}
+.o2k7Skin span.mce_iespell {background-position:-120px -20px}
+.o2k7Skin span.mce_insertdate {background-position:-140px -20px}
+.o2k7Skin span.mce_inserttime {background-position:-160px -20px}
+.o2k7Skin span.mce_absolute {background-position:-180px -20px}
+.o2k7Skin span.mce_backward {background-position:-200px -20px}
+.o2k7Skin span.mce_forward {background-position:-220px -20px}
+.o2k7Skin span.mce_insert_layer {background-position:-240px -20px}
+.o2k7Skin span.mce_insertlayer {background-position:-260px -20px}
+.o2k7Skin span.mce_movebackward {background-position:-280px -20px}
+.o2k7Skin span.mce_moveforward {background-position:-300px -20px}
+.o2k7Skin span.mce_media {background-position:-320px -20px}
+.o2k7Skin span.mce_nonbreaking {background-position:-340px -20px}
+.o2k7Skin span.mce_pastetext {background-position:-360px -20px}
+.o2k7Skin span.mce_pasteword {background-position:-380px -20px}
+.o2k7Skin span.mce_selectall {background-position:-400px -20px}
+.o2k7Skin span.mce_preview {background-position:-420px -20px}
+.o2k7Skin span.mce_print {background-position:-440px -20px}
+.o2k7Skin span.mce_cancel {background-position:-460px -20px}
+.o2k7Skin span.mce_save {background-position:-480px -20px}
+.o2k7Skin span.mce_replace {background-position:-500px -20px}
+.o2k7Skin span.mce_search {background-position:-520px -20px}
+.o2k7Skin span.mce_styleprops {background-position:-560px -20px}
+.o2k7Skin span.mce_table {background-position:-580px -20px}
+.o2k7Skin span.mce_cell_props {background-position:-600px -20px}
+.o2k7Skin span.mce_delete_table {background-position:-620px -20px}
+.o2k7Skin span.mce_delete_col {background-position:-640px -20px}
+.o2k7Skin span.mce_delete_row {background-position:-660px -20px}
+.o2k7Skin span.mce_col_after {background-position:-680px -20px}
+.o2k7Skin span.mce_col_before {background-position:-700px -20px}
+.o2k7Skin span.mce_row_after {background-position:-720px -20px}
+.o2k7Skin span.mce_row_before {background-position:-740px -20px}
+.o2k7Skin span.mce_merge_cells {background-position:-760px -20px}
+.o2k7Skin span.mce_table_props {background-position:-980px -20px}
+.o2k7Skin span.mce_row_props {background-position:-780px -20px}
+.o2k7Skin span.mce_split_cells {background-position:-800px -20px}
+.o2k7Skin span.mce_template {background-position:-820px -20px}
+.o2k7Skin span.mce_visualchars {background-position:-840px -20px}
+.o2k7Skin span.mce_abbr {background-position:-860px -20px}
+.o2k7Skin span.mce_acronym {background-position:-880px -20px}
+.o2k7Skin span.mce_attribs {background-position:-900px -20px}
+.o2k7Skin span.mce_cite {background-position:-920px -20px}
+.o2k7Skin span.mce_del {background-position:-940px -20px}
+.o2k7Skin span.mce_ins {background-position:-960px -20px}
+.o2k7Skin span.mce_pagebreak {background-position:0 -40px}
+.o2k7Skin .mce_spellchecker span.mceAction {background-position:-540px -20px}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
new file mode 100644
index 000000000..caa7dbbb2
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
@@ -0,0 +1,8 @@
+/* Black */
+.o2k7SkinBlack .mceToolbar .mceToolbarStart span, .o2k7SkinBlack .mceToolbar .mceToolbarEnd span, .o2k7SkinBlack .mceButton, .o2k7SkinBlack .mceSplitButton, .o2k7SkinBlack .mceSeparator, .o2k7SkinBlack .mceSplitButton span.mceOpen, .o2k7SkinBlack .mceListBox .mceOpen {background-image:url(img/button_bg_black.png)}
+.o2k7SkinBlack table, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack .mceMenuItemTitle span.mceText, .o2k7SkinBlack .mceStatusbar div, .o2k7SkinBlack .mceStatusbar span, .o2k7SkinBlack .mceStatusbar a {background:#535353; color:#FFF}
+.o2k7SkinBlack table.mceListBoxEnabled .mceText, o2k7SkinBlack .mceListBox .mceText {background:#FFF; border:1px solid #CBCFD4; border-bottom-color:#989FA9; border-right:0}
+.o2k7SkinBlack table.mceListBoxEnabled:hover .mceText, .o2k7Skin .mceListBoxHover .mceText, .o2k7Skin .mceListBoxSelected .mceText {background:#FFF; border:1px solid #FFBD69; border-right:0}
+.o2k7SkinBlack .mceExternalToolbar, .o2k7SkinBlack .mceListBox .mceText, .o2k7SkinBlack div.mceMenu, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceFirst td, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceLast td, .o2k7SkinBlack .mceIframeContainer {border-color: #535353;}
+.o2k7SkinBlack table.mceSplitButtonEnabled:hover a.mceAction, .o2k7Skin .mceSplitButtonHover a.mceAction, .o2k7Skin .mceSplitButtonSelected {background-image:url(img/button_bg_black.png)}
+.o2k7SkinBlack .mceMenu .mceMenuItemEnabled a:hover, .o2k7Skin .mceMenu .mceMenuItemActive {background-color:#FFE7A1}
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
new file mode 100644
index 000000000..bf3c47971
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
@@ -0,0 +1,5 @@
+/* Silver */
+.o2k7SkinSilver .mceToolbar .mceToolbarStart span, .o2k7SkinSilver .mceButton, .o2k7SkinSilver .mceSplitButton, .o2k7SkinSilver .mceSeparator, .o2k7SkinSilver .mceSplitButton span.mceOpen, .o2k7SkinSilver .mceListBox .mceOpen {background-image:url(img/button_bg_silver.png)}
+.o2k7SkinSilver table, .o2k7SkinSilver .mceMenuItemTitle a {background:#eee}
+.o2k7SkinSilver .mceListBox .mceText {background:#FFF}
+.o2k7SkinSilver .mceExternalToolbar, .o2k7SkinSilver .mceListBox .mceText, .o2k7SkinSilver div.mceMenu, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceFirst td, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceLast td, .o2k7SkinSilver .mceIframeContainer {border-color: #bbb}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
new file mode 100644
index 000000000..119a913c9
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
@@ -0,0 +1,32 @@
+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

+	<title>{#advanced_dlg.code_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/source_editor.js"></script>

+	<base target="_self" />

+</head>

+<body onresize="resizeInputs();" style="display:none; overflow:hidden;">

+	<form name="source" onsubmit="saveContent();return false;" action="#">

+		<div style="float: left" class="title">{#advanced_dlg.code_title}</div>

+

+		<div id="wrapline" style="float: right">

+			<input type="checkbox" name="wraped" id="wraped" onclick="toggleWordWrap(this);" class="wordWrapCode" /><label for="wraped">{#advanced_dlg.code_wordwrap}</label>

+		</div>

+

+		<br style="clear: both" />

+

+		<textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,monospace; font-size: 12px;" dir="ltr" wrap="off" class="mceFocus"></textarea>

+

+		<div class="mceActionPanel">

+			<div style="float: left">

+				<input type="submit" name="insert" value="{#update}" id="insert" />

+			</div>

+

+			<div style="float: right">

+				<input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />

+			</div>

+		</div>

+	</form>

+</body>

+</html>

diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js
new file mode 100644
index 000000000..3a25c04d6
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js
@@ -0,0 +1 @@
+(function(){var DOM=tinymce.DOM;tinymce.ThemeManager.requireLangPack('simple');tinymce.create('tinymce.themes.SimpleTheme',{init:function(ed,url){var t=this,states=['Bold','Italic','Underline','Strikethrough','InsertUnorderedList','InsertOrderedList'],s=ed.settings;t.editor=ed;ed.onInit.add(function(){ed.onNodeChange.add(function(ed,cm){tinymce.each(states,function(c){cm.get(c.toLowerCase()).setActive(ed.queryCommandState(c));});});ed.dom.loadCSS(url+"/skins/"+s.skin+"/content.css");});DOM.loadCSS((s.editor_css?ed.baseURI.toAbsolute(s.editor_css):'')||url+"/skins/"+s.skin+"/ui.css");},renderUI:function(o){var t=this,n=o.targetNode,ic,tb,ed=t.editor,cf=ed.controlManager,sc;n=DOM.insertAfter(DOM.create('span',{id:ed.id+'_container','class':'mceEditor '+ed.settings.skin+'SimpleSkin'}),n);n=sc=DOM.add(n,'table',{cellPadding:0,cellSpacing:0,'class':'mceLayout'});n=tb=DOM.add(n,'tbody');n=DOM.add(tb,'tr');n=ic=DOM.add(DOM.add(n,'td'),'div',{'class':'mceIframeContainer'});n=DOM.add(DOM.add(tb,'tr',{'class':'last'}),'td',{'class':'mceToolbar mceLast',align:'center'});tb=t.toolbar=cf.createToolbar("tools1");tb.add(cf.createButton('bold',{title:'simple.bold_desc',cmd:'Bold'}));tb.add(cf.createButton('italic',{title:'simple.italic_desc',cmd:'Italic'}));tb.add(cf.createButton('underline',{title:'simple.underline_desc',cmd:'Underline'}));tb.add(cf.createButton('strikethrough',{title:'simple.striketrough_desc',cmd:'Strikethrough'}));tb.add(cf.createSeparator());tb.add(cf.createButton('undo',{title:'simple.undo_desc',cmd:'Undo'}));tb.add(cf.createButton('redo',{title:'simple.redo_desc',cmd:'Redo'}));tb.add(cf.createSeparator());tb.add(cf.createButton('cleanup',{title:'simple.cleanup_desc',cmd:'mceCleanup'}));tb.add(cf.createSeparator());tb.add(cf.createButton('insertunorderedlist',{title:'simple.bullist_desc',cmd:'InsertUnorderedList'}));tb.add(cf.createButton('insertorderedlist',{title:'simple.numlist_desc',cmd:'InsertOrderedList'}));tb.renderTo(n);return{iframeContainer:ic,editorContainer:ed.id+'_container',sizeContainer:sc,deltaHeight:-20};},getInfo:function(){return{longname:'Simple theme',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.ThemeManager.add('simple',tinymce.themes.SimpleTheme);})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
new file mode 100644
index 000000000..4873a0cd5
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
@@ -0,0 +1,85 @@
+/**
+ * $Id: editor_template_src.js 752 2008-03-27 21:51:25Z spocke $
+ *
+ * This file is meant to showcase how to create a simple theme. The advanced
+ * theme is more suitable for production use.
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var DOM = tinymce.DOM;
+
+	// Tell it to load theme specific language pack(s)
+	tinymce.ThemeManager.requireLangPack('simple');
+
+	tinymce.create('tinymce.themes.SimpleTheme', {
+		init : function(ed, url) {
+			var t = this, states = ['Bold', 'Italic', 'Underline', 'Strikethrough', 'InsertUnorderedList', 'InsertOrderedList'], s = ed.settings;
+
+			t.editor = ed;
+
+			ed.onInit.add(function() {
+				ed.onNodeChange.add(function(ed, cm) {
+					tinymce.each(states, function(c) {
+						cm.get(c.toLowerCase()).setActive(ed.queryCommandState(c));
+					});
+				});
+
+				ed.dom.loadCSS(url + "/skins/" + s.skin + "/content.css");
+			});
+
+			DOM.loadCSS((s.editor_css ? ed.baseURI.toAbsolute(s.editor_css) : '') || url + "/skins/" + s.skin + "/ui.css");
+		},
+
+		renderUI : function(o) {
+			var t = this, n = o.targetNode, ic, tb, ed = t.editor, cf = ed.controlManager, sc;
+
+			n = DOM.insertAfter(DOM.create('span', {id : ed.id + '_container', 'class' : 'mceEditor ' + ed.settings.skin + 'SimpleSkin'}), n);
+			n = sc = DOM.add(n, 'table', {cellPadding : 0, cellSpacing : 0, 'class' : 'mceLayout'});
+			n = tb = DOM.add(n, 'tbody');
+
+			// Create iframe container
+			n = DOM.add(tb, 'tr');
+			n = ic = DOM.add(DOM.add(n, 'td'), 'div', {'class' : 'mceIframeContainer'});
+
+			// Create toolbar container
+			n = DOM.add(DOM.add(tb, 'tr', {'class' : 'last'}), 'td', {'class' : 'mceToolbar mceLast', align : 'center'});
+
+			// Create toolbar
+			tb = t.toolbar = cf.createToolbar("tools1");
+			tb.add(cf.createButton('bold', {title : 'simple.bold_desc', cmd : 'Bold'}));
+			tb.add(cf.createButton('italic', {title : 'simple.italic_desc', cmd : 'Italic'}));
+			tb.add(cf.createButton('underline', {title : 'simple.underline_desc', cmd : 'Underline'}));
+			tb.add(cf.createButton('strikethrough', {title : 'simple.striketrough_desc', cmd : 'Strikethrough'}));
+			tb.add(cf.createSeparator());
+			tb.add(cf.createButton('undo', {title : 'simple.undo_desc', cmd : 'Undo'}));
+			tb.add(cf.createButton('redo', {title : 'simple.redo_desc', cmd : 'Redo'}));
+			tb.add(cf.createSeparator());
+			tb.add(cf.createButton('cleanup', {title : 'simple.cleanup_desc', cmd : 'mceCleanup'}));
+			tb.add(cf.createSeparator());
+			tb.add(cf.createButton('insertunorderedlist', {title : 'simple.bullist_desc', cmd : 'InsertUnorderedList'}));
+			tb.add(cf.createButton('insertorderedlist', {title : 'simple.numlist_desc', cmd : 'InsertOrderedList'}));
+			tb.renderTo(n);
+
+			return {
+				iframeContainer : ic,
+				editorContainer : ed.id + '_container',
+				sizeContainer : sc,
+				deltaHeight : -20
+			};
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Simple theme',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			}
+		}
+	});
+
+	tinymce.ThemeManager.add('simple', tinymce.themes.SimpleTheme);
+})();
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif
new file mode 100644
index 000000000..16af141ff
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js
new file mode 100644
index 000000000..6f095311d
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js
@@ -0,0 +1,11 @@
+tinyMCE.addI18n('en.simple',{
+bold_desc:"Bold (Ctrl+B)",
+italic_desc:"Italic (Ctrl+I)",
+underline_desc:"Underline (Ctrl+U)",
+striketrough_desc:"Strikethrough",
+bullist_desc:"Unordered list",
+numlist_desc:"Ordered list",
+undo_desc:"Undo (Ctrl+Z)",
+redo_desc:"Redo (Ctrl+Y)",
+cleanup_desc:"Cleanup messy code"
+});
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css
new file mode 100644
index 000000000..f02d08933
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css
@@ -0,0 +1,25 @@
+body, td, pre {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 13px;
+}
+
+body {
+	background-color: #FFFFFF;
+}
+
+.mceVisualAid {
+	border: 1px dashed #BBBBBB;
+}
+
+/* MSIE specific */
+
+* html body {
+	scrollbar-3dlight-color: #F0F0EE;
+	scrollbar-arrow-color: #676662;
+	scrollbar-base-color: #F0F0EE;
+	scrollbar-darkshadow-color: #DDDDDD;
+	scrollbar-face-color: #E0E0DD;
+	scrollbar-highlight-color: #F0F0EE;
+	scrollbar-shadow-color: #F0F0EE;
+	scrollbar-track-color: #F5F5F5;	
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css
new file mode 100644
index 000000000..d92ba408a
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css
@@ -0,0 +1,32 @@
+/* Reset */
+.defaultSimpleSkin table, .defaultSimpleSkin tbody, .defaultSimpleSkin a, .defaultSimpleSkin img, .defaultSimpleSkin tr, .defaultSimpleSkin div, .defaultSimpleSkin td, .defaultSimpleSkin iframe, .defaultSimpleSkin span, .defaultSimpleSkin * {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000}
+
+/* Containers */
+.defaultSimpleSkin {position:relative}
+.defaultSimpleSkin table.mceLayout {background:#F0F0EE; border:1px solid #CCC;}
+.defaultSimpleSkin iframe {display:block; background:#FFF; border-bottom:1px solid #CCC;}
+.defaultSimpleSkin .mceToolbar {height:24px;}
+
+/* Layout */
+.defaultSimpleSkin span.mceIcon, .defaultSimpleSkin img.mceIcon {display:block; width:20px; height:20px}
+.defaultSimpleSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
+
+/* Button */
+.defaultSimpleSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px}
+.defaultSimpleSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0}
+.defaultSimpleSkin a.mceButtonActive {border:1px solid #0A246A; background-color:#C2CBE0}
+.defaultSimpleSkin .mceButtonDisabled span {opacity:0.3; filter:alpha(opacity=30)}
+
+/* Separator */
+.defaultSimpleSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:0 2px 0 4px}
+
+/* Theme */
+.defaultSimpleSkin span.mce_bold {background-position:0 0}
+.defaultSimpleSkin span.mce_italic {background-position:-60px 0}
+.defaultSimpleSkin span.mce_underline {background-position:-140px 0}
+.defaultSimpleSkin span.mce_strikethrough {background-position:-120px 0}
+.defaultSimpleSkin span.mce_undo {background-position:-160px 0}
+.defaultSimpleSkin span.mce_redo {background-position:-100px 0}
+.defaultSimpleSkin span.mce_cleanup {background-position:-40px 0}
+.defaultSimpleSkin span.mce_insertunorderedlist {background-position:-20px 0}
+.defaultSimpleSkin span.mce_insertorderedlist {background-position:-80px 0}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css
new file mode 100644
index 000000000..e10558f9d
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css
@@ -0,0 +1,17 @@
+body, td, pre {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+
+body {background: #FFF;}
+.mceVisualAid {border: 1px dashed #BBB;}
+
+/* IE */
+
+* html body {
+scrollbar-3dlight-color: #F0F0EE;
+scrollbar-arrow-color: #676662;
+scrollbar-base-color: #F0F0EE;
+scrollbar-darkshadow-color: #DDDDDD;
+scrollbar-face-color: #E0E0DD;
+scrollbar-highlight-color: #F0F0EE;
+scrollbar-shadow-color: #F0F0EE;
+scrollbar-track-color: #F5F5F5;	
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png
new file mode 100644
index 000000000..527e3495a
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css
new file mode 100644
index 000000000..21c0d19cd
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css
@@ -0,0 +1,35 @@
+/* Reset */
+.o2k7SimpleSkin table, .o2k7SimpleSkin tbody, .o2k7SimpleSkin a, .o2k7SimpleSkin img, .o2k7SimpleSkin tr, .o2k7SimpleSkin div, .o2k7SimpleSkin td, .o2k7SimpleSkin iframe, .o2k7SimpleSkin span, .o2k7SimpleSkin * {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000}
+
+/* Containers */
+.o2k7SimpleSkin {position:relative}
+.o2k7SimpleSkin table.mceLayout {background:#E5EFFD; border:1px solid #ABC6DD;}
+.o2k7SimpleSkin iframe {display:block; background:#FFF; border-bottom:1px solid #ABC6DD;}
+.o2k7SimpleSkin .mceToolbar {height:26px;}
+
+/* Layout */
+.o2k7SimpleSkin .mceToolbar .mceToolbarStart span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px; }
+.o2k7SimpleSkin .mceToolbar .mceToolbarEnd span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px}
+.o2k7SimpleSkin span.mceIcon, .o2k7SimpleSkin img.mceIcon {display:block; width:20px; height:20px}
+.o2k7SimpleSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
+
+/* Button */
+.o2k7SimpleSkin .mceButton {display:block; background:url(img/button_bg.png); width:22px; height:22px}
+.o2k7SimpleSkin a.mceButton span, .o2k7SimpleSkin a.mceButton img {margin:1px 0 0 1px}
+.o2k7SimpleSkin a.mceButtonEnabled:hover {background-color:#B2BBD0; background-position:0 -22px}
+.o2k7SimpleSkin a.mceButtonActive {background-position:0 -44px}
+.o2k7SimpleSkin .mceButtonDisabled span {opacity:0.3; filter:alpha(opacity=30)}
+
+/* Separator */
+.o2k7SimpleSkin .mceSeparator {display:block; background:url(img/button_bg.png) -22px 0; width:5px; height:22px}
+
+/* Theme */
+.o2k7SimpleSkin span.mce_bold {background-position:0 0}
+.o2k7SimpleSkin span.mce_italic {background-position:-60px 0}
+.o2k7SimpleSkin span.mce_underline {background-position:-140px 0}
+.o2k7SimpleSkin span.mce_strikethrough {background-position:-120px 0}
+.o2k7SimpleSkin span.mce_undo {background-position:-160px 0}
+.o2k7SimpleSkin span.mce_redo {background-position:-100px 0}
+.o2k7SimpleSkin span.mce_cleanup {background-position:-40px 0}
+.o2k7SimpleSkin span.mce_insertunorderedlist {background-position:-20px 0}
+.o2k7SimpleSkin span.mce_insertorderedlist {background-position:-80px 0}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js b/mod/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js
new file mode 100644
index 000000000..72087e80a
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js
@@ -0,0 +1 @@
+var tinymce={majorVersion:'3',minorVersion:'1.0.1',releaseDate:'2008-06-18',_init:function(){var t=this,d=document,w=window,na=navigator,ua=na.userAgent,i,nl,n,base,p,v;t.isOpera=w.opera&&opera.buildNumber;t.isWebKit=/WebKit/.test(ua);t.isOldWebKit=t.isWebKit&&!w.getSelection().getRangeAt;t.isIE=!t.isWebKit&&!t.isOpera&&(/MSIE/gi).test(ua)&&(/Explorer/gi).test(na.appName);t.isIE6=t.isIE&&/MSIE [56]/.test(ua);t.isGecko=!t.isWebKit&&/Gecko/.test(ua);t.isMac=ua.indexOf('Mac')!=-1;if(w.tinyMCEPreInit){t.suffix=tinyMCEPreInit.suffix;t.baseURL=tinyMCEPreInit.base;t.query=tinyMCEPreInit.query;return;}t.suffix='';nl=d.getElementsByTagName('base');for(i=0;i<nl.length;i++){if(v=nl[i].href){if(/^https?:\/\/[^\/]+$/.test(v))v+='/';base=v?v.match(/.*\//)[0]:'';}}function getBase(n){if(n.src&&/tiny_mce(|_dev|_src|_gzip|_jquery|_prototype).js/.test(n.src)){if(/_(src|dev)\.js/g.test(n.src))t.suffix='_src';if((p=n.src.indexOf('?'))!=-1)t.query=n.src.substring(p+1);t.baseURL=n.src.substring(0,n.src.lastIndexOf('/'));if(base&&t.baseURL.indexOf('://')==-1)t.baseURL=base+t.baseURL;return t.baseURL;}return null;};nl=d.getElementsByTagName('script');for(i=0;i<nl.length;i++){if(getBase(nl[i]))return;}n=d.getElementsByTagName('head')[0];if(n){nl=n.getElementsByTagName('script');for(i=0;i<nl.length;i++){if(getBase(nl[i]))return;}}return;},is:function(o,t){var n=typeof(o);if(!t)return n!='undefined';if(t=='array'&&(o instanceof Array))return true;return n==t;},each:function(o,cb,s){var n,l;if(!o)return 0;s=s||o;if(typeof(o.length)!='undefined'){for(n=0,l=o.length;n<l;n++){if(cb.call(s,o[n],n,o)===false)return 0;}}else{for(n in o){if(o.hasOwnProperty(n)){if(cb.call(s,o[n],n,o)===false)return 0;}}}return 1;},map:function(a,f){var o=[];tinymce.each(a,function(v){o.push(f(v));});return o;},grep:function(a,f){var o=[];tinymce.each(a,function(v){if(!f||f(v))o.push(v);});return o;},inArray:function(a,v){var i,l;if(a){for(i=0,l=a.length;i<l;i++){if(a[i]===v)return i;}}return-1;},extend:function(o,e){var i,a=arguments;for(i=1;i<a.length;i++){e=a[i];tinymce.each(e,function(v,n){if(typeof(v)!=='undefined')o[n]=v;});}return o;},trim:function(s){return(s?''+s:'').replace(/^\s*|\s*$/g,'');},create:function(s,p){var t=this,sp,ns,cn,scn,c,de=0;s=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(s);cn=s[3].match(/(^|\.)(\w+)$/i)[2];ns=t.createNS(s[3].replace(/\.\w+$/,''));if(ns[cn])return;if(s[2]=='static'){ns[cn]=p;if(this.onCreate)this.onCreate(s[2],s[3],ns[cn]);return;}if(!p[cn]){p[cn]=function(){};de=1;}ns[cn]=p[cn];t.extend(ns[cn].prototype,p);if(s[5]){sp=t.resolve(s[5]).prototype;scn=s[5].match(/\.(\w+)$/i)[1];c=ns[cn];if(de){ns[cn]=function(){return sp[scn].apply(this,arguments);};}else{ns[cn]=function(){this.parent=sp[scn];return c.apply(this,arguments);};}ns[cn].prototype[cn]=ns[cn];t.each(sp,function(f,n){ns[cn].prototype[n]=sp[n];});t.each(p,function(f,n){if(sp[n]){ns[cn].prototype[n]=function(){this.parent=sp[n];return f.apply(this,arguments);};}else{if(n!=cn)ns[cn].prototype[n]=f;}});}t.each(p['static'],function(f,n){ns[cn][n]=f;});if(this.onCreate)this.onCreate(s[2],s[3],ns[cn].prototype);},walk:function(o,f,n,s){s=s||this;if(o){if(n)o=o[n];tinymce.each(o,function(o,i){if(f.call(s,o,i,n)===false)return false;tinymce.walk(o,f,n,s);});}},createNS:function(n,o){var i,v;o=o||window;n=n.split('.');for(i=0;i<n.length;i++){v=n[i];if(!o[v])o[v]={};o=o[v];}return o;},resolve:function(n,o){var i,l;o=o||window;n=n.split('.');for(i=0,l=n.length;i<l;i++){o=o[n[i]];if(!o)break;}return o;},addUnload:function(f,s){var t=this,w=window;f={func:f,scope:s||this};if(!t.unloads){function unload(){var li=t.unloads,o,n;if(li){for(n in li){o=li[n];if(o&&o.func)o.func.call(o.scope,1);}if(w.detachEvent){w.detachEvent('onbeforeunload',fakeUnload);w.detachEvent('onunload',unload);}else if(w.removeEventListener)w.removeEventListener('unload',unload,false);t.unloads=o=li=w=unload=null;if(window.CollectGarbage)window.CollectGarbage();}};function fakeUnload(){var d=document;if(d.readyState=='interactive'){function stop(){d.detachEvent('onstop',stop);unload();d=null;};d.attachEvent('onstop',stop);window.setTimeout(function(){d.detachEvent('onstop',stop);},0);}};if(w.attachEvent){w.attachEvent('onunload',unload);w.attachEvent('onbeforeunload',fakeUnload);}else if(w.addEventListener)w.addEventListener('unload',unload,false);t.unloads=[f];}else t.unloads.push(f);return f;},removeUnload:function(f){var u=this.unloads,r=null;tinymce.each(u,function(o,i){if(o&&o.func==f){u.splice(i,1);r=f;return false;}});return r;},explode:function(s,d){return s?tinymce.map(s.split(d||','),tinymce.trim):s;},_addVer:function(u){var v;if(!this.query)return u;v=(u.indexOf('?')==-1?'?':'&')+this.query;if(u.indexOf('#')==-1)return u+v;return u.replace('#',v+'#');}};window.tinymce=tinymce;tinymce._init();tinymce.create('tinymce.util.Dispatcher',{scope:null,listeners:null,Dispatcher:function(s){this.scope=s||this;this.listeners=[];},add:function(cb,s){this.listeners.push({cb:cb,scope:s||this.scope});return cb;},addToTop:function(cb,s){this.listeners.unshift({cb:cb,scope:s||this.scope});return cb;},remove:function(cb){var l=this.listeners,o=null;tinymce.each(l,function(c,i){if(cb==c.cb){o=cb;l.splice(i,1);return false;}});return o;},dispatch:function(){var s,a=arguments,i,li=this.listeners,c;for(i=0;i<li.length;i++){c=li[i];s=c.cb.apply(c.scope,a);if(s===false)break;}return s;}});(function(){var each=tinymce.each;tinymce.create('tinymce.util.URI',{URI:function(u,s){var t=this,o,a,b;s=t.settings=s||{};if(/^(mailto|news|javascript|about):/i.test(u)||/^\s*#/.test(u)){t.source=u;return;}if(u.indexOf('/')===0&&u.indexOf('//')!==0)u=(s.base_uri?s.base_uri.protocol||'http':'http')+'://mce_host'+u;if(u.indexOf('://')===-1&&u.indexOf('//')!==0)u=(s.base_uri.protocol||'http')+'://mce_host'+t.toAbsPath(s.base_uri.path,u);u=u.replace(/@@/g,'(mce_at)');u=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(u);each(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(v,i){var s=u[i];if(s)s=s.replace(/\(mce_at\)/g,'@@');t[v]=s;});if(b=s.base_uri){if(!t.protocol)t.protocol=b.protocol;if(!t.userInfo)t.userInfo=b.userInfo;if(!t.port&&t.host=='mce_host')t.port=b.port;if(!t.host||t.host=='mce_host')t.host=b.host;t.source='';}},setPath:function(p){var t=this;p=/^(.*?)\/?(\w+)?$/.exec(p);t.path=p[0];t.directory=p[1];t.file=p[2];t.source='';t.getURI();},toRelative:function(u){var t=this,o;u=new tinymce.util.URI(u,{base_uri:t});if((u.host!='mce_host'&&t.host!=u.host&&u.host)||t.port!=u.port||t.protocol!=u.protocol)return u.getURI();o=t.toRelPath(t.path,u.path);if(u.query)o+='?'+u.query;if(u.anchor)o+='#'+u.anchor;return o;},toAbsolute:function(u,nh){var u=new tinymce.util.URI(u,{base_uri:this});return u.getURI(this.host==u.host?nh:0);},toRelPath:function(base,path){var items,bp=0,out='',i;base=base.substring(0,base.lastIndexOf('/'));base=base.split('/');items=path.split('/');if(base.length>=items.length){for(i=0;i<base.length;i++){if(i>=items.length||base[i]!=items[i]){bp=i+1;break;}}}if(base.length<items.length){for(i=0;i<items.length;i++){if(i>=base.length||base[i]!=items[i]){bp=i+1;break;}}}if(bp==1)return path;for(i=0;i<base.length-(bp-1);i++)out+="../";for(i=bp-1;i<items.length;i++){if(i!=bp-1)out+="/"+items[i];else out+=items[i];}return out;},toAbsPath:function(base,path){var i,nb=0,o=[];base=base.split('/');path=path.split('/');each(base,function(k){if(k)o.push(k);});base=o;for(i=path.length-1,o=[];i>=0;i--){if(path[i].length==0||path[i]==".")continue;if(path[i]=='..'){nb++;continue;}if(nb>0){nb--;continue;}o.push(path[i]);}i=base.length-nb;if(i<=0)return'/'+o.reverse().join('/');return'/'+base.slice(0,i).join('/')+'/'+o.reverse().join('/');},getURI:function(nh){var s,t=this;if(!t.source||nh){s='';if(!nh){if(t.protocol)s+=t.protocol+'://';if(t.userInfo)s+=t.userInfo+'@';if(t.host)s+=t.host;if(t.port)s+=':'+t.port;}if(t.path)s+=t.path;if(t.query)s+='?'+t.query;if(t.anchor)s+='#'+t.anchor;t.source=s;}return t.source;}});})();(function(){var each=tinymce.each;tinymce.create('static tinymce.util.Cookie',{getHash:function(n){var v=this.get(n),h;if(v){each(v.split('&'),function(v){v=v.split('=');h=h||{};h[unescape(v[0])]=unescape(v[1]);});}return h;},setHash:function(n,v,e,p,d,s){var o='';each(v,function(v,k){o+=(!o?'':'&')+escape(k)+'='+escape(v);});this.set(n,o,e,p,d,s);},get:function(n){var c=document.cookie,e,p=n+"=",b;if(!c)return;b=c.indexOf("; "+p);if(b==-1){b=c.indexOf(p);if(b!=0)return null;}else b+=2;e=c.indexOf(";",b);if(e==-1)e=c.length;return unescape(c.substring(b+p.length,e));},set:function(n,v,e,p,d,s){document.cookie=n+"="+escape(v)+((e)?"; expires="+e.toGMTString():"")+((p)?"; path="+escape(p):"")+((d)?"; domain="+d:"")+((s)?"; secure":"");},remove:function(n,p){var d=new Date();d.setTime(d.getTime()-1000);this.set(n,'',d,p,d);}});})();tinymce.create('static tinymce.util.JSON',{serialize:function(o){var i,v,s=tinymce.util.JSON.serialize,t;if(o==null)return'null';t=typeof o;if(t=='string'){v='\bb\tt\nn\ff\rr\""\'\'\\\\';return'"'+o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'])/g,function(a,b){i=v.indexOf(b);if(i+1)return'\\'+v.charAt(i+1);a=b.charCodeAt().toString(16);return'\\u'+'0000'.substring(a.length)+a;})+'"';}if(t=='object'){if(o instanceof Array){for(i=0,v='[';i<o.length;i++)v+=(i>0?',':'')+s(o[i]);return v+']';}v='{';for(i in o)v+=typeof o[i]!='function'?(v.length>1?',"':'"')+i+'":'+s(o[i]):'';return v+'}';}return''+o;},parse:function(s){try{return eval('('+s+')');}catch(ex){}}});tinymce.create('static tinymce.util.XHR',{send:function(o){var x,t,w=window,c=0;o.scope=o.scope||this;o.success_scope=o.success_scope||o.scope;o.error_scope=o.error_scope||o.scope;o.async=o.async===false?false:true;o.data=o.data||'';function get(s){x=0;try{x=new ActiveXObject(s);}catch(ex){}return x;};x=w.XMLHttpRequest?new XMLHttpRequest():get('Microsoft.XMLHTTP')||get('Msxml2.XMLHTTP');if(x){if(x.overrideMimeType)x.overrideMimeType(o.content_type);x.open(o.type||(o.data?'POST':'GET'),o.url,o.async);if(o.content_type)x.setRequestHeader('Content-Type',o.content_type);x.send(o.data);function ready(){if(!o.async||x.readyState==4||c++>10000){if(o.success&&c<10000&&x.status==200)o.success.call(o.success_scope,''+x.responseText,x,o);else if(o.error)o.error.call(o.error_scope,c>10000?'TIMED_OUT':'GENERAL',x,o);x=null;}else w.setTimeout(ready,10);};if(!o.async)return ready();t=w.setTimeout(ready,10);}}});(function(){var extend=tinymce.extend,JSON=tinymce.util.JSON,XHR=tinymce.util.XHR;tinymce.create('tinymce.util.JSONRequest',{JSONRequest:function(s){this.settings=extend({},s);this.count=0;},send:function(o){var ecb=o.error,scb=o.success;o=extend(this.settings,o);o.success=function(c,x){c=JSON.parse(c);if(typeof(c)=='undefined'){c={error:'JSON Parse error.'};}if(c.error)ecb.call(o.error_scope||o.scope,c.error,x);else scb.call(o.success_scope||o.scope,c.result);};o.error=function(ty,x){ecb.call(o.error_scope||o.scope,ty,x);};o.data=JSON.serialize({id:o.id||'c'+(this.count++),method:o.method,params:o.params});o.content_type='application/json';XHR.send(o);},'static':{sendRPC:function(o){return new tinymce.util.JSONRequest().send(o);}}});}());(function(){var each=tinymce.each,is=tinymce.is;var isWebKit=tinymce.isWebKit,isIE=tinymce.isIE;tinymce.create('tinymce.dom.DOMUtils',{doc:null,root:null,files:null,listeners:{},pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,cache:{},idPattern:/^#[\w]+$/,elmPattern:/^[\w_*]+$/,elmClassPattern:/^([\w_]*)\.([\w_]+)$/,DOMUtils:function(d,s){var t=this;t.doc=d;t.win=window;t.files={};t.cssFlicker=false;t.counter=0;t.boxModel=!tinymce.isIE||d.compatMode=="CSS1Compat";t.stdMode=d.documentMode===8;this.settings=s=tinymce.extend({keep_values:false,hex_colors:1,process_html:1},s);if(tinymce.isIE6){try{d.execCommand('BackgroundImageCache',false,true);}catch(e){t.cssFlicker=true;}}tinymce.addUnload(t.destroy,t);},getRoot:function(){var t=this,s=t.settings;return(s&&t.get(s.root_element))||t.doc.body;},getViewPort:function(w){var d,b;w=!w?this.win:w;d=w.document;b=this.boxModel?d.documentElement:d.body;return{x:w.pageXOffset||b.scrollLeft,y:w.pageYOffset||b.scrollTop,w:w.innerWidth||b.clientWidth,h:w.innerHeight||b.clientHeight};},getRect:function(e){var p,t=this,w,h;e=t.get(e);p=t.getPos(e);w=t.getStyle(e,'width');h=t.getStyle(e,'height');if(w.indexOf('px')===-1)w=0;if(h.indexOf('px')===-1)h=0;return{x:p.x,y:p.y,w:parseInt(w)||e.offsetWidth||e.clientWidth,h:parseInt(h)||e.offsetHeight||e.clientHeight};},getParent:function(n,f,r){var na,se=this.settings;n=this.get(n);if(se.strict_root)r=r||this.getRoot();if(is(f,'string')){na=f.toUpperCase();f=function(n){var s=false;if(n.nodeType==1&&na==='*'){s=true;return false;}each(na.split(','),function(v){if(n.nodeType==1&&((se.strict&&n.nodeName.toUpperCase()==v)||n.nodeName.toUpperCase()==v)){s=true;return false;}});return s;};}while(n){if(n==r)return null;if(f(n))return n;n=n.parentNode;}return null;},get:function(e){var n;if(e&&this.doc&&typeof(e)=='string'){n=e;e=this.doc.getElementById(e);if(e&&e.id!==n)return this.doc.getElementsByName(n)[1];}return e;},select:function(pa,s){var t=this,cs,c,pl,o=[],x,i,l,n;s=t.get(s)||t.doc;if(s.querySelectorAll){if(s!=t.doc){i=s.id;s.id='_mc_tmp';pa='#_mc_tmp '+pa;}l=tinymce.grep(s.querySelectorAll(pa));s.id=i;return l;}if(t.settings.strict){function get(s,n){return s.getElementsByTagName(n.toLowerCase());};}else{function get(s,n){return s.getElementsByTagName(n);};}if(t.elmPattern.test(pa)){x=get(s,pa);for(i=0,l=x.length;i<l;i++)o.push(x[i]);return o;}if(t.elmClassPattern.test(pa)){pl=t.elmClassPattern.exec(pa);x=get(s,pl[1]||'*');c=' '+pl[2]+' ';for(i=0,l=x.length;i<l;i++){n=x[i];if(n.className&&(' '+n.className+' ').indexOf(c)!==-1)o.push(n);}return o;}function collect(n){if(!n.mce_save){n.mce_save=1;o.push(n);}};function collectIE(n){if(!n.getAttribute('mce_save')){n.setAttribute('mce_save','1');o.push(n);}};function find(n,f,r){var i,l,nl=get(r,n);for(i=0,l=nl.length;i<l;i++)f(nl[i]);};each(pa.split(','),function(v,i){v=tinymce.trim(v);if(t.elmPattern.test(v)){each(get(s,v),function(n){collect(n);});return;}if(t.elmClassPattern.test(v)){x=t.elmClassPattern.exec(v);each(get(s,x[1]),function(n){if(t.hasClass(n,x[2]))collect(n);});return;}if(!(cs=t.cache[pa])){cs='x=(function(cf, s) {';pl=v.split(' ');each(pl,function(v){var p=/^([\w\\*]+)?(?:#([\w\\]+))?(?:\.([\w\\\.]+))?(?:\[\@([\w\\]+)([\^\$\*!]?=)([\w\\]+)\])?(?:\:([\w\\]+))?/i.exec(v);p[1]=p[1]||'*';cs+='find("'+p[1]+'", function(n) {';if(p[2])cs+='if (n.id !== "'+p[2]+'") return;';if(p[3]){cs+='var c = " " + n.className + " ";';cs+='if (';c='';each(p[3].split('.'),function(v){if(v)c+=(c?'||':'')+'c.indexOf(" '+v+' ") === -1';});cs+=c+') return;';}});cs+='cf(n);';for(i=pl.length-1;i>=0;i--)cs+='}, '+(i?'n':'s')+');';cs+='})';t.cache[pa]=cs=eval(cs);}cs(isIE?collectIE:collect,s);});each(o,function(n){if(isIE)n.removeAttribute('mce_save');else delete n.mce_save;});return o;},add:function(p,n,a,h,c){var t=this;return this.run(p,function(p){var e,k;e=is(n,'string')?t.doc.createElement(n):n;if(a){for(k in a){if(a.hasOwnProperty(k)&&!is(a[k],'object'))t.setAttrib(e,k,''+a[k]);}if(a.style&&!is(a.style,'string')){each(a.style,function(v,n){t.setStyle(e,n,v);});}}if(h){if(h.nodeType)e.appendChild(h);else t.setHTML(e,h);}return!c?p.appendChild(e):e;});},create:function(n,a,h){return this.add(this.doc.createElement(n),n,a,h,1);},createHTML:function(n,a,h){var o='',t=this,k;o+='<'+n;for(k in a){if(a.hasOwnProperty(k))o+=' '+k+'="'+t.encode(a[k])+'"';}if(tinymce.is(h))return o+'>'+h+'</'+n+'>';return o+' />';},remove:function(n,k){return this.run(n,function(n){var p,g;p=n.parentNode;if(!p)return null;if(k){each(n.childNodes,function(c){p.insertBefore(c.cloneNode(true),n);});}return p.removeChild(n);});},setStyle:function(n,na,v){var t=this;return t.run(n,function(e){var s,i;s=e.style;na=na.replace(/-(\D)/g,function(a,b){return b.toUpperCase();});if(t.pixelStyles.test(na)&&(tinymce.is(v,'number')||/^[\-0-9\.]+$/.test(v)))v+='px';switch(na){case'opacity':if(isIE){s.filter=v===''?'':"alpha(opacity="+(v*100)+")";if(!n.currentStyle||!n.currentStyle.hasLayout)s.display='inline-block';}s[na]=s['-moz-opacity']=s['-khtml-opacity']=v||'';break;case'float':isIE?s.styleFloat=v:s.cssFloat=v;break;default:s[na]=v||'';}if(t.settings.update_styles)t.setAttrib(e,'mce_style');});},getStyle:function(n,na,c){n=this.get(n);if(!n)return false;if(this.doc.defaultView&&c){na=na.replace(/[A-Z]/g,function(a){return'-'+a;});try{return this.doc.defaultView.getComputedStyle(n,null).getPropertyValue(na);}catch(ex){return null;}}na=na.replace(/-(\D)/g,function(a,b){return b.toUpperCase();});if(na=='float')na=isIE?'styleFloat':'cssFloat';if(n.currentStyle&&c)return n.currentStyle[na];return n.style[na];},setStyles:function(e,o){var t=this,s=t.settings,ol;ol=s.update_styles;s.update_styles=0;each(o,function(v,n){t.setStyle(e,n,v);});s.update_styles=ol;if(s.update_styles)t.setAttrib(e,s.cssText);},setAttrib:function(e,n,v){var t=this;if(t.settings.strict)n=n.toLowerCase();return this.run(e,function(e){var s=t.settings;switch(n){case"style":if(s.keep_values){if(v&&!t._isRes(v))e.setAttribute('mce_style',v,2);else e.removeAttribute('mce_style',2);}e.style.cssText=v;break;case"class":e.className=v||'';break;case"src":case"href":if(s.keep_values){if(s.url_converter)v=s.url_converter.call(s.url_converter_scope||t,v,n,e);t.setAttrib(e,'mce_'+n,v,2);}break;case"shape":e.setAttribute('mce_style',v);break;}if(is(v)&&v!==null&&v.length!==0)e.setAttribute(n,''+v,2);else e.removeAttribute(n,2);});},setAttribs:function(e,o){var t=this;return this.run(e,function(e){each(o,function(v,n){t.setAttrib(e,n,v);});});},getAttrib:function(e,n,dv){var v,t=this;e=t.get(e);if(!e||e.nodeType!==1)return false;if(!is(dv))dv="";if(/^(src|href|style|coords|shape)$/.test(n)){v=e.getAttribute("mce_"+n);if(v)return v;}v=e.getAttribute(n,2);if(!v){switch(n){case'class':v=e.className;break;default:if(isIE&&n==='name'&&e.nodeName==='A'){v=e.name;break;}v=e.attributes[n];v=v&&is(v.nodeValue)?v.nodeValue:v;}}switch(n){case'style':v=v||e.style.cssText;if(v){v=t.serializeStyle(t.parseStyle(v));if(t.settings.keep_values&&!t._isRes(v))e.setAttribute('mce_style',v);}break;}if(isWebKit&&n==="class"&&v)v=v.replace(/(apple|webkit)\-[a-z\-]+/gi,'');if(isIE){switch(n){case'rowspan':case'colspan':if(v===1)v='';break;case'size':if(v==='+0')v='';break;case'hspace':if(v===-1)v='';break;case'tabindex':if(v===32768)v='';break;case'maxlength':if(v===2147483647)v='';break;case'shape':v=v.toLowerCase();break;default:if(n.indexOf('on')===0&&v)v=(''+v).replace(/^function\s+anonymous\(\)\s+\{\s+(.*)\s+\}$/,'$1');}}return(v&&v!='')?''+v:dv;},getPos:function(n){var t=this,x=0,y=0,e,d=t.doc,r;n=t.get(n);if(n&&isIE){n=n.getBoundingClientRect();e=t.boxModel?d.documentElement:d.body;x=t.getStyle(t.select('html')[0],'borderWidth');x=(x=='medium'||t.boxModel&&!t.isIE6)&&2||x;n.top+=t.win.self!=t.win.top?2:0;return{x:n.left+e.scrollLeft-x,y:n.top+e.scrollTop-x};}r=n;while(r){x+=r.offsetLeft||0;y+=r.offsetTop||0;r=r.offsetParent;}r=n;while(r){if(!/^table-row|inline.*/i.test(t.getStyle(r,"display",1))){x-=r.scrollLeft||0;y-=r.scrollTop||0;}r=r.parentNode;if(r==d.body)break;}return{x:x,y:y};},parseStyle:function(st){var t=this,s=t.settings,o={};if(!st)return o;function compress(p,s,ot){var t,r,b,l;t=o[p+'-top'+s];if(!t)return;r=o[p+'-right'+s];if(t!=r)return;b=o[p+'-bottom'+s];if(r!=b)return;l=o[p+'-left'+s];if(b!=l)return;o[ot]=l;delete o[p+'-top'+s];delete o[p+'-right'+s];delete o[p+'-bottom'+s];delete o[p+'-left'+s];};function compress2(ta,a,b,c){var t;t=o[a];if(!t)return;t=o[b];if(!t)return;t=o[c];if(!t)return;o[ta]=o[a]+' '+o[b]+' '+o[c];delete o[a];delete o[b];delete o[c];};st=st.replace(/&(#?[a-z0-9]+);/g,'&$1_MCE_SEMI_');each(st.split(';'),function(v){var sv,ur=[];if(v){v=v.replace(/_MCE_SEMI_/g,';');v=v.replace(/url\([^\)]+\)/g,function(v){ur.push(v);return'url('+ur.length+')';});v=v.split(':');sv=tinymce.trim(v[1]);sv=sv.replace(/url\(([^\)]+)\)/g,function(a,b){return ur[parseInt(b)-1];});sv=sv.replace(/rgb\([^\)]+\)/g,function(v){return t.toHex(v);});if(s.url_converter){sv=sv.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g,function(x,c){return'url('+s.url_converter.call(s.url_converter_scope||t,t.decode(c),'style',null)+')';});}o[tinymce.trim(v[0]).toLowerCase()]=sv;}});compress("border","","border");compress("border","-width","border-width");compress("border","-color","border-color");compress("border","-style","border-style");compress("padding","","padding");compress("margin","","margin");compress2('border','border-width','border-style','border-color');if(isIE){if(o.border=='medium none')o.border='';}return o;},serializeStyle:function(o){var s='';each(o,function(v,k){if(k&&v){if(tinymce.isGecko&&k.indexOf('-moz-')===0)return;switch(k){case'color':case'background-color':v=v.toLowerCase();break;}s+=(s?' ':'')+k+': '+v+';';}});return s;},loadCSS:function(u){var t=this,d=t.doc;if(!u)u='';each(u.split(','),function(u){if(t.files[u])return;t.files[u]=true;t.add(t.select('head')[0],'link',{rel:'stylesheet',href:tinymce._addVer(u)});});},addClass:function(e,c){return this.run(e,function(e){var o;if(!c)return 0;if(this.hasClass(e,c))return e.className;o=this.removeClass(e,c);return e.className=(o!=''?(o+' '):'')+c;});},removeClass:function(e,c){var t=this,re;return t.run(e,function(e){var v;if(t.hasClass(e,c)){if(!re)re=new RegExp("(^|\\s+)"+c+"(\\s+|$)","g");v=e.className.replace(re,' ');return e.className=tinymce.trim(v!=' '?v:'');}return e.className;});},hasClass:function(n,c){n=this.get(n);if(!n||!c)return false;return(' '+n.className+' ').indexOf(' '+c+' ')!==-1;},show:function(e){return this.setStyle(e,'display','block');},hide:function(e){return this.setStyle(e,'display','none');},isHidden:function(e){e=this.get(e);return e.style.display=='none'||this.getStyle(e,'display')=='none';},uniqueId:function(p){return(!p?'mce_':p)+(this.counter++);},setHTML:function(e,h){var t=this;return this.run(e,function(e){var x,i,nl,n,p,x;h=t.processHTML(h);if(isIE){function set(){try{e.innerHTML='<br />'+h;e.removeChild(e.firstChild);}catch(ex){while(e.firstChild)e.firstChild.removeNode();x=t.create('div');x.innerHTML='<br />'+h;each(x.childNodes,function(n,i){if(i)e.appendChild(n);});}};if(t.settings.fix_ie_paragraphs)h=h.replace(/<p><\/p>|<p([^>]+)><\/p>|<p[^\/+]\/>/gi,'<p$1 mce_keep="true">&nbsp;</p>');set();if(t.settings.fix_ie_paragraphs){nl=e.getElementsByTagName("p");for(i=nl.length-1,x=0;i>=0;i--){n=nl[i];if(!n.hasChildNodes()){if(!n.mce_keep){x=1;break;}n.removeAttribute('mce_keep');}}}if(x){h=h.replace(/<p([^>]+)>|<p>/g,'<div$1 mce_tmp="1">');h=h.replace(/<\/p>/g,'</div>');set();if(t.settings.fix_ie_paragraphs){nl=e.getElementsByTagName("DIV");for(i=nl.length-1;i>=0;i--){n=nl[i];if(n.mce_tmp){p=t.doc.createElement('p');n.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi,function(a,b){var v;if(b!=='mce_tmp'){v=n.getAttribute(b);if(!v&&b==='class')v=n.className;p.setAttribute(b,v);}});for(x=0;x<n.childNodes.length;x++)p.appendChild(n.childNodes[x].cloneNode(true));n.swapNode(p);}}}}}else e.innerHTML=h;return h;});},processHTML:function(h){var t=this,s=t.settings;if(!s.process_html)return h;if(tinymce.isGecko){h=h.replace(/<(\/?)strong>|<strong( [^>]+)>/gi,'<$1b$2>');h=h.replace(/<(\/?)em>|<em( [^>]+)>/gi,'<$1i$2>');}else if(isIE)h=h.replace(/&apos;/g,'&#39;');h=h.replace(/<a( )([^>]+)\/>|<a\/>/gi,'<a$1$2></a>');if(s.keep_values){if(/<script|style/.test(h)){function trim(s){s=s.replace(/^[\r\n]*|[\r\n]*$/g,'');s=s.replace(/^\s*(\/\/\s*<!--|\/\/\s*<\[CDATA\[|<!--|<\[CDATA\[)[\r\n]*/g,'');s=s.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->)\s*$/g,'');return s;};h=h.replace(/<script([^>]+|)>([\s\S]*?)<\/script>/g,function(v,a,b){b=trim(b);if(!a)a=' type="text/javascript"';if(b)b='<!--\n'+b+'\n// -->';return'<mce:script'+a+'>'+b+'</mce:script>';});h=h.replace(/<style([^>]+|)>([\s\S]*?)<\/style>/g,function(v,a,b){b=trim(b);return'<mce:style'+a+'><!--\n'+b+'\n--></mce:style><style'+a+' mce_bogus="1">'+b+'</style>';});}h=h.replace(/<([\w:]+) [^>]*(src|href|style|shape|coords)[^>]*>/gi,function(a,n){function handle(m,b,c){var u=c;if(a.indexOf('mce_'+b)!=-1)return m;if(b=='style'){if(t._isRes(c))return m;if(s.hex_colors){u=u.replace(/rgb\([^\)]+\)/g,function(v){return t.toHex(v);});}if(s.url_converter){u=u.replace(/url\([\'\"]?([^\)\'\"]+)\)/g,function(x,c){return'url('+t.encode(s.url_converter.call(s.url_converter_scope||t,t.decode(c),b,n))+')';});}}else if(b!='coords'&&b!='shape'){if(s.url_converter)u=t.encode(s.url_converter.call(s.url_converter_scope||t,t.decode(c),b,n));}return' '+b+'="'+c+'" mce_'+b+'="'+u+'"';};a=a.replace(/ (src|href|style|coords|shape)=[\"]([^\"]+)[\"]/gi,handle);a=a.replace(/ (src|href|style|coords|shape)=[\']([^\']+)[\']/gi,handle);return a.replace(/ (src|href|style|coords|shape)=([^\s\"\'>]+)/gi,handle);});}return h;},getOuterHTML:function(e){var d;e=this.get(e);if(!e)return null;if(isIE)return e.outerHTML;d=(e.ownerDocument||this.doc).createElement("body");d.appendChild(e.cloneNode(true));return d.innerHTML;},setOuterHTML:function(e,h,d){var t=this;return this.run(e,function(e){var n,tp;e=t.get(e);d=d||e.ownerDocument||t.doc;if(isIE&&e.nodeType==1)e.outerHTML=h;else{tp=d.createElement("body");tp.innerHTML=h;n=tp.lastChild;while(n){t.insertAfter(n.cloneNode(true),e);n=n.previousSibling;}t.remove(e);}});},decode:function(s){var e;if(/&[^;]+;/.test(s)){e=this.doc.createElement("div");e.innerHTML=s;return!e.firstChild?s:e.firstChild.nodeValue;}return s;},encode:function(s){return s?(''+s).replace(/[<>&\"]/g,function(c,b){switch(c){case'&':return'&amp;';case'"':return'&quot;';case'<':return'&lt;';case'>':return'&gt;';}return c;}):s;},insertAfter:function(n,r){var t=this;r=t.get(r);return this.run(n,function(n){var p,ns;p=r.parentNode;ns=r.nextSibling;if(ns)p.insertBefore(n,ns);else p.appendChild(n);return n;});},isBlock:function(n){if(n.nodeType&&n.nodeType!==1)return false;n=n.nodeName||n;return/^(H[1-6]|HR|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP)$/.test(n);},replace:function(n,o,k){if(is(o,'array'))n=n.cloneNode(true);return this.run(o,function(o){if(k){each(o.childNodes,function(c){n.appendChild(c.cloneNode(true));});}return o.parentNode.replaceChild(n,o);});},toHex:function(s){var c=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(s);function hex(s){s=parseInt(s).toString(16);return s.length>1?s:'0'+s;};if(c){s='#'+hex(c[1])+hex(c[2])+hex(c[3]);return s;}return s;},getClasses:function(){var t=this,cl=[],i,lo={},f=t.settings.class_filter,ov;if(t.classes)return t.classes;function addClasses(s){each(s.imports,function(r){addClasses(r);});each(s.cssRules||s.rules,function(r){switch(r.type||1){case 1:if(r.selectorText){each(r.selectorText.split(','),function(v){v=v.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(v)||!/\.[\w\-]+$/.test(v))return;ov=v;v=v.replace(/.*\.([a-z0-9_\-]+).*/i,'$1');if(f&&!(v=f(v,ov)))return;if(!lo[v]){cl.push({'class':v});lo[v]=1;}});}break;case 3:addClasses(r.styleSheet);break;}});};try{each(t.doc.styleSheets,addClasses);}catch(ex){}if(cl.length>0)t.classes=cl;return cl;},run:function(e,f,s){var t=this,o;if(t.doc&&typeof(e)==='string')e=t.doc.getElementById(e);if(!e)return false;s=s||this;if(!e.nodeType&&(e.length||e.length===0)){o=[];each(e,function(e,i){if(e){if(typeof(e)=='string')e=t.doc.getElementById(e);o.push(f.call(s,e,i));}});return o;}return f.call(s,e);},getAttribs:function(n){var o;n=this.get(n);if(!n)return[];if(isIE){o=[];if(n.nodeName=='OBJECT')return n.attributes;n.cloneNode(false).outerHTML.replace(/([a-z0-9\:\-_]+)=/gi,function(a,b){o.push({specified:1,nodeName:b});});return o;}return n.attributes;},destroy:function(s){var t=this;t.win=t.doc=t.root=null;if(!s)tinymce.removeUnload(t.destroy);},_isRes:function(c){return/^(top|left|bottom|right|width|height)/i.test(c)||/;\s*(top|left|bottom|right|width|height)/i.test(c);}});tinymce.DOM=new tinymce.dom.DOMUtils(document,{process_html:0});})();(function(){var each=tinymce.each,DOM=tinymce.DOM,isIE=tinymce.isIE,isWebKit=tinymce.isWebKit,Event;tinymce.create('static tinymce.dom.Event',{inits:[],events:[],add:function(o,n,f,s){var cb,t=this,el=t.events,r;if(o&&o instanceof Array){r=[];each(o,function(o){o=DOM.get(o);r.push(t.add(o,n,f,s));});return r;}o=DOM.get(o);if(!o)return;cb=function(e){e=e||window.event;if(e&&!e.target&&isIE)e.target=e.srcElement;if(!s)return f(e);return f.call(s,e);};if(n=='unload'){tinymce.unloads.unshift({func:cb});return cb;}if(n=='init'){if(t.domLoaded)cb();else t.inits.push(cb);return cb;}el.push({obj:o,name:n,func:f,cfunc:cb,scope:s});t._add(o,n,cb);return f;},remove:function(o,n,f){var t=this,a=t.events,s=false,r;if(o&&o instanceof Array){r=[];each(o,function(o){o=DOM.get(o);r.push(t.remove(o,n,f));});return r;}o=DOM.get(o);each(a,function(e,i){if(e.obj==o&&e.name==n&&(!f||(e.func==f||e.cfunc==f))){a.splice(i,1);t._remove(o,n,e.cfunc);s=true;return false;}});return s;},clear:function(o){var t=this,a=t.events,i,e;if(o){o=DOM.get(o);for(i=a.length-1;i>=0;i--){e=a[i];if(e.obj===o){t._remove(e.obj,e.name,e.cfunc);e.obj=e.cfunc=null;a.splice(i,1);}}}},cancel:function(e){if(!e)return false;this.stop(e);return this.prevent(e);},stop:function(e){if(e.stopPropagation)e.stopPropagation();else e.cancelBubble=true;return false;},prevent:function(e){if(e.preventDefault)e.preventDefault();else e.returnValue=false;return false;},_unload:function(){var t=Event;each(t.events,function(e,i){t._remove(e.obj,e.name,e.cfunc);e.obj=e.cfunc=null;});t.events=[];t=null;},_add:function(o,n,f){if(o.attachEvent)o.attachEvent('on'+n,f);else if(o.addEventListener)o.addEventListener(n,f,false);else o['on'+n]=f;},_remove:function(o,n,f){if(o){try{if(o.detachEvent)o.detachEvent('on'+n,f);else if(o.removeEventListener)o.removeEventListener(n,f,false);else o['on'+n]=null;}catch(ex){}}},_pageInit:function(){var e=Event;e._remove(window,'DOMContentLoaded',e._pageInit);e.domLoaded=true;each(e.inits,function(c){c();});e.inits=[];},_wait:function(){var t;if(window.tinyMCE_GZ&&tinyMCE_GZ.loaded){Event.domLoaded=1;return;}if(isIE&&document.location.protocol!='https:'){document.write('<script id=__ie_onload defer src=\'javascript:""\';><\/script>');DOM.get("__ie_onload").onreadystatechange=function(){if(this.readyState=="complete"){Event._pageInit();DOM.get("__ie_onload").onreadystatechange=null;}};}else{Event._add(window,'DOMContentLoaded',Event._pageInit,Event);if(isIE||isWebKit){t=setInterval(function(){if(/loaded|complete/.test(document.readyState)){clearInterval(t);Event._pageInit();}},10);}}}});Event=tinymce.dom.Event;Event._wait();tinymce.addUnload(Event._unload);})();(function(){var each=tinymce.each;tinymce.create('tinymce.dom.Element',{Element:function(id,s){var t=this,dom,el;s=s||{};t.id=id;t.dom=dom=s.dom||tinymce.DOM;t.settings=s;if(!tinymce.isIE)el=t.dom.get(t.id);each(['getPos','getRect','getParent','add','setStyle','getStyle','setStyles','setAttrib','setAttribs','getAttrib','addClass','removeClass','hasClass','getOuterHTML','setOuterHTML','remove','show','hide','isHidden','setHTML','get'],function(k){t[k]=function(){var a=arguments,o;if(tinymce.isOpera){a=[id];each(arguments,function(v){a.push(v);});}else Array.prototype.unshift.call(a,el||id);o=dom[k].apply(dom,a);t.update(k);return o;};});},on:function(n,f,s){return tinymce.dom.Event.add(this.id,n,f,s);},getXY:function(){return{x:parseInt(this.getStyle('left')),y:parseInt(this.getStyle('top'))};},getSize:function(){var n=this.dom.get(this.id);return{w:parseInt(this.getStyle('width')||n.clientWidth),h:parseInt(this.getStyle('height')||n.clientHeight)};},moveTo:function(x,y){this.setStyles({left:x,top:y});},moveBy:function(x,y){var p=this.getXY();this.moveTo(p.x+x,p.y+y);},resizeTo:function(w,h){this.setStyles({width:w,height:h});},resizeBy:function(w,h){var s=this.getSize();this.resizeTo(s.w+w,s.h+h);},update:function(k){var t=this,b,dom=t.dom;if(tinymce.isIE6&&t.settings.blocker){k=k||'';if(k.indexOf('get')===0||k.indexOf('has')===0||k.indexOf('is')===0)return;if(k=='remove'){dom.remove(t.blocker);return;}if(!t.blocker){t.blocker=dom.uniqueId();b=dom.add(t.settings.container||dom.getRoot(),'iframe',{id:t.blocker,style:'position:absolute;',frameBorder:0,src:'javascript:""'});dom.setStyle(b,'opacity',0);}else b=dom.get(t.blocker);dom.setStyle(b,'left',t.getStyle('left',1));dom.setStyle(b,'top',t.getStyle('top',1));dom.setStyle(b,'width',t.getStyle('width',1));dom.setStyle(b,'height',t.getStyle('height',1));dom.setStyle(b,'display',t.getStyle('display',1));dom.setStyle(b,'zIndex',parseInt(t.getStyle('zIndex',1)||0)-1);}}});})();(function(){function trimNl(s){return s.replace(/[\n\r]+/g,'');};var is=tinymce.is,isIE=tinymce.isIE,each=tinymce.each;tinymce.create('tinymce.dom.Selection',{Selection:function(dom,win,serializer){var t=this;t.dom=dom;t.win=win;t.serializer=serializer;tinymce.addUnload(t.destroy,t);},getContent:function(s){var t=this,r=t.getRng(),e=t.dom.create("body"),se=t.getSel(),wb,wa,n;s=s||{};wb=wa='';s.get=true;s.format=s.format||'html';if(s.format=='text')return t.isCollapsed()?'':(r.text||(se.toString?se.toString():''));if(r.cloneContents){n=r.cloneContents();if(n)e.appendChild(n);}else if(is(r.item)||is(r.htmlText))e.innerHTML=r.item?r.item(0).outerHTML:r.htmlText;else e.innerHTML=r.toString();if(/^\s/.test(e.innerHTML))wb=' ';if(/\s+$/.test(e.innerHTML))wa=' ';s.getInner=true;return t.isCollapsed()?'':wb+t.serializer.serialize(e,s)+wa;},setContent:function(h,s){var t=this,r=t.getRng(),d=t.win.document;s=s||{format:'html'};s.set=true;h=t.dom.processHTML(h);if(r.insertNode){if(tinymce.isGecko&&h.indexOf('<')==-1){r.deleteContents();r.insertNode(t.getRng().createContextualFragment(h+'<span id="__caret">_</span>'));t.select(t.dom.get('__caret'));t.getRng().deleteContents();return;}try{if(d.queryCommandEnabled('InsertHTML'))return d.execCommand('InsertHTML',false,h);}catch(ex){r.deleteContents();r.insertNode(t.getRng().createContextualFragment(h));}}else{if(r.item){d.execCommand('Delete',false,null);r=t.getRng();}r.pasteHTML(h);}},getStart:function(){var t=this,r=t.getRng(),e;if(isIE){if(r.item)return r.item(0);r=r.duplicate();r.collapse(1);e=r.parentElement();if(e&&e.nodeName=='BODY')return e.firstChild;return e;}else{e=r.startContainer;if(e.nodeName=='BODY')return e.firstChild;return t.dom.getParent(e,function(n){return n.nodeType==1;});}},getEnd:function(){var t=this,r=t.getRng(),e;if(isIE){if(r.item)return r.item(0);r=r.duplicate();r.collapse(0);e=r.parentElement();if(e&&e.nodeName=='BODY')return e.lastChild;return e;}else{e=r.endContainer;if(e.nodeName=='BODY')return e.lastChild;return t.dom.getParent(e,function(n){return n.nodeType==1;});}},getBookmark:function(si){var t=this,r=t.getRng(),tr,sx,sy,vp=t.dom.getViewPort(t.win),e,sp,bp,le,c=-0xFFFFFF,s,ro=t.dom.getRoot(),wb=0,wa=0,nv;sx=vp.x;sy=vp.y;if(si=='simple')return{rng:r,scrollX:sx,scrollY:sy};if(isIE){if(r.item){e=r.item(0);each(t.dom.select(e.nodeName),function(n,i){if(e==n){sp=i;return false;}});return{tag:e.nodeName,index:sp,scrollX:sx,scrollY:sy};}tr=t.dom.doc.body.createTextRange();tr.moveToElementText(ro);tr.collapse(true);bp=Math.abs(tr.move('character',c));tr=r.duplicate();tr.collapse(true);sp=Math.abs(tr.move('character',c));tr=r.duplicate();tr.collapse(false);le=Math.abs(tr.move('character',c))-sp;return{start:sp-bp,length:le,scrollX:sx,scrollY:sy};}e=t.getNode();s=t.getSel();if(!s)return null;if(e&&e.nodeName=='IMG'){return{scrollX:sx,scrollY:sy};}function getPos(r,sn,en){var w=t.dom.doc.createTreeWalker(r,NodeFilter.SHOW_TEXT,null,false),n,p=0,d={};while((n=w.nextNode())!=null){if(n==sn)d.start=p;if(n==en){d.end=p;return d;}p+=trimNl(n.nodeValue||'').length;}return null;};if(s.anchorNode==s.focusNode&&s.anchorOffset==s.focusOffset){e=getPos(ro,s.anchorNode,s.focusNode);if(!e)return{scrollX:sx,scrollY:sy};trimNl(s.anchorNode.nodeValue||'').replace(/^\s+/,function(a){wb=a.length;});return{start:Math.max(e.start+s.anchorOffset-wb,0),end:Math.max(e.end+s.focusOffset-wb,0),scrollX:sx,scrollY:sy,beg:s.anchorOffset-wb==0};}else{e=getPos(ro,r.startContainer,r.endContainer);if(!e)return{scrollX:sx,scrollY:sy};return{start:Math.max(e.start+r.startOffset-wb,0),end:Math.max(e.end+r.endOffset-wa,0),scrollX:sx,scrollY:sy,beg:r.startOffset-wb==0};}},moveToBookmark:function(b){var t=this,r=t.getRng(),s=t.getSel(),ro=t.dom.getRoot(),sd,nvl,nv;function getPos(r,sp,ep){var w=t.dom.doc.createTreeWalker(r,NodeFilter.SHOW_TEXT,null,false),n,p=0,d={},o,v,wa,wb;while((n=w.nextNode())!=null){wa=wb=0;nv=n.nodeValue||'';nvl=trimNl(nv).length;p+=nvl;if(p>=sp&&!d.startNode){o=sp-(p-nvl);if(b.beg&&o>=nvl)continue;d.startNode=n;d.startOffset=o+wb;}if(p>=ep){d.endNode=n;d.endOffset=ep-(p-nvl)+wb;return d;}}return null;};if(!b)return false;t.win.scrollTo(b.scrollX,b.scrollY);if(isIE){if(r=b.rng){try{r.select();}catch(ex){}return true;}t.win.focus();if(b.tag){r=ro.createControlRange();each(t.dom.select(b.tag),function(n,i){if(i==b.index)r.addElement(n);});}else{try{if(b.start<0)return true;r=s.createRange();r.moveToElementText(ro);r.collapse(true);r.moveStart('character',b.start);r.moveEnd('character',b.length);}catch(ex2){return true;}}try{r.select();}catch(ex){}return true;}if(!s)return false;if(b.rng){s.removeAllRanges();s.addRange(b.rng);}else{if(is(b.start)&&is(b.end)){try{sd=getPos(ro,b.start,b.end);if(sd){r=t.dom.doc.createRange();r.setStart(sd.startNode,sd.startOffset);r.setEnd(sd.endNode,sd.endOffset);s.removeAllRanges();s.addRange(r);}if(!tinymce.isOpera)t.win.focus();}catch(ex){}}}},select:function(n,c){var t=this,r=t.getRng(),s=t.getSel(),b,fn,ln,d=t.win.document;function first(n){return n?d.createTreeWalker(n,NodeFilter.SHOW_TEXT,null,false).nextNode():null;};function last(n){var c,o,w;if(!n)return null;w=d.createTreeWalker(n,NodeFilter.SHOW_TEXT,null,false);while(c=w.nextNode())o=c;return o;};if(isIE){try{b=d.body;if(/^(IMG|TABLE)$/.test(n.nodeName)){r=b.createControlRange();r.addElement(n);}else{r=b.createTextRange();r.moveToElementText(n);}r.select();}catch(ex){}}else{if(c){fn=first(n);ln=last(n);if(fn&&ln){r=d.createRange();r.setStart(fn,0);r.setEnd(ln,ln.nodeValue.length);}else r.selectNode(n);}else r.selectNode(n);t.setRng(r);}return n;},isCollapsed:function(){var t=this,r=t.getRng(),s=t.getSel();if(!r||r.item)return false;return!s||r.boundingWidth==0||s.isCollapsed;},collapse:function(b){var t=this,r=t.getRng(),n;if(r.item){n=r.item(0);r=this.win.document.body.createTextRange();r.moveToElementText(n);}r.collapse(!!b);t.setRng(r);},getSel:function(){var t=this,w=this.win;return w.getSelection?w.getSelection():w.document.selection;},getRng:function(){var t=this,s=t.getSel(),r;try{if(s)r=s.rangeCount>0?s.getRangeAt(0):(s.createRange?s.createRange():t.win.document.createRange());}catch(ex){}if(!r)r=isIE?t.win.document.body.createTextRange():t.win.document.createRange();return r;},setRng:function(r){var s;if(!isIE){s=this.getSel();if(s){s.removeAllRanges();s.addRange(r);}}else{try{r.select();}catch(ex){}}},setNode:function(n){var t=this;t.setContent(t.dom.getOuterHTML(n));return n;},getNode:function(){var t=this,r=t.getRng(),s=t.getSel(),e;if(!isIE){if(!r)return t.dom.getRoot();e=r.commonAncestorContainer;if(!r.collapsed){if(r.startContainer==r.endContainer||(tinymce.isWebKit&&r.startContainer==r.endContainer.parentNode)){if(r.startOffset-r.endOffset<2||tinymce.isWebKit){if(r.startContainer.hasChildNodes())e=r.startContainer.childNodes[r.startOffset];}}}return t.dom.getParent(e,function(n){return n.nodeType==1;});}return r.item?r.item(0):r.parentElement();},destroy:function(s){var t=this;t.win=null;if(!s)tinymce.removeUnload(t.destroy);}});})();(function(){tinymce.create('tinymce.dom.XMLWriter',{node:null,XMLWriter:function(s){function getXML(){var i=document.implementation;if(!i||!i.createDocument){try{return new ActiveXObject('MSXML2.DOMDocument');}catch(ex){}try{return new ActiveXObject('Microsoft.XmlDom');}catch(ex){}}else return i.createDocument('','',null);};this.doc=getXML();this.valid=tinymce.isOpera||tinymce.isWebKit;this.reset();},reset:function(){var t=this,d=t.doc;if(d.firstChild)d.removeChild(d.firstChild);t.node=d.appendChild(d.createElement("html"));},writeStartElement:function(n){var t=this;t.node=t.node.appendChild(t.doc.createElement(n));},writeAttribute:function(n,v){if(this.valid)v=v.replace(/>/g,'%MCGT%');this.node.setAttribute(n,v);},writeEndElement:function(){this.node=this.node.parentNode;},writeFullEndElement:function(){var t=this,n=t.node;n.appendChild(t.doc.createTextNode(""));t.node=n.parentNode;},writeText:function(v){if(this.valid)v=v.replace(/>/g,'%MCGT%');this.node.appendChild(this.doc.createTextNode(v));},writeCDATA:function(v){this.node.appendChild(this.doc.createCDATA(v));},writeComment:function(v){this.node.appendChild(this.doc.createComment(v.replace(/\-\-/g,' ')));},getContent:function(){var h;h=this.doc.xml||new XMLSerializer().serializeToString(this.doc);h=h.replace(/<\?[^?]+\?>|<html>|<\/html>|<html\/>|<!DOCTYPE[^>]+>/g,'');h=h.replace(/ ?\/>/g,' />');if(this.valid)h=h.replace(/\%MCGT%/g,'&gt;');return h;}});})();(function(){tinymce.create('tinymce.dom.StringWriter',{str:null,tags:null,count:0,settings:null,indent:null,StringWriter:function(s){this.settings=tinymce.extend({indent_char:' ',indentation:1},s);this.reset();},reset:function(){this.indent='';this.str="";this.tags=[];this.count=0;},writeStartElement:function(n){this._writeAttributesEnd();this.writeRaw('<'+n);this.tags.push(n);this.inAttr=true;this.count++;this.elementCount=this.count;},writeAttribute:function(n,v){var t=this;t.writeRaw(" "+t.encode(n)+'="'+t.encode(v)+'"');},writeEndElement:function(){var n;if(this.tags.length>0){n=this.tags.pop();if(this._writeAttributesEnd(1))this.writeRaw('</'+n+'>');if(this.settings.indentation>0)this.writeRaw('\n');}},writeFullEndElement:function(){if(this.tags.length>0){this._writeAttributesEnd();this.writeRaw('</'+this.tags.pop()+'>');if(this.settings.indentation>0)this.writeRaw('\n');}},writeText:function(v){this._writeAttributesEnd();this.writeRaw(this.encode(v));this.count++;},writeCDATA:function(v){this._writeAttributesEnd();this.writeRaw('<![CDATA['+v+']]>');this.count++;},writeComment:function(v){this._writeAttributesEnd();this.writeRaw('<!-- '+v+'-->');this.count++;},writeRaw:function(v){this.str+=v;},encode:function(s){return s.replace(/[<>&"]/g,function(v){switch(v){case'<':return'&lt;';case'>':return'&gt;';case'&':return'&amp;';case'"':return'&quot;';}return v;});},getContent:function(){return this.str;},_writeAttributesEnd:function(s){if(!this.inAttr)return;this.inAttr=false;if(s&&this.elementCount==this.count){this.writeRaw(' />');return false;}this.writeRaw('>');return true;}});})();(function(){var extend=tinymce.extend,each=tinymce.each,Dispatcher=tinymce.util.Dispatcher,isIE=tinymce.isIE,isGecko=tinymce.isGecko;function getIEAtts(n){var o=[];if(n.nodeName=='OBJECT')return n.attributes;n.cloneNode(false).outerHTML.replace(/([a-z0-9\:\-_]+)=/gi,function(a,b){o.push({specified:1,nodeName:b});});return o;};function wildcardToRE(s){return s.replace(/([?+*])/g,'.$1');};tinymce.create('tinymce.dom.Serializer',{Serializer:function(s){var t=this;t.key=0;t.onPreProcess=new Dispatcher(t);t.onPostProcess=new Dispatcher(t);if(tinymce.relaxedDomain&&tinymce.isGecko){t.writer=new tinymce.dom.StringWriter();}else{try{t.writer=new tinymce.dom.XMLWriter();}catch(ex){t.writer=new tinymce.dom.StringWriter();}}t.settings=s=extend({dom:tinymce.DOM,valid_nodes:0,node_filter:0,attr_filter:0,invalid_attrs:/^(mce_|_moz_)/,closed:/(br|hr|input|meta|img|link|param)/,entity_encoding:'named',entities:'160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro',valid_elements:'*[*]',extended_valid_elements:0,valid_child_elements:0,invalid_elements:0,fix_table_elements:0,fix_list_elements:true,fix_content_duplication:true,convert_fonts_to_spans:false,font_size_classes:0,font_size_style_values:0,apply_source_formatting:0,indent_mode:'simple',indent_char:'\t',indent_levels:1,remove_linebreaks:1},s);t.dom=s.dom;if(s.fix_list_elements){t.onPreProcess.add(function(se,o){var nl,x,a=['ol','ul'],i,n,p,r=/^(OL|UL)$/,np;function prevNode(e,n){var a=n.split(','),i;while((e=e.previousSibling)!=null){for(i=0;i<a.length;i++){if(e.nodeName==a[i])return e;}}return null;};for(x=0;x<a.length;x++){nl=t.dom.select(a[x],o.node);for(i=0;i<nl.length;i++){n=nl[i];p=n.parentNode;if(r.test(p.nodeName)){np=prevNode(n,'LI');if(!np){np=t.dom.create('li');np.innerHTML='&nbsp;';np.appendChild(n);p.insertBefore(np,p.firstChild);}else np.appendChild(n);}}}});}if(s.fix_table_elements){t.onPreProcess.add(function(se,o){each(t.dom.select('table',o.node),function(e){var pa=t.dom.getParent(e,'H1,H2,H3,H4,H5,H6,P'),pa2,n,tm,pl=[],i,ns;if(pa){pa2=pa.cloneNode(false);pl.push(e);for(n=e;n=n.parentNode;){pl.push(n);if(n==pa)break;}tm=pa2;for(i=pl.length-1;i>=0;i--){if(i==pl.length-1){while(ns=pl[i-1].nextSibling)tm.appendChild(ns.parentNode.removeChild(ns));}else{n=pl[i].cloneNode(false);if(i!=0){while(ns=pl[i-1].nextSibling)n.appendChild(ns.parentNode.removeChild(ns));}tm=tm.appendChild(n);}}e=t.dom.insertAfter(e.parentNode.removeChild(e),pa);t.dom.insertAfter(e,pa);t.dom.insertAfter(pa2,e);}});});}},setEntities:function(s){var t=this,a,i,l={},re='',v;if(t.entityLookup)return;a=s.split(',');for(i=0;i<a.length;i+=2){v=a[i];if(v==34||v==38||v==60||v==62)continue;l[String.fromCharCode(a[i])]=a[i+1];v=parseInt(a[i]).toString(16);re+='\\u'+'0000'.substring(v.length)+v;}if(!re){t.settings.entity_encoding='raw';return;}t.entitiesRE=new RegExp('['+re+']','g');t.entityLookup=l;},setValidChildRules:function(s){this.childRules=null;this.addValidChildRules(s);},addValidChildRules:function(s){var t=this,inst,intr,bloc;if(!s)return;inst='A|BR|SPAN|BDO|MAP|OBJECT|IMG|TT|I|B|BIG|SMALL|EM|STRONG|DFN|CODE|Q|SAMP|KBD|VAR|CITE|ABBR|ACRONYM|SUB|SUP|#text|#comment';intr='A|BR|SPAN|BDO|OBJECT|APPLET|IMG|MAP|IFRAME|TT|I|B|U|S|STRIKE|BIG|SMALL|FONT|BASEFONT|EM|STRONG|DFN|CODE|Q|SAMP|KBD|VAR|CITE|ABBR|ACRONYM|SUB|SUP|INPUT|SELECT|TEXTAREA|LABEL|BUTTON|#text|#comment';bloc='H[1-6]|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|FORM|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP';each(s.split(','),function(s){var p=s.split(/\[|\]/),re;s='';each(p[1].split('|'),function(v){if(s)s+='|';switch(v){case'%itrans':v=intr;break;case'%itrans_na':v=intr.substring(2);break;case'%istrict':v=inst;break;case'%istrict_na':v=inst.substring(2);break;case'%btrans':v=bloc;break;case'%bstrict':v=bloc;break;}s+=v;});re=new RegExp('^('+s.toLowerCase()+')$','i');each(p[0].split('/'),function(s){t.childRules=t.childRules||{};t.childRules[s]=re;});});s='';each(t.childRules,function(v,k){if(s)s+='|';s+=k;});t.parentElementsRE=new RegExp('^('+s.toLowerCase()+')$','i');},setRules:function(s){var t=this;t._setup();t.rules={};t.wildRules=[];t.validElements={};return t.addRules(s);},addRules:function(s){var t=this,dr;if(!s)return;t._setup();each(s.split(','),function(s){var p=s.split(/\[|\]/),tn=p[0].split('/'),ra,at,wat,va=[];if(dr)at=tinymce.extend([],dr.attribs);if(p.length>1){each(p[1].split('|'),function(s){var ar={},i;at=at||[];s=s.replace(/::/g,'~');s=/^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(s);s[2]=s[2].replace(/~/g,':');if(s[1]=='!'){ra=ra||[];ra.push(s[2]);}if(s[1]=='-'){for(i=0;i<at.length;i++){if(at[i].name==s[2]){at.splice(i,1);return;}}}switch(s[3]){case'=':ar.defaultVal=s[4]||'';break;case':':ar.forcedVal=s[4];break;case'<':ar.validVals=s[4].split('?');break;}if(/[*.?]/.test(s[2])){wat=wat||[];ar.nameRE=new RegExp('^'+wildcardToRE(s[2])+'$');wat.push(ar);}else{ar.name=s[2];at.push(ar);}va.push(s[2]);});}each(tn,function(s,i){var pr=s.charAt(0),x=1,ru={};if(dr){if(dr.noEmpty)ru.noEmpty=dr.noEmpty;if(dr.fullEnd)ru.fullEnd=dr.fullEnd;if(dr.padd)ru.padd=dr.padd;}switch(pr){case'-':ru.noEmpty=true;break;case'+':ru.fullEnd=true;break;case'#':ru.padd=true;break;default:x=0;}tn[i]=s=s.substring(x);t.validElements[s]=1;if(/[*.?]/.test(tn[0])){ru.nameRE=new RegExp('^'+wildcardToRE(tn[0])+'$');t.wildRules=t.wildRules||{};t.wildRules.push(ru);}else{ru.name=tn[0];if(tn[0]=='@')dr=ru;t.rules[s]=ru;}ru.attribs=at;if(ra)ru.requiredAttribs=ra;if(wat){s='';each(va,function(v){if(s)s+='|';s+='('+wildcardToRE(v)+')';});ru.validAttribsRE=new RegExp('^'+s.toLowerCase()+'$');ru.wildAttribs=wat;}});});s='';each(t.validElements,function(v,k){if(s)s+='|';if(k!='@')s+=k;});t.validElementsRE=new RegExp('^('+wildcardToRE(s.toLowerCase())+')$');},findRule:function(n){var t=this,rl=t.rules,i,r;t._setup();r=rl[n];if(r)return r;rl=t.wildRules;for(i=0;i<rl.length;i++){if(rl[i].nameRE.test(n))return rl[i];}return null;},findAttribRule:function(ru,n){var i,wa=ru.wildAttribs;for(i=0;i<wa.length;i++){if(wa[i].nameRE.test(n))return wa[i];}return null;},serialize:function(n,o){var h,t=this;t._setup();o=o||{};o.format=o.format||'html';t.processObj=o;n=n.cloneNode(true);t.key=''+(parseInt(t.key)+1);if(!o.no_events){o.node=n;t.onPreProcess.dispatch(t,o);}t.writer.reset();t._serializeNode(n,o.getInner);o.content=t.writer.getContent();if(!o.no_events)t.onPostProcess.dispatch(t,o);t._postProcess(o);o.node=null;return tinymce.trim(o.content);},_postProcess:function(o){var t=this,s=t.settings,h=o.content,sc=[],p;if(o.format=='html'){p=t._protect({content:h,patterns:[{pattern:/(<script[^>]*>)(.*?)(<\/script>)/g},{pattern:/(<style[^>]*>)(.*?)(<\/style>)/g},{pattern:/(<pre[^>]*>)(.*?)(<\/pre>)/g,encode:1}]});h=p.content;if(s.entity_encoding!=='raw')h=t._encode(h);if(!o.set){h=h.replace(/<p>\s+<\/p>|<p([^>]+)>\s+<\/p>/g,s.entity_encoding=='numeric'?'<p$1>&#160;</p>':'<p$1>&nbsp;</p>');if(s.remove_linebreaks){h=h.replace(/\r?\n|\r/g,' ');h=h.replace(/(<[^>]+>)\s+/g,'$1 ');h=h.replace(/\s+(<\/[^>]+>)/g,' $1');h=h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object) ([^>]+)>\s+/g,'<$1 $2>');h=h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>\s+/g,'<$1>');h=h.replace(/\s+<\/(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>/g,'</$1>');}if(s.apply_source_formatting&&s.indent_mode=='simple'){h=h.replace(/<(\/?)(ul|hr|table|meta|link|tbody|tr|object|body|head|html|map)(|[^>]+)>\s*/g,'\n<$1$2$3>\n');h=h.replace(/\s*<(p|h[1-6]|blockquote|div|title|style|pre|script|td|li|area)(|[^>]+)>/g,'\n<$1$2>');h=h.replace(/<\/(p|h[1-6]|blockquote|div|title|style|pre|script|td|li)>\s*/g,'</$1>\n');h=h.replace(/\n\n/g,'\n');}}h=t._unprotect(h,p);if(s.entity_encoding=='raw')h=h.replace(/<p>&nbsp;<\/p>|<p([^>]+)>&nbsp;<\/p>/g,'<p$1>\u00a0</p>');}o.content=h;},_serializeNode:function(n,inn){var t=this,s=t.settings,w=t.writer,hc,el,cn,i,l,a,at,no,v,nn,ru,ar,iv;if(!s.node_filter||s.node_filter(n)){switch(n.nodeType){case 1:if(n.hasAttribute?n.hasAttribute('mce_bogus'):n.getAttribute('mce_bogus'))return;iv=false;hc=n.hasChildNodes();nn=n.getAttribute('mce_name')||n.nodeName.toLowerCase();if(isIE){if(n.scopeName!=='HTML'&&n.scopeName!=='html')nn=n.scopeName+':'+nn;}if(nn.indexOf('mce:')===0)nn=nn.substring(4);if(!t.validElementsRE.test(nn)||(t.invalidElementsRE&&t.invalidElementsRE.test(nn))||inn){iv=true;break;}if(isIE){if(s.fix_content_duplication){if(n.mce_serialized==t.key)return;n.mce_serialized=t.key;}if(nn.charAt(0)=='/')nn=nn.substring(1);}else if(isGecko){if(n.nodeName==='BR'&&n.getAttribute('type')=='_moz')return;}if(t.childRules){if(t.parentElementsRE.test(t.elementName)){if(!t.childRules[t.elementName].test(nn)){iv=true;break;}}t.elementName=nn;}ru=t.findRule(nn);nn=ru.name||nn;if((!hc&&ru.noEmpty)||(isIE&&!nn)){iv=true;break;}if(ru.requiredAttribs){a=ru.requiredAttribs;for(i=a.length-1;i>=0;i--){if(this.dom.getAttrib(n,a[i])!=='')break;}if(i==-1){iv=true;break;}}w.writeStartElement(nn);if(ru.attribs){for(i=0,at=ru.attribs,l=at.length;i<l;i++){a=at[i];v=t._getAttrib(n,a);if(v!==null)w.writeAttribute(a.name,v);}}if(ru.validAttribsRE){at=isIE?getIEAtts(n):n.attributes;for(i=at.length-1;i>-1;i--){no=at[i];if(no.specified){a=no.nodeName.toLowerCase();if(s.invalid_attrs.test(a)||!ru.validAttribsRE.test(a))continue;ar=t.findAttribRule(ru,a);v=t._getAttrib(n,ar,a);if(v!==null)w.writeAttribute(a,v);}}}if(!hc&&ru.padd)w.writeText('\u00a0');break;case 3:if(t.childRules&&t.parentElementsRE.test(t.elementName)){if(!t.childRules[t.elementName].test(n.nodeName))return;}return w.writeText(n.nodeValue);case 4:return w.writeCDATA(n.nodeValue);case 8:return w.writeComment(n.nodeValue);}}else if(n.nodeType==1)hc=n.hasChildNodes();if(hc){cn=n.firstChild;while(cn){t._serializeNode(cn);t.elementName=nn;cn=cn.nextSibling;}}if(!iv){if(hc||!s.closed.test(nn))w.writeFullEndElement();else w.writeEndElement();}},_protect:function(o){var t=this;o.items=o.items||[];function enc(s){return s.replace(/[\r\n\\]/g,function(c){if(c==='\n')return'\\n';else if(c==='\\')return'\\\\';return'\\r';});};function dec(s){return s.replace(/\\[\\rn]/g,function(c){if(c==='\\n')return'\n';else if(c==='\\\\')return'\\';return'\r';});};each(o.patterns,function(p){o.content=dec(enc(o.content).replace(p.pattern,function(x,a,b,c){b=dec(b);if(p.encode)b=t._encode(b);o.items.push(b);return a+'<!--mce:'+(o.items.length-1)+'-->'+c;}));});return o;},_unprotect:function(h,o){h=h.replace(/\<!--mce:([0-9]+)--\>/g,function(a,b){return o.items[parseInt(b)];});o.items=[];return h;},_encode:function(h){var t=this,s=t.settings,l;if(s.entity_encoding!=='raw'){if(s.entity_encoding.indexOf('named')!=-1){t.setEntities(s.entities);l=t.entityLookup;h=h.replace(t.entitiesRE,function(a){var v;if(v=l[a])a='&'+v+';';return a;});}if(s.entity_encoding.indexOf('numeric')!=-1){h=h.replace(/[\u007E-\uFFFF]/g,function(a){return'&#'+a.charCodeAt(0)+';';});}}return h;},_setup:function(){var t=this,s=this.settings;if(t.done)return;t.done=1;t.setRules(s.valid_elements);t.addRules(s.extended_valid_elements);t.addValidChildRules(s.valid_child_elements);if(s.invalid_elements)t.invalidElementsRE=new RegExp('^('+wildcardToRE(s.invalid_elements.replace(/,/g,'|').toLowerCase())+')$');if(s.attrib_value_filter)t.attribValueFilter=s.attribValueFilter;},_getAttrib:function(n,a,na){var i,v;na=na||a.name;if(a.forcedVal&&(v=a.forcedVal)){if(v==='{$uid}')return this.dom.uniqueId();return v;}v=this.dom.getAttrib(n,na);switch(na){case'rowspan':case'colspan':if(v=='1')v='';break;}if(this.attribValueFilter)v=this.attribValueFilter(na,v,n);if(a.validVals){for(i=a.validVals.length-1;i>=0;i--){if(v==a.validVals[i])break;}if(i==-1)return null;}if(v===''&&typeof(a.defaultVal)!='undefined'){v=a.defaultVal;if(v==='{$uid}')return this.dom.uniqueId();return v;}else{if(na=='class'&&this.processObj.get)v=v.replace(/\s?mceItem\w+\s?/g,'');}if(v==='')return null;return v;}});})();(function(){var each=tinymce.each;tinymce.create('tinymce.dom.ScriptLoader',{ScriptLoader:function(s){this.settings=s||{};this.queue=[];this.lookup={};},isDone:function(u){return this.lookup[u]?this.lookup[u].state==2:0;},markDone:function(u){this.lookup[u]={state:2,url:u};},add:function(u,cb,s,pr){var t=this,lo=t.lookup,o;if(o=lo[u]){if(cb&&o.state==2)cb.call(s||this);return o;}o={state:0,url:u,func:cb,scope:s||this};if(pr)t.queue.unshift(o);else t.queue.push(o);lo[u]=o;return o;},load:function(u,cb,s){var t=this,o;if(o=t.lookup[u]){if(cb&&o.state==2)cb.call(s||t);return o;}function loadScript(u){if(tinymce.dom.Event.domLoaded||t.settings.strict_mode){tinymce.util.XHR.send({url:tinymce._addVer(u),error:t.settings.error,async:false,success:function(co){t.eval(co);}});}else document.write('<script type="text/javascript" src="'+tinymce._addVer(u)+'"></script>');};if(!tinymce.is(u,'string')){each(u,function(u){loadScript(u);});if(cb)cb.call(s||t);}else{loadScript(u);if(cb)cb.call(s||t);}},loadQueue:function(cb,s){var t=this;if(!t.queueLoading){t.queueLoading=1;t.queueCallbacks=[];t.loadScripts(t.queue,function(){t.queueLoading=0;if(cb)cb.call(s||t);each(t.queueCallbacks,function(o){o.func.call(o.scope);});});}else if(cb)t.queueCallbacks.push({func:cb,scope:s||t});},eval:function(co){var w=window;if(!w.execScript){try{eval.call(w,co);}catch(ex){eval(co,w);}}else w.execScript(co);},loadScripts:function(sc,cb,s){var t=this,lo=t.lookup;function done(o){o.state=2;if(o.func)o.func.call(o.scope||t);};function allDone(){var l;l=sc.length;each(sc,function(o){o=lo[o.url];if(o.state===2){done(o);l--;}else load(o);});if(l===0&&cb){cb.call(s||t);cb=0;}};function load(o){if(o.state>0)return;o.state=1;tinymce.util.XHR.send({url:o.url,error:t.settings.error,success:function(co){t.eval(co);done(o);allDone();}});};each(sc,function(o){var u=o.url;if(!lo[u]){lo[u]=o;t.queue.push(o);}else o=lo[u];if(o.state>0)return;if(!tinymce.dom.Event.domLoaded&&!t.settings.strict_mode){var ix,ol='';if(cb||o.func){o.state=1;ix=tinymce.dom.ScriptLoader._addOnLoad(function(){done(o);allDone();});if(tinymce.isIE)ol=' onreadystatechange="';else ol=' onload="';ol+='tinymce.dom.ScriptLoader._onLoad(this,\''+u+'\','+ix+');"';}document.write('<script type="text/javascript" src="'+tinymce._addVer(u)+'"'+ol+'></script>');if(!o.func)done(o);}else load(o);});allDone();},'static':{_addOnLoad:function(f){var t=this;t._funcs=t._funcs||[];t._funcs.push(f);return t._funcs.length-1;},_onLoad:function(e,u,ix){if(!tinymce.isIE||e.readyState=='complete')this._funcs[ix].call(this);}}});tinymce.ScriptLoader=new tinymce.dom.ScriptLoader();})();(function(){var DOM=tinymce.DOM,is=tinymce.is;tinymce.create('tinymce.ui.Control',{Control:function(id,s){this.id=id;this.settings=s=s||{};this.rendered=false;this.onRender=new tinymce.util.Dispatcher(this);this.classPrefix='';this.scope=s.scope||this;this.disabled=0;this.active=0;},setDisabled:function(s){var e;if(s!=this.disabled){e=DOM.get(this.id);if(e&&this.settings.unavailable_prefix){if(s){this.prevTitle=e.title;e.title=this.settings.unavailable_prefix+": "+e.title;}else e.title=this.prevTitle;}this.setState('Disabled',s);this.setState('Enabled',!s);this.disabled=s;}},isDisabled:function(){return this.disabled;},setActive:function(s){if(s!=this.active){this.setState('Active',s);this.active=s;}},isActive:function(){return this.active;},setState:function(c,s){var n=DOM.get(this.id);c=this.classPrefix+c;if(s)DOM.addClass(n,c);else DOM.removeClass(n,c);},isRendered:function(){return this.rendered;},renderHTML:function(){},renderTo:function(n){DOM.setHTML(n,this.renderHTML());},postRender:function(){var t=this,b;if(is(t.disabled)){b=t.disabled;t.disabled=-1;t.setDisabled(b);}if(is(t.active)){b=t.active;t.active=-1;t.setActive(b);}},remove:function(){DOM.remove(this.id);this.destroy();},destroy:function(){tinymce.dom.Event.clear(this.id);}});})();tinymce.create('tinymce.ui.Container:tinymce.ui.Control',{Container:function(id,s){this.parent(id,s);this.controls=[];this.lookup={};},add:function(c){this.lookup[c.id]=c;this.controls.push(c);return c;},get:function(n){return this.lookup[n];}});tinymce.create('tinymce.ui.Separator:tinymce.ui.Control',{Separator:function(id,s){this.parent(id,s);this.classPrefix='mceSeparator';},renderHTML:function(){return tinymce.DOM.createHTML('span',{'class':this.classPrefix});}});(function(){var is=tinymce.is,DOM=tinymce.DOM,each=tinymce.each,walk=tinymce.walk;tinymce.create('tinymce.ui.MenuItem:tinymce.ui.Control',{MenuItem:function(id,s){this.parent(id,s);this.classPrefix='mceMenuItem';},setSelected:function(s){this.setState('Selected',s);this.selected=s;},isSelected:function(){return this.selected;},postRender:function(){var t=this;t.parent();if(is(t.selected))t.setSelected(t.selected);}});})();(function(){var is=tinymce.is,DOM=tinymce.DOM,each=tinymce.each,walk=tinymce.walk;tinymce.create('tinymce.ui.Menu:tinymce.ui.MenuItem',{Menu:function(id,s){var t=this;t.parent(id,s);t.items={};t.collapsed=false;t.menuCount=0;t.onAddItem=new tinymce.util.Dispatcher(this);},expand:function(d){var t=this;if(d){walk(t,function(o){if(o.expand)o.expand();},'items',t);}t.collapsed=false;},collapse:function(d){var t=this;if(d){walk(t,function(o){if(o.collapse)o.collapse();},'items',t);}t.collapsed=true;},isCollapsed:function(){return this.collapsed;},add:function(o){if(!o.settings)o=new tinymce.ui.MenuItem(o.id||DOM.uniqueId(),o);this.onAddItem.dispatch(this,o);return this.items[o.id]=o;},addSeparator:function(){return this.add({separator:true});},addMenu:function(o){if(!o.collapse)o=this.createMenu(o);this.menuCount++;return this.add(o);},hasMenus:function(){return this.menuCount!==0;},remove:function(o){delete this.items[o.id];},removeAll:function(){var t=this;walk(t,function(o){if(o.removeAll)o.removeAll();else o.remove();o.destroy();},'items',t);t.items={};},createMenu:function(o){var m=new tinymce.ui.Menu(o.id||DOM.uniqueId(),o);m.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return m;}});})();(function(){var is=tinymce.is,DOM=tinymce.DOM,each=tinymce.each,Event=tinymce.dom.Event,Element=tinymce.dom.Element;tinymce.create('tinymce.ui.DropMenu:tinymce.ui.Menu',{DropMenu:function(id,s){s=s||{};s.container=s.container||DOM.doc.body;s.offset_x=s.offset_x||0;s.offset_y=s.offset_y||0;s.vp_offset_x=s.vp_offset_x||0;s.vp_offset_y=s.vp_offset_y||0;if(is(s.icons)&&!s.icons)s['class']+=' mceNoIcons';this.parent(id,s);this.onShowMenu=new tinymce.util.Dispatcher(this);this.onHideMenu=new tinymce.util.Dispatcher(this);this.classPrefix='mceMenu';},createMenu:function(s){var t=this,cs=t.settings,m;s.container=s.container||cs.container;s.parent=t;s.constrain=s.constrain||cs.constrain;s['class']=s['class']||cs['class'];s.vp_offset_x=s.vp_offset_x||cs.vp_offset_x;s.vp_offset_y=s.vp_offset_y||cs.vp_offset_y;m=new tinymce.ui.DropMenu(s.id||DOM.uniqueId(),s);m.onAddItem.add(t.onAddItem.dispatch,t.onAddItem);return m;},update:function(){var t=this,s=t.settings,tb=DOM.get('menu_'+t.id+'_tbl'),co=DOM.get('menu_'+t.id+'_co'),tw,th;tw=s.max_width?Math.min(tb.clientWidth,s.max_width):tb.clientWidth;th=s.max_height?Math.min(tb.clientHeight,s.max_height):tb.clientHeight;if(!DOM.boxModel)t.element.setStyles({width:tw+2,height:th+2});else t.element.setStyles({width:tw,height:th});if(s.max_width)DOM.setStyle(co,'width',tw);if(s.max_height){DOM.setStyle(co,'height',th);if(tb.clientHeight<s.max_height)DOM.setStyle(co,'overflow','hidden');}},showMenu:function(x,y,px){var t=this,s=t.settings,co,vp=DOM.getViewPort(),w,h,mx,my,ot=2,dm,tb,cp=t.classPrefix;t.collapse(1);if(t.isMenuVisible)return;if(!t.rendered){co=DOM.add(t.settings.container,t.renderNode());each(t.items,function(o){o.postRender();});t.element=new Element('menu_'+t.id,{blocker:1,container:s.container});}else co=DOM.get('menu_'+t.id);if(!tinymce.isOpera)DOM.setStyles(co,{left:-0xFFFF,top:-0xFFFF});DOM.show(co);t.update();x+=s.offset_x||0;y+=s.offset_y||0;vp.w-=4;vp.h-=4;if(s.constrain){w=co.clientWidth-ot;h=co.clientHeight-ot;mx=vp.x+vp.w;my=vp.y+vp.h;if((x+s.vp_offset_x+w)>mx)x=px?px-w:Math.max(0,(mx-s.vp_offset_x)-w);if((y+s.vp_offset_y+h)>my)y=Math.max(0,(my-s.vp_offset_y)-h);}DOM.setStyles(co,{left:x,top:y});t.element.update();t.isMenuVisible=1;t.mouseClickFunc=Event.add(co,'click',function(e){var m;e=e.target;if(e&&(e=DOM.getParent(e,'TR'))&&!DOM.hasClass(e,cp+'ItemSub')){m=t.items[e.id];if(m.isDisabled())return;dm=t;while(dm){if(dm.hideMenu)dm.hideMenu();dm=dm.settings.parent;}if(m.settings.onclick)m.settings.onclick(e);return Event.cancel(e);}});if(t.hasMenus()){t.mouseOverFunc=Event.add(co,'mouseover',function(e){var m,r,mi;e=e.target;if(e&&(e=DOM.getParent(e,'TR'))){m=t.items[e.id];if(t.lastMenu)t.lastMenu.collapse(1);if(m.isDisabled())return;if(e&&DOM.hasClass(e,cp+'ItemSub')){r=DOM.getRect(e);m.showMenu((r.x+r.w-ot),r.y-ot,r.x);t.lastMenu=m;DOM.addClass(DOM.get(m.id).firstChild,cp+'ItemActive');}}});}t.onShowMenu.dispatch(t);if(s.keyboard_focus){Event.add(co,'keydown',t._keyHandler,t);DOM.select('a','menu_'+t.id)[0].focus();t._focusIdx=0;}},hideMenu:function(c){var t=this,co=DOM.get('menu_'+t.id),e;if(!t.isMenuVisible)return;Event.remove(co,'mouseover',t.mouseOverFunc);Event.remove(co,'click',t.mouseClickFunc);Event.remove(co,'keydown',t._keyHandler);DOM.hide(co);t.isMenuVisible=0;if(!c)t.collapse(1);if(t.element)t.element.hide();if(e=DOM.get(t.id))DOM.removeClass(e.firstChild,t.classPrefix+'ItemActive');t.onHideMenu.dispatch(t);},add:function(o){var t=this,co;o=t.parent(o);if(t.isRendered&&(co=DOM.get('menu_'+t.id)))t._add(DOM.select('tbody',co)[0],o);return o;},collapse:function(d){this.parent(d);this.hideMenu(1);},remove:function(o){DOM.remove(o.id);this.destroy();return this.parent(o);},destroy:function(){var t=this,co=DOM.get('menu_'+t.id);Event.remove(co,'mouseover',t.mouseOverFunc);Event.remove(co,'click',t.mouseClickFunc);if(t.element)t.element.remove();DOM.remove(co);},renderNode:function(){var t=this,s=t.settings,n,tb,co,w;w=DOM.create('div',{id:'menu_'+t.id,'class':s['class'],'style':'position:absolute;left:0;top:0;z-index:200000'});co=DOM.add(w,'div',{id:'menu_'+t.id+'_co','class':t.classPrefix+(s['class']?' '+s['class']:'')});t.element=new Element('menu_'+t.id,{blocker:1,container:s.container});if(s.menu_line)DOM.add(co,'span',{'class':t.classPrefix+'Line'});n=DOM.add(co,'table',{id:'menu_'+t.id+'_tbl',border:0,cellPadding:0,cellSpacing:0});tb=DOM.add(n,'tbody');each(t.items,function(o){t._add(tb,o);});t.rendered=true;return w;},_keyHandler:function(e){var t=this,kc=e.keyCode;function focus(d){var i=t._focusIdx+d,e=DOM.select('a','menu_'+t.id)[i];if(e){t._focusIdx=i;e.focus();}};switch(kc){case 38:focus(-1);return;case 40:focus(1);return;case 13:return;case 27:return this.hideMenu();}},_add:function(tb,o){var n,s=o.settings,a,ro,it,cp=this.classPrefix;if(s.separator){ro=DOM.add(tb,'tr',{id:o.id,'class':cp+'ItemSeparator'});DOM.add(ro,'td',{'class':cp+'ItemSeparator'});if(n=ro.previousSibling)DOM.addClass(n,'mceLast');return;}n=ro=DOM.add(tb,'tr',{id:o.id,'class':cp+'Item '+cp+'ItemEnabled'});n=it=DOM.add(n,'td');n=a=DOM.add(n,'a',{href:'javascript:;',onclick:"return false;",onmousedown:'return false;'});DOM.addClass(it,s['class']);DOM.add(n,'span',{'class':'mceIcon'+(s.icon?' mce_'+s.icon:'')});n=DOM.add(n,s.element||'span',{'class':'mceText',title:o.settings.title},o.settings.title);if(o.settings.style)DOM.setAttrib(n,'style',o.settings.style);if(tb.childNodes.length==1)DOM.addClass(ro,'mceFirst');if((n=ro.previousSibling)&&DOM.hasClass(n,cp+'ItemSeparator'))DOM.addClass(ro,'mceFirst');if(o.collapse)DOM.addClass(ro,cp+'ItemSub');if(n=ro.previousSibling)DOM.removeClass(n,'mceLast');DOM.addClass(ro,'mceLast');}});})();(function(){var DOM=tinymce.DOM;tinymce.create('tinymce.ui.Button:tinymce.ui.Control',{Button:function(id,s){this.parent(id,s);this.classPrefix='mceButton';},renderHTML:function(){var cp=this.classPrefix,s=this.settings,h,l;l=DOM.encode(s.label||'');h='<a id="'+this.id+'" href="javascript:;" class="'+cp+' '+cp+'Enabled '+s['class']+(l?' '+cp+'Labeled':'')+'" onmousedown="return false;" onclick="return false;" title="'+DOM.encode(s.title)+'">';if(s.image)h+='<img class="mceIcon" src="'+s.image+'" />'+l+'</a>';else h+='<span class="mceIcon '+s['class']+'"></span>'+(l?'<span class="'+cp+'Label">'+l+'</span>':'')+'</a>';return h;},postRender:function(){var t=this,s=t.settings;tinymce.dom.Event.add(t.id,'click',function(e){if(!t.isDisabled())return s.onclick.call(s.scope,e);});}});})();(function(){var DOM=tinymce.DOM,Event=tinymce.dom.Event,each=tinymce.each,Dispatcher=tinymce.util.Dispatcher;tinymce.create('tinymce.ui.ListBox:tinymce.ui.Control',{ListBox:function(id,s){var t=this;t.parent(id,s);t.items=[];t.onChange=new Dispatcher(t);t.onPostRender=new Dispatcher(t);t.onAdd=new Dispatcher(t);t.onRenderMenu=new tinymce.util.Dispatcher(this);t.classPrefix='mceListBox';},select:function(v){var t=this,e,fv;if(v!=t.selectedValue){e=DOM.get(t.id+'_text');t.selectedValue=v;each(t.items,function(o){if(o.value==v){DOM.setHTML(e,DOM.encode(o.title));fv=1;return false;}});if(!fv){DOM.setHTML(e,DOM.encode(t.settings.title));DOM.addClass(e,'mceTitle');e=0;return;}else DOM.removeClass(e,'mceTitle');}e=0;},add:function(n,v,o){var t=this;o=o||{};o=tinymce.extend(o,{title:n,value:v});t.items.push(o);t.onAdd.dispatch(t,o);},getLength:function(){return this.items.length;},renderHTML:function(){var h='',t=this,s=t.settings,cp=t.classPrefix;h='<table id="'+t.id+'" cellpadding="0" cellspacing="0" class="'+cp+' '+cp+'Enabled'+(s['class']?(' '+s['class']):'')+'"><tbody><tr>';h+='<td>'+DOM.createHTML('a',{id:t.id+'_text',href:'javascript:;','class':'mceText',onclick:"return false;",onmousedown:'return false;'},DOM.encode(t.settings.title))+'</td>';h+='<td>'+DOM.createHTML('a',{id:t.id+'_open',tabindex:-1,href:'javascript:;','class':'mceOpen',onclick:"return false;",onmousedown:'return false;'},'<span></span>')+'</td>';h+='</tr></tbody></table>';return h;},showMenu:function(){var t=this,p1,p2,e=DOM.get(this.id),m;if(t.isDisabled()||t.items.length==0)return;if(t.menu&&t.menu.isMenuVisible)return t.hideMenu();if(!t.isMenuRendered){t.renderMenu();t.isMenuRendered=true;}p1=DOM.getPos(this.settings.menu_container);p2=DOM.getPos(e);m=t.menu;m.settings.offset_x=p2.x;m.settings.offset_y=p2.y;m.settings.keyboard_focus=!tinymce.isOpera;if(t.oldID)m.items[t.oldID].setSelected(0);each(t.items,function(o){if(o.value===t.selectedValue){m.items[o.id].setSelected(1);t.oldID=o.id;}});m.showMenu(0,e.clientHeight);Event.add(DOM.doc,'mousedown',t.hideMenu,t);DOM.addClass(t.id,t.classPrefix+'Selected');},hideMenu:function(e){var t=this;if(e&&e.type=="mousedown"&&(e.target.id==t.id+'_text'||e.target.id==t.id+'_open'))return;if(!e||!DOM.getParent(e.target,function(n){return DOM.hasClass(n,'mceMenu');})){DOM.removeClass(t.id,t.classPrefix+'Selected');Event.remove(DOM.doc,'mousedown',t.hideMenu,t);if(t.menu)t.menu.hideMenu();}},renderMenu:function(){var t=this,m;m=t.settings.control_manager.createDropMenu(t.id+'_menu',{menu_line:1,'class':t.classPrefix+'Menu mceNoIcons',max_width:150,max_height:150});m.onHideMenu.add(t.hideMenu,t);m.add({title:t.settings.title,'class':'mceMenuItemTitle',onclick:function(){if(t.settings.onselect('')!==false)t.select('');}});each(t.items,function(o){o.id=DOM.uniqueId();o.onclick=function(){if(t.settings.onselect(o.value)!==false)t.select(o.value);};m.add(o);});t.onRenderMenu.dispatch(t,m);t.menu=m;},postRender:function(){var t=this,cp=t.classPrefix;Event.add(t.id,'click',t.showMenu,t);Event.add(t.id+'_text','focus',function(e){if(!t._focused){t.keyDownHandler=Event.add(t.id+'_text','keydown',function(e){var idx=-1,v,kc=e.keyCode;each(t.items,function(v,i){if(t.selectedValue==v.value)idx=i;});if(kc==38)v=t.items[idx-1];else if(kc==40)v=t.items[idx+1];else if(kc==13){v=t.selectedValue;t.selectedValue=null;t.settings.onselect(v);return Event.cancel(e);}if(v){t.hideMenu();t.select(v.value);}});}t._focused=1;});Event.add(t.id+'_text','blur',function(){Event.remove(t.id+'_text','keydown',t.keyDownHandler);t._focused=0;});if(tinymce.isIE6||!DOM.boxModel){Event.add(t.id,'mouseover',function(){if(!DOM.hasClass(t.id,cp+'Disabled'))DOM.addClass(t.id,cp+'Hover');});Event.add(t.id,'mouseout',function(){if(!DOM.hasClass(t.id,cp+'Disabled'))DOM.removeClass(t.id,cp+'Hover');});}t.onPostRender.dispatch(t,DOM.get(t.id));},destroy:function(){this.parent();Event.clear(this.id+'_text');}});})();(function(){var DOM=tinymce.DOM,Event=tinymce.dom.Event,each=tinymce.each,Dispatcher=tinymce.util.Dispatcher;tinymce.create('tinymce.ui.NativeListBox:tinymce.ui.ListBox',{NativeListBox:function(id,s){this.parent(id,s);this.classPrefix='mceNativeListBox';},setDisabled:function(s){DOM.get(this.id).disabled=s;},isDisabled:function(){return DOM.get(this.id).disabled;},select:function(v){var e=DOM.get(this.id),ol=e.options;v=''+(v||'');e.selectedIndex=0;each(ol,function(o,i){if(o.value==v){e.selectedIndex=i;return false;}});},add:function(n,v,a){var o,t=this;a=a||{};a.value=v;if(t.isRendered())DOM.add(DOM.get(this.id),'option',a,n);o={title:n,value:v,attribs:a};t.items.push(o);t.onAdd.dispatch(t,o);},getLength:function(){return DOM.get(this.id).options.length-1;},renderHTML:function(){var h,t=this;h=DOM.createHTML('option',{value:''},'-- '+t.settings.title+' --');each(t.items,function(it){h+=DOM.createHTML('option',{value:it.value},it.title);});h=DOM.createHTML('select',{id:t.id,'class':'mceNativeListBox'},h);return h;},postRender:function(){var t=this,ch;t.rendered=true;function onChange(e){var v=e.target.options[e.target.selectedIndex].value;t.onChange.dispatch(t,v);if(t.settings.onselect)t.settings.onselect(v);};Event.add(t.id,'change',onChange);Event.add(t.id,'keydown',function(e){var bf;Event.remove(t.id,'change',ch);bf=Event.add(t.id,'blur',function(){Event.add(t.id,'change',onChange);Event.remove(t.id,'blur',bf);});if(e.keyCode==13||e.keyCode==32){onChange(e);return Event.cancel(e);}});t.onPostRender.dispatch(t,DOM.get(t.id));}});})();(function(){var DOM=tinymce.DOM,Event=tinymce.dom.Event,each=tinymce.each;tinymce.create('tinymce.ui.MenuButton:tinymce.ui.Button',{MenuButton:function(id,s){this.parent(id,s);this.onRenderMenu=new tinymce.util.Dispatcher(this);s.menu_container=s.menu_container||DOM.doc.body;},showMenu:function(){var t=this,p1,p2,e=DOM.get(t.id),m;if(t.isDisabled())return;if(!t.isMenuRendered){t.renderMenu();t.isMenuRendered=true;}if(t.isMenuVisible)return t.hideMenu();p1=DOM.getPos(t.settings.menu_container);p2=DOM.getPos(e);m=t.menu;m.settings.offset_x=p2.x;m.settings.offset_y=p2.y;m.settings.vp_offset_x=p2.x;m.settings.vp_offset_y=p2.y;m.settings.keyboard_focus=t._focused;m.showMenu(0,e.clientHeight);Event.add(DOM.doc,'mousedown',t.hideMenu,t);t.setState('Selected',1);t.isMenuVisible=1;},renderMenu:function(){var t=this,m;m=t.settings.control_manager.createDropMenu(t.id+'_menu',{menu_line:1,'class':this.classPrefix+'Menu',icons:t.settings.icons});m.onHideMenu.add(t.hideMenu,t);t.onRenderMenu.dispatch(t,m);t.menu=m;},hideMenu:function(e){var t=this;if(e&&e.type=="mousedown"&&DOM.getParent(e.target,function(e){return e.id===t.id||e.id===t.id+'_open';}))return;if(!e||!DOM.getParent(e.target,function(n){return DOM.hasClass(n,'mceMenu');})){t.setState('Selected',0);Event.remove(DOM.doc,'mousedown',t.hideMenu,t);if(t.menu)t.menu.hideMenu();}t.isMenuVisible=0;},postRender:function(){var t=this,s=t.settings;Event.add(t.id,'click',function(){if(!t.isDisabled()){if(s.onclick)s.onclick(t.value);t.showMenu();}});}});})();(function(){var DOM=tinymce.DOM,Event=tinymce.dom.Event,each=tinymce.each;tinymce.create('tinymce.ui.SplitButton:tinymce.ui.MenuButton',{SplitButton:function(id,s){this.parent(id,s);this.classPrefix='mceSplitButton';},renderHTML:function(){var h,t=this,s=t.settings,h1;h='<tbody><tr>';if(s.image)h1=DOM.createHTML('img ',{src:s.image,'class':'mceAction '+s['class']});else h1=DOM.createHTML('span',{'class':'mceAction '+s['class']},'');h+='<td>'+DOM.createHTML('a',{id:t.id+'_action',href:'javascript:;','class':'mceAction '+s['class'],onclick:"return false;",onmousedown:'return false;',title:s.title},h1)+'</td>';h1=DOM.createHTML('span',{'class':'mceOpen '+s['class']});h+='<td>'+DOM.createHTML('a',{id:t.id+'_open',href:'javascript:;','class':'mceOpen '+s['class'],onclick:"return false;",onmousedown:'return false;',title:s.title},h1)+'</td>';h+='</tr></tbody>';return DOM.createHTML('table',{id:t.id,'class':'mceSplitButton mceSplitButtonEnabled '+s['class'],cellpadding:'0',cellspacing:'0',onmousedown:'return false;',title:s.title},h);},postRender:function(){var t=this,s=t.settings;if(s.onclick){Event.add(t.id+'_action','click',function(){if(!t.isDisabled())s.onclick(t.value);});}Event.add(t.id+'_open','click',t.showMenu,t);Event.add(t.id+'_open','focus',function(){t._focused=1;});Event.add(t.id+'_open','blur',function(){t._focused=0;});if(tinymce.isIE6||!DOM.boxModel){Event.add(t.id,'mouseover',function(){if(!DOM.hasClass(t.id,'mceSplitButtonDisabled'))DOM.addClass(t.id,'mceSplitButtonHover');});Event.add(t.id,'mouseout',function(){if(!DOM.hasClass(t.id,'mceSplitButtonDisabled'))DOM.removeClass(t.id,'mceSplitButtonHover');});}},destroy:function(){this.parent();Event.clear(this.id+'_action');Event.clear(this.id+'_open');}});})();(function(){var DOM=tinymce.DOM,Event=tinymce.dom.Event,is=tinymce.is,each=tinymce.each;tinymce.create('tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton',{ColorSplitButton:function(id,s){var t=this;t.parent(id,s);t.settings=s=tinymce.extend({colors:'000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF',grid_width:8,default_color:'#888888'},t.settings);t.onShowMenu=new tinymce.util.Dispatcher(t);t.onHideMenu=new tinymce.util.Dispatcher(t);t.value=s.default_color;},showMenu:function(){var t=this,r,p,e,p2;if(t.isDisabled())return;if(!t.isMenuRendered){t.renderMenu();t.isMenuRendered=true;}if(t.isMenuVisible)return t.hideMenu();e=DOM.get(t.id);DOM.show(t.id+'_menu');DOM.addClass(e,'mceSplitButtonSelected');p2=DOM.getPos(e);DOM.setStyles(t.id+'_menu',{left:p2.x,top:p2.y+e.clientHeight,zIndex:200000});e=0;Event.add(DOM.doc,'mousedown',t.hideMenu,t);if(t._focused){t._keyHandler=Event.add(t.id+'_menu','keydown',function(e){if(e.keyCode==27)t.hideMenu();});DOM.select('a',t.id+'_menu')[0].focus();}t.onShowMenu.dispatch(t);t.isMenuVisible=1;},hideMenu:function(e){var t=this;if(e&&e.type=="mousedown"&&DOM.getParent(e.target,function(e){return e.id===t.id+'_open';}))return;if(!e||!DOM.getParent(e.target,function(n){return DOM.hasClass(n,'mceSplitButtonMenu');})){DOM.removeClass(t.id,'mceSplitButtonSelected');Event.remove(DOM.doc,'mousedown',t.hideMenu,t);Event.remove(t.id+'_menu','keydown',t._keyHandler);DOM.hide(t.id+'_menu');}t.onHideMenu.dispatch(t);t.isMenuVisible=0;},renderMenu:function(){var t=this,m,i=0,s=t.settings,n,tb,tr,w;w=DOM.add(s.menu_container,'div',{id:t.id+'_menu','class':s['menu_class']+' '+s['class'],style:'position:absolute;left:0;top:-1000px;'});m=DOM.add(w,'div',{'class':s['class']+' mceSplitButtonMenu'});DOM.add(m,'span',{'class':'mceMenuLine'});n=DOM.add(m,'table',{'class':'mceColorSplitMenu'});tb=DOM.add(n,'tbody');i=0;each(is(s.colors,'array')?s.colors:s.colors.split(','),function(c){c=c.replace(/^#/,'');if(!i--){tr=DOM.add(tb,'tr');i=s.grid_width-1;}n=DOM.add(tr,'td');n=DOM.add(n,'a',{href:'javascript:;',style:{backgroundColor:'#'+c},mce_color:'#'+c});});if(s.more_colors_func){n=DOM.add(tb,'tr');n=DOM.add(n,'td',{colspan:s.grid_width,'class':'mceMoreColors'});n=DOM.add(n,'a',{id:t.id+'_more',href:'javascript:;',onclick:'return false;','class':'mceMoreColors'},s.more_colors_title);Event.add(n,'click',function(e){s.more_colors_func.call(s.more_colors_scope||this);return Event.cancel(e);});}DOM.addClass(m,'mceColorSplitMenu');Event.add(t.id+'_menu','click',function(e){var c;e=e.target;if(e.nodeName=='A'&&(c=e.getAttribute('mce_color')))t.setColor(c);return Event.cancel(e);});return w;},setColor:function(c){var t=this;DOM.setStyle(t.id+'_preview','backgroundColor',c);t.value=c;t.hideMenu();t.settings.onselect(c);},postRender:function(){var t=this,id=t.id;t.parent();DOM.add(id+'_action','div',{id:id+'_preview','class':'mceColorPreview'});},destroy:function(){this.parent();Event.clear(this.id+'_menu');Event.clear(this.id+'_more');DOM.remove(this.id+'_menu');}});})();tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container',{renderHTML:function(){var t=this,h='',c,co,dom=tinymce.DOM,s=t.settings,i,pr,nx,cl;cl=t.controls;for(i=0;i<cl.length;i++){co=cl[i];pr=cl[i-1];nx=cl[i+1];if(i===0){c='mceToolbarStart';if(co.Button)c+=' mceToolbarStartButton';else if(co.SplitButton)c+=' mceToolbarStartSplitButton';else if(co.ListBox)c+=' mceToolbarStartListBox';h+=dom.createHTML('td',{'class':c},dom.createHTML('span',null,'<!-- IE -->'));}if(pr&&co.ListBox){if(pr.Button||pr.SplitButton)h+=dom.createHTML('td',{'class':'mceToolbarEnd'},dom.createHTML('span',null,'<!-- IE -->'));}if(dom.stdMode)h+='<td style="position: relative">'+co.renderHTML()+'</td>';else h+='<td>'+co.renderHTML()+'</td>';if(nx&&co.ListBox){if(nx.Button||nx.SplitButton)h+=dom.createHTML('td',{'class':'mceToolbarStart'},dom.createHTML('span',null,'<!-- IE -->'));}}c='mceToolbarEnd';if(co.Button)c+=' mceToolbarEndButton';else if(co.SplitButton)c+=' mceToolbarEndSplitButton';else if(co.ListBox)c+=' mceToolbarEndListBox';h+=dom.createHTML('td',{'class':c},dom.createHTML('span',null,'<!-- IE -->'));return dom.createHTML('table',{id:t.id,'class':'mceToolbar'+(s['class']?' '+s['class']:''),cellpadding:'0',cellspacing:'0',align:t.settings.align||''},'<tbody><tr>'+h+'</tr></tbody>');}});(function(){var Dispatcher=tinymce.util.Dispatcher,each=tinymce.each;tinymce.create('tinymce.AddOnManager',{items:[],urls:{},lookup:{},onAdd:new Dispatcher(this),get:function(n){return this.lookup[n];},requireLangPack:function(n){var u,s;if(tinymce.EditorManager.settings){u=this.urls[n]+'/langs/'+tinymce.EditorManager.settings.language+'.js';s=tinymce.EditorManager.settings;if(s){if(!tinymce.dom.Event.domLoaded&&!s.strict_mode)tinymce.ScriptLoader.load(u);else tinymce.ScriptLoader.add(u);}}},add:function(id,o){this.items.push(o);this.lookup[id]=o;this.onAdd.dispatch(this,id,o);return o;},load:function(n,u,cb,s){var t=this;if(t.urls[n])return;if(u.indexOf('/')!=0&&u.indexOf('://')==-1)u=tinymce.baseURL+'/'+u;t.urls[n]=u.substring(0,u.lastIndexOf('/'));tinymce.ScriptLoader.add(u,cb,s);}});tinymce.PluginManager=new tinymce.AddOnManager();tinymce.ThemeManager=new tinymce.AddOnManager();}());(function(){var each=tinymce.each,extend=tinymce.extend,DOM=tinymce.DOM,Event=tinymce.dom.Event,ThemeManager=tinymce.ThemeManager,PluginManager=tinymce.PluginManager,explode=tinymce.explode;tinymce.create('static tinymce.EditorManager',{editors:{},i18n:{},activeEditor:null,preInit:function(){var t=this,lo=window.location;tinymce.documentBaseURL=lo.href.replace(/[\?#].*$/,'').replace(/[\/\\][^\/]+$/,'');if(!/[\/\\]$/.test(tinymce.documentBaseURL))tinymce.documentBaseURL+='/';tinymce.baseURL=new tinymce.util.URI(tinymce.documentBaseURL).toAbsolute(tinymce.baseURL);tinymce.EditorManager.baseURI=new tinymce.util.URI(tinymce.baseURL);if(tinymce.EditorManager.baseURI.host!=lo.hostname&&lo.hostname)document.domain=tinymce.relaxedDomain=lo.hostname.replace(/.*\.(.+\..+)$/,'$1');t.onBeforeUnload=new tinymce.util.Dispatcher(t);Event.add(window,'beforeunload',function(e){t.onBeforeUnload.dispatch(t,e);});},init:function(s){var t=this,pl,sl=tinymce.ScriptLoader,c,e;function execCallback(se,n,s){var f=se[n];if(!f)return;if(tinymce.is(f,'string')){s=f.replace(/\.\w+$/,'');s=s?tinymce.resolve(s):0;f=tinymce.resolve(f);}return f.apply(s||this,Array.prototype.slice.call(arguments,2));};s=extend({theme:"simple",language:"en",strict_loading_mode:document.contentType=='application/xhtml+xml'},s);t.settings=s;if(!Event.domLoaded&&!s.strict_loading_mode){if(s.language)sl.add(tinymce.baseURL+'/langs/'+s.language+'.js');if(s.theme&&s.theme.charAt(0)!='-'&&!ThemeManager.urls[s.theme])ThemeManager.load(s.theme,'themes/'+s.theme+'/editor_template'+tinymce.suffix+'.js');if(s.plugins){pl=explode(s.plugins);if(tinymce.inArray(pl,'compat2x')!=-1)PluginManager.load('compat2x','plugins/compat2x/editor_plugin'+tinymce.suffix+'.js');each(pl,function(v){if(v&&v.charAt(0)!='-'&&!PluginManager.urls[v]){if(!tinymce.isWebKit&&v=='safari')return;PluginManager.load(v,'plugins/'+v+'/editor_plugin'+tinymce.suffix+'.js');}});}sl.loadQueue();}Event.add(document,'init',function(){var l,co;execCallback(s,'onpageload');if(s.browsers){l=false;each(explode(s.browsers),function(v){switch(v){case'ie':case'msie':if(tinymce.isIE)l=true;break;case'gecko':if(tinymce.isGecko)l=true;break;case'safari':case'webkit':if(tinymce.isWebKit)l=true;break;case'opera':if(tinymce.isOpera)l=true;break;}});if(!l)return;}switch(s.mode){case"exact":l=s.elements||'';if(l.length>0){each(explode(l),function(v){if(DOM.get(v))new tinymce.Editor(v,s).render(1);else{c=0;each(document.forms,function(f){each(f.elements,function(e){if(e.name===v){v='mce_editor_'+c;DOM.setAttrib(e,'id',v);new tinymce.Editor(v,s).render(1);}});});}});}break;case"textareas":case"specific_textareas":function hasClass(n,c){return c.constructor===RegExp?c.test(n.className):DOM.hasClass(n,c);};each(DOM.select('textarea'),function(v){if(s.editor_deselector&&hasClass(v,s.editor_deselector))return;if(!s.editor_selector||hasClass(v,s.editor_selector)){e=DOM.get(v.name);if(!v.id&&!e)v.id=v.name;if(!v.id||t.get(v.id))v.id=DOM.uniqueId();new tinymce.Editor(v.id,s).render(1);}});break;}if(s.oninit){l=co=0;each(t.editors,function(ed){co++;if(!ed.initialized){ed.onInit.add(function(){l++;if(l==co)execCallback(s,'oninit');});}else l++;if(l==co)execCallback(s,'oninit');});}});},get:function(id){return this.editors[id];},getInstanceById:function(id){return this.get(id);},add:function(e){this.editors[e.id]=e;this._setActive(e);return e;},remove:function(e){var t=this;if(!t.editors[e.id])return null;delete t.editors[e.id];if(t.activeEditor==e){each(t.editors,function(e){t._setActive(e);return false;});}e.destroy();return e;},execCommand:function(c,u,v){var t=this,ed=t.get(v),w;switch(c){case"mceFocus":ed.focus();return true;case"mceAddEditor":case"mceAddControl":if(!t.get(v))new tinymce.Editor(v,t.settings).render();return true;case"mceAddFrameControl":w=v.window;w.tinyMCE=tinyMCE;w.tinymce=tinymce;tinymce.DOM.doc=w.document;tinymce.DOM.win=w;ed=new tinymce.Editor(v.element_id,v);ed.render();if(tinymce.isIE){function clr(){ed.destroy();w.detachEvent('onunload',clr);w=w.tinyMCE=w.tinymce=null;};w.attachEvent('onunload',clr);}v.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":ed.remove();return true;case'mceToggleEditor':if(!ed){t.execCommand('mceAddControl',0,v);return true;}if(ed.isHidden())ed.show();else ed.hide();return true;}if(t.activeEditor)return t.activeEditor.execCommand(c,u,v);return false;},execInstanceCommand:function(id,c,u,v){var ed=this.get(id);if(ed)return ed.execCommand(c,u,v);return false;},triggerSave:function(){each(this.editors,function(e){e.save();});},addI18n:function(p,o){var lo,i18n=this.i18n;if(!tinymce.is(p,'string')){each(p,function(o,lc){each(o,function(o,g){each(o,function(o,k){if(g==='common')i18n[lc+'.'+k]=o;else i18n[lc+'.'+g+'.'+k]=o;});});});}else{each(o,function(o,k){i18n[p+'.'+k]=o;});}},_setActive:function(e){this.selectedInstance=this.activeEditor=e;}});tinymce.EditorManager.preInit();})();var tinyMCE=window.tinyMCE=tinymce.EditorManager;(function(){var DOM=tinymce.DOM,Event=tinymce.dom.Event,extend=tinymce.extend,Dispatcher=tinymce.util.Dispatcher;var each=tinymce.each,isGecko=tinymce.isGecko,isIE=tinymce.isIE,isWebKit=tinymce.isWebKit;var is=tinymce.is,ThemeManager=tinymce.ThemeManager,PluginManager=tinymce.PluginManager,EditorManager=tinymce.EditorManager;var inArray=tinymce.inArray,grep=tinymce.grep,explode=tinymce.explode;tinymce.create('tinymce.Editor',{Editor:function(id,s){var t=this;t.id=t.editorId=id;t.execCommands={};t.queryStateCommands={};t.queryValueCommands={};t.plugins={};each(['onPreInit','onBeforeRenderUI','onPostRender','onInit','onRemove','onActivate','onDeactivate','onClick','onEvent','onMouseUp','onMouseDown','onDblClick','onKeyDown','onKeyUp','onKeyPress','onContextMenu','onSubmit','onReset','onPaste','onPreProcess','onPostProcess','onBeforeSetContent','onBeforeGetContent','onSetContent','onGetContent','onLoadContent','onSaveContent','onNodeChange','onChange','onBeforeExecCommand','onExecCommand','onUndo','onRedo','onVisualAid','onSetProgressState'],function(e){t[e]=new Dispatcher(t);});t.settings=s=extend({id:id,language:'en',docs_language:'en',theme:'simple',skin:'default',delta_width:0,delta_height:0,popup_css:'',plugins:'',document_base_url:tinymce.documentBaseURL,add_form_submit_trigger:1,submit_patch:1,add_unload_trigger:1,convert_urls:1,relative_urls:1,remove_script_host:1,table_inline_editing:0,object_resizing:1,cleanup:1,accessibility_focus:1,custom_shortcuts:1,custom_undo_redo_keyboard_shortcuts:1,custom_undo_redo_restore_selection:1,custom_undo_redo:1,doctype:'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">',visual_table_class:'mceItemTable',visual:1,inline_styles:true,convert_fonts_to_spans:true,font_size_style_values:'xx-small,x-small,small,medium,large,x-large,xx-large',apply_source_formatting:1,directionality:'ltr',forced_root_block:'p',valid_elements:'@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,#p[align],-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,-blockquote[cite],-table[border=0|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value],embed[type|width|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo,button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method],input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value],kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value],q[cite],samp,select[disabled|multiple|name|size],small,textarea[cols|rows|disabled|name|readonly],tt,var,big',hidden_input:1,padd_empty_editor:1,render_ui:1,init_theme:1,force_p_newlines:1,indentation:'30px'},s);t.documentBaseURI=new tinymce.util.URI(s.document_base_url||tinymce.documentBaseURL,{base_uri:tinyMCE.baseURI});t.baseURI=EditorManager.baseURI;t.execCallback('setup',t);},render:function(nst){var t=this,s=t.settings,id=t.id,sl=tinymce.ScriptLoader;if(!Event.domLoaded){Event.add(document,'init',function(){t.render();});return;}if(!nst){s.strict_loading_mode=1;tinyMCE.settings=s;}if(!t.getElement())return;if(s.strict_loading_mode){sl.settings.strict_mode=s.strict_loading_mode;tinymce.DOM.settings.strict=1;}if(!/TEXTAREA|INPUT/i.test(t.getElement().nodeName)&&s.hidden_input&&DOM.getParent(id,'form'))DOM.insertAfter(DOM.create('input',{type:'hidden',name:id}),id);t.windowManager=new tinymce.WindowManager(t);if(s.encoding=='xml'){t.onGetContent.add(function(ed,o){if(o.save)o.content=DOM.encode(o.content);});}if(s.add_form_submit_trigger){t.onSubmit.addToTop(function(){if(t.initialized){t.save();t.isNotDirty=1;}});}if(s.add_unload_trigger&&!s.ask){t._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(t.initialized&&!t.destroyed&&!t.isHidden())t.save({format:'raw',no_events:true});});}tinymce.addUnload(t.destroy,t);if(s.submit_patch){t.onBeforeRenderUI.add(function(){var n=t.getElement().form;if(!n)return;if(n._mceOldSubmit)return;if(!n.submit.nodeType&&!n.submit.length){t.formElement=n;n._mceOldSubmit=n.submit;n.submit=function(){EditorManager.triggerSave();t.isNotDirty=1;return this._mceOldSubmit(this);};}n=null;});}function loadScripts(){if(s.language)sl.add(tinymce.baseURL+'/langs/'+s.language+'.js');if(s.theme.charAt(0)!='-'&&!ThemeManager.urls[s.theme])ThemeManager.load(s.theme,'themes/'+s.theme+'/editor_template'+tinymce.suffix+'.js');each(explode(s.plugins),function(p){if(p&&p.charAt(0)!='-'&&!PluginManager.urls[p]){if(!isWebKit&&p=='safari')return;PluginManager.load(p,'plugins/'+p+'/editor_plugin'+tinymce.suffix+'.js');}});sl.loadQueue(function(){if(s.ask){function ask(){window.setTimeout(function(){Event.remove(t.id,'focus',ask);t.windowManager.confirm(t.getLang('edit_confirm'),function(s){if(s)t.init();});},0);};Event.add(t.id,'focus',ask);return;}if(!t.removed)t.init();});};if(s.plugins.indexOf('compat2x')!=-1){PluginManager.load('compat2x','plugins/compat2x/editor_plugin'+tinymce.suffix+'.js');sl.loadQueue(loadScripts);}else loadScripts();},init:function(){var n,t=this,s=t.settings,w,h,e=t.getElement(),o,ti,u,bi,bc,re;EditorManager.add(t);s.theme=s.theme.replace(/-/,'');o=ThemeManager.get(s.theme);t.theme=new o();if(t.theme.init&&s.init_theme)t.theme.init(t,ThemeManager.urls[s.theme]||tinymce.documentBaseURL.replace(/\/$/,''));each(explode(s.plugins.replace(/\-/g,'')),function(p){var c=PluginManager.get(p),u=PluginManager.urls[p]||tinymce.documentBaseURL.replace(/\/$/,''),po;if(c){po=new c(t,u);t.plugins[p]=po;if(po.init)po.init(t,u);}});if(s.popup_css)s.popup_css=t.documentBaseURI.toAbsolute(s.popup_css);else s.popup_css=t.baseURI.toAbsolute("themes/"+s.theme+"/skins/"+s.skin+"/dialog.css");if(s.popup_css_add)s.popup_css+=','+t.documentBaseURI.toAbsolute(s.popup_css_add);t.controlManager=new tinymce.ControlManager(t);t.undoManager=new tinymce.UndoManager(t);t.undoManager.onAdd.add(function(um,l){if(!l.initial)return t.onChange.dispatch(t,l,um);});t.undoManager.onUndo.add(function(um,l){return t.onUndo.dispatch(t,l,um);});t.undoManager.onRedo.add(function(um,l){return t.onRedo.dispatch(t,l,um);});if(s.custom_undo_redo){t.onExecCommand.add(function(ed,cmd,ui,val,a){if(cmd!='Undo'&&cmd!='Redo'&&cmd!='mceRepaint'&&(!a||!a.skip_undo))t.undoManager.add();});}t.onExecCommand.add(function(ed,c){if(!/^(FontName|FontSize)$/.test(c))t.nodeChanged();});if(isGecko){function repaint(a,o){if(!o||!o.initial)t.execCommand('mceRepaint');};t.onUndo.add(repaint);t.onRedo.add(repaint);t.onSetContent.add(repaint);}t.onBeforeRenderUI.dispatch(t,t.controlManager);if(s.render_ui){w=s.width||e.style.width||e.offsetWidth;h=s.height||e.style.height||e.offsetHeight;t.orgDisplay=e.style.display;re=/^[0-9\.]+(|px)$/i;if(re.test(''+w))w=Math.max(parseInt(w)+(o.deltaWidth||0),100);if(re.test(''+h))h=Math.max(parseInt(h)+(o.deltaHeight||0),100);o=t.theme.renderUI({targetNode:e,width:w,height:h,deltaWidth:s.delta_width,deltaHeight:s.delta_height});t.editorContainer=o.editorContainer;}DOM.setStyles(o.sizeContainer||o.editorContainer,{width:w,height:h});h=(o.iframeHeight||h)+((h+'').indexOf('%')==-1?(o.deltaHeight||0):'');if(h<100)h=100;t.iframeHTML=s.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="'+t.documentBaseURI.getURI()+'" />';t.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';if(tinymce.relaxedDomain)t.iframeHTML+='<script type="text/javascript">document.domain = "'+tinymce.relaxedDomain+'";</script>';bi=s.body_id||'tinymce';if(bi.indexOf('=')!=-1){bi=t.getParam('body_id','','hash');bi=bi[t.id]||bi;}bc=s.body_class||'';if(bc.indexOf('=')!=-1){bc=t.getParam('body_class','','hash');bc=bc[t.id]||'';}t.iframeHTML+='</head><body id="'+bi+'" class="mceContentBody '+bc+'"></body></html>';if(tinymce.relaxedDomain){if(isIE)u='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+t.id+'");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()';else if(tinymce.isOpera)u='javascript:(function(){document.open();document.domain="'+document.domain+'";document.close();ed.setupIframe();})()';}n=DOM.add(o.iframeContainer,'iframe',{id:t.id+"_ifr",src:u||'javascript:""',frameBorder:'0',style:{width:'100%',height:h}});t.contentAreaContainer=o.iframeContainer;DOM.get(o.editorContainer).style.display=t.orgDisplay;DOM.get(t.id).style.display='none';if(tinymce.isOldWebKit){Event.add(n,'load',t.setupIframe,t);n.src=tinymce.baseURL+'/plugins/safari/blank.htm';}else{if(!isIE||!tinymce.relaxedDomain)t.setupIframe();e=n=o=null;}},setupIframe:function(){var t=this,s=t.settings,e=DOM.get(t.id),d=t.getDoc(),h,b;if(!isIE||!tinymce.relaxedDomain){d.open();d.write(t.iframeHTML);d.close();}if(!isIE){try{d.designMode='On';}catch(ex){}}if(isIE){b=t.getBody();DOM.hide(b);b.contentEditable=true;DOM.show(b);}t.dom=new tinymce.DOM.DOMUtils(t.getDoc(),{keep_values:true,url_converter:t.convertURL,url_converter_scope:t,hex_colors:s.force_hex_style_colors,class_filter:s.class_filter,update_styles:1,fix_ie_paragraphs:1});t.serializer=new tinymce.dom.Serializer({entity_encoding:s.entity_encoding,entities:s.entities,valid_elements:s.verify_html===false?'*[*]':s.valid_elements,extended_valid_elements:s.extended_valid_elements,valid_child_elements:s.valid_child_elements,invalid_elements:s.invalid_elements,fix_table_elements:s.fix_table_elements,fix_list_elements:s.fix_list_elements,fix_content_duplication:s.fix_content_duplication,convert_fonts_to_spans:s.convert_fonts_to_spans,font_size_classes:s.font_size_classes,font_size_style_values:s.font_size_style_values,apply_source_formatting:s.apply_source_formatting,remove_linebreaks:s.remove_linebreaks,dom:t.dom});t.selection=new tinymce.dom.Selection(t.dom,t.getWin(),t.serializer);t.forceBlocks=new tinymce.ForceBlocks(t,{forced_root_block:s.forced_root_block});t.editorCommands=new tinymce.EditorCommands(t);t.serializer.onPreProcess.add(function(se,o){return t.onPreProcess.dispatch(t,o,se);});t.serializer.onPostProcess.add(function(se,o){return t.onPostProcess.dispatch(t,o,se);});t.onPreInit.dispatch(t);if(!s.gecko_spellcheck)t.getBody().spellcheck=0;t._addEvents();t.controlManager.onPostRender.dispatch(t,t.controlManager);t.onPostRender.dispatch(t);if(s.directionality)t.getBody().dir=s.directionality;if(s.nowrap)t.getBody().style.whiteSpace="nowrap";if(s.auto_resize)t.onNodeChange.add(t.resizeToContent,t);if(s.custom_elements){function handleCustom(ed,o){each(explode(s.custom_elements),function(v){var n;if(v.indexOf('~')===0){v=v.substring(1);n='span';}else n='div';o.content=o.content.replace(new RegExp('<('+v+')([^>]*)>','g'),'<'+n+' mce_name="$1"$2>');o.content=o.content.replace(new RegExp('</('+v+')>','g'),'</'+n+'>');});};t.onBeforeSetContent.add(handleCustom);t.onPostProcess.add(function(ed,o){if(o.set)handleCustom(ed,o)});}if(s.handle_node_change_callback){t.onNodeChange.add(function(ed,cm,n){t.execCallback('handle_node_change_callback',t.id,n,-1,-1,true,t.selection.isCollapsed());});}if(s.save_callback){t.onSaveContent.add(function(ed,o){var h=t.execCallback('save_callback',t.id,o.content,t.getBody());if(h)o.content=h;});}if(s.onchange_callback){t.onChange.add(function(ed,l){t.execCallback('onchange_callback',t,l);});}if(s.convert_newlines_to_brs){t.onBeforeSetContent.add(function(ed,o){if(o.initial)o.content=o.content.replace(/\r?\n/g,'<br />');});}if(s.fix_nesting&&isIE){t.onBeforeSetContent.add(function(ed,o){o.content=t._fixNesting(o.content);});}if(s.preformatted){t.onPostProcess.add(function(ed,o){o.content=o.content.replace(/^\s*<pre.*?>/,'');o.content=o.content.replace(/<\/pre>\s*$/,'');if(o.set)o.content='<pre class="mceItemHidden">'+o.content+'</pre>';});}if(s.verify_css_classes){t.serializer.attribValueFilter=function(n,v){var s,cl;if(n=='class'){if(!t.classesRE){cl=t.dom.getClasses();if(cl.length>0){s='';each(cl,function(o){s+=(s?'|':'')+o['class'];});t.classesRE=new RegExp('('+s+')','gi');}}return!t.classesRE||/(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(v)||t.classesRE.test(v)?v:'';}return v;};}if(s.convert_fonts_to_spans)t._convertFonts();if(s.inline_styles)t._convertInlineElements();if(s.cleanup_callback){t.onBeforeSetContent.add(function(ed,o){o.content=t.execCallback('cleanup_callback','insert_to_editor',o.content,o);});t.onPreProcess.add(function(ed,o){if(o.set)t.execCallback('cleanup_callback','insert_to_editor_dom',o.node,o);if(o.get)t.execCallback('cleanup_callback','get_from_editor_dom',o.node,o);});t.onPostProcess.add(function(ed,o){if(o.set)o.content=t.execCallback('cleanup_callback','insert_to_editor',o.content,o);if(o.get)o.content=t.execCallback('cleanup_callback','get_from_editor',o.content,o);});}if(s.save_callback){t.onGetContent.add(function(ed,o){if(o.save)o.content=t.execCallback('save_callback',t.id,o.content,t.getBody());});}if(s.handle_event_callback){t.onEvent.add(function(ed,e,o){if(t.execCallback('handle_event_callback',e,ed,o)===false)Event.cancel(e);});}t.onSetContent.add(function(){t.addVisual(t.getBody());});if(s.padd_empty_editor){t.onPostProcess.add(function(ed,o){o.content=o.content.replace(/^(<p>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,'');});}if(isGecko){try{d.designMode='Off';d.designMode='On';}catch(ex){}}setTimeout(function(){if(t.removed)return;t.load({initial:true,format:(s.cleanup_on_startup?'html':'raw')});t.startContent=t.getContent({format:'raw'});t.undoManager.add({initial:true});t.initialized=true;t.onInit.dispatch(t);t.execCallback('setupcontent_callback',t.id,t.getBody(),t.getDoc());t.execCallback('init_instance_callback',t);t.focus(true);t.nodeChanged({initial:1});if(s.content_css){tinymce.each(explode(s.content_css),function(u){t.dom.loadCSS(t.documentBaseURI.toAbsolute(u));});}if(s.auto_focus){setTimeout(function(){var ed=EditorManager.get(s.auto_focus);ed.selection.select(ed.getBody(),1);ed.selection.collapse(1);ed.getWin().focus();},100);}},1);e=null;},focus:function(sf){var oed,t=this,ce=t.settings.content_editable;if(!sf){if(!ce&&(!isIE||t.selection.getNode().ownerDocument!=t.getDoc()))t.getWin().focus();}if(EditorManager.activeEditor!=t){if((oed=EditorManager.activeEditor)!=null)oed.onDeactivate.dispatch(oed,t);t.onActivate.dispatch(t,oed);}EditorManager._setActive(t);},execCallback:function(n){var t=this,f=t.settings[n],s;if(!f)return;if(t.callbackLookup&&(s=t.callbackLookup[n])){f=s.func;s=s.scope;}if(is(f,'string')){s=f.replace(/\.\w+$/,'');s=s?tinymce.resolve(s):0;f=tinymce.resolve(f);t.callbackLookup=t.callbackLookup||{};t.callbackLookup[n]={func:f,scope:s};}return f.apply(s||t,Array.prototype.slice.call(arguments,1));},translate:function(s){var c=this.settings.language,i18n=EditorManager.i18n;if(!s)return'';return i18n[c+'.'+s]||s.replace(/{\#([^}]+)\}/g,function(a,b){return i18n[c+'.'+b]||'{#'+b+'}';});},getLang:function(n,dv){return EditorManager.i18n[this.settings.language+'.'+n]||(is(dv)?dv:'{#'+n+'}');},getParam:function(n,dv,ty){var tr=tinymce.trim,v=is(this.settings[n])?this.settings[n]:dv,o;if(ty==='hash'){o={};if(is(v,'string')){each(v.indexOf('=')>0?v.split(/[;,](?![^=;,]*(?:[;,]|$))/):v.split(','),function(v){v=v.split('=');if(v.length>1)o[tr(v[0])]=tr(v[1]);else o[tr(v[0])]=tr(v);});}else o=v;return o;}return v;},nodeChanged:function(o){var t=this,s=t.selection,n=s.getNode()||t.getBody();if(t.initialized){t.onNodeChange.dispatch(t,o?o.controlManager||t.controlManager:t.controlManager,isIE&&n.ownerDocument!=t.getDoc()?t.getBody():n,s.isCollapsed(),o);}},addButton:function(n,s){var t=this;t.buttons=t.buttons||{};t.buttons[n]=s;},addCommand:function(n,f,s){this.execCommands[n]={func:f,scope:s||this};},addQueryStateHandler:function(n,f,s){this.queryStateCommands[n]={func:f,scope:s||this};},addQueryValueHandler:function(n,f,s){this.queryValueCommands[n]={func:f,scope:s||this};},addShortcut:function(pa,desc,cmd_func,sc){var t=this,c;if(!t.settings.custom_shortcuts)return false;t.shortcuts=t.shortcuts||{};if(is(cmd_func,'string')){c=cmd_func;cmd_func=function(){t.execCommand(c,false,null);};}if(is(cmd_func,'object')){c=cmd_func;cmd_func=function(){t.execCommand(c[0],c[1],c[2]);};}each(explode(pa),function(pa){var o={func:cmd_func,scope:sc||this,desc:desc,alt:false,ctrl:false,shift:false};each(explode(pa,'+'),function(v){switch(v){case'alt':case'ctrl':case'shift':o[v]=true;break;default:o.charCode=v.charCodeAt(0);o.keyCode=v.toUpperCase().charCodeAt(0);}});t.shortcuts[(o.ctrl?'ctrl':'')+','+(o.alt?'alt':'')+','+(o.shift?'shift':'')+','+o.keyCode]=o;});return true;},execCommand:function(cmd,ui,val,a){var t=this,s=0,o,st;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(cmd)&&(!a||!a.skip_focus))t.focus();o={};t.onBeforeExecCommand.dispatch(t,cmd,ui,val,o);if(o.terminate)return false;if(t.execCallback('execcommand_callback',t.id,t.selection.getNode(),cmd,ui,val)){t.onExecCommand.dispatch(t,cmd,ui,val,a);return true;}if(o=t.execCommands[cmd]){st=o.func.call(o.scope,ui,val);if(st!==true){t.onExecCommand.dispatch(t,cmd,ui,val,a);return st;}}each(t.plugins,function(p){if(p.execCommand&&p.execCommand(cmd,ui,val)){t.onExecCommand.dispatch(t,cmd,ui,val,a);s=1;return false;}});if(s)return true;if(t.theme.execCommand&&t.theme.execCommand(cmd,ui,val)){t.onExecCommand.dispatch(t,cmd,ui,val,a);return true;}if(t.editorCommands.execCommand(cmd,ui,val)){t.onExecCommand.dispatch(t,cmd,ui,val,a);return true;}t.getDoc().execCommand(cmd,ui,val);t.onExecCommand.dispatch(t,cmd,ui,val,a);},queryCommandState:function(c){var t=this,o,s;if(t._isHidden())return;if(o=t.queryStateCommands[c]){s=o.func.call(o.scope);if(s!==true)return s;}o=t.editorCommands.queryCommandState(c);if(o!==-1)return o;try{return this.getDoc().queryCommandState(c);}catch(ex){}},queryCommandValue:function(c){var t=this,o,s;if(t._isHidden())return;if(o=t.queryValueCommands[c]){s=o.func.call(o.scope);if(s!==true)return s;}o=t.editorCommands.queryCommandValue(c);if(is(o))return o;try{return this.getDoc().queryCommandValue(c);}catch(ex){}},show:function(){var t=this;DOM.show(t.getContainer());DOM.hide(t.id);t.load();},hide:function(){var t=this,d=t.getDoc();if(isIE&&d)d.execCommand('SelectAll');t.save();DOM.hide(t.getContainer());DOM.setStyle(t.id,'display',t.orgDisplay);},isHidden:function(){return!DOM.isHidden(this.id);},setProgressState:function(b,ti,o){this.onSetProgressState.dispatch(this,b,ti,o);return b;},resizeToContent:function(){var t=this;DOM.setStyle(t.id+"_ifr",'height',t.getBody().scrollHeight);},load:function(o){var t=this,e=t.getElement(),h;o=o||{};o.load=true;h=t.setContent(is(e.value)?e.value:e.innerHTML,o);o.element=e;if(!o.no_events)t.onLoadContent.dispatch(t,o);o.element=e=null;return h;},save:function(o){var t=this,e=t.getElement(),h,f;if(!t.initialized)return;o=o||{};o.save=true;if(!o.no_events){t.undoManager.typing=0;t.undoManager.add();}o.element=e;h=o.content=t.getContent(o);if(!o.no_events)t.onSaveContent.dispatch(t,o);h=o.content;if(!/TEXTAREA|INPUT/i.test(e.nodeName)){e.innerHTML=h;if(f=DOM.getParent(t.id,'form')){each(f.elements,function(e){if(e.name==t.id){e.value=h;return false;}});}}else e.value=h;o.element=e=null;return h;},setContent:function(h,o){var t=this;o=o||{};o.format=o.format||'html';o.set=true;o.content=h;if(!o.no_events)t.onBeforeSetContent.dispatch(t,o);if(!tinymce.isIE&&(h.length===0||/^\s+$/.test(h))){o.content=t.dom.setHTML(t.getBody(),'<br mce_bogus="1" />');o.format='raw';}o.content=t.dom.setHTML(t.getBody(),tinymce.trim(o.content));if(o.format!='raw'&&t.settings.cleanup){o.getInner=true;o.content=t.dom.setHTML(t.getBody(),t.serializer.serialize(t.getBody(),o));}if(!o.no_events)t.onSetContent.dispatch(t,o);return o.content;},getContent:function(o){var t=this,h;o=o||{};o.format=o.format||'html';o.get=true;if(!o.no_events)t.onBeforeGetContent.dispatch(t,o);if(o.format!='raw'&&t.settings.cleanup){o.getInner=true;h=t.serializer.serialize(t.getBody(),o);}else h=t.getBody().innerHTML;h=h.replace(/^\s*|\s*$/g,'');o.content=h;if(!o.no_events)t.onGetContent.dispatch(t,o);return o.content;},isDirty:function(){var t=this;return tinymce.trim(t.startContent)!=tinymce.trim(t.getContent({format:'raw',no_events:1}))&&!t.isNotDirty;},getContainer:function(){var t=this;if(!t.container)t.container=DOM.get(t.editorContainer||t.id+'_parent');return t.container;},getContentAreaContainer:function(){return this.contentAreaContainer;},getElement:function(){return DOM.get(this.settings.content_element||this.id);},getWin:function(){var t=this,e;if(!t.contentWindow){e=DOM.get(t.id+"_ifr");if(e)t.contentWindow=e.contentWindow;}return t.contentWindow;},getDoc:function(){var t=this,w;if(!t.contentDocument){w=t.getWin();if(w)t.contentDocument=w.document;}return t.contentDocument;},getBody:function(){return this.bodyElement||this.getDoc().body;},convertURL:function(u,n,e){var t=this,s=t.settings;if(s.urlconverter_callback)return t.execCallback('urlconverter_callback',u,e,true,n);if(!s.convert_urls||(e&&e.nodeName=='LINK')||u.indexOf('file:')===0)return u;if(s.relative_urls)return t.documentBaseURI.toRelative(u);u=t.documentBaseURI.toAbsolute(u,s.remove_script_host);return u;},addVisual:function(e){var t=this,s=t.settings;e=e||t.getBody();if(!is(t.hasVisual))t.hasVisual=s.visual;each(t.dom.select('table,a',e),function(e){var v;switch(e.nodeName){case'TABLE':v=t.dom.getAttrib(e,'border');if(!v||v=='0'){if(t.hasVisual)t.dom.addClass(e,s.visual_table_class);else t.dom.removeClass(e,s.visual_table_class);}return;case'A':v=t.dom.getAttrib(e,'name');if(v){if(t.hasVisual)t.dom.addClass(e,'mceItemAnchor');else t.dom.removeClass(e,'mceItemAnchor');}return;}});t.onVisualAid.dispatch(t,e,t.hasVisual);},remove:function(){var t=this,e=t.getContainer();t.removed=1;t.hide();t.execCallback('remove_instance_callback',t);t.onRemove.dispatch(t);t.onExecCommand.listeners=[];EditorManager.remove(t);DOM.remove(e);},destroy:function(s){var t=this;if(t.destroyed)return;if(!s){tinymce.removeUnload(t.destroy);tinyMCE.onBeforeUnload.remove(t._beforeUnload);if(t.theme.destroy)t.theme.destroy();t.controlManager.destroy();t.selection.destroy();t.dom.destroy();if(!t.settings.content_editable){Event.clear(t.getWin());Event.clear(t.getDoc());}Event.clear(t.getBody());Event.clear(t.formElement);}if(t.formElement){t.formElement.submit=t.formElement._mceOldSubmit;t.formElement._mceOldSubmit=null;}t.contentAreaContainer=t.formElement=t.container=t.settings.content_element=t.bodyElement=t.contentDocument=t.contentWindow=null;if(t.selection)t.selection=t.selection.win=t.selection.dom=t.selection.dom.doc=null;t.destroyed=1;},_addEvents:function(){var t=this,i,s=t.settings,lo={mouseup:'onMouseUp',mousedown:'onMouseDown',click:'onClick',keyup:'onKeyUp',keydown:'onKeyDown',keypress:'onKeyPress',submit:'onSubmit',reset:'onReset',contextmenu:'onContextMenu',dblclick:'onDblClick',paste:'onPaste'};function eventHandler(e,o){var ty=e.type;if(t.removed)return;if(t.onEvent.dispatch(t,e,o)!==false){t[lo[e.fakeType||e.type]].dispatch(t,e,o);}};each(lo,function(v,k){switch(k){case'contextmenu':if(tinymce.isOpera){Event.add(t.getBody(),'mousedown',function(e){if(e.ctrlKey){e.fakeType='contextmenu';eventHandler(e);}});}else Event.add(t.getBody(),k,eventHandler);break;case'paste':Event.add(t.getBody(),k,function(e){var tx,h,el,r;if(e.clipboardData)tx=e.clipboardData.getData('text/plain');else if(tinymce.isIE)tx=t.getWin().clipboardData.getData('Text');eventHandler(e,{text:tx,html:h});});break;case'submit':case'reset':Event.add(t.getElement().form||DOM.getParent(t.id,'form'),k,eventHandler);break;default:Event.add(s.content_editable?t.getBody():t.getDoc(),k,eventHandler);}});Event.add(s.content_editable?t.getBody():(isGecko?t.getDoc():t.getWin()),'focus',function(e){t.focus(true);});if(tinymce.isGecko){Event.add(t.getDoc(),'DOMNodeInserted',function(e){var v;e=e.target;if(e.nodeType===1&&e.nodeName==='IMG'&&(v=e.getAttribute('mce_src')))e.src=t.documentBaseURI.toAbsolute(v);});}if(isGecko){function setOpts(){var t=this,d=t.getDoc(),s=t.settings;if(isGecko){if(t._isHidden()){try{if(!s.content_editable)d.designMode='On';}catch(ex){}}try{d.execCommand("styleWithCSS",0,false);}catch(ex){if(!t._isHidden())try{d.execCommand("useCSS",0,true);}catch(ex){}}if(!s.table_inline_editing)try{d.execCommand('enableInlineTableEditing',false,false);}catch(ex){}if(!s.object_resizing)try{d.execCommand('enableObjectResizing',false,false);}catch(ex){}}};t.onBeforeExecCommand.add(setOpts);t.onMouseDown.add(setOpts);}t.onMouseUp.add(t.nodeChanged);t.onClick.add(t.nodeChanged);t.onKeyUp.add(function(ed,e){if((e.keyCode>=33&&e.keyCode<=36)||(e.keyCode>=37&&e.keyCode<=40)||e.keyCode==13||e.keyCode==45||e.keyCode==46||e.keyCode==8||e.ctrlKey)t.nodeChanged();});t.onReset.add(function(){t.setContent(t.startContent,{format:'raw'});});if(t.getParam('tab_focus')){function tabCancel(ed,e){if(e.keyCode===9)return Event.cancel(e);};function tabHandler(ed,e){var x,i,f,el,v;function find(d){f=DOM.getParent(ed.id,'form');el=f.elements;if(f){each(el,function(e,i){if(e.id==ed.id){x=i;return false;}});if(d>0){for(i=x+1;i<el.length;i++){if(el[i].type!='hidden')return el[i];}}else{for(i=x-1;i>=0;i--){if(el[i].type!='hidden')return el[i];}}}return null;};if(e.keyCode===9){v=explode(ed.getParam('tab_focus'));if(v.length==1){v[1]=v[0];v[0]=':prev';}if(e.shiftKey){if(v[0]==':prev')el=find(-1);else el=DOM.get(v[0]);}else{if(v[1]==':next')el=find(1);else el=DOM.get(v[1]);}if(el){if(ed=EditorManager.get(el.id||el.name))ed.focus();else window.setTimeout(function(){window.focus();el.focus();},10);return Event.cancel(e);}}};t.onKeyUp.add(tabCancel);if(isGecko){t.onKeyPress.add(tabHandler);t.onKeyDown.add(tabCancel);}else t.onKeyDown.add(tabHandler);}if(s.custom_shortcuts){if(s.custom_undo_redo_keyboard_shortcuts){t.addShortcut('ctrl+z',t.getLang('undo_desc'),'Undo');t.addShortcut('ctrl+y',t.getLang('redo_desc'),'Redo');}if(isGecko){t.addShortcut('ctrl+b',t.getLang('bold_desc'),'Bold');t.addShortcut('ctrl+i',t.getLang('italic_desc'),'Italic');t.addShortcut('ctrl+u',t.getLang('underline_desc'),'Underline');}for(i=1;i<=6;i++)t.addShortcut('ctrl+'+i,'',['FormatBlock',false,'<h'+i+'>']);t.addShortcut('ctrl+7','',['FormatBlock',false,'<p>']);t.addShortcut('ctrl+8','',['FormatBlock',false,'<div>']);t.addShortcut('ctrl+9','',['FormatBlock',false,'<address>']);function find(e){var v=null;if(!e.altKey&&!e.ctrlKey&&!e.metaKey)return v;each(t.shortcuts,function(o){if(o.ctrl!=e.ctrlKey&&(!tinymce.isMac||o.ctrl==e.metaKey))return;if(o.alt!=e.altKey)return;if(o.shift!=e.shiftKey)return;if(e.keyCode==o.keyCode||(e.charCode&&e.charCode==o.charCode)){v=o;return false;}});return v;};t.onKeyUp.add(function(ed,e){var o=find(e);if(o)return Event.cancel(e);});t.onKeyPress.add(function(ed,e){var o=find(e);if(o)return Event.cancel(e);});t.onKeyDown.add(function(ed,e){var o=find(e);if(o){o.func.call(o.scope);return Event.cancel(e);}});}if(tinymce.isIE){Event.add(t.getDoc(),'controlselect',function(e){var re=t.resizeInfo,cb;e=e.target;if(e.nodeName!=='IMG')return;if(re)Event.remove(re.node,re.ev,re.cb);if(!t.dom.hasClass(e,'mceItemNoResize')){ev='resizeend';cb=Event.add(e,ev,function(e){var v;e=e.target;if(v=t.dom.getStyle(e,'width')){t.dom.setAttrib(e,'width',v.replace(/[^0-9%]+/g,''));t.dom.setStyle(e,'width','');}if(v=t.dom.getStyle(e,'height')){t.dom.setAttrib(e,'height',v.replace(/[^0-9%]+/g,''));t.dom.setStyle(e,'height','');}});}else{ev='resizestart';cb=Event.add(e,'resizestart',Event.cancel,Event);}re=t.resizeInfo={node:e,ev:ev,cb:cb};});t.onKeyDown.add(function(ed,e){switch(e.keyCode){case 8:if(t.selection.getRng().item){t.selection.getRng().item(0).removeNode();return Event.cancel(e);}}});}if(tinymce.isOpera){t.onClick.add(function(ed,e){Event.prevent(e);});}if(s.custom_undo_redo){function addUndo(){t.undoManager.typing=0;t.undoManager.add();};if(tinymce.isIE){Event.add(t.getWin(),'blur',function(e){var n;if(t.selection){n=t.selection.getNode();if(!t.removed&&n.ownerDocument&&n.ownerDocument!=t.getDoc())addUndo();}});}else{Event.add(t.getDoc(),'blur',function(){if(t.selection&&!t.removed)addUndo();});}t.onMouseDown.add(addUndo);t.onKeyUp.add(function(ed,e){if((e.keyCode>=33&&e.keyCode<=36)||(e.keyCode>=37&&e.keyCode<=40)||e.keyCode==13||e.keyCode==45||e.ctrlKey){t.undoManager.typing=0;t.undoManager.add();}});t.onKeyDown.add(function(ed,e){if((e.keyCode>=33&&e.keyCode<=36)||(e.keyCode>=37&&e.keyCode<=40)||e.keyCode==13||e.keyCode==45){if(t.undoManager.typing){t.undoManager.add();t.undoManager.typing=0;}return;}if(!t.undoManager.typing){t.undoManager.add();t.undoManager.typing=1;}});}},_convertInlineElements:function(){var t=this,s=t.settings,dom=t.dom,v,e,na,st,sp;function convert(ed,o){if(!s.inline_styles)return;if(o.get){each(t.dom.select('table,u,strike',o.node),function(n){switch(n.nodeName){case'TABLE':if(v=dom.getAttrib(n,'height')){dom.setStyle(n,'height',v);dom.setAttrib(n,'height','');}break;case'U':case'STRIKE':n.style.textDecoration=n.nodeName=='U'?'underline':'line-through';dom.setAttrib(n,'mce_style','');dom.setAttrib(n,'mce_name','span');break;}});}else if(o.set){each(t.dom.select('table,span',o.node).reverse(),function(n){if(n.nodeName=='TABLE'){if(v=dom.getStyle(n,'height'))dom.setAttrib(n,'height',v.replace(/[^0-9%]+/g,''));}else{if(n.style.textDecoration=='underline')na='u';else if(n.style.textDecoration=='line-through')na='strike';else na='';if(na){n.style.textDecoration='';dom.setAttrib(n,'mce_style','');e=dom.create(na,{style:dom.getAttrib(n,'style')});dom.replace(e,n,1);}}});}};t.onPreProcess.add(convert);if(!s.cleanup_on_startup){t.onSetContent.add(function(ed,o){if(o.initial)convert(t,{node:t.getBody(),set:1});});}},_convertFonts:function(){var t=this,s=t.settings,dom=t.dom,fz,fzn,sl,cl;if(!s.inline_styles)return;fz=[8,10,12,14,18,24,36];fzn=['xx-small','x-small','small','medium','large','x-large','xx-large'];if(sl=s.font_size_style_values)sl=explode(sl);if(cl=s.font_size_classes)cl=explode(cl);function convertToFonts(no){var n,f,nl,x,i,v,st;if(tinymce.isWebKit||!s.inline_styles)return;nl=t.dom.select('span',no);for(x=nl.length-1;x>=0;x--){n=nl[x];f=dom.create('font',{color:dom.toHex(dom.getStyle(n,'color')),face:dom.getStyle(n,'fontFamily'),style:dom.getAttrib(n,'style'),'class':dom.getAttrib(n,'class')});st=f.style;if(st.color||st.fontFamily){st.color=st.fontFamily='';dom.setAttrib(f,'mce_style','');}if(sl){i=inArray(sl,dom.getStyle(n,'fontSize'));if(i!=-1){dom.setAttrib(f,'size',''+(i+1||1));}}else if(cl){i=inArray(cl,dom.getAttrib(n,'class'));v=dom.getStyle(n,'fontSize');if(i==-1&&v.indexOf('pt')>0)i=inArray(fz,parseInt(v));if(i==-1)i=inArray(fzn,v);if(i!=-1){dom.setAttrib(f,'size',''+(i+1||1));f.style.fontSize='';}}if(f.color||f.face||f.size){f.style.fontFamily='';dom.setAttrib(f,'mce_style','');dom.replace(f,n,1);}f=n=null;}};t.onSetContent.add(function(ed,o){convertToFonts(ed.getBody());});t.onPreProcess.add(function(ed,o){var n,sp,nl,x;if(!s.inline_styles)return;if(o.get){nl=t.dom.select('font',o.node);for(x=nl.length-1;x>=0;x--){n=nl[x];sp=dom.create('span',{style:dom.getAttrib(n,'style'),'class':dom.getAttrib(n,'class')});dom.setStyles(sp,{fontFamily:dom.getAttrib(n,'face'),color:dom.getAttrib(n,'color'),backgroundColor:n.style.backgroundColor});if(n.size){if(sl)dom.setStyle(sp,'fontSize',sl[parseInt(n.size)-1]);else dom.setAttrib(sp,'class',cl[parseInt(n.size)-1]);}dom.setAttrib(sp,'mce_style','');dom.replace(sp,n,1);}}});},_isHidden:function(){var s;if(!isGecko)return 0;s=this.selection.getSel();return(!s||!s.rangeCount||s.rangeCount==0);},_fixNesting:function(s){var d=[],i;s=s.replace(/<(\/)?([^\s>]+)[^>]*?>/g,function(a,b,c){var e;if(b==='/'){if(!d.length)return'';if(c!==d[d.length-1].tag){for(i=d.length-1;i>=0;i--){if(d[i].tag===c){d[i].close=1;break;}}return'';}else{d.pop();if(d.length&&d[d.length-1].close){a=a+'</'+d[d.length-1].tag+'>';d.pop();}}}else{if(/^(br|hr|input|meta|img|link|param)$/i.test(c))return a;if(/\/>$/.test(a))return a;d.push({tag:c});}return a;});for(i=d.length-1;i>=0;i--)s+='</'+d[i].tag+'>';return s;}});})();(function(){var each=tinymce.each,isIE=tinymce.isIE,isGecko=tinymce.isGecko,isOpera=tinymce.isOpera,isWebKit=tinymce.isWebKit;tinymce.create('tinymce.EditorCommands',{EditorCommands:function(ed){this.editor=ed;},execCommand:function(cmd,ui,val){var t=this,ed=t.editor,f;switch(cmd){case'Cut':case'Copy':case'Paste':try{ed.getDoc().execCommand(cmd,ui,val);}catch(ex){if(isGecko){ed.windowManager.confirm(ed.getLang('clipboard_msg'),function(s){if(s)window.open('http://www.mozilla.org/editor/midasdemo/securityprefs.html','mceExternal');});}else ed.windowManager.alert(ed.getLang('clipboard_no_support'));}return true;case'mceResetDesignMode':case'mceBeginUndoLevel':return true;case'unlink':t.UnLink();return true;case'JustifyLeft':case'JustifyCenter':case'JustifyRight':case'JustifyFull':t.mceJustify(cmd,cmd.substring(7).toLowerCase());return true;case'mceEndUndoLevel':case'mceAddUndoLevel':ed.undoManager.add();return true;default:f=this[cmd];if(f){f.call(this,ui,val);return true;}}return false;},Indent:function(){var ed=this.editor,d=ed.dom,s=ed.selection,e,iv,iu;iv=ed.settings.indentation;iu=/[a-z%]+$/i.exec(iv);iv=parseInt(iv);if(ed.settings.inline_styles&&(!this.queryStateInsertUnorderedList()&&!this.queryStateInsertOrderedList())){each(this._getSelectedBlocks(),function(e){d.setStyle(e,'paddingLeft',(parseInt(e.style.paddingLeft||0)+iv)+iu);});return;}ed.getDoc().execCommand('Indent',false,null);if(isIE){d.getParent(s.getNode(),function(n){if(n.nodeName=='BLOCKQUOTE'){n.dir=n.style.cssText='';}});}},Outdent:function(){var ed=this.editor,d=ed.dom,s=ed.selection,e,v,iv,iu;iv=ed.settings.indentation;iu=/[a-z%]+$/i.exec(iv);iv=parseInt(iv);if(ed.settings.inline_styles&&(!this.queryStateInsertUnorderedList()&&!this.queryStateInsertOrderedList())){each(this._getSelectedBlocks(),function(e){v=Math.max(0,parseInt(e.style.paddingLeft||0)-iv);d.setStyle(e,'paddingLeft',v?v+iu:'');});return;}ed.getDoc().execCommand('Outdent',false,null);},mceSetAttribute:function(u,v){var ed=this.editor,d=ed.dom,e;if(e=d.getParent(ed.selection.getNode(),d.isBlock))d.setAttrib(e,v.name,v.value);},mceSetContent:function(u,v){this.editor.setContent(v);},mceToggleVisualAid:function(){var ed=this.editor;ed.hasVisual=!ed.hasVisual;ed.addVisual();},mceReplaceContent:function(u,v){var s=this.editor.selection;s.setContent(v.replace(/\{\$selection\}/g,s.getContent({format:'text'})));},mceInsertLink:function(u,v){var ed=this.editor,s=ed.selection,e=ed.dom.getParent(s.getNode(),'A');if(tinymce.is(v,'string'))v={href:v};function set(e){each(v,function(v,k){ed.dom.setAttrib(e,k,v);});};if(!e){ed.execCommand('CreateLink',false,'javascript:mctmp(0);');each(ed.dom.select('a'),function(e){if(e.href=='javascript:mctmp(0);')set(e);});}else{if(v.href)set(e);else ed.dom.remove(e,1);}},UnLink:function(){var ed=this.editor,s=ed.selection;if(s.isCollapsed())s.select(s.getNode());ed.getDoc().execCommand('unlink',false,null);s.collapse(0);},FontName:function(u,v){var t=this,ed=t.editor,s=ed.selection,e;if(!v){if(s.isCollapsed())s.select(s.getNode());t.RemoveFormat();}else ed.getDoc().execCommand('FontName',false,v);},FontSize:function(u,v){var ed=this.editor,s=ed.settings,fz=tinymce.explode(s.font_size_style_values),fzc=tinymce.explode(s.font_size_classes),h,bm;each(ed.dom.select('font'),function(e){e.style.fontSize='';});ed.getDoc().execCommand('FontSize',false,v);if(s.inline_styles){each(ed.dom.select('font'),function(e){if(e.parentNode.nodeName=='FONT'&&e.size==e.parentNode.size){if(!bm)bm=ed.selection.getBookmark();ed.dom.remove(e,1);return;}if(v=e.size){if(fzc&&fzc.length>0)ed.dom.setAttrib(e,'class',fzc[parseInt(v)-1]);else ed.dom.setStyle(e,'fontSize',fz[parseInt(v)-1]);}});}ed.selection.moveToBookmark(bm);},queryCommandValue:function(c){var f=this['queryValue'+c];if(f)return f.call(this,c);return false;},queryCommandState:function(cmd){var f;switch(cmd){case'JustifyLeft':case'JustifyCenter':case'JustifyRight':case'JustifyFull':return this.queryStateJustify(cmd,cmd.substring(7).toLowerCase());default:if(f=this['queryState'+cmd])return f.call(this,cmd);}return-1;},_queryState:function(c){try{return this.editor.getDoc().queryCommandState(c);}catch(ex){}},_queryVal:function(c){try{return this.editor.getDoc().queryCommandValue(c);}catch(ex){}},queryValueFontSize:function(){var ed=this.editor,v=0,p;if(isOpera||isWebKit){if(p=ed.dom.getParent(ed.selection.getNode(),'FONT'))v=p.size;return v;}return this._queryVal('FontSize');},queryValueFontName:function(){var ed=this.editor,v=0,p;if(p=ed.dom.getParent(ed.selection.getNode(),'FONT'))v=p.face;if(!v)v=this._queryVal('FontName');return v;},mceJustify:function(c,v){var ed=this.editor,se=ed.selection,n=se.getNode(),nn=n.nodeName,bl,nb,dom=ed.dom,rm;if(ed.settings.inline_styles&&this.queryStateJustify(c,v))rm=1;bl=dom.getParent(n,ed.dom.isBlock);if(nn=='IMG'){if(v=='full')return;if(rm){if(v=='center')dom.setStyle(n.parentNode,'textAlign','');dom.setStyle(n,'float','');this.mceRepaint();return;}if(v=='center'){if(/^(TD|TH)$/.test(bl.nodeName))bl=0;if(!bl||bl.childNodes.length>1){nb=dom.create('p');nb.appendChild(n.cloneNode(false));if(bl)dom.insertAfter(nb,bl);else dom.insertAfter(nb,n);dom.remove(n);n=nb.firstChild;bl=nb;}dom.setStyle(bl,'textAlign',v);dom.setStyle(n,'float','');}else{dom.setStyle(n,'float',v);dom.setStyle(n.parentNode,'textAlign','');}this.mceRepaint();return;}if(ed.settings.inline_styles&&ed.settings.forced_root_block){if(rm)v='';each(this._getSelectedBlocks(dom.getParent(se.getStart(),dom.isBlock),dom.getParent(se.getEnd(),dom.isBlock)),function(e){dom.setAttrib(e,'align','');dom.setStyle(e,'textAlign',v=='full'?'justify':v);});return;}else if(!rm)ed.getDoc().execCommand(c,false,null);if(ed.settings.inline_styles){if(rm){dom.getParent(ed.selection.getNode(),function(n){if(n.style&&n.style.textAlign)dom.setStyle(n,'textAlign','');});return;}each(dom.select('*'),function(n){var v=n.align;if(v){if(v=='full')v='justify';dom.setStyle(n,'textAlign',v);dom.setAttrib(n,'align','');}});}},mceSetCSSClass:function(u,v){this.mceSetStyleInfo(0,{command:'setattrib',name:'class',value:v});},getSelectedElement:function(){var t=this,ed=t.editor,dom=ed.dom,se=ed.selection,r=se.getRng(),r1,r2,sc,ec,so,eo,e,sp,ep,re;if(se.isCollapsed()||r.item)return se.getNode();re=ed.settings.merge_styles_invalid_parents;if(tinymce.is(re,'string'))re=new RegExp(re,'i');if(isIE){r1=r.duplicate();r1.collapse(true);sc=r1.parentElement();r2=r.duplicate();r2.collapse(false);ec=r2.parentElement();if(sc!=ec){r1.move('character',1);sc=r1.parentElement();}if(sc==ec){r1=r.duplicate();r1.moveToElementText(sc);if(r1.compareEndPoints('StartToStart',r)==0&&r1.compareEndPoints('EndToEnd',r)==0)return re&&re.test(sc.nodeName)?null:sc;}}else{function getParent(n){return dom.getParent(n,function(n){return n.nodeType==1;});};sc=r.startContainer;ec=r.endContainer;so=r.startOffset;eo=r.endOffset;if(!r.collapsed){if(sc==ec){if(so-eo<2){if(sc.hasChildNodes()){sp=sc.childNodes[so];return re&&re.test(sp.nodeName)?null:sp;}}}}if(sc.nodeType!=3||ec.nodeType!=3)return null;if(so==0){sp=getParent(sc);if(sp&&sp.firstChild!=sc)sp=null;}if(so==sc.nodeValue.length){e=sc.nextSibling;if(e&&e.nodeType==1)sp=sc.nextSibling;}if(eo==0){e=ec.previousSibling;if(e&&e.nodeType==1)ep=e;}if(eo==ec.nodeValue.length){ep=getParent(ec);if(ep&&ep.lastChild!=ec)ep=null;}if(sp==ep)return re&&sp&&re.test(sp.nodeName)?null:sp;}return null;},InsertHorizontalRule:function(){if(isGecko||isIE)this.editor.selection.setContent('<hr />');else this.editor.getDoc().execCommand('InsertHorizontalRule',false,'');},RemoveFormat:function(){var t=this,ed=t.editor,s=ed.selection,b;if(isWebKit)s.setContent(s.getContent({format:'raw'}).replace(/(<(span|b|i|strong|em|strike) [^>]+>|<(span|b|i|strong|em|strike)>|<\/(span|b|i|strong|em|strike)>|)/g,''),{format:'raw'});else ed.getDoc().execCommand('RemoveFormat',false,null);t.mceSetStyleInfo(0,{command:'removeformat'});ed.addVisual();},mceSetStyleInfo:function(u,v){var t=this,ed=t.editor,d=ed.getDoc(),dom=ed.dom,e,b,s=ed.selection,nn=v.wrapper||'span',b=s.getBookmark(),re;function set(n,e){if(n.nodeType==1){switch(v.command){case'setattrib':return dom.setAttrib(n,v.name,v.value);case'setstyle':return dom.setStyle(n,v.name,v.value);case'removeformat':return dom.setAttrib(n,'class','');}}};re=ed.settings.merge_styles_invalid_parents;if(tinymce.is(re,'string'))re=new RegExp(re,'i');if(e=t.getSelectedElement())set(e,1);else{d.execCommand('FontName',false,'__');each(isWebKit?dom.select('span'):dom.select('font'),function(n){var sp,e;if(dom.getAttrib(n,'face')=='__'||n.style.fontFamily==='__'){sp=dom.create(nn,{mce_new:'1'});set(sp);each(n.childNodes,function(n){sp.appendChild(n.cloneNode(true));});dom.replace(sp,n);}});}each(dom.select(nn).reverse(),function(n){var p=n.parentNode;if(!dom.getAttrib(n,'mce_new')){p=dom.getParent(n,function(n){return n.nodeType==1&&dom.getAttrib(n,'mce_new');});if(p)dom.remove(n,1);}});each(dom.select(nn).reverse(),function(n){var p=n.parentNode;if(!p||!dom.getAttrib(n,'mce_new'))return;if(p.nodeName==nn.toUpperCase()&&p.childNodes.length==1)return dom.remove(p,1);if(n.nodeType==1&&(!re||!re.test(p.nodeName))&&p.childNodes.length==1){set(p);dom.setAttrib(n,'class','');}});each(dom.select(nn).reverse(),function(n){if(dom.getAttrib(n,'mce_new')||(dom.getAttribs(n).length<=1&&n.className==='')){if(!dom.getAttrib(n,'class')&&!dom.getAttrib(n,'style'))return dom.remove(n,1);dom.setAttrib(n,'mce_new','');}});s.moveToBookmark(b);},queryStateJustify:function(c,v){var ed=this.editor,n=ed.selection.getNode(),dom=ed.dom;if(n&&n.nodeName=='IMG'){if(dom.getStyle(n,'float')==v)return 1;return n.parentNode.style.textAlign==v;}n=dom.getParent(ed.selection.getStart(),function(n){return n.nodeType==1&&n.style.textAlign;});if(v=='full')v='justify';if(ed.settings.inline_styles)return(n&&n.style.textAlign==v);return this._queryState(c);},HiliteColor:function(ui,val){var t=this,ed=t.editor,d=ed.getDoc();function set(s){if(!isGecko)return;try{d.execCommand("styleWithCSS",0,s);}catch(ex){d.execCommand("useCSS",0,!s);}};if(isGecko||isOpera){set(true);d.execCommand('hilitecolor',false,val);set(false);}else d.execCommand('BackColor',false,val);},Undo:function(){var ed=this.editor;if(ed.settings.custom_undo_redo){ed.undoManager.undo();ed.nodeChanged();}else ed.getDoc().execCommand('Undo',false,null);},Redo:function(){var ed=this.editor;if(ed.settings.custom_undo_redo){ed.undoManager.redo();ed.nodeChanged();}else ed.getDoc().execCommand('Redo',false,null);},FormatBlock:function(ui,val){var t=this,ed=t.editor,s=ed.selection,dom=ed.dom,bl,nb,b;function isBlock(n){return/^(P|DIV|H[1-6]|ADDRESS|BLOCKQUOTE|PRE)$/.test(n.nodeName);};bl=dom.getParent(s.getNode(),function(n){return isBlock(n);});if(bl){if((isIE&&isBlock(bl.parentNode))||bl.nodeName=='DIV'){nb=ed.dom.create(val);each(dom.getAttribs(bl),function(v){dom.setAttrib(nb,v.nodeName,dom.getAttrib(bl,v.nodeName));});b=s.getBookmark();dom.replace(nb,bl,1);s.moveToBookmark(b);ed.nodeChanged();return;}}val=ed.settings.forced_root_block?(val||'<p>'):val;if(val.indexOf('<')==-1)val='<'+val+'>';if(tinymce.isGecko)val=val.replace(/<(div|blockquote|code|dt|dd|dl|samp)>/gi,'$1');ed.getDoc().execCommand('FormatBlock',false,val);},mceCleanup:function(){var ed=this.editor,s=ed.selection,b=s.getBookmark();ed.setContent(ed.getContent());s.moveToBookmark(b);},mceRemoveNode:function(ui,val){var ed=this.editor,s=ed.selection,b,n=val||s.getNode();if(n==ed.getBody())return;b=s.getBookmark();ed.dom.remove(n,1);s.moveToBookmark(b);ed.nodeChanged();},mceSelectNodeDepth:function(ui,val){var ed=this.editor,s=ed.selection,c=0;ed.dom.getParent(s.getNode(),function(n){if(n.nodeType==1&&c++==val){s.select(n);ed.nodeChanged();return false;}},ed.getBody());},mceSelectNode:function(u,v){this.editor.selection.select(v);},mceInsertContent:function(ui,val){this.editor.selection.setContent(val);},mceInsertRawHTML:function(ui,val){var ed=this.editor;ed.selection.setContent('tiny_mce_marker');ed.setContent(ed.getContent().replace(/tiny_mce_marker/g,val));},mceRepaint:function(){var s,b,e=this.editor;if(tinymce.isGecko){try{s=e.selection;b=s.getBookmark(true);if(s.getSel())s.getSel().selectAllChildren(e.getBody());s.collapse(true);s.moveToBookmark(b);}catch(ex){}}},queryStateUnderline:function(){var ed=this.editor,n=ed.selection.getNode();if(n&&n.nodeName=='A')return false;return this._queryState('Underline');},queryStateOutdent:function(){var ed=this.editor,n;if(ed.settings.inline_styles){if((n=ed.dom.getParent(ed.selection.getStart(),ed.dom.isBlock))&&parseInt(n.style.paddingLeft)>0)return true;if((n=ed.dom.getParent(ed.selection.getEnd(),ed.dom.isBlock))&&parseInt(n.style.paddingLeft)>0)return true;}else return!!ed.dom.getParent(ed.selection.getNode(),'BLOCKQUOTE');return this.queryStateInsertUnorderedList()||this.queryStateInsertOrderedList();},queryStateInsertUnorderedList:function(){return this.editor.dom.getParent(this.editor.selection.getNode(),'UL');},queryStateInsertOrderedList:function(){return this.editor.dom.getParent(this.editor.selection.getNode(),'OL');},queryStatemceBlockQuote:function(){return!!this.editor.dom.getParent(this.editor.selection.getStart(),function(n){return n.nodeName==='BLOCKQUOTE';});},mceBlockQuote:function(){var t=this,ed=t.editor,s=ed.selection,dom=ed.dom,sb,eb,n,bm,bq,r,bq2,i,nl;function getBQ(e){return dom.getParent(e,function(n){return n.nodeName==='BLOCKQUOTE';});};sb=dom.getParent(s.getStart(),dom.isBlock);eb=dom.getParent(s.getEnd(),dom.isBlock);if(bq=getBQ(sb)){if(sb!=eb||sb.childNodes.length>1||(sb.childNodes.length==1&&sb.firstChild.nodeName!='BR'))bm=s.getBookmark();if(getBQ(eb)){bq2=bq.cloneNode(false);while(n=eb.nextSibling)bq2.appendChild(n.parentNode.removeChild(n));}if(bq2)dom.insertAfter(bq2,bq);nl=t._getSelectedBlocks(sb,eb);for(i=nl.length-1;i>=0;i--){dom.insertAfter(nl[i],bq);}if(/^\s*$/.test(bq.innerHTML))dom.remove(bq,1);if(bq2&&/^\s*$/.test(bq2.innerHTML))dom.remove(bq2,1);if(!bm){if(!isIE){r=ed.getDoc().createRange();r.setStart(sb,0);r.setEnd(sb,0);s.setRng(r);}else{s.select(sb);s.collapse(0);if(dom.getParent(s.getStart(),dom.isBlock)!=sb){r=s.getRng();r.move('character',-1);r.select();}}}else t.editor.selection.moveToBookmark(bm);return;}if(isIE&&!sb&&!eb){t.editor.getDoc().execCommand('Indent');n=getBQ(s.getNode());n.style.margin=n.dir='';return;}if(!sb||!eb)return;if(sb!=eb||sb.childNodes.length>1||(sb.childNodes.length==1&&sb.firstChild.nodeName!='BR'))bm=s.getBookmark();each(t._getSelectedBlocks(getBQ(s.getStart()),getBQ(s.getEnd())),function(e){if(e.nodeName=='BLOCKQUOTE'&&!bq){bq=e;return;}if(!bq){bq=dom.create('blockquote');e.parentNode.insertBefore(bq,e);}if(e.nodeName=='BLOCKQUOTE'&&bq){n=e.firstChild;while(n){bq.appendChild(n.cloneNode(true));n=n.nextSibling;}dom.remove(e);return;}bq.appendChild(dom.remove(e));});if(!bm){if(!isIE){r=ed.getDoc().createRange();r.setStart(sb,0);r.setEnd(sb,0);s.setRng(r);}else{s.select(sb);s.collapse(1);}}else s.moveToBookmark(bm);},_getSelectedBlocks:function(st,en){var ed=this.editor,dom=ed.dom,s=ed.selection,sb,eb,n,bl=[];sb=dom.getParent(st||s.getStart(),dom.isBlock);eb=dom.getParent(en||s.getEnd(),dom.isBlock);if(sb)bl.push(sb);if(sb&&eb&&sb!=eb){n=sb;while((n=n.nextSibling)&&n!=eb){if(dom.isBlock(n))bl.push(n);}}if(eb&&sb!=eb)bl.push(eb);return bl;}});})();tinymce.create('tinymce.UndoManager',{index:0,data:null,typing:0,UndoManager:function(ed){var t=this,Dispatcher=tinymce.util.Dispatcher;t.editor=ed;t.data=[];t.onAdd=new Dispatcher(this);t.onUndo=new Dispatcher(this);t.onRedo=new Dispatcher(this);},add:function(l){var t=this,i,ed=t.editor,b,s=ed.settings,la;l=l||{};l.content=l.content||ed.getContent({format:'raw',no_events:1});l.content=l.content.replace(/^\s*|\s*$/g,'');la=t.data[t.index>0&&(t.index==0||t.index==t.data.length)?t.index-1:t.index];if(!l.initial&&la&&l.content==la.content)return null;if(s.custom_undo_redo_levels){if(t.data.length>s.custom_undo_redo_levels){for(i=0;i<t.data.length-1;i++)t.data[i]=t.data[i+1];t.data.length--;t.index=t.data.length;}}if(s.custom_undo_redo_restore_selection&&!l.initial)l.bookmark=b=l.bookmark||ed.selection.getBookmark();if(t.index<t.data.length)t.index++;if(t.data.length===0&&!l.initial)return null;t.data.length=t.index+1;t.data[t.index++]=l;if(l.initial)t.index=0;if(t.data.length==2&&t.data[0].initial)t.data[0].bookmark=b;t.onAdd.dispatch(t,l);ed.isNotDirty=0;return l;},undo:function(){var t=this,ed=t.editor,l=l,i;if(t.typing){t.add();t.typing=0;}if(t.index>0){if(t.index==t.data.length&&t.index>1){i=t.index;t.typing=0;if(!t.add())t.index=i;--t.index;}l=t.data[--t.index];ed.setContent(l.content,{format:'raw'});ed.selection.moveToBookmark(l.bookmark);t.onUndo.dispatch(t,l);}return l;},redo:function(){var t=this,ed=t.editor,l=null;if(t.index<t.data.length-1){l=t.data[++t.index];ed.setContent(l.content,{format:'raw'});ed.selection.moveToBookmark(l.bookmark);t.onRedo.dispatch(t,l);}return l;},clear:function(){var t=this;t.data=[];t.index=0;t.typing=0;t.add({initial:true});},hasUndo:function(){return this.index!=0||this.typing;},hasRedo:function(){return this.index<this.data.length-1;}});(function(){var Event,isIE,isGecko,isOpera,each,extend;Event=tinymce.dom.Event;isIE=tinymce.isIE;isGecko=tinymce.isGecko;isOpera=tinymce.isOpera;each=tinymce.each;extend=tinymce.extend;tinymce.create('tinymce.ForceBlocks',{ForceBlocks:function(ed){var t=this,s=ed.settings,elm;t.editor=ed;t.dom=ed.dom;elm=(s.forced_root_block||'p').toLowerCase();s.element=elm.toUpperCase();ed.onPreInit.add(t.setup,t);t.reOpera=new RegExp('(\\u00a0|&#160;|&nbsp;)<\/'+elm+'>','gi');t.rePadd=new RegExp('<p( )([^>]+)><\\\/p>|<p( )([^>]+)\\\/>|<p( )([^>]+)>\\s+<\\\/p>|<p><\\\/p>|<p\\\/>|<p>\\s+<\\\/p>'.replace(/p/g,elm),'gi');t.reNbsp2BR1=new RegExp('<p( )([^>]+)>[\\s\\u00a0]+<\\\/p>|<p>[\\s\\u00a0]+<\\\/p>'.replace(/p/g,elm),'gi');t.reNbsp2BR2=new RegExp('<p( )([^>]+)>(&nbsp;|&#160;)<\\\/p>|<p>(&nbsp;|&#160;)<\\\/p>'.replace(/p/g,elm),'gi');t.reBR2Nbsp=new RegExp('<p( )([^>]+)>\\s*<br \\\/>\\s*<\\\/p>|<p>\\s*<br \\\/>\\s*<\\\/p>'.replace(/p/g,elm),'gi');t.reTrailBr=new RegExp('\\s*<br \\/>\\s*<\\\/p>'.replace(/p/g,elm),'gi');function padd(ed,o){if(isOpera)o.content=o.content.replace(t.reOpera,'</'+elm+'>');o.content=o.content.replace(t.rePadd,'<'+elm+'$1$2$3$4$5$6>\u00a0</'+elm+'>');if(!isIE&&!isOpera&&o.set){o.content=o.content.replace(t.reNbsp2BR1,'<'+elm+'$1$2><br /></'+elm+'>');o.content=o.content.replace(t.reNbsp2BR2,'<'+elm+'$1$2><br /></'+elm+'>');}else{o.content=o.content.replace(t.reBR2Nbsp,'<'+elm+'$1$2>\u00a0</'+elm+'>');o.content=o.content.replace(t.reTrailBr,'</'+elm+'>');}};ed.onBeforeSetContent.add(padd);ed.onPostProcess.add(padd);if(s.forced_root_block){ed.onInit.add(t.forceRoots,t);ed.onSetContent.add(t.forceRoots,t);ed.onBeforeGetContent.add(t.forceRoots,t);}},setup:function(){var t=this,ed=t.editor,s=ed.settings;if(s.forced_root_block){ed.onKeyUp.add(t.forceRoots,t);ed.onPreProcess.add(t.forceRoots,t);}if(s.force_br_newlines){if(isIE){ed.onKeyPress.add(function(ed,e){var n,s=ed.selection;if(e.keyCode==13&&s.getNode().nodeName!='LI'){s.setContent('<br id="__" /> ',{format:'raw'});n=ed.dom.get('__');n.removeAttribute('id');s.select(n);s.collapse();return Event.cancel(e);}});}return;}if(!isIE&&s.force_p_newlines){ed.onKeyPress.add(function(ed,e){if(e.keyCode==13&&!e.shiftKey){if(!t.insertPara(e))Event.cancel(e);}});if(isGecko){ed.onKeyDown.add(function(ed,e){if((e.keyCode==8||e.keyCode==46)&&!e.shiftKey)t.backspaceDelete(e,e.keyCode==8);});}}function ren(rn,na){var ne=ed.dom.create(na);each(rn.attributes,function(a){if(a.specified&&a.nodeValue)ne.setAttribute(a.nodeName.toLowerCase(),a.nodeValue);});each(rn.childNodes,function(n){ne.appendChild(n.cloneNode(true));});rn.parentNode.replaceChild(ne,rn);return ne;};if(isIE&&s.element!='P'){ed.onKeyPress.add(function(ed,e){t.lastElm=ed.selection.getNode().nodeName;});ed.onKeyUp.add(function(ed,e){var bl,sel=ed.selection,n=sel.getNode(),b=ed.getBody();if(b.childNodes.length===1&&n.nodeName=='P'){n=ren(n,s.element);sel.select(n);sel.collapse();ed.nodeChanged();}else if(e.keyCode==13&&!e.shiftKey&&t.lastElm!='P'){bl=ed.dom.getParent(n,'P');if(bl){ren(bl,s.element);ed.nodeChanged();}}});}},find:function(n,t,s){var ed=this.editor,w=ed.getDoc().createTreeWalker(n,4,null,false),c=-1;while(n=w.nextNode()){c++;if(t==0&&n==s)return c;if(t==1&&c==s)return n;}return-1;},forceRoots:function(ed,e){var t=this,ed=t.editor,b=ed.getBody(),d=ed.getDoc(),se=ed.selection,s=se.getSel(),r=se.getRng(),si=-2,ei,so,eo,tr,c=-0xFFFFFF;var nx,bl,bp,sp,le,nl=b.childNodes,i;if(e&&e.keyCode==13)return true;for(i=nl.length-1;i>=0;i--){nx=nl[i];if(nx.nodeType==3||(!t.dom.isBlock(nx)&&nx.nodeType!=8)){if(!bl){if(nx.nodeType!=3||/[^\s]/g.test(nx.nodeValue)){if(si==-2&&r){if(!isIE){if(ed.dom.getParent(r.startContainer,function(e){return e===b;})){so=r.startOffset;eo=r.endOffset;si=t.find(b,0,r.startContainer);ei=t.find(b,0,r.endContainer);}}else{tr=d.body.createTextRange();tr.moveToElementText(b);tr.collapse(1);bp=tr.move('character',c)*-1;tr=r.duplicate();tr.collapse(1);sp=tr.move('character',c)*-1;tr=r.duplicate();tr.collapse(0);le=(tr.move('character',c)*-1)-sp;si=sp-bp;ei=le;}}bl=ed.dom.create(ed.settings.forced_root_block);bl.appendChild(nx.cloneNode(1));nx.parentNode.replaceChild(bl,nx);}}else{if(bl.hasChildNodes())bl.insertBefore(nx,bl.firstChild);else bl.appendChild(nx);}}else bl=null;}if(si!=-2){if(!isIE){bl=b.getElementsByTagName(ed.settings.element)[0];r=d.createRange();if(si!=-1)r.setStart(t.find(b,1,si),so);else r.setStart(bl,0);if(ei!=-1)r.setEnd(t.find(b,1,ei),eo);else r.setEnd(bl,0);if(s){s.removeAllRanges();s.addRange(r);}}else{try{r=s.createRange();r.moveToElementText(b);r.collapse(1);r.moveStart('character',si);r.moveEnd('character',ei);r.select();}catch(ex){}}}},getParentBlock:function(n){var d=this.dom;return d.getParent(n,d.isBlock);},insertPara:function(e){var t=this,ed=t.editor,dom=ed.dom,d=ed.getDoc(),se=ed.settings,s=ed.selection.getSel(),r=s.getRangeAt(0),b=d.body;var rb,ra,dir,sn,so,en,eo,sb,eb,bn,bef,aft,sc,ec,n,vp=dom.getViewPort(ed.getWin()),y,ch;function isEmpty(n){n=n.innerHTML;n=n.replace(/<(img|hr|table)/gi,'-');n=n.replace(/<[^>]+>/g,'');return n.replace(/[ \t\r\n]+/g,'')=='';};rb=d.createRange();rb.setStart(s.anchorNode,s.anchorOffset);rb.collapse(true);ra=d.createRange();ra.setStart(s.focusNode,s.focusOffset);ra.collapse(true);dir=rb.compareBoundaryPoints(rb.START_TO_END,ra)<0;sn=dir?s.anchorNode:s.focusNode;so=dir?s.anchorOffset:s.focusOffset;en=dir?s.focusNode:s.anchorNode;eo=dir?s.focusOffset:s.anchorOffset;if(sn===en&&/^(TD|TH)$/.test(sn.nodeName)){dom.remove(sn.firstChild);ed.dom.add(sn,se.element,null,'<br />');aft=ed.dom.add(sn,se.element,null,'<br />');r=d.createRange();r.selectNodeContents(aft);r.collapse(1);ed.selection.setRng(r);return false;}if(sn==b&&en==b&&b.firstChild&&ed.dom.isBlock(b.firstChild)){sn=en=sn.firstChild;so=eo=0;rb=d.createRange();rb.setStart(sn,0);ra=d.createRange();ra.setStart(en,0);}sn=sn.nodeName=="HTML"?d.body:sn;sn=sn.nodeName=="BODY"?sn.firstChild:sn;en=en.nodeName=="HTML"?d.body:en;en=en.nodeName=="BODY"?en.firstChild:en;sb=t.getParentBlock(sn);eb=t.getParentBlock(en);bn=sb?sb.nodeName:se.element;if(t.dom.getParent(sb,function(n){return/OL|UL|PRE/.test(n.nodeName);}))return true;if(sb&&(sb.nodeName=='CAPTION'||/absolute|relative|static/gi.test(sb.style.position))){bn=se.element;sb=null;}if(eb&&(eb.nodeName=='CAPTION'||/absolute|relative|static/gi.test(eb.style.position))){bn=se.element;eb=null;}if(/(TD|TABLE|TH|CAPTION)/.test(bn)||(sb&&bn=="DIV"&&/left|right/gi.test(sb.style.cssFloat))){bn=se.element;sb=eb=null;}bef=(sb&&sb.nodeName==bn)?sb.cloneNode(0):ed.dom.create(bn);aft=(eb&&eb.nodeName==bn)?eb.cloneNode(0):ed.dom.create(bn);aft.removeAttribute('id');if(/^(H[1-6])$/.test(bn)&&sn.nodeValue&&so==sn.nodeValue.length)aft=ed.dom.create(se.element);n=sc=sn;do{if(n==b||n.nodeType==9||t.dom.isBlock(n)||/(TD|TABLE|TH|CAPTION)/.test(n.nodeName))break;sc=n;}while((n=n.previousSibling?n.previousSibling:n.parentNode));n=ec=en;do{if(n==b||n.nodeType==9||t.dom.isBlock(n)||/(TD|TABLE|TH|CAPTION)/.test(n.nodeName))break;ec=n;}while((n=n.nextSibling?n.nextSibling:n.parentNode));if(sc.nodeName==bn)rb.setStart(sc,0);else rb.setStartBefore(sc);rb.setEnd(sn,so);bef.appendChild(rb.cloneContents()||d.createTextNode(''));try{ra.setEndAfter(ec);}catch(ex){}ra.setStart(en,eo);aft.appendChild(ra.cloneContents()||d.createTextNode(''));r=d.createRange();if(!sc.previousSibling&&sc.parentNode.nodeName==bn){r.setStartBefore(sc.parentNode);}else{if(rb.startContainer.nodeName==bn&&rb.startOffset==0)r.setStartBefore(rb.startContainer);else r.setStart(rb.startContainer,rb.startOffset);}if(!ec.nextSibling&&ec.parentNode.nodeName==bn)r.setEndAfter(ec.parentNode);else r.setEnd(ra.endContainer,ra.endOffset);r.deleteContents();if(isOpera)ed.getWin().scrollTo(0,vp.y);if(bef.firstChild&&bef.firstChild.nodeName==bn)bef.innerHTML=bef.firstChild.innerHTML;if(aft.firstChild&&aft.firstChild.nodeName==bn)aft.innerHTML=aft.firstChild.innerHTML;if(isEmpty(bef))bef.innerHTML='<br />';if(isEmpty(aft))aft.innerHTML=isOpera?'&nbsp;':'<br />';if(isOpera&&parseFloat(opera.version())<9.5){r.insertNode(bef);r.insertNode(aft);}else{r.insertNode(aft);r.insertNode(bef);}aft.normalize();bef.normalize();function first(n){return d.createTreeWalker(n,NodeFilter.SHOW_TEXT,null,false).nextNode()||n;};r=d.createRange();r.selectNodeContents(isGecko?first(aft):aft);r.collapse(1);s.removeAllRanges();s.addRange(r);y=ed.dom.getPos(aft).y;ch=aft.clientHeight;if(y<vp.y||y+ch>vp.y+vp.h){ed.getWin().scrollTo(0,y<vp.y?y:y-vp.h+ch);}return false;},backspaceDelete:function(e,bs){var t=this,ed=t.editor,b=ed.getBody(),n,se=ed.selection,r=se.getRng(),sc=r.startContainer,n,w,tn;if(sc&&ed.dom.isBlock(sc)&&!/^(TD|TH)$/.test(sc.nodeName)&&bs){if(sc.childNodes.length==0||(sc.childNodes.length==1&&sc.firstChild.nodeName=='BR')){n=sc;while((n=n.previousSibling)&&!ed.dom.isBlock(n));if(n){if(sc!=b.firstChild){w=ed.dom.doc.createTreeWalker(n,NodeFilter.SHOW_TEXT,null,false);while(tn=w.nextNode())n=tn;r=ed.getDoc().createRange();r.setStart(n,n.nodeValue?n.nodeValue.length:0);r.setEnd(n,n.nodeValue?n.nodeValue.length:0);se.setRng(r);ed.dom.remove(sc);}return Event.cancel(e);}}}function handler(e){e=e.target;if(e&&e.parentNode&&e.nodeName=='BR'&&(n=t.getParentBlock(e))){Event.remove(b,'DOMNodeInserted',handler);if(e.previousSibling||e.nextSibling)ed.dom.remove(e);}};Event._add(b,'DOMNodeInserted',handler);window.setTimeout(function(){Event._remove(b,'DOMNodeInserted',handler);},1);}});})();(function(){var DOM=tinymce.DOM,Event=tinymce.dom.Event,each=tinymce.each,extend=tinymce.extend;tinymce.create('tinymce.ControlManager',{ControlManager:function(ed,s){var t=this,i;s=s||{};t.editor=ed;t.controls={};t.onAdd=new tinymce.util.Dispatcher(t);t.onPostRender=new tinymce.util.Dispatcher(t);t.prefix=s.prefix||ed.id+'_';t._cls={};t.onPostRender.add(function(){each(t.controls,function(c){c.postRender();});});},get:function(id){return this.controls[this.prefix+id]||this.controls[id];},setActive:function(id,s){var c=null;if(c=this.get(id))c.setActive(s);return c;},setDisabled:function(id,s){var c=null;if(c=this.get(id))c.setDisabled(s);return c;},add:function(c){var t=this;if(c){t.controls[c.id]=c;t.onAdd.dispatch(c,t);}return c;},createControl:function(n){var c,t=this,ed=t.editor;each(ed.plugins,function(p){if(p.createControl){c=p.createControl(n,t);if(c)return false;}});switch(n){case"|":case"separator":return t.createSeparator();}if(!c&&ed.buttons&&(c=ed.buttons[n]))return t.createButton(n,c);return t.add(c);},createDropMenu:function(id,s,cc){var t=this,ed=t.editor,c,bm,v,cls;s=extend({'class':'mceDropDown',constrain:ed.settings.constrain_menus},s);s['class']=s['class']+' '+ed.getParam('skin')+'Skin';if(v=ed.getParam('skin_variant'))s['class']+=' '+ed.getParam('skin')+'Skin'+v.substring(0,1).toUpperCase()+v.substring(1);id=t.prefix+id;cls=cc||t._cls.dropmenu||tinymce.ui.DropMenu;c=t.controls[id]=new cls(id,s);c.onAddItem.add(function(c,o){var s=o.settings;s.title=ed.getLang(s.title,s.title);if(!s.onclick){s.onclick=function(v){ed.execCommand(s.cmd,s.ui||false,s.value);};}});ed.onRemove.add(function(){c.destroy();});if(tinymce.isIE){c.onShowMenu.add(function(){bm=ed.selection.getBookmark(1);});c.onHideMenu.add(function(){if(bm)ed.selection.moveToBookmark(bm);});}return t.add(c);},createListBox:function(id,s,cc){var t=this,ed=t.editor,cmd,c,cls;if(t.get(id))return null;s.title=ed.translate(s.title);s.scope=s.scope||ed;if(!s.onselect){s.onselect=function(v){ed.execCommand(s.cmd,s.ui||false,v||s.value);};}s=extend({title:s.title,'class':'mce_'+id,scope:s.scope,control_manager:t},s);id=t.prefix+id;if(ed.settings.use_native_selects)c=new tinymce.ui.NativeListBox(id,s);else{cls=cc||t._cls.listbox||tinymce.ui.ListBox;c=new cls(id,s);}t.controls[id]=c;if(tinymce.isWebKit){c.onPostRender.add(function(c,n){Event.add(n,'mousedown',function(){ed.bookmark=ed.selection.getBookmark('simple');});Event.add(n,'focus',function(){ed.selection.moveToBookmark(ed.bookmark);ed.bookmark=null;});});}if(c.hideMenu)ed.onMouseDown.add(c.hideMenu,c);return t.add(c);},createButton:function(id,s,cc){var t=this,ed=t.editor,o,c,cls;if(t.get(id))return null;s.title=ed.translate(s.title);s.label=ed.translate(s.label);s.scope=s.scope||ed;if(!s.onclick&&!s.menu_button){s.onclick=function(){ed.execCommand(s.cmd,s.ui||false,s.value);};}s=extend({title:s.title,'class':'mce_'+id,unavailable_prefix:ed.getLang('unavailable',''),scope:s.scope,control_manager:t},s);id=t.prefix+id;if(s.menu_button){cls=cc||t._cls.menubutton||tinymce.ui.MenuButton;c=new cls(id,s);ed.onMouseDown.add(c.hideMenu,c);}else{cls=t._cls.button||tinymce.ui.Button;c=new cls(id,s);}return t.add(c);},createMenuButton:function(id,s){s=s||{};s.menu_button=1;return this.createButton(id,s);},createSplitButton:function(id,s,cc){var t=this,ed=t.editor,cmd,c,cls;if(t.get(id))return null;s.title=ed.translate(s.title);s.scope=s.scope||ed;if(!s.onclick){s.onclick=function(v){ed.execCommand(s.cmd,s.ui||false,v||s.value);};}if(!s.onselect){s.onselect=function(v){ed.execCommand(s.cmd,s.ui||false,v||s.value);};}s=extend({title:s.title,'class':'mce_'+id,scope:s.scope,control_manager:t},s);id=t.prefix+id;cls=cc||t._cls.splitbutton||tinymce.ui.SplitButton;c=t.add(new cls(id,s));ed.onMouseDown.add(c.hideMenu,c);return c;},createColorSplitButton:function(id,s,cc){var t=this,ed=t.editor,cmd,c,cls,bm;if(t.get(id))return null;s.title=ed.translate(s.title);s.scope=s.scope||ed;if(!s.onclick){s.onclick=function(v){ed.execCommand(s.cmd,s.ui||false,v||s.value);};}if(!s.onselect){s.onselect=function(v){ed.execCommand(s.cmd,s.ui||false,v||s.value);};}s=extend({title:s.title,'class':'mce_'+id,'menu_class':ed.getParam('skin')+'Skin',scope:s.scope,more_colors_title:ed.getLang('more_colors')},s);id=t.prefix+id;cls=cc||t._cls.colorsplitbutton||tinymce.ui.ColorSplitButton;c=new cls(id,s);ed.onMouseDown.add(c.hideMenu,c);ed.onRemove.add(function(){c.destroy();});if(tinymce.isIE){c.onShowMenu.add(function(){bm=ed.selection.getBookmark(1);});c.onHideMenu.add(function(){if(bm){ed.selection.moveToBookmark(bm);bm=0;}});}return t.add(c);},createToolbar:function(id,s,cc){var c,t=this,cls;id=t.prefix+id;cls=cc||t._cls.toolbar||tinymce.ui.Toolbar;c=new cls(id,s);if(t.get(id))return null;return t.add(c);},createSeparator:function(cc){var cls=cc||this._cls.separator||tinymce.ui.Separator;return new cls();},setControlType:function(n,c){return this._cls[n.toLowerCase()]=c;},destroy:function(){each(this.controls,function(c){c.destroy();});this.controls=null;}});})();(function(){var Dispatcher=tinymce.util.Dispatcher,each=tinymce.each,isIE=tinymce.isIE,isOpera=tinymce.isOpera;tinymce.create('tinymce.WindowManager',{WindowManager:function(ed){var t=this;t.editor=ed;t.onOpen=new Dispatcher(t);t.onClose=new Dispatcher(t);t.params={};t.features={};},open:function(s,p){var t=this,f='',x,y,mo=t.editor.settings.dialog_type=='modal',w,sw,sh,vp=tinymce.DOM.getViewPort(),u;s=s||{};p=p||{};sw=isOpera?vp.w:screen.width;sh=isOpera?vp.h:screen.height;s.name=s.name||'mc_'+new Date().getTime();s.width=parseInt(s.width||320);s.height=parseInt(s.height||240);s.resizable=true;s.left=s.left||parseInt(sw/ 2.0) - (s.width /2.0);s.top=s.top||parseInt(sh/ 2.0) - (s.height /2.0);p.inline=false;p.mce_width=s.width;p.mce_height=s.height;p.mce_auto_focus=s.auto_focus;if(mo){if(isIE){s.center=true;s.help=false;s.dialogWidth=s.width+'px';s.dialogHeight=s.height+'px';s.scroll=s.scrollbars||false;}}each(s,function(v,k){if(tinymce.is(v,'boolean'))v=v?'yes':'no';if(!/^(name|url)$/.test(k)){if(isIE&&mo)f+=(f?';':'')+k+':'+v;else f+=(f?',':'')+k+'='+v;}});t.features=s;t.params=p;t.onOpen.dispatch(t,s,p);u=s.url||s.file;if(tinymce.relaxedDomain)u+=(u.indexOf('?')==-1?'?':'&')+'mce_rdomain='+tinymce.relaxedDomain;u=tinymce._addVer(u);try{if(isIE&&mo){w=1;window.showModalDialog(u,window,f);}else w=window.open(u,s.name,f);}catch(ex){}if(!w)alert(t.editor.getLang('popup_blocked'));},close:function(w){w.close();this.onClose.dispatch(this);},createInstance:function(cl,a,b,c,d,e){var f=tinymce.resolve(cl);return new f(a,b,c,d,e);},confirm:function(t,cb,s){cb.call(s||this,confirm(this._decode(this.editor.getLang(t,t))));},alert:function(tx,cb,s){var t=this;alert(t._decode(t.editor.getLang(tx,tx)));if(cb)cb.call(s||t);},_decode:function(s){return tinymce.DOM.decode(s).replace(/\\n/g,'\n');}});}());
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/tiny_mce_popup.js b/mod/tinymce/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
new file mode 100644
index 000000000..6c8f73b67
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
@@ -0,0 +1,275 @@
+// Some global instances
+var tinymce = null, tinyMCEPopup, tinyMCE;
+
+tinyMCEPopup = {
+	init : function() {
+		var t = this, w, ti, li, q, i, it;
+
+		li = ('' + document.location.search).replace(/^\?/, '').split('&');
+		q = {};
+		for (i=0; i<li.length; i++) {
+			it = li[i].split('=');
+			q[unescape(it[0])] = unescape(it[1]);
+		}
+
+		if (q.mce_rdomain)
+			document.domain = q.mce_rdomain;
+
+		// Find window & API
+		w = t.getWin();
+		tinymce = w.tinymce;
+		tinyMCE = w.tinyMCE;
+		t.editor = tinymce.EditorManager.activeEditor;
+		t.params = t.editor.windowManager.params;
+
+		// Setup local DOM
+		t.dom = t.editor.windowManager.createInstance('tinymce.dom.DOMUtils', document);
+		t.dom.loadCSS(t.editor.settings.popup_css);
+
+		// Setup on init listeners
+		t.listeners = [];
+		t.onInit = {
+			add : function(f, s) {
+				t.listeners.push({func : f, scope : s});
+			}
+		};
+
+		t.isWindow = !t.getWindowArg('mce_inline');
+		t.id = t.getWindowArg('mce_window_id');
+		t.editor.windowManager.onOpen.dispatch(t.editor.windowManager, window);
+	},
+
+	getWin : function() {
+		return window.dialogArguments || opener || parent || top;
+	},
+
+	getWindowArg : function(n, dv) {
+		var v = this.params[n];
+
+		return tinymce.is(v) ? v : dv;
+	},
+
+	getParam : function(n, dv) {
+		return this.editor.getParam(n, dv);
+	},
+
+	getLang : function(n, dv) {
+		return this.editor.getLang(n, dv);
+	},
+
+	execCommand : function(cmd, ui, val, a) {
+		a = a || {};
+		a.skip_focus = 1;
+
+		this.restoreSelection();
+		return this.editor.execCommand(cmd, ui, val, a);
+	},
+
+	resizeToInnerSize : function() {
+		var t = this, n, b = document.body, vp = t.dom.getViewPort(window), dw, dh;
+
+		dw = t.getWindowArg('mce_width') - vp.w;
+		dh = t.getWindowArg('mce_height') - vp.h;
+
+		if (t.isWindow)
+			window.resizeBy(dw, dh);
+		else
+			t.editor.windowManager.resizeBy(dw, dh, t.id);
+	},
+
+	executeOnLoad : function(s) {
+		this.onInit.add(function() {
+			eval(s);
+		});
+	},
+
+	storeSelection : function() {
+		this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark('simple');
+	},
+
+	restoreSelection : function() {
+		var t = tinyMCEPopup;
+
+		if (!t.isWindow && tinymce.isIE)
+			t.editor.selection.moveToBookmark(t.editor.windowManager.bookmark);
+	},
+
+	requireLangPack : function() {
+		var u = this.getWindowArg('plugin_url') || this.getWindowArg('theme_url');
+
+		if (u && this.editor.settings.language) {
+			u += '/langs/' + this.editor.settings.language + '_dlg.js';
+
+			if (!tinymce.ScriptLoader.isDone(u)) {
+				document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"></script>');
+				tinymce.ScriptLoader.markDone(u);
+			}
+		}
+	},
+
+	pickColor : function(e, element_id) {
+		this.execCommand('mceColorPicker', true, {
+			color : document.getElementById(element_id).value,
+			func : function(c) {
+				document.getElementById(element_id).value = c;
+
+				try {
+					document.getElementById(element_id).onchange();
+				} catch (ex) {
+					// Try fire event, ignore errors
+				}
+			}
+		});
+	},
+
+	openBrowser : function(element_id, type, option) {
+		tinyMCEPopup.restoreSelection();
+		this.editor.execCallback('file_browser_callback', element_id, document.getElementById(element_id).value, type, window);
+	},
+
+	close : function() {
+		var t = this;
+
+		// To avoid domain relaxing issue in Opera
+		function close() {
+			t.editor.windowManager.close(window);
+			tinymce = tinyMCE = t.editor = t.params = t.dom = t.dom.doc = null; // Cleanup
+		};
+
+		if (tinymce.isOpera)
+			t.getWin().setTimeout(close, 0);
+		else
+			close();
+	},
+
+	// Internal functions	
+
+	_restoreSelection : function() {
+		var e = window.event.srcElement;
+
+		if (e.nodeName == 'INPUT' && (e.type == 'submit' || e.type == 'button'))
+			tinyMCEPopup.restoreSelection();
+	},
+
+/*	_restoreSelection : function() {
+		var e = window.event.srcElement;
+
+		// If user focus a non text input or textarea
+		if ((e.nodeName != 'INPUT' && e.nodeName != 'TEXTAREA') || e.type != 'text')
+			tinyMCEPopup.restoreSelection();
+	},*/
+
+	_onDOMLoaded : function() {
+		var t = this, ti = document.title, bm, h;
+
+		// Translate page
+		h = document.body.innerHTML;
+
+		// Replace a=x with a="x" in IE
+		if (tinymce.isIE)
+			h = h.replace(/ (value|title|alt)=([^"][^\s>]+)/gi, ' $1="$2"')
+
+		document.dir = t.editor.getParam('directionality','');
+		document.body.innerHTML = t.editor.translate(h);
+		document.title = ti = t.editor.translate(ti);
+		document.body.style.display = '';
+
+		// Restore selection in IE when focus is placed on a non textarea or input element of the type text
+		if (tinymce.isIE)
+			document.attachEvent('onmouseup', tinyMCEPopup._restoreSelection);
+
+		t.restoreSelection();
+		t.resizeToInnerSize();
+
+		// Set inline title
+		if (!t.isWindow)
+			t.editor.windowManager.setTitle(window, ti);
+		else
+			window.focus();
+
+		if (!tinymce.isIE && !t.isWindow) {
+			tinymce.dom.Event._add(document, 'focus', function() {
+				t.editor.windowManager.focus(t.id)
+			});
+		}
+
+		// Patch for accessibility
+		tinymce.each(t.dom.select('select'), function(e) {
+			e.onkeydown = tinyMCEPopup._accessHandler;
+		});
+
+		// Call onInit
+		// Init must be called before focus so the selection won't get lost by the focus call
+		tinymce.each(t.listeners, function(o) {
+			o.func.call(o.scope, t.editor);
+		});
+
+		// Move focus to window
+		if (t.getWindowArg('mce_auto_focus', true)) {
+			window.focus();
+
+			// Focus element with mceFocus class
+			tinymce.each(document.forms, function(f) {
+				tinymce.each(f.elements, function(e) {
+					if (t.dom.hasClass(e, 'mceFocus') && !e.disabled) {
+						e.focus();
+						return false; // Break loop
+					}
+				});
+			});
+		}
+
+		document.onkeyup = tinyMCEPopup._closeWinKeyHandler;
+	},
+
+	_accessHandler : function(e) {
+		e = e || window.event;
+
+		if (e.keyCode == 13 || e.keyCode == 32) {
+			e = e.target || e.srcElement;
+
+			if (e.onchange)
+				e.onchange();
+
+			return tinymce.dom.Event.cancel(e);
+		}
+	},
+
+	_closeWinKeyHandler : function(e) {
+		e = e || window.event;
+
+		if (e.keyCode == 27)
+			tinyMCEPopup.close();
+	},
+
+	_wait : function() {
+		var t = this, ti;
+
+		if (tinymce.isIE && document.location.protocol != 'https:') {
+			// Fake DOMContentLoaded on IE
+			document.write('<script id=__ie_onload defer src=\'javascript:""\';><\/script>');
+			document.getElementById("__ie_onload").onreadystatechange = function() {
+				if (this.readyState == "complete") {
+					t._onDOMLoaded();
+					document.getElementById("__ie_onload").onreadystatechange = null; // Prevent leak
+				}
+			};
+		} else {
+			if (tinymce.isIE || tinymce.isWebKit) {
+				ti = setInterval(function() {
+					if (/loaded|complete/.test(document.readyState)) {
+						clearInterval(ti);
+						t._onDOMLoaded();
+					}
+				}, 10);
+			} else {
+				window.addEventListener('DOMContentLoaded', function() {
+					t._onDOMLoaded();
+				}, false);
+			}
+		}
+	}
+};
+
+tinyMCEPopup.init();
+tinyMCEPopup._wait(); // Wait for DOM Content Loaded
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/tiny_mce_src.js b/mod/tinymce/tinymce/jscripts/tiny_mce/tiny_mce_src.js
new file mode 100644
index 000000000..39a60e63e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/tiny_mce_src.js
@@ -0,0 +1,10658 @@
+
+/* file:jscripts/tiny_mce/classes/tinymce.js */
+
+var tinymce = {
+	majorVersion : '3',
+	minorVersion : '1.0.1',
+	releaseDate : '2008-06-18',
+
+	_init : function() {
+		var t = this, d = document, w = window, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;
+
+		// Browser checks
+		t.isOpera = w.opera && opera.buildNumber;
+		t.isWebKit = /WebKit/.test(ua);
+		t.isOldWebKit = t.isWebKit && !w.getSelection().getRangeAt;
+		t.isIE = !t.isWebKit && !t.isOpera && (/MSIE/gi).test(ua) && (/Explorer/gi).test(na.appName);
+		t.isIE6 = t.isIE && /MSIE [56]/.test(ua);
+		t.isGecko = !t.isWebKit && /Gecko/.test(ua);
+		t.isMac = ua.indexOf('Mac') != -1;
+
+		// TinyMCE .NET webcontrol might be setting the values for TinyMCE
+		if (w.tinyMCEPreInit) {
+			t.suffix = tinyMCEPreInit.suffix;
+			t.baseURL = tinyMCEPreInit.base;
+			t.query = tinyMCEPreInit.query;
+			return;
+		}
+
+		// Get suffix and base
+		t.suffix = '';
+
+		// If base element found, add that infront of baseURL
+		nl = d.getElementsByTagName('base');
+		for (i=0; i<nl.length; i++) {
+			if (v = nl[i].href) {
+				// Host only value like http://site.com or http://site.com:8008
+				if (/^https?:\/\/[^\/]+$/.test(v))
+					v += '/';
+
+				base = v ? v.match(/.*\//)[0] : ''; // Get only directory
+			}
+		}
+
+		function getBase(n) {
+			if (n.src && /tiny_mce(|_dev|_src|_gzip|_jquery|_prototype).js/.test(n.src)) {
+				if (/_(src|dev)\.js/g.test(n.src))
+					t.suffix = '_src';
+
+				if ((p = n.src.indexOf('?')) != -1)
+					t.query = n.src.substring(p + 1);
+
+				t.baseURL = n.src.substring(0, n.src.lastIndexOf('/'));
+
+				// If path to script is relative and a base href was found add that one infront
+				if (base && t.baseURL.indexOf('://') == -1)
+					t.baseURL = base + t.baseURL;
+
+				return t.baseURL;
+			}
+
+			return null;
+		};
+
+		// Check document
+		nl = d.getElementsByTagName('script');
+		for (i=0; i<nl.length; i++) {
+			if (getBase(nl[i]))
+				return;
+		}
+
+		// Check head
+		n = d.getElementsByTagName('head')[0];
+		if (n) {
+			nl = n.getElementsByTagName('script');
+			for (i=0; i<nl.length; i++) {
+				if (getBase(nl[i]))
+					return;
+			}
+		}
+
+		return;
+	},
+
+	is : function(o, t) {
+		var n = typeof(o);
+
+		if (!t)
+			return n != 'undefined';
+
+		if (t == 'array' && (o instanceof Array))
+			return true;
+
+		return n == t;
+	},
+
+	// #if !jquery
+
+	each : function(o, cb, s) {
+		var n, l;
+
+		if (!o)
+			return 0;
+
+		s = s || o;
+
+		if (typeof(o.length) != 'undefined') {
+			// Indexed arrays, needed for Safari
+			for (n=0, l = o.length; n<l; n++) {
+				if (cb.call(s, o[n], n, o) === false)
+					return 0;
+			}
+		} else {
+			// Hashtables
+			for (n in o) {
+				if (o.hasOwnProperty(n)) {
+					if (cb.call(s, o[n], n, o) === false)
+						return 0;
+				}
+			}
+		}
+
+		return 1;
+	},
+
+	map : function(a, f) {
+		var o = [];
+
+		tinymce.each(a, function(v) {
+			o.push(f(v));
+		});
+
+		return o;
+	},
+
+	grep : function(a, f) {
+		var o = [];
+
+		tinymce.each(a, function(v) {
+			if (!f || f(v))
+				o.push(v);
+		});
+
+		return o;
+	},
+
+	inArray : function(a, v) {
+		var i, l;
+
+		if (a) {
+			for (i = 0, l = a.length; i < l; i++) {
+				if (a[i] === v)
+					return i;
+			}
+		}
+
+		return -1;
+	},
+
+	extend : function(o, e) {
+		var i, a = arguments;
+
+		for (i=1; i<a.length; i++) {
+			e = a[i];
+
+			tinymce.each(e, function(v, n) {
+				if (typeof(v) !== 'undefined')
+					o[n] = v;
+			});
+		}
+
+		return o;
+	},
+
+	trim : function(s) {
+		return (s ? '' + s : '').replace(/^\s*|\s*$/g, '');
+	},
+
+	// #endif
+
+	create : function(s, p) {
+		var t = this, sp, ns, cn, scn, c, de = 0;
+
+		// Parse : <prefix> <class>:<super class>
+		s = /^((static) )?([\w.]+)(:([\w.]+))?/.exec(s);
+		cn = s[3].match(/(^|\.)(\w+)$/i)[2]; // Class name
+
+		// Create namespace for new class
+		ns = t.createNS(s[3].replace(/\.\w+$/, ''));
+
+		// Class already exists
+		if (ns[cn])
+			return;
+
+		// Make pure static class
+		if (s[2] == 'static') {
+			ns[cn] = p;
+
+			if (this.onCreate)
+				this.onCreate(s[2], s[3], ns[cn]);
+
+			return;
+		}
+
+		// Create default constructor
+		if (!p[cn]) {
+			p[cn] = function() {};
+			de = 1;
+		}
+
+		// Add constructor and methods
+		ns[cn] = p[cn];
+		t.extend(ns[cn].prototype, p);
+
+		// Extend
+		if (s[5]) {
+			sp = t.resolve(s[5]).prototype;
+			scn = s[5].match(/\.(\w+)$/i)[1]; // Class name
+
+			// Extend constructor
+			c = ns[cn];
+			if (de) {
+				// Add passthrough constructor
+				ns[cn] = function() {
+					return sp[scn].apply(this, arguments);
+				};
+			} else {
+				// Add inherit constructor
+				ns[cn] = function() {
+					this.parent = sp[scn];
+					return c.apply(this, arguments);
+				};
+			}
+			ns[cn].prototype[cn] = ns[cn];
+
+			// Add super methods
+			t.each(sp, function(f, n) {
+				ns[cn].prototype[n] = sp[n];
+			});
+
+			// Add overridden methods
+			t.each(p, function(f, n) {
+				// Extend methods if needed
+				if (sp[n]) {
+					ns[cn].prototype[n] = function() {
+						this.parent = sp[n];
+						return f.apply(this, arguments);
+					};
+				} else {
+					if (n != cn)
+						ns[cn].prototype[n] = f;
+				}
+			});
+		}
+
+		// Add static methods
+		t.each(p['static'], function(f, n) {
+			ns[cn][n] = f;
+		});
+
+		if (this.onCreate)
+			this.onCreate(s[2], s[3], ns[cn].prototype);
+	},
+
+	walk : function(o, f, n, s) {
+		s = s || this;
+
+		if (o) {
+			if (n)
+				o = o[n];
+
+			tinymce.each(o, function(o, i) {
+				if (f.call(s, o, i, n) === false)
+					return false;
+
+				tinymce.walk(o, f, n, s);
+			});
+		}
+	},
+
+	createNS : function(n, o) {
+		var i, v;
+
+		o = o || window;
+
+		n = n.split('.');
+		for (i=0; i<n.length; i++) {
+			v = n[i];
+
+			if (!o[v])
+				o[v] = {};
+
+			o = o[v];
+		}
+
+		return o;
+	},
+
+	resolve : function(n, o) {
+		var i, l;
+
+		o = o || window;
+
+		n = n.split('.');
+		for (i=0, l = n.length; i<l; i++) {
+			o = o[n[i]];
+
+			if (!o)
+				break;
+		}
+
+		return o;
+	},
+
+	addUnload : function(f, s) {
+		var t = this, w = window;
+
+		f = {func : f, scope : s || this};
+
+		if (!t.unloads) {
+			function unload() {
+				var li = t.unloads, o, n;
+
+				if (li) {
+					// Call unload handlers
+					for (n in li) {
+						o = li[n];
+
+						if (o && o.func)
+							o.func.call(o.scope, 1); // Send in one arg to distinct unload and user destroy
+					}
+
+					// Detach unload function
+					if (w.detachEvent) {
+						w.detachEvent('onbeforeunload', fakeUnload);
+						w.detachEvent('onunload', unload);
+					} else if (w.removeEventListener)
+						w.removeEventListener('unload', unload, false);
+
+					// Destroy references
+					t.unloads = o = li = w = unload = null;
+
+					// Run garbarge collector on IE
+					if (window.CollectGarbage)
+						window.CollectGarbage();
+				}
+			};
+
+			function fakeUnload() {
+				var d = document;
+
+				// Is there things still loading, then do some magic
+				if (d.readyState == 'interactive') {
+					function stop() {
+						// Prevent memory leak
+						d.detachEvent('onstop', stop);
+
+						// Call unload handler
+						unload();
+
+						d = null;
+					};
+
+					// Fire unload when the currently loading page is stopped
+					d.attachEvent('onstop', stop);
+
+					// Remove onstop listener after a while to prevent the unload function
+					// to execute if the user presses cancel in an onbeforeunload
+					// confirm dialog and then presses the browser stop button
+					window.setTimeout(function() {
+						d.detachEvent('onstop', stop);
+					}, 0);
+				}
+			};
+
+			// Attach unload handler
+			if (w.attachEvent) {
+				w.attachEvent('onunload', unload);
+				w.attachEvent('onbeforeunload', fakeUnload);
+			} else if (w.addEventListener)
+				w.addEventListener('unload', unload, false);
+
+			// Setup initial unload handler array
+			t.unloads = [f];
+		} else
+			t.unloads.push(f);
+
+		return f;
+	},
+
+	removeUnload : function(f) {
+		var u = this.unloads, r = null;
+
+		tinymce.each(u, function(o, i) {
+			if (o && o.func == f) {
+				u.splice(i, 1);
+				r = f;
+				return false;
+			}
+		});
+
+		return r;
+	},
+
+	explode : function(s, d) {
+		return s ? tinymce.map(s.split(d || ','), tinymce.trim) : s;
+	},
+
+	_addVer : function(u) {
+		var v;
+
+		if (!this.query)
+			return u;
+
+		v = (u.indexOf('?') == -1 ? '?' : '&') + this.query;
+
+		if (u.indexOf('#') == -1)
+			return u + v;
+
+		return u.replace('#', v + '#');
+	}
+
+	};
+
+// Required for GZip AJAX loading
+window.tinymce = tinymce;
+
+// Initialize the API
+tinymce._init();
+
+/* file:jscripts/tiny_mce/classes/adapter/jquery/adapter.js */
+
+
+/* file:jscripts/tiny_mce/classes/adapter/prototype/adapter.js */
+
+
+/* file:jscripts/tiny_mce/classes/util/Dispatcher.js */
+
+tinymce.create('tinymce.util.Dispatcher', {
+	scope : null,
+	listeners : null,
+
+	Dispatcher : function(s) {
+		this.scope = s || this;
+		this.listeners = [];
+	},
+
+	add : function(cb, s) {
+		this.listeners.push({cb : cb, scope : s || this.scope});
+
+		return cb;
+	},
+
+	addToTop : function(cb, s) {
+		this.listeners.unshift({cb : cb, scope : s || this.scope});
+
+		return cb;
+	},
+
+	remove : function(cb) {
+		var l = this.listeners, o = null;
+
+		tinymce.each(l, function(c, i) {
+			if (cb == c.cb) {
+				o = cb;
+				l.splice(i, 1);
+				return false;
+			}
+		});
+
+		return o;
+	},
+
+	dispatch : function() {
+		var s, a = arguments, i, li = this.listeners, c;
+
+		// Needs to be a real loop since the listener count might change while looping
+		// And this is also more efficient
+		for (i = 0; i<li.length; i++) {
+			c = li[i];
+			s = c.cb.apply(c.scope, a);
+
+			if (s === false)
+				break;
+		}
+
+		return s;
+	}
+
+	});
+
+/* file:jscripts/tiny_mce/classes/util/URI.js */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.util.URI', {
+		URI : function(u, s) {
+			var t = this, o, a, b;
+
+			// Default settings
+			s = t.settings = s || {};
+
+			// Strange app protocol or local anchor
+			if (/^(mailto|news|javascript|about):/i.test(u) || /^\s*#/.test(u)) {
+				t.source = u;
+				return;
+			}
+
+			// Absolute path with no host, fake host and protocol
+			if (u.indexOf('/') === 0 && u.indexOf('//') !== 0)
+				u = (s.base_uri ? s.base_uri.protocol || 'http' : 'http') + '://mce_host' + u;
+
+			// Relative path
+			if (u.indexOf('://') === -1 && u.indexOf('//') !== 0)
+				u = (s.base_uri.protocol || 'http') + '://mce_host' + t.toAbsPath(s.base_uri.path, u);
+
+			// Parse URL (Credits goes to Steave, http://blog.stevenlevithan.com/archives/parseuri)
+			u = u.replace(/@@/g, '(mce_at)'); // Zope 3 workaround, they use @@something
+			u = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(u);
+			each(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"], function(v, i) {
+				var s = u[i];
+
+				// Zope 3 workaround, they use @@something
+				if (s)
+					s = s.replace(/\(mce_at\)/g, '@@');
+
+				t[v] = s;
+			});
+
+			if (b = s.base_uri) {
+				if (!t.protocol)
+					t.protocol = b.protocol;
+
+				if (!t.userInfo)
+					t.userInfo = b.userInfo;
+
+				if (!t.port && t.host == 'mce_host')
+					t.port = b.port;
+
+				if (!t.host || t.host == 'mce_host')
+					t.host = b.host;
+
+				t.source = '';
+			}
+
+			//t.path = t.path || '/';
+		},
+
+		setPath : function(p) {
+			var t = this;
+
+			p = /^(.*?)\/?(\w+)?$/.exec(p);
+
+			// Update path parts
+			t.path = p[0];
+			t.directory = p[1];
+			t.file = p[2];
+
+			// Rebuild source
+			t.source = '';
+			t.getURI();
+		},
+
+		toRelative : function(u) {
+			var t = this, o;
+
+			u = new tinymce.util.URI(u, {base_uri : t});
+
+			// Not on same domain/port or protocol
+			if ((u.host != 'mce_host' && t.host != u.host && u.host) || t.port != u.port || t.protocol != u.protocol)
+				return u.getURI();
+
+			o = t.toRelPath(t.path, u.path);
+
+			// Add query
+			if (u.query)
+				o += '?' + u.query;
+
+			// Add anchor
+			if (u.anchor)
+				o += '#' + u.anchor;
+
+			return o;
+		},
+	
+		toAbsolute : function(u, nh) {
+			var u = new tinymce.util.URI(u, {base_uri : this});
+
+			return u.getURI(this.host == u.host ? nh : 0);
+		},
+
+		toRelPath : function(base, path) {
+			var items, bp = 0, out = '', i;
+
+			// Split the paths
+			base = base.substring(0, base.lastIndexOf('/'));
+			base = base.split('/');
+			items = path.split('/');
+
+			if (base.length >= items.length) {
+				for (i = 0; i < base.length; i++) {
+					if (i >= items.length || base[i] != items[i]) {
+						bp = i + 1;
+						break;
+					}
+				}
+			}
+
+			if (base.length < items.length) {
+				for (i = 0; i < items.length; i++) {
+					if (i >= base.length || base[i] != items[i]) {
+						bp = i + 1;
+						break;
+					}
+				}
+			}
+
+			if (bp == 1)
+				return path;
+
+			for (i = 0; i < base.length - (bp - 1); i++)
+				out += "../";
+
+			for (i = bp - 1; i < items.length; i++) {
+				if (i != bp - 1)
+					out += "/" + items[i];
+				else
+					out += items[i];
+			}
+
+			return out;
+		},
+
+		toAbsPath : function(base, path) {
+			var i, nb = 0, o = [];
+
+			// Split paths
+			base = base.split('/');
+			path = path.split('/');
+
+			// Remove empty chunks
+			each(base, function(k) {
+				if (k)
+					o.push(k);
+			});
+
+			base = o;
+
+			// Merge relURLParts chunks
+			for (i = path.length - 1, o = []; i >= 0; i--) {
+				// Ignore empty or .
+				if (path[i].length == 0 || path[i] == ".")
+					continue;
+
+				// Is parent
+				if (path[i] == '..') {
+					nb++;
+					continue;
+				}
+
+				// Move up
+				if (nb > 0) {
+					nb--;
+					continue;
+				}
+
+				o.push(path[i]);
+			}
+
+			i = base.length - nb;
+
+			// If /a/b/c or /
+			if (i <= 0)
+				return '/' + o.reverse().join('/');
+
+			return '/' + base.slice(0, i).join('/') + '/' + o.reverse().join('/');
+		},
+
+		getURI : function(nh) {
+			var s, t = this;
+
+			// Rebuild source
+			if (!t.source || nh) {
+				s = '';
+
+				if (!nh) {
+					if (t.protocol)
+						s += t.protocol + '://';
+
+					if (t.userInfo)
+						s += t.userInfo + '@';
+
+					if (t.host)
+						s += t.host;
+
+					if (t.port)
+						s += ':' + t.port;
+				}
+
+				if (t.path)
+					s += t.path;
+
+				if (t.query)
+					s += '?' + t.query;
+
+				if (t.anchor)
+					s += '#' + t.anchor;
+
+				t.source = s;
+			}
+
+			return t.source;
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/util/Cookie.js */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('static tinymce.util.Cookie', {
+		getHash : function(n) {
+			var v = this.get(n), h;
+
+			if (v) {
+				each(v.split('&'), function(v) {
+					v = v.split('=');
+					h = h || {};
+					h[unescape(v[0])] = unescape(v[1]);
+				});
+			}
+
+			return h;
+		},
+
+		setHash : function(n, v, e, p, d, s) {
+			var o = '';
+
+			each(v, function(v, k) {
+				o += (!o ? '' : '&') + escape(k) + '=' + escape(v);
+			});
+
+			this.set(n, o, e, p, d, s);
+		},
+
+		get : function(n) {
+			var c = document.cookie, e, p = n + "=", b;
+
+			// Strict mode
+			if (!c)
+				return;
+
+			b = c.indexOf("; " + p);
+
+			if (b == -1) {
+				b = c.indexOf(p);
+
+				if (b != 0)
+					return null;
+			} else
+				b += 2;
+
+			e = c.indexOf(";", b);
+
+			if (e == -1)
+				e = c.length;
+
+			return unescape(c.substring(b + p.length, e));
+		},
+
+		set : function(n, v, e, p, d, s) {
+			document.cookie = n + "=" + escape(v) +
+				((e) ? "; expires=" + e.toGMTString() : "") +
+				((p) ? "; path=" + escape(p) : "") +
+				((d) ? "; domain=" + d : "") +
+				((s) ? "; secure" : "");
+		},
+
+		remove : function(n, p) {
+			var d = new Date();
+
+			d.setTime(d.getTime() - 1000);
+
+			this.set(n, '', d, p, d);
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/util/JSON.js */
+
+tinymce.create('static tinymce.util.JSON', {
+	serialize : function(o) {
+		var i, v, s = tinymce.util.JSON.serialize, t;
+
+		if (o == null)
+			return 'null';
+
+		t = typeof o;
+
+		if (t == 'string') {
+			v = '\bb\tt\nn\ff\rr\""\'\'\\\\';
+
+			return '"' + o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'])/g, function(a, b) {
+				i = v.indexOf(b);
+
+				if (i + 1)
+					return '\\' + v.charAt(i + 1);
+
+				a = b.charCodeAt().toString(16);
+
+				return '\\u' + '0000'.substring(a.length) + a;
+			}) + '"';
+		}
+
+		if (t == 'object') {
+			if (o instanceof Array) {
+					for (i=0, v = '['; i<o.length; i++)
+						v += (i > 0 ? ',' : '') + s(o[i]);
+
+					return v + ']';
+				}
+
+				v = '{';
+
+				for (i in o)
+					v += typeof o[i] != 'function' ? (v.length > 1 ? ',"' : '"') + i + '":' + s(o[i]) : '';
+
+				return v + '}';
+		}
+
+		return '' + o;
+	},
+
+	parse : function(s) {
+		try {
+			return eval('(' + s + ')');
+		} catch (ex) {
+			// Ignore
+		}
+	}
+
+	});
+
+/* file:jscripts/tiny_mce/classes/util/XHR.js */
+
+tinymce.create('static tinymce.util.XHR', {
+	send : function(o) {
+		var x, t, w = window, c = 0;
+
+		// Default settings
+		o.scope = o.scope || this;
+		o.success_scope = o.success_scope || o.scope;
+		o.error_scope = o.error_scope || o.scope;
+		o.async = o.async === false ? false : true;
+		o.data = o.data || '';
+
+		function get(s) {
+			x = 0;
+
+			try {
+				x = new ActiveXObject(s);
+			} catch (ex) {
+			}
+
+			return x;
+		};
+
+		x = w.XMLHttpRequest ? new XMLHttpRequest() : get('Microsoft.XMLHTTP') || get('Msxml2.XMLHTTP');
+
+		if (x) {
+			if (x.overrideMimeType)
+				x.overrideMimeType(o.content_type);
+
+			x.open(o.type || (o.data ? 'POST' : 'GET'), o.url, o.async);
+
+			if (o.content_type)
+				x.setRequestHeader('Content-Type', o.content_type);
+
+			x.send(o.data);
+
+			function ready() {
+				if (!o.async || x.readyState == 4 || c++ > 10000) {
+					if (o.success && c < 10000 && x.status == 200)
+						o.success.call(o.success_scope, '' + x.responseText, x, o);
+					else if (o.error)
+						o.error.call(o.error_scope, c > 10000 ? 'TIMED_OUT' : 'GENERAL', x, o);
+
+					x = null;
+				} else
+					w.setTimeout(ready, 10);
+			};
+
+			// Syncronous request
+			if (!o.async)
+				return ready();
+
+			// Wait for response, onReadyStateChange can not be used since it leaks memory in IE
+			t = w.setTimeout(ready, 10);
+		}
+
+		}
+});
+
+/* file:jscripts/tiny_mce/classes/util/JSONRequest.js */
+
+(function() {
+	var extend = tinymce.extend, JSON = tinymce.util.JSON, XHR = tinymce.util.XHR;
+
+	tinymce.create('tinymce.util.JSONRequest', {
+		JSONRequest : function(s) {
+			this.settings = extend({
+			}, s);
+			this.count = 0;
+		},
+
+		send : function(o) {
+			var ecb = o.error, scb = o.success;
+
+			o = extend(this.settings, o);
+
+			o.success = function(c, x) {
+				c = JSON.parse(c);
+
+				if (typeof(c) == 'undefined') {
+					c = {
+						error : 'JSON Parse error.'
+					};
+				}
+
+				if (c.error)
+					ecb.call(o.error_scope || o.scope, c.error, x);
+				else
+					scb.call(o.success_scope || o.scope, c.result);
+			};
+
+			o.error = function(ty, x) {
+				ecb.call(o.error_scope || o.scope, ty, x);
+			};
+
+			o.data = JSON.serialize({
+				id : o.id || 'c' + (this.count++),
+				method : o.method,
+				params : o.params
+			});
+
+			// JSON content type for Ruby on rails. Bug: #1883287
+			o.content_type = 'application/json';
+
+			XHR.send(o);
+		},
+
+		'static' : {
+			sendRPC : function(o) {
+				return new tinymce.util.JSONRequest().send(o);
+			}
+		}
+
+		});
+}());
+/* file:jscripts/tiny_mce/classes/dom/DOMUtils.js */
+
+(function() {
+	// Shorten names
+	var each = tinymce.each, is = tinymce.is;
+	var isWebKit = tinymce.isWebKit, isIE = tinymce.isIE;
+
+	tinymce.create('tinymce.dom.DOMUtils', {
+		doc : null,
+		root : null,
+		files : null,
+		listeners : {},
+		pixelStyles : /^(top|left|bottom|right|width|height|borderWidth)$/,
+		cache : {},
+		idPattern : /^#[\w]+$/,
+		elmPattern : /^[\w_*]+$/,
+		elmClassPattern : /^([\w_]*)\.([\w_]+)$/,
+
+		DOMUtils : function(d, s) {
+			var t = this;
+
+			t.doc = d;
+			t.win = window;
+			t.files = {};
+			t.cssFlicker = false;
+			t.counter = 0;
+			t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat"; 
+			t.stdMode = d.documentMode === 8;
+
+			this.settings = s = tinymce.extend({
+				keep_values : false,
+				hex_colors : 1,
+				process_html : 1
+			}, s);
+
+			// Fix IE6SP2 flicker and check it failed for pre SP2
+			if (tinymce.isIE6) {
+				try {
+					d.execCommand('BackgroundImageCache', false, true);
+				} catch (e) {
+					t.cssFlicker = true;
+				}
+			}
+
+			tinymce.addUnload(t.destroy, t);
+		},
+
+		getRoot : function() {
+			var t = this, s = t.settings;
+
+			return (s && t.get(s.root_element)) || t.doc.body;
+		},
+
+		getViewPort : function(w) {
+			var d, b;
+
+			w = !w ? this.win : w;
+			d = w.document;
+			b = this.boxModel ? d.documentElement : d.body;
+
+			// Returns viewport size excluding scrollbars
+			return {
+				x : w.pageXOffset || b.scrollLeft,
+				y : w.pageYOffset || b.scrollTop,
+				w : w.innerWidth || b.clientWidth,
+				h : w.innerHeight || b.clientHeight
+			};
+		},
+
+		getRect : function(e) {
+			var p, t = this, w, h;
+
+			e = t.get(e);
+			p = t.getPos(e);
+			w = t.getStyle(e, 'width');
+			h = t.getStyle(e, 'height');
+
+			// Non pixel value, then force offset/clientWidth
+			if (w.indexOf('px') === -1)
+				w = 0;
+
+			// Non pixel value, then force offset/clientWidth
+			if (h.indexOf('px') === -1)
+				h = 0;
+
+			return {
+				x : p.x,
+				y : p.y,
+				w : parseInt(w) || e.offsetWidth || e.clientWidth,
+				h : parseInt(h) || e.offsetHeight || e.clientHeight
+			};
+		},
+
+		getParent : function(n, f, r) {
+			var na, se = this.settings;
+
+			n = this.get(n);
+
+			if (se.strict_root)
+				r = r || this.getRoot();
+
+			// Wrap node name as func
+			if (is(f, 'string')) {
+				na = f.toUpperCase();
+
+				f = function(n) {
+					var s = false;
+
+					// Any element
+					if (n.nodeType == 1 && na === '*') {
+						s = true;
+						return false;
+					}
+
+					each(na.split(','), function(v) {
+						if (n.nodeType == 1 && ((se.strict && n.nodeName.toUpperCase() == v) || n.nodeName.toUpperCase() == v)) {
+							s = true;
+							return false; // Break loop
+						}
+					});
+
+					return s;
+				};
+			}
+
+			while (n) {
+				if (n == r)
+					return null;
+
+				if (f(n))
+					return n;
+
+				n = n.parentNode;
+			}
+
+			return null;
+		},
+
+		get : function(e) {
+			var n;
+
+			if (e && this.doc && typeof(e) == 'string') {
+				n = e;
+				e = this.doc.getElementById(e);
+
+				// IE and Opera returns meta elements when they match the specified input ID, but getElementsByName seems to do the trick
+				if (e && e.id !== n)
+					return this.doc.getElementsByName(n)[1];
+			}
+
+			return e;
+		},
+
+		// #if !jquery
+
+		select : function(pa, s) {
+			var t = this, cs, c, pl, o = [], x, i, l, n;
+
+			s = t.get(s) || t.doc;
+
+			// Look for native support and use that if it's found
+			if (s.querySelectorAll) {
+				// Element scope then use temp id
+				// We need to do this to be compatible with other implementations
+				// See bug report: http://bugs.webkit.org/show_bug.cgi?id=17461
+				if (s != t.doc) {
+					i = s.id;
+					s.id = '_mc_tmp';
+					pa = '#_mc_tmp ' + pa;
+				}
+
+				// Select elements
+				l = tinymce.grep(s.querySelectorAll(pa));
+
+				// Restore old id
+				s.id = i;
+
+				return l;
+			}
+
+			if (t.settings.strict) {
+				function get(s, n) {
+					return s.getElementsByTagName(n.toLowerCase());
+				};
+			} else {
+				function get(s, n) {
+					return s.getElementsByTagName(n);
+				};
+			}
+
+			// Simple element pattern. For example: "p" or "*"
+			if (t.elmPattern.test(pa)) {
+				x = get(s, pa);
+
+				for (i = 0, l = x.length; i<l; i++)
+					o.push(x[i]);
+
+				return o;
+			}
+
+			// Simple class pattern. For example: "p.class" or ".class"
+			if (t.elmClassPattern.test(pa)) {
+				pl = t.elmClassPattern.exec(pa);
+				x = get(s, pl[1] || '*');
+				c = ' ' + pl[2] + ' ';
+
+				for (i = 0, l = x.length; i<l; i++) {
+					n = x[i];
+
+					if (n.className && (' ' + n.className + ' ').indexOf(c) !== -1)
+						o.push(n);
+				}
+
+				return o;
+			}
+
+			function collect(n) {
+				if (!n.mce_save) {
+					n.mce_save = 1;
+					o.push(n);
+				}
+			};
+
+			function collectIE(n) {
+				if (!n.getAttribute('mce_save')) {
+					n.setAttribute('mce_save', '1');
+					o.push(n);
+				}
+			};
+
+			function find(n, f, r) {
+				var i, l, nl = get(r, n);
+
+				for (i = 0, l = nl.length; i < l; i++)
+					f(nl[i]);
+			};
+
+			each(pa.split(','), function(v, i) {
+				v = tinymce.trim(v);
+
+				// Simple element pattern, most common in TinyMCE
+				if (t.elmPattern.test(v)) {
+					each(get(s, v), function(n) {
+						collect(n);
+					});
+
+					return;
+				}
+
+				// Simple element pattern with class, fairly common in TinyMCE
+				if (t.elmClassPattern.test(v)) {
+					x = t.elmClassPattern.exec(v);
+
+					each(get(s, x[1]), function(n) {
+						if (t.hasClass(n, x[2]))
+							collect(n);
+					});
+
+					return;
+				}
+
+				if (!(cs = t.cache[pa])) {
+					cs = 'x=(function(cf, s) {';
+					pl = v.split(' ');
+
+					each(pl, function(v) {
+						var p = /^([\w\\*]+)?(?:#([\w\\]+))?(?:\.([\w\\\.]+))?(?:\[\@([\w\\]+)([\^\$\*!]?=)([\w\\]+)\])?(?:\:([\w\\]+))?/i.exec(v);
+
+						// Find elements
+						p[1] = p[1] || '*';
+						cs += 'find("' + p[1] + '", function(n) {';
+
+						// Check id
+						if (p[2])
+							cs += 'if (n.id !== "' + p[2] + '") return;';
+
+						// Check classes
+						if (p[3]) {
+							cs += 'var c = " " + n.className + " ";';
+							cs += 'if (';
+							c = '';
+							each(p[3].split('.'), function(v) {
+								if (v)
+									c += (c ? '||' : '') + 'c.indexOf(" ' + v + ' ") === -1';
+							});
+							cs += c + ') return;';
+						}
+					});
+
+					cs += 'cf(n);';
+
+					for (i = pl.length - 1; i >= 0; i--)
+						cs += '}, ' + (i ? 'n' : 's') + ');';
+
+					cs += '})';
+
+					// Compile CSS pattern function
+					t.cache[pa] = cs = eval(cs);
+				}
+
+				// Run selector function
+				cs(isIE ? collectIE : collect, s);
+			});
+
+			// Cleanup
+			each(o, function(n) {
+				if (isIE)
+					n.removeAttribute('mce_save');
+				else
+					delete n.mce_save;
+			});
+
+			return o;
+		},
+
+		// #endif
+
+		add : function(p, n, a, h, c) {
+			var t = this;
+
+			return this.run(p, function(p) {
+				var e, k;
+
+				e = is(n, 'string') ? t.doc.createElement(n) : n;
+
+				if (a) {
+					for (k in a) {
+						if (a.hasOwnProperty(k) && !is(a[k], 'object'))
+							t.setAttrib(e, k, '' + a[k]);
+					}
+
+					if (a.style && !is(a.style, 'string')) {
+						each(a.style, function(v, n) {
+							t.setStyle(e, n, v);
+						});
+					}
+				}
+
+				if (h) {
+					if (h.nodeType)
+						e.appendChild(h);
+					else
+						t.setHTML(e, h);
+				}
+
+				return !c ? p.appendChild(e) : e;
+			});
+		},
+
+		create : function(n, a, h) {
+			return this.add(this.doc.createElement(n), n, a, h, 1);
+		},
+
+		createHTML : function(n, a, h) {
+			var o = '', t = this, k;
+
+			o += '<' + n;
+
+			for (k in a) {
+				if (a.hasOwnProperty(k))
+					o += ' ' + k + '="' + t.encode(a[k]) + '"';
+			}
+
+			if (tinymce.is(h))
+				return o + '>' + h + '</' + n + '>';
+
+			return o + ' />';
+		},
+
+		remove : function(n, k) {
+			return this.run(n, function(n) {
+				var p, g;
+
+				p = n.parentNode;
+
+				if (!p)
+					return null;
+
+				if (k) {
+					each (n.childNodes, function(c) {
+						p.insertBefore(c.cloneNode(true), n);
+					});
+				}
+
+				// Fix IE psuedo leak
+		/*		if (isIE) {
+					p = n.cloneNode(true);
+					n.outerHTML = '';
+
+					return p;
+				}*/
+
+				return p.removeChild(n);
+			});
+		},
+
+		// #if !jquery
+
+		setStyle : function(n, na, v) {
+			var t = this;
+
+			return t.run(n, function(e) {
+				var s, i;
+
+				s = e.style;
+
+				// Camelcase it, if needed
+				na = na.replace(/-(\D)/g, function(a, b){
+					return b.toUpperCase();
+				});
+
+				// Default px suffix on these
+				if (t.pixelStyles.test(na) && (tinymce.is(v, 'number') || /^[\-0-9\.]+$/.test(v)))
+					v += 'px';
+
+				switch (na) {
+					case 'opacity':
+						// IE specific opacity
+						if (isIE) {
+							s.filter = v === '' ? '' : "alpha(opacity=" + (v * 100) + ")";
+
+							if (!n.currentStyle || !n.currentStyle.hasLayout)
+								s.display = 'inline-block';
+						}
+
+						// Fix for older browsers
+						s[na] = s['-moz-opacity'] = s['-khtml-opacity'] = v || '';
+						break;
+
+					case 'float':
+						isIE ? s.styleFloat = v : s.cssFloat = v;
+						break;
+					
+					default:
+						s[na] = v || '';
+				}
+
+				// Force update of the style data
+				if (t.settings.update_styles)
+					t.setAttrib(e, 'mce_style');
+			});
+		},
+
+		getStyle : function(n, na, c) {
+			n = this.get(n);
+
+			if (!n)
+				return false;
+
+			// Gecko
+			if (this.doc.defaultView && c) {
+				// Remove camelcase
+				na = na.replace(/[A-Z]/g, function(a){
+					return '-' + a;
+				});
+
+				try {
+					return this.doc.defaultView.getComputedStyle(n, null).getPropertyValue(na);
+				} catch (ex) {
+					// Old safari might fail
+					return null;
+				}
+			}
+
+			// Camelcase it, if needed
+			na = na.replace(/-(\D)/g, function(a, b){
+				return b.toUpperCase();
+			});
+
+			if (na == 'float')
+				na = isIE ? 'styleFloat' : 'cssFloat';
+
+			// IE & Opera
+			if (n.currentStyle && c)
+				return n.currentStyle[na];
+
+			return n.style[na];
+		},
+
+		setStyles : function(e, o) {
+			var t = this, s = t.settings, ol;
+
+			ol = s.update_styles;
+			s.update_styles = 0;
+
+			each(o, function(v, n) {
+				t.setStyle(e, n, v);
+			});
+
+			// Update style info
+			s.update_styles = ol;
+			if (s.update_styles)
+				t.setAttrib(e, s.cssText);
+		},
+
+		setAttrib : function(e, n, v) {
+			var t = this;
+
+			// Strict XML mode
+			if (t.settings.strict)
+				n = n.toLowerCase();
+
+			return this.run(e, function(e) {
+				var s = t.settings;
+
+				switch (n) {
+					case "style":
+						// No mce_style for elements with these since they might get resized by the user
+						if (s.keep_values) {
+							if (v && !t._isRes(v))
+								e.setAttribute('mce_style', v, 2);
+							else
+								e.removeAttribute('mce_style', 2);
+						}
+
+						e.style.cssText = v;
+						break;
+
+					case "class":
+						e.className = v || ''; // Fix IE null bug
+						break;
+
+					case "src":
+					case "href":
+						if (s.keep_values) {
+							if (s.url_converter)
+								v = s.url_converter.call(s.url_converter_scope || t, v, n, e);
+
+							t.setAttrib(e, 'mce_' + n, v, 2);
+						}
+
+						break;
+					
+					case "shape":
+						e.setAttribute('mce_style', v);
+						break;
+				}
+
+				if (is(v) && v !== null && v.length !== 0)
+					e.setAttribute(n, '' + v, 2);
+				else
+					e.removeAttribute(n, 2);
+			});
+		},
+
+		setAttribs : function(e, o) {
+			var t = this;
+
+			return this.run(e, function(e) {
+				each(o, function(v, n) {
+					t.setAttrib(e, n, v);
+				});
+			});
+		},
+
+		// #endif
+
+		getAttrib : function(e, n, dv) {
+			var v, t = this;
+
+			e = t.get(e);
+
+			if (!e || e.nodeType !== 1)
+				return false;
+
+			if (!is(dv))
+				dv = "";
+
+			// Try the mce variant for these
+			if (/^(src|href|style|coords|shape)$/.test(n)) {
+				v = e.getAttribute("mce_" + n);
+
+				if (v)
+					return v;
+			}
+
+			v = e.getAttribute(n, 2);
+
+			if (!v) {
+				switch (n) {
+					case 'class':
+						v = e.className;
+						break;
+
+					default:
+						// Fix for IE crash Bug: #1884376 probably due to invalid DOM structure
+						if (isIE && n === 'name' && e.nodeName === 'A') {
+							v = e.name;
+							break;
+						}
+
+						v = e.attributes[n];
+						v = v && is(v.nodeValue) ? v.nodeValue : v;
+				}
+			}
+
+			switch (n) {
+				case 'style':
+					v = v || e.style.cssText;
+
+					if (v) {
+						v = t.serializeStyle(t.parseStyle(v));
+
+						if (t.settings.keep_values && !t._isRes(v))
+							e.setAttribute('mce_style', v);
+					}
+
+					break;
+			}
+
+			// Remove Apple and WebKit stuff
+			if (isWebKit && n === "class" && v)
+				v = v.replace(/(apple|webkit)\-[a-z\-]+/gi, '');
+
+			// Handle IE issues
+			if (isIE) {
+				switch (n) {
+					case 'rowspan':
+					case 'colspan':
+						// IE returns 1 as default value
+						if (v === 1)
+							v = '';
+
+						break;
+
+					case 'size':
+						// IE returns +0 as default value for size
+						if (v === '+0')
+							v = '';
+
+						break;
+
+					case 'hspace':
+						// IE returns -1 as default value
+						if (v === -1)
+							v = '';
+
+						break;
+
+					case 'tabindex':
+						// IE returns default value
+						if (v === 32768)
+							v = '';
+
+						break;
+
+					case 'maxlength':
+						// IE returns  default value
+						if (v === 2147483647)
+							v = '';
+
+						break;
+
+					case 'shape':
+						v = v.toLowerCase();
+						break;
+
+					default:
+						// IE has odd anonymous function for event attributes
+						if (n.indexOf('on') === 0 && v)
+							v = ('' + v).replace(/^function\s+anonymous\(\)\s+\{\s+(.*)\s+\}$/, '$1');
+				}
+			}
+
+			return (v && v != '') ? '' + v : dv;
+		},
+
+		getPos : function(n) {
+			var t = this, x = 0, y = 0, e, d = t.doc, r;
+
+			n = t.get(n);
+
+			// Use getBoundingClientRect on IE, Opera has it but it's not perfect
+			if (n && isIE) {
+				n = n.getBoundingClientRect();
+				e = t.boxModel ? d.documentElement : d.body;
+				x = t.getStyle(t.select('html')[0], 'borderWidth'); // Remove border
+				x = (x == 'medium' || t.boxModel && !t.isIE6) && 2 || x;
+				n.top += t.win.self != t.win.top ? 2 : 0; // IE adds some strange extra cord if used in a frameset
+
+				return {x : n.left + e.scrollLeft - x, y : n.top + e.scrollTop - x};
+			}
+
+			r = n;
+			while (r) {
+				x += r.offsetLeft || 0;
+				y += r.offsetTop || 0;
+				r = r.offsetParent;
+			}
+
+			r = n;
+			while (r) {
+				// Opera 9.25 bug fix, fixed in 9.50
+				if (!/^table-row|inline.*/i.test(t.getStyle(r, "display", 1))) {
+					x -= r.scrollLeft || 0;
+					y -= r.scrollTop || 0;
+				}
+
+				r = r.parentNode;
+
+				if (r == d.body)
+					break;
+			}
+
+			return {x : x, y : y};
+		},
+
+		parseStyle : function(st) {
+			var t = this, s = t.settings, o = {};
+
+			if (!st)
+				return o;
+
+			function compress(p, s, ot) {
+				var t, r, b, l;
+
+				// Get values and check it it needs compressing
+				t = o[p + '-top' + s];
+				if (!t)
+					return;
+
+				r = o[p + '-right' + s];
+				if (t != r)
+					return;
+
+				b = o[p + '-bottom' + s];
+				if (r != b)
+					return;
+
+				l = o[p + '-left' + s];
+				if (b != l)
+					return;
+
+				// Compress
+				o[ot] = l;
+				delete o[p + '-top' + s];
+				delete o[p + '-right' + s];
+				delete o[p + '-bottom' + s];
+				delete o[p + '-left' + s];
+			};
+
+			function compress2(ta, a, b, c) {
+				var t;
+
+				t = o[a];
+				if (!t)
+					return;
+
+				t = o[b];
+				if (!t)
+					return;
+
+				t = o[c];
+				if (!t)
+					return;
+
+				// Compress
+				o[ta] = o[a] + ' ' + o[b] + ' ' + o[c];
+				delete o[a];
+				delete o[b];
+				delete o[c];
+			};
+
+			st = st.replace(/&(#?[a-z0-9]+);/g, '&$1_MCE_SEMI_'); // Protect entities
+
+			each(st.split(';'), function(v) {
+				var sv, ur = [];
+
+				if (v) {
+					v = v.replace(/_MCE_SEMI_/g, ';'); // Restore entities
+					v = v.replace(/url\([^\)]+\)/g, function(v) {ur.push(v);return 'url(' + ur.length + ')';});
+					v = v.split(':');
+					sv = tinymce.trim(v[1]);
+					sv = sv.replace(/url\(([^\)]+)\)/g, function(a, b) {return ur[parseInt(b) - 1];});
+
+					sv = sv.replace(/rgb\([^\)]+\)/g, function(v) {
+						return t.toHex(v);
+					});
+
+					if (s.url_converter) {
+						sv = sv.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g, function(x, c) {
+							return 'url(' + s.url_converter.call(s.url_converter_scope || t, t.decode(c), 'style', null) + ')';
+						});
+					}
+
+					o[tinymce.trim(v[0]).toLowerCase()] = sv;
+				}
+			});
+
+			compress("border", "", "border");
+			compress("border", "-width", "border-width");
+			compress("border", "-color", "border-color");
+			compress("border", "-style", "border-style");
+			compress("padding", "", "padding");
+			compress("margin", "", "margin");
+			compress2('border', 'border-width', 'border-style', 'border-color');
+
+			if (isIE) {
+				// Remove pointless border
+				if (o.border == 'medium none')
+					o.border = '';
+			}
+
+			return o;
+		},
+
+		serializeStyle : function(o) {
+			var s = '';
+
+			each(o, function(v, k) {
+				if (k && v) {
+					if (tinymce.isGecko && k.indexOf('-moz-') === 0)
+						return;
+
+					switch (k) {
+						case 'color':
+						case 'background-color':
+							v = v.toLowerCase();
+							break;
+					}
+
+					s += (s ? ' ' : '') + k + ': ' + v + ';';
+				}
+			});
+
+			return s;
+		},
+
+		loadCSS : function(u) {
+			var t = this, d = t.doc;
+
+			if (!u)
+				u = '';
+
+			each(u.split(','), function(u) {
+				if (t.files[u])
+					return;
+
+				t.files[u] = true;
+				t.add(t.select('head')[0], 'link', {rel : 'stylesheet', href : tinymce._addVer(u)});
+			});
+		},
+
+		// #if !jquery
+
+		addClass : function(e, c) {
+			return this.run(e, function(e) {
+				var o;
+
+				if (!c)
+					return 0;
+
+				if (this.hasClass(e, c))
+					return e.className;
+
+				o = this.removeClass(e, c);
+
+				return e.className = (o != '' ? (o + ' ') : '') + c;
+			});
+		},
+
+		removeClass : function(e, c) {
+			var t = this, re;
+
+			return t.run(e, function(e) {
+				var v;
+
+				if (t.hasClass(e, c)) {
+					if (!re)
+						re = new RegExp("(^|\\s+)" + c + "(\\s+|$)", "g");
+
+					v = e.className.replace(re, ' ');
+
+					return e.className = tinymce.trim(v != ' ' ? v : '');
+				}
+
+				return e.className;
+			});
+		},
+
+		hasClass : function(n, c) {
+			n = this.get(n);
+
+			if (!n || !c)
+				return false;
+
+			return (' ' + n.className + ' ').indexOf(' ' + c + ' ') !== -1;
+		},
+
+		show : function(e) {
+			return this.setStyle(e, 'display', 'block');
+		},
+
+		hide : function(e) {
+			return this.setStyle(e, 'display', 'none');
+		},
+
+		isHidden : function(e) {
+			e = this.get(e);
+
+			return e.style.display == 'none' || this.getStyle(e, 'display') == 'none';
+		},
+
+		// #endif
+
+		uniqueId : function(p) {
+			return (!p ? 'mce_' : p) + (this.counter++);
+		},
+
+		setHTML : function(e, h) {
+			var t = this;
+
+			return this.run(e, function(e) {
+				var x, i, nl, n, p, x;
+
+				h = t.processHTML(h);
+
+				if (isIE) {
+					function set() {
+						try {
+							// IE will remove comments from the beginning
+							// unless you padd the contents with something
+							e.innerHTML = '<br />' + h;
+							e.removeChild(e.firstChild);
+						} catch (ex) {
+							// IE sometimes produces an unknown runtime error on innerHTML if it's an block element within a block element for example a div inside a p
+							// This seems to fix this problem
+
+							// Remove all child nodes
+							while (e.firstChild)
+								e.firstChild.removeNode();
+
+							// Create new div with HTML contents and a BR infront to keep comments
+							x = t.create('div');
+							x.innerHTML = '<br />' + h;
+
+							// Add all children from div to target
+							each (x.childNodes, function(n, i) {
+								// Skip br element
+								if (i)
+									e.appendChild(n);
+							});
+						}
+					};
+
+					// IE has a serious bug when it comes to paragraphs it can produce an invalid
+					// DOM tree if contents like this <p><ul><li>Item 1</li></ul></p> is inserted
+					// It seems to be that IE doesn't like a root block element placed inside another root block element
+					if (t.settings.fix_ie_paragraphs)
+						h = h.replace(/<p><\/p>|<p([^>]+)><\/p>|<p[^\/+]\/>/gi, '<p$1 mce_keep="true">&nbsp;</p>');
+
+					set();
+
+					if (t.settings.fix_ie_paragraphs) {
+						// Check for odd paragraphs this is a sign of a broken DOM
+						nl = e.getElementsByTagName("p");
+						for (i = nl.length - 1, x = 0; i >= 0; i--) {
+							n = nl[i];
+
+							if (!n.hasChildNodes()) {
+								if (!n.mce_keep) {
+									x = 1; // Is broken
+									break;
+								}
+
+								n.removeAttribute('mce_keep');
+							}
+						}
+					}
+
+					// Time to fix the madness IE left us
+					if (x) {
+						// So if we replace the p elements with divs and mark them and then replace them back to paragraphs
+						// after we use innerHTML we can fix the DOM tree
+						h = h.replace(/<p([^>]+)>|<p>/g, '<div$1 mce_tmp="1">');
+						h = h.replace(/<\/p>/g, '</div>');
+
+						// Set the new HTML with DIVs
+						set();
+
+						// Replace all DIV elements with he mce_tmp attibute back to paragraphs
+						// This is needed since IE has a annoying bug see above for details
+						// This is a slow process but it has to be done. :(
+						if (t.settings.fix_ie_paragraphs) {
+							nl = e.getElementsByTagName("DIV");
+							for (i = nl.length - 1; i >= 0; i--) {
+								n = nl[i];
+
+								// Is it a temp div
+								if (n.mce_tmp) {
+									// Create new paragraph
+									p = t.doc.createElement('p');
+
+									// Copy all attributes
+									n.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi, function(a, b) {
+										var v;
+
+										if (b !== 'mce_tmp') {
+											v = n.getAttribute(b);
+
+											if (!v && b === 'class')
+												v = n.className;
+
+											p.setAttribute(b, v);
+										}
+									});
+
+									// Append all children to new paragraph
+									for (x = 0; x<n.childNodes.length; x++)
+										p.appendChild(n.childNodes[x].cloneNode(true));
+
+									// Replace div with new paragraph
+									n.swapNode(p);
+								}
+							}
+						}
+					}
+				} else
+					e.innerHTML = h;
+
+				return h;
+			});
+		},
+
+		processHTML : function(h) {
+			var t = this, s = t.settings;
+
+			if (!s.process_html)
+				return h;
+
+			// Convert strong and em to b and i in FF since it can't handle them
+			if (tinymce.isGecko) {
+				h = h.replace(/<(\/?)strong>|<strong( [^>]+)>/gi, '<$1b$2>');
+				h = h.replace(/<(\/?)em>|<em( [^>]+)>/gi, '<$1i$2>');
+			} else if (isIE)
+				h = h.replace(/&apos;/g, '&#39;'); // IE can't handle apos
+
+			// Fix some issues
+			h = h.replace(/<a( )([^>]+)\/>|<a\/>/gi, '<a$1$2></a>'); // Force open
+
+			// Store away src and href in mce_src and mce_href since browsers mess them up
+			if (s.keep_values) {
+				// Wrap scripts and styles in comments for serialization purposes
+				if (/<script|style/.test(h)) {
+					function trim(s) {
+						// Remove prefix and suffix code for element
+						s = s.replace(/^[\r\n]*|[\r\n]*$/g, '');
+						s = s.replace(/^\s*(\/\/\s*<!--|\/\/\s*<\[CDATA\[|<!--|<\[CDATA\[)[\r\n]*/g, '');
+						s = s.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->)\s*$/g, '');
+
+						return s;
+					};
+
+					// Preserve script elements
+					h = h.replace(/<script([^>]+|)>([\s\S]*?)<\/script>/g, function(v, a, b) {
+						// Remove prefix and suffix code for script element
+						b = trim(b);
+
+						// Force type attribute
+						if (!a)
+							a = ' type="text/javascript"';
+
+						// Wrap contents in a comment
+						if (b)
+							b = '<!--\n' + b + '\n// -->';
+
+						// Output fake element
+						return '<mce:script' + a + '>' + b + '</mce:script>';
+					});
+
+					// Preserve style elements
+					h = h.replace(/<style([^>]+|)>([\s\S]*?)<\/style>/g, function(v, a, b) {
+						b = trim(b);
+						return '<mce:style' + a + '><!--\n' + b + '\n--></mce:style><style' + a + ' mce_bogus="1">' + b + '</style>';
+					});
+				}
+
+				// Process all tags with src, href or style
+				h = h.replace(/<([\w:]+) [^>]*(src|href|style|shape|coords)[^>]*>/gi, function(a, n) {
+					function handle(m, b, c) {
+						var u = c;
+
+						// Tag already got a mce_ version
+						if (a.indexOf('mce_' + b) != -1)
+							return m;
+
+						if (b == 'style') {
+							// Why did I need this one?
+							//if (isIE)
+							//	u = t.serializeStyle(t.parseStyle(u));
+
+							// No mce_style for elements with these since they might get resized by the user
+							if (t._isRes(c))
+								return m;
+
+							if (s.hex_colors) {
+								u = u.replace(/rgb\([^\)]+\)/g, function(v) {
+									return t.toHex(v);
+								});
+							}
+
+							if (s.url_converter) {
+								u = u.replace(/url\([\'\"]?([^\)\'\"]+)\)/g, function(x, c) {
+									return 'url(' + t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(c), b, n)) + ')';
+								});
+							}
+						} else if (b != 'coords' && b != 'shape') {
+							if (s.url_converter)
+								u = t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(c), b, n));
+						}
+
+						return ' ' + b + '="' + c + '" mce_' + b + '="' + u + '"';
+					};
+
+					a = a.replace(/ (src|href|style|coords|shape)=[\"]([^\"]+)[\"]/gi, handle); // W3C
+					a = a.replace(/ (src|href|style|coords|shape)=[\']([^\']+)[\']/gi, handle); // W3C
+
+					return a.replace(/ (src|href|style|coords|shape)=([^\s\"\'>]+)/gi, handle); // IE
+				});
+			}
+
+			return h;
+		},
+
+		getOuterHTML : function(e) {
+			var d;
+
+			e = this.get(e);
+
+			if (!e)
+				return null;
+
+			if (isIE)
+				return e.outerHTML;
+
+			d = (e.ownerDocument || this.doc).createElement("body");
+			d.appendChild(e.cloneNode(true));
+
+			return d.innerHTML;
+		},
+
+		setOuterHTML : function(e, h, d) {
+			var t = this;
+
+			return this.run(e, function(e) {
+				var n, tp;
+
+				e = t.get(e);
+				d = d || e.ownerDocument || t.doc;
+
+				if (isIE && e.nodeType == 1)
+					e.outerHTML = h;
+				else {
+					tp = d.createElement("body");
+					tp.innerHTML = h;
+
+					n = tp.lastChild;
+					while (n) {
+						t.insertAfter(n.cloneNode(true), e);
+						n = n.previousSibling;
+					}
+
+					t.remove(e);
+				}
+			});
+		},
+
+		decode : function(s) {
+			var e;
+
+			// Look for entities to decode
+			if (/&[^;]+;/.test(s)) {
+				// Decode the entities using a div element not super efficient but less code
+				e = this.doc.createElement("div");
+				e.innerHTML = s;
+
+				return !e.firstChild ? s : e.firstChild.nodeValue;
+			}
+
+			return s;
+		},
+
+		encode : function(s) {
+			return s ? ('' + s).replace(/[<>&\"]/g, function (c, b) {
+				switch (c) {
+					case '&':
+						return '&amp;';
+
+					case '"':
+						return '&quot;';
+
+					case '<':
+						return '&lt;';
+
+					case '>':
+						return '&gt;';
+				}
+
+				return c;
+			}) : s;
+		},
+
+		// #if !jquery
+
+		insertAfter : function(n, r) {
+			var t = this;
+
+			r = t.get(r);
+
+			return this.run(n, function(n) {
+				var p, ns;
+
+				p = r.parentNode;
+				ns = r.nextSibling;
+
+				if (ns)
+					p.insertBefore(n, ns);
+				else
+					p.appendChild(n);
+
+				return n;
+			});
+		},
+
+		// #endif
+
+		isBlock : function(n) {
+			if (n.nodeType && n.nodeType !== 1)
+				return false;
+
+			n = n.nodeName || n;
+
+			return /^(H[1-6]|HR|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP)$/.test(n);
+		},
+
+		// #if !jquery
+
+		replace : function(n, o, k) {
+			if (is(o, 'array'))
+				n = n.cloneNode(true);
+
+			return this.run(o, function(o) {
+				if (k) {
+					each(o.childNodes, function(c) {
+						n.appendChild(c.cloneNode(true));
+					});
+				}
+
+				// Fix IE psuedo leak for elements since replacing elements if fairly common
+				// Will break parentNode for some unknown reason
+	/*			if (isIE && o.nodeType === 1) {
+					o.parentNode.insertBefore(n, o);
+					o.outerHTML = '';
+					return n;
+				}*/
+
+				return o.parentNode.replaceChild(n, o);
+			});
+		},
+
+		// #endif
+
+		toHex : function(s) {
+			var c = /^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(s);
+
+			function hex(s) {
+				s = parseInt(s).toString(16);
+
+				return s.length > 1 ? s : '0' + s; // 0 -> 00
+			};
+
+			if (c) {
+				s = '#' + hex(c[1]) + hex(c[2]) + hex(c[3]);
+
+				return s;
+			}
+
+			return s;
+		},
+
+		getClasses : function() {
+			var t = this, cl = [], i, lo = {}, f = t.settings.class_filter, ov;
+
+			if (t.classes)
+				return t.classes;
+
+			function addClasses(s) {
+				// IE style imports
+				each(s.imports, function(r) {
+					addClasses(r);
+				});
+
+				each(s.cssRules || s.rules, function(r) {
+					// Real type or fake it on IE
+					switch (r.type || 1) {
+						// Rule
+						case 1:
+							if (r.selectorText) {
+								each(r.selectorText.split(','), function(v) {
+									v = v.replace(/^\s*|\s*$|^\s\./g, "");
+
+									// Is internal or it doesn't contain a class
+									if (/\.mce/.test(v) || !/\.[\w\-]+$/.test(v))
+										return;
+
+									// Remove everything but class name
+									ov = v;
+									v = v.replace(/.*\.([a-z0-9_\-]+).*/i, '$1');
+
+									// Filter classes
+									if (f && !(v = f(v, ov)))
+										return;
+
+									if (!lo[v]) {
+										cl.push({'class' : v});
+										lo[v] = 1;
+									}
+								});
+							}
+							break;
+
+						// Import
+						case 3:
+							addClasses(r.styleSheet);
+							break;
+					}
+				});
+			};
+
+			try {
+				each(t.doc.styleSheets, addClasses);
+			} catch (ex) {
+				// Ignore
+			}
+
+			if (cl.length > 0)
+				t.classes = cl;
+
+			return cl;
+		},
+
+		run : function(e, f, s) {
+			var t = this, o;
+
+			if (t.doc && typeof(e) === 'string')
+				e = t.doc.getElementById(e);
+
+			if (!e)
+				return false;
+
+			s = s || this;
+			if (!e.nodeType && (e.length || e.length === 0)) {
+				o = [];
+
+				each(e, function(e, i) {
+					if (e) {
+						if (typeof(e) == 'string')
+							e = t.doc.getElementById(e);
+
+						o.push(f.call(s, e, i));
+					}
+				});
+
+				return o;
+			}
+
+			return f.call(s, e);
+		},
+
+		getAttribs : function(n) {
+			var o;
+
+			n = this.get(n);
+
+			if (!n)
+				return [];
+
+			if (isIE) {
+				o = [];
+
+				// Object will throw exception in IE
+				if (n.nodeName == 'OBJECT')
+					return n.attributes;
+
+				// It's crazy that this is faster in IE but it's because it returns all attributes all the time
+				n.cloneNode(false).outerHTML.replace(/([a-z0-9\:\-_]+)=/gi, function(a, b) {
+					o.push({specified : 1, nodeName : b});
+				});
+
+				return o;
+			}
+
+			return n.attributes;
+		},
+
+		destroy : function(s) {
+			var t = this;
+
+			t.win = t.doc = t.root = null;
+
+			// Manual destroy then remove unload handler
+			if (!s)
+				tinymce.removeUnload(t.destroy);
+		},
+
+		_isRes : function(c) {
+			// Is live resizble element
+			return /^(top|left|bottom|right|width|height)/i.test(c) || /;\s*(top|left|bottom|right|width|height)/i.test(c);
+		}
+
+		/*
+		walk : function(n, f, s) {
+			var d = this.doc, w;
+
+			if (d.createTreeWalker) {
+				w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
+
+				while ((n = w.nextNode()) != null)
+					f.call(s || this, n);
+			} else
+				tinymce.walk(n, f, 'childNodes', s);
+		}
+		*/
+
+		/*
+		toRGB : function(s) {
+			var c = /^\s*?#([0-9A-F]{2})([0-9A-F]{1,2})([0-9A-F]{2})?\s*?$/.exec(s);
+
+			if (c) {
+				// #FFF -> #FFFFFF
+				if (!is(c[3]))
+					c[3] = c[2] = c[1];
+
+				return "rgb(" + parseInt(c[1], 16) + "," + parseInt(c[2], 16) + "," + parseInt(c[3], 16) + ")";
+			}
+
+			return s;
+		}
+		*/
+
+		});
+
+	// Setup page DOM
+	tinymce.DOM = new tinymce.dom.DOMUtils(document, {process_html : 0});
+})();
+
+/* file:jscripts/tiny_mce/classes/dom/Event.js */
+
+(function() {
+	// Shorten names
+	var each = tinymce.each, DOM = tinymce.DOM, isIE = tinymce.isIE, isWebKit = tinymce.isWebKit, Event;
+
+	tinymce.create('static tinymce.dom.Event', {
+		inits : [],
+		events : [],
+
+		// #if !jquery
+
+		add : function(o, n, f, s) {
+			var cb, t = this, el = t.events, r;
+
+			// Handle array
+			if (o && o instanceof Array) {
+				r = [];
+
+				each(o, function(o) {
+					o = DOM.get(o);
+					r.push(t.add(o, n, f, s));
+				});
+
+				return r;
+			}
+
+			o = DOM.get(o);
+
+			if (!o)
+				return;
+
+			// Setup event callback
+			cb = function(e) {
+				e = e || window.event;
+
+				// Patch in target in IE it's W3C valid
+				if (e && !e.target && isIE)
+					e.target = e.srcElement;
+
+				if (!s)
+					return f(e);
+
+				return f.call(s, e);
+			};
+
+			if (n == 'unload') {
+				tinymce.unloads.unshift({func : cb});
+				return cb;
+			}
+
+			if (n == 'init') {
+				if (t.domLoaded)
+					cb();
+				else
+					t.inits.push(cb);
+
+				return cb;
+			}
+
+			// Store away listener reference
+			el.push({
+				obj : o,
+				name : n,
+				func : f,
+				cfunc : cb,
+				scope : s
+			});
+
+			t._add(o, n, cb);
+
+			return f;
+		},
+
+		remove : function(o, n, f) {
+			var t = this, a = t.events, s = false, r;
+
+			// Handle array
+			if (o && o instanceof Array) {
+				r = [];
+
+				each(o, function(o) {
+					o = DOM.get(o);
+					r.push(t.remove(o, n, f));
+				});
+
+				return r;
+			}
+
+			o = DOM.get(o);
+
+			each(a, function(e, i) {
+				if (e.obj == o && e.name == n && (!f || (e.func == f || e.cfunc == f))) {
+					a.splice(i, 1);
+					t._remove(o, n, e.cfunc);
+					s = true;
+					return false;
+				}
+			});
+
+			return s;
+		},
+
+		clear : function(o) {
+			var t = this, a = t.events, i, e;
+
+			if (o) {
+				o = DOM.get(o);
+
+				for (i = a.length - 1; i >= 0; i--) {
+					e = a[i];
+
+					if (e.obj === o) {
+						t._remove(e.obj, e.name, e.cfunc);
+						e.obj = e.cfunc = null;
+						a.splice(i, 1);
+					}
+				}
+			}
+		},
+
+		// #endif
+
+		cancel : function(e) {
+			if (!e)
+				return false;
+
+			this.stop(e);
+			return this.prevent(e);
+		},
+
+		stop : function(e) {
+			if (e.stopPropagation)
+				e.stopPropagation();
+			else
+				e.cancelBubble = true;
+
+			return false;
+		},
+
+		prevent : function(e) {
+			if (e.preventDefault)
+				e.preventDefault();
+			else
+				e.returnValue = false;
+
+			return false;
+		},
+
+		_unload : function() {
+			var t = Event;
+
+			each(t.events, function(e, i) {
+				t._remove(e.obj, e.name, e.cfunc);
+				e.obj = e.cfunc = null;
+			});
+
+			t.events = [];
+			t = null;
+		},
+
+		_add : function(o, n, f) {
+			if (o.attachEvent)
+				o.attachEvent('on' + n, f);
+			else if (o.addEventListener)
+				o.addEventListener(n, f, false);
+			else
+				o['on' + n] = f;
+		},
+
+		_remove : function(o, n, f) {
+			if (o) {
+				try {
+					if (o.detachEvent)
+						o.detachEvent('on' + n, f);
+					else if (o.removeEventListener)
+						o.removeEventListener(n, f, false);
+					else
+						o['on' + n] = null;
+				} catch (ex) {
+					// Might fail with permission denined on IE so we just ignore that
+				}
+			}
+		},
+
+		_pageInit : function() {
+			var e = Event;
+
+			e._remove(window, 'DOMContentLoaded', e._pageInit);
+			e.domLoaded = true;
+
+			each(e.inits, function(c) {
+				c();
+			});
+
+			e.inits = [];
+		},
+
+		_wait : function() {
+			var t;
+
+			// No need since the document is already loaded
+			if (window.tinyMCE_GZ && tinyMCE_GZ.loaded) {
+				Event.domLoaded = 1;
+				return;
+			}
+
+			if (isIE && document.location.protocol != 'https:') {
+				// Fake DOMContentLoaded on IE
+				document.write('<script id=__ie_onload defer src=\'javascript:""\';><\/script>');
+				DOM.get("__ie_onload").onreadystatechange = function() {
+					if (this.readyState == "complete") {
+						Event._pageInit();
+						DOM.get("__ie_onload").onreadystatechange = null; // Prevent leak
+					}
+				};
+			} else {
+				Event._add(window, 'DOMContentLoaded', Event._pageInit, Event);
+
+				if (isIE || isWebKit) {
+					t = setInterval(function() {
+						if (/loaded|complete/.test(document.readyState)) {
+							clearInterval(t);
+							Event._pageInit();
+						}
+					}, 10);
+				}
+			}
+		}
+
+		});
+
+	// Shorten name
+	Event = tinymce.dom.Event;
+
+	// Dispatch DOM content loaded event for IE and Safari
+	Event._wait();
+	tinymce.addUnload(Event._unload);
+})();
+
+/* file:jscripts/tiny_mce/classes/dom/Element.js */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.dom.Element', {
+		Element : function(id, s) {
+			var t = this, dom, el;
+
+			s = s || {};
+			t.id = id;
+			t.dom = dom = s.dom || tinymce.DOM;
+			t.settings = s;
+
+			// Only IE leaks DOM references, this is a lot faster
+			if (!tinymce.isIE)
+				el = t.dom.get(t.id);
+
+			each([
+				'getPos',
+				'getRect',
+				'getParent',
+				'add',
+				'setStyle',
+				'getStyle',
+				'setStyles',
+				'setAttrib',
+				'setAttribs',
+				'getAttrib',
+				'addClass',
+				'removeClass',
+				'hasClass',
+				'getOuterHTML',
+				'setOuterHTML',
+				'remove',
+				'show',
+				'hide',
+				'isHidden',
+				'setHTML',
+				'get'
+			], function(k) {
+				t[k] = function() {
+					var a = arguments, o;
+
+					// Opera fails
+					if (tinymce.isOpera) {
+						a = [id];
+
+						each(arguments, function(v) {
+							a.push(v);
+						});
+					} else
+						Array.prototype.unshift.call(a, el || id);
+
+					o = dom[k].apply(dom, a);
+					t.update(k);
+
+					return o;
+				};
+			});
+		},
+
+		on : function(n, f, s) {
+			return tinymce.dom.Event.add(this.id, n, f, s);
+		},
+
+		getXY : function() {
+			return {
+				x : parseInt(this.getStyle('left')),
+				y : parseInt(this.getStyle('top'))
+			};
+		},
+
+		getSize : function() {
+			var n = this.dom.get(this.id);
+
+			return {
+				w : parseInt(this.getStyle('width') || n.clientWidth),
+				h : parseInt(this.getStyle('height') || n.clientHeight)
+			};
+		},
+
+		moveTo : function(x, y) {
+			this.setStyles({left : x, top : y});
+		},
+
+		moveBy : function(x, y) {
+			var p = this.getXY();
+
+			this.moveTo(p.x + x, p.y + y);
+		},
+
+		resizeTo : function(w, h) {
+			this.setStyles({width : w, height : h});
+		},
+
+		resizeBy : function(w, h) {
+			var s = this.getSize();
+
+			this.resizeTo(s.w + w, s.h + h);
+		},
+
+		update : function(k) {
+			var t = this, b, dom = t.dom;
+
+			if (tinymce.isIE6 && t.settings.blocker) {
+				k = k || '';
+
+				// Ignore getters
+				if (k.indexOf('get') === 0 || k.indexOf('has') === 0 || k.indexOf('is') === 0)
+					return;
+
+				// Remove blocker on remove
+				if (k == 'remove') {
+					dom.remove(t.blocker);
+					return;
+				}
+
+				if (!t.blocker) {
+					t.blocker = dom.uniqueId();
+					b = dom.add(t.settings.container || dom.getRoot(), 'iframe', {id : t.blocker, style : 'position:absolute;', frameBorder : 0, src : 'javascript:""'});
+					dom.setStyle(b, 'opacity', 0);
+				} else
+					b = dom.get(t.blocker);
+
+				dom.setStyle(b, 'left', t.getStyle('left', 1));
+				dom.setStyle(b, 'top', t.getStyle('top', 1));
+				dom.setStyle(b, 'width', t.getStyle('width', 1));
+				dom.setStyle(b, 'height', t.getStyle('height', 1));
+				dom.setStyle(b, 'display', t.getStyle('display', 1));
+				dom.setStyle(b, 'zIndex', parseInt(t.getStyle('zIndex', 1) || 0) - 1);
+			}
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/dom/Selection.js */
+
+(function() {
+	function trimNl(s) {
+		return s.replace(/[\n\r]+/g, '');
+	};
+
+	// Shorten names
+	var is = tinymce.is, isIE = tinymce.isIE, each = tinymce.each;
+
+	tinymce.create('tinymce.dom.Selection', {
+		Selection : function(dom, win, serializer) {
+			var t = this;
+
+			t.dom = dom;
+			t.win = win;
+			t.serializer = serializer;
+
+			// Prevent leaks
+			tinymce.addUnload(t.destroy, t);
+		},
+
+		getContent : function(s) {
+			var t = this, r = t.getRng(), e = t.dom.create("body"), se = t.getSel(), wb, wa, n;
+
+			s = s || {};
+			wb = wa = '';
+			s.get = true;
+			s.format = s.format || 'html';
+
+			if (s.format == 'text')
+				return t.isCollapsed() ? '' : (r.text || (se.toString ? se.toString() : ''));
+
+			if (r.cloneContents) {
+				n = r.cloneContents();
+
+				if (n)
+					e.appendChild(n);
+			} else if (is(r.item) || is(r.htmlText))
+				e.innerHTML = r.item ? r.item(0).outerHTML : r.htmlText;
+			else
+				e.innerHTML = r.toString();
+
+			// Keep whitespace before and after
+			if (/^\s/.test(e.innerHTML))
+				wb = ' ';
+
+			if (/\s+$/.test(e.innerHTML))
+				wa = ' ';
+
+			s.getInner = true;
+
+			return t.isCollapsed() ? '' : wb + t.serializer.serialize(e, s) + wa;
+		},
+
+		setContent : function(h, s) {
+			var t = this, r = t.getRng(), d = t.win.document;
+
+			s = s || {format : 'html'};
+			s.set = true;
+			h = t.dom.processHTML(h);
+
+			if (r.insertNode) {
+				// Gecko has a bug where if you insert &nbsp; using InsertHTML it will insert a space instead
+				// So we simply check if the input is HTML or text and then insert text using the insertNode method
+				if (tinymce.isGecko && h.indexOf('<') == -1) {
+					r.deleteContents();
+					r.insertNode(t.getRng().createContextualFragment(h + '<span id="__caret">_</span>'));
+					t.select(t.dom.get('__caret'));
+					t.getRng().deleteContents();
+					return;
+				}
+
+				// Use insert HTML if it exists (places cursor after content)
+				try {
+					// This might fail with an exception see bug #1893736
+					if (d.queryCommandEnabled('InsertHTML'))
+						return d.execCommand('InsertHTML', false, h);
+				} catch (ex) {
+					// Use old school method
+					r.deleteContents();
+					r.insertNode(t.getRng().createContextualFragment(h));
+				}
+			} else {
+				if (r.item) {
+					// Delete content and get caret text selection
+					d.execCommand('Delete', false, null);
+					r = t.getRng();
+				}
+
+				r.pasteHTML(h);
+			}
+		},
+
+		getStart : function() {
+			var t = this, r = t.getRng(), e;
+
+			if (isIE) {
+				if (r.item)
+					return r.item(0);
+
+				r = r.duplicate();
+				r.collapse(1);
+				e = r.parentElement();
+
+				if (e && e.nodeName == 'BODY')
+					return e.firstChild;
+
+				return e;
+			} else {
+				e = r.startContainer;
+
+				if (e.nodeName == 'BODY')
+					return e.firstChild;
+
+				return t.dom.getParent(e, function(n) {return n.nodeType == 1;});
+			}
+		},
+
+		getEnd : function() {
+			var t = this, r = t.getRng(), e;
+
+			if (isIE) {
+				if (r.item)
+					return r.item(0);
+
+				r = r.duplicate();
+				r.collapse(0);
+				e = r.parentElement();
+
+				if (e && e.nodeName == 'BODY')
+					return e.lastChild;
+
+				return e;
+			} else {
+				e = r.endContainer;
+
+				if (e.nodeName == 'BODY')
+					return e.lastChild;
+
+				return t.dom.getParent(e, function(n) {return n.nodeType == 1;});
+			}
+		},
+
+		getBookmark : function(si) {
+			var t = this, r = t.getRng(), tr, sx, sy, vp = t.dom.getViewPort(t.win), e, sp, bp, le, c = -0xFFFFFF, s, ro = t.dom.getRoot(), wb = 0, wa = 0, nv;
+			sx = vp.x;
+			sy = vp.y;
+
+			// Simple bookmark fast but not as persistent
+			if (si == 'simple')
+				return {rng : r, scrollX : sx, scrollY : sy};
+
+			// Handle IE
+			if (isIE) {
+				// Control selection
+				if (r.item) {
+					e = r.item(0);
+
+					each(t.dom.select(e.nodeName), function(n, i) {
+						if (e == n) {
+							sp = i;
+							return false;
+						}
+					});
+
+					return {
+						tag : e.nodeName,
+						index : sp,
+						scrollX : sx,
+						scrollY : sy
+					};
+				}
+
+				// Text selection
+				tr = t.dom.doc.body.createTextRange();
+				tr.moveToElementText(ro);
+				tr.collapse(true);
+				bp = Math.abs(tr.move('character', c));
+
+				tr = r.duplicate();
+				tr.collapse(true);
+				sp = Math.abs(tr.move('character', c));
+
+				tr = r.duplicate();
+				tr.collapse(false);
+				le = Math.abs(tr.move('character', c)) - sp;
+
+				return {
+					start : sp - bp,
+					length : le,
+					scrollX : sx,
+					scrollY : sy
+				};
+			}
+
+			// Handle W3C
+			e = t.getNode();
+			s = t.getSel();
+
+			if (!s)
+				return null;
+
+			// Image selection
+			if (e && e.nodeName == 'IMG') {
+				return {
+					scrollX : sx,
+					scrollY : sy
+				};
+			}
+
+			// Text selection
+
+			function getPos(r, sn, en) {
+				var w = t.dom.doc.createTreeWalker(r, NodeFilter.SHOW_TEXT, null, false), n, p = 0, d = {};
+
+				while ((n = w.nextNode()) != null) {
+					if (n == sn)
+						d.start = p;
+
+					if (n == en) {
+						d.end = p;
+						return d;
+					}
+
+					p += trimNl(n.nodeValue || '').length;
+				}
+
+				return null;
+			};
+
+			// Caret or selection
+			if (s.anchorNode == s.focusNode && s.anchorOffset == s.focusOffset) {
+				e = getPos(ro, s.anchorNode, s.focusNode);
+
+				if (!e)
+					return {scrollX : sx, scrollY : sy};
+
+				// Count whitespace before
+				trimNl(s.anchorNode.nodeValue || '').replace(/^\s+/, function(a) {wb = a.length;});
+
+				return {
+					start : Math.max(e.start + s.anchorOffset - wb, 0),
+					end : Math.max(e.end + s.focusOffset - wb, 0),
+					scrollX : sx,
+					scrollY : sy,
+					beg : s.anchorOffset - wb == 0
+				};
+			} else {
+				e = getPos(ro, r.startContainer, r.endContainer);
+
+				// Count whitespace before start and end container
+				//(r.startContainer.nodeValue || '').replace(/^\s+/, function(a) {wb = a.length;});
+				//(r.endContainer.nodeValue || '').replace(/^\s+/, function(a) {wa = a.length;});
+
+				if (!e)
+					return {scrollX : sx, scrollY : sy};
+
+				return {
+					start : Math.max(e.start + r.startOffset - wb, 0),
+					end : Math.max(e.end + r.endOffset - wa, 0),
+					scrollX : sx,
+					scrollY : sy,
+					beg : r.startOffset - wb == 0
+				};
+			}
+		},
+
+		moveToBookmark : function(b) {
+			var t = this, r = t.getRng(), s = t.getSel(), ro = t.dom.getRoot(), sd, nvl, nv;
+
+			function getPos(r, sp, ep) {
+				var w = t.dom.doc.createTreeWalker(r, NodeFilter.SHOW_TEXT, null, false), n, p = 0, d = {}, o, v, wa, wb;
+
+				while ((n = w.nextNode()) != null) {
+					wa = wb = 0;
+
+					nv = n.nodeValue || '';
+					//nv.replace(/^\s+[^\s]/, function(a) {wb = a.length - 1;});
+					//nv.replace(/[^\s]\s+$/, function(a) {wa = a.length - 1;});
+
+					nvl = trimNl(nv).length;
+					p += nvl;
+
+					if (p >= sp && !d.startNode) {
+						o = sp - (p - nvl);
+
+						// Fix for odd quirk in FF
+						if (b.beg && o >= nvl)
+							continue;
+
+						d.startNode = n;
+						d.startOffset = o + wb;
+					}
+
+					if (p >= ep) {
+						d.endNode = n;
+						d.endOffset = ep - (p - nvl) + wb;
+						return d;
+					}
+				}
+
+				return null;
+			};
+
+			if (!b)
+				return false;
+
+			t.win.scrollTo(b.scrollX, b.scrollY);
+
+			// Handle explorer
+			if (isIE) {
+				// Handle simple
+				if (r = b.rng) {
+					try {
+						r.select();
+					} catch (ex) {
+						// Ignore
+					}
+
+					return true;
+				}
+
+				t.win.focus();
+
+				// Handle control bookmark
+				if (b.tag) {
+					r = ro.createControlRange();
+
+					each(t.dom.select(b.tag), function(n, i) {
+						if (i == b.index)
+							r.addElement(n);
+					});
+				} else {
+					// Try/catch needed since this operation breaks when TinyMCE is placed in hidden divs/tabs
+					try {
+						// Incorrect bookmark
+						if (b.start < 0)
+							return true;
+
+						r = s.createRange();
+						r.moveToElementText(ro);
+						r.collapse(true);
+						r.moveStart('character', b.start);
+						r.moveEnd('character', b.length);
+					} catch (ex2) {
+						return true;
+					}
+				}
+
+				try {
+					r.select();
+				} catch (ex) {
+					// Needed for some odd IE bug #1843306
+				}
+
+				return true;
+			}
+
+			// Handle W3C
+			if (!s)
+				return false;
+
+			// Handle simple
+			if (b.rng) {
+				s.removeAllRanges();
+				s.addRange(b.rng);
+			} else {
+				if (is(b.start) && is(b.end)) {
+					try {
+						sd = getPos(ro, b.start, b.end);
+
+						if (sd) {
+							r = t.dom.doc.createRange();
+							r.setStart(sd.startNode, sd.startOffset);
+							r.setEnd(sd.endNode, sd.endOffset);
+							s.removeAllRanges();
+							s.addRange(r);
+						}
+
+						if (!tinymce.isOpera)
+							t.win.focus();
+					} catch (ex) {
+						// Ignore
+					}
+				}
+			}
+		},
+
+		select : function(n, c) {
+			var t = this, r = t.getRng(), s = t.getSel(), b, fn, ln, d = t.win.document;
+
+			function first(n) {
+				return n ? d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false).nextNode() : null;
+			};
+
+			function last(n) {
+				var c, o, w;
+
+				if (!n)
+					return null;
+
+				w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
+				while (c = w.nextNode())
+					o = c;
+
+				return o;
+			};
+
+			if (isIE) {
+				try {
+					b = d.body;
+
+					if (/^(IMG|TABLE)$/.test(n.nodeName)) {
+						r = b.createControlRange();
+						r.addElement(n);
+					} else {
+						r = b.createTextRange();
+						r.moveToElementText(n);
+					}
+
+					r.select();
+				} catch (ex) {
+					// Throws illigal agrument in IE some times
+				}
+			} else {
+				if (c) {
+					fn = first(n);
+					ln = last(n);
+
+					if (fn && ln) {
+						//console.debug(fn, ln);
+						r = d.createRange();
+						r.setStart(fn, 0);
+						r.setEnd(ln, ln.nodeValue.length);
+					} else
+						r.selectNode(n);
+				} else
+					r.selectNode(n);
+
+				t.setRng(r);
+			}
+
+			return n;
+		},
+
+		isCollapsed : function() {
+			var t = this, r = t.getRng(), s = t.getSel();
+
+			if (!r || r.item)
+				return false;
+
+			return !s || r.boundingWidth == 0 || s.isCollapsed;
+		},
+
+		collapse : function(b) {
+			var t = this, r = t.getRng(), n;
+
+			// Control range on IE
+			if (r.item) {
+				n = r.item(0);
+				r = this.win.document.body.createTextRange();
+				r.moveToElementText(n);
+			}
+
+			r.collapse(!!b);
+			t.setRng(r);
+		},
+
+		getSel : function() {
+			var t = this, w = this.win;
+
+			return w.getSelection ? w.getSelection() : w.document.selection;
+		},
+
+		getRng : function() {
+			var t = this, s = t.getSel(), r;
+
+			try {
+				if (s)
+					r = s.rangeCount > 0 ? s.getRangeAt(0) : (s.createRange ? s.createRange() : t.win.document.createRange());
+			} catch (ex) {
+				// IE throws unspecified error here if TinyMCE is placed in a frame/iframe
+			}
+
+			// No range found then create an empty one
+			// This can occur when the editor is placed in a hidden container element on Gecko
+			// Or on IE when there was an exception
+			if (!r)
+				r = isIE ? t.win.document.body.createTextRange() : t.win.document.createRange();
+
+			return r;
+		},
+
+		setRng : function(r) {
+			var s;
+
+			if (!isIE) {
+				s = this.getSel();
+
+				if (s) {
+					s.removeAllRanges();
+					s.addRange(r);
+				}
+			} else {
+				try {
+					r.select();
+				} catch (ex) {
+					// Needed for some odd IE bug #1843306
+				}
+			}
+		},
+
+		setNode : function(n) {
+			var t = this;
+
+			t.setContent(t.dom.getOuterHTML(n));
+
+			return n;
+		},
+
+		getNode : function() {
+			var t = this, r = t.getRng(), s = t.getSel(), e;
+
+			if (!isIE) {
+				// Range maybe lost after the editor is made visible again
+				if (!r)
+					return t.dom.getRoot();
+
+				e = r.commonAncestorContainer;
+
+				// Handle selection a image or other control like element such as anchors
+				if (!r.collapsed) {
+					if (r.startContainer == r.endContainer || (tinymce.isWebKit && r.startContainer == r.endContainer.parentNode)) {
+						if (r.startOffset - r.endOffset < 2 || tinymce.isWebKit) {
+							if (r.startContainer.hasChildNodes())
+								e = r.startContainer.childNodes[r.startOffset];
+						}
+					}
+				}
+
+				return t.dom.getParent(e, function(n) {
+					return n.nodeType == 1;
+				});
+			}
+
+			return r.item ? r.item(0) : r.parentElement();
+		},
+
+		destroy : function(s) {
+			var t = this;
+
+			t.win = null;
+
+			// Manual destroy then remove unload handler
+			if (!s)
+				tinymce.removeUnload(t.destroy);
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/dom/XMLWriter.js */
+
+(function() {
+	tinymce.create('tinymce.dom.XMLWriter', {
+		node : null,
+
+		XMLWriter : function(s) {
+			// Get XML document
+			function getXML() {
+				var i = document.implementation;
+
+				if (!i || !i.createDocument) {
+					// Try IE objects
+					try {return new ActiveXObject('MSXML2.DOMDocument');} catch (ex) {}
+					try {return new ActiveXObject('Microsoft.XmlDom');} catch (ex) {}
+				} else
+					return i.createDocument('', '', null);
+			};
+
+			this.doc = getXML();
+			
+			// Since Opera and WebKit doesn't escape > into &gt; we need to do it our self to normalize the output for all browsers
+			this.valid = tinymce.isOpera || tinymce.isWebKit;
+
+			this.reset();
+		},
+
+		reset : function() {
+			var t = this, d = t.doc;
+
+			if (d.firstChild)
+				d.removeChild(d.firstChild);
+
+			t.node = d.appendChild(d.createElement("html"));
+		},
+
+		writeStartElement : function(n) {
+			var t = this;
+
+			t.node = t.node.appendChild(t.doc.createElement(n));
+		},
+
+		writeAttribute : function(n, v) {
+			if (this.valid)
+				v = v.replace(/>/g, '%MCGT%');
+
+			this.node.setAttribute(n, v);
+		},
+
+		writeEndElement : function() {
+			this.node = this.node.parentNode;
+		},
+
+		writeFullEndElement : function() {
+			var t = this, n = t.node;
+
+			n.appendChild(t.doc.createTextNode(""));
+			t.node = n.parentNode;
+		},
+
+		writeText : function(v) {
+			if (this.valid)
+				v = v.replace(/>/g, '%MCGT%');
+
+			this.node.appendChild(this.doc.createTextNode(v));
+		},
+
+		writeCDATA : function(v) {
+			this.node.appendChild(this.doc.createCDATA(v));
+		},
+
+		writeComment : function(v) {
+			this.node.appendChild(this.doc.createComment(v.replace(/\-\-/g, ' ')));
+		},
+
+		getContent : function() {
+			var h;
+
+			h = this.doc.xml || new XMLSerializer().serializeToString(this.doc);
+			h = h.replace(/<\?[^?]+\?>|<html>|<\/html>|<html\/>|<!DOCTYPE[^>]+>/g, '');
+			h = h.replace(/ ?\/>/g, ' />');
+
+			if (this.valid)
+				h = h.replace(/\%MCGT%/g, '&gt;');
+
+			return h;
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/dom/StringWriter.js */
+
+(function() {
+	tinymce.create('tinymce.dom.StringWriter', {
+		str : null,
+		tags : null,
+		count : 0,
+		settings : null,
+		indent : null,
+
+		StringWriter : function(s) {
+			this.settings = tinymce.extend({
+				indent_char : ' ',
+				indentation : 1
+			}, s);
+
+			this.reset();
+		},
+
+		reset : function() {
+			this.indent = '';
+			this.str = "";
+			this.tags = [];
+			this.count = 0;
+		},
+
+		writeStartElement : function(n) {
+			this._writeAttributesEnd();
+			this.writeRaw('<' + n);
+			this.tags.push(n);
+			this.inAttr = true;
+			this.count++;
+			this.elementCount = this.count;
+		},
+
+		writeAttribute : function(n, v) {
+			var t = this;
+
+			t.writeRaw(" " + t.encode(n) + '="' + t.encode(v) + '"');
+		},
+
+		writeEndElement : function() {
+			var n;
+
+			if (this.tags.length > 0) {
+				n = this.tags.pop();
+
+				if (this._writeAttributesEnd(1))
+					this.writeRaw('</' + n + '>');
+
+				if (this.settings.indentation > 0)
+					this.writeRaw('\n');
+			}
+		},
+
+		writeFullEndElement : function() {
+			if (this.tags.length > 0) {
+				this._writeAttributesEnd();
+				this.writeRaw('</' + this.tags.pop() + '>');
+
+				if (this.settings.indentation > 0)
+					this.writeRaw('\n');
+			}
+		},
+
+		writeText : function(v) {
+			this._writeAttributesEnd();
+			this.writeRaw(this.encode(v));
+			this.count++;
+		},
+
+		writeCDATA : function(v) {
+			this._writeAttributesEnd();
+			this.writeRaw('<![CDATA[' + v + ']]>');
+			this.count++;
+		},
+
+		writeComment : function(v) {
+			this._writeAttributesEnd();
+			this.writeRaw('<!-- ' + v + '-->');
+			this.count++;
+		},
+
+		writeRaw : function(v) {
+			this.str += v;
+		},
+
+		encode : function(s) {
+			return s.replace(/[<>&"]/g, function(v) {
+				switch (v) {
+					case '<':
+						return '&lt;';
+
+					case '>':
+						return '&gt;';
+
+					case '&':
+						return '&amp;';
+
+					case '"':
+						return '&quot;';
+				}
+
+				return v;
+			});
+		},
+
+		getContent : function() {
+			return this.str;
+		},
+
+		_writeAttributesEnd : function(s) {
+			if (!this.inAttr)
+				return;
+
+			this.inAttr = false;
+
+			if (s && this.elementCount == this.count) {
+				this.writeRaw(' />');
+				return false;
+			}
+
+			this.writeRaw('>');
+
+			return true;
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/dom/Serializer.js */
+
+(function() {
+	// Shorten names
+	var extend = tinymce.extend, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher, isIE = tinymce.isIE, isGecko = tinymce.isGecko;
+
+	// Returns only attribites that have values not all attributes in IE
+	function getIEAtts(n) {
+		var o = [];
+
+		// Object will throw exception in IE
+		if (n.nodeName == 'OBJECT')
+			return n.attributes;
+
+		n.cloneNode(false).outerHTML.replace(/([a-z0-9\:\-_]+)=/gi, function(a, b) {
+			o.push({specified : 1, nodeName : b});
+		});
+
+		return o;
+	};
+
+	function wildcardToRE(s) {
+		return s.replace(/([?+*])/g, '.$1');
+	};
+
+	tinymce.create('tinymce.dom.Serializer', {
+		Serializer : function(s) {
+			var t = this;
+
+			t.key = 0;
+			t.onPreProcess = new Dispatcher(t);
+			t.onPostProcess = new Dispatcher(t);
+
+			if (tinymce.relaxedDomain && tinymce.isGecko) {
+				// Gecko has a bug where we can't create a new XML document if domain relaxing is used
+				t.writer = new tinymce.dom.StringWriter();
+			} else {
+				try {
+					t.writer = new tinymce.dom.XMLWriter();
+				} catch (ex) {
+					// IE might throw exception if ActiveX is disabled so we then switch to the slightly slower StringWriter
+					t.writer = new tinymce.dom.StringWriter();
+				}
+			}
+
+			// Default settings
+			t.settings = s = extend({
+				dom : tinymce.DOM,
+				valid_nodes : 0,
+				node_filter : 0,
+				attr_filter : 0,
+				invalid_attrs : /^(mce_|_moz_)/,
+				closed : /(br|hr|input|meta|img|link|param)/,
+				entity_encoding : 'named',
+				entities : '160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro',
+				valid_elements : '*[*]',
+				extended_valid_elements : 0,
+				valid_child_elements : 0,
+				invalid_elements : 0,
+				fix_table_elements : 0,
+				fix_list_elements : true,
+				fix_content_duplication : true,
+				convert_fonts_to_spans : false,
+				font_size_classes : 0,
+				font_size_style_values : 0,
+				apply_source_formatting : 0,
+				indent_mode : 'simple',
+				indent_char : '\t',
+				indent_levels : 1,
+				remove_linebreaks : 1
+			}, s);
+
+			t.dom = s.dom;
+
+			if (s.fix_list_elements) {
+				t.onPreProcess.add(function(se, o) {
+					var nl, x, a = ['ol', 'ul'], i, n, p, r = /^(OL|UL)$/, np;
+
+					function prevNode(e, n) {
+						var a = n.split(','), i;
+
+						while ((e = e.previousSibling) != null) {
+							for (i=0; i<a.length; i++) {
+								if (e.nodeName == a[i])
+									return e;
+							}
+						}
+
+						return null;
+					};
+
+					for (x=0; x<a.length; x++) {
+						nl = t.dom.select(a[x], o.node);
+
+						for (i=0; i<nl.length; i++) {
+							n = nl[i];
+							p = n.parentNode;
+
+							if (r.test(p.nodeName)) {
+								np = prevNode(n, 'LI');
+
+								if (!np) {
+									np = t.dom.create('li');
+									np.innerHTML = '&nbsp;';
+									np.appendChild(n);
+									p.insertBefore(np, p.firstChild);
+								} else
+									np.appendChild(n);
+							}
+						}
+					}
+				});
+			}
+
+			if (s.fix_table_elements) {
+				t.onPreProcess.add(function(se, o) {
+					each(t.dom.select('table', o.node), function(e) {
+						var pa = t.dom.getParent(e, 'H1,H2,H3,H4,H5,H6,P'), pa2, n, tm, pl = [], i, ns;
+
+						if (pa) {
+							pa2 = pa.cloneNode(false);
+
+							pl.push(e);
+							for (n = e; n = n.parentNode;) {
+								pl.push(n);
+
+								if (n == pa)
+									break;
+							}
+
+							tm = pa2;
+							for (i = pl.length - 1; i >= 0; i--) {
+								if (i == pl.length - 1) {
+									while (ns = pl[i - 1].nextSibling)
+										tm.appendChild(ns.parentNode.removeChild(ns));
+								} else {
+									n = pl[i].cloneNode(false);
+
+									if (i != 0) {
+										while (ns = pl[i - 1].nextSibling)
+											n.appendChild(ns.parentNode.removeChild(ns));
+									}
+
+									tm = tm.appendChild(n);
+								}
+							}
+
+							e = t.dom.insertAfter(e.parentNode.removeChild(e), pa);
+							t.dom.insertAfter(e, pa);
+							t.dom.insertAfter(pa2, e);
+						}
+					});
+				});
+			}
+		},
+
+		setEntities : function(s) {
+			var t = this, a, i, l = {}, re = '', v;
+
+			// No need to setup more than once
+			if (t.entityLookup)
+				return;
+
+			// Build regex and lookup array
+			a = s.split(',');
+			for (i = 0; i < a.length; i += 2) {
+				v = a[i];
+
+				// Don't add default &amp; &quot; etc.
+				if (v == 34 || v == 38 || v == 60 || v == 62)
+					continue;
+
+				l[String.fromCharCode(a[i])] = a[i + 1];
+
+				v = parseInt(a[i]).toString(16);
+				re += '\\u' + '0000'.substring(v.length) + v;
+			}
+
+			if (!re) {
+				t.settings.entity_encoding = 'raw';
+				return;
+			}
+
+			t.entitiesRE = new RegExp('[' + re + ']', 'g');
+			t.entityLookup = l;
+		},
+
+		setValidChildRules : function(s) {
+			this.childRules = null;
+			this.addValidChildRules(s);
+		},
+
+		addValidChildRules : function(s) {
+			var t = this, inst, intr, bloc;
+
+			if (!s)
+				return;
+
+			inst = 'A|BR|SPAN|BDO|MAP|OBJECT|IMG|TT|I|B|BIG|SMALL|EM|STRONG|DFN|CODE|Q|SAMP|KBD|VAR|CITE|ABBR|ACRONYM|SUB|SUP|#text|#comment';
+			intr = 'A|BR|SPAN|BDO|OBJECT|APPLET|IMG|MAP|IFRAME|TT|I|B|U|S|STRIKE|BIG|SMALL|FONT|BASEFONT|EM|STRONG|DFN|CODE|Q|SAMP|KBD|VAR|CITE|ABBR|ACRONYM|SUB|SUP|INPUT|SELECT|TEXTAREA|LABEL|BUTTON|#text|#comment';
+			bloc = 'H[1-6]|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|FORM|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP';
+
+			each(s.split(','), function(s) {
+				var p = s.split(/\[|\]/), re;
+
+				s = '';
+				each(p[1].split('|'), function(v) {
+					if (s)
+						s += '|';
+
+					switch (v) {
+						case '%itrans':
+							v = intr;
+							break;
+
+						case '%itrans_na':
+							v = intr.substring(2);
+							break;
+
+						case '%istrict':
+							v = inst;
+							break;
+
+						case '%istrict_na':
+							v = inst.substring(2);
+							break;
+
+						case '%btrans':
+							v = bloc;
+							break;
+
+						case '%bstrict':
+							v = bloc;
+							break;
+					}
+
+					s += v;
+				});
+				re = new RegExp('^(' + s.toLowerCase() + ')$', 'i');
+
+				each(p[0].split('/'), function(s) {
+					t.childRules = t.childRules || {};
+					t.childRules[s] = re;
+				});
+			});
+
+			// Build regex
+			s = '';
+			each(t.childRules, function(v, k) {
+				if (s)
+					s += '|';
+
+				s += k;
+			});
+
+			t.parentElementsRE = new RegExp('^(' + s.toLowerCase() + ')$', 'i');
+
+			/*console.debug(t.parentElementsRE.toString());
+			each(t.childRules, function(v) {
+				console.debug(v.toString());
+			});*/
+		},
+
+		setRules : function(s) {
+			var t = this;
+
+			t._setup();
+			t.rules = {};
+			t.wildRules = [];
+			t.validElements = {};
+
+			return t.addRules(s);
+		},
+
+		addRules : function(s) {
+			var t = this, dr;
+
+			if (!s)
+				return;
+
+			t._setup();
+
+			each(s.split(','), function(s) {
+				var p = s.split(/\[|\]/), tn = p[0].split('/'), ra, at, wat, va = [];
+
+				// Extend with default rules
+				if (dr)
+					at = tinymce.extend([], dr.attribs);
+
+				// Parse attributes
+				if (p.length > 1) {
+					each(p[1].split('|'), function(s) {
+						var ar = {}, i;
+
+						at = at || [];
+
+						// Parse attribute rule
+						s = s.replace(/::/g, '~');
+						s = /^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(s);
+						s[2] = s[2].replace(/~/g, ':');
+
+						// Add required attributes
+						if (s[1] == '!') {
+							ra = ra || [];
+							ra.push(s[2]);
+						}
+
+						// Remove inherited attributes
+						if (s[1] == '-') {
+							for (i = 0; i <at.length; i++) {
+								if (at[i].name == s[2]) {
+									at.splice(i, 1);
+									return;
+								}
+							}
+						}
+
+						switch (s[3]) {
+							// Add default attrib values
+							case '=':
+								ar.defaultVal = s[4] || '';
+								break;
+
+							// Add forced attrib values
+							case ':':
+								ar.forcedVal = s[4];
+								break;
+
+							// Add validation values
+							case '<':
+								ar.validVals = s[4].split('?');
+								break;
+						}
+
+						if (/[*.?]/.test(s[2])) {
+							wat = wat || [];
+							ar.nameRE = new RegExp('^' + wildcardToRE(s[2]) + '$');
+							wat.push(ar);
+						} else {
+							ar.name = s[2];
+							at.push(ar);
+						}
+
+						va.push(s[2]);
+					});
+				}
+
+				// Handle element names
+				each(tn, function(s, i) {
+					var pr = s.charAt(0), x = 1, ru = {};
+
+					// Extend with default rule data
+					if (dr) {
+						if (dr.noEmpty)
+							ru.noEmpty = dr.noEmpty;
+
+						if (dr.fullEnd)
+							ru.fullEnd = dr.fullEnd;
+
+						if (dr.padd)
+							ru.padd = dr.padd;
+					}
+
+					// Handle prefixes
+					switch (pr) {
+						case '-':
+							ru.noEmpty = true;
+							break;
+
+						case '+':
+							ru.fullEnd = true;
+							break;
+
+						case '#':
+							ru.padd = true;
+							break;
+
+						default:
+							x = 0;
+					}
+
+					tn[i] = s = s.substring(x);
+					t.validElements[s] = 1;
+
+					// Add element name or element regex
+					if (/[*.?]/.test(tn[0])) {
+						ru.nameRE = new RegExp('^' + wildcardToRE(tn[0]) + '$');
+						t.wildRules = t.wildRules || {};
+						t.wildRules.push(ru);
+					} else {
+						ru.name = tn[0];
+
+						// Store away default rule
+						if (tn[0] == '@')
+							dr = ru;
+
+						t.rules[s] = ru;
+					}
+
+					ru.attribs = at;
+
+					if (ra)
+						ru.requiredAttribs = ra;
+
+					if (wat) {
+						// Build valid attributes regexp
+						s = '';
+						each(va, function(v) {
+							if (s)
+								s += '|';
+
+							s += '(' + wildcardToRE(v) + ')';
+						});
+						ru.validAttribsRE = new RegExp('^' + s.toLowerCase() + '$');
+						ru.wildAttribs = wat;
+					}
+				});
+			});
+
+			// Build valid elements regexp
+			s = '';
+			each(t.validElements, function(v, k) {
+				if (s)
+					s += '|';
+
+				if (k != '@')
+					s += k;
+			});
+			t.validElementsRE = new RegExp('^(' + wildcardToRE(s.toLowerCase()) + ')$');
+
+			//console.debug(t.validElementsRE.toString());
+			//console.dir(t.rules);
+			//console.dir(t.wildRules);
+		},
+
+		findRule : function(n) {
+			var t = this, rl = t.rules, i, r;
+
+			t._setup();
+
+			// Exact match
+			r = rl[n];
+			if (r)
+				return r;
+
+			// Try wildcards
+			rl = t.wildRules;
+			for (i = 0; i < rl.length; i++) {
+				if (rl[i].nameRE.test(n))
+					return rl[i];
+			}
+
+			return null;
+		},
+
+		findAttribRule : function(ru, n) {
+			var i, wa = ru.wildAttribs;
+
+			for (i = 0; i < wa.length; i++) {
+				if (wa[i].nameRE.test(n))
+					return wa[i];
+			}
+
+			return null;
+		},
+
+		serialize : function(n, o) {
+			var h, t = this;
+
+			t._setup();
+			o = o || {};
+			o.format = o.format || 'html';
+			t.processObj = o;
+			n = n.cloneNode(true);
+			t.key = '' + (parseInt(t.key) + 1);
+
+			// Pre process
+			if (!o.no_events) {
+				o.node = n;
+				t.onPreProcess.dispatch(t, o);
+			}
+
+			// Serialize HTML DOM into a string
+			t.writer.reset();
+			t._serializeNode(n, o.getInner);
+
+			// Post process
+			o.content = t.writer.getContent();
+
+			if (!o.no_events)
+				t.onPostProcess.dispatch(t, o);
+
+			t._postProcess(o);
+			o.node = null;
+
+			return tinymce.trim(o.content);
+		},
+
+		// Internal functions
+
+		_postProcess : function(o) {
+			var t = this, s = t.settings, h = o.content, sc = [], p;
+
+			if (o.format == 'html') {
+				// Protect some elements
+				p = t._protect({
+					content : h,
+					patterns : [
+						{pattern : /(<script[^>]*>)(.*?)(<\/script>)/g},
+						{pattern : /(<style[^>]*>)(.*?)(<\/style>)/g},
+						{pattern : /(<pre[^>]*>)(.*?)(<\/pre>)/g, encode : 1}
+					]
+				});
+
+				h = p.content;
+
+				// Entity encode
+				if (s.entity_encoding !== 'raw')
+					h = t._encode(h);
+
+				// Use BR instead of &nbsp; padded P elements inside editor and use <p>&nbsp;</p> outside editor
+/*				if (o.set)
+					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p><br /></p>');
+				else
+					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p>$1</p>');*/
+
+				// Since Gecko and Safari keeps whitespace in the DOM we need to
+				// remove it inorder to match other browsers. But I think Gecko and Safari is right.
+				// This process is only done when getting contents out from the editor.
+				if (!o.set) {
+					// We need to replace paragraph whitespace with an nbsp before indentation to keep the \u00a0 char
+					h = h.replace(/<p>\s+<\/p>|<p([^>]+)>\s+<\/p>/g, s.entity_encoding == 'numeric' ? '<p$1>&#160;</p>' : '<p$1>&nbsp;</p>');
+
+					if (s.remove_linebreaks) {
+						h = h.replace(/\r?\n|\r/g, ' ');
+						h = h.replace(/(<[^>]+>)\s+/g, '$1 ');
+						h = h.replace(/\s+(<\/[^>]+>)/g, ' $1');
+						h = h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object) ([^>]+)>\s+/g, '<$1 $2>'); // Trim block start
+						h = h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>\s+/g, '<$1>'); // Trim block start
+						h = h.replace(/\s+<\/(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>/g, '</$1>'); // Trim block end
+					}
+
+					// Simple indentation
+					if (s.apply_source_formatting && s.indent_mode == 'simple') {
+						// Add line breaks before and after block elements
+						h = h.replace(/<(\/?)(ul|hr|table|meta|link|tbody|tr|object|body|head|html|map)(|[^>]+)>\s*/g, '\n<$1$2$3>\n');
+						h = h.replace(/\s*<(p|h[1-6]|blockquote|div|title|style|pre|script|td|li|area)(|[^>]+)>/g, '\n<$1$2>');
+						h = h.replace(/<\/(p|h[1-6]|blockquote|div|title|style|pre|script|td|li)>\s*/g, '</$1>\n');
+						h = h.replace(/\n\n/g, '\n');
+					}
+				}
+
+				h = t._unprotect(h, p);
+
+				// Restore the \u00a0 character if raw mode is enabled
+				if (s.entity_encoding == 'raw')
+					h = h.replace(/<p>&nbsp;<\/p>|<p([^>]+)>&nbsp;<\/p>/g, '<p$1>\u00a0</p>');
+			}
+
+			o.content = h;
+		},
+
+		_serializeNode : function(n, inn) {
+			var t = this, s = t.settings, w = t.writer, hc, el, cn, i, l, a, at, no, v, nn, ru, ar, iv;
+
+			if (!s.node_filter || s.node_filter(n)) {
+				switch (n.nodeType) {
+					case 1: // Element
+						if (n.hasAttribute ? n.hasAttribute('mce_bogus') : n.getAttribute('mce_bogus'))
+							return;
+
+						iv = false;
+						hc = n.hasChildNodes();
+						nn = n.getAttribute('mce_name') || n.nodeName.toLowerCase();
+
+						// Add correct prefix on IE
+						if (isIE) {
+							if (n.scopeName !== 'HTML' && n.scopeName !== 'html')
+								nn = n.scopeName + ':' + nn;
+						}
+
+						// Remove mce prefix on IE needed for the abbr element
+						if (nn.indexOf('mce:') === 0)
+							nn = nn.substring(4);
+
+						// Check if valid
+						if (!t.validElementsRE.test(nn) || (t.invalidElementsRE && t.invalidElementsRE.test(nn)) || inn) {
+							iv = true;
+							break;
+						}
+
+						if (isIE) {
+							// Fix IE content duplication (DOM can have multiple copies of the same node)
+							if (s.fix_content_duplication) {
+								if (n.mce_serialized == t.key)
+									return;
+
+								n.mce_serialized = t.key;
+							}
+
+							// IE sometimes adds a / infront of the node name
+							if (nn.charAt(0) == '/')
+								nn = nn.substring(1);
+						} else if (isGecko) {
+							// Ignore br elements
+							if (n.nodeName === 'BR' && n.getAttribute('type') == '_moz')
+								return;
+						}
+
+						// Check if valid child
+						if (t.childRules) {
+							if (t.parentElementsRE.test(t.elementName)) {
+								if (!t.childRules[t.elementName].test(nn)) {
+									iv = true;
+									break;
+								}
+							}
+
+							t.elementName = nn;
+						}
+
+						ru = t.findRule(nn);
+						nn = ru.name || nn;
+
+						// Skip empty nodes or empty node name in IE
+						if ((!hc && ru.noEmpty) || (isIE && !nn)) {
+							iv = true;
+							break;
+						}
+
+						// Check required
+						if (ru.requiredAttribs) {
+							a = ru.requiredAttribs;
+
+							for (i = a.length - 1; i >= 0; i--) {
+								if (this.dom.getAttrib(n, a[i]) !== '')
+									break;
+							}
+
+							// None of the required was there
+							if (i == -1) {
+								iv = true;
+								break;
+							}
+						}
+
+						w.writeStartElement(nn);
+
+						// Add ordered attributes
+						if (ru.attribs) {
+							for (i=0, at = ru.attribs, l = at.length; i<l; i++) {
+								a = at[i];
+								v = t._getAttrib(n, a);
+
+								if (v !== null)
+									w.writeAttribute(a.name, v);
+							}
+						}
+
+						// Add wild attributes
+						if (ru.validAttribsRE) {
+							at = isIE ? getIEAtts(n) : n.attributes;
+							for (i=at.length-1; i>-1; i--) {
+								no = at[i];
+
+								if (no.specified) {
+									a = no.nodeName.toLowerCase();
+
+									if (s.invalid_attrs.test(a) || !ru.validAttribsRE.test(a))
+										continue;
+
+									ar = t.findAttribRule(ru, a);
+									v = t._getAttrib(n, ar, a);
+
+									if (v !== null)
+										w.writeAttribute(a, v);
+								}
+							}
+						}
+
+						// Padd empty nodes with a &nbsp;
+						if (!hc && ru.padd)
+							w.writeText('\u00a0');
+
+						break;
+
+					case 3: // Text
+						// Check if valid child
+						if (t.childRules && t.parentElementsRE.test(t.elementName)) {
+							if (!t.childRules[t.elementName].test(n.nodeName))
+								return;
+						}
+
+						return w.writeText(n.nodeValue);
+
+					case 4: // CDATA
+						return w.writeCDATA(n.nodeValue);
+
+					case 8: // Comment
+						return w.writeComment(n.nodeValue);
+				}
+			} else if (n.nodeType == 1)
+				hc = n.hasChildNodes();
+
+			if (hc) {
+				cn = n.firstChild;
+
+				while (cn) {
+					t._serializeNode(cn);
+					t.elementName = nn;
+					cn = cn.nextSibling;
+				}
+			}
+
+			// Write element end
+			if (!iv) {
+				if (hc || !s.closed.test(nn))
+					w.writeFullEndElement();
+				else
+					w.writeEndElement();
+			}
+		},
+
+		_protect : function(o) {
+			var t = this;
+
+			o.items = o.items || [];
+
+			function enc(s) {
+				return s.replace(/[\r\n\\]/g, function(c) {
+					if (c === '\n')
+						return '\\n';
+					else if (c === '\\')
+						return '\\\\';
+
+					return '\\r';
+				});
+			};
+
+			function dec(s) {
+				return s.replace(/\\[\\rn]/g, function(c) {
+					if (c === '\\n')
+						return '\n';
+					else if (c === '\\\\')
+						return '\\';
+
+					return '\r';
+				});
+			};
+
+			each(o.patterns, function(p) {
+				o.content = dec(enc(o.content).replace(p.pattern, function(x, a, b, c) {
+					b = dec(b);
+
+					if (p.encode)
+						b = t._encode(b);
+
+					o.items.push(b);
+					return a + '<!--mce:' + (o.items.length - 1) + '-->' + c;
+				}));
+			});
+
+			return o;
+		},
+
+		_unprotect : function(h, o) {
+			h = h.replace(/\<!--mce:([0-9]+)--\>/g, function(a, b) {
+				return o.items[parseInt(b)];
+			});
+
+			o.items = [];
+
+			return h;
+		},
+
+		_encode : function(h) {
+			var t = this, s = t.settings, l;
+
+			// Entity encode
+			if (s.entity_encoding !== 'raw') {
+				if (s.entity_encoding.indexOf('named') != -1) {
+					t.setEntities(s.entities);
+					l = t.entityLookup;
+
+					h = h.replace(t.entitiesRE, function(a) {
+						var v;
+
+						if (v = l[a])
+							a = '&' + v + ';';
+
+						return a;
+					});
+				}
+
+				if (s.entity_encoding.indexOf('numeric') != -1) {
+					h = h.replace(/[\u007E-\uFFFF]/g, function(a) {
+						return '&#' + a.charCodeAt(0) + ';';
+					});
+				}
+			}
+
+			return h;
+		},
+
+		_setup : function() {
+			var t = this, s = this.settings;
+
+			if (t.done)
+				return;
+
+			t.done = 1;
+
+			t.setRules(s.valid_elements);
+			t.addRules(s.extended_valid_elements);
+			t.addValidChildRules(s.valid_child_elements);
+
+			if (s.invalid_elements)
+				t.invalidElementsRE = new RegExp('^(' + wildcardToRE(s.invalid_elements.replace(/,/g, '|').toLowerCase()) + ')$');
+
+			if (s.attrib_value_filter)
+				t.attribValueFilter = s.attribValueFilter;
+		},
+
+		_getAttrib : function(n, a, na) {
+			var i, v;
+
+			na = na || a.name;
+
+			if (a.forcedVal && (v = a.forcedVal)) {
+				if (v === '{$uid}')
+					return this.dom.uniqueId();
+
+				return v;
+			}
+
+			v = this.dom.getAttrib(n, na);
+
+			switch (na) {
+				case 'rowspan':
+				case 'colspan':
+					// Whats the point? Remove usless attribute value
+					if (v == '1')
+						v = '';
+
+					break;
+			}
+
+			if (this.attribValueFilter)
+				v = this.attribValueFilter(na, v, n);
+
+			if (a.validVals) {
+				for (i = a.validVals.length - 1; i >= 0; i--) {
+					if (v == a.validVals[i])
+						break;
+				}
+
+				if (i == -1)
+					return null;
+			}
+
+			if (v === '' && typeof(a.defaultVal) != 'undefined') {
+				v = a.defaultVal;
+
+				if (v === '{$uid}')
+					return this.dom.uniqueId();
+
+				return v;
+			} else {
+				// Remove internal mceItemXX classes when content is extracted from editor
+				if (na == 'class' && this.processObj.get)
+					v = v.replace(/\s?mceItem\w+\s?/g, '');
+			}
+
+			if (v === '')
+				return null;
+
+
+			return v;
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/dom/ScriptLoader.js */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.dom.ScriptLoader', {
+		ScriptLoader : function(s) {
+			this.settings = s || {};
+			this.queue = [];
+			this.lookup = {};
+		},
+
+		isDone : function(u) {
+			return this.lookup[u] ? this.lookup[u].state == 2 : 0;
+		},
+
+		markDone : function(u) {
+			this.lookup[u] = {state : 2, url : u};
+		},
+
+		add : function(u, cb, s, pr) {
+			var t = this, lo = t.lookup, o;
+
+			if (o = lo[u]) {
+				// Is loaded fire callback
+				if (cb && o.state == 2)
+					cb.call(s || this);
+
+				return o;
+			}
+
+			o = {state : 0, url : u, func : cb, scope : s || this};
+
+			if (pr)
+				t.queue.unshift(o);
+			else
+				t.queue.push(o);
+
+			lo[u] = o;
+
+			return o;
+		},
+
+		load : function(u, cb, s) {
+			var t = this, o;
+
+			if (o = t.lookup[u]) {
+				// Is loaded fire callback
+				if (cb && o.state == 2)
+					cb.call(s || t);
+
+				return o;
+			}
+
+			function loadScript(u) {
+				if (tinymce.dom.Event.domLoaded || t.settings.strict_mode) {
+					tinymce.util.XHR.send({
+						url : tinymce._addVer(u),
+						error : t.settings.error,
+						async : false,
+						success : function(co) {
+							t.eval(co);
+						}
+					});
+				} else
+					document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"></script>');
+			};
+
+			if (!tinymce.is(u, 'string')) {
+				each(u, function(u) {
+					loadScript(u);
+				});
+
+				if (cb)
+					cb.call(s || t);
+			} else {
+				loadScript(u);
+
+				if (cb)
+					cb.call(s || t);
+			}
+		},
+
+		loadQueue : function(cb, s) {
+			var t = this;
+
+			if (!t.queueLoading) {
+				t.queueLoading = 1;
+				t.queueCallbacks = [];
+
+				t.loadScripts(t.queue, function() {
+					t.queueLoading = 0;
+
+					if (cb)
+						cb.call(s || t);
+
+					each(t.queueCallbacks, function(o) {
+						o.func.call(o.scope);
+					});
+				});
+			} else if (cb)
+				t.queueCallbacks.push({func : cb, scope : s || t});
+		},
+
+		eval : function(co) {
+			var w = window;
+
+			// Evaluate script
+			if (!w.execScript) {
+				try {
+					eval.call(w, co);
+				} catch (ex) {
+					eval(co, w); // Firefox 3.0a8
+				}
+			} else
+				w.execScript(co); // IE
+		},
+
+		loadScripts : function(sc, cb, s) {
+			var t = this, lo = t.lookup;
+
+			function done(o) {
+				o.state = 2; // Has been loaded
+
+				// Run callback
+				if (o.func)
+					o.func.call(o.scope || t);
+			};
+
+			function allDone() {
+				var l;
+
+				// Check if all files are loaded
+				l = sc.length;
+				each(sc, function(o) {
+					o = lo[o.url];
+
+					if (o.state === 2) {// It has finished loading
+						done(o);
+						l--;
+					} else
+						load(o);
+				});
+
+				// They are all loaded
+				if (l === 0 && cb) {
+					cb.call(s || t);
+					cb = 0;
+				}
+			};
+
+			function load(o) {
+				if (o.state > 0)
+					return;
+
+				o.state = 1; // Is loading
+
+				tinymce.util.XHR.send({
+					url : o.url,
+					error : t.settings.error,
+					success : function(co) {
+						t.eval(co);
+						done(o);
+						allDone();
+					}
+				});
+			};
+
+			each(sc, function(o) {
+				var u = o.url;
+
+				// Add to queue if needed
+				if (!lo[u]) {
+					lo[u] = o;
+					t.queue.push(o);
+				} else
+					o = lo[u];
+
+				// Is already loading or has been loaded
+				if (o.state > 0)
+					return;
+
+				if (!tinymce.dom.Event.domLoaded && !t.settings.strict_mode) {
+					var ix, ol = '';
+
+					// Add onload events
+					if (cb || o.func) {
+						o.state = 1; // Is loading
+
+						ix = tinymce.dom.ScriptLoader._addOnLoad(function() {
+							done(o);
+							allDone();
+						});
+
+						if (tinymce.isIE)
+							ol = ' onreadystatechange="';
+						else
+							ol = ' onload="';
+
+						ol += 'tinymce.dom.ScriptLoader._onLoad(this,\'' + u + '\',' + ix + ');"';
+					}
+
+					document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"' + ol + '></script>');
+
+					if (!o.func)
+						done(o);
+				} else
+					load(o);
+			});
+
+			allDone();
+		},
+
+		// Static methods
+		'static' : {
+			_addOnLoad : function(f) {
+				var t = this;
+
+				t._funcs = t._funcs || [];
+				t._funcs.push(f);
+
+				return t._funcs.length - 1;
+			},
+
+			_onLoad : function(e, u, ix) {
+				if (!tinymce.isIE || e.readyState == 'complete')
+					this._funcs[ix].call(this);
+			}
+		}
+
+		});
+
+	// Global script loader
+	tinymce.ScriptLoader = new tinymce.dom.ScriptLoader();
+})();
+
+/* file:jscripts/tiny_mce/classes/ui/Control.js */
+
+(function() {
+	// Shorten class names
+	var DOM = tinymce.DOM, is = tinymce.is;
+
+	tinymce.create('tinymce.ui.Control', {
+		Control : function(id, s) {
+			this.id = id;
+			this.settings = s = s || {};
+			this.rendered = false;
+			this.onRender = new tinymce.util.Dispatcher(this);
+			this.classPrefix = '';
+			this.scope = s.scope || this;
+			this.disabled = 0;
+			this.active = 0;
+		},
+
+		setDisabled : function(s) {
+			var e;
+
+			if (s != this.disabled) {
+				e = DOM.get(this.id);
+
+				// Add accessibility title for unavailable actions
+				if (e && this.settings.unavailable_prefix) {
+					if (s) {
+						this.prevTitle = e.title;
+						e.title = this.settings.unavailable_prefix + ": " + e.title;
+					} else
+						e.title = this.prevTitle;
+				}
+
+				this.setState('Disabled', s);
+				this.setState('Enabled', !s);
+				this.disabled = s;
+			}
+		},
+
+		isDisabled : function() {
+			return this.disabled;
+		},
+
+		setActive : function(s) {
+			if (s != this.active) {
+				this.setState('Active', s);
+				this.active = s;
+			}
+		},
+
+		isActive : function() {
+			return this.active;
+		},
+
+		setState : function(c, s) {
+			var n = DOM.get(this.id);
+
+			c = this.classPrefix + c;
+
+			if (s)
+				DOM.addClass(n, c);
+			else
+				DOM.removeClass(n, c);
+		},
+
+		isRendered : function() {
+			return this.rendered;
+		},
+
+		renderHTML : function() {
+		},
+
+		renderTo : function(n) {
+			DOM.setHTML(n, this.renderHTML());
+		},
+
+		postRender : function() {
+			var t = this, b;
+
+			// Set pending states
+			if (is(t.disabled)) {
+				b = t.disabled;
+				t.disabled = -1;
+				t.setDisabled(b);
+			}
+
+			if (is(t.active)) {
+				b = t.active;
+				t.active = -1;
+				t.setActive(b);
+			}
+		},
+
+		remove : function() {
+			DOM.remove(this.id);
+			this.destroy();
+		},
+
+		destroy : function() {
+			tinymce.dom.Event.clear(this.id);
+		}
+
+		});
+})();
+/* file:jscripts/tiny_mce/classes/ui/Container.js */
+
+tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {
+	Container : function(id, s) {
+		this.parent(id, s);
+		this.controls = [];
+		this.lookup = {};
+	},
+
+	add : function(c) {
+		this.lookup[c.id] = c;
+		this.controls.push(c);
+
+		return c;
+	},
+
+	get : function(n) {
+		return this.lookup[n];
+	}
+
+	});
+
+
+/* file:jscripts/tiny_mce/classes/ui/Separator.js */
+
+tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
+	Separator : function(id, s) {
+		this.parent(id, s);
+		this.classPrefix = 'mceSeparator';
+	},
+
+	renderHTML : function() {
+		return tinymce.DOM.createHTML('span', {'class' : this.classPrefix});
+	}
+
+	});
+
+/* file:jscripts/tiny_mce/classes/ui/MenuItem.js */
+
+(function() {
+	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, walk = tinymce.walk;
+
+	tinymce.create('tinymce.ui.MenuItem:tinymce.ui.Control', {
+		MenuItem : function(id, s) {
+			this.parent(id, s);
+			this.classPrefix = 'mceMenuItem';
+		},
+
+		setSelected : function(s) {
+			this.setState('Selected', s);
+			this.selected = s;
+		},
+
+		isSelected : function() {
+			return this.selected;
+		},
+
+		postRender : function() {
+			var t = this;
+			
+			t.parent();
+
+			// Set pending state
+			if (is(t.selected))
+				t.setSelected(t.selected);
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/ui/Menu.js */
+
+(function() {
+	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, walk = tinymce.walk;
+
+	tinymce.create('tinymce.ui.Menu:tinymce.ui.MenuItem', {
+		Menu : function(id, s) {
+			var t = this;
+
+			t.parent(id, s);
+			t.items = {};
+			t.collapsed = false;
+			t.menuCount = 0;
+			t.onAddItem = new tinymce.util.Dispatcher(this);
+		},
+
+		expand : function(d) {
+			var t = this;
+
+			if (d) {
+				walk(t, function(o) {
+					if (o.expand)
+						o.expand();
+				}, 'items', t);
+			}
+
+			t.collapsed = false;
+		},
+
+		collapse : function(d) {
+			var t = this;
+
+			if (d) {
+				walk(t, function(o) {
+					if (o.collapse)
+						o.collapse();
+				}, 'items', t);
+			}
+
+			t.collapsed = true;
+		},
+
+		isCollapsed : function() {
+			return this.collapsed;
+		},
+
+		add : function(o) {
+			if (!o.settings)
+				o = new tinymce.ui.MenuItem(o.id || DOM.uniqueId(), o);
+
+			this.onAddItem.dispatch(this, o);
+
+			return this.items[o.id] = o;
+		},
+
+		addSeparator : function() {
+			return this.add({separator : true});
+		},
+
+		addMenu : function(o) {
+			if (!o.collapse)
+				o = this.createMenu(o);
+
+			this.menuCount++;
+
+			return this.add(o);
+		},
+
+		hasMenus : function() {
+			return this.menuCount !== 0;
+		},
+
+		remove : function(o) {
+			delete this.items[o.id];
+		},
+
+		removeAll : function() {
+			var t = this;
+
+			walk(t, function(o) {
+				if (o.removeAll)
+					o.removeAll();
+				else
+					o.remove();
+
+				o.destroy();
+			}, 'items', t);
+
+			t.items = {};
+		},
+
+		createMenu : function(o) {
+			var m = new tinymce.ui.Menu(o.id || DOM.uniqueId(), o);
+
+			m.onAddItem.add(this.onAddItem.dispatch, this.onAddItem);
+
+			return m;
+		}
+
+		});
+})();
+/* file:jscripts/tiny_mce/classes/ui/DropMenu.js */
+
+(function() {
+	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, Event = tinymce.dom.Event, Element = tinymce.dom.Element;
+
+	tinymce.create('tinymce.ui.DropMenu:tinymce.ui.Menu', {
+		DropMenu : function(id, s) {
+			s = s || {};
+			s.container = s.container || DOM.doc.body;
+			s.offset_x = s.offset_x || 0;
+			s.offset_y = s.offset_y || 0;
+			s.vp_offset_x = s.vp_offset_x || 0;
+			s.vp_offset_y = s.vp_offset_y || 0;
+
+			if (is(s.icons) && !s.icons)
+				s['class'] += ' mceNoIcons';
+
+			this.parent(id, s);
+			this.onShowMenu = new tinymce.util.Dispatcher(this);
+			this.onHideMenu = new tinymce.util.Dispatcher(this);
+			this.classPrefix = 'mceMenu';
+		},
+
+		createMenu : function(s) {
+			var t = this, cs = t.settings, m;
+
+			s.container = s.container || cs.container;
+			s.parent = t;
+			s.constrain = s.constrain || cs.constrain;
+			s['class'] = s['class'] || cs['class'];
+			s.vp_offset_x = s.vp_offset_x || cs.vp_offset_x;
+			s.vp_offset_y = s.vp_offset_y || cs.vp_offset_y;
+			m = new tinymce.ui.DropMenu(s.id || DOM.uniqueId(), s);
+
+			m.onAddItem.add(t.onAddItem.dispatch, t.onAddItem);
+
+			return m;
+		},
+
+		update : function() {
+			var t = this, s = t.settings, tb = DOM.get('menu_' + t.id + '_tbl'), co = DOM.get('menu_' + t.id + '_co'), tw, th;
+
+			tw = s.max_width ? Math.min(tb.clientWidth, s.max_width) : tb.clientWidth;
+			th = s.max_height ? Math.min(tb.clientHeight, s.max_height) : tb.clientHeight;
+
+			if (!DOM.boxModel)
+				t.element.setStyles({width : tw + 2, height : th + 2});
+			else
+				t.element.setStyles({width : tw, height : th});
+
+			if (s.max_width)
+				DOM.setStyle(co, 'width', tw);
+
+			if (s.max_height) {
+				DOM.setStyle(co, 'height', th);
+
+				if (tb.clientHeight < s.max_height)
+					DOM.setStyle(co, 'overflow', 'hidden');
+			}
+		},
+
+		showMenu : function(x, y, px) {
+			var t = this, s = t.settings, co, vp = DOM.getViewPort(), w, h, mx, my, ot = 2, dm, tb, cp = t.classPrefix;
+
+			t.collapse(1);
+
+			if (t.isMenuVisible)
+				return;
+
+			if (!t.rendered) {
+				co = DOM.add(t.settings.container, t.renderNode());
+
+				each(t.items, function(o) {
+					o.postRender();
+				});
+
+				t.element = new Element('menu_' + t.id, {blocker : 1, container : s.container});
+			} else
+				co = DOM.get('menu_' + t.id);
+
+			// Move layer out of sight unless it's Opera since it scrolls to top of page due to an bug
+			if (!tinymce.isOpera)
+				DOM.setStyles(co, {left : -0xFFFF , top : -0xFFFF});
+
+			DOM.show(co);
+			t.update();
+
+			x += s.offset_x || 0;
+			y += s.offset_y || 0;
+			vp.w -= 4;
+			vp.h -= 4;
+
+			// Move inside viewport if not submenu
+			if (s.constrain) {
+				w = co.clientWidth - ot;
+				h = co.clientHeight - ot;
+				mx = vp.x + vp.w;
+				my = vp.y + vp.h;
+
+				if ((x + s.vp_offset_x + w) > mx)
+					x = px ? px - w : Math.max(0, (mx - s.vp_offset_x) - w);
+
+				if ((y + s.vp_offset_y + h) > my)
+					y = Math.max(0, (my - s.vp_offset_y) - h);
+			}
+
+			DOM.setStyles(co, {left : x , top : y});
+			t.element.update();
+
+			t.isMenuVisible = 1;
+			t.mouseClickFunc = Event.add(co, 'click', function(e) {
+				var m;
+
+				e = e.target;
+
+				if (e && (e = DOM.getParent(e, 'TR')) && !DOM.hasClass(e, cp + 'ItemSub')) {
+					m = t.items[e.id];
+
+					if (m.isDisabled())
+						return;
+
+					dm = t;
+
+					while (dm) {
+						if (dm.hideMenu)
+							dm.hideMenu();
+
+						dm = dm.settings.parent;
+					}
+
+					if (m.settings.onclick)
+						m.settings.onclick(e);
+
+					return Event.cancel(e); // Cancel to fix onbeforeunload problem
+				}
+			});
+
+			if (t.hasMenus()) {
+				t.mouseOverFunc = Event.add(co, 'mouseover', function(e) {
+					var m, r, mi;
+
+					e = e.target;
+					if (e && (e = DOM.getParent(e, 'TR'))) {
+						m = t.items[e.id];
+
+						if (t.lastMenu)
+							t.lastMenu.collapse(1);
+
+						if (m.isDisabled())
+							return;
+
+						if (e && DOM.hasClass(e, cp + 'ItemSub')) {
+							//p = DOM.getPos(s.container);
+							r = DOM.getRect(e);
+							m.showMenu((r.x + r.w - ot), r.y - ot, r.x);
+							t.lastMenu = m;
+							DOM.addClass(DOM.get(m.id).firstChild, cp + 'ItemActive');
+						}
+					}
+				});
+			}
+
+			t.onShowMenu.dispatch(t);
+
+			if (s.keyboard_focus) {
+				Event.add(co, 'keydown', t._keyHandler, t);
+				DOM.select('a', 'menu_' + t.id)[0].focus(); // Select first link
+				t._focusIdx = 0;
+			}
+		},
+
+		hideMenu : function(c) {
+			var t = this, co = DOM.get('menu_' + t.id), e;
+
+			if (!t.isMenuVisible)
+				return;
+
+			Event.remove(co, 'mouseover', t.mouseOverFunc);
+			Event.remove(co, 'click', t.mouseClickFunc);
+			Event.remove(co, 'keydown', t._keyHandler);
+			DOM.hide(co);
+			t.isMenuVisible = 0;
+
+			if (!c)
+				t.collapse(1);
+
+			if (t.element)
+				t.element.hide();
+
+			if (e = DOM.get(t.id))
+				DOM.removeClass(e.firstChild, t.classPrefix + 'ItemActive');
+
+			t.onHideMenu.dispatch(t);
+		},
+
+		add : function(o) {
+			var t = this, co;
+
+			o = t.parent(o);
+
+			if (t.isRendered && (co = DOM.get('menu_' + t.id)))
+				t._add(DOM.select('tbody', co)[0], o);
+
+			return o;
+		},
+
+		collapse : function(d) {
+			this.parent(d);
+			this.hideMenu(1);
+		},
+
+		remove : function(o) {
+			DOM.remove(o.id);
+			this.destroy();
+
+			return this.parent(o);
+		},
+
+		destroy : function() {
+			var t = this, co = DOM.get('menu_' + t.id);
+
+			Event.remove(co, 'mouseover', t.mouseOverFunc);
+			Event.remove(co, 'click', t.mouseClickFunc);
+
+			if (t.element)
+				t.element.remove();
+
+			DOM.remove(co);
+		},
+
+		renderNode : function() {
+			var t = this, s = t.settings, n, tb, co, w;
+
+			w = DOM.create('div', {id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:200000'});
+			co = DOM.add(w, 'div', {id : 'menu_' + t.id + '_co', 'class' : t.classPrefix + (s['class'] ? ' ' + s['class'] : '')});
+			t.element = new Element('menu_' + t.id, {blocker : 1, container : s.container});
+
+			if (s.menu_line)
+				DOM.add(co, 'span', {'class' : t.classPrefix + 'Line'});
+
+//			n = DOM.add(co, 'div', {id : 'menu_' + t.id + '_co', 'class' : 'mceMenuContainer'});
+			n = DOM.add(co, 'table', {id : 'menu_' + t.id + '_tbl', border : 0, cellPadding : 0, cellSpacing : 0});
+			tb = DOM.add(n, 'tbody');
+
+			each(t.items, function(o) {
+				t._add(tb, o);
+			});
+
+			t.rendered = true;
+
+			return w;
+		},
+
+		// Internal functions
+
+		_keyHandler : function(e) {
+			var t = this, kc = e.keyCode;
+
+			function focus(d) {
+				var i = t._focusIdx + d, e = DOM.select('a', 'menu_' + t.id)[i];
+
+				if (e) {
+					t._focusIdx = i;
+					e.focus();
+				}
+			};
+
+			switch (kc) {
+				case 38:
+					focus(-1); // Select first link
+					return;
+
+				case 40:
+					focus(1);
+					return;
+
+				case 13:
+					return;
+
+				case 27:
+					return this.hideMenu();
+			}
+		},
+
+		_add : function(tb, o) {
+			var n, s = o.settings, a, ro, it, cp = this.classPrefix;
+
+			if (s.separator) {
+				ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'ItemSeparator'});
+				DOM.add(ro, 'td', {'class' : cp + 'ItemSeparator'});
+
+				if (n = ro.previousSibling)
+					DOM.addClass(n, 'mceLast');
+
+				return;
+			}
+
+			n = ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'Item ' + cp + 'ItemEnabled'});
+			n = it = DOM.add(n, 'td');
+			n = a = DOM.add(n, 'a', {href : 'javascript:;', onclick : "return false;", onmousedown : 'return false;'});
+
+			DOM.addClass(it, s['class']);
+//			n = DOM.add(n, 'span', {'class' : 'item'});
+			DOM.add(n, 'span', {'class' : 'mceIcon' + (s.icon ? ' mce_' + s.icon : '')});
+			n = DOM.add(n, s.element || 'span', {'class' : 'mceText', title : o.settings.title}, o.settings.title);
+
+			if (o.settings.style)
+				DOM.setAttrib(n, 'style', o.settings.style);
+
+			if (tb.childNodes.length == 1)
+				DOM.addClass(ro, 'mceFirst');
+
+			if ((n = ro.previousSibling) && DOM.hasClass(n, cp + 'ItemSeparator'))
+				DOM.addClass(ro, 'mceFirst');
+
+			if (o.collapse)
+				DOM.addClass(ro, cp + 'ItemSub');
+
+			if (n = ro.previousSibling)
+				DOM.removeClass(n, 'mceLast');
+
+			DOM.addClass(ro, 'mceLast');
+		}
+
+		});
+})();
+/* file:jscripts/tiny_mce/classes/ui/Button.js */
+
+(function() {
+	var DOM = tinymce.DOM;
+
+	tinymce.create('tinymce.ui.Button:tinymce.ui.Control', {
+		Button : function(id, s) {
+			this.parent(id, s);
+			this.classPrefix = 'mceButton';
+		},
+
+		renderHTML : function() {
+			var cp = this.classPrefix, s = this.settings, h, l;
+
+			l = DOM.encode(s.label || '');
+			h = '<a id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + (l ? ' ' + cp + 'Labeled' : '') +'" onmousedown="return false;" onclick="return false;" title="' + DOM.encode(s.title) + '">';
+
+			if (s.image)
+				h += '<img class="mceIcon" src="' + s.image + '" />' + l + '</a>';
+			else
+				h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '') + '</a>';
+
+			return h;
+		},
+
+		postRender : function() {
+			var t = this, s = t.settings;
+
+			tinymce.dom.Event.add(t.id, 'click', function(e) {
+				if (!t.isDisabled())
+					return s.onclick.call(s.scope, e);
+			});
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/ui/ListBox.js */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;
+
+	tinymce.create('tinymce.ui.ListBox:tinymce.ui.Control', {
+		ListBox : function(id, s) {
+			var t = this;
+
+			t.parent(id, s);
+			t.items = [];
+			t.onChange = new Dispatcher(t);
+			t.onPostRender = new Dispatcher(t);
+			t.onAdd = new Dispatcher(t);
+			t.onRenderMenu = new tinymce.util.Dispatcher(this);
+			t.classPrefix = 'mceListBox';
+		},
+
+		select : function(v) {
+			var t = this, e, fv;
+
+			// Do we need to do something?
+			if (v != t.selectedValue) {
+				e = DOM.get(t.id + '_text');
+				t.selectedValue = v;
+
+				// Find item
+				each(t.items, function(o) {
+					if (o.value == v) {
+						DOM.setHTML(e, DOM.encode(o.title));
+						fv = 1;
+						return false;
+					}
+				});
+
+				// If no item was found then present title
+				if (!fv) {
+					DOM.setHTML(e, DOM.encode(t.settings.title));
+					DOM.addClass(e, 'mceTitle');
+					e = 0;
+					return;
+				} else
+					DOM.removeClass(e, 'mceTitle');
+			}
+
+			e = 0;
+		},
+
+		add : function(n, v, o) {
+			var t = this;
+
+			o = o || {};
+			o = tinymce.extend(o, {
+				title : n,
+				value : v
+			});
+
+			t.items.push(o);
+			t.onAdd.dispatch(t, o);
+		},
+
+		getLength : function() {
+			return this.items.length;
+		},
+
+		renderHTML : function() {
+			var h = '', t = this, s = t.settings, cp = t.classPrefix;
+
+			h = '<table id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';
+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_text', href : 'javascript:;', 'class' : 'mceText', onclick : "return false;", onmousedown : 'return false;'}, DOM.encode(t.settings.title)) + '</td>';
+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', tabindex : -1, href : 'javascript:;', 'class' : 'mceOpen', onclick : "return false;", onmousedown : 'return false;'}, '<span></span>') + '</td>';
+			h += '</tr></tbody></table>';
+
+			return h;
+		},
+
+		showMenu : function() {
+			var t = this, p1, p2, e = DOM.get(this.id), m;
+
+			if (t.isDisabled() || t.items.length == 0)
+				return;
+
+			if (t.menu && t.menu.isMenuVisible)
+				return t.hideMenu();
+
+			if (!t.isMenuRendered) {
+				t.renderMenu();
+				t.isMenuRendered = true;
+			}
+
+			p1 = DOM.getPos(this.settings.menu_container);
+			p2 = DOM.getPos(e);
+
+			m = t.menu;
+			m.settings.offset_x = p2.x;
+			m.settings.offset_y = p2.y;
+			m.settings.keyboard_focus = !tinymce.isOpera; // Opera is buggy when it comes to auto focus
+
+			// Select in menu
+			if (t.oldID)
+				m.items[t.oldID].setSelected(0);
+
+			each(t.items, function(o) {
+				if (o.value === t.selectedValue) {
+					m.items[o.id].setSelected(1);
+					t.oldID = o.id;
+				}
+			});
+
+			m.showMenu(0, e.clientHeight);
+
+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
+			DOM.addClass(t.id, t.classPrefix + 'Selected');
+
+			//DOM.get(t.id + '_text').focus();
+		},
+
+		hideMenu : function(e) {
+			var t = this;
+
+			// Prevent double toogles by canceling the mouse click event to the button
+			if (e && e.type == "mousedown" && (e.target.id == t.id + '_text' || e.target.id == t.id + '_open'))
+				return;
+
+			if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceMenu');})) {
+				DOM.removeClass(t.id, t.classPrefix + 'Selected');
+				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
+
+				if (t.menu)
+					t.menu.hideMenu();
+			}
+		},
+
+		renderMenu : function() {
+			var t = this, m;
+
+			m = t.settings.control_manager.createDropMenu(t.id + '_menu', {
+				menu_line : 1,
+				'class' : t.classPrefix + 'Menu mceNoIcons',
+				max_width : 150,
+				max_height : 150
+			});
+
+			m.onHideMenu.add(t.hideMenu, t);
+
+			m.add({
+				title : t.settings.title,
+				'class' : 'mceMenuItemTitle',
+				onclick : function() {
+					if (t.settings.onselect('') !== false)
+						t.select(''); // Must be runned after
+				}
+			});
+
+			each(t.items, function(o) {
+				o.id = DOM.uniqueId();
+				o.onclick = function() {
+					if (t.settings.onselect(o.value) !== false)
+						t.select(o.value); // Must be runned after
+				};
+
+				m.add(o);
+			});
+
+			t.onRenderMenu.dispatch(t, m);
+			t.menu = m;
+		},
+
+		postRender : function() {
+			var t = this, cp = t.classPrefix;
+
+			Event.add(t.id, 'click', t.showMenu, t);
+			Event.add(t.id + '_text', 'focus', function(e) {
+				if (!t._focused) {
+					t.keyDownHandler = Event.add(t.id + '_text', 'keydown', function(e) {
+						var idx = -1, v, kc = e.keyCode;
+
+						// Find current index
+						each(t.items, function(v, i) {
+							if (t.selectedValue == v.value)
+								idx = i;
+						});
+
+						// Move up/down
+						if (kc == 38)
+							v = t.items[idx - 1];
+						else if (kc == 40)
+							v = t.items[idx + 1];
+						else if (kc == 13) {
+							// Fake select on enter
+							v = t.selectedValue;
+							t.selectedValue = null; // Needs to be null to fake change
+							t.settings.onselect(v);
+							return Event.cancel(e);
+						}
+
+						if (v) {
+							t.hideMenu();
+							t.select(v.value);
+						}
+					});
+				}
+
+				t._focused = 1;
+			});
+			Event.add(t.id + '_text', 'blur', function() {Event.remove(t.id + '_text', 'keydown', t.keyDownHandler); t._focused = 0;});
+
+			// Old IE doesn't have hover on all elements
+			if (tinymce.isIE6 || !DOM.boxModel) {
+				Event.add(t.id, 'mouseover', function() {
+					if (!DOM.hasClass(t.id, cp + 'Disabled'))
+						DOM.addClass(t.id, cp + 'Hover');
+				});
+
+				Event.add(t.id, 'mouseout', function() {
+					if (!DOM.hasClass(t.id, cp + 'Disabled'))
+						DOM.removeClass(t.id, cp + 'Hover');
+				});
+			}
+
+			t.onPostRender.dispatch(t, DOM.get(t.id));
+		},
+
+		destroy : function() {
+			this.parent();
+
+			Event.clear(this.id + '_text');
+		}
+
+		});
+})();
+/* file:jscripts/tiny_mce/classes/ui/NativeListBox.js */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;
+
+	tinymce.create('tinymce.ui.NativeListBox:tinymce.ui.ListBox', {
+		NativeListBox : function(id, s) {
+			this.parent(id, s);
+			this.classPrefix = 'mceNativeListBox';
+		},
+
+		setDisabled : function(s) {
+			DOM.get(this.id).disabled = s;
+		},
+
+		isDisabled : function() {
+			return DOM.get(this.id).disabled;
+		},
+
+		select : function(v) {
+			var e = DOM.get(this.id), ol = e.options;
+
+			v = '' + (v || '');
+
+			e.selectedIndex = 0;
+			each(ol, function(o, i) {
+				if (o.value == v) {
+					e.selectedIndex = i;
+					return false;
+				}
+			});
+		},
+
+		add : function(n, v, a) {
+			var o, t = this;
+
+			a = a || {};
+			a.value = v;
+
+			if (t.isRendered())
+				DOM.add(DOM.get(this.id), 'option', a, n);
+
+			o = {
+				title : n,
+				value : v,
+				attribs : a
+			};
+
+			t.items.push(o);
+			t.onAdd.dispatch(t, o);
+		},
+
+		getLength : function() {
+			return DOM.get(this.id).options.length - 1;
+		},
+
+		renderHTML : function() {
+			var h, t = this;
+
+			h = DOM.createHTML('option', {value : ''}, '-- ' + t.settings.title + ' --');
+
+			each(t.items, function(it) {
+				h += DOM.createHTML('option', {value : it.value}, it.title);
+			});
+
+			h = DOM.createHTML('select', {id : t.id, 'class' : 'mceNativeListBox'}, h);
+
+			return h;
+		},
+
+		postRender : function() {
+			var t = this, ch;
+
+			t.rendered = true;
+
+			function onChange(e) {
+				var v = e.target.options[e.target.selectedIndex].value;
+
+				t.onChange.dispatch(t, v);
+
+				if (t.settings.onselect)
+					t.settings.onselect(v);
+			};
+
+			Event.add(t.id, 'change', onChange);
+
+			// Accessibility keyhandler
+			Event.add(t.id, 'keydown', function(e) {
+				var bf;
+
+				Event.remove(t.id, 'change', ch);
+
+				bf = Event.add(t.id, 'blur', function() {
+					Event.add(t.id, 'change', onChange);
+					Event.remove(t.id, 'blur', bf);
+				});
+
+				if (e.keyCode == 13 || e.keyCode == 32) {
+					onChange(e);
+					return Event.cancel(e);
+				}
+			});
+
+			t.onPostRender.dispatch(t, DOM.get(t.id));
+		}
+
+		});
+})();
+/* file:jscripts/tiny_mce/classes/ui/MenuButton.js */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;
+
+	tinymce.create('tinymce.ui.MenuButton:tinymce.ui.Button', {
+		MenuButton : function(id, s) {
+			this.parent(id, s);
+			this.onRenderMenu = new tinymce.util.Dispatcher(this);
+			s.menu_container = s.menu_container || DOM.doc.body;
+		},
+
+		showMenu : function() {
+			var t = this, p1, p2, e = DOM.get(t.id), m;
+
+			if (t.isDisabled())
+				return;
+
+			if (!t.isMenuRendered) {
+				t.renderMenu();
+				t.isMenuRendered = true;
+			}
+
+			if (t.isMenuVisible)
+				return t.hideMenu();
+
+			p1 = DOM.getPos(t.settings.menu_container);
+			p2 = DOM.getPos(e);
+
+			m = t.menu;
+			m.settings.offset_x = p2.x;
+			m.settings.offset_y = p2.y;
+			m.settings.vp_offset_x = p2.x;
+			m.settings.vp_offset_y = p2.y;
+			m.settings.keyboard_focus = t._focused;
+			m.showMenu(0, e.clientHeight);
+
+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
+			t.setState('Selected', 1);
+
+			t.isMenuVisible = 1;
+		},
+
+		renderMenu : function() {
+			var t = this, m;
+
+			m = t.settings.control_manager.createDropMenu(t.id + '_menu', {
+				menu_line : 1,
+				'class' : this.classPrefix + 'Menu',
+				icons : t.settings.icons
+			});
+
+			m.onHideMenu.add(t.hideMenu, t);
+
+			t.onRenderMenu.dispatch(t, m);
+			t.menu = m;
+		},
+
+		hideMenu : function(e) {
+			var t = this;
+
+			// Prevent double toogles by canceling the mouse click event to the button
+			if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id || e.id === t.id + '_open';}))
+				return;
+
+			if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceMenu');})) {
+				t.setState('Selected', 0);
+				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
+				if (t.menu)
+					t.menu.hideMenu();
+			}
+
+			t.isMenuVisible = 0;
+		},
+
+		postRender : function() {
+			var t = this, s = t.settings;
+
+			Event.add(t.id, 'click', function() {
+				if (!t.isDisabled()) {
+					if (s.onclick)
+						s.onclick(t.value);
+
+					t.showMenu();
+				}
+			});
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/ui/SplitButton.js */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;
+
+	tinymce.create('tinymce.ui.SplitButton:tinymce.ui.MenuButton', {
+		SplitButton : function(id, s) {
+			this.parent(id, s);
+			this.classPrefix = 'mceSplitButton';
+		},
+
+		renderHTML : function() {
+			var h, t = this, s = t.settings, h1;
+
+			h = '<tbody><tr>';
+
+			if (s.image)
+				h1 = DOM.createHTML('img ', {src : s.image, 'class' : 'mceAction ' + s['class']});
+			else
+				h1 = DOM.createHTML('span', {'class' : 'mceAction ' + s['class']}, '');
+
+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_action', href : 'javascript:;', 'class' : 'mceAction ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
+	
+			h1 = DOM.createHTML('span', {'class' : 'mceOpen ' + s['class']});
+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
+
+			h += '</tr></tbody>';
+
+			return DOM.createHTML('table', {id : t.id, 'class' : 'mceSplitButton mceSplitButtonEnabled ' + s['class'], cellpadding : '0', cellspacing : '0', onmousedown : 'return false;', title : s.title}, h);
+		},
+
+		postRender : function() {
+			var t = this, s = t.settings;
+
+			if (s.onclick) {
+				Event.add(t.id + '_action', 'click', function() {
+					if (!t.isDisabled())
+						s.onclick(t.value);
+				});
+			}
+
+			Event.add(t.id + '_open', 'click', t.showMenu, t);
+			Event.add(t.id + '_open', 'focus', function() {t._focused = 1;});
+			Event.add(t.id + '_open', 'blur', function() {t._focused = 0;});
+
+			// Old IE doesn't have hover on all elements
+			if (tinymce.isIE6 || !DOM.boxModel) {
+				Event.add(t.id, 'mouseover', function() {
+					if (!DOM.hasClass(t.id, 'mceSplitButtonDisabled'))
+						DOM.addClass(t.id, 'mceSplitButtonHover');
+				});
+
+				Event.add(t.id, 'mouseout', function() {
+					if (!DOM.hasClass(t.id, 'mceSplitButtonDisabled'))
+						DOM.removeClass(t.id, 'mceSplitButtonHover');
+				});
+			}
+		},
+
+		destroy : function() {
+			this.parent();
+
+			Event.clear(this.id + '_action');
+			Event.clear(this.id + '_open');
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/ui/ColorSplitButton.js */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, is = tinymce.is, each = tinymce.each;
+
+	tinymce.create('tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton', {
+		ColorSplitButton : function(id, s) {
+			var t = this;
+
+			t.parent(id, s);
+
+			t.settings = s = tinymce.extend({
+				colors : '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF',
+				grid_width : 8,
+				default_color : '#888888'
+			}, t.settings);
+
+			t.onShowMenu = new tinymce.util.Dispatcher(t);
+			t.onHideMenu = new tinymce.util.Dispatcher(t);
+
+			t.value = s.default_color;
+		},
+
+		showMenu : function() {
+			var t = this, r, p, e, p2;
+
+			if (t.isDisabled())
+				return;
+
+			if (!t.isMenuRendered) {
+				t.renderMenu();
+				t.isMenuRendered = true;
+			}
+
+			if (t.isMenuVisible)
+				return t.hideMenu();
+
+			e = DOM.get(t.id);
+			DOM.show(t.id + '_menu');
+			DOM.addClass(e, 'mceSplitButtonSelected');
+			p2 = DOM.getPos(e);
+			DOM.setStyles(t.id + '_menu', {
+				left : p2.x,
+				top : p2.y + e.clientHeight,
+				zIndex : 200000
+			});
+			e = 0;
+
+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
+
+			if (t._focused) {
+				t._keyHandler = Event.add(t.id + '_menu', 'keydown', function(e) {
+					if (e.keyCode == 27)
+						t.hideMenu();
+				});
+
+				DOM.select('a', t.id + '_menu')[0].focus(); // Select first link
+			}
+
+			t.onShowMenu.dispatch(t);
+
+			t.isMenuVisible = 1;
+		},
+
+		hideMenu : function(e) {
+			var t = this;
+
+			// Prevent double toogles by canceling the mouse click event to the button
+			if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id + '_open';}))
+				return;
+
+			if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceSplitButtonMenu');})) {
+				DOM.removeClass(t.id, 'mceSplitButtonSelected');
+				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
+				Event.remove(t.id + '_menu', 'keydown', t._keyHandler);
+				DOM.hide(t.id + '_menu');
+			}
+
+			t.onHideMenu.dispatch(t);
+
+			t.isMenuVisible = 0;
+		},
+
+		renderMenu : function() {
+			var t = this, m, i = 0, s = t.settings, n, tb, tr, w;
+
+			w = DOM.add(s.menu_container, 'div', {id : t.id + '_menu', 'class' : s['menu_class'] + ' ' + s['class'], style : 'position:absolute;left:0;top:-1000px;'});
+			m = DOM.add(w, 'div', {'class' : s['class'] + ' mceSplitButtonMenu'});
+			DOM.add(m, 'span', {'class' : 'mceMenuLine'});
+
+			n = DOM.add(m, 'table', {'class' : 'mceColorSplitMenu'});
+			tb = DOM.add(n, 'tbody');
+
+			// Generate color grid
+			i = 0;
+			each(is(s.colors, 'array') ? s.colors : s.colors.split(','), function(c) {
+				c = c.replace(/^#/, '');
+
+				if (!i--) {
+					tr = DOM.add(tb, 'tr');
+					i = s.grid_width - 1;
+				}
+
+				n = DOM.add(tr, 'td');
+
+				n = DOM.add(n, 'a', {
+					href : 'javascript:;',
+					style : {
+						backgroundColor : '#' + c
+					},
+					mce_color : '#' + c
+				});
+			});
+
+			if (s.more_colors_func) {
+				n = DOM.add(tb, 'tr');
+				n = DOM.add(n, 'td', {colspan : s.grid_width, 'class' : 'mceMoreColors'});
+				n = DOM.add(n, 'a', {id : t.id + '_more', href : 'javascript:;', onclick : 'return false;', 'class' : 'mceMoreColors'}, s.more_colors_title);
+
+				Event.add(n, 'click', function(e) {
+					s.more_colors_func.call(s.more_colors_scope || this);
+					return Event.cancel(e); // Cancel to fix onbeforeunload problem
+				});
+			}
+
+			DOM.addClass(m, 'mceColorSplitMenu');
+
+			Event.add(t.id + '_menu', 'click', function(e) {
+				var c;
+
+				e = e.target;
+
+				if (e.nodeName == 'A' && (c = e.getAttribute('mce_color')))
+					t.setColor(c);
+
+				return Event.cancel(e); // Prevent IE auto save warning
+			});
+
+			return w;
+		},
+
+		setColor : function(c) {
+			var t = this;
+
+			DOM.setStyle(t.id + '_preview', 'backgroundColor', c);
+
+			t.value = c;
+			t.hideMenu();
+			t.settings.onselect(c);
+		},
+
+		postRender : function() {
+			var t = this, id = t.id;
+
+			t.parent();
+			DOM.add(id + '_action', 'div', {id : id + '_preview', 'class' : 'mceColorPreview'});
+		},
+
+		destroy : function() {
+			this.parent();
+
+			Event.clear(this.id + '_menu');
+			Event.clear(this.id + '_more');
+			DOM.remove(this.id + '_menu');
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/ui/Toolbar.js */
+
+tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
+	renderHTML : function() {
+		var t = this, h = '', c, co, dom = tinymce.DOM, s = t.settings, i, pr, nx, cl;
+
+		cl = t.controls;
+		for (i=0; i<cl.length; i++) {
+			// Get current control, prev control, next control and if the control is a list box or not
+			co = cl[i];
+			pr = cl[i - 1];
+			nx = cl[i + 1];
+
+			// Add toolbar start
+			if (i === 0) {
+				c = 'mceToolbarStart';
+
+				if (co.Button)
+					c += ' mceToolbarStartButton';
+				else if (co.SplitButton)
+					c += ' mceToolbarStartSplitButton';
+				else if (co.ListBox)
+					c += ' mceToolbarStartListBox';
+
+				h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));
+			}
+
+			// Add toolbar end before list box and after the previous button
+			// This is to fix the o2k7 editor skins
+			if (pr && co.ListBox) {
+				if (pr.Button || pr.SplitButton)
+					h += dom.createHTML('td', {'class' : 'mceToolbarEnd'}, dom.createHTML('span', null, '<!-- IE -->'));
+			}
+
+			// Render control HTML
+
+			// IE 8 quick fix, needed to propertly generate a hit area for anchors
+			if (dom.stdMode)
+				h += '<td style="position: relative">' + co.renderHTML() + '</td>';
+			else
+				h += '<td>' + co.renderHTML() + '</td>';
+
+			// Add toolbar start after list box and before the next button
+			// This is to fix the o2k7 editor skins
+			if (nx && co.ListBox) {
+				if (nx.Button || nx.SplitButton)
+					h += dom.createHTML('td', {'class' : 'mceToolbarStart'}, dom.createHTML('span', null, '<!-- IE -->'));
+			}
+		}
+
+		c = 'mceToolbarEnd';
+
+		if (co.Button)
+			c += ' mceToolbarEndButton';
+		else if (co.SplitButton)
+			c += ' mceToolbarEndSplitButton';
+		else if (co.ListBox)
+			c += ' mceToolbarEndListBox';
+
+		h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));
+
+		return dom.createHTML('table', {id : t.id, 'class' : 'mceToolbar' + (s['class'] ? ' ' + s['class'] : ''), cellpadding : '0', cellspacing : '0', align : t.settings.align || ''}, '<tbody><tr>' + h + '</tr></tbody>');
+	}
+
+	});
+
+/* file:jscripts/tiny_mce/classes/AddOnManager.js */
+
+(function() {
+	var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each;
+
+	tinymce.create('tinymce.AddOnManager', {
+		items : [],
+		urls : {},
+		lookup : {},
+		onAdd : new Dispatcher(this),
+
+		get : function(n) {
+			return this.lookup[n];
+		},
+
+		requireLangPack : function(n) {
+			var u, s;
+
+			if (tinymce.EditorManager.settings) {
+				u = this.urls[n] + '/langs/' + tinymce.EditorManager.settings.language + '.js';
+				s = tinymce.EditorManager.settings;
+
+				if (s) {
+					if (!tinymce.dom.Event.domLoaded && !s.strict_mode)
+						tinymce.ScriptLoader.load(u);
+					else
+						tinymce.ScriptLoader.add(u);
+				}
+			}
+		},
+
+		add : function(id, o) {
+			this.items.push(o);
+			this.lookup[id] = o;
+			this.onAdd.dispatch(this, id, o);
+
+			return o;
+		},
+
+		load : function(n, u, cb, s) {
+			var t = this;
+
+			if (t.urls[n])
+				return;
+
+			if (u.indexOf('/') != 0 && u.indexOf('://') == -1)
+				u = tinymce.baseURL + '/' +  u;
+
+			t.urls[n] = u.substring(0, u.lastIndexOf('/'));
+			tinymce.ScriptLoader.add(u, cb, s);
+		}
+
+		});
+
+	// Create plugin and theme managers
+	tinymce.PluginManager = new tinymce.AddOnManager();
+	tinymce.ThemeManager = new tinymce.AddOnManager();
+}());
+/* file:jscripts/tiny_mce/classes/EditorManager.js */
+
+(function() {
+	// Shorten names
+	var each = tinymce.each, extend = tinymce.extend, DOM = tinymce.DOM, Event = tinymce.dom.Event, ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager, explode = tinymce.explode;
+
+	tinymce.create('static tinymce.EditorManager', {
+		editors : {},
+		i18n : {},
+		activeEditor : null,
+
+		preInit : function() {
+			var t = this, lo = window.location;
+
+			// Setup some URLs where the editor API is located and where the document is
+			tinymce.documentBaseURL = lo.href.replace(/[\?#].*$/, '').replace(/[\/\\][^\/]+$/, '');
+			if (!/[\/\\]$/.test(tinymce.documentBaseURL))
+				tinymce.documentBaseURL += '/';
+
+			tinymce.baseURL = new tinymce.util.URI(tinymce.documentBaseURL).toAbsolute(tinymce.baseURL);
+			tinymce.EditorManager.baseURI = new tinymce.util.URI(tinymce.baseURL);
+
+			// Setup document domain
+			if (tinymce.EditorManager.baseURI.host != lo.hostname && lo.hostname)
+				document.domain = tinymce.relaxedDomain = lo.hostname.replace(/.*\.(.+\..+)$/, '$1');
+
+			// Add before unload listener
+			// This was required since IE was leaking memory if you added and removed beforeunload listeners
+			// with attachEvent/detatchEvent so this only adds one listener and instances can the attach to the onBeforeUnload event
+			t.onBeforeUnload = new tinymce.util.Dispatcher(t);
+
+			// Must be on window or IE will leak if the editor is placed in frame or iframe
+			Event.add(window, 'beforeunload', function(e) {
+				t.onBeforeUnload.dispatch(t, e);
+			});
+		},
+
+		init : function(s) {
+			var t = this, pl, sl = tinymce.ScriptLoader, c, e;
+
+			function execCallback(se, n, s) {
+				var f = se[n];
+
+				if (!f)
+					return;
+
+				if (tinymce.is(f, 'string')) {
+					s = f.replace(/\.\w+$/, '');
+					s = s ? tinymce.resolve(s) : 0;
+					f = tinymce.resolve(f);
+				}
+
+				return f.apply(s || this, Array.prototype.slice.call(arguments, 2));
+			};
+
+			s = extend({
+				theme : "simple",
+				language : "en",
+				strict_loading_mode : document.contentType == 'application/xhtml+xml'
+			}, s);
+
+			t.settings = s;
+
+			// If page not loaded and strict mode isn't enabled then load them
+			if (!Event.domLoaded && !s.strict_loading_mode) {
+				// Load language
+				if (s.language)
+					sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
+
+				// Load theme
+				if (s.theme && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])
+					ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
+
+				// Load plugins
+				if (s.plugins) {
+					pl = explode(s.plugins);
+
+					// Load compat2x first
+					if (tinymce.inArray(pl, 'compat2x') != -1)
+						PluginManager.load('compat2x', 'plugins/compat2x/editor_plugin' + tinymce.suffix + '.js');
+
+					// Load rest if plugins
+					each(pl, function(v) {
+						if (v && v.charAt(0) != '-' && !PluginManager.urls[v]) {
+							// Skip safari plugin for other browsers
+							if (!tinymce.isWebKit && v == 'safari')
+								return;
+
+							PluginManager.load(v, 'plugins/' + v + '/editor_plugin' + tinymce.suffix + '.js');
+						}
+					});
+				}
+
+				sl.loadQueue();
+			}
+
+			// Legacy call
+			Event.add(document, 'init', function() {
+				var l, co;
+
+				execCallback(s, 'onpageload');
+
+				// Verify that it's a valid browser
+				if (s.browsers) {
+					l = false;
+
+					each(explode(s.browsers), function(v) {
+						switch (v) {
+							case 'ie':
+							case 'msie':
+								if (tinymce.isIE)
+									l = true;
+								break;
+
+							case 'gecko':
+								if (tinymce.isGecko)
+									l = true;
+								break;
+
+							case 'safari':
+							case 'webkit':
+								if (tinymce.isWebKit)
+									l = true;
+								break;
+
+							case 'opera':
+								if (tinymce.isOpera)
+									l = true;
+
+								break;
+						}
+					});
+
+					// Not a valid one
+					if (!l)
+						return;
+				}
+
+				switch (s.mode) {
+					case "exact":
+						l = s.elements || '';
+
+						if(l.length > 0) {
+							each(explode(l), function(v) {
+								if (DOM.get(v))
+									new tinymce.Editor(v, s).render(1);
+								else {
+									c = 0;
+
+									each(document.forms, function(f) {
+										each(f.elements, function(e) {
+											if (e.name === v) {
+												v = 'mce_editor_' + c;
+												DOM.setAttrib(e, 'id', v);
+												new tinymce.Editor(v, s).render(1);
+											}
+										});
+									});
+								}
+							});
+						}
+						break;
+
+					case "textareas":
+					case "specific_textareas":
+						function hasClass(n, c) {
+							return c.constructor === RegExp ? c.test(n.className) : DOM.hasClass(n, c);
+						};
+
+						each(DOM.select('textarea'), function(v) {
+							if (s.editor_deselector && hasClass(v, s.editor_deselector))
+								return;
+
+							if (!s.editor_selector || hasClass(v, s.editor_selector)) {
+								// Can we use the name
+								e = DOM.get(v.name);
+								if (!v.id && !e)
+									v.id = v.name;
+
+								// Generate unique name if missing or already exists
+								if (!v.id || t.get(v.id))
+									v.id = DOM.uniqueId();
+
+								new tinymce.Editor(v.id, s).render(1);
+							}
+						});
+						break;
+				}
+
+				// Call onInit when all editors are initialized
+				if (s.oninit) {
+					l = co = 0;
+
+					each (t.editors, function(ed) {
+						co++;
+
+						if (!ed.initialized) {
+							// Wait for it
+							ed.onInit.add(function() {
+								l++;
+
+								// All done
+								if (l == co)
+									execCallback(s, 'oninit');
+							});
+						} else
+							l++;
+
+						// All done
+						if (l == co)
+							execCallback(s, 'oninit');					
+					});
+				}
+			});
+		},
+
+		get : function(id) {
+			return this.editors[id];
+		},
+
+		getInstanceById : function(id) {
+			return this.get(id);
+		},
+
+		add : function(e) {
+			this.editors[e.id] = e;
+			this._setActive(e);
+
+			return e;
+		},
+
+		remove : function(e) {
+			var t = this;
+
+			// Not in the collection
+			if (!t.editors[e.id])
+				return null;
+
+			delete t.editors[e.id];
+
+			// Select another editor since the active one was removed
+			if (t.activeEditor == e) {
+				each(t.editors, function(e) {
+					t._setActive(e);
+					return false; // Break
+				});
+			}
+
+			e.destroy();
+
+			return e;
+		},
+
+		execCommand : function(c, u, v) {
+			var t = this, ed = t.get(v), w;
+
+			// Manager commands
+			switch (c) {
+				case "mceFocus":
+					ed.focus();
+					return true;
+
+				case "mceAddEditor":
+				case "mceAddControl":
+					if (!t.get(v))
+						new tinymce.Editor(v, t.settings).render();
+
+					return true;
+
+				case "mceAddFrameControl":
+					w = v.window;
+
+					// Add tinyMCE global instance and tinymce namespace to specified window
+					w.tinyMCE = tinyMCE;
+					w.tinymce = tinymce;
+
+					tinymce.DOM.doc = w.document;
+					tinymce.DOM.win = w;
+
+					ed = new tinymce.Editor(v.element_id, v);
+					ed.render();
+
+					// Fix IE memory leaks
+					if (tinymce.isIE) {
+						function clr() {
+							ed.destroy();
+							w.detachEvent('onunload', clr);
+							w = w.tinyMCE = w.tinymce = null; // IE leak
+						};
+
+						w.attachEvent('onunload', clr);
+					}
+
+					v.page_window = null;
+
+					return true;
+
+				case "mceRemoveEditor":
+				case "mceRemoveControl":
+					ed.remove();
+					return true;
+
+				case 'mceToggleEditor':
+					if (!ed) {
+						t.execCommand('mceAddControl', 0, v);
+						return true;
+					}
+
+					if (ed.isHidden())
+						ed.show();
+					else
+						ed.hide();
+
+					return true;
+			}
+
+			// Run command on active editor
+			if (t.activeEditor)
+				return t.activeEditor.execCommand(c, u, v);
+
+			return false;
+		},
+
+		execInstanceCommand : function(id, c, u, v) {
+			var ed = this.get(id);
+
+			if (ed)
+				return ed.execCommand(c, u, v);
+
+			return false;
+		},
+
+		triggerSave : function() {
+			each(this.editors, function(e) {
+				e.save();
+			});
+		},
+
+		addI18n : function(p, o) {
+			var lo, i18n = this.i18n;
+
+			if (!tinymce.is(p, 'string')) {
+				each(p, function(o, lc) {
+					each(o, function(o, g) {
+						each(o, function(o, k) {
+							if (g === 'common')
+								i18n[lc + '.' + k] = o;
+							else
+								i18n[lc + '.' + g + '.' + k] = o;
+						});
+					});
+				});
+			} else {
+				each(o, function(o, k) {
+					i18n[p + '.' + k] = o;
+				});
+			}
+		},
+
+		// Private methods
+
+		_setActive : function(e) {
+			this.selectedInstance = this.activeEditor = e;
+		}
+
+		});
+
+	tinymce.EditorManager.preInit();
+})();
+
+// Short for editor manager window.tinyMCE is needed when TinyMCE gets loaded though a XHR call
+var tinyMCE = window.tinyMCE = tinymce.EditorManager;
+
+/* file:jscripts/tiny_mce/classes/Editor.js */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend, Dispatcher = tinymce.util.Dispatcher;
+	var each = tinymce.each, isGecko = tinymce.isGecko, isIE = tinymce.isIE, isWebKit = tinymce.isWebKit;
+	var is = tinymce.is, ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager, EditorManager = tinymce.EditorManager;
+	var inArray = tinymce.inArray, grep = tinymce.grep, explode = tinymce.explode;
+
+	tinymce.create('tinymce.Editor', {
+		Editor : function(id, s) {
+			var t = this;
+
+			t.id = t.editorId = id;
+			t.execCommands = {};
+			t.queryStateCommands = {};
+			t.queryValueCommands = {};
+			t.plugins = {};
+
+			// Add events to the editor
+			each([
+				'onPreInit',
+				'onBeforeRenderUI',
+				'onPostRender',
+				'onInit',
+				'onRemove',
+				'onActivate',
+				'onDeactivate',
+				'onClick',
+				'onEvent',
+				'onMouseUp',
+				'onMouseDown',
+				'onDblClick',
+				'onKeyDown',
+				'onKeyUp',
+				'onKeyPress',
+				'onContextMenu',
+				'onSubmit',
+				'onReset',
+				'onPaste',
+				'onPreProcess',
+				'onPostProcess',
+				'onBeforeSetContent',
+				'onBeforeGetContent',
+				'onSetContent',
+				'onGetContent',
+				'onLoadContent',
+				'onSaveContent',
+				'onNodeChange',
+				'onChange',
+				'onBeforeExecCommand',
+				'onExecCommand',
+				'onUndo',
+				'onRedo',
+				'onVisualAid',
+				'onSetProgressState'
+			], function(e) {
+				t[e] = new Dispatcher(t);
+			});
+
+			// Default editor config
+			t.settings = s = extend({
+				id : id,
+				language : 'en',
+				docs_language : 'en',
+				theme : 'simple',
+				skin : 'default',
+				delta_width : 0,
+				delta_height : 0,
+				popup_css : '',
+				plugins : '',
+				document_base_url : tinymce.documentBaseURL,
+				add_form_submit_trigger : 1,
+				submit_patch : 1,
+				add_unload_trigger : 1,
+				convert_urls : 1,
+				relative_urls : 1,
+				remove_script_host : 1,
+				table_inline_editing : 0,
+				object_resizing : 1,
+				cleanup : 1,
+				accessibility_focus : 1,
+				custom_shortcuts : 1,
+				custom_undo_redo_keyboard_shortcuts : 1,
+				custom_undo_redo_restore_selection : 1,
+				custom_undo_redo : 1,
+				doctype : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">',
+				visual_table_class : 'mceItemTable',
+				visual : 1,
+				inline_styles : true,
+				convert_fonts_to_spans : true,
+				font_size_style_values : 'xx-small,x-small,small,medium,large,x-large,xx-large',
+				apply_source_formatting : 1,
+				directionality : 'ltr',
+				forced_root_block : 'p',
+				valid_elements : '@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,#p[align],-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,-blockquote[cite],-table[border=0|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value],embed[type|width|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo,button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method],input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value],kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value],q[cite],samp,select[disabled|multiple|name|size],small,textarea[cols|rows|disabled|name|readonly],tt,var,big',
+				hidden_input : 1,
+				padd_empty_editor : 1,
+				render_ui : 1,
+				init_theme : 1,
+				force_p_newlines : 1,
+				indentation : '30px'
+			}, s);
+
+			// Setup URIs
+			t.documentBaseURI = new tinymce.util.URI(s.document_base_url || tinymce.documentBaseURL, {
+				base_uri : tinyMCE.baseURI
+			});
+			t.baseURI = EditorManager.baseURI;
+
+			// Call setup
+			t.execCallback('setup', t);
+		},
+
+		render : function(nst) {
+			var t = this, s = t.settings, id = t.id, sl = tinymce.ScriptLoader;
+
+			// Page is not loaded yet, wait for it
+			if (!Event.domLoaded) {
+				Event.add(document, 'init', function() {
+					t.render();
+				});
+				return;
+			}
+
+			// Force strict loading mode if render us called by user and not internally
+			if (!nst) {
+				s.strict_loading_mode = 1;
+				tinyMCE.settings = s;
+			}
+
+			// Element not found, then skip initialization
+			if (!t.getElement())
+				return;
+
+			if (s.strict_loading_mode) {
+				sl.settings.strict_mode = s.strict_loading_mode;
+				tinymce.DOM.settings.strict = 1;
+			}
+
+			// Add hidden input for non input elements inside form elements
+			if (!/TEXTAREA|INPUT/i.test(t.getElement().nodeName) && s.hidden_input && DOM.getParent(id, 'form'))
+				DOM.insertAfter(DOM.create('input', {type : 'hidden', name : id}), id);
+
+			t.windowManager = new tinymce.WindowManager(t);
+
+			if (s.encoding == 'xml') {
+				t.onGetContent.add(function(ed, o) {
+					if (o.save)
+						o.content = DOM.encode(o.content);
+				});
+			}
+
+			if (s.add_form_submit_trigger) {
+				t.onSubmit.addToTop(function() {
+					if (t.initialized) {
+						t.save();
+						t.isNotDirty = 1;
+					}
+				});
+			}
+
+			if (s.add_unload_trigger && !s.ask) {
+				t._beforeUnload = tinyMCE.onBeforeUnload.add(function() {
+					if (t.initialized && !t.destroyed && !t.isHidden())
+						t.save({format : 'raw', no_events : true});
+				});
+			}
+
+			tinymce.addUnload(t.destroy, t);
+
+			if (s.submit_patch) {
+				t.onBeforeRenderUI.add(function() {
+					var n = t.getElement().form;
+
+					if (!n)
+						return;
+
+					// Already patched
+					if (n._mceOldSubmit)
+						return;
+
+					// Check page uses id="submit" or name="submit" for it's submit button
+					if (!n.submit.nodeType && !n.submit.length) {
+						t.formElement = n;
+						n._mceOldSubmit = n.submit;
+						n.submit = function() {
+							// Save all instances
+							EditorManager.triggerSave();
+							t.isNotDirty = 1;
+
+							return this._mceOldSubmit(this);
+						};
+					}
+
+					n = null;
+				});
+			}
+
+			// Load scripts
+			function loadScripts() {
+				if (s.language)
+					sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
+
+				if (s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])
+					ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
+
+				each(explode(s.plugins), function(p) {
+					if (p && p.charAt(0) != '-' && !PluginManager.urls[p]) {
+						// Skip safari plugin for other browsers
+						if (!isWebKit && p == 'safari')
+							return;
+
+						PluginManager.load(p, 'plugins/' + p + '/editor_plugin' + tinymce.suffix + '.js');
+					}
+				});
+
+				// Init when que is loaded
+				sl.loadQueue(function() {
+					if (s.ask) {
+						function ask() {
+							// Yield for awhile to avoid focus bug on FF 3 when cancel is pressed
+							window.setTimeout(function() {
+								Event.remove(t.id, 'focus', ask);
+
+								t.windowManager.confirm(t.getLang('edit_confirm'), function(s) {
+									if (s)
+										t.init();
+								});
+							}, 0);
+						};
+
+						Event.add(t.id, 'focus', ask);
+						return;
+					}
+
+					if (!t.removed)
+						t.init();
+				});
+			};
+
+			// Load compat2x first
+			if (s.plugins.indexOf('compat2x') != -1) {
+				PluginManager.load('compat2x', 'plugins/compat2x/editor_plugin' + tinymce.suffix + '.js');
+				sl.loadQueue(loadScripts);
+			} else
+				loadScripts();
+		},
+
+		init : function() {
+			var n, t = this, s = t.settings, w, h, e = t.getElement(), o, ti, u, bi, bc, re;
+
+			EditorManager.add(t);
+
+			// Create theme
+			s.theme = s.theme.replace(/-/, '');
+			o = ThemeManager.get(s.theme);
+			t.theme = new o();
+
+			if (t.theme.init && s.init_theme)
+				t.theme.init(t, ThemeManager.urls[s.theme] || tinymce.documentBaseURL.replace(/\/$/, ''));
+
+			// Create all plugins
+			each(explode(s.plugins.replace(/\-/g, '')), function(p) {
+				var c = PluginManager.get(p), u = PluginManager.urls[p] || tinymce.documentBaseURL.replace(/\/$/, ''), po;
+
+				if (c) {
+					po = new c(t, u);
+
+					t.plugins[p] = po;
+
+					if (po.init)
+						po.init(t, u);
+				}
+			});
+
+			// Setup popup CSS path(s)
+			if (s.popup_css)
+				s.popup_css = t.documentBaseURI.toAbsolute(s.popup_css);
+			else
+				s.popup_css = t.baseURI.toAbsolute("themes/" + s.theme + "/skins/" + s.skin + "/dialog.css");
+
+			if (s.popup_css_add)
+				s.popup_css += ',' + t.documentBaseURI.toAbsolute(s.popup_css_add);
+
+			// Setup control factory
+			t.controlManager = new tinymce.ControlManager(t);
+			t.undoManager = new tinymce.UndoManager(t);
+
+			// Pass through
+			t.undoManager.onAdd.add(function(um, l) {
+				if (!l.initial)
+					return t.onChange.dispatch(t, l, um);
+			});
+
+			t.undoManager.onUndo.add(function(um, l) {
+				return t.onUndo.dispatch(t, l, um);
+			});
+
+			t.undoManager.onRedo.add(function(um, l) {
+				return t.onRedo.dispatch(t, l, um);
+			});
+
+			if (s.custom_undo_redo) {
+				t.onExecCommand.add(function(ed, cmd, ui, val, a) {
+					if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo))
+						t.undoManager.add();
+				});
+			}
+
+			t.onExecCommand.add(function(ed, c) {
+				// Don't refresh the select lists until caret move
+				if (!/^(FontName|FontSize)$/.test(c))
+					t.nodeChanged();
+			});
+
+			// Remove ghost selections on images and tables in Gecko
+			if (isGecko) {
+				function repaint(a, o) {
+					if (!o || !o.initial)
+						t.execCommand('mceRepaint');
+				};
+
+				t.onUndo.add(repaint);
+				t.onRedo.add(repaint);
+				t.onSetContent.add(repaint);
+			}
+
+			// Enables users to override the control factory
+			t.onBeforeRenderUI.dispatch(t, t.controlManager);
+
+			// Measure box
+			if (s.render_ui) {
+				w = s.width || e.style.width || e.offsetWidth;
+				h = s.height || e.style.height || e.offsetHeight;
+				t.orgDisplay = e.style.display;
+				re = /^[0-9\.]+(|px)$/i;
+
+				if (re.test('' + w))
+					w = Math.max(parseInt(w) + (o.deltaWidth || 0), 100);
+
+				if (re.test('' + h))
+					h = Math.max(parseInt(h) + (o.deltaHeight || 0), 100);
+
+				// Render UI
+				o = t.theme.renderUI({
+					targetNode : e,
+					width : w,
+					height : h,
+					deltaWidth : s.delta_width,
+					deltaHeight : s.delta_height
+				});
+
+				t.editorContainer = o.editorContainer;
+			}
+
+			
+			// Resize editor
+			DOM.setStyles(o.sizeContainer || o.editorContainer, {
+				width : w,
+				height : h
+			});
+
+			h = (o.iframeHeight || h) + ((h + '').indexOf('%') == -1 ? (o.deltaHeight || 0) : '');
+			if (h < 100)
+				h = 100;
+
+			t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="' + t.documentBaseURI.getURI() + '" />';
+			t.iframeHTML += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';
+
+			if (tinymce.relaxedDomain)
+				t.iframeHTML += '<script type="text/javascript">document.domain = "' + tinymce.relaxedDomain + '";</script>';
+
+			bi = s.body_id || 'tinymce';
+			if (bi.indexOf('=') != -1) {
+				bi = t.getParam('body_id', '', 'hash');
+				bi = bi[t.id] || bi;
+			}
+
+			bc = s.body_class || '';
+			if (bc.indexOf('=') != -1) {
+				bc = t.getParam('body_class', '', 'hash');
+				bc = bc[t.id] || '';
+			}
+
+			t.iframeHTML += '</head><body id="' + bi + '" class="mceContentBody ' + bc + '"></body></html>';
+
+			// Domain relaxing enabled, then set document domain
+			if (tinymce.relaxedDomain) {
+				// We need to write the contents here in IE since multiple writes messes up refresh button and back button
+				if (isIE)
+					u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()';
+				else if (tinymce.isOpera)
+					u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";document.close();ed.setupIframe();})()';					
+			}
+
+			// Create iframe
+			n = DOM.add(o.iframeContainer, 'iframe', {
+				id : t.id + "_ifr",
+				src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7
+				frameBorder : '0',
+				style : {
+					width : '100%',
+					height : h
+				}
+			});
+
+			t.contentAreaContainer = o.iframeContainer;
+			DOM.get(o.editorContainer).style.display = t.orgDisplay;
+			DOM.get(t.id).style.display = 'none';
+
+			// Safari 2.x requires us to wait for the load event and load a real HTML doc
+			if (tinymce.isOldWebKit) {
+				Event.add(n, 'load', t.setupIframe, t);
+				n.src = tinymce.baseURL + '/plugins/safari/blank.htm';
+			} else {
+				if (!isIE || !tinymce.relaxedDomain)
+					t.setupIframe();
+
+				e = n = o = null; // Cleanup
+			}
+		},
+
+		setupIframe : function() {
+			var t = this, s = t.settings, e = DOM.get(t.id), d = t.getDoc(), h, b;
+
+			// Setup iframe body
+			if (!isIE || !tinymce.relaxedDomain) {
+				d.open();
+				d.write(t.iframeHTML);
+				d.close();
+			}
+
+			// Design mode needs to be added here Ctrl+A will fail otherwise
+			if (!isIE) {
+				try {
+					d.designMode = 'On';
+				} catch (ex) {
+					// Will fail on Gecko if the editor is placed in an hidden container element
+					// The design mode will be set ones the editor is focused
+				}
+			}
+
+			// IE needs to use contentEditable or it will display non secure items for HTTPS
+			if (isIE) {
+				// It will not steal focus if we hide it while setting contentEditable
+				b = t.getBody();
+				DOM.hide(b);
+				b.contentEditable = true;
+				DOM.show(b);
+			}
+
+			// Setup objects
+			t.dom = new tinymce.DOM.DOMUtils(t.getDoc(), {
+				keep_values : true,
+				url_converter : t.convertURL,
+				url_converter_scope : t,
+				hex_colors : s.force_hex_style_colors,
+				class_filter : s.class_filter,
+				update_styles : 1,
+				fix_ie_paragraphs : 1
+			});
+
+			t.serializer = new tinymce.dom.Serializer({
+				entity_encoding : s.entity_encoding,
+				entities : s.entities,
+				valid_elements : s.verify_html === false ? '*[*]' : s.valid_elements,
+				extended_valid_elements : s.extended_valid_elements,
+				valid_child_elements : s.valid_child_elements,
+				invalid_elements : s.invalid_elements,
+				fix_table_elements : s.fix_table_elements,
+				fix_list_elements : s.fix_list_elements,
+				fix_content_duplication : s.fix_content_duplication,
+				convert_fonts_to_spans : s.convert_fonts_to_spans,
+				font_size_classes  : s.font_size_classes,
+				font_size_style_values : s.font_size_style_values,
+				apply_source_formatting : s.apply_source_formatting,
+				remove_linebreaks : s.remove_linebreaks,
+				dom : t.dom
+			});
+
+			t.selection = new tinymce.dom.Selection(t.dom, t.getWin(), t.serializer);
+			t.forceBlocks = new tinymce.ForceBlocks(t, {
+				forced_root_block : s.forced_root_block
+			});
+			t.editorCommands = new tinymce.EditorCommands(t);
+
+			// Pass through
+			t.serializer.onPreProcess.add(function(se, o) {
+				return t.onPreProcess.dispatch(t, o, se);
+			});
+
+			t.serializer.onPostProcess.add(function(se, o) {
+				return t.onPostProcess.dispatch(t, o, se);
+			});
+
+			t.onPreInit.dispatch(t);
+
+			if (!s.gecko_spellcheck)
+				t.getBody().spellcheck = 0;
+
+			t._addEvents();
+
+			t.controlManager.onPostRender.dispatch(t, t.controlManager);
+			t.onPostRender.dispatch(t);
+
+			if (s.directionality)
+				t.getBody().dir = s.directionality;
+
+			if (s.nowrap)
+				t.getBody().style.whiteSpace = "nowrap";
+
+			if (s.auto_resize)
+				t.onNodeChange.add(t.resizeToContent, t);
+
+			if (s.custom_elements) {
+				function handleCustom(ed, o) {
+					each(explode(s.custom_elements), function(v) {
+						var n;
+
+						if (v.indexOf('~') === 0) {
+							v = v.substring(1);
+							n = 'span';
+						} else
+							n = 'div';
+
+						o.content = o.content.replace(new RegExp('<(' + v + ')([^>]*)>', 'g'), '<' + n + ' mce_name="$1"$2>');
+						o.content = o.content.replace(new RegExp('</(' + v + ')>', 'g'), '</' + n + '>');
+					});
+				};
+
+				t.onBeforeSetContent.add(handleCustom);
+				t.onPostProcess.add(function(ed, o) {
+					if (o.set)
+						handleCustom(ed, o)
+				});
+			}
+
+			if (s.handle_node_change_callback) {
+				t.onNodeChange.add(function(ed, cm, n) {
+					t.execCallback('handle_node_change_callback', t.id, n, -1, -1, true, t.selection.isCollapsed());
+				});
+			}
+
+			if (s.save_callback) {
+				t.onSaveContent.add(function(ed, o) {
+					var h = t.execCallback('save_callback', t.id, o.content, t.getBody());
+
+					if (h)
+						o.content = h;
+				});
+			}
+
+			if (s.onchange_callback) {
+				t.onChange.add(function(ed, l) {
+					t.execCallback('onchange_callback', t, l);
+				});
+			}
+
+			if (s.convert_newlines_to_brs) {
+				t.onBeforeSetContent.add(function(ed, o) {
+					if (o.initial)
+						o.content = o.content.replace(/\r?\n/g, '<br />');
+				});
+			}
+
+			if (s.fix_nesting && isIE) {
+				t.onBeforeSetContent.add(function(ed, o) {
+					o.content = t._fixNesting(o.content);
+				});
+			}
+
+			if (s.preformatted) {
+				t.onPostProcess.add(function(ed, o) {
+					o.content = o.content.replace(/^\s*<pre.*?>/, '');
+					o.content = o.content.replace(/<\/pre>\s*$/, '');
+
+					if (o.set)
+						o.content = '<pre class="mceItemHidden">' + o.content + '</pre>';
+				});
+			}
+
+			if (s.verify_css_classes) {
+				t.serializer.attribValueFilter = function(n, v) {
+					var s, cl;
+
+					if (n == 'class') {
+						// Build regexp for classes
+						if (!t.classesRE) {
+							cl = t.dom.getClasses();
+
+							if (cl.length > 0) {
+								s = '';
+
+								each (cl, function(o) {
+									s += (s ? '|' : '') + o['class'];
+								});
+
+								t.classesRE = new RegExp('(' + s + ')', 'gi');
+							}
+						}
+
+						return !t.classesRE || /(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(v) || t.classesRE.test(v) ? v : '';
+					}
+
+					return v;
+				};
+			}
+
+			if (s.convert_fonts_to_spans)
+				t._convertFonts();
+
+			if (s.inline_styles)
+				t._convertInlineElements();
+
+			if (s.cleanup_callback) {
+				t.onBeforeSetContent.add(function(ed, o) {
+					o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);
+				});
+
+				t.onPreProcess.add(function(ed, o) {
+					if (o.set)
+						t.execCallback('cleanup_callback', 'insert_to_editor_dom', o.node, o);
+
+					if (o.get)
+						t.execCallback('cleanup_callback', 'get_from_editor_dom', o.node, o);
+				});
+
+				t.onPostProcess.add(function(ed, o) {
+					if (o.set)
+						o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);
+
+					if (o.get)						
+						o.content = t.execCallback('cleanup_callback', 'get_from_editor', o.content, o);
+				});
+			}
+
+			if (s.save_callback) {
+				t.onGetContent.add(function(ed, o) {
+					if (o.save)
+						o.content = t.execCallback('save_callback', t.id, o.content, t.getBody());
+				});
+			}
+
+			if (s.handle_event_callback) {
+				t.onEvent.add(function(ed, e, o) {
+					if (t.execCallback('handle_event_callback', e, ed, o) === false)
+						Event.cancel(e);
+				});
+			}
+
+			t.onSetContent.add(function() {
+				// Safari needs some time, it will crash the browser when a link is created otherwise
+				// I think this crash issue is resolved in the latest 3.0.4
+				//window.setTimeout(function() {
+					t.addVisual(t.getBody());
+				//}, 1);
+			});
+
+			// Remove empty contents
+			if (s.padd_empty_editor) {
+				t.onPostProcess.add(function(ed, o) {
+					o.content = o.content.replace(/^(<p>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/, '');
+				});
+			}
+
+			if (isGecko) {
+				try {
+					// Design mode must be set here once again to fix a bug where
+					// Ctrl+A/Delete/Backspace didn't work if the editor was added using mceAddControl then removed then added again
+					d.designMode = 'Off';
+					d.designMode = 'On';
+				} catch (ex) {
+					// Will fail on Gecko if the editor is placed in an hidden container element
+					// The design mode will be set ones the editor is focused
+				}
+			}
+
+			// A small timeout was needed since firefox will remove. Bug: #1838304
+			setTimeout(function () {
+				if (t.removed)
+					return;
+
+				t.load({initial : true, format : (s.cleanup_on_startup ? 'html' : 'raw')});
+				t.startContent = t.getContent({format : 'raw'});
+				t.undoManager.add({initial : true});
+				t.initialized = true;
+
+				t.onInit.dispatch(t);
+				t.execCallback('setupcontent_callback', t.id, t.getBody(), t.getDoc());
+				t.execCallback('init_instance_callback', t);
+				t.focus(true);
+				t.nodeChanged({initial : 1});
+
+				// Load specified content CSS last
+				if (s.content_css) {
+					tinymce.each(explode(s.content_css), function(u) {
+						t.dom.loadCSS(t.documentBaseURI.toAbsolute(u));
+					});
+				}
+
+				// Handle auto focus
+				if (s.auto_focus) {
+					setTimeout(function () {
+						var ed = EditorManager.get(s.auto_focus);
+
+						ed.selection.select(ed.getBody(), 1);
+						ed.selection.collapse(1);
+						ed.getWin().focus();
+					}, 100);
+				}
+			}, 1);
+	
+			e = null;
+		},
+
+		
+		focus : function(sf) {
+			var oed, t = this, ce = t.settings.content_editable;
+
+			if (!sf) {
+				// Is not content editable or the selection is outside the area in IE
+				// the IE statement is needed to avoid bluring if element selections inside layers since
+				// the layer is like it's own document in IE
+				if (!ce && (!isIE || t.selection.getNode().ownerDocument != t.getDoc()))
+					t.getWin().focus();
+
+							}
+
+			if (EditorManager.activeEditor != t) {
+				if ((oed = EditorManager.activeEditor) != null)
+					oed.onDeactivate.dispatch(oed, t);
+
+				t.onActivate.dispatch(t, oed);
+			}
+
+			EditorManager._setActive(t);
+		},
+
+		execCallback : function(n) {
+			var t = this, f = t.settings[n], s;
+
+			if (!f)
+				return;
+
+			// Look through lookup
+			if (t.callbackLookup && (s = t.callbackLookup[n])) {
+				f = s.func;
+				s = s.scope;
+			}
+
+			if (is(f, 'string')) {
+				s = f.replace(/\.\w+$/, '');
+				s = s ? tinymce.resolve(s) : 0;
+				f = tinymce.resolve(f);
+				t.callbackLookup = t.callbackLookup || {};
+				t.callbackLookup[n] = {func : f, scope : s};
+			}
+
+			return f.apply(s || t, Array.prototype.slice.call(arguments, 1));
+		},
+
+		translate : function(s) {
+			var c = this.settings.language, i18n = EditorManager.i18n;
+
+			if (!s)
+				return '';
+
+			return i18n[c + '.' + s] || s.replace(/{\#([^}]+)\}/g, function(a, b) {
+				return i18n[c + '.' + b] || '{#' + b + '}';
+			});
+		},
+
+		getLang : function(n, dv) {
+			return EditorManager.i18n[this.settings.language + '.' + n] || (is(dv) ? dv : '{#' + n + '}');
+		},
+
+		getParam : function(n, dv, ty) {
+			var tr = tinymce.trim, v = is(this.settings[n]) ? this.settings[n] : dv, o;
+
+			if (ty === 'hash') {
+				o = {};
+
+				if (is(v, 'string')) {
+					each(v.indexOf('=') > 0 ? v.split(/[;,](?![^=;,]*(?:[;,]|$))/) : v.split(','), function(v) {
+						v = v.split('=');
+
+						if (v.length > 1)
+							o[tr(v[0])] = tr(v[1]);
+						else
+							o[tr(v[0])] = tr(v);
+					});
+				} else
+					o = v;
+
+				return o;
+			}
+
+			return v;
+		},
+
+		nodeChanged : function(o) {
+			var t = this, s = t.selection, n = s.getNode() || t.getBody();
+
+			// Fix for bug #1896577 it seems that this can not be fired while the editor is loading
+			if (t.initialized) {
+				t.onNodeChange.dispatch(
+					t,
+					o ? o.controlManager || t.controlManager : t.controlManager,
+					isIE && n.ownerDocument != t.getDoc() ? t.getBody() : n, // Fix for IE initial state
+					s.isCollapsed(),
+					o
+				);
+			}
+		},
+
+		addButton : function(n, s) {
+			var t = this;
+
+			t.buttons = t.buttons || {};
+			t.buttons[n] = s;
+		},
+
+		addCommand : function(n, f, s) {
+			this.execCommands[n] = {func : f, scope : s || this};
+		},
+
+		addQueryStateHandler : function(n, f, s) {
+			this.queryStateCommands[n] = {func : f, scope : s || this};
+		},
+
+		addQueryValueHandler : function(n, f, s) {
+			this.queryValueCommands[n] = {func : f, scope : s || this};
+		},
+
+		addShortcut : function(pa, desc, cmd_func, sc) {
+			var t = this, c;
+
+			if (!t.settings.custom_shortcuts)
+				return false;
+
+			t.shortcuts = t.shortcuts || {};
+
+			if (is(cmd_func, 'string')) {
+				c = cmd_func;
+
+				cmd_func = function() {
+					t.execCommand(c, false, null);
+				};
+			}
+
+			if (is(cmd_func, 'object')) {
+				c = cmd_func;
+
+				cmd_func = function() {
+					t.execCommand(c[0], c[1], c[2]);
+				};
+			}
+
+			each(explode(pa), function(pa) {
+				var o = {
+					func : cmd_func,
+					scope : sc || this,
+					desc : desc,
+					alt : false,
+					ctrl : false,
+					shift : false
+				};
+
+				each(explode(pa, '+'), function(v) {
+					switch (v) {
+						case 'alt':
+						case 'ctrl':
+						case 'shift':
+							o[v] = true;
+							break;
+
+						default:
+							o.charCode = v.charCodeAt(0);
+							o.keyCode = v.toUpperCase().charCodeAt(0);
+					}
+				});
+
+				t.shortcuts[(o.ctrl ? 'ctrl' : '') + ',' + (o.alt ? 'alt' : '') + ',' + (o.shift ? 'shift' : '') + ',' + o.keyCode] = o;
+			});
+
+			return true;
+		},
+
+		execCommand : function(cmd, ui, val, a) {
+			var t = this, s = 0, o, st;
+
+			if (!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(cmd) && (!a || !a.skip_focus))
+				t.focus();
+
+			o = {};
+			t.onBeforeExecCommand.dispatch(t, cmd, ui, val, o);
+			if (o.terminate)
+				return false;
+
+			// Command callback
+			if (t.execCallback('execcommand_callback', t.id, t.selection.getNode(), cmd, ui, val)) {
+				t.onExecCommand.dispatch(t, cmd, ui, val, a);
+				return true;
+			}
+
+			// Registred commands
+			if (o = t.execCommands[cmd]) {
+				st = o.func.call(o.scope, ui, val);
+
+				// Fall through on true
+				if (st !== true) {
+					t.onExecCommand.dispatch(t, cmd, ui, val, a);
+					return st;
+				}
+			}
+
+			// Plugin commands
+			each(t.plugins, function(p) {
+				if (p.execCommand && p.execCommand(cmd, ui, val)) {
+					t.onExecCommand.dispatch(t, cmd, ui, val, a);
+					s = 1;
+					return false;
+				}
+			});
+
+			if (s)
+				return true;
+
+			// Theme commands
+			if (t.theme.execCommand && t.theme.execCommand(cmd, ui, val)) {
+				t.onExecCommand.dispatch(t, cmd, ui, val, a);
+				return true;
+			}
+
+			// Editor commands
+			if (t.editorCommands.execCommand(cmd, ui, val)) {
+				t.onExecCommand.dispatch(t, cmd, ui, val, a);
+				return true;
+			}
+
+			// Browser commands
+			t.getDoc().execCommand(cmd, ui, val);
+			t.onExecCommand.dispatch(t, cmd, ui, val, a);
+		},
+
+		queryCommandState : function(c) {
+			var t = this, o, s;
+
+			// Is hidden then return undefined
+			if (t._isHidden())
+				return;
+
+			// Registred commands
+			if (o = t.queryStateCommands[c]) {
+				s = o.func.call(o.scope);
+
+				// Fall though on true
+				if (s !== true)
+					return s;
+			}
+
+			// Registred commands
+			o = t.editorCommands.queryCommandState(c);
+			if (o !== -1)
+				return o;
+
+			// Browser commands
+			try {
+				return this.getDoc().queryCommandState(c);
+			} catch (ex) {
+				// Fails sometimes see bug: 1896577
+			}
+		},
+
+		queryCommandValue : function(c) {
+			var t = this, o, s;
+
+			// Is hidden then return undefined
+			if (t._isHidden())
+				return;
+
+			// Registred commands
+			if (o = t.queryValueCommands[c]) {
+				s = o.func.call(o.scope);
+
+				// Fall though on true
+				if (s !== true)
+					return s;
+			}
+
+			// Registred commands
+			o = t.editorCommands.queryCommandValue(c);
+			if (is(o))
+				return o;
+
+			// Browser commands
+			try {
+				return this.getDoc().queryCommandValue(c);
+			} catch (ex) {
+				// Fails sometimes see bug: 1896577
+			}
+		},
+
+		show : function() {
+			var t = this;
+
+			DOM.show(t.getContainer());
+			DOM.hide(t.id);
+			t.load();
+		},
+
+		hide : function() {
+			var t = this, d = t.getDoc();
+
+			// Fixed bug where IE has a blinking cursor left from the editor
+			if (isIE && d)
+				d.execCommand('SelectAll');
+
+			// We must save before we hide so Safari doesn't crash
+			t.save();
+			DOM.hide(t.getContainer());
+			DOM.setStyle(t.id, 'display', t.orgDisplay);
+		},
+
+		isHidden : function() {
+			return !DOM.isHidden(this.id);
+		},
+
+		setProgressState : function(b, ti, o) {
+			this.onSetProgressState.dispatch(this, b, ti, o);
+
+			return b;
+		},
+
+		resizeToContent : function() {
+			var t = this;
+
+			DOM.setStyle(t.id + "_ifr", 'height', t.getBody().scrollHeight);
+		},
+
+		load : function(o) {
+			var t = this, e = t.getElement(), h;
+
+			o = o || {};
+			o.load = true;
+
+			h = t.setContent(is(e.value) ? e.value : e.innerHTML, o);
+			o.element = e;
+
+			if (!o.no_events)
+				t.onLoadContent.dispatch(t, o);
+
+			o.element = e = null;
+
+			return h;
+		},
+
+		save : function(o) {
+			var t = this, e = t.getElement(), h, f;
+
+			if (!t.initialized)
+				return;
+
+			o = o || {};
+			o.save = true;
+
+			// Add undo level will trigger onchange event
+			if (!o.no_events) {
+				t.undoManager.typing = 0;
+				t.undoManager.add();
+			}
+
+			o.element = e;
+			h = o.content = t.getContent(o);
+
+			if (!o.no_events)
+				t.onSaveContent.dispatch(t, o);
+
+			h = o.content;
+
+			if (!/TEXTAREA|INPUT/i.test(e.nodeName)) {
+				e.innerHTML = h;
+
+				// Update hidden form element
+				if (f = DOM.getParent(t.id, 'form')) {
+					each(f.elements, function(e) {
+						if (e.name == t.id) {
+							e.value = h;
+							return false;
+						}
+					});
+				}
+			} else
+				e.value = h;
+
+			o.element = e = null;
+
+			return h;
+		},
+
+		setContent : function(h, o) {
+			var t = this;
+
+			o = o || {};
+			o.format = o.format || 'html';
+			o.set = true;
+			o.content = h;
+
+			if (!o.no_events)
+				t.onBeforeSetContent.dispatch(t, o);
+
+			// Padd empty content in Gecko and Safari. Commands will otherwise fail on the content
+			// It will also be impossible to place the caret in the editor unless there is a BR element present
+			if (!tinymce.isIE && (h.length === 0 || /^\s+$/.test(h))) {
+				o.content = t.dom.setHTML(t.getBody(), '<br mce_bogus="1" />');
+				o.format = 'raw';
+			}
+
+			o.content = t.dom.setHTML(t.getBody(), tinymce.trim(o.content));
+
+			if (o.format != 'raw' && t.settings.cleanup) {
+				o.getInner = true;
+				o.content = t.dom.setHTML(t.getBody(), t.serializer.serialize(t.getBody(), o));
+			}
+
+			if (!o.no_events)
+				t.onSetContent.dispatch(t, o);
+
+			return o.content;
+		},
+
+		getContent : function(o) {
+			var t = this, h;
+
+			o = o || {};
+			o.format = o.format || 'html';
+			o.get = true;
+
+			if (!o.no_events)
+				t.onBeforeGetContent.dispatch(t, o);
+
+			if (o.format != 'raw' && t.settings.cleanup) {
+				o.getInner = true;
+				h = t.serializer.serialize(t.getBody(), o);
+			} else
+				h = t.getBody().innerHTML;
+
+			h = h.replace(/^\s*|\s*$/g, '');
+			o.content = h;
+
+			if (!o.no_events)
+				t.onGetContent.dispatch(t, o);
+
+			return o.content;
+		},
+
+		isDirty : function() {
+			var t = this;
+
+			return tinymce.trim(t.startContent) != tinymce.trim(t.getContent({format : 'raw', no_events : 1})) && !t.isNotDirty;
+		},
+
+		getContainer : function() {
+			var t = this;
+
+			if (!t.container)
+				t.container = DOM.get(t.editorContainer || t.id + '_parent');
+
+			return t.container;
+		},
+
+		getContentAreaContainer : function() {
+			return this.contentAreaContainer;
+		},
+
+		getElement : function() {
+			return DOM.get(this.settings.content_element || this.id);
+		},
+
+		getWin : function() {
+			var t = this, e;
+
+			if (!t.contentWindow) {
+				e = DOM.get(t.id + "_ifr");
+
+				if (e)
+					t.contentWindow = e.contentWindow;
+			}
+
+			return t.contentWindow;
+		},
+
+		getDoc : function() {
+			var t = this, w;
+
+			if (!t.contentDocument) {
+				w = t.getWin();
+
+				if (w)
+					t.contentDocument = w.document;
+			}
+
+			return t.contentDocument;
+		},
+
+		getBody : function() {
+			return this.bodyElement || this.getDoc().body;
+		},
+
+		convertURL : function(u, n, e) {
+			var t = this, s = t.settings;
+
+			// Use callback instead
+			if (s.urlconverter_callback)
+				return t.execCallback('urlconverter_callback', u, e, true, n);
+
+			// Don't convert link href since thats the CSS files that gets loaded into the editor also skip local file URLs
+			if (!s.convert_urls || (e && e.nodeName == 'LINK') || u.indexOf('file:') === 0)
+				return u;
+
+			// Convert to relative
+			if (s.relative_urls)
+				return t.documentBaseURI.toRelative(u);
+
+			// Convert to absolute
+			u = t.documentBaseURI.toAbsolute(u, s.remove_script_host);
+
+			return u;
+		},
+
+		addVisual : function(e) {
+			var t = this, s = t.settings;
+
+			e = e || t.getBody();
+
+			if (!is(t.hasVisual))
+				t.hasVisual = s.visual;
+
+			each(t.dom.select('table,a', e), function(e) {
+				var v;
+
+				switch (e.nodeName) {
+					case 'TABLE':
+						v = t.dom.getAttrib(e, 'border');
+
+						if (!v || v == '0') {
+							if (t.hasVisual)
+								t.dom.addClass(e, s.visual_table_class);
+							else
+								t.dom.removeClass(e, s.visual_table_class);
+						}
+
+						return;
+
+					case 'A':
+						v = t.dom.getAttrib(e, 'name');
+
+						if (v) {
+							if (t.hasVisual)
+								t.dom.addClass(e, 'mceItemAnchor');
+							else
+								t.dom.removeClass(e, 'mceItemAnchor');
+						}
+
+						return;
+				}
+			});
+
+			t.onVisualAid.dispatch(t, e, t.hasVisual);
+		},
+
+		remove : function() {
+			var t = this, e = t.getContainer();
+
+			t.removed = 1; // Cancels post remove event execution
+			t.hide();
+
+			t.execCallback('remove_instance_callback', t);
+			t.onRemove.dispatch(t);
+
+			// Clear all execCommand listeners this is required to avoid errors if the editor was removed inside another command
+			t.onExecCommand.listeners = [];
+
+			EditorManager.remove(t);
+			DOM.remove(e);
+		},
+
+		destroy : function(s) {
+			var t = this;
+
+			// One time is enough
+			if (t.destroyed)
+				return;
+
+			if (!s) {
+				tinymce.removeUnload(t.destroy);
+				tinyMCE.onBeforeUnload.remove(t._beforeUnload);
+
+				// Manual destroy
+				if (t.theme.destroy)
+					t.theme.destroy();
+
+				// Destroy controls, selection and dom
+				t.controlManager.destroy();
+				t.selection.destroy();
+				t.dom.destroy();
+
+				// Remove all events
+
+				// Don't clear the window or document if content editable
+				// is enabled since other instances might still be present
+				if (!t.settings.content_editable) {
+					Event.clear(t.getWin());
+					Event.clear(t.getDoc());
+				}
+
+				Event.clear(t.getBody());
+				Event.clear(t.formElement);
+			}
+
+			if (t.formElement) {
+				t.formElement.submit = t.formElement._mceOldSubmit;
+				t.formElement._mceOldSubmit = null;
+			}
+
+			t.contentAreaContainer = t.formElement = t.container = t.settings.content_element = t.bodyElement = t.contentDocument = t.contentWindow = null;
+
+			if (t.selection)
+				t.selection = t.selection.win = t.selection.dom = t.selection.dom.doc = null;
+
+			t.destroyed = 1;
+		},
+
+		// Internal functions
+
+		_addEvents : function() {
+			// 'focus', 'blur', 'dblclick', 'beforedeactivate', submit, reset
+			var t = this, i, s = t.settings, lo = {
+				mouseup : 'onMouseUp',
+				mousedown : 'onMouseDown',
+				click : 'onClick',
+				keyup : 'onKeyUp',
+				keydown : 'onKeyDown',
+				keypress : 'onKeyPress',
+				submit : 'onSubmit',
+				reset : 'onReset',
+				contextmenu : 'onContextMenu',
+				dblclick : 'onDblClick',
+				paste : 'onPaste' // Doesn't work in all browsers yet
+			};
+
+			function eventHandler(e, o) {
+				var ty = e.type;
+
+				// Don't fire events when it's removed
+				if (t.removed)
+					return;
+
+				// Generic event handler
+				if (t.onEvent.dispatch(t, e, o) !== false) {
+					// Specific event handler
+					t[lo[e.fakeType || e.type]].dispatch(t, e, o);
+				}
+			};
+
+			// Add DOM events
+			each(lo, function(v, k) {
+				switch (k) {
+					case 'contextmenu':
+						if (tinymce.isOpera) {
+							// Fake contextmenu on Opera
+							Event.add(t.getBody(), 'mousedown', function(e) {
+								if (e.ctrlKey) {
+									e.fakeType = 'contextmenu';
+									eventHandler(e);
+								}
+							});
+						} else
+							Event.add(t.getBody(), k, eventHandler);
+						break;
+
+					case 'paste':
+						Event.add(t.getBody(), k, function(e) {
+							var tx, h, el, r;
+
+							// Get plain text data
+							if (e.clipboardData)
+								tx = e.clipboardData.getData('text/plain');
+							else if (tinymce.isIE)
+								tx = t.getWin().clipboardData.getData('Text');
+
+							// Get HTML data
+							/*if (tinymce.isIE) {
+								el = DOM.add(DOM.doc.body, 'div', {style : 'visibility:hidden;overflow:hidden;position:absolute;width:1px;height:1px'});
+								r = DOM.doc.body.createTextRange();
+								r.moveToElementText(el);
+								r.execCommand('Paste');
+								h = el.innerHTML;
+								DOM.remove(el);
+							}*/
+
+							eventHandler(e, {text : tx, html : h});
+						});
+						break;
+
+					case 'submit':
+					case 'reset':
+						Event.add(t.getElement().form || DOM.getParent(t.id, 'form'), k, eventHandler);
+						break;
+
+					default:
+						Event.add(s.content_editable ? t.getBody() : t.getDoc(), k, eventHandler);
+				}
+			});
+
+			Event.add(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) {
+				t.focus(true);
+			});
+
+			
+			// Fixes bug where a specified document_base_uri could result in broken images
+			// This will also fix drag drop of images in Gecko
+			if (tinymce.isGecko) {
+				// Convert all images to absolute URLs
+/*				t.onSetContent.add(function(ed, o) {
+					each(ed.dom.select('img'), function(e) {
+						var v;
+
+						if (v = e.getAttribute('mce_src'))
+							e.src = t.documentBaseURI.toAbsolute(v);
+					})
+				});*/
+
+				Event.add(t.getDoc(), 'DOMNodeInserted', function(e) {
+					var v;
+
+					e = e.target;
+
+					if (e.nodeType === 1 && e.nodeName === 'IMG' && (v = e.getAttribute('mce_src')))
+						e.src = t.documentBaseURI.toAbsolute(v);
+				});
+			}
+
+			// Set various midas options in Gecko
+			if (isGecko) {
+				function setOpts() {
+					var t = this, d = t.getDoc(), s = t.settings;
+
+					if (isGecko) {
+						if (t._isHidden()) {
+							try {
+								if (!s.content_editable)
+									d.designMode = 'On';
+							} catch (ex) {
+								// Fails if it's hidden
+							}
+						}
+
+						try {
+							// Try new Gecko method
+							d.execCommand("styleWithCSS", 0, false);
+						} catch (ex) {
+							// Use old method
+							if (!t._isHidden())
+								try {d.execCommand("useCSS", 0, true);} catch (ex) {}
+						}
+
+						if (!s.table_inline_editing)
+							try {d.execCommand('enableInlineTableEditing', false, false);} catch (ex) {}
+
+						if (!s.object_resizing)
+							try {d.execCommand('enableObjectResizing', false, false);} catch (ex) {}
+					}
+				};
+
+				t.onBeforeExecCommand.add(setOpts);
+				t.onMouseDown.add(setOpts);
+			}
+
+			// Add node change handlers
+			t.onMouseUp.add(t.nodeChanged);
+			t.onClick.add(t.nodeChanged);
+			t.onKeyUp.add(function(ed, e) {
+				if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45 || e.keyCode == 46 || e.keyCode == 8 || e.ctrlKey)
+					t.nodeChanged();
+			});
+
+			// Add reset handler
+			t.onReset.add(function() {
+				t.setContent(t.startContent, {format : 'raw'});
+			});
+
+			if (t.getParam('tab_focus')) {
+				function tabCancel(ed, e) {
+					if (e.keyCode === 9)
+						return Event.cancel(e);
+				};
+
+				function tabHandler(ed, e) {
+					var x, i, f, el, v;
+
+					function find(d) {
+						f = DOM.getParent(ed.id, 'form');
+						el = f.elements;
+
+						if (f) {
+							each(el, function(e, i) {
+								if (e.id == ed.id) {
+									x = i;
+									return false;
+								}
+							});
+
+							if (d > 0) {
+								for (i = x + 1; i < el.length; i++) {
+									if (el[i].type != 'hidden')
+										return el[i];
+								}
+							} else {
+								for (i = x - 1; i >= 0; i--) {
+									if (el[i].type != 'hidden')
+										return el[i];
+								}
+							}
+						}
+
+						return null;
+					};
+
+					if (e.keyCode === 9) {
+						v = explode(ed.getParam('tab_focus'));
+
+						if (v.length == 1) {
+							v[1] = v[0];
+							v[0] = ':prev';
+						}
+
+						// Find element to focus
+						if (e.shiftKey) {
+							if (v[0] == ':prev')
+								el = find(-1);
+							else
+								el = DOM.get(v[0]);
+						} else {
+							if (v[1] == ':next')
+								el = find(1);
+							else
+								el = DOM.get(v[1]);
+						}
+
+						if (el) {
+							if (ed = EditorManager.get(el.id || el.name))
+								ed.focus();
+							else
+								window.setTimeout(function() {window.focus();el.focus();}, 10);
+
+							return Event.cancel(e);
+						}
+					}
+				};
+
+				t.onKeyUp.add(tabCancel);
+
+				if (isGecko) {
+					t.onKeyPress.add(tabHandler);
+					t.onKeyDown.add(tabCancel);
+				} else
+					t.onKeyDown.add(tabHandler);
+			}
+
+			// Add shortcuts
+			if (s.custom_shortcuts) {
+				if (s.custom_undo_redo_keyboard_shortcuts) {
+					t.addShortcut('ctrl+z', t.getLang('undo_desc'), 'Undo');
+					t.addShortcut('ctrl+y', t.getLang('redo_desc'), 'Redo');
+				}
+
+				// Add default shortcuts for gecko
+				if (isGecko) {
+					t.addShortcut('ctrl+b', t.getLang('bold_desc'), 'Bold');
+					t.addShortcut('ctrl+i', t.getLang('italic_desc'), 'Italic');
+					t.addShortcut('ctrl+u', t.getLang('underline_desc'), 'Underline');
+				}
+
+				// BlockFormat shortcuts keys
+				for (i=1; i<=6; i++)
+					t.addShortcut('ctrl+' + i, '', ['FormatBlock', false, '<h' + i + '>']);
+
+				t.addShortcut('ctrl+7', '', ['FormatBlock', false, '<p>']);
+				t.addShortcut('ctrl+8', '', ['FormatBlock', false, '<div>']);
+				t.addShortcut('ctrl+9', '', ['FormatBlock', false, '<address>']);
+
+				function find(e) {
+					var v = null;
+
+					if (!e.altKey && !e.ctrlKey && !e.metaKey)
+						return v;
+
+					each(t.shortcuts, function(o) {
+						if (o.ctrl != e.ctrlKey && (!tinymce.isMac || o.ctrl == e.metaKey))
+							return;
+
+						if (o.alt != e.altKey)
+							return;
+
+						if (o.shift != e.shiftKey)
+							return;
+
+						if (e.keyCode == o.keyCode || (e.charCode && e.charCode == o.charCode)) {
+							v = o;
+							return false;
+						}
+					});
+
+					return v;
+				};
+
+				t.onKeyUp.add(function(ed, e) {
+					var o = find(e);
+
+					if (o)
+						return Event.cancel(e);
+				});
+
+				t.onKeyPress.add(function(ed, e) {
+					var o = find(e);
+
+					if (o)
+						return Event.cancel(e);
+				});
+
+				t.onKeyDown.add(function(ed, e) {
+					var o = find(e);
+
+					if (o) {
+						o.func.call(o.scope);
+						return Event.cancel(e);
+					}
+				});
+			}
+
+			if (tinymce.isIE) {
+				// Fix so resize will only update the width and height attributes not the styles of an image
+				// It will also block mceItemNoResize items
+				Event.add(t.getDoc(), 'controlselect', function(e) {
+					var re = t.resizeInfo, cb;
+
+					e = e.target;
+
+					// Don't do this action for non image elements
+					if (e.nodeName !== 'IMG')
+						return;
+
+					if (re)
+						Event.remove(re.node, re.ev, re.cb);
+
+					if (!t.dom.hasClass(e, 'mceItemNoResize')) {
+						ev = 'resizeend';
+						cb = Event.add(e, ev, function(e) {
+							var v;
+
+							e = e.target;
+
+							if (v = t.dom.getStyle(e, 'width')) {
+								t.dom.setAttrib(e, 'width', v.replace(/[^0-9%]+/g, ''));
+								t.dom.setStyle(e, 'width', '');
+							}
+
+							if (v = t.dom.getStyle(e, 'height')) {
+								t.dom.setAttrib(e, 'height', v.replace(/[^0-9%]+/g, ''));
+								t.dom.setStyle(e, 'height', '');
+							}
+						});
+					} else {
+						ev = 'resizestart';
+						cb = Event.add(e, 'resizestart', Event.cancel, Event);
+					}
+
+					re = t.resizeInfo = {
+						node : e,
+						ev : ev,
+						cb : cb
+					};
+				});
+
+				t.onKeyDown.add(function(ed, e) {
+					switch (e.keyCode) {
+						case 8:
+							// Fix IE control + backspace browser bug
+							if (t.selection.getRng().item) {
+								t.selection.getRng().item(0).removeNode();
+								return Event.cancel(e);
+							}
+					}
+				});
+			}
+
+			if (tinymce.isOpera) {
+				t.onClick.add(function(ed, e) {
+					Event.prevent(e);
+				});
+			}
+
+			// Add custom undo/redo handlers
+			if (s.custom_undo_redo) {
+				function addUndo() {
+					t.undoManager.typing = 0;
+					t.undoManager.add();
+				};
+
+				// Add undo level on editor blur
+				if (tinymce.isIE) {
+					Event.add(t.getWin(), 'blur', function(e) {
+						var n;
+
+						// Check added for fullscreen bug
+						if (t.selection) {
+							n = t.selection.getNode();
+
+							// Add undo level is selection was lost to another document
+							if (!t.removed && n.ownerDocument && n.ownerDocument != t.getDoc())
+								addUndo();
+						}
+					});
+				} else {
+					Event.add(t.getDoc(), 'blur', function() {
+						if (t.selection && !t.removed)
+							addUndo();
+					});
+				}
+
+				t.onMouseDown.add(addUndo);
+
+				t.onKeyUp.add(function(ed, e) {
+					if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45 || e.ctrlKey) {
+						t.undoManager.typing = 0;
+						t.undoManager.add();
+					}
+				});
+
+				t.onKeyDown.add(function(ed, e) {
+					// Is caracter positon keys
+					if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45) {
+						if (t.undoManager.typing) {
+							t.undoManager.add();
+							t.undoManager.typing = 0;
+						}
+
+						return;
+					}
+
+					if (!t.undoManager.typing) {
+						t.undoManager.add();
+						t.undoManager.typing = 1;
+					}
+				});
+			}
+		},
+
+		_convertInlineElements : function() {
+			var t = this, s = t.settings, dom = t.dom, v, e, na, st, sp;
+
+			function convert(ed, o) {
+				if (!s.inline_styles)
+					return;
+
+				if (o.get) {
+					each(t.dom.select('table,u,strike', o.node), function(n) {
+						switch (n.nodeName) {
+							case 'TABLE':
+								if (v = dom.getAttrib(n, 'height')) {
+									dom.setStyle(n, 'height', v);
+									dom.setAttrib(n, 'height', '');
+								}
+								break;
+
+							case 'U':
+							case 'STRIKE':
+								//sp = dom.create('span', {style : dom.getAttrib(n, 'style')});
+								n.style.textDecoration = n.nodeName == 'U' ? 'underline' : 'line-through';
+								dom.setAttrib(n, 'mce_style', '');
+								dom.setAttrib(n, 'mce_name', 'span');
+								break;
+						}
+					});
+				} else if (o.set) {
+					each(t.dom.select('table,span', o.node).reverse(), function(n) {
+						if (n.nodeName == 'TABLE') {
+							if (v = dom.getStyle(n, 'height'))
+								dom.setAttrib(n, 'height', v.replace(/[^0-9%]+/g, ''));
+						} else {
+							// Convert spans to elements
+							if (n.style.textDecoration == 'underline')
+								na = 'u';
+							else if (n.style.textDecoration == 'line-through')
+								na = 'strike';
+							else
+								na = '';
+
+							if (na) {
+								n.style.textDecoration = '';
+								dom.setAttrib(n, 'mce_style', '');
+
+								e = dom.create(na, {
+									style : dom.getAttrib(n, 'style')
+								});
+
+								dom.replace(e, n, 1);
+							}
+						}
+					});
+				}
+			};
+
+			t.onPreProcess.add(convert);
+
+			if (!s.cleanup_on_startup) {
+				t.onSetContent.add(function(ed, o) {
+					if (o.initial)
+						convert(t, {node : t.getBody(), set : 1});
+				});
+			}
+		},
+
+		_convertFonts : function() {
+			var t = this, s = t.settings, dom = t.dom, fz, fzn, sl, cl;
+
+			// No need
+			if (!s.inline_styles)
+				return;
+
+			// Font pt values and font size names
+			fz = [8, 10, 12, 14, 18, 24, 36];
+			fzn = ['xx-small', 'x-small','small','medium','large','x-large', 'xx-large'];
+
+			if (sl = s.font_size_style_values)
+				sl = explode(sl);
+
+			if (cl = s.font_size_classes)
+				cl = explode(cl);
+
+			function convertToFonts(no) {
+				var n, f, nl, x, i, v, st;
+
+				// Convert spans to fonts on non WebKit browsers
+				if (tinymce.isWebKit || !s.inline_styles)
+					return;
+
+				nl = t.dom.select('span', no);
+				for (x = nl.length - 1; x >= 0; x--) {
+					n = nl[x];
+
+					f = dom.create('font', {
+						color : dom.toHex(dom.getStyle(n, 'color')),
+						face : dom.getStyle(n, 'fontFamily'),
+						style : dom.getAttrib(n, 'style'),
+						'class' : dom.getAttrib(n, 'class')
+					});
+
+					// Clear color and font family
+					st = f.style;
+					if (st.color || st.fontFamily) {
+						st.color = st.fontFamily = '';
+						dom.setAttrib(f, 'mce_style', ''); // Remove cached style data
+					}
+
+					if (sl) {
+						i = inArray(sl, dom.getStyle(n, 'fontSize'));
+
+						if (i != -1) {
+							dom.setAttrib(f, 'size', '' + (i + 1 || 1));
+							//f.style.fontSize = '';
+						}
+					} else if (cl) {
+						i = inArray(cl, dom.getAttrib(n, 'class'));
+						v = dom.getStyle(n, 'fontSize');
+
+						if (i == -1 && v.indexOf('pt') > 0)
+							i = inArray(fz, parseInt(v));
+
+						if (i == -1)
+							i = inArray(fzn, v);
+
+						if (i != -1) {
+							dom.setAttrib(f, 'size', '' + (i + 1 || 1));
+							f.style.fontSize = '';
+						}
+					}
+
+					if (f.color || f.face || f.size) {
+						f.style.fontFamily = '';
+						dom.setAttrib(f, 'mce_style', '');
+						dom.replace(f, n, 1);
+					}
+
+					f = n = null;
+				}
+			};
+
+			// Run on setup
+			t.onSetContent.add(function(ed, o) {
+				convertToFonts(ed.getBody());
+			});
+
+			// Run on cleanup
+			t.onPreProcess.add(function(ed, o) {
+				var n, sp, nl, x;
+
+				// Keep unit tests happy
+				if (!s.inline_styles)
+					return;
+
+				if (o.get) {
+					nl = t.dom.select('font', o.node);
+					for (x = nl.length - 1; x >= 0; x--) {
+						n = nl[x];
+
+						sp = dom.create('span', {
+							style : dom.getAttrib(n, 'style'),
+							'class' : dom.getAttrib(n, 'class')
+						});
+
+						dom.setStyles(sp, {
+							fontFamily : dom.getAttrib(n, 'face'),
+							color : dom.getAttrib(n, 'color'),
+							backgroundColor : n.style.backgroundColor
+						});
+
+						if (n.size) {
+							if (sl)
+								dom.setStyle(sp, 'fontSize', sl[parseInt(n.size) - 1]);
+							else
+								dom.setAttrib(sp, 'class', cl[parseInt(n.size) - 1]);
+						}
+
+						dom.setAttrib(sp, 'mce_style', '');
+						dom.replace(sp, n, 1);
+					}
+				}
+			});
+		},
+
+		_isHidden : function() {
+			var s;
+
+			if (!isGecko)
+				return 0;
+
+			// Weird, wheres that cursor selection?
+			s = this.selection.getSel();
+			return (!s || !s.rangeCount || s.rangeCount == 0);
+		},
+
+		// Fix for bug #1867292
+		_fixNesting : function(s) {
+			var d = [], i;
+
+			s = s.replace(/<(\/)?([^\s>]+)[^>]*?>/g, function(a, b, c) {
+				var e;
+
+				// Handle end element
+				if (b === '/') {
+					if (!d.length)
+						return '';
+
+					if (c !== d[d.length - 1].tag) {
+						for (i=d.length - 1; i>=0; i--) {
+							if (d[i].tag === c) {
+								d[i].close = 1;
+								break;
+							}
+						}
+
+						return '';
+					} else {
+						d.pop();
+
+						if (d.length && d[d.length - 1].close) {
+							a = a + '</' + d[d.length - 1].tag + '>';
+							d.pop();
+						}
+					}
+				} else {
+					// Ignore these
+					if (/^(br|hr|input|meta|img|link|param)$/i.test(c))
+						return a;
+
+					// Ignore closed ones
+					if (/\/>$/.test(a))
+						return a;
+
+					d.push({tag : c}); // Push start element
+				}
+
+				return a;
+			});
+
+			// End all open tags
+			for (i=d.length - 1; i>=0; i--)
+				s += '</' + d[i].tag + '>';
+
+			return s;
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/EditorCommands.js */
+
+(function() {
+	var each = tinymce.each, isIE = tinymce.isIE, isGecko = tinymce.isGecko, isOpera = tinymce.isOpera, isWebKit = tinymce.isWebKit;
+
+	tinymce.create('tinymce.EditorCommands', {
+		EditorCommands : function(ed) {
+			this.editor = ed;
+		},
+
+		execCommand : function(cmd, ui, val) {
+			var t = this, ed = t.editor, f;
+
+			switch (cmd) {
+				case 'Cut':
+				case 'Copy':
+				case 'Paste':
+					try {
+						ed.getDoc().execCommand(cmd, ui, val);
+					} catch (ex) {
+						if (isGecko) {
+							ed.windowManager.confirm(ed.getLang('clipboard_msg'), function(s) {
+								if (s)
+									window.open('http://www.mozilla.org/editor/midasdemo/securityprefs.html', 'mceExternal');
+							});
+						} else
+							ed.windowManager.alert(ed.getLang('clipboard_no_support'));
+					}
+
+					return true;
+
+				// Ignore these
+				case 'mceResetDesignMode':
+				case 'mceBeginUndoLevel':
+					return true;
+
+				// Ignore these
+				case 'unlink':
+					t.UnLink();
+					return true;
+
+				// Bundle these together
+				case 'JustifyLeft':
+				case 'JustifyCenter':
+				case 'JustifyRight':
+				case 'JustifyFull':
+					t.mceJustify(cmd, cmd.substring(7).toLowerCase());
+					return true;
+
+				case 'mceEndUndoLevel':
+				case 'mceAddUndoLevel':
+					ed.undoManager.add();
+					return true;
+
+				default:
+					f = this[cmd];
+
+					if (f) {
+						f.call(this, ui, val);
+						return true;
+					}
+			}
+
+			return false;
+		},
+
+		Indent : function() {
+			var ed = this.editor, d = ed.dom, s = ed.selection, e, iv, iu;
+
+			// Setup indent level
+			iv = ed.settings.indentation;
+			iu = /[a-z%]+$/i.exec(iv);
+			iv = parseInt(iv);
+
+			if (ed.settings.inline_styles && (!this.queryStateInsertUnorderedList() && !this.queryStateInsertOrderedList())) {
+				each(this._getSelectedBlocks(), function(e) {
+					d.setStyle(e, 'paddingLeft', (parseInt(e.style.paddingLeft || 0) + iv) + iu);
+				});
+
+				return;
+			}
+
+			ed.getDoc().execCommand('Indent', false, null);
+
+			if (isIE) {
+				d.getParent(s.getNode(), function(n) {
+					if (n.nodeName == 'BLOCKQUOTE') {
+						n.dir = n.style.cssText = '';
+					}
+				});
+			}
+		},
+
+		Outdent : function() {
+			var ed = this.editor, d = ed.dom, s = ed.selection, e, v, iv, iu;
+
+			// Setup indent level
+			iv = ed.settings.indentation;
+			iu = /[a-z%]+$/i.exec(iv);
+			iv = parseInt(iv);
+
+			if (ed.settings.inline_styles && (!this.queryStateInsertUnorderedList() && !this.queryStateInsertOrderedList())) {
+				each(this._getSelectedBlocks(), function(e) {
+					v = Math.max(0, parseInt(e.style.paddingLeft || 0) - iv);
+					d.setStyle(e, 'paddingLeft', v ? v + iu : '');
+				});
+
+				return;
+			}
+
+			ed.getDoc().execCommand('Outdent', false, null);
+		},
+
+		mceSetAttribute : function(u, v) {
+			var ed = this.editor, d = ed.dom, e;
+
+			if (e = d.getParent(ed.selection.getNode(), d.isBlock))
+				d.setAttrib(e, v.name, v.value);
+		},
+
+		mceSetContent : function(u, v) {
+			this.editor.setContent(v);
+		},
+
+		mceToggleVisualAid : function() {
+			var ed = this.editor;
+
+			ed.hasVisual = !ed.hasVisual;
+			ed.addVisual();
+		},
+
+		mceReplaceContent : function(u, v) {
+			var s = this.editor.selection;
+
+			s.setContent(v.replace(/\{\$selection\}/g, s.getContent({format : 'text'})));
+		},
+
+		mceInsertLink : function(u, v) {
+			var ed = this.editor, s = ed.selection, e = ed.dom.getParent(s.getNode(), 'A');
+
+			if (tinymce.is(v, 'string'))
+				v = {href : v};
+
+			function set(e) {
+				each(v, function(v, k) {
+					ed.dom.setAttrib(e, k, v);
+				});
+			};
+
+			if (!e) {
+				ed.execCommand('CreateLink', false, 'javascript:mctmp(0);');
+				each(ed.dom.select('a'), function(e) {
+					if (e.href == 'javascript:mctmp(0);')
+						set(e);
+				});
+			} else {
+				if (v.href)
+					set(e);
+				else
+					ed.dom.remove(e, 1);
+			}
+		},
+
+		UnLink : function() {
+			var ed = this.editor, s = ed.selection;
+
+			if (s.isCollapsed())
+				s.select(s.getNode());
+
+			ed.getDoc().execCommand('unlink', false, null);
+			s.collapse(0);
+		},
+
+		FontName : function(u, v) {
+			var t = this, ed = t.editor, s = ed.selection, e;
+
+			if (!v) {
+				if (s.isCollapsed())
+					s.select(s.getNode());
+
+				t.RemoveFormat();
+			} else
+				ed.getDoc().execCommand('FontName', false, v);
+		},
+
+		FontSize : function(u, v) {
+			var ed = this.editor, s = ed.settings, fz = tinymce.explode(s.font_size_style_values), fzc = tinymce.explode(s.font_size_classes), h, bm;
+
+			// Remove style sizes
+			each(ed.dom.select('font'), function(e) {
+				e.style.fontSize = '';
+			});
+
+			// Let the browser add new size it will remove unneded ones in some browsers
+			ed.getDoc().execCommand('FontSize', false, v);
+
+			// Add style values
+			if (s.inline_styles) {
+				each(ed.dom.select('font'), function(e) {
+					// Try remove redundant font elements
+					if (e.parentNode.nodeName == 'FONT' && e.size == e.parentNode.size) {
+						if (!bm)
+							bm = ed.selection.getBookmark();
+
+						ed.dom.remove(e, 1);
+						return;
+					}
+
+					// Setup font size based on font size value
+					if (v = e.size) {
+						if (fzc && fzc.length > 0)
+							ed.dom.setAttrib(e, 'class', fzc[parseInt(v) - 1]);
+						else
+							ed.dom.setStyle(e, 'fontSize', fz[parseInt(v) - 1]);
+					}
+				});
+			}
+
+			ed.selection.moveToBookmark(bm);
+		},
+
+		queryCommandValue : function(c) {
+			var f = this['queryValue' + c];
+
+			if (f)
+				return f.call(this, c);
+
+			return false;
+		},
+
+		queryCommandState : function(cmd) {
+			var f;
+
+			switch (cmd) {
+				// Bundle these together
+				case 'JustifyLeft':
+				case 'JustifyCenter':
+				case 'JustifyRight':
+				case 'JustifyFull':
+					return this.queryStateJustify(cmd, cmd.substring(7).toLowerCase());
+
+				default:
+					if (f = this['queryState' + cmd])
+						return f.call(this, cmd);
+			}
+
+			return -1;
+		},
+
+		_queryState : function(c) {
+			try {
+				return this.editor.getDoc().queryCommandState(c);
+			} catch (ex) {
+				// Ignore exception
+			}
+		},
+
+		_queryVal : function(c) {
+			try {
+				return this.editor.getDoc().queryCommandValue(c);
+			} catch (ex) {
+				// Ignore exception
+			}
+		},
+
+		queryValueFontSize : function() {
+			var ed = this.editor, v = 0, p;
+
+			if (isOpera || isWebKit) {
+				if (p = ed.dom.getParent(ed.selection.getNode(), 'FONT'))
+					v = p.size;
+
+				return v;
+			}
+
+			return this._queryVal('FontSize');
+		},
+
+		queryValueFontName : function() {
+			var ed = this.editor, v = 0, p;
+
+			if (p = ed.dom.getParent(ed.selection.getNode(), 'FONT'))
+				v = p.face;
+
+			if (!v)
+				v = this._queryVal('FontName');
+
+			return v;
+		},
+
+		mceJustify : function(c, v) {
+			var ed = this.editor, se = ed.selection, n = se.getNode(), nn = n.nodeName, bl, nb, dom = ed.dom, rm;
+
+			if (ed.settings.inline_styles && this.queryStateJustify(c, v))
+				rm = 1;
+
+			bl = dom.getParent(n, ed.dom.isBlock);
+
+			if (nn == 'IMG') {
+				if (v == 'full')
+					return;
+
+				if (rm) {
+					if (v == 'center')
+						dom.setStyle(n.parentNode, 'textAlign', '');
+
+					dom.setStyle(n, 'float', '');
+					this.mceRepaint();
+					return;
+				}
+
+				if (v == 'center') {
+					// Do not change table elements
+					if (/^(TD|TH)$/.test(bl.nodeName))
+						bl = 0;
+
+					if (!bl || bl.childNodes.length > 1) {
+						nb = dom.create('p');
+						nb.appendChild(n.cloneNode(false));
+
+						if (bl)
+							dom.insertAfter(nb, bl);
+						else
+							dom.insertAfter(nb, n);
+
+						dom.remove(n);
+						n = nb.firstChild;
+						bl = nb;
+					}
+
+					dom.setStyle(bl, 'textAlign', v);
+					dom.setStyle(n, 'float', '');
+				} else {
+					dom.setStyle(n, 'float', v);
+					dom.setStyle(n.parentNode, 'textAlign', '');
+				}
+
+				this.mceRepaint();
+				return;
+			}
+
+			// Handle the alignment outselfs, less quirks in all browsers
+			if (ed.settings.inline_styles && ed.settings.forced_root_block) {
+				if (rm)
+					v = '';
+
+				each(this._getSelectedBlocks(dom.getParent(se.getStart(), dom.isBlock), dom.getParent(se.getEnd(), dom.isBlock)), function(e) {
+					dom.setAttrib(e, 'align', '');
+					dom.setStyle(e, 'textAlign', v == 'full' ? 'justify' : v);
+				});
+
+				return;
+			} else if (!rm)
+				ed.getDoc().execCommand(c, false, null);
+
+			if (ed.settings.inline_styles) {
+				if (rm) {
+					dom.getParent(ed.selection.getNode(), function(n) {
+						if (n.style && n.style.textAlign)
+							dom.setStyle(n, 'textAlign', '');
+					});
+
+					return;
+				}
+
+				each(dom.select('*'), function(n) {
+					var v = n.align;
+
+					if (v) {
+						if (v == 'full')
+							v = 'justify';
+
+						dom.setStyle(n, 'textAlign', v);
+						dom.setAttrib(n, 'align', '');
+					}
+				});
+			}
+		},
+
+		mceSetCSSClass : function(u, v) {
+			this.mceSetStyleInfo(0, {command : 'setattrib', name : 'class', value : v});
+		},
+
+		getSelectedElement : function() {
+			var t = this, ed = t.editor, dom = ed.dom, se = ed.selection, r = se.getRng(), r1, r2, sc, ec, so, eo, e, sp, ep, re;
+
+			if (se.isCollapsed() || r.item)
+				return se.getNode();
+
+			// Setup regexp
+			re = ed.settings.merge_styles_invalid_parents;
+			if (tinymce.is(re, 'string'))
+				re = new RegExp(re, 'i');
+
+			if (isIE) {
+				r1 = r.duplicate();
+				r1.collapse(true);
+				sc = r1.parentElement();
+
+				r2 = r.duplicate();
+				r2.collapse(false);
+				ec = r2.parentElement();
+
+				if (sc != ec) {
+					r1.move('character', 1);
+					sc = r1.parentElement();
+				}
+
+				if (sc == ec) {
+					r1 = r.duplicate();
+					r1.moveToElementText(sc);
+
+					if (r1.compareEndPoints('StartToStart', r) == 0 && r1.compareEndPoints('EndToEnd', r) == 0)
+						return re && re.test(sc.nodeName) ? null : sc;
+				}
+			} else {
+				function getParent(n) {
+					return dom.getParent(n, function(n) {return n.nodeType == 1;});
+				};
+
+				sc = r.startContainer;
+				ec = r.endContainer;
+				so = r.startOffset;
+				eo = r.endOffset;
+
+				if (!r.collapsed) {
+					if (sc == ec) {
+						if (so - eo < 2) {
+							if (sc.hasChildNodes()) {
+								sp = sc.childNodes[so];
+								return re && re.test(sp.nodeName) ? null : sp;
+							}
+						}
+					}
+				}
+
+				if (sc.nodeType != 3 || ec.nodeType != 3)
+					return null;
+
+				if (so == 0) {
+					sp = getParent(sc);
+
+					if (sp && sp.firstChild != sc)
+						sp = null;
+				}
+
+				if (so == sc.nodeValue.length) {
+					e = sc.nextSibling;
+
+					if (e && e.nodeType == 1)
+						sp = sc.nextSibling;
+				}
+
+				if (eo == 0) {
+					e = ec.previousSibling;
+
+					if (e && e.nodeType == 1)
+						ep = e;
+				}
+
+				if (eo == ec.nodeValue.length) {
+					ep = getParent(ec);
+
+					if (ep && ep.lastChild != ec)
+						ep = null;
+				}
+
+				// Same element
+				if (sp == ep)
+					return re && sp && re.test(sp.nodeName) ? null : sp;
+			}
+
+			return null;
+		},
+
+		InsertHorizontalRule : function() {
+			// Fix for Gecko <hr size="1" /> issue and IE bug rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");
+			if (isGecko || isIE)
+				this.editor.selection.setContent('<hr />');
+			else
+				this.editor.getDoc().execCommand('InsertHorizontalRule', false, '');
+		},
+
+		RemoveFormat : function() {
+			var t = this, ed = t.editor, s = ed.selection, b;
+
+			// Safari breaks tables
+			if (isWebKit)
+				s.setContent(s.getContent({format : 'raw'}).replace(/(<(span|b|i|strong|em|strike) [^>]+>|<(span|b|i|strong|em|strike)>|<\/(span|b|i|strong|em|strike)>|)/g, ''), {format : 'raw'});
+			else
+				ed.getDoc().execCommand('RemoveFormat', false, null);
+
+			t.mceSetStyleInfo(0, {command : 'removeformat'});
+			ed.addVisual();
+		},
+
+		mceSetStyleInfo : function(u, v) {
+			var t = this, ed = t.editor, d = ed.getDoc(), dom = ed.dom, e, b, s = ed.selection, nn = v.wrapper || 'span', b = s.getBookmark(), re;
+
+			function set(n, e) {
+				if (n.nodeType == 1) {
+					switch (v.command) {
+						case 'setattrib':
+							return dom.setAttrib(n, v.name, v.value);
+
+						case 'setstyle':
+							return dom.setStyle(n, v.name, v.value);
+
+						case 'removeformat':
+							return dom.setAttrib(n, 'class', '');
+					}
+				}
+			};
+
+			// Setup regexp
+			re = ed.settings.merge_styles_invalid_parents;
+			if (tinymce.is(re, 'string'))
+				re = new RegExp(re, 'i');
+
+			// Set style info on selected element
+			if (e = t.getSelectedElement())
+				set(e, 1);
+			else {
+				// Generate wrappers and set styles on them
+				d.execCommand('FontName', false, '__');
+				each(isWebKit ? dom.select('span') : dom.select('font'), function(n) {
+					var sp, e;
+
+					if (dom.getAttrib(n, 'face') == '__' || n.style.fontFamily === '__') {
+						sp = dom.create(nn, {mce_new : '1'});
+
+						set(sp);
+
+						each (n.childNodes, function(n) {
+							sp.appendChild(n.cloneNode(true));
+						});
+
+						dom.replace(sp, n);
+					}
+				});
+			}
+
+			// Remove wrappers inside new ones
+			each(dom.select(nn).reverse(), function(n) {
+				var p = n.parentNode;
+
+				// Check if it's an old span in a new wrapper
+				if (!dom.getAttrib(n, 'mce_new')) {
+					// Find new wrapper
+					p = dom.getParent(n, function(n) {
+						return n.nodeType == 1 && dom.getAttrib(n, 'mce_new');
+					});
+
+					if (p)
+						dom.remove(n, 1);
+				}
+			});
+
+			// Merge wrappers with parent wrappers
+			each(dom.select(nn).reverse(), function(n) {
+				var p = n.parentNode;
+
+				if (!p || !dom.getAttrib(n, 'mce_new'))
+					return;
+
+				// Has parent of the same type and only child
+				if (p.nodeName == nn.toUpperCase() && p.childNodes.length == 1)
+					return dom.remove(p, 1);
+
+				// Has parent that is more suitable to have the class and only child
+				if (n.nodeType == 1 && (!re || !re.test(p.nodeName)) && p.childNodes.length == 1) {
+					set(p); // Set style info on parent instead
+					dom.setAttrib(n, 'class', '');
+				}
+			});
+
+			// Remove empty wrappers
+			each(dom.select(nn).reverse(), function(n) {
+				if (dom.getAttrib(n, 'mce_new') || (dom.getAttribs(n).length <= 1 && n.className === '')) {
+					if (!dom.getAttrib(n, 'class') && !dom.getAttrib(n, 'style'))
+						return dom.remove(n, 1);
+
+					dom.setAttrib(n, 'mce_new', ''); // Remove mce_new marker
+				}
+			});
+
+			s.moveToBookmark(b);
+		},
+
+		queryStateJustify : function(c, v) {
+			var ed = this.editor, n = ed.selection.getNode(), dom = ed.dom;
+
+			if (n && n.nodeName == 'IMG') {
+				if (dom.getStyle(n, 'float') == v)
+					return 1;
+
+				return n.parentNode.style.textAlign == v;
+			}
+
+			n = dom.getParent(ed.selection.getStart(), function(n) {
+				return n.nodeType == 1 && n.style.textAlign;
+			});
+
+			if (v == 'full')
+				v = 'justify';
+
+			if (ed.settings.inline_styles)
+				return (n && n.style.textAlign == v);
+
+			return this._queryState(c);
+		},
+
+		HiliteColor : function(ui, val) {
+			var t = this, ed = t.editor, d = ed.getDoc();
+
+			function set(s) {
+				if (!isGecko)
+					return;
+
+				try {
+					// Try new Gecko method
+					d.execCommand("styleWithCSS", 0, s);
+				} catch (ex) {
+					// Use old
+					d.execCommand("useCSS", 0, !s);
+				}
+			};
+
+			if (isGecko || isOpera) {
+				set(true);
+				d.execCommand('hilitecolor', false, val);
+				set(false);
+			} else
+				d.execCommand('BackColor', false, val);
+		},
+
+		Undo : function() {
+			var ed = this.editor;
+
+			if (ed.settings.custom_undo_redo) {
+				ed.undoManager.undo();
+				ed.nodeChanged();
+			} else
+				ed.getDoc().execCommand('Undo', false, null);
+		},
+
+		Redo : function() {
+			var ed = this.editor;
+
+			if (ed.settings.custom_undo_redo) {
+				ed.undoManager.redo();
+				ed.nodeChanged();
+			} else
+				ed.getDoc().execCommand('Redo', false, null);
+		},
+
+		FormatBlock : function(ui, val) {
+			var t = this, ed = t.editor, s = ed.selection, dom = ed.dom, bl, nb, b;
+
+			function isBlock(n) {
+				return /^(P|DIV|H[1-6]|ADDRESS|BLOCKQUOTE|PRE)$/.test(n.nodeName);
+			};
+
+			bl = dom.getParent(s.getNode(), function(n) {
+				return isBlock(n);
+			});
+
+			// IE has an issue where it removes the parent div if you change format on the paragrah in <div><p>Content</p></div>
+			// FF and Opera doesn't change parent DIV elements if you switch format
+			if (bl) {
+				if ((isIE && isBlock(bl.parentNode)) || bl.nodeName == 'DIV') {
+					// Rename block element
+					nb = ed.dom.create(val);
+
+					each(dom.getAttribs(bl), function(v) {
+						dom.setAttrib(nb, v.nodeName, dom.getAttrib(bl, v.nodeName));
+					});
+
+					b = s.getBookmark();
+					dom.replace(nb, bl, 1);
+					s.moveToBookmark(b);
+					ed.nodeChanged();
+					return;
+				}
+			}
+
+			val = ed.settings.forced_root_block ? (val || '<p>') : val;
+
+			if (val.indexOf('<') == -1)
+				val = '<' + val + '>';
+
+			if (tinymce.isGecko)
+				val = val.replace(/<(div|blockquote|code|dt|dd|dl|samp)>/gi, '$1');
+
+			ed.getDoc().execCommand('FormatBlock', false, val);
+		},
+
+		mceCleanup : function() {
+			var ed = this.editor, s = ed.selection, b = s.getBookmark();
+			ed.setContent(ed.getContent());
+			s.moveToBookmark(b);
+		},
+
+		mceRemoveNode : function(ui, val) {
+			var ed = this.editor, s = ed.selection, b, n = val || s.getNode();
+
+			// Make sure that the body node isn't removed
+			if (n == ed.getBody())
+				return;
+
+			b = s.getBookmark();
+			ed.dom.remove(n, 1);
+			s.moveToBookmark(b);
+			ed.nodeChanged();
+		},
+
+		mceSelectNodeDepth : function(ui, val) {
+			var ed = this.editor, s = ed.selection, c = 0;
+
+			ed.dom.getParent(s.getNode(), function(n) {
+				if (n.nodeType == 1 && c++ == val) {
+					s.select(n);
+					ed.nodeChanged();
+					return false;
+				}
+			}, ed.getBody());
+		},
+
+		mceSelectNode : function(u, v) {
+			this.editor.selection.select(v);
+		},
+
+		mceInsertContent : function(ui, val) {
+			this.editor.selection.setContent(val);
+		},
+
+		mceInsertRawHTML : function(ui, val) {
+			var ed = this.editor;
+
+			ed.selection.setContent('tiny_mce_marker');
+			ed.setContent(ed.getContent().replace(/tiny_mce_marker/g, val));
+		},
+
+		mceRepaint : function() {
+			var s, b, e = this.editor;
+
+			if (tinymce.isGecko) {
+				try {
+					s = e.selection;
+					b = s.getBookmark(true);
+
+					if (s.getSel())
+						s.getSel().selectAllChildren(e.getBody());
+
+					s.collapse(true);
+					s.moveToBookmark(b);
+				} catch (ex) {
+					// Ignore
+				}
+			}
+		},
+
+		queryStateUnderline : function() {
+			var ed = this.editor, n = ed.selection.getNode();
+
+			if (n && n.nodeName == 'A')
+				return false;
+
+			return this._queryState('Underline');
+		},
+
+		queryStateOutdent : function() {
+			var ed = this.editor, n;
+
+			if (ed.settings.inline_styles) {
+				if ((n = ed.dom.getParent(ed.selection.getStart(), ed.dom.isBlock)) && parseInt(n.style.paddingLeft) > 0)
+					return true;
+
+				if ((n = ed.dom.getParent(ed.selection.getEnd(), ed.dom.isBlock)) && parseInt(n.style.paddingLeft) > 0)
+					return true;
+			} else
+				return !!ed.dom.getParent(ed.selection.getNode(), 'BLOCKQUOTE');
+
+			return this.queryStateInsertUnorderedList() || this.queryStateInsertOrderedList();
+		},
+
+		queryStateInsertUnorderedList : function() {
+			return this.editor.dom.getParent(this.editor.selection.getNode(), 'UL');
+		},
+
+		queryStateInsertOrderedList : function() {
+			return this.editor.dom.getParent(this.editor.selection.getNode(), 'OL');
+		},
+
+		queryStatemceBlockQuote : function() {
+			return !!this.editor.dom.getParent(this.editor.selection.getStart(), function(n) {return n.nodeName === 'BLOCKQUOTE';});
+		},
+
+		mceBlockQuote : function() {
+			var t = this, ed = t.editor, s = ed.selection, dom = ed.dom, sb, eb, n, bm, bq, r, bq2, i, nl;
+
+			function getBQ(e) {
+				return dom.getParent(e, function(n) {return n.nodeName === 'BLOCKQUOTE';});
+			};
+
+			// Get start/end block
+			sb = dom.getParent(s.getStart(), dom.isBlock);
+			eb = dom.getParent(s.getEnd(), dom.isBlock);
+
+			// Remove blockquote(s)
+			if (bq = getBQ(sb)) {
+				if (sb != eb || sb.childNodes.length > 1 || (sb.childNodes.length == 1 && sb.firstChild.nodeName != 'BR'))
+					bm = s.getBookmark();
+
+				// Move all elements after the end block into new bq
+				if (getBQ(eb)) {
+					bq2 = bq.cloneNode(false);
+
+					while (n = eb.nextSibling)
+						bq2.appendChild(n.parentNode.removeChild(n));
+				}
+
+				// Add new bq after
+				if (bq2)
+					dom.insertAfter(bq2, bq);
+
+				// Move all selected blocks after the current bq
+				nl = t._getSelectedBlocks(sb, eb);
+				for (i = nl.length - 1; i >= 0; i--) {
+					dom.insertAfter(nl[i], bq);
+				}
+
+				// Empty bq, then remove it
+				if (/^\s*$/.test(bq.innerHTML))
+					dom.remove(bq, 1); // Keep children so boomark restoration works correctly
+
+				// Empty bq, then remote it
+				if (bq2 && /^\s*$/.test(bq2.innerHTML))
+					dom.remove(bq2, 1); // Keep children so boomark restoration works correctly
+
+				if (!bm) {
+					// Move caret inside empty block element
+					if (!isIE) {
+						r = ed.getDoc().createRange();
+						r.setStart(sb, 0);
+						r.setEnd(sb, 0);
+						s.setRng(r);
+					} else {
+						s.select(sb);
+						s.collapse(0);
+
+						// IE misses the empty block some times element so we must move back the caret
+						if (dom.getParent(s.getStart(), dom.isBlock) != sb) {
+							r = s.getRng();
+							r.move('character', -1);
+							r.select();
+						}
+					}
+				} else
+					t.editor.selection.moveToBookmark(bm);
+
+				return;
+			}
+
+			// Since IE can start with a totally empty document we need to add the first bq and paragraph
+			if (isIE && !sb && !eb) {
+				t.editor.getDoc().execCommand('Indent');
+				n = getBQ(s.getNode());
+				n.style.margin = n.dir = ''; // IE adds margin and dir to bq
+				return;
+			}
+
+			if (!sb || !eb)
+				return;
+
+			// If empty paragraph node then do not use bookmark
+			if (sb != eb || sb.childNodes.length > 1 || (sb.childNodes.length == 1 && sb.firstChild.nodeName != 'BR'))
+				bm = s.getBookmark();
+
+			// Move selected block elements into a bq
+			each(t._getSelectedBlocks(getBQ(s.getStart()), getBQ(s.getEnd())), function(e) {
+				// Found existing BQ add to this one
+				if (e.nodeName == 'BLOCKQUOTE' && !bq) {
+					bq = e;
+					return;
+				}
+
+				// No BQ found, create one
+				if (!bq) {
+					bq = dom.create('blockquote');
+					e.parentNode.insertBefore(bq, e);
+				}
+
+				// Add children from existing BQ
+				if (e.nodeName == 'BLOCKQUOTE' && bq) {
+					n = e.firstChild;
+
+					while (n) {
+						bq.appendChild(n.cloneNode(true));
+						n = n.nextSibling;
+					}
+
+					dom.remove(e);
+					return;
+				}
+
+				// Add non BQ element to BQ
+				bq.appendChild(dom.remove(e));
+			});
+
+			if (!bm) {
+				// Move caret inside empty block element
+				if (!isIE) {
+					r = ed.getDoc().createRange();
+					r.setStart(sb, 0);
+					r.setEnd(sb, 0);
+					s.setRng(r);
+				} else {
+					s.select(sb);
+					s.collapse(1);
+				}
+			} else
+				s.moveToBookmark(bm);
+		},
+/*
+		_mceBlockQuote : function() {
+			var t = this, s = t.editor.selection, b = s.getBookmark(), bq, dom = t.editor.dom;
+
+			function findBQ(e) {
+				return dom.getParent(e, function(n) {return n.nodeName === 'BLOCKQUOTE';});
+			};
+
+			// Remove blockquote(s)
+			if (findBQ(s.getStart())) {
+				each(t._getSelectedBlocks(findBQ(s.getStart()), findBQ(s.getEnd())), function(e) {
+					// Found BQ lets remove it
+					if (e.nodeName == 'BLOCKQUOTE')
+						dom.remove(e, 1);
+				});
+
+				t.editor.selection.moveToBookmark(b);
+				return;
+			}
+
+			each(t._getSelectedBlocks(findBQ(s.getStart()), findBQ(s.getEnd())), function(e) {
+				var n;
+
+				// Found existing BQ add to this one
+				if (e.nodeName == 'BLOCKQUOTE' && !bq) {
+					bq = e;
+					return;
+				}
+
+				// No BQ found, create one
+				if (!bq) {
+					bq = dom.create('blockquote');
+					e.parentNode.insertBefore(bq, e);
+				}
+
+				// Add children from existing BQ
+				if (e.nodeName == 'BLOCKQUOTE' && bq) {
+					n = e.firstChild;
+
+					while (n) {
+						bq.appendChild(n.cloneNode(true));
+						n = n.nextSibling;
+					}
+
+					dom.remove(e);
+
+					return;
+				}
+
+				// Add non BQ element to BQ
+				bq.appendChild(dom.remove(e));
+			});
+
+			t.editor.selection.moveToBookmark(b);
+		},
+*/
+		_getSelectedBlocks : function(st, en) {
+			var ed = this.editor, dom = ed.dom, s = ed.selection, sb, eb, n, bl = [];
+
+			sb = dom.getParent(st || s.getStart(), dom.isBlock);
+			eb = dom.getParent(en || s.getEnd(), dom.isBlock);
+
+			if (sb)
+				bl.push(sb);
+
+			if (sb && eb && sb != eb) {
+				n = sb;
+
+				while ((n = n.nextSibling) && n != eb) {
+					if (dom.isBlock(n))
+						bl.push(n);
+				}
+			}
+
+			if (eb && sb != eb)
+				bl.push(eb);
+
+			return bl;
+		}
+	});
+})();
+
+
+/* file:jscripts/tiny_mce/classes/UndoManager.js */
+
+tinymce.create('tinymce.UndoManager', {
+	index : 0,
+	data : null,
+	typing : 0,
+
+	UndoManager : function(ed) {
+		var t = this, Dispatcher = tinymce.util.Dispatcher;
+
+		t.editor = ed;
+		t.data = [];
+		t.onAdd = new Dispatcher(this);
+		t.onUndo = new Dispatcher(this);
+		t.onRedo = new Dispatcher(this);
+	},
+
+	add : function(l) {
+		var t = this, i, ed = t.editor, b, s = ed.settings, la;
+
+		l = l || {};
+		l.content = l.content || ed.getContent({format : 'raw', no_events : 1});
+
+		// Add undo level if needed
+		l.content = l.content.replace(/^\s*|\s*$/g, '');
+		la = t.data[t.index > 0 && (t.index == 0 || t.index == t.data.length) ? t.index - 1 : t.index];
+		if (!l.initial && la && l.content == la.content)
+			return null;
+
+		// Time to compress
+		if (s.custom_undo_redo_levels) {
+			if (t.data.length > s.custom_undo_redo_levels) {
+				for (i = 0; i < t.data.length - 1; i++)
+					t.data[i] = t.data[i + 1];
+
+				t.data.length--;
+				t.index = t.data.length;
+			}
+		}
+
+		if (s.custom_undo_redo_restore_selection && !l.initial)
+			l.bookmark = b = l.bookmark || ed.selection.getBookmark();
+
+		if (t.index < t.data.length)
+			t.index++;
+
+		// Only initial marked undo levels should be allowed as first item
+		// This to workaround a bug with Firefox and the blur event
+		if (t.data.length === 0 && !l.initial)
+			return null;
+
+		// Add level
+		t.data.length = t.index + 1;
+		t.data[t.index++] = l;
+
+		if (l.initial)
+			t.index = 0;
+
+		// Set initial bookmark use first real undo level
+		if (t.data.length == 2 && t.data[0].initial)
+			t.data[0].bookmark = b;
+
+		t.onAdd.dispatch(t, l);
+		ed.isNotDirty = 0;
+
+		//console.dir(t.data);
+
+		return l;
+	},
+
+	undo : function() {
+		var t = this, ed = t.editor, l = l, i;
+
+		if (t.typing) {
+			t.add();
+			t.typing = 0;
+		}
+
+		if (t.index > 0) {
+			// If undo on last index then take snapshot
+			if (t.index == t.data.length && t.index > 1) {
+				i = t.index;
+				t.typing = 0;
+
+				if (!t.add())
+					t.index = i;
+
+				--t.index;
+			}
+
+			l = t.data[--t.index];
+			ed.setContent(l.content, {format : 'raw'});
+			ed.selection.moveToBookmark(l.bookmark);
+
+			t.onUndo.dispatch(t, l);
+		}
+
+		return l;
+	},
+
+	redo : function() {
+		var t = this, ed = t.editor, l = null;
+
+		if (t.index < t.data.length - 1) {
+			l = t.data[++t.index];
+			ed.setContent(l.content, {format : 'raw'});
+			ed.selection.moveToBookmark(l.bookmark);
+
+			t.onRedo.dispatch(t, l);
+		}
+
+		return l;
+	},
+
+	clear : function() {
+		var t = this;
+
+		t.data = [];
+		t.index = 0;
+		t.typing = 0;
+		t.add({initial : true});
+	},
+
+	hasUndo : function() {
+		return this.index != 0 || this.typing;
+	},
+
+	hasRedo : function() {
+		return this.index < this.data.length - 1;
+	}
+
+	});
+/* file:jscripts/tiny_mce/classes/ForceBlocks.js */
+
+(function() {
+	// Shorten names
+	var Event, isIE, isGecko, isOpera, each, extend;
+
+	Event = tinymce.dom.Event;
+	isIE = tinymce.isIE;
+	isGecko = tinymce.isGecko;
+	isOpera = tinymce.isOpera;
+	each = tinymce.each;
+	extend = tinymce.extend;
+
+	tinymce.create('tinymce.ForceBlocks', {
+		ForceBlocks : function(ed) {
+			var t = this, s = ed.settings, elm;
+
+			t.editor = ed;
+			t.dom = ed.dom;
+			elm = (s.forced_root_block || 'p').toLowerCase();
+			s.element = elm.toUpperCase();
+
+			ed.onPreInit.add(t.setup, t);
+
+			t.reOpera = new RegExp('(\\u00a0|&#160;|&nbsp;)<\/' + elm + '>', 'gi');
+			t.rePadd = new RegExp('<p( )([^>]+)><\\\/p>|<p( )([^>]+)\\\/>|<p( )([^>]+)>\\s+<\\\/p>|<p><\\\/p>|<p\\\/>|<p>\\s+<\\\/p>'.replace(/p/g, elm), 'gi');
+			t.reNbsp2BR1 = new RegExp('<p( )([^>]+)>[\\s\\u00a0]+<\\\/p>|<p>[\\s\\u00a0]+<\\\/p>'.replace(/p/g, elm), 'gi');
+			t.reNbsp2BR2 = new RegExp('<p( )([^>]+)>(&nbsp;|&#160;)<\\\/p>|<p>(&nbsp;|&#160;)<\\\/p>'.replace(/p/g, elm), 'gi');
+			t.reBR2Nbsp = new RegExp('<p( )([^>]+)>\\s*<br \\\/>\\s*<\\\/p>|<p>\\s*<br \\\/>\\s*<\\\/p>'.replace(/p/g, elm), 'gi');
+			t.reTrailBr = new RegExp('\\s*<br \\/>\\s*<\\\/p>'.replace(/p/g, elm), 'gi');
+
+			function padd(ed, o) {
+				if (isOpera)
+					o.content = o.content.replace(t.reOpera, '</' + elm + '>');
+
+				o.content = o.content.replace(t.rePadd, '<' + elm + '$1$2$3$4$5$6>\u00a0</' + elm + '>');
+
+				if (!isIE && !isOpera && o.set) {
+					// Use &nbsp; instead of BR in padded paragraphs
+					o.content = o.content.replace(t.reNbsp2BR1, '<' + elm + '$1$2><br /></' + elm + '>');
+					o.content = o.content.replace(t.reNbsp2BR2, '<' + elm + '$1$2><br /></' + elm + '>');
+				} else {
+					o.content = o.content.replace(t.reBR2Nbsp, '<' + elm + '$1$2>\u00a0</' + elm + '>');
+					o.content = o.content.replace(t.reTrailBr, '</' + elm + '>');
+				}
+			};
+
+			ed.onBeforeSetContent.add(padd);
+			ed.onPostProcess.add(padd);
+
+			if (s.forced_root_block) {
+				ed.onInit.add(t.forceRoots, t);
+				ed.onSetContent.add(t.forceRoots, t);
+				ed.onBeforeGetContent.add(t.forceRoots, t);
+			}
+		},
+
+		setup : function() {
+			var t = this, ed = t.editor, s = ed.settings;
+
+			// Force root blocks when typing and when getting output
+			if (s.forced_root_block) {
+				ed.onKeyUp.add(t.forceRoots, t);
+				ed.onPreProcess.add(t.forceRoots, t);
+			}
+
+			if (s.force_br_newlines) {
+				// Force IE to produce BRs on enter
+				if (isIE) {
+					ed.onKeyPress.add(function(ed, e) {
+						var n, s = ed.selection;
+
+						if (e.keyCode == 13 && s.getNode().nodeName != 'LI') {
+							s.setContent('<br id="__" /> ', {format : 'raw'});
+							n = ed.dom.get('__');
+							n.removeAttribute('id');
+							s.select(n);
+							s.collapse();
+							return Event.cancel(e);
+						}
+					});
+				}
+
+				return;
+			}
+
+			if (!isIE && s.force_p_newlines) {
+/*				ed.onPreProcess.add(function(ed, o) {
+					each(ed.dom.select('br', o.node), function(n) {
+						var p = n.parentNode;
+
+						// Replace <p><br /></p> with <p>&nbsp;</p>
+						if (p && p.nodeName == 'p' && (p.childNodes.length == 1 || p.lastChild == n)) {
+							p.replaceChild(ed.getDoc().createTextNode('\u00a0'), n);
+						}
+					});
+				});*/
+
+				ed.onKeyPress.add(function(ed, e) {
+					if (e.keyCode == 13 && !e.shiftKey) {
+						if (!t.insertPara(e))
+							Event.cancel(e);
+					}
+				});
+
+				if (isGecko) {
+					ed.onKeyDown.add(function(ed, e) {
+						if ((e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey)
+							t.backspaceDelete(e, e.keyCode == 8);
+					});
+				}
+			}
+
+			function ren(rn, na) {
+				var ne = ed.dom.create(na);
+
+				each(rn.attributes, function(a) {
+					if (a.specified && a.nodeValue)
+						ne.setAttribute(a.nodeName.toLowerCase(), a.nodeValue);
+				});
+
+				each(rn.childNodes, function(n) {
+					ne.appendChild(n.cloneNode(true));
+				});
+
+				rn.parentNode.replaceChild(ne, rn);
+
+				return ne;
+			};
+
+			// Replaces IE:s auto generated paragraphs with the specified element name
+			if (isIE && s.element != 'P') {
+				ed.onKeyPress.add(function(ed, e) {
+					t.lastElm = ed.selection.getNode().nodeName;
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					var bl, sel = ed.selection, n = sel.getNode(), b = ed.getBody();
+
+					if (b.childNodes.length === 1 && n.nodeName == 'P') {
+						n = ren(n, s.element);
+						sel.select(n);
+						sel.collapse();
+						ed.nodeChanged();
+					} else if (e.keyCode == 13 && !e.shiftKey && t.lastElm != 'P') {
+						bl = ed.dom.getParent(n, 'P');
+
+						if (bl) {
+							ren(bl, s.element);
+							ed.nodeChanged();
+						}
+					}
+				});
+			}
+		},
+
+		find : function(n, t, s) {
+			var ed = this.editor, w = ed.getDoc().createTreeWalker(n, 4, null, false), c = -1;
+
+			while (n = w.nextNode()) {
+				c++;
+
+				// Index by node
+				if (t == 0 && n == s)
+					return c;
+
+				// Node by index
+				if (t == 1 && c == s)
+					return n;
+			}
+
+			return -1;
+		},
+
+		forceRoots : function(ed, e) {
+			var t = this, ed = t.editor, b = ed.getBody(), d = ed.getDoc(), se = ed.selection, s = se.getSel(), r = se.getRng(), si = -2, ei, so, eo, tr, c = -0xFFFFFF;
+			var nx, bl, bp, sp, le, nl = b.childNodes, i;
+
+			// Fix for bug #1863847
+			if (e && e.keyCode == 13)
+				return true;
+
+			// Wrap non blocks into blocks
+			for (i = nl.length - 1; i >= 0; i--) {
+				nx = nl[i];
+
+				// Is text or non block element
+				if (nx.nodeType == 3 || (!t.dom.isBlock(nx) && nx.nodeType != 8)) {
+					if (!bl) {
+						// Create new block but ignore whitespace
+						if (nx.nodeType != 3 || /[^\s]/g.test(nx.nodeValue)) {
+							// Store selection
+							if (si == -2 && r) {
+								if (!isIE) {
+									// If element is inside body, might not be the case in contentEdiable mode
+									if (ed.dom.getParent(r.startContainer, function(e) {return e === b;})) {
+										so = r.startOffset;
+										eo = r.endOffset;
+										si = t.find(b, 0, r.startContainer);
+										ei = t.find(b, 0, r.endContainer);
+									}
+								} else {
+									tr = d.body.createTextRange();
+									tr.moveToElementText(b);
+									tr.collapse(1);
+									bp = tr.move('character', c) * -1;
+
+									tr = r.duplicate();
+									tr.collapse(1);
+									sp = tr.move('character', c) * -1;
+
+									tr = r.duplicate();
+									tr.collapse(0);
+									le = (tr.move('character', c) * -1) - sp;
+
+									si = sp - bp;
+									ei = le;
+								}
+							}
+
+							bl = ed.dom.create(ed.settings.forced_root_block);
+							bl.appendChild(nx.cloneNode(1));
+							nx.parentNode.replaceChild(bl, nx);
+						}
+					} else {
+						if (bl.hasChildNodes())
+							bl.insertBefore(nx, bl.firstChild);
+						else
+							bl.appendChild(nx);
+					}
+				} else
+					bl = null; // Time to create new block
+			}
+
+			// Restore selection
+			if (si != -2) {
+				if (!isIE) {
+					bl = b.getElementsByTagName(ed.settings.element)[0];
+					r = d.createRange();
+
+					// Select last location or generated block
+					if (si != -1)
+						r.setStart(t.find(b, 1, si), so);
+					else
+						r.setStart(bl, 0);
+
+					// Select last location or generated block
+					if (ei != -1)
+						r.setEnd(t.find(b, 1, ei), eo);
+					else
+						r.setEnd(bl, 0);
+
+					if (s) {
+						s.removeAllRanges();
+						s.addRange(r);
+					}
+				} else {
+					try {
+						r = s.createRange();
+						r.moveToElementText(b);
+						r.collapse(1);
+						r.moveStart('character', si);
+						r.moveEnd('character', ei);
+						r.select();
+					} catch (ex) {
+						// Ignore
+					}
+				}
+			}
+		},
+
+		getParentBlock : function(n) {
+			var d = this.dom;
+
+			return d.getParent(n, d.isBlock);
+		},
+
+		insertPara : function(e) {
+			var t = this, ed = t.editor, dom = ed.dom, d = ed.getDoc(), se = ed.settings, s = ed.selection.getSel(), r = s.getRangeAt(0), b = d.body;
+			var rb, ra, dir, sn, so, en, eo, sb, eb, bn, bef, aft, sc, ec, n, vp = dom.getViewPort(ed.getWin()), y, ch;
+
+			function isEmpty(n) {
+				n = n.innerHTML;
+				n = n.replace(/<(img|hr|table)/gi, '-'); // Keep these convert them to - chars
+				n = n.replace(/<[^>]+>/g, ''); // Remove all tags
+
+				return n.replace(/[ \t\r\n]+/g, '') == '';
+			};
+
+			// If root blocks are forced then use Operas default behavior since it's really good
+// Removed due to bug: #1853816
+//			if (se.forced_root_block && isOpera)
+//				return true;
+
+			// Setup before range
+			rb = d.createRange();
+
+			// If is before the first block element and in body, then move it into first block element
+			rb.setStart(s.anchorNode, s.anchorOffset);
+			rb.collapse(true);
+
+			// Setup after range
+			ra = d.createRange();
+
+			// If is before the first block element and in body, then move it into first block element
+			ra.setStart(s.focusNode, s.focusOffset);
+			ra.collapse(true);
+
+			// Setup start/end points
+			dir = rb.compareBoundaryPoints(rb.START_TO_END, ra) < 0;
+			sn = dir ? s.anchorNode : s.focusNode;
+			so = dir ? s.anchorOffset : s.focusOffset;
+			en = dir ? s.focusNode : s.anchorNode;
+			eo = dir ? s.focusOffset : s.anchorOffset;
+
+			// If selection is in empty table cell
+			if (sn === en && /^(TD|TH)$/.test(sn.nodeName)) {
+				dom.remove(sn.firstChild); // Remove BR
+
+				// Create two new block elements
+				ed.dom.add(sn, se.element, null, '<br />');
+				aft = ed.dom.add(sn, se.element, null, '<br />');
+
+				// Move caret into the last one
+				r = d.createRange();
+				r.selectNodeContents(aft);
+				r.collapse(1);
+				ed.selection.setRng(r);
+
+				return false;
+			}
+
+			// If the caret is in an invalid location in FF we need to move it into the first block
+			if (sn == b && en == b && b.firstChild && ed.dom.isBlock(b.firstChild)) {
+				sn = en = sn.firstChild;
+				so = eo = 0;
+				rb = d.createRange();
+				rb.setStart(sn, 0);
+				ra = d.createRange();
+				ra.setStart(en, 0);
+			}
+
+			// Never use body as start or end node
+			sn = sn.nodeName == "HTML" ? d.body : sn; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes
+			sn = sn.nodeName == "BODY" ? sn.firstChild : sn;
+			en = en.nodeName == "HTML" ? d.body : en; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes
+			en = en.nodeName == "BODY" ? en.firstChild : en;
+
+			// Get start and end blocks
+			sb = t.getParentBlock(sn);
+			eb = t.getParentBlock(en);
+			bn = sb ? sb.nodeName : se.element; // Get block name to create
+
+			// Return inside list use default browser behavior
+			if (t.dom.getParent(sb, function(n) { return /OL|UL|PRE/.test(n.nodeName); }))
+				return true;
+
+			// If caption or absolute layers then always generate new blocks within
+			if (sb && (sb.nodeName == 'CAPTION' || /absolute|relative|static/gi.test(sb.style.position))) {
+				bn = se.element;
+				sb = null;
+			}
+
+			// If caption or absolute layers then always generate new blocks within
+			if (eb && (eb.nodeName == 'CAPTION' || /absolute|relative|static/gi.test(eb.style.position))) {
+				bn = se.element;
+				eb = null;
+			}
+
+			// Use P instead
+			if (/(TD|TABLE|TH|CAPTION)/.test(bn) || (sb && bn == "DIV" && /left|right/gi.test(sb.style.cssFloat))) {
+				bn = se.element;
+				sb = eb = null;
+			}
+
+			// Setup new before and after blocks
+			bef = (sb && sb.nodeName == bn) ? sb.cloneNode(0) : ed.dom.create(bn);
+			aft = (eb && eb.nodeName == bn) ? eb.cloneNode(0) : ed.dom.create(bn);
+
+			// Remove id from after clone
+			aft.removeAttribute('id');
+
+			// Is header and cursor is at the end, then force paragraph under
+			if (/^(H[1-6])$/.test(bn) && sn.nodeValue && so == sn.nodeValue.length)
+				aft = ed.dom.create(se.element);
+
+			// Find start chop node
+			n = sc = sn;
+			do {
+				if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))
+					break;
+
+				sc = n;
+			} while ((n = n.previousSibling ? n.previousSibling : n.parentNode));
+
+			// Find end chop node
+			n = ec = en;
+			do {
+				if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))
+					break;
+
+				ec = n;
+			} while ((n = n.nextSibling ? n.nextSibling : n.parentNode));
+
+			// Place first chop part into before block element
+			if (sc.nodeName == bn)
+				rb.setStart(sc, 0);
+			else
+				rb.setStartBefore(sc);
+
+			rb.setEnd(sn, so);
+			bef.appendChild(rb.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari
+
+			// Place secnd chop part within new block element
+			try {
+				ra.setEndAfter(ec);
+			} catch(ex) {
+				//console.debug(s.focusNode, s.focusOffset);
+			}
+
+			ra.setStart(en, eo);
+			aft.appendChild(ra.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari
+
+			// Create range around everything
+			r = d.createRange();
+			if (!sc.previousSibling && sc.parentNode.nodeName == bn) {
+				r.setStartBefore(sc.parentNode);
+			} else {
+				if (rb.startContainer.nodeName == bn && rb.startOffset == 0)
+					r.setStartBefore(rb.startContainer);
+				else
+					r.setStart(rb.startContainer, rb.startOffset);
+			}
+
+			if (!ec.nextSibling && ec.parentNode.nodeName == bn)
+				r.setEndAfter(ec.parentNode);
+			else
+				r.setEnd(ra.endContainer, ra.endOffset);
+
+			// Delete and replace it with new block elements
+			r.deleteContents();
+
+			if (isOpera)
+				ed.getWin().scrollTo(0, vp.y);
+
+			// Never wrap blocks in blocks
+			if (bef.firstChild && bef.firstChild.nodeName == bn)
+				bef.innerHTML = bef.firstChild.innerHTML;
+
+			if (aft.firstChild && aft.firstChild.nodeName == bn)
+				aft.innerHTML = aft.firstChild.innerHTML;
+
+			// Padd empty blocks
+			if (isEmpty(bef))
+				bef.innerHTML = '<br />';
+
+			if (isEmpty(aft))
+				aft.innerHTML = isOpera ? '&nbsp;' : '<br />'; // Extra space for Opera so that the caret can move there
+
+			// Opera needs this one backwards for older versions
+			if (isOpera && parseFloat(opera.version()) < 9.5) {
+				r.insertNode(bef);
+				r.insertNode(aft);
+			} else {
+				r.insertNode(aft);
+				r.insertNode(bef);
+			}
+
+			// Normalize
+			aft.normalize();
+			bef.normalize();
+
+			function first(n) {
+				return d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false).nextNode() || n;
+			};
+
+			// Move cursor and scroll into view
+			r = d.createRange();
+			r.selectNodeContents(isGecko ? first(aft) : aft);
+			r.collapse(1);
+			s.removeAllRanges();
+			s.addRange(r);
+
+			// scrollIntoView seems to scroll the parent window in most browsers now including FF 3.0b4 so it's time to stop using it and do it our selfs
+			y = ed.dom.getPos(aft).y;
+			ch = aft.clientHeight;
+
+			// Is element within viewport
+			if (y < vp.y || y + ch > vp.y + vp.h) {
+				ed.getWin().scrollTo(0, y < vp.y ? y : y - vp.h + ch);
+				//console.debug('SCROLL!', 'vp.y: ' + vp.y, 'y' + y, 'vp.h' + vp.h, 'clientHeight' + aft.clientHeight, 'yyy: ' + (y < vp.y ? y : y - vp.h + aft.clientHeight));
+			}
+
+			return false;
+		},
+
+		backspaceDelete : function(e, bs) {
+			var t = this, ed = t.editor, b = ed.getBody(), n, se = ed.selection, r = se.getRng(), sc = r.startContainer, n, w, tn;
+
+			// The caret sometimes gets stuck in Gecko if you delete empty paragraphs
+			// This workaround removes the element by hand and moves the caret to the previous element
+			if (sc && ed.dom.isBlock(sc) && !/^(TD|TH)$/.test(sc.nodeName) && bs) {
+				if (sc.childNodes.length == 0 || (sc.childNodes.length == 1 && sc.firstChild.nodeName == 'BR')) {
+					// Find previous block element
+					n = sc;
+					while ((n = n.previousSibling) && !ed.dom.isBlock(n)) ;
+
+					if (n) {
+						if (sc != b.firstChild) {
+							// Find last text node
+							w = ed.dom.doc.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
+							while (tn = w.nextNode())
+								n = tn;
+
+							// Place caret at the end of last text node
+							r = ed.getDoc().createRange();
+							r.setStart(n, n.nodeValue ? n.nodeValue.length : 0);
+							r.setEnd(n, n.nodeValue ? n.nodeValue.length : 0);
+							se.setRng(r);
+
+							// Remove the target container
+							ed.dom.remove(sc);
+						}
+
+						return Event.cancel(e);
+					}
+				}
+			}
+
+			// Gecko generates BR elements here and there, we don't like those so lets remove them
+			function handler(e) {
+				e = e.target;
+
+				// A new BR was created in a block element, remove it
+				if (e && e.parentNode && e.nodeName == 'BR' && (n = t.getParentBlock(e))) {
+					Event.remove(b, 'DOMNodeInserted', handler);
+
+					// Only remove BR elements that got inserted in the middle of the text
+					if (e.previousSibling || e.nextSibling)
+						ed.dom.remove(e);
+				}
+			};
+
+			// Listen for new nodes
+			Event._add(b, 'DOMNodeInserted', handler);
+
+			// Remove listener
+			window.setTimeout(function() {
+				Event._remove(b, 'DOMNodeInserted', handler);
+			}, 1);
+		}
+	});
+})();
+
+/* file:jscripts/tiny_mce/classes/ControlManager.js */
+
+(function() {
+	// Shorten names
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, extend = tinymce.extend;
+
+	tinymce.create('tinymce.ControlManager', {
+		ControlManager : function(ed, s) {
+			var t = this, i;
+
+			s = s || {};
+			t.editor = ed;
+			t.controls = {};
+			t.onAdd = new tinymce.util.Dispatcher(t);
+			t.onPostRender = new tinymce.util.Dispatcher(t);
+			t.prefix = s.prefix || ed.id + '_';
+			t._cls = {};
+
+			t.onPostRender.add(function() {
+				each(t.controls, function(c) {
+					c.postRender();
+				});
+			});
+		},
+
+		get : function(id) {
+			return this.controls[this.prefix + id] || this.controls[id];
+		},
+
+		setActive : function(id, s) {
+			var c = null;
+
+			if (c = this.get(id))
+				c.setActive(s);
+
+			return c;
+		},
+
+		setDisabled : function(id, s) {
+			var c = null;
+
+			if (c = this.get(id))
+				c.setDisabled(s);
+
+			return c;
+		},
+
+		add : function(c) {
+			var t = this;
+
+			if (c) {
+				t.controls[c.id] = c;
+				t.onAdd.dispatch(c, t);
+			}
+
+			return c;
+		},
+
+		createControl : function(n) {
+			var c, t = this, ed = t.editor;
+
+			each(ed.plugins, function(p) {
+				if (p.createControl) {
+					c = p.createControl(n, t);
+
+					if (c)
+						return false;
+				}
+			});
+
+			switch (n) {
+				case "|":
+				case "separator":
+					return t.createSeparator();
+			}
+
+			if (!c && ed.buttons && (c = ed.buttons[n]))
+				return t.createButton(n, c);
+
+			return t.add(c);
+		},
+
+		createDropMenu : function(id, s, cc) {
+			var t = this, ed = t.editor, c, bm, v, cls;
+
+			s = extend({
+				'class' : 'mceDropDown',
+				constrain : ed.settings.constrain_menus
+			}, s);
+
+			s['class'] = s['class'] + ' ' + ed.getParam('skin') + 'Skin';
+			if (v = ed.getParam('skin_variant'))
+				s['class'] += ' ' + ed.getParam('skin') + 'Skin' + v.substring(0, 1).toUpperCase() + v.substring(1);
+
+			id = t.prefix + id;
+			cls = cc || t._cls.dropmenu || tinymce.ui.DropMenu;
+			c = t.controls[id] = new cls(id, s);
+			c.onAddItem.add(function(c, o) {
+				var s = o.settings;
+
+				s.title = ed.getLang(s.title, s.title);
+
+				if (!s.onclick) {
+					s.onclick = function(v) {
+						ed.execCommand(s.cmd, s.ui || false, s.value);
+					};
+				}
+			});
+
+			ed.onRemove.add(function() {
+				c.destroy();
+			});
+
+			// Fix for bug #1897785, #1898007
+			if (tinymce.isIE) {
+				c.onShowMenu.add(function() {
+					bm = ed.selection.getBookmark(1);
+				});
+
+				c.onHideMenu.add(function() {
+					if (bm)
+						ed.selection.moveToBookmark(bm);
+				});
+			}
+
+			return t.add(c);
+		},
+
+		createListBox : function(id, s, cc) {
+			var t = this, ed = t.editor, cmd, c, cls;
+
+			if (t.get(id))
+				return null;
+
+			s.title = ed.translate(s.title);
+			s.scope = s.scope || ed;
+
+			if (!s.onselect) {
+				s.onselect = function(v) {
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			s = extend({
+				title : s.title,
+				'class' : 'mce_' + id,
+				scope : s.scope,
+				control_manager : t
+			}, s);
+
+			id = t.prefix + id;
+
+			if (ed.settings.use_native_selects)
+				c = new tinymce.ui.NativeListBox(id, s);
+			else {
+				cls = cc || t._cls.listbox || tinymce.ui.ListBox;
+				c = new cls(id, s);
+			}
+
+			t.controls[id] = c;
+
+			// Fix focus problem in Safari
+			if (tinymce.isWebKit) {
+				c.onPostRender.add(function(c, n) {
+					// Store bookmark on mousedown
+					Event.add(n, 'mousedown', function() {
+						ed.bookmark = ed.selection.getBookmark('simple');
+					});
+
+					// Restore on focus, since it might be lost
+					Event.add(n, 'focus', function() {
+						ed.selection.moveToBookmark(ed.bookmark);
+						ed.bookmark = null;
+					});
+				});
+			}
+
+			if (c.hideMenu)
+				ed.onMouseDown.add(c.hideMenu, c);
+
+			return t.add(c);
+		},
+
+		createButton : function(id, s, cc) {
+			var t = this, ed = t.editor, o, c, cls;
+
+			if (t.get(id))
+				return null;
+
+			s.title = ed.translate(s.title);
+			s.label = ed.translate(s.label);
+			s.scope = s.scope || ed;
+
+			if (!s.onclick && !s.menu_button) {
+				s.onclick = function() {
+					ed.execCommand(s.cmd, s.ui || false, s.value);
+				};
+			}
+
+			s = extend({
+				title : s.title,
+				'class' : 'mce_' + id,
+				unavailable_prefix : ed.getLang('unavailable', ''),
+				scope : s.scope,
+				control_manager : t
+			}, s);
+
+			id = t.prefix + id;
+
+			if (s.menu_button) {
+				cls = cc || t._cls.menubutton || tinymce.ui.MenuButton;
+				c = new cls(id, s);
+				ed.onMouseDown.add(c.hideMenu, c);
+			} else {
+				cls = t._cls.button || tinymce.ui.Button;
+				c = new cls(id, s);
+			}
+
+			return t.add(c);
+		},
+
+		createMenuButton : function(id, s) {
+			s = s || {};
+			s.menu_button = 1;
+
+			return this.createButton(id, s);
+		},
+
+		createSplitButton : function(id, s, cc) {
+			var t = this, ed = t.editor, cmd, c, cls;
+
+			if (t.get(id))
+				return null;
+
+			s.title = ed.translate(s.title);
+			s.scope = s.scope || ed;
+
+			if (!s.onclick) {
+				s.onclick = function(v) {
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			if (!s.onselect) {
+				s.onselect = function(v) {
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			s = extend({
+				title : s.title,
+				'class' : 'mce_' + id,
+				scope : s.scope,
+				control_manager : t
+			}, s);
+
+			id = t.prefix + id;
+			cls = cc || t._cls.splitbutton || tinymce.ui.SplitButton;
+			c = t.add(new cls(id, s));
+			ed.onMouseDown.add(c.hideMenu, c);
+
+			return c;
+		},
+
+		createColorSplitButton : function(id, s, cc) {
+			var t = this, ed = t.editor, cmd, c, cls, bm;
+
+			if (t.get(id))
+				return null;
+
+			s.title = ed.translate(s.title);
+			s.scope = s.scope || ed;
+
+			if (!s.onclick) {
+				s.onclick = function(v) {
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			if (!s.onselect) {
+				s.onselect = function(v) {
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			s = extend({
+				title : s.title,
+				'class' : 'mce_' + id,
+				'menu_class' : ed.getParam('skin') + 'Skin',
+				scope : s.scope,
+				more_colors_title : ed.getLang('more_colors')
+			}, s);
+
+			id = t.prefix + id;
+			cls = cc || t._cls.colorsplitbutton || tinymce.ui.ColorSplitButton;
+			c = new cls(id, s);
+			ed.onMouseDown.add(c.hideMenu, c);
+
+			// Remove the menu element when the editor is removed
+			ed.onRemove.add(function() {
+				c.destroy();
+			});
+
+			// Fix for bug #1897785, #1898007
+			if (tinymce.isIE) {
+				c.onShowMenu.add(function() {
+					bm = ed.selection.getBookmark(1);
+				});
+
+				c.onHideMenu.add(function() {
+					if (bm) {
+						ed.selection.moveToBookmark(bm);
+						bm = 0;
+					}
+				});
+			}
+
+			return t.add(c);
+		},
+
+		createToolbar : function(id, s, cc) {
+			var c, t = this, cls;
+
+			id = t.prefix + id;
+			cls = cc || t._cls.toolbar || tinymce.ui.Toolbar;
+			c = new cls(id, s);
+
+			if (t.get(id))
+				return null;
+
+			return t.add(c);
+		},
+
+		createSeparator : function(cc) {
+			var cls = cc || this._cls.separator || tinymce.ui.Separator;
+
+			return new cls();
+		},
+
+		setControlType : function(n, c) {
+			return this._cls[n.toLowerCase()] = c;
+		},
+
+		destroy : function() {
+			each(this.controls, function(c) {
+				c.destroy();
+			});
+
+			this.controls = null;
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/WindowManager.js */
+
+(function() {
+	var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each, isIE = tinymce.isIE, isOpera = tinymce.isOpera;
+
+	tinymce.create('tinymce.WindowManager', {
+		WindowManager : function(ed) {
+			var t = this;
+
+			t.editor = ed;
+			t.onOpen = new Dispatcher(t);
+			t.onClose = new Dispatcher(t);
+			t.params = {};
+			t.features = {};
+		},
+
+		open : function(s, p) {
+			var t = this, f = '', x, y, mo = t.editor.settings.dialog_type == 'modal', w, sw, sh, vp = tinymce.DOM.getViewPort(), u;
+
+			// Default some options
+			s = s || {};
+			p = p || {};
+			sw = isOpera ? vp.w : screen.width; // Opera uses windows inside the Opera window
+			sh = isOpera ? vp.h : screen.height;
+			s.name = s.name || 'mc_' + new Date().getTime();
+			s.width = parseInt(s.width || 320);
+			s.height = parseInt(s.height || 240);
+			s.resizable = true;
+			s.left = s.left || parseInt(sw / 2.0) - (s.width / 2.0);
+			s.top = s.top || parseInt(sh / 2.0) - (s.height / 2.0);
+			p.inline = false;
+			p.mce_width = s.width;
+			p.mce_height = s.height;
+			p.mce_auto_focus = s.auto_focus;
+
+			if (mo) {
+				if (isIE) {
+					s.center = true;
+					s.help = false;
+					s.dialogWidth = s.width + 'px';
+					s.dialogHeight = s.height + 'px';
+					s.scroll = s.scrollbars || false;
+				}
+			}
+
+			// Build features string
+			each(s, function(v, k) {
+				if (tinymce.is(v, 'boolean'))
+					v = v ? 'yes' : 'no';
+
+				if (!/^(name|url)$/.test(k)) {
+					if (isIE && mo)
+						f += (f ? ';' : '') + k + ':' + v;
+					else
+						f += (f ? ',' : '') + k + '=' + v;
+				}
+			});
+
+			t.features = s;
+			t.params = p;
+			t.onOpen.dispatch(t, s, p);
+
+			u = s.url || s.file;
+			if (tinymce.relaxedDomain)
+				u += (u.indexOf('?') == -1 ? '?' : '&') + 'mce_rdomain=' + tinymce.relaxedDomain;
+
+			u = tinymce._addVer(u);
+
+			try {
+				if (isIE && mo) {
+					w = 1;
+					window.showModalDialog(u, window, f);
+				} else
+					w = window.open(u, s.name, f);
+			} catch (ex) {
+				// Ignore
+			}
+
+			if (!w)
+				alert(t.editor.getLang('popup_blocked'));
+		},
+
+		close : function(w) {
+			w.close();
+			this.onClose.dispatch(this);
+		},
+
+		createInstance : function(cl, a, b, c, d, e) {
+			var f = tinymce.resolve(cl);
+
+			return new f(a, b, c, d, e);
+		},
+
+		confirm : function(t, cb, s) {
+			cb.call(s || this, confirm(this._decode(this.editor.getLang(t, t))));
+		},
+
+		alert : function(tx, cb, s) {
+			var t = this;
+	
+			alert(t._decode(t.editor.getLang(tx, tx)));
+
+			if (cb)
+				cb.call(s || t);
+		},
+
+		// Internal functions
+
+		_decode : function(s) {
+			return tinymce.DOM.decode(s).replace(/\\n/g, '\n');
+		}
+
+		});
+}());
\ No newline at end of file
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/utils/editable_selects.js b/mod/tinymce/tinymce/jscripts/tiny_mce/utils/editable_selects.js
new file mode 100644
index 000000000..c1bfa739e
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/utils/editable_selects.js
@@ -0,0 +1,69 @@
+/**
+ * $Id: editable_selects.js 867 2008-06-09 20:33:40Z spocke $
+ *
+ * Makes select boxes editable.
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+var TinyMCE_EditableSelects = {
+	editSelectElm : null,
+
+	init : function() {
+		var nl = document.getElementsByTagName("select"), i, d = document, o;
+
+		for (i=0; i<nl.length; i++) {
+			if (nl[i].className.indexOf('mceEditableSelect') != -1) {
+				o = new Option('(value)', '__mce_add_custom__');
+
+				o.className = 'mceAddSelectValue';
+
+				nl[i].options[nl[i].options.length] = o;
+				nl[i].onchange = TinyMCE_EditableSelects.onChangeEditableSelect;
+			}
+		}
+	},
+
+	onChangeEditableSelect : function(e) {
+		var d = document, ne, se = window.event ? window.event.srcElement : e.target;
+
+		if (se.options[se.selectedIndex].value == '__mce_add_custom__') {
+			ne = d.createElement("input");
+			ne.id = se.id + "_custom";
+			ne.name = se.name + "_custom";
+			ne.type = "text";
+
+			ne.style.width = se.offsetWidth + 'px';
+			se.parentNode.insertBefore(ne, se);
+			se.style.display = 'none';
+			ne.focus();
+			ne.onblur = TinyMCE_EditableSelects.onBlurEditableSelectInput;
+			ne.onkeydown = TinyMCE_EditableSelects.onKeyDown;
+			TinyMCE_EditableSelects.editSelectElm = se;
+		}
+	},
+
+	onBlurEditableSelectInput : function() {
+		var se = TinyMCE_EditableSelects.editSelectElm;
+
+		if (se) {
+			if (se.previousSibling.value != '') {
+				addSelectValue(document.forms[0], se.id, se.previousSibling.value, se.previousSibling.value);
+				selectByValue(document.forms[0], se.id, se.previousSibling.value);
+			} else
+				selectByValue(document.forms[0], se.id, '');
+
+			se.style.display = 'inline';
+			se.parentNode.removeChild(se.previousSibling);
+			TinyMCE_EditableSelects.editSelectElm = null;
+		}
+	},
+
+	onKeyDown : function(e) {
+		e = e || window.event;
+
+		if (e.keyCode == 13)
+			TinyMCE_EditableSelects.onBlurEditableSelectInput();
+	}
+};
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/utils/form_utils.js b/mod/tinymce/tinymce/jscripts/tiny_mce/utils/form_utils.js
new file mode 100644
index 000000000..6d79d0a03
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/utils/form_utils.js
@@ -0,0 +1,199 @@
+/**
+ * $Id: form_utils.js 673 2008-03-06 13:26:20Z spocke $
+ *
+ * Various form utilitiy functions.
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));
+
+function getColorPickerHTML(id, target_form_element) {
+	var h = "";
+
+	h += '<a id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
+	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '"></span></a>';
+
+	return h;
+}
+
+function updateColor(img_id, form_element_id) {
+	document.getElementById(img_id).style.backgroundColor = document.forms[0].elements[form_element_id].value;
+}
+
+function setBrowserDisabled(id, state) {
+	var img = document.getElementById(id);
+	var lnk = document.getElementById(id + "_link");
+
+	if (lnk) {
+		if (state) {
+			lnk.setAttribute("realhref", lnk.getAttribute("href"));
+			lnk.removeAttribute("href");
+			tinyMCEPopup.dom.addClass(img, 'disabled');
+		} else {
+			if (lnk.getAttribute("realhref"))
+				lnk.setAttribute("href", lnk.getAttribute("realhref"));
+
+			tinyMCEPopup.dom.removeClass(img, 'disabled');
+		}
+	}
+}
+
+function getBrowserHTML(id, target_form_element, type, prefix) {
+	var option = prefix + "_" + type + "_browser_callback", cb, html;
+
+	cb = tinyMCEPopup.getParam(option, tinyMCEPopup.getParam("file_browser_callback"));
+
+	if (!cb)
+		return "";
+
+	html = "";
+	html += '<a id="' + id + '_link" href="javascript:openBrowser(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;" class="browse">';
+	html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '"></span></a>';
+
+	return html;
+}
+
+function openBrowser(img_id, target_form_element, type, option) {
+	var img = document.getElementById(img_id);
+
+	if (img.className != "mceButtonDisabled")
+		tinyMCEPopup.openBrowser(target_form_element, type, option);
+}
+
+function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
+	if (!form_obj || !form_obj.elements[field_name])
+		return;
+
+	var sel = form_obj.elements[field_name];
+
+	var found = false;
+	for (var i=0; i<sel.options.length; i++) {
+		var option = sel.options[i];
+
+		if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {
+			option.selected = true;
+			found = true;
+		} else
+			option.selected = false;
+	}
+
+	if (!found && add_custom && value != '') {
+		var option = new Option(value, value);
+		option.selected = true;
+		sel.options[sel.options.length] = option;
+		sel.selectedIndex = sel.options.length - 1;
+	}
+
+	return found;
+}
+
+function getSelectValue(form_obj, field_name) {
+	var elm = form_obj.elements[field_name];
+
+	if (elm == null || elm.options == null)
+		return "";
+
+	return elm.options[elm.selectedIndex].value;
+}
+
+function addSelectValue(form_obj, field_name, name, value) {
+	var s = form_obj.elements[field_name];
+	var o = new Option(name, value);
+	s.options[s.options.length] = o;
+}
+
+function addClassesToList(list_id, specific_option) {
+	// Setup class droplist
+	var styleSelectElm = document.getElementById(list_id);
+	var styles = tinyMCEPopup.getParam('theme_advanced_styles', false);
+	styles = tinyMCEPopup.getParam(specific_option, styles);
+
+	if (styles) {
+		var stylesAr = styles.split(';');
+
+		for (var i=0; i<stylesAr.length; i++) {
+			if (stylesAr != "") {
+				var key, value;
+
+				key = stylesAr[i].split('=')[0];
+				value = stylesAr[i].split('=')[1];
+
+				styleSelectElm.options[styleSelectElm.length] = new Option(key, value);
+			}
+		}
+	} else {
+		tinymce.each(tinyMCEPopup.editor.dom.getClasses(), function(o) {
+			styleSelectElm.options[styleSelectElm.length] = new Option(o.title || o['class'], o['class']);
+		});
+	}
+}
+
+function isVisible(element_id) {
+	var elm = document.getElementById(element_id);
+
+	return elm && elm.style.display != "none";
+}
+
+function convertRGBToHex(col) {
+	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
+
+	var rgb = col.replace(re, "$1,$2,$3").split(',');
+	if (rgb.length == 3) {
+		r = parseInt(rgb[0]).toString(16);
+		g = parseInt(rgb[1]).toString(16);
+		b = parseInt(rgb[2]).toString(16);
+
+		r = r.length == 1 ? '0' + r : r;
+		g = g.length == 1 ? '0' + g : g;
+		b = b.length == 1 ? '0' + b : b;
+
+		return "#" + r + g + b;
+	}
+
+	return col;
+}
+
+function convertHexToRGB(col) {
+	if (col.indexOf('#') != -1) {
+		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
+
+		r = parseInt(col.substring(0, 2), 16);
+		g = parseInt(col.substring(2, 4), 16);
+		b = parseInt(col.substring(4, 6), 16);
+
+		return "rgb(" + r + "," + g + "," + b + ")";
+	}
+
+	return col;
+}
+
+function trimSize(size) {
+	return size.replace(/([0-9\.]+)px|(%|in|cm|mm|em|ex|pt|pc)/, '$1$2');
+}
+
+function getCSSSize(size) {
+	size = trimSize(size);
+
+	if (size == "")
+		return "";
+
+	// Add px
+	if (/^[0-9]+$/.test(size))
+		size += 'px';
+
+	return size;
+}
+
+function getStyle(elm, attrib, style) {
+	var val = tinyMCEPopup.dom.getAttrib(elm, attrib);
+
+	if (val != '')
+		return '' + val;
+
+	if (typeof(style) == 'undefined')
+		style = attrib;
+
+	return tinyMCEPopup.dom.getStyle(elm, style);
+}
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/utils/mctabs.js b/mod/tinymce/tinymce/jscripts/tiny_mce/utils/mctabs.js
new file mode 100644
index 000000000..135180643
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/utils/mctabs.js
@@ -0,0 +1,76 @@
+/**
+ * $Id: mctabs.js 758 2008-03-30 13:53:29Z spocke $
+ *
+ * Moxiecode DHTML Tabs script.
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+function MCTabs() {
+	this.settings = [];
+};
+
+MCTabs.prototype.init = function(settings) {
+	this.settings = settings;
+};
+
+MCTabs.prototype.getParam = function(name, default_value) {
+	var value = null;
+
+	value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];
+
+	// Fix bool values
+	if (value == "true" || value == "false")
+		return (value == "true");
+
+	return value;
+};
+
+MCTabs.prototype.displayTab = function(tab_id, panel_id) {
+	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i;
+
+	panelElm= document.getElementById(panel_id);
+	panelContainerElm = panelElm ? panelElm.parentNode : null;
+	tabElm = document.getElementById(tab_id);
+	tabContainerElm = tabElm ? tabElm.parentNode : null;
+	selectionClass = this.getParam('selection_class', 'current');
+
+	if (tabElm && tabContainerElm) {
+		nodes = tabContainerElm.childNodes;
+
+		// Hide all other tabs
+		for (i = 0; i < nodes.length; i++) {
+			if (nodes[i].nodeName == "LI")
+				nodes[i].className = '';
+		}
+
+		// Show selected tab
+		tabElm.className = 'current';
+	}
+
+	if (panelElm && panelContainerElm) {
+		nodes = panelContainerElm.childNodes;
+
+		// Hide all other panels
+		for (i = 0; i < nodes.length; i++) {
+			if (nodes[i].nodeName == "DIV")
+				nodes[i].className = 'panel';
+		}
+
+		// Show selected panel
+		panelElm.className = 'current';
+	}
+};
+
+MCTabs.prototype.getAnchor = function() {
+	var pos, url = document.location.href;
+
+	if ((pos = url.lastIndexOf('#')) != -1)
+		return url.substring(pos + 1);
+
+	return "";
+};
+
+// Global instance
+var mcTabs = new MCTabs();
diff --git a/mod/tinymce/tinymce/jscripts/tiny_mce/utils/validate.js b/mod/tinymce/tinymce/jscripts/tiny_mce/utils/validate.js
new file mode 100644
index 000000000..3fcd63936
--- /dev/null
+++ b/mod/tinymce/tinymce/jscripts/tiny_mce/utils/validate.js
@@ -0,0 +1,219 @@
+/**
+ * $Id: validate.js 758 2008-03-30 13:53:29Z spocke $
+ *
+ * Various form validation methods.
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+/**
+	// String validation:
+
+	if (!Validator.isEmail('myemail'))
+		alert('Invalid email.');
+
+	// Form validation:
+
+	var f = document.forms['myform'];
+
+	if (!Validator.isEmail(f.myemail))
+		alert('Invalid email.');
+*/
+
+var Validator = {
+	isEmail : function(s) {
+		return this.test(s, '^[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+@[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$');
+	},
+
+	isAbsUrl : function(s) {
+		return this.test(s, '^(news|telnet|nttp|file|http|ftp|https)://[-A-Za-z0-9\\.]+\\/?.*$');
+	},
+
+	isSize : function(s) {
+		return this.test(s, '^[0-9]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
+	},
+
+	isId : function(s) {
+		return this.test(s, '^[A-Za-z_]([A-Za-z0-9_])*$');
+	},
+
+	isEmpty : function(s) {
+		var nl, i;
+
+		if (s.nodeName == 'SELECT' && s.selectedIndex < 1)
+			return true;
+
+		if (s.type == 'checkbox' && !s.checked)
+			return true;
+
+		if (s.type == 'radio') {
+			for (i=0, nl = s.form.elements; i<nl.length; i++) {
+				if (nl[i].type == "radio" && nl[i].name == s.name && nl[i].checked)
+					return false;
+			}
+
+			return true;
+		}
+
+		return new RegExp('^\\s*$').test(s.nodeType == 1 ? s.value : s);
+	},
+
+	isNumber : function(s, d) {
+		return !isNaN(s.nodeType == 1 ? s.value : s) && (!d || !this.test(s, '^-?[0-9]*\\.[0-9]*$'));
+	},
+
+	test : function(s, p) {
+		s = s.nodeType == 1 ? s.value : s;
+
+		return s == '' || new RegExp(p).test(s);
+	}
+};
+
+var AutoValidator = {
+	settings : {
+		id_cls : 'id',
+		int_cls : 'int',
+		url_cls : 'url',
+		number_cls : 'number',
+		email_cls : 'email',
+		size_cls : 'size',
+		required_cls : 'required',
+		invalid_cls : 'invalid',
+		min_cls : 'min',
+		max_cls : 'max'
+	},
+
+	init : function(s) {
+		var n;
+
+		for (n in s)
+			this.settings[n] = s[n];
+	},
+
+	validate : function(f) {
+		var i, nl, s = this.settings, c = 0;
+
+		nl = this.tags(f, 'label');
+		for (i=0; i<nl.length; i++)
+			this.removeClass(nl[i], s.invalid_cls);
+
+		c += this.validateElms(f, 'input');
+		c += this.validateElms(f, 'select');
+		c += this.validateElms(f, 'textarea');
+
+		return c == 3;
+	},
+
+	invalidate : function(n) {
+		this.mark(n.form, n);
+	},
+
+	reset : function(e) {
+		var t = ['label', 'input', 'select', 'textarea'];
+		var i, j, nl, s = this.settings;
+
+		if (e == null)
+			return;
+
+		for (i=0; i<t.length; i++) {
+			nl = this.tags(e.form ? e.form : e, t[i]);
+			for (j=0; j<nl.length; j++)
+				this.removeClass(nl[j], s.invalid_cls);
+		}
+	},
+
+	validateElms : function(f, e) {
+		var nl, i, n, s = this.settings, st = true, va = Validator, v;
+
+		nl = this.tags(f, e);
+		for (i=0; i<nl.length; i++) {
+			n = nl[i];
+
+			this.removeClass(n, s.invalid_cls);
+
+			if (this.hasClass(n, s.required_cls) && va.isEmpty(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.number_cls) && !va.isNumber(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.int_cls) && !va.isNumber(n, true))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.url_cls) && !va.isAbsUrl(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.email_cls) && !va.isEmail(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.size_cls) && !va.isSize(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.id_cls) && !va.isId(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.min_cls, true)) {
+				v = this.getNum(n, s.min_cls);
+
+				if (isNaN(v) || parseInt(n.value) < parseInt(v))
+					st = this.mark(f, n);
+			}
+
+			if (this.hasClass(n, s.max_cls, true)) {
+				v = this.getNum(n, s.max_cls);
+
+				if (isNaN(v) || parseInt(n.value) > parseInt(v))
+					st = this.mark(f, n);
+			}
+		}
+
+		return st;
+	},
+
+	hasClass : function(n, c, d) {
+		return new RegExp('\\b' + c + (d ? '[0-9]+' : '') + '\\b', 'g').test(n.className);
+	},
+
+	getNum : function(n, c) {
+		c = n.className.match(new RegExp('\\b' + c + '([0-9]+)\\b', 'g'))[0];
+		c = c.replace(/[^0-9]/g, '');
+
+		return c;
+	},
+
+	addClass : function(n, c, b) {
+		var o = this.removeClass(n, c);
+		n.className = b ? c + (o != '' ? (' ' + o) : '') : (o != '' ? (o + ' ') : '') + c;
+	},
+
+	removeClass : function(n, c) {
+		c = n.className.replace(new RegExp("(^|\\s+)" + c + "(\\s+|$)"), ' ');
+		return n.className = c != ' ' ? c : '';
+	},
+
+	tags : function(f, s) {
+		return f.getElementsByTagName(s);
+	},
+
+	mark : function(f, n) {
+		var s = this.settings;
+
+		this.addClass(n, s.invalid_cls);
+		this.markLabels(f, n, s.invalid_cls);
+
+		return false;
+	},
+
+	markLabels : function(f, n, ic) {
+		var nl, i;
+
+		nl = this.tags(f, "label");
+		for (i=0; i<nl.length; i++) {
+			if (nl[i].getAttribute("for") == n.id || nl[i].htmlFor == n.id)
+				this.addClass(nl[i], ic);
+		}
+
+		return null;
+	}
+};
diff --git a/mod/tinymce/views/default/embed/addcontentjs.php b/mod/tinymce/views/default/embed/addcontentjs.php
new file mode 100644
index 000000000..90ff6a348
--- /dev/null
+++ b/mod/tinymce/views/default/embed/addcontentjs.php
@@ -0,0 +1,4 @@
+
+	if(window.tinyMCE)
+		window.tinyMCE.execCommand("mceInsertContent",true,content);
+	
\ No newline at end of file
diff --git a/mod/tinymce/views/default/input/longtext.php b/mod/tinymce/views/default/input/longtext.php
new file mode 100644
index 000000000..e49c6190e
--- /dev/null
+++ b/mod/tinymce/views/default/input/longtext.php
@@ -0,0 +1,69 @@
+<?php
+
+	/**
+	 * Elgg long text input with the tinymce text editor intacts
+	 * Displays a long text input field
+	 * 
+	 * @package ElggTinyMCE
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['value'] The current value, if any
+	 * @uses $vars['js'] Any Javascript to enter into the input tag
+	 * @uses $vars['internalname'] The name of the input field
+	 * 
+	 */
+
+	global $tinymce_js_loaded;
+	
+	$input = rand(0,9999);
+	
+	if (!isset($tinymce_js_loaded)) $tinymce_js_loaded = false;
+
+	if (!$tinymce_js_loaded) {
+	
+?>
+<!-- include tinymce -->
+<script language="javascript" type="text/javascript" src="<?php echo $vars['url']; ?>mod/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
+<!-- intialise tinymce, you can find other configurations here http://wiki.moxiecode.com/examples/tinymce/installation_example_01.php -->
+<script language="javascript" type="text/javascript">
+   tinyMCE.init({
+	mode : "textareas",
+	theme : "advanced",
+	relative_urls : false,
+	theme_advanced_buttons1 : "bold,italic,underline,separator,strikethrough,bullist,numlist,undo,redo,link,unlink,image,blockquote,code",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "left",
+	theme_advanced_statusbar_location : "bottom",
+	theme_advanced_resizing : true,
+	extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|style],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]"
+});
+function toggleEditor(id) {
+if (!tinyMCE.get(id))
+	tinyMCE.execCommand('mceAddControl', false, id);
+else
+	tinyMCE.execCommand('mceRemoveControl', false, id);
+}
+</script>
+<?php
+
+		$tinymce_js_loaded = true;
+	}
+
+?>
+
+<!-- show the textarea -->
+<textarea class="input-textarea" name="<?php echo $vars['internalname']; ?>" <?php echo $vars['js']; ?>><?php echo htmlentities($vars['value'], null, 'UTF-8'); ?></textarea> 
+<div class="toggle_editor_container"><a class="toggle_editor" href="javascript:toggleEditor('<?php echo $vars['internalname']; ?>');"><?php echo elgg_echo('tinymce:remove'); ?></a></div>
+
+<script type="text/javascript">
+	$(document).ready(function() {
+		$('textarea').parents('form').submit(function() {
+			tinyMCE.triggerSave();
+		});
+	});
+</script>
\ No newline at end of file
diff --git a/mod/tinymce/views/default/tinymce/css.php b/mod/tinymce/views/default/tinymce/css.php
new file mode 100644
index 000000000..121c24440
--- /dev/null
+++ b/mod/tinymce/views/default/tinymce/css.php
@@ -0,0 +1,17 @@
+blockquote {
+    margin:10px;
+    border:1px solid #efefef;
+    padding:4px;
+}
+
+strong {
+    font-weight:bold;
+}
+
+ul {
+   list-style: disc;
+}
+
+ol {
+  list-style: decimal;
+}
\ No newline at end of file
diff --git a/mod/twitter/graphics/thewire_speech_bubble.gif b/mod/twitter/graphics/thewire_speech_bubble.gif
new file mode 100644
index 000000000..d0e8606a1
--- /dev/null
+++ b/mod/twitter/graphics/thewire_speech_bubble.gif
diff --git a/mod/twitter/graphics/twitter.png b/mod/twitter/graphics/twitter.png
new file mode 100644
index 000000000..de51c6953
--- /dev/null
+++ b/mod/twitter/graphics/twitter.png
diff --git a/mod/twitter/languages/en.php b/mod/twitter/languages/en.php
new file mode 100644
index 000000000..5e9fcd92b
--- /dev/null
+++ b/mod/twitter/languages/en.php
@@ -0,0 +1,30 @@
+<?php
+
+	$english = array(
+	
+		/**
+		 * twitter widget details
+		 */
+		
+	
+		'twitter:username' => 'Enter your twitter username.',
+		'twitter:num' => 'The number of tweets to show.',
+		'twitter:visit' => 'visit my twitter',
+		'twitter:notset' => 'This Twitter widget is not yet set to go. To display your latest tweets, click on - edit - and fill in your details',
+		
+		
+		 /**
+	     * twitter widget river
+	     **/
+	        
+	        //generic terms to use
+	        'twitter:river:created' => "%s added the twitter widget.",
+	        'twitter:river:updated' => "%s updated their twitter widget.",
+	        'twitter:river:delete' => "%s removed their twitter widget.",
+	        
+		
+	);
+					
+	add_translation("en",$english);
+
+?>
\ No newline at end of file
diff --git a/mod/twitter/manifest.xml b/mod/twitter/manifest.xml
new file mode 100644
index 000000000..5439409db
--- /dev/null
+++ b/mod/twitter/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider" />
+        <field key="version" value="1.7" />
+        <field key="description" value="Elgg simple twitter widget" />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+        <field key="licence" value="GNU Public License version 2" />
+        <field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/twitter/start.php b/mod/twitter/start.php
new file mode 100644
index 000000000..c316164d5
--- /dev/null
+++ b/mod/twitter/start.php
@@ -0,0 +1,26 @@
+<?php
+
+	/**
+	 * Elgg twitter widget
+	 * This plugin allows users to pull in their twitter feed to display on their profile
+	 * 
+	 * @package ElggTwitter
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	
+		function twitter_init() {
+    		
+    		//extend css if style is required
+    		    elgg_extend_view('css','twitter/css');
+    		
+    		//add a widget
+			    add_widget_type('twitter',"Twitter","This is your twitter feed");
+			
+		}
+		
+		register_elgg_event_handler('init','system','twitter_init');
+
+?>
\ No newline at end of file
diff --git a/mod/twitter/views/default/twitter/css.php b/mod/twitter/views/default/twitter/css.php
new file mode 100644
index 000000000..f0e51ccb5
--- /dev/null
+++ b/mod/twitter/views/default/twitter/css.php
@@ -0,0 +1,63 @@
+<?php
+ 
+    /**
+	 * Elgg Twitter CSS
+	 * 
+	 * @package ElggTwitter
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+     
+?>
+
+#twitter_widget {
+    margin:0 10px 0 10px;
+}
+
+#twitter_widget ul {
+	margin:0;
+	padding:0;
+}
+
+#twitter_widget li {
+	background: url(<?php echo $vars['url']; ?>mod/twitter/graphics/thewire_speech_bubble.gif) no-repeat right bottom;
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	margin:0 0 5px 0;
+	padding:0;
+	overflow-x: hidden;
+}
+
+#twitter_widget li span {
+	color:#666666;
+	background:white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	padding:5px;
+	display:block;
+}
+
+p.visit_twitter a {
+    background:url(<?php echo $vars['url']; ?>mod/twitter/graphics/twitter.png) left no-repeat;
+    padding:0 0 0 20px;
+    margin:0;
+}
+.visit_twitter {
+	background:white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	padding:2px;
+	margin:0 0 5px 0;
+}
+
+#twitter_widget li a {
+	display:block;
+	margin:0 0 0 4px;
+}
+
+#twitter_widget li span a {
+	display:inline !important;
+}
\ No newline at end of file
diff --git a/mod/twitter/views/default/widgets/twitter/edit.php b/mod/twitter/views/default/widgets/twitter/edit.php
new file mode 100644
index 000000000..efb8f622a
--- /dev/null
+++ b/mod/twitter/views/default/widgets/twitter/edit.php
@@ -0,0 +1,20 @@
+<?php
+
+    /**
+	 * Elgg twitter edit page
+	 *
+	 * @package ElggTwitter
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+	<p>
+		<?php echo elgg_echo("twitter:username"); ?>
+		<input type="text" name="params[twitter_username]" value="<?php echo htmlentities($vars['entity']->twitter_username); ?>" />	
+		<br /><?php echo elgg_echo("twitter:num"); ?>
+		<input type="text" name="params[twitter_num]" value="<?php echo htmlentities($vars['entity']->twitter_num); ?>" />	
+	
+	</p>
\ No newline at end of file
diff --git a/mod/twitter/views/default/widgets/twitter/view.php b/mod/twitter/views/default/widgets/twitter/view.php
new file mode 100644
index 000000000..71caaf380
--- /dev/null
+++ b/mod/twitter/views/default/widgets/twitter/view.php
@@ -0,0 +1,35 @@
+<?php
+    
+     /**
+	 * Elgg twitter view page
+	 *
+	 * @package ElggTwitter
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+	 //some required params
+	 
+	 $username = $vars['entity']->twitter_username;
+	 $num = $vars['entity']->twitter_num;
+	 
+    // if the twitter username is empty, then do not show
+    if($username){
+	 
+?>
+
+<div id="twitter_widget">
+<ul id="twitter_update_list"></ul>
+<p class="visit_twitter"><a href="http://twitter.com/<?php echo $username; ?>"><?php echo elgg_echo("twitter:visit"); ?></a></p>
+<script type="text/javascript" src="http://twitter.com/javascripts/blogger.js"></script>
+<script type="text/javascript" src="http://twitter.com/statuses/user_timeline/<?php echo $username; ?>.json?callback=twitterCallback2&count=<?php echo $num; ?>"></script>
+<?php 
+    } else {
+        
+      echo "<div class=\"contentWrapper\"><p>" . elgg_echo("twitter:notset") . ".</p></div>";
+      
+  }
+?>
+</div>
\ No newline at end of file
diff --git a/mod/twitterservice/languages/en.php b/mod/twitterservice/languages/en.php
new file mode 100644
index 000000000..60ddb99b6
--- /dev/null
+++ b/mod/twitterservice/languages/en.php
@@ -0,0 +1,10 @@
+<?php
+	$english = array(
+		'twitterservice' => 'Twitter Service',
+		'twitterservice:postwire' => 'By setting the following option all messages you post to The Wire will be sent to your twitter account. Do you want to post your messages from The Wire to Twitter?',
+		'twitterservice:twittername' => 'Twitter username',
+		'twitterservice:twitterpass' => 'Twitter password',
+	);
+					
+	add_translation("en",$english);
+?>
\ No newline at end of file
diff --git a/mod/twitterservice/manifest.xml b/mod/twitterservice/manifest.xml
new file mode 100644
index 000000000..5aaeb79cd
--- /dev/null
+++ b/mod/twitterservice/manifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+	<field key="author" value="Curverider" />
+	<field key="version" value="1.7" />
+	<field key="description" value="Provides a simple Elgg wrapper around the twitter class written by David Grudl" />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Curverider 2008-2010" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="recommends" value="thewire" />
+	<field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/twitterservice/start.php b/mod/twitterservice/start.php
new file mode 100644
index 000000000..b387379f2
--- /dev/null
+++ b/mod/twitterservice/start.php
@@ -0,0 +1,54 @@
+<?php
+	/**
+	 * Elgg Twitter Service.
+	 * This plugin provides a wrapper around David Grudl's twitter library and exposes some basic functionality.
+	 * 
+	 * @package ElggSMS
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	global $CONFIG;
+	require_once($CONFIG->pluginspath . "twitterservice/vendors/twitter/twitter.class.php"); 
+
+	function twitterservice_init()
+	{
+		// Listen for wire create event
+		register_elgg_event_handler('create','object','twitterservice_wire_listener');
+		
+	}
+	
+	/**
+	 * Post a message to a twitter feed.
+	 *
+	 */
+	function twitterservice_send($twittername, $twitterpass, $twittermessage)
+	{
+		$twitter = new Twitter($twittername, $twitterpass);
+		
+		return $twitter->send($twittermessage);
+	}
+	
+	/**
+	 * Listen for thewire and push messages accordingly.
+	 */
+	function twitterservice_wire_listener($event, $object_type, $object)
+	{
+
+		if (($object) && ($object->subtype == get_subtype_id('object', 'thewire')) )
+		{
+			if (get_plugin_usersetting('sendtowire', $object->owner_guid, 'twitterservice')=='yes')
+			{
+				$twittername = get_plugin_usersetting('twittername', $object->owner_guid, 'twitterservice');
+				$twitterpass = get_plugin_usersetting('twitterpass', $object->owner_guid, 'twitterservice');
+			
+				if (($twittername) && ($twitterpass))
+					twitterservice_send($twittername, $twitterpass, $object->description);
+			}
+		}
+	}
+	
+	register_elgg_event_handler('init','system','twitterservice_init');
+?>
\ No newline at end of file
diff --git a/mod/twitterservice/vendors/twitter/license.txt b/mod/twitterservice/vendors/twitter/license.txt
new file mode 100644
index 000000000..a8d57203e
--- /dev/null
+++ b/mod/twitterservice/vendors/twitter/license.txt
@@ -0,0 +1,27 @@
+Copyright (c) 2008, Copyright (c) 2008 David Grudl
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    * Neither the name of David Grudl nor the names of its
+      contributors may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/mod/twitterservice/vendors/twitter/load.php b/mod/twitterservice/vendors/twitter/load.php
new file mode 100644
index 000000000..388b4e358
--- /dev/null
+++ b/mod/twitterservice/vendors/twitter/load.php
@@ -0,0 +1,20 @@
+<?php
+
+require_once 'twitter.class.php';
+
+
+$twitter = new Twitter('pokusnyucet2', '123456');
+
+$withFriends = FALSE;
+$channel = $twitter->load($withFriends);
+
+?>
+
+<ul>
+<?foreach ($channel->status as $status): ?>
+	<li><a href="http://twitter.com/<?=$status->user->screen_name?>"><?=$status->user->name?></a>:
+	<?=$status->text?>
+	<small>at <?=date("j.n.Y H:m", strtotime($status->created_at))?></small>
+	</li>
+<?endforeach?>
+</ul>
diff --git a/mod/twitterservice/vendors/twitter/readme.txt b/mod/twitterservice/vendors/twitter/readme.txt
new file mode 100644
index 000000000..a01b768af
--- /dev/null
+++ b/mod/twitterservice/vendors/twitter/readme.txt
@@ -0,0 +1,55 @@
+Twitter for PHP (c) David Grudl, 2008 (http://davidgrudl.com)
+
+
+Introduction
+------------
+
+Twitter for PHP is a very small and easy-to-use library for sending 
+messages to Twitter and receiving status updates.
+
+
+Project at GoogleCode: http://twitter-php.googlecode.com
+Twitter's API documentation: http://groups.google.com/group/twitter-development-talk/web/api-documentation
+My PHP blog: http://phpfashion.com
+
+
+Requirements
+------------
+- PHP (version 5 or better)
+- cURL extension
+
+
+Usage
+-----
+
+Create object using your credentials (user name and password)
+
+	$twitter = new Twitter($userName, $password);
+
+The send() method updates your status. The message must be encoded in UTF-8:
+
+	$twitter->send('I am fine today.');
+
+The load() method returns the 20 most recent status updates 
+posted in the last 24 hours by you and optionally by your friends:
+
+	$withFriends = FALSE;
+	$channel = $twitter->load($withFriends);
+
+The returned channel is a SimpleXMLElement object. Extracting 
+the information from the channel is easy:
+
+	foreach ($channel->status as $status) {
+		echo "message: ", $status->text;
+		echo "posted at " , $status->created_at;
+		echo "posted by " , $status->user->name;
+	}
+
+
+Files
+-----
+readme.txt        - This file.
+license.txt       - The license for this software (New BSD License).
+twitter.class.php - The core Twitter class source.
+send.php          - Example sending message to Twitter.
+load.php          - Example loading statuses from Twitter.
diff --git a/mod/twitterservice/vendors/twitter/send.php b/mod/twitterservice/vendors/twitter/send.php
new file mode 100644
index 000000000..f8bea6f6e
--- /dev/null
+++ b/mod/twitterservice/vendors/twitter/send.php
@@ -0,0 +1,9 @@
+<?php
+
+require_once 'twitter.class.php';
+
+
+$twitter = new Twitter('pokusnyucet2', '123456');
+$status = $twitter->send('Mám se fajn II');
+
+echo $status ? 'OK' : 'ERROR';
diff --git a/mod/twitterservice/vendors/twitter/twitter.class.php b/mod/twitterservice/vendors/twitter/twitter.class.php
new file mode 100644
index 000000000..457bede4c
--- /dev/null
+++ b/mod/twitterservice/vendors/twitter/twitter.class.php
@@ -0,0 +1,142 @@
+<?php
+
+/**
+ * Twitter for PHP - library for sending messages to Twitter and receiving status updates.
+ *
+ * @author     David Grudl (+ Bugfix by Curverider)
+ * @copyright  Copyright (c) 2008 David Grudl
+ * @license    New BSD License
+ * @link       http://phpfashion.com/
+ * @version    1.0_MP
+ */
+class Twitter
+{
+	/** @var int */
+	public static $cacheExpire = 1800; // 30 min
+
+	/** @var string */
+	public static $cacheDir;
+
+	/** @var  user name */
+	private $user;
+
+	/** @var  password */
+	private $pass;
+
+
+
+	/**
+	 * Creates object using your credentials.
+	 * @param  string  user name
+	 * @param  string  password
+	 * @throws Exception
+	 */
+	public function __construct($user, $pass)
+	{
+		if (!extension_loaded('curl')) {
+			throw new Exception('PHP extension CURL is not loaded.');
+		}
+
+		$this->user = $user;
+		$this->pass = $pass;
+	}
+
+
+
+	/**
+	 * Sends message to the Twitter.
+	 * @param string   message encoded in UTF-8
+	 * @return boolean TRUE on success or FALSE on failure
+	 */
+	public function send($message)
+	{
+		$result = $this->httpRequest(
+			'https://twitter.com/statuses/update.xml',
+			array('status' => $message)
+		);
+		return strpos($result, '<created_at>') !== FALSE;
+	}
+
+
+
+	/**
+	 * Returns the 20 most recent statuses posted from you and your friends (optionally).
+	 * @param  bool  with friends?
+	 * @return SimpleXMLElement
+	 * @throws Exception
+	 */
+	public function load($withFriends, $since = '')
+	{
+		$line = $withFriends ? 'friends_timeline' : 'user_timeline';
+		$url = "http://twitter.com/statuses/$line/$this->user.xml";
+		//if (!empty($since))
+		//	$url .= "?since=" . urlencode($since);
+		$feed = $this->httpRequest($url);
+		if ($feed === FALSE) {
+			throw new Exception('Cannot load channel.');
+		}
+
+		$xml = new SimpleXMLElement($feed);
+		if (!$xml || !$xml->status) {
+			throw new Exception('Invalid channel.');
+		}
+
+		return $xml;
+	}
+
+
+
+	/**
+	 * Process HTTP request.
+	 * @param string  URL
+	 * @param array   post data
+	 * @return string|FALSE
+	 */
+	private function httpRequest($url, $post = NULL)
+	{
+		/*
+		if (!$post && self::$cacheDir) {
+			$cacheFile = self::$cacheDir . '/twitter.' . md5($url) . '.xml';
+			if (@filemtime($cacheFile) + self::$cacheExpire > time()) {
+				return file_get_contents($cacheFile);
+			}
+		}
+		*/
+
+		$curl = curl_init();
+		curl_setopt($curl, CURLOPT_URL, $url);
+		// curl_setopt($curl, CURLOPT_USERPWD, "$this->user:$this->pass");
+		curl_setopt($curl, CURLOPT_HEADER, FALSE);
+		curl_setopt($curl, CURLOPT_TIMEOUT, 20);
+		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+		curl_setopt($curl, CURLOPT_FRESH_CONNECT, 1);
+		curl_setopt($curl, CURLOPT_HTTPHEADER, array('Expect:'));
+		if ($post) {
+			curl_setopt($curl, CURLOPT_USERPWD, "$this->user:$this->pass");
+			curl_setopt($curl, CURLOPT_POST, TRUE);
+			curl_setopt($curl, CURLOPT_POSTFIELDS, $post);
+		}
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE); // no echo, just return result
+		$result = curl_exec($curl);
+		$ok = curl_errno($curl) === 0 && curl_getinfo($curl, CURLINFO_HTTP_CODE) === 200;
+
+		if (!$ok) {
+			if (isset($cacheFile)) {
+				$result = @file_get_contents($cacheFile);
+				if (is_string($result)) {
+					return $result;
+				}
+			}
+			return FALSE;
+		}
+
+		/*
+		if (isset($cacheFile)) {
+			file_put_contents($cacheFile, $result);
+		}
+		*/
+
+		return $result;
+	}
+
+}
diff --git a/mod/twitterservice/views/default/usersettings/twitterservice/edit.php b/mod/twitterservice/views/default/usersettings/twitterservice/edit.php
new file mode 100644
index 000000000..eb4896756
--- /dev/null
+++ b/mod/twitterservice/views/default/usersettings/twitterservice/edit.php
@@ -0,0 +1,17 @@
+<p>
+	<?php echo elgg_echo('twitterservice:twittername'); ?> <?php echo elgg_view('input/text', array('internalname' => 'params[twittername]', 'value' => $vars['entity']->twittername)); ?>
+</p>
+<p>
+	<?php echo elgg_echo('twitterservice:twitterpass'); ?> <?php echo elgg_view('input/password', array('internalname' => 'params[twitterpass]', 'value' => $vars['entity']->twitterpass)); ?>
+</p>
+<?php if (is_plugin_enabled('thewire')) { ?>
+<p>
+	<?php echo elgg_echo('twitterservice:postwire'); ?>
+	
+	<select name="params[sendtowire]">
+		<option value="yes" <?php if ($vars['entity']->sendtowire == 'yes') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:yes'); ?></option>
+		<option value="no" <?php if ($vars['entity']->sendtowire != 'yes') echo " selected=\"yes\" "; ?>><?php echo elgg_echo('option:no'); ?></option>
+	</select>
+	
+</p>
+<?php } ?>
\ No newline at end of file
diff --git a/mod/zaudio/audioplayer/audio-player.js b/mod/zaudio/audioplayer/audio-player.js
new file mode 100644
index 000000000..43ea8eb54
--- /dev/null
+++ b/mod/zaudio/audioplayer/audio-player.js
@@ -0,0 +1,5 @@
+var AudioPlayer=function(){var F=[];var C;var E="";var A={};var D=-1;function B(G){return document.all?window[G]:document[G]}return{setup:function(H,G){E=H;A=G},getPlayer:function(G){return B(G)},embed:function(K,O){var I={};var M;var G;var P;var H;var N={};var J={};var L={};for(M in A){I[M]=A[M]}for(M in O){I[M]=O[M]}if(I.transparentpagebg=="yes"){N.bgcolor="#FFFFFF";N.wmode="transparent"}else{if(I.pagebg){N.bgcolor="#"+I.pagebg}N.wmode="opaque"}N.menu="false";for(M in I){if(M=="pagebg"||M=="width"||M=="transparentpagebg"){continue}J[M]=I[M]}L.name=K;L.style="outline: none";J.playerID=K;audioplayer_swfobject.embedSWF(E,K,I.width.toString(),"24","9.0.0",false,J,N,L);F.push(K)},syncVolumes:function(G,I){D=I;for(var H=0;H<F.length;H++){if(F[H]!=G){B(F[H]).setVolume(D)}}},activate:function(G){if(C&&C!=G){B(C).close()}C=G},load:function(I,G,J,H){B(I).load(G,J,H)},close:function(G){B(G).close();if(G==C){C=null}},open:function(G){B(G).open()},getVolume:function(G){return D}}}()/* SWFObject v2.1 <http://code.google.com/p/swfobject/>
+	Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der Sluis
+	This software is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
+*/
+var audioplayer_swfobject=function(){var b="undefined",Q="object",n="Shockwave Flash",p="ShockwaveFlash.ShockwaveFlash",P="application/x-shockwave-flash",m="SWFObjectExprInst",j=window,K=document,T=navigator,o=[],N=[],i=[],d=[],J,Z=null,M=null,l=null,e=false,A=false;var h=function(){var v=typeof K.getElementById!=b&&typeof K.getElementsByTagName!=b&&typeof K.createElement!=b,AC=[0,0,0],x=null;if(typeof T.plugins!=b&&typeof T.plugins[n]==Q){x=T.plugins[n].description;if(x&&!(typeof T.mimeTypes!=b&&T.mimeTypes[P]&&!T.mimeTypes[P].enabledPlugin)){x=x.replace(/^.*\s+(\S+\s+\S+$)/,"$1");AC[0]=parseInt(x.replace(/^(.*)\..*$/,"$1"),10);AC[1]=parseInt(x.replace(/^.*\.(.*)\s.*$/,"$1"),10);AC[2]=/r/.test(x)?parseInt(x.replace(/^.*r(.*)$/,"$1"),10):0}}else{if(typeof j.ActiveXObject!=b){var y=null,AB=false;try{y=new ActiveXObject(p+".7")}catch(t){try{y=new ActiveXObject(p+".6");AC=[6,0,21];y.AllowScriptAccess="always"}catch(t){if(AC[0]==6){AB=true}}if(!AB){try{y=new ActiveXObject(p)}catch(t){}}}if(!AB&&y){try{x=y.GetVariable("$version");if(x){x=x.split(" ")[1].split(",");AC=[parseInt(x[0],10),parseInt(x[1],10),parseInt(x[2],10)]}}catch(t){}}}}var AD=T.userAgent.toLowerCase(),r=T.platform.toLowerCase(),AA=/webkit/.test(AD)?parseFloat(AD.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,q=false,z=r?/win/.test(r):/win/.test(AD),w=r?/mac/.test(r):/mac/.test(AD);/*@cc_on q=true;@if(@_win32)z=true;@elif(@_mac)w=true;@end@*/return{w3cdom:v,pv:AC,webkit:AA,ie:q,win:z,mac:w}}();var L=function(){if(!h.w3cdom){return }f(H);if(h.ie&&h.win){try{K.write("<script id=__ie_ondomload defer=true src=//:><\/script>");J=C("__ie_ondomload");if(J){I(J,"onreadystatechange",S)}}catch(q){}}if(h.webkit&&typeof K.readyState!=b){Z=setInterval(function(){if(/loaded|complete/.test(K.readyState)){E()}},10)}if(typeof K.addEventListener!=b){K.addEventListener("DOMContentLoaded",E,null)}R(E)}();function S(){if(J.readyState=="complete"){J.parentNode.removeChild(J);E()}}function E(){if(e){return }if(h.ie&&h.win){var v=a("span");try{var u=K.getElementsByTagName("body")[0].appendChild(v);u.parentNode.removeChild(u)}catch(w){return }}e=true;if(Z){clearInterval(Z);Z=null}var q=o.length;for(var r=0;r<q;r++){o[r]()}}function f(q){if(e){q()}else{o[o.length]=q}}function R(r){if(typeof j.addEventListener!=b){j.addEventListener("load",r,false)}else{if(typeof K.addEventListener!=b){K.addEventListener("load",r,false)}else{if(typeof j.attachEvent!=b){I(j,"onload",r)}else{if(typeof j.onload=="function"){var q=j.onload;j.onload=function(){q();r()}}else{j.onload=r}}}}}function H(){var t=N.length;for(var q=0;q<t;q++){var u=N[q].id;if(h.pv[0]>0){var r=C(u);if(r){N[q].width=r.getAttribute("width")?r.getAttribute("width"):"0";N[q].height=r.getAttribute("height")?r.getAttribute("height"):"0";if(c(N[q].swfVersion)){if(h.webkit&&h.webkit<312){Y(r)}W(u,true)}else{if(N[q].expressInstall&&!A&&c("6.0.65")&&(h.win||h.mac)){k(N[q])}else{O(r)}}}}else{W(u,true)}}}function Y(t){var q=t.getElementsByTagName(Q)[0];if(q){var w=a("embed"),y=q.attributes;if(y){var v=y.length;for(var u=0;u<v;u++){if(y[u].nodeName=="DATA"){w.setAttribute("src",y[u].nodeValue)}else{w.setAttribute(y[u].nodeName,y[u].nodeValue)}}}var x=q.childNodes;if(x){var z=x.length;for(var r=0;r<z;r++){if(x[r].nodeType==1&&x[r].nodeName=="PARAM"){w.setAttribute(x[r].getAttribute("name"),x[r].getAttribute("value"))}}}t.parentNode.replaceChild(w,t)}}function k(w){A=true;var u=C(w.id);if(u){if(w.altContentId){var y=C(w.altContentId);if(y){M=y;l=w.altContentId}}else{M=G(u)}if(!(/%$/.test(w.width))&&parseInt(w.width,10)<310){w.width="310"}if(!(/%$/.test(w.height))&&parseInt(w.height,10)<137){w.height="137"}K.title=K.title.slice(0,47)+" - Flash Player Installation";var z=h.ie&&h.win?"ActiveX":"PlugIn",q=K.title,r="MMredirectURL="+j.location+"&MMplayerType="+z+"&MMdoctitle="+q,x=w.id;if(h.ie&&h.win&&u.readyState!=4){var t=a("div");x+="SWFObjectNew";t.setAttribute("id",x);u.parentNode.insertBefore(t,u);u.style.display="none";var v=function(){u.parentNode.removeChild(u)};I(j,"onload",v)}U({data:w.expressInstall,id:m,width:w.width,height:w.height},{flashvars:r},x)}}function O(t){if(h.ie&&h.win&&t.readyState!=4){var r=a("div");t.parentNode.insertBefore(r,t);r.parentNode.replaceChild(G(t),r);t.style.display="none";var q=function(){t.parentNode.removeChild(t)};I(j,"onload",q)}else{t.parentNode.replaceChild(G(t),t)}}function G(v){var u=a("div");if(h.win&&h.ie){u.innerHTML=v.innerHTML}else{var r=v.getElementsByTagName(Q)[0];if(r){var w=r.childNodes;if(w){var q=w.length;for(var t=0;t<q;t++){if(!(w[t].nodeType==1&&w[t].nodeName=="PARAM")&&!(w[t].nodeType==8)){u.appendChild(w[t].cloneNode(true))}}}}}return u}function U(AG,AE,t){var q,v=C(t);if(v){if(typeof AG.id==b){AG.id=t}if(h.ie&&h.win){var AF="";for(var AB in AG){if(AG[AB]!=Object.prototype[AB]){if(AB.toLowerCase()=="data"){AE.movie=AG[AB]}else{if(AB.toLowerCase()=="styleclass"){AF+=' class="'+AG[AB]+'"'}else{if(AB.toLowerCase()!="classid"){AF+=" "+AB+'="'+AG[AB]+'"'}}}}}var AD="";for(var AA in AE){if(AE[AA]!=Object.prototype[AA]){AD+='<param name="'+AA+'" value="'+AE[AA]+'" />'}}v.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+AF+">"+AD+"</object>";i[i.length]=AG.id;q=C(AG.id)}else{if(h.webkit&&h.webkit<312){var AC=a("embed");AC.setAttribute("type",P);for(var z in AG){if(AG[z]!=Object.prototype[z]){if(z.toLowerCase()=="data"){AC.setAttribute("src",AG[z])}else{if(z.toLowerCase()=="styleclass"){AC.setAttribute("class",AG[z])}else{if(z.toLowerCase()!="classid"){AC.setAttribute(z,AG[z])}}}}}for(var y in AE){if(AE[y]!=Object.prototype[y]){if(y.toLowerCase()!="movie"){AC.setAttribute(y,AE[y])}}}v.parentNode.replaceChild(AC,v);q=AC}else{var u=a(Q);u.setAttribute("type",P);for(var x in AG){if(AG[x]!=Object.prototype[x]){if(x.toLowerCase()=="styleclass"){u.setAttribute("class",AG[x])}else{if(x.toLowerCase()!="classid"){u.setAttribute(x,AG[x])}}}}for(var w in AE){if(AE[w]!=Object.prototype[w]&&w.toLowerCase()!="movie"){F(u,w,AE[w])}}v.parentNode.replaceChild(u,v);q=u}}}return q}function F(t,q,r){var u=a("param");u.setAttribute("name",q);u.setAttribute("value",r);t.appendChild(u)}function X(r){var q=C(r);if(q&&(q.nodeName=="OBJECT"||q.nodeName=="EMBED")){if(h.ie&&h.win){if(q.readyState==4){B(r)}else{j.attachEvent("onload",function(){B(r)})}}else{q.parentNode.removeChild(q)}}}function B(t){var r=C(t);if(r){for(var q in r){if(typeof r[q]=="function"){r[q]=null}}r.parentNode.removeChild(r)}}function C(t){var q=null;try{q=K.getElementById(t)}catch(r){}return q}function a(q){return K.createElement(q)}function I(t,q,r){t.attachEvent(q,r);d[d.length]=[t,q,r]}function c(t){var r=h.pv,q=t.split(".");q[0]=parseInt(q[0],10);q[1]=parseInt(q[1],10)||0;q[2]=parseInt(q[2],10)||0;return(r[0]>q[0]||(r[0]==q[0]&&r[1]>q[1])||(r[0]==q[0]&&r[1]==q[1]&&r[2]>=q[2]))?true:false}function V(v,r){if(h.ie&&h.mac){return }var u=K.getElementsByTagName("head")[0],t=a("style");t.setAttribute("type","text/css");t.setAttribute("media","screen");if(!(h.ie&&h.win)&&typeof K.createTextNode!=b){t.appendChild(K.createTextNode(v+" {"+r+"}"))}u.appendChild(t);if(h.ie&&h.win&&typeof K.styleSheets!=b&&K.styleSheets.length>0){var q=K.styleSheets[K.styleSheets.length-1];if(typeof q.addRule==Q){q.addRule(v,r)}}}function W(t,q){var r=q?"visible":"hidden";if(e&&C(t)){C(t).style.visibility=r}else{V("#"+t,"visibility:"+r)}}function g(s){var r=/[\\\"<>\.;]/;var q=r.exec(s)!=null;return q?encodeURIComponent(s):s}var D=function(){if(h.ie&&h.win){window.attachEvent("onunload",function(){var w=d.length;for(var v=0;v<w;v++){d[v][0].detachEvent(d[v][1],d[v][2])}var t=i.length;for(var u=0;u<t;u++){X(i[u])}for(var r in h){h[r]=null}h=null;for(var q in audioplayer_swfobject){audioplayer_swfobject[q]=null}audioplayer_swfobject=null})}}();return{registerObject:function(u,q,t){if(!h.w3cdom||!u||!q){return }var r={};r.id=u;r.swfVersion=q;r.expressInstall=t?t:false;N[N.length]=r;W(u,false)},getObjectById:function(v){var q=null;if(h.w3cdom){var t=C(v);if(t){var u=t.getElementsByTagName(Q)[0];if(!u||(u&&typeof t.SetVariable!=b)){q=t}else{if(typeof u.SetVariable!=b){q=u}}}}return q},embedSWF:function(x,AE,AB,AD,q,w,r,z,AC){if(!h.w3cdom||!x||!AE||!AB||!AD||!q){return }AB+="";AD+="";if(c(q)){W(AE,false);var AA={};if(AC&&typeof AC===Q){for(var v in AC){if(AC[v]!=Object.prototype[v]){AA[v]=AC[v]}}}AA.data=x;AA.width=AB;AA.height=AD;var y={};if(z&&typeof z===Q){for(var u in z){if(z[u]!=Object.prototype[u]){y[u]=z[u]}}}if(r&&typeof r===Q){for(var t in r){if(r[t]!=Object.prototype[t]){if(typeof y.flashvars!=b){y.flashvars+="&"+t+"="+r[t]}else{y.flashvars=t+"="+r[t]}}}}f(function(){U(AA,y,AE);if(AA.id==AE){W(AE,true)}})}else{if(w&&!A&&c("6.0.65")&&(h.win||h.mac)){A=true;W(AE,false);f(function(){var AF={};AF.id=AF.altContentId=AE;AF.width=AB;AF.height=AD;AF.expressInstall=w;k(AF)})}}},getFlashPlayerVersion:function(){return{major:h.pv[0],minor:h.pv[1],release:h.pv[2]}},hasFlashPlayerVersion:c,createSWF:function(t,r,q){if(h.w3cdom){return U(t,r,q)}else{return undefined}},removeSWF:function(q){if(h.w3cdom){X(q)}},createCSS:function(r,q){if(h.w3cdom){V(r,q)}},addDomLoadEvent:f,addLoadEvent:R,getQueryParamValue:function(v){var u=K.location.search||K.location.hash;if(v==null){return g(u)}if(u){var t=u.substring(1).split("&");for(var r=0;r<t.length;r++){if(t[r].substring(0,t[r].indexOf("="))==v){return g(t[r].substring((t[r].indexOf("=")+1)))}}}return""},expressInstallCallback:function(){if(A&&M){var q=C(m);if(q){q.parentNode.replaceChild(M,q);if(l){W(l,true);if(h.ie&&h.win){M.style.display="block"}}M=null;l=null;A=false}}}}}();
\ No newline at end of file
diff --git a/mod/zaudio/audioplayer/license.txt b/mod/zaudio/audioplayer/license.txt
new file mode 100644
index 000000000..35f0bcd0e
--- /dev/null
+++ b/mod/zaudio/audioplayer/license.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2008 Martin Laine
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/mod/zaudio/audioplayer/player.swf b/mod/zaudio/audioplayer/player.swf
new file mode 100644
index 000000000..04be6a9bb
--- /dev/null
+++ b/mod/zaudio/audioplayer/player.swf
diff --git a/mod/zaudio/manifest.xml b/mod/zaudio/manifest.xml
new file mode 100644
index 000000000..6db4cbf47
--- /dev/null
+++ b/mod/zaudio/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+        <field key="author" value="Curverider" />
+        <field key="version" value="1.7" />
+        <field key="description" value="This simple plugin lets users play mp3's in the page." />
+        <field key="website" value="http://www.elgg.org/" />
+        <field key="copyright" value="(C) Curverider 2008-2010" />
+        <field key="licence" value="GNU Public License version 2" />
+        <field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/mod/zaudio/readme.txt b/mod/zaudio/readme.txt
new file mode 100644
index 000000000..5776231e6
--- /dev/null
+++ b/mod/zaudio/readme.txt
@@ -0,0 +1,9 @@
+Notes:
+
+* A simple plugin to play mp3 files on the page
+* http://wpaudioplayer.com/license
+* http://wpaudioplayer.com/standalone
+
+Instructions:
+
+Drop into mod, enable in the admin planel and use.
\ No newline at end of file
diff --git a/mod/zaudio/start.php b/mod/zaudio/start.php
new file mode 100644
index 000000000..af3bff891
--- /dev/null
+++ b/mod/zaudio/start.php
@@ -0,0 +1,22 @@
+<?php
+
+     /**
+     * ZAudio - a simple mp3 player
+     * A simple plugin to play mp3 files on the page
+     * http://wpaudioplayer.com/license
+     * http://wpaudioplayer.com/standalone
+     * @package ElggZAudio
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+     **/
+  
+    function zaudio_init() {
+		    
+     }
+     
+     // Make sure the status initialisation function is called on initialisation
+		register_elgg_event_handler('init','system','zaudio_init',999);
+		
+?>
\ No newline at end of file
diff --git a/mod/zaudio/views/default/file/specialcontent/audio/mp3.php b/mod/zaudio/views/default/file/specialcontent/audio/mp3.php
new file mode 100644
index 000000000..a2b3e654f
--- /dev/null
+++ b/mod/zaudio/views/default/file/specialcontent/audio/mp3.php
@@ -0,0 +1,31 @@
+<?php
+ 
+    /**
+     * ZAudio - a simple mp3 player
+     * A simple plugin to play mp3 files on the page
+     * http://wpaudioplayer.com/license
+     * http://wpaudioplayer.com/standalone
+     * @package ElggZAudio
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+     **/
+     
+?>
+<!-- include the audioplayer js code -->
+<script type="text/javascript" src="<?php echo $vars['url']; ?>mod/zaudio/audioplayer/audio-player.js"></script>  
+<!-- set up the player -->
+<script type="text/javascript">  
+    AudioPlayer.setup("<?php echo $vars['url']; ?>mod/zaudio/audioplayer/player.swf", {  
+         width: 290  
+    });  
+</script>  
+
+<div style="margin:10px 0 10px 10px;">
+<p id="audioplayer_1">Alternative content</p>  
+         <script type="text/javascript">  
+         AudioPlayer.embed("audioplayer_1", {soundFile: "<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>"});  
+         </script> 
+</div> 
+ 
\ No newline at end of file
diff --git a/mod/zaudio/views/default/file/specialcontent/audio/mpeg.php b/mod/zaudio/views/default/file/specialcontent/audio/mpeg.php
new file mode 100644
index 000000000..318e0b301
--- /dev/null
+++ b/mod/zaudio/views/default/file/specialcontent/audio/mpeg.php
@@ -0,0 +1,30 @@
+<?php
+ 
+    /**
+     * ZAudio - a simple mp3 player
+     * A simple plugin to play mp3 files on the page
+     * http://wpaudioplayer.com/license
+     * http://wpaudioplayer.com/standalone
+     * @package ElggZAudio
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+     **/
+     
+?>
+<!-- include the audioplayer js code -->
+<script type="text/javascript" src="<?php echo $vars['url']; ?>mod/zaudio/audioplayer/audio-player.js"></script>  
+<!-- set up the player -->
+<script type="text/javascript">  
+    AudioPlayer.setup("<?php echo $vars['url']; ?>mod/zaudio/audioplayer/player.swf", {  
+         width: 290  
+    });  
+</script>  
+
+<div style="margin:10px 0 10px 10px;">
+<p id="audioplayer_1">Alternative content</p>  
+         <script type="text/javascript">  
+         AudioPlayer.embed("audioplayer_1", {soundFile: "<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>"});  
+         </script> 
+</div> 
\ No newline at end of file
diff --git a/mod/zaudio/views/default/file/specialcontent/audio/mpg.php b/mod/zaudio/views/default/file/specialcontent/audio/mpg.php
new file mode 100644
index 000000000..318e0b301
--- /dev/null
+++ b/mod/zaudio/views/default/file/specialcontent/audio/mpg.php
@@ -0,0 +1,30 @@
+<?php
+ 
+    /**
+     * ZAudio - a simple mp3 player
+     * A simple plugin to play mp3 files on the page
+     * http://wpaudioplayer.com/license
+     * http://wpaudioplayer.com/standalone
+     * @package ElggZAudio
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.org/
+     **/
+     
+?>
+<!-- include the audioplayer js code -->
+<script type="text/javascript" src="<?php echo $vars['url']; ?>mod/zaudio/audioplayer/audio-player.js"></script>  
+<!-- set up the player -->
+<script type="text/javascript">  
+    AudioPlayer.setup("<?php echo $vars['url']; ?>mod/zaudio/audioplayer/player.swf", {  
+         width: 290  
+    });  
+</script>  
+
+<div style="margin:10px 0 10px 10px;">
+<p id="audioplayer_1">Alternative content</p>  
+         <script type="text/javascript">  
+         AudioPlayer.embed("audioplayer_1", {soundFile: "<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>"});  
+         </script> 
+</div> 
\ No newline at end of file
diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php
index 5ffb1be1a..b360bcc63 100644
--- a/views/default/account/forms/forgotten_password.php
+++ b/views/default/account/forms/forgotten_password.php
@@ -15,11 +15,17 @@ $form_body .= elgg_view('input/captcha');
 $form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "</p>";
 
 ?>
-<div class="contentWrapper">
-<?php
-echo elgg_view('input/form', array(
-	'action' => "{$vars['url']}action/user/requestnewpassword",
-	'body' => $form_body)
-);
-?>
-</div>
\ No newline at end of file
+<div id="elgg_content" class="sidebar">
+	<div id="elgg_page_contents" class="clearfloat forgotten_password">
+	<h2><?php echo elgg_echo('user:password:lost'); ?></h2>
+	<?php
+		echo elgg_view('input/form', array(
+			'action' => "{$vars['url']}action/user/requestnewpassword",
+			'body' => $form_body)
+		);
+	?>
+	</div>
+</div>
+<script type="text/javascript">
+	$(document).ready(function() { $('input[name=username]').focus(); });
+</script>
\ No newline at end of file
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index 394c1ea88..766b2ca28 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -10,16 +10,16 @@
 
 global $CONFIG;
 
-$form_body = "<p class=\"loginbox\"><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea')) . "</label>";
+$form_body = "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea')) . "</label>";
 $form_body .= "<br />";
-$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea')) . "</label><br />";
+$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea')) . "</label><br />";
 
 $form_body .= elgg_view('login/extend');
 
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <div id=\"persistent_login\"><label><input type=\"checkbox\" name=\"persistent\" value=\"true\" />".elgg_echo('user:persistent')."</label></div></p>";
-$form_body .= "<p class=\"loginbox\">";
+$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <div class='persistent_login'><label><input type='checkbox' name='persistent' value='true' />".elgg_echo('user:persistent')."</label></div></p>";
+$form_body .= "<p class='loginbox'>";
 $form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "<a href=\"{$vars['url']}pg/register/\">" . elgg_echo('register') . "</a> | " : "";
-$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
+$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a>";
 
 $login_url = $vars['url'];
 if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
@@ -27,7 +27,7 @@ if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
 }
 ?>
 
-<div id="login-box">
+<div id="login">
 <h2><?php echo elgg_echo('login'); ?></h2>
 	<?php
 		echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login"));
diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
index 3e53b6f05..0265ce187 100644
--- a/views/default/account/forms/register.php
+++ b/views/default/account/forms/register.php
@@ -17,12 +17,12 @@ if (($_SESSION['user']->admin) && ($vars['show_admin'])) {
 	$admin_option = true;
 }
 
-$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name', 'class' => "general-textarea", 'value' => $name)) . "</label><br />";
+$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name', 'class' => "input_text", 'value' => $name)) . "</label><br />";
 
-$form_body .= "<label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email', 'class' => "general-textarea", 'value' => $email)) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username', 'class' => "general-textarea", 'value' => $username)) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password', 'class' => "general-textarea")) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2', 'class' => "general-textarea")) . "</label><br />";
+$form_body .= "<label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email', 'class' => "input_text", 'value' => $email)) . "</label><br />";
+$form_body .= "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username', 'class' => "input_text", 'value' => $username)) . "</label><br />";
+$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password', 'class' => "input_password")) . "</label><br />";
+$form_body .= "<label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2', 'class' => "input_password")) . "</label><br />";
 
 // view to extend to add more fields to the registration form
 $form_body .= elgg_view('register/extend');
@@ -39,8 +39,12 @@ $form_body .= elgg_view('input/hidden', array('internalname' => 'invitecode', 'v
 $form_body .= elgg_view('input/hidden', array('internalname' => 'action', 'value' => 'register'));
 $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>";
 ?>
-
-<div id="register-box">
-<h2><?php echo elgg_echo('register'); ?></h2>
-<?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body)) ?>
-</div>
\ No newline at end of file
+<div id="elgg_content" class="clearfloat sidebar">
+	<div id="elgg_page_contents" class="clearfloat register">
+		<h2><?php echo elgg_echo('register'); ?></h2>
+		<?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body)) ?>
+	</div>
+</div>
+<script type="text/javascript">
+	$(document).ready(function() { $('input[name=name]').focus(); });
+</script>
\ No newline at end of file
diff --git a/views/default/account/forms/useradd.php b/views/default/account/forms/useradd.php
index 09b4c4718..734854d08 100644
--- a/views/default/account/forms/useradd.php
+++ b/views/default/account/forms/useradd.php
@@ -13,10 +13,9 @@ if (($_SESSION['user']->admin) && ($vars['show_admin'])) {
 	$admin_option = true;
 }
 
-$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name')) . "</label></p>";
-
-$form_body .= "<p><label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email')) . "</label></p>";
+$form_body  = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name')) . "</label></p>";
 $form_body .= "<p><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username')) . "</label></p>";
+$form_body .= "<p><label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email')) . "</label></p>";
 $form_body .= "<p><label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password')) . "</label></p>";
 $form_body .= "<p><label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2')) . "</label></p>";
 
@@ -27,7 +26,7 @@ if ($admin_option) {
 $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>";
 ?>
 
-<div id="add-box">
-<h2><?php echo elgg_echo('adduser'); ?></h2>
+<div class="admin_settings add_user">
+	<h3><?php echo elgg_echo('adduser'); ?></h3>
 	<?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/useradd", 'body' => $form_body)) ?>
 </div>
\ No newline at end of file
diff --git a/views/default/admin/main.php b/views/default/admin/main.php
index fc143244d..e345f56d6 100644
--- a/views/default/admin/main.php
+++ b/views/default/admin/main.php
@@ -9,4 +9,4 @@
  */
 
 // Description of what's going on
-echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("admin:description"))) . "</p>";
+echo elgg_view('output/longtext', array('value' => elgg_echo("admin:description")));
diff --git a/views/default/admin/main_opt/plugins.php b/views/default/admin/main_opt/plugins.php
index b1e2f0078..b8ae611d3 100644
--- a/views/default/admin/main_opt/plugins.php
+++ b/views/default/admin/main_opt/plugins.php
@@ -10,7 +10,7 @@
 
 global $CONFIG;
 ?>
-<div class="admin-menu-option">
+<div class="menu_admin_option">
 	<h2><?php echo elgg_echo('admin:plugins'); ?> </h2>
 	<p><?php echo elgg_echo('admin:plugins:opt:description'); ?><br />
 	<a href="<?php echo $CONFIG->wwwroot . "pg/admin/plugins/"; ?>"><?php echo elgg_echo('admin:plugins:opt:linktext'); ?></a></p>
diff --git a/views/default/admin/main_opt/site.php b/views/default/admin/main_opt/site.php
index 7c34015ba..e21dcc3fe 100644
--- a/views/default/admin/main_opt/site.php
+++ b/views/default/admin/main_opt/site.php
@@ -8,7 +8,7 @@
  * @link http://elgg.org/
  */
 ?>
-<div class="admin-menu-option">
+<div class="menu_admin_option">
 	<h2><?php echo elgg_echo('admin:site'); ?> </h2>
 	<p><?php echo elgg_echo('admin:site:opt:description'); ?><br />
 	<a href="<?php echo $CONFIG->wwwroot . "pg/admin/site/"; ?>"><?php echo elgg_echo('admin:site:opt:linktext'); ?></a></p>
diff --git a/views/default/admin/main_opt/statistics.php b/views/default/admin/main_opt/statistics.php
index fec4c3f20..5b063b82e 100644
--- a/views/default/admin/main_opt/statistics.php
+++ b/views/default/admin/main_opt/statistics.php
@@ -8,7 +8,7 @@
  * @link http://elgg.org/
  */
 ?>
-<div class="admin-menu-option">
+<div class="menu_admin_option">
 	<h2><?php echo elgg_echo('admin:statistics'); ?> </h2>
 	<p><?php echo elgg_echo('admin:statistics:opt:description'); ?><br />
 	<a href="<?php echo $CONFIG->wwwroot . "pg/admin/statistics/"; ?>"><?php echo elgg_echo('admin:statistics:opt:linktext'); ?></a></p>
diff --git a/views/default/admin/main_opt/user.php b/views/default/admin/main_opt/user.php
index e82f97625..f1dc28e5e 100644
--- a/views/default/admin/main_opt/user.php
+++ b/views/default/admin/main_opt/user.php
@@ -8,7 +8,7 @@
  * @link http://elgg.org/
  */
 ?>
-<div class="admin-menu-option">
+<div class="menu_admin_option">
 	<h2><?php echo elgg_echo('admin:user'); ?> </h2>
 	<p><?php echo elgg_echo('admin:user:opt:description'); ?><br />
 	<a href="<?php echo $CONFIG->wwwroot . "pg/admin/user/"; ?>"><?php echo elgg_echo('admin:user:opt:linktext'); ?></a></p>
diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php
index f73530f44..70e5d2683 100644
--- a/views/default/admin/plugins.php
+++ b/views/default/admin/plugins.php
@@ -15,7 +15,7 @@ $token = generate_action_token($ts);
 
 // Description of what's going on
 $buttons = " <a class='enableallplugins' href=\"{$CONFIG->url}action/admin/plugins/enableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('enableall')."</a>  <a class='disableallplugins' href=\"{$CONFIG->url}action/admin/plugins/disableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('disableall')."</a> ";
-echo "<div class=\"contentWrapper\"><span class=\"contentIntro\">" . $buttons . elgg_view('output/longtext', array('value' => elgg_echo("admin:plugins:description"))) . "<div class='clearfloat'></div></span></div>";
+echo $buttons . elgg_view('output/longtext', array('value' => elgg_echo("admin:plugins:description")));
 
 $limit = get_input('limit', 10);
 $offset = get_input('offset', 0);
@@ -33,20 +33,6 @@ foreach($plugin_list as $key => $foo) {
 // Display list of plugins
 $n = 0;
 foreach ($installed_plugins as $plugin => $data) {
-	//if (($n>=$offset) && ($n < $offset+$limit))
-		echo elgg_view("admin/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data, 'maxorder' => $max, 'order' => array_search($plugin, $plugin_list)));
-
+	echo elgg_view("admin/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data, 'maxorder' => $max, 'order' => array_search($plugin, $plugin_list)));
 	$n++;
-}
-
-// Diplay nav
-/*
-if ($count)
-{
-	echo elgg_view('navigation/pagination',array(
-										'baseurl' => $_SERVER['REQUEST_URI'],
-										'offset' => $offset,
-										'count' => $count,
-												));
-}
-*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/views/default/admin/plugins_opt/plugin.php b/views/default/admin/plugins_opt/plugin.php
index 33718f2ac..d813b8c01 100644
--- a/views/default/admin/plugins_opt/plugin.php
+++ b/views/default/admin/plugins_opt/plugin.php
@@ -26,7 +26,7 @@ if ($manifest['elgg_version']) {
 $ts = time();
 $token = generate_action_token($ts);
 ?>
-<div class="plugin_details <?php if ($active) echo "active"; else echo "not-active" ?>">
+<div class="plugin_details <?php if ($active) echo "active"; else echo "not_active" ?>">
 	<div class="admin_plugin_reorder">
 <?php
 			if ($vars['order'] > 10) {
@@ -56,7 +56,7 @@ $token = generate_action_token($ts);
 	<h3><?php echo $plugin; ?><?php if (elgg_view("settings/{$plugin}/edit")) { ?> <a class="pluginsettings_link">[<?php echo elgg_echo('settings'); ?>]</a><?php } ?></h3>
 
 	<?php if (elgg_view("settings/{$plugin}/edit")) { ?>
-	<div class="pluginsettings">
+	<div class="pluginsettings hidden">
 			<div id="<?php echo $plugin; ?>_settings">
 				<?php echo elgg_view("object/plugin", array('plugin' => $plugin, 'entity' => find_plugin_settings($plugin))) ?>
 			</div>
@@ -77,7 +77,7 @@ $token = generate_action_token($ts);
 
 	<p><a class="manifest_details"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></p>
 
-	<div class="manifest_file">
+	<div class="manifest_file hidden">
 
 	<?php if ($manifest) { ?>
 		<?php if ((!$version_check_valid) || (!isset($manifest['elgg_version']))) { ?>
diff --git a/views/default/admin/site.php b/views/default/admin/site.php
index 67cfca5a1..0893e4970 100644
--- a/views/default/admin/site.php
+++ b/views/default/admin/site.php
@@ -11,8 +11,6 @@
 global $CONFIG;
 
 // Description of what's going on
-echo "<div class=\"contentWrapper\">" . elgg_view('output/longtext', array('value' => elgg_echo("admin:site:description"))) . " ";
+echo elgg_view('output/longtext', array('value' => elgg_echo("admin:site:description")));
 
-echo elgg_view("settings/system",array("action" => $CONFIG->wwwroot."action/admin/site/update_basic")); // Always want to do this first.
-
-echo "</div>";
\ No newline at end of file
+echo elgg_view("settings/system",array("action" => $CONFIG->wwwroot."action/admin/site/update_basic")); // Always want to do this first.
\ No newline at end of file
diff --git a/views/default/admin/statistics_opt/basic.php b/views/default/admin/statistics_opt/basic.php
index eed94c76b..f89314fef 100644
--- a/views/default/admin/statistics_opt/basic.php
+++ b/views/default/admin/statistics_opt/basic.php
@@ -19,9 +19,9 @@ $version = get_version();
 $release = get_version(true);
 
 ?>
-<div class="admin_statistics">
+<div class="admin_settings site_stats">
 	<h3><?php echo elgg_echo('admin:statistics:label:basic'); ?></h3>
-	<table>
+	<table class="styled">
 		<tr class="odd">
 			<td class="column_one"><b><?php echo elgg_echo('admin:statistics:label:version'); ?> :</b></td>
 			<td><?php echo elgg_echo('admin:statistics:label:version:release'); ?> - <?php echo $release; ?>, <?php echo elgg_echo('admin:statistics:label:version:version'); ?> - <?php echo $version; ?></td>
diff --git a/views/default/admin/statistics_opt/numentities.php b/views/default/admin/statistics_opt/numentities.php
index 9f67512e1..4336c5a82 100644
--- a/views/default/admin/statistics_opt/numentities.php
+++ b/views/default/admin/statistics_opt/numentities.php
@@ -12,9 +12,9 @@
 $entity_stats = get_entity_statistics();
 $even_odd = "";
 ?>
-<div class="admin_statistics">
+<div class="admin_settings site_entities">
 	<h3><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h3>
-	<table>
+	<table class="styled">
 		<?php
 			foreach ($entity_stats as $k => $entry) {
 				arsort($entry);
diff --git a/views/default/admin/statistics_opt/online.php b/views/default/admin/statistics_opt/online.php
index 70a2979c1..b30e8a396 100644
--- a/views/default/admin/statistics_opt/online.php
+++ b/views/default/admin/statistics_opt/online.php
@@ -9,12 +9,16 @@
  */
 
 // users online
-get_context('search');
-$users_online = get_online_users();
-get_context('admin');
-?>
-
-<div class="admin_users_online">
-	<h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>
-	<?php echo $users_online; ?>
-</div>
+if( (is_plugin_enabled('search')) && (is_plugin_enabled('profile')) ) {
+	get_context('search');
+	$users_online = get_online_users();
+	get_context('admin');
+	?>
+	
+	<div class="admin_settings users_online">
+		<h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>
+		<?php echo $users_online; ?>
+	</div>
+<?php
+}
+?>
\ No newline at end of file
diff --git a/views/default/admin/user.php b/views/default/admin/user.php
index 409afbe88..eb07d120e 100644
--- a/views/default/admin/user.php
+++ b/views/default/admin/user.php
@@ -8,11 +8,12 @@
  * @link http://elgg.org/
  */
 
-// Description of what's going on
-echo "<div class=\"contentWrapper\"><span class=\"contentIntro\">" . elgg_view('output/longtext', array('value' => elgg_echo("admin:user:description"))) . "</span></div>";
-
-echo elgg_view("admin/user_opt/adduser");
-
+// Intro
+echo elgg_view('output/longtext', array('value' => elgg_echo("admin:user:description")));
+//echo elgg_view("admin/user_opt/adduser");
+// add a new user form
+echo elgg_view('account/forms/useradd', array('show_admin'=>true));
+// search for a user
 echo elgg_view("admin/user_opt/search");
 
 if ($vars['list']) {
diff --git a/views/default/admin/user_opt/adduser.php b/views/default/admin/user_opt/adduser.php
index 759678bc1..e69de29bb 100644
--- a/views/default/admin/user_opt/adduser.php
+++ b/views/default/admin/user_opt/adduser.php
@@ -1,18 +0,0 @@
-<?php
-/**
- * Add a user.
- * Form to add a new user.
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-?>
-
-<div class="admin_adduser_link">
-	<a href="#" onclick="$('#add_user_showhide').toggle()"><?php echo elgg_echo('admin:user:adduser:label'); ?></a>
-</div>
-<div id="add_user_showhide" style="display:none" >
-<?php echo elgg_view('account/forms/useradd', array('show_admin'=>true)); ?>
-</div>
\ No newline at end of file
diff --git a/views/default/admin/user_opt/search.php b/views/default/admin/user_opt/search.php
index 2e337755b..f853dcf3c 100644
--- a/views/default/admin/user_opt/search.php
+++ b/views/default/admin/user_opt/search.php
@@ -7,18 +7,19 @@
  * @author Curverider Ltd
  * @link http://elgg.org/
  */
+ 
+if( (is_plugin_enabled('search')) && (is_plugin_enabled('profile')) ) { 
 ?>
-<div id="search-box">
-	<form action="<?php echo $vars['url']; ?>pg/search/" method="get">
-	<b><?php echo elgg_echo('admin:user:label:search'); ?></b>
-	<?php
-
-		echo elgg_view('input/text',array('internalname' => 'q'));
-
-	?>
-	<input type="hidden" name="entity_type" value="user" />
-	<input type="hidden" name="search_type" value="entities" />
-	<input type="submit" name="<?php echo elgg_echo('admin:user:label:searchbutton'); ?>"
-		value="<?php echo elgg_echo('admin:user:label:searchbutton'); ?>" />
-	</form>
-</div>
+	<div class="admin_settings user_search">
+		<form action="<?php echo $vars['url']; ?>pg/search/" method="get">
+			<h3><?php echo elgg_echo('admin:user:label:search'); ?></h3>
+			<?php echo elgg_view('input/text',array('internalname' => 'q')); ?>
+			<input type="hidden" name="entity_type" value="user" />
+			<input type="hidden" name="search_type" value="entities" />
+			<input type="submit" name="<?php echo elgg_echo('admin:user:label:searchbutton'); ?>"
+				value="<?php echo elgg_echo('admin:user:label:searchbutton'); ?>" />
+		</form>
+	</div>
+<?php
+}
+?>
\ No newline at end of file
diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index 0348a0ce8..9e0d20881 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -1,40 +1,27 @@
 <?php
-/**
- * Elgg comment river view 
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
 
-$performed_by = get_entity($vars['item']->subject_guid);
-$object = get_entity($vars['item']->object_guid);
-$url = $object->getURL();
-$title = $object->title;
-if (!$title) {
-	$title = elgg_echo('untitled');
-}
-$subtype = get_subtype_from_id($object->subtype);
-
-//grab the annotation, if one exists
-if ($vars['item']->annotation_id != 0) {
-	$comment = get_annotation($vars['item']->annotation_id)->value;
-}
-$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
-$string .= elgg_echo("{$subtype}:river:annotate") . " | <a href=\"{$object->getURL()}\">" . $title . "</a>";
-$string .= "<div class=\"river_content_display\">";
-
-if ($comment) {
-	$contents = strip_tags($comment);//this is so we don't get large images etc in the activity river
-	if (strlen($contents) > 200) {
-		$string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
-	} else {
-		$string .= $contents;
+	$performed_by = get_entity($vars['item']->subject_guid);
+	$object = get_entity($vars['item']->object_guid);
+	$url = $object->getURL();
+	$title = $object->title;
+	if(!$title)
+		$title = elgg_echo('file:untitled');
+	$subtype = get_subtype_from_id($object->subtype);
+	//grab the annotation, if one exists
+	if($vars['item']->annotation_id != 0)
+		$comment = get_annotation($vars['item']->annotation_id)->value; 
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = "<div class=\"river_content_title\">" . sprintf(elgg_echo("river:posted:generic"),$url) . " ";
+	$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> " . friendly_time($object->time_created) . "</div>";
+	if(get_context() != 'riverdashboard'){
+		$string .= "<div class=\"river_content_display\">";
+		if($comment){
+			$contents = strip_tags($comment);//this is so we don't get large images etc in the activity river
+			if(strlen($contents) > 200)
+	        		$string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
+	    		else
+		    		$string .= $contents;
+       	}
+		$string .= "</div>";
 	}
-}
-
-$string .= "</div>";
-
 echo $string;
\ No newline at end of file
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index ca0f69eaf..7395d781a 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -1,12 +1,6 @@
 <?php
 /**
  * Elgg generic comment
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
  */
 
 $owner = get_user($vars['annotation']->owner_guid);
@@ -25,21 +19,13 @@ $owner = get_user($vars['annotation']->owner_guid);
 		?>
 	</div>
 	<div class="generic_comment_details">
-
-		<!-- output the actual comment -->
-		<?php echo elgg_view("output/longtext",array("value" => $vars['annotation']->value)); ?>
-
-		<p class="generic_comment_owner">
-			<a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo friendly_time($vars['annotation']->time_created); ?>
-		</p>
-
 		<?php
 
 			// if the user looking at the comment can edit, show the delete link
 			if ($vars['annotation']->canEdit()) {
 
 			?>
-		<p>
+		<div class="delete_button">
 			<?php
 
 				echo elgg_view("output/confirmlink",array(
@@ -49,10 +35,15 @@ $owner = get_user($vars['annotation']->owner_guid);
 				));
 
 			?>
-		</p>
+		</div>
 
 			<?php
 			} //end of can edit if statement
 		?>
-	</div><!-- end of generic_comment_details -->
+		<p class="generic_comment_owner">
+			<a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo friendly_time($vars['annotation']->time_created); ?>
+		</p>
+		<!-- output the actual comment -->
+		<div class="generic_comment_body"><?php echo elgg_view("output/longtext",array("value" => $vars['annotation']->value)); ?></div>
+	</div><div class="clearfloat"></div><!-- end of generic_comment_details -->
 </div><!-- end of generic_comment div -->
\ No newline at end of file
diff --git a/views/default/annotation/latest_comments.php b/views/default/annotation/latest_comments.php
new file mode 100755
index 000000000..85ddfab7b
--- /dev/null
+++ b/views/default/annotation/latest_comments.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Display latest comments on objects
+ **/
+	 
+if($vars['comments']){
+	global $CONFIG;
+		
+	echo "<div class='sidebar container'>";
+	echo "<h2>" . elgg_echo('latestcomments') . "</h2>";		
+	foreach($vars['comments'] as $comment){
+	   //grab the entity the comment is on
+	   $entity = get_entity($comment->entity_guid);
+		//comment owner
+		$comment_owner = get_user($comment->owner_guid);
+		$friendlytime = friendly_time($comment->time_created); // get timestamp for comment
+	
+		//set the title
+		if($entity->title)
+			$objecttitle = $entity->title;
+		else
+			$objecttitle = elgg_echo('file:untitled');			
+				
+		//if the entity has been deleted, don't link to it
+		if($entity){
+			$url = $entity->getURL(); // get url to file for comment link
+			$url_display = "<a href=\"{$url}\">{$objecttitle}</a>";
+			//$owner = $entity->getOwnerEntity(); // get file owner
+		}else{
+			$url_display = $objecttitle;
+		}
+	
+		echo "<div class='LatestComment'><span class='generic_comment_icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
+		echo "<p class='owner_timestamp'><a href=\"{$vars['url']}pg/profile/{$comment_owner->username}\">{$comment_owner->name}</a> " . elgg_echo('on') . " {$url_display} <small>{$friendlytime}</small></p>";
+		echo "<div class='clearfloat'></div></div>";
+	
+	}
+	echo "</div>";
+}
\ No newline at end of file
diff --git a/views/default/canvas/default.php b/views/default/canvas/default.php
index 0cfa8b49a..9ad941ccc 100644
--- a/views/default/canvas/default.php
+++ b/views/default/canvas/default.php
@@ -8,8 +8,7 @@
  * @link http://elgg.org/
  */
 
-for ($i = 1; $i < 8; $i++) {
-	if (isset($vars["area{$i}"])) {
-		echo $vars["area{$i}"];
-	}
-}
\ No newline at end of file
+if (isset($vars['area1'])) {
+	echo $vars['area1'];
+}
+
diff --git a/views/default/canvas/layouts/one_column.php b/views/default/canvas/layouts/one_column.php
index c71c2def6..68a75f784 100644
--- a/views/default/canvas/layouts/one_column.php
+++ b/views/default/canvas/layouts/one_column.php
@@ -8,10 +8,8 @@
  * @link http://elgg.org/
  */
 ?>
-
-<!-- main content -->
-<div id="one_column">
-
-<?php echo $vars['area1']; ?>
-
-</div><!-- /one_column -->
\ No newline at end of file
+<div id="elgg_content" class="clearfloat">
+	<div id="elgg_page_contents" class="clearfloat one_column">
+		<?php echo $vars['area1']; ?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/views/default/canvas/layouts/one_column_with_sidebar.php b/views/default/canvas/layouts/one_column_with_sidebar.php
new file mode 100644
index 000000000..f7fff4d08
--- /dev/null
+++ b/views/default/canvas/layouts/one_column_with_sidebar.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Elgg 2 column left sidebar canvas layout
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+?>
+<div id="elgg_content" class="clearfloat sidebar">
+	<div id="elgg_sidebar">
+		<?php 
+			echo elgg_view('page_elements/owner_block'); 
+			if (isset($vars['area1'])) echo $vars['area1'];
+			if (isset($vars['area3'])) echo $vars['area3']; 
+		?>
+	</div>
+	
+	<div id="elgg_page_contents" class="clearfloat">
+		<?php if (isset($vars['area2'])) echo $vars['area2']; ?>
+	</div>
+</div>
diff --git a/views/default/canvas/layouts/two_column_left_sidebar.php b/views/default/canvas/layouts/two_column_left_sidebar.php
deleted file mode 100644
index 40eb77b1a..000000000
--- a/views/default/canvas/layouts/two_column_left_sidebar.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Elgg 2 column left sidebar canvas layout
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-?>
-<!-- left sidebar -->
-<div id="two_column_left_sidebar">
-
-	<?php
-
-		echo elgg_view('page_elements/owner_block',array('content' => $vars['area1']));
-
-	?>
-
-	<?php if (isset($vars['area3'])) echo $vars['area3']; ?>
-
-</div><!-- /two_column_left_sidebar -->
-
-<!-- main content -->
-<div id="two_column_left_sidebar_maincontent">
-
-<?php if (isset($vars['area2'])) echo $vars['area2']; ?>
-
-</div><!-- /two_column_left_sidebar_maincontent -->
-
diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php
index 7b3470dd2..fa0d2ab0c 100644
--- a/views/default/canvas/layouts/widgets.php
+++ b/views/default/canvas/layouts/widgets.php
@@ -1,42 +1,52 @@
 <?php
 
-/**
- * Elgg widget layout
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-$widgettypes = get_widget_types();
-
-$owner = page_owner_entity();
-
-$area1widgets = get_widgets(page_owner(),get_context(),1);
-$area2widgets = get_widgets(page_owner(),get_context(),2);
-$area3widgets = get_widgets(page_owner(),get_context(),3);
-
-if (empty($area1widgets) && empty($area2widgets) && empty($area3widgets)) {
-	if (isset($vars['area3'])) {
-		$vars['area1'] = $vars['area3'];
-	}
-	if (isset($vars['area4'])) {
-		$vars['area2'] = $vars['area4'];
-	}
-}
-
-if ($owner && $owner->canEdit()) {
-
-?>
+	/**
+	 * Elgg widget layout
+	 */
+
+		$widgettypes = get_widget_types();
+		
+		$owner = page_owner_entity();
+		
+		$area1widgets = get_widgets(page_owner(),get_context(),1);
+		$area2widgets = get_widgets(page_owner(),get_context(),2);
+		$area3widgets = get_widgets(page_owner(),get_context(),3);
+		
+		if (empty($area1widgets) && empty($area2widgets) && empty($area3widgets)) {
+			
+			if (isset($vars['area3'])) $vars['area1'] = $vars['area3'];
+			if (isset($vars['area4'])) $vars['area2'] = $vars['area4'];
+			
+		}
+		
+		if (is_array($widgettypes) && sizeof($widgettypes) > 0 && $owner && $owner->canEdit()) {
+
+			
+ 		
+		if($_SESSION['user']->guid == page_owner() || ($owner instanceof ElggGroup && $owner->canEdit())){
+		
+			if(get_context() == "profile") {
+		?>
+			<!-- add remove widget button -->
+			<div class="add_widgets" style="margin:-18px 0 10px;">
+			<a href="javascript:void(0);" class="action_button toggle_customise_edit_panel"><?php echo(elgg_echo('dashboard:configure')); ?></a>
+			</div><div class="clearfloat"></div>
+		<?php
+			}
+		}
+		?>
 
-<div id="customise_editpanel">
+<div id="customise_editpanel" class="hidden">
 
 <div id="customise_editpanel_rhs">
 <h2><?php echo elgg_echo("widgets:gallery"); ?></h2>
 <div id="widget_picker_gallery">
 
+
 <?php
+
 	foreach($widgettypes as $handler => $widget) {
+
 ?>
 
 <table class="draggable_widget" cellspacing="0"><tr><td>
@@ -45,8 +55,8 @@ if ($owner && $owner->canEdit()) {
 		<input type="hidden" name="multiple" value="<?php if ((isset($widget->handler)) && (isset($widgettypes[$widget->handler]->multiple))) echo $widgettypes[$widget->handler]->multiple; ?>" />
 		<input type="hidden" name="side" value="<?php if ((isset($widget->handler)) && (isset($widgettypes[$widget->handler])) && (is_array($widgettypes[$widget->handler]->positions))) echo in_array('side',$widgettypes[$widget->handler]->positions); ?>" />
 		<input type="hidden" name="main" value="<?php if ((isset($widget->handler)) && (isset($widgettypes[$widget->handler])) && (is_array($widgettypes[$widget->handler]->positions))) echo in_array('main',$widgettypes[$widget->handler]->positions); ?>" />
-		<input type="hidden" name="handler" value="<?php echo htmlentities($handler, ENT_QUOTES, 'UTF-8'); ?>" />
-		<input type="hidden" name="description" value="<?php echo htmlentities($widget->description, ENT_QUOTES, 'UTF-8'); ?>" />
+		<input type="hidden" name="handler" value="<?php echo htmlentities($handler); ?>" />
+		<input type="hidden" name="description" value="<?php echo htmlentities($widget->description, null, 'UTF-8'); ?>" />
 		<input type="hidden" name="guid" value="0" />
 	</h3>
 </td>
@@ -64,6 +74,7 @@ if ($owner && $owner->canEdit()) {
 </div><!-- /#customise_editpanel_rhs -->
 </div><!-- /#widget_picker_gallery -->
 
+
 <div class="customise_editpanel_instructions">
 <h2><?php echo elgg_echo('widgets:add'); ?></h2>
 <?php echo elgg_view('output/longtext', array('value' => elgg_echo('widgets:add:description'))); ?>
@@ -73,25 +84,28 @@ if ($owner && $owner->canEdit()) {
 <div id="customise_page_view">
 
 <table cellspacing="0">
-<tr>
-	<td colspan="2" align="left" valign="top">
+  <tr>
+    <td colspan="2" align="left" valign="top">
+    
+    <?php
+if(get_context() != "profile"){ /* on groups */
+    ?>
 
-	<?php
-	if(get_context() == "profile"){
-	?>
 			<h2 class="profile_box"><?php echo elgg_echo("widgets:profilebox"); ?></h2>
-			<div id="profile_box_widgets">
-			<p><small><?php echo elgg_echo('widgets:position:fixed'); ?></small></p>
-			</div>
-	<?php
-	}
-	?>
-
-	</td>
-
-	<td rowspan="2" align="left" valign="top">
+    		<div id="profile_box_widgets">
+    		<p><small><?php echo elgg_echo('widgets:position:fixed'); ?></small></p>
+    		</div>
+
+    <?php
+	} 
+    ?>
+    
+    </td>
+    
+    
+    <td rowspan="2" align="left" valign="top">
 		<h2><?php echo elgg_echo("widgets:rightcolumn"); ?></h2>
-		<div id="rightcolumn_widgets" <?php if(get_context() == "profile")echo "class=\"long\""; ?>>
+		<div id="rightcolumn_widgets" <?php if(get_context() != "profile")echo "class=\"long\""; ?> >
 		<?php
 			$rightcolumn_widgets = "";
 			if (is_array($area3widgets) && sizeof($area3widgets) > 0) {
@@ -101,17 +115,17 @@ if ($owner && $owner->canEdit()) {
 					}
 					$rightcolumn_widgets .= "{$widget->handler}::{$widget->getGUID()}";
 		?>
-
+		
 		<table class="draggable_widget" cellspacing="0"><tr><td width="149px">
 			<h3>
 				<?php echo $widgettypes[$widget->handler]->name; ?>
-				<input type="hidden" name="handler" value="<?php
-					echo $widget->handler;
+				<input type="hidden" name="handler" value="<?php 
+					echo $widget->handler; 
 				?>" />
 				<input type="hidden" name="multiple" value="<?php echo $widgettypes[$widget->handler]->multiple; ?>" />
 				<input type="hidden" name="side" value="<?php echo in_array('side',$widgettypes[$widget->handler]->positions); ?>" />
 				<input type="hidden" name="main" value="<?php echo in_array('main',$widgettypes[$widget->handler]->positions); ?>" />
-				<input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description, ENT_QUOTES, 'UTF-8'); ?>" />
+				<input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description); ?>" />
 				<input type="hidden" name="guid" value="<?php echo $widget->getGUID(); ?>" />
 			</h3>
 		</td>
@@ -119,19 +133,19 @@ if ($owner && $owner->canEdit()) {
 		<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="14px" height="14px" class="more_info" /></a></td>
 		<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="15px" height="15px" class="drag_handle" /></a></td>
 		</tr></table>
-
+		
 		<?php
-
+					
 				}
 			}
 		?>
-
+		
 		</div>
-	</td><!-- /rightcolumn td -->
-
-</tr>
-
-<tr>
+    </td><!-- /rightcolumn td -->
+    
+  </tr>
+  
+  <tr>
 
 <td>
 <h2><?php echo elgg_echo("widgets:leftcolumn"); ?></h2>
@@ -150,13 +164,13 @@ if ($owner && $owner->canEdit()) {
 <table class="draggable_widget" cellspacing="0"><tr><td width="149px">
 	<h3>
 		<?php echo $widgettypes[$widget->handler]->name; ?>
-		<input type="hidden" name="handler" value="<?php
-			echo $widget->handler;
+		<input type="hidden" name="handler" value="<?php 
+			echo $widget->handler; 
 		?>" />
 		<input type="hidden" name="multiple" value="<?php echo $widgettypes[$widget->handler]->multiple; ?>" />
 		<input type="hidden" name="side" value="<?php echo in_array('side',$widgettypes[$widget->handler]->positions); ?>" />
 		<input type="hidden" name="main" value="<?php echo in_array('main',$widgettypes[$widget->handler]->positions); ?>" />
-		<input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description, ENT_QUOTES, 'UTF-8'); ?>" />
+		<input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description); ?>" />
 		<input type="hidden" name="guid" value="<?php echo $widget->getGUID(); ?>" />
 	</h3>
 </td>
@@ -166,7 +180,7 @@ if ($owner && $owner->canEdit()) {
 </tr></table>
 
 <?php
-
+			
 		}
 	}
 ?>
@@ -191,13 +205,13 @@ if ($owner && $owner->canEdit()) {
 <table class="draggable_widget" cellspacing="0"><tr><td width="149px">
 	<h3>
 		<?php echo $widgettypes[$widget->handler]->name; ?>
-		<input type="hidden" name="handler" value="<?php
-			echo $widget->handler;
+		<input type="hidden" name="handler" value="<?php 
+			echo $widget->handler; 
 		?>" />
 		<input type="hidden" name="multiple" value="<?php echo $widgettypes[$widget->handler]->multiple; ?>" />
 		<input type="hidden" name="side" value="<?php echo in_array('side',$widgettypes[$widget->handler]->positions); ?>" />
 		<input type="hidden" name="main" value="<?php echo in_array('main',$widgettypes[$widget->handler]->positions); ?>" />
-		<input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description, ENT_QUOTES, 'UTF-8'); ?>" />
+		<input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description); ?>" />
 		<input type="hidden" name="guid" value="<?php echo $widget->getGUID(); ?>" />
 	</h3>
 </td>
@@ -207,7 +221,7 @@ if ($owner && $owner->canEdit()) {
 </tr></table>
 
 <?php
-
+			
 		}
 	}
 ?>
@@ -226,98 +240,100 @@ if ($owner && $owner->canEdit()) {
 </div><!-- /#customise_page_view -->
 
 <form action="<?php echo $vars['url']; ?>action/widgets/reorder" method="post">
+<?php echo elgg_view('input/securitytoken'); ?>
 <textarea type="textarea" value="Left widgets"   style="display:none" name="debugField1" id="debugField1" /><?php echo $leftcolumn_widgets; ?></textarea>
 <textarea type="textarea" value="Middle widgets" style="display:none" name="debugField2" id="debugField2" /><?php echo $middlecolumn_widgets; ?></textarea>
 <textarea type="textarea" value="Right widgets"  style="display:none" name="debugField3" id="debugField3" /><?php echo $rightcolumn_widgets; ?></textarea>
 
 <input type="hidden" name="context" value="<?php echo get_context(); ?>" />
 <input type="hidden" name="owner" value="<?php echo page_owner(); ?>" />
-
-<?php
-$ts = time();
-$token = generate_action_token($ts);
-?>
-<input type="hidden" name="__elgg_ts" value="<?php echo $ts; ?>" />
-<input type="hidden" name="__elgg_token" value="<?php echo $token; ?>" />
-
-<input type="submit" value="<?php echo elgg_echo('save'); ?>" class="submit_button" onclick="$('a.toggle_customise_edit_panel').click();" />
-<input type="button" value="<?php echo elgg_echo('cancel'); ?>" class="cancel_button" onclick="$('a.toggle_customise_edit_panel').click();" />
+<input type="submit" onfocus="blur()" value="<?php echo elgg_echo('save'); ?>" class="submit_button" onclick="$('a.Action_Button.toggle_customise_edit_panel').click();" />
+<input type="button" onfocus="blur()" value="<?php echo elgg_echo('cancel'); ?>" class="cancel_button" onclick="$('a.Action_Button.toggle_customise_edit_panel').click();" />
 
 </form>
 </div><!-- /customise_editpanel -->
 
 <?php
-
+			
 		}
-
+		
 ?>
 
 
+
 <table cellspacing="0" id="widget_table">
-<tr>
-	<td colspan="2" align="left" valign="top" height="1px">
+  <tr>
+    <td colspan="2" align="left" valign="top" height="1px">
 		<!-- profile box or 'dashboard info' notice -->
 		<?php if (isset($vars['area1'])) echo $vars['area1']; ?>
 	</td>
-	<td rowspan="2" align="left" valign="top" height="100%">
-		<?php
-		if($_SESSION['user']->guid == page_owner()){
+    <td rowspan="2" align="left" valign="top" height="100%">
+
+	<?php 	
+		if($_SESSION['user']->guid == page_owner() || ($owner instanceof ElggGroup && $owner->canEdit())){
+		
+			if(get_context() != "profile") {
 		?>
-		<!-- customise page button -->
-		<a href="javascript:void(0);" class="toggle_customise_edit_panel"><?php echo(elgg_echo('dashboard:configure')); ?></a>
-		<!-- <div style="clear:both;"></div> -->
+			<!-- customise page button appears in different place on groups widgets -->
+			<div class="add_widgets">
+			<a href="javascript:void(0);" class="action_button toggle_customise_edit_panel"><?php echo(elgg_echo('dashboard:configure')); ?></a>
+			</div>
 		<?php
+			}
 		}
 		?>
 
+
 		<div id="widgets_right">
 		<?php
-
+		
 			if (is_array($area3widgets) && sizeof($area3widgets) > 0)
 			foreach($area3widgets as $widget) {
 				echo elgg_view_entity($widget);
 			}
 
 		?>
-
-		</div><!-- /#widgets_right -->
-	</td>
-</tr>
-<tr>
+		
+		</div><!-- /#widgets_right -->	    
+    </td>
+  </tr>
+  <tr>
 	<td align="left" valign="top">
-
+	
 		<!-- left widgets -->
 		<div id="widgets_left">
-
+		
 		<?php
-
+		
 			if (is_array($area1widgets) && sizeof($area1widgets) > 0)
 			foreach($area1widgets as $widget) {
 				echo elgg_view_entity($widget);
 			}
 
 		?>
-
+		
 		</div><!-- /#widgets_left -->
-
+	
 	</td>
 	<td align="left" valign="top">
-
+	
 		<!-- widgets middle -->
 		<div id="widgets_middle">
-
+		
 		<?php if (isset($vars['area2'])) echo $vars['area2']; ?>
 		<?php
-
+		
 			if (is_array($area2widgets) && sizeof($area2widgets) > 0)
 			foreach($area2widgets as $widget) {
 				echo elgg_view_entity($widget);
 			}
-
+		
 		?>
-
+		
 		</div><!-- /#widgets_middle -->
-
+	
 	</td>
 	</tr>
 </table>
+
+
diff --git a/views/default/canvas_header/submenu_group.php b/views/default/canvas_header/submenu_group.php
index 2ec9ab451..bf9fb6ab8 100644
--- a/views/default/canvas_header/submenu_group.php
+++ b/views/default/canvas_header/submenu_group.php
@@ -15,5 +15,6 @@ if (isset($vars['group_name'])) {
 
 if (isset($vars['submenu'])) {
 	$submenu = "<ul>" . $vars['submenu'] . "</ul>";
-	echo "<div class=\"submenu_group\"><div class=\"submenu_group_{$groupname}\">{$submenu}</div></div>";
+	//echo "<div class=\"submenu_group\"><div class=\"submenu_group_{$groupname}\">{$submenu}</div></div>";
+	echo $submenu;
 }
\ No newline at end of file
diff --git a/views/default/comments/forms/edit.php b/views/default/comments/forms/edit.php
index 3116bd3da..a52d8659c 100644
--- a/views/default/comments/forms/edit.php
+++ b/views/default/comments/forms/edit.php
@@ -8,12 +8,15 @@
  *
  * @uses $vars['entity']
  */
+	 
+	 if (isset($vars['entity']) && isloggedin()) {
+    	 
+		 $form_body = "<div class='contentWrapper comment'><p class='longtext_editarea'><label>".elgg_echo("generic_comments:text")."<br />" . elgg_view('input/longtext',array('internalname' => 'generic_comment')) . "</label></p>";
+		 $form_body .= elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID()));
+		 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))) . "</div>";
+		 
+		 echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/comments/add"));
 
-if (isset($vars['entity']) && isloggedin()) {
-	$form_body = "<div class=\"contentWrapper\"><p class='longtext_editarea'><label>".elgg_echo("generic_comments:text")."<br />" . elgg_view('input/longtext',array('internalname' => 'generic_comment')) . "</label></p>";
-	$form_body .= "<p>" . elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID()));
-	$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))) . "</p></div>";
-
-	echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/comments/add"));
-
-}
\ No newline at end of file
+    }
+    
+?>
\ No newline at end of file
diff --git a/views/default/css.php b/views/default/css.php
index e5df6a0b2..80885ef7d 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -1,20 +1,42 @@
-<?php
 /**
- * Elgg Default Theme
- * core CSS file
- *
- * Updated 30 Sept 09
- *
- * @package Elgg
- * @subpackage Core
- * @link http://elgg.org/
- *
+ * ELGG DEFAULT CSS
  * @uses $vars['wwwroot'] The site URL
- */
-?>
+*/
+
+/* Table of Contents:
+
+	RESET CSS 					reduce browser inconsistencies in line height, margins, font size...
+	CSS BASICS					<body> <p> <a> <h1>
+	PAGE LAYOUT					main page content blocks: header, sidebar, footer...
+	GENERIC SELECTORS			reusable generic classes
+	ELGG TOPBAR					elgg topbar
+	TOOLS MENU					drop-down tools menu in topbar
+	HEADER CONTENTS
+	FOOTER CONTENTS
+	SYSTEM MESSAGES				system messages overlay
+	BREADCRUMBS
+	SUBMENU						current page/tool submenu in sidebar
+	PAGINATION					re-usable default page navigation
+	ELGG TABBED NAVIGATION 		primary tabbed elgg navigation in header
+	LOGIN / REGISTER			login box, register, and lost password page styles
+	CONTENT HEADER
+	ENTITY LISTINGS				elgg's default entity listings
+	USER SETTINGS & ADMIN AREA	styles for user settings and default admin area
+	GENERAL FORM ELEMENTS		default styles for all elgg input/form elements
+	
+	
+
+*/
+/* Colors:	
+
+	#4690D6 - elgg light blue
+	#0054A7 - elgg dark blue
+*/
+
+
 
 /* ***************************************
-	RESET BASE STYLES
+	RESET CSS
 *************************************** */
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
@@ -34,19 +56,28 @@ table, caption, tbody, tfoot, thead, tr, th, td {
 	font-family: inherit;
 	vertical-align: baseline;
 }
-/* remember to define focus styles! */
+img {
+	border-width:0;
+	border-color:transparent;
+}
 :focus {
-	outline: 0;
+	outline:0 none;
+	-moz-outline-style: none;
 }
 ol, ul {
-	list-style: none;
+	list-style:none outside none;
 }
 em, i {
 	font-style:italic;
 }
-/* tables still need cellspacing="0" (for ie6) */
+ins {
+	text-decoration:none;
+}
+del {
+	text-decoration:line-through;
+}
 table {
-	border-collapse: separate;
+	border-collapse: collapse;
 	border-spacing: 0;
 }
 caption, th, td {
@@ -61,74 +92,46 @@ q:before, q:after {
 blockquote, q {
 	quotes: "" "";
 }
-.clearfloat {
-	clear:both;
-	height:0;
-	font-size: 1px;
-	line-height: 0px;
-}
 
-/* ***************************************
-	DEFAULTS
-*************************************** */
 
-/* elgg open source		blue 			#4690d6 */
-/* elgg open source		dark blue 		#0054a7 */
-/* elgg open source		light yellow 	#FDFFC3 */
-/* elgg open source		light blue	 	#bbdaf7 */
 
 
+/* ***************************************
+	BASICS
+*************************************** */
 body {
 	text-align:left;
 	margin:0 auto;
 	padding:0;
-	background: #dedede;
-	font: 80%/1.4  "Lucida Grande", Verdana, sans-serif;
-	color: #333333;
+	background-color: white;
+	font-size: 80%;
+	line-height: 1.4em;
+	font-family: "Lucida Grande",Arial,Tahoma,Verdana,sans-serif;
 }
 a {
-	color: #4690d6;
+	color: #4690D6;
 	text-decoration: none;
 	-moz-outline-style: none;
 	outline: none;
 }
-a:visited {
-
-}
-a:hover {
-	color: #0054a7;
+a:hover,
+a.selected {
+	color: #555555;
 	text-decoration: underline;
 }
 p {
-	margin: 0px 0px 15px 0;
-}
-img {
-	border: none;
-}
-ul {
-	margin: 5px 0px 15px;
-	padding-left: 20px;
-}
-ul li {
-	margin: 0px;
-}
-ol {
-	margin: 5px 0px 15px;
-	padding-left: 20px;
-}
-ul li {
-	margin: 0px;
+	margin-bottom:15px;
 }
-form {
-	margin: 0px;
-	padding: 0px;
+p:last-child {
+	margin-bottom:0;
 }
 small {
 	font-size: 90%;
 }
 h1, h2, h3, h4, h5, h6 {
 	font-weight: bold;
-	line-height: normal;
+	line-height: auto;
+	color:#0054A7;
 }
 h1 { font-size: 1.8em; }
 h2 { font-size: 1.5em; }
@@ -136,29 +139,24 @@ h3 { font-size: 1.2em; }
 h4 { font-size: 1.0em; }
 h5 { font-size: 0.9em; }
 h6 { font-size: 0.8em; }
-
 dt {
-	margin: 0;
-	padding: 0;
 	font-weight: bold;
 }
 dd {
 	margin: 0 0 1em 1em;
-	padding: 0;
 }
 pre, code {
 	font-family:Monaco,"Courier New",Courier,monospace;
 	font-size:12px;
 	background:#EBF5FF;
 	overflow:auto;
-
+	
 	overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */
 	white-space: pre-wrap; /* css-3 */
 	white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
 	white-space: -pre-wrap; /* Opera 4-6 */
 	white-space: -o-pre-wrap; /* Opera 7 */
 	word-wrap: break-word; /* Internet Explorer 5.5+ */
-
 }
 code {
 	padding:2px 3px;
@@ -173,415 +171,289 @@ blockquote {
 	margin:0px 0 15px 0;
 	line-height:1.3em;
 	background:#EBF5FF;
-	border:none !important;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-}
-blockquote p {
-	margin:0 0 5px 0;
+	border:none;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
 }
 
+
 /* ***************************************
-	PAGE LAYOUT - MAIN STRUCTURE
+   GENERIC SELECTORS 
 *************************************** */
-#page_container {
-	margin:0;
-	padding:0;
+h2 {
+	border-bottom:1px solid #CCCCCC;
+	padding-bottom:5px;
+}
+.clearfloat:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+.divider {
+	border-top:1px solid #cccccc;
 }
-#page_wrapper {
-	width:990px;
-	margin:0 auto;
-	padding:0;
-	min-height: 300px;
-
+.hidden {
+	display:none;
 }
-#layout_header {
-	text-align:left;
-	width:100%;
-	height:67px;
-	background:#dedede;
+.radius8 {
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
 }
-#wrapper_header {
-	margin:0;
-	padding:10px 20px 20px 0px;
+.margin_top {
+	margin-top:10px;
 }
-#wrapper_header h1 {
-	margin:10px 0 0 0;
-	letter-spacing: -0.03em;
+form.action {
+	margin-top:10px;
 }
-#layout_canvas {
-	margin:0 0 20px 0;
-	padding:20px;
-	min-height: 360px;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	background: white;
-	border-bottom:1px solid #cccccc;
-	border-right:1px solid #cccccc;
+.tags {
+	background-image:url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/icon_tag.png);
+	background-repeat: no-repeat;
+	background-position: left 2px;
+	padding:1px 0 0 16px;
+	font-size: 90%;
 }
-
-
-/* canvas layout: 1 column, no sidebar */
-#one_column {
-/* 	width:928px; */
-	margin:0;
-	min-height: 360px;
-	background: #dedede;
-	padding:0 0 10px 0;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
+.ajax_loader {
+	background-color: white;
+	background-image: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/ajax_loader_bw.gif);
+	background-repeat: no-repeat;
+	background-position: center 30px;
+	/*
+	width:auto;
+	height:100px;
+	margin:0 10px 0 10px;
+*/
 }
-
-/* canvas layout: 2 column left sidebar */
-#two_column_left_sidebar {
-	width:210px;
-	margin:0 20px 0 0;
-	min-height:360px;
-	float:left;
-	background: #dedede;
-	padding:0px;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	border-bottom:1px solid #cccccc;
-	border-right:1px solid #cccccc;
+#elgg_sidebar h3 {
+	border-bottom:1px solid #CCCCCC;
+	margin-bottom:5px;
+	margin-top:20px;
+	padding-bottom:5px;
 }
 
-#two_column_left_sidebar_maincontent {
-	width:718px;
-	margin:0;
-	min-height: 360px;
-	float:left;
-	background: #dedede;
-	padding:0 0 5px 0;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
+/* ***************************************
+   PAGE LAYOUT - MAIN BLOCKS POSITIONING 
+*************************************** */
+#elgg_topbar {
+	background:#333333 url(<?php echo $vars['url']; ?>_graphics/toptoolbar_background.gif) repeat-x top left;
+	color:#eeeeee;
+	border-bottom:1px solid #000000;
+	min-width:998px;
+	position:relative;
+	width:100%;
+	height:24px;
+	z-index: 9000;
 }
-
-
-
-
-#two_column_left_sidebar_maincontent_boxes {
-	margin:0 0px 20px 20px;
-	padding:0 0 5px 0;
-	width:718px;
-	background: #dedede;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	float:left;
+#elgg_header {
+	overflow: hidden;
+	position: relative;
+	width: 100%;
+	height:90px;
+	background-color: #4690D6;
 }
-#two_column_left_sidebar_boxes {
-	width:210px;
-	margin:0px 0 20px 0px;
-	min-height:360px;
-	float:left;
-	padding:0;
+#elgg_header_contents {
+	width:990px;
+	position: relative;
+	margin:0 auto;
+	height:90px;
 }
-#two_column_left_sidebar_boxes .sidebarBox {
-	margin:0px 0 22px 0;
-	background: #dedede;
-	padding:4px 10px 10px 10px;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	border-bottom:1px solid #cccccc;
-	border-right:1px solid #cccccc;
+#elgg_search {
+	bottom:5px;
+	height:23px;
+	position:absolute;
+	right:0;
 }
-#two_column_left_sidebar_boxes .sidebarBox h3 {
-	padding:0 0 5px 0;
-	font-size:1.25em;
-	line-height:1.2em;
-	color:#0054A7;
+#elgg_main_nav {
+	z-index: 7000;
+	position: absolute;
+    height:23px;
+    bottom:0;
+    left:0;
+    width:auto;
 }
-
-/* canvas layout: 2 column right sidebar */
-#two_column_right_sidebar {
-	width:210px;
-	margin:0 0 0 20px;
-	min-height:360px;
-	float:left;
-	background: #dedede;
-	padding:0px;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	border-bottom:1px solid #cccccc;
-	border-right:1px solid #cccccc;
+#elgg_content { /* wraps sidebar and page contents */
+	width:990px;
+	position: relative;
+	margin:0 auto;
+	min-height:400px;
 }
-
-
-.contentWrapper {
-	background:white;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	padding:10px;
-	margin:0 10px 10px 10px;
+#elgg_content.sidebar { /* class on #elgg_content div to give a full-height sidebar background */
+	background-image:url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/sidebar_background.gif);
+	background-repeat:repeat-y;
+	background-position: right top;
 }
-span.contentIntro p {
-	margin:0 0 0 0;
+#elgg_page_contents { /* main page contents */
+	float:left;
+	width:730px;
+	position: relative;
+	min-height: 360px;
+	margin:10px 20px 20px 10px;
 }
-.notitle {
-	margin-top:10px;
+#elgg_page_contents.one_column { /* class on #elgg_page_contents when no sidebar */
+	width:970px;
+	margin-right:10px;
 }
-
-/* canvas layout: widgets (profile and dashboard) */
-#widgets_left {
-	width:303px;
-	margin:0 20px 20px 0;
+#elgg_sidebar { /* elgg sidebar */
+	float:right;
+	width:210px;
+	margin:20px 10px;
+	position: relative;
 	min-height:360px;
-	padding:0;
 }
-#widgets_middle {
-	width:303px;
-	margin:0 0 20px 0;
-	padding:0;
-}
-#widgets_right {
-	width:303px;
-	margin:0px 0 20px 20px;
-	float:left;
-	padding:0;
-}
-#widget_table td {
-	border:0;
-	padding:0;
-	margin:0;
-	text-align: left;
-	vertical-align: top;
+#elgg_footer {
+	position: relative;
+	z-index: 999;
 }
-/* IE6 fixes */
-* html #widgets_right { float:none; }
-* html #profile_info_column_left {
-	margin:0 10px 0 0;
-	width:200px;
+#elgg_footer_contents {
+	border-top:1px solid #DEDEDE;
+	margin:0 auto;
+	width:990px;
+	padding:3px 0 10px 0;
+	text-align: right;
 }
-* html #dashboard_info { width:585px; }
-/* IE7 */
-*:first-child+html #profile_info_column_left { width:200px; }
+
 
 
 /* ***************************************
-	SPOTLIGHT
+	ELGG MAIN NAVIGATION in header
 *************************************** */
-#layout_spotlight {
-	margin:20px 0 20px 0;
-	padding:0;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	background: white;
-	border-bottom:1px solid #cccccc;
-	border-right:1px solid #cccccc;
-}
-#wrapper_spotlight {
+.navigation,
+.navigation ul {
 	margin:0;
 	padding:0;
-	height:auto;
-}
-#wrapper_spotlight #spotlight_table h2 {
-	color:#4690d6;
-	font-size:1.25em;
-	line-height:1.2em;
-}
-#wrapper_spotlight #spotlight_table li {
-	list-style: square;
-	line-height: 1.2em;
-	margin:5px 20px 5px 0;
-	color:#4690d6;
+	display:inline;
+	float:left;
+	list-style-type: none;
+	z-index: 7000;
+	position: relative;
 }
-#wrapper_spotlight .collapsable_box_content  {
+.navigation li {
+	list-style: none;
+	font-weight: bold;
+	position: relative;
+	display:block;
+	height:23px;
+	float:left;
 	margin:0;
-	padding:10px 10px 5px 10px;
-	background:none;
-	min-height:60px;
-	border:none;
-	border-top:1px solid #cccccc;
-}
-#spotlight_table {
-	margin:0 0 2px 0;
-}
-#spotlight_table .spotlightRHS {
-	float:right;
-	width:270px;
-	margin:0 0 0 50px;
-}
-/* IE7 */
-*:first-child+html #wrapper_spotlight .collapsable_box_content {
-	width:958px;
-}
-#layout_spotlight .collapsable_box_content p {
 	padding:0;
 }
-#wrapper_spotlight .collapsable_box_header  {
-	border: none;
-	background: none;
-}
-
-
-/* ***************************************
-	FOOTER
-*************************************** */
-#layout_footer {
-	background: #b6b6b6;
-	height:80px;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	margin:0 0 20px 0;
-}
-#layout_footer table {
-margin:0 0 0 20px;
+.navigation a {
+	display:block;
 }
-#layout_footer a, #layout_footer p {
-color:#333333;
-margin:0;
+.navigation a {
+	color:white;
+	margin:0 1px 0 0px;
+	text-decoration:none;
+	font-weight: bold;
+	font-size: 1em;
+	padding:3px 13px 0px 13px;
+	height:20px;
 }
-#layout_footer .footer_toolbar_links {
-	text-align:right;
-	padding:15px 0 0 0;
-	font-size:1.2em;
+.navigation li a.hover,
+.navigation a:hover {
+	background:white;
+	color:#43575e;
+	-moz-border-radius-topleft:4px;
+	-moz-border-radius-topright:4px;
+	-webkit-border-top-left-radius:4px;
+	-webkit-border-top-right-radius:4px;
 }
-#layout_footer .footer_legal_links {
-	text-align:right;
+.navigation li.selected a {
+	background:white;
+	color:#43575e;
+	-moz-border-radius-topleft:4px;
+	-moz-border-radius-topright:4px;
+	-webkit-border-top-left-radius:4px;
+	-webkit-border-top-right-radius:4px;
+	margin-top:2px;
 }
 
 
+
 /* ***************************************
-HORIZONTAL ELGG TOPBAR
+  ELGG TOPBAR
 *************************************** */
-#elgg_topbar {
-	background:#333333 url(<?php echo $vars['url']; ?>_graphics/toptoolbar_background.gif) repeat-x top left;
-	color:#eeeeee;
-	border-bottom:1px solid #000000;
-	min-width:998px;
-	position:relative;
-	width:100%;
-	height:24px;
-	z-index: 9000; /* if you have multiple position:relative elements, then IE sets up separate Z layer contexts for each one, which ignore each other */
-}
-#elgg_topbar_container_left {
+#elgg_topbar_contents {
 	float:left;
 	height:24px;
 	left:0px;
 	top:0px;
 	position:absolute;
 	text-align:left;
-	width:60%;
-}
-#elgg_topbar_container_right {
-	float:right;
-	height:24px;
-	position:absolute;
-	right:0px;
-	top:0px;
-	/* width:120px;*/
-	text-align:right;
-}
-#elgg_topbar_container_search {
-	float:right;
-	height:21px;
-	/*width:280px;*/
-	position:relative;
-	right:120px;
-	text-align:right;
-	margin:3px 0 0 0;
+	width:100%;
 }
-#elgg_topbar_container_left .toolbarimages {
-	float:left;
+#elgg_topbar_contents a {
 	margin-right:20px;
-}
-#elgg_topbar_container_left .toolbarlinks {
-	margin:0 0 10px 0;
-	float:left;
-}
-#elgg_topbar_container_left .toolbarlinks2 {
-	margin:3px 0 0 0;
+	padding-top:2px;
+	display:inline;
 	float:left;
-}
-#elgg_topbar_container_left a.loggedinuser {
+	text-align: left;
 	color:#eeeeee;
-	font-weight:bold;
-	margin:0 0 0 5px;
 }
-#elgg_topbar_container_left a.pagelinks {
-	color:white;
-	margin:0 15px 0 5px;
-	display:block;
-	padding:3px;
-}
-#elgg_topbar_container_left a.pagelinks:hover {
-	background: #4690d6;
-	text-decoration: none;
-}
-#elgg_topbar_container_left a.privatemessages {
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left 2px;
-	padding:0 0 4px 16px;
-	margin:0 15px 0 5px;
-	cursor:pointer;
+#elgg_topbar_contents a:hover {
+	color:#71cbff;
+	text-decoration: none;	
 }
-#elgg_topbar_container_left a.privatemessages:hover {
-	text-decoration: none;
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left -36px;
-}
-#elgg_topbar_container_left a.privatemessages_new {
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left -17px;
-	padding:0 0 0 18px;
-	margin:0 15px 0 5px;
-	color:white;
-}
-/* IE6 */
-* html #elgg_topbar_container_left a.privatemessages_new { background-position: left -18px; }
-/* IE7 */
-*+html #elgg_topbar_container_left a.privatemessages_new { background-position: left -18px; }
-
-#elgg_topbar_container_left a.privatemessages_new:hover {
-	text-decoration: none;
-}
-
-#elgg_topbar_container_left a.usersettings {
-	margin:0 0 0 20px;
-	color:#999999;
-	padding:3px;
+#elgg_topbar_contents a img.user_mini_avatar {
+	border:1px solid #eeeeee;
+	margin:1px 0 0 10px;
+	display: block;
 }
-#elgg_topbar_container_left a.usersettings:hover {
-	color:#eeeeee;
+#elgg_topbar_contents a img.site_logo {
+	display: block;
+	margin-left:5px;
+	margin-top: -1px;
 }
-#elgg_topbar_container_left img {
-	margin:0 0 0 5px;
+#elgg_topbar_contents .log_out {
+	float:right;	
 }
-#elgg_topbar_container_left .user_mini_avatar {
-	border:1px solid #eeeeee;
-	margin:0 0 0 20px;
+#elgg_topbar_contents .log_out a {
+	display: inline;
+	text-align: right;
+	margin-right:10px;
+	color:#999999;	
 }
-#elgg_topbar_container_right {
-	padding:3px 0 0 0;
+#elgg_topbar_contents .log_out a:hover {
+	color:#71cbff;	
 }
-#elgg_topbar_container_right a {
-	color:#eeeeee;
-	margin:0 5px 0 0;
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logout.gif) no-repeat top right;
-	padding:0 21px 0 0;
-	display:block;
-	height:20px;
+#elgg_topbar_contents a.settings {
+	background:transparent url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/topbar_icons.png) no-repeat left -41px;
+	padding-left:20px !important;
+	float:right;
+	margin-right:30px;
 }
-/* IE6 fix */
-* html #elgg_topbar_container_right a {
-	width: 120px;
+#elgg_topbar_contents a.admin {
+	background:transparent url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/topbar_icons.png) no-repeat left -41px;
+	padding-left:20px !important;
+	float:right;
+	margin-right:30px;
 }
-#elgg_topbar_container_right a:hover {
-	background-position: right -21px;
+#elgg_topbar_contents a.help {
+	background:transparent url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/topbar_icons.png) no-repeat 0 -133px;
+	padding-left:18px !important;
+	float:right;
+	margin-right:30px;
 }
-#elgg_topbar_panel {
-	background:#333333;
-	color:#eeeeee;
-	height:200px;
-	width:100%;
-	padding:10px 20px 10px 20px;
-	display:none;
-	position:relative;
+
+
+
+
+/* @todo PH check + move into shared access? */
+#elgg_topbar_contents a.shared_access {
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/icons_shared_access.png) no-repeat 0 -15px;
+	padding-left:20px !important;
+	float:right;
 }
 
 
+
+
 /* ***************************************
-	TOP BAR - VERTICAL TOOLS MENU
+	TOOLS MENU
 *************************************** */
-/* elgg toolbar menu setup */
-ul.topbardropdownmenu, ul.topbardropdownmenu ul {
+#elgg_topbar_contents ul.tools_menu,
+#elgg_topbar_contents ul.tools_menu ul {
 	margin:0;
 	padding:0;
 	display:inline;
@@ -590,10 +462,14 @@ ul.topbardropdownmenu, ul.topbardropdownmenu ul {
 	z-index: 9000;
 	position: relative;
 }
-ul.topbardropdownmenu {
-	margin:0pt 20px 0pt 5px;
+#elgg_topbar_contents ul.tools_menu {
+	margin:0 20px 0 5px;
+}
+#elgg_topbar_contents li.menu a.tools {
+	background:transparent url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/topbar_icons.png) no-repeat 3px 1px;
+	padding-left:24px !important;
 }
-ul.topbardropdownmenu li {
+#elgg_topbar_contents ul.tools_menu li { 
 	display: block;
 	list-style: none;
 	margin: 0;
@@ -601,798 +477,834 @@ ul.topbardropdownmenu li {
 	float: left;
 	position: relative;
 }
-ul.topbardropdownmenu a {
+#elgg_topbar_contents ul.tools_menu a {
 	display:block;
 }
-ul.topbardropdownmenu ul {
+#elgg_topbar_contents ul.tools_menu ul {
 	display: none;
 	position: absolute;
 	left: 0;
 	margin: 0;
 	padding: 0;
 }
-/* IE6 fix */
-* html ul.topbardropdownmenu ul {
-	line-height: 1.1em;
-}
-/* IE6/7 fix */
-ul.topbardropdownmenu ul a {
-	zoom: 1;
-}
-ul.topbardropdownmenu ul li {
+#elgg_topbar_contents ul.tools_menu ul li {
 	float: none;
-}
-/* elgg toolbar menu style */
-ul.topbardropdownmenu ul {
+}   
+/* elgg toolbar drop-down menu style */
+#elgg_topbar_contents ul.tools_menu ul {
 	width: 150px;
 	top: 24px;
+	overflow: hidden;
 	border-top:1px solid black;
 }
-ul.topbardropdownmenu *:hover {
+#elgg_topbar_contents ul.tools_menu *:hover {
 	background-color: none;
 }
-ul.topbardropdownmenu a {
-	padding:3px;
+#elgg_topbar_contents ul.tools_menu a {
+	padding:2px 7px 4px 7px;
 	text-decoration:none;
 	color:white;
+	overflow-y: hidden;
 }
-ul.topbardropdownmenu li.hover a {
-	background-color: #4690d6;
+#elgg_topbar_contents ul.tools_menu li.hover a {
+	background-color: #333333;
 	text-decoration: none;
 }
-ul.topbardropdownmenu ul li.drop a {
-	font-weight: normal;
-}
-/* IE7 fixes */
-*:first-child+html #elgg_topbar_container_left a.pagelinks {
-
-}
-*:first-child+html ul.topbardropdownmenu li.drop a.menuitemtools {
-	padding-bottom:6px;
-}
-ul.topbardropdownmenu ul li a {
-	background-color: #999999;/* menu off state color */
+#elgg_topbar_contents ul.tools_menu ul li a {
+	background-color: #333333; /* menu off-state color */
 	font-weight: bold;
 	padding-left:6px;
 	padding-top:4px;
 	padding-bottom:0;
 	height:22px;
+	width:150px;
+	display: block;
 	border-bottom: 1px solid white;
 }
-ul.topbardropdownmenu ul a.hover {
-	background-color: #333333;
+#elgg_topbar_contents ul.tools_menu ul a.hover {
+	background-color: #0054a7; /* menu hover-state color */
 }
-ul.topbardropdownmenu ul a {
+#elgg_topbar_contents ul.tools_menu ul a {
 	opacity: 0.9;
-	filter: alpha(opacity=90);
 }
 
 
+
 /* ***************************************
-SYSTEM MESSSAGES
+  HEADER CONTENTS
 *************************************** */
-.messages {
-	background:#ccffcc;
-	color:#000000;
-	padding:3px 10px 3px 10px;
-	z-index: 8000;
-	margin:0;
-	position:fixed;
-	top:30px;
-	width:969px;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border:4px solid #00CC00;
-	cursor: pointer;
+#elgg_header_contents h1 a {
+	font-size: 2em;
+	line-height:1.7em;
+	color: white;
+	font-style: italic;
+	font-family: Georgia, times, serif;
+	display: block;
+	text-decoration: none;
+	text-shadow:1px 2px 4px #333333;
 }
-.messages_error {
-	border:4px solid #D3322A;
-	background:#F7DAD8;
-	color:#000000;
-	padding:3px 10px 3px 10px;
-	z-index: 8000;
+#elgg_header_contents #elgg_search input.search_input {
+	-webkit-border-radius: 10px; 
+	-moz-border-radius: 10px;
+	background-color:transparent;
+	border:1px solid #71b9f7;
+	color:white;
+	font-size:12px;
+	font-weight:bold;
 	margin:0;
-	position:fixed;
-	top:30px;
-	width:969px;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	cursor: pointer;
-}
-.closeMessages {
-	float:right;
-	margin-top:17px;
+	padding:2px 4px 2px 26px;
+	width:198px;
+	background-image: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/search.png);
+	background-position: 3px 0;
+	background-repeat: no-repeat;
+}
+#elgg_header_contents #elgg_search input.search_input:focus {
+	background-color:white;
+	color:#0054A7;
+	border:1px solid white;
+	background-position: 3px -37px;
 }
-.closeMessages a {
-	color:#666666;
-	cursor: pointer;
-	text-decoration: none;
-	font-size: 80%;
+#elgg_header_contents #elgg_search input.search_input:active {
+	background-color:white;
+	color:#0054A7;
+	border:1px solid white;
+	background-position: 3px -37px;
 }
-.closeMessages a:hover {
-	color:black;
+#elgg_header_contents #elgg_search input.search_submit_button {
+	display:none;	
 }
 
 
 /* ***************************************
-COLLAPSABLE BOXES
+	FOOTER CONTENTS
 *************************************** */
-.collapsable_box {
-	margin: 0 0 20px 0;
-	height:auto;
-
+#elgg_footer_contents,
+#elgg_footer_contents a,
+#elgg_footer_contents p {
+   color:#999999;
 }
-/* IE6 fix */
-* html .collapsable_box  {
-	height:10px;
+#elgg_footer_contents a:hover {
+	color:#666666;
 }
-.collapsable_box_header {
-	color: #4690d6;
-	padding: 5px 10px 5px 10px;
+.#elgg_footer_contents p {
 	margin:0;
-	border-left: 1px solid white;
-	border-right: 1px solid #cccccc;
-	border-bottom: 1px solid #cccccc;
-	-moz-border-radius-topleft:8px;
-	-moz-border-radius-topright:8px;
-	-webkit-border-top-right-radius:8px;
-	-webkit-border-top-left-radius:8px;
-	background:#dedede;
 }
-.collapsable_box_header h1 {
-	color: #0054a7;
-	font-size:1.25em;
-	line-height: 1.2em;
+.powered_by_elgg_badge {
+	float:right;
 }
-.collapsable_box_content {
-	padding: 10px 0 10px 0;
-	margin:0;
-	height:auto;
-	background:#dedede;
-	-moz-border-radius-bottomleft:8px;
-	-moz-border-radius-bottomright:8px;
-	-webkit-border-bottom-right-radius:8px;
-	-webkit-border-bottom-left-radius:8px;
-	border-left: 1px solid white;
-	border-right: 1px solid #cccccc;
-	border-bottom: 1px solid #cccccc;
+
+
+/* ***************************************
+  SYSTEM MESSAGES
+*************************************** */
+#elgg_system_message {
+    background-color:black;
+    color:white;
+    font-weight: bold;
+	display:block;
+	padding:3px 10px;
+    z-index: 9600;
+	position:fixed;
+	right:20px;
+	margin-top:10px;
+	width:auto;
+	cursor: pointer;
+	opacity:0.9;
+	-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); /* safari v3+ */
+	-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); /* FF v3.5+ */
 }
-.collapsable_box_content .contentWrapper {
-	margin-bottom:5px;
+#elgg_system_message.error {
+    background-color:red;
 }
-.collapsable_box_editpanel {
-	display: none;
-	background: #a8a8a8;
-	padding:10px 10px 5px 10px;
-	border-left: 1px solid white;
-	border-bottom: 1px solid white;
+#elgg_system_message p {
+	margin:0;
 }
-.collapsable_box_editpanel p {
-	margin:0 0 5px 0;
+
+
+/* ***************************************
+	BREADCRUMBS
+*************************************** */
+#breadcrumbs {
+	font-size: 80%;
+	line-height:1.2em;
+	color:#bababa;
+	position: relative;
+	top:-8px;
+	left:0;
 }
-.collapsable_box_header a.toggle_box_contents {
-	color: #4690d6;
-	cursor:pointer;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size:20px;
-	font-weight: bold;
-	text-decoration:none;
-	float:right;
-	margin: 0;
-	margin-top: -7px;
+#breadcrumbs a {
+	color:#999999;
+	font-weight:bold;
+	text-decoration: none;
 }
-.collapsable_box_header a.toggle_box_edit_panel {
-	color: #4690d6;
-	cursor:pointer;
-	font-size:9px;
-	text-transform: uppercase;
-	text-decoration:none;
-	font-weight: normal;
-	float:right;
-	margin: 3px 10px 0 0;
+#breadcrumbs a:hover {
+	color: #0054a7;
+	text-decoration: underline;
 }
-.collapsable_box_editpanel label {
-	font-weight: normal;
-	font-size: 100%;
+
+
+/* ***************************************
+	SUBMENU
+*************************************** */
+.submenu ul {
+	margin:0;
+	padding:0;
+	list-style: none;
 }
-/* used for collapsing a content box */
-.display_none {
-	display:none;
+.submenu ul li.selected a {
+	background: #4690D6;
+	color:white;
 }
-/* used on spotlight box - to cancel default box margin */
-.no_space_after {
-	margin: 0 0 0 0;
+.submenu ul li a {
+	display:block;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	background-color:white;
+	margin:0 0 3px 0;
+	padding:2px 4px 2px 8px;
+}
+.submenu ul li a:hover {
+	background:#0054A7;
+	color:white;
+	text-decoration:none;
 }
 
 
 
 /* ***************************************
-	GENERAL FORM ELEMENTS
+	PAGINATION
 *************************************** */
-label {
-	font-weight: bold;
-	color:#333333;
-	font-size: 120%;
-}
-input {
-	font: 120% Arial, Helvetica, sans-serif;
-	padding: 5px;
-	border: 1px solid #cccccc;
-	color:#666666;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-}
-input[type="checkbox"] {
-	padding: 1px;
-	border-style: none;
-}
-textarea {
-	font: 120% Arial, Helvetica, sans-serif;
-	border: solid 1px #cccccc;
-	padding: 5px;
-	color:#666666;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
+.pagination {
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	background:white;
+	margin:5px 10px 5px 10px;
+	padding:5px;
 }
-textarea:focus, input[type="text"]:focus {
-	border: solid 1px #4690d6;
-	background-color: #e4ecf5;
-	color:#333333;
+.pagination .pagination_number {
+	display:block;
+	float:left;
+	background:#ffffff;
+	border:1px solid #4690d6;
+	text-align: center;
+	color:#4690d6;
+	font-size: 12px;
+	font-weight: normal;
+	margin:0 6px 0 0;
+	padding:0px 4px;
+	cursor: pointer;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
 }
-.submit_button {
-	font: 12px/100% Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	color: #ffffff;
+.pagination .pagination_number:hover {
 	background:#4690d6;
-	border: 1px solid #4690d6;
-	-webkit-border-radius: 4px;
+	color:white;
+	text-decoration: none;
+}
+.pagination .pagination_more {
+	display:block;
+	float:left;
+	background:#ffffff;
+	border:1px solid #ffffff;
+	text-align: center;
+	color:#4690d6;
+	font-size: 12px;
+	font-weight: normal;
+	margin:0 6px 0 0;
+	padding:0px 4px;
+	-webkit-border-radius: 4px; 
 	-moz-border-radius: 4px;
-	width: auto;
-	height: 25px;
-	padding: 2px 6px 2px 6px;
-	margin:10px 0 10px 0;
-	cursor: pointer;
 }
-.submit_button:hover, input[type="submit"]:hover {
-	background: #0054a7;
-	border-color: #0054a7;
+.pagination .pagination_previous,
+.pagination .pagination_next {
+	display:block;
+	float:left;
+	border:1px solid #4690d6;
+	color:#4690d6;
+	text-align: center;
+	font-size: 12px;
+	font-weight: normal;
+	margin:0 6px 0 0;
+	padding:0px 4px;
+	cursor: pointer;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
 }
-
-input[type="submit"] {
-	font: 12px/100% Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	color: #ffffff;
+.pagination .pagination_previous:hover,
+.pagination .pagination_next:hover {
 	background:#4690d6;
-	border: 1px solid #4690d6;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	width: auto;
-	height: 25px;
-	padding: 2px 6px 2px 6px;
-	margin:10px 0 10px 0;
-	cursor: pointer;
+	color:white;
+	text-decoration: none;
 }
-.cancel_button {
-	font: 12px/100% Arial, Helvetica, sans-serif;
+.pagination .pagination_currentpage {
+	display:block;
+	float:left;
+	background:#4690d6;
+	border:1px solid #4690d6;
+	text-align: center;
+	color:white;
+	font-size: 12px;
 	font-weight: bold;
-	color: #999999;
-	background:#dddddd;
-	border: 1px solid #999999;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	width: auto;
-	height: 25px;
-	padding: 2px 6px 2px 6px;
-	margin:10px 0 10px 10px;
+	margin:0 6px 0 0;
+	padding:0px 4px;
 	cursor: pointer;
-}
-.cancel_button:hover {
-	background: #cccccc;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
 }
 
-.input-password,
-.input-text,
-.input-tags,
-.input-url,
-.input-textarea {
-	width:98%;
-}
 
-.input-textarea {
-	height: 200px;
+/* ***************************************
+	ELGG TABBED PAGE NAVIGATION
+*************************************** */
+.elgg_horizontal_tabbed_nav {
+	margin-bottom:5px;
+	padding: 0;
+	border-bottom: 2px solid #cccccc;
+	display:table;
+	width:100%;
+}
+.elgg_horizontal_tabbed_nav ul {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+.elgg_horizontal_tabbed_nav li {
+	float: left;
+	border: 2px solid #cccccc;
+	border-bottom-width: 0;
+	background: #eeeeee;
+	margin: 0 0 0 10px;
+	-moz-border-radius-topleft:5px;
+	-moz-border-radius-topright:5px;
+	-webkit-border-top-left-radius:5px;
+	-webkit-border-top-right-radius:5px;
+}
+.elgg_horizontal_tabbed_nav a {
+	text-decoration: none;
+	display: block;
+	padding:3px 10px 0 10px;
+	text-align: center;
+	height:21px;
+	color:#999999;
+}
+.elgg_horizontal_tabbed_nav a:hover {
+	background: #dedede;
+	color:#4690D6;
+}
+.elgg_horizontal_tabbed_nav .selected {
+	border-color: #cccccc;
+	background: white;
+}
+.elgg_horizontal_tabbed_nav .selected a {
+	position: relative;
+	top: 2px;
+	background: white;
 }
 
 
 /* ***************************************
 	LOGIN / REGISTER
 *************************************** */
-#login-box {
-	margin:0 0 10px 0;
-	padding:0 0 10px 0;
-	background: #dedede;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	width:240px;
-	text-align:left;
-}
-#login-box form {
-	margin:0 10px 0 10px;
-	padding:0 10px 4px 10px;
-	background: white;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	width:200px;
+/* login in sidebar */
+#elgg_sidebar #login {
+	width:auto;
 }
-#login-box h2 {
-	color:#0054A7;
-	font-size:1.35em;
-	line-height:1.2em;
-	margin:0 0 0 8px;
-	padding:5px 5px 0 5px;
+#elgg_sidebar #login form {
+	width:auto;
 }
-#login-box .login-textarea {
-	width:178px;
+#elgg_sidebar #login .login_textarea {
+	width:196px;
 }
-#login-box label,
-#register-box label {
+/* default login and register forms */
+#login label,
+.register label {
 	font-size: 1.2em;
 	color:gray;
 }
-#login-box p.loginbox {
-	margin:0;
-}
-#login-box input[type="text"],
-#login-box input[type="password"],
-#register-box input[type="text"],
-#register-box input[type="password"] {
+#login input[type="text"],
+#login input[type="password"],
+.register input[type="text"],
+.register input[type="password"] {
 	margin:0 0 10px 0;
 }
-#register-box input[type="text"],
-#register-box input[type="password"] {
+.register input[type="text"],
+.register input[type="password"] {
 	width:380px;
 }
-#login-box h2,
-#login-box-openid h2,
-#register-box h2,
-#add-box h2,
-#forgotten_box h2 {
-	color:#0054A7;
-	font-size:1.35em;
-	line-height:1.2em;
-	margin:0pt 0pt 5px;
-}
-#register-box {
-	text-align:left;
-	width:400px;
-	padding:10px;
-	background: #dedede;
-	margin:0;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
+#login .persistent_login {
+	float:left;
+	display:block;
+	margin-top:-34px;
+	margin-left:100px;
 }
-#persistent_login label {
+#login .persistent_login label {
 	font-size:1.0em;
 	font-weight: normal;
+	cursor: pointer;
 }
-/* login and openID boxes when not running custom_index mod */
-#two_column_left_sidebar #login-box {
-	width:auto;
-	background: none;
-}
-#two_column_left_sidebar #login-box form {
-	width:auto;
-	margin:10px 10px 0 10px;
-	padding:5px 0 5px 10px;
-}
-#two_column_left_sidebar #login-box h2 {
-	margin:0 0 0 5px;
-	padding:5px 5px 0 5px;
-}
-#two_column_left_sidebar #login-box .login-textarea {
-	width:158px;
-}
-/* login and openID boxes when not running custom_index mod */
-#two_column_right_sidebar #login-box {
-	width:auto;
-	background: none;
-}
-#two_column_right_sidebar #login-box form {
-	width:auto;
-	margin:10px 10px 0 10px;
-	padding:5px 0 5px 10px;
-}
-#two_column_right_sidebar #login-box h2 {
-	margin:0 0 0 5px;
-	padding:5px 5px 0 5px;
-}
-#two_column_right_sidebar #login-box .login-textarea {
-	width:158px;
-}
+
 
 /* ***************************************
-	PROFILE
-*************************************** */
-#profile_info {
-	margin:0 0 20px 0;
-	padding:20px;
-	border-bottom:1px solid #cccccc;
-	border-right:1px solid #cccccc;
-	background: #e9e9e9;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-}
-#profile_info_column_left {
+	CONTENT HEADER
+**************************************** */
+#content_header {
+	border-bottom:1px solid #CCCCCC;
+}
+#content_header:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+.content_header_title,
+.content_header_filter {
 	float:left;
-	padding: 0;
-	margin:0 20px 0 0;
 }
-#profile_info_column_middle {
-	float:left;
-	width:365px;
-	padding: 0;
+.content_header_title {
+	margin-right:10px;
+	max-width: 530px;
 }
-#profile_info_column_right {
-	width:578px;
-	margin:0 0 0 0;
-	background:#dedede;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	padding:4px;
-}
-#dashboard_info {
-	margin:0px 0px 0 0px;
-	padding:20px;
-	border-bottom:1px solid #cccccc;
-	border-right:1px solid #cccccc;
-	background: #bbdaf7;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
+.content_header_title h2 {
+	border:none;
+	margin-bottom:0;
+	padding-bottom:5px;
 }
-#profile_menu_wrapper {
-	margin:10px 0 10px 0;
-	width:200px;
+.content_header_options {
+	float:right;
 }
-#profile_menu_wrapper p {
-	border-bottom:1px solid #cccccc;
+.content_header_options .action_button {
+	float:right;
+	margin:0 0 5px 10px;
 }
-#profile_menu_wrapper p:first-child {
-	border-top:1px solid #cccccc;
+.content_header_filter {
+	background: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/content_header_filter.gif) no-repeat 0 0;
 }
-#profile_menu_wrapper a {
-	display:block;
-	padding:0 0 0 3px;
+.content_header_filter select.styled {
+	height:25px;
+	cursor: pointer;
 }
-#profile_menu_wrapper a:hover {
-	color:#ffffff;
-	background:#4690d6;
-	text-decoration:none;
+span.select {
+	position: absolute;
+	width: 342px;
+	height: 25px;
+	padding: 3px 24px 0 8px;
+	color: #fff;
+	font-weight: bold;
+	font-size: 1.35em;
+	background: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/content_header_filter.gif) no-repeat;
+	overflow: hidden;
+	text-align: left;
 }
-p.user_menu_friends, p.user_menu_profile,
-p.user_menu_removefriend,
-p.user_menu_friends_of {
+select.styled .select_option {
+	font-size:1.3em;
 	margin:0;
-}
-#profile_menu_wrapper .user_menu_admin {
-	border-top:none;
+	padding:3px;
 }
 
-#profile_info_column_middle p {
-	margin:7px 0 7px 0;
-	padding:2px 4px 2px 4px;
-}
-/* profile owner name */
-#profile_info_column_middle h2 {
-	padding:0 0 14px 0;
+
+
+/* ***************************************
+	DEFAULT ENTITY LISTINGS
+**************************************** */
+.entity_listing {
+	border-bottom:1px dotted #cccccc;
+	clear:both;
+	display:block;
 	margin:0;
+	padding:5px 0 7px;
+	position:relative;
 }
-#profile_info_column_middle .profile_status {
-	background:#bbdaf7;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	padding:2px 4px 2px 4px;
-	line-height:1.2em;
-}
-#profile_info_column_middle .profile_status span {
-	display:block;
-	font-size:90%;
-	color:#666666;
+.entity_listing:first-child {
+	border-top:1px dotted #cccccc;
 }
-#profile_info_column_middle a.status_update {
-	float:right;
+.entity_listing:hover {
+	background-color: #eeeeee;
 }
-#profile_info_column_middle .odd {
-	background:#dedede;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
+.entity_listing_icon {
+	float:left;
+	margin-left:3px;
+	margin-top:3px;
 }
-#profile_info_column_middle .even {
-	background:#dedede;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
+.entity_listing_icon img {
+	width: auto;
 }
-#profile_info_column_right p {
-	margin:0 0 7px 0;
+.entity_listing_info {
+	float:left;
+	margin-left:7px;
+	min-height:28px;
+	width:693px;
 }
-#profile_info_column_right .profile_aboutme_title {
+.entity_listing_info p {
 	margin:0;
-	padding:0;
-	line-height:1em;
-}
-/* edit profile button */
-.profile_info_edit_buttons {
-	float:right;
-	margin:0  !important;
-	padding:0 !important;
+	line-height:1.2em;
 }
-.profile_info_edit_buttons a {
-	font: 12px/100% Arial, Helvetica, sans-serif;
+.entity_listing_info p.entity_title {
 	font-weight: bold;
-	color: #ffffff;
-	background:#4690d6;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	width: auto;
-	padding: 2px 6px 2px 6px;
-	margin:0;
-	cursor: pointer;
+	font-size: 1.1em;
 }
-.profile_info_edit_buttons a:hover {
-	background: #0054a7;
-	text-decoration: none;
-	color:white;
-}
-
-
-/* ***************************************
-	RIVER
-*************************************** */
-#river,
-.river_item_list {
-	border-top:1px solid #dddddd;
-
-	overflow:hidden;
+.entity_listing_info p.entity_title a {
+	color:#0054A7;
 }
-.river_item p {
+.entity_listing_info p.entity_subtext {
 	margin:0;
-	padding:0 0 0 21px;
-	line-height:1.1em;
-	min-height:17px;
-}
-.river_item {
-	border-bottom:1px solid #dddddd;
-	padding:2px 0 2px 0;
-}
-.river_item_time {
-	font-size:90%;
+	padding:0;
 	color:#666666;
+	font-size: 90%;
 }
-.river_item .river_item_useravatar {
-	float:left;
-	margin:0 5px 0 0;
-}
-/* IE6 fix */
-* html .river_item p {
-	padding:3px 0 3px 20px;
+/* entity metadata block */
+.entity_metadata {
+	float:right;
+	margin:0 3px 0 15px;
+	color:#aaaaaa;
+	font-size: 90%;
 }
-/* IE7 */
-*:first-child+html .river_item p {
-	min-height:17px;
+.entity_metadata table {
+	width:280px;
 }
-.river_user_update {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px;
+.entity_metadata table td {
+	height:30px;
+	vertical-align:middle;
 }
-.river_object_user_profileupdate {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px;
+.entity_metadata table td.entity_edit {
+	text-align:right;
 }
-.river_object_user_profileiconupdate {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px;
+.entity_metadata table td.entity_edit a {
+	color:#aaaaaa;
+	margin:0 0 0 10px;
 }
-.river_object_annotate {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+.entity_metadata table td.entity_edit a:hover {
+	color:#0054a7;
 }
-.river_object_bookmarks_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_bookmarks.gif) no-repeat left -1px;
+.entity_metadata table td.entity_delete {
+	padding-top:2px;
+	width:26px;
 }
-.river_object_bookmarks_comment {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+
+
+
+/* ***************************************
+	USER SETTINGS & ADMIN AREA
+*************************************** */
+/* GENERAL STYLES */
+.user_settings,
+.admin_settings {
+	margin-bottom:20px;
 }
-.river_object_status_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_status.gif) no-repeat left -1px;
+.user_settings p,
+.admin_settings p {
+	margin-bottom:6px;
 }
-.river_object_file_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_files.gif) no-repeat left -1px;
+.user_settings h3,
+.admin_settings h3 {
+	background:#e4e4e4;
+	color:#333333;
+	padding:5px;
+	margin-top:10px;
+	margin-bottom:10px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
 }
-.river_object_file_update {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_files.gif) no-repeat left -1px;
+.user_settings label,
+.admin_settings label {
+	color:#333333;
+	font-size:100%;
+	font-weight:normal;
 }
-.river_object_file_comment {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+.user_settings table.styled,
+.admin_settings table.styled {
+	width:100%;
 }
-.river_object_widget_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px;
+.user_settings table.styled,
+.admin_settings table.styled {
+	border-top:1px solid #cccccc;
 }
-.river_object_forums_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+.user_settings table.styled td,
+.admin_settings table.styled td {
+	padding:2px 4px 2px 4px;
+	border-bottom:1px solid #cccccc;
 }
-.river_object_forums_update {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+.user_settings table.styled td.column_one,
+.admin_settings table.styled td.column_one {
+	width:200px;
 }
-.river_object_widget_update {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px;
+.user_settings table.styled tr:hover,
+.admin_settings table.styled tr:hover {
+	background: #E4E4E4;
 }
-.river_object_blog_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;
+.add_user form {
+	width:300px;
 }
-.river_object_blog_update {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;
+/* PLUGINS MANAGEMENT (ADMIN) */
+.plugin_details {
+	margin:0 0 5px 0;
+	padding:0 7px 4px 10px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
 }
-.river_object_blog_comment {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+.plugin_details p {
+	margin:0;
+	padding:0;
 }
-.river_object_forumtopic_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+.plugin_details a.pluginsettings_link {
+	cursor:pointer;
+	font-size:80%;
 }
-.river_user_friend {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_friends.gif) no-repeat left -1px;
+.plugin_details a.manifest_details {
+	cursor:pointer;
+	font-size:80%;
 }
-.river_object_relationship_friend_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_friends.gif) no-repeat left -1px;
+.active {
+	border:1px solid #999999;
+	background:white;
 }
-.river_object_relationship_member_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+.not_active {
+	border:1px solid #999999;
+	background:#dedede;
 }
-.river_object_thewire_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_thewire.gif) no-repeat left -1px;
+
+
+/* ***************************************
+	GENERAL FORM ELEMENTS
+*************************************** */
+/* default elgg core input field classes */
+.input_text,
+.input_tags,
+.input_url,
+.input_textarea {
+	width:98%;
 }
-.river_group_join {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+.input_access {
+	margin:5px 0 0 0;
 }
-.river_object_groupforumtopic_annotate {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+.input_password {
+	width:200px;
 }
-.river_object_groupforumtopic_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px;
+.input_textarea {
+	height: 200px;
 }
-.river_object_sitemessage_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px;
+input[type="checkbox"] {
+	margin:0 3px 0 0;
+	padding:0;
+	border:none;
 }
-.river_user_messageboard {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+label {
+	font-weight: bold;
+	color:#333333;
+	font-size: 110%;
 }
-.river_object_page_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px;
+input {
+	font: 120% Arial, Helvetica, sans-serif;
+	padding: 5px;
+	border: 1px solid #cccccc;
+	color:#666666;
+	-webkit-border-radius: 5px; 
+	-moz-border-radius: 5px;
 }
-.river_object_page_update {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px;
+textarea {
+	font: 120% Arial, Helvetica, sans-serif;
+	border: solid 1px #cccccc;
+	padding: 5px;
+	color:#666666;
+	-webkit-border-radius: 5px; 
+	-moz-border-radius: 5px;
 }
-.river_object_page_top_create {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px;
+textarea:focus,
+input[type="text"]:focus {
+	border: solid 1px #4690d6;
+	background: #e4ecf5;
+	color:#333333;
 }
-.river_object_page_top_update {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px;
+.submit_button {
+	font-size: 14px;
+	font-weight: bold;
+	color: white;
+	text-shadow:1px 1px 0px black;
+	text-decoration:none;
+	border: 1px solid #4690d6;
+	background-color:#4690d6;
+	background-image: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/button_graduation.png);
+	background-repeat: repeat-x;
+	background-position: left 10px;
+	-webkit-border-radius: 7px; 
+	-moz-border-radius: 7px;
+	width: auto;
+	padding: 2px 4px;
+	margin:0 10px 10px 0;
+	cursor: pointer;
+	-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); /* safari v3+ */
+	-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); /* FF v3.5+ */
 }
-.river_object_page_top_comment {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+.submit_button:hover {
+	color: white;
+	border-color: #0054a7;
+	text-decoration:none;
+	background-color:#0054a7;
+	background-image:  url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/button_graduation.png);
+	background-repeat:  repeat-x;
+	background-position:  left 10px;
 }
-.river_object_page_comment {
-	background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+input[type="password"]:focus {
+	border: solid 1px #4690d6;
+	background-color: #e4ecf5;
+	color:#333333;
 }
-
-/* ***************************************
-	ENTITY LISTINGS
-*************************************** */
-.search_listing {
-	display: block;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	background:white;
-	margin:0 10px 5px 10px;
-	padding:5px;
+input[type="submit"] {
+	font-size: 14px;
+	font-weight: bold;
+	color: white;
+	text-shadow:1px 1px 0px black;
+	text-decoration:none;
+	border: 1px solid #4690d6;
+	background-color:#4690d6;
+	background-image:  url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/button_graduation.png);
+	background-repeat:  repeat-x;
+	background-position:  left 10px;
+	-webkit-border-radius: 7px; 
+	-moz-border-radius: 7px;
+	width: auto;
+	padding: 2px 4px;
+	margin:10px 0 10px 0;
+	cursor: pointer;
+	-moz-outline-style: none;
+	outline: none;	
+	-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); /* safari v3+ */
+	-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); /* FF v3.5+ */	
 }
-.search_listing_icon {
-	float:left;
+input[type="submit"]:hover {
+	border-color: #0054a7;
+	text-decoration:none;
+	background-color:#0054a7;
+	background-image:  url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/button_graduation.png);
+	background-repeat:  repeat-x;
+	background-position:  left 10px;
 }
-.search_listing_icon img {
-	width: 40px;
+.cancel_button {
+	font-size: 14px;
+	font-weight: bold;
+	text-decoration:none;
+	color: #333333;
+	background-color:#dddddd;
+	background-image:  url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/button_graduation.png);
+	background-repeat:  repeat-x;
+	background-position:  left 10px;
+	border: 1px solid #999999;
+	-webkit-border-radius: 7px; 
+	-moz-border-radius: 7px;
+	width: auto;
+	padding: 2px 4px;
+	margin:10px 0 10px 10px;
+	cursor: pointer;
 }
-.search_listing_icon .avatar_menu_button img {
-	width: 15px;
+.cancel_button:hover {
+	background-color: #999999;
+	background-position:  left 10px;
+	text-decoration:none;
+	color:white;
 }
-.search_listing_info {
-	margin-left: 50px;
-	min-height: 40px;
+a.action_button {
+	-webkit-border-radius: 5px; 
+	-moz-border-radius: 5px;
+	background-color:#cccccc;
+	background-image:  url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/button_background.gif);
+	background-repeat:  repeat-x;
+	background-position: 0 0;
+	border:1px solid #999999;
+	color:#333333;
+	/*display:block;*/
+	padding:2px 15px 2px 15px;
+	text-align:center;
+	font-weight:bold;
+	text-decoration:none;
+	text-shadow:0 1px 0 white;
+	cursor:pointer;
 }
-/* IE 6 fix */
-* html .search_listing_info {
-	height:40px;
+a.action_button:hover, 
+a.action_button:focus {
+	background-position:0 -15px;
+	color:#111111;
+	text-decoration: none;
 }
-.search_listing_info p {
-	margin:0 0 3px 0;
-	line-height:1.2em;
+a.action_button:active {
+	background-image:none;
 }
-.search_listing_info p.owner_timestamp {
-	margin:0;
-	padding:0;
-	color:#666666;
-	font-size: 90%;
+a.action_button.disabled {
+	color:#999999;
+	padding:2px 7px 2px 7px;
 }
-table.entity_gallery {
-	border-spacing: 10px;
-	margin:0 0 0 0;
+a.action_button.disabled:hover {
+	background-position:0 -15px;
+	color:#111111;
+	border:1px solid #999999;
 }
-.entity_gallery td {
-	padding: 5px;
+a.action_button.disabled:active {
+	background-image:none;
 }
-.entity_gallery_item {
-	background: white;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	width:170px;
+a.action_button.download {
+	color: white;
+	background-color:#4690d6;
+	background-image:  url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/button_graduation.png);
+	background-repeat:  repeat-x;
+	background-position:  left 10px;
+	/*display:inline-block;*/
+	width:auto;
+	height:auto;
+	padding: 3px 6px 3px 6px;
+	margin:0 0 10px 0;
 }
-.entity_gallery_item:hover {
-	background: black;
+a.action_button.download:hover {
+	background: #0054a7;
+	border-color: #0054a7;
 	color:white;
 }
-.entity_gallery_item .search_listing {
-	background: none;
-	text-align: center;
-}
-.entity_gallery_item .search_listing_header {
-	text-align: center;
-}
-.entity_gallery_item .search_listing_icon {
-	position: relative;
-	text-align: center;
-}
-.entity_gallery_item .search_listing_info {
-	margin: 5px;
-}
-.entity_gallery_item .search_listing_info p {
-	margin: 5px;
-	margin-bottom: 10px;
-}
-.entity_gallery_item .search_listing {
-	background: none;
-	text-align: center;
-}
-.entity_gallery_item .search_listing_icon {
-	position: absolute;
-	margin-bottom: 20px;
+/* small round delete button */
+.delete_button {
+	width:14px;
+	height:14px;
+	margin:0;
+	float:right;
 }
-.entity_gallery_item .search_listing_info {
-	margin: 5px;
+.delete_button a {
+	display:block;
+	cursor: pointer;
+	width:14px;
+	height:14px;
+	background: url("<?php echo $vars['url']; ?>mod/elgg_layout/graphics/icon_delete.png") no-repeat 0 0;
+	text-indent: -9000px;
 }
-.entity_gallery_item .search_listing_info p {
-	margin: 5px;
-	margin-bottom: 10px;
+.delete_button a:hover {
+	background-position: 0 -16px;
 }
+/*  //////////////////////////////////////////////////////////////////////////////////////////	>>>End Verified */
 
 
-/* ***************************************
-	FRIENDS
-*************************************** */
-/* friends widget */
-#widget_friends_list {
-	display:table;
-	width:275px;
-	margin:0 10px 0 10px;
-	padding:8px 0 4px 8px;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	background:white;
-}
-.widget_friends_singlefriend {
-	float:left;
-	margin:0 5px 5px 0;
-}
 
 
-/* ***************************************
-	ADMIN AREA - PLUGIN SETTINGS
-*************************************** */
-.plugin_details {
-	margin:0 10px 5px 10px;
-	padding:0 7px 4px 10px;
+
+
+
+
+
+
+/* @todo OLD ADMIN AREA - will be replaced/updated with multi-admin */
+.admin_settings.users_online .profile_status {
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	background:#bbdaf7;
+	line-height:1.2em;
+	padding:2px 4px;
+}
+.admin_settings.users_online .profile_status span {
+	font-size:90%;
+	color:#666666;
+}
+.admin_settings.users_online  p.owner_timestamp {
+	padding-left:3px;
+}
+.admin_users_online .search_listing {
+	margin:0 0 5px 0;
+	padding:5px;
+	border:1px solid #cccccc;
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 }
@@ -1406,33 +1318,12 @@ table.entity_gallery {
 	font-size:80%;
 	color:#999999;
 }
-.plugin_details a.pluginsettings_link {
-	cursor:pointer;
-	font-size:80%;
-}
-.active {
-	border:1px solid #999999;
-	background:white;
-}
-.not-active {
-	border:1px solid #999999;
-	background:#dedede;
-}
-.plugin_details p {
-	margin:0;
-	padding:0;
-}
-.plugin_details a.manifest_details {
-	cursor:pointer;
-	font-size:80%;
-}
 .manifest_file {
-	background:#dedede;
+	background-color:#eeeeee;
 	-webkit-border-radius: 8px;
 	-moz-border-radius: 8px;
 	padding:5px 10px 5px 10px;
 	margin:4px 0 4px 0;
-	display:none;
 }
 .admin_plugin_enable_disable {
 	width:150px;
@@ -1440,15 +1331,15 @@ table.entity_gallery {
 	float:right;
 	text-align: right;
 }
-.contentIntro .enableallplugins,
-.contentIntro .disableallplugins {
+ .enableallplugins,
+ .disableallplugins {
 	float:right;
 }
-.contentIntro .enableallplugins {
+ .enableallplugins {
 	margin-left:10px;
 }
-.contentIntro .enableallplugins,
-.not-active .admin_plugin_enable_disable a {
+ .enableallplugins,
+.not_active .admin_plugin_enable_disable a {
 	font: 12px/100% Arial, Helvetica, sans-serif;
 	font-weight: bold;
 	color: #ffffff;
@@ -1460,13 +1351,13 @@ table.entity_gallery {
 	padding: 4px;
 	cursor: pointer;
 }
-.contentIntro .enableallplugins:hover,
-.not-active .admin_plugin_enable_disable a:hover {
+ .enableallplugins:hover,
+.not_active .admin_plugin_enable_disable a:hover {
 	background: #0054a7;
 	border: 1px solid #0054a7;
 	text-decoration: none;
 }
-.contentIntro .disableallplugins,
+ .disableallplugins,
 .active .admin_plugin_enable_disable a {
 	font: 12px/100% Arial, Helvetica, sans-serif;
 	font-weight: bold;
@@ -1479,7 +1370,7 @@ table.entity_gallery {
 	padding: 4px;
 	cursor: pointer;
 }
-.contentIntro .disableallplugins:hover,
+ .disableallplugins:hover,
 .active .admin_plugin_enable_disable a:hover {
 	background: #333333;
 	border: 1px solid #333333;
@@ -1487,11 +1378,10 @@ table.entity_gallery {
 }
 .pluginsettings {
 	margin:15px 0 5px 0;
-	background:#bbdaf7;
+	background-color:#eeeeee;
 	-webkit-border-radius: 8px;
 	-moz-border-radius: 8px;
 	padding:10px;
-	display:none;
 }
 .pluginsettings h3 {
 	padding:0 0 5px 0;
@@ -1503,13 +1393,31 @@ table.entity_gallery {
 	margin:0;
 	border:none;
 }
-.input-access {
-	margin:5px 0 0 0;
-}
 
-/* ***************************************
-	GENERIC COMMENTS
-*************************************** */
+
+/*
+
+
+#elgg_topbar_panel {
+	background:#333333;
+	color:#eeeeee;
+	height:200px;
+	width:100%;
+	padding:10px 20px 10px 20px;
+	display:none;
+	position:relative;
+}
+#elggFooterContents .footer_legal_links {
+	text-align:right;
+}
+#elggFooterContents .footersidebar {
+	text-align:right;
+}
+#elggFooterContents table td.footersidebar a img {
+	float:right;
+	padding:5px 0;
+}
+ 
 .generic_comment_owner {
 	font-size: 90%;
 	color:#666666;
@@ -1536,1000 +1444,206 @@ table.entity_gallery {
 	font-size:90%;
 	border-top: 1px solid #aaaaaa;
 }
-/* IE6 */
-* html #generic_comment_tbl { width:676px !important;}
 
 
-/* ***************************************
-PAGE-OWNER BLOCK
-*************************************** */
-#owner_block {
-	padding:10px;
-}
-#owner_block_icon {
-	float:left;
-	margin:0 10px 0 0;
-}
-#owner_block_rss_feed,
-#owner_block_odd_feed {
-	padding:5px 0 0 0;
-}
-#owner_block_rss_feed a {
-	font-size: 90%;
-	color:#999999;
-	padding:0 0 4px 20px;
-	background: url(<?php echo $vars['url']; ?>_graphics/icon_rss.gif) no-repeat left top;
-}
-#owner_block_odd_feed a {
-	font-size: 90%;
-	color:#999999;
-	padding:0 0 4px 20px;
-	background: url(<?php echo $vars['url']; ?>_graphics/icon_odd.gif) no-repeat left top;
-}
-#owner_block_rss_feed a:hover,
-#owner_block_odd_feed a:hover {
-	color: #0054a7;
-}
-#owner_block_desc {
-	padding:4px 0 4px 0;
-	margin:0 0 0 0;
-	line-height: 1.2em;
-	border-bottom:1px solid #cccccc;
-	color:#666666;
-}
-#owner_block_content {
-	margin:0 0 4px 0;
-	padding:3px 0 0 0;
-	min-height:35px;
-	font-weight: bold;
-}
-#owner_block_content a {
-	line-height: 1em;
-}
-.ownerblockline {
-	padding:0;
-	margin:0;
-	border-bottom:1px solid #cccccc;
-	height:1px;
-}
-#owner_block_submenu {
-	margin:20px 0 20px 0;
-	padding: 0;
-	width:100%;
-}
-#owner_block_submenu ul {
-	list-style: none;
-	padding: 0;
-	margin: 0;
-}
-#owner_block_submenu ul li.selected a {
-	background: #4690d6;
-	color:white;
-}
-#owner_block_submenu ul li.selected a:hover {
-	background: #4690d6;
-	color:white;
-}
-#owner_block_submenu ul li a {
-	text-decoration: none;
-	display: block;
-	margin: 2px 0 0 0;
-	color:#4690d6;
-	padding:4px 6px 4px 10px;
-	font-weight: bold;
-	line-height: 1.1em;
-	-webkit-border-radius: 10px;
-	-moz-border-radius: 10px;
-}
-#owner_block_submenu ul li a:hover {
-	color:white;
-	background: #0054a7;
-}
-
-/* IE 6 + 7 menu arrow position fix */
-* html #owner_block_submenu ul li.selected a {
-	background-position: left 10px;
-}
-*:first-child+html #owner_block_submenu ul li.selected a {
-	background-position: left 8px;
-}
+Object page headers blogs/pages/files etc
 
-#owner_block_submenu .submenu_group {
-	border-bottom: 1px solid #cccccc;
-	margin:10px 0 0 0;
-	padding-bottom: 10px;
-}
 
-#owner_block_submenu .submenu_group .submenu_group_filter ul li a,
-#owner_block_submenu .submenu_group .submenu_group_filetypes ul li a {
-	color:#666666;
-}
-#owner_block_submenu .submenu_group .submenu_group_filter ul li.selected a,
-#owner_block_submenu .submenu_group .submenu_group_filetypes ul li.selected a {
-	background:#999999;
-	color:white;
+table.search_gallery {
+	border-spacing: 10px;
+	margin:0 0 0 0;
 }
-#owner_block_submenu .submenu_group .submenu_group_filter ul li a:hover,
-#owner_block_submenu .submenu_group .submenu_group_filetypes ul li a:hover {
-	color:white;
-	background: #999999;
+.search_gallery td {
+	padding: 5px;
 }
-
-
-/* ***************************************
-	PAGINATION
-*************************************** */
-.pagination {
-	-webkit-border-radius: 8px;
+.search_gallery_item {
+	background: white;
+	-webkit-border-radius: 8px; 
 	-moz-border-radius: 8px;
-	background:white;
-	margin:5px 10px 5px 10px;
-	padding:5px;
-}
-.pagination .pagination_number {
-	display:block;
-	float:left;
-	background:#ffffff;
-	border:1px solid #4690d6;
-	text-align: center;
-	color:#4690d6;
-	font-size: 12px;
-	font-weight: normal;
-	margin:0 6px 0 0;
-	padding:0px 4px;
-	cursor: pointer;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
+	width:170px;
 }
-.pagination .pagination_number:hover {
-	background:#4690d6;
+.search_gallery_item:hover {
+	background: black;
 	color:white;
-	text-decoration: none;
 }
-.pagination .pagination_more {
-	display:block;
-	float:left;
-	background:#ffffff;
-	border:1px solid #ffffff;
+.search_gallery_item .search_listing {
+	background: none;
 	text-align: center;
-	color:#4690d6;
-	font-size: 12px;
-	font-weight: normal;
-	margin:0 6px 0 0;
-	padding:0px 4px;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
 }
-.pagination .pagination_previous,
-.pagination .pagination_next {
-	display:block;
-	float:left;
-	border:1px solid #4690d6;
-	color:#4690d6;
+.search_gallery_item .search_listing_header {
 	text-align: center;
-	font-size: 12px;
-	font-weight: normal;
-	margin:0 6px 0 0;
-	padding:0px 4px;
-	cursor: pointer;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-}
-.pagination .pagination_previous:hover,
-.pagination .pagination_next:hover {
-	background:#4690d6;
-	color:white;
-	text-decoration: none;
 }
-.pagination .pagination_currentpage {
-	display:block;
-	float:left;
-	background:#4690d6;
-	border:1px solid #4690d6;
+.search_gallery_item .search_listing_icon {
+	position: relative;
 	text-align: center;
-	color:white;
-	font-size: 12px;
-	font-weight: bold;
-	margin:0 6px 0 0;
-	padding:0px 4px;
-	cursor: pointer;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
 }
-
-
-/* ***************************************
-	FRIENDS COLLECTIONS ACCORDIAN
-*************************************** */
-ul#friends_collections_accordian {
-	margin: 0 0 0 0;
-	padding: 0;
-}
-#friends_collections_accordian li {
-	margin: 0 0 0 0;
-	padding: 0;
-	list-style-type: none;
-	color: #666666;
+.search_gallery_item .search_listing_info {
+	margin: 5px;
 }
-#friends_collections_accordian li h2 {
-	background:#4690d6;
-	color: white;
-	padding:4px 2px 4px 6px;
-	margin:10px 0 10px 0;
-	font-size:1.2em;
-	cursor:pointer;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
+.search_gallery_item .search_listing_info p {
+	margin: 5px;
+	margin-bottom: 10px;
 }
-#friends_collections_accordian li h2:hover {
-	background:#333333;
-	color:white;
+.search_gallery_item .search_listing {
+	background: none;
+	text-align: center;
 }
-#friends_collections_accordian .friends_picker {
-	background:white;
-	padding:0;
-	display:none;
+.search_gallery_item .search_listing_icon {
+	position: absolute;
+	margin-bottom: 20px;
 }
-#friends_collections_accordian .friends_collections_controls {
-	font-size:70%;
-	float:right;
+.search_gallery_item .search_listing_info {
+	margin: 5px;
 }
-#friends_collections_accordian .friends_collections_controls a {
-	color:#999999;
-	font-weight:normal;
+.search_gallery_item .search_listing_info p {
+	margin: 5px;
+	margin-bottom: 10px;
 }
 
-
-/* ***************************************
-	FRIENDS PICKER SLIDER
-*************************************** */
-.friendsPicker_container h3 {
-	font-size:4em !important;
-	text-align: left;
-	margin:0 0 10px 0 !important;
-	color:#999999 !important;
-	background: none !important;
-	padding:0 !important;
-}
-.friendsPicker .friendsPicker_container .panel ul {
-	text-align: left;
-	margin: 0;
+#NewListStyle  {
 	padding:0;
+	margin:0;
 }
-.friendsPicker_wrapper {
-	margin: 0;
-	padding:0;
+#NewListStyle  .search_listing {
+   	-webkit-border-radius: 0; 
+	-moz-border-radius: 0;
+	background:none;
+	border-bottom:1px dotted #CCCCCC;
+	margin:0;
+	padding:5px 0 7px 0;
+	display: inline-block;
 	position: relative;
-	width: 100%;
+	clear:both;
 }
-.friendsPicker {
-	position: relative;
-	overflow: hidden;
-	margin: 0;
-	padding:0;
-	width: 678px;
-
-	height: auto;
-	background: #dedede;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
+#NewListStyle  .ListTop {
+	margin:0 0;
+	clear:both;
+	width:auto;
 }
-.friendspicker_savebuttons {
-	background: white;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	margin:0 10px 10px 10px;
+#NewListStyle  .search_listing:hover {
+	background-color: #eeeeee;
 }
-.friendsPicker .friendsPicker_container { /* long container used to house end-to-end panels. Width is calculated in JS  */
-	position: relative;
-	left: 0;
-	top: 0;
-	width: 100%;
-	list-style-type: none;
+#NewListStyle  .search_listing:last-child {
+	border-bottom:1px dotted #CCCCCC;
 }
-.friendsPicker .friendsPicker_container .panel {
+
+#NewListStyle .search_listing_icon {
 	float:left;
-	height: 100%;
-	position: relative;
-	width: 678px;
-	margin: 0;
-	padding:0;
-}
-.friendsPicker .friendsPicker_container .panel .wrapper {
-	margin: 0;
-	padding:4px 10px 10px 10px;
-	min-height: 230px;
-}
-.friendsPickerNavigation {
-	margin: 0 0 10px 0;
-	padding:0;
-}
-.friendsPickerNavigation ul {
-	list-style: none;
-	padding-left: 0;
-}
-.friendsPickerNavigation ul li {
-	float: left;
-	margin:0;
-	background:white;
-}
-.friendsPickerNavigation a {
-	font-weight: bold;
-	text-align: center;
-	background: white;
-	color: #999999;
-	text-decoration: none;
-	display: block;
-	padding: 0;
-	width:20px;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-}
-.tabHasContent {
-	background: white; color:#333333 !important;
+	margin-left:3px;
+	margin-top:3px;
 }
-.friendsPickerNavigation li a:hover {
-	background: #333333;
-	color:white !important;
-}
-.friendsPickerNavigation li a.current {
-	background: #4690D6;
-	color:white !important;
-}
-.friendsPickerNavigationAll {
-	margin:0px 0 0 20px;
+#NewListStyle .search_listing .search_listing_info {
 	float:left;
+	margin-left:7px;
+	min-height:28px;
+	width:693px;
 }
-.friendsPickerNavigationAll a {
-	font-weight: bold;
-	text-align: left;
-	font-size:0.8em;
-	background: white;
-	color: #999999;
-	text-decoration: none;
-	display: block;
-	padding: 0 4px 0 4px;
-	width:auto;
-}
-.friendsPickerNavigationAll a:hover {
-	background: #4690D6;
-	color:white;
-}
-.friendsPickerNavigationL, .friendsPickerNavigationR {
-	position: absolute;
-	top: 46px;
-	text-indent: -9000em;
-}
-.friendsPickerNavigationL a, .friendsPickerNavigationR a {
-	display: block;
-	height: 43px;
-	width: 43px;
-}
-.friendsPickerNavigationL {
-	right: 48px;
-	z-index:1;
-}
-.friendsPickerNavigationR {
-	right: 0;
-	z-index:1;
-}
-.friendsPickerNavigationL {
-	background: url("<?php echo $vars['url']; ?>_graphics/friends_picker_arrows.gif") no-repeat left top;
-}
-.friendsPickerNavigationR {
-	background: url("<?php echo $vars['url']; ?>_graphics/friends_picker_arrows.gif") no-repeat -60px top;
-}
-.friendsPickerNavigationL:hover {
-	background: url("<?php echo $vars['url']; ?>_graphics/friends_picker_arrows.gif") no-repeat left -44px;
-}
-.friendsPickerNavigationR:hover {
-	background: url("<?php echo $vars['url']; ?>_graphics/friends_picker_arrows.gif") no-repeat -60px -44px;
-}
-.friends_collections_controls a.delete_collection {
-	display:block;
-	cursor: pointer;
-	width:14px;
-	height:14px;
-	margin:2px 3px 0 0;
-	background: url("<?php echo $vars['url']; ?>_graphics/icon_customise_remove.png") no-repeat 0 0;
-}
-.friends_collections_controls a.delete_collection:hover {
-	background-position: 0 -16px;
-}
-.friendspicker_savebuttons .submit_button,
-.friendspicker_savebuttons .cancel_button {
-	margin:5px 20px 5px 5px;
-}
-
-#collectionMembersTable {
-	background: #dedede;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	margin:10px 0 0 0;
-	padding:10px 10px 0 10px;
-}
-
-
-/* ***************************************
-WIDGET PICKER (PROFILE & DASHBOARD)
-*************************************** */
-/* 'edit page' button */
-a.toggle_customise_edit_panel {
+#NewListStyle .search_listing .search_listing_info .ItemMetaData {
 	float:right;
-	clear:right;
-	color: #4690d6;
-	background: white;
-	border:1px solid #cccccc;
-	padding: 5px 10px 5px 10px;
-	margin:0 0 20px 0;
-	width:280px;
-	text-align: left;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-}
-a.toggle_customise_edit_panel:hover {
-	color: #ffffff;
-	background: #0054a7;
-	border:1px solid #0054a7;
-	text-decoration:none;
-}
-#customise_editpanel {
-	display:none;
-	margin: 0 0 20px 0;
-	padding:10px;
-	background: #dedede;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-}
-
-/* Top area - instructions */
-.customise_editpanel_instructions {
-	width:690px;
-	padding:0 0 10px 0;
-}
-.customise_editpanel_instructions h2 {
-	padding:0 0 10px 0;
-}
-.customise_editpanel_instructions p {
-	margin:0 0 5px 0;
-	line-height: 1.4em;
+	margin-left:15px;
+	margin-top:0;
+	margin-right: 3px;
+	color:#AAAAAA;
+	font-size: 90%;
 }
 
-/* RHS (widget gallery area) */
-#customise_editpanel_rhs {
+.ItemMetaData.special {
 	float:right;
-	width:230px;
-	background:white;
-}
-#customise_editpanel #customise_editpanel_rhs h2 {
-	color:#333333;
-	font-size: 1.4em;
-	margin:0;
-	padding:6px;
-}
-#widget_picker_gallery {
-	border-top:1px solid #cccccc;
-	background:white;
-	width:210px;
-	height:340px;
-	padding:10px;
-	overflow:scroll;
-	overflow-x:hidden;
+	margin-left:15px;
+	margin-top:0;
+	margin-right: 3px;
+	color:#AAAAAA;
+	font-size: 90%;
 }
 
-/* main page widget area */
-#customise_page_view {
-	width:656px;
-	padding:10px;
-	margin:0 0 10px 0;
-	background:white;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-}
-#customise_page_view h2 {
-	border-top:1px solid #cccccc;
-	border-right:1px solid #cccccc;
-	border-left:1px solid #cccccc;
-	margin:0;
-	padding:5px;
-	width:200px;
-	color: #0054a7;
-	background: #dedede;
-	font-size:1.25em;
-	line-height: 1.2em;
-}
-#profile_box_widgets {
-	width:422px;
-	margin:0 10px 10px 0;
-	padding:5px 5px 0px 5px;
-	min-height: 50px;
-	border:1px solid #cccccc;
-	background: #dedede;
+used on groups members listings where there is only a delete button in table 
+#NewListStyle .search_listing .search_listing_info .ItemMetaData table.singlecell {
+	width:auto; 
 }
-#customise_page_view h2.profile_box {
-	width:422px;
-	color: #999999;
-}
-#profile_box_widgets p {
-	color:#999999;
-}
-#leftcolumn_widgets {
-	width:200px;
-	margin:0 10px 0 0;
-	padding:5px 5px 40px 5px;
-	min-height: 190px;
-	border:1px solid #cccccc;
-}
-#middlecolumn_widgets {
-	width:200px;
-	margin:0 10px 0 0;
-	padding:5px 5px 40px 5px;
-	min-height: 190px;
-	border:1px solid #cccccc;
-}
-#rightcolumn_widgets {
-	width:200px;
+#NewListStyle .search_listing_info p.tags {
+	font-size:90%;
 	margin:0;
-	padding:5px 5px 40px 5px;
-	min-height: 190px;
-	border:1px solid #cccccc;
-}
-#rightcolumn_widgets.long {
-	min-height: 288px;
-}
-/* IE6 fix */
-* html #leftcolumn_widgets {
-	height: 190px;
-}
-* html #middlecolumn_widgets {
-	height: 190px;
-}
-* html #rightcolumn_widgets {
-	height: 190px;
-}
-* html #rightcolumn_widgets.long {
-	height: 338px;
-}
-
-#customise_editpanel table.draggable_widget {
-	width:200px;
-	background: #cccccc;
-	margin: 10px 0 0 0;
-	vertical-align:text-top;
-	border:1px solid #cccccc;
-}
-#widget_picker_gallery table.draggable_widget {
-	width:200px;
-	background: #cccccc;
-	margin: 10px 0 0 0;
-}
-
-/* take care of long widget names */
-#customise_editpanel table.draggable_widget h3 {
-	word-wrap:break-word;/* safari, webkit, ie */
-	width:140px;
-	line-height: 1.1em;
-	overflow: hidden;/* ff */
-	padding:4px;
-}
-#widget_picker_gallery table.draggable_widget h3 {
-	word-wrap:break-word;
-	width:145px;
-	line-height: 1.1em;
-	overflow: hidden;
-	padding:4px;
-}
-#customise_editpanel img.more_info {
-	background: url(<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif) no-repeat top left;
-	cursor:pointer;
-}
-#customise_editpanel img.drag_handle {
-	background: url(<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif) no-repeat top left;
-	cursor:move;
-}
-#customise_editpanel img {
-	margin-top:4px;
-}
-#widget_moreinfo {
-	position:absolute;
-	border:1px solid #333333;
-	background:#e4ecf5;
-	color:#333333;
-	padding:5px;
-	display:none;
-	width: 200px;
-	line-height: 1.2em;
-}
-/* droppable area hover class  */
-.droppable-hover {
-	background:#bbdaf7;
-}
-/* target drop area class */
-.placeholder {
-	border:2px dashed #AAA;
-	width:196px !important;
-	margin: 10px 0 10px 0;
-}
-/* class of widget while dragging */
-.ui-sortable-helper {
-	background: #4690d6;
-	color:white;
-	padding: 4px;
-	margin: 10px 0 0 0;
-	width:200px;
-}
-/* IE6 fix */
-* html .placeholder {
-	margin: 0;
-}
-/* IE7 */
-*:first-child+html .placeholder {
-	margin: 0;
-}
-/* IE6 fix */
-* html .ui-sortable-helper h3 {
-	padding: 4px;
-}
-* html .ui-sortable-helper img.drag_handle, * html .ui-sortable-helper img.remove_me, * html .ui-sortable-helper img.more_info {
-	padding-top: 4px;
-}
-/* IE7 */
-*:first-child+html .ui-sortable-helper h3 {
-	padding: 4px;
-}
-*:first-child+html .ui-sortable-helper img.drag_handle, *:first-child+html .ui-sortable-helper img.remove_me, *:first-child+html .ui-sortable-helper img.more_info {
-	padding-top: 4px;
+	padding-top:1px;
 }
+*/
 
 
 /* ***************************************
-	BREADCRUMBS
+  COLLAPSABLE BOXES - for widgets?
 *************************************** */
-#pages_breadcrumbs {
-	font-size: 80%;
-	color:#bababa;
-	padding:0;
-	margin:2px 0 0 10px;
-}
-#pages_breadcrumbs a {
-	color:#999999;
-	text-decoration: none;
-}
-#pages_breadcrumbs a:hover {
-	color: #0054a7;
-	text-decoration: underline;
-}
-
+/*
+.collapsable_box {
+	margin: 0 0 20px 0;
+	height:auto;
 
-/* ***************************************
-	MISC.
-*************************************** */
-/* general page titles in main content area */
-#content_area_user_title h2 {
-	margin:0 0 0 8px;
-	padding:5px;
-	color:#0054A7;
-	font-size:1.35em;
-	line-height:1.2em;
 }
-/* reusable generic collapsible box */
-.collapsible_box {
+.collapsable_box_header {
+	color: #4690d6;
+	padding: 5px 10px 5px 10px;
+	margin:0;
+	border-left: 1px solid white;
+	border-right: 1px solid #cccccc;
+	border-bottom: 1px solid #cccccc;
+	-moz-border-radius-topleft:8px;
+	-moz-border-radius-topright:8px;
+	-webkit-border-top-right-radius:8px;
+	-webkit-border-top-left-radius:8px;
 	background:#dedede;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	padding:5px 10px 5px 10px;
-	margin:4px 0 4px 0;
-	display:none;
 }
-a.collapsibleboxlink {
-	cursor:pointer;
+.collapsable_box_header h1 {
+	color: #0054a7;
+	font-size:1.25em;
+	line-height: 1.2em;
 }
-
-/* tag icon */
-.object_tag_string {
-	background: url(<?php echo $vars['url']; ?>_graphics/icon_tag.gif) no-repeat left 2px;
-	padding:0 0 0 14px;
+.collapsable_box_content {
+	padding: 10px 0 10px 0;
 	margin:0;
+	height:auto;
+	background:#dedede;
+	-moz-border-radius-bottomleft:8px;
+	-moz-border-radius-bottomright:8px;
+	-webkit-border-bottom-right-radius:8px;
+	-webkit-border-bottom-left-radius:8px;
+	border-left: 1px solid white;
+	border-right: 1px solid #cccccc;
+	border-bottom: 1px solid #cccccc;
 }
-
-/* profile picture upload n crop page */
-#profile_picture_form {
-	height:145px;
-}
-#current_user_avatar {
-	float:left;
-	width:160px;
-	height:130px;
-	border-right:1px solid #cccccc;
-	margin:0 20px 0 0;
-}
-#profile_picture_croppingtool {
-	border-top: 1px solid #cccccc;
-	margin:20px 0 0 0;
-	padding:10px 0 0 0;
-}
-#profile_picture_croppingtool #user_avatar {
-	float: left;
-	margin-right: 20px;
-}
-#profile_picture_croppingtool #applycropping {
-
-}
-#profile_picture_croppingtool #user_avatar_preview {
-	float: left;
-	position: relative;
-	overflow: hidden;
-	width: 100px;
-	height: 100px;
-}
-
-
-/* ***************************************
-	SETTINGS & ADMIN
-*************************************** */
-.admin_statistics,
-.admin_users_online,
-.usersettings_statistics,
-.admin_adduser_link,
-#add-box,
-#search-box,
-#logbrowser_search_area {
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	background:white;
-	margin:0 10px 10px 10px;
-	padding:10px;
-}
-
-.usersettings_statistics h3,
-.admin_statistics h3,
-.admin_users_online h3,
-.user_settings h3,
-.notification_methods h3 {
-	background:#e4e4e4;
-	color:#333333;
-	font-size:1.1em;
-	line-height:1em;
-	margin:0 0 10px 0;
-	padding:5px;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-}
-h3.settings {
-	background:#e4e4e4;
-	color:#333333;
-	font-size:1.1em;
-	line-height:1em;
-	margin:10px 0 4px 0;
-	padding:5px;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-}
-.admin_users_online .profile_status {
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	background:#bbdaf7;
-	line-height:1.2em;
-	padding:2px 4px;
-}
-.admin_users_online .profile_status span {
-	font-size:90%;
-	color:#666666;
-}
-.admin_users_online  p.owner_timestamp {
-	padding-left:3px;
-}
-
-
-.admin_debug label,
-.admin_usage label {
-	color:#333333;
-	font-size:100%;
-	font-weight:normal;
-}
-
-.admin_usage {
-	border-bottom:1px solid #cccccc;
-	padding:0 0 20px 0;
-}
-.usersettings_statistics .odd,
-.admin_statistics .odd {
-
-}
-.usersettings_statistics .even,
-.admin_statistics .even {
-
-}
-.usersettings_statistics td,
-.admin_statistics td {
-	padding:2px 4px 2px 4px;
-	border-bottom:1px solid #cccccc;
-}
-.usersettings_statistics td.column_one,
-.admin_statistics td.column_one {
-	width:200px;
-}
-.usersettings_statistics table,
-.admin_statistics table {
-	width:100%;
-}
-.usersettings_statistics table,
-.admin_statistics table {
-	border-top:1px solid #cccccc;
+.collapsable_box_content  {
+	margin-bottom:5px;
 }
-.usersettings_statistics table tr:hover,
-.admin_statistics table tr:hover {
-	background: #E4E4E4;
+.collapsable_box_editpanel {
+	display: none;
+	background: #a8a8a8;
+	padding:10px 10px 5px 10px;
+	border-left: 1px solid white;
+	border-bottom: 1px solid white;
 }
-.admin_users_online .search_listing {
+.collapsable_box_editpanel p {
 	margin:0 0 5px 0;
-	padding:5px;
-	border:2px solid #cccccc;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-}
-
-
-
-/* force tinyMCE editor initial width for safari */
-.mceLayout {
-	width:683px;
-}
-p.longtext_editarea {
-	margin:0 !important;
 }
-.toggle_editor_container {
-	margin:0 0 15px 0;
-}
-/* add/remove longtext tinyMCE editor */
-a.toggle_editor {
-	display:block;
+.collapsable_box_header a.toggle_box_contents {
+	color: #4690d6;
+	cursor:pointer;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size:20px;
+	font-weight: bold;
+	text-decoration:none;
 	float:right;
-	text-align:right;
-	color:#666666;
-	font-size:1em;
-	font-weight:normal;
-}
-
-div.ajax_loader {
-	background: white url(<?php echo $vars['url']; ?>_graphics/ajax_loader.gif) no-repeat center 30px;
-	width:auto;
-	height:100px;
-	margin:0 10px 0 10px;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-}
-
-
-
-/* reusable elgg horizontal tabbed navigation
-(used on friends collections, external pages, & riverdashboard mods)
-*/
-#elgg_horizontal_tabbed_nav {
-	margin:0 0 5px 0;
-	padding: 0;
-	border-bottom: 2px solid #cccccc;
-	display:table;
-	width:100%;
-}
-#elgg_horizontal_tabbed_nav ul {
-	list-style: none;
-	padding: 0;
 	margin: 0;
+	margin-top: -7px;
 }
-#elgg_horizontal_tabbed_nav li {
-	float: left;
-	border: 2px solid #cccccc;
-	border-bottom-width: 0;
-	background: #eeeeee;
-	margin: 0 0 0 10px;
-	-moz-border-radius-topleft:5px;
-	-moz-border-radius-topright:5px;
-	-webkit-border-top-left-radius:5px;
-	-webkit-border-top-right-radius:5px;
-}
-#elgg_horizontal_tabbed_nav a {
-	text-decoration: none;
-	display: block;
-	padding:3px 10px 0 10px;
-	color: #999999;
-	text-align: center;
-	height:21px;
-}
-/* IE6 fix */
-* html #elgg_horizontal_tabbed_nav a { display: inline; }
-
-#elgg_horizontal_tabbed_nav a:hover {
-	color: #4690d6;
-	background: #dedede;
-}
-#elgg_horizontal_tabbed_nav .selected {
-	border-color: #cccccc;
-	background: white;
-}
-#elgg_horizontal_tabbed_nav .selected a {
-	position: relative;
-	top: 2px;
-	background: white;
+.collapsable_box_header a.toggle_box_edit_panel {
 	color: #4690d6;
+	cursor:pointer;
+	font-size:9px;
+	text-transform: uppercase;
+	text-decoration:none;
+	font-weight: normal;
+	float:right;
+	margin: 3px 10px 0 0;
 }
-/* IE6 fix */
-* html #elgg_horizontal_tabbed_nav .selected a { top: 3px; }
-
-
-
-
-/* ***************************************
-	Auto Suggest Boxes
-*************************************** */
-
-.ac_results {
-	padding: 0px;
-	border: 1px solid black;
-	background-color: white;
-	overflow: hidden;
-	z-index: 99999;
-}
-
-.ac_results ul {
-	width: 100%;
-	list-style-position: outside;
-	list-style: none;
-	padding: 0;
-	margin: 0;
-}
-
-.ac_results li {
-	margin: 0px;
-	padding: 2px 5px;
-	cursor: default;
-	display: block;
-	/*
-	if width will be 100% horizontal scrollbar will apear
-	when scroll mode will be used
-	*/
-	/*width: 100%;*/
-	font: menu;
-	font-size: 12px;
-	/*
-	it is very important, if line-height not setted or setted
-	in relative units scroll will be broken in firefox
-	*/
-	line-height: 16px;
-	overflow: hidden;
-}
-
-.ac_loading {
-	background: white url(<?php echo $vars['url']; ?>_graphics/indicator.gif) right center no-repeat;
-}
-
-.ac_odd {
-	background-color: #eee;
-}
-
-.ac_over {
-	background-color: #0A246A;
-	color: white;
-}
-
-.autocomplete {
-	width:300px;
-}
-
-.ac_results strong {
-	font-weight: bold;
-}
-
-.user_picker .user_picker_entry {
-	clear: both;
-	padding: 1em;
-}
-
-.livesearch_icon {
-	float: left;
-	padding-right: 1em;
-}
-
-.draggable {
-	cursor: move;
+.collapsable_box_editpanel label {
+	font-weight: normal;
+	font-size: 100%;
 }
+*/
diff --git a/views/default/css_ie.php b/views/default/css_ie.php
new file mode 100755
index 000000000..a3262744d
--- /dev/null
+++ b/views/default/css_ie.php
@@ -0,0 +1,27 @@
+/**
+ * elgg_layout css for Internet Explorer > ie6
+ * @uses $vars['wwwroot'] The site URL
+*/
+
+#elgg_topbar_contents a.privatemessages_new span { 
+	display:block;
+	padding:1px;
+	position:relative;
+	text-align:center;
+	float:left;
+	top:auto;
+	right:auto; 
+}
+#elgg_topbar_contents a.privatemessages_new  {
+	padding:0 0 0 20px;
+}
+
+ul.topbar_tools ul a {
+	zoom: 1;
+}
+ul.topbar_tools li.menu a.tools {
+	padding-bottom:6px;
+}
+ul.topbar_tools ul a {
+	filter: alpha(opacity=90);
+}
\ No newline at end of file
diff --git a/views/default/css_ie6.php b/views/default/css_ie6.php
new file mode 100755
index 000000000..6b4ced9d7
--- /dev/null
+++ b/views/default/css_ie6.php
@@ -0,0 +1,27 @@
+/**
+ * elgg_layout css for Internet Explorer6
+ * @uses $vars['wwwroot'] The site URL
+*/
+
+* {zoom: 1;}
+
+ul.topbar_tools ul {
+	line-height: 1.1em;
+}
+ul.topbar_tools ul a {
+	zoom: 1;
+}
+ul.topbar_tools ul a {
+	filter: alpha(opacity=90);
+}
+
+.collapsable_box  {
+	height:10px;
+}
+
+.search_listing_info {
+	/* height:40px; */
+}
+
+.delete_button a { background-position-y: 2px; }
+.delete_button a:hover { background-position-y: -14px; }
\ No newline at end of file
diff --git a/views/default/entities/entity_list.php b/views/default/entities/entity_list.php
index ec9ebd6ed..90fe6ead3 100644
--- a/views/default/entities/entity_list.php
+++ b/views/default/entities/entity_list.php
@@ -46,7 +46,6 @@ if ($pagination) {
 	));
 }
 
-$html .= $nav;
 if ($viewtype == 'list') {
 	if (is_array($entities) && sizeof($entities) > 0) {
 		foreach($entities as $entity) {
diff --git a/views/default/entities/entity_listing.php b/views/default/entities/entity_listing.php
index d934a2b0c..3d6c37f2f 100644
--- a/views/default/entities/entity_listing.php
+++ b/views/default/entities/entity_listing.php
@@ -8,22 +8,11 @@
  * @link http://elgg.org/
  */
 ?>
-
-<div class="search_listing">
-
-	<div class="search_listing_icon">
-		<?php
-
-			echo $vars['icon'];
-
-		?>
+<div class="entity_listing clearfloat">
+	<div class="entity_listing_icon">
+		<?php echo $vars['icon']; ?>
 	</div>
-	<div class="search_listing_info">
-		<?php
-
-			echo $vars['info'];
-
-		?>
+	<div class="entity_listing_info">
+		<?php echo $vars['info']; ?>
 	</div>
-
 </div>
diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php
index 2b5c81b18..1ac8b23af 100644
--- a/views/default/friends/picker.php
+++ b/views/default/friends/picker.php
@@ -249,8 +249,6 @@ if (!isset($vars['replacement'])) {
 
 if ($formtarget) {
 
-	echo elgg_view('input/securitytoken');
-
 	if (isset($vars['formcontents']))
 		echo $vars['formcontents'];
 
diff --git a/views/default/friends/river/create.php b/views/default/friends/river/create.php
index e577ba721..da9dde1f0 100644
--- a/views/default/friends/river/create.php
+++ b/views/default/friends/river/create.php
@@ -8,16 +8,16 @@
  *
  * @uses $vars['entity']
  */
-$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+$performed_by = get_entity($vars['item']->subject_guid);
 $performed_on = get_entity($vars['item']->object_guid);
 $url = $performed_on->getURL();
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = sprintf(elgg_echo("friends:river:add"),$url) . " ";
-$string .= "<a href=\"{$performed_on->getURL()}\">{$performed_on->name}</a>";
+$string = "<div class=\"river_content_title\">" . sprintf(elgg_echo("friends:river:add"),$url) . " ";
+$string .= "<a href=\"{$performed_on->getURL()}\">{$performed_on->name}</a></div>";
 $string .= "<div class=\"river_content_display\">";
-$string .= "<table><tr><td>" . elgg_view("profile/icon",array('entity' => $performed_by, 'size' => 'small')) . "</td>";
-$string .= "<td><div class=\"following_icon\"></div></td><td>" . elgg_view("profile/icon",array('entity' => $performed_on, 'size' => 'small')) . "</td></tr></table>";
+$string .= "<table><tr><td>" . elgg_view("profile/icon",array('entity' => $performed_by, 'size' => 'tiny')) . "</td>";
+$string .= "<td><div class=\"following_icon\"></div></td><td>" . elgg_view("profile/icon",array('entity' => $performed_on, 'size' => 'tiny')) . "</td></tr></table>";
 $string .= "</div>";
 
 echo $string;
\ No newline at end of file
diff --git a/views/default/group/search/finishblurb.php b/views/default/group/search/finishblurb.php
index 9d3759cb3..756ad03c0 100644
--- a/views/default/group/search/finishblurb.php
+++ b/views/default/group/search/finishblurb.php
@@ -1,20 +1,20 @@
-<?php

-/**

- * @package Elgg

- * @subpackage Core

- * @author Curverider Ltd

- * @link http://elgg.org/

- * @deprecated 1.7

- */

-elgg_deprecated_notice('view groups/search/finishblurb was deprecated.', 1.7);

-

-if ($vars['count'] > $vars['threshold']) {

-

-?>

-<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/groups/?tag=<?php echo urlencode($vars['tag']); ?>">

-	<?php

-	echo elgg_echo("group:search:finishblurb");

-	?></a>

-</div>

-<?php

-}

+<?php
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ * @deprecated 1.7
+ */
+elgg_deprecated_notice('view groups/search/finishblurb was deprecated.', 1.7);
+
+if ($vars['count'] > $vars['threshold']) {
+
+?>
+<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/groups/?tag=<?php echo urlencode($vars['tag']); ?>">
+	<?php
+	echo elgg_echo("group:search:finishblurb");
+	?></a>
+</div>
+<?php
+}
diff --git a/views/default/group/search/startblurb.php b/views/default/group/search/startblurb.php
index f3acfaf5a..19138a360 100644
--- a/views/default/group/search/startblurb.php
+++ b/views/default/group/search/startblurb.php
@@ -1,16 +1,16 @@
-<?php

-/**

- * @package Elgg

- * @subpackage Core

- * @author Curverider Ltd

- * @link http://elgg.org/

- * @deprecated 1.7

- */

-elgg_deprecated_notice('view groups/search/startblurb was deprecated.', 1.7);

-?>

-

-<div class="contentWrapper">

-	<?php

-		echo sprintf(elgg_echo("group:search:startblurb"),$vars['tag']);

-	?>

-</div>

+<?php
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ * @deprecated 1.7
+ */
+elgg_deprecated_notice('view groups/search/startblurb was deprecated.', 1.7);
+?>
+
+<div class="contentWrapper">
+	<?php
+		echo sprintf(elgg_echo("group:search:startblurb"),$vars['tag']);
+	?>
+</div>
diff --git a/views/default/input/access.php b/views/default/input/access.php
index 27f818a67..e93b47cd1 100644
--- a/views/default/input/access.php
+++ b/views/default/input/access.php
@@ -16,7 +16,7 @@
  *
  */
 
-$class = "input-access";
+$class = "input_access";
 if (isset($vars['class'])) {
 	$class = $vars['class'];
 }
diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php
index 7d03db257..60674cb3c 100644
--- a/views/default/input/checkboxes.php
+++ b/views/default/input/checkboxes.php
@@ -17,7 +17,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-	$class = "input-checkboxes";
+	$class = "input_checkboxes";
 }
 
 foreach($vars['options'] as $label => $option) {
diff --git a/views/default/input/email.php b/views/default/input/email.php
index bd2892e97..62a4ec993 100644
--- a/views/default/input/email.php
+++ b/views/default/input/email.php
@@ -18,7 +18,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-	$class = "input-text";
+	$class = "input_text";
 }
 ?>
 
diff --git a/views/default/input/file.php b/views/default/input/file.php
index e943210c2..bd27df525 100644
--- a/views/default/input/file.php
+++ b/views/default/input/file.php
@@ -21,7 +21,7 @@ if (!empty($vars['value'])) {
 	echo elgg_echo('fileexists') . "<br />";
 }
 
-$class = "input-file";
+$class = "input_file";
 if (isset($vars['class'])) {
 	$class = $vars['class'];
 }
diff --git a/views/default/input/longtext.php b/views/default/input/longtext.php
index 9ae42a01a..328eb8f78 100644
--- a/views/default/input/longtext.php
+++ b/views/default/input/longtext.php
@@ -16,7 +16,7 @@
  * @uses $vars['disabled'] Is the input field disabled?
  */
 
-$class = "input-textarea";
+$class = "input_textarea";
 if (isset($vars['class'])) {
 	$class = $vars['class'];
 }
diff --git a/views/default/input/password.php b/views/default/input/password.php
index 90ee984d4..ad9f45c16 100644
--- a/views/default/input/password.php
+++ b/views/default/input/password.php
@@ -16,7 +16,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-	$class = "input-password";
+	$class = "input_password";
 }
 ?>
 
diff --git a/views/default/input/plaintext.php b/views/default/input/plaintext.php
index e177f8b3f..22171a7a7 100644
--- a/views/default/input/plaintext.php
+++ b/views/default/input/plaintext.php
@@ -16,7 +16,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-	$class = "input-textarea";
+	$class = "input_textarea";
 }
 
 ?>
diff --git a/views/default/input/pulldown.php b/views/default/input/pulldown.php
index 03143d677..59c8a7adc 100644
--- a/views/default/input/pulldown.php
+++ b/views/default/input/pulldown.php
@@ -18,7 +18,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-	$class = "input-pulldown";
+	$class = "input_pulldown";
 }
 
 ?>
diff --git a/views/default/input/radio.php b/views/default/input/radio.php
index c6163b141..8304d0737 100644
--- a/views/default/input/radio.php
+++ b/views/default/input/radio.php
@@ -17,7 +17,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-	$class = "input-radio";
+	$class = "input_radio";
 }
 
 foreach($vars['options'] as $label => $option) {
diff --git a/views/default/input/tags.php b/views/default/input/tags.php
index 874a33ce9..3592edb10 100644
--- a/views/default/input/tags.php
+++ b/views/default/input/tags.php
@@ -19,7 +19,7 @@
  */
 
 
-$class = "input-tags";
+$class = "input_tags";
 if (isset($vars['class'])) {
 	$class = $vars['class'];
 }
diff --git a/views/default/input/text.php b/views/default/input/text.php
index e4d39e0ba..aa6e571b6 100644
--- a/views/default/input/text.php
+++ b/views/default/input/text.php
@@ -21,7 +21,7 @@
 if (isset($vars['class'])) {
 	$class = $vars['class'];
 } else {
-	$class = "input-text";
+	$class = "input_text";
 }
 
 $disabled = false;
diff --git a/views/default/input/url.php b/views/default/input/url.php
index 6bf19d319..571754c77 100644
--- a/views/default/input/url.php
+++ b/views/default/input/url.php
@@ -16,7 +16,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-	$class = "input-url";
+	$class = "input_url";
 }
 ?>
 
diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
index 76937fe18..50aa8f5fd 100644
--- a/views/default/js/initialise_elgg.php
+++ b/views/default/js/initialise_elgg.php
@@ -1,9 +1,11 @@
 $(document).ready(function () {
 
-	// COLLAPSABLE WIDGETS (on Dashboard & Profile pages)
+	// COLLAPSABLE WIDGETS (on Dashboard? & Profile pages)
 	// toggle widget box contents
 	$('a.toggle_box_contents').bind('click', toggleContent);
 
+/*  // replaced with elgg_slide_toggle
+	@todo - PH update new admin area and widget canvas with the new toggle function
 	// toggle widget box edit panel
 	$('a.toggle_box_edit_panel').click(function () {
 		$(this.parentNode.parentNode).children(".collapsable_box_editpanel").slideToggle("fast");
@@ -16,20 +18,23 @@ $(document).ready(function () {
 		return false;
 	});
 
-	// toggle plugin's settings nad more info on admin tools admin
+	// toggle plugin's settings and more info on admin tools admin
 	$('a.pluginsettings_link').click(function () {
 		$(this.parentNode.parentNode).children(".pluginsettings").slideToggle("fast");
 		return false;
 	});
+	
 	$('a.manifest_details').click(function () {
 		$(this.parentNode.parentNode).children(".manifest_file").slideToggle("fast");
 		return false;
 	});
-	// reusable generic hidden panel
+	
+
 	$('a.collapsibleboxlink').click(function () {
 		$(this.parentNode.parentNode).children(".collapsible_box").slideToggle("fast");
 		return false;
 	});
+*/
 
 	// WIDGET GALLERY EDIT PANEL
 	// Sortable widgets
@@ -42,6 +47,7 @@ $(document).ready(function () {
 		forcePlaceholderSize: true,
 		placeholder: 'ui-state-highlight',
 		cursor: 'move',
+		revert: true,
 		opacity: 0.9,
 		appendTo: 'body',
 		connectWith: els,
@@ -81,6 +87,24 @@ $(document).ready(function () {
 
 }); /* end document ready function */
 
+// display & hide elgg system messages
+function elgg_system_message() {
+	$("#elgg_system_message").animate({opacity: 0.9}, 1000); 
+	$("#elgg_system_message").animate({opacity: 0.9}, 5000);
+	$("#elgg_system_message").fadeOut('slow');
+    
+	$("#elgg_system_message").click(function () {
+		$("#elgg_system_message").stop();
+		$("#elgg_system_message").fadeOut('slow');
+	return false;
+    });	
+}
+
+// reusable slide in/out toggle function
+function elgg_slide_toggle(activateLink,parentElement,toggleElement) {
+	$(activateLink).closest(parentElement).find(toggleElement).animate({"height": "toggle"}, { duration: 400 });
+	return false;
+}
 
 // List active widgets for each page column
 function outputWidgetList(forElement) {
@@ -219,8 +243,8 @@ jQuery.cookie = function(name, value, options) {
 	}
 };
 
-// ELGG TOOLBAR MENU
-$.fn.elgg_topbardropdownmenu = function(options) {
+// ELGG DROP DOWN MENU
+$.fn.elgg_dropdownmenu = function(options) {
 
 options = $.extend({speed: 350}, options || {});
 
diff --git a/views/default/js/upload_js.php b/views/default/js/upload_js.php
index cdd011729..83530d67a 100644
--- a/views/default/js/upload_js.php
+++ b/views/default/js/upload_js.php
@@ -45,7 +45,7 @@ function file_addtoform() {
     var o,el;
     o = document.getElementById('option_container');
     title_label = "<?php echo elgg_echo("title"); ?>";
-    bit = file_generate_bit(title_label,'title_','input-text','text',0);
+    bit = file_generate_bit(title_label,'title_','input_text','text',0);
     o.appendChild(bit);
     file_label = "<?php echo elgg_echo("file:file"); ?>";
     bit = file_generate_bit(file_label,'upload_','input-file','file',30);
diff --git a/views/default/messages/errors/error.php b/views/default/messages/errors/error.php
index 26a24c807..3175521d4 100644
--- a/views/default/messages/errors/error.php
+++ b/views/default/messages/errors/error.php
@@ -10,8 +10,4 @@
  *
  * @uses $vars['object'] An error message (string)
  */
-?>
-
-<p>
-	<?php echo elgg_view('output/longtext', array('value' => $vars['object'])); ?>
-</p>
\ No newline at end of file
+echo elgg_view('output/longtext', array('value' => $vars['object']));
diff --git a/views/default/messages/errors/list.php b/views/default/messages/errors/list.php
index 846e22a80..5e4b2ff31 100644
--- a/views/default/messages/errors/list.php
+++ b/views/default/messages/errors/list.php
@@ -14,37 +14,13 @@
 if (!empty($vars['object']) && is_array($vars['object'])) {
 
 ?>
-<!-- used to fade out the system messages after 3 seconds -->
-<script>
-$(document).ready(function () {
-	$('.messages_error').animate({opacity: 1.0}, 1000);
-	$('.messages_error').animate({opacity: 1.0}, 5000);
-	$('.messages_error').fadeOut('slow');
-
-	$('span.closeMessages a').click(function () {
-		$(".messages_error").stop();
-		$('.messages_error').fadeOut('slow');
-	return false;
-	});
-
-	$('div.messages_error').click(function () {
-		$(".messages_error").stop();
-		$('.messages_error').fadeOut('slow');
-	return false;
-	});
-
-});
-</script>
-
-	<div class="messages_error">
-	<span class="closeMessages"><a href="#"><?php echo elgg_echo('systemmessages:dismiss'); ?></a></span>
-
+<div id="elgg_system_message" class="hidden radius8 error">
+<script type="text/javascript">$(document).ready(function(){ elgg_system_message() });</script>
 <?php
 	foreach($vars['object'] as $error) {
 		echo elgg_view('messages/errors/error',array('object' => $error));
 	}
 ?>
-
-	</div>
+</div>
 <?php
 }
\ No newline at end of file
diff --git a/views/default/messages/messages/list.php b/views/default/messages/messages/list.php
index 67da01657..36b55a20e 100644
--- a/views/default/messages/messages/list.php
+++ b/views/default/messages/messages/list.php
@@ -14,37 +14,14 @@
 if (!empty($vars['object']) && is_array($vars['object'])) {
 
 ?>
-<!-- used to fade out the system messages after 3 seconds -->
-<script type="text/javascript">
-$(document).ready(function () {
-	$('.messages').animate({opacity: 1.0}, 1000);
-	$('.messages').animate({opacity: 1.0}, 5000);
-	$('.messages').fadeOut('slow');
-
-	$('span.closeMessages a').click(function () {
-		$(".messages").stop();
-		$('.messages').fadeOut('slow');
-	return false;
-	});
-
-	$('div.messages').click(function () {
-		$(".messages").stop();
-		$('.messages').fadeOut('slow');
-	return false;
-	});
-});
-</script>
-
-	<div class="messages">
-	<span class="closeMessages"><a href="#"><?php echo elgg_echo('systemmessages:dismiss'); ?></a></span>
+<div id="elgg_system_message" class="hidden radius8">
+<script type="text/javascript">$(document).ready(function(){ elgg_system_message() });</script>
 <?php
 	foreach($vars['object'] as $message) {
 		echo elgg_view('messages/messages/message',array('object' => $message));
 	}
 ?>
-
-	</div>
-
+</div>
 <?php
 
 }
diff --git a/views/default/messages/messages/message.php b/views/default/messages/messages/message.php
index 717fd5e57..58777a3cc 100644
--- a/views/default/messages/messages/message.php
+++ b/views/default/messages/messages/message.php
@@ -10,8 +10,5 @@
  *
  * @uses $vars['object'] A system message (string)
  */
-?>
 
-<p>
-	<?php echo elgg_view('output/longtext', array('value' => $vars['object'])); ?>
-</p>
\ No newline at end of file
+echo elgg_view('output/longtext', array('value' => $vars['object']));
diff --git a/views/default/navigation/main_nav.php b/views/default/navigation/main_nav.php
new file mode 100755
index 000000000..42796ef9a
--- /dev/null
+++ b/views/default/navigation/main_nav.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Main navigation bar
+ **/
+ 
+echo "<div id='elgg_main_nav' class='clearfloat'>";
+echo "<ul class='navigation'>";
+//if(get_context() == 'home')
+//	$selected = "class=selected";
+//else
+//	$selected = "";
+//echo "<li {$selected}><a href=\"{$vars['url']}\" id='home'><span>Home</span></a></li>";
+if(is_plugin_enabled('riverdashboard')){
+	if(get_context() == 'riverdashboard')
+		$selected = 'class="selected"';
+	else
+		$selected = "";
+	echo "<li {$selected}><a href=\"{$vars['url']}mod/riverdashboard/\" id='activity'><span>Activity</span></a></li>";
+}
+if(is_plugin_enabled('thewire') && isloggedin()){
+	if(get_context() == 'thewire')
+		$selected = 'class="selected"';
+	else
+		$selected = "";
+	echo "<li {$selected}><a href=\"{$vars['url']}mod/thewire/all.php\" id='thewire'><span>" . elgg_echo('thewire') . "</span></a></li>";
+}
+if(is_plugin_enabled('blog')){
+	if(get_context() == 'blog')
+		$selected = 'class="selected"';
+	else
+		$selected = "";
+	echo "<li {$selected}><a href=\"{$vars['url']}mod/blog/all.php\" id='blogs'><span>Blogs</span></a></li>";
+}
+if(is_plugin_enabled('pages')){
+	if(get_context() == 'pages')
+		$selected = 'class="selected"';
+	else
+		$selected = "";
+	echo "<li {$selected}><a href=\"{$vars['url']}mod/pages/all.php\" id='pages'><span>Pages</span></a></li>";
+}
+if(is_plugin_enabled('file')){
+	if(get_context() == 'file')
+		$selected = 'class="selected"';
+	else
+		$selected = "";
+	echo "<li {$selected}><a href=\"{$vars['url']}mod/file/all.php\" id='files'><span>Files</span></a></li>";
+}
+if(is_plugin_enabled('bookmarks')){
+	if(get_context() == 'bookmarks')
+		$selected = 'class="selected"';
+	else
+		$selected = "";
+	echo "<li {$selected}><a href=\"{$vars['url']}mod/bookmarks/all.php\" id='bookmarks'><span>Bookmarks</span></a></li>";
+}
+if(is_plugin_enabled('groups')){
+	if(get_context() == 'groups')
+		$selected = 'class="selected"';
+	else
+		$selected = "";
+	echo "<li {$selected}><a href=\"{$vars['url']}pg/groups/all/\" id='groups'><span>". elgg_echo('groups') . "</span></a></li>";
+}
+echo "</ul>";
+echo "</div>";
+
+?>
\ No newline at end of file
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index 11dfd0e86..9dde51eea 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -38,12 +38,14 @@ if (isset($vars['nonefound'])) {
 $totalpages = ceil($count / $limit);
 $currentpage = ceil($offset / $limit) + 1;
 
+//$baseurl = elgg_http_remove_url_query_element($vars['baseurl'], $word);
+
 //only display if there is content to paginate through or if we already have an offset
 if (($count > $limit || $offset > 0) && get_context() != 'widget') {
 
 	?>
 
-	<div class="pagination">
+	<div class="pagination clearfloat">
 	<?php
 
 	if ($offset > 0) {
@@ -53,9 +55,9 @@ if (($count > $limit || $offset > 0) && get_context() != 'widget') {
 			$prevoffset = 0;
 		}
 
-		$prevurl = elgg_http_add_url_query_elements($vars['baseurl'], array($word => $prevoffset));
+		$prevurl = elgg_http_add_url_query_elements($baseurl, array($word => $prevoffset));
 
-		echo "<a href=\"{$prevurl}\" class=\"pagination_previous\">&laquo; ". elgg_echo("previous") ."</a> ";
+		echo "<a href=\"{$prevurl}\" class='pagination_previous'>&laquo; ". elgg_echo("previous") ."</a> ";
 	}
 
 	if ($offset > 0 || $offset < ($count - $limit)) {
@@ -89,16 +91,16 @@ if (($count > $limit || $offset > 0) && get_context() != 'widget') {
 		$prev = 0;
 		foreach($pagesarray as $i) {
 			if (($i - $prev) > 1) {
-				echo "<span class=\"pagination_more\">...</span>";
+				echo "<span class='pagination_more'>...</span>";
 			}
 
 			$curoffset = (($i - 1) * $limit);
-			$counturl = elgg_http_add_url_query_elements($vars['baseurl'], array($word => $curoffset));
+			$counturl = elgg_http_add_url_query_elements($base_url, array($word => $curoffset));
 
 			if ($curoffset != $offset) {
-				echo " <a href=\"{$counturl}\" class=\"pagination_number\">{$i}</a> ";
+				echo " <a href=\"{$counturl}\" class='pagination_number'>{$i}</a> ";
 			} else {
-				echo "<span class=\"pagination_currentpage\"> {$i} </span>";
+				echo "<span class='pagination_currentpage'> {$i} </span>";
 			}
 			$prev = $i;
 
@@ -112,14 +114,13 @@ if (($count > $limit || $offset > 0) && get_context() != 'widget') {
 			$nextoffset--;
 		}
 
-		$nexturl = elgg_http_add_url_query_elements($vars['baseurl'], array($word => $nextoffset));
+		$nexturl = elgg_http_add_url_query_elements($baseurl, array($word => $nextoffset));
 
-		echo " <a href=\"{$nexturl}\" class=\"pagination_next\">" . elgg_echo("next") . " &raquo;</a>";
+		echo " <a href=\"{$nexturl}\" class='pagination_next'>" . elgg_echo("next") . " &raquo;</a>";
 
 	}
 
 	?>
-	<div class="clearfloat"></div>
 	</div>
 	<?php
 } // end of pagination check if statement
\ No newline at end of file
diff --git a/views/default/navigation/topbar_tools.php b/views/default/navigation/topbar_tools.php
index 897a827d6..0e0eec097 100644
--- a/views/default/navigation/topbar_tools.php
+++ b/views/default/navigation/topbar_tools.php
@@ -12,8 +12,6 @@
 
 $menu = get_register('menu');
 
-//var_export($menu);
-
 if (is_array($menu) && sizeof($menu) > 0) {
 	$alphamenu = array();
 	foreach($menu as $item) {
@@ -23,8 +21,8 @@ if (is_array($menu) && sizeof($menu) > 0) {
 
 ?>
 
-<ul class="topbardropdownmenu">
-	<li class="drop"><a href="#" class="menuitemtools"><?php echo(elgg_echo('tools')); ?></a>
+<ul class="tools_menu">
+	<li class="menu"><a href="#" class="tools"><?php echo(elgg_echo('tools')); ?></a>
 	<ul>
 	<?php
 		foreach($alphamenu as $item) {
@@ -37,7 +35,7 @@ if (is_array($menu) && sizeof($menu) > 0) {
 
 <script type="text/javascript">
 $(function() {
-	$('ul.topbardropdownmenu').elgg_topbardropdownmenu();
+	$('ul.tools_menu').elgg_dropdownmenu();
 });
 </script>
 
diff --git a/views/default/notifications/settings/usersettings.php b/views/default/notifications/settings/usersettings.php
index cba5cdef0..ea11ade8f 100644
--- a/views/default/notifications/settings/usersettings.php
+++ b/views/default/notifications/settings/usersettings.php
@@ -12,6 +12,7 @@ global $NOTIFICATION_HANDLERS;
 $notification_settings = get_user_notification_settings(page_owner());
 
 ?>
+<div class="user_settings notifications">
 <h3><?php echo elgg_echo('notifications:usersettings'); ?></h3>
 
 <p><?php echo elgg_echo('notifications:methods'); ?>
@@ -40,4 +41,5 @@ $notification_settings = get_user_notification_settings(page_owner());
 <?php
 	}
 ?>
-</table>
\ No newline at end of file
+</table>
+</div>
\ No newline at end of file
diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php
index 3370320ed..9377426ad 100644
--- a/views/default/output/confirmlink.php
+++ b/views/default/output/confirmlink.php
@@ -20,7 +20,7 @@ if (!$confirm) {
 }
 
 // always generate missing action tokens
-$link = elgg_add_action_tokens_to_url($vars['href']);
+$link = elgg_validate_action_url($vars['href']);
 
 if (isset($vars['class']) && $vars['class']) {
 	$class = 'class="' . $vars['class'] . '"';
diff --git a/views/default/output/rss_view.php b/views/default/output/rss_view.php
new file mode 100755
index 000000000..0dd1002b4
--- /dev/null
+++ b/views/default/output/rss_view.php
@@ -0,0 +1,8 @@
+<?php
+	/**
+	 * View to display the RSS link
+	 **/
+?>
+<div class="sidebar_container">
+<p><a href=""><img src="<?php echo $vars['url']; ?>_graphics/icon_rss.gif" alt="RSS icon" /></a> RSS feed for the wire</p>
+</div>
\ No newline at end of file
diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index b93536797..1afc89d88 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -29,17 +29,6 @@ if (empty($vars['tags']) && !empty($vars['value'])) {
 	$vars['tags'] = $vars['value'];
 }
 
-$tag_names_str = '';
-if (isset($vars['tag_names'])) {
-	if (is_array($vars['tag_names'])) {
-		foreach ($vars['tag_names'] as $tag_name) {
-			$tag_names_str .= "&tag_names[]=$tag_name";
-		}
-	} else {
-		$tag_names_str = "&tag_names={$vars['tag_names']}";
-	}
-}
-
 if (!empty($vars['tags'])) {
 	$tagstr = "";
 	if (!is_array($vars['tags'])) {
@@ -56,7 +45,7 @@ if (!empty($vars['tags'])) {
 			$type = "";
 		}
 		if (is_string($tag)) {
-			$tagstr .= "<a rel=\"tag\" href=\"{$vars['url']}pg/search/?q=".urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}{$tag_names_str}\">" . htmlentities($tag, ENT_QUOTES, 'UTF-8') . "</a>";
+			$tagstr .= "<a rel=\"tag\" href=\"{$vars['url']}pg/search/?q=".urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}\">" . htmlentities($tag, ENT_QUOTES, 'UTF-8') . "</a>";
 		}
 	}
 	echo $tagstr;
diff --git a/views/default/output/url.php b/views/default/output/url.php
index 7319f6971..b77ffbf00 100644
--- a/views/default/output/url.php
+++ b/views/default/output/url.php
@@ -17,15 +17,11 @@
  *
  */
 
-if (isset($vars['value'])) {
-	$vars['href'] = $vars['value'];
-}
-
 $url = trim($vars['href']);
 
 if (!empty($url)) {
 	if (array_key_exists('is_action', $vars) && $vars['is_action']) {
-		$url = elgg_add_action_tokens_to_url($url);
+		$url = elgg_validate_action_url($url);
 	}
 
 	if (array_key_exists('target', $vars) && $vars['target']) {
@@ -41,7 +37,7 @@ if (!empty($url)) {
 	}
 
 	if (array_key_exists('js', $vars) && $vars['js']) {
-		$js = "{$vars['js']}";
+		$js = "{$vars['target']}";
 	} else {
 		$js = '';
 	}
@@ -53,4 +49,4 @@ if (!empty($url)) {
 	}
 
 	echo "<a href=\"{$url}\" $target $class $js>$text</a>";
-}
+}
\ No newline at end of file
diff --git a/views/default/page_elements/breadcrumbs.php b/views/default/page_elements/breadcrumbs.php
new file mode 100755
index 000000000..165a6c7dd
--- /dev/null
+++ b/views/default/page_elements/breadcrumbs.php
@@ -0,0 +1,26 @@
+<?php

+

+/**

+ * Breadcrumbs

+**/

+// @todo spk to Brett re. making this simpler / scalable

+// grab variables from array

+$breadcrumb_root_url = $vars['breadcrumb_root_url'];

+$breadcrumb_root_text = $vars['breadcrumb_root_text'];

+$breadcrumb_level1_url = $vars['breadcrumb_level1_url'];

+$breadcrumb_level1_text = $vars['breadcrumb_level1_text'];

+$breadcrumb_level2_url = $vars['breadcrumb_level2_url'];

+$breadcrumb_level2_text = $vars['breadcrumb_level2_text'];

+$breadcrumb_currentpage = $vars['breadcrumb_currentpage']; 

+?>

+<div id="breadcrumbs">

+	<a href="<?php echo $breadcrumb_root_url; ?>"><?php echo $breadcrumb_root_text; ?></a> &gt;

+	<?php

+		if (isset($vars['breadcrumb_level1_url']) && $vars['breadcrumb_level1_url']) { ?>

+		<a href="<?php echo $breadcrumb_level1_url; ?>"><?php echo $breadcrumb_level1_text; ?></a> &gt;

+	<?php } 

+		if (isset($vars['breadcrumb_level2_url']) && $vars['breadcrumb_level2_url']) { ?>	

+		<a href="<?php echo $breadcrumb_level2_url; ?>"><?php echo $breadcrumb_level2_text; ?></a> &gt; 

+	<?php }

+	echo $breadcrumb_currentpage; ?>

+</div>
\ No newline at end of file
diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
new file mode 100755
index 000000000..9d7bea08a
--- /dev/null
+++ b/views/default/page_elements/content_header.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ *	Page Content header 
+	holds the filter menu and any content action buttons
+	used on  bookmarks, blog, file, pages,
+ **/
+	 
+global $CONFIG;
+	
+// set variables
+$page_owner = page_owner_entity();
+$filter_context = $vars['context']; // so we know if the user is looking at their own, everyone's or all friends
+$type = $vars['type']; // get the object type 
+$mine_selected = '';
+$all_selected = '';
+$friend_selected = '';
+$action_buttons = '';
+$title = '';
+/* $dash_selected = ''; */
+	 				
+if(!($page_owner instanceof ElggGroup)){
+	if($filter_context == 'mine') {
+		$mine_selected = "SELECTED";
+	}
+	if($filter_context == 'everyone') {
+		$all_selected = "SELECTED";	
+	}
+	if($filter_context == 'friends') {
+		$friend_selected = "SELECTED";
+	}
+	if($filter_context == 'action') { 
+		// if this is an action page, we'll not be displaying the filter
+	}
+/*
+	if($filter_context == 'dashboard') 
+		$dash_selected = "SELECTED";
+*/
+}	
+
+// must be logged in to see the filter menu and any action buttons
+if(isloggedin()) {
+	// if we're not on an action page (add bookmark, create page, upload a file etc)
+	if ($filter_context != 'action') {
+		$location_filter = "<select onchange=\"window.open(this.options[this.selectedIndex].value,'_top')\" name=\"file_filter\" class='styled' >";
+		$location_filter .= "<option {$mine_selected} class='select_option' value=\"{$vars['url']}pg/{$type}/{$_SESSION['user']->username}\" >" . elgg_echo($type . ':yours') . "</option>";
+		$location_filter .= "<option {$all_selected} class='select_option' value=\"{$vars['url']}mod/{$type}/all.php\">" . elgg_echo($type . ':all') . "</option>";
+		$location_filter .= "<option {$friend_selected} class='select_option' value=\"{$vars['url']}pg/{$type}/{$_SESSION['user']->username}/friends/\">". elgg_echo($type . ':friends') . "</option>";
+		$location_filter .= "</select>";
+		$location_filter = "<div class='content_header_filter'>".$location_filter."</div>";
+		
+		// action buttons
+		if(get_context() != 'bookmarks'){
+			$url = $CONFIG->wwwroot . "pg/{$type}/". $page_owner->username . "/new/";
+		} else {
+			$url = $CONFIG->wwwroot . "pg/{$type}/". $page_owner->username . "/add";
+		}
+		$action_buttons = "<a href=\"{$url}\" class='action_button'>" . elgg_echo($type . ':new') . "</a>";
+		$action_buttons = "<div class='content_header_options'>".$action_buttons."</div>";
+
+	} else {
+		// if we're on an action page - we'll just have a simple page title, and no filter menu
+		$title = "<div class='content_header_title'>".elgg_view_title($title = elgg_echo($type . ':add'))."</div>";
+	}
+}	
+?>
+<!-- construct the content area header -->
+<div id="content_header" class="clearfloat">
+	<?php echo $title; ?>
+	<?php echo $location_filter; ?>
+	<?php echo $action_buttons; ?>
+</div>
diff --git a/views/default/page_elements/content_header_member.php b/views/default/page_elements/content_header_member.php
new file mode 100755
index 000000000..0a75bb7f5
--- /dev/null
+++ b/views/default/page_elements/content_header_member.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ *	Page Content header when viewing another members entities
+	holds the filter menu and any content action buttons
+	used on  bookmarks, blog, file, pages,
+ **/
+$type = $vars['type'];//get the object type 
+$user = page_owner_entity();
+$user_name = elgg_view_title($user->name . "'s " . elgg_echo($type));
+?>
+<div id="content_header" class="clearfloat">
+	<div class="content_header_title">
+		<?php echo $user_name; ?>
+	</div>
+<!--
+	<div class="content_header_options">
+		<?php // if we're on bookmarks 		
+			if((get_context() == 'bookmarks') && ($user instanceof ElggGroup)) {
+				$upload_link = "<a href=\"{$vars['url']}pg/{$type}/{$user->username}/add\" class='action_button'>" . elgg_echo($type . ':new') . "</a>";
+				echo $upload_link;
+			}
+		?>		
+	</div>
+-->
+</div>
\ No newline at end of file
diff --git a/views/default/page_elements/contentwrapper.php b/views/default/page_elements/contentwrapper.php
deleted file mode 100644
index 81b7b5c7c..000000000
--- a/views/default/page_elements/contentwrapper.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['value'] The URL to display
- *
- */
-?>
-<div class="contentWrapper<?php
-
-	if (isset($vars['subclass'])) {
-		echo ' ' . $vars['subclass'];
-	}
-
-?>">
-<?php
-	echo $vars['body'];
-?>
-</div>
\ No newline at end of file
diff --git a/views/default/page_elements/elgg_content.php b/views/default/page_elements/elgg_content.php
new file mode 100755
index 000000000..35e67232c
--- /dev/null
+++ b/views/default/page_elements/elgg_content.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Elgg content wrapper
+ * This file holds the main content
+ **/
+
+$content = isset($vars['body']) ? $vars['body'] : '';
+
+echo $content;
diff --git a/views/default/page_elements/elgg_footer.php b/views/default/page_elements/elgg_footer.php
new file mode 100755
index 000000000..4113b84c7
--- /dev/null
+++ b/views/default/page_elements/elgg_footer.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Elgg footer
+ * The standard HTML footer that displays across the site
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
+
+?>
+<div id="elgg_footer">
+	<div id="elgg_footer_contents">
+		<?php
+			if(is_plugin_enabled('reportedcontent') && isloggedin()){
+		?>
+			<div id="report_this">
+				<a href="javascript:location.href='<?php echo $vars['url']; ?>mod/reportedcontent/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)">Report this</a>				
+			</div>
+		<?php
+			}
+		?>
+		<?php echo elgg_view('footer/links'); ?>
+		<a href="http://www.elgg.org" target="_blank" class="powered_by_elgg_badge">
+			<img src="<?php echo $vars['url']; ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" border="0" alt="Powered by Elgg" />
+		</a>
+	</div>
+</div>
diff --git a/views/default/page_elements/elgg_header.php b/views/default/page_elements/elgg_header.php
new file mode 100644
index 000000000..565368607
--- /dev/null
+++ b/views/default/page_elements/elgg_header.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Elgg header contents
+ * This file holds the header output that a user will see
+ **/
+
+?>
+<div id="elgg_header">
+	<div id="elgg_header_contents">
+		<!-- display site name -->
+		<h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1>
+		<?php
+			// insert a view which can be extended
+			echo elgg_view('header/extend');
+		?>
+		
+		<div id="elgg_search">
+			<form id="searchform" action="<?php echo $vars['url']; ?>pg/search/" method="get">
+				<input type="text" size="21" name="tag" value="<?php echo elgg_echo('search'); ?>" onblur="if (this.value=='') { this.value='<?php echo elgg_echo('search'); ?>' }" onfocus="if (this.value=='<?php echo elgg_echo('search'); ?>') { this.value='' };" class="search_input" />
+				<input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search_submit_button" />
+			</form>
+		</div>
+
+	</div>
+</div>
\ No newline at end of file
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index 7734e61de..c57020e79 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -2,12 +2,6 @@
 /**
  * Elgg top toolbar
  * The standard elgg top toolbar
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
  */
 ?>
 
@@ -15,65 +9,51 @@
 	if (isloggedin()) {
 ?>
 
-<div id="elgg_topbar">
+<div id="elgg_topbar" class="clearfloat">
+<div id="elgg_topbar_contents">
+	<a href="http://www.elgg.org" target="_blank"><img class="site_logo" src="<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logo.gif" alt="Elgg logo" /></a>
+	<a href="<?php echo $_SESSION['user']->getURL(); ?>"><img class="user_mini_avatar" src="<?php echo $_SESSION['user']->getIcon('topbar'); ?>" alt="User avatar" /></a>
 
-<div id="elgg_topbar_container_left">
-	<div class="toolbarimages">
-		<a href="http://www.elgg.org" target="_blank"><img src="<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logo.gif" alt="toolbar_logo graphic" /></a>
+    <?php
+	    // elgg tools menu
+        echo elgg_view("navigation/topbar_tools");
 
-		<a href="<?php echo $_SESSION['user']->getURL(); ?>"><img class="user_mini_avatar" src="<?php echo $_SESSION['user']->getIcon('topbar'); ?>" alt="User avatar" /></a>
-
-	</div>
-	<div class="toolbarlinks">
-		<a href="<?php echo $vars['url']; ?>pg/dashboard/" class="pagelinks"><?php echo elgg_echo('dashboard'); ?></a>
-	</div>
-		<?php
-
-			echo elgg_view("navigation/topbar_tools");
-
-		?>
-
-		<div class="toolbarlinks2">
-		<?php
-		//allow people to extend this top menu
+		// enable elgg topbar extending
 		echo elgg_view('elgg_topbar/extend', $vars);
-		?>
-
-		<a href="<?php echo $vars['url']; ?>pg/settings/" class="usersettings"><?php echo elgg_echo('settings'); ?></a>
-
-		<?php
-
-			// The administration link is for admin or site admin users only
-			if ($vars['user']->admin || $vars['user']->siteadmin) {
-
-		?>
-
-			<a href="<?php echo $vars['url']; ?>pg/admin/" class="usersettings"><?php echo elgg_echo("admin"); ?></a>
-
-		<?php
-
-				}
-
-		?>
+	?>
+	
+	<div class="log_out">
+		<?php echo elgg_view('output/url', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE)); ?>
 	</div>
 
+	<?php
+		if(is_plugin_enabled('shared_access')){
+	?>
+	<a href="<?php echo $vars['url']; ?>pg/shared_access/home" class="shared_access"><?php echo elgg_echo('shared_access:shared_access'); ?></a>
+	<?php
+		}
+	?>
+	<a href="<?php echo $vars['url']; ?>pg/settings/" class="settings"><?php echo elgg_echo('settings'); ?></a>
+	<?php
+		if(is_plugin_enabled('help')){
+	?>
+		<a href="<?php echo $vars['url']; ?>mod/help/index.php" class="help">Help</a>
+	<?php
+		}
+	?>
+	<?php
+		// The administration link is for admin or site admin users only
+		if ($vars['user']->admin || $vars['user']->siteadmin) { 
+	?>
+		<a href="<?php echo $vars['url']; ?>pg/admin/" class="admin"><?php echo elgg_echo("admin"); ?></a>
+	
+	<?php
+		}
+	?>
 
 </div>
 
-
-<div id="elgg_topbar_container_right">
-		<small>
-			<?php echo elgg_view('output/url', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE)); ?>
-		</small>
-</div>
-
-<div id="elgg_topbar_container_search">
-<?php echo elgg_view('page_elements/searchbox'); ?>
 </div>
-
-</div><!-- /#elgg_topbar -->
-
-<div class="clearfloat"></div>
-
 <?php
-	}
+    }
+?>
\ No newline at end of file
diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
deleted file mode 100644
index 31c62a76e..000000000
--- a/views/default/page_elements/footer.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Elgg footer
- * The standard HTML footer that displays across the site
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- */
-
-// get the tools menu
-//$menu = get_register('menu');
-
-?>
-
-<div class="clearfloat"></div>
-
-<div id="layout_footer">
-<table width="958" height="79" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td width="210" height="50">
-
-		</td>
-
-		<td width="748" height="50" align="right">
-		<p class="footer_toolbar_links">
-		<?php
-			echo elgg_view('footer/links');
-		?>
-		</p>
-		</td>
-	</tr>
-
-	<tr>
-		<td width="210" height="28">
-		<a href="http://www.elgg.org" target="_blank">
-		<img src="<?php echo $vars['url']; ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" border="0" />
-		</a>
-		</td>
-
-		<td width="748" height="28" align="right">
-		<p class="footer_legal_links"><small>
-		Powered by Elgg, the leading open source social networking platform
-		</small>
-		</p>
-		</td>
-	</tr>
-</table>
-</div><!-- /#layout_footer -->
-
-<div class="clearfloat"></div>
-
-</div><!-- /#page_wrapper -->
-</div><!-- /#page_container -->
-<!-- insert an analytics view to be extended -->
-<?php
-	echo elgg_view('footer/analytics');
-?>
-</body>
-</html>
\ No newline at end of file
diff --git a/views/default/page_elements/header_contents.php b/views/default/page_elements/header_contents.php
deleted file mode 100644
index ac47d8962..000000000
--- a/views/default/page_elements/header_contents.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Elgg header contents
- * This file holds the header output that a user will see
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- **/
-
-?>
-
-<div id="page_container">
-<div id="page_wrapper">
-
-<div id="layout_header">
-<div id="wrapper_header">
-	<!-- display the page title -->
-	<h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1>
-</div><!-- /#wrapper_header -->
-</div><!-- /#layout_header -->
\ No newline at end of file
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/html_begin.php
index 6cbb2fcb9..6836c5ee4 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/html_begin.php
@@ -1,13 +1,7 @@
 <?php
 /**
- * Elgg pageshell
+ * Start html output.
  * The standard HTML header that displays across the site
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
  * @uses $vars['config'] The site configuration settings, imported
  * @uses $vars['title'] The page title
  * @uses $vars['body'] The main content of the page
@@ -26,20 +20,14 @@ global $autofeed;
 if (isset($autofeed) && $autofeed == true) {
 	$url = $url2 = full_url();
 	if (substr_count($url,'?')) {
-		$url .= "&view=rss";
+		$url .= "&amp;view=rss";
 	} else {
 		$url .= "?view=rss";
 	}
-	if (substr_count($url2,'?')) {
-		$url2 .= "&view=odd";
-	} else {
-		$url2 .= "?view=opendd";
-	}
 	$feedref = <<<END
 
 	<link rel="alternate" type="application/rss+xml" title="RSS" href="{$url}" />
-	<link rel="alternate" type="application/odd+xml" title="OpenDD" href="{$url2}" />
-
+	
 END;
 } else {
 	$feedref = "";
@@ -51,18 +39,31 @@ header('Content-type: text/html; charset=utf-8');
 $version = get_version();
 $release = get_version(true);
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="ElggRelease" content="<?php echo $release; ?>" />
 	<meta name="ElggVersion" content="<?php echo $version; ?>" />
 	<title><?php echo $title; ?></title>
+	<link REL="SHORTCUT ICON" HREF="<?php echo $vars['url']; ?>_graphics/favicon.ico">
 
-	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.3.2.min.js"></script>
-	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-1.7.2.custom.min.js"></script>
+	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.4.min.js"></script> 
+	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script>
 	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.form.js"></script>
+	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/custom-form-elements.js"></script>
 	<script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;js=initialise_elgg&amp;viewtype=<?php echo $vars['view']; ?>"></script>
+
+	<?php
+		echo $feedref;
+		echo elgg_view('metatags',$vars);
+	?>
+	<script type="text/javascript">
+		jQuery(document).ready(function($) {
+		});
+	</script>
+
 <?php
 	global $pickerinuse;
 	if (isset($pickerinuse) && $pickerinuse == true) {
@@ -76,14 +77,13 @@ $release = get_version(true);
 	<!-- include the default css file -->
 	<link rel="stylesheet" href="<?php echo $vars['url']; ?>_css/css.css?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;viewtype=<?php echo $vars['view']; ?>" type="text/css" />
 
-	<?php
-		echo $feedref;
-		echo elgg_view('metatags',$vars);
-	?>
-	<script type="text/javascript">
-		jQuery(document).ready(function($) {
-		});
-	</script>
+	<!--[if IE 6]>
+		<link rel="stylesheet" type="text/css" href="<?php echo $vars['url']; ?>mod/elgg_layout/css_ie6.php" />
+	<![endif]-->
+	
+	<!--[if gt IE 6]>
+		<link rel="stylesheet" type="text/css" href="<?php echo $vars['url']; ?>mod/elgg_layout/css_ie.php" />
+	<![endif]-->
 </head>
 
 <body>
diff --git a/views/default/page_elements/html_end.php b/views/default/page_elements/html_end.php
new file mode 100644
index 000000000..0862934cf
--- /dev/null
+++ b/views/default/page_elements/html_end.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Start html output.
+ * The standard HTML header that displays across the site
+ * @uses $vars['config'] The site configuration settings, imported
+ * @uses $vars['title'] The page title
+ * @uses $vars['body'] The main content of the page
+ */
+?>
+</body>
+</html>
diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php
index 1a3440135..eb18a733e 100644
--- a/views/default/page_elements/owner_block.php
+++ b/views/default/page_elements/owner_block.php
@@ -12,24 +12,25 @@
 
 $contents = "";
 
-// Is there a page owner?
-$owner = page_owner_entity();
-if ($owner instanceof ElggEntity) {
-	$icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
-	if ($owner instanceof ElggUser || $owner instanceof ElggGroup) {
-		$info = '<a href="' . $owner->getURL() . '">' . $owner->name . '</a>';
+if(is_plugin_enabled('profile')) {
+	// Is there a page owner?
+	$owner = page_owner_entity();
+	if ($owner instanceof ElggEntity) {
+		$icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
+		if ($owner instanceof ElggUser || $owner instanceof ElggGroup) {
+			$info = '<a href="' . $owner->getURL() . '">' . $owner->name . '</a>';
+		}
+		$display = "<div id='owner_block_icon'>" . $icon . "</div>";
+		$display .= "<div id='owner_block_content'>" . $info . "</div><div class='clearfloat ownerblockline'></div>";
+	
+		if ($owner->briefdescription) {
+			$desc = $owner->briefdescription;
+			$display .= "<div id='owner_block_desc'>" . $desc . "</div>";
+		}
+	
+		$contents .= "<div id='owner_block'>".$display."</div><div id='owner_block_bottom'></div>";
 	}
-	$display = "<div id=\"owner_block_icon\">" . $icon . "</div>";
-	$display .= "<div id=\"owner_block_content\">" . $info . "</div><div class=\"clearfloat ownerblockline\"></div>";
-
-	if ($owner->briefdescription) {
-		$desc = $owner->briefdescription;
-		$display .= "<div id=\"owner_block_desc\">" . $desc . "</div>";
-	}
-
-	$contents .= $display;
 }
-
 // Are there feeds to display?
 global $autofeed;
 
@@ -43,7 +44,7 @@ if (isset($autofeed) && $autofeed == true) {
 	$label = elgg_echo('feed:rss');
 	$contents .= <<<END
 
-<div id="owner_block_rss_feed"><a href="{$url}" rel="nofollow">{$label}</a></div>
+<div id="rss_link"><a href="{$url}" rel="nofollow">{$label}</a></div>
 
 END;
 }
@@ -55,13 +56,11 @@ $contents .= elgg_view('owner_block/extend');
 if (isset($vars['content']))
 	$contents .= $vars['content'];
 
-// Initialise the submenu (plugins can add to the submenu)
+// Initialise the current tool/page submenu (plugins can add to the submenu)
 $submenu = get_submenu(); 
 if (!empty($submenu))
-	$contents .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>"; 
+	$contents .= "<div class='submenu page_navigation'>" . $submenu . "</div>"; 
 
 if (!empty($contents)) {
-	echo "<div id=\"owner_block\">";
 	echo $contents;
-	echo "</div><div id=\"owner_block_bottom\"></div>";
 }
\ No newline at end of file
diff --git a/views/default/page_elements/spotlight.php b/views/default/page_elements/spotlight.php
deleted file mode 100644
index 0c7e49c0f..000000000
--- a/views/default/page_elements/spotlight.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Elgg spotlight
- * The spotlight area that displays across the site
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- */
-?>
-
-<div id="layout_spotlight">
-<div id="wrapper_spotlight">
-
-<div class="collapsable_box no_space_after">
-	<div class="collapsable_box_header">
-<?php
-
-	$closed = false;
-	if ($_SESSION['user'] instanceof ElggUser) {
-		if ($_SESSION['user']->spotlightclosed) {
-
-			$closed = true;
-
-		}
-	}
-	if ($closed) {
-?>
-		<a href="javascript:void(0);" class="toggle_box_contents" onClick="$.post('<?php echo elgg_add_action_tokens_to_url("{$vars['url']}action/user/spotlight?closed=false"); ?>')">+</a>
-<?php
-		} else {
-?>
-		<a href="javascript:void(0);" class="toggle_box_contents" onClick="$.post('<?php echo elgg_add_action_tokens_to_url("{$vars['url']}action/user/spotlight?closed=true"); ?>')">-</a>
-<?php
-
-		}
-
-?>
-		<h1><?php echo elgg_echo("spotlight"); ?></h1>
-	</div>
-	<div class="collapsable_box_content" <?php if ($closed) echo "style=\"display:none\"" ?>>
-<?php
-
-	$context = get_context();
-	if (!empty($context) && elgg_view_exists("spotlight/{$context}")) {
-		echo elgg_view("spotlight/{$context}");
-	} else {
-		echo elgg_view("spotlight/default");
-	}
-?>
-	</div><!-- /.collapsable_box_content -->
-</div><!-- /.collapsable_box -->
-
-</div><!-- /#wrapper_spotlight -->
-</div><!-- /#layout_spotlight -->
diff --git a/views/default/page_elements/title.php b/views/default/page_elements/title.php
index 5123c14a7..99bc0fc6d 100644
--- a/views/default/page_elements/title.php
+++ b/views/default/page_elements/title.php
@@ -1,12 +1,6 @@
 <?php
 /**
  * Elgg title element
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
  * @uses $vars['title'] The page title
  */
 
@@ -23,7 +17,7 @@ if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION['
 	if($page_owner_user instanceOf ElggGroup) {
 		$display = "<div id=\"content_area_group_title\">" . $info . "</div>";
 	} else {
-		$display = "<div id=\"content_area_user_title\">" . $info . "</div>";
+		$display = $info;
 	}
 	if (!empty($submenu) && $vars['submenu'] == true) {
 		// plugins can extend this to add menu options
@@ -34,7 +28,7 @@ if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION['
 	if($page_owner_user instanceOf ElggGroup) {
 		$display = "<div id=\"content_area_group_title\">" . $info . "</div>";
 	} else {
-		$display = "<div id=\"content_area_user_title\">" . $info . "</div>";
+		$display = $info;
 	}
 	if (!empty($submenu)  && $vars['submenu'] == true) {
 		// plugins can extend this to add menu options
diff --git a/views/default/pageshells/pageshell.php b/views/default/page_shells/default.php
index 61396dfbc..61396dfbc 100644
--- a/views/default/pageshells/pageshell.php
+++ b/views/default/page_shells/default.php
diff --git a/views/default/river/item/list.php b/views/default/river/item/list.php
index 8fcc84bea..e1155cd28 100644
--- a/views/default/river/item/list.php
+++ b/views/default/river/item/list.php
@@ -47,7 +47,7 @@
 		}
 
 		if (!empty($nav)) {
-			echo '<div class="river_pagination"><p>'.$nav.'</p><div class="clearfloat"></div></div>';
+			echo '<div class="river_pagination"><p>'.$nav.'</p></div>';
 		}
 	}
 ?>
diff --git a/views/default/river/item/wrapper.php b/views/default/river/item/wrapper.php
index 27de4affd..0080cf48b 100644
--- a/views/default/river/item/wrapper.php
+++ b/views/default/river/item/wrapper.php
@@ -57,7 +57,6 @@ if($avatar_icon == "icon"){
 				?>)
 			</span>
 		</p>
-		<div class="clearfloat"></div>
 	</div>
 	<?php
 }
diff --git a/views/default/settings/system.php b/views/default/settings/system.php
index c8301051f..bcc5206f4 100644
--- a/views/default/settings/system.php
+++ b/views/default/settings/system.php
@@ -32,20 +32,20 @@ foreach(array('sitename','sitedescription', 'siteemail', 'wwwroot','path','datar
 $languages = get_installed_translations();
 $form_body .= "<p>" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "</p>";
 
-$form_body .= "<p class=\"admin_debug\">" . elgg_echo('admin:site:access:warning') . "<br />";
+$form_body .= "<p>" . elgg_echo('admin:site:access:warning') . "<br />";
 $form_body .= elgg_echo('installation:sitepermissions') . elgg_view('input/access', array('internalname' => 'default_access','value' => $vars['config']->default_access)) . "</p>";
-$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:allow_user_default_access:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:allow_user_default_access:label')), 'internalname' => 'allow_user_default_access', 'value' => ($vars['config']->allow_user_default_access ? elgg_echo('installation:allow_user_default_access:label') : "") )) . "</p>";
-$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:simplecache:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:simplecache:label')), 'internalname' => 'simplecache_enabled', 'value' => ($vars['config']->simplecache_enabled ? elgg_echo('installation:simplecache:label') : "") )) . "</p>";
-$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:viewpathcache:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:viewpathcache:label')), 'internalname' => 'viewpath_cache_enabled', 'value' => (($vars['config']->viewpath_cache_enabled) ? elgg_echo('installation:viewpathcache:label') : "") )) . "</p>";
+$form_body .= "<p>" . elgg_echo('installation:allow_user_default_access:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:allow_user_default_access:label')), 'internalname' => 'allow_user_default_access', 'value' => ($vars['config']->allow_user_default_access ? elgg_echo('installation:allow_user_default_access:label') : "") )) . "</p>";
+$form_body .= "<p>" . elgg_echo('installation:simplecache:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:simplecache:label')), 'internalname' => 'simplecache_enabled', 'value' => ($vars['config']->simplecache_enabled ? elgg_echo('installation:simplecache:label') : "") )) . "</p>";
+$form_body .= "<p>" . elgg_echo('installation:viewpathcache:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:viewpathcache:label')), 'internalname' => 'viewpath_cache_enabled', 'value' => (($vars['config']->viewpath_cache_enabled) ? elgg_echo('installation:viewpathcache:label') : "") )) . "</p>";
 
 $debug_options = array('0' => elgg_echo('installation:debug:none'), 'ERROR' => elgg_echo('installation:debug:error'), 'WARNING' => elgg_echo('installation:debug:warning'), 'NOTICE' => elgg_echo('installation:debug:notice'));
-$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:debug');
+$form_body .= "<p>" . elgg_echo('installation:debug');
 $form_body .= elgg_view('input/pulldown', array('options_values' => $debug_options, 'internalname' => 'debug', 'value' => $vars['config']->debug));
 $form_body .= '</p>';
 
-$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:httpslogin') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:httpslogin:label')), 'internalname' => 'https_login', 'value' => ($vars['config']->https_login ? elgg_echo('installation:httpslogin:label') : "") )) . "</p>";
+$form_body .= "<p>" . elgg_echo('installation:httpslogin') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:httpslogin:label')), 'internalname' => 'https_login', 'value' => ($vars['config']->https_login ? elgg_echo('installation:httpslogin:label') : "") )) . "</p>";
 
-$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:disableapi') . "<br />";
+$form_body .= "<p>" . elgg_echo('installation:disableapi') . "<br />";
 $on = elgg_echo('installation:disableapi:label');
 if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) {
 	$on = ($vars['config']->disable_api ?  "" : elgg_echo('installation:disableapi:label'));
@@ -53,8 +53,17 @@ if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) {
 $form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', 'value' => $on ));
 $form_body .= "</p>";
 
-$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
+$form_body .= "<p>" . elgg_echo('installation:usage') . "<br />";
+$on = elgg_echo('installation:usage:label');
 
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
+if (isset($CONFIG->ping_home)) {
+	$on = ($vars['config']->ping_home!='disabled' ? elgg_echo('installation:usage:label') : "");
+}
+$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:usage:label')), 'internalname' => 'usage', 'value' => $on ));
+$form_body .= "</p>";
+
+$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
 
+$form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo("save")));
+$form_body = "<div class='admin_settings site_admin'>".$form_body."</div>";
 echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
\ No newline at end of file
diff --git a/views/default/spotlight/default.php b/views/default/spotlight/default.php
index 38dd73c8d..cd52700da 100644
--- a/views/default/spotlight/default.php
+++ b/views/default/spotlight/default.php
@@ -32,5 +32,4 @@
 			<a href="http://community.elgg.org/">Elgg community</a>.
 		</p>
 	</div><!-- /spotlight LHS content -->
-	<div class="clearfloat"></div>
 </div>
\ No newline at end of file
diff --git a/views/default/user/search/finishblurb.php b/views/default/user/search/finishblurb.php
index a8c14f357..8371ee4b5 100644
--- a/views/default/user/search/finishblurb.php
+++ b/views/default/user/search/finishblurb.php
@@ -1,20 +1,20 @@
-<?php

-/**

- * @package Elgg

- * @subpackage Core

- * @author Curverider Ltd

- * @link http://elgg.org/

- * @deprecated 1.7

- */

-

-elgg_deprecated_notice('view user/search/finishblurb was deprecated.', 1.7);

-

-if ($vars['count'] > $vars['threshold']) {

-

-?>

-<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php

-	echo elgg_echo("user:search:finishblurb");

-	?></a></div>

-<?php

-

-}

+<?php
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ * @deprecated 1.7
+ */
+
+elgg_deprecated_notice('view user/search/finishblurb was deprecated.', 1.7);
+
+if ($vars['count'] > $vars['threshold']) {
+
+?>
+<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php
+	echo elgg_echo("user:search:finishblurb");
+	?></a></div>
+<?php
+
+}
diff --git a/views/default/user/search/startblurb.php b/views/default/user/search/startblurb.php
index e069ec460..5ddb5ddc0 100644
--- a/views/default/user/search/startblurb.php
+++ b/views/default/user/search/startblurb.php
@@ -1,19 +1,19 @@
-<?php

-/**

- * @package Elgg

- * @subpackage Core

- * @author Curverider Ltd

- * @deprecated 1.7

- * @link http://elgg.org/

- */

-

-elgg_deprecated_notice('view user/search/startblurb was deprecated.', 1.7);

-

-?>

-<div class="contentWrapper">

-	<?php

-

-		echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']);

-

-	?>

-</div>

+<?php
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @deprecated 1.7
+ * @link http://elgg.org/
+ */
+
+elgg_deprecated_notice('view user/search/startblurb was deprecated.', 1.7);
+
+?>
+<div class="contentWrapper">
+	<?php
+
+		echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']);
+
+	?>
+</div>
diff --git a/views/default/user/settings/default_access.php b/views/default/user/settings/default_access.php
index 3a6e6842c..791f3932c 100644
--- a/views/default/user/settings/default_access.php
+++ b/views/default/user/settings/default_access.php
@@ -15,6 +15,7 @@ if ($vars['config']->allow_user_default_access) {
 			$default_access = $vars['config']->default_access;
 		}
 ?>
+<div class="user_settings access">
 	<h3><?php echo elgg_echo('default_access:settings'); ?></h3>
 	<p>
 		<?php echo elgg_echo('default_access:label'); ?>:
@@ -24,7 +25,7 @@ if ($vars['config']->allow_user_default_access) {
 
 		?>
 	</p>
-
+</div>
 <?php
 	}
 }
\ No newline at end of file
diff --git a/views/default/user/settings/email.php b/views/default/user/settings/email.php
index 699f72583..7b6ea9f00 100644
--- a/views/default/user/settings/email.php
+++ b/views/default/user/settings/email.php
@@ -12,6 +12,7 @@ $user = page_owner_entity();
 
 if ($user) {
 ?>
+<div class="user_settings email">
 <h3><?php echo elgg_echo('email:settings'); ?></h3>
 <p>
 	<?php echo elgg_echo('email:address:label'); ?>:
@@ -21,6 +22,6 @@ if ($user) {
 
 	?>
 </p>
-
+</div>
 <?php
 }
\ No newline at end of file
diff --git a/views/default/user/settings/language.php b/views/default/user/settings/language.php
index a7a66e5c2..36964a638 100644
--- a/views/default/user/settings/language.php
+++ b/views/default/user/settings/language.php
@@ -13,6 +13,7 @@ $user = page_owner_entity();
 
 if ($user) {
 ?>
+<div class="user_settings language">
 <h3><?php echo elgg_echo('user:set:language'); ?></h3>
 <p>
 
@@ -28,6 +29,6 @@ if ($user) {
 	?>
 
 </p>
-
+</div>
 <?php
 }
\ No newline at end of file
diff --git a/views/default/user/settings/name.php b/views/default/user/settings/name.php
index 2cbfd0bb6..d1d61482a 100644
--- a/views/default/user/settings/name.php
+++ b/views/default/user/settings/name.php
@@ -1,28 +1,17 @@
 <?php
-	/**
-	 * Provide a way of setting your full name.
-	 *
-	 * @package Elgg
-	 * @subpackage Core
+/**
+ * Provide a way of setting your full name.
+ *
+ * @package Elgg
+ * @subpackage Core
 
-	 * @author Curverider Ltd
+ * @author Curverider Ltd
 
-	 * @link http://elgg.org/
-	 */
+ * @link http://elgg.org/
+ */
 
-	$user = page_owner_entity();
+$user = page_owner_entity();
 
-if ($user) {
-?>
-	<h3><?php echo elgg_echo('user:set:name'); ?></h3>
-	<p>
-		<?php echo elgg_echo('user:name:label'); ?>:
-		<?php
-
-			echo elgg_view('input/text', array('internalname' => 'name', 'value' => $user->name));
-			echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $user->guid));
-		?>
-	</p>
-
-<?php
-}
\ No newline at end of file
+// all hidden, but necessary for properly updating user details
+echo elgg_view('input/hidden', array('internalname' => 'name', 'value' => $user->name));
+echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $user->guid));
diff --git a/views/default/user/settings/password.php b/views/default/user/settings/password.php
index 5cefe3821..68db18136 100644
--- a/views/default/user/settings/password.php
+++ b/views/default/user/settings/password.php
@@ -12,6 +12,7 @@ $user = page_owner_entity();
 
 if ($user) {
 ?>
+<div class="user_settings password">
 <h3><?php echo elgg_echo('user:set:password'); ?></h3>
 <p>
 	<?php echo elgg_echo('user:password:label'); ?>:
@@ -22,6 +23,6 @@ if ($user) {
 		echo elgg_view('input/password',array('internalname' => 'password2'));
 	?>
 </p>
-
+</div>
 <?php
 }
\ No newline at end of file
diff --git a/views/default/usersettings/form.php b/views/default/usersettings/form.php
index 2d4a7cb80..ffd9b9af0 100644
--- a/views/default/usersettings/form.php
+++ b/views/default/usersettings/form.php
@@ -6,7 +6,7 @@
  * @link http://elgg.org/
  */
 
-$form_body = "<div class=\"contentWrapper user_settings\">" . elgg_view("usersettings/user") . " ";
-$form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "</p></div>";
+$form_body = elgg_view("usersettings/user");
+$form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo('save')));
 
 echo elgg_view('input/form', array('action' => "{$vars['url']}action/usersettings/save", 'body' => $form_body));
\ No newline at end of file
diff --git a/views/default/usersettings/main.php b/views/default/usersettings/main.php
index 6d96076f8..32d6c2c51 100644
--- a/views/default/usersettings/main.php
+++ b/views/default/usersettings/main.php
@@ -10,4 +10,4 @@
  */
 
 // Description of what's going on
-echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:description"))) . "</p>";
+echo elgg_view('output/longtext', array('value' => elgg_echo("usersettings:description")));
diff --git a/views/default/usersettings/main_opt/plugins.php b/views/default/usersettings/main_opt/plugins.php
index 210096e92..2b6793386 100644
--- a/views/default/usersettings/main_opt/plugins.php
+++ b/views/default/usersettings/main_opt/plugins.php
@@ -10,7 +10,7 @@
 
 global $CONFIG;
 ?>
-<div class="admin-menu-option">
+<div class="menu_admin_option">
 	<h2><?php echo elgg_echo('usersettings:plugins'); ?> </h2>
 	<p><?php echo elgg_echo('usersettings:plugins:opt:description'); ?><br />
 	<a href="<?php echo $CONFIG->wwwroot . "pg/settings/plugins/"; ?>"><?php echo elgg_echo('usersettings:plugins:opt:linktext'); ?></a></p>
diff --git a/views/default/usersettings/main_opt/statistics.php b/views/default/usersettings/main_opt/statistics.php
index ca9d2d2bb..bbb4fc64d 100644
--- a/views/default/usersettings/main_opt/statistics.php
+++ b/views/default/usersettings/main_opt/statistics.php
@@ -8,7 +8,7 @@
  * @link http://elgg.org/
  */
 ?>
-<div class="admin-menu-option">
+<div class="menu_admin_option">
 	<h2><?php echo elgg_echo('usersettings:statistics'); ?> </h2>
 	<p><?php echo elgg_echo('usersettings:statistics:opt:description'); ?><br />
 	<a href="<?php echo $CONFIG->wwwroot . "pg/settings/statistics/"; ?>"><?php echo elgg_echo('usersettings:statistics:opt:linktext'); ?></a></p>
diff --git a/views/default/usersettings/main_opt/user.php b/views/default/usersettings/main_opt/user.php
index 92b09cae0..369fc7bd3 100644
--- a/views/default/usersettings/main_opt/user.php
+++ b/views/default/usersettings/main_opt/user.php
@@ -8,7 +8,7 @@
  * @link http://elgg.org/
  */
 ?>
-<div class="admin-menu-option">
+<div class="menu_admin_option">
 	<h2><?php echo elgg_echo('usersettings:user'); ?> </h2>
 	<p><?php echo elgg_echo('usersettings:user:opt:description'); ?><br />
 	<a href="<?php echo $CONFIG->wwwroot . "pg/settings/user/"; ?>"><?php echo elgg_echo('usersettings:user:opt:linktext'); ?></a></p>
diff --git a/views/default/usersettings/plugins.php b/views/default/usersettings/plugins.php
index 95a856850..8c873a9de 100644
--- a/views/default/usersettings/plugins.php
+++ b/views/default/usersettings/plugins.php
@@ -9,7 +9,7 @@
  */
 
 // Description of what's going on
-echo "<div class=\"contentWrapper\">" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description"))) . "</div>";
+echo elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description")));
 
 $limit = get_input('limit', 10);
 $offset = get_input('offset', 0);
diff --git a/views/default/usersettings/plugins_opt/plugin.php b/views/default/usersettings/plugins_opt/plugin.php
index c27212887..d32e44283 100644
--- a/views/default/usersettings/plugins_opt/plugin.php
+++ b/views/default/usersettings/plugins_opt/plugin.php
@@ -25,12 +25,12 @@ if ($user_guid) {
 
 if (elgg_view("usersettings/{$plugin}/edit")) {
 ?>
-<div class="contentWrapper">
-	<h3 class="settings"><?php echo elgg_echo($plugin); ?></h3>
-
+<div class="user_settings">
+	<h3><?php echo elgg_echo($plugin); ?></h3>
+	
 	<div id="<?php echo $plugin; ?>_settings">
 		<?php echo elgg_view("object/plugin", array('plugin' => $plugin, 'entity' => find_plugin_usersettings($plugin, $user_guid), 'prefix' => 'user')) ?>
 	</div>
-</div>
+</div>	
 <?php
 }
\ No newline at end of file
diff --git a/views/default/usersettings/statistics_opt/numentities.php b/views/default/usersettings/statistics_opt/numentities.php
index cf1d8598b..1c4b127ec 100644
--- a/views/default/usersettings/statistics_opt/numentities.php
+++ b/views/default/usersettings/statistics_opt/numentities.php
@@ -13,9 +13,9 @@ $entity_stats = get_entity_statistics($_SESSION['user']->guid);
 
 if ($entity_stats) {
 ?>
-<div class="usersettings_statistics">
+<div class="user_settings statistics">
 	<h3><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h3>
-	<table>
+	<table class="styled">
 		<?php
 			foreach ($entity_stats as $k => $entry) {
 				foreach ($entry as $a => $b) {
diff --git a/views/default/usersettings/statistics_opt/online.php b/views/default/usersettings/statistics_opt/online.php
index 2ea9bef28..817b18cde 100644
--- a/views/default/usersettings/statistics_opt/online.php
+++ b/views/default/usersettings/statistics_opt/online.php
@@ -18,10 +18,10 @@ if ($log) {
 }
 
 ?>
-<div class="usersettings_statistics">
+<div class="user_settings details">
 	<h3><?php echo elgg_echo('usersettings:statistics:yourdetails'); ?></h3>
 
-	<table>
+	<table class="styled">
 		<tr class="odd"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:name'); ?></td><td><?php echo $user->name; ?></td></tr>
 		<tr class="even"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:email'); ?></td><td><?php echo $user->email; ?></td></tr>
 		<tr class="odd"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:membersince'); ?></td><td><?php echo date("r",$user->time_created); ?></td></tr>